@wonderwhy-er/desktop-commander 0.2.19 → 0.2.21

package/dist/config-manager.js

@@ -101,7 +101,15 @@ class ConfigManager {
                 "cipher", // Encrypt/decrypt files or wipe data
                 "takeown" // Take ownership of files
             ],
-            defaultShell: os.platform() === 'win32' ? 'powershell.exe' : '/bin/sh',
+            defaultShell: (() => {
+                if (os.platform() === 'win32') {
+                    return 'powershell.exe';
+                }
+                // Use user's actual shell from environment, or fall back to /bin/sh
+                const userShell = process.env.SHELL || '/bin/sh';
+                // Return just the shell path - we'll handle login shell flag elsewhere
+                return userShell;
+            })(),
             allowedDirectories: [],
             telemetryEnabled: true, // Default to opt-out approach (telemetry on by default)
             fileWriteLineLimit: 50, // Default line limit for file write operations (changed from 100)

package/dist/custom-stdio.d.ts

@@ -8,11 +8,18 @@ export declare class FilteredStdioServerTransport extends StdioServerTransport {
     private originalStdoutWrite;
     private isInitialized;
     private messageBuffer;
+    private clientName;
+    private disableNotifications;
     constructor();
     /**
      * Call this method after MCP initialization is complete to enable JSON-RPC notifications
      */
     enableNotifications(): void;
+    /**
+     * Configure client-specific behavior
+     * Call this BEFORE enableNotifications()
+     */
+    configureForClient(clientName: string): void;
     /**
      * Check if notifications are enabled
      */

package/dist/custom-stdio.js

@@ -9,6 +9,8 @@ export class FilteredStdioServerTransport extends StdioServerTransport {
         super();
         this.isInitialized = false;
         this.messageBuffer = [];
+        this.clientName = 'unknown';
+        this.disableNotifications = false;
         // Store original methods
         this.originalConsole = {
             log: console.log,
@@ -30,6 +32,15 @@ export class FilteredStdioServerTransport extends StdioServerTransport {
      */
     enableNotifications() {
         this.isInitialized = true;
+        // Check if notifications should be disabled based on client
+        if (this.disableNotifications) {
+            // Clear buffer without sending - just log to stderr instead
+            if (this.messageBuffer.length > 0) {
+                process.stderr.write(`[INFO] ${this.messageBuffer.length} buffered messages suppressed for ${this.clientName}\n`);
+            }
+            this.messageBuffer = [];
+            return;
+        }
         // Send the deferred initialization notification first
         this.sendLogNotification('info', ['Enhanced FilteredStdioServerTransport initialized']);
         // Replay all buffered messages in chronological order
@@ -45,6 +56,20 @@ export class FilteredStdioServerTransport extends StdioServerTransport {
         }
         this.sendLogNotification('info', ['JSON-RPC notifications enabled']);
     }
+    /**
+     * Configure client-specific behavior
+     * Call this BEFORE enableNotifications()
+     */
+    configureForClient(clientName) {
+        this.clientName = clientName.toLowerCase();
+        // Detect Cline and disable notifications
+        if (this.clientName.includes('cline') ||
+            this.clientName.includes('vscode') ||
+            this.clientName === 'claude-dev') {
+            this.disableNotifications = true;
+            process.stderr.write(`[INFO] Desktop Commander: Notifications disabled for ${clientName}\n`);
+        }
+    }
     /**
      * Check if notifications are enabled
      */
@@ -155,6 +180,10 @@ export class FilteredStdioServerTransport extends StdioServerTransport {
         };
     }
     sendLogNotification(level, args) {
+        // Skip if notifications are disabled (e.g., for Cline)
+        if (this.disableNotifications) {
+            return;
+        }
         try {
             // For data, we can send structured data or string according to MCP spec
             let data;
@@ -206,6 +235,10 @@ export class FilteredStdioServerTransport extends StdioServerTransport {
      * Public method to send log notifications from anywhere in the application
      */
     sendLog(level, message, data) {
+        // Skip if notifications are disabled (e.g., for Cline)
+        if (this.disableNotifications) {
+            return;
+        }
         try {
             const notification = {
                 jsonrpc: "2.0",

package/dist/server.js

@@ -70,6 +70,11 @@ server.setRequestHandler(InitializeRequestSchema, async (request) => {
                 name: clientInfo.name || 'unknown',
                 version: clientInfo.version || 'unknown'
             };
+            // Configure transport for client-specific behavior
+            const transport = global.mcpTransport;
+            if (transport && typeof transport.configureForClient === 'function') {
+                transport.configureForClient(currentClient.name);
+            }
             // Defer client connection message until after initialization
             deferLog('info', `Client connected: ${currentClient.name} v${currentClient.version}`);
         }

package/dist/terminal-manager.js

@@ -1,8 +1,63 @@
 import { spawn } from 'child_process';
+import path from 'path';
 import { DEFAULT_COMMAND_TIMEOUT } from './config.js';
 import { configManager } from './config-manager.js';
 import { capture } from "./utils/capture.js";
 import { analyzeProcessState } from './utils/process-detection.js';
+/**
+ * Get the appropriate spawn configuration for a given shell
+ * This handles login shell flags for different shell types
+ */
+function getShellSpawnArgs(shellPath, command) {
+    const shellName = path.basename(shellPath).toLowerCase();
+    // Unix shells with login flag support
+    if (shellName.includes('bash') || shellName.includes('zsh')) {
+        return {
+            executable: shellPath,
+            args: ['-l', '-c', command],
+            useShellOption: false
+        };
+    }
+    // PowerShell Core (cross-platform, supports -Login)
+    if (shellName === 'pwsh' || shellName === 'pwsh.exe') {
+        return {
+            executable: shellPath,
+            args: ['-Login', '-Command', command],
+            useShellOption: false
+        };
+    }
+    // Windows PowerShell 5.1 (no login flag support)
+    if (shellName === 'powershell' || shellName === 'powershell.exe') {
+        return {
+            executable: shellPath,
+            args: ['-Command', command],
+            useShellOption: false
+        };
+    }
+    // CMD
+    if (shellName === 'cmd' || shellName === 'cmd.exe') {
+        return {
+            executable: shellPath,
+            args: ['/c', command],
+            useShellOption: false
+        };
+    }
+    // Fish shell (uses -l for login, -c for command)
+    if (shellName.includes('fish')) {
+        return {
+            executable: shellPath,
+            args: ['-l', '-c', command],
+            useShellOption: false
+        };
+    }
+    // Unknown/other shells - use shell option for safety
+    // This provides a fallback for shells we don't explicitly handle
+    return {
+        executable: command,
+        args: [],
+        useShellOption: shellPath
+    };
+}
 export class TerminalManager {
     constructor() {
         this.sessions = new Map();
@@ -54,15 +109,40 @@ export class TerminalManager {
             enhancedCommand = command.replace(/^ssh /, 'ssh -t ');
             console.log(`Enhanced SSH command: ${enhancedCommand}`);
         }
-        const spawnOptions = {
-            shell: shellToUse,
-            env: {
-                ...process.env,
-                TERM: 'xterm-256color' // Better terminal compatibility
+        // Get the appropriate spawn configuration for the shell
+        let spawnConfig;
+        let spawnOptions;
+        if (typeof shellToUse === 'string') {
+            // Use shell-specific configuration with login flags where appropriate
+            spawnConfig = getShellSpawnArgs(shellToUse, enhancedCommand);
+            spawnOptions = {
+                env: {
+                    ...process.env,
+                    TERM: 'xterm-256color' // Better terminal compatibility
+                }
+            };
+            // Add shell option if needed (for unknown shells)
+            if (spawnConfig.useShellOption) {
+                spawnOptions.shell = spawnConfig.useShellOption;
             }
-        };
-        // Spawn the process with an empty array of arguments and our options
-        const childProcess = spawn(enhancedCommand, [], spawnOptions);
+        }
+        else {
+            // Boolean or undefined shell - use default shell option behavior
+            spawnConfig = {
+                executable: enhancedCommand,
+                args: [],
+                useShellOption: shellToUse
+            };
+            spawnOptions = {
+                shell: shellToUse,
+                env: {
+                    ...process.env,
+                    TERM: 'xterm-256color'
+                }
+            };
+        }
+        // Spawn the process with appropriate arguments
+        const childProcess = spawn(spawnConfig.executable, spawnConfig.args, spawnOptions);
         let output = '';
         // Ensure childProcess.pid is defined before proceeding
         if (!childProcess.pid) {

package/dist/version.d.ts

@@ -1 +1 @@
-export declare const VERSION = "0.2.19";
+export declare const VERSION = "0.2.21";

package/dist/version.js

@@ -1 +1 @@
-export const VERSION = '0.2.19';
+export const VERSION = '0.2.21';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wonderwhy-er/desktop-commander",
-  "version": "0.2.19",
+  "version": "0.2.21",
   "description": "MCP server for terminal operations and file editing",
   "mcpName": "io.github.wonderwhy-er/desktop-commander",
   "license": "MIT",
@@ -87,6 +87,7 @@
     "zod-to-json-schema": "^3.23.5"
   },
   "devDependencies": {
+    "@anthropic-ai/mcpb": "^1.2.0",
     "@types/node": "^20.17.24",
     "commander": "^13.1.0",
     "nexe": "^5.0.0-beta.4",