very-happy-cli 0.2.189 → 0.2.191

package/dist/{codexAppServerClient-BlVmpjR-.mjs → codexAppServerClient-DXhAf6i-.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-DOKH3Zbh.mjs';
+import { l as logger } from './logger-GcbI0eg2.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-DTcaIhjW.mjs';
-import { s as shouldReadCodexRateLimits, i as isUnsupportedCodexMethodError } from './rateLimitWindows-5vIuNjko.mjs';
+import { p as packageJson } from './package-BsUHyqWe.mjs';
+import { s as shouldReadCodexRateLimits, i as isUnsupportedCodexMethodError } from './rateLimitWindows-j_qQk0KY.mjs';
 import { s as stopProcessGracefully, k as killProcessTree } from './processTree-CP5IvQ2Z.mjs';
 
 const CODEX_HELPER_LABEL_MAX_CHARS = 80;
@@ -125,6 +125,8 @@ class CodexAppServerClient {
   pending = /* @__PURE__ */ new Map();
   processEpoch = 0;
   connected = false;
+  /** B-852: agent version from the last `initialize` (null = unknown). */
+  serverVersion = null;
   sandboxConfig;
   sandboxCleanup = null;
   sandboxEnabled = false;
@@ -625,7 +627,8 @@ ${text}`.slice(-400);
         experimentalApi: true
       }
     };
-    await this.request("initialize", initParams);
+    const initialized = await this.request("initialize", initParams);
+    this.serverVersion = typeof initialized?.userAgent === "string" ? initialized.userAgent.match(/\/(\d+\.\d+\.\d+)\b/)?.[1] ?? null : null;
     this.notify("initialized");
     this.connected = true;
     logger.debug("[CodexAppServer] Connected and initialized");
@@ -811,7 +814,8 @@ ${text}`.slice(-400);
       baseInstructions: null,
       developerInstructions: null,
       ephemeral: false,
-      threadSource: null
+      threadSource: null,
+      ...opts.lastTurnId ? { lastTurnId: opts.lastTurnId } : {}
     };
     const result = await this.request("thread/fork", params);
     this._threadId = result.thread.id;
@@ -1118,7 +1122,10 @@ ${text}`.slice(-400);
    * Returns { aborted: true } if the turn was aborted (user cancel, permission reject, etc.).
    */
   async sendTurnAndWait(prompt, opts) {
-    const { aborted } = await this.runTurnAndWait(() => this.sendTurn(prompt, opts), opts);
+    const { aborted } = await this.runTurnAndWait(async () => {
+      await this.sendTurn(prompt, opts);
+      opts?.onTurnStarted?.();
+    }, opts);
     return { aborted };
   }
   /**

package/dist/{codexCommand-CAMR4g5o.mjs → codexCommand-CIaOiiOj.mjs}

@@ -1,106 +1,107 @@
-import { a as authAndSetupMachineIfNeeded } from './auth-CyrVvWHF.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-BMwgK21e.mjs';
-import { s as sharedProjectsClient } from './client-B161HwAk.mjs';
+import { a as authAndSetupMachineIfNeeded } from './auth-DC6rg8lJ.mjs';
+import { j as createEnvelope, t as BUILTIN_TODO_DISCOVERY, r as restoredEffort, m as readEffortIntent, E as EFFORT_INTENT_AUTO, P as PROMPT_QUEUE_CAPABILITY, Y as CODEX_STEER_CAPABILITY, a as PROJECT_SESSION_CAPABILITY, Z as CODEX_COMPACT_CAPABILITY, R as RUN_INTENT_CAPABILITY } from './index-Bq8NKSCF.mjs';
+import { a as recordRunIntents, w as withoutEffort, r as registerRunIntentRpc, b as DEFAULT_CODEX_PERMISSION_MODE } from './defaultPermissionMode-m6z2QVyP.mjs';
+import { h as hashObject, s as startHappyServer, c as createProjectInjector } from './deterministicJson-BtSwbsok.mjs';
+import { s as sharedProjectsClient } from './client-Bi20Ka0h.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-B0yN68XH.mjs';
-import { r as registerAgentAttachmentDownloads } from './agentAttachments-M_B5qEF2.mjs';
-import { C as CLAUDE_ATTACHMENT_KINDS, a as stageClaudeAttachments, b as appendStagedAttachmentsToPrompt } from './attachmentContent-CcIdMfAx.mjs';
+import { t as textResultPayload, d as toolResultContentText, c as connectionState, A as ApiClient } from './api-jfeMRg5R.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-Dm_RIs5L.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-tEFvFXLD.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-G2PMqvsh.mjs';
 import React, { useState, useRef, useEffect, useCallback } from 'react';
-import { C as CodexAppServerClient } from './codexAppServerClient-BlVmpjR-.mjs';
-import { w as wrapperRateLimitReporter } from './rateLimitReporter-DR5LXuiQ.mjs';
-import { l as logger } from './logger-DOKH3Zbh.mjs';
-import { B as BasePermissionHandler } from './BasePermissionHandler-CVtH-snr.mjs';
-import { B as BaseReasoningProcessor, s as settleCodexSession } from './codexTermination-BvGlN02_.mjs';
+import { C as CodexAppServerClient } from './codexAppServerClient-DXhAf6i-.mjs';
+import { w as wrapperRateLimitReporter } from './rateLimitReporter-COUkf446.mjs';
+import { l as logger } from './logger-GcbI0eg2.mjs';
+import { B as BasePermissionHandler } from './BasePermissionHandler-DYLN6Ec9.mjs';
+import { B as BaseReasoningProcessor, s as settleCodexSession } from './codexTermination-BcQdEDaw.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-0INrP3aB.mjs';
-import { g as getInitialMachineMetadata } from './machineMetadata-D-5qeIqd.mjs';
-import { c as configuration } from './configuration-1FabKklB.mjs';
-import { M as MessageQueue2, r as registerKillSessionHandler } from './registerKillSessionHandler-CSCTRIbI.mjs';
+import { r as readSettings, l as latchKeepAwake, e as evaluateWrapperIdle, a as resolveCheckMs, H as HIBERNATION_CAPABILITY } from './persistence-Cpw4yJs8.mjs';
+import { g as getInitialMachineMetadata } from './machineMetadata-CXRmFNOV.mjs';
+import { c as configuration } from './configuration-ECqXu34R.mjs';
+import { M as MessageQueue2, r as registerKillSessionHandler } from './registerKillSessionHandler-Cpug_r5C.mjs';
 import { p as projectPath } from './projectPath-BTBIMB57.mjs';
 import { join } from 'node:path';
-import { c as createSessionMetadata } from './createSessionMetadata-CG6Klinp.mjs';
+import { c as createSessionMetadata } from './createSessionMetadata-B0eT_Kfj.mjs';
 import { M as MessageBuffer } from './sessionExitLifecycle-CzkLIgNZ.mjs';
-import { n as notifyDaemonSessionStarted, k as reportSessionEditToDaemon, c as checkDaemonHibernation } from './controlClient-DwNnNAUx.mjs';
-import { a as HibernationExitLatch, H as HibernationProbe, c as commitHibernation, b as DEFAULT_CODEX_PERMISSION_MODE } from './defaultPermissionMode-e2bIIJG4.mjs';
+import { n as notifyDaemonSessionStarted, k as reportSessionEditToDaemon, c as checkDaemonHibernation } from './controlClient-ClI7A0qE.mjs';
+import { c as createSessionForStartup, b as HibernationExitLatch, H as HibernationProbe, a as commitHibernation } from './startupSessionCreate-BtR4iYEC.mjs';
 import { d as decodeBase64, e as encodeBase64 } from './authRelay-DhQhkBvX.mjs';
-import { s as setupOfflineReconnection } from './setupOfflineReconnection-B7I8R2Ex.mjs';
-import { c as createSessionForStartup } from './startupSessionCreate-npXe2TdN.mjs';
+import { s as setupOfflineReconnection } from './setupOfflineReconnection-DI-QZGYz.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 { E as EditReportThrottle, a as extractCodexPatchPaths } from './editPaths-BVfS_FFL.mjs';
-import { a as extractNoSandboxFlag, e as ensureDaemonRunning } from './ensureDaemonRunning-DZq8bvsp.mjs';
+import { a as extractNoSandboxFlag, e as ensureDaemonRunning } from './ensureDaemonRunning-B_9WAlbU.mjs';
 import 'tweetnacl';
 import 'axios';
-import './time-CUK37wiV.mjs';
-import './browser-vb0k1zfI.mjs';
+import './time-D0jvDRhn.mjs';
+import './browser-CHpVgyni.mjs';
 import 'open';
 import 'zod';
 import './prompt-QHuFx9j6.mjs';
-import './reportProgressTool-B7zmX7NJ.mjs';
-import './client-CvjjadIE.mjs';
+import './reportProgressTool-XgQBzxoD.mjs';
+import './client-BXD66ZF5.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-C9Ecbtko.mjs';
+import './client-Bh1aUPh-.mjs';
 import 'node:util';
-import './context-BgxbXWKS.mjs';
-import './sessionOps-CljctDs5.mjs';
+import './context-CfgTFpCB.mjs';
+import './sessionOps-DPw5k8vV.mjs';
 import 'socket.io-client';
 import './backgroundTaskActivity-8PdPxrvy.mjs';
 import './resources-CLP_MpK4.mjs';
-import './tools-CCIEAVbB.mjs';
-import './peerTools-BtrUnSwz.mjs';
+import './tools-Bei5i03L.mjs';
+import './peerTools-CwCe6tmJ.mjs';
 import './ids-DU6sLx4C.mjs';
-import './remoteSessionClient-Vfj_5g2-.mjs';
+import './remoteSessionClient-BdnJ_n8C.mjs';
 import '@modelcontextprotocol/sdk/server/mcp.js';
 import 'node:http';
 import '@modelcontextprotocol/sdk/server/streamableHttp.js';
 import './limits-DIo7rEBR.mjs';
-import './downloadTarget-C6tqaXGm.mjs';
+import './downloadTarget-BXqXhNF7.mjs';
 import './terminals-Dlg0x3nY.mjs';
 import './terminalTitleSuggest-CeKsX_V6.mjs';
 import './tmuxSocket-B8Yx20sT.mjs';
-import './bootstrap-DfXwkUQb.mjs';
-import './package-DTcaIhjW.mjs';
+import './bootstrap-rLaL3kTa.mjs';
+import './package-BsUHyqWe.mjs';
 import './webPanels-B2_C2-3g.mjs';
-import './pushNotifications-Cq1s8YVK.mjs';
+import './pushNotifications-XAM8__Pg.mjs';
 import './contentLogMetadata-BlWI0egu.mjs';
 import './previewPath-CXN4Vag0.mjs';
 import 'crypto';
-import './lidState-q5Its2Hm.mjs';
+import './lidState-CD81ryTy.mjs';
 import 'os';
 import 'child_process';
 import 'node:events';
-import './registerCommonHandlers-DWkTysjD.mjs';
+import './registerCommonHandlers-DRRfinzK.mjs';
 import 'util';
 import 'fs/promises';
 import 'path';
 import 'cross-spawn';
-import './sync-BvDMkKAN.mjs';
+import './sync-C0PRuTMj.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-5vIuNjko.mjs';
+import './rateLimitWindows-j_qQk0KY.mjs';
 import './processTree-CP5IvQ2Z.mjs';
 import './detectCLI-CSGMlV51.mjs';
 import 'fs';
-import './localHappyAgentAuth-C_G5u5lY.mjs';
+import './localHappyAgentAuth-Cg-m1lwm.mjs';
 import './fsMkdir-DumgLTzR.mjs';
 import './types-CkqAACXx.mjs';
 import 'url';
-import './spawnHappyCLI-CEsXwz5V.mjs';
+import './spawnHappyCLI-CIA9Sc_5.mjs';
 import './doctorReadiness-C208SMN9.mjs';
 
 function getStartedSubagents(state) {
@@ -1094,6 +1095,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;
@@ -1497,11 +1505,13 @@ 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, RUN_INTENT_CAPABILITY]
   });
   metadata.attachmentKinds = [...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;
@@ -1555,6 +1565,7 @@ async function runCodex(opts) {
       logger.debug(`[START] Reconnect without server snapshot (${snapshot.reason}); skipping existing messages`);
     }
   }
+  const resumedEffort = reconnectSeeded && response ? restoredEffort(response.metadata, { useReportedLevel: true }) : void 0;
   let session;
   let permissionHandler;
   let client;
@@ -1614,9 +1625,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 = new 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?.threadModel ?? machineDefaultModel;
   let currentAppendSystemPrompt = void 0;
   let reportedStickyModel = null;
   let reportedCurrentModel;
@@ -1639,8 +1654,6 @@ async function runCodex(opts) {
     });
   };
   const resetCurrentModeDefaults = () => {
-    currentEffort = DEFAULT_CODEX_EFFORT;
-    reportModeFacts();
     currentAppendSystemPrompt = void 0;
     logger.debug("[Codex] Reset current mode defaults after abort");
   };
@@ -1654,6 +1667,7 @@ async function runCodex(opts) {
   };
   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"];
@@ -1698,9 +1712,13 @@ async function runCodex(opts) {
         reportModeFacts();
         logger.debug("[Codex] Model override updated", logValueMetadata(message.meta.model));
       } else {
+        messageModelReset = pendingModelReset && !messageModel;
         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) {
@@ -1710,15 +1728,22 @@ async function runCodex(opts) {
           logger.debug(`[Codex] Effort reset to default`);
         } else if (typeof incoming === "string") {
           messageEffort = incoming;
-          currentEffort = messageEffort;
-          reportModeFacts();
-          logger.debug("[Codex] Valid effort override applied");
+          effortExplicit = true;
+          effortRefused = unsupportedEffortReason(discoveredModels, effortJudgeModel(messageModel, messageModelReset), messageEffort) !== null;
+          if (effortRefused) {
+            logger.debug("[Codex] Effort override refused by the model catalog; sticky level kept", logValueMetadata(incoming));
+          } else {
+            currentEffort = messageEffort;
+            reportModeFacts();
+            logger.debug("[Codex] Valid effort override applied");
+          }
         } else {
           logger.debug("[Codex] Ignoring invalid effort override", logValueMetadata(incoming));
         }
       } else {
         logger.debug("[Codex] User message received without an effort override");
       }
+      recordRunIntents(session, effortRefused ? withoutEffort(message.meta) : message.meta);
       let messageAppendSystemPrompt = currentAppendSystemPrompt;
       if (message.meta?.hasOwnProperty("appendSystemPrompt")) {
         messageAppendSystemPrompt = message.meta.appendSystemPrompt || void 0;
@@ -1732,7 +1757,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)) {
@@ -1753,6 +1779,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;
@@ -1795,6 +1822,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;
@@ -1848,6 +1876,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 {
@@ -1873,6 +1905,24 @@ async function runCodex(opts) {
     }
   });
   session.rpcHandlerManager.registerHandler("abort", () => handleAbort("user"));
+  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) reportModeFacts();
+    logger.debug("[Codex] Run intent set", logValueMetadata(request.model ?? null));
+    return { effortRefused };
+  });
   const disposeTermination = registerKillSessionHandler(session.rpcHandlerManager, () => handleKillSession("archive"), session, { processSignals: true, onSignal: () => handleKillSession("offline") });
   const messageBuffer = new MessageBuffer();
   const hasTTY = process.stdout.isTTY && process.stdin.isTTY;
@@ -2073,6 +2123,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;
@@ -2167,6 +2218,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 } : {}
         };
       };
@@ -2197,6 +2249,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");
@@ -2214,6 +2268,7 @@ async function runCodex(opts) {
           break;
         }
         message = batch;
+        heldInput.hold(batch.sourceIds);
       }
       if (!message) {
         break;
@@ -2226,6 +2281,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();
@@ -2262,6 +2318,7 @@ async function runCodex(opts) {
       try {
         if (compactCommand !== null) {
           await client.ensureConnected();
+          heldInput.delivered();
           const outcome = await runCodexCompact(compactCommand, {
             client,
             notify: (text) => {
@@ -2279,9 +2336,23 @@ async function runCodex(opts) {
           sandboxManagedByHappy
         );
         const turnModel = resolveCodexTurnModel(message.mode, machineDefaultModel);
-        const effortRefusal = unsupportedEffortReason(discoveredModels, turnModel ?? client.threadModel ?? machineDefaultModel, message.mode.effort);
-        if (effortRefusal) {
-          throw new Error(effortRefusal);
+        const turnEffort = settleTurnEffort(discoveredModels, turnModel ?? client.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 (readEffortIntent(session.getMetadata()?.effortIntent) === refused) {
+            recordRunIntents(session, { effort: turnEffort.effort ?? null, effortIntent: turnEffort.effort ?? EFFORT_INTENT_AUTO });
+          }
+          logger.debug("[Codex] Refused effort settled", logValueMetadata(turnEffort.effort ?? null));
+        }
+        if (turnEffort.refusal) {
+          throw new Error(turnEffort.refusal);
         }
         if (!client.hasActiveThread()) {
           const startedThread = await client.startThread({
@@ -2310,12 +2381,20 @@ 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: turnModel,
           approvalPolicy: executionPolicy.approvalPolicy,
           sandbox: executionPolicy.sandbox,
-          effort: message.mode.effort
+          effort: turnEffort.effort,
+          onTurnStarted: () => {
+            lastStartedEffort = turnEffort.effort;
+            heldInput.delivered();
+          }
         });
         reportModeFacts();
         first = false;
@@ -2327,6 +2406,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");
@@ -2358,6 +2438,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) {