@wonderwhy-er/desktop-commander 0.1.23 → 0.1.25

package/README.md

@@ -67,7 +67,12 @@ npx @wonderwhy-er/desktop-commander setup
 Restart Claude if running
 
 ### Option 3: Add to claude_desktop_config by hand
-Add this entry to your claude_desktop_config.json (on Mac, found at ~/Library/Application\ Support/Claude/claude_desktop_config.json):
+Add this entry to your claude_desktop_config.json:
+
+- On Mac: `~/Library/Application\ Support/Claude/claude_desktop_config.json`
+- On Windows: `%APPDATA%\Claude\claude_desktop_config.json`
+- On Linux: `~/.config/Claude/claude_desktop_config.json`
+
 ```json
 {
   "mcpServers": {
@@ -164,6 +169,7 @@ This project extends the MCP Filesystem Server to enable:
 Created as part of exploring Claude MCPs: https://youtube.com/live/TlbjFDbl5Us
 
 ## DONE
+- **28-03-2025 Fixed "Watching /" JSON error** - Implemented custom stdio transport to handle non-JSON messages and prevent server crashes
 - **25-03-2025 Better code search** ([merged](https://github.com/wonderwhy-er/ClaudeDesktopCommander/pull/17)) - Enhanced code exploration with context-aware results
 
 ## Work in Progress and TODOs
@@ -195,7 +201,7 @@ Learn more about this project through these resources:
 This Developer Ditched Windsurf, Cursor Using Claude with MCPs](https://analyticsindiamag.com/ai-features/this-developer-ditched-windsurf-cursor-using-claude-with-mcps/)
 
 ### Community
-Join our [Discord server](https://discord.gg/7cbccwRp) to get help, share feedback, and connect with other users.
+Join our [Discord server](https://discord.gg/kQ27sNnZr7) to get help, share feedback, and connect with other users.
 
 ## Testimonials
 

package/dist/custom-stdio.d.ts

@@ -0,0 +1,8 @@
+import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
+/**
+ * Extended StdioServerTransport that filters out non-JSON messages.
+ * This prevents the "Watching /" error from crashing the server.
+ */
+export declare class FilteredStdioServerTransport extends StdioServerTransport {
+    constructor();
+}

package/dist/custom-stdio.js

@@ -0,0 +1,22 @@
+import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
+import process from "node:process";
+/**
+ * Extended StdioServerTransport that filters out non-JSON messages.
+ * This prevents the "Watching /" error from crashing the server.
+ */
+export class FilteredStdioServerTransport extends StdioServerTransport {
+    constructor() {
+        // Create a proxy for stdout that only allows valid JSON to pass through
+        const originalStdoutWrite = process.stdout.write;
+        process.stdout.write = function (buffer) {
+            // Only intercept string output that doesn't look like JSON
+            if (typeof buffer === 'string' && !buffer.trim().startsWith('{')) {
+                return true; //process.stderr.write(buffer);
+            }
+            return originalStdoutWrite.apply(process.stdout, arguments);
+        };
+        super();
+        // Log initialization to stderr to avoid polluting the JSON stream
+        process.stderr.write(`[desktop-commander] Initialized FilteredStdioServerTransport\n`);
+    }
+}

package/dist/index.js

@@ -1,20 +1,51 @@
 #!/usr/bin/env node
-import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
+import { FilteredStdioServerTransport } from './custom-stdio.js';
 import { server } from './server.js';
 import { commandManager } from './command-manager.js';
 import { join, dirname } from 'path';
-import { fileURLToPath } from 'url';
+import { fileURLToPath, pathToFileURL } from 'url';
+import { platform } from 'os';
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
+const isWindows = platform() === 'win32';
+// Helper function to properly convert file paths to URLs, especially for Windows
+function createFileURL(filePath) {
+    if (isWindows) {
+        // Ensure path uses forward slashes for URL format
+        const normalizedPath = filePath.replace(/\\/g, '/');
+        // Ensure path has proper file:// prefix
+        if (normalizedPath.startsWith('/')) {
+            return new URL(`file://${normalizedPath}`);
+        }
+        else {
+            return new URL(`file:///${normalizedPath}`);
+        }
+    }
+    else {
+        // For non-Windows, we can use the built-in function
+        return pathToFileURL(filePath);
+    }
+}
 async function runSetup() {
-    const setupScript = join(__dirname, 'setup-claude-server.js');
-    const { default: setupModule } = await import(setupScript);
-    if (typeof setupModule === 'function') {
-        await setupModule();
+    try {
+        // Fix for Windows ESM path issue
+        const setupScriptPath = join(__dirname, 'setup-claude-server.js');
+        const setupScriptUrl = createFileURL(setupScriptPath);
+        // Now import using the URL format
+        const { default: setupModule } = await import(setupScriptUrl.href);
+        if (typeof setupModule === 'function') {
+            await setupModule();
+        }
+    }
+    catch (error) {
+        console.error('Error running setup:', error);
+        process.exit(1);
     }
 }
 async function runServer() {
     try {
+        const transport = new FilteredStdioServerTransport();
+        console.log("start");
         // Check if first argument is "setup"
         if (process.argv[2] === 'setup') {
             await runSetup();
@@ -23,14 +54,25 @@ async function runServer() {
         // Handle uncaught exceptions
         process.on('uncaughtException', async (error) => {
             const errorMessage = error instanceof Error ? error.message : String(error);
+            // If this is a JSON parsing error, log it to stderr but don't crash
+            if (errorMessage.includes('JSON') && errorMessage.includes('Unexpected token')) {
+                process.stderr.write(`[desktop-commander] JSON parsing error: ${errorMessage}\n`);
+                return; // Don't exit on JSON parsing errors
+            }
+            process.stderr.write(`[desktop-commander] Uncaught exception: ${errorMessage}\n`);
             process.exit(1);
         });
         // Handle unhandled rejections
         process.on('unhandledRejection', async (reason) => {
             const errorMessage = reason instanceof Error ? reason.message : String(reason);
+            // If this is a JSON parsing error, log it to stderr but don't crash
+            if (errorMessage.includes('JSON') && errorMessage.includes('Unexpected token')) {
+                process.stderr.write(`[desktop-commander] JSON parsing rejection: ${errorMessage}\n`);
+                return; // Don't exit on JSON parsing errors
+            }
+            process.stderr.write(`[desktop-commander] Unhandled rejection: ${errorMessage}\n`);
             process.exit(1);
         });
-        const transport = new StdioServerTransport();
         // Load blocked commands from config file
         await commandManager.loadBlockedCommands();
         await server.connect(transport);

package/dist/server.d.ts

@@ -1,20 +1,24 @@
 import { Server } from "@modelcontextprotocol/sdk/server/index.js";
 export declare const server: Server<{
     method: string;
-    params?: import("zod").objectOutputType<{
-        _meta: import("zod").ZodOptional<import("zod").ZodObject<{
-            progressToken: import("zod").ZodOptional<import("zod").ZodUnion<[import("zod").ZodString, import("zod").ZodNumber]>>;
-        }, "passthrough", import("zod").ZodTypeAny, import("zod").objectOutputType<{
-            progressToken: import("zod").ZodOptional<import("zod").ZodUnion<[import("zod").ZodString, import("zod").ZodNumber]>>;
-        }, import("zod").ZodTypeAny, "passthrough">, import("zod").objectInputType<{
-            progressToken: import("zod").ZodOptional<import("zod").ZodUnion<[import("zod").ZodString, import("zod").ZodNumber]>>;
-        }, import("zod").ZodTypeAny, "passthrough">>>;
-    }, import("zod").ZodTypeAny, "passthrough"> | undefined;
+    params?: {
+        [x: string]: unknown;
+        _meta?: {
+            [x: string]: unknown;
+            progressToken?: string | number | undefined;
+        } | undefined;
+    } | undefined;
 }, {
     method: string;
-    params?: import("zod").objectOutputType<{
-        _meta: import("zod").ZodOptional<import("zod").ZodObject<{}, "passthrough", import("zod").ZodTypeAny, import("zod").objectOutputType<{}, import("zod").ZodTypeAny, "passthrough">, import("zod").objectInputType<{}, import("zod").ZodTypeAny, "passthrough">>>;
-    }, import("zod").ZodTypeAny, "passthrough"> | undefined;
-}, import("zod").objectOutputType<{
-    _meta: import("zod").ZodOptional<import("zod").ZodObject<{}, "passthrough", import("zod").ZodTypeAny, import("zod").objectOutputType<{}, import("zod").ZodTypeAny, "passthrough">, import("zod").objectInputType<{}, import("zod").ZodTypeAny, "passthrough">>>;
-}, import("zod").ZodTypeAny, "passthrough">>;
+    params?: {
+        [x: string]: unknown;
+        _meta?: {
+            [x: string]: unknown;
+        } | undefined;
+    } | undefined;
+}, {
+    [x: string]: unknown;
+    _meta?: {
+        [x: string]: unknown;
+    } | undefined;
+}>;

package/dist/setup-claude-server.js

@@ -3,15 +3,31 @@ import { join } from 'path';
 import { readFileSync, writeFileSync, existsSync, appendFileSync } from 'fs';
 import { fileURLToPath } from 'url';
 import { dirname } from 'path';
+import { exec } from "node:child_process";
 
+// Fix for Windows ESM path resolution
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
 
-// Determine OS and set appropriate config path and command
-const isWindows = platform() === 'win32';
-const claudeConfigPath = isWindows
-    ? join(process.env.APPDATA, 'Claude', 'claude_desktop_config.json')
-    : join(homedir(), 'Library', 'Application Support', 'Claude', 'claude_desktop_config.json');
+// Determine OS and set appropriate config path
+const os = platform();
+const isWindows = os === 'win32'; // Define isWindows variable
+let claudeConfigPath;
+
+switch (os) {
+    case 'win32':
+        claudeConfigPath = join(process.env.APPDATA, 'Claude', 'claude_desktop_config.json');
+        break;
+    case 'darwin':
+        claudeConfigPath = join(homedir(), 'Library', 'Application Support', 'Claude', 'claude_desktop_config.json');
+        break;
+    case 'linux':
+        claudeConfigPath = join(homedir(), '.config', 'Claude', 'claude_desktop_config.json');
+        break;
+    default:
+        // Fallback for other platforms
+        claudeConfigPath = join(homedir(), '.claude_desktop_config.json');
+}
 
 // Setup logging
 const LOG_FILE = join(__dirname, 'setup.log');
@@ -38,6 +54,64 @@ function logToFile(message, isError = false) {
     }
 }
 
+async function execAsync(command) {
+    return new Promise((resolve, reject) => {
+      // Use PowerShell on Windows for better Unicode support and consistency
+      const actualCommand = isWindows
+      ? `cmd.exe /c ${command}`
+      : command;
+
+      exec(actualCommand, (error, stdout, stderr) => {
+        if (error) {
+          reject(error);
+          return;
+        }
+        resolve({ stdout, stderr });
+      });
+    });
+}
+
+async function restartClaude() {
+	try {
+        const platform = process.platform
+        switch (platform) {
+            case "win32":
+                // ignore errors on windows when claude is not running.
+                // just silently kill the process
+                try  {
+                    await execAsync(
+                        `taskkill /F /IM "Claude.exe"`,
+                    )
+                } catch {}
+                break;
+            case "darwin":
+                await execAsync(
+                    `killall "Claude"`,
+                )
+                break;
+            case "linux":
+                await execAsync(
+                    `pkill -f "claude"`,
+                )
+                break;
+        }
+		await new Promise((resolve) => setTimeout(resolve, 3000))
+
+		if (platform === "win32") {
+            // it will never start claude
+			// await execAsync(`start "" "Claude.exe"`)
+		} else if (platform === "darwin") {
+			await execAsync(`open -a "Claude"`)
+		} else if (platform === "linux") {
+			await execAsync(`claude`)
+		}
+
+		logToFile(`Claude has been restarted.`)
+	} catch (error) {
+		logToFile(`Failed to restart Claude: ${error}`, true)
+	}
+}
+
 // Check if config file exists and create default if not
 if (!existsSync(claudeConfigPath)) {
     logToFile(`Claude config file not found at: ${claudeConfigPath}`);
@@ -49,7 +123,7 @@ if (!existsSync(claudeConfigPath)) {
         import('fs').then(fs => fs.mkdirSync(configDir, { recursive: true }));
     }
     
-    // Create default config
+    // Create default config with shell based on platform
     const defaultConfig = {
         "serverConfig": isWindows
             ? {
@@ -66,49 +140,69 @@ if (!existsSync(claudeConfigPath)) {
     logToFile('Default config file created. Please update it with your Claude API credentials.');
 }
 
-try {
-    // Read existing config
-    const configData = readFileSync(claudeConfigPath, 'utf8');
-    const config = JSON.parse(configData);
-
-    // Prepare the new server config based on OS
-    // Determine if running through npx or locally
-    const isNpx = import.meta.url.endsWith('dist/setup-claude-server.js');
-
-    const serverConfig = isNpx ? {
-        "command": "npx",
-        "args": [
-            "@wonderwhy-er/desktop-commander"
-        ]
-    } : {
-        "command": "node",
-        "args": [
-            join(__dirname, 'dist', 'index.js')
-        ]
-    };
+// Main function to export for ESM compatibility
+export default async function setup() {
+    try {
+        // Read existing config
+        const configData = readFileSync(claudeConfigPath, 'utf8');
+        const config = JSON.parse(configData);
 
-    // Initialize mcpServers if it doesn't exist
-    if (!config.mcpServers) {
-        config.mcpServers = {};
-    }
-    
-    // Check if the old "desktopCommander" exists and remove it
-    if (config.mcpServers.desktopCommander) {
-        logToFile('Found old "desktopCommander" installation. Removing it...');
-        delete config.mcpServers.desktopCommander;
+        // Prepare the new server config based on OS
+        // Determine if running through npx or locally
+        const isNpx = import.meta.url.includes('node_modules');
+
+        // Fix Windows path handling for npx execution
+        let serverConfig;
+        if (isNpx) {
+            serverConfig = {
+                "command": isWindows ? "npx.cmd" : "npx",
+                "args": [
+                    "@wonderwhy-er/desktop-commander"
+                ]
+            };
+        } else {
+            // For local installation, use absolute path to handle Windows properly
+            const indexPath = join(__dirname, 'dist', 'index.js');
+            serverConfig = {
+                "command": "node",
+                "args": [
+                    indexPath.replace(/\\/g, '\\\\') // Double escape backslashes for JSON
+                ]
+            };
+        }
+
+        // Initialize mcpServers if it doesn't exist
+        if (!config.mcpServers) {
+            config.mcpServers = {};
+        }
+
+        // Check if the old "desktopCommander" exists and remove it
+        if (config.mcpServers.desktopCommander) {
+            logToFile('Found old "desktopCommander" installation. Removing it...');
+            delete config.mcpServers.desktopCommander;
+        }
+
+        // Add or update the terminal server config with the proper name "desktop-commander"
+        config.mcpServers["desktop-commander"] = serverConfig;
+
+        // Write the updated config back
+        writeFileSync(claudeConfigPath, JSON.stringify(config, null, 2), 'utf8');
+
+        logToFile('Successfully added MCP server to Claude configuration!');
+        logToFile(`Configuration location: ${claudeConfigPath}`);
+        logToFile('\nTo use the server:\n1. Restart Claude if it\'s currently running\n2. The server will be available as "desktop-commander" in Claude\'s MCP server list');
+
+        await restartClaude();
+    } catch (error) {
+        logToFile(`Error updating Claude configuration: ${error}`, true);
+        process.exit(1);
     }
-    
-    // Add or update the terminal server config with the proper name "desktop-commander"
-    config.mcpServers["desktop-commander"] = serverConfig;
+}
 
-    // Write the updated config back
-    writeFileSync(claudeConfigPath, JSON.stringify(config, null, 2), 'utf8');
-    
-    logToFile('Successfully added MCP server to Claude configuration!');
-    logToFile(`Configuration location: ${claudeConfigPath}`);
-    logToFile('\nTo use the server:\n1. Restart Claude if it\'s currently running\n2. The server will be available as "desktop-commander" in Claude\'s MCP server list');
-    
-} catch (error) {
-    logToFile(`Error updating Claude configuration: ${error}`, true);
-    process.exit(1);
+// Allow direct execution
+if (process.argv.length >= 2 && process.argv[1] === fileURLToPath(import.meta.url)) {
+    setup().catch(error => {
+        logToFile(`Fatal error: ${error}`, true);
+        process.exit(1);
+    });
 }

package/dist/version.d.ts

@@ -1 +1 @@
-export declare const VERSION = "0.1.23";
+export declare const VERSION = "0.1.25";

package/dist/version.js

@@ -1 +1 @@
-export const VERSION = '0.1.23';
+export const VERSION = '0.1.25';

package/package.json

@@ -1,12 +1,15 @@
 {
   "name": "@wonderwhy-er/desktop-commander",
-  "version": "0.1.23",
+  "version": "0.1.25",
   "description": "MCP server for terminal operations and file editing",
   "license": "MIT",
   "author": "Eduards Ruzga",
   "homepage": "https://github.com/wonderwhy-er/DesktopCommanderMCP",
   "bugs": "https://github.com/wonderwhy-er/DesktopCommanderMCP/issues",
   "type": "module",
+  "engines": {
+    "node": ">=18.0.0"
+  },
   "bin": {
     "desktop-commander": "dist/index.js",
     "setup": "dist/setup-claude-server.js"
@@ -56,14 +59,14 @@
     "file-operations"
   ],
   "dependencies": {
-    "@modelcontextprotocol/sdk": "1.0.1",
+    "@modelcontextprotocol/sdk": "^1.8.0",
     "@vscode/ripgrep": "^1.15.9",
     "glob": "^10.3.10",
     "zod": "^3.24.1",
     "zod-to-json-schema": "^3.23.5"
   },
   "devDependencies": {
-    "@types/node": "^20.11.0",
+    "@types/node": "^20.17.24",
     "nodemon": "^3.0.2",
     "shx": "^0.3.4",
     "typescript": "^5.3.3"