@pixelbyte-software/pixcode 1.50.6 → 1.50.8

package/scripts/hermes/pixcode-mcp-server.mjs

@@ -9,6 +9,7 @@ const appRoot = path.resolve(path.dirname(fileURLToPath(import.meta.url)), '..',
 const mcpServerPath = path.join(appRoot, 'scripts', 'hermes', 'pixcode-mcp-server.mjs');
 const READBACK_IDLE_STABLE_MS = 2500;
 const DEFAULT_STARTUP_WAIT_MS = 100000;
+const CODEX_PROMPT_INPUT_PENDING_REASON = 'codex_prompt_input_pending';
 
 const tools = [
   {
@@ -140,7 +141,7 @@ const tools = [
         },
         startIfNeeded: {
           type: 'boolean',
-          description: 'When true, Pixcode starts the managed Hermes gateway before probing.',
+          description: 'When false, only probe an already-running gateway. Defaults to true so Pixcode keeps Hermes REST ready.',
         },
       },
       additionalProperties: false,
@@ -218,13 +219,29 @@ function getLastMatchIndex(text, pattern) {
   return lastIndex;
 }
 
-function inferTerminalState(provider, terminalOutput) {
+function normalizePromptInput(value) {
+  return String(value || '').replace(/(?:\r\n|\r|\n)+$/u, '').trim();
+}
+
+function hasCodexPromptInputPending(output, expectedInput) {
+  const expected = normalizePromptInput(expectedInput);
+  if (!expected) return false;
+  const match = String(output || '').match(/(?:^|\n)[^\S\r\n]*[›❯][ \t]+([^\r\n]+)[\r\n]*$/u);
+  if (!match) return false;
+  return normalizePromptInput(match[1]) === expected;
+}
+
+function inferTerminalState(provider, terminalOutput, expectedInput = null) {
   if (!terminalOutput) return 'unknown';
+  const output = String(terminalOutput.output || '');
+  if (provider === 'codex' && hasCodexPromptInputPending(output, expectedInput)) {
+    terminalOutput.terminalStateReason = terminalOutput.terminalStateReason || CODEX_PROMPT_INPUT_PENDING_REASON;
+    return 'busy';
+  }
   if (typeof terminalOutput.terminalState === 'string') return terminalOutput.terminalState;
   if (typeof terminalOutput.isBusy === 'boolean') return terminalOutput.isBusy ? 'busy' : 'idle';
   if (terminalOutput.active === false) return terminalOutput.output ? 'idle' : 'unknown';
 
-  const output = String(terminalOutput.output || '');
   if (!output.trim()) return 'unknown';
   if (/Process exited with code/iu.test(output)) return 'idle';
 
@@ -240,6 +257,10 @@ function inferTerminalState(provider, terminalOutput) {
       getLastMatchIndex(output, /(?:^|\n)\s*›(?:\s|$)/gu),
       getLastMatchIndex(output, /(?:^|\n)\s*❯(?:\s|$)/gu),
     );
+    if (hasCodexPromptInputPending(output, expectedInput)) {
+      terminalOutput.terminalStateReason = terminalOutput.terminalStateReason || CODEX_PROMPT_INPUT_PENDING_REASON;
+      return 'busy';
+    }
     if (lastPrompt >= 0) return lastStrongBusy > lastPrompt ? 'busy' : 'idle';
     if (lastBusy >= 0) return 'busy';
     return 'unknown';
@@ -249,13 +270,13 @@ function inferTerminalState(provider, terminalOutput) {
   return 'unknown';
 }
 
-function isTerminalReadbackFinal(provider, terminalOutput) {
-  const terminalState = inferTerminalState(provider, terminalOutput);
+function isTerminalReadbackFinal(provider, terminalOutput, expectedInput = null) {
+  const terminalState = inferTerminalState(provider, terminalOutput, expectedInput);
   return terminalState === 'idle' || terminalState === 'completed' || terminalState === 'exited' || terminalState === 'failed';
 }
 
-function isTerminalReadbackHardFinal(provider, terminalOutput) {
-  const terminalState = inferTerminalState(provider, terminalOutput);
+function isTerminalReadbackHardFinal(provider, terminalOutput, expectedInput = null) {
+  const terminalState = inferTerminalState(provider, terminalOutput, expectedInput);
   return terminalState === 'completed' || terminalState === 'exited' || terminalState === 'failed' || Boolean(terminalOutput?.terminalFailed);
 }
 
@@ -269,7 +290,7 @@ function getReadbackFingerprint(terminalOutput) {
   ].join('\n---pixcode-readback---\n');
 }
 
-async function waitForProviderTerminalOutput(provider, projectPath, waitMs, launchId = null) {
+async function waitForProviderTerminalOutput(provider, projectPath, waitMs, launchId = null, expectedInput = null) {
   const startedAt = Date.now();
   let latestOutput = null;
   let stableFingerprint = null;
@@ -285,8 +306,8 @@ async function waitForProviderTerminalOutput(provider, projectPath, waitMs, laun
       error: error instanceof Error ? error.message : String(error),
     }));
 
-    if (latestOutput?.output && isTerminalReadbackFinal(provider, latestOutput)) {
-      if (isTerminalReadbackHardFinal(provider, latestOutput)) {
+    if (latestOutput?.output && isTerminalReadbackFinal(provider, latestOutput, expectedInput)) {
+      if (isTerminalReadbackHardFinal(provider, latestOutput, expectedInput)) {
         stableFinal = true;
         break;
       }
@@ -307,7 +328,7 @@ async function waitForProviderTerminalOutput(provider, projectPath, waitMs, laun
   } while (Date.now() - startedAt < waitMs);
 
   if (latestOutput && !latestOutput.terminalState) {
-    latestOutput.terminalState = inferTerminalState(provider, latestOutput);
+    latestOutput.terminalState = inferTerminalState(provider, latestOutput, expectedInput);
   }
   if (latestOutput && typeof latestOutput.isBusy !== 'boolean') {
     latestOutput.isBusy = latestOutput.terminalState === 'busy';
@@ -436,10 +457,10 @@ async function callTool(name, args = {}) {
     const requestedWaitMs = Number(args.waitForCompletionMs ?? args.waitForOutputMs ?? defaultWaitMs);
     const waitForOutputMs = Math.min(600000, Math.max(0, requestedWaitMs));
     if (waitForOutputMs > 0) {
-      terminalOutput = await waitForProviderTerminalOutput(provider, projectPath, waitForOutputMs, launchId);
+      terminalOutput = await waitForProviderTerminalOutput(provider, projectPath, waitForOutputMs, launchId, startupInput);
     }
     const terminalOutputFinal = terminalOutput
-      ? Boolean(terminalOutput.terminalOutputFinal ?? isTerminalReadbackFinal(provider, terminalOutput))
+      ? Boolean(terminalOutput.terminalOutputFinal ?? isTerminalReadbackFinal(provider, terminalOutput, startupInput))
       : false;
     return textResult(JSON.stringify({
       launched: true,
@@ -495,7 +516,7 @@ async function callTool(name, args = {}) {
       body: JSON.stringify({
         projectPath: args.projectPath || null,
         input: args.input || null,
-        startIfNeeded: args.startIfNeeded === true,
+        startIfNeeded: args.startIfNeeded !== false,
       }),
     });
     return textResult(JSON.stringify(body, null, 2));

package/scripts/smoke/hermes-mcp-pixcode-roundtrip.mjs

@@ -127,7 +127,28 @@ const server = createServer(async (req, res) => {
         provider: 'codex',
         projectPath: '/root/pixcode',
         terminalState: 'idle',
-        output: 'OpenAI Codex\n› /init\n\n• Ran npm test\n\n› Implement {feature}\n',
+        output: 'OpenAI Codex\n› /init\n',
+      },
+      {
+        active: true,
+        provider: 'codex',
+        projectPath: '/root/pixcode',
+        terminalState: 'idle',
+        output: 'OpenAI Codex\n› /init\n',
+      },
+      {
+        active: true,
+        provider: 'codex',
+        projectPath: '/root/pixcode',
+        terminalState: 'idle',
+        output: 'OpenAI Codex\n› /init\n',
+      },
+      {
+        active: true,
+        provider: 'codex',
+        projectPath: '/root/pixcode',
+        terminalState: 'idle',
+        output: 'OpenAI Codex\n› /init\n',
       },
       {
         active: true,

package/scripts/smoke/hermes-settings-commands.mjs

@@ -13,6 +13,7 @@ const serverIndex = read('server/index.js');
 const shellTypes = read('src/components/shell/types/types.ts');
 const shellRuntime = read('src/components/shell/hooks/useShellRuntime.ts');
 const shellConnection = read('src/components/shell/hooks/useShellConnection.ts');
+const shellTerminal = read('src/components/shell/hooks/useShellTerminal.ts');
 const shellView = read('src/components/shell/view/Shell.tsx');
 const standaloneShell = read('src/components/standalone-shell/view/StandaloneShell.tsx');
 const hermesRoutes = read('server/modules/orchestration/hermes/hermes.routes.ts');
@@ -33,6 +34,16 @@ assert.match(
   /pixcode:hermes-terminal[\s\S]+command[\s\S]+title/,
   'Hermes settings should dispatch command and title to the workbench terminal.',
 );
+assert.match(
+  settingsTab,
+  /ensureGatewayReady/,
+  'Hermes settings should automatically start/probe the REST API gateway when Hermes is installed.',
+);
+assert.match(
+  settingsTab,
+  /startIfNeeded:\s*true/,
+  'Hermes settings should start the REST API gateway through Pixcode when checking gateway readiness.',
+);
 assert.match(
   settingsModal,
   /<HermesSettingsTab onClose=\{onClose\} \/>/,
@@ -73,6 +84,11 @@ assert.match(
   /pixcode_read_cli_terminal/,
   'Pixcode MCP should expose a terminal transcript reader so Hermes can report provider CLI output.',
 );
+assert.match(
+  pixcodeMcpServer,
+  /startIfNeeded:\s*args\.startIfNeeded !== false/,
+  'Pixcode MCP gateway probes should start the managed REST gateway by default unless Hermes explicitly opts out.',
+);
 assert.match(
   pixcodeMcpServer,
   /Use this instead of Hermes shell\/proc\/skill execution/,
@@ -93,6 +109,11 @@ assert.match(
   /lastStrongBusy[\s\S]+lastPrompt[\s\S]+\?\s*'busy'\s*:\s*'idle'/,
   'Codex readback should ignore weak spinner remnants once the prompt has returned.',
 );
+assert.match(
+  pixcodeMcpServer,
+  /codex_prompt_input_pending/,
+  'Codex readback should not treat a prompt line with typed-but-unsubmitted input as final output.',
+);
 assert.match(
   serverIndex,
   /lastStrongBusy[\s\S]+lastPrompt[\s\S]+\?\s*'busy'\s*:\s*'idle'/,
@@ -108,6 +129,11 @@ assert.match(
   /requestedLaunchId[\s\S]+session\.hermesLaunchId === requestedLaunchId/,
   'Provider output API should filter by Hermes terminal launch id when supplied.',
 );
+assert.match(
+  serverIndex,
+  /existingSession\.hermesLaunchId = hermesLaunchId \|\| existingSession\.hermesLaunchId/,
+  'Reused visible provider PTYs should be rebound to the latest Hermes launch id so MCP readback follows the current request.',
+);
 assert.match(
   serverIndex,
   /lifecycleState/,
@@ -215,8 +241,8 @@ assert.match(
 );
 assert.match(
   shellConnection,
-  /normalizeStartupInput\(input: string, provider: LLMProvider\)/,
-  'Startup input normalization should be provider-aware.',
+  /startupInputDelivery/,
+  'Startup input should be delivered through an explicit command-or-terminal mode.',
 );
 assert.match(
   shellConnection,
@@ -225,8 +251,48 @@ assert.match(
 );
 assert.match(
   shellConnection,
-  /startupInput:\s*handlesStartupInputInCommand \? startupInputForCommand : null/,
-  'Shell websocket init should send Codex startup input to the backend command builder.',
+  /startupInputDelivery:\s*handlesStartupInputInCommand \? 'command' : 'terminal'/,
+  'Shell websocket init should tell the backend whether startup input belongs in the command or visible terminal.',
+);
+assert.match(
+  shellTerminal,
+  /sanitizeTerminalInputData/,
+  'Terminal input should filter xterm color-query reports before sending data to the PTY.',
+);
+assert.match(
+  shellTerminal,
+  /OSC_COLOR_REPORT_REGEX/,
+  'Terminal input should drop OSC 10/11/12 color reports so resize/theme probes do not corrupt CLI prompts.',
+);
+assert.match(
+  serverIndex,
+  /writeTerminalStartupInput/,
+  'Shell backend should submit Hermes startup input directly into reused visible PTYs.',
+);
+assert.match(
+  serverIndex,
+  /queueTerminalStartupInput/,
+  'Shell backend should queue Hermes startup input until the visible provider terminal is ready instead of writing blindly after a fixed delay.',
+);
+assert.match(
+  serverIndex,
+  /STARTUP_INPUT_READY_TIMEOUT_MS/,
+  'Queued provider startup input should have a bounded readiness timeout.',
+);
+assert.match(
+  serverIndex,
+  /resolveProviderTerminalState[\s\S]+terminalState === 'busy'/,
+  'Queued startup input should inspect the provider terminal state and avoid sending while the CLI is busy.',
+);
+assert.match(
+  serverIndex,
+  /\\x15/,
+  'Provider startup input should clear any half-typed prompt line before typing the requested work.',
+);
+assert.match(
+  serverIndex,
+  /startupInputDelivery === 'terminal'[\s\S]+writeTerminalStartupInput/,
+  'Existing visible provider sessions should receive terminal-delivered startup input before reconnect returns.',
 );
 assert.match(
   workbench,
@@ -253,6 +319,11 @@ assert.match(
   /startupInput\?: string \| null/,
   'Shell init messages should carry launch-time startup input for providers that accept an initial prompt.',
 );
+assert.match(
+  shellTypes,
+  /startupInputDelivery\?: 'command' \| 'terminal'/,
+  'Shell init messages should carry startup input delivery mode.',
+);
 assert.match(
   serverIndex,
   /const startupInput = typeof data\.startupInput === 'string'/,
@@ -260,7 +331,7 @@ assert.match(
 );
 assert.match(
   serverIndex,
-  /provider === 'codex'[\s\S]+startupInput[\s\S]+quoteShellArgForPlatform\(startupInput\)/,
+  /provider === 'codex'[\s\S]+commandStartupInput[\s\S]+quoteShellArgForPlatform\(commandStartupInput\)/,
   'Codex provider terminals should start with the requested prompt as a CLI argument so banners/update notices cannot swallow Enter.',
 );
 assert.match(

package/scripts/smoke/pixcode-workbench-1-48.mjs

@@ -62,7 +62,8 @@ assert.match(workbench, /vscodeWorkbench\.cli\.closeTerminal/, 'CLI terminal clo
 assert.match(workbench, /WORKBENCH_CLI_STATE_STORAGE_KEY/, 'CLI terminal should remember per-project open state across workspace switches.');
 assert.match(workbench, /function WorkbenchBottomTerminal/, 'Terminal activity should render as a bottom plain-shell panel.');
 assert.match(workbench, /BOTTOM_TERMINAL_MIN_HEIGHT/, 'Bottom terminal should support height resizing.');
-assert.match(workbench, /isBottomTerminalMinimized/, 'Bottom terminal should support minimizing without closing.');
+assert.match(workbench, /WorkbenchBottomTerminalViewMode/, 'Bottom terminal should support explicit half and full-screen modes.');
+assert.doesNotMatch(workbench, /BOTTOM_TERMINAL_MINIMIZED_HEIGHT|Minimize terminal/, 'Bottom terminal should not expose the old minimized strip behavior.');
 assert.match(workbench, /bottomTerminalProject/, 'Bottom terminal should stay bound to the project it was opened for.');
 assert.match(workbench, /setBottomTerminalProject/, 'Opening a bottom terminal should capture its project instead of following workspace selection changes.');
 assert.match(workbench, /terminalProject = bottomTerminalProject \?\? selectedProject/, 'Workbench should render bottom terminals against their captured project binding.');
@@ -135,9 +136,9 @@ assert.match(hermesRoutes, /router\.post\('\/install'/, 'Hermes should install t
 assert.match(read('scripts/smoke/hermes-api-install.mjs'), /hermes API install smoke passed/, 'Hermes API install behavior should have a focused smoke test.');
 assert.match(workbench, /terminalStartupInput/, 'Hermes terminal launch prompts should be passed into the selected CLI.');
 assert.match(read('src/components/shell/hooks/useShellConnection.ts'), /startupInputRef/, 'Shell connections should support one-shot startup input for Hermes-triggered CLI work.');
-assert.match(read('src/components/shell/hooks/useShellConnection.ts'), /isCliReadyForStartupInput/, 'Hermes-triggered CLI input should wait until the provider TUI is ready.');
+assert.match(read('src/components/shell/hooks/useShellTerminal.ts'), /sanitizeTerminalInputData/, 'Terminal should filter xterm color-query replies before forwarding input to provider CLIs.');
 assert.match(read('src/components/shell/hooks/useShellConnection.ts'), /forceNewSessionRef\.current[\s\S]+startupInputForCommand/, 'Codex startup input should only be sent as a CLI argument for explicit fresh sessions.');
-assert.doesNotMatch(read('src/components/shell/hooks/useShellConnection.ts'), /TERMINAL_INIT_DELAY_MS \* 3/, 'Hermes-triggered CLI input should not be sent on a blind fixed delay.');
+assert.match(read('src/components/shell/hooks/useShellConnection.ts'), /startupInputDelivery:\s*handlesStartupInputInCommand \? 'command' : 'terminal'/, 'Reused visible sessions should submit startup input through the backend terminal path.');
 assert.match(shellTerminal, /handleTerminalPaste/, 'Terminal should support browser paste events.');
 assert.match(shellTerminal, /handleCopyPasteShortcut/, 'Terminal should normalize Ctrl/Cmd copy and paste shortcuts.');
 assert.match(shellTerminal, /event\.shiftKey/, 'Terminal should support Ctrl+Shift+C/V style shortcuts.');

package/scripts/smoke/vscode-workbench-polish.mjs

@@ -284,9 +284,19 @@ assert.match(
   'Terminal activity should open a VS Code-style bottom terminal instead of the provider CLI picker.',
 );
 
-for (const token of ['BOTTOM_TERMINAL_MIN_HEIGHT', 'isBottomTerminalMinimized', 'shrinkCliPanel', 'expandCliPanel']) {
+for (const token of ['BOTTOM_TERMINAL_MIN_HEIGHT', 'bottomTerminalViewMode', 'shrinkCliPanel', 'expandCliPanel']) {
   assert.match(workbench, new RegExp(token), `Workbench should include ${token}.`);
 }
+assert.match(
+  workbench,
+  /WorkbenchBottomTerminalViewMode/,
+  'Bottom terminal should expose half/full display modes instead of minimize/restore.',
+);
+assert.doesNotMatch(
+  workbench,
+  /BOTTOM_TERMINAL_MINIMIZED_HEIGHT|Minimize terminal|isBottomTerminalMinimized/,
+  'Bottom terminal should not keep the old minimized strip UI.',
+);
 
 assert.match(
   workbench,

package/server/index.js

@@ -153,6 +153,8 @@ let projectsWatchers = [];
 let projectsWatcherDebounceTimer = null;
 const connectedClients = new Set();
 let isGetProjectsRunning = false; // Flag to prevent reentrant calls
+const STARTUP_INPUT_READY_TIMEOUT_MS = 10 * 60 * 1000;
+const STARTUP_INPUT_POLL_MS = 750;
 
 // Broadcast progress to all connected WebSocket clients
 function broadcastProgress(progress) {
@@ -298,6 +300,10 @@ function terminatePtySession(sessionKey, session, reason) {
     if (session.timeoutId) {
         clearTimeout(session.timeoutId);
     }
+    if (session.startupInputTimerId) {
+        clearTimeout(session.startupInputTimerId);
+        session.startupInputTimerId = null;
+    }
 
     try {
         if (session.pty && session.pty.kill) {
@@ -435,6 +441,100 @@ function appendPtySessionBuffer(session, data) {
     }
 }
 
+function normalizeTerminalStartupInput(input) {
+    return `\x15${String(input || '').replace(/(?:\r\n|\r|\n)+$/u, '')}\r`;
+}
+
+function readSessionOutputForState(session, maxChars = 12000) {
+    return stripAnsiSequences((session?.buffer || []).join('').slice(-maxChars));
+}
+
+function shouldWaitForProviderIdle(provider) {
+    return provider === 'codex';
+}
+
+function isTerminalReadyForStartupInput(session) {
+    if (!session?.pty || session.lifecycleState !== 'running') {
+        return { ready: false, retry: false, terminalState: 'exited' };
+    }
+
+    const output = readSessionOutputForState(session);
+    const state = resolveProviderTerminalState(session, session.provider, output);
+    if (state.terminalState === 'busy') {
+        return { ready: false, retry: true, terminalState: state.terminalState };
+    }
+
+    if (state.terminalState === 'idle') {
+        return { ready: true, retry: false, terminalState: state.terminalState };
+    }
+
+    if (shouldWaitForProviderIdle(session.provider)) {
+        return { ready: false, retry: true, terminalState: state.terminalState };
+    }
+
+    return { ready: true, retry: false, terminalState: state.terminalState };
+}
+
+function processTerminalStartupInputQueue(session) {
+    if (!session?.pendingStartupInputs?.length) {
+        session.startupInputTimerId = null;
+        return;
+    }
+
+    const item = session.pendingStartupInputs[0];
+    const readiness = isTerminalReadyForStartupInput(session);
+    if (!readiness.ready) {
+        if (!readiness.retry || Date.now() - item.queuedAt > STARTUP_INPUT_READY_TIMEOUT_MS) {
+            session.pendingStartupInputs.shift();
+            session.startupInputTimerId = null;
+            const message = `\r\n\x1b[33m[Pixcode] Startup input was not sent because ${session.provider} is still ${readiness.terminalState || 'unavailable'}.\x1b[0m\r\n`;
+            try {
+                session.ws?.send?.(JSON.stringify({ type: 'output', data: message }));
+            } catch { /* websocket gone */ }
+            if (session.pendingStartupInputs.length > 0) {
+                session.startupInputTimerId = setTimeout(() => processTerminalStartupInputQueue(session), STARTUP_INPUT_POLL_MS);
+            }
+            return;
+        }
+
+        session.startupInputTimerId = setTimeout(() => processTerminalStartupInputQueue(session), STARTUP_INPUT_POLL_MS);
+        return;
+    }
+
+    session.pendingStartupInputs.shift();
+    session.startupInputTimerId = null;
+    try {
+        session.pty.write(normalizeTerminalStartupInput(item.startupInput));
+        session.updatedAt = Date.now();
+        console.log(`⌨️  Submitted startup input to visible PTY (${item.reason})`);
+    } catch (error) {
+        console.warn('Failed to submit startup input to visible PTY:', error?.message || error);
+    }
+
+    if (session.pendingStartupInputs.length > 0) {
+        session.startupInputTimerId = setTimeout(() => processTerminalStartupInputQueue(session), STARTUP_INPUT_POLL_MS);
+    }
+}
+
+function queueTerminalStartupInput(session, startupInput, reason, delayMs = 500) {
+    if (!session?.pty || !startupInput) return;
+    if (!Array.isArray(session.pendingStartupInputs)) {
+        session.pendingStartupInputs = [];
+    }
+    session.pendingStartupInputs.push({
+        startupInput,
+        reason,
+        queuedAt: Date.now(),
+    });
+
+    if (session.startupInputTimerId) return;
+    session.startupInputTimerId = setTimeout(() => processTerminalStartupInputQueue(session), delayMs);
+}
+
+function writeTerminalStartupInput(session, startupInput, reason, delayMs = 500) {
+    queueTerminalStartupInput(session, startupInput, reason, delayMs);
+}
+
 function normalizeShellPermissionMode(value) {
     return typeof value === 'string' ? value.trim() : '';
 }
@@ -2387,6 +2487,9 @@ function handleShellConnection(ws, request) {
                 const startupInput = typeof data.startupInput === 'string' && data.startupInput.trim()
                     ? data.startupInput.trim()
                     : null;
+                const startupInputDelivery = data.startupInputDelivery === 'terminal' ? 'terminal' : 'command';
+                const commandStartupInput = startupInputDelivery === 'command' ? startupInput : null;
+                const terminalStartupInput = startupInputDelivery === 'terminal' ? startupInput : null;
                 const hermesLaunchId = Number.isFinite(Number(data.hermesLaunchId)) && Number(data.hermesLaunchId) > 0
                     ? Number(data.hermesLaunchId)
                     : null;
@@ -2474,6 +2577,11 @@ function handleShellConnection(ws, request) {
                         }
 
                         existingSession.ws = ws;
+                        existingSession.hermesLaunchId = hermesLaunchId || existingSession.hermesLaunchId;
+                        existingSession.updatedAt = Date.now();
+                        if (terminalStartupInput && !isPlainShell) {
+                            writeTerminalStartupInput(existingSession, terminalStartupInput, 'reused provider session', 350);
+                        }
 
                         return;
                     }
@@ -2551,8 +2659,8 @@ function handleShellConnection(ws, request) {
                             } else {
                                 shellCommand = `${command} resume "${sessionId}" || ${command}`;
                             }
-                        } else if (startupInput) {
-                            shellCommand = `${command} ${quoteShellArgForPlatform(startupInput)}`;
+                        } else if (commandStartupInput) {
+                            shellCommand = `${command} ${quoteShellArgForPlatform(commandStartupInput)}`;
                         } else {
                             shellCommand = command;
                         }
@@ -2682,8 +2790,14 @@ function handleShellConnection(ws, request) {
                         exitSignal: null,
                         completedAt: null,
                         keepAliveUntilExit: false,
+                        pendingStartupInputs: [],
+                        startupInputTimerId: null,
                         updatedAt: Date.now(),
                     });
+                    const createdSession = ptySessionsMap.get(ptySessionKey);
+                    if (terminalStartupInput && !isPlainShell) {
+                        writeTerminalStartupInput(createdSession, terminalStartupInput, 'new provider session', 4500);
+                    }
 
                     // Handle data output
                     shellProcess.onData((data) => {
@@ -2762,6 +2876,11 @@ function handleShellConnection(ws, request) {
                             session.exitSignal = exitCode.signal || null;
                             session.completedAt = new Date().toISOString();
                             session.updatedAt = Date.now();
+                            if (session.startupInputTimerId) {
+                                clearTimeout(session.startupInputTimerId);
+                                session.startupInputTimerId = null;
+                            }
+                            session.pendingStartupInputs = [];
                             session.pty = null;
                             appendPtySessionBuffer(session, exitMessage);
                         }