@ashx-j/lunr 0.2.22 → 0.2.24

package/dist/node-runtime/{chunk-IWOWXRWU.js → chunk-5Q3EHOHI.js}

@@ -2,7 +2,7 @@ import { createRequire as __lunrRequire } from "node:module"; const require = __
 import {
   lightBuiltinExtensions,
   loadAllBuiltinExtensions
-} from "./chunk-LMBNLFXQ.js";
+} from "./chunk-QM43FEAE.js";
 import {
   createProjectTrustContext,
   createStartupTui,
@@ -11,10 +11,10 @@ import {
   showFirstTimeSetup,
   showStartupSelector,
   startStartupTui
-} from "./chunk-UAFLNHSH.js";
+} from "./chunk-OF7PWMG4.js";
 import {
   applyInheritedSubagentPermissions
-} from "./chunk-CSUZVNYE.js";
+} from "./chunk-OVX6X377.js";
 import {
   MissingSessionCwdError,
   createAgentSessionFromServices,
@@ -23,7 +23,7 @@ import {
   formatMissingSessionCwdPrompt,
   formatNoModelsAvailableMessage,
   getMissingSessionCwdIssue
-} from "./chunk-TDL7UWJ7.js";
+} from "./chunk-DE2JB6J5.js";
 import {
   restoreStdout,
   takeOverStdout
@@ -31,18 +31,18 @@ import {
 import {
   detectSupportedImageMimeTypeFromFile,
   resolveReadPath
-} from "./chunk-VSSXXL36.js";
+} from "./chunk-YDO2F2IA.js";
 import {
   processImage
 } from "./chunk-AD6VXAO7.js";
+import {
+  bindRuntimeBridges
+} from "./chunk-FU6OODRZ.js";
 import {
   SettingsManager,
   applyHttpProxySettings,
   configureHttpDispatcher
-} from "./chunk-WADV2VDS.js";
-import {
-  bindRuntimeBridges
-} from "./chunk-GMHJCCEN.js";
+} from "./chunk-RORY2HMJ.js";
 import {
   ProjectTrustStore,
   hasTrustRequiringProjectResources
@@ -50,14 +50,14 @@ import {
 import {
   resolveCliModel,
   resolveModelScope
-} from "./chunk-OFKSVRV7.js";
+} from "./chunk-GYIXXQAO.js";
 import {
   migrateLegacyGlobalInstructions
 } from "./chunk-M3LZLQW2.js";
 import {
   SessionManager,
   assertValidSessionId
-} from "./chunk-XLTL257W.js";
+} from "./chunk-2KIPT4HJ.js";
 import {
   registerCustomizeBridge
 } from "./chunk-4EULYYR4.js";
@@ -69,7 +69,7 @@ import {
 } from "./chunk-2TKODGBZ.js";
 import {
   SessionSelectorComponent
-} from "./chunk-ORH324EP.js";
+} from "./chunk-PCEW76PM.js";
 import {
   SessionOwnership
 } from "./chunk-UAEOTO52.js";
@@ -92,7 +92,7 @@ import {
 import {
   initTheme,
   stopThemeWatcher
-} from "./chunk-7QWNYZDI.js";
+} from "./chunk-RDDAZOMU.js";
 import {
   APP_NAME,
   CONFIG_DIR_NAME,
@@ -730,17 +730,17 @@ async function main(args, options) {
   resetTimings(), (args.includes("--offline") || isTruthyEnvFlag(process.env.PI_OFFLINE)) && (process.env.PI_OFFLINE = "1");
   let cwd = process.cwd(), agentDir = getAgentDir(), bootstrapSettingsManager = SettingsManager.create(cwd, agentDir, { projectTrusted: !1 });
   if (applyHttpProxySettings(bootstrapSettingsManager.getGlobalSettings().httpProxy), configureHttpDispatcher(), ["setup", "features", "uninstall", "browser"].includes(args[0])) {
-    let { handleInstallCli } = await import("./install-cli-C3CF7O7N.js");
+    let { handleInstallCli } = await import("./install-cli-VAP6KBFN.js");
     if (await handleInstallCli(args))
       return;
   }
   if (args[0] === "update") {
-    let { handleUpdateCli } = await import("./update-cli-4TP25CNW.js");
+    let { handleUpdateCli } = await import("./update-cli-VBR2777K.js");
     if (await handleUpdateCli(args))
       return;
   }
   if (["install", "remove", "uninstall", "list", "config"].includes(args[0])) {
-    let { handleConfigCommand, handlePackageCommand } = await import("./package-manager-cli-VCK4E2RC.js");
+    let { handleConfigCommand, handlePackageCommand } = await import("./package-manager-cli-ZLW5DZXF.js");
     if (await handlePackageCommand(args, { extensionFactories: options?.extensionFactories })) {
       process.exit(process.exitCode ?? 0);
       return;
@@ -749,7 +749,7 @@ async function main(args, options) {
       return;
   }
   if (args[0] === "gateway") {
-    let { handleGatewayCommand } = await import("./command-3JHHXOPX.js");
+    let { handleGatewayCommand } = await import("./command-7BG7VVTS.js");
     if (await handleGatewayCommand(args))
       return;
   }
@@ -764,7 +764,7 @@ async function main(args, options) {
   if (time("parseArgs"), parsed.version && (console.log(VERSION), process.exit(0)), parsed.export) {
     let result;
     try {
-      let { exportFromFile } = await import("./export-html-KBFVV63J.js"), outputPath = parsed.messages.length > 0 ? parsed.messages[0] : void 0;
+      let { exportFromFile } = await import("./export-html-VM4J2MNR.js"), outputPath = parsed.messages.length > 0 ? parsed.messages[0] : void 0;
       result = await exportFromFile(parsed.export, outputPath);
     } catch (error) {
       let message = error instanceof Error ? error.message : "Failed to export session";
@@ -772,7 +772,7 @@ async function main(args, options) {
     }
     console.log(`Exported to: ${result}`), process.exit(0);
   }
-  let appMode = resolveAppMode(parsed, process.stdin.isTTY, process.stdout.isTTY), interactiveModeImport = appMode === "interactive" ? import("./interactive-mode-LOM6AIF6.js") : void 0, startupView = appMode === "interactive" ? options?.startupView : void 0;
+  let appMode = resolveAppMode(parsed, process.stdin.isTTY, process.stdout.isTTY), interactiveModeImport = appMode === "interactive" ? import("./interactive-mode-6J5VZ2TT.js") : void 0, startupView = appMode === "interactive" ? options?.startupView : void 0;
   options?.startupView && !startupView && options.startupView.stop(), applyInheritedSubagentPermissions(), appMode !== "interactive" && !isPlainRuntimeMetadataCommand(parsed) && takeOverStdout(), parsed.mode === "rpc" && parsed.fileArgs.length > 0 && (console.error(chalk4.red("Error: @file arguments are not supported in RPC mode")), process.exit(1)), validateForkFlags(parsed), validateSessionIdFlags(parsed);
   let { migratedAuthProviders: migratedProviders, deprecationWarnings } = runMigrations(cwd);
   time("runMigrations");
@@ -929,12 +929,12 @@ ${EXTENSION_LOAD_FAILURE_HINT}` : "";
     extensionHint && console.error(chalk4.yellow(EXTENSION_LOAD_FAILURE_HINT)), process.exit(1);
   }
   if (time("createAgentSession"), appMode !== "interactive" && !session.model && (console.error(chalk4.red(formatNoModelsAvailableMessage())), process.exit(1)), startupBenchmark && appMode !== "interactive" && (console.error(chalk4.red("Error: PI_STARTUP_BENCHMARK only supports interactive mode")), process.exit(1)), appMode === "rpc") {
-    let { runRpcMode } = await import("./rpc-mode-P5ODXPEG.js");
+    let { runRpcMode } = await import("./rpc-mode-O3XV4SID.js");
     printTimings(), await runRpcMode(runtime);
   } else if (appMode === "interactive") {
     let [{ InteractiveMode }, { loadDeferredBuiltinExtensions }] = await Promise.all([
       interactiveModeImport,
-      import("./builtin-extensions-GVC6IFDU.js")
+      import("./builtin-extensions-EBAWTH4M.js")
     ]), interactiveMode = new InteractiveMode(runtime, {
       migratedProviders,
       modelFallbackMessage,

package/dist/node-runtime/{chunk-6B2POMK7.js → chunk-6VYZ5UFP.js}

@@ -1,7 +1,7 @@
 import { createRequire as __lunrRequire } from "node:module"; const require = __lunrRequire(import.meta.url);
 import {
   theme
-} from "./chunk-7QWNYZDI.js";
+} from "./chunk-RDDAZOMU.js";
 
 // packages/coding-agent/dist/modes/interactive/components/dynamic-border.js
 var DynamicBorder = class {

package/dist/node-runtime/{chunk-TQGPP4SC.js → chunk-CDVHZOOK.js}

@@ -1,7 +1,7 @@
 import { createRequire as __lunrRequire } from "node:module"; const require = __lunrRequire(import.meta.url);
 import {
   estimateTokens
-} from "./chunk-OFKSVRV7.js";
+} from "./chunk-GYIXXQAO.js";
 
 // packages/coding-agent/dist/core/context-breakdown.js
 var CHARS_PER_TOKEN = 4, PROJECT_CONTEXT_RE = /<project_context>[\s\S]*?<\/project_context>/, PROJECT_INSTRUCTIONS_RE = /<project_instructions(?:\s+path="([^"]*)")?>([\s\S]*?)<\/project_instructions>/g, SKILLS_BLOCK_RE = /\n\nThe following skills provide specialized instructions for specific tasks\.[\s\S]*<\/available_skills>/;

package/dist/node-runtime/{chunk-TDL7UWJ7.js → chunk-DE2JB6J5.js}

@@ -7,7 +7,7 @@ import {
   createSyntheticSourceInfo,
   expandPromptTemplate,
   formatSkillsForPrompt
-} from "./chunk-IQIEU7SB.js";
+} from "./chunk-F4FLTQKV.js";
 import {
   stripFrontmatter
 } from "./chunk-QFWG2RVL.js";
@@ -16,7 +16,7 @@ import {
   createLocalBashOperations,
   createToolDefinitionFromAgentTool,
   wrapToolDefinition
-} from "./chunk-VSSXXL36.js";
+} from "./chunk-YDO2F2IA.js";
 import {
   DEFAULT_MAX_BYTES,
   truncateTail
@@ -28,10 +28,10 @@ import {
   ModelRuntime,
   isAuthInvalidError,
   isUsageLimitError
-} from "./chunk-GS66LV4M.js";
+} from "./chunk-KJ6DWS3K.js";
 import {
   SettingsManager
-} from "./chunk-WADV2VDS.js";
+} from "./chunk-RORY2HMJ.js";
 import {
   DEFAULT_THINKING_LEVEL,
   calculateContextTokens,
@@ -43,17 +43,17 @@ import {
   generateBranchSummary,
   prepareCompaction,
   shouldCompact
-} from "./chunk-OFKSVRV7.js";
+} from "./chunk-GYIXXQAO.js";
 import {
   ExtensionRunner,
   emitSessionShutdownEvent
-} from "./chunk-5BNJ4JUH.js";
+} from "./chunk-GJ2RDBRL.js";
 import {
   getSubagentCancellation
 } from "./chunk-BBUVIEZB.js";
 import {
   gateToolCall
-} from "./chunk-5D7LC2ZQ.js";
+} from "./chunk-ZXSGTGJ6.js";
 import {
   isUserInstructionsPath,
   loadSelectedUserInstructions
@@ -66,13 +66,13 @@ import {
 } from "./chunk-CSFI6YXL.js";
 import {
   SessionTransferError
-} from "./chunk-AZJHNQKQ.js";
+} from "./chunk-I54LGHWM.js";
 import {
   CURRENT_SESSION_VERSION,
   SessionManager,
   getDefaultSessionDir,
   getLatestCompactionEntry
-} from "./chunk-XLTL257W.js";
+} from "./chunk-2KIPT4HJ.js";
 import {
   convertToLlm
 } from "./chunk-FVDOXRUD.js";
@@ -90,7 +90,7 @@ import {
 import {
   getThemeByName,
   theme
-} from "./chunk-7QWNYZDI.js";
+} from "./chunk-RDDAZOMU.js";
 import {
   CONFIG_DIR_NAME,
   getAgentDir,
@@ -649,9 +649,25 @@ function snapFileName(absPath) {
   return `${createHash("sha1").update(absPath).digest("hex")}.snap`;
 }
 
+// packages/coding-agent/dist/core/subagent-wait-interruption.js
+var SUBAGENT_WAIT_INTERRUPTION_SYMBOL = /* @__PURE__ */ Symbol.for("@lunr/subagent-wait-interruption");
+function getBridge() {
+  let globals = globalThis, existing = globals[SUBAGENT_WAIT_INTERRUPTION_SYMBOL];
+  if (existing)
+    return existing;
+  let bridge = { owners: /* @__PURE__ */ new Map() };
+  return globals[SUBAGENT_WAIT_INTERRUPTION_SYMBOL] = bridge, bridge;
+}
+function registerSubagentWaitInterruptionOwner(sessionId, owner) {
+  let owners = getBridge().owners;
+  return owners.set(sessionId, owner), () => {
+    owners.get(sessionId) === owner && owners.delete(sessionId);
+  };
+}
+
 // packages/coding-agent/dist/core/system-prompt.js
 function buildSystemPrompt(options) {
-  let { customPrompt, modelSlug, selectedTools, appendSystemPrompt, cwd, contextFiles: providedContextFiles, skills: providedSkills } = options, promptCwd = cwd.replace(/\\/g, "/"), appendSection = appendSystemPrompt ? `
+  let { customPrompt, modelSlug, automaticSubagentDelegation = !0, selectedTools, appendSystemPrompt, cwd, contextFiles: providedContextFiles, skills: providedSkills } = options, promptCwd = cwd.replace(/\\/g, "/"), appendSection = appendSystemPrompt ? `
 
 ${appendSystemPrompt}` : "", contextFiles = providedContextFiles ?? [], skills = providedSkills ?? [];
   if (customPrompt) {
@@ -684,11 +700,11 @@ Behavior guidelines:
 - Default to writing no comments. Only add one if the why is non-obvious: a hidden constraint, a subtle invariant, a workaround for a specific bug, something that would surprise the reader. If removing the comment wouldn't confuse a future reader, don't write it.
 - Keep comments up to date! When making changes, it's important to keep things in sync. An outdated comment is worse than no comment at all.
 - Carefully consider the reversibility and blast radius of actions. Generally you can freely take local, reversible actions like editing files or running tests. But for actions that are hard to reverse, affect shared systems beyond your local environment, or could otherwise be risky or destructive, check with the user before proceeding.
-- Orchestrate subagents with intent! Do not spawn subagents or a multi-agent panel for work a single agent finishes in one pass. Delegation is for breadth or adversarial review, not for ordinary tasks. Use subagents as a tool when there is genuine benefit to it or the user explicitly asks for it.
+${automaticSubagentDelegation ? "- Orchestrate subagents with intent! Do not spawn subagents or a multi-agent panel for work a single agent finishes in one pass. Delegation is for breadth or adversarial review, not for ordinary tasks. Use subagents as a tool when there is genuine benefit to it or the user explicitly asks for it." : "- Work on tasks directly. Launch subagents only when the user specifically instructs you to delegate work."}
 - When several agents work in parallel, state file ownership up front so they do not collide.
 - Tests are good! Endless smoke tests, regressions tests for feature deletions, etc, much less good. Tests should be focused, not slop.
 - Prefer editing existing files to creating new ones.
-- When a reusable excerpt, prompt, or code fragment should have its own Copy button, wrap only that payload in a fenced Markdown block with the info string \`lunr-copy\`. Keep explanation outside the block. Use a longer backtick or tilde fence when the payload contains fenced code.
+- When a reusable excerpt, prompt, or code fragment should be click-to-copy, wrap only that payload in a fenced Markdown block with the info string \`lunr-copy\`. Keep explanation outside the block. Use a longer backtick or tilde fence when the payload contains fenced code.
 - Only use emojis if the user explicitly requests it.
 - Never exfil private data on public platforms like github or any other services under any circumstances.
 
@@ -701,9 +717,11 @@ Guidelines:
 - Each edits[].oldText is matched against the original file, not after earlier edits are applied. Do not emit overlapping or nested edits. Merge nearby changes into one edit.
 - Keep edits[].oldText as small as possible while still being unique in the file. Do not pad with large unchanged regions.
 - Use write only for new files or complete rewrites.
-${todoGuideline}- Use subagents for independent parallel work, specialist analysis, or substantial research. Subagents start with fresh sessions. Use intercom instead to coordinate with an existing lunR session.
+${todoGuideline}${automaticSubagentDelegation ? `- Use subagents for independent parallel work, specialist analysis, or substantial research. Subagents start with fresh sessions. Use intercom instead to coordinate with an existing lunR session.
+` : ""}- Resume a subagent only when its work is unfinished or the next task genuinely needs the context it built up. Otherwise launch a new subagent.
 - Use ast_search for structural code matches.
 - Use cron only when the user asks to schedule or manage unattended prompts.
+- For gateway work, inspect with \`lunr gateway status\` or \`lunr gateway doctor\`, configure with \`lunr gateway setup\`, and run \`lunr gateway start\` or \`lunr gateway stop\` only with user approval. Test by asking the user to send \`/whoami\` or a normal message to the bot; there is no arbitrary outbound send command. Keep bot tokens out of commands and output. See ${docsPath}/features.md for pairing, logs, and service details.
 - Memory stores established, durable facts and stable preferences. Do not store behavior instructions, transient task details, transcripts, guesses, or secrets. Change memory only with the memory tools.
 - ~/.lunr/agent/agents/ contains optional global and per-model AGENTS.md instructions written by the user. Never modify this tree, including through shell commands.
 - Use web search when information is current, uncertain, externally referenced, or research-heavy, and cite the sources used.
@@ -765,6 +783,11 @@ var THINKING_LEVELS = ["off", "minimal", "low", "medium", "high", "xhigh", "max"
   _isAgentRunActive = !1;
   _idleWaitPromise;
   _resolveIdleWait;
+  _activePromptRun;
+  _waitPromptHandoff;
+  _waitPromptAcceptance = Promise.resolve();
+  _waitPromptGeneration = 0;
+  _unregisterSubagentWaitInterruptionOwners = [];
   /** Tracks pending steering messages for UI display. Removed when delivered. */
   _steeringMessages = [];
   /** Tracks pending follow-up messages for UI display. Removed when delivered. */
@@ -815,12 +838,16 @@ var THINKING_LEVELS = ["off", "minimal", "low", "medium", "high", "xhigh", "max"
   _baseSystemPrompt = "";
   _baseSystemPromptOptions;
   _systemPromptOverride;
-  // lunr: core-owned system-prompt append (plan mode addendum) applied on top of base/override
+  // lunr: core-owned system-prompt append (read-only mode addendum) applied on top of base/override
   _systemPromptAppend;
-  // lunr: core-owned tool-call gates (plan mode) checked before extension tool_call handlers
+  // lunr: core-owned tool-call gates (read-only mode) checked before extension tool_call handlers
   _toolCallGates = [];
   constructor(config) {
-    this.agent = config.agent, this.sessionManager = config.sessionManager, this.settingsManager = config.settingsManager, this._scopedModels = config.scopedModels ?? [], this._resourceLoader = config.resourceLoader, this._customTools = config.customTools ?? [], this._cwd = config.cwd, this._agentDir = config.agentDir ?? getAgentDir(), this._modelRuntime = config.modelRuntime, this._syncOpenAIServiceTier(), this._extensionRunnerRef = config.extensionRunnerRef, this._initialActiveToolNames = config.initialActiveToolNames, this._allowedToolNames = config.allowedToolNames ? new Set(config.allowedToolNames) : void 0, this._excludedToolNames = config.excludedToolNames ? new Set(config.excludedToolNames) : void 0, this._baseToolsOverride = config.baseToolsOverride, this._sessionStartEvent = config.sessionStartEvent ?? { type: "session_start", reason: "startup" }, this._unsubscribeAgent = this.agent.subscribe(this._handleAgentEvent), this._installAgentToolHooks(), this._installAgentNextTurnRefresh(), this._buildRuntime({
+    this.agent = config.agent, this.sessionManager = config.sessionManager, this.settingsManager = config.settingsManager, this._scopedModels = config.scopedModels ?? [], this._resourceLoader = config.resourceLoader, this._customTools = config.customTools ?? [], this._cwd = config.cwd, this._agentDir = config.agentDir ?? getAgentDir(), this._modelRuntime = config.modelRuntime, this._syncOpenAIServiceTier(), this._extensionRunnerRef = config.extensionRunnerRef, this._initialActiveToolNames = config.initialActiveToolNames, this._allowedToolNames = config.allowedToolNames ? new Set(config.allowedToolNames) : void 0, this._excludedToolNames = config.excludedToolNames ? new Set(config.excludedToolNames) : void 0, this._baseToolsOverride = config.baseToolsOverride, this._sessionStartEvent = config.sessionStartEvent ?? { type: "session_start", reason: "startup" };
+    let waitInterruptionOwner = { register: () => this._registerSubagentWaitInterruption() };
+    for (let identity of new Set([this.sessionId, this.sessionFile].filter((value) => !!value)))
+      this._unregisterSubagentWaitInterruptionOwners.push(registerSubagentWaitInterruptionOwner(identity, waitInterruptionOwner));
+    this._unsubscribeAgent = this.agent.subscribe(this._handleAgentEvent), this._installAgentToolHooks(), this._installAgentNextTurnRefresh(), this._buildRuntime({
       activeToolNames: this._initialActiveToolNames,
       includeAllExtensionTools: !0
     });
@@ -1152,13 +1179,16 @@ var THINKING_LEVELS = ["off", "minimal", "low", "medium", "high", "xhigh", "max"
    */
   transferring = !1;
   setTransferring(value) {
-    this.transferring = value;
+    this.transferring = value, value && this._invalidateWaitPromptHandoffs("Session transfer interrupted the pending prompt.");
   }
   assertCanStartWork() {
     if (this.sessionManager.assertWritable(), this.transferring)
       throw new Error("Session transfer is in progress. Wait or reclaim the session.");
   }
   dispose() {
+    this._invalidateWaitPromptHandoffs("Session closed before the pending prompt could run.");
+    for (let unregister of this._unregisterSubagentWaitInterruptionOwners.splice(0))
+      unregister();
     try {
       this.abortRetry(), this.abortCompaction(), this.abortBranchSummary(), this.abortBash(), this.agent.abort();
     } catch {
@@ -1188,12 +1218,16 @@ var THINKING_LEVELS = ["off", "minimal", "low", "medium", "high", "xhigh", "max"
   get isIdle() {
     return !this._isAgentRunActive;
   }
+  /** Whether normal Enter is still being reserved for an interrupted wait handoff. */
+  get isWaitPromptHandoffActive() {
+    return this._waitPromptHandoff?.accepting === !0;
+  }
   /** Current effective system prompt (includes any per-turn extension modifications) */
   get systemPrompt() {
     return this.agent.state.systemPrompt;
   }
   /**
-   * lunr: register a core-owned tool-call gate (plan mode). Gates run before extension
+   * lunr: register a core-owned tool-call gate (read-only mode). Gates run before extension
    * tool_call handlers and even when no extension handles tool_call. Returns an
    * unsubscribe function.
    */
@@ -1337,6 +1371,7 @@ ${this._systemPromptAppend}` : prompt;
     return this._baseSystemPromptOptions = {
       cwd: this._cwd,
       modelSlug: this.model ? `${this.model.provider}/${this.model.id}` : void 0,
+      automaticSubagentDelegation: this.settingsManager.getAutomaticSubagentDelegation(),
       skills: loadedSkills,
       contextFiles,
       customPrompt: loaderSystemPrompt,
@@ -1352,23 +1387,47 @@ ${this._systemPromptAppend}` : prompt;
   // =========================================================================
   // Prompting
   // =========================================================================
+  _registerSubagentWaitInterruption() {
+    let run = this._activePromptRun, ownerSignal = this.agent.signal, wait = run && ownerSignal ? { controller: new AbortController(), interrupted: !1, ownerSignal } : void 0;
+    return run && wait && (run.waits.add(wait), run.gracefulStopRequested && (wait.interrupted = !0, wait.controller.abort())), {
+      signal: wait?.controller.signal ?? new AbortController().signal,
+      wasInterrupted: () => wait?.interrupted === !0,
+      unregister: () => {
+        wait && run?.waits.delete(wait);
+      }
+    };
+  }
+  _interruptSubagentWaits(run, ownerSignal) {
+    for (let wait of run.waits)
+      wait.ownerSignal === ownerSignal && (wait.interrupted = !0, wait.controller.abort());
+  }
+  _invalidateWaitPromptHandoffs(message) {
+    this._waitPromptGeneration++;
+    let handoff = this._waitPromptHandoff;
+    if (this._waitPromptHandoff = void 0, !handoff)
+      return;
+    let error = new Error(message);
+    for (let reservation of handoff.reservations.splice(0))
+      reservation.reject(error);
+  }
   async _runAgentPrompt(messages) {
-    this._isAgentRunActive = !0;
+    let run = { waits: /* @__PURE__ */ new Set(), gracefulStopRequested: !1 };
+    this._activePromptRun = run, this._isAgentRunActive = !0;
     try {
-      for (await this.agent.prompt(messages); await this._handlePostAgentRun(); )
+      for (await this.agent.prompt(messages); await this._handlePostAgentRun(run); )
         await this.agent.continue();
     } finally {
-      this._systemPromptOverride = void 0, this._flushPendingBashMessages(), await this._emitAgentSettled();
+      this._activePromptRun === run && (this._activePromptRun = void 0), this._systemPromptOverride = void 0, this._flushPendingBashMessages(), await this._emitAgentSettled();
     }
   }
-  async _handlePostAgentRun() {
+  async _handlePostAgentRun(run) {
     let msg = this._lastAssistantMessage;
-    return this._lastAssistantMessage = void 0, msg ? msg.stopReason === "error" && this._isRotationError(msg) && await this._tryRotateSubscriptionKey(msg) || this._isRetryableError(msg) && await this._prepareRetry(msg) || msg.stopReason === "error" && this._isRetryableError(msg) && await this._tryRotateSubscriptionKey(msg) || (msg.stopReason === "error" && this._retryAttempt > 0 && (this._emit({
+    return this._lastAssistantMessage = void 0, !msg || run.gracefulStopRequested ? !1 : msg.stopReason === "error" && this._isRotationError(msg) && await this._tryRotateSubscriptionKey(msg) || this._isRetryableError(msg) && await this._prepareRetry(msg) || msg.stopReason === "error" && this._isRetryableError(msg) && await this._tryRotateSubscriptionKey(msg) || (msg.stopReason === "error" && this._retryAttempt > 0 && (this._emit({
       type: "auto_retry_end",
       success: !1,
       attempt: this._retryAttempt,
       finalError: msg.errorMessage
-    }), this._retryAttempt = 0), await this._checkCompaction(msg)) ? !0 : this.agent.hasQueuedMessages() : !1;
+    }), this._retryAttempt = 0), await this._checkCompaction(msg)) ? !0 : this.agent.hasQueuedMessages();
   }
   /**
    * Send a prompt to the agent.
@@ -1381,60 +1440,117 @@ ${this._systemPromptAppend}` : prompt;
    */
   async prompt(text, options) {
     this.assertCanStartWork();
-    let expandPromptTemplates = options?.expandPromptTemplates ?? !0, preflightResult = options?.preflightResult, messages;
+    let preflightResult = options?.preflightResult, prepared, messages;
     try {
-      if (expandPromptTemplates && text.startsWith("/") && await this._tryExecuteExtensionCommand(text)) {
+      if (prepared = await this._preparePromptInput(text, options, this.isStreaming ? options?.streamingBehavior : void 0), !prepared) {
         preflightResult?.(!0);
         return;
       }
-      let currentText = text, currentImages = options?.images;
-      if (this._extensionRunner.hasHandlers("input")) {
-        let inputResult = await this._extensionRunner.emitInput(currentText, currentImages, options?.source ?? "interactive", this.isStreaming ? options?.streamingBehavior : void 0);
-        if (inputResult.action === "handled") {
-          preflightResult?.(!0);
-          return;
-        }
-        inputResult.action === "transform" && (currentText = inputResult.text, currentImages = inputResult.images ?? currentImages);
-      }
-      let expandedText = currentText;
-      if (expandPromptTemplates && (expandedText = this._expandSkillCommand(expandedText), expandedText = expandPromptTemplate(expandedText, [...this.promptTemplates])), this.isStreaming) {
+      if (this.isStreaming) {
         if (!options?.streamingBehavior)
           throw new Error("Agent is already processing. Specify streamingBehavior ('steer' or 'followUp') to queue the message.");
-        options.streamingBehavior === "followUp" ? await this._queueFollowUp(expandedText, currentImages) : await this._queueSteer(expandedText, currentImages), preflightResult?.(!0);
+        options.streamingBehavior === "followUp" ? await this._queueFollowUp(prepared.text, prepared.images) : await this._queueSteer(prepared.text, prepared.images), preflightResult?.(!0);
         return;
       }
-      if (this._flushPendingBashMessages(), !this.model)
-        throw new Error(formatNoModelSelectedMessage());
-      if (!(this._modelRuntime.hasConfiguredAuth(this.model.provider) || await this._modelRuntime.checkAuth(this.model.provider) !== void 0))
-        throw this._modelRuntime.isUsingOAuth(this.model.provider) ? new Error(`Authentication failed for "${this.model.provider}". Credentials may have expired or network is unavailable. Run '/login ${this.model.provider}' to re-authenticate.`) : new Error(formatNoApiKeyFoundMessage(this.model.provider));
-      let lastAssistant = this._findLastAssistantMessage();
-      lastAssistant && await this._checkCompaction(lastAssistant, !1), messages = [];
-      let userContent = [{ type: "text", text: expandedText }];
-      currentImages && userContent.push(...currentImages), messages.push({
+      messages = await this._createPromptMessages(prepared);
+    } catch (error) {
+      throw preflightResult?.(!1), error;
+    }
+    preflightResult?.(!0), await this._runAgentPrompt(messages);
+  }
+  async _preparePromptInput(text, options, streamingBehavior) {
+    let expandPromptTemplates = options?.expandPromptTemplates ?? !0;
+    if (expandPromptTemplates && text.startsWith("/") && await this._tryExecuteExtensionCommand(text))
+      return;
+    let currentText = text, currentImages = options?.images;
+    if (this._extensionRunner.hasHandlers("input")) {
+      let inputResult = await this._extensionRunner.emitInput(currentText, currentImages, options?.source ?? "interactive", streamingBehavior);
+      if (inputResult.action === "handled")
+        return;
+      inputResult.action === "transform" && (currentText = inputResult.text, currentImages = inputResult.images ?? currentImages);
+    }
+    return expandPromptTemplates && (currentText = this._expandSkillCommand(currentText), currentText = expandPromptTemplate(currentText, [...this.promptTemplates])), { text: currentText, images: currentImages };
+  }
+  async _createPromptMessages(input) {
+    if (this._flushPendingBashMessages(), !this.model)
+      throw new Error(formatNoModelSelectedMessage());
+    if (!(this._modelRuntime.hasConfiguredAuth(this.model.provider) || await this._modelRuntime.checkAuth(this.model.provider) !== void 0))
+      throw this._modelRuntime.isUsingOAuth(this.model.provider) ? new Error(`Authentication failed for "${this.model.provider}". Credentials may have expired or network is unavailable. Run '/login ${this.model.provider}' to re-authenticate.`) : new Error(formatNoApiKeyFoundMessage(this.model.provider));
+    let lastAssistant = this._findLastAssistantMessage();
+    lastAssistant && await this._checkCompaction(lastAssistant, !1);
+    let userContent = [{ type: "text", text: input.text }];
+    input.images && userContent.push(...input.images);
+    let messages = [
+      {
         role: "user",
         content: userContent,
         timestamp: Date.now()
-      });
-      for (let msg of this._pendingNextTurnMessages)
-        messages.push(msg);
-      this._pendingNextTurnMessages = [];
-      let result = await this._extensionRunner.emitBeforeAgentStart(expandedText, currentImages, this._baseSystemPrompt, this._baseSystemPromptOptions);
-      if (result?.messages)
-        for (let msg of result.messages)
-          messages.push({
-            role: "custom",
-            customType: msg.customType,
-            // Untyped extensions can pass null/missing content; normalize at ingestion.
-            content: msg.content ?? [],
-            display: msg.display,
-            details: msg.details,
-            timestamp: Date.now()
-          });
-      result?.systemPrompt !== void 0 ? (this._systemPromptOverride = result.systemPrompt, this.agent.state.systemPrompt = this._withSystemPromptAppend(result.systemPrompt)) : (this._systemPromptOverride = void 0, this.agent.state.systemPrompt = this._withSystemPromptAppend(this._baseSystemPrompt));
+      },
+      ...this._pendingNextTurnMessages
+    ];
+    this._pendingNextTurnMessages = [];
+    let result = await this._extensionRunner.emitBeforeAgentStart(input.text, input.images, this._baseSystemPrompt, this._baseSystemPromptOptions);
+    if (result?.messages)
+      for (let msg of result.messages)
+        messages.push({
+          role: "custom",
+          customType: msg.customType,
+          content: msg.content ?? [],
+          display: msg.display,
+          details: msg.details,
+          timestamp: Date.now()
+        });
+    return result?.systemPrompt !== void 0 ? (this._systemPromptOverride = result.systemPrompt, this.agent.state.systemPrompt = this._withSystemPromptAppend(result.systemPrompt)) : (this._systemPromptOverride = void 0, this.agent.state.systemPrompt = this._withSystemPromptAppend(this._baseSystemPrompt)), messages;
+  }
+  async interruptSubagentWaitWithPrompt(text, options) {
+    let acceptance = this._waitPromptAcceptance.then(() => this._reserveWaitPrompt(text, options));
+    return this._waitPromptAcceptance = acceptance.then(() => {
+    }, () => {
+    }), acceptance;
+  }
+  async _reserveWaitPrompt(text, options) {
+    this.assertCanStartWork();
+    let activeRun = this._activePromptRun, existing = this._waitPromptHandoff, activeWait = activeRun?.waits.values().next().value, run = existing?.accepting ? existing.run : activeWait ? activeRun : void 0, ownerSignal = existing?.accepting ? existing.ownerSignal : activeWait?.ownerSignal;
+    if (!run || !ownerSignal)
+      return;
+    let handoff = existing?.run === run && existing.accepting ? existing : {
+      run,
+      ownerSignal,
+      generation: this._waitPromptGeneration,
+      reservations: [],
+      draining: !1,
+      accepting: !0
+    };
+    this._waitPromptHandoff = handoff;
+    let prepared;
+    try {
+      prepared = await this._preparePromptInput(text, options, void 0);
     } catch (error) {
-      throw preflightResult?.(!1), error;
+      throw handoff.reservations.length === 0 && this._waitPromptHandoff === handoff && (this._waitPromptHandoff = void 0), error;
+    }
+    if (!prepared)
+      return handoff.reservations.length === 0 && this._waitPromptHandoff === handoff && (this._waitPromptHandoff = void 0), { completion: Promise.resolve() };
+    let resolveCompletion = () => {
+    }, rejectCompletion = (_error) => {
+    }, completion = new Promise((resolve3, reject) => {
+      resolveCompletion = resolve3, rejectCompletion = reject;
+    });
+    return handoff.reservations.push({ input: prepared, resolve: resolveCompletion, reject: rejectCompletion }), !run.gracefulStopRequested && this.agent.requestGracefulStop(handoff.ownerSignal) && (run.gracefulStopRequested = !0), this._interruptSubagentWaits(run, handoff.ownerSignal), handoff.draining || (handoff.draining = !0, this._drainWaitPromptHandoff(handoff)), { completion };
+  }
+  async _drainWaitPromptHandoff(handoff) {
+    for (await this.waitForIdle(); this._waitPromptHandoff === handoff && handoff.generation === this._waitPromptGeneration && handoff.reservations.length > 0; ) {
+      let reservation = handoff.reservations[0];
+      try {
+        this.assertCanStartWork();
+        let messages = await this._createPromptMessages(reservation.input);
+        handoff.accepting = !1, await this._runAgentPrompt(messages), reservation.resolve();
+      } catch (error) {
+        reservation.reject(error);
+      } finally {
+        handoff.reservations[0] === reservation && handoff.reservations.shift();
+      }
     }
-    messages && (preflightResult?.(!0), await this._runAgentPrompt(messages));
+    handoff.accepting = !1, this._waitPromptHandoff === handoff && (this._waitPromptHandoff = void 0);
   }
   /**
    * Try to execute an extension command. Returns true if command was found and executed.
@@ -1618,7 +1734,7 @@ ${args}` : skillBlock;
    * Abort current operation and wait for agent to become idle.
    */
   async abort() {
-    this.abortRetry(), this.agent.abort(), await this.waitForIdle();
+    this._invalidateWaitPromptHandoffs("The active run was aborted before the pending prompt could run."), this.abortRetry(), this.agent.abort(), await this.waitForIdle();
   }
   async waitForIdle() {
     this.isIdle || await this._getIdleWaitPromise();
@@ -2289,6 +2405,7 @@ ${args}` : skillBlock;
     });
   }
   async reload(options) {
+    this._invalidateWaitPromptHandoffs("Extensions reloaded before the pending prompt could run.");
     let previousFlagValues = this._extensionRunner.getFlagValues();
     await emitSessionShutdownEvent(this._extensionRunner, { type: "session_shutdown", reason: "reload" }), await this.settingsManager.reload(), this.syncQueueModesFromSettings(), resetApiProviders(), await this._resourceLoader.reload(), this._buildRuntime({
       activeToolNames: this.getActiveToolNames(),
@@ -2663,7 +2780,7 @@ ${command}` : command;
    */
   async exportToHtml(outputPath) {
     let [{ exportSessionToHtml }, { createToolHtmlRenderer }] = await Promise.all([
-      import("./export-html-KBFVV63J.js"),
+      import("./export-html-VM4J2MNR.js"),
       import("./tool-renderer-MV5O452K.js")
     ]), configuredThemeName = this.settingsManager.getTheme(), themeName = configuredThemeName && getThemeByName(configuredThemeName) ? configuredThemeName : void 0, toolRenderer = createToolHtmlRenderer({
       getToolDefinition: (name) => this.getToolDefinition(name),
@@ -3115,15 +3232,17 @@ async function createOwnedAgentSession(options) {
     },
     convertToLlm: convertToLlmWithBlockImages,
     streamFn: async (model2, context, options2) => {
-      let providerRetrySettings = settingsManager.getProviderRetrySettings(), httpIdleTimeoutMs = settingsManager.getHttpIdleTimeoutMs(), effectiveTimeoutMs = httpIdleTimeoutMs === 0 ? 2147483647 : httpIdleTimeoutMs, timeoutMs = options2?.timeoutMs ?? providerRetrySettings.timeoutMs ?? effectiveTimeoutMs, websocketConnectTimeoutMs = options2?.websocketConnectTimeoutMs ?? settingsManager.getWebSocketConnectTimeoutMs(), headerRunner = extensionRunnerRef.current;
+      let providerRetrySettings = settingsManager.getProviderRetrySettings(), httpIdleTimeoutMs = settingsManager.getHttpIdleTimeoutMs(), effectiveTimeoutMs = httpIdleTimeoutMs === 0 ? 2147483647 : httpIdleTimeoutMs, timeoutMs = options2?.timeoutMs ?? providerRetrySettings.timeoutMs ?? effectiveTimeoutMs, websocketConnectTimeoutMs = options2?.websocketConnectTimeoutMs ?? settingsManager.getWebSocketConnectTimeoutMs(), headerRunner = extensionRunnerRef.current, subscription = model2.provider === "anthropic" && (await modelRuntime.getAuth(model2, { apiKey: options2?.apiKey, env: options2?.env }))?.auth.externalClaudeCode;
       return modelRuntime.streamSimple(model2, context, {
         ...options2,
+        ...subscription && !headerRunner?.hasHandlers("before_provider_request") ? { onPayload: void 0 } : {},
+        ...subscription && !headerRunner?.hasHandlers("after_provider_response") ? { onResponse: void 0 } : {},
         timeoutMs,
         websocketConnectTimeoutMs,
         cacheRetention: settingsManager.getCacheRetention(),
         maxRetries: options2?.maxRetries ?? providerRetrySettings.maxRetries,
         maxRetryDelayMs: options2?.maxRetryDelayMs ?? providerRetrySettings.maxRetryDelayMs,
-        transformHeaders: async (requestHeaders) => {
+        transformHeaders: subscription && !headerRunner?.hasHandlers("before_provider_headers") ? void 0 : async (requestHeaders) => {
           let headers = mergeProviderAttributionHeaders(model2, settingsManager, options2?.sessionId, requestHeaders);
           return headerRunner?.hasHandlers("before_provider_headers") ? headerRunner.emitBeforeProviderHeaders(headers ?? {}) : headers ?? {};
         }

package/dist/node-runtime/{chunk-YJMMG7C6.js → chunk-DSIKTUPW.js}

@@ -81,7 +81,7 @@ import {
   serializeTools,
   throwIfAborted,
   truncateAtWord
-} from "./chunk-VSELYKWU.js";
+} from "./chunk-LWYIVUGV.js";
 import {
   getAgentPath
 } from "./chunk-4HXHDDCF.js";