tabby-mcp-server 1.0.3 → 1.0.4

package/README.md

@@ -12,7 +12,7 @@
 
 **A Comprehensive MCP Server Plugin for Tabby Terminal**
 
-*Connect AI assistants to your terminal with full control capabilities — 18 MCP tools included*
+*Connect AI assistants to your terminal with full control capabilities — 21 MCP tools included*
 
 [English](README.md) | [中文](README_CN.md)
 
@@ -28,9 +28,9 @@
 
 ### 🖥️ Terminal Control
 - Execute commands with output capture
+- Send interactive input (vim, less, top)
 - Read terminal buffer content
-- Abort running commands
-- List all terminal sessions
+- Abort/monitor running commands
 
 </td>
 <td width="50%">
@@ -211,14 +211,16 @@ For clients that don't support SSE, use the STDIO bridge:
 
 ## 🛠️ Available Tools
 
-### Terminal Control (4)
+### Terminal Control (6)
 
 | Tool | Description |
 |------|-------------|
 | `get_session_list` | List all terminal sessions |
 | `exec_command` | Execute command with output |
+| `send_input` | Send interactive input (Ctrl+C, etc) |
 | `get_terminal_buffer` | Read terminal buffer |
 | `abort_command` | Abort running command |
+| `get_command_status` | Monitor active commands |
 
 ### Tab Management (10)
 

package/dist/index.js

@@ -17453,6 +17453,8 @@ const core_1 = __webpack_require__(9430);
 const tabby_core_1 = __webpack_require__(1368);
 const mcpService_1 = __webpack_require__(7554);
 const mcpLogger_service_1 = __webpack_require__(9924);
+// Version from package.json - update on each release
+const PLUGIN_VERSION = '1.0.4';
 /**
  * MCP Settings Tab Component
  */
@@ -17461,6 +17463,19 @@ let McpSettingsTabComponent = class McpSettingsTabComponent {
         this.config = config;
         this.mcpService = mcpService;
         this.logger = logger;
+        this.version = PLUGIN_VERSION;
+        this.saveMessage = '';
+    }
+    ngOnInit() {
+        // Ensure timing config exists
+        if (!this.config.store.mcp.timing) {
+            this.config.store.mcp.timing = {
+                pollInterval: 100,
+                initialDelay: 0,
+                sessionStableChecks: 5,
+                sessionPollInterval: 200
+            };
+        }
     }
     get isRunning() {
         return this.mcpService.isServerRunning();
@@ -17484,9 +17499,28 @@ let McpSettingsTabComponent = class McpSettingsTabComponent {
         console.log('MCP Logs:', logs);
         alert('Logs have been printed to the console (Cmd+Option+I)');
     }
+    exportLogsToFile() {
+        const logs = this.logger.exportLogs();
+        const json = JSON.stringify(logs, null, 2);
+        const blob = new Blob([json], { type: 'application/json' });
+        const url = URL.createObjectURL(blob);
+        const a = document.createElement('a');
+        a.href = url;
+        a.download = `mcp-logs-${new Date().toISOString().slice(0, 10)}.json`;
+        document.body.appendChild(a);
+        a.click();
+        document.body.removeChild(a);
+        URL.revokeObjectURL(url);
+        this.logger.info('Logs exported to JSON file');
+    }
     clearLogs() {
         this.logger.clearLogs();
     }
+    saveConfig() {
+        this.config.save();
+        this.saveMessage = '✓ Settings saved';
+        setTimeout(() => { this.saveMessage = ''; }, 2000);
+    }
     getConfigExample() {
         return JSON.stringify({
             mcpServers: {
@@ -17508,7 +17542,10 @@ exports.McpSettingsTabComponent = McpSettingsTabComponent = __decorate([
         selector: 'mcp-settings-tab',
         template: `
     <div class="mcp-settings">
-      <h3>🔌 MCP Server Settings</h3>
+      <div class="header-row">
+        <h3>🔌 MCP Server Settings</h3>
+        <span class="version-badge">v{{ version }}</span>
+      </div>
       
       <div class="form-group">
         <label>Server Status</label>
@@ -17534,14 +17571,14 @@ exports.McpSettingsTabComponent = McpSettingsTabComponent = __decorate([
       <div class="form-group">
         <label>Port</label>
         <input type="number" class="form-control" [(ngModel)]="config.store.mcp.port" 
-               placeholder="3001" min="1024" max="65535">
+               placeholder="3001" min="1024" max="65535" (change)="saveConfig()">
         <small class="form-text text-muted">MCP server port (default: 3001)</small>
       </div>
 
       <div class="form-group">
         <div class="checkbox">
           <label>
-            <input type="checkbox" [(ngModel)]="config.store.mcp.startOnBoot">
+            <input type="checkbox" [(ngModel)]="config.store.mcp.startOnBoot" (change)="saveConfig()">
             Start server on Tabby launch
           </label>
         </div>
@@ -17554,7 +17591,7 @@ exports.McpSettingsTabComponent = McpSettingsTabComponent = __decorate([
       <div class="form-group">
         <div class="checkbox">
           <label>
-            <input type="checkbox" [(ngModel)]="config.store.mcp.enableLogging">
+            <input type="checkbox" [(ngModel)]="config.store.mcp.enableLogging" (change)="saveConfig()">
             Enable logging
           </label>
         </div>
@@ -17562,7 +17599,7 @@ exports.McpSettingsTabComponent = McpSettingsTabComponent = __decorate([
 
       <div class="form-group" *ngIf="config.store.mcp.enableLogging">
         <label>Log Level</label>
-        <select class="form-control" [(ngModel)]="config.store.mcp.logLevel">
+        <select class="form-control" [(ngModel)]="config.store.mcp.logLevel" (change)="saveConfig()">
           <option value="debug">Debug</option>
           <option value="info">Info</option>
           <option value="warn">Warning</option>
@@ -17572,6 +17609,7 @@ exports.McpSettingsTabComponent = McpSettingsTabComponent = __decorate([
 
       <div class="form-group" *ngIf="config.store.mcp.enableLogging">
         <button class="btn btn-sm btn-secondary" (click)="viewLogs()">View Logs</button>
+        <button class="btn btn-sm btn-outline-secondary ml-2" (click)="exportLogsToFile()">Export JSON</button>
         <button class="btn btn-sm btn-outline-secondary ml-2" (click)="clearLogs()">Clear Logs</button>
       </div>
 
@@ -17582,7 +17620,7 @@ exports.McpSettingsTabComponent = McpSettingsTabComponent = __decorate([
       <div class="form-group">
         <div class="checkbox">
           <label>
-            <input type="checkbox" [(ngModel)]="config.store.mcp.pairProgrammingMode.enabled">
+            <input type="checkbox" [(ngModel)]="config.store.mcp.pairProgrammingMode.enabled" (change)="saveConfig()">
             Enable Pair Programming Mode
           </label>
         </div>
@@ -17594,7 +17632,7 @@ exports.McpSettingsTabComponent = McpSettingsTabComponent = __decorate([
       <div class="form-group" *ngIf="config.store.mcp.pairProgrammingMode.enabled">
         <div class="checkbox">
           <label>
-            <input type="checkbox" [(ngModel)]="config.store.mcp.pairProgrammingMode.showConfirmationDialog">
+            <input type="checkbox" [(ngModel)]="config.store.mcp.pairProgrammingMode.showConfirmationDialog" (change)="saveConfig()">
             Show confirmation dialog
           </label>
         </div>
@@ -17603,7 +17641,7 @@ exports.McpSettingsTabComponent = McpSettingsTabComponent = __decorate([
       <div class="form-group" *ngIf="config.store.mcp.pairProgrammingMode.enabled">
         <div class="checkbox">
           <label>
-            <input type="checkbox" [(ngModel)]="config.store.mcp.pairProgrammingMode.autoFocusTerminal">
+            <input type="checkbox" [(ngModel)]="config.store.mcp.pairProgrammingMode.autoFocusTerminal" (change)="saveConfig()">
             Auto-focus terminal on command execution
           </label>
         </div>
@@ -17611,6 +17649,41 @@ exports.McpSettingsTabComponent = McpSettingsTabComponent = __decorate([
 
       <hr />
 
+      <h4>⏱️ Timing Settings</h4>
+      <small class="form-text text-muted mb-2">
+        Advanced timing configuration for command execution and session detection
+      </small>
+
+      <div class="form-group">
+        <label>Poll Interval (ms)</label>
+        <input type="number" class="form-control" [(ngModel)]="config.store.mcp.timing.pollInterval" 
+               placeholder="100" min="50" max="1000" (change)="saveConfig()">
+        <small class="form-text text-muted">How often to check for command output (default: 100)</small>
+      </div>
+
+      <div class="form-group">
+        <label>Initial Delay (ms)</label>
+        <input type="number" class="form-control" [(ngModel)]="config.store.mcp.timing.initialDelay" 
+               placeholder="0" min="0" max="5000" (change)="saveConfig()">
+        <small class="form-text text-muted">Delay before polling starts (default: 0)</small>
+      </div>
+
+      <div class="form-group">
+        <label>Session Stable Checks</label>
+        <input type="number" class="form-control" [(ngModel)]="config.store.mcp.timing.sessionStableChecks" 
+               placeholder="5" min="1" max="20" (change)="saveConfig()">
+        <small class="form-text text-muted">Number of stable checks for session ready detection (default: 5)</small>
+      </div>
+
+      <div class="form-group">
+        <label>Session Poll Interval (ms)</label>
+        <input type="number" class="form-control" [(ngModel)]="config.store.mcp.timing.sessionPollInterval" 
+               placeholder="200" min="100" max="2000" (change)="saveConfig()">
+        <small class="form-text text-muted">Interval for session ready polling (default: 200)</small>
+      </div>
+
+      <hr />
+
       <h4>🔗 Connection Info</h4>
       <div class="connection-info">
         <p><strong>SSE Endpoint:</strong> <code>http://localhost:{{ config.store.mcp.port }}/sse</code></p>
@@ -17622,12 +17695,29 @@ exports.McpSettingsTabComponent = McpSettingsTabComponent = __decorate([
           <button class="btn btn-sm btn-outline-primary" (click)="copyConfig()">Copy Config</button>
         </div>
       </div>
+
+      <div class="save-status mt-3" *ngIf="saveMessage">
+        <span class="text-success">{{ saveMessage }}</span>
+      </div>
     </div>
   `,
         styles: [`
     .mcp-settings {
       padding: 1rem;
     }
+    .header-row {
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+    }
+    .version-badge {
+      background: rgba(0, 123, 255, 0.2);
+      color: #007bff;
+      padding: 0.25rem 0.5rem;
+      border-radius: 4px;
+      font-size: 0.85em;
+      font-weight: bold;
+    }
     .status-container {
       display: flex;
       align-items: center;
@@ -17662,6 +17752,18 @@ exports.McpSettingsTabComponent = McpSettingsTabComponent = __decorate([
       font-size: 0.85em;
       overflow-x: auto;
     }
+    .ml-2 {
+      margin-left: 0.5rem;
+    }
+    .mb-2 {
+      margin-bottom: 0.5rem;
+      display: block;
+    }
+    .save-status {
+      padding: 0.5rem;
+      background: rgba(40, 167, 69, 0.1);
+      border-radius: 4px;
+    }
   `]
     }),
     __metadata("design:paramtypes", [tabby_core_1.ConfigService,
@@ -24861,45 +24963,73 @@ Special keys: \\x03 (Ctrl+C), \\x04 (Ctrl+D), \\x1b (Escape), \\r (Enter)`,
     }
     /**
      * Wait for command output between markers
+     * Timing is configurable via Settings → MCP → Timing
      */
     async waitForCommandOutput(session, startMarker, endMarker, timeout, isAborted) {
         const startTime = Date.now();
         let lastBufferLength = 0;
-        let noChangeCount = 0;
+        let stableCount = 0;
+        // Get timing config (with fallback defaults)
+        const timing = this.config.store.mcp?.timing || {};
+        const pollInterval = timing.pollInterval ?? 100;
+        const initialDelay = timing.initialDelay ?? 0;
+        // Optional initial delay (configurable, default 0)
+        if (initialDelay > 0) {
+            await new Promise(resolve => setTimeout(resolve, initialDelay));
+        }
         while (Date.now() - startTime < timeout) {
             if (isAborted()) {
                 return { success: false, output: '', error: 'Command aborted' };
             }
             const buffer = this.getTerminalBufferText(session);
-            // Check for markers
-            const startIndex = buffer.lastIndexOf(startMarker);
-            const endIndex = buffer.lastIndexOf(endMarker);
-            if (startIndex !== -1 && endIndex !== -1 && endIndex > startIndex) {
-                const output = buffer.substring(startIndex + startMarker.length, endIndex).trim();
-                // Extract exit code from end marker
-                const exitCodeMatch = buffer.substring(endIndex).match(new RegExp(`${endMarker}\\s*(\\d+)`));
-                const exitCode = exitCodeMatch ? parseInt(exitCodeMatch[1], 10) : 0;
-                return {
-                    success: exitCode === 0,
-                    output,
-                    exitCode
-                };
+            // Look for end marker with exit code pattern (complete marker)
+            // End marker format: __MCP_END_<timestamp>__ <exit_code>
+            const endPattern = new RegExp(`${endMarker}\\s+(\\d+)`, 'm');
+            const endMatch = buffer.match(endPattern);
+            if (endMatch) {
+                // Found complete end marker with exit code
+                const endIndex = buffer.indexOf(endMatch[0]);
+                const startIndex = buffer.lastIndexOf(startMarker, endIndex);
+                if (startIndex !== -1 && startIndex < endIndex) {
+                    // Extract output between markers
+                    let output = buffer.substring(startIndex + startMarker.length, endIndex).trim();
+                    // Remove command echo (first line often contains the wrapped command)
+                    // Look for the start marker echo line and skip it
+                    const lines = output.split('\n');
+                    if (lines.length > 0 && lines[0].includes(startMarker.slice(0, 10))) {
+                        lines.shift();
+                        output = lines.join('\n').trim();
+                    }
+                    const exitCode = parseInt(endMatch[1], 10);
+                    return {
+                        success: exitCode === 0,
+                        output,
+                        exitCode
+                    };
+                }
             }
-            // Track if buffer is changing (to detect stuck commands)
+            // Track buffer stability (helps detect when output is complete)
             if (buffer.length === lastBufferLength) {
-                noChangeCount++;
+                stableCount++;
             }
             else {
-                noChangeCount = 0;
+                stableCount = 0;
                 lastBufferLength = buffer.length;
             }
-            await new Promise(resolve => setTimeout(resolve, 100));
+            // Wait between checks (configurable via Settings → MCP → Timing)
+            await new Promise(resolve => setTimeout(resolve, pollInterval));
         }
         // On timeout, return partial output if start marker found
         const buffer = this.getTerminalBufferText(session);
         const startIndex = buffer.lastIndexOf(startMarker);
         if (startIndex !== -1) {
-            const partialOutput = buffer.substring(startIndex + startMarker.length).trim();
+            let partialOutput = buffer.substring(startIndex + startMarker.length).trim();
+            // Clean up command echo
+            const lines = partialOutput.split('\n');
+            if (lines.length > 0 && lines[0].includes('&&')) {
+                lines.shift();
+                partialOutput = lines.join('\n').trim();
+            }
             return {
                 success: false,
                 output: partialOutput,
@@ -27665,16 +27795,58 @@ Set waitForReady=false (default) for immediate return - use get_session_list to
                     if (tab) {
                         const tabIndex = this.app.tabs.indexOf(tab);
                         if (waitForReady) {
-                            // Wait for the terminal to be ready
+                            // Wait for the terminal session to be fully connected
+                            // Timing is configurable via Settings → MCP → Timing
+                            const timing = this.config.store.mcp?.timing || {};
+                            const sessionPollInterval = timing.sessionPollInterval ?? 200;
+                            const sessionStableChecks = timing.sessionStableChecks ?? 5;
                             const startTime = Date.now();
                             let ready = false;
+                            let lastBufferLength = 0;
+                            let stableCount = 0;
                             while (Date.now() - startTime < timeout) {
-                                // Check if terminal frontend is available
-                                if (tab.frontend && tab.sessionReady !== false) {
+                                const tabAny = tab;
+                                // Check multiple indicators of connection readiness:
+                                // 1. frontend exists (terminal rendered)
+                                // 2. session exists and is open
+                                // 3. sessionReady is explicitly true
+                                // 4. buffer has content (indicates activity)
+                                const hasSession = tabAny.session !== undefined;
+                                const sessionOpen = tabAny.session?.open === true;
+                                const frontendReady = tabAny.frontend !== undefined;
+                                const sessionReady = tabAny.sessionReady === true;
+                                // Also check if terminal buffer has content (indicates connection activity)
+                                let bufferLength = 0;
+                                try {
+                                    const xterm = tabAny.frontend?.xterm;
+                                    if (xterm?.buffer?.active) {
+                                        bufferLength = xterm.buffer.active.length;
+                                    }
+                                }
+                                catch (e) {
+                                    // Ignore buffer access errors
+                                }
+                                // Consider ready if:
+                                // - Session is open, OR
+                                // - Frontend is ready AND sessionReady is true, OR
+                                // - Terminal buffer has stabilized with content
+                                if (sessionOpen || (frontendReady && sessionReady)) {
                                     ready = true;
                                     break;
                                 }
-                                await new Promise(resolve => setTimeout(resolve, 200));
+                                // Check for buffer stability (activity settled)
+                                if (bufferLength > 0 && bufferLength === lastBufferLength) {
+                                    stableCount++;
+                                    if (stableCount >= sessionStableChecks) {
+                                        ready = true;
+                                        break;
+                                    }
+                                }
+                                else {
+                                    stableCount = 0;
+                                    lastBufferLength = bufferLength;
+                                }
+                                await new Promise(resolve => setTimeout(resolve, sessionPollInterval));
                             }
                             this.logger.info(`Opened profile: ${profile.name} (ready: ${ready})`);
                             return {
@@ -59734,6 +59906,13 @@ let McpConfigProvider = class McpConfigProvider extends tabby_core_1.ConfigProvi
                     enabled: true,
                     showConfirmationDialog: true,
                     autoFocusTerminal: true
+                },
+                // Timing configuration (in milliseconds)
+                timing: {
+                    pollInterval: 100, // How often to check for command output
+                    initialDelay: 0, // Delay before starting to poll (0 = no delay)
+                    sessionStableChecks: 5, // Number of stable checks for session ready detection
+                    sessionPollInterval: 200 // Interval for session ready polling
                 }
             }
         };