@ashx-j/lunr 0.2.19 → 0.2.20

package/dist/node-runtime/{chunk-TXHKBRHZ.js → chunk-QKFMBRAL.js}

@@ -6,6 +6,10 @@ import {
   checkForUpdate,
   markUpdateNotified
 } from "./chunk-KWA4OC2J.js";
+import {
+  SubagentEscapeSequence,
+  getSubagentCancellation
+} from "./chunk-BBUVIEZB.js";
 import {
   copyToClipboard,
   readClipboardText
@@ -31,13 +35,25 @@ import {
 import {
   MissingSessionCwdError,
   SessionImportFileNotFoundError,
+  beginTurn,
+  captureTreeChanges,
+  clearRollback,
+  disableRollbackForSession,
+  enableRollbackForSession,
   formatCatalogRefreshSummary,
   formatMissingSessionCwdPrompt,
   hasGrokCliXaiAuth,
+  initRollback,
+  isRollbackEnabled,
+  isRollbackSessionForceEnabled,
+  migrateRollbackSession,
   parseSkillBlock,
+  peekRollbackTurnsConsumed,
   refreshModelCandidatesForInit,
+  rollbackLastTurn,
+  setRollbackWarningHandler,
   stripJsonComments
-} from "./chunk-ATGA2WLC.js";
+} from "./chunk-JYNNB7DU.js";
 import {
   computeFileLists,
   createFileOps,
@@ -96,21 +112,9 @@ import {
   getModelTiersBridge
 } from "./chunk-W3CVH5RX.js";
 import {
-  beginTurn,
-  captureTreeChanges,
-  clearRollback,
-  disableRollbackForSession,
-  enableRollbackForSession,
   getAllPlanUsageResults,
-  getUsageServiceBridge,
-  initRollback,
-  isRollbackEnabled,
-  isRollbackSessionForceEnabled,
-  migrateRollbackSession,
-  peekRollbackTurnsConsumed,
-  rollbackLastTurn,
-  setRollbackWarningHandler
-} from "./chunk-PNJSG3IZ.js";
+  getUsageServiceBridge
+} from "./chunk-LTYWTR3V.js";
 import {
   convertToPng,
   processImage
@@ -124,7 +128,7 @@ import {
   resetPermissions,
   restorePermissionModeAfterPlan,
   setPermissionMode
-} from "./chunk-J26TSGDL.js";
+} from "./chunk-6N22HULO.js";
 import {
   getGlobalInstructionsPath,
   getModelInstructionsPath
@@ -1230,8 +1234,8 @@ var OSC133_ZONE_START = "\x1B]133;A\x07", OSC133_ZONE_END = "\x1B]133;B\x07", OS
   updateContent(message, options) {
     this.lastMessage = message, this.thinkingSource = options?.thinkingSource, this.contentContainer.clear();
     let sourceMessage = this.thinkingSource ?? message, sourceThinkingRuns = collectThinkingRuns(sourceMessage.content);
-    (message.content.some((c) => c.type === "text" && c.text.trim() || c.type === "thinking" && c.thinking.trim()) || !this.hideThinkingBlock && sourceThinkingRuns.some((run) => run.length > 0)) && this.contentContainer.addChild(new Spacer(1));
-    let isFirstTextBlock = !0, thinkingRunIndex = -1, renderedThinking = !1;
+    message.content.some((c) => c.type === "text" && c.text.trim() || !this.hideThinkingBlock && c.type === "thinking" && c.thinking.trim()) && this.contentContainer.addChild(new Spacer(1));
+    let isFirstTextBlock = !0, thinkingRunIndex = -1;
     for (let i = 0; i < message.content.length; i++) {
       let content = message.content[i];
       if (content.type === "text" && content.text.trim()) {
@@ -1249,18 +1253,12 @@ var OSC133_ZONE_START = "\x1B]133;A\x07", OSC133_ZONE_END = "\x1B]133;B\x07", OS
           let thinking = thinkingContent.thinking.trim();
           thinking && displayBlocks.push(thinking);
         }
-        i--;
-        let thinkingBlocks = sourceThinkingRuns[thinkingRunIndex] ?? displayBlocks;
-        if (thinkingBlocks.length === 0 || this.hideThinkingBlock)
+        if (i--, displayBlocks.length === 0 || this.hideThinkingBlock)
           continue;
-        renderedThinking = !0, this.renderThinkingRun(thinkingRunIndex, thinkingBlocks, message, i);
+        let sourceBlocks = sourceThinkingRuns[thinkingRunIndex] ?? [], fullyRevealed = displayBlocks.length === sourceBlocks.length && displayBlocks.every((block, index) => block === sourceBlocks[index]);
+        this.renderThinkingRun(thinkingRunIndex, displayBlocks, message, i, fullyRevealed);
       }
     }
-    if (!this.hideThinkingBlock && !renderedThinking && sourceThinkingRuns.length > 0) {
-      thinkingRunIndex = 0;
-      let thinkingBlocks = sourceThinkingRuns[0] ?? [];
-      thinkingBlocks.length > 0 && this.renderThinkingRun(thinkingRunIndex, thinkingBlocks, message, -1);
-    }
     let hasToolCalls = message.content.some((c) => c.type === "toolCall");
     if (this.hasToolCalls = hasToolCalls, message.stopReason === "length")
       this.contentContainer.addChild(new Spacer(1)), this.contentContainer.addChild(new Text(theme.fg("error", "Error: Model stopped because it reached the maximum output token limit. The response may be incomplete."), this.outputPad, 0));
@@ -1274,8 +1272,8 @@ var OSC133_ZONE_START = "\x1B]133;A\x07", OSC133_ZONE_END = "\x1B]133;B\x07", OS
       }
     }
   }
-  renderThinkingRun(thinkingRunIndex, thinkingBlocks, displayMessage, displayIndex) {
-    let hasVisibleContentAfter = displayIndex >= 0 ? displayMessage.content.slice(displayIndex + 1).some((c) => c.type === "text" && c.text.trim() || c.type === "thinking" && c.thinking.trim()) : displayMessage.content.some((c) => c.type === "text" && c.text.trim()), runComplete = isThinkingRunComplete(!1, this.thinkingTimings?.[thinkingRunIndex], this.thinkingTimings !== void 0), wrap = (inner) => {
+  renderThinkingRun(thinkingRunIndex, thinkingBlocks, displayMessage, displayIndex, fullyRevealed) {
+    let hasVisibleContentAfter = displayIndex >= 0 ? displayMessage.content.slice(displayIndex + 1).some((c) => c.type === "text" && c.text.trim() || c.type === "thinking" && c.thinking.trim()) : displayMessage.content.some((c) => c.type === "text" && c.text.trim()), runComplete = fullyRevealed && isThinkingRunComplete(!1, this.thinkingTimings?.[thinkingRunIndex], this.thinkingTimings !== void 0), wrap = (inner) => {
       this.contentContainer.addChild(new ThinkingRunBlock(this, thinkingRunIndex, inner));
     };
     if (this.thinkingCollapse && !this.isRunExpanded(thinkingRunIndex) && runComplete) {
@@ -1328,7 +1326,7 @@ function collectThinkingRuns(content) {
       let thinking = thinkingContent.thinking.trim();
       thinking && blocks.push(thinking);
     }
-    blocks.length > 0 && runs.push(blocks);
+    runs.push(blocks);
   }
   return runs;
 }
@@ -3976,7 +3974,13 @@ var ToolExecutionComponent = class extends Container14 {
     return !!this.result?.isError && this.groupFollowed && !this.expanded && !this.isPartial && this.getRenderShell() === "default" && this.toolName !== "subagent" && this.toolName !== "subagent_wait";
   }
   shouldSkipCompactResult() {
-    return this.result === void 0 || this.isPartial || this.expanded ? !1 : this.result.isError ? this.shouldHideGroupedErrorBody() : this.getRenderShell() === "default";
+    if (this.result === void 0 || this.isPartial || this.expanded)
+      return !1;
+    if (this.toolName === "subagent") {
+      let details = this.result.details;
+      return !(this.result.isError || Array.isArray(details?.results) && details.results.length > 0 || details?.mode === "management");
+    }
+    return this.result.isError ? this.shouldHideGroupedErrorBody() : this.getRenderShell() === "default";
   }
   formatHoistedGroupErrors() {
     if (this.groupFollowed || this.expanded)
@@ -5329,6 +5333,7 @@ var InteractiveMode = class _InteractiveMode {
   hiddenThinkingLabel = this.defaultHiddenThinkingLabel;
   lastSigintTime = 0;
   lastEscapeTime = 0;
+  subagentEscape = new SubagentEscapeSequence();
   anthropicSubscriptionWarningShown = !1;
   // Status line tracking (for mutating immediately-sequential status updates)
   lastStatusSpacer = void 0;
@@ -6464,6 +6469,15 @@ ${message}`, ["Yes", "No"], opts) === "Yes";
   // =========================================================================
   setupKeyHandlers() {
     this.defaultEditor.onEscape = () => {
+      let sessionId = this.session.sessionId, cancellation = getSubagentCancellation(sessionId), escapeAction = this.subagentEscape.press(sessionId, cancellation?.hasActiveRuns() ?? !1);
+      if (escapeAction) {
+        this.lastEscapeTime = 0, this.session.isStreaming ? this.restoreQueuedMessagesToEditor({ abort: !0 }) : this.session.isBashRunning && this.session.abortBash(), escapeAction === "children" && cancellation && cancellation.stop().then(({ requested, failed }) => {
+          this.session.sessionId === sessionId && (failed ? this.showError(`Could not request stop for ${failed} async runs. Inspect subagent status.`) : requested && this.showStatus(`Stopping ${requested} async ${requested === 1 ? "run" : "runs"}`));
+        }).catch((error) => {
+          this.session.sessionId === sessionId && this.showError(error instanceof Error ? error.message : String(error));
+        });
+        return;
+      }
       if (this.session.isStreaming)
         this.restoreQueuedMessagesToEditor({ abort: !0 });
       else if (this.session.isBashRunning)

package/dist/node-runtime/{command-DWUM5X3U.js → command-RBTRL55A.js}

@@ -5,7 +5,7 @@ import "./chunk-BRJX2PRC.js";
 async function handleGatewayCommand(args) {
   if (args[0] !== "gateway")
     return !1;
-  let { runGateway } = await import("./gateway-UZXMFGWY.js"), code = await runGateway(args.slice(1));
+  let { runGateway } = await import("./gateway-L4ANRTVE.js"), code = await runGateway(args.slice(1));
   return process.exitCode = code, !0;
 }
 export {

package/dist/node-runtime/{gateway-UZXMFGWY.js → gateway-L4ANRTVE.js}

@@ -5,7 +5,7 @@ import {
   listSessions,
   splitMessage,
   startGatewayCron
-} from "./chunk-ZRCBN365.js";
+} from "./chunk-ELWEXVO5.js";
 import {
   gatewayConfigPath,
   isFeatureEnabled,
@@ -30,7 +30,7 @@ import "./chunk-AD6VXAO7.js";
 import {
   NO_HANDLER_REASON,
   registerApprovalHandler
-} from "./chunk-J26TSGDL.js";
+} from "./chunk-6N22HULO.js";
 import "./chunk-M3LZLQW2.js";
 import "./chunk-RQ2Q5IYR.js";
 import "./chunk-QZMODZQ2.js";

package/dist/node-runtime/index.js

@@ -19,7 +19,7 @@ import {
   TreeSelectorComponent,
   UserMessageComponent,
   UserMessageSelectorComponent
-} from "./chunk-TXHKBRHZ.js";
+} from "./chunk-QKFMBRAL.js";
 import "./chunk-G6LRAP36.js";
 import {
   attachJsonlLineReader,
@@ -30,6 +30,7 @@ import {
   runPrintMode
 } from "./chunk-OCVIXVTZ.js";
 import "./chunk-KWA4OC2J.js";
+import "./chunk-BBUVIEZB.js";
 import {
   copyToClipboard
 } from "./chunk-Q5ZU2VRT.js";
@@ -38,14 +39,14 @@ import "./chunk-6BEIBLQ3.js";
 import "./chunk-7N3YHTYF.js";
 import {
   main
-} from "./chunk-TFBIJTM3.js";
-import "./chunk-4FX25LWP.js";
+} from "./chunk-AL2FMKKM.js";
+import "./chunk-K3646JTM.js";
 import "./chunk-4DJ6HEGH.js";
 import {
   ProjectTrustStore,
   hasTrustRequiringProjectResources
 } from "./chunk-AROOY4BB.js";
-import "./chunk-XATUM2HK.js";
+import "./chunk-25I2BHAA.js";
 import {
   AgentSession,
   AgentSessionRuntime,
@@ -60,7 +61,7 @@ import {
   readStoredCredential,
   wrapRegisteredTool,
   wrapRegisteredTools
-} from "./chunk-ATGA2WLC.js";
+} from "./chunk-JYNNB7DU.js";
 import {
   DEFAULT_COMPACTION_SETTINGS,
   calculateContextTokens,
@@ -150,16 +151,16 @@ import {
 import {
   convertToLlm
 } from "./chunk-FVDOXRUD.js";
-import "./chunk-3NMWLTPV.js";
+import "./chunk-AOFXZQKA.js";
 import "./chunk-W3CVH5RX.js";
-import "./chunk-PNJSG3IZ.js";
+import "./chunk-LTYWTR3V.js";
 import "./chunk-PL6JKXWI.js";
 import {
   convertToPng,
   formatDimensionNote,
   resizeImage
 } from "./chunk-AD6VXAO7.js";
-import "./chunk-J26TSGDL.js";
+import "./chunk-6N22HULO.js";
 import "./chunk-M3LZLQW2.js";
 import "./chunk-RQ2Q5IYR.js";
 import "./chunk-JHYKXIMM.js";

package/dist/node-runtime/{interactive-mode-QT5IKGQ5.js → interactive-mode-HPUNH7SV.js}

@@ -3,15 +3,16 @@ import {
   InteractiveMode,
   formatResumeCommand,
   startInteractiveToolInstalls
-} from "./chunk-TXHKBRHZ.js";
+} from "./chunk-QKFMBRAL.js";
 import "./chunk-G6LRAP36.js";
 import "./chunk-KWA4OC2J.js";
+import "./chunk-BBUVIEZB.js";
 import "./chunk-Q5ZU2VRT.js";
 import "./chunk-NUIFPZWX.js";
 import "./chunk-6BEIBLQ3.js";
 import "./chunk-7N3YHTYF.js";
 import "./chunk-AROOY4BB.js";
-import "./chunk-ATGA2WLC.js";
+import "./chunk-JYNNB7DU.js";
 import "./chunk-STERBGUB.js";
 import "./chunk-4CSFRBCN.js";
 import "./chunk-OBMWP3I5.js";
@@ -26,9 +27,9 @@ import "./chunk-CBGB57XT.js";
 import "./chunk-GKLEQ3I4.js";
 import "./chunk-FVDOXRUD.js";
 import "./chunk-W3CVH5RX.js";
-import "./chunk-PNJSG3IZ.js";
+import "./chunk-LTYWTR3V.js";
 import "./chunk-AD6VXAO7.js";
-import "./chunk-J26TSGDL.js";
+import "./chunk-6N22HULO.js";
 import "./chunk-M3LZLQW2.js";
 import "./chunk-RQ2Q5IYR.js";
 import "./chunk-H2EOZYMP.js";

package/dist/node-runtime/{lunr-cron-QPBTKBGI.js → lunr-cron-NNYTWTGF.js}

@@ -13,7 +13,7 @@ import {
   setCronDeliverValidator,
   startScheduler,
   updateJob
-} from "./chunk-ZRCBN365.js";
+} from "./chunk-ELWEXVO5.js";
 import {
   loadGatewayConfig
 } from "./chunk-4I23VTC4.js";
@@ -26,7 +26,7 @@ import {
   typebox_exports
 } from "./chunk-PL6JKXWI.js";
 import "./chunk-AD6VXAO7.js";
-import "./chunk-J26TSGDL.js";
+import "./chunk-6N22HULO.js";
 import "./chunk-M3LZLQW2.js";
 import "./chunk-RQ2Q5IYR.js";
 import "./chunk-FQMM2EZ2.js";

package/dist/node-runtime/main.js

@@ -2,12 +2,12 @@ import { createRequire as __lunrRequire } from "node:module"; const require = __
 import {
   main,
   readPipedStdin
-} from "./chunk-TFBIJTM3.js";
-import "./chunk-4FX25LWP.js";
+} from "./chunk-AL2FMKKM.js";
+import "./chunk-K3646JTM.js";
 import "./chunk-4DJ6HEGH.js";
 import "./chunk-AROOY4BB.js";
-import "./chunk-XATUM2HK.js";
-import "./chunk-ATGA2WLC.js";
+import "./chunk-25I2BHAA.js";
+import "./chunk-JYNNB7DU.js";
 import "./chunk-STERBGUB.js";
 import "./chunk-4CSFRBCN.js";
 import "./chunk-OBMWP3I5.js";
@@ -21,12 +21,12 @@ import "./chunk-CSFI6YXL.js";
 import "./chunk-CBGB57XT.js";
 import "./chunk-GKLEQ3I4.js";
 import "./chunk-FVDOXRUD.js";
-import "./chunk-3NMWLTPV.js";
+import "./chunk-AOFXZQKA.js";
 import "./chunk-W3CVH5RX.js";
-import "./chunk-PNJSG3IZ.js";
+import "./chunk-LTYWTR3V.js";
 import "./chunk-PL6JKXWI.js";
 import "./chunk-AD6VXAO7.js";
-import "./chunk-J26TSGDL.js";
+import "./chunk-6N22HULO.js";
 import "./chunk-M3LZLQW2.js";
 import "./chunk-RQ2Q5IYR.js";
 import "./chunk-JHYKXIMM.js";

package/dist/node-runtime/{pi-intercom-EEMBGQID.js → pi-intercom-DDQMRNPJ.js}

@@ -389,13 +389,13 @@ var IntercomClient = class extends EventEmitter {
 
 // packages/coding-agent/dist/builtin-extensions/pi-intercom/broker/spawn.js
 import { spawn } from "child_process";
-import { existsSync, readFileSync as readFileSync2, unlinkSync, writeFileSync } from "fs";
+import { closeSync, existsSync, openSync, readFileSync as readFileSync2, unlinkSync, writeFileSync } from "fs";
 import { join as join2, dirname } from "path";
 import { fileURLToPath } from "url";
 import { createRequire } from "module";
 import net2 from "net";
 import { randomUUID as randomUUID2 } from "crypto";
-var INTERCOM_DIR = getIntercomDirPath(), EXTENSION_DIR = join2(dirname(fileURLToPath(new URL("../builtin-extensions/pi-intercom/broker/spawn.js", import.meta.url).href)), ".."), BROKER_PID = join2(INTERCOM_DIR, "broker.pid"), BROKER_SPAWN_LOCK = join2(INTERCOM_DIR, "broker.spawn.lock");
+var INTERCOM_DIR = getIntercomDirPath(), EXTENSION_DIR = join2(dirname(fileURLToPath(new URL("../builtin-extensions/pi-intercom/broker/spawn.js", import.meta.url).href)), ".."), BROKER_PID = join2(INTERCOM_DIR, "broker.pid"), BROKER_SPAWN_LOCK = join2(INTERCOM_DIR, "broker.spawn.lock"), BROKER_STDERR = join2(INTERCOM_DIR, "broker.stderr.log"), NATIVE_SUPERVISOR_CHANNEL_DIR_ENV = "PI_SUBAGENT_SUPERVISOR_CHANNEL_DIR";
 function sleep(ms) {
   return new Promise((resolve2) => setTimeout(resolve2, ms));
 }
@@ -407,6 +407,16 @@ function getTsxCliPath(extensionDir = EXTENSION_DIR) {
     return join2(extensionDir, "node_modules", "tsx", "dist", "cli.mjs");
   }
 }
+function isNativeSupervisorChannelActive(env = process.env) {
+  return !!env[NATIVE_SUPERVISOR_CHANNEL_DIR_ENV]?.trim();
+}
+function resolveBrokerScriptPath(brokerDir = dirname(fileURLToPath(new URL("../builtin-extensions/pi-intercom/broker/spawn.js", import.meta.url).href))) {
+  let tsPath = join2(brokerDir, "broker.ts");
+  return existsSync(tsPath) ? tsPath : join2(brokerDir, "broker.js");
+}
+function isCompiledBrokerScript(brokerPath) {
+  return brokerPath.endsWith(".js");
+}
 function quoteWindowsArg(value) {
   return `"${value.replace(/"/g, '""')}"`;
 }
@@ -416,8 +426,15 @@ function getWindowsHiddenLauncherPath(intercomDir = INTERCOM_DIR) {
 function usesDefaultBrokerCommand(brokerCommand, brokerArgs) {
   return brokerCommand === "npx" && brokerArgs.length === 2 && brokerArgs[0] === "--no-install" && brokerArgs[1] === "tsx";
 }
-function getWindowsBrokerCommandLine(brokerPath, extensionDir = EXTENSION_DIR, nodePath = process.execPath, brokerCommand = "npx", brokerArgs = ["--no-install", "tsx"]) {
-  return usesDefaultBrokerCommand(brokerCommand, brokerArgs) ? [quoteWindowsArg(nodePath), quoteWindowsArg(getTsxCliPath(extensionDir)), quoteWindowsArg(brokerPath)].join(" ") : [quoteWindowsArg(brokerCommand), ...brokerArgs.map(quoteWindowsArg), quoteWindowsArg(brokerPath)].join(" ");
+function defaultBrokerArgv(brokerPath, extensionDir, nodePath, brokerCommand, brokerArgs) {
+  return usesDefaultBrokerCommand(brokerCommand, brokerArgs) && isCompiledBrokerScript(brokerPath) ? { command: nodePath, args: [brokerPath] } : usesDefaultBrokerCommand(brokerCommand, brokerArgs) ? { command: nodePath, args: [getTsxCliPath(extensionDir), brokerPath] } : { command: brokerCommand, args: [...brokerArgs, brokerPath] };
+}
+function withWindowsStderr(commandLine, stderrLogPath) {
+  return stderrLogPath ? `cmd.exe /s /c "${`${commandLine} 1>NUL 2>>${quoteWindowsArg(stderrLogPath)}`}"` : commandLine;
+}
+function getWindowsBrokerCommandLine(brokerPath, extensionDir = EXTENSION_DIR, nodePath = process.execPath, brokerCommand = "npx", brokerArgs = ["--no-install", "tsx"], stderrLogPath) {
+  let argv = defaultBrokerArgv(brokerPath, extensionDir, nodePath, brokerCommand, brokerArgs), commandLine = [quoteWindowsArg(argv.command), ...argv.args.map(quoteWindowsArg)].join(" ");
+  return withWindowsStderr(commandLine, stderrLogPath);
 }
 function getWindowsHiddenLauncherScript(commandLine) {
   return [
@@ -440,7 +457,7 @@ function writeWindowsHiddenLauncher(commandLine, launcherPath = getWindowsHidden
     mode: INTERCOM_RUNTIME_FILE_MODE
   }), restrictIntercomRuntimeFile(launcherPath), launcherPath;
 }
-function getBrokerLaunchSpec(brokerPath, brokerCommand, brokerArgs, extensionDir = EXTENSION_DIR, platform = process.platform, intercomDir = INTERCOM_DIR, nodePath = process.execPath) {
+function getBrokerLaunchSpec(brokerPath, brokerCommand, brokerArgs, extensionDir = EXTENSION_DIR, platform = process.platform, intercomDir = INTERCOM_DIR, nodePath = process.execPath, stderrLogPath) {
   if (platform === "win32") {
     let launcherPath = getWindowsHiddenLauncherPath(intercomDir);
     return {
@@ -448,23 +465,20 @@ function getBrokerLaunchSpec(brokerPath, brokerCommand, brokerArgs, extensionDir
       command: "wscript.exe",
       args: [launcherPath],
       launcherPath,
-      launcherCommandLine: getWindowsBrokerCommandLine(brokerPath, extensionDir, nodePath, brokerCommand, brokerArgs)
+      launcherCommandLine: getWindowsBrokerCommandLine(brokerPath, extensionDir, nodePath, brokerCommand, brokerArgs, stderrLogPath)
     };
   }
-  return usesDefaultBrokerCommand(brokerCommand, brokerArgs) ? {
-    kind: "direct",
-    command: nodePath,
-    args: [getTsxCliPath(extensionDir), brokerPath]
-  } : {
+  let argv = defaultBrokerArgv(brokerPath, extensionDir, nodePath, brokerCommand, brokerArgs);
+  return {
     kind: "direct",
-    command: brokerCommand,
-    args: [...brokerArgs, brokerPath]
+    command: argv.command,
+    args: argv.args
   };
 }
-function getBrokerSpawnOptions(extensionDir = EXTENSION_DIR, env = process.env) {
+function getBrokerSpawnOptions(extensionDir = EXTENSION_DIR, env = process.env, stderrFd) {
   return {
     detached: !0,
-    stdio: "ignore",
+    stdio: stderrFd === void 0 ? "ignore" : ["ignore", "ignore", stderrFd],
     cwd: extensionDir,
     env: { ...env, PI_CODING_AGENT_DIR: getAgentDirPath(env), NODE_NO_WARNINGS: "1" },
     windowsHide: !0
@@ -474,7 +488,7 @@ function toError2(error) {
   return error instanceof Error ? error : new Error(String(error));
 }
 async function spawnBrokerIfNeeded(brokerCommand, brokerArgs) {
-  if (ensureIntercomRuntimeDir(INTERCOM_DIR), await isBrokerRunning())
+  if (isNativeSupervisorChannelActive() || (ensureIntercomRuntimeDir(INTERCOM_DIR), await isBrokerRunning()))
     return;
   if (!acquireSpawnLock()) {
     await waitForBroker();
@@ -483,29 +497,43 @@ async function spawnBrokerIfNeeded(brokerCommand, brokerArgs) {
   try {
     if (await isBrokerRunning())
       return;
-    let brokerPath = join2(dirname(fileURLToPath(new URL("../builtin-extensions/pi-intercom/broker/spawn.js", import.meta.url).href)), "broker.ts"), launch = getBrokerLaunchSpec(brokerPath, brokerCommand, brokerArgs);
+    let brokerPath = resolveBrokerScriptPath(), launch = getBrokerLaunchSpec(brokerPath, brokerCommand, brokerArgs, EXTENSION_DIR, process.platform, INTERCOM_DIR, process.execPath, BROKER_STDERR);
     launch.kind === "windows-launcher" && writeWindowsHiddenLauncher(launch.launcherCommandLine, launch.launcherPath);
-    let child = spawn(launch.command, launch.args, getBrokerSpawnOptions());
-    child.unref(), await new Promise((resolve2, reject) => {
-      let cleanup = () => {
-        child.off("error", onError), child.off("exit", onExit);
-      }, onError = (error) => {
-        cleanup(), reject(new Error(`Failed to spawn intercom broker: ${error.message}`, { cause: error }));
-      }, onExit = (code, signal) => {
-        if (!(launch.kind === "windows-launcher" && code === 0 && signal === null)) {
-          if (cleanup(), signal) {
-            reject(new Error(`Intercom broker exited before startup with signal ${signal}`));
-            return;
+    let stderrFd;
+    try {
+      stderrFd = openSync(BROKER_STDERR, "a");
+    } catch {
+      stderrFd = void 0;
+    }
+    try {
+      let child = spawn(launch.command, launch.args, getBrokerSpawnOptions(EXTENSION_DIR, process.env, launch.kind === "windows-launcher" ? void 0 : stderrFd));
+      child.unref(), await new Promise((resolve2, reject) => {
+        let cleanup = () => {
+          child.off("error", onError), child.off("exit", onExit);
+        }, onError = (error) => {
+          cleanup(), reject(new Error(`Failed to spawn intercom broker: ${error.message}`, { cause: error }));
+        }, onExit = (code, signal) => {
+          if (!(launch.kind === "windows-launcher" && code === 0 && signal === null)) {
+            if (cleanup(), signal) {
+              reject(new Error(`Intercom broker exited before startup with signal ${signal}`));
+              return;
+            }
+            reject(new Error(`Intercom broker exited before startup with code ${code ?? "unknown"}`));
           }
-          reject(new Error(`Intercom broker exited before startup with code ${code ?? "unknown"}`));
-        }
-      };
-      child.once("error", onError), child.once("exit", onExit), waitForBroker().then(() => {
-        cleanup(), resolve2();
-      }, (error) => {
-        cleanup(), reject(toError2(error));
+        };
+        child.once("error", onError), child.once("exit", onExit), waitForBroker().then(() => {
+          cleanup(), resolve2();
+        }, (error) => {
+          cleanup(), reject(toError2(error));
+        });
       });
-    });
+    } finally {
+      if (stderrFd !== void 0)
+        try {
+          closeSync(stderrFd);
+        } catch {
+        }
+    }
   } finally {
     releaseSpawnLock();
   }
@@ -1531,8 +1559,9 @@ ${entry.bodyText}`,
   }
   function startSessionRuntime(ctx) {
     let previousClient = client;
-    previousClient && (client = null, previousClient.disconnect().catch(() => {
-    })), shuttingDown = !1, disposed = !1, runtimeStarted = !0, runtimeGeneration += 1, reconnectAttempt = 0, clearReconnectTimer(), clearStartupConnectTimer(), clearNamePollTimer(), clearInboundFlushTimer(), rejectReplyWaiter(new Error("Session replaced")), replyTracker.reset(), pendingIdleMessages.length = 0, runtimeContext = ctx, currentSessionId = ctx.sessionManager.getSessionId(), publishIntercomSessionId(currentSessionId), currentModel = ctx.model?.id ?? "unknown", sessionStartedAt = Date.now(), lastPresenceName = buildPresenceIdentity(pi, currentSessionId).name, agentRunning = !1, activeTools.clear(), startNamePoll();
+    if (previousClient && (client = null, previousClient.disconnect().catch(() => {
+    })), shuttingDown = !1, disposed = !1, runtimeStarted = !0, runtimeGeneration += 1, reconnectAttempt = 0, clearReconnectTimer(), clearStartupConnectTimer(), clearNamePollTimer(), clearInboundFlushTimer(), rejectReplyWaiter(new Error("Session replaced")), replyTracker.reset(), pendingIdleMessages.length = 0, runtimeContext = ctx, currentSessionId = ctx.sessionManager.getSessionId(), publishIntercomSessionId(currentSessionId), currentModel = ctx.model?.id ?? "unknown", sessionStartedAt = Date.now(), lastPresenceName = buildPresenceIdentity(pi, currentSessionId).name, agentRunning = !1, activeTools.clear(), startNamePoll(), isNativeSupervisorChannelActive())
+      return;
     let startupGeneration = runtimeGeneration;
     startupConnectTimer = setTimeout(() => {
       startupConnectTimer = null, getLiveContext(ctx, startupGeneration) && ensureConnected("startup").catch(() => {
@@ -1547,50 +1576,41 @@ ${entry.bodyText}`,
       ...error ? { error: getErrorMessage(error) } : {}
     });
   }
+  let resultDeliveries = /* @__PURE__ */ new Map(), acknowledgedResults = [];
   function relaySubagentIntercomPayload(payload, options) {
     let parsed = parseSubagentIntercomPayload(payload);
     if (!parsed)
       return;
-    let relayGeneration = runtimeGeneration;
-    (async () => {
+    let relayGeneration = runtimeGeneration, key = options.acknowledge && parsed.requestId ? `${relayGeneration}:${parsed.requestId}` : void 0, delivery = key ? resultDeliveries.get(key) : void 0;
+    delivery || (delivery = (async () => {
       let relayStillLive = () => !runtimeStarted || !!getLiveContext(runtimeContext, relayGeneration);
-      if (!relayStillLive())
-        return;
-      if (currentSessionTargetMatches(parsed.to)) {
-        deliverLocalSubagentRelayMessage(options.sender, options.status, parsed.message), options.acknowledge && emitResultDelivery(parsed.requestId, !0);
-        return;
-      }
-      let activeClient, target;
       try {
-        activeClient = await ensureConnected("background"), target = await resolveSessionTarget(activeClient, parsed.to) ?? parsed.to;
-      } catch (error) {
         if (!relayStillLive())
-          return;
-        recordSubagentDeliveryError(options.errorEntryType, parsed.to, parsed.message, error), options.acknowledge && emitResultDelivery(parsed.requestId, !1, error);
-        return;
+          return !1;
+        if (currentSessionTargetMatches(parsed.to))
+          return deliverLocalSubagentRelayMessage(options.sender, options.status, parsed.message), !0;
+        let activeClient = await ensureConnected("background"), target = await resolveSessionTarget(activeClient, parsed.to) ?? parsed.to;
+        if (!relayStillLive())
+          return !1;
+        if (currentSessionTargetMatches(parsed.to, target, activeClient))
+          return deliverLocalSubagentRelayMessage(options.sender, options.status, parsed.message), !0;
+        let result = await activeClient.send(target, { text: parsed.message });
+        if (!result.delivered)
+          throw new Error(result.reason ?? "Session may not exist or has disconnected.");
+        return !0;
+      } catch (error) {
+        return relayStillLive() && recordSubagentDeliveryError(options.errorEntryType, parsed.to, parsed.message, error), !1;
       }
-      if (relayStillLive()) {
-        if (currentSessionTargetMatches(parsed.to, target, activeClient)) {
-          deliverLocalSubagentRelayMessage(options.sender, options.status, parsed.message), options.acknowledge && emitResultDelivery(parsed.requestId, !0);
-          return;
-        }
-        try {
-          let result = await activeClient.send(target, { text: parsed.message });
-          if (!relayStillLive())
-            return;
-          if (!result.delivered) {
-            let error = new Error(result.reason ?? "Session may not exist or has disconnected.");
-            recordSubagentDeliveryError(options.errorEntryType, parsed.to, parsed.message, error), options.acknowledge && emitResultDelivery(parsed.requestId, !1, error);
-            return;
-          }
-          options.acknowledge && emitResultDelivery(parsed.requestId, !0);
-        } catch (error) {
-          if (!relayStillLive())
-            return;
-          recordSubagentDeliveryError(options.errorEntryType, parsed.to, parsed.message, error), options.acknowledge && emitResultDelivery(parsed.requestId, !1, error);
-        }
+    })(), key && (resultDeliveries.set(key, delivery), delivery.then((delivered) => {
+      if (!delivered) {
+        resultDeliveries.get(key) === delivery && resultDeliveries.delete(key);
+        return;
       }
-    })();
+      for (acknowledgedResults.push(key); acknowledgedResults.length > 1024; )
+        resultDeliveries.delete(acknowledgedResults.shift());
+    }))), delivery.then((delivered) => {
+      options.acknowledge && emitResultDelivery(parsed.requestId, delivered);
+    });
   }
   let unsubscribeSubagentControlIntercom = pi.events.on(SUBAGENT_CONTROL_INTERCOM_EVENT, (payload) => {
     relaySubagentIntercomPayload(payload, {
@@ -1649,8 +1669,8 @@ ${entry.bodyText}`,
     if (details.error === !0 || details.delivered === !1)
       return { isError: !0 };
   });
-  let childOrchestratorMetadata = readChildOrchestratorMetadata();
-  childOrchestratorMetadata && pi.registerTool({
+  let childOrchestratorMetadata = readChildOrchestratorMetadata(), nativeSupervisorChannel = isNativeSupervisorChannelActive();
+  childOrchestratorMetadata && !nativeSupervisorChannel && pi.registerTool({
     name: "contact_supervisor",
     label: "Contact Supervisor",
     description: "Subagent-only tool for contacting the supervisor agent that delegated this task. Use need_decision when blocked, uncertain, needing approval, or facing a product/API/scope decision before continuing; this waits for the supervisor's reply. Use interview_request when multiple structured questions need supervisor answers; this also waits for a reply. Use progress_update only for meaningful progress or unexpected discoveries that change the plan; this does not wait for a reply. Do not use for routine completion handoffs.",
@@ -1847,7 +1867,7 @@ ${replyText}${replyAttachments}` }],
       return text += theme.fg(failed ? "error" : "text", textContent), parseWarning && (text += `
 ` + theme.fg("warning", `Structured reply parse issue: ${details.structuredReplyParseError}`)), new Text(text, 0, 0);
     }
-  }), pi.registerTool({
+  }), nativeSupervisorChannel || pi.registerTool({
     name: "intercom",
     label: "Intercom",
     description: `Send a message to another pi session running on this machine.