very-happy-cli 0.2.174 → 0.2.175

package/dist/{claudeLocal-Cg8Qn4tF.cjs → claudeLocal-CtZVz3ee.cjs}

@@ -4,19 +4,19 @@ var spawn = require('cross-spawn');
 var node_readline = require('node:readline');
 var node_fs = require('node:fs');
 var node_crypto = require('node:crypto');
-var logger = require('./logger-XjIS0lU7.cjs');
+var logger = require('./logger-C7dRaCkE.cjs');
 var smallFastModel = require('./smallFastModel-D_uxGMo3.cjs');
 var path$1 = require('node:path');
 var path = require('./path-B7zW-WwE.cjs');
-var systemPrompt = require('./systemPrompt-DRCJdhNo.cjs');
+var systemPrompt = require('./systemPrompt-DaTKLEb-.cjs');
 var manager = require('./manager-HrEj442o.cjs');
 var contentLogMetadata = require('./contentLogMetadata-ZSFk_NjQ.cjs');
 var claudeCliPath = require('./claudeCliPath-U4HHmV4r.cjs');
 require('chalk');
 require('node:util');
-require('./configuration-Btwt68O2.cjs');
+require('./configuration-UV4EE5ui.cjs');
 require('node:os');
-require('./package-DFQUF2in.cjs');
+require('./package-VqWv7EI5.cjs');
 require('node:fs/promises');
 require('./index-BZdhwBKa.cjs');
 require('zod');

package/dist/{claudeLocalLauncher-BAavVhU8.mjs → claudeLocalLauncher-D4vmjI3c.mjs}

@@ -1,20 +1,20 @@
-import { l as logger } from './logger-CUxbqfrp.mjs';
-import { claudeLocal, ExitCodeError } from './claudeLocal-DnPoeXP2.mjs';
-import { c as createSessionScanner, F as Future } from './sessionScanner-1-ANJdrm.mjs';
+import { l as logger } from './logger-D5EzMy30.mjs';
+import { claudeLocal, ExitCodeError } from './claudeLocal-B0P-wVJJ.mjs';
+import { c as createSessionScanner, F as Future } from './sessionScanner-CxXPAVyS.mjs';
 import 'chalk';
 import 'node:util';
-import './configuration-zOfO2qdB.mjs';
+import './configuration-BNGPXg07.mjs';
 import 'node:fs';
 import 'node:os';
 import 'node:path';
-import './package-DkI3yDe0.mjs';
+import './package-D0dxZ-W8.mjs';
 import 'node:fs/promises';
 import 'cross-spawn';
 import 'node:readline';
 import 'node:crypto';
 import './smallFastModel-BLNgMrwR.mjs';
 import './path-D2wdaNSk.mjs';
-import './systemPrompt-BMGFnaRU.mjs';
+import './systemPrompt-e-qeag_h.mjs';
 import './index-boE-d8CM.mjs';
 import 'zod';
 import '@paralleldrive/cuid2';
@@ -27,11 +27,11 @@ import './claudeCliPath-BqkaH2oR.mjs';
 import './projectPath-BTBIMB57.mjs';
 import 'path';
 import 'url';
-import './sync-MTpgBfV2.mjs';
-import './time-7iVn8KLQ.mjs';
+import './sync-D5YqUVjS.mjs';
+import './time-CvrpeD3S.mjs';
 import './types-CkqAACXx.mjs';
 import './transcriptCursor-B7T_gkQ0.mjs';
-import './startFileWatcher-CgH0PknF.mjs';
+import './startFileWatcher-CaYRObJu.mjs';
 import 'fs/promises';
 
 async function claudeLocalLauncher(session) {

package/dist/{claudeLocalLauncher-CFlsscqX.cjs → claudeLocalLauncher-Dnv4CH8r.cjs}

@@ -1,22 +1,22 @@
 'use strict';
 
-var logger = require('./logger-XjIS0lU7.cjs');
-var claudeLocal = require('./claudeLocal-Cg8Qn4tF.cjs');
-var sessionScanner = require('./sessionScanner-BJFPUwar.cjs');
+var logger = require('./logger-C7dRaCkE.cjs');
+var claudeLocal = require('./claudeLocal-CtZVz3ee.cjs');
+var sessionScanner = require('./sessionScanner-BpegdnXK.cjs');
 require('chalk');
 require('node:util');
-require('./configuration-Btwt68O2.cjs');
+require('./configuration-UV4EE5ui.cjs');
 require('node:fs');
 require('node:os');
 require('node:path');
-require('./package-DFQUF2in.cjs');
+require('./package-VqWv7EI5.cjs');
 require('node:fs/promises');
 require('cross-spawn');
 require('node:readline');
 require('node:crypto');
 require('./smallFastModel-D_uxGMo3.cjs');
 require('./path-B7zW-WwE.cjs');
-require('./systemPrompt-DRCJdhNo.cjs');
+require('./systemPrompt-DaTKLEb-.cjs');
 require('./index-BZdhwBKa.cjs');
 require('zod');
 require('@paralleldrive/cuid2');
@@ -29,11 +29,11 @@ require('./claudeCliPath-U4HHmV4r.cjs');
 require('./projectPath-ChLhdOyt.cjs');
 require('path');
 require('url');
-require('./sync-CGVTRg-R.cjs');
-require('./time-ChuhR6SU.cjs');
+require('./sync-BK-IBkuB.cjs');
+require('./time-0szhiPo4.cjs');
 require('./types-CRS-srZK.cjs');
 require('./transcriptCursor-DcXGLeSc.cjs');
-require('./startFileWatcher-BJ4vTfRp.cjs');
+require('./startFileWatcher-BtBaahTn.cjs');
 require('fs/promises');
 
 async function claudeLocalLauncher(session) {

package/dist/{claudeSessionFork-bp8LeRZ9.mjs → claudeSessionFork-CxjOBoBh.mjs}

@@ -3,7 +3,7 @@ import { copyFile, unlink, readFile, rename, writeFile } from 'node:fs/promises'
 import { createReadStream, createWriteStream } from 'node:fs';
 import { join } from 'node:path';
 import { createInterface } from 'node:readline';
-import { l as logger } from './logger-CUxbqfrp.mjs';
+import { l as logger } from './logger-D5EzMy30.mjs';
 
 class ForkTruncateUuidNotFoundError extends Error {
   constructor(cutAfterUuid, sourcePath) {

package/dist/{claudeSessionFork-DmwPXMmz.cjs → claudeSessionFork-DQk5-dzR.cjs}

@@ -5,7 +5,7 @@ var promises = require('node:fs/promises');
 var node_fs = require('node:fs');
 var path = require('node:path');
 var node_readline = require('node:readline');
-var logger = require('./logger-XjIS0lU7.cjs');
+var logger = require('./logger-C7dRaCkE.cjs');
 
 class ForkTruncateUuidNotFoundError extends Error {
   constructor(cutAfterUuid, sourcePath) {

package/dist/{client-QtWC3yii.cjs → client-BHZVyQwi.cjs}

@@ -1,9 +1,9 @@
 'use strict';
 
 var node_crypto = require('node:crypto');
-var configuration = require('./configuration-Btwt68O2.cjs');
-var persistence = require('./persistence-BO7AS2NK.cjs');
-var context = require('./context-BknomZTq.cjs');
+var configuration = require('./configuration-UV4EE5ui.cjs');
+var persistence = require('./persistence-DweHi8xa.cjs');
+var context = require('./context-BmH2BKip.cjs');
 
 async function teamRequest(path, method, token, scoped, body) {
   const response = await fetch(`${configuration.configuration.serverUrl}${path}`, {

package/dist/{client-B6H6ZROd.cjs → client-BhLhjj_x.cjs}

@@ -1,7 +1,7 @@
 'use strict';
 
-var configuration = require('./configuration-Btwt68O2.cjs');
-var persistence = require('./persistence-BO7AS2NK.cjs');
+var configuration = require('./configuration-UV4EE5ui.cjs');
+var persistence = require('./persistence-DweHi8xa.cjs');
 
 class AutomationsRequestError extends Error {
   constructor(status, code, runStatus) {

package/dist/{client-Bi1DOVy9.mjs → client-C4ddTzrD.mjs}

@@ -1,5 +1,5 @@
-import { c as configuration } from './configuration-zOfO2qdB.mjs';
-import { c as readCredentialsForConfiguredRelay, r as readSettings } from './persistence-CBToZ0R6.mjs';
+import { c as configuration } from './configuration-BNGPXg07.mjs';
+import { c as readCredentialsForConfiguredRelay, r as readSettings } from './persistence-CIIhP0Uw.mjs';
 
 class AutomationsRequestError extends Error {
   constructor(status, code, runStatus) {

package/dist/{client-DbqP92Fy.mjs → client-eQjOvC55.mjs}

@@ -1,7 +1,7 @@
 import { randomUUID } from 'node:crypto';
-import { c as configuration } from './configuration-zOfO2qdB.mjs';
-import { r as readSettings, b as readPersistedSessions, c as readCredentialsForConfiguredRelay } from './persistence-CBToZ0R6.mjs';
-import { r as readTeamScope, t as teamScopePath, w as writeTeamScope } from './context-BTX3YYdt.mjs';
+import { c as configuration } from './configuration-BNGPXg07.mjs';
+import { r as readSettings, b as readPersistedSessions, c as readCredentialsForConfiguredRelay } from './persistence-CIIhP0Uw.mjs';
+import { r as readTeamScope, t as teamScopePath, w as writeTeamScope } from './context-Ptdnlcv6.mjs';
 
 async function teamRequest(path, method, token, scoped, body) {
   const response = await fetch(`${configuration.serverUrl}${path}`, {

package/dist/codex/happyMcpStdioBridge.cjs

@@ -1,8 +1,8 @@
 'use strict';
 
-var tools = require('../tools-9hPR5-u8.cjs');
-var reportProgressTool = require('../reportProgressTool-oJMMqzKb.cjs');
-var peerTools = require('../peerTools-DbI6tEk1.cjs');
+var tools = require('../tools-C77-Ssan.cjs');
+var reportProgressTool = require('../reportProgressTool-DzMi4mvH.cjs');
+var peerTools = require('../peerTools-BktGmlpd.cjs');
 var agentGuidance = require('../agentGuidance-BtBx2xxE.cjs');
 var mcp_js = require('@modelcontextprotocol/sdk/server/mcp.js');
 var stdio_js = require('@modelcontextprotocol/sdk/server/stdio.js');
@@ -10,33 +10,33 @@ var index_js = require('@modelcontextprotocol/sdk/client/index.js');
 var streamableHttp_js = require('@modelcontextprotocol/sdk/client/streamableHttp.js');
 var z = require('zod');
 var limits = require('../limits-C-a7gr04.cjs');
-require('../client-QtWC3yii.cjs');
+require('../client-BHZVyQwi.cjs');
 require('node:crypto');
-require('../configuration-Btwt68O2.cjs');
+require('../configuration-UV4EE5ui.cjs');
 require('node:fs');
 require('node:os');
 require('node:path');
-require('../package-DFQUF2in.cjs');
+require('../package-VqWv7EI5.cjs');
 require('node:fs/promises');
-require('../persistence-BO7AS2NK.cjs');
+require('../persistence-DweHi8xa.cjs');
 require('../authRelay-BdYkC1Po.cjs');
 require('tweetnacl');
-require('../logger-XjIS0lU7.cjs');
+require('../logger-C7dRaCkE.cjs');
 require('chalk');
 require('node:util');
-require('../context-BknomZTq.cjs');
+require('../context-BmH2BKip.cjs');
 require('../index-BZdhwBKa.cjs');
 require('@paralleldrive/cuid2');
-require('../client-B6H6ZROd.cjs');
+require('../client-BhLhjj_x.cjs');
 require('../precheckCompat-CWOi5c9L.cjs');
 require('../ids-B6ZC0HGt.cjs');
-require('../controlClient-CEpaptre.cjs');
-require('../sessionOps-C7wI8Ll6.cjs');
+require('../controlClient-CtsQMw--.cjs');
+require('../sessionOps-9MChM9Op.cjs');
 require('axios');
-require('../time-ChuhR6SU.cjs');
+require('../time-0szhiPo4.cjs');
 require('socket.io-client');
 require('../backgroundTaskActivity-CBvUdj39.cjs');
-require('../remoteSessionClient-D79ci1L8.cjs');
+require('../remoteSessionClient-CL3akj0K.cjs');
 require('../trimIdent-4gvk9Wk6.cjs');
 
 function parseArgs(argv) {

package/dist/codex/happyMcpStdioBridge.mjs

@@ -1,6 +1,6 @@
-import { r as registerTeamsTools } from '../tools-BSlqfWAq.mjs';
-import { r as registerAutomationTools, a as registerReportProgressTool } from '../reportProgressTool-DujvMncK.mjs';
-import { r as registerSessionPeerTools } from '../peerTools-zfe59JAw.mjs';
+import { r as registerTeamsTools } from '../tools-Cp0qJeBq.mjs';
+import { r as registerAutomationTools, a as registerReportProgressTool } from '../reportProgressTool-BLLwMQrN.mjs';
+import { r as registerSessionPeerTools } from '../peerTools-B_eiNB3P.mjs';
 import { P as PREVIEW_TOOL_NAME, a as PREVIEW_TOOL_TITLE, b as PREVIEW_TOOL_DESCRIPTION, c as PREVIEW_DOWNLOAD_PARAM_DESCRIPTION, R as REPORT_PROGRESS_TOOL_NAME } from '../agentGuidance-BDYt2Qy2.mjs';
 import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
 import { StdioServerTransport } from '@modelcontextprotocol/sdk/server/stdio.js';
@@ -8,33 +8,33 @@ import { Client } from '@modelcontextprotocol/sdk/client/index.js';
 import { StreamableHTTPClientTransport } from '@modelcontextprotocol/sdk/client/streamableHttp.js';
 import { z } from 'zod';
 import { C as CLIPBOARD_TOOL_NAME, a as CLIPBOARD_TOOL_TITLE, b as CLIPBOARD_TOOL_DESCRIPTION } from '../limits-DIo7rEBR.mjs';
-import '../client-DbqP92Fy.mjs';
+import '../client-eQjOvC55.mjs';
 import 'node:crypto';
-import '../configuration-zOfO2qdB.mjs';
+import '../configuration-BNGPXg07.mjs';
 import 'node:fs';
 import 'node:os';
 import 'node:path';
-import '../package-DkI3yDe0.mjs';
+import '../package-D0dxZ-W8.mjs';
 import 'node:fs/promises';
-import '../persistence-CBToZ0R6.mjs';
+import '../persistence-CIIhP0Uw.mjs';
 import '../authRelay-DSAvg1uv.mjs';
 import 'tweetnacl';
-import '../logger-CUxbqfrp.mjs';
+import '../logger-D5EzMy30.mjs';
 import 'chalk';
 import 'node:util';
-import '../context-BTX3YYdt.mjs';
+import '../context-Ptdnlcv6.mjs';
 import '../index-boE-d8CM.mjs';
 import '@paralleldrive/cuid2';
-import '../client-Bi1DOVy9.mjs';
+import '../client-C4ddTzrD.mjs';
 import '../precheckCompat-DeEbilbr.mjs';
 import '../ids-DU6sLx4C.mjs';
-import '../controlClient-CbmWgWJW.mjs';
-import '../sessionOps-DfAtoDD5.mjs';
+import '../controlClient-DqtC0pq1.mjs';
+import '../sessionOps-ByZJbkMq.mjs';
 import 'axios';
-import '../time-7iVn8KLQ.mjs';
+import '../time-CvrpeD3S.mjs';
 import 'socket.io-client';
 import '../backgroundTaskActivity-8PdPxrvy.mjs';
-import '../remoteSessionClient-Bk1Qzb5I.mjs';
+import '../remoteSessionClient-CUjw1COc.mjs';
 import '../trimIdent-BAjmv_TG.mjs';
 
 function parseArgs(argv) {

package/dist/{codexAppServerClient-pnCpJlD8.mjs → codexAppServerClient-CppPl_R6.mjs}

@@ -1,11 +1,11 @@
 import { execSync } from 'node:child_process';
 import { spawn } from 'cross-spawn';
 import { createInterface } from 'node:readline';
-import { l as logger } from './logger-CUxbqfrp.mjs';
+import { l as logger } from './logger-D5EzMy30.mjs';
 import { e as errorLogMetadata, c as contentLogMetadata } from './contentLogMetadata-BlWI0egu.mjs';
 import { i as initializeSandbox, w as wrapForMcpTransport } from './manager-BEsI4qt3.mjs';
-import { p as packageJson } from './package-DkI3yDe0.mjs';
-import { s as shouldReadCodexRateLimits, i as isUnsupportedCodexMethodError } from './rateLimitWindows-i2-530Zt.mjs';
+import { p as packageJson } from './package-D0dxZ-W8.mjs';
+import { s as shouldReadCodexRateLimits, i as isUnsupportedCodexMethodError } from './rateLimitWindows-Bo6XVnie.mjs';
 
 function isAppServerAvailable() {
   try {
@@ -89,7 +89,6 @@ class CodexAppServerClient {
   _turnId = null;
   threadDefaults = null;
   // Turn completion tracking for the currently active sendTurnAndWait call.
-  // A completion event only resolves once we have seen task_started for this turn.
   pendingTurnCompletion = null;
   // Tracks in-flight interruptTurn() RPCs so sendTurnAndWait can wait for them
   // before starting a new turn (prevents stale turn/interrupt from aborting the next turn).
@@ -99,6 +98,22 @@ class CodexAppServerClient {
   idleRelease = null;
   notificationProtocol = "unknown";
   completedTurnIds = /* @__PURE__ */ new Set();
+  /** B-625: turns whose failure has already been forwarded, so a second failed frame is not. */
+  failedTurnIds = /* @__PURE__ */ new Set();
+  // B-625: the app-server speaks for every thread it hosts — the session's own and the
+  // children `spawn_agent` opens — so a lifecycle frame (turn/started, turn/completed,
+  // thread/status/changed, error, thread/closed) is the session's only when its `threadId`
+  // is ours; a frame naming no thread belongs to the thread it was asked on (Orca's rule,
+  // src/main/codex/codex-structured-turn-open-wait.ts). Before this, a child's
+  // `turn/completed` ended the parent's turn in the UI and a child's `turn/started`
+  // retargeted `turn/interrupt` at the child.
+  /** The own thread's last turn-ending `error` (willRetry=false), for a turn end that arrives without a verdict. */
+  lastTurnError = null;
+  /** Own thread reported idle/systemError while a turn was pending: Codex's `turn/completed`
+   *  follows within a millisecond; this ends the turn if it does not (see armThreadStopGrace). */
+  threadStopGrace = null;
+  /** Last few hundred chars of the app-server's stderr: Codex's own last words when it dies. */
+  stderrRing = "";
   rawFileChangesByItemId = /* @__PURE__ */ new Map();
   // B-622: inactivity watchdog for the pending turn — re-armed by every
   // notification, never a cap on how long a turn may run (see sendTurnAndWait).
@@ -167,8 +182,21 @@ class CodexAppServerClient {
     const status = params?.turn?.status ?? params?.status ?? null;
     return typeof status === "string" && status.length > 0 ? status : null;
   }
+  extractThreadId(params) {
+    const threadId = params?.threadId ?? params?.thread_id ?? params?.thread?.id ?? null;
+    return typeof threadId === "string" && threadId.length > 0 ? threadId : null;
+  }
+  /** B-625: whether a lifecycle frame is about the session's own thread (see the field comment). */
+  isOwnThreadFrame(params) {
+    const threadId = this.extractThreadId(params);
+    return threadId === null || this._threadId === null || threadId === this._threadId;
+  }
+  /** Codex's last stderr lines, one line, for a message a person reads. */
+  stderrTail() {
+    return this.stderrRing.replace(/\x1b\[[0-9;]*m/g, "").replace(/\s+/g, " ").trim();
+  }
   shouldHandleRawNotification(method) {
-    const isRawNotification = method === "thread/started" || method === "turn/started" || method === "turn/completed" || method === "thread/status/changed" || method === "thread/tokenUsage/updated" || method.startsWith("item/");
+    const isRawNotification = method === "thread/started" || method === "turn/started" || method === "turn/completed" || method === "thread/status/changed" || method === "thread/closed" || method === "thread/tokenUsage/updated" || method.startsWith("item/");
     if (!isRawNotification) {
       return false;
     }
@@ -183,14 +211,19 @@ class CodexAppServerClient {
   emitRawTurnCompletion(turnId, status, error, source) {
     const aborted = status === "cancelled" || status === "canceled" || status === "aborted" || status === "interrupted";
     const failed = status === "failed" || error !== void 0 && error !== null;
+    this.clearThreadStopGrace();
     this.tryResolvePendingTurn(aborted, turnId, source);
     this._turnId = null;
     this.maybeRefreshRateLimits();
+    if (this.lastTurnError && (!turnId || !this.lastTurnError.turnId || this.lastTurnError.turnId === turnId)) {
+      this.lastTurnError = null;
+    }
     if (turnId && this.completedTurnIds.has(turnId)) {
-      if (!failed) return;
+      if (!failed || this.failedTurnIds.has(turnId)) return;
     }
     if (turnId) {
       this.completedTurnIds.add(turnId);
+      if (failed) this.failedTurnIds.add(turnId);
     }
     if (aborted) {
       this.eventHandler?.({
@@ -213,6 +246,10 @@ class CodexAppServerClient {
       return false;
     }
     if (method === "turn/started") {
+      if (!this.isOwnThreadFrame(params)) {
+        logger.debug(`[CodexAppServer] Child thread ${this.extractThreadId(params)} started a turn`);
+        return true;
+      }
       const turnId = this.extractTurnId(params);
       if (turnId) {
         this._turnId = turnId;
@@ -225,6 +262,10 @@ class CodexAppServerClient {
       return true;
     }
     if (method === "turn/completed") {
+      if (!this.isOwnThreadFrame(params)) {
+        logger.debug(`[CodexAppServer] Child thread ${this.extractThreadId(params)} ended a turn`);
+        return true;
+      }
       this.emitRawTurnCompletion(
         this.extractTurnId(params),
         this.extractTurnStatus(params),
@@ -234,9 +275,23 @@ class CodexAppServerClient {
       return true;
     }
     if (method === "thread/status/changed") {
+      if (!this.isOwnThreadFrame(params)) return true;
       const statusType = params?.status?.type;
-      if (statusType === "idle" && this.pendingTurnCompletion) {
-        this.emitRawTurnCompletion(this._turnId, "completed", null, method);
+      if ((statusType === "idle" || statusType === "systemError") && this.pendingTurnCompletion?.opened) {
+        this.armThreadStopGrace(statusType);
+      } else if (statusType === "active") {
+        this.clearThreadStopGrace();
+      }
+      return true;
+    }
+    if (method === "thread/closed") {
+      if (this.isOwnThreadFrame(params) && this.pendingTurnCompletion) {
+        this.emitRawTurnCompletion(
+          this.pendingTurnCompletion.turnId ?? this._turnId,
+          "aborted",
+          { message: "Codex closed the thread before the turn ended." },
+          method
+        );
       }
       return true;
     }
@@ -382,17 +437,35 @@ class CodexAppServerClient {
         return;
       }
       this.connected = false;
+      const tail = this.stderrTail();
+      const exited = `Codex process exited (code=${code ?? "null"}${signal ? `, signal=${signal}` : ""})`;
       for (const [id, req] of this.pending) {
         if (req.epoch !== epoch) continue;
-        req.reject(new Error(`Codex process exited (code=${code}) while waiting for ${req.method}`));
+        const error = new Error(`${exited} while waiting for ${req.method}`);
+        error.codexStderrTail = tail;
+        req.reject(error);
         this.pending.delete(id);
       }
+      if (this.pendingTurnCompletion) {
+        const turnId = this.pendingTurnCompletion.turnId ?? this._turnId;
+        this.eventHandler?.({
+          type: "turn_aborted",
+          reason: "process-exit",
+          ...turnId ? { turn_id: turnId } : {},
+          error: { message: `${exited}${tail ? `: ${tail}` : ""}` }
+        });
+      }
       this.resolvePendingTurn(true);
     });
+    this.stderrRing = "";
     proc.stderr?.on("data", (chunk) => {
       if (this.process !== proc || this.processEpoch !== epoch) return;
       const text = chunk.toString().trim();
-      if (text) logger.debug("[CodexAppServer:stderr]", contentLogMetadata(text));
+      if (text) {
+        logger.debug("[CodexAppServer:stderr]", contentLogMetadata(text));
+        this.stderrRing = `${this.stderrRing}
+${text}`.slice(-400);
+      }
     });
     this.readline = createInterface({ input: proc.stdout });
     this.readline.on("line", (line) => {
@@ -443,6 +516,9 @@ class CodexAppServerClient {
     this._turnId = null;
     this.notificationProtocol = "unknown";
     this.completedTurnIds.clear();
+    this.failedTurnIds.clear();
+    this.lastTurnError = null;
+    this.clearThreadStopGrace();
     if (!opts?.preserveThreadState) {
       this._threadId = null;
       this.threadDefaults = null;
@@ -661,15 +737,49 @@ class CodexAppServerClient {
   resolvePendingTurn(aborted) {
     if (!this.pendingTurnCompletion) return;
     this.clearTurnWatchdog();
+    this.clearThreadStopGrace();
     this.pendingTurnCompletion.resolve(aborted);
     this.pendingTurnCompletion = null;
   }
   markPendingTurnStarted(turnId) {
     if (!this.pendingTurnCompletion) return;
+    this.pendingTurnCompletion.opened = true;
     if (turnId) {
       this.pendingTurnCompletion.turnId = turnId;
     }
   }
+  /** Default wait for Codex's `turn/completed` after its thread reported idle/systemError. */
+  static THREAD_STOP_GRACE_MS = 1500;
+  /**
+   * B-625: the own thread stopped (idle / systemError) while a turn was pending and
+   * had opened. Codex's `turn/completed` follows at once in every probed release
+   * (0.154.0: 1 ms); this is the net under a release that does not send it, so the
+   * session never waits on the silence watchdog for a turn Codex has already left.
+   */
+  armThreadStopGrace(statusType) {
+    this.clearThreadStopGrace();
+    const graceMs = this.pendingTurnCompletion?.threadStopGraceMs ?? CodexAppServerClient.THREAD_STOP_GRACE_MS;
+    this.threadStopGrace = setTimeout(() => {
+      this.threadStopGrace = null;
+      const pending = this.pendingTurnCompletion;
+      if (!pending) return;
+      const turnId = pending.turnId ?? this._turnId;
+      const lastError = this.lastTurnError && (!turnId || !this.lastTurnError.turnId || this.lastTurnError.turnId === turnId) ? this.lastTurnError.error : null;
+      logger.warn(`[CodexAppServer] Thread went ${statusType} and no turn/completed followed for turn ${turnId ?? "?"}; ending the turn`);
+      const failed = statusType === "systemError" || lastError !== null;
+      this.emitRawTurnCompletion(
+        turnId,
+        failed ? "failed" : "completed",
+        lastError ?? (failed ? { message: "Codex reported a system error and ended the turn without a verdict." } : null),
+        `thread/status/changed:${statusType}`
+      );
+    }, graceMs);
+  }
+  clearThreadStopGrace() {
+    if (!this.threadStopGrace) return;
+    clearTimeout(this.threadStopGrace);
+    this.threadStopGrace = null;
+  }
   tryResolvePendingTurn(aborted, turnId, source) {
     const pending = this.pendingTurnCompletion;
     if (!pending) return;
@@ -771,6 +881,8 @@ class CodexAppServerClient {
   }
   /** Default timeout for waiting on turn completion (ms). 10 minutes. */
   static TURN_TIMEOUT_MS = 10 * 60 * 1e3;
+  /** How much of the app-server's stderr is kept for its exit message. */
+  static STDERR_TAIL_CHARS = 400;
   /**
    * Send a user turn and wait for it to complete (task_complete or turn_aborted).
    * Returns { aborted: true } if the turn was aborted (user cancel, permission reject, etc.).
@@ -785,8 +897,11 @@ class CodexAppServerClient {
     const completion = new Promise((resolve) => {
       this.pendingTurnCompletion = {
         resolve,
-        turnId: null
+        turnId: null,
+        opened: false,
+        threadStopGraceMs: opts?.threadStopGraceMs ?? CodexAppServerClient.THREAD_STOP_GRACE_MS
       };
+      this.lastTurnError = null;
       this.armTurnWatchdog(timeoutMs);
     });
     try {
@@ -866,6 +981,8 @@ class CodexAppServerClient {
     this._turnId = null;
     this.threadDefaults = null;
     this.completedTurnIds.clear();
+    this.failedTurnIds.clear();
+    this.lastTurnError = null;
     this.rawFileChangesByItemId.clear();
   }
   // ─── JSON-RPC transport ─────────────────────────────────────
@@ -1134,6 +1251,7 @@ class CodexAppServerClient {
     }
     if (method === "thread/started" || method === "turn/started" || method === "turn/completed" || method === "thread/status/changed") {
       logger.debug(`[CodexAppServer] Lifecycle notification: ${method}`);
+      if (!this.isOwnThreadFrame(params)) return;
       if (method === "turn/started") {
         const turnId = this.extractTurnId(params);
         if (turnId) {
@@ -1160,19 +1278,28 @@ class CodexAppServerClient {
       logger.debug(`[CodexAppServer] mcpServer startup status:`, params);
       return;
     }
-    if (method === "error" && params?.willRetry === true) {
+    if (method === "error") {
+      if (!this.isOwnThreadFrame(params)) return;
       const error = params?.error ?? {};
-      const message = typeof error.message === "string" ? error.message : "";
-      const info = error.codexErrorInfo;
-      const httpStatus = info && typeof info === "object" ? info.responseStreamDisconnected?.httpStatusCode ?? info.httpStatusCode ?? null : null;
-      const turnId = typeof params?.turnId === "string" ? params.turnId : null;
-      this.eventHandler?.({
-        type: "turn_retry",
-        message,
-        ...typeof httpStatus === "number" ? { http_status: httpStatus } : {},
-        ...turnId ? { turn_id: turnId } : {},
-        ...typeof error.additionalDetails === "string" ? { details: error.additionalDetails } : {}
-      });
+      const turnId = typeof params?.turnId === "string" && params.turnId.length > 0 ? params.turnId : null;
+      if (params?.willRetry === true) {
+        const message = typeof error.message === "string" ? error.message : "";
+        const info = error.codexErrorInfo;
+        const httpStatus = info && typeof info === "object" ? info.responseStreamDisconnected?.httpStatusCode ?? info.httpStatusCode ?? null : null;
+        this.eventHandler?.({
+          type: "turn_retry",
+          message,
+          ...typeof httpStatus === "number" ? { http_status: httpStatus } : {},
+          ...turnId ? { turn_id: turnId } : {},
+          ...typeof error.additionalDetails === "string" ? { details: error.additionalDetails } : {}
+        });
+        return;
+      }
+      this.lastTurnError = { turnId, error };
+      const pending = this.pendingTurnCompletion;
+      if (pending && !pending.opened && (turnId === null || pending.turnId === null || pending.turnId === turnId)) {
+        this.emitRawTurnCompletion(turnId ?? pending.turnId, "failed", error, "error:unopened-turn");
+      }
       return;
     }
     logger.debug(`[CodexAppServer] Notification: ${method}`);