very-happy-cli 0.2.188 → 0.2.190

package/dist/{codexCommand-1vFEA1KT.cjs → codexCommand-39kH99SJ.cjs}

@@ -1,107 +1,109 @@
 'use strict';
 
-var auth = require('./auth-CXmI92aj.cjs');
+var auth = require('./auth-Bb_SL2os.cjs');
 var index = require('./index-BOe6dKnL.cjs');
-var deterministicJson = require('./deterministicJson-D0BrV1FD.cjs');
-var client = require('./client-agH03Irm.cjs');
+var deterministicJson = require('./deterministicJson-BEygolBQ.cjs');
+var client = require('./client-CMKGrnmT.cjs');
 var promises = require('node:fs/promises');
 var forkBackfill = require('./forkBackfill-8eLDeS73.cjs');
 var node_crypto = require('node:crypto');
 var cuid2 = require('@paralleldrive/cuid2');
-var api = require('./api-BOqjYd5r.cjs');
-var agentAttachments = require('./agentAttachments-Dbw8iMCZ.cjs');
-var attachmentContent = require('./attachmentContent-BFRMLong.cjs');
+var api = require('./api-CXL6jp-p.cjs');
+var heldInput = require('./heldInput-BOtqFO2r.cjs');
+var attachmentContent = require('./attachmentContent-NmVfKp-B.cjs');
 var ink = require('ink');
-var sessionLock = require('./sessionLock-DjE7O0LS.cjs');
+var sessionLock = require('./sessionLock-BFBReiKq.cjs');
 var React = require('react');
-var codexAppServerClient = require('./codexAppServerClient-DwzC8LR0.cjs');
-var rateLimitReporter = require('./rateLimitReporter-BkHyvLru.cjs');
-var logger = require('./logger-C3vZG6Q0.cjs');
-var BasePermissionHandler = require('./BasePermissionHandler-C8UEcFz0.cjs');
-var codexTermination = require('./codexTermination-DuDPyBRR.cjs');
+var codexAppServerClient = require('./codexAppServerClient-CpT9F6EM.cjs');
+var rateLimitReporter = require('./rateLimitReporter-DUu2KydZ.cjs');
+var logger = require('./logger-BBRTTVsQ.cjs');
+var BasePermissionHandler = require('./BasePermissionHandler-CpSugp7Z.cjs');
+var codexTermination = require('./codexTermination-ByW7tRjr.cjs');
 var node_child_process = require('node:child_process');
-var persistence = require('./persistence-CqtjFiD1.cjs');
-var machineMetadata = require('./machineMetadata-CAvFq1Jg.cjs');
-var configuration = require('./configuration-DyPW9mVa.cjs');
-var specialCommands = require('./specialCommands-BsvSoDhC.cjs');
+var persistence = require('./persistence-Bl5S3TLB.cjs');
+var machineMetadata = require('./machineMetadata-DnFNlrVK.cjs');
+var configuration = require('./configuration-Dt5lKW3P.cjs');
+var registerKillSessionHandler = require('./registerKillSessionHandler-CA1FFr_F.cjs');
 var projectPath = require('./projectPath-C3ioB4Bu.cjs');
 var path = require('node:path');
-var createSessionMetadata = require('./createSessionMetadata-Dpg6bV6f.cjs');
+var createSessionMetadata = require('./createSessionMetadata-B_HZCDj_.cjs');
 var sessionExitLifecycle = require('./sessionExitLifecycle-DFltxXU8.cjs');
-var controlClient = require('./controlClient-DvFaPsg6.cjs');
-var defaultPermissionMode = require('./defaultPermissionMode-Dlm0q1m0.cjs');
+var controlClient = require('./controlClient-BRk65BRO.cjs');
+var startupSessionCreate = require('./startupSessionCreate-Dxy3X4DG.cjs');
 var authRelay = require('./authRelay-Dy1qU9td.cjs');
-var setupOfflineReconnection = require('./setupOfflineReconnection-CQHNuP_0.cjs');
-var startupSessionCreate = require('./startupSessionCreate-C1u2dtz8.cjs');
+var setupOfflineReconnection = require('./setupOfflineReconnection-DPXRo_zf.cjs');
 var trimIdent = require('./trimIdent-4gvk9Wk6.cjs');
+var specialCommands = require('./specialCommands-J3JFOq0J.cjs');
 var constants = require('./constants-VJ0N6WuG.cjs');
+var defaultPermissionMode = require('./defaultPermissionMode-CxmTXUQR.cjs');
 var editPaths = require('./editPaths-Bqp4OFPw.cjs');
-var ensureDaemonRunning = require('./ensureDaemonRunning-Ce3BlWiR.cjs');
+var ensureDaemonRunning = require('./ensureDaemonRunning-Bibp6vhe.cjs');
 require('tweetnacl');
 require('axios');
-require('./time-BAJRbB6U.cjs');
-require('./browser-D3uBFRQu.cjs');
+require('./time-gPD_EmA-.cjs');
+require('./browser-CLJWcodR.cjs');
 require('open');
 require('zod');
 require('./prompt-Bof2aQkI.cjs');
-require('./reportProgressTool-CaJ8EwLq.cjs');
-require('./client-DmY03OZZ.cjs');
+require('./reportProgressTool-CvPGov1F.cjs');
+require('./client-Bffkrs5p.cjs');
 require('./precheckCompat-CWOi5c9L.cjs');
 require('./agentGuidance-BtBx2xxE.cjs');
 require('node:fs');
 require('node:os');
 require('./pi-DlsrPCTa.cjs');
 require('./fileStore-7qhnbs6N.cjs');
-require('./client-C2HcMqRF.cjs');
+require('./client-CARZ_lNS.cjs');
 require('node:util');
-require('./context-2xDvjkQp.cjs');
-require('./sessionOps-DGMpl9NB.cjs');
+require('./context-BdZssgF0.cjs');
+require('./sessionOps-DeWVqpe4.cjs');
 require('socket.io-client');
 require('./backgroundTaskActivity-CBvUdj39.cjs');
 require('./resources-BZ_Be0qM.cjs');
-require('./tools-30E66QL_.cjs');
-require('./peerTools-C1E5cQ86.cjs');
+require('./tools-DvqbLsCF.cjs');
+require('./peerTools-5ZM4spcZ.cjs');
 require('./ids-B6ZC0HGt.cjs');
-require('./remoteSessionClient-DgUMfPW4.cjs');
+require('./remoteSessionClient-DGFI__5Z.cjs');
 require('@modelcontextprotocol/sdk/server/mcp.js');
 require('node:http');
 require('@modelcontextprotocol/sdk/server/streamableHttp.js');
 require('./limits-C-a7gr04.cjs');
-require('./downloadTarget-CuhBVvuC.cjs');
+require('./downloadTarget-DS0zT2AU.cjs');
 require('./terminals-B_bfC9c2.cjs');
 require('./terminalTitleSuggest-DhvRFX3H.cjs');
 require('./tmuxSocket-D-Xt6Vn-.cjs');
-require('./bootstrap-eJ1l7VYl.cjs');
-require('./package-Gnf_935w.cjs');
+require('./bootstrap-DBJB0y-H.cjs');
+require('./package-DrY090nZ.cjs');
 require('./webPanels-FCgFKvVe.cjs');
-require('./pushNotifications-Bb-QSqXw.cjs');
+require('./pushNotifications-CfspRcl-.cjs');
 require('./contentLogMetadata-ZSFk_NjQ.cjs');
 require('./previewPath-B0rBdhy1.cjs');
 require('crypto');
-require('./lidState-d1vgQ3n7.cjs');
+require('./lidState-q_XFYg33.cjs');
 require('os');
 require('child_process');
 require('node:events');
-require('./registerCommonHandlers-CIs6H2DV.cjs');
+require('./registerCommonHandlers-Beun-cQv.cjs');
 require('util');
 require('fs/promises');
 require('path');
 require('cross-spawn');
-require('./sync-6HFRJP1h.cjs');
+require('./sync-DtWB7RzA.cjs');
 require('chalk');
+require('./cliUpdate-DsKXPFYp.cjs');
 require('./processTreeSnapshot-mDbnuojn.cjs');
 require('node:readline');
 require('./manager-HrEj442o.cjs');
 require('@anthropic-ai/sandbox-runtime');
-require('./rateLimitWindows-Bm_dcQGW.cjs');
+require('./rateLimitWindows-Bx3ROBP5.cjs');
 require('./processTree-CMHWlVse.cjs');
 require('./detectCLI-BuYR_Qxe.cjs');
 require('fs');
-require('./localHappyAgentAuth-DucSnCg3.cjs');
+require('./localHappyAgentAuth-CKNW-MXw.cjs');
 require('./fsMkdir-0K3yENml.cjs');
 require('./types-CRS-srZK.cjs');
 require('url');
-require('./spawnHappyCLI-BJUd974I.cjs');
+require('./spawnHappyCLI-CTy3p6V_.cjs');
 require('./doctorReadiness-Dl6yRQCy.cjs');
 
 function getStartedSubagents(state) {
@@ -1096,6 +1098,19 @@ function unsupportedEffortReason(catalog, model, effort) {
   return `Reasoning effort "${effort}" is not supported by ${model ?? "the default model"}. Choose a supported level.`;
 }
 
+function resolveCodexTurnModel(mode, machineDefault) {
+  if (mode.model) return mode.model;
+  return mode.modelReset ? machineDefault || void 0 : void 0;
+}
+function codexModelFacts(input) {
+  const { threadModel, pendingModel, machineDefault } = input;
+  if (!threadModel) return { stickyModel: pendingModel ?? null };
+  return {
+    stickyModel: threadModel !== machineDefault ? threadModel : null,
+    currentModelCode: threadModel
+  };
+}
+
 const UNEXPECTED_STATUS = /^unexpected status (\d{3}) ([^:]*?):\s*([\s\S]*?)(?:,\s*url:\s*(\S+))?$/;
 function readableCodexErrorText(text) {
   const trimmed = text.trim();
@@ -1377,6 +1392,7 @@ function hashCodexEnhancedMode(mode) {
   return deterministicJson.hashObject({
     permissionMode: mode.permissionMode,
     model: mode.model,
+    modelReset: mode.modelReset,
     appendSystemPrompt: mode.appendSystemPrompt,
     effort: mode.effort
   });
@@ -1430,6 +1446,16 @@ function safeCodexErrorMetadata(value) {
   };
 }
 
+const CODEX_REMOTE_PERMISSION_MODES = [
+  "default",
+  "read-only",
+  "safe-yolo",
+  "yolo"
+];
+function codexPublishablePermissionMode(mode) {
+  return typeof mode === "string" && CODEX_REMOTE_PERMISSION_MODES.includes(mode) ? mode : null;
+}
+
 const DEFAULT_CODEX_MODEL = void 0;
 const DEFAULT_CODEX_EFFORT = "medium";
 async function runCodex(opts) {
@@ -1474,9 +1500,11 @@ async function runCodex(opts) {
     dangerouslySkipPermissions: initialPermissionMode === "yolo" || initialPermissionMode === "bypassPermissions",
     ...forkedFromSessionId ? { parentSessionId: forkedFromSessionId } : {},
     ...forkedFromMessageId ? { forkedFromMessageId } : {},
-    capabilities: [index.PROMPT_QUEUE_CAPABILITY, forkBackfill.FORK_BACKFILL_CAPABILITY, persistence.HIBERNATION_CAPABILITY, index.CODEX_STEER_CAPABILITY, index.PROJECT_SESSION_CAPABILITY, index.CODEX_COMPACT_CAPABILITY]
+    capabilities: [index.PROMPT_QUEUE_CAPABILITY, forkBackfill.FORK_BACKFILL_CAPABILITY, persistence.HIBERNATION_CAPABILITY, sessionLock.AUTO_RESTART_CAPABILITY, index.CODEX_STEER_CAPABILITY, index.PROJECT_SESSION_CAPABILITY, index.CODEX_COMPACT_CAPABILITY]
   });
   metadata.attachmentKinds = [...attachmentContent.CLAUDE_ATTACHMENT_KINDS];
+  metadata.stickyModel = null;
+  metadata.currentThoughtLevelCode = DEFAULT_CODEX_EFFORT;
   const importCodexThreadId = process.env[IMPORT_CODEX_THREAD_ENV];
   if (importCodexThreadId) {
     metadata.importedFromCodexThreadId = importCodexThreadId;
@@ -1577,7 +1605,7 @@ async function runCodex(opts) {
       logger.logger.debug("[START] Failed to report to daemon (may not be running)", safeCodexErrorMetadata(error));
     }
   }
-  const messageQueue = new specialCommands.MessageQueue2(hashCodexEnhancedMode);
+  const messageQueue = new registerKillSessionHandler.MessageQueue2(hashCodexEnhancedMode);
   function attachPromptQueueDrain(client2) {
     const drain = client2.attachPromptQueueDrain({
       isIdle: () => messageQueue.size() === 0 && messageQueue.isWaiting()
@@ -1589,25 +1617,50 @@ async function runCodex(opts) {
     const keys = entries.map((entry) => entry.sourceId).filter((key) => typeof key === "string");
     if (keys.length > 0) session.sendQueueCancelReason(keys, entries[0].reason);
   });
+  const heldInput$1 = new heldInput.HeldInput((keys, reason) => session.sendQueueCancelReason(keys, reason));
   let currentPermissionMode = initialPermissionMode;
   let currentModel = DEFAULT_CODEX_MODEL;
   let currentEffort = DEFAULT_CODEX_EFFORT;
   let currentAppendSystemPrompt = void 0;
+  let reportedStickyModel = null;
+  let reportedCurrentModel;
+  let reportedEffort = DEFAULT_CODEX_EFFORT;
+  const reportModeFacts = () => {
+    const facts = codexModelFacts({ threadModel: client$1.threadModel, pendingModel: currentModel, machineDefault: machineDefaultModel });
+    const effort = currentEffort;
+    if (facts.stickyModel === reportedStickyModel && facts.currentModelCode === reportedCurrentModel && effort === reportedEffort) return;
+    reportedStickyModel = facts.stickyModel;
+    reportedCurrentModel = facts.currentModelCode;
+    reportedEffort = effort;
+    session.updateMetadata((metadata2) => {
+      const { currentThoughtLevelCode: _previous, currentModelCode: _model, ...rest } = metadata2;
+      return {
+        ...rest,
+        stickyModel: facts.stickyModel,
+        ...facts.currentModelCode ? { currentModelCode: facts.currentModelCode } : {},
+        ...effort ? { currentThoughtLevelCode: effort } : {}
+      };
+    });
+  };
   const resetCurrentModeDefaults = () => {
-    currentPermissionMode = defaultPermissionMode.DEFAULT_CODEX_PERMISSION_MODE;
-    currentModel = DEFAULT_CODEX_MODEL;
     currentEffort = DEFAULT_CODEX_EFFORT;
+    reportModeFacts();
     currentAppendSystemPrompt = void 0;
     logger.logger.debug("[Codex] Reset current mode defaults after abort");
   };
-  const VALID_REMOTE_PERMISSION_MODES = [
-    "default",
-    "read-only",
-    "safe-yolo",
-    "yolo"
-  ];
+  const VALID_REMOTE_PERMISSION_MODES = CODEX_REMOTE_PERMISSION_MODES;
+  let publishedPermissionMode = null;
+  const publishPermissionMode = (mode) => {
+    const publishable = codexPublishablePermissionMode(mode);
+    if (!publishable || publishable === publishedPermissionMode) return;
+    publishedPermissionMode = publishable;
+    session.updateMetadata((currentMetadata) => ({ ...currentMetadata, permissionMode: publishable }));
+  };
+  publishPermissionMode(opts.permissionMode);
   let discoveredModels = [];
-  agentAttachments.registerAgentAttachmentDownloads(session);
+  let codexAgentVersion = null;
+  let machineDefaultModel;
+  heldInput.registerAgentAttachmentDownloads(session);
   const CODEX_IMAGE_MIME_TYPES = ["image/jpeg", "image/png", "image/gif", "image/webp"];
   const steerDeps = {
     ownsTurn: () => turnActive && !abortInProgress && !shouldExit,
@@ -1633,6 +1686,7 @@ async function runCodex(opts) {
         if (VALID_REMOTE_PERMISSION_MODES.includes(incoming)) {
           messagePermissionMode = incoming;
           currentPermissionMode = messagePermissionMode;
+          publishPermissionMode(incoming);
           logger.logger.debug("[Codex] Valid permission mode override applied");
         } else {
           logger.logger.debug("[Codex] Ignoring invalid permission mode override", logValueMetadata(message.meta.permissionMode));
@@ -1641,9 +1695,12 @@ async function runCodex(opts) {
         logger.logger.debug("[Codex] User message received without a permission mode override");
       }
       let messageModel = currentModel;
+      let messageModelReset = false;
       if (message.meta?.hasOwnProperty("model")) {
         messageModel = message.meta.model || void 0;
+        messageModelReset = !messageModel;
         currentModel = messageModel;
+        reportModeFacts();
         logger.logger.debug("[Codex] Model override updated", logValueMetadata(message.meta.model));
       } else {
         logger.logger.debug("[Codex] User message received without a model override");
@@ -1654,10 +1711,12 @@ async function runCodex(opts) {
         if (incoming === null || incoming === void 0) {
           messageEffort = void 0;
           currentEffort = void 0;
+          reportModeFacts();
           logger.logger.debug(`[Codex] Effort reset to default`);
         } else if (typeof incoming === "string") {
           messageEffort = incoming;
           currentEffort = messageEffort;
+          reportModeFacts();
           logger.logger.debug("[Codex] Valid effort override applied");
         } else {
           logger.logger.debug("[Codex] Ignoring invalid effort override", logValueMetadata(incoming));
@@ -1676,6 +1735,7 @@ async function runCodex(opts) {
       const enhancedMode = {
         permissionMode: messagePermissionMode || "default",
         model: messageModel,
+        ...messageModelReset ? { modelReset: true } : {},
         appendSystemPrompt: messageAppendSystemPrompt,
         effort: messageEffort
       };
@@ -1698,6 +1758,7 @@ async function runCodex(opts) {
     }).catch((error) => {
       logger.logger.warn("[Codex] Failed to prepare user attachments", safeCodexErrorMetadata(error));
       session.sendSessionEvent({ type: "message", message: "Could not prepare this message. Please send it again." });
+      if (message.localKey) session.sendQueueCancelReason([message.localKey], "failed");
     });
   });
   let thinking = false;
@@ -1740,7 +1801,8 @@ async function runCodex(opts) {
   }
   let abortController = new AbortController();
   let shouldExit = false;
-  const hibernationExit = new defaultPermissionMode.HibernationExitLatch((a, b) => a === "archive" && b !== "archive");
+  let terminating = false;
+  const hibernationExit = new startupSessionCreate.HibernationExitLatch((a, b) => a === "archive" && b !== "archive");
   let hibernationStamp = null;
   let hibernationProbe = null;
   async function handleAbort(source) {
@@ -1793,6 +1855,10 @@ async function runCodex(opts) {
     logger.logger.debug("[Codex] Kill session requested - terminating process");
     const exitCursor = intent === "offline" && session ? sessionLock.exitCursorStamp(session.messageCursor, Date.now()) : void 0;
     if (exitCursor) session.freezeInbound();
+    const exitReason = intent === "archive" ? "aborted" : "restarted";
+    terminating = true;
+    heldInput$1.drop(exitReason);
+    messageQueue.discardAll(exitReason);
     await handleAbort("kill");
     logger.logger.debug("[Codex] Abort completed, proceeding with termination");
     try {
@@ -1818,7 +1884,7 @@ async function runCodex(opts) {
     }
   });
   session.rpcHandlerManager.registerHandler("abort", () => handleAbort("user"));
-  const disposeTermination = specialCommands.registerKillSessionHandler(session.rpcHandlerManager, () => handleKillSession("archive"), session, { processSignals: true, onSignal: () => handleKillSession("offline") });
+  const disposeTermination = registerKillSessionHandler.registerKillSessionHandler(session.rpcHandlerManager, () => handleKillSession("archive"), session, { processSignals: true, onSignal: () => handleKillSession("offline") });
   const messageBuffer = new sessionExitLifecycle.MessageBuffer();
   const hasTTY = process.stdout.isTTY && process.stdin.isTTY;
   let inkInstance = null;
@@ -2018,6 +2084,7 @@ async function runCodex(opts) {
     logger.logger.debug("[codex]: client.connect begin");
     await client$1.connect();
     logger.logger.debug("[codex]: client.connect done");
+    codexAgentVersion = client$1.serverVersion;
     try {
       discoveredModels = await client$1.listModels();
       let configured = null;
@@ -2026,6 +2093,7 @@ async function runCodex(opts) {
       } catch (error) {
         logger.logger.debug("[Codex] config/read unavailable", safeCodexErrorMetadata(error));
       }
+      machineDefaultModel = configured?.model ?? discoveredModels.find((model) => model.isDefault)?.model;
       if (discoveredModels.length > 0 || configured) {
         session.updateMetadata((metadata2) => ({
           ...metadata2,
@@ -2069,6 +2137,7 @@ async function runCodex(opts) {
       first = false;
       appendSystemPromptInjected = true;
     }
+    reportModeFacts();
     const forkCodexThreadId = process.env.HAPPY_FORK_CODEX_THREAD_ID;
     if (!reconnectSessionId && forkCodexThreadId) {
       try {
@@ -2110,17 +2179,18 @@ async function runCodex(opts) {
           pendingRequests: Object.keys(session.getAgentState()?.requests ?? {}).length,
           backgroundTasks: codexActiveSubagents.size,
           lastActivityAt: session.lastActivityAt,
+          ...codexAgentVersion ? { agentVersion: codexAgentVersion } : {},
           ...shouldExit && !hibernationExit.hibernating ? { exiting: true } : {}
         };
       };
-      hibernationProbe = new defaultPermissionMode.HibernationProbe({
+      hibernationProbe = new startupSessionCreate.HibernationProbe({
         onKeepAwakeLatched: () => {
           if (session.getMetadata()?.keepAwake === void 0) session.updateMetadata((m) => m.keepAwake === void 0 ? { ...m, keepAwake: true } : m);
         },
         checkMs: persistence.resolveCheckMs(),
         snapshot: hibernationSnapshot,
         ask: (report) => controlClient.checkDaemonHibernation({ sessionId: session.sessionId, pid: process.pid, report }),
-        commit: (idleMs) => defaultPermissionMode.commitHibernation({
+        commit: (idleMs) => startupSessionCreate.commitHibernation({
           client: session,
           claimExit: () => !shouldExit && hibernationExit.begin(),
           exitRequested: () => hibernationExit.exitRequested,
@@ -2140,6 +2210,8 @@ async function runCodex(opts) {
       });
       hibernationProbe.start();
     }
+    const autoUpdated = sessionLock.takeAutoRestartedEvent(process.env, "Codex");
+    if (autoUpdated) session.sendSessionEvent(autoUpdated);
     idleRelease.arm();
     while (!shouldExit) {
       logActiveHandles("loop-top");
@@ -2157,6 +2229,7 @@ async function runCodex(opts) {
           break;
         }
         message = batch;
+        heldInput$1.hold(batch.sourceIds);
       }
       if (!message) {
         break;
@@ -2169,6 +2242,7 @@ async function runCodex(opts) {
       turnActive = true;
       if (isCodexClearText(message.message)) {
         logger.logger.debug("[Codex] Handling /clear command - resetting Codex thread state");
+        heldInput$1.delivered();
         client$1.clearThreadState();
         currentTurnId = null;
         codexStartedSubagents = /* @__PURE__ */ new Set();
@@ -2179,6 +2253,7 @@ async function runCodex(opts) {
         reasoningProcessor.abort();
         diffProcessor.reset();
         appendSystemPromptInjected = false;
+        projectInjector.reset();
         thinking = false;
         session.keepAlive(thinking, "remote");
         messageBuffer.addMessage("Context was reset", "status");
@@ -2204,6 +2279,7 @@ async function runCodex(opts) {
       try {
         if (compactCommand !== null) {
           await client$1.ensureConnected();
+          heldInput$1.delivered();
           const outcome = await runCodexCompact(compactCommand, {
             client: client$1,
             notify: (text) => {
@@ -2220,13 +2296,14 @@ async function runCodex(opts) {
           message.mode.permissionMode,
           sandboxManagedByHappy
         );
-        const effortRefusal = unsupportedEffortReason(discoveredModels, message.mode.model, message.mode.effort);
+        const turnModel = resolveCodexTurnModel(message.mode, machineDefaultModel);
+        const effortRefusal = unsupportedEffortReason(discoveredModels, turnModel ?? client$1.threadModel ?? machineDefaultModel, message.mode.effort);
         if (effortRefusal) {
           throw new Error(effortRefusal);
         }
         if (!client$1.hasActiveThread()) {
           const startedThread = await client$1.startThread({
-            model: message.mode.model,
+            model: turnModel,
             cwd: process.cwd(),
             approvalPolicy: executionPolicy.approvalPolicy,
             sandbox: executionPolicy.sandbox,
@@ -2236,6 +2313,7 @@ async function runCodex(opts) {
             ...currentMetadata,
             codexThreadId: startedThread.threadId
           }));
+          reportModeFacts();
         }
         const includeAppendSystemPrompt = Boolean(
           message.mode.appendSystemPrompt && !appendSystemPromptInjected
@@ -2250,13 +2328,19 @@ async function runCodex(opts) {
           happyHomeDir: configuration.configuration.happyHomeDir,
           sessionId: session.sessionId
         }) : [];
+        if (terminating) {
+          logger.logger.debug("[Codex] Session is ending; not starting the turn");
+          continue;
+        }
         const result = await client$1.sendTurnAndWait(attachmentContent.appendStagedAttachmentsToPrompt(turnPrompt, staged), {
           images: staged.filter((file) => ["image/jpeg", "image/png", "image/gif", "image/webp"].includes(file.mimeType)).map((file) => file.path),
-          model: message.mode.model,
+          model: turnModel,
           approvalPolicy: executionPolicy.approvalPolicy,
           sandbox: executionPolicy.sandbox,
-          effort: message.mode.effort
+          effort: message.mode.effort,
+          onTurnStarted: () => heldInput$1.delivered()
         });
+        reportModeFacts();
         first = false;
         if (includeAppendSystemPrompt) {
           appendSystemPromptInjected = true;
@@ -2266,6 +2350,7 @@ async function runCodex(opts) {
         }
       } catch (error) {
         logger.logger.warn("Error in codex session", safeCodexErrorMetadata(error));
+        if (heldInput$1.drop("failed")) logger.logger.debug("[Codex] Message failed before its turn started; tombstoned");
         const reason = describeThrownTurnError(error);
         if (reason) {
           messageBuffer.addMessage(`Task failed: ${reason}`, "status");
@@ -2297,6 +2382,8 @@ async function runCodex(opts) {
     disposeTermination?.();
     hibernationProbe?.stop();
     session.closePromptQueueDrain();
+    heldInput$1.drop("aborted");
+    messageQueue.discardAll("aborted");
     logger.logger.debug("[codex]: Final cleanup start");
     logActiveHandles("cleanup-start");
     if (reconnectionHandle) {