very-happy-cli 0.2.189 → 0.2.190

package/dist/{codexAppServerClient-CO9f4Jr8.cjs → codexAppServerClient-CpT9F6EM.cjs}

@@ -3,11 +3,11 @@
 var node_child_process = require('node:child_process');
 var spawn = require('cross-spawn');
 var node_readline = require('node:readline');
-var logger = require('./logger-BP1SW7Cs.cjs');
+var logger = require('./logger-BBRTTVsQ.cjs');
 var contentLogMetadata = require('./contentLogMetadata-ZSFk_NjQ.cjs');
 var manager = require('./manager-HrEj442o.cjs');
-var _package = require('./package-CYDdLA6R.cjs');
-var rateLimitWindows = require('./rateLimitWindows-Cs56YJCH.cjs');
+var _package = require('./package-DrY090nZ.cjs');
+var rateLimitWindows = require('./rateLimitWindows-Bx3ROBP5.cjs');
 var processTree = require('./processTree-CMHWlVse.cjs');
 
 const CODEX_HELPER_LABEL_MAX_CHARS = 80;
@@ -127,6 +127,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;
@@ -627,7 +629,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.logger.debug("[CodexAppServer] Connected and initialized");
@@ -813,7 +816,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;
@@ -1120,7 +1124,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-BfoRP6E9.cjs → codexCommand-39kH99SJ.cjs}

@@ -1,108 +1,109 @@
 'use strict';
 
-var auth = require('./auth-DQKSpaEf.cjs');
+var auth = require('./auth-Bb_SL2os.cjs');
 var index = require('./index-BOe6dKnL.cjs');
-var deterministicJson = require('./deterministicJson-D0LU_XbO.cjs');
-var client = require('./client-DIfxYk7B.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-BDuuyys8.cjs');
-var agentAttachments = require('./agentAttachments-Dbw8iMCZ.cjs');
-var attachmentContent = require('./attachmentContent-Cc5b7TPr.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-DSqiP2lH.cjs');
+var sessionLock = require('./sessionLock-BFBReiKq.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-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-CrzC7yr_.cjs');
-var machineMetadata = require('./machineMetadata-BKX3ov9g.cjs');
-var configuration = require('./configuration-C0ctLGW2.cjs');
-var registerKillSessionHandler = require('./registerKillSessionHandler-DhCjrs44.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-DezS33OM.cjs');
+var createSessionMetadata = require('./createSessionMetadata-B_HZCDj_.cjs');
 var sessionExitLifecycle = require('./sessionExitLifecycle-DFltxXU8.cjs');
-var controlClient = require('./controlClient-F7hAEEy2.cjs');
-var defaultPermissionMode = require('./defaultPermissionMode-5EvgRq38.cjs');
+var controlClient = require('./controlClient-BRk65BRO.cjs');
+var startupSessionCreate = require('./startupSessionCreate-Dxy3X4DG.cjs');
 var authRelay = require('./authRelay-Dy1qU9td.cjs');
-var setupOfflineReconnection = require('./setupOfflineReconnection-tV0Q1dgR.cjs');
-var startupSessionCreate = require('./startupSessionCreate-CYc8mra-.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-CIghxgDR.cjs');
+var ensureDaemonRunning = require('./ensureDaemonRunning-Bibp6vhe.cjs');
 require('tweetnacl');
 require('axios');
-require('./time-XwEZxKGc.cjs');
-require('./browser-D1yzC0Tu.cjs');
+require('./time-gPD_EmA-.cjs');
+require('./browser-CLJWcodR.cjs');
 require('open');
 require('zod');
 require('./prompt-Bof2aQkI.cjs');
-require('./reportProgressTool-DznxPKES.cjs');
-require('./client-D0aYWt53.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-BNmFaRXZ.cjs');
+require('./client-CARZ_lNS.cjs');
 require('node:util');
-require('./context-D-hEk5pC.cjs');
-require('./sessionOps-BzeOKIEF.cjs');
+require('./context-BdZssgF0.cjs');
+require('./sessionOps-DeWVqpe4.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-DvqbLsCF.cjs');
+require('./peerTools-5ZM4spcZ.cjs');
 require('./ids-B6ZC0HGt.cjs');
-require('./remoteSessionClient-Dq8XTLQP.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-aNcCxVRL.cjs');
+require('./downloadTarget-DS0zT2AU.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-DBJB0y-H.cjs');
+require('./package-DrY090nZ.cjs');
 require('./webPanels-FCgFKvVe.cjs');
-require('./pushNotifications-CalIS9sq.cjs');
+require('./pushNotifications-CfspRcl-.cjs');
 require('./contentLogMetadata-ZSFk_NjQ.cjs');
 require('./previewPath-B0rBdhy1.cjs');
 require('crypto');
-require('./lidState-B4dHJCeS.cjs');
+require('./lidState-q_XFYg33.cjs');
 require('os');
 require('child_process');
 require('node:events');
-require('./registerCommonHandlers-DZPozYxc.cjs');
+require('./registerCommonHandlers-Beun-cQv.cjs');
 require('util');
 require('fs/promises');
 require('path');
 require('cross-spawn');
-require('./sync-CoChLEIg.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-Cs56YJCH.cjs');
+require('./rateLimitWindows-Bx3ROBP5.cjs');
 require('./processTree-CMHWlVse.cjs');
 require('./detectCLI-BuYR_Qxe.cjs');
 require('fs');
-require('./localHappyAgentAuth-CG2nPD_H.cjs');
+require('./localHappyAgentAuth-CKNW-MXw.cjs');
 require('./fsMkdir-0K3yENml.cjs');
 require('./types-CRS-srZK.cjs');
 require('url');
-require('./spawnHappyCLI-CxiR2Qoy.cjs');
+require('./spawnHappyCLI-CTy3p6V_.cjs');
 require('./doctorReadiness-Dl6yRQCy.cjs');
 
 function getStartedSubagents(state) {
@@ -1499,7 +1500,7 @@ 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;
@@ -1616,6 +1617,7 @@ 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;
@@ -1656,8 +1658,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,
@@ -1755,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;
@@ -1797,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) {
@@ -1850,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 {
@@ -2075,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;
@@ -2169,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,
@@ -2199,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");
@@ -2216,6 +2229,7 @@ async function runCodex(opts) {
           break;
         }
         message = batch;
+        heldInput$1.hold(batch.sourceIds);
       }
       if (!message) {
         break;
@@ -2228,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();
@@ -2264,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) => {
@@ -2312,12 +2328,17 @@ 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: message.mode.effort,
+          onTurnStarted: () => heldInput$1.delivered()
         });
         reportModeFacts();
         first = false;
@@ -2329,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");
@@ -2360,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) {

package/dist/{codexCommand-CAMR4g5o.mjs → codexCommand-Dliq3EBv.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-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-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-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-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-Ca_bIo50.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-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-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-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-CG6Klinp.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-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-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-B7I8R2Ex.mjs';
-import { c as createSessionForStartup } from './startupSessionCreate-npXe2TdN.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-DZq8bvsp.mjs';
+import { a as extractNoSandboxFlag, e as ensureDaemonRunning } from './ensureDaemonRunning-BOdbryDM.mjs';
 import 'tweetnacl';
 import 'axios';
-import './time-CUK37wiV.mjs';
-import './browser-vb0k1zfI.mjs';
+import './time-CN3TuSVG.mjs';
+import './browser-BGxDRhHy.mjs';
 import 'open';
 import 'zod';
 import './prompt-QHuFx9j6.mjs';
-import './reportProgressTool-B7zmX7NJ.mjs';
-import './client-CvjjadIE.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-C9Ecbtko.mjs';
+import './client-CtL0Vtww.mjs';
 import 'node:util';
-import './context-BgxbXWKS.mjs';
-import './sessionOps-CljctDs5.mjs';
+import './context-C9JbJoNe.mjs';
+import './sessionOps-CA2kpm66.mjs';
 import 'socket.io-client';
 import './backgroundTaskActivity-8PdPxrvy.mjs';
 import './resources-CLP_MpK4.mjs';
-import './tools-CCIEAVbB.mjs';
-import './peerTools-BtrUnSwz.mjs';
+import './tools-zXJpxiG_.mjs';
+import './peerTools-dY1aJez4.mjs';
 import './ids-DU6sLx4C.mjs';
-import './remoteSessionClient-Vfj_5g2-.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-C6tqaXGm.mjs';
+import './downloadTarget-CGojGjaN.mjs';
 import './terminals-Dlg0x3nY.mjs';
 import './terminalTitleSuggest-CeKsX_V6.mjs';
 import './tmuxSocket-B8Yx20sT.mjs';
-import './bootstrap-DfXwkUQb.mjs';
-import './package-DTcaIhjW.mjs';
+import './bootstrap-Ct9Nb4sv.mjs';
+import './package-C6uiXULx.mjs';
 import './webPanels-B2_C2-3g.mjs';
-import './pushNotifications-Cq1s8YVK.mjs';
+import './pushNotifications-dUceOIni.mjs';
 import './contentLogMetadata-BlWI0egu.mjs';
 import './previewPath-CXN4Vag0.mjs';
 import 'crypto';
-import './lidState-q5Its2Hm.mjs';
+import './lidState-D0DF20oG.mjs';
 import 'os';
 import 'child_process';
 import 'node:events';
-import './registerCommonHandlers-DWkTysjD.mjs';
+import './registerCommonHandlers-DWZ7mfdt.mjs';
 import 'util';
 import 'fs/promises';
 import 'path';
 import 'cross-spawn';
-import './sync-BvDMkKAN.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-5vIuNjko.mjs';
+import './rateLimitWindows-CEn0DXaX.mjs';
 import './processTree-CP5IvQ2Z.mjs';
 import './detectCLI-CSGMlV51.mjs';
 import 'fs';
-import './localHappyAgentAuth-C_G5u5lY.mjs';
+import './localHappyAgentAuth-BBhM4Qk1.mjs';
 import './fsMkdir-DumgLTzR.mjs';
 import './types-CkqAACXx.mjs';
 import 'url';
-import './spawnHappyCLI-CEsXwz5V.mjs';
+import './spawnHappyCLI-DjbkiSH1.mjs';
 import './doctorReadiness-C208SMN9.mjs';
 
 function getStartedSubagents(state) {
@@ -1497,7 +1498,7 @@ 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;
@@ -1614,6 +1615,7 @@ 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;
@@ -1654,6 +1656,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"];
@@ -1753,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;
@@ -1795,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;
@@ -1848,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 {
@@ -2073,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;
@@ -2167,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 } : {}
         };
       };
@@ -2197,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");
@@ -2214,6 +2227,7 @@ async function runCodex(opts) {
           break;
         }
         message = batch;
+        heldInput.hold(batch.sourceIds);
       }
       if (!message) {
         break;
@@ -2226,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();
@@ -2262,6 +2277,7 @@ async function runCodex(opts) {
       try {
         if (compactCommand !== null) {
           await client.ensureConnected();
+          heldInput.delivered();
           const outcome = await runCodexCompact(compactCommand, {
             client,
             notify: (text) => {
@@ -2310,12 +2326,17 @@ 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: message.mode.effort,
+          onTurnStarted: () => heldInput.delivered()
         });
         reportModeFacts();
         first = false;
@@ -2327,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");
@@ -2358,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-IrLZQzKC.cjs → codexTermination-ByW7tRjr.cjs}

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