very-happy-cli 0.2.188 → 0.2.190

package/dist/{codexCommand-DUSVzbKh.mjs → codexCommand-Dliq3EBv.mjs}

@@ -1,105 +1,107 @@
-import { a as authAndSetupMachineIfNeeded } from './auth-BNhhk2Fr.mjs';
-import { g as createEnvelope, j as BUILTIN_TODO_DISCOVERY, P as PROMPT_QUEUE_CAPABILITY, J as CODEX_STEER_CAPABILITY, a as PROJECT_SESSION_CAPABILITY, K as CODEX_COMPACT_CAPABILITY } from './index-WKyN-bNy.mjs';
-import { h as hashObject, s as startHappyServer, c as createProjectInjector } from './deterministicJson-CsRckxVq.mjs';
-import { s as sharedProjectsClient } from './client-DWws_aQK.mjs';
+import { a as authAndSetupMachineIfNeeded } from './auth-Bj0psrD2.mjs';
+import { g as createEnvelope, j as BUILTIN_TODO_DISCOVERY, P as PROMPT_QUEUE_CAPABILITY, J as CODEX_STEER_CAPABILITY, a as PROJECT_SESSION_CAPABILITY, K as CODEX_COMPACT_CAPABILITY } from './index-DmqsRnV7.mjs';
+import { h as hashObject, s as startHappyServer, c as createProjectInjector } from './deterministicJson-DNmMVhFu.mjs';
+import { s as sharedProjectsClient } from './client-CnGNYidN.mjs';
 import { unlink } from 'node:fs/promises';
 import { p as publishForkBackfillWhenCommitted, F as FORK_BACKFILL_CAPABILITY } from './forkBackfill-DYIjlN1Z.mjs';
 import { randomUUID } from 'node:crypto';
 import { createId } from '@paralleldrive/cuid2';
-import { t as textResultPayload, d as toolResultContentText, c as connectionState, A as ApiClient } from './api-DNKa7kVy.mjs';
-import { r as registerAgentAttachmentDownloads } from './agentAttachments-M_B5qEF2.mjs';
-import { C as CLAUDE_ATTACHMENT_KINDS, a as stageClaudeAttachments, b as appendStagedAttachmentsToPrompt } from './attachmentContent-C9S4ekAz.mjs';
+import { t as textResultPayload, d as toolResultContentText, c as connectionState, A as ApiClient } from './api-Dw8gFsQi.mjs';
+import { r as registerAgentAttachmentDownloads, H as HeldInput } from './heldInput-C69lA2dH.mjs';
+import { C as CLAUDE_ATTACHMENT_KINDS, a as stageClaudeAttachments, b as appendStagedAttachmentsToPrompt } from './attachmentContent-CC4yIrSm.mjs';
 import { useStdout, useInput, Box, Text, render } from 'ink';
-import { c as claimSessionOrExit, a as applyServerSnapshot, b as applyReconnectReplay, w as withoutServerSnapshot, m as mergeReconnectMetadata, e as exitCursorStamp } from './sessionLock-C7Wg1RVd.mjs';
+import { c as claimSessionOrExit, a as applyServerSnapshot, b as applyReconnectReplay, w as withoutServerSnapshot, m as mergeReconnectMetadata, t as takeAutoRestartedEvent, A as AUTO_RESTART_CAPABILITY, e as exitCursorStamp } from './sessionLock-Ca_bIo50.mjs';
 import React, { useState, useRef, useEffect, useCallback } from 'react';
-import { C as CodexAppServerClient } from './codexAppServerClient-DgE99i7X.mjs';
-import { w as wrapperRateLimitReporter } from './rateLimitReporter-Iw4k3Bbr.mjs';
-import { l as logger } from './logger-RpzJ4d8V.mjs';
-import { B as BasePermissionHandler } from './BasePermissionHandler-CrfyUmqO.mjs';
-import { B as BaseReasoningProcessor, s as settleCodexSession } from './codexTermination-Bybovr2z.mjs';
+import { C as CodexAppServerClient } from './codexAppServerClient-CLc5nhLT.mjs';
+import { w as wrapperRateLimitReporter } from './rateLimitReporter-jeVi-fym.mjs';
+import { l as logger } from './logger-CL7pin9b.mjs';
+import { B as BasePermissionHandler } from './BasePermissionHandler-CLp1ge-4.mjs';
+import { B as BaseReasoningProcessor, s as settleCodexSession } from './codexTermination-ORIw0gpU.mjs';
 import { execSync } from 'node:child_process';
-import { r as readSettings, l as latchKeepAwake, e as evaluateWrapperIdle, a as resolveCheckMs, H as HIBERNATION_CAPABILITY } from './persistence-Bn4qEbDg.mjs';
-import { g as getInitialMachineMetadata } from './machineMetadata-CiQ2_1Mq.mjs';
-import { c as configuration } from './configuration-BZHpFD7K.mjs';
-import { p as parseSpecialCommand, c as compactCommandText, a as parseCompact, M as MessageQueue2, r as registerKillSessionHandler } from './specialCommands-DHU7TNeK.mjs';
+import { r as readSettings, l as latchKeepAwake, e as evaluateWrapperIdle, a as resolveCheckMs, H as HIBERNATION_CAPABILITY } from './persistence-Dogj7JIp.mjs';
+import { g as getInitialMachineMetadata } from './machineMetadata-DP06qdBk.mjs';
+import { c as configuration } from './configuration-Dechcvd-.mjs';
+import { M as MessageQueue2, r as registerKillSessionHandler } from './registerKillSessionHandler-CzgklwLG.mjs';
 import { p as projectPath } from './projectPath-BTBIMB57.mjs';
 import { join } from 'node:path';
-import { c as createSessionMetadata } from './createSessionMetadata-Dn5BkLfU.mjs';
+import { c as createSessionMetadata } from './createSessionMetadata-DyhFKAby.mjs';
 import { M as MessageBuffer } from './sessionExitLifecycle-CzkLIgNZ.mjs';
-import { n as notifyDaemonSessionStarted, k as reportSessionEditToDaemon, c as checkDaemonHibernation } from './controlClient-Bw56NIrj.mjs';
-import { a as HibernationExitLatch, H as HibernationProbe, c as commitHibernation, b as DEFAULT_CODEX_PERMISSION_MODE } from './defaultPermissionMode-DMTnlccv.mjs';
+import { n as notifyDaemonSessionStarted, k as reportSessionEditToDaemon, c as checkDaemonHibernation } from './controlClient-D7NGfmtq.mjs';
+import { c as createSessionForStartup, b as HibernationExitLatch, H as HibernationProbe, a as commitHibernation } from './startupSessionCreate-BKFU4v_h.mjs';
 import { d as decodeBase64, e as encodeBase64 } from './authRelay-DhQhkBvX.mjs';
-import { s as setupOfflineReconnection } from './setupOfflineReconnection-DaOXnGuH.mjs';
-import { c as createSessionForStartup } from './startupSessionCreate-BgaVuvQp.mjs';
+import { s as setupOfflineReconnection } from './setupOfflineReconnection-CyPNgyCe.mjs';
 import { t as trimIdent } from './trimIdent-BAjmv_TG.mjs';
+import { a as parseSpecialCommand, c as compactCommandText, b as parseCompact } from './specialCommands-MXUN0wfI.mjs';
 import { C as CHANGE_TITLE_INSTRUCTION } from './constants-BC4St0xd.mjs';
+import { a as DEFAULT_CODEX_PERMISSION_MODE } from './defaultPermissionMode-BnxJPVHT.mjs';
 import { E as EditReportThrottle, a as extractCodexPatchPaths } from './editPaths-BVfS_FFL.mjs';
-import { a as extractNoSandboxFlag, e as ensureDaemonRunning } from './ensureDaemonRunning-DVtIG9z7.mjs';
+import { a as extractNoSandboxFlag, e as ensureDaemonRunning } from './ensureDaemonRunning-BOdbryDM.mjs';
 import 'tweetnacl';
 import 'axios';
-import './time-umG7yHkb.mjs';
-import './browser-6Cg7G6bb.mjs';
+import './time-CN3TuSVG.mjs';
+import './browser-BGxDRhHy.mjs';
 import 'open';
 import 'zod';
 import './prompt-QHuFx9j6.mjs';
-import './reportProgressTool-DUEq3xAL.mjs';
-import './client-DcDE6Ifk.mjs';
+import './reportProgressTool-CgPy6n_7.mjs';
+import './client-DZkBUoh9.mjs';
 import './precheckCompat-DeEbilbr.mjs';
 import './agentGuidance-BDYt2Qy2.mjs';
 import 'node:fs';
 import 'node:os';
 import './pi-CqyoZMjI.mjs';
 import './fileStore-5qpetZS0.mjs';
-import './client-qJ0y8fus.mjs';
+import './client-CtL0Vtww.mjs';
 import 'node:util';
-import './context-t7YV0aZc.mjs';
-import './sessionOps-CYjMT7Ad.mjs';
+import './context-C9JbJoNe.mjs';
+import './sessionOps-CA2kpm66.mjs';
 import 'socket.io-client';
 import './backgroundTaskActivity-8PdPxrvy.mjs';
 import './resources-CLP_MpK4.mjs';
-import './tools-BOWazSD6.mjs';
-import './peerTools-2_8Bw9PU.mjs';
+import './tools-zXJpxiG_.mjs';
+import './peerTools-dY1aJez4.mjs';
 import './ids-DU6sLx4C.mjs';
-import './remoteSessionClient-uPj7omsw.mjs';
+import './remoteSessionClient-BiC2KDew.mjs';
 import '@modelcontextprotocol/sdk/server/mcp.js';
 import 'node:http';
 import '@modelcontextprotocol/sdk/server/streamableHttp.js';
 import './limits-DIo7rEBR.mjs';
-import './downloadTarget-tYMV_VHo.mjs';
+import './downloadTarget-CGojGjaN.mjs';
 import './terminals-Dlg0x3nY.mjs';
 import './terminalTitleSuggest-CeKsX_V6.mjs';
 import './tmuxSocket-B8Yx20sT.mjs';
-import './bootstrap-Di38SnpN.mjs';
-import './package-CwB8rFJt.mjs';
+import './bootstrap-Ct9Nb4sv.mjs';
+import './package-C6uiXULx.mjs';
 import './webPanels-B2_C2-3g.mjs';
-import './pushNotifications-BThg4nVd.mjs';
+import './pushNotifications-dUceOIni.mjs';
 import './contentLogMetadata-BlWI0egu.mjs';
 import './previewPath-CXN4Vag0.mjs';
 import 'crypto';
-import './lidState-D-lsD1FS.mjs';
+import './lidState-D0DF20oG.mjs';
 import 'os';
 import 'child_process';
 import 'node:events';
-import './registerCommonHandlers-CaWl9ll1.mjs';
+import './registerCommonHandlers-DWZ7mfdt.mjs';
 import 'util';
 import 'fs/promises';
 import 'path';
 import 'cross-spawn';
-import './sync-I8NYmycF.mjs';
+import './sync-eZkXnsW_.mjs';
 import 'chalk';
+import './cliUpdate-Y34VGe9Y.mjs';
 import './processTreeSnapshot-CuLJDNC-.mjs';
 import 'node:readline';
 import './manager-BEsI4qt3.mjs';
 import '@anthropic-ai/sandbox-runtime';
-import './rateLimitWindows-CQ4tIQnx.mjs';
+import './rateLimitWindows-CEn0DXaX.mjs';
 import './processTree-CP5IvQ2Z.mjs';
 import './detectCLI-CSGMlV51.mjs';
 import 'fs';
-import './localHappyAgentAuth-wvDp-nGj.mjs';
+import './localHappyAgentAuth-BBhM4Qk1.mjs';
 import './fsMkdir-DumgLTzR.mjs';
 import './types-CkqAACXx.mjs';
 import 'url';
-import './spawnHappyCLI-CnyyJk74.mjs';
+import './spawnHappyCLI-DjbkiSH1.mjs';
 import './doctorReadiness-C208SMN9.mjs';
 
 function getStartedSubagents(state) {
@@ -1094,6 +1096,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();
@@ -1375,6 +1390,7 @@ function hashCodexEnhancedMode(mode) {
   return hashObject({
     permissionMode: mode.permissionMode,
     model: mode.model,
+    modelReset: mode.modelReset,
     appendSystemPrompt: mode.appendSystemPrompt,
     effort: mode.effort
   });
@@ -1428,6 +1444,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) {
@@ -1472,9 +1498,11 @@ async function runCodex(opts) {
     dangerouslySkipPermissions: initialPermissionMode === "yolo" || initialPermissionMode === "bypassPermissions",
     ...forkedFromSessionId ? { parentSessionId: forkedFromSessionId } : {},
     ...forkedFromMessageId ? { forkedFromMessageId } : {},
-    capabilities: [PROMPT_QUEUE_CAPABILITY, FORK_BACKFILL_CAPABILITY, HIBERNATION_CAPABILITY, CODEX_STEER_CAPABILITY, PROJECT_SESSION_CAPABILITY, CODEX_COMPACT_CAPABILITY]
+    capabilities: [PROMPT_QUEUE_CAPABILITY, FORK_BACKFILL_CAPABILITY, HIBERNATION_CAPABILITY, AUTO_RESTART_CAPABILITY, CODEX_STEER_CAPABILITY, PROJECT_SESSION_CAPABILITY, CODEX_COMPACT_CAPABILITY]
   });
   metadata.attachmentKinds = [...CLAUDE_ATTACHMENT_KINDS];
+  metadata.stickyModel = null;
+  metadata.currentThoughtLevelCode = DEFAULT_CODEX_EFFORT;
   const importCodexThreadId = process.env[IMPORT_CODEX_THREAD_ENV];
   if (importCodexThreadId) {
     metadata.importedFromCodexThreadId = importCodexThreadId;
@@ -1587,24 +1615,49 @@ 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 = new 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.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 = DEFAULT_CODEX_PERMISSION_MODE;
-    currentModel = DEFAULT_CODEX_MODEL;
     currentEffort = DEFAULT_CODEX_EFFORT;
+    reportModeFacts();
     currentAppendSystemPrompt = void 0;
     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 = [];
+  let codexAgentVersion = null;
+  let machineDefaultModel;
   registerAgentAttachmentDownloads(session);
   const CODEX_IMAGE_MIME_TYPES = ["image/jpeg", "image/png", "image/gif", "image/webp"];
   const steerDeps = {
@@ -1631,6 +1684,7 @@ async function runCodex(opts) {
         if (VALID_REMOTE_PERMISSION_MODES.includes(incoming)) {
           messagePermissionMode = incoming;
           currentPermissionMode = messagePermissionMode;
+          publishPermissionMode(incoming);
           logger.debug("[Codex] Valid permission mode override applied");
         } else {
           logger.debug("[Codex] Ignoring invalid permission mode override", logValueMetadata(message.meta.permissionMode));
@@ -1639,9 +1693,12 @@ async function runCodex(opts) {
         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.debug("[Codex] Model override updated", logValueMetadata(message.meta.model));
       } else {
         logger.debug("[Codex] User message received without a model override");
@@ -1652,10 +1709,12 @@ async function runCodex(opts) {
         if (incoming === null || incoming === void 0) {
           messageEffort = void 0;
           currentEffort = void 0;
+          reportModeFacts();
           logger.debug(`[Codex] Effort reset to default`);
         } else if (typeof incoming === "string") {
           messageEffort = incoming;
           currentEffort = messageEffort;
+          reportModeFacts();
           logger.debug("[Codex] Valid effort override applied");
         } else {
           logger.debug("[Codex] Ignoring invalid effort override", logValueMetadata(incoming));
@@ -1674,6 +1733,7 @@ async function runCodex(opts) {
       const enhancedMode = {
         permissionMode: messagePermissionMode || "default",
         model: messageModel,
+        ...messageModelReset ? { modelReset: true } : {},
         appendSystemPrompt: messageAppendSystemPrompt,
         effort: messageEffort
       };
@@ -1696,6 +1756,7 @@ async function runCodex(opts) {
     }).catch((error) => {
       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;
@@ -1738,6 +1799,7 @@ async function runCodex(opts) {
   }
   let abortController = new AbortController();
   let shouldExit = false;
+  let terminating = false;
   const hibernationExit = new HibernationExitLatch((a, b) => a === "archive" && b !== "archive");
   let hibernationStamp = null;
   let hibernationProbe = null;
@@ -1791,6 +1853,10 @@ async function runCodex(opts) {
     logger.debug("[Codex] Kill session requested - terminating process");
     const exitCursor = intent === "offline" && session ? exitCursorStamp(session.messageCursor, Date.now()) : void 0;
     if (exitCursor) session.freezeInbound();
+    const exitReason = intent === "archive" ? "aborted" : "restarted";
+    terminating = true;
+    heldInput.drop(exitReason);
+    messageQueue.discardAll(exitReason);
     await handleAbort("kill");
     logger.debug("[Codex] Abort completed, proceeding with termination");
     try {
@@ -2016,6 +2082,7 @@ async function runCodex(opts) {
     logger.debug("[codex]: client.connect begin");
     await client.connect();
     logger.debug("[codex]: client.connect done");
+    codexAgentVersion = client.serverVersion;
     try {
       discoveredModels = await client.listModels();
       let configured = null;
@@ -2024,6 +2091,7 @@ async function runCodex(opts) {
       } catch (error) {
         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,
@@ -2067,6 +2135,7 @@ async function runCodex(opts) {
       first = false;
       appendSystemPromptInjected = true;
     }
+    reportModeFacts();
     const forkCodexThreadId = process.env.HAPPY_FORK_CODEX_THREAD_ID;
     if (!reconnectSessionId && forkCodexThreadId) {
       try {
@@ -2108,6 +2177,7 @@ 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 } : {}
         };
       };
@@ -2138,6 +2208,8 @@ async function runCodex(opts) {
       });
       hibernationProbe.start();
     }
+    const autoUpdated = takeAutoRestartedEvent(process.env, "Codex");
+    if (autoUpdated) session.sendSessionEvent(autoUpdated);
     idleRelease.arm();
     while (!shouldExit) {
       logActiveHandles("loop-top");
@@ -2155,6 +2227,7 @@ async function runCodex(opts) {
           break;
         }
         message = batch;
+        heldInput.hold(batch.sourceIds);
       }
       if (!message) {
         break;
@@ -2167,6 +2240,7 @@ async function runCodex(opts) {
       turnActive = true;
       if (isCodexClearText(message.message)) {
         logger.debug("[Codex] Handling /clear command - resetting Codex thread state");
+        heldInput.delivered();
         client.clearThreadState();
         currentTurnId = null;
         codexStartedSubagents = /* @__PURE__ */ new Set();
@@ -2177,6 +2251,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");
@@ -2202,6 +2277,7 @@ async function runCodex(opts) {
       try {
         if (compactCommand !== null) {
           await client.ensureConnected();
+          heldInput.delivered();
           const outcome = await runCodexCompact(compactCommand, {
             client,
             notify: (text) => {
@@ -2218,13 +2294,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.threadModel ?? machineDefaultModel, message.mode.effort);
         if (effortRefusal) {
           throw new Error(effortRefusal);
         }
         if (!client.hasActiveThread()) {
           const startedThread = await client.startThread({
-            model: message.mode.model,
+            model: turnModel,
             cwd: process.cwd(),
             approvalPolicy: executionPolicy.approvalPolicy,
             sandbox: executionPolicy.sandbox,
@@ -2234,6 +2311,7 @@ async function runCodex(opts) {
             ...currentMetadata,
             codexThreadId: startedThread.threadId
           }));
+          reportModeFacts();
         }
         const includeAppendSystemPrompt = Boolean(
           message.mode.appendSystemPrompt && !appendSystemPromptInjected
@@ -2248,13 +2326,19 @@ async function runCodex(opts) {
           happyHomeDir: configuration.happyHomeDir,
           sessionId: session.sessionId
         }) : [];
+        if (terminating) {
+          logger.debug("[Codex] Session is ending; not starting the turn");
+          continue;
+        }
         const result = await client.sendTurnAndWait(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.delivered()
         });
+        reportModeFacts();
         first = false;
         if (includeAppendSystemPrompt) {
           appendSystemPromptInjected = true;
@@ -2264,6 +2348,7 @@ async function runCodex(opts) {
         }
       } catch (error) {
         logger.warn("Error in codex session", safeCodexErrorMetadata(error));
+        if (heldInput.drop("failed")) logger.debug("[Codex] Message failed before its turn started; tombstoned");
         const reason = describeThrownTurnError(error);
         if (reason) {
           messageBuffer.addMessage(`Task failed: ${reason}`, "status");
@@ -2295,6 +2380,8 @@ async function runCodex(opts) {
     disposeTermination?.();
     hibernationProbe?.stop();
     session.closePromptQueueDrain();
+    heldInput.drop("aborted");
+    messageQueue.discardAll("aborted");
     logger.debug("[codex]: Final cleanup start");
     logActiveHandles("cleanup-start");
     if (reconnectionHandle) {

package/dist/{codexTermination-DuDPyBRR.cjs → codexTermination-ByW7tRjr.cjs}

@@ -1,7 +1,7 @@
 'use strict';
 
 var node_crypto = require('node:crypto');
-var logger = require('./logger-C3vZG6Q0.cjs');
+var logger = require('./logger-BBRTTVsQ.cjs');
 var sessionExitLifecycle = require('./sessionExitLifecycle-DFltxXU8.cjs');
 
 class BaseReasoningProcessor {

package/dist/{codexTermination-Bybovr2z.mjs → codexTermination-ORIw0gpU.mjs}

@@ -1,5 +1,5 @@
 import { randomUUID } from 'node:crypto';
-import { l as logger } from './logger-RpzJ4d8V.mjs';
+import { l as logger } from './logger-CL7pin9b.mjs';
 import { O as OFFLINE_EXIT_STAMP_TIMEOUT_MS } from './sessionExitLifecycle-CzkLIgNZ.mjs';
 
 class BaseReasoningProcessor {

package/dist/{codexThreadFork-DNekT4nQ.cjs → codexThreadFork-5kwoKjMu.cjs}

@@ -100,6 +100,9 @@ async function forkCodexThread(client, opts) {
     newCodexThreadId: forked.threadId
   };
 }
+function firstItemId(turn) {
+  return turn.items?.[0]?.id;
+}
 async function forkCodexBeforeUserMessage(client, opts) {
   const { thread: source } = await client.readThread({ threadId: opts.threadId, includeTurns: true });
   rejectAttachedTarget(source, opts.cutBeforeItemId);
@@ -109,24 +112,15 @@ async function forkCodexBeforeUserMessage(client, opts) {
     throw new Error("Cannot safely rewind a user message inside an existing turn");
   }
   if (sourceCut.index === 0) return { type: "success", startFresh: true };
-  const forked = await client.forkThread({ threadId: opts.threadId, cwd: opts.cwd });
+  const kept = (source.turns ?? []).slice(0, sourceCut.index);
+  const expected = kept.map(firstItemId);
+  const forked = await client.forkThread({ threadId: opts.threadId, cwd: opts.cwd, lastTurnId: kept[kept.length - 1].id });
   if (forked.threadId === opts.threadId) throw new Error("Codex did not create an independent fork");
-  rejectAttachedTarget(forked.thread, opts.cutBeforeItemId);
-  const cut = findCutTurn(forked.thread, opts.cutBeforeItemId);
-  if (!cut) throw new CodexForkRewindPointNotFoundError(opts.cutBeforeItemId, opts.threadId);
-  const turns = forked.thread.turns ?? [];
-  const items = turns[cut.index].items ?? [];
-  if (items.findIndex((item) => item.id === opts.cutBeforeItemId) !== 0) {
-    throw new Error("Cannot safely rewind a user message inside an existing turn");
-  }
-  if (cut.index === 0) return { type: "success", startFresh: true };
-  const expectedTurnIds = turns.slice(0, cut.index).map((turn) => turn.id);
-  const { thread } = await client.rollbackThread({
-    threadId: forked.threadId,
-    numTurns: turns.length - cut.index
-  });
-  const remaining = thread.turns ?? [];
-  if (remaining.length !== cut.index || remaining.some((turn, index) => turn.id !== expectedTurnIds[index])) {
+  let { thread } = await client.readThread({ threadId: forked.threadId, includeTurns: true });
+  const extra = (thread.turns ?? []).length - expected.length;
+  if (extra > 0) ({ thread } = await client.rollbackThread({ threadId: forked.threadId, numTurns: extra }));
+  const remaining = (thread.turns ?? []).map(firstItemId);
+  if (remaining.length !== expected.length || remaining.some((id, index) => id !== expected[index])) {
     throw new Error("Codex rollback did not preserve the expected history");
   }
   return { type: "success", newCodexThreadId: forked.threadId };

package/dist/{codexThreadFork-R76RU5H0.mjs → codexThreadFork-DobPd19R.mjs}

@@ -98,6 +98,9 @@ async function forkCodexThread(client, opts) {
     newCodexThreadId: forked.threadId
   };
 }
+function firstItemId(turn) {
+  return turn.items?.[0]?.id;
+}
 async function forkCodexBeforeUserMessage(client, opts) {
   const { thread: source } = await client.readThread({ threadId: opts.threadId, includeTurns: true });
   rejectAttachedTarget(source, opts.cutBeforeItemId);
@@ -107,24 +110,15 @@ async function forkCodexBeforeUserMessage(client, opts) {
     throw new Error("Cannot safely rewind a user message inside an existing turn");
   }
   if (sourceCut.index === 0) return { type: "success", startFresh: true };
-  const forked = await client.forkThread({ threadId: opts.threadId, cwd: opts.cwd });
+  const kept = (source.turns ?? []).slice(0, sourceCut.index);
+  const expected = kept.map(firstItemId);
+  const forked = await client.forkThread({ threadId: opts.threadId, cwd: opts.cwd, lastTurnId: kept[kept.length - 1].id });
   if (forked.threadId === opts.threadId) throw new Error("Codex did not create an independent fork");
-  rejectAttachedTarget(forked.thread, opts.cutBeforeItemId);
-  const cut = findCutTurn(forked.thread, opts.cutBeforeItemId);
-  if (!cut) throw new CodexForkRewindPointNotFoundError(opts.cutBeforeItemId, opts.threadId);
-  const turns = forked.thread.turns ?? [];
-  const items = turns[cut.index].items ?? [];
-  if (items.findIndex((item) => item.id === opts.cutBeforeItemId) !== 0) {
-    throw new Error("Cannot safely rewind a user message inside an existing turn");
-  }
-  if (cut.index === 0) return { type: "success", startFresh: true };
-  const expectedTurnIds = turns.slice(0, cut.index).map((turn) => turn.id);
-  const { thread } = await client.rollbackThread({
-    threadId: forked.threadId,
-    numTurns: turns.length - cut.index
-  });
-  const remaining = thread.turns ?? [];
-  if (remaining.length !== cut.index || remaining.some((turn, index) => turn.id !== expectedTurnIds[index])) {
+  let { thread } = await client.readThread({ threadId: forked.threadId, includeTurns: true });
+  const extra = (thread.turns ?? []).length - expected.length;
+  if (extra > 0) ({ thread } = await client.rollbackThread({ threadId: forked.threadId, numTurns: extra }));
+  const remaining = (thread.turns ?? []).map(firstItemId);
+  if (remaining.length !== expected.length || remaining.some((id, index) => id !== expected[index])) {
     throw new Error("Codex rollback did not preserve the expected history");
   }
   return { type: "success", newCodexThreadId: forked.threadId };

package/dist/{config-C4xOL5bH.cjs → config-CeIzCsfj.cjs}

@@ -4,15 +4,15 @@ var require$$0 = require('fs');
 var require$$1 = require('path');
 var os = require('os');
 var child_process = require('child_process');
-var logger = require('./logger-C3vZG6Q0.cjs');
+var logger = require('./logger-BBRTTVsQ.cjs');
 var constants = require('./constants-VJ0N6WuG.cjs');
 require('chalk');
 require('node:util');
-require('./configuration-DyPW9mVa.cjs');
+require('./configuration-Dt5lKW3P.cjs');
 require('node:fs');
 require('node:os');
 require('node:path');
-require('./package-Gnf_935w.cjs');
+require('./package-DrY090nZ.cjs');
 require('node:fs/promises');
 require('./trimIdent-4gvk9Wk6.cjs');
 

package/dist/{config-BrzZ0O-6.mjs → config-CxSsGO1Z.mjs}

@@ -2,15 +2,15 @@ import { existsSync, readFileSync, mkdirSync, writeFileSync } from 'fs';
 import { join } from 'path';
 import { homedir } from 'os';
 import { execSync } from 'child_process';
-import { l as logger } from './logger-RpzJ4d8V.mjs';
+import { l as logger } from './logger-CL7pin9b.mjs';
 import { D as DEFAULT_GEMINI_MODEL, G as GEMINI_MODEL_ENV } from './constants-BC4St0xd.mjs';
 import 'chalk';
 import 'node:util';
-import './configuration-BZHpFD7K.mjs';
+import './configuration-Dechcvd-.mjs';
 import 'node:fs';
 import 'node:os';
 import 'node:path';
-import './package-CwB8rFJt.mjs';
+import './package-C6uiXULx.mjs';
 import 'node:fs/promises';
 import './trimIdent-BAjmv_TG.mjs';
 

package/dist/{configuration-BZHpFD7K.mjs → configuration-Dechcvd-.mjs}

@@ -1,7 +1,7 @@
 import { mkdirSync, chmodSync, readdirSync, statSync, appendFileSync, writeFileSync, existsSync, readFileSync } from 'node:fs';
 import { homedir } from 'node:os';
 import { join } from 'node:path';
-import { p as packageJson } from './package-CwB8rFJt.mjs';
+import { p as packageJson } from './package-C6uiXULx.mjs';
 import { mkdir, chmod, writeFile } from 'node:fs/promises';
 
 const PRIVATE_DIRECTORY_MODE = 448;

package/dist/{configuration-DyPW9mVa.cjs → configuration-Dt5lKW3P.cjs}

@@ -3,7 +3,7 @@
 var node_fs = require('node:fs');
 var os = require('node:os');
 var path = require('node:path');
-var _package = require('./package-Gnf_935w.cjs');
+var _package = require('./package-DrY090nZ.cjs');
 var promises = require('node:fs/promises');
 
 const PRIVATE_DIRECTORY_MODE = 448;