very-happy-cli 0.2.194 → 0.2.196

package/dist/{codexCommand-DtbDjHZp.cjs → codexCommand-5nWT7F8A.cjs}

@@ -1,114 +1,115 @@
 'use strict';
 
-var auth = require('./auth-boIcb7iq.cjs');
-var index = require('./index-BUFrKZeQ.cjs');
-var defaultPermissionMode = require('./defaultPermissionMode-BakXiqRr.cjs');
-var deterministicJson = require('./deterministicJson-ZBFn1jtS.cjs');
-var client = require('./client-CsfPUxLy.cjs');
+var auth = require('./auth-DHlbjtf7.cjs');
+var index = require('./index-D9Hidq-g.cjs');
+var defaultPermissionMode = require('./defaultPermissionMode-BCWCMONI.cjs');
+var deterministicJson = require('./deterministicJson-r4zhG546.cjs');
+var client = require('./client-Ckic3nxZ.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-wYwQCJml.cjs');
+var api = require('./api-fuwEEEkT.cjs');
 var heldInput = require('./heldInput-BOtqFO2r.cjs');
-var attachmentContent = require('./attachmentContent-DB8ZsxGE.cjs');
+var attachmentContent = require('./attachmentContent-Cehh7ClR.cjs');
 var ink = require('ink');
-var sessionLock = require('./sessionLock-BJ1ngLgm.cjs');
+var sessionLock = require('./sessionLock-D2usWXAg.cjs');
 var React = require('react');
-var codexAppServerClient = require('./codexAppServerClient-Bj5vN7sb.cjs');
-var rateLimitReporter = require('./rateLimitReporter-M_IKRRS7.cjs');
-var logger = require('./logger-CepF8C5Z.cjs');
-var BasePermissionHandler = require('./BasePermissionHandler-DKzNFVCh.cjs');
-var codexTermination = require('./codexTermination-CX_FHKT5.cjs');
+var codexAppServerClient = require('./codexAppServerClient-C-UwVMUN.cjs');
+var registerSideQuestionHandler = require('./registerSideQuestionHandler-ByUnjI3V.cjs');
+var logger = require('./logger-HQ9yDb8R.cjs');
+var BasePermissionHandler = require('./BasePermissionHandler-C0JS37Jt.cjs');
+var codexTermination = require('./codexTermination-D18IHgLP.cjs');
 var node_child_process = require('node:child_process');
-var persistence = require('./persistence-D0gNvqXe.cjs');
-var machineMetadata = require('./machineMetadata-ObK4hjF0.cjs');
-var configuration = require('./configuration-2Pbg3a0H.cjs');
-var registerKillSessionHandler = require('./registerKillSessionHandler-DQKsD9CW.cjs');
+var persistence = require('./persistence-BiyvEYaR.cjs');
+var machineMetadata = require('./machineMetadata-Dzwn-HjN.cjs');
+var configuration = require('./configuration-CWRKSOyj.cjs');
+var registerKillSessionHandler = require('./registerKillSessionHandler-C6F1sjoo.cjs');
 var projectPath = require('./projectPath-C3ioB4Bu.cjs');
 var path = require('node:path');
-var createSessionMetadata = require('./createSessionMetadata-BHjzRzPc.cjs');
-var sessionExitLifecycle = require('./sessionExitLifecycle-DFltxXU8.cjs');
-var controlClient = require('./controlClient-CIqHL07h.cjs');
-var startupSessionCreate = require('./startupSessionCreate-Cmg1gkKS.cjs');
+var createSessionMetadata = require('./createSessionMetadata-C4WN8pVK.cjs');
+var sessionExitLifecycle = require('./sessionExitLifecycle-DB2rjvVS.cjs');
+var controlClient = require('./controlClient-DyNgxNl7.cjs');
+var startupSessionCreate = require('./startupSessionCreate-CltDtCEF.cjs');
 var authRelay = require('./authRelay-Dy1qU9td.cjs');
-var setupOfflineReconnection = require('./setupOfflineReconnection-Bd6XsWhA.cjs');
+var setupOfflineReconnection = require('./setupOfflineReconnection-BCbJa5mT.cjs');
 var trimIdent = require('./trimIdent-4gvk9Wk6.cjs');
 var specialCommands = require('./specialCommands-J3JFOq0J.cjs');
 var constants = require('./constants-VJ0N6WuG.cjs');
 var editPaths = require('./editPaths-Bqp4OFPw.cjs');
 var reconnectEnv = require('./reconnectEnv-B31lY4nR.cjs');
-var store = require('./store-CkNa6oj4.cjs');
+var store = require('./store-aa3CVNwS.cjs');
 var node_fs = require('node:fs');
-var codexAccount = require('./codexAccount-BDQjRbtI.cjs');
-var wrapperAccount = require('./wrapperAccount-D2A4DuZy.cjs');
-var ensureDaemonRunning = require('./ensureDaemonRunning-D2ny0yon.cjs');
+var codexAccount = require('./codexAccount-CYhQir50.cjs');
+var wrapperAccount = require('./wrapperAccount-BubTurHU.cjs');
+var ensureDaemonRunning = require('./ensureDaemonRunning-Bq-n6xTt.cjs');
 require('tweetnacl');
 require('axios');
-require('./time-Da5GIiCa.cjs');
-require('./browser-Do2MFdq6.cjs');
+require('./time-BqPZjTpo.cjs');
+require('./browser-Bm24RiFU.cjs');
 require('open');
 require('zod');
 require('./prompt-Bof2aQkI.cjs');
-require('./reportProgressTool-BLw2_Ohi.cjs');
-require('./client-BIg2LPVx.cjs');
+require('./reportProgressTool-C1JOvo6T.cjs');
+require('./client-B9fcSMXP.cjs');
 require('./precheckCompat-CWOi5c9L.cjs');
 require('./agentGuidance-BtBx2xxE.cjs');
 require('node:os');
 require('./pi-DlsrPCTa.cjs');
 require('./fileStore-7qhnbs6N.cjs');
-require('./client-BfDga3xi.cjs');
+require('./client-YFvImdwH.cjs');
 require('node:util');
-require('./context-CLTyu_tQ.cjs');
-require('./sessionOps-BUlpeaUe.cjs');
+require('./context-BqhlGL3u.cjs');
+require('./sessionOps-JRyQhF5s.cjs');
 require('socket.io-client');
 require('./backgroundTaskActivity-CBvUdj39.cjs');
 require('./resources-BZ_Be0qM.cjs');
-require('./tools-hPD2Hvei.cjs');
-require('./peerTools-BcZAbqBL.cjs');
+require('./tools-CL8h3fqh.cjs');
+require('./peerTools-D417O7d-.cjs');
 require('./ids-B6ZC0HGt.cjs');
-require('./remoteSessionClient-DOWgca08.cjs');
+require('./remoteSessionClient-CUk6haD7.cjs');
 require('@modelcontextprotocol/sdk/server/mcp.js');
 require('node:http');
 require('@modelcontextprotocol/sdk/server/streamableHttp.js');
 require('./limits-C-a7gr04.cjs');
-require('./downloadTarget-DlmqPQp9.cjs');
+require('./downloadTarget-8ovVpDv1.cjs');
 require('./terminals-B_bfC9c2.cjs');
 require('./terminalTitleSuggest-DhvRFX3H.cjs');
 require('./tmuxSocket-D-Xt6Vn-.cjs');
-require('./bootstrap-kywZ0tvD.cjs');
-require('./package-C7WgesIw.cjs');
+require('./bootstrap-PeTZ2sAn.cjs');
+require('./package-Dn7zZkY1.cjs');
 require('./webPanels-FCgFKvVe.cjs');
-require('./pushNotifications-CH0XVPQe.cjs');
+require('./pushNotifications-DRDWUnP-.cjs');
 require('./contentLogMetadata-ZSFk_NjQ.cjs');
 require('./previewPath-B0rBdhy1.cjs');
 require('crypto');
-require('./lidState-DYeb7Wud.cjs');
+require('./lidState-VZ1j_QYw.cjs');
 require('os');
 require('child_process');
 require('node:events');
-require('./registerCommonHandlers-D4uXC0he.cjs');
+require('./registerCommonHandlers-CEV9KUsq.cjs');
 require('util');
 require('fs/promises');
 require('path');
 require('cross-spawn');
-require('./sync-BfrnSdL1.cjs');
+require('./sync-DfI78smj.cjs');
 require('chalk');
 require('./cliUpdate-DsKXPFYp.cjs');
-require('./processTreeSnapshot-mDbnuojn.cjs');
+require('./processTermination-f17wxlMb.cjs');
+require('./processTreeSnapshot-D5iNblp6.cjs');
 require('node:readline');
 require('./manager-HrEj442o.cjs');
 require('@anthropic-ai/sandbox-runtime');
-require('./rateLimitWindows-B9PERFm1.cjs');
+require('./rateLimitWindows-U4fc1-_6.cjs');
 require('./processTree-CMHWlVse.cjs');
 require('./detectCLI-BuYR_Qxe.cjs');
 require('fs');
-require('./localHappyAgentAuth-CScN2McN.cjs');
+require('./localHappyAgentAuth-oxhpgJOb.cjs');
 require('./fsMkdir-0K3yENml.cjs');
 require('./types-CRS-srZK.cjs');
 require('url');
-require('./claudeAccountEnv-CEX_EMZr.cjs');
-require('./spawnHappyCLI-C0XAWy8V.cjs');
+require('./claudeAccountEnv-_O3x5AJ1.cjs');
+require('./spawnHappyCLI-CHSlXWUe.cjs');
 require('./doctorReadiness-Dl6yRQCy.cjs');
 
 function getStartedSubagents(state) {
@@ -1401,6 +1402,84 @@ async function steerIntoRunningTurn(deps, text, attachments, localKey) {
   return false;
 }
 
+const CODEX_SIDE_QUESTION_INSTRUCTIONS = `${registerSideQuestionHandler.SIDE_QUESTION_SYSTEM_PROMPT} Do not run commands or call tools.`;
+const ANSWER_ITEMS = /* @__PURE__ */ new Set(["userMessage", "agentMessage", "reasoning"]);
+function toolName(item) {
+  if (item.type === "commandExecution") return "a shell command";
+  if (item.type === "mcpToolCall" && typeof item.tool === "string") return typeof item.server === "string" ? `${item.server}.${item.tool}` : item.tool;
+  return typeof item.type === "string" ? item.type : "a tool";
+}
+function turnError(turn) {
+  if (!turn || turn.status === "completed") return null;
+  const message = turn.error && typeof turn.error.message === "string" ? turn.error.message : "";
+  return message || `Side question ended (${String(turn.status ?? "unknown")})`;
+}
+async function runCodexSideQuestion(createClient, input) {
+  const client = createClient();
+  const signal = input.signal;
+  if (signal?.aborted) throw new Error("Side question cancelled");
+  let threadId = null;
+  let turnId = null;
+  let streamed = "";
+  const messages = /* @__PURE__ */ new Map();
+  let toolAttempt = null;
+  let settle;
+  const done = new Promise((resolve) => {
+    settle = resolve;
+  });
+  const interrupt = () => {
+    if (threadId && turnId) void client.interruptSideTurn(threadId, turnId).catch(() => {
+    });
+  };
+  const off = client.onRawNotification((method, params) => {
+    if (!threadId || params?.threadId !== threadId) return;
+    if (!turnId && typeof params.turnId === "string") turnId = params.turnId;
+    if (method === "item/agentMessage/delta" && typeof params.delta === "string") {
+      streamed += params.delta;
+      input.onText?.(streamed);
+    } else if (method === "item/started" && params.item && !ANSWER_ITEMS.has(params.item.type)) {
+      toolAttempt ??= toolName(params.item);
+      interrupt();
+    } else if (method === "item/completed" && params.item?.type === "agentMessage" && typeof params.item.text === "string") {
+      messages.set(params.item.id ?? String(messages.size), params.item.text);
+    } else if (method === "turn/completed") {
+      settle({ error: toolAttempt ? void 0 : turnError(params.turn) ?? void 0 });
+    }
+  });
+  const onAbort = () => {
+    interrupt();
+    settle({ error: "Side question cancelled" });
+  };
+  signal?.addEventListener("abort", onAbort, { once: true });
+  try {
+    await client.connect();
+    let hadContext = Boolean(input.resumeSessionId);
+    try {
+      ({ threadId } = await client.openSideThread({ sourceThreadId: input.resumeSessionId, cwd: input.cwd, model: input.model, developerInstructions: CODEX_SIDE_QUESTION_INSTRUCTIONS }));
+    } catch (error) {
+      if (!input.resumeSessionId || signal?.aborted) throw error;
+      hadContext = false;
+      ({ threadId } = await client.openSideThread({ sourceThreadId: null, cwd: input.cwd, model: input.model, developerInstructions: CODEX_SIDE_QUESTION_INSTRUCTIONS }));
+    }
+    if (signal?.aborted) throw new Error("Side question cancelled");
+    turnId = await client.startSideTurn(threadId, registerSideQuestionHandler.buildSideQuestionPrompt(input.question, input.history, input.mainStatus)) ?? turnId;
+    if (signal?.aborted || toolAttempt) interrupt();
+    const outcome = await done;
+    if (signal?.aborted) throw new Error("Side question cancelled");
+    if (outcome.error) throw new Error(outcome.error);
+    const final = [...messages.values()].filter((text) => text.trim()).join("\n\n") || streamed;
+    const answer = toolAttempt ? [final.trim(), registerSideQuestionHandler.toolAttemptNotice(toolAttempt)].filter(Boolean).join("\n\n") : final;
+    if (!answer.trim()) throw new Error("Side question ended without a result");
+    input.onText?.(answer);
+    return { answer, hadContext, mode: "fork" };
+  } finally {
+    off();
+    signal?.removeEventListener("abort", onAbort);
+    await client.disconnect().catch(() => {
+    });
+  }
+}
+
 function hashCodexEnhancedMode(mode) {
   return deterministicJson.hashObject({
     permissionMode: mode.permissionMode,
@@ -1579,7 +1658,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, sessionLock.AUTO_RESTART_CAPABILITY, index.CODEX_STEER_CAPABILITY, index.PROJECT_SESSION_CAPABILITY, index.CODEX_COMPACT_CAPABILITY, index.RUN_INTENT_CAPABILITY, index.AGENT_PROFILE_SESSION_CAPABILITY]
+    capabilities: [index.PROMPT_QUEUE_CAPABILITY, forkBackfill.FORK_BACKFILL_CAPABILITY, persistence.HIBERNATION_CAPABILITY, sessionLock.AUTO_RESTART_CAPABILITY, index.CODEX_STEER_CAPABILITY, index.PROJECT_SESSION_CAPABILITY, index.CODEX_COMPACT_CAPABILITY, index.RUN_INTENT_CAPABILITY, index.AGENT_PROFILE_SESSION_CAPABILITY, index.CODEX_BTW_CAPABILITY]
   });
   metadata.attachmentKinds = [...attachmentContent.CLAUDE_ATTACHMENT_KINDS];
   metadata.stickyModel = null;
@@ -1937,7 +2016,7 @@ async function runCodex(opts) {
   let abortController = new AbortController();
   let shouldExit = false;
   let terminating = false;
-  const hibernationExit = new startupSessionCreate.HibernationExitLatch((a, b) => a === "archive" && b !== "archive");
+  const hibernationExit = new startupSessionCreate.HibernationExitLatch((a, b) => b !== "superseded" && (a === "superseded" || a === "archive" && b !== "archive"));
   let hibernationStamp = null;
   let hibernationProbe = null;
   async function handleAbort(source) {
@@ -1991,6 +2070,7 @@ async function runCodex(opts) {
     const exitCursor = intent === "offline" && session ? sessionLock.exitCursorStamp(session.messageCursor, Date.now()) : void 0;
     if (exitCursor) session.freezeInbound();
     const exitReason = intent === "archive" ? "aborted" : "restarted";
+    if (intent === "superseded") logger.logger.debug("[Codex] Session superseded by a newer wrapper; leaving without lifecycle writes");
     terminating = true;
     heldInput$1.drop(exitReason);
     messageQueue.discardAll(exitReason);
@@ -2038,6 +2118,9 @@ async function runCodex(opts) {
     return { effortRefused };
   });
   const disposeTermination = registerKillSessionHandler.registerKillSessionHandler(session.rpcHandlerManager, () => handleKillSession("archive"), session, { processSignals: true, onSignal: () => handleKillSession("offline") });
+  session.on("superseded", () => {
+    void handleKillSession("superseded");
+  });
   const messageBuffer = new sessionExitLifecycle.MessageBuffer();
   const hasTTY = process.stdout.isTTY && process.stdin.isTTY;
   let inkInstance = null;
@@ -2065,6 +2148,17 @@ async function runCodex(opts) {
   }
   client$1 = new codexAppServerClient.CodexAppServerClient(sandboxConfig);
   client$1.setAccountOverrides(codexAccount$1.overrides);
+  registerSideQuestionHandler.registerSideQuestionHandler(session.rpcHandlerManager, {
+    getClaudeSessionId: () => client$1?.threadId ?? null,
+    getModel: () => currentModel ?? client$1?.threadModel ?? void 0,
+    cwd: process.cwd(),
+    getMainStatus: () => registerSideQuestionHandler.describePendingApprovals(session.getAgentState()?.requests),
+    run: (input) => runCodexSideQuestion(() => {
+      const side = new codexAppServerClient.CodexAppServerClient(sandboxConfig);
+      side.setAccountOverrides(codexAccount$1.overrides);
+      return side;
+    }, input)
+  });
   const idleRelease = new CodexIdleReleaseTimer({
     delayMs: resolveCodexIdleReleaseMs(process.env[CODEX_IDLE_RELEASE_ENV]),
     isIdle: () => shouldReleaseIdleCodex({
@@ -2108,7 +2202,7 @@ async function runCodex(opts) {
     }
   });
   const editThrottle = new editPaths.EditReportThrottle();
-  client$1.setRateLimitHandler((snapshot) => rateLimitReporter.wrapperRateLimitReporter().observeCodex(snapshot));
+  client$1.setRateLimitHandler((snapshot) => registerSideQuestionHandler.wrapperRateLimitReporter().observeCodex(snapshot));
   client$1.setEventHandler((msg) => {
     if (msg.type === "token_count") {
       session.sendAgentUsageSnapshot("codex", msg);

package/dist/{codexCommand-655pR6CR.mjs → codexCommand-CI2NTyIF.mjs}

@@ -1,112 +1,113 @@
-import { a as authAndSetupMachineIfNeeded } from './auth-CWO6cQ4G.mjs';
-import { k as createEnvelope, w as BUILTIN_TODO_DISCOVERY, r as restoredEffort, o as readEffortIntent, Q as EFFORT_INTENT_AUTO, P as PROMPT_QUEUE_CAPABILITY, a5 as CODEX_STEER_CAPABILITY, a as PROJECT_SESSION_CAPABILITY, a6 as CODEX_COMPACT_CAPABILITY, R as RUN_INTENT_CAPABILITY, A as AGENT_PROFILE_SESSION_CAPABILITY } from './index-D1YnIih6.mjs';
-import { a as recordRunIntents, w as withoutEffort, r as registerRunIntentRpc, b as DEFAULT_CODEX_PERMISSION_MODE } from './defaultPermissionMode-DF5AfeBb.mjs';
-import { h as hashObject, s as startHappyServer, c as createProjectInjector } from './deterministicJson-DFwJ57jR.mjs';
-import { s as sharedProjectsClient } from './client-Cbxr9VUE.mjs';
+import { a as authAndSetupMachineIfNeeded } from './auth-DVsH_a8J.mjs';
+import { k as createEnvelope, w as BUILTIN_TODO_DISCOVERY, r as restoredEffort, o as readEffortIntent, N as EFFORT_INTENT_AUTO, P as PROMPT_QUEUE_CAPABILITY, a5 as CODEX_STEER_CAPABILITY, a as PROJECT_SESSION_CAPABILITY, a6 as CODEX_COMPACT_CAPABILITY, R as RUN_INTENT_CAPABILITY, A as AGENT_PROFILE_SESSION_CAPABILITY, a7 as CODEX_BTW_CAPABILITY } from './index-C27JFCbe.mjs';
+import { a as recordRunIntents, w as withoutEffort, r as registerRunIntentRpc, b as DEFAULT_CODEX_PERMISSION_MODE } from './defaultPermissionMode-CpEJ0wlb.mjs';
+import { h as hashObject, s as startHappyServer, c as createProjectInjector } from './deterministicJson-Dg_0QJAR.mjs';
+import { s as sharedProjectsClient } from './client-CfTeXnYS.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-aE60mNjs.mjs';
+import { t as textResultPayload, d as toolResultContentText, c as connectionState, A as ApiClient } from './api-CiNezCys.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-C2ymY_-w.mjs';
+import { C as CLAUDE_ATTACHMENT_KINDS, a as stageClaudeAttachments, b as appendStagedAttachmentsToPrompt } from './attachmentContent-CiY3MvdO.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, t as takeAutoRestartedEvent, A as AUTO_RESTART_CAPABILITY, e as exitCursorStamp } from './sessionLock-dbi4JPhP.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-BfvR9BGB.mjs';
 import React, { useState, useRef, useEffect, useCallback } from 'react';
-import { C as CodexAppServerClient } from './codexAppServerClient-HKAm8f_D.mjs';
-import { w as wrapperRateLimitReporter } from './rateLimitReporter-B_PZClib.mjs';
-import { l as logger } from './logger-SGCwRIV5.mjs';
-import { B as BasePermissionHandler } from './BasePermissionHandler-D2pNcAXn.mjs';
-import { B as BaseReasoningProcessor, s as settleCodexSession } from './codexTermination-DxLR-bb5.mjs';
+import { C as CodexAppServerClient } from './codexAppServerClient-aV5m-FpZ.mjs';
+import { S as SIDE_QUESTION_SYSTEM_PROMPT, b as buildSideQuestionPrompt, t as toolAttemptNotice, r as registerSideQuestionHandler, d as describePendingApprovals, w as wrapperRateLimitReporter } from './registerSideQuestionHandler-4mRv0Msq.mjs';
+import { l as logger } from './logger-D1hb3CG8.mjs';
+import { B as BasePermissionHandler } from './BasePermissionHandler-CgHLVNKT.mjs';
+import { B as BaseReasoningProcessor, s as settleCodexSession } from './codexTermination-CLjDP6Ja.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-mr4Y484W.mjs';
-import { g as getInitialMachineMetadata } from './machineMetadata-ClJfd7ay.mjs';
-import { c as configuration } from './configuration-rTcdHkhE.mjs';
-import { M as MessageQueue2, r as registerKillSessionHandler } from './registerKillSessionHandler-CwyHwm_n.mjs';
+import { r as readSettings, l as latchKeepAwake, e as evaluateWrapperIdle, a as resolveCheckMs, H as HIBERNATION_CAPABILITY } from './persistence-CagHeZ-f.mjs';
+import { g as getInitialMachineMetadata } from './machineMetadata-Dxng45Uh.mjs';
+import { c as configuration } from './configuration-C8r6uD9k.mjs';
+import { M as MessageQueue2, r as registerKillSessionHandler } from './registerKillSessionHandler-D4SSwQj8.mjs';
 import { p as projectPath } from './projectPath-BTBIMB57.mjs';
 import { dirname, join } from 'node:path';
-import { c as createSessionMetadata } from './createSessionMetadata-PrN-dT7K.mjs';
-import { M as MessageBuffer } from './sessionExitLifecycle-CzkLIgNZ.mjs';
-import { n as notifyDaemonSessionStarted, o as reportSessionEditToDaemon, c as checkDaemonHibernation } from './controlClient-BIdGnYBo.mjs';
-import { c as createSessionForStartup, b as HibernationExitLatch, H as HibernationProbe, a as commitHibernation } from './startupSessionCreate-BnEPBxsJ.mjs';
+import { c as createSessionMetadata } from './createSessionMetadata-CZuEDo2v.mjs';
+import { M as MessageBuffer } from './sessionExitLifecycle-iAtZN9sa.mjs';
+import { n as notifyDaemonSessionStarted, o as reportSessionEditToDaemon, c as checkDaemonHibernation } from './controlClient-DYQ1g2ar.mjs';
+import { c as createSessionForStartup, b as HibernationExitLatch, H as HibernationProbe, a as commitHibernation } from './startupSessionCreate-B7jrCZUD.mjs';
 import { d as decodeBase64, e as encodeBase64 } from './authRelay-DhQhkBvX.mjs';
-import { s as setupOfflineReconnection } from './setupOfflineReconnection-BrljmbqX.mjs';
+import { s as setupOfflineReconnection } from './setupOfflineReconnection-IKEI7fLJ.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 { t as takeReconnectEnv } from './reconnectEnv-DeSvHl3q.mjs';
-import { r as readSessionBindings, w as writeSessionBinding, d as defaultSecretProbe, a as readAccounts, c as readAccountsFileV2, f as writeAccountsFile, S as SPAWN_ACCOUNT_ENV } from './store-Vej_738f.mjs';
+import { r as readSessionBindings, w as writeSessionBinding, d as defaultSecretProbe, a as readAccounts, c as readAccountsFileV2, f as writeAccountsFile, S as SPAWN_ACCOUNT_ENV } from './store-BlPvTr_Q.mjs';
 import { mkdirSync, writeFileSync, chmodSync, rmSync } from 'node:fs';
-import { a as resolveCodexAccount, r as readCodexProviders, s as syncCodexOverlay, b as baseCodexHome, c as codexAccountSwitched, d as readCodexDefaultProvider, e as codexAccountDefaultModel, f as accountModelsAsCatalog, i as isHistoryRejectedError, g as isCodexAuthRejection } from './codexAccount-NOX5pmQf.mjs';
-import { s as shouldRecordSpawnAccount, u as unavailableNotice } from './wrapperAccount-BkufO_9g.mjs';
-import { a as extractNoSandboxFlag, e as ensureDaemonRunning } from './ensureDaemonRunning-B6Y-CMWe.mjs';
+import { a as resolveCodexAccount, r as readCodexProviders, s as syncCodexOverlay, b as baseCodexHome, c as codexAccountSwitched, d as readCodexDefaultProvider, e as codexAccountDefaultModel, f as accountModelsAsCatalog, i as isHistoryRejectedError, g as isCodexAuthRejection } from './codexAccount-iZwmpYti.mjs';
+import { s as shouldRecordSpawnAccount, u as unavailableNotice } from './wrapperAccount-RPtq8BwD.mjs';
+import { a as extractNoSandboxFlag, e as ensureDaemonRunning } from './ensureDaemonRunning-CwlujXmV.mjs';
 import 'tweetnacl';
 import 'axios';
-import './time-0Ru4clBD.mjs';
-import './browser-CFfZM3yg.mjs';
+import './time-CgAwVt5R.mjs';
+import './browser-CWWyaf8_.mjs';
 import 'open';
 import 'zod';
 import './prompt-QHuFx9j6.mjs';
-import './reportProgressTool-DTKlUlHv.mjs';
-import './client-OjYRPhZs.mjs';
+import './reportProgressTool-BCn5oG52.mjs';
+import './client-Cg_cuQb1.mjs';
 import './precheckCompat-DeEbilbr.mjs';
 import './agentGuidance-BDYt2Qy2.mjs';
 import 'node:os';
 import './pi-CqyoZMjI.mjs';
 import './fileStore-5qpetZS0.mjs';
-import './client-DS5JEsHs.mjs';
+import './client-B3lOol4f.mjs';
 import 'node:util';
-import './context-C7QarZMk.mjs';
-import './sessionOps-C9wRmCBg.mjs';
+import './context-CtMY-M8T.mjs';
+import './sessionOps-OmRqUFm4.mjs';
 import 'socket.io-client';
 import './backgroundTaskActivity-8PdPxrvy.mjs';
 import './resources-CLP_MpK4.mjs';
-import './tools-DqA2Jt2R.mjs';
-import './peerTools-DUg9RduG.mjs';
+import './tools-DthGQoo3.mjs';
+import './peerTools-CNzlwuL7.mjs';
 import './ids-DU6sLx4C.mjs';
-import './remoteSessionClient-mIr_9OL_.mjs';
+import './remoteSessionClient-CfYDFlKm.mjs';
 import '@modelcontextprotocol/sdk/server/mcp.js';
 import 'node:http';
 import '@modelcontextprotocol/sdk/server/streamableHttp.js';
 import './limits-DIo7rEBR.mjs';
-import './downloadTarget-CVPBZMnY.mjs';
+import './downloadTarget-CbuUiS5p.mjs';
 import './terminals-Dlg0x3nY.mjs';
 import './terminalTitleSuggest-CeKsX_V6.mjs';
 import './tmuxSocket-B8Yx20sT.mjs';
-import './bootstrap-CiWwfHB2.mjs';
-import './package-Q_ELj5DL.mjs';
+import './bootstrap-C2XSEyOe.mjs';
+import './package-CpmoMPuj.mjs';
 import './webPanels-B2_C2-3g.mjs';
-import './pushNotifications-DjEl8G0a.mjs';
+import './pushNotifications-4sNESDMv.mjs';
 import './contentLogMetadata-BlWI0egu.mjs';
 import './previewPath-CXN4Vag0.mjs';
 import 'crypto';
-import './lidState-zy20u7T3.mjs';
+import './lidState-BflRFw38.mjs';
 import 'os';
 import 'child_process';
 import 'node:events';
-import './registerCommonHandlers-CND00Dpj.mjs';
+import './registerCommonHandlers-PTJ8TBj9.mjs';
 import 'util';
 import 'fs/promises';
 import 'path';
 import 'cross-spawn';
-import './sync-DVcNkv8e.mjs';
+import './sync-DtzoF9sw.mjs';
 import 'chalk';
 import './cliUpdate-Y34VGe9Y.mjs';
-import './processTreeSnapshot-CuLJDNC-.mjs';
+import './processTermination-ChJG5SLW.mjs';
+import './processTreeSnapshot-fuwxC0fr.mjs';
 import 'node:readline';
 import './manager-BEsI4qt3.mjs';
 import '@anthropic-ai/sandbox-runtime';
-import './rateLimitWindows-a2yE3kCv.mjs';
+import './rateLimitWindows-4uhuwKnU.mjs';
 import './processTree-CP5IvQ2Z.mjs';
 import './detectCLI-CSGMlV51.mjs';
 import 'fs';
-import './localHappyAgentAuth-CBsX08VJ.mjs';
+import './localHappyAgentAuth-BAK_nqMG.mjs';
 import './fsMkdir-DumgLTzR.mjs';
 import './types-CkqAACXx.mjs';
 import 'url';
-import './claudeAccountEnv-BL1pR_37.mjs';
-import './spawnHappyCLI-BA1bTIiO.mjs';
+import './claudeAccountEnv-CPO6CGNd.mjs';
+import './spawnHappyCLI-C8gMHJu5.mjs';
 import './doctorReadiness-C208SMN9.mjs';
 
 function getStartedSubagents(state) {
@@ -1399,6 +1400,84 @@ async function steerIntoRunningTurn(deps, text, attachments, localKey) {
   return false;
 }
 
+const CODEX_SIDE_QUESTION_INSTRUCTIONS = `${SIDE_QUESTION_SYSTEM_PROMPT} Do not run commands or call tools.`;
+const ANSWER_ITEMS = /* @__PURE__ */ new Set(["userMessage", "agentMessage", "reasoning"]);
+function toolName(item) {
+  if (item.type === "commandExecution") return "a shell command";
+  if (item.type === "mcpToolCall" && typeof item.tool === "string") return typeof item.server === "string" ? `${item.server}.${item.tool}` : item.tool;
+  return typeof item.type === "string" ? item.type : "a tool";
+}
+function turnError(turn) {
+  if (!turn || turn.status === "completed") return null;
+  const message = turn.error && typeof turn.error.message === "string" ? turn.error.message : "";
+  return message || `Side question ended (${String(turn.status ?? "unknown")})`;
+}
+async function runCodexSideQuestion(createClient, input) {
+  const client = createClient();
+  const signal = input.signal;
+  if (signal?.aborted) throw new Error("Side question cancelled");
+  let threadId = null;
+  let turnId = null;
+  let streamed = "";
+  const messages = /* @__PURE__ */ new Map();
+  let toolAttempt = null;
+  let settle;
+  const done = new Promise((resolve) => {
+    settle = resolve;
+  });
+  const interrupt = () => {
+    if (threadId && turnId) void client.interruptSideTurn(threadId, turnId).catch(() => {
+    });
+  };
+  const off = client.onRawNotification((method, params) => {
+    if (!threadId || params?.threadId !== threadId) return;
+    if (!turnId && typeof params.turnId === "string") turnId = params.turnId;
+    if (method === "item/agentMessage/delta" && typeof params.delta === "string") {
+      streamed += params.delta;
+      input.onText?.(streamed);
+    } else if (method === "item/started" && params.item && !ANSWER_ITEMS.has(params.item.type)) {
+      toolAttempt ??= toolName(params.item);
+      interrupt();
+    } else if (method === "item/completed" && params.item?.type === "agentMessage" && typeof params.item.text === "string") {
+      messages.set(params.item.id ?? String(messages.size), params.item.text);
+    } else if (method === "turn/completed") {
+      settle({ error: toolAttempt ? void 0 : turnError(params.turn) ?? void 0 });
+    }
+  });
+  const onAbort = () => {
+    interrupt();
+    settle({ error: "Side question cancelled" });
+  };
+  signal?.addEventListener("abort", onAbort, { once: true });
+  try {
+    await client.connect();
+    let hadContext = Boolean(input.resumeSessionId);
+    try {
+      ({ threadId } = await client.openSideThread({ sourceThreadId: input.resumeSessionId, cwd: input.cwd, model: input.model, developerInstructions: CODEX_SIDE_QUESTION_INSTRUCTIONS }));
+    } catch (error) {
+      if (!input.resumeSessionId || signal?.aborted) throw error;
+      hadContext = false;
+      ({ threadId } = await client.openSideThread({ sourceThreadId: null, cwd: input.cwd, model: input.model, developerInstructions: CODEX_SIDE_QUESTION_INSTRUCTIONS }));
+    }
+    if (signal?.aborted) throw new Error("Side question cancelled");
+    turnId = await client.startSideTurn(threadId, buildSideQuestionPrompt(input.question, input.history, input.mainStatus)) ?? turnId;
+    if (signal?.aborted || toolAttempt) interrupt();
+    const outcome = await done;
+    if (signal?.aborted) throw new Error("Side question cancelled");
+    if (outcome.error) throw new Error(outcome.error);
+    const final = [...messages.values()].filter((text) => text.trim()).join("\n\n") || streamed;
+    const answer = toolAttempt ? [final.trim(), toolAttemptNotice(toolAttempt)].filter(Boolean).join("\n\n") : final;
+    if (!answer.trim()) throw new Error("Side question ended without a result");
+    input.onText?.(answer);
+    return { answer, hadContext, mode: "fork" };
+  } finally {
+    off();
+    signal?.removeEventListener("abort", onAbort);
+    await client.disconnect().catch(() => {
+    });
+  }
+}
+
 function hashCodexEnhancedMode(mode) {
   return hashObject({
     permissionMode: mode.permissionMode,
@@ -1577,7 +1656,7 @@ async function runCodex(opts) {
     dangerouslySkipPermissions: initialPermissionMode === "yolo" || initialPermissionMode === "bypassPermissions",
     ...forkedFromSessionId ? { parentSessionId: forkedFromSessionId } : {},
     ...forkedFromMessageId ? { forkedFromMessageId } : {},
-    capabilities: [PROMPT_QUEUE_CAPABILITY, FORK_BACKFILL_CAPABILITY, HIBERNATION_CAPABILITY, AUTO_RESTART_CAPABILITY, CODEX_STEER_CAPABILITY, PROJECT_SESSION_CAPABILITY, CODEX_COMPACT_CAPABILITY, RUN_INTENT_CAPABILITY, AGENT_PROFILE_SESSION_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, AGENT_PROFILE_SESSION_CAPABILITY, CODEX_BTW_CAPABILITY]
   });
   metadata.attachmentKinds = [...CLAUDE_ATTACHMENT_KINDS];
   metadata.stickyModel = null;
@@ -1935,7 +2014,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");
+  const hibernationExit = new HibernationExitLatch((a, b) => b !== "superseded" && (a === "superseded" || a === "archive" && b !== "archive"));
   let hibernationStamp = null;
   let hibernationProbe = null;
   async function handleAbort(source) {
@@ -1989,6 +2068,7 @@ async function runCodex(opts) {
     const exitCursor = intent === "offline" && session ? exitCursorStamp(session.messageCursor, Date.now()) : void 0;
     if (exitCursor) session.freezeInbound();
     const exitReason = intent === "archive" ? "aborted" : "restarted";
+    if (intent === "superseded") logger.debug("[Codex] Session superseded by a newer wrapper; leaving without lifecycle writes");
     terminating = true;
     heldInput.drop(exitReason);
     messageQueue.discardAll(exitReason);
@@ -2036,6 +2116,9 @@ async function runCodex(opts) {
     return { effortRefused };
   });
   const disposeTermination = registerKillSessionHandler(session.rpcHandlerManager, () => handleKillSession("archive"), session, { processSignals: true, onSignal: () => handleKillSession("offline") });
+  session.on("superseded", () => {
+    void handleKillSession("superseded");
+  });
   const messageBuffer = new MessageBuffer();
   const hasTTY = process.stdout.isTTY && process.stdin.isTTY;
   let inkInstance = null;
@@ -2063,6 +2146,17 @@ async function runCodex(opts) {
   }
   client = new CodexAppServerClient(sandboxConfig);
   client.setAccountOverrides(codexAccount.overrides);
+  registerSideQuestionHandler(session.rpcHandlerManager, {
+    getClaudeSessionId: () => client?.threadId ?? null,
+    getModel: () => currentModel ?? client?.threadModel ?? void 0,
+    cwd: process.cwd(),
+    getMainStatus: () => describePendingApprovals(session.getAgentState()?.requests),
+    run: (input) => runCodexSideQuestion(() => {
+      const side = new CodexAppServerClient(sandboxConfig);
+      side.setAccountOverrides(codexAccount.overrides);
+      return side;
+    }, input)
+  });
   const idleRelease = new CodexIdleReleaseTimer({
     delayMs: resolveCodexIdleReleaseMs(process.env[CODEX_IDLE_RELEASE_ENV]),
     isIdle: () => shouldReleaseIdleCodex({

package/dist/{codexTermination-DxLR-bb5.mjs → codexTermination-CLjDP6Ja.mjs}

@@ -1,6 +1,6 @@
 import { randomUUID } from 'node:crypto';
-import { l as logger } from './logger-SGCwRIV5.mjs';
-import { O as OFFLINE_EXIT_STAMP_TIMEOUT_MS } from './sessionExitLifecycle-CzkLIgNZ.mjs';
+import { l as logger } from './logger-D1hb3CG8.mjs';
+import { O as OFFLINE_EXIT_STAMP_TIMEOUT_MS } from './sessionExitLifecycle-iAtZN9sa.mjs';
 
 class BaseReasoningProcessor {
   accumulator = "";
@@ -198,6 +198,10 @@ class BaseReasoningProcessor {
 
 async function settleCodexSession(session, intent, deactivate, log = () => {
 }, exitCursor) {
+  if (intent === "superseded") {
+    await session.close();
+    return;
+  }
   if (intent === "offline" && exitCursor && session.updateMetadataAndWait) {
     const landed = await session.updateMetadataAndWait((currentMetadata) => ({ ...currentMetadata, exitCursor }), OFFLINE_EXIT_STAMP_TIMEOUT_MS);
     if (!landed) log("[Codex] offline exit cursor not confirmed before going offline");