@pixelbyte-software/pixcode 1.50.3 → 1.50.5

package/dist-server/server/services/external-access.js

@@ -1,4 +1,7 @@
 import { spawn } from 'node:child_process';
+import fs from 'node:fs/promises';
+import os from 'node:os';
+import path from 'node:path';
 /**
  * External-access service.
  *
@@ -27,15 +30,58 @@ export const getUpnpState = () => UPNP_UNAVAILABLE;
 // stdout. We keep a single live tunnel per process — starting a new one
 // stops the previous one to avoid dangling child processes.
 // ============================================================================
+export const TUNNEL_PERSISTENCE_PATH = process.env.PIXCODE_TUNNEL_STATE_PATH
+    || path.join(os.homedir(), '.pixcode', 'external-access.json');
 let tunnelProc = null;
+let suppressNextTunnelRestore = false;
+let restoreTimer = null;
+let restoreInFlight = null;
 let tunnelState = {
     running: false,
     binary: null, // 'cloudflared' | 'ngrok'
     url: null,
     error: null,
     installHint: null,
+    desired: false,
+    restoring: false,
     log: [],
 };
+const DEFAULT_TUNNEL_PREFERENCE = Object.freeze({
+    desired: false,
+    port: null,
+    provider: null,
+    lastUrl: null,
+    lastStartedAt: null,
+    lastStoppedAt: null,
+    updatedAt: null,
+});
+const readTunnelPreference = async () => {
+    try {
+        const raw = await fs.readFile(TUNNEL_PERSISTENCE_PATH, 'utf8');
+        const parsed = JSON.parse(raw);
+        return {
+            ...DEFAULT_TUNNEL_PREFERENCE,
+            ...(parsed && typeof parsed === 'object' ? parsed : {}),
+        };
+    }
+    catch (error) {
+        if (error?.code !== 'ENOENT') {
+            console.warn('[external-access] Failed to read tunnel preference:', error?.message || error);
+        }
+        return { ...DEFAULT_TUNNEL_PREFERENCE };
+    }
+};
+export const persistTunnelPreference = async (patch) => {
+    const current = await readTunnelPreference();
+    const next = {
+        ...current,
+        ...patch,
+        updatedAt: new Date().toISOString(),
+    };
+    await fs.mkdir(path.dirname(TUNNEL_PERSISTENCE_PATH), { recursive: true });
+    await fs.writeFile(TUNNEL_PERSISTENCE_PATH, `${JSON.stringify(next, null, 2)}\n`, 'utf8');
+    return next;
+};
 const appendLog = (line) => {
     // Tunnels can be noisy. Cap the tail we retain so a long-running tunnel
     // doesn't grow the log into an OOM risk.
@@ -89,16 +135,33 @@ const extractUrl = (binary, text) => {
         return text.match(ngrokUrlRegex)?.[0] ?? null;
     return null;
 };
-export const startTunnel = async ({ port }) => {
+export const startTunnel = async ({ port, persistPreference = false, restoring = false } = {}) => {
     if (tunnelProc) {
-        // Already running — tell the caller to stop it first rather than silently
-        // replacing, which would orphan the old child and lie about state.
-        throw new Error('Tunnel already running; stop it first');
+        if (persistPreference) {
+            await persistTunnelPreference({
+                desired: true,
+                port,
+                provider: tunnelState.binary,
+                lastUrl: tunnelState.url,
+            });
+            tunnelState = { ...tunnelState, desired: true, restoring: false };
+        }
+        return tunnelState;
     }
+    suppressNextTunnelRestore = false;
     const binary = await detectBinary();
     if (!binary) {
         const installHint = createTunnelInstallHint();
-        tunnelState = { running: false, binary: null, url: null, error: 'No tunnel binary found', installHint, log: [] };
+        tunnelState = {
+            running: false,
+            binary: null,
+            url: null,
+            error: 'No tunnel binary found',
+            installHint,
+            desired: Boolean(persistPreference || restoring),
+            restoring,
+            log: [],
+        };
         const err = new Error('No tunnel binary found (tried cloudflared, ngrok)');
         err.code = 'ENOENT_TUNNEL';
         err.installHint = installHint;
@@ -107,7 +170,16 @@ export const startTunnel = async ({ port }) => {
     const args = buildTunnelArgs(binary, port);
     const child = spawn(binary, args, { stdio: ['ignore', 'pipe', 'pipe'] });
     tunnelProc = child;
-    tunnelState = { running: true, binary, url: null, error: null, installHint: null, log: [] };
+    tunnelState = {
+        running: true,
+        binary,
+        url: null,
+        error: null,
+        installHint: null,
+        desired: Boolean(persistPreference || restoring),
+        restoring,
+        log: [],
+    };
     const handleChunk = (chunk) => {
         const text = chunk.toString();
         text.split(/\r?\n/).filter(Boolean).forEach(appendLog);
@@ -127,35 +199,86 @@ export const startTunnel = async ({ port }) => {
             url: null,
             error: code === 0 ? null : `Tunnel exited with code ${code}`,
             installHint: null,
+            desired: tunnelState.desired,
+            restoring: false,
             log: tunnelState.log,
         };
+        if (suppressNextTunnelRestore) {
+            suppressNextTunnelRestore = false;
+            return;
+        }
+        void readTunnelPreference().then((preference) => {
+            if (!preference.desired)
+                return;
+            if (restoreTimer)
+                clearTimeout(restoreTimer);
+            restoreTimer = setTimeout(() => {
+                restoreTimer = null;
+                restoreRequestedTunnel({ port: Number(preference.port || port) || port }).catch((error) => {
+                    console.warn('[external-access] Tunnel restore failed after exit:', error?.message || error);
+                });
+            }, 3000);
+        });
     });
     // Wait up to 15s for the public URL to appear in the log. We don't block
     // indefinitely — if the binary is hanging on login/auth, the UI should see
     // a clear failure instead of a spinner that never resolves.
     const start = Date.now();
     while (Date.now() - start < 15000) {
-        if (tunnelState.url)
+        if (tunnelState.url) {
+            if (persistPreference || restoring) {
+                await persistTunnelPreference({
+                    desired: true,
+                    port,
+                    provider: binary,
+                    lastUrl: tunnelState.url,
+                    lastStartedAt: new Date().toISOString(),
+                });
+                tunnelState = { ...tunnelState, desired: true, restoring: false };
+            }
             return tunnelState;
+        }
         if (!tunnelProc)
             break; // process died early
         await new Promise((r) => setTimeout(r, 250));
     }
     if (!tunnelState.url) {
         // If we never captured a URL, kill the child so we don't leak it.
+        suppressNextTunnelRestore = true;
         try {
             child.kill();
         }
         catch { /* ignore */ }
         tunnelProc = null;
-        tunnelState = { ...tunnelState, running: false, error: 'Tunnel did not report a public URL', installHint: null };
+        tunnelState = { ...tunnelState, running: false, error: 'Tunnel did not report a public URL', installHint: null, restoring: false };
         throw new Error(tunnelState.error);
     }
     return tunnelState;
 };
-export const stopTunnel = async () => {
+export const stopTunnel = async ({ persistPreference = true } = {}) => {
+    suppressNextTunnelRestore = Boolean(tunnelProc);
+    if (restoreTimer) {
+        clearTimeout(restoreTimer);
+        restoreTimer = null;
+    }
+    if (persistPreference) {
+        await persistTunnelPreference({
+            desired: false,
+            lastStoppedAt: new Date().toISOString(),
+        });
+    }
     if (!tunnelProc) {
-        tunnelState = { running: false, binary: null, url: null, error: null, installHint: null, log: [] };
+        suppressNextTunnelRestore = false;
+        tunnelState = {
+            running: false,
+            binary: null,
+            url: null,
+            error: null,
+            installHint: null,
+            desired: false,
+            restoring: false,
+            log: [],
+        };
         return tunnelState;
     }
     try {
@@ -165,9 +288,68 @@ export const stopTunnel = async () => {
         // already dead
     }
     tunnelProc = null;
-    tunnelState = { running: false, binary: null, url: null, error: null, installHint: null, log: [] };
+    tunnelState = {
+        running: false,
+        binary: null,
+        url: null,
+        error: null,
+        installHint: null,
+        desired: false,
+        restoring: false,
+        log: [],
+    };
     return tunnelState;
 };
+export const restoreRequestedTunnel = async ({ port } = {}) => {
+    if (restoreInFlight)
+        return restoreInFlight;
+    restoreInFlight = (async () => {
+        const preference = await readTunnelPreference();
+        if (!preference.desired) {
+            tunnelState = { ...tunnelState, desired: false, restoring: false };
+            return tunnelState;
+        }
+        if (tunnelProc) {
+            tunnelState = { ...tunnelState, desired: true, restoring: false };
+            return tunnelState;
+        }
+        const restorePort = Number(port || preference.port);
+        if (!Number.isFinite(restorePort) || restorePort <= 0) {
+            tunnelState = {
+                ...tunnelState,
+                running: false,
+                desired: true,
+                restoring: false,
+                error: 'Tunnel restore skipped: no valid server port',
+            };
+            return tunnelState;
+        }
+        try {
+            return await startTunnel({
+                port: restorePort,
+                persistPreference: true,
+                restoring: true,
+            });
+        }
+        catch (error) {
+            tunnelState = {
+                ...tunnelState,
+                running: false,
+                desired: true,
+                restoring: false,
+                error: `Tunnel restore failed: ${error?.message || error}`,
+                installHint: error?.installHint || tunnelState.installHint || null,
+            };
+            return tunnelState;
+        }
+    })();
+    try {
+        return await restoreInFlight;
+    }
+    finally {
+        restoreInFlight = null;
+    }
+};
 export const getTunnelState = () => tunnelState;
 // Explicit cleanup so the server process can shut down without leaking the
 // child tunnel process.

package/dist-server/server/services/external-access.js.map

@@ -1 +1 @@
-{"version":3,"file":"external-access.js","sourceRoot":"","sources":["../../../server/services/external-access.js"],"names":[],"mappings":"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"}
+{"version":3,"file":"external-access.js","sourceRoot":"","sources":["../../../server/services/external-access.js"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pixelbyte-software/pixcode",
-  "version": "1.50.3",
+  "version": "1.50.5",
   "description": "Self-hosted AI coding agent control room for Claude Code, Cursor CLI, OpenAI Codex, Gemini CLI, Qwen Code, and OpenCode with chat, files, shell, Git, orchestration, API keys, Telegram, MCP, plugins, themes, and desktop/server deployment.",
   "type": "module",
   "main": "dist-server/server/index.js",

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

@@ -7,6 +7,7 @@ const baseUrl = (process.env.PIXCODE_BASE_URL || '').replace(/\/$/, '');
 const apiKey = process.env.PIXCODE_API_KEY || '';
 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 tools = [
   {
@@ -35,7 +36,7 @@ const tools = [
   },
   {
     name: 'pixcode_open_cli_terminal',
-    description: 'Use this instead of Hermes shell/proc/skill execution whenever the user asks to open Codex, Claude, Cursor, Gemini, Qwen, or OpenCode inside Pixcode. It asks the open Pixcode workbench to open a visible provider CLI terminal in the project and submit startup input there. Do not run a parallel Hermes codex/claude/proc command for the same request. For multi-step, piece-by-piece, or long-running work, put the full user instruction in startupInput so the provider CLI does the work visibly inside Pixcode. If the user asks for the provider output, set waitForOutputMs or call pixcode_read_cli_terminal after launch.',
+    description: 'Use this instead of Hermes shell/proc/skill execution whenever the user asks to open Codex, Claude, Cursor, Gemini, Qwen, or OpenCode inside Pixcode. It asks the open Pixcode workbench to open a visible provider CLI terminal in the project and submit startup input there. Do not run a parallel Hermes codex/claude/proc command for the same request. For multi-step, piece-by-piece, or long-running work, put the full user instruction in startupInput so the provider CLI does the work visibly inside Pixcode. When startupInput is present, Pixcode waits for the terminal to become idle before returning readback by default; never treat the first working frame as final output.',
     inputSchema: {
       type: 'object',
       properties: {
@@ -66,7 +67,15 @@ const tools = [
         },
         waitForOutputMs: {
           type: 'number',
-          description: 'Optional milliseconds to wait and then read recent terminal output. Useful when the user asks you to report the provider output.',
+          description: 'Optional milliseconds to wait for recent terminal output. Pixcode keeps polling while terminalState is busy, so use a large value when the user asks for the final provider answer.',
+        },
+        waitForCompletionMs: {
+          type: 'number',
+          description: 'Optional explicit milliseconds to wait for the visible provider CLI to return to an idle prompt before reporting output. Overrides waitForOutputMs.',
+        },
+        launchId: {
+          type: 'number',
+          description: 'Optional Pixcode terminal launch id. Use the id returned by pixcode_open_cli_terminal when reading one specific visible terminal.',
         },
       },
       required: ['provider'],
@@ -186,15 +195,125 @@ async function readProviderStatus(provider) {
   return body?.data ?? body;
 }
 
-async function readProviderTerminalOutput(provider, projectPath, maxChars) {
+async function readProviderTerminalOutput(provider, projectPath, maxChars, launchId = null) {
   const params = new URLSearchParams({
     provider,
     maxChars: String(maxChars || 12000),
   });
   if (projectPath) params.set('projectPath', projectPath);
+  if (launchId) params.set('launchId', String(launchId));
   return pixcodeFetch(`/api/shell/sessions/provider-output?${params.toString()}`);
 }
 
+function getLastMatchIndex(text, pattern) {
+  let lastIndex = -1;
+  for (const match of text.matchAll(pattern)) {
+    lastIndex = match.index ?? lastIndex;
+  }
+  return lastIndex;
+}
+
+function inferTerminalState(provider, terminalOutput) {
+  if (!terminalOutput) return 'unknown';
+  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';
+
+  const lastBusy = Math.max(
+    getLastMatchIndex(output, /(?:^|\n)\s*[•*]\s*(?:Working|Running|Thinking)\b/giu),
+    getLastMatchIndex(output, /\bWorking\s*\([^)]*esc to interrupt[^)]*\)/giu),
+    getLastMatchIndex(output, /\bmsg=interrupt\b/giu),
+  );
+
+  if (provider === 'codex') {
+    const lastPrompt = Math.max(
+      getLastMatchIndex(output, /(?:^|\n)\s*›(?:\s|$)/gu),
+      getLastMatchIndex(output, /(?:^|\n)\s*❯(?:\s|$)/gu),
+    );
+    if (lastBusy >= 0) return lastPrompt > lastBusy ? 'idle' : 'busy';
+    return lastPrompt >= 0 && /(?:Initialized|Baseline check passed|I did not modify files|Use \/skills)/iu.test(output)
+      ? 'idle'
+      : 'unknown';
+  }
+
+  if (lastBusy >= 0) return 'busy';
+  return 'unknown';
+}
+
+function isTerminalReadbackFinal(provider, terminalOutput) {
+  const terminalState = inferTerminalState(provider, terminalOutput);
+  return terminalState === 'idle' || terminalState === 'completed' || terminalState === 'exited' || terminalState === 'failed';
+}
+
+function isTerminalReadbackHardFinal(provider, terminalOutput) {
+  const terminalState = inferTerminalState(provider, terminalOutput);
+  return terminalState === 'completed' || terminalState === 'exited' || terminalState === 'failed' || Boolean(terminalOutput?.terminalFailed);
+}
+
+function getReadbackFingerprint(terminalOutput) {
+  return [
+    terminalOutput?.terminalState || '',
+    terminalOutput?.lifecycleState || '',
+    terminalOutput?.exitCode ?? '',
+    terminalOutput?.exitSignal || '',
+    String(terminalOutput?.output || '').slice(-12000),
+  ].join('\n---pixcode-readback---\n');
+}
+
+async function waitForProviderTerminalOutput(provider, projectPath, waitMs, launchId = null) {
+  const startedAt = Date.now();
+  let latestOutput = null;
+  let stableFingerprint = null;
+  let stableSince = 0;
+  let stableFinal = false;
+  do {
+    const elapsed = Date.now() - startedAt;
+    const remaining = Math.max(0, waitMs - elapsed);
+    await sleep(Math.min(1000, Math.max(250, remaining)));
+    latestOutput = await readProviderTerminalOutput(provider, projectPath, 12000, launchId).catch((error) => ({
+      active: false,
+      terminalState: 'unknown',
+      error: error instanceof Error ? error.message : String(error),
+    }));
+
+    if (latestOutput?.output && isTerminalReadbackFinal(provider, latestOutput)) {
+      if (isTerminalReadbackHardFinal(provider, latestOutput)) {
+        stableFinal = true;
+        break;
+      }
+
+      const fingerprint = getReadbackFingerprint(latestOutput);
+      if (fingerprint !== stableFingerprint) {
+        stableFingerprint = fingerprint;
+        stableSince = Date.now();
+      }
+      if (Date.now() - stableSince >= READBACK_IDLE_STABLE_MS) {
+        stableFinal = true;
+        break;
+      }
+    } else {
+      stableFingerprint = null;
+      stableSince = 0;
+    }
+  } while (Date.now() - startedAt < waitMs);
+
+  if (latestOutput && !latestOutput.terminalState) {
+    latestOutput.terminalState = inferTerminalState(provider, latestOutput);
+  }
+  if (latestOutput && typeof latestOutput.isBusy !== 'boolean') {
+    latestOutput.isBusy = latestOutput.terminalState === 'busy';
+  }
+  if (latestOutput) {
+    latestOutput.readbackStable = stableFinal;
+    latestOutput.terminalOutputFinal = stableFinal;
+  }
+  return latestOutput;
+}
+
 function isLegacyPromptLikelyStartupInput(prompt) {
   if (!prompt || prompt.length > 160 || prompt.includes('\n')) return false;
   if (/^[/:!@]/u.test(prompt)) return true;
@@ -287,26 +406,32 @@ async function callTool(name, args = {}) {
         permissionMode,
       }),
     });
+    const launchId = Number(body?.event?.id || body?.id || 0) || null;
     let terminalOutput = null;
-    const waitForOutputMs = Math.min(15000, Math.max(0, Number(args.waitForOutputMs || 0)));
+    const defaultWaitMs = startupInput ? 180000 : 0;
+    const requestedWaitMs = Number(args.waitForCompletionMs ?? args.waitForOutputMs ?? defaultWaitMs);
+    const waitForOutputMs = Math.min(600000, Math.max(0, requestedWaitMs));
     if (waitForOutputMs > 0) {
-      const startedAt = Date.now();
-      do {
-        await sleep(Math.min(1000, Math.max(250, waitForOutputMs)));
-        terminalOutput = await readProviderTerminalOutput(provider, projectPath, 12000).catch((error) => ({
-          active: false,
-          error: error instanceof Error ? error.message : String(error),
-        }));
-        if (terminalOutput?.active && terminalOutput?.output) break;
-      } while (Date.now() - startedAt < waitForOutputMs);
+      terminalOutput = await waitForProviderTerminalOutput(provider, projectPath, waitForOutputMs, launchId);
     }
+    const terminalOutputFinal = terminalOutput
+      ? Boolean(terminalOutput.terminalOutputFinal ?? isTerminalReadbackFinal(provider, terminalOutput))
+      : false;
     return textResult(JSON.stringify({
       launched: true,
+      launchId,
       pixcodeMcpConfigured: mcpConfigured,
       pixcodeMcpError: mcpError,
       event: body?.event ?? body,
       permissionBypass: bypassPermissions,
       status,
+      terminalOutputFinal,
+      terminalFailed: Boolean(terminalOutput?.terminalFailed),
+      message: terminalOutput && !terminalOutputFinal
+        ? 'Provider terminal is still running or not at an idle prompt yet. Do not summarize this as final output; call pixcode_read_cli_terminal with launchId later.'
+        : terminalOutput?.terminalFailed
+          ? 'Provider terminal exited with a failure. Do not report this as successful; tell the user the visible CLI failed and include the exit code/output.'
+        : undefined,
       terminalOutput,
     }, null, 2));
   }
@@ -317,7 +442,16 @@ async function callTool(name, args = {}) {
       ? args.projectPath.trim()
       : null;
     const maxChars = Math.min(20000, Math.max(1000, Number(args.maxChars || 12000)));
-    const body = await readProviderTerminalOutput(provider, projectPath, maxChars);
+    const launchId = Number(args.launchId || 0) || null;
+    const body = await readProviderTerminalOutput(provider, projectPath, maxChars, launchId);
+    if (body && !body.terminalState) {
+      body.terminalState = inferTerminalState(provider, body);
+    }
+    if (body && typeof body.isBusy !== 'boolean') {
+      body.isBusy = body.terminalState === 'busy';
+    }
+    body.terminalOutputFinal = isTerminalReadbackFinal(provider, body);
+    body.terminalFailed = Boolean(body.terminalFailed);
     return textResult(JSON.stringify(body, null, 2));
   }
 

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

@@ -9,6 +9,7 @@ const apiKey = 'px_smoke_key';
 const seen = [];
 const providerMcpUpserts = [];
 const terminalLaunches = [];
+const providerOutputReads = [];
 
 function readJson(req) {
   return new Promise((resolve, reject) => {
@@ -90,7 +91,7 @@ const server = createServer(async (req, res) => {
     res.statusCode = 201;
     res.end(JSON.stringify({
       event: {
-        id: 1,
+        id: terminalLaunches.length,
         provider: body.provider,
         projectPath: body.projectPath,
         prompt: body.prompt,
@@ -100,6 +101,46 @@ const server = createServer(async (req, res) => {
     return;
   }
 
+  if (req.method === 'GET' && url.pathname === '/api/shell/sessions/provider-output') {
+    providerOutputReads.push({
+      provider: url.searchParams.get('provider'),
+      projectPath: url.searchParams.get('projectPath'),
+      launchId: url.searchParams.get('launchId'),
+    });
+    const outputs = [
+      {
+        active: true,
+        provider: 'codex',
+        projectPath: '/root/pixcode',
+        terminalState: 'busy',
+        output: 'OpenAI Codex\n› /init\n\n• Working (10s • esc to interrupt)\n',
+      },
+      {
+        active: true,
+        provider: 'codex',
+        projectPath: '/root/pixcode',
+        terminalState: 'busy',
+        output: 'OpenAI Codex\n› /init\n\n• Ran npm test\n• Working (30s • esc to interrupt)\n',
+      },
+      {
+        active: true,
+        provider: 'codex',
+        projectPath: '/root/pixcode',
+        terminalState: 'idle',
+        output: 'OpenAI Codex\n› /init\n\n• Ran npm test\n\n› Implement {feature}\n',
+      },
+      {
+        active: true,
+        provider: 'codex',
+        projectPath: '/root/pixcode',
+        terminalState: 'idle',
+        output: 'Baseline check passed: npm test reports 195 passing, 0 failing.\n\n› Use /skills to list available skills\n',
+      },
+    ];
+    res.end(JSON.stringify(outputs[Math.min(providerOutputReads.length - 1, outputs.length - 1)]));
+    return;
+  }
+
   res.statusCode = 404;
   res.end(JSON.stringify({ error: url.pathname }));
 });
@@ -121,7 +162,7 @@ function callMcp(child, method, params = undefined) {
   return new Promise((resolve, reject) => {
     const timeout = setTimeout(() => {
       reject(new Error(`MCP call timed out: ${method}`));
-    }, 5000);
+    }, 10000);
     const onLine = (line) => {
       if (!line.trim()) return;
       const message = JSON.parse(line);
@@ -190,13 +231,38 @@ try {
   assert.equal(providerMcpUpserts.length, 1, 'Codex launch should upsert a project-scoped Pixcode MCP server');
   assert.equal(providerMcpUpserts[0].name, 'pixcode', 'Provider MCP server should be named pixcode');
 
+  providerOutputReads.length = 0;
+  const launchWithReadback = await callMcp(child, 'tools/call', {
+    name: 'pixcode_open_cli_terminal',
+    arguments: {
+      provider: 'codex',
+      projectPath: '/root/pixcode',
+      prompt: 'read final output',
+      startupInput: '/init',
+      waitForOutputMs: 7000,
+    },
+  });
+  assert(
+    providerOutputReads.length >= 5,
+    `readback should keep polling until the provider terminal is idle, reads=${providerOutputReads.length}`,
+  );
+  assert.match(
+    launchWithReadback.content[0].text,
+    /195 passing, 0 failing/,
+    'readback should return the final Codex output instead of the first working frame',
+  );
+  assert(
+    providerOutputReads.every((read) => read.launchId === '2'),
+    `readback should be tied to the Hermes terminal launch id, reads=${JSON.stringify(providerOutputReads)}`,
+  );
+
   const blockedLaunch = await callMcp(child, 'tools/call', {
     name: 'pixcode_open_cli_terminal',
     arguments: { provider: 'qwen', projectPath: '/root/pixcode', prompt: 'smoke' },
   });
   assert.match(blockedLaunch.content[0].text, /"launched": false/, 'uninstalled providers should not create terminal launches');
   assert.match(blockedLaunch.content[0].text, /"reason": "not_installed"/, 'uninstalled provider response should explain the block');
-  assert.equal(terminalLaunches.length, 1, 'Only the installed Codex provider should be launched');
+  assert.equal(terminalLaunches.length, 2, 'Only installed Codex provider launches should be created');
 
   assert(seen.every((entry) => entry.auth === `Bearer ${apiKey}`), 'all MCP calls should use the Pixcode bearer key');
   console.log('hermes MCP Pixcode roundtrip smoke passed');