smart-terminal-mcp 1.2.11 → 1.2.12

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "smart-terminal-mcp",
-  "version": "1.2.11",
+  "version": "1.2.12",
   "description": "MCP PTY server providing AI agents with real interactive terminal access",
   "type": "module",
   "main": "src/index.js",

package/src/command-runner.js

@@ -116,6 +116,9 @@ export async function runCommand({
 
         if (signal) result.signal = signal;
         if (maxOutputExceeded) result.maxOutputExceeded = true;
+        if (successExitCode === null && exitCode !== 0 && exitCode !== null) {
+          result.exitCodeIgnored = true;
+        }
         if (shouldIncludeSuccessChecks({ successExitCode, successFile })) {
           result.checks = checks.details;
         }
@@ -229,6 +232,14 @@ function buildSpawnPlan({ cmd, args, cwd }) {
   }
 
   const resolvedCommand = resolveWindowsCommand(cmd, cwd);
+
+  // When the caller explicitly invokes cmd.exe with /c (e.g. for shell
+  // built-ins like `for /f`), join the trailing args into a single verbatim
+  // command string so cmd.exe interprets them correctly.
+  if (isExplicitCmdExeCall(resolvedCommand ?? cmd, args)) {
+    return buildCmdExePlan(args);
+  }
+
   if (!resolvedCommand || !isWindowsBatchCommand(resolvedCommand)) {
     return {
       command: resolvedCommand ?? cmd,
@@ -244,6 +255,37 @@ function buildSpawnPlan({ cmd, args, cwd }) {
   };
 }
 
+function isExplicitCmdExeCall(resolved, args) {
+  const comSpec = (process.env.ComSpec || 'cmd.exe').toLowerCase();
+  const name = resolved.toLowerCase();
+  if (name !== comSpec && name !== 'cmd' && name !== 'cmd.exe') return false;
+  return args.some((a) => a.toLowerCase() === '/c');
+}
+
+function buildCmdExePlan(args) {
+  const comSpec = process.env.ComSpec || 'cmd.exe';
+
+  // Collect any flags before /c (e.g. /d, /s) and the command body after /c.
+  const prefixFlags = [];
+  let commandBody = '';
+  let foundSlashC = false;
+  for (let i = 0; i < args.length; i++) {
+    if (!foundSlashC && args[i].toLowerCase() === '/c') {
+      foundSlashC = true;
+      // Everything after /c is the shell command – join into one string.
+      commandBody = args.slice(i + 1).join(' ');
+      break;
+    }
+    prefixFlags.push(args[i]);
+  }
+
+  return {
+    command: comSpec,
+    args: [...prefixFlags, '/s', '/c', `"${commandBody}"`],
+    windowsVerbatimArguments: true,
+  };
+}
+
 function resolveWindowsCommand(cmd, cwd) {
   const pathExts = getWindowsPathExtensions();
   if (looksLikePath(cmd)) {

package/src/session-manager.js

@@ -1,8 +1,9 @@
 import { randomUUID } from 'node:crypto';
 import { stat } from 'node:fs/promises';
 import { resolve as resolvePath } from 'node:path';
+import { platform } from 'node:os';
 import { PtySession } from './pty-session.js';
-import { detectShell } from './shell-detector.js';
+import { detectShell, isAvailable } from './shell-detector.js';
 
 const DEFAULT_TTL_MS = 30 * 60 * 1000; // 30 minutes
 const MAX_SESSIONS = 10;
@@ -41,7 +42,7 @@ export class SessionManager {
 
     const resolvedCwd = await resolveSessionCwd(cwd);
     const detected = detectShell();
-    const resolvedShell = shell || detected.shell;
+    const resolvedShell = shell ? resolveUserShell(shell) : detected.shell;
     const shellArgs = shell ? [] : detected.args;
 
     const id = randomUUID().slice(0, 8);
@@ -121,6 +122,32 @@ export class SessionManager {
   }
 }
 
+const WINDOWS_SHELL_EXTENSIONS = ['.exe', '.cmd', '.bat'];
+
+/**
+ * Validate and resolve a user-provided shell name.
+ * On Windows, tries appending common extensions if the bare name isn't found.
+ * @param {string} shell
+ * @returns {string} The resolved shell name
+ */
+function resolveUserShell(shell) {
+  if (isAvailable(shell)) return shell;
+
+  // On Windows, try appending .exe etc. so "pwsh" resolves to "pwsh.exe"
+  if (platform() === 'win32' && !shell.includes('.')) {
+    for (const ext of WINDOWS_SHELL_EXTENSIONS) {
+      const candidate = `${shell}${ext}`;
+      if (isAvailable(candidate)) return candidate;
+    }
+  }
+
+  const detected = detectShell();
+  throw new Error(
+    `Shell "${shell}" not found. The auto-detected shell is "${detected.shell}". ` +
+    'Omit the shell parameter to use auto-detection, or provide the full path to the shell executable.',
+  );
+}
+
 export async function resolveSessionCwd(cwd) {
   const resolvedCwd = resolvePath(cwd ?? process.cwd());
 

package/src/shell-detector.js

@@ -6,7 +6,7 @@ import { platform } from 'node:os';
  * @param {string} exe
  * @returns {boolean}
  */
-function isAvailable(exe) {
+export function isAvailable(exe) {
   try {
     const cmd = platform() === 'win32' ? 'where' : 'which';
     execFileSync(cmd, [exe], { stdio: 'ignore', timeout: 5000 });

package/test/session-manager.test.js

@@ -42,6 +42,31 @@ test('SessionManager.create rejects invalid cwd before creating a session', asyn
   }
 });
 
+test('SessionManager.create rejects unknown shell before creating a session', async () => {
+  let constructed = 0;
+  class FakeSession {
+    constructor() {
+      constructed++;
+    }
+  }
+
+  const manager = new SessionManager({ SessionClass: FakeSession });
+
+  try {
+    await assert.rejects(
+      () => manager.create({ shell: 'nonexistent-shell-abc123' }),
+      (error) => {
+        assert.match(error.message, /Shell "nonexistent-shell-abc123" not found/);
+        return true;
+      }
+    );
+    assert.equal(constructed, 0);
+    assert.equal(manager.list().length, 0);
+  } finally {
+    manager.destroyAll();
+  }
+});
+
 test('SessionManager.create rejects file cwd values', async () => {
   const tempDir = await mkdtemp(join(tmpdir(), 'smart-terminal-mcp-'));
   const filePath = join(tempDir, 'not-a-directory.txt');