@ashx-j/lunr-dev 0.2.19-dev.10.1 → 0.2.21-dev.12.1

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

@@ -389,16 +389,14 @@ 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 { setTimeout as sleep } from "node:timers/promises";
+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");
-function sleep(ms) {
-  return new Promise((resolve2) => setTimeout(resolve2, ms));
-}
+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 getTsxCliPath(extensionDir = EXTENSION_DIR) {
   try {
     let tsxMain = createRequire(new URL("../builtin-extensions/pi-intercom/broker/spawn.js", import.meta.url).href).resolve("tsx");
@@ -407,6 +405,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,14 +424,22 @@ 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 [
     'Set WshShell = CreateObject("WScript.Shell")',
-    `WshShell.Run "${commandLine.replace(/"/g, '""')}", 0, False`,
+    `exitCode = WshShell.Run("${commandLine.replace(/"/g, '""')}", 0, True)`,
     "Set WshShell = Nothing",
+    "WScript.Quit exitCode",
     ""
   ].join(`\r
 `);
@@ -440,31 +456,28 @@ 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 {
       kind: "windows-launcher",
       command: "wscript.exe",
-      args: [launcherPath],
+      args: ["//B", "//NoLogo", 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,40 +487,53 @@ function toError2(error) {
   return error instanceof Error ? error : new Error(String(error));
 }
 async function spawnBrokerIfNeeded(brokerCommand, brokerArgs) {
-  if (ensureIntercomRuntimeDir(INTERCOM_DIR), await isBrokerRunning())
-    return;
-  if (!acquireSpawnLock()) {
-    await waitForBroker();
+  if (isNativeSupervisorChannelActive() || (ensureIntercomRuntimeDir(INTERCOM_DIR), await isBrokerRunning()))
     return;
-  }
+  let ownsLock = acquireSpawnLock();
   try {
+    if (!ownsLock) {
+      await waitForBroker();
+      return;
+    }
     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)) {
+    let stderrFd;
+    launch.kind === "windows-launcher" ? writeFileSync(BROKER_STDERR, "", { mode: INTERCOM_RUNTIME_FILE_MODE }) : stderrFd = openSync(BROKER_STDERR, "w", INTERCOM_RUNTIME_FILE_MODE);
+    try {
+      let child = spawn(launch.command, launch.args, getBrokerSpawnOptions(EXTENSION_DIR, process.env, stderrFd));
+      child.unref(), await new Promise((resolve2, reject) => {
+        let healthCheck = new AbortController(), cleanup = () => {
+          healthCheck.abort(), child.off("error", onError), child.off("exit", onExit), launch.kind === "windows-launcher" && child.pid && child.exitCode === null && child.signalCode === null && child.kill();
+        }, onError = (error) => {
+          cleanup(), reject(new Error(`Failed to spawn intercom broker: ${error.message}`, { cause: error }));
+        }, onExit = (code, signal) => {
           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"}`));
-        }
-      };
-      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(5e3, healthCheck.signal).then(() => {
+          cleanup(), resolve2();
+        }, (error) => {
+          cleanup(), reject(toError2(error));
+        });
       });
-    });
+    } finally {
+      if (stderrFd !== void 0)
+        try {
+          closeSync(stderrFd);
+        } catch {
+        }
+    }
+  } catch (error) {
+    let cause = toError2(error);
+    throw new Error(`${cause.message}
+Startup log: ${BROKER_STDERR}`, { cause });
   } finally {
-    releaseSpawnLock();
+    ownsLock && releaseSpawnLock();
   }
 }
 async function isBrokerRunning() {
@@ -599,12 +625,12 @@ function releaseSpawnLock() {
   } catch {
   }
 }
-async function waitForBroker(timeoutMs = 5e3) {
+async function waitForBroker(timeoutMs = 5e3, signal) {
   let start = Date.now();
   for (; Date.now() - start < timeoutMs; ) {
-    if (await checkSocketConnectable())
+    if (signal?.throwIfAborted(), await checkSocketConnectable())
       return;
-    await sleep(100);
+    await sleep(100, void 0, { signal });
   }
   throw new Error("Broker failed to start within timeout");
 }
@@ -1191,8 +1217,8 @@ function parseSubagentIntercomPayload(payload) {
   let record = payload;
   if (typeof record.to != "string" || typeof record.message != "string")
     return null;
-  let requestId = typeof record.requestId == "string" ? record.requestId : void 0;
-  return { to: record.to, message: record.message, ...requestId ? { requestId } : {} };
+  let requestId = typeof record.requestId == "string" ? record.requestId : void 0, ownerNotificationSessionId = typeof record.ownerNotificationSessionId == "string" ? record.ownerNotificationSessionId : void 0;
+  return { to: record.to, message: record.message, ...requestId ? { requestId } : {}, ...ownerNotificationSessionId ? { ownerNotificationSessionId } : {} };
 }
 function resolveIntercomPresenceName(sessionName, sessionId) {
   let trimmedName = sessionName?.trim();
@@ -1531,8 +1557,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 +1574,44 @@ ${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, deliverLocal = () => {
+      let ctx = getLiveContext(runtimeContext, relayGeneration), ownerSessionId = ctx?.sessionManager.getSessionFile?.() ?? ctx?.sessionManager.getSessionId();
+      options.sender === "subagent-result" && ownerSessionId && parsed.ownerNotificationSessionId === ownerSessionId || deliverLocalSubagentRelayMessage(options.sender, options.status, parsed.message);
+    }, 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 deliverLocal(), !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 deliverLocal(), !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 +1670,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 +1868,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.

package/dist/node-runtime/{pi-mcp-adapter-DPTJGAAL.js → pi-mcp-adapter-JLB5YL2F.js}

@@ -11,9 +11,9 @@ import {
   resolveDirectTools,
   throwIfAborted,
   truncateAtWord
-} from "./chunk-EHMBW7FA.js";
-import "./chunk-ARC4KOTI.js";
+} from "./chunk-VSELYKWU.js";
 import "./chunk-4HXHDDCF.js";
+import "./chunk-ARC4KOTI.js";
 import "./chunk-BRJX2PRC.js";
 
 // packages/coding-agent/dist/builtin-extensions/pi-mcp-adapter/index.js
@@ -121,11 +121,11 @@ function mcpAdapter(pi) {
   function loadHeavyModules() {
     return heavyModules ? Promise.resolve(heavyModules) : (heavyModulesPromise || (heavyModulesPromise = (async () => {
       let [init, authFlow, commands, proxyModes, directToolExecutor] = await Promise.all([
-        import("./init-EKE277AG.js"),
+        import("./init-DVJUAOUO.js"),
         import("./mcp-auth-flow-YL6RWPYG.js"),
-        import("./commands-LGR5VT5X.js"),
-        import("./proxy-modes-R64LU6WZ.js"),
-        import("./direct-tool-executor-TDJS7TBD.js")
+        import("./commands-BZGSLIP7.js"),
+        import("./proxy-modes-OR7ISBXK.js"),
+        import("./direct-tool-executor-BSZDHIYR.js")
       ]), loaded = { init, authFlow, commands, proxyModes, directToolExecutor };
       return heavyModules = loaded, loaded;
     })().catch((error) => {