very-happy-cli 0.2.175 → 0.2.176

package/dist/{codexCommand-AgVJYnFU.cjs → codexCommand-Aycux-B7.cjs}

@@ -1,61 +1,61 @@
 'use strict';
 
-var auth = require('./auth-BGmM3Vlm.cjs');
-var index = require('./index-BZdhwBKa.cjs');
+var auth = require('./auth-CpO3ZUMz.cjs');
+var index = require('./index-De8L5lFK.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 agentAttachments = require('./agentAttachments-Dbw8iMCZ.cjs');
-var attachmentContent = require('./attachmentContent-4L9dO8E3.cjs');
+var attachmentContent = require('./attachmentContent-CFzzTeV9.cjs');
 var ink = require('ink');
-var sessionLock = require('./sessionLock-BWBcBZKh.cjs');
+var sessionLock = require('./sessionLock-DOj6mMXn.cjs');
 var React = require('react');
-var api = require('./api-KZmVqSKO.cjs');
-var codexAppServerClient = require('./codexAppServerClient-D-9z-lWP.cjs');
-var specialCommands = require('./specialCommands-DGUeZqdm.cjs');
-var logger = require('./logger-C7dRaCkE.cjs');
-var BasePermissionHandler = require('./BasePermissionHandler-BbLYwd13.cjs');
-var BaseReasoningProcessor = require('./BaseReasoningProcessor-_S1PbSvH.cjs');
+var api = require('./api-Buc_ejoA.cjs');
+var codexAppServerClient = require('./codexAppServerClient-DsIUkVnX.cjs');
+var specialCommands = require('./specialCommands-BpqnGrOP.cjs');
+var logger = require('./logger-zoO54Zsy.cjs');
+var BasePermissionHandler = require('./BasePermissionHandler-DPvLN7aR.cjs');
+var BaseReasoningProcessor = require('./BaseReasoningProcessor-Dnf16mtJ.cjs');
 var node_child_process = require('node:child_process');
-var persistence = require('./persistence-DweHi8xa.cjs');
-var machineMetadata = require('./machineMetadata-DYYuK_0c.cjs');
-var configuration = require('./configuration-UV4EE5ui.cjs');
-var registerKillSessionHandler = require('./registerKillSessionHandler-CcX84g-T.cjs');
+var persistence = require('./persistence-Cih2AWml.cjs');
+var machineMetadata = require('./machineMetadata-BAKVtr-k.cjs');
+var configuration = require('./configuration-CpBrilxV.cjs');
+var registerKillSessionHandler = require('./registerKillSessionHandler-WQra3T9B.cjs');
 var projectPath = require('./projectPath-ChLhdOyt.cjs');
 var path = require('node:path');
-var createSessionMetadata = require('./createSessionMetadata-2IuH5nlA.cjs');
-var deterministicJson = require('./deterministicJson-je21npNx.cjs');
+var createSessionMetadata = require('./createSessionMetadata-D4Sj6H95.cjs');
+var deterministicJson = require('./deterministicJson-aHxtYLha.cjs');
 var messageBuffer = require('./messageBuffer-fJMH6uY8.cjs');
-var controlClient = require('./controlClient-CtsQMw--.cjs');
-var defaultPermissionMode = require('./defaultPermissionMode-Bn4HcU8S.cjs');
+var controlClient = require('./controlClient-bs_YqwDl.cjs');
+var defaultPermissionMode = require('./defaultPermissionMode-CMsiaRzr.cjs');
 var authRelay = require('./authRelay-BdYkC1Po.cjs');
-var setupOfflineReconnection = require('./setupOfflineReconnection-CS_8Da8R.cjs');
+var setupOfflineReconnection = require('./setupOfflineReconnection-B9Tw1Ouj.cjs');
 var trimIdent = require('./trimIdent-4gvk9Wk6.cjs');
 var constants = require('./constants-VJ0N6WuG.cjs');
 var editPaths = require('./editPaths-Bqp4OFPw.cjs');
-var ensureDaemonRunning = require('./ensureDaemonRunning-bIp6-vgi.cjs');
+var ensureDaemonRunning = require('./ensureDaemonRunning-CY7iC--U.cjs');
 require('tweetnacl');
 require('axios');
-require('./time-0szhiPo4.cjs');
-require('./browser-DmgVoopB.cjs');
+require('./time-s8CaneqW.cjs');
+require('./browser-GQZJxD2n.cjs');
 require('open');
 require('zod');
-require('node:fs/promises');
-require('./attachmentLimits-D6bT2jU1.cjs');
+require('./attachmentLimits-DtFqqiwR.cjs');
 require('node:fs');
-require('./lidState-BmJp2pLt.cjs');
+require('./lidState-UasMvPzw.cjs');
 require('os');
 require('child_process');
 require('node:events');
 require('socket.io-client');
 require('./limits-C-a7gr04.cjs');
-require('./registerCommonHandlers-B7QZxkCL.cjs');
+require('./registerCommonHandlers-CqO075-X.cjs');
 require('util');
 require('fs/promises');
 require('crypto');
 require('path');
 require('cross-spawn');
-require('./sync-BK-IBkuB.cjs');
+require('./sync-BgZuthoS.cjs');
 require('./backgroundTaskActivity-CBvUdj39.cjs');
 require('./contentLogMetadata-ZSFk_NjQ.cjs');
 require('chalk');
@@ -63,36 +63,36 @@ require('node:readline');
 require('./manager-HrEj442o.cjs');
 require('@anthropic-ai/sandbox-runtime');
 require('node:os');
-require('./package-VqWv7EI5.cjs');
-require('./rateLimitWindows-Bp4T21RI.cjs');
+require('./package-A7zOGx8B.cjs');
+require('./rateLimitWindows-82izLQy8.cjs');
 require('node:util');
 require('./detectCLI-DR9ZaN6B.cjs');
 require('fs');
-require('./localHappyAgentAuth-9SP7hdiw.cjs');
+require('./localHappyAgentAuth-CA02WOny.cjs');
 require('./types-CRS-srZK.cjs');
 require('url');
-require('./client-BHZVyQwi.cjs');
-require('./context-BmH2BKip.cjs');
-require('./sessionOps-9MChM9Op.cjs');
+require('./client-D7sSU04O.cjs');
+require('./context-Hk0j2Y9-.cjs');
+require('./sessionOps-Nryt1DZt.cjs');
 require('./resources-JDPugcDq.cjs');
-require('./tools-C77-Ssan.cjs');
-require('./reportProgressTool-DzMi4mvH.cjs');
-require('./client-BhLhjj_x.cjs');
+require('./tools-lotMyxIE.cjs');
+require('./reportProgressTool-C2gn_HWD.cjs');
+require('./client-D9pEOhn4.cjs');
 require('./precheckCompat-CWOi5c9L.cjs');
 require('./agentGuidance-BtBx2xxE.cjs');
-require('./peerTools-BktGmlpd.cjs');
+require('./peerTools-dPc9hRC5.cjs');
 require('./ids-B6ZC0HGt.cjs');
-require('./remoteSessionClient-CL3akj0K.cjs');
+require('./remoteSessionClient-f3DYorl8.cjs');
 require('@modelcontextprotocol/sdk/server/mcp.js');
 require('node:http');
 require('@modelcontextprotocol/sdk/server/streamableHttp.js');
-require('./downloadTarget-JC7FZl7W.cjs');
+require('./downloadTarget-CmdlljZW.cjs');
 require('./terminals-B_bfC9c2.cjs');
 require('./terminalTitleSuggest-DhvRFX3H.cjs');
 require('./tmuxSocket-D-Xt6Vn-.cjs');
-require('./bootstrap-DTJ6-vYT.cjs');
+require('./bootstrap-BboDz_w2.cjs');
 require('./previewPath-B0rBdhy1.cjs');
-require('./spawnHappyCLI-DByQcqEN.cjs');
+require('./spawnHappyCLI-ahi4j6Mh.cjs');
 require('./doctorReadiness-BCZGcN0a.cjs');
 
 function getStartedSubagents(state) {
@@ -104,13 +104,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;
+  }
+  if (startedSubagents.has(subagent)) {
+    if (label && !labeledSubagents.has(subagent)) {
+      envelopes.push(index.createEnvelope("agent", { t: "start", description: label }, { ...opts, subagent }));
+      labeledSubagents.add(subagent);
+    }
     return;
   }
-  envelopes.push(index.createEnvelope("agent", { t: "start" }, { ...opts, subagent }));
+  envelopes.push(index.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 = [];
@@ -136,6 +152,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) {
@@ -414,14 +434,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(index.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 = cuid2.createId();
@@ -429,11 +460,13 @@ function mapCodexMcpMessageToSessionEnvelopes(message, state) {
     startedSubagents.clear();
     activeSubagents.clear();
     providerSubagentToSessionSubagent.clear();
+    labeledSubagents.clear();
     return {
       currentTurnId: turnId,
       startedSubagents,
       activeSubagents,
       providerSubagentToSessionSubagent,
+      labeledSubagents,
       envelopes: [turnStart]
     };
   }
@@ -444,16 +477,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),
         index.createEnvelope("agent", {
@@ -469,6 +505,7 @@ function mapCodexMcpMessageToSessionEnvelopes(message, state) {
       startedSubagents,
       activeSubagents,
       providerSubagentToSessionSubagent,
+      labeledSubagents,
       envelopes: []
     };
   }
@@ -481,17 +518,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(index.createEnvelope("agent", { t: "text", text: message.message }, opts));
     return {
       currentTurnId: state.currentTurnId,
       startedSubagents,
       activeSubagents,
       providerSubagentToSessionSubagent,
+      labeledSubagents,
       envelopes
     };
   }
@@ -503,17 +542,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(index.createEnvelope("agent", { t: "text", text, thinking: true }, opts));
     return {
       currentTurnId: state.currentTurnId,
       startedSubagents,
       activeSubagents,
       providerSubagentToSessionSubagent,
+      labeledSubagents,
       envelopes
     };
   }
@@ -523,7 +564,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(
       index.createEnvelope("agent", {
         t: "tool-call-start",
@@ -539,19 +580,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(index.createEnvelope("agent", { t: "tool-call-end", call }, opts));
     return {
       currentTurnId: state.currentTurnId,
       startedSubagents,
       activeSubagents,
       providerSubagentToSessionSubagent,
+      labeledSubagents,
       envelopes
     };
   }
@@ -560,7 +603,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(
       index.createEnvelope("agent", {
         t: "tool-call-start",
@@ -579,19 +622,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(index.createEnvelope("agent", { t: "tool-call-end", call }, opts));
     return {
       currentTurnId: state.currentTurnId,
       startedSubagents,
       activeSubagents,
       providerSubagentToSessionSubagent,
+      labeledSubagents,
       envelopes
     };
   }
@@ -600,6 +645,7 @@ function mapCodexMcpMessageToSessionEnvelopes(message, state) {
     startedSubagents,
     activeSubagents,
     providerSubagentToSessionSubagent,
+    labeledSubagents,
     envelopes: []
   };
 }
@@ -1250,6 +1296,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 deterministicJson.hashObject({
     permissionMode: mode.permissionMode,
@@ -1351,7 +1418,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]
+    capabilities: [index.PROMPT_QUEUE_CAPABILITY, forkBackfill.FORK_BACKFILL_CAPABILITY, persistence.HIBERNATION_CAPABILITY, index.CODEX_STEER_CAPABILITY]
   });
   metadata.attachmentKinds = [...attachmentContent.CLAUDE_ATTACHMENT_KINDS];
   const importCodexThreadId = process.env[IMPORT_CODEX_THREAD_ENV];
@@ -1482,6 +1549,20 @@ async function runCodex(opts) {
   ];
   let discoveredModels = [];
   agentAttachments.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) => attachmentContent.stageClaudeAttachments(attachments, {
+      happyHomeDir: configuration.configuration.happyHomeDir,
+      sessionId: session.sessionId
+    }),
+    withAttachments: attachmentContent.appendStagedAttachmentsToPrompt,
+    unlink: (path) => promises.unlink(path),
+    isImage: (file) => CODEX_IMAGE_MIME_TYPES.includes(file.mimeType),
+    onSteered: (text) => messageBuffer$1.addMessage(text, "user"),
+    log: (message) => logger.logger.debug(message)
+  };
   let userMessageDelivery = Promise.resolve();
   session.onUserMessage((message) => {
     const downloads = session.drainAttachmentsForUserMessage();
@@ -1539,6 +1620,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.logger.debug("[Codex] User message steered into the current turn");
+          return;
+        }
+      }
       const enqueueResult = enqueueCodexUserText({
         text: message.content.text,
         mode: enhancedMode,
@@ -1559,6 +1646,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");
@@ -1780,6 +1868,12 @@ async function runCodex(opts) {
       const notice = describeCodexRetry(msg);
       messageBuffer$1.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$1.addMessage("A steered message was not read before the turn ended", "status");
+      }
     }
     if (msg.type === "task_started") {
       if (!thinking) {
@@ -1834,12 +1928,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);
       }
@@ -2007,6 +2103,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();