more fixes for vscode ext

Author: ndbroadbent

renamify-mcp/README.md

@@ -44,6 +44,24 @@ Add to your MCP client configuration (e.g., for Claude Desktop or Cursor):
 }
 ```
 
+### Custom Binary Path
+
+If `renamify` is not in your PATH or you want to use a specific binary, set the `RENAMIFY_PATH` environment variable:
+
+```json
+{
+  "mcpServers": {
+    "renamify": {
+      "command": "npx",
+      "args": ["-y", "@renamify/mcp-server"],
+      "env": {
+        "RENAMIFY_PATH": "/path/to/renamify"
+      }
+    }
+  }
+}
+```
+
 ### Supported AI Assistants
 
 - **Claude Desktop** - Anthropic's AI assistant

renamify-mcp/src/index.ts

@@ -261,7 +261,10 @@ export function createServer(
 }
 
 export async function main() {
-  const server = createServer();
+  // Allow configuration via environment variable
+  const renamifyPath = process.env.RENAMIFY_PATH;
+  const service = renamifyPath ? new RenamifyService(renamifyPath) : undefined;
+  const server = createServer(service);
   const transport = new StdioServerTransport();
   await server.connect(transport);
   // Server started successfully - MCP servers communicate via stdio

renamify-vscode/.gitignore

@@ -4,3 +4,8 @@ node_modules
 *.vsix
 .DS_Store
 src/renamify-core-bindings
+
+# Generated files
+media/bundle.js
+media/webview.js
+media/webview.js.map

renamify-vscode/extension/src/cliService.ts

@@ -1,10 +1,10 @@
-import { spawn } from "node:child_process";
-import * as fs from "node:fs";
-import * as path from "node:path";
-import * as vscode from "vscode";
-import type { SearchOptions, SearchResult, Status } from "./types";
+import { spawn } from 'node:child_process';
+import * as fs from 'node:fs';
+import * as path from 'node:path';
+import * as vscode from 'vscode';
+import type { SearchOptions, SearchResult, Status } from './types';
 
-export type { SearchOptions, SearchResult } from "./types";
+export type { SearchOptions, SearchResult } from './types';
 
 export class RenamifyCliService {
   private readonly cliPath: string;
@@ -16,23 +16,23 @@ export class RenamifyCliService {
   }
 
   private findCliPath(): string {
-    const config = vscode.workspace.getConfiguration("renamify");
-    const configuredPath = config.get<string>("cliPath");
+    const config = vscode.workspace.getConfiguration('renamify');
+    const configuredPath = config.get<string>('cliPath');
 
     if (configuredPath && fs.existsSync(configuredPath)) {
       return configuredPath;
     }
 
     // Try to find in PATH
-    const pathEnv = process.env.PATH || "";
+    const pathEnv = process.env.PATH || '';
     const paths = pathEnv.split(path.delimiter);
 
     for (const p of paths) {
-      const cliPath = path.join(p, "renamify");
+      const cliPath = path.join(p, 'renamify');
       if (fs.existsSync(cliPath)) {
         return cliPath;
       }
-      const cliPathExe = path.join(p, "renamify.exe");
+      const cliPathExe = path.join(p, 'renamify.exe');
       if (fs.existsSync(cliPathExe)) {
         return cliPathExe;
       }
@@ -41,158 +41,171 @@ export class RenamifyCliService {
     // Try local development path
     const workspaceRoot = vscode.workspace.workspaceFolders?.[0]?.uri.fsPath;
     if (workspaceRoot) {
-      const devPath = path.join(workspaceRoot, "target", "debug", "renamify");
+      const devPath = path.join(workspaceRoot, 'target', 'debug', 'renamify');
       if (fs.existsSync(devPath)) {
         return devPath;
       }
       const devPathExe = path.join(
         workspaceRoot,
-        "target",
-        "debug",
-        "renamify.exe"
+        'target',
+        'debug',
+        'renamify.exe'
       );
       if (fs.existsSync(devPathExe)) {
         return devPathExe;
       }
     }
 
     throw new Error(
-      "Renamify CLI not found. Please install it or configure the path in settings."
+      'Renamify CLI not found. Please install it or configure the path in settings.'
     );
   }
 
   async search(searchTerm: string, options: SearchOptions): Promise<Plan> {
-    const args = ["search", searchTerm, "--output", "json"];
+    const args = ['search', searchTerm, '--output', 'json'];
 
     if (options.include) {
-      args.push("--include", options.include);
+      args.push('--include', options.include);
     }
 
     if (options.exclude) {
-      args.push("--exclude", options.exclude);
+      args.push('--exclude', options.exclude);
     }
 
     if (options.excludeMatchingLines) {
-      args.push("--exclude-matching-lines", options.excludeMatchingLines);
+      args.push('--exclude-matching-lines', options.excludeMatchingLines);
     }
 
     if (options.caseStyles && options.caseStyles.length > 0) {
-      args.push("--only-styles", options.caseStyles.join(","));
+      args.push('--only-styles', options.caseStyles.join(','));
     }
 
-    const config = vscode.workspace.getConfiguration("renamify");
-    if (!config.get("respectGitignore")) {
-      args.push("-u");
+    const config = vscode.workspace.getConfiguration('renamify');
+    if (!config.get('respectGitignore')) {
+      args.push('-u');
     }
 
     const result = await this.runCli(args);
-    return JSON.parse(result);
+    const parsed = JSON.parse(result);
+    // The CLI returns a wrapper object with the plan nested inside
+    if (!parsed.plan) {
+      throw new Error('Invalid response from CLI: missing plan data');
+    }
+    return parsed.plan;
   }
 
   async createPlan(
     searchTerm: string,
     replaceTerm: string,
     options: SearchOptions & { dryRun?: boolean }
   ): Promise<Plan | SearchResult[]> {
-    const args = ["plan", searchTerm, replaceTerm, "--output", "json"];
+    const args = ['plan', searchTerm, replaceTerm, '--output', 'json'];
 
     if (options.dryRun) {
-      args.push("--dry-run");
+      args.push('--dry-run');
     }
 
     if (options.include) {
-      args.push("--include", options.include);
+      args.push('--include', options.include);
     }
 
     if (options.exclude) {
-      args.push("--exclude", options.exclude);
+      args.push('--exclude', options.exclude);
     }
 
     if (options.excludeMatchingLines) {
-      args.push("--exclude-matching-lines", options.excludeMatchingLines);
+      args.push('--exclude-matching-lines', options.excludeMatchingLines);
     }
 
     if (options.caseStyles && options.caseStyles.length > 0) {
-      args.push("--only-styles", options.caseStyles.join(","));
+      args.push('--only-styles', options.caseStyles.join(','));
     }
 
-    const config = vscode.workspace.getConfiguration("renamify");
-    if (!config.get("respectGitignore")) {
-      args.push("-u");
+    const config = vscode.workspace.getConfiguration('renamify');
+    if (!config.get('respectGitignore')) {
+      args.push('-u');
     }
 
     const result = await this.runCli(args);
-
-    // Always return the full Plan object, whether dry-run or not
-    return JSON.parse(result);
+    const parsed = JSON.parse(result);
+    // The CLI returns a wrapper object with the plan nested inside
+    if (!parsed.plan) {
+      throw new Error('Invalid response from CLI: missing plan data');
+    }
+    return parsed.plan;
   }
 
   async rename(
     searchTerm: string,
     replaceTerm: string,
     options: SearchOptions
   ): Promise<{ planId: string }> {
-    const args = ["rename", searchTerm, replaceTerm, "-y", "--output", "json"];
+    const args = ['rename', searchTerm, replaceTerm, '-y', '--output', 'json'];
 
     if (options.include) {
-      args.push("--include", options.include);
+      args.push('--include', options.include);
     }
 
     if (options.exclude) {
-      args.push("--exclude", options.exclude);
+      args.push('--exclude', options.exclude);
     }
 
     if (options.excludeMatchingLines) {
-      args.push("--exclude-matching-lines", options.excludeMatchingLines);
+      args.push('--exclude-matching-lines', options.excludeMatchingLines);
     }
 
     if (options.caseStyles && options.caseStyles.length > 0) {
-      args.push("--only-styles", options.caseStyles.join(","));
+      args.push('--only-styles', options.caseStyles.join(','));
     }
 
-    const config = vscode.workspace.getConfiguration("renamify");
-    if (!config.get("respectGitignore")) {
-      args.push("-u");
+    const config = vscode.workspace.getConfiguration('renamify');
+    if (!config.get('respectGitignore')) {
+      args.push('-u');
     }
 
     const result = await this.runCli(args);
 
     // Parse the JSON response
-    const planData = JSON.parse(result);
-    return { planId: planData.plan_id };
+    const parsed = JSON.parse(result);
+    // Extract the plan ID from the wrapper or plan
+    const planId = parsed.plan_id || parsed.plan?.id;
+    if (!planId) {
+      throw new Error('Invalid response from CLI: missing plan ID');
+    }
+    return { planId };
   }
 
   async apply(planId?: string): Promise<void> {
-    const args = ["apply", "--output", "json"];
+    const args = ['apply', '--output', 'json'];
 
     if (planId) {
-      args.push("--id", planId);
+      args.push('--id', planId);
     }
 
     await this.runCli(args);
   }
 
   async undo(id: string): Promise<void> {
-    await this.runCli(["undo", id, "--output", "json"]);
+    await this.runCli(['undo', id, '--output', 'json']);
   }
 
   async redo(id: string): Promise<void> {
-    await this.runCli(["redo", id, "--output", "json"]);
+    await this.runCli(['redo', id, '--output', 'json']);
   }
 
   async history(limit?: number): Promise<HistoryEntry[]> {
-    const args = ["history", "--output", "json"];
+    const args = ['history', '--output', 'json'];
 
     if (limit) {
-      args.push("--limit", limit.toString());
+      args.push('--limit', limit.toString());
     }
 
     const result = await this.runCli(args);
     return JSON.parse(result);
   }
 
   async status(): Promise<Status> {
-    const result = await this.runCli(["status", "--output", "json"]);
+    const result = await this.runCli(['status', '--output', 'json']);
     return JSON.parse(result);
   }
 
@@ -210,18 +223,18 @@ export class RenamifyCliService {
         env: process.env,
       });
 
-      let stdout = "";
-      let stderr = "";
+      let stdout = '';
+      let stderr = '';
 
-      proc.stdout.on("data", (data) => {
+      proc.stdout.on('data', (data) => {
         stdout += data.toString();
       });
 
-      proc.stderr.on("data", (data) => {
+      proc.stderr.on('data', (data) => {
         stderr += data.toString();
       });
 
-      proc.on("close", (code) => {
+      proc.on('close', (code) => {
         if (code === 0) {
           resolve(stdout);
         } else {
@@ -230,7 +243,7 @@ export class RenamifyCliService {
         }
       });
 
-      proc.on("error", (err) => {
+      proc.on('error', (err) => {
         reject(err);
       });
     });