very-happy-cli 0.2.194 → 0.2.195

package/dist/{codexAppServerClient-Bj5vN7sb.cjs → codexAppServerClient-C1xBSuVk.cjs}

@@ -3,11 +3,11 @@
 var node_child_process = require('node:child_process');
 var spawn = require('cross-spawn');
 var node_readline = require('node:readline');
-var logger = require('./logger-CepF8C5Z.cjs');
+var logger = require('./logger-BZ5TcbEh.cjs');
 var contentLogMetadata = require('./contentLogMetadata-ZSFk_NjQ.cjs');
 var manager = require('./manager-HrEj442o.cjs');
-var _package = require('./package-C7WgesIw.cjs');
-var rateLimitWindows = require('./rateLimitWindows-B9PERFm1.cjs');
+var _package = require('./package-B61-BBlh.cjs');
+var rateLimitWindows = require('./rateLimitWindows-BIfLMxOk.cjs');
 var processTree = require('./processTree-CMHWlVse.cjs');
 
 const CODEX_HELPER_LABEL_MAX_CHARS = 80;
@@ -191,6 +191,7 @@ class CodexAppServerClient {
   static MAX_CHILD_LABELS = 128;
   // Handlers set by the consumer (runCodex.ts)
   eventHandler = null;
+  rawNotificationListeners = /* @__PURE__ */ new Set();
   approvalHandler = null;
   // B-555: subscription rate-limit snapshots (sparse notifications + throttled reads).
   rateLimitHandler = null;
@@ -868,6 +869,55 @@ ${text}`.slice(-400);
     };
     return await this.request("thread/inject_items", params);
   }
+  // ─── B-861 side questions ───────────────────────────────────
+  // A side client (its own app-server process) drives a throwaway thread
+  // with these; none of them touch `_threadId` / `_turnId`, so the client's
+  // turn tracking and reconnect-resume stay out of it.
+  /** Every app-server notification, raw. Returns the unsubscribe. */
+  onRawNotification(listener) {
+    this.rawNotificationListeners.add(listener);
+    return () => {
+      this.rawNotificationListeners.delete(listener);
+    };
+  }
+  /**
+   * An ephemeral (never persisted) thread for one side question. With
+   * `sourceThreadId`: `thread/fork` of the main thread — Codex 0.154 forks a
+   * running thread from a second app-server with the turn in flight as
+   * `interrupted`, and writes nothing to the source rollout
+   * (vh-team-B-861/codex-probe1.log). `excludeTurns` is required for an
+   * ephemeral fork of a paginated thread. Read-only sandbox, approval never.
+   */
+  async openSideThread(opts) {
+    await this.ensureConnected();
+    const common = {
+      model: opts.model ?? null,
+      modelProvider: this.accountOverrides.modelProvider ?? null,
+      cwd: opts.cwd,
+      approvalPolicy: "never",
+      sandbox: "read-only",
+      config: { ...this.accountOverrides.config, "features.hooks": false },
+      baseInstructions: null,
+      developerInstructions: opts.developerInstructions,
+      ephemeral: true,
+      persistExtendedHistory: false
+    };
+    const result = opts.sourceThreadId ? await this.request("thread/fork", { ...common, threadId: opts.sourceThreadId, excludeTurns: true, threadSource: null }) : await this.request("thread/start", { ...common, profile: null, compactPrompt: null, includeApplyPatchTool: false, experimentalRawEvents: false });
+    return { threadId: result.thread.id };
+  }
+  /** `turn/start` on a side thread; resolves with the turn id once accepted. */
+  async startSideTurn(threadId, text) {
+    const result = await this.request("turn/start", {
+      threadId,
+      input: [{ type: "text", text }],
+      approvalPolicy: "never",
+      sandboxPolicy: { type: "readOnly" }
+    });
+    return typeof result?.turn?.id === "string" ? result.turn.id : null;
+  }
+  async interruptSideTurn(threadId, turnId) {
+    await this.request("turn/interrupt", { threadId, turnId });
+  }
   async reconnectAndResumeThread() {
     const threadId = this._threadId;
     await this.disconnectInternal({ preserveThreadState: !!threadId });
@@ -1505,6 +1555,13 @@ ${text}`.slice(-400);
   }
   handleNotification(method, params) {
     this.touchTurnWatchdog();
+    for (const listener of this.rawNotificationListeners) {
+      try {
+        listener(method, params);
+      } catch (error) {
+        logger.logger.debug("[CodexAppServer] raw notification listener failed", contentLogMetadata.errorLogMetadata(error));
+      }
+    }
     if (method === "codex/event" || method.startsWith("codex/event/")) {
       this.notificationProtocol = "legacy";
       const msg = params?.msg;

package/dist/{codexAppServerClient-HKAm8f_D.mjs → codexAppServerClient-mln0W8vT.mjs}

@@ -1,11 +1,11 @@
 import { execSync } from 'node:child_process';
 import { spawn } from 'cross-spawn';
 import { createInterface } from 'node:readline';
-import { l as logger } from './logger-SGCwRIV5.mjs';
+import { l as logger } from './logger-UgDpJA2u.mjs';
 import { e as errorLogMetadata, c as contentLogMetadata } from './contentLogMetadata-BlWI0egu.mjs';
 import { i as initializeSandbox, w as wrapForMcpTransport } from './manager-BEsI4qt3.mjs';
-import { p as packageJson } from './package-Q_ELj5DL.mjs';
-import { s as shouldReadCodexRateLimits, i as isUnsupportedCodexMethodError } from './rateLimitWindows-a2yE3kCv.mjs';
+import { p as packageJson } from './package-C4OfB2YF.mjs';
+import { s as shouldReadCodexRateLimits, i as isUnsupportedCodexMethodError } from './rateLimitWindows-8-khalzj.mjs';
 import { s as stopProcessGracefully, k as killProcessTree } from './processTree-CP5IvQ2Z.mjs';
 
 const CODEX_HELPER_LABEL_MAX_CHARS = 80;
@@ -189,6 +189,7 @@ class CodexAppServerClient {
   static MAX_CHILD_LABELS = 128;
   // Handlers set by the consumer (runCodex.ts)
   eventHandler = null;
+  rawNotificationListeners = /* @__PURE__ */ new Set();
   approvalHandler = null;
   // B-555: subscription rate-limit snapshots (sparse notifications + throttled reads).
   rateLimitHandler = null;
@@ -866,6 +867,55 @@ ${text}`.slice(-400);
     };
     return await this.request("thread/inject_items", params);
   }
+  // ─── B-861 side questions ───────────────────────────────────
+  // A side client (its own app-server process) drives a throwaway thread
+  // with these; none of them touch `_threadId` / `_turnId`, so the client's
+  // turn tracking and reconnect-resume stay out of it.
+  /** Every app-server notification, raw. Returns the unsubscribe. */
+  onRawNotification(listener) {
+    this.rawNotificationListeners.add(listener);
+    return () => {
+      this.rawNotificationListeners.delete(listener);
+    };
+  }
+  /**
+   * An ephemeral (never persisted) thread for one side question. With
+   * `sourceThreadId`: `thread/fork` of the main thread — Codex 0.154 forks a
+   * running thread from a second app-server with the turn in flight as
+   * `interrupted`, and writes nothing to the source rollout
+   * (vh-team-B-861/codex-probe1.log). `excludeTurns` is required for an
+   * ephemeral fork of a paginated thread. Read-only sandbox, approval never.
+   */
+  async openSideThread(opts) {
+    await this.ensureConnected();
+    const common = {
+      model: opts.model ?? null,
+      modelProvider: this.accountOverrides.modelProvider ?? null,
+      cwd: opts.cwd,
+      approvalPolicy: "never",
+      sandbox: "read-only",
+      config: { ...this.accountOverrides.config, "features.hooks": false },
+      baseInstructions: null,
+      developerInstructions: opts.developerInstructions,
+      ephemeral: true,
+      persistExtendedHistory: false
+    };
+    const result = opts.sourceThreadId ? await this.request("thread/fork", { ...common, threadId: opts.sourceThreadId, excludeTurns: true, threadSource: null }) : await this.request("thread/start", { ...common, profile: null, compactPrompt: null, includeApplyPatchTool: false, experimentalRawEvents: false });
+    return { threadId: result.thread.id };
+  }
+  /** `turn/start` on a side thread; resolves with the turn id once accepted. */
+  async startSideTurn(threadId, text) {
+    const result = await this.request("turn/start", {
+      threadId,
+      input: [{ type: "text", text }],
+      approvalPolicy: "never",
+      sandboxPolicy: { type: "readOnly" }
+    });
+    return typeof result?.turn?.id === "string" ? result.turn.id : null;
+  }
+  async interruptSideTurn(threadId, turnId) {
+    await this.request("turn/interrupt", { threadId, turnId });
+  }
   async reconnectAndResumeThread() {
     const threadId = this._threadId;
     await this.disconnectInternal({ preserveThreadState: !!threadId });
@@ -1503,6 +1553,13 @@ ${text}`.slice(-400);
   }
   handleNotification(method, params) {
     this.touchTurnWatchdog();
+    for (const listener of this.rawNotificationListeners) {
+      try {
+        listener(method, params);
+      } catch (error) {
+        logger.debug("[CodexAppServer] raw notification listener failed", errorLogMetadata(error));
+      }
+    }
     if (method === "codex/event" || method.startsWith("codex/event/")) {
       this.notificationProtocol = "legacy";
       const msg = params?.msg;

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

@@ -1,112 +1,112 @@
-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-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-aE60mNjs.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-C2ymY_-w.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-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-BexUoWhZ.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-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-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-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-PrN-dT7K.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-BIdGnYBo.mjs';
-import { c as createSessionForStartup, b as HibernationExitLatch, H as HibernationProbe, a as commitHibernation } from './startupSessionCreate-BnEPBxsJ.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-BrljmbqX.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-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-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-0Ru4clBD.mjs';
-import './browser-CFfZM3yg.mjs';
+import './time-CIkdLyza.mjs';
+import './browser-Bb0Gqffc.mjs';
 import 'open';
 import 'zod';
 import './prompt-QHuFx9j6.mjs';
-import './reportProgressTool-DTKlUlHv.mjs';
-import './client-OjYRPhZs.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-DS5JEsHs.mjs';
+import './client-BhAjEv8Z.mjs';
 import 'node:util';
-import './context-C7QarZMk.mjs';
-import './sessionOps-C9wRmCBg.mjs';
+import './context-DcOpvIiR.mjs';
+import './sessionOps-BkEgNA2O.mjs';
 import 'socket.io-client';
 import './backgroundTaskActivity-8PdPxrvy.mjs';
 import './resources-CLP_MpK4.mjs';
-import './tools-DqA2Jt2R.mjs';
-import './peerTools-DUg9RduG.mjs';
+import './tools-DqjPHq9I.mjs';
+import './peerTools-DS6GqJcn.mjs';
 import './ids-DU6sLx4C.mjs';
-import './remoteSessionClient-mIr_9OL_.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-CVPBZMnY.mjs';
+import './downloadTarget-CM0BZNSY.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-BxcKrgR9.mjs';
+import './package-C4OfB2YF.mjs';
 import './webPanels-B2_C2-3g.mjs';
-import './pushNotifications-DjEl8G0a.mjs';
+import './pushNotifications-67GmbVfE.mjs';
 import './contentLogMetadata-BlWI0egu.mjs';
 import './previewPath-CXN4Vag0.mjs';
 import 'crypto';
-import './lidState-zy20u7T3.mjs';
+import './lidState-Cb3TbhPb.mjs';
 import 'os';
 import 'child_process';
 import 'node:events';
-import './registerCommonHandlers-CND00Dpj.mjs';
+import './registerCommonHandlers-C7hlztAO.mjs';
 import 'util';
 import 'fs/promises';
 import 'path';
 import 'cross-spawn';
-import './sync-DVcNkv8e.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-a2yE3kCv.mjs';
+import './rateLimitWindows-8-khalzj.mjs';
 import './processTree-CP5IvQ2Z.mjs';
 import './detectCLI-CSGMlV51.mjs';
 import 'fs';
-import './localHappyAgentAuth-CBsX08VJ.mjs';
+import './localHappyAgentAuth-CAAIUJyY.mjs';
 import './fsMkdir-DumgLTzR.mjs';
 import './types-CkqAACXx.mjs';
 import 'url';
-import './claudeAccountEnv-BL1pR_37.mjs';
-import './spawnHappyCLI-BA1bTIiO.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({