very-happy-cli 0.2.189 → 0.2.191

package/dist/{codexCommand-BfoRP6E9.cjs → codexCommand-DvbbpYBS.cjs}

@@ -1,108 +1,109 @@
 'use strict';
 
-var auth = require('./auth-DQKSpaEf.cjs');
-var index = require('./index-BOe6dKnL.cjs');
-var deterministicJson = require('./deterministicJson-D0LU_XbO.cjs');
-var client = require('./client-DIfxYk7B.cjs');
+var auth = require('./auth-DnxoVkkf.cjs');
+var index = require('./index-CLUHaPU8.cjs');
+var defaultPermissionMode = require('./defaultPermissionMode-oqTupStc.cjs');
+var deterministicJson = require('./deterministicJson-CpFFgUL_.cjs');
+var client = require('./client-C5-C0t2a.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-BDuuyys8.cjs');
-var agentAttachments = require('./agentAttachments-Dbw8iMCZ.cjs');
-var attachmentContent = require('./attachmentContent-Cc5b7TPr.cjs');
+var api = require('./api-BBxZ7y2z.cjs');
+var heldInput = require('./heldInput-BOtqFO2r.cjs');
+var attachmentContent = require('./attachmentContent-BO2njyza.cjs');
 var ink = require('ink');
-var sessionLock = require('./sessionLock-DSqiP2lH.cjs');
+var sessionLock = require('./sessionLock-BmLA2S8K.cjs');
 var React = require('react');
-var codexAppServerClient = require('./codexAppServerClient-CO9f4Jr8.cjs');
-var rateLimitReporter = require('./rateLimitReporter-BKmoOZQi.cjs');
-var logger = require('./logger-BP1SW7Cs.cjs');
-var BasePermissionHandler = require('./BasePermissionHandler-DjM16uJz.cjs');
-var codexTermination = require('./codexTermination-IrLZQzKC.cjs');
+var codexAppServerClient = require('./codexAppServerClient-DKXeikEe.cjs');
+var rateLimitReporter = require('./rateLimitReporter-CaTzBe3x.cjs');
+var logger = require('./logger-Ct2zvaq0.cjs');
+var BasePermissionHandler = require('./BasePermissionHandler-C9Ag7yvs.cjs');
+var codexTermination = require('./codexTermination-BszWfyk5.cjs');
 var node_child_process = require('node:child_process');
-var persistence = require('./persistence-CrzC7yr_.cjs');
-var machineMetadata = require('./machineMetadata-BKX3ov9g.cjs');
-var configuration = require('./configuration-C0ctLGW2.cjs');
-var registerKillSessionHandler = require('./registerKillSessionHandler-DhCjrs44.cjs');
+var persistence = require('./persistence-A2NeERZJ.cjs');
+var machineMetadata = require('./machineMetadata-DDCVWb_x.cjs');
+var configuration = require('./configuration-DfPBa-9d.cjs');
+var registerKillSessionHandler = require('./registerKillSessionHandler-hvCsEn7b.cjs');
 var projectPath = require('./projectPath-C3ioB4Bu.cjs');
 var path = require('node:path');
-var createSessionMetadata = require('./createSessionMetadata-DezS33OM.cjs');
+var createSessionMetadata = require('./createSessionMetadata-Cf78KHtt.cjs');
 var sessionExitLifecycle = require('./sessionExitLifecycle-DFltxXU8.cjs');
-var controlClient = require('./controlClient-F7hAEEy2.cjs');
-var defaultPermissionMode = require('./defaultPermissionMode-5EvgRq38.cjs');
+var controlClient = require('./controlClient-C13_pSKG.cjs');
+var startupSessionCreate = require('./startupSessionCreate-CcF7rGGB.cjs');
 var authRelay = require('./authRelay-Dy1qU9td.cjs');
-var setupOfflineReconnection = require('./setupOfflineReconnection-tV0Q1dgR.cjs');
-var startupSessionCreate = require('./startupSessionCreate-CYc8mra-.cjs');
+var setupOfflineReconnection = require('./setupOfflineReconnection-BKLfOd-i.cjs');
 var trimIdent = require('./trimIdent-4gvk9Wk6.cjs');
 var specialCommands = require('./specialCommands-J3JFOq0J.cjs');
 var constants = require('./constants-VJ0N6WuG.cjs');
 var editPaths = require('./editPaths-Bqp4OFPw.cjs');
-var ensureDaemonRunning = require('./ensureDaemonRunning-CIghxgDR.cjs');
+var ensureDaemonRunning = require('./ensureDaemonRunning-BUuH-pbE.cjs');
 require('tweetnacl');
 require('axios');
-require('./time-XwEZxKGc.cjs');
-require('./browser-D1yzC0Tu.cjs');
+require('./time-Cy0a-7YX.cjs');
+require('./browser-BTgZ9d4i.cjs');
 require('open');
 require('zod');
 require('./prompt-Bof2aQkI.cjs');
-require('./reportProgressTool-DznxPKES.cjs');
-require('./client-D0aYWt53.cjs');
+require('./reportProgressTool-tzQLCLIw.cjs');
+require('./client-BscskEBk.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-BNmFaRXZ.cjs');
+require('./client-C-OdTbrU.cjs');
 require('node:util');
-require('./context-D-hEk5pC.cjs');
-require('./sessionOps-BzeOKIEF.cjs');
+require('./context-Co7hUaW-.cjs');
+require('./sessionOps-DXlTmS7J.cjs');
 require('socket.io-client');
 require('./backgroundTaskActivity-CBvUdj39.cjs');
 require('./resources-BZ_Be0qM.cjs');
-require('./tools-CjMafO_D.cjs');
-require('./peerTools-B4315xjX.cjs');
+require('./tools-B1x1j6tz.cjs');
+require('./peerTools-CElYh-5u.cjs');
 require('./ids-B6ZC0HGt.cjs');
-require('./remoteSessionClient-Dq8XTLQP.cjs');
+require('./remoteSessionClient-6ymeMVa4.cjs');
 require('@modelcontextprotocol/sdk/server/mcp.js');
 require('node:http');
 require('@modelcontextprotocol/sdk/server/streamableHttp.js');
 require('./limits-C-a7gr04.cjs');
-require('./downloadTarget-aNcCxVRL.cjs');
+require('./downloadTarget-CikzJv1h.cjs');
 require('./terminals-B_bfC9c2.cjs');
 require('./terminalTitleSuggest-DhvRFX3H.cjs');
 require('./tmuxSocket-D-Xt6Vn-.cjs');
-require('./bootstrap-CDY-Vz8q.cjs');
-require('./package-CYDdLA6R.cjs');
+require('./bootstrap-sly4qPPY.cjs');
+require('./package-9n7wd2dT.cjs');
 require('./webPanels-FCgFKvVe.cjs');
-require('./pushNotifications-CalIS9sq.cjs');
+require('./pushNotifications-23YSd-0l.cjs');
 require('./contentLogMetadata-ZSFk_NjQ.cjs');
 require('./previewPath-B0rBdhy1.cjs');
 require('crypto');
-require('./lidState-B4dHJCeS.cjs');
+require('./lidState-C9_DoF9i.cjs');
 require('os');
 require('child_process');
 require('node:events');
-require('./registerCommonHandlers-DZPozYxc.cjs');
+require('./registerCommonHandlers-D1MiSfcB.cjs');
 require('util');
 require('fs/promises');
 require('path');
 require('cross-spawn');
-require('./sync-CoChLEIg.cjs');
+require('./sync-Ba8N6xba.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-Cs56YJCH.cjs');
+require('./rateLimitWindows-B2Kx6L0S.cjs');
 require('./processTree-CMHWlVse.cjs');
 require('./detectCLI-BuYR_Qxe.cjs');
 require('fs');
-require('./localHappyAgentAuth-CG2nPD_H.cjs');
+require('./localHappyAgentAuth-CCjUvOfi.cjs');
 require('./fsMkdir-0K3yENml.cjs');
 require('./types-CRS-srZK.cjs');
 require('url');
-require('./spawnHappyCLI-CxiR2Qoy.cjs');
+require('./spawnHappyCLI-CF_gLi92.cjs');
 require('./doctorReadiness-Dl6yRQCy.cjs');
 
 function getStartedSubagents(state) {
@@ -1096,6 +1097,13 @@ function unsupportedEffortReason(catalog, model, effort) {
   if (selected.supportedReasoningEfforts.some((option) => option.reasoningEffort === effort)) return null;
   return `Reasoning effort "${effort}" is not supported by ${model ?? "the default model"}. Choose a supported level.`;
 }
+function settleTurnEffort(catalog, model, effort, opts) {
+  const refusal = unsupportedEffortReason(catalog, model, effort);
+  if (!refusal) return { refusal: null, effort, changed: false };
+  const catalogDefault = catalog.find((entry) => model ? entry.model === model : entry.isDefault)?.defaultReasoningEffort ?? void 0;
+  const settled = !unsupportedEffortReason(catalog, model, opts.fallback) ? opts.fallback : catalogDefault && !unsupportedEffortReason(catalog, model, catalogDefault) ? catalogDefault : void 0;
+  return { refusal: opts.explicit ? refusal : null, effort: settled, changed: true };
+}
 
 function resolveCodexTurnModel(mode, machineDefault) {
   if (mode.model) return mode.model;
@@ -1499,11 +1507,13 @@ 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, index.RUN_INTENT_CAPABILITY]
   });
   metadata.attachmentKinds = [...attachmentContent.CLAUDE_ATTACHMENT_KINDS];
   metadata.stickyModel = null;
   metadata.currentThoughtLevelCode = DEFAULT_CODEX_EFFORT;
+  metadata.modelIntent = null;
+  metadata.effortIntent = null;
   const importCodexThreadId = process.env[IMPORT_CODEX_THREAD_ENV];
   if (importCodexThreadId) {
     metadata.importedFromCodexThreadId = importCodexThreadId;
@@ -1557,6 +1567,7 @@ async function runCodex(opts) {
       logger.logger.debug(`[START] Reconnect without server snapshot (${snapshot.reason}); skipping existing messages`);
     }
   }
+  const resumedEffort = reconnectSeeded && response ? index.restoredEffort(response.metadata, { useReportedLevel: true }) : void 0;
   let session;
   let permissionHandler;
   let client$1;
@@ -1616,9 +1627,13 @@ 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 currentEffort = resumedEffort !== void 0 ? resumedEffort ?? void 0 : DEFAULT_CODEX_EFFORT;
+  let pendingModelReset = false;
+  let lastStartedEffort = currentEffort;
+  const effortJudgeModel = (model, modelReset) => resolveCodexTurnModel({ model, modelReset }, machineDefaultModel) ?? client$1?.threadModel ?? machineDefaultModel;
   let currentAppendSystemPrompt = void 0;
   let reportedStickyModel = null;
   let reportedCurrentModel;
@@ -1641,8 +1656,6 @@ async function runCodex(opts) {
     });
   };
   const resetCurrentModeDefaults = () => {
-    currentEffort = DEFAULT_CODEX_EFFORT;
-    reportModeFacts();
     currentAppendSystemPrompt = void 0;
     logger.logger.debug("[Codex] Reset current mode defaults after abort");
   };
@@ -1656,8 +1669,9 @@ async function runCodex(opts) {
   };
   publishPermissionMode(opts.permissionMode);
   let discoveredModels = [];
+  let codexAgentVersion = null;
   let machineDefaultModel;
-  agentAttachments.registerAgentAttachmentDownloads(session);
+  heldInput.registerAgentAttachmentDownloads(session);
   const CODEX_IMAGE_MIME_TYPES = ["image/jpeg", "image/png", "image/gif", "image/webp"];
   const steerDeps = {
     ownsTurn: () => turnActive && !abortInProgress && !shouldExit,
@@ -1700,9 +1714,13 @@ async function runCodex(opts) {
         reportModeFacts();
         logger.logger.debug("[Codex] Model override updated", logValueMetadata(message.meta.model));
       } else {
+        messageModelReset = pendingModelReset && !messageModel;
         logger.logger.debug("[Codex] User message received without a model override");
       }
+      pendingModelReset = false;
       let messageEffort = currentEffort;
+      let effortExplicit = false;
+      let effortRefused = false;
       if (message.meta?.hasOwnProperty("effort")) {
         const incoming = message.meta.effort;
         if (incoming === null || incoming === void 0) {
@@ -1712,15 +1730,22 @@ async function runCodex(opts) {
           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");
+          effortExplicit = true;
+          effortRefused = unsupportedEffortReason(discoveredModels, effortJudgeModel(messageModel, messageModelReset), messageEffort) !== null;
+          if (effortRefused) {
+            logger.logger.debug("[Codex] Effort override refused by the model catalog; sticky level kept", logValueMetadata(incoming));
+          } else {
+            currentEffort = messageEffort;
+            reportModeFacts();
+            logger.logger.debug("[Codex] Valid effort override applied");
+          }
         } else {
           logger.logger.debug("[Codex] Ignoring invalid effort override", logValueMetadata(incoming));
         }
       } else {
         logger.logger.debug("[Codex] User message received without an effort override");
       }
+      defaultPermissionMode.recordRunIntents(session, effortRefused ? defaultPermissionMode.withoutEffort(message.meta) : message.meta);
       let messageAppendSystemPrompt = currentAppendSystemPrompt;
       if (message.meta?.hasOwnProperty("appendSystemPrompt")) {
         messageAppendSystemPrompt = message.meta.appendSystemPrompt || void 0;
@@ -1734,7 +1759,8 @@ async function runCodex(opts) {
         model: messageModel,
         ...messageModelReset ? { modelReset: true } : {},
         appendSystemPrompt: messageAppendSystemPrompt,
-        effort: messageEffort
+        effort: messageEffort,
+        ...effortExplicit ? { effortExplicit: true } : {}
       };
       if (message.meta?.delivery === "steer" && !isCodexControlText(message.content.text)) {
         if (await steerIntoRunningTurn(steerDeps, message.content.text, attachments, message.localKey)) {
@@ -1755,6 +1781,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;
@@ -1797,7 +1824,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) {
@@ -1850,6 +1878,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 {
@@ -1875,6 +1907,24 @@ async function runCodex(opts) {
     }
   });
   session.rpcHandlerManager.registerHandler("abort", () => handleAbort("user"));
+  defaultPermissionMode.registerRunIntentRpc(session.rpcHandlerManager, {
+    getMetadata: () => session.getMetadata(),
+    updateMetadata: (handler) => session.updateMetadata(handler)
+  }, (request) => {
+    if (Object.prototype.hasOwnProperty.call(request, "model")) {
+      currentModel = request.model || void 0;
+      pendingModelReset = !currentModel;
+    }
+    let effortRefused = false;
+    if (Object.prototype.hasOwnProperty.call(request, "effort")) {
+      const effort = request.effort || void 0;
+      effortRefused = unsupportedEffortReason(discoveredModels, effortJudgeModel(currentModel, pendingModelReset), effort) !== null;
+      if (!effortRefused) currentEffort = effort;
+    }
+    if (client$1) reportModeFacts();
+    logger.logger.debug("[Codex] Run intent set", logValueMetadata(request.model ?? null));
+    return { effortRefused };
+  });
   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;
@@ -2075,6 +2125,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;
@@ -2169,17 +2220,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,
@@ -2199,6 +2251,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");
@@ -2216,6 +2270,7 @@ async function runCodex(opts) {
           break;
         }
         message = batch;
+        heldInput$1.hold(batch.sourceIds);
       }
       if (!message) {
         break;
@@ -2228,6 +2283,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();
@@ -2264,6 +2320,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) => {
@@ -2281,9 +2338,23 @@ async function runCodex(opts) {
           sandboxManagedByHappy
         );
         const turnModel = resolveCodexTurnModel(message.mode, machineDefaultModel);
-        const effortRefusal = unsupportedEffortReason(discoveredModels, turnModel ?? client$1.threadModel ?? machineDefaultModel, message.mode.effort);
-        if (effortRefusal) {
-          throw new Error(effortRefusal);
+        const turnEffort = settleTurnEffort(discoveredModels, turnModel ?? client$1.threadModel ?? machineDefaultModel, message.mode.effort, {
+          explicit: message.mode.effortExplicit === true,
+          fallback: lastStartedEffort
+        });
+        if (turnEffort.changed) {
+          const refused = message.mode.effort;
+          if (currentEffort === refused) {
+            currentEffort = turnEffort.effort;
+            reportModeFacts();
+          }
+          if (index.readEffortIntent(session.getMetadata()?.effortIntent) === refused) {
+            defaultPermissionMode.recordRunIntents(session, { effort: turnEffort.effort ?? null, effortIntent: turnEffort.effort ?? index.EFFORT_INTENT_AUTO });
+          }
+          logger.logger.debug("[Codex] Refused effort settled", logValueMetadata(turnEffort.effort ?? null));
+        }
+        if (turnEffort.refusal) {
+          throw new Error(turnEffort.refusal);
         }
         if (!client$1.hasActiveThread()) {
           const startedThread = await client$1.startThread({
@@ -2312,12 +2383,20 @@ 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: turnModel,
           approvalPolicy: executionPolicy.approvalPolicy,
           sandbox: executionPolicy.sandbox,
-          effort: message.mode.effort
+          effort: turnEffort.effort,
+          onTurnStarted: () => {
+            lastStartedEffort = turnEffort.effort;
+            heldInput$1.delivered();
+          }
         });
         reportModeFacts();
         first = false;
@@ -2329,6 +2408,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");
@@ -2360,6 +2440,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) {

package/dist/{codexTermination-BvGlN02_.mjs → codexTermination-BcQdEDaw.mjs}

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

package/dist/{codexTermination-IrLZQzKC.cjs → codexTermination-BszWfyk5.cjs}

@@ -1,7 +1,7 @@
 'use strict';
 
 var node_crypto = require('node:crypto');
-var logger = require('./logger-BP1SW7Cs.cjs');
+var logger = require('./logger-Ct2zvaq0.cjs');
 var sessionExitLifecycle = require('./sessionExitLifecycle-DFltxXU8.cjs');
 
 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-BGFqQGvh.cjs → config-Di3Cf6js.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-BP1SW7Cs.cjs');
+var logger = require('./logger-Ct2zvaq0.cjs');
 var constants = require('./constants-VJ0N6WuG.cjs');
 require('chalk');
 require('node:util');
-require('./configuration-C0ctLGW2.cjs');
+require('./configuration-DfPBa-9d.cjs');
 require('node:fs');
 require('node:os');
 require('node:path');
-require('./package-CYDdLA6R.cjs');
+require('./package-9n7wd2dT.cjs');
 require('node:fs/promises');
 require('./trimIdent-4gvk9Wk6.cjs');
 

package/dist/{config-CtMgGPvf.mjs → config-OCEcVVK1.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-DOKH3Zbh.mjs';
+import { l as logger } from './logger-GcbI0eg2.mjs';
 import { D as DEFAULT_GEMINI_MODEL, G as GEMINI_MODEL_ENV } from './constants-BC4St0xd.mjs';
 import 'chalk';
 import 'node:util';
-import './configuration-1FabKklB.mjs';
+import './configuration-ECqXu34R.mjs';
 import 'node:fs';
 import 'node:os';
 import 'node:path';
-import './package-DTcaIhjW.mjs';
+import './package-BsUHyqWe.mjs';
 import 'node:fs/promises';
 import './trimIdent-BAjmv_TG.mjs';
 

package/dist/{configuration-C0ctLGW2.cjs → configuration-DfPBa-9d.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-CYDdLA6R.cjs');
+var _package = require('./package-9n7wd2dT.cjs');
 var promises = require('node:fs/promises');
 
 const PRIVATE_DIRECTORY_MODE = 448;

package/dist/{configuration-1FabKklB.mjs → configuration-ECqXu34R.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-DTcaIhjW.mjs';
+import { p as packageJson } from './package-BsUHyqWe.mjs';
 import { mkdir, chmod, writeFile } from 'node:fs/promises';
 
 const PRIVATE_DIRECTORY_MODE = 448;