very-happy-cli 0.2.193 → 0.2.195

package/dist/{codexCommand-D1xlj4sT.mjs → codexCommand-CmWhYduF.mjs}

@@ -1,112 +1,112 @@
-import { a as authAndSetupMachineIfNeeded } from './auth-jN5dNqTO.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-BzX94gi3.mjs';
-import { s as sharedProjectsClient } from './client-Bde4QVIn.mjs';
+import { a as authAndSetupMachineIfNeeded } from './auth-Bfe3Ue_B.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, a7 as CODEX_BTW_CAPABILITY } from './index-BlWyEpMw.mjs';
+import { a as recordRunIntents, w as withoutEffort, r as registerRunIntentRpc, b as DEFAULT_CODEX_PERMISSION_MODE } from './defaultPermissionMode-B-Vt8ECY.mjs';
+import { h as hashObject, s as startHappyServer, c as createProjectInjector } from './deterministicJson-CMApF2Rl.mjs';
+import { s as sharedProjectsClient } from './client-CydHzidF.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-DUfunY3x.mjs';
+import { t as textResultPayload, d as toolResultContentText, c as connectionState, A as ApiClient } from './api-DOzNOoVJ.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-KNIZxwlu.mjs';
+import { C as CLAUDE_ATTACHMENT_KINDS, a as stageClaudeAttachments, b as appendStagedAttachmentsToPrompt } from './attachmentContent-D6PjMVDq.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-B73fhgQN.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-BexUoWhZ.mjs';
 import React, { useState, useRef, useEffect, useCallback } from 'react';
-import { C as CodexAppServerClient } from './codexAppServerClient-B3QJV6Ey.mjs';
-import { w as wrapperRateLimitReporter } from './rateLimitReporter-CAz7VMw4.mjs';
-import { l as logger } from './logger-JV7-4Q_6.mjs';
-import { B as BasePermissionHandler } from './BasePermissionHandler-DV6UM6e9.mjs';
-import { B as BaseReasoningProcessor, s as settleCodexSession } from './codexTermination-CaWAVQjZ.mjs';
+import { C as CodexAppServerClient } from './codexAppServerClient-mln0W8vT.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-Xg46gSVh.mjs';
+import { l as logger } from './logger-UgDpJA2u.mjs';
+import { B as BasePermissionHandler } from './BasePermissionHandler-B5ka7Aaf.mjs';
+import { B as BaseReasoningProcessor, s as settleCodexSession } from './codexTermination-QltAvFpq.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-Cg4sfjQV.mjs';
-import { g as getInitialMachineMetadata } from './machineMetadata-D5-SW9kv.mjs';
-import { c as configuration } from './configuration-ThKBP_zY.mjs';
-import { M as MessageQueue2, r as registerKillSessionHandler } from './registerKillSessionHandler-Bg9t45Ub.mjs';
+import { r as readSettings, l as latchKeepAwake, e as evaluateWrapperIdle, a as resolveCheckMs, H as HIBERNATION_CAPABILITY } from './persistence-CQhmtobL.mjs';
+import { g as getInitialMachineMetadata } from './machineMetadata-BYHC-3Vx.mjs';
+import { c as configuration } from './configuration-CwfgJZKs.mjs';
+import { M as MessageQueue2, r as registerKillSessionHandler } from './registerKillSessionHandler-rwXdO0t0.mjs';
 import { p as projectPath } from './projectPath-BTBIMB57.mjs';
 import { dirname, join } from 'node:path';
-import { c as createSessionMetadata } from './createSessionMetadata-vug4Cv8z.mjs';
+import { c as createSessionMetadata } from './createSessionMetadata-DimBsfVG.mjs';
 import { M as MessageBuffer } from './sessionExitLifecycle-CzkLIgNZ.mjs';
-import { n as notifyDaemonSessionStarted, o as reportSessionEditToDaemon, c as checkDaemonHibernation } from './controlClient-Ckl8N1MS.mjs';
-import { c as createSessionForStartup, b as HibernationExitLatch, H as HibernationProbe, a as commitHibernation } from './startupSessionCreate-DoK0IvJG.mjs';
+import { n as notifyDaemonSessionStarted, o as reportSessionEditToDaemon, c as checkDaemonHibernation } from './controlClient-Dv6IvvUq.mjs';
+import { c as createSessionForStartup, b as HibernationExitLatch, H as HibernationProbe, a as commitHibernation } from './startupSessionCreate-CSi60oo_.mjs';
 import { d as decodeBase64, e as encodeBase64 } from './authRelay-DhQhkBvX.mjs';
-import { s as setupOfflineReconnection } from './setupOfflineReconnection-Bvdy-2xd.mjs';
+import { s as setupOfflineReconnection } from './setupOfflineReconnection-Dp1rC-eP.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-Tf-r1ouq.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-C6ERYK-O.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-CKXpXq0B.mjs';
+import { s as shouldRecordSpawnAccount, u as unavailableNotice } from './wrapperAccount-Cq7eZRMx.mjs';
+import { a as extractNoSandboxFlag, e as ensureDaemonRunning } from './ensureDaemonRunning-P399ot_C.mjs';
 import 'tweetnacl';
 import 'axios';
-import './time-Cw0liIqB.mjs';
-import './browser-LHW2hBH8.mjs';
+import './time-CIkdLyza.mjs';
+import './browser-Bb0Gqffc.mjs';
 import 'open';
 import 'zod';
 import './prompt-QHuFx9j6.mjs';
-import './reportProgressTool-DVru7jc_.mjs';
-import './client-7RnI9J0W.mjs';
+import './reportProgressTool-HjzV5y_2.mjs';
+import './client-DpTk1S7C.mjs';
 import './precheckCompat-DeEbilbr.mjs';
 import './agentGuidance-BDYt2Qy2.mjs';
 import 'node:os';
 import './pi-CqyoZMjI.mjs';
 import './fileStore-5qpetZS0.mjs';
-import './client-DwbhrX6D.mjs';
+import './client-BhAjEv8Z.mjs';
 import 'node:util';
-import './context-C0EFLnOg.mjs';
-import './sessionOps-C65Iej_C.mjs';
+import './context-DcOpvIiR.mjs';
+import './sessionOps-BkEgNA2O.mjs';
 import 'socket.io-client';
 import './backgroundTaskActivity-8PdPxrvy.mjs';
 import './resources-CLP_MpK4.mjs';
-import './tools-BR-drXZ8.mjs';
-import './peerTools-WtRgTSqG.mjs';
+import './tools-DqjPHq9I.mjs';
+import './peerTools-DS6GqJcn.mjs';
 import './ids-DU6sLx4C.mjs';
-import './remoteSessionClient--0vfA7I5.mjs';
+import './remoteSessionClient-DQSnC7ox.mjs';
 import '@modelcontextprotocol/sdk/server/mcp.js';
 import 'node:http';
 import '@modelcontextprotocol/sdk/server/streamableHttp.js';
 import './limits-DIo7rEBR.mjs';
-import './downloadTarget-Baslc6jW.mjs';
+import './downloadTarget-CM0BZNSY.mjs';
 import './terminals-Dlg0x3nY.mjs';
 import './terminalTitleSuggest-CeKsX_V6.mjs';
 import './tmuxSocket-B8Yx20sT.mjs';
-import './bootstrap-B3gMpU9e.mjs';
-import './package-Bw3H6VLn.mjs';
+import './bootstrap-BxcKrgR9.mjs';
+import './package-C4OfB2YF.mjs';
 import './webPanels-B2_C2-3g.mjs';
-import './pushNotifications-BbE-qV9I.mjs';
+import './pushNotifications-67GmbVfE.mjs';
 import './contentLogMetadata-BlWI0egu.mjs';
 import './previewPath-CXN4Vag0.mjs';
 import 'crypto';
-import './lidState-B6yYKjNK.mjs';
+import './lidState-Cb3TbhPb.mjs';
 import 'os';
 import 'child_process';
 import 'node:events';
-import './registerCommonHandlers-Cj3Nl9y-.mjs';
+import './registerCommonHandlers-C7hlztAO.mjs';
 import 'util';
 import 'fs/promises';
 import 'path';
 import 'cross-spawn';
-import './sync-BP6vnxVP.mjs';
+import './sync-GJkf-HGu.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-CRARnKaI.mjs';
+import './rateLimitWindows-8-khalzj.mjs';
 import './processTree-CP5IvQ2Z.mjs';
 import './detectCLI-CSGMlV51.mjs';
 import 'fs';
-import './localHappyAgentAuth-KRlg_aI0.mjs';
+import './localHappyAgentAuth-CAAIUJyY.mjs';
 import './fsMkdir-DumgLTzR.mjs';
 import './types-CkqAACXx.mjs';
 import 'url';
-import './claudeAccountEnv-BL1pR_37.mjs';
-import './spawnHappyCLI-CnMwzjWX.mjs';
+import './claudeAccountEnv-NyoxjLuJ.mjs';
+import './spawnHappyCLI-CgjpjSTT.mjs';
 import './doctorReadiness-C208SMN9.mjs';
 
 function getStartedSubagents(state) {
@@ -1399,6 +1399,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 +1655,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;
@@ -2063,6 +2141,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/{codexCommand-Bg8AmxVm.cjs → codexCommand-Plm-_aRy.cjs}

@@ -1,114 +1,114 @@
 'use strict';
 
-var auth = require('./auth-DCjxpI6Z.cjs');
-var index = require('./index-BUFrKZeQ.cjs');
-var defaultPermissionMode = require('./defaultPermissionMode-BakXiqRr.cjs');
-var deterministicJson = require('./deterministicJson-t33SsuRC.cjs');
-var client = require('./client-CJr8Pjwm.cjs');
+var auth = require('./auth-DfcdjMUp.cjs');
+var index = require('./index-D9Hidq-g.cjs');
+var defaultPermissionMode = require('./defaultPermissionMode-BCWCMONI.cjs');
+var deterministicJson = require('./deterministicJson-BYqRKTmL.cjs');
+var client = require('./client-DcXLNaF2.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-CBE_a88I.cjs');
+var api = require('./api-TpjZJXV-.cjs');
 var heldInput = require('./heldInput-BOtqFO2r.cjs');
-var attachmentContent = require('./attachmentContent-B3AzuYqk.cjs');
+var attachmentContent = require('./attachmentContent-BiBOjTXX.cjs');
 var ink = require('ink');
-var sessionLock = require('./sessionLock-DdDCuNUs.cjs');
+var sessionLock = require('./sessionLock-B8fsnpZD.cjs');
 var React = require('react');
-var codexAppServerClient = require('./codexAppServerClient-DWEsZUC4.cjs');
-var rateLimitReporter = require('./rateLimitReporter-BZ8x0-6-.cjs');
-var logger = require('./logger-CX3x2eI4.cjs');
-var BasePermissionHandler = require('./BasePermissionHandler-5iG-cvA2.cjs');
-var codexTermination = require('./codexTermination-ByX9GcEJ.cjs');
+var codexAppServerClient = require('./codexAppServerClient-C1xBSuVk.cjs');
+var registerSideQuestionHandler = require('./registerSideQuestionHandler-CsyPnjce.cjs');
+var logger = require('./logger-BZ5TcbEh.cjs');
+var BasePermissionHandler = require('./BasePermissionHandler-C6iF28Ct.cjs');
+var codexTermination = require('./codexTermination-C9c80lIF.cjs');
 var node_child_process = require('node:child_process');
-var persistence = require('./persistence-CsmAgN-C.cjs');
-var machineMetadata = require('./machineMetadata-DhZuM0iB.cjs');
-var configuration = require('./configuration-BBK0rmmj.cjs');
-var registerKillSessionHandler = require('./registerKillSessionHandler-C3EDnW4F.cjs');
+var persistence = require('./persistence-DBmeYlwT.cjs');
+var machineMetadata = require('./machineMetadata-DLb-m4fL.cjs');
+var configuration = require('./configuration-CKaq0tNe.cjs');
+var registerKillSessionHandler = require('./registerKillSessionHandler-BWvl6wro.cjs');
 var projectPath = require('./projectPath-C3ioB4Bu.cjs');
 var path = require('node:path');
-var createSessionMetadata = require('./createSessionMetadata-DqZ6h02H.cjs');
+var createSessionMetadata = require('./createSessionMetadata-CusO22Am.cjs');
 var sessionExitLifecycle = require('./sessionExitLifecycle-DFltxXU8.cjs');
-var controlClient = require('./controlClient-DwWTns3A.cjs');
-var startupSessionCreate = require('./startupSessionCreate-rBHd4tc1.cjs');
+var controlClient = require('./controlClient-D_HIbnnS.cjs');
+var startupSessionCreate = require('./startupSessionCreate-rkIMVGJW.cjs');
 var authRelay = require('./authRelay-Dy1qU9td.cjs');
-var setupOfflineReconnection = require('./setupOfflineReconnection-DxMiW7OV.cjs');
+var setupOfflineReconnection = require('./setupOfflineReconnection-CMUdHtFT.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-CoAg11Zi.cjs');
+var codexAccount = require('./codexAccount-CYhQir50.cjs');
+var wrapperAccount = require('./wrapperAccount-BubTurHU.cjs');
+var ensureDaemonRunning = require('./ensureDaemonRunning-D508DmcP.cjs');
 require('tweetnacl');
 require('axios');
-require('./time-BTLcO8jp.cjs');
-require('./browser-v1pdPP1E.cjs');
+require('./time-BPPTQ_sE.cjs');
+require('./browser-ac0aPrVE.cjs');
 require('open');
 require('zod');
 require('./prompt-Bof2aQkI.cjs');
-require('./reportProgressTool-Ddg1yVq2.cjs');
-require('./client-D2GWkd-T.cjs');
+require('./reportProgressTool-CIHGKraF.cjs');
+require('./client-BlV73Gbw.cjs');
 require('./precheckCompat-CWOi5c9L.cjs');
 require('./agentGuidance-BtBx2xxE.cjs');
 require('node:os');
 require('./pi-DlsrPCTa.cjs');
 require('./fileStore-7qhnbs6N.cjs');
-require('./client-DLlnmAPL.cjs');
+require('./client-DxjYsJ8d.cjs');
 require('node:util');
-require('./context-wDp0aZBK.cjs');
-require('./sessionOps-XSEjIqNq.cjs');
+require('./context-DbENnaVc.cjs');
+require('./sessionOps-74pSDXoS.cjs');
 require('socket.io-client');
 require('./backgroundTaskActivity-CBvUdj39.cjs');
 require('./resources-BZ_Be0qM.cjs');
-require('./tools-CcebYtLj.cjs');
-require('./peerTools-D-VNNFw-.cjs');
+require('./tools-B3KGMSU5.cjs');
+require('./peerTools-BXSjS8lB.cjs');
 require('./ids-B6ZC0HGt.cjs');
-require('./remoteSessionClient-CcSP24Zq.cjs');
+require('./remoteSessionClient-D6_7vNKc.cjs');
 require('@modelcontextprotocol/sdk/server/mcp.js');
 require('node:http');
 require('@modelcontextprotocol/sdk/server/streamableHttp.js');
 require('./limits-C-a7gr04.cjs');
-require('./downloadTarget-T1id2Gh6.cjs');
+require('./downloadTarget-C5BzZ_bz.cjs');
 require('./terminals-B_bfC9c2.cjs');
 require('./terminalTitleSuggest-DhvRFX3H.cjs');
 require('./tmuxSocket-D-Xt6Vn-.cjs');
-require('./bootstrap-CoJu9VnB.cjs');
-require('./package-uzlvxa5S.cjs');
+require('./bootstrap-DpyP22Wx.cjs');
+require('./package-B61-BBlh.cjs');
 require('./webPanels-FCgFKvVe.cjs');
-require('./pushNotifications-BCg7YAiu.cjs');
+require('./pushNotifications-qCS7_tDF.cjs');
 require('./contentLogMetadata-ZSFk_NjQ.cjs');
 require('./previewPath-B0rBdhy1.cjs');
 require('crypto');
-require('./lidState-B_v6qgfE.cjs');
+require('./lidState-Btv4N_B8.cjs');
 require('os');
 require('child_process');
 require('node:events');
-require('./registerCommonHandlers-CZGmrPbT.cjs');
+require('./registerCommonHandlers-G2p0MJu4.cjs');
 require('util');
 require('fs/promises');
 require('path');
 require('cross-spawn');
-require('./sync-WYBwkJvG.cjs');
+require('./sync-Cj8Vhltg.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-BZl6GMwQ.cjs');
+require('./rateLimitWindows-BIfLMxOk.cjs');
 require('./processTree-CMHWlVse.cjs');
 require('./detectCLI-BuYR_Qxe.cjs');
 require('fs');
-require('./localHappyAgentAuth-jJH0n67S.cjs');
+require('./localHappyAgentAuth-B3Q5DNLR.cjs');
 require('./fsMkdir-0K3yENml.cjs');
 require('./types-CRS-srZK.cjs');
 require('url');
-require('./claudeAccountEnv-CEX_EMZr.cjs');
-require('./spawnHappyCLI-BYGOUda1.cjs');
+require('./claudeAccountEnv-_O3x5AJ1.cjs');
+require('./spawnHappyCLI-Du1IgJGA.cjs');
 require('./doctorReadiness-Dl6yRQCy.cjs');
 
 function getStartedSubagents(state) {
@@ -1401,6 +1401,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 +1657,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;
@@ -2065,6 +2143,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 +2197,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/{codexTermination-ByX9GcEJ.cjs → codexTermination-C9c80lIF.cjs}

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

package/dist/{codexTermination-CaWAVQjZ.mjs → codexTermination-QltAvFpq.mjs}

@@ -1,5 +1,5 @@
 import { randomUUID } from 'node:crypto';
-import { l as logger } from './logger-JV7-4Q_6.mjs';
+import { l as logger } from './logger-UgDpJA2u.mjs';
 import { O as OFFLINE_EXIT_STAMP_TIMEOUT_MS } from './sessionExitLifecycle-CzkLIgNZ.mjs';
 
 class BaseReasoningProcessor {

package/dist/{codexThreadFork-5kwoKjMu.cjs → codexThreadFork-C6ZmcT2z.cjs}

@@ -112,7 +112,9 @@ async function forkCodexBeforeUserMessage(client, opts) {
     throw new Error("Cannot safely rewind a user message inside an existing turn");
   }
   if (sourceCut.index === 0) return { type: "success", startFresh: true };
-  const kept = (source.turns ?? []).slice(0, sourceCut.index);
+  return forkThroughTurns(client, opts, (source.turns ?? []).slice(0, sourceCut.index));
+}
+async function forkThroughTurns(client, opts, kept) {
   const expected = kept.map(firstItemId);
   const forked = await client.forkThread({ threadId: opts.threadId, cwd: opts.cwd, lastTurnId: kept[kept.length - 1].id });
   if (forked.threadId === opts.threadId) throw new Error("Codex did not create an independent fork");
@@ -125,8 +127,27 @@ async function forkCodexBeforeUserMessage(client, opts) {
   }
   return { type: "success", newCodexThreadId: forked.threadId };
 }
+function isUnfinishedTurn(turn) {
+  return turn?.status === "inProgress" || turn?.status === "interrupted";
+}
+async function forkCodexCompletedTurns(client, opts) {
+  const { thread: source } = await client.readThread({ threadId: opts.threadId, includeTurns: true });
+  const turns = source.turns ?? [];
+  const last = turns[turns.length - 1];
+  if (!isUnfinishedTurn(last)) {
+    return { ...await forkCodexThread(client, opts), excludedPrompts: [] };
+  }
+  const excludedPrompts = (last.items ?? []).flatMap((item) => {
+    const text = textFromUserItem(item);
+    return text ? [text] : [];
+  });
+  const kept = turns.slice(0, -1);
+  if (kept.length === 0) return { type: "success", startFresh: true, excludedPrompts };
+  return { ...await forkThroughTurns(client, opts, kept), excludedPrompts };
+}
 
 exports.CodexForkRewindPointNotFoundError = CodexForkRewindPointNotFoundError;
 exports.forkCodexBeforeUserMessage = forkCodexBeforeUserMessage;
+exports.forkCodexCompletedTurns = forkCodexCompletedTurns;
 exports.forkCodexThread = forkCodexThread;
 exports.listCodexRewindPoints = listCodexRewindPoints;