centaurus-cli 2.8.4 → 2.8.5

package/dist/cli-adapter.d.ts

@@ -37,6 +37,7 @@ export declare class CentaurusCLI {
     private requestIntentionallyAborted;
     private mcpCommandHandler?;
     private onInteractiveEditorMode?;
+    private onConnectionStatusUpdate?;
     constructor();
     setOnResponseCallback(callback: (message: string) => void): void;
     setOnDirectMessageCallback(callback: (message: string) => void): void;
@@ -85,6 +86,12 @@ export declare class CentaurusCLI {
     setOnSubshellContextChange(callback: (context: SubshellContext) => void): void;
     setOnPasswordRequest(callback: (message: string) => Promise<string>): void;
     setOnInteractiveEditorMode(callback: (active: boolean, command?: string, cwd?: string, remoteContext?: SubshellContext) => void): void;
+    setOnConnectionStatusUpdate(callback: (status: {
+        type: 'ssh' | 'wsl' | 'docker';
+        status: 'connecting' | 'connected' | 'error';
+        connectionString?: string;
+        error?: string;
+    }) => void): void;
     private initializeMCP;
     writeToShellStdin(input: string): void;
     sendSignalToShell(signal: NodeJS.Signals): void;

package/dist/cli-adapter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cli-adapter.d.ts","sourceRoot":"","sources":["../src/cli-adapter.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"cli-adapter.d.ts","sourceRoot":"","sources":["../src/cli-adapter.ts"],"names":[],"mappings":"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"}

package/dist/cli-adapter.js

@@ -68,6 +68,7 @@ export class CentaurusCLI {
     requestIntentionallyAborted = false;
     mcpCommandHandler;
     onInteractiveEditorMode;
+    onConnectionStatusUpdate;
     constructor() {
         this.configManager = new ConfigManager();
         this.toolRegistry = new ToolRegistry();
@@ -150,6 +151,9 @@ export class CentaurusCLI {
     setOnInteractiveEditorMode(callback) {
         this.onInteractiveEditorMode = callback;
     }
+    setOnConnectionStatusUpdate(callback) {
+        this.onConnectionStatusUpdate = callback;
+    }
     async initializeMCP() {
         try {
             const mcpConfigManager = new MCPConfigManager();
@@ -241,10 +245,39 @@ export class CentaurusCLI {
      */
     notifyToolStatus(toolName, status, args, result, error) {
         if (this.onToolExecutionUpdate) {
-            // Add cwd to arguments for execute_command tool
-            const toolArgs = toolName === 'execute_command' && args
-                ? { ...args, cwd: this.cwd }
-                : args;
+            // Get current context for remote prefix
+            const currentContext = this.contextManager.getCurrentContext();
+            // Build remote context prefix for SSH/Docker/WSL
+            let remoteContext;
+            if (currentContext.type !== 'local') {
+                const metadata = currentContext.metadata;
+                if (currentContext.type === 'ssh' && metadata) {
+                    // SSH: user@hostname
+                    const username = metadata.username || 'user';
+                    const hostname = metadata.hostname || 'remote';
+                    remoteContext = `${username}@${hostname}`;
+                }
+                else if (currentContext.type === 'wsl' && metadata) {
+                    // WSL: distroName or just wsl
+                    remoteContext = `wsl:${metadata.distroName || 'wsl'}`;
+                }
+                else if (currentContext.type === 'docker' && metadata) {
+                    // Docker: container id (first 12 chars)
+                    remoteContext = `docker:${metadata.containerId?.substring(0, 12) || 'container'}`;
+                }
+            }
+            // Add cwd and remoteContext to arguments for execute_command tool
+            let toolArgs = args;
+            if (toolName === 'execute_command' && args) {
+                toolArgs = { ...args, cwd: this.cwd, remoteContext };
+            }
+            else if (remoteContext && args) {
+                // For other tools, also add remoteContext if in remote environment
+                toolArgs = { ...args, remoteContext };
+            }
+            else if (remoteContext) {
+                toolArgs = { remoteContext };
+            }
             this.onToolExecutionUpdate({
                 toolName,
                 status,
@@ -922,12 +955,26 @@ Press Enter to continue...
                             const effectiveCwd = currentCtx.type !== 'local'
                                 ? currentCtx.metadata?.workingDirectory || '~'
                                 : this.cwd;
+                            // Build remote context prefix for SSH/Docker/WSL (for path display in UI)
+                            let remoteContext;
+                            if (currentCtx.type !== 'local') {
+                                const metadata = currentCtx.metadata;
+                                if (currentCtx.type === 'ssh' && metadata) {
+                                    remoteContext = `${metadata.username || 'user'}@${metadata.hostname || 'remote'}`;
+                                }
+                                else if (currentCtx.type === 'wsl' && metadata) {
+                                    remoteContext = `wsl:${metadata.distroName || 'wsl'}`;
+                                }
+                                else if (currentCtx.type === 'docker' && metadata) {
+                                    remoteContext = `docker:${metadata.containerId?.substring(0, 12) || 'container'}`;
+                                }
+                            }
                             // Notify UI: tool is executing (send before execution starts)
                             if (this.onToolExecutionUpdate) {
-                                // Add cwd to arguments for execute_command tool
+                                // Add cwd to arguments for execute_command tool, and remoteContext for all tools
                                 const toolArgs = toolCall.name === 'execute_command'
-                                    ? { ...toolCall.arguments, cwd: effectiveCwd }
-                                    : toolCall.arguments;
+                                    ? { ...toolCall.arguments, cwd: effectiveCwd, remoteContext }
+                                    : { ...toolCall.arguments, remoteContext };
                                 this.onToolExecutionUpdate({
                                     toolName: toolCall.name,
                                     status: 'executing',
@@ -943,10 +990,10 @@ Press Enter to continue...
                                 conversationLogger.logToolResult(toolCall.name, toolCall.id, result.result, true);
                                 // Notify UI: tool succeeded (send full result to UI)
                                 if (this.onToolExecutionUpdate) {
-                                    // Add cwd to arguments for execute_command tool
+                                    // Add cwd to arguments for execute_command tool, and remoteContext for all tools
                                     const toolArgs = toolCall.name === 'execute_command'
-                                        ? { ...toolCall.arguments, cwd: effectiveCwd }
-                                        : toolCall.arguments;
+                                        ? { ...toolCall.arguments, cwd: effectiveCwd, remoteContext }
+                                        : { ...toolCall.arguments, remoteContext };
                                     this.onToolExecutionUpdate({
                                         toolName: toolCall.name,
                                         status: 'completed',
@@ -982,10 +1029,10 @@ Press Enter to continue...
                                 }
                                 // Notify UI: tool failed
                                 if (this.onToolExecutionUpdate) {
-                                    // Add cwd to arguments for execute_command tool
+                                    // Add cwd to arguments for execute_command tool, and remoteContext for all tools
                                     const toolArgs = toolCall.name === 'execute_command'
-                                        ? { ...toolCall.arguments, cwd: effectiveCwd }
-                                        : toolCall.arguments;
+                                        ? { ...toolCall.arguments, cwd: effectiveCwd, remoteContext }
+                                        : { ...toolCall.arguments, remoteContext };
                                     this.onToolExecutionUpdate({
                                         toolName: toolCall.name,
                                         status: 'error',
@@ -1011,12 +1058,27 @@ Press Enter to continue...
                             if (error.message && error.message.includes('Operation cancelled by user')) {
                                 userCancelledOperation = true;
                             }
+                            // Build remote context for error notification
+                            const catchCtx = this.contextManager.getCurrentContext();
+                            let catchRemoteContext;
+                            if (catchCtx.type !== 'local') {
+                                const metadata = catchCtx.metadata;
+                                if (catchCtx.type === 'ssh' && metadata) {
+                                    catchRemoteContext = `${metadata.username || 'user'}@${metadata.hostname || 'remote'}`;
+                                }
+                                else if (catchCtx.type === 'wsl' && metadata) {
+                                    catchRemoteContext = `wsl:${metadata.distroName || 'wsl'}`;
+                                }
+                                else if (catchCtx.type === 'docker' && metadata) {
+                                    catchRemoteContext = `docker:${metadata.containerId?.substring(0, 12) || 'container'}`;
+                                }
+                            }
                             // Notify UI: tool failed
                             if (this.onToolExecutionUpdate) {
-                                // Add cwd to arguments for execute_command tool
+                                // Add cwd to arguments for execute_command tool, and remoteContext for all tools
                                 const toolArgs = toolCall.name === 'execute_command'
-                                    ? { ...toolCall.arguments, cwd: this.cwd }
-                                    : toolCall.arguments;
+                                    ? { ...toolCall.arguments, cwd: this.cwd, remoteContext: catchRemoteContext }
+                                    : { ...toolCall.arguments, remoteContext: catchRemoteContext };
                                 this.onToolExecutionUpdate({
                                     toolName: toolCall.name,
                                     status: 'error',
@@ -1913,9 +1975,34 @@ Once the user approves the plan:
             // Detect subshell commands
             const detection = this.commandDetector.detect(command);
             if (detection) {
-                // Show connecting message
-                if (this.onResponseCallback) {
-                    this.onResponseCallback(`🔄 Connecting to ${detection.handler.type} environment...`);
+                // Build connection string for display (e.g., "rohan@localhost" for SSH)
+                let connectionString = '';
+                if (detection.handler.type === 'ssh') {
+                    // Parse SSH command to get user@host
+                    const sshMatch = command.match(/ssh\s+(?:(?:-\w+\s+)+)?(?:(\S+)@)?(\S+)/);
+                    if (sshMatch) {
+                        const user = sshMatch[1] || 'user';
+                        const host = sshMatch[2] || 'remote';
+                        connectionString = `${user}@${host}`;
+                    }
+                }
+                else if (detection.handler.type === 'wsl') {
+                    // Parse WSL command to get distribution name
+                    const wslMatch = command.match(/wsl(?:\s+(?:-d|--distribution)\s+(\S+))?/);
+                    connectionString = wslMatch?.[1] || 'Ubuntu';
+                }
+                else if (detection.handler.type === 'docker') {
+                    // Parse Docker command to get container
+                    const dockerMatch = command.match(/docker\s+exec\s+(?:(?:-\w+\s+)+)?(\S+)/);
+                    connectionString = dockerMatch?.[1]?.substring(0, 12) || 'container';
+                }
+                // Show connecting message with spinner (dynamic)
+                if (this.onConnectionStatusUpdate) {
+                    this.onConnectionStatusUpdate({
+                        type: detection.handler.type,
+                        status: 'connecting',
+                        connectionString
+                    });
                 }
                 // Update connection state
                 this.contextManager.updateConnectionState('connecting');
@@ -1923,19 +2010,26 @@ Once the user approves the plan:
                     // Connect to subshell
                     const context = await detection.handler.connect(command, this.cwd);
                     this.contextManager.pushContext(context);
-                    // Show success message
-                    if (this.onResponseCallback) {
-                        const breadcrumbs = detection.handler.getBreadcrumbs();
-                        const breadcrumbText = breadcrumbs.map(b => `${b.label}${b.value ? `: ${b.value}` : ''}`).join(' ');
-                        this.onResponseCallback(`✅ Connected to ${detection.handler.type} environment [${breadcrumbText}]`);
+                    // Show success message (replaces the spinner with static message)
+                    if (this.onConnectionStatusUpdate) {
+                        this.onConnectionStatusUpdate({
+                            type: detection.handler.type,
+                            status: 'connected',
+                            connectionString
+                        });
                     }
                     return;
                 }
                 catch (error) {
                     // Connection failed
                     this.contextManager.updateConnectionState('error');
-                    if (this.onResponseCallback) {
-                        this.onResponseCallback(`❌ Failed to connect: ${error.message}`);
+                    if (this.onConnectionStatusUpdate) {
+                        this.onConnectionStatusUpdate({
+                            type: detection.handler.type,
+                            status: 'error',
+                            connectionString,
+                            error: error.message
+                        });
                     }
                     return;
                 }
@@ -1987,12 +2081,26 @@ Once the user approves the plan:
             const effectiveCwd = currentContext.type !== 'local'
                 ? currentContext.metadata?.workingDirectory || '~'
                 : this.cwd;
+            // Build remote context prefix for SSH/Docker/WSL (for path display in UI)
+            let remoteContext;
+            if (currentContext.type !== 'local') {
+                const metadata = currentContext.metadata;
+                if (currentContext.type === 'ssh' && metadata) {
+                    remoteContext = `${metadata.username || 'user'}@${metadata.hostname || 'remote'}`;
+                }
+                else if (currentContext.type === 'wsl' && metadata) {
+                    remoteContext = `wsl:${metadata.distroName || 'wsl'}`;
+                }
+                else if (currentContext.type === 'docker' && metadata) {
+                    remoteContext = `docker:${metadata.containerId?.substring(0, 12) || 'container'}`;
+                }
+            }
             // Notify UI that command is executing
             if (this.onToolExecutionUpdate) {
                 this.onToolExecutionUpdate({
                     toolName: 'execute_command',
                     status: 'executing',
-                    arguments: { command, cwd: effectiveCwd, isPty: shellUtils.isPtyAvailable() }
+                    arguments: { command, cwd: effectiveCwd, isPty: shellUtils.isPtyAvailable(), remoteContext }
                 });
             }
             // Execute with streaming support for local commands
@@ -2015,7 +2123,7 @@ Once the user approves the plan:
                                     status: 'error',
                                     result: output,
                                     error: `Exit Code: ${exitCode}`,
-                                    arguments: { command, cwd: this.cwd }
+                                    arguments: { command, cwd: this.cwd, remoteContext }
                                 });
                             }
                             else {
@@ -2023,7 +2131,7 @@ Once the user approves the plan:
                                     toolName: 'execute_command',
                                     status: 'completed',
                                     result: output || 'Command executed successfully',
-                                    arguments: { command, cwd: this.cwd }
+                                    arguments: { command, cwd: this.cwd, remoteContext }
                                 });
                             }
                         }
@@ -2053,7 +2161,7 @@ Once the user approves the plan:
                                     status: 'error',
                                     result: output,
                                     error: `Exit Code: ${exitCode}`,
-                                    arguments: { command, cwd: remoteCwd }
+                                    arguments: { command, cwd: remoteCwd, remoteContext }
                                 });
                             }
                             else {
@@ -2061,7 +2169,7 @@ Once the user approves the plan:
                                     toolName: 'execute_command',
                                     status: 'completed',
                                     result: output || 'Command executed successfully',
-                                    arguments: { command, cwd: remoteCwd }
+                                    arguments: { command, cwd: remoteCwd, remoteContext }
                                 });
                             }
                         }
@@ -2104,7 +2212,7 @@ Once the user approves the plan:
                                     status: 'error',
                                     result: output,
                                     error: `Exit Code: ${exitCode}`,
-                                    arguments: { command, cwd: remoteCwd }
+                                    arguments: { command, cwd: remoteCwd, remoteContext }
                                 });
                             }
                             else {
@@ -2112,7 +2220,7 @@ Once the user approves the plan:
                                     toolName: 'execute_command',
                                     status: 'completed',
                                     result: output || 'Command executed successfully',
-                                    arguments: { command, cwd: remoteCwd }
+                                    arguments: { command, cwd: remoteCwd, remoteContext }
                                 });
                             }
                         }
@@ -2158,7 +2266,7 @@ Once the user approves the plan:
                                     status: 'error',
                                     result: output,
                                     error: `Exit Code: ${exitCode}`,
-                                    arguments: { command, cwd: remoteCwd }
+                                    arguments: { command, cwd: remoteCwd, remoteContext }
                                 });
                             }
                             else {
@@ -2166,7 +2274,7 @@ Once the user approves the plan:
                                     toolName: 'execute_command',
                                     status: 'completed',
                                     result: output || 'Command executed successfully',
-                                    arguments: { command, cwd: remoteCwd }
+                                    arguments: { command, cwd: remoteCwd, remoteContext }
                                 });
                             }
                         }