vscode-terminal-mcp 0.1.3 → 0.1.5

package/dist/extension.js

@@ -5389,6 +5389,13 @@ var zodToJsonSchema = (schema, options) => {
 };
 
 // src/mcp/tools/schemas.ts
+var coerceBoolean = external_exports.preprocess(
+  (val) => {
+    if (typeof val === "string") return val.toLowerCase() === "true";
+    return val;
+  },
+  external_exports.boolean()
+);
 var terminalCreateSchema = external_exports.object({
   name: external_exports.string().min(1).describe("Display name for the terminal tab"),
   cwd: external_exports.string().optional().describe("Working directory for the terminal"),
@@ -5400,7 +5407,7 @@ var terminalExecuteSchema = external_exports.object({
   sessionId: external_exports.string().min(1).describe("Session ID of the target terminal"),
   command: external_exports.string().min(1).describe("Command to execute"),
   timeoutMs: external_exports.coerce.number().min(1e3).max(3e5).optional().default(3e4).describe("Timeout in milliseconds (default: 30000, max: 300000)"),
-  waitForCompletion: external_exports.coerce.boolean().optional().default(true).describe("Wait for command to complete before returning (default: true)")
+  waitForCompletion: coerceBoolean.optional().default(true).describe("Wait for command to complete before returning (default: true)")
 });
 var terminalReadOutputSchema = external_exports.object({
   sessionId: external_exports.string().min(1).describe("Session ID of the target terminal"),
@@ -5421,7 +5428,7 @@ var terminalRunSchema = external_exports.object({
   shell: external_exports.string().optional().describe("Override shell (e.g., /bin/zsh, /bin/bash)"),
   agentId: external_exports.string().optional().describe("Identifier for the owning agent/subagent"),
   timeoutMs: external_exports.coerce.number().min(1e3).max(3e5).optional().default(3e4).describe("Timeout in milliseconds (default: 30000, max: 300000)"),
-  waitForCompletion: external_exports.coerce.boolean().optional().default(true).describe("Wait for command to complete before returning (default: true)")
+  waitForCompletion: coerceBoolean.optional().default(true).describe("Wait for command to complete before returning (default: true)")
 });
 var terminalSendInputSchema = external_exports.object({
   sessionId: external_exports.string().min(1).describe("Session ID of the target terminal"),
@@ -5518,11 +5525,12 @@ async function handleTerminalExecute(params, sessionManager2) {
 async function handleTerminalRun(params, sessionManager2) {
   const input = terminalRunSchema.parse(params);
   let sessionId;
+  let isNewSession = false;
   const existing = sessionManager2.listSessions(input.agentId);
   for (const s of existing) {
     if (!s.isActive || input.cwd && s.cwd !== input.cwd) continue;
-    const session2 = sessionManager2.getSession(s.sessionId);
-    if (session2 && !session2.isBusy) {
+    const session = sessionManager2.getSession(s.sessionId);
+    if (session && !session.isBusy) {
       sessionId = s.sessionId;
       break;
     }
@@ -5536,44 +5544,43 @@ async function handleTerminalRun(params, sessionManager2) {
       agentId: input.agentId
     });
     sessionId = sessionInfo.sessionId;
+    isNewSession = true;
+  }
+  if (isNewSession) {
+    return new Promise((resolve) => {
+      setTimeout(async () => {
+        const result = await executeCommand(sessionId, input, sessionManager2);
+        resolve(result);
+      }, 500);
+    });
   }
+  return executeCommand(sessionId, input, sessionManager2);
+}
+async function executeCommand(sessionId, input, sessionManager2) {
   const session = sessionManager2.getSession(sessionId);
   if (!session) {
     return {
-      content: [
-        {
-          type: "text",
-          text: "Error: Failed to get terminal session."
-        }
-      ],
+      content: [{ type: "text", text: "Error: Failed to get terminal session." }],
       isError: true
     };
   }
   const validation = sessionManager2.validateCommand(input.command);
   if (!validation.valid) {
     return {
-      content: [
-        {
-          type: "text",
-          text: `Command blocked: ${validation.reason}`
-        }
-      ],
+      content: [{ type: "text", text: `Command blocked: ${validation.reason}` }],
       isError: true
     };
   }
   const timeoutMs = input.timeoutMs ?? sessionManager2.getDefaultTimeout();
   const waitForCompletion = input.waitForCompletion ?? true;
-  const result = await session.execute(
-    input.command,
-    timeoutMs,
-    waitForCompletion
-  );
-  const cleanOutput = result.output.replace(/\x1b\[[0-9;]*[a-zA-Z]/g, "").replace(/\x1b\][^\x07]*\x07/g, "").replace(/\r\n/g, "\n").replace(/\r/g, "").trim();
-  const statusParts = [
-    `exit: ${result.exitCode ?? "n/a"}`,
-    `${result.durationMs}ms`,
-    sessionId
-  ];
+  const result = await session.execute(input.command, timeoutMs, waitForCompletion);
+  let cleanOutput = result.output.replace(/\x1b\[[0-9;]*[a-zA-Z]/g, "").replace(/\x1b\][^\x07]*\x07/g, "").replace(/\r\n/g, "\n").replace(/\r/g, "").trim();
+  const lines = cleanOutput.split("\n");
+  if (lines.length > 0 && lines[0].trim() === input.command.trim()) {
+    lines.shift();
+    cleanOutput = lines.join("\n").trim();
+  }
+  const statusParts = [`exit: ${result.exitCode ?? "n/a"}`, `${result.durationMs}ms`, sessionId];
   let text = `$ ${input.command}
 ${cleanOutput}
 
@@ -5583,12 +5590,7 @@ ${cleanOutput}
 [TIMED OUT after ${timeoutMs}ms - session still active, use read to get more output]`;
   }
   return {
-    content: [
-      {
-        type: "text",
-        text
-      }
-    ],
+    content: [{ type: "text", text }],
     isError: result.exitCode !== null && result.exitCode !== 0
   };
 }
@@ -5609,23 +5611,20 @@ async function handleTerminalReadOutput(params, sessionManager2) {
     };
   }
   const result = session.readOutput(input.offset, input.lines);
+  const cleanOutput = result.lines.join("\n").replace(/\x1b\[[0-9;]*[a-zA-Z]/g, "").replace(/\x1b\][^\x07]*\x07/g, "").replace(/\r\n/g, "\n").replace(/\r/g, "").trim();
+  const status = [
+    `lines: ${result.readFrom}-${result.readFrom + result.readCount}/${result.totalLines}`,
+    `remaining: ${result.remaining}`,
+    input.sessionId
+  ];
+  const text = `${cleanOutput}
+
+[${status.join(" | ")}]`;
   return {
     content: [
       {
         type: "text",
-        text: JSON.stringify(
-          {
-            sessionId: input.sessionId,
-            readFrom: result.readFrom,
-            readCount: result.readCount,
-            totalLines: result.totalLines,
-            remaining: result.remaining,
-            isComplete: result.isComplete,
-            output: result.lines.join("\n")
-          },
-          null,
-          2
-        )
+        text
       }
     ]
   };
@@ -5943,7 +5942,6 @@ var TerminalSession = class {
   isActive = true;
   lastCommandAt;
   shellReady;
-  resolveShellReady;
   constructor(config, maxOutputLines) {
     this.sessionId = generateSessionId();
     this.name = config.name;
@@ -5959,27 +5957,12 @@ var TerminalSession = class {
     if (config.shell) {
       terminalOptions.shellPath = config.shell;
     }
-    this.shellReady = new Promise((resolve) => {
-      this.resolveShellReady = resolve;
-    });
     this.terminal = vscode2.window.createTerminal(terminalOptions);
     this.terminal.show(true);
+    this.shellReady = new Promise((resolve) => {
+      resolve();
+    });
     this.setupShellIntegrationCapture();
-    if (vscode2.window.onDidChangeTerminalShellIntegration) {
-      const disposable = vscode2.window.onDidChangeTerminalShellIntegration((e) => {
-        if (e.terminal === this.terminal) {
-          disposable.dispose();
-          log(`Shell integration ready for session ${this.sessionId}`);
-          this.resolveShellReady();
-        }
-      });
-      setTimeout(() => {
-        disposable.dispose();
-        this.resolveShellReady();
-      }, 3e3);
-    } else {
-      setTimeout(() => this.resolveShellReady(), 1500);
-    }
     log(`Session ${this.sessionId} created: ${config.name} (cwd: ${this.cwd})`);
   }
   setupShellIntegrationCapture() {
@@ -6011,6 +5994,7 @@ var TerminalSession = class {
             this.commandHistory.push(this.currentCommand);
             this.currentCommand = null;
           }
+          this.lastCommandAt = Date.now();
           log(
             `Shell execution ended in session ${this.sessionId} with exit code: ${event.exitCode}`
           );
@@ -6018,11 +6002,10 @@ var TerminalSession = class {
       }
     }
   }
-  /**
-   * Execute a command in this terminal session.
-   */
   async execute(command, timeoutMs, waitForCompletion) {
+    log(`Waiting for shell ready in session ${this.sessionId}...`);
     await this.shellReady;
+    log(`Shell ready, executing command in session ${this.sessionId}`);
     const commandId = generateCommandId();
     const startedAt = Date.now();
     this.lastCommandAt = startedAt;
@@ -6109,9 +6092,6 @@ var TerminalSession = class {
       }
     });
   }
-  /**
-   * Send text input to the terminal (for interactive commands).
-   */
   sendInput(input, pressEnter) {
     this.terminal.sendText(input, pressEnter);
     this.lastCommandAt = Date.now();
@@ -6119,21 +6099,12 @@ var TerminalSession = class {
       `Input sent to session ${this.sessionId}: ${input.slice(0, 50)}${input.length > 50 ? "..." : ""}`
     );
   }
-  /**
-   * Read output from the buffer with pagination.
-   */
   readOutput(offset = 0, maxLines = 500) {
     return readFromBuffer(this.outputBuffer, offset, maxLines);
   }
-  /**
-   * Check if a command is currently executing.
-   */
   get isBusy() {
     return this.currentCommand !== null;
   }
-  /**
-   * Get session info for listing.
-   */
   getInfo() {
     return {
       sessionId: this.sessionId,
@@ -6146,23 +6117,14 @@ var TerminalSession = class {
       outputLineCount: getBufferLineCount(this.outputBuffer)
     };
   }
-  /**
-   * Get the VSCode terminal instance (for matching events).
-   */
   getTerminal() {
     return this.terminal;
   }
-  /**
-   * Check if session has been idle longer than the given duration.
-   */
   isIdle(idleThresholdMs) {
     if (idleThresholdMs <= 0) return false;
     const lastActivity = this.lastCommandAt ?? this.createdAt;
     return Date.now() - lastActivity > idleThresholdMs;
   }
-  /**
-   * Close the terminal session.
-   */
   dispose() {
     this.isActive = false;
     this.shellExecutionDisposable?.dispose();
@@ -6178,7 +6140,6 @@ var SessionManager = class {
   onSessionsChanged = this.onSessionsChangedEmitter.event;
   idleReaperInterval = null;
   constructor() {
-    this.startIdleReaper();
     vscode3.window.onDidCloseTerminal((terminal) => {
       for (const [id, session] of this.sessions) {
         if (session.getTerminal() === terminal) {
@@ -6212,6 +6173,7 @@ var SessionManager = class {
       const config = this.getConfig();
       if (config.idleTimeoutMs <= 0) return;
       for (const [id, session] of this.sessions) {
+        if (session.isBusy) continue;
         if (session.isIdle(config.idleTimeoutMs)) {
           log(`Reaping idle session ${id}`);
           session.dispose();

package/package.json

@@ -2,7 +2,7 @@
   "name": "vscode-terminal-mcp",
   "displayName": "Terminal MCP Server",
   "description": "MCP server that provides visible terminal sessions in VSCode for Claude Code and subagents",
-  "version": "0.1.3",
+  "version": "0.1.5",
   "publisher": "sirlordt",
   "license": "MIT",
   "author": "sirlordt",