very-happy-cli 0.2.175 → 0.2.177

package/dist/{codexCommand-BdrBNbZu.mjs → codexCommand-CVTkZJ1o.mjs}

@@ -1,96 +1,97 @@
-import { a as authAndSetupMachineIfNeeded } from './auth-D1qHU-i_.mjs';
-import { c as createEnvelope, o as BUILTIN_TODO_DISCOVERY, P as PROMPT_QUEUE_CAPABILITY } from './index-boE-d8CM.mjs';
+import { a as authAndSetupMachineIfNeeded } from './auth-BmESeKuM.mjs';
+import { c as createEnvelope, o as BUILTIN_TODO_DISCOVERY, P as PROMPT_QUEUE_CAPABILITY, r as CODEX_STEER_CAPABILITY } from './index-DMy3OCBe.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 { r as registerAgentAttachmentDownloads } from './agentAttachments-M_B5qEF2.mjs';
-import { C as CLAUDE_ATTACHMENT_KINDS, a as stageClaudeAttachments, b as appendStagedAttachmentsToPrompt } from './attachmentContent-PrNJg8gG.mjs';
+import { C as CLAUDE_ATTACHMENT_KINDS, a as stageClaudeAttachments, b as appendStagedAttachmentsToPrompt } from './attachmentContent-cPVF463_.mjs';
 import { useStdout, useInput, Box, Text, render } from 'ink';
-import { c as claimSessionOrExit, a as applyServerSnapshot, b as applyHibernationReplay, w as withoutServerSnapshot, m as mergeReconnectMetadata } from './sessionLock-gb32sVPR.mjs';
+import { c as claimSessionOrExit, a as applyServerSnapshot, b as applyHibernationReplay, w as withoutServerSnapshot, m as mergeReconnectMetadata } from './sessionLock-ZfvFVdUi.mjs';
 import React, { useState, useRef, useEffect, useCallback } from 'react';
-import { c as connectionState, A as ApiClient } from './api-D08IEaWa.mjs';
-import { C as CodexAppServerClient } from './codexAppServerClient-CppPl_R6.mjs';
-import { p as parseSpecialCommand, w as wrapperRateLimitReporter } from './specialCommands-DUUBqzvd.mjs';
-import { l as logger } from './logger-D5EzMy30.mjs';
-import { B as BasePermissionHandler } from './BasePermissionHandler-DriZLITp.mjs';
-import { B as BaseReasoningProcessor } from './BaseReasoningProcessor-DnykPlPo.mjs';
+import { c as connectionState, A as ApiClient } from './api-CKBViqI3.mjs';
+import { C as CodexAppServerClient } from './codexAppServerClient-D-Z8qSfI.mjs';
+import { p as parseSpecialCommand, w as wrapperRateLimitReporter } from './specialCommands-DkdFJi4N.mjs';
+import { l as logger } from './logger-13cBr_ew.mjs';
+import { B as BasePermissionHandler } from './BasePermissionHandler-hdY7kTqX.mjs';
+import { B as BaseReasoningProcessor, s as settleCodexSession } from './codexTermination-CCIfwzcx.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-CIIhP0Uw.mjs';
-import { g as getInitialMachineMetadata } from './machineMetadata-DqplCWue.mjs';
-import { c as configuration } from './configuration-BNGPXg07.mjs';
-import { M as MessageQueue2, r as registerKillSessionHandler } from './registerKillSessionHandler-DLiu24CQ.mjs';
+import { r as readSettings, l as latchKeepAwake, e as evaluateWrapperIdle, a as resolveCheckMs, H as HIBERNATION_CAPABILITY } from './persistence-C_tYtOqK.mjs';
+import { g as getInitialMachineMetadata } from './machineMetadata-dMida2qq.mjs';
+import { c as configuration } from './configuration-D55F0t16.mjs';
+import { M as MessageQueue2, r as registerKillSessionHandler } from './registerKillSessionHandler-Drhf7-Vz.mjs';
 import { p as projectPath } from './projectPath-BTBIMB57.mjs';
 import { join } from 'node:path';
-import { c as createSessionMetadata } from './createSessionMetadata-CtNMvfth.mjs';
-import { h as hashObject, s as startHappyServer } from './deterministicJson-DF4xv6MH.mjs';
+import { c as createSessionMetadata } from './createSessionMetadata-Bi-m0Y_O.mjs';
+import { h as hashObject, s as startHappyServer } from './deterministicJson-BkQETt8_.mjs';
 import { M as MessageBuffer } from './messageBuffer-BWlGgR3A.mjs';
-import { n as notifyDaemonSessionStarted, j as reportSessionEditToDaemon, c as checkDaemonHibernation } from './controlClient-DqtC0pq1.mjs';
-import { a as HibernationExitLatch, H as HibernationProbe, c as commitHibernation, b as DEFAULT_CODEX_PERMISSION_MODE } from './defaultPermissionMode-DYihjV2g.mjs';
+import { n as notifyDaemonSessionStarted, j as reportSessionEditToDaemon, c as checkDaemonHibernation } from './controlClient-C4xB5J6O.mjs';
+import { a as HibernationExitLatch, H as HibernationProbe, c as commitHibernation, b as DEFAULT_CODEX_PERMISSION_MODE } from './defaultPermissionMode-wBcbBezm.mjs';
 import { d as decodeBase64, e as encodeBase64 } from './authRelay-DSAvg1uv.mjs';
-import { s as setupOfflineReconnection } from './setupOfflineReconnection-CgtXlV74.mjs';
+import { s as setupOfflineReconnection } from './setupOfflineReconnection-C5trsV-j.mjs';
 import { t as trimIdent } from './trimIdent-BAjmv_TG.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-JPA9tHNE.mjs';
+import { a as extractNoSandboxFlag, e as ensureDaemonRunning } from './ensureDaemonRunning--HYzs5Ce.mjs';
 import 'tweetnacl';
 import 'axios';
-import './time-CvrpeD3S.mjs';
-import './browser-xuW4fiHo.mjs';
+import './time-yEL6wHUF.mjs';
+import './browser-BlLWZUMx.mjs';
 import 'open';
 import 'zod';
-import 'node:fs/promises';
-import './attachmentLimits-BLbji11b.mjs';
+import './attachmentLimits-Di1Z93lN.mjs';
 import 'node:fs';
-import './lidState-CL1NdKfQ.mjs';
+import './lidState-BqVsw7H1.mjs';
 import 'os';
 import 'child_process';
 import 'node:events';
 import 'socket.io-client';
 import './limits-DIo7rEBR.mjs';
-import './registerCommonHandlers-CR5jpiSx.mjs';
+import './registerCommonHandlers-D8OMpBbQ.mjs';
 import 'util';
 import 'fs/promises';
 import 'crypto';
 import 'path';
 import 'cross-spawn';
-import './sync-D5YqUVjS.mjs';
-import './backgroundTaskActivity-8PdPxrvy.mjs';
+import './sync-C3p7-KLn.mjs';
+import './backgroundTaskActivity-BVwJBl02.mjs';
 import './contentLogMetadata-BlWI0egu.mjs';
 import 'chalk';
 import 'node:readline';
 import './manager-BEsI4qt3.mjs';
 import '@anthropic-ai/sandbox-runtime';
 import 'node:os';
-import './package-D0dxZ-W8.mjs';
-import './rateLimitWindows-Bo6XVnie.mjs';
+import './package-CjlsAaRe.mjs';
+import './rateLimitWindows-DYHDGuzQ.mjs';
+import './processTree-CP5IvQ2Z.mjs';
 import 'node:util';
 import './detectCLI-CSGMlV51.mjs';
 import 'fs';
-import './localHappyAgentAuth-B7f4Ysn0.mjs';
+import './localHappyAgentAuth-Ce8kO2yc.mjs';
 import './types-CkqAACXx.mjs';
 import 'url';
-import './client-eQjOvC55.mjs';
-import './context-Ptdnlcv6.mjs';
-import './sessionOps-ByZJbkMq.mjs';
+import './client-BPMWutfs.mjs';
+import './context-CCRpVXFo.mjs';
+import './sessionOps-CdgbEJgf.mjs';
 import './resources-BdFBQi8r.mjs';
-import './tools-Cp0qJeBq.mjs';
-import './reportProgressTool-BLLwMQrN.mjs';
-import './client-C4ddTzrD.mjs';
+import './tools-BrM3bZW5.mjs';
+import './reportProgressTool-B203EZCR.mjs';
+import './client-DG5ndWLw.mjs';
 import './precheckCompat-DeEbilbr.mjs';
 import './agentGuidance-BDYt2Qy2.mjs';
-import './peerTools-B_eiNB3P.mjs';
+import './peerTools-CxmrKnfV.mjs';
 import './ids-DU6sLx4C.mjs';
-import './remoteSessionClient-CUjw1COc.mjs';
+import './remoteSessionClient-D01Hso2-.mjs';
 import '@modelcontextprotocol/sdk/server/mcp.js';
 import 'node:http';
 import '@modelcontextprotocol/sdk/server/streamableHttp.js';
-import './downloadTarget-CUJg8iJV.mjs';
+import './downloadTarget-ByXzbDK4.mjs';
 import './terminals-Dlg0x3nY.mjs';
 import './terminalTitleSuggest-CeKsX_V6.mjs';
 import './tmuxSocket-B8Yx20sT.mjs';
-import './bootstrap-CWjpC5-J.mjs';
+import './bootstrap-C0s2bPFQ.mjs';
 import './previewPath-CXN4Vag0.mjs';
-import './spawnHappyCLI-DsC256j_.mjs';
+import './spawnHappyCLI-B_0RWxD4.mjs';
 import './doctorReadiness-C208SMN9.mjs';
 
 function getStartedSubagents(state) {
@@ -102,13 +103,29 @@ function getActiveSubagents(state) {
 function getProviderSubagentToSessionSubagent(state) {
   return state.providerSubagentToSessionSubagent ?? /* @__PURE__ */ new Map();
 }
-function maybeEmitSubagentStart(subagent, opts, startedSubagents, activeSubagents, envelopes) {
-  if (!subagent || startedSubagents.has(subagent)) {
+function getLabeledSubagents(state) {
+  return state.labeledSubagents ?? /* @__PURE__ */ new Set();
+}
+function maybeEmitSubagentStart(subagent, opts, startedSubagents, activeSubagents, envelopes, label, labeledSubagents = /* @__PURE__ */ new Set()) {
+  if (!subagent) {
     return;
   }
-  envelopes.push(createEnvelope("agent", { t: "start" }, { ...opts, subagent }));
+  if (startedSubagents.has(subagent)) {
+    if (label && !labeledSubagents.has(subagent)) {
+      envelopes.push(createEnvelope("agent", { t: "start", description: label }, { ...opts, subagent }));
+      labeledSubagents.add(subagent);
+    }
+    return;
+  }
+  envelopes.push(createEnvelope("agent", { t: "start", ...label ? { description: label } : {} }, { ...opts, subagent }));
   startedSubagents.add(subagent);
   activeSubagents.add(subagent);
+  if (label) labeledSubagents.add(subagent);
+}
+function subagentStopStatus(status) {
+  if (status === "failed") return "failed";
+  if (status === "interrupted" || status === "cancelled" || status === "canceled" || status === "aborted") return "stopped";
+  return "completed";
 }
 function emitSubagentStops(opts, startedSubagents, activeSubagents) {
   const envelopes = [];
@@ -134,6 +151,10 @@ function pickProviderSubagent(message) {
   }
   return void 0;
 }
+function pickSubagentLabel(message) {
+  const label = message.subagent_label;
+  return typeof label === "string" && label.length > 0 ? label : void 0;
+}
 function resolveSessionSubagent(message, providerSubagentToSessionSubagent) {
   const providerSubagent = pickProviderSubagent(message);
   if (!providerSubagent) {
@@ -412,14 +433,25 @@ function mapCodexMcpMessageToSessionEnvelopes(message, state) {
   const startedSubagents = getStartedSubagents(state);
   const activeSubagents = getActiveSubagents(state);
   const providerSubagentToSessionSubagent = getProviderSubagentToSessionSubagent(state);
+  const labeledSubagents = getLabeledSubagents(state);
   if (type === "collab_agent_item") {
-    return {
-      currentTurnId: state.currentTurnId,
-      startedSubagents,
-      activeSubagents,
-      providerSubagentToSessionSubagent,
-      envelopes: mapCodexCollaborationItem(message.item, buildEnvelopeOptions(state.currentTurnId), "live")
-    };
+    const subagent2 = resolveSessionSubagent(message, providerSubagentToSessionSubagent);
+    const opts2 = buildEnvelopeOptions(state.currentTurnId, subagent2);
+    const envelopes = [];
+    maybeEmitSubagentStart(subagent2, opts2, startedSubagents, activeSubagents, envelopes, pickSubagentLabel(message), labeledSubagents);
+    envelopes.push(...mapCodexCollaborationItem(message.item, opts2, "live"));
+    return { currentTurnId: state.currentTurnId, startedSubagents, activeSubagents, providerSubagentToSessionSubagent, labeledSubagents, envelopes };
+  }
+  if (type === "subagent_turn_end") {
+    const providerSubagent = pickProviderSubagent(message);
+    const sessionSubagent = providerSubagent ? providerSubagentToSessionSubagent.get(providerSubagent) : void 0;
+    const envelopes = [];
+    if (sessionSubagent && activeSubagents.has(sessionSubagent)) {
+      envelopes.push(createEnvelope("agent", { t: "stop", status: subagentStopStatus(message.status) }, buildEnvelopeOptions(state.currentTurnId, sessionSubagent)));
+      activeSubagents.delete(sessionSubagent);
+      startedSubagents.delete(sessionSubagent);
+    }
+    return { currentTurnId: state.currentTurnId, startedSubagents, activeSubagents, providerSubagentToSessionSubagent, labeledSubagents, envelopes };
   }
   if (type === "task_started") {
     const turnId = createId();
@@ -427,11 +459,13 @@ function mapCodexMcpMessageToSessionEnvelopes(message, state) {
     startedSubagents.clear();
     activeSubagents.clear();
     providerSubagentToSessionSubagent.clear();
+    labeledSubagents.clear();
     return {
       currentTurnId: turnId,
       startedSubagents,
       activeSubagents,
       providerSubagentToSessionSubagent,
+      labeledSubagents,
       envelopes: [turnStart]
     };
   }
@@ -442,16 +476,19 @@ function mapCodexMcpMessageToSessionEnvelopes(message, state) {
         startedSubagents,
         activeSubagents,
         providerSubagentToSessionSubagent,
+        labeledSubagents,
         envelopes: []
       };
     }
     const lifecycleOpts = { turn: state.currentTurnId };
     providerSubagentToSessionSubagent.clear();
+    labeledSubagents.clear();
     return {
       currentTurnId: null,
       startedSubagents,
       activeSubagents,
       providerSubagentToSessionSubagent,
+      labeledSubagents,
       envelopes: [
         ...emitSubagentStops(lifecycleOpts, startedSubagents, activeSubagents),
         createEnvelope("agent", {
@@ -467,6 +504,7 @@ function mapCodexMcpMessageToSessionEnvelopes(message, state) {
       startedSubagents,
       activeSubagents,
       providerSubagentToSessionSubagent,
+      labeledSubagents,
       envelopes: []
     };
   }
@@ -479,17 +517,19 @@ function mapCodexMcpMessageToSessionEnvelopes(message, state) {
         startedSubagents,
         activeSubagents,
         providerSubagentToSessionSubagent,
+        labeledSubagents,
         envelopes: []
       };
     }
     const envelopes = [];
-    maybeEmitSubagentStart(subagent, opts, startedSubagents, activeSubagents, envelopes);
+    maybeEmitSubagentStart(subagent, opts, startedSubagents, activeSubagents, envelopes, pickSubagentLabel(message), labeledSubagents);
     envelopes.push(createEnvelope("agent", { t: "text", text: message.message }, opts));
     return {
       currentTurnId: state.currentTurnId,
       startedSubagents,
       activeSubagents,
       providerSubagentToSessionSubagent,
+      labeledSubagents,
       envelopes
     };
   }
@@ -501,17 +541,19 @@ function mapCodexMcpMessageToSessionEnvelopes(message, state) {
         startedSubagents,
         activeSubagents,
         providerSubagentToSessionSubagent,
+        labeledSubagents,
         envelopes: []
       };
     }
     const envelopes = [];
-    maybeEmitSubagentStart(subagent, opts, startedSubagents, activeSubagents, envelopes);
+    maybeEmitSubagentStart(subagent, opts, startedSubagents, activeSubagents, envelopes, pickSubagentLabel(message), labeledSubagents);
     envelopes.push(createEnvelope("agent", { t: "text", text, thinking: true }, opts));
     return {
       currentTurnId: state.currentTurnId,
       startedSubagents,
       activeSubagents,
       providerSubagentToSessionSubagent,
+      labeledSubagents,
       envelopes
     };
   }
@@ -521,7 +563,7 @@ function mapCodexMcpMessageToSessionEnvelopes(message, state) {
     const command = summarizeCommand(args.command);
     const description = typeof args.description === "string" ? args.description : command ?? "Execute command";
     const envelopes = [];
-    maybeEmitSubagentStart(subagent, opts, startedSubagents, activeSubagents, envelopes);
+    maybeEmitSubagentStart(subagent, opts, startedSubagents, activeSubagents, envelopes, pickSubagentLabel(message), labeledSubagents);
     envelopes.push(
       createEnvelope("agent", {
         t: "tool-call-start",
@@ -537,19 +579,21 @@ function mapCodexMcpMessageToSessionEnvelopes(message, state) {
       startedSubagents,
       activeSubagents,
       providerSubagentToSessionSubagent,
+      labeledSubagents,
       envelopes
     };
   }
   if (type === "exec_command_end") {
     const call = pickCallId(message);
     const envelopes = [];
-    maybeEmitSubagentStart(subagent, opts, startedSubagents, activeSubagents, envelopes);
+    maybeEmitSubagentStart(subagent, opts, startedSubagents, activeSubagents, envelopes, pickSubagentLabel(message), labeledSubagents);
     envelopes.push(createEnvelope("agent", { t: "tool-call-end", call }, opts));
     return {
       currentTurnId: state.currentTurnId,
       startedSubagents,
       activeSubagents,
       providerSubagentToSessionSubagent,
+      labeledSubagents,
       envelopes
     };
   }
@@ -558,7 +602,7 @@ function mapCodexMcpMessageToSessionEnvelopes(message, state) {
     const autoApproved = message.auto_approved;
     const changes = message.changes;
     const envelopes = [];
-    maybeEmitSubagentStart(subagent, opts, startedSubagents, activeSubagents, envelopes);
+    maybeEmitSubagentStart(subagent, opts, startedSubagents, activeSubagents, envelopes, pickSubagentLabel(message), labeledSubagents);
     envelopes.push(
       createEnvelope("agent", {
         t: "tool-call-start",
@@ -577,19 +621,21 @@ function mapCodexMcpMessageToSessionEnvelopes(message, state) {
       startedSubagents,
       activeSubagents,
       providerSubagentToSessionSubagent,
+      labeledSubagents,
       envelopes
     };
   }
   if (type === "patch_apply_end") {
     const call = pickCallId(message);
     const envelopes = [];
-    maybeEmitSubagentStart(subagent, opts, startedSubagents, activeSubagents, envelopes);
+    maybeEmitSubagentStart(subagent, opts, startedSubagents, activeSubagents, envelopes, pickSubagentLabel(message), labeledSubagents);
     envelopes.push(createEnvelope("agent", { t: "tool-call-end", call }, opts));
     return {
       currentTurnId: state.currentTurnId,
       startedSubagents,
       activeSubagents,
       providerSubagentToSessionSubagent,
+      labeledSubagents,
       envelopes
     };
   }
@@ -598,6 +644,7 @@ function mapCodexMcpMessageToSessionEnvelopes(message, state) {
     startedSubagents,
     activeSubagents,
     providerSubagentToSessionSubagent,
+    labeledSubagents,
     envelopes: []
   };
 }
@@ -929,29 +976,6 @@ const CodexDisplay = ({ messageBuffer, logPath, onExit }) => {
   ));
 };
 
-async function settleCodexSession(session, intent, deactivate, log = () => {
-}) {
-  if (intent === "archive") {
-    session.updateMetadata((currentMetadata) => ({
-      ...currentMetadata,
-      lifecycleState: "archived",
-      lifecycleStateSince: Date.now(),
-      archivedBy: "cli",
-      archiveReason: "User terminated"
-    }));
-  }
-  session.sendSessionDeath();
-  await session.flush();
-  if (intent === "offline") {
-    try {
-      await deactivate(session.sessionId);
-    } catch (error) {
-      log("[Codex] deactivate on signal failed", error);
-    }
-  }
-  await session.close();
-}
-
 function resolveCodexExecutionPolicy(permissionMode, sandboxManagedByHappy) {
   if (sandboxManagedByHappy) {
     return {
@@ -1248,6 +1272,27 @@ function enqueueCodexUserText(opts) {
   return "queued";
 }
 
+async function steerIntoRunningTurn(deps, text, attachments, localKey) {
+  if (!deps.ownsTurn()) return false;
+  const staged = attachments?.length ? await deps.stage(attachments) : [];
+  try {
+    const outcome = await deps.steer({
+      text: deps.withAttachments(text, staged),
+      images: staged.filter((file) => deps.isImage(file)).map((file) => file.path),
+      clientId: localKey
+    });
+    if (outcome === "steered") {
+      deps.onSteered(text);
+      return true;
+    }
+    deps.log(`[Codex] Steer not taken (${outcome}); queuing the message for the next turn`);
+  } catch (error) {
+    deps.log(`[Codex] Steer failed; queuing the message for the next turn: ${error instanceof Error ? error.message : String(error)}`);
+  }
+  await Promise.all(staged.map((file) => deps.unlink(file.path).catch(() => void 0)));
+  return false;
+}
+
 function hashCodexEnhancedMode(mode) {
   return hashObject({
     permissionMode: mode.permissionMode,
@@ -1349,7 +1394,7 @@ async function runCodex(opts) {
     dangerouslySkipPermissions: initialPermissionMode === "yolo" || initialPermissionMode === "bypassPermissions",
     ...forkedFromSessionId ? { parentSessionId: forkedFromSessionId } : {},
     ...forkedFromMessageId ? { forkedFromMessageId } : {},
-    capabilities: [PROMPT_QUEUE_CAPABILITY, FORK_BACKFILL_CAPABILITY, HIBERNATION_CAPABILITY]
+    capabilities: [PROMPT_QUEUE_CAPABILITY, FORK_BACKFILL_CAPABILITY, HIBERNATION_CAPABILITY, CODEX_STEER_CAPABILITY]
   });
   metadata.attachmentKinds = [...CLAUDE_ATTACHMENT_KINDS];
   const importCodexThreadId = process.env[IMPORT_CODEX_THREAD_ENV];
@@ -1480,6 +1525,20 @@ async function runCodex(opts) {
   ];
   let discoveredModels = [];
   registerAgentAttachmentDownloads(session);
+  const CODEX_IMAGE_MIME_TYPES = ["image/jpeg", "image/png", "image/gif", "image/webp"];
+  const steerDeps = {
+    ownsTurn: () => turnActive && !abortInProgress && !shouldExit,
+    steer: (input) => client.steerTurn(input),
+    stage: (attachments) => stageClaudeAttachments(attachments, {
+      happyHomeDir: configuration.happyHomeDir,
+      sessionId: session.sessionId
+    }),
+    withAttachments: appendStagedAttachmentsToPrompt,
+    unlink: (path) => unlink(path),
+    isImage: (file) => CODEX_IMAGE_MIME_TYPES.includes(file.mimeType),
+    onSteered: (text) => messageBuffer.addMessage(text, "user"),
+    log: (message) => logger.debug(message)
+  };
   let userMessageDelivery = Promise.resolve();
   session.onUserMessage((message) => {
     const downloads = session.drainAttachmentsForUserMessage();
@@ -1537,6 +1596,12 @@ async function runCodex(opts) {
         appendSystemPrompt: messageAppendSystemPrompt,
         effort: messageEffort
       };
+      if (message.meta?.delivery === "steer" && !isCodexClearText(message.content.text)) {
+        if (await steerIntoRunningTurn(steerDeps, message.content.text, attachments, message.localKey)) {
+          logger.debug("[Codex] User message steered into the current turn");
+          return;
+        }
+      }
       const enqueueResult = enqueueCodexUserText({
         text: message.content.text,
         mode: enhancedMode,
@@ -1557,6 +1622,7 @@ async function runCodex(opts) {
   let codexStartedSubagents = /* @__PURE__ */ new Set();
   let codexActiveSubagents = /* @__PURE__ */ new Set();
   let codexProviderSubagentToSessionSubagent = /* @__PURE__ */ new Map();
+  let codexLabeledSubagents = /* @__PURE__ */ new Set();
   session.keepAlive(thinking, "remote");
   const keepAliveInterval = setInterval(() => {
     session.keepAlive(thinking, "remote");
@@ -1778,6 +1844,12 @@ async function runCodex(opts) {
       const notice = describeCodexRetry(msg);
       messageBuffer.addMessage(notice, "status");
       session.sendSessionEvent({ type: "message", message: notice });
+    } else if (msg.type === "steer_dropped") {
+      const clientIds = Array.isArray(msg.client_ids) ? msg.client_ids.filter((id) => typeof id === "string" && id.length > 0) : [];
+      if (clientIds.length > 0) {
+        session.sendQueueCancelReason(clientIds, "aborted");
+        messageBuffer.addMessage("A steered message was not read before the turn ended", "status");
+      }
     }
     if (msg.type === "task_started") {
       if (!thinking) {
@@ -1832,12 +1904,14 @@ async function runCodex(opts) {
         currentTurnId,
         startedSubagents: codexStartedSubagents,
         activeSubagents: codexActiveSubagents,
-        providerSubagentToSessionSubagent: codexProviderSubagentToSessionSubagent
+        providerSubagentToSessionSubagent: codexProviderSubagentToSessionSubagent,
+        labeledSubagents: codexLabeledSubagents
       });
       currentTurnId = mapped.currentTurnId;
       codexStartedSubagents = mapped.startedSubagents;
       codexActiveSubagents = mapped.activeSubagents;
       codexProviderSubagentToSessionSubagent = mapped.providerSubagentToSessionSubagent;
+      codexLabeledSubagents = mapped.labeledSubagents;
       for (const envelope of mapped.envelopes) {
         session.sendSessionProtocolMessage(envelope);
       }
@@ -2005,6 +2079,7 @@ async function runCodex(opts) {
         codexStartedSubagents = /* @__PURE__ */ new Set();
         codexActiveSubagents = /* @__PURE__ */ new Set();
         codexProviderSubagentToSessionSubagent = /* @__PURE__ */ new Map();
+        codexLabeledSubagents = /* @__PURE__ */ new Set();
         permissionHandler.reset();
         reasoningProcessor.abort();
         diffProcessor.reset();

package/dist/{BaseReasoningProcessor-_S1PbSvH.cjs → codexTermination-BBU7e92y.cjs}

@@ -1,7 +1,7 @@
 'use strict';
 
 var node_crypto = require('node:crypto');
-var logger = require('./logger-C7dRaCkE.cjs');
+var logger = require('./logger-LvwVeATU.cjs');
 
 class BaseReasoningProcessor {
   accumulator = "";
@@ -197,4 +197,28 @@ class BaseReasoningProcessor {
   }
 }
 
+async function settleCodexSession(session, intent, deactivate, log = () => {
+}) {
+  if (intent === "archive") {
+    session.updateMetadata((currentMetadata) => ({
+      ...currentMetadata,
+      lifecycleState: "archived",
+      lifecycleStateSince: Date.now(),
+      archivedBy: "cli",
+      archiveReason: "User terminated"
+    }));
+  }
+  session.sendSessionDeath();
+  await session.flush();
+  if (intent === "offline") {
+    try {
+      await deactivate(session.sessionId);
+    } catch (error) {
+      log("[Codex] deactivate on signal failed", error);
+    }
+  }
+  await session.close();
+}
+
 exports.BaseReasoningProcessor = BaseReasoningProcessor;
+exports.settleCodexSession = settleCodexSession;

package/dist/{BaseReasoningProcessor-DnykPlPo.mjs → codexTermination-CCIfwzcx.mjs}

@@ -1,5 +1,5 @@
 import { randomUUID } from 'node:crypto';
-import { l as logger } from './logger-D5EzMy30.mjs';
+import { l as logger } from './logger-13cBr_ew.mjs';
 
 class BaseReasoningProcessor {
   accumulator = "";
@@ -195,4 +195,27 @@ class BaseReasoningProcessor {
   }
 }
 
-export { BaseReasoningProcessor as B };
+async function settleCodexSession(session, intent, deactivate, log = () => {
+}) {
+  if (intent === "archive") {
+    session.updateMetadata((currentMetadata) => ({
+      ...currentMetadata,
+      lifecycleState: "archived",
+      lifecycleStateSince: Date.now(),
+      archivedBy: "cli",
+      archiveReason: "User terminated"
+    }));
+  }
+  session.sendSessionDeath();
+  await session.flush();
+  if (intent === "offline") {
+    try {
+      await deactivate(session.sessionId);
+    } catch (error) {
+      log("[Codex] deactivate on signal failed", error);
+    }
+  }
+  await session.close();
+}
+
+export { BaseReasoningProcessor as B, settleCodexSession as s };

package/dist/{config-Cr3VUzbE.mjs → config-CvsNChKX.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-D5EzMy30.mjs';
+import { l as logger } from './logger-13cBr_ew.mjs';
 import { D as DEFAULT_GEMINI_MODEL, G as GEMINI_MODEL_ENV } from './constants-BC4St0xd.mjs';
 import 'chalk';
 import 'node:util';
-import './configuration-BNGPXg07.mjs';
+import './configuration-D55F0t16.mjs';
 import 'node:fs';
 import 'node:os';
 import 'node:path';
-import './package-D0dxZ-W8.mjs';
+import './package-CjlsAaRe.mjs';
 import 'node:fs/promises';
 import './trimIdent-BAjmv_TG.mjs';
 

package/dist/{config-D89sE3wK.cjs → config-DhdrvOLV.cjs}

@@ -4,15 +4,15 @@ var fs = require('fs');
 var path = require('path');
 var os = require('os');
 var child_process = require('child_process');
-var logger = require('./logger-C7dRaCkE.cjs');
+var logger = require('./logger-LvwVeATU.cjs');
 var constants = require('./constants-VJ0N6WuG.cjs');
 require('chalk');
 require('node:util');
-require('./configuration-UV4EE5ui.cjs');
+require('./configuration-DZPy0T9Z.cjs');
 require('node:fs');
 require('node:os');
 require('node:path');
-require('./package-VqWv7EI5.cjs');
+require('./package-Ch9WGDV_.cjs');
 require('node:fs/promises');
 require('./trimIdent-4gvk9Wk6.cjs');
 

package/dist/{configuration-BNGPXg07.mjs → configuration-D55F0t16.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-D0dxZ-W8.mjs';
+import { p as packageJson } from './package-CjlsAaRe.mjs';
 import { mkdir, chmod, writeFile } from 'node:fs/promises';
 
 const PRIVATE_DIRECTORY_MODE = 448;

package/dist/{configuration-UV4EE5ui.cjs → configuration-DZPy0T9Z.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-VqWv7EI5.cjs');
+var _package = require('./package-Ch9WGDV_.cjs');
 var promises = require('node:fs/promises');
 
 const PRIVATE_DIRECTORY_MODE = 448;