@ashx-j/lunr 0.2.20 → 0.2.21

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

@@ -389,6 +389,7 @@ var IntercomClient = class extends EventEmitter {
 
 // packages/coding-agent/dist/builtin-extensions/pi-intercom/broker/spawn.js
 import { spawn } from "child_process";
+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";
@@ -396,9 +397,6 @@ 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"), 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));
-}
 function getTsxCliPath(extensionDir = EXTENSION_DIR) {
   try {
     let tsxMain = createRequire(new URL("../builtin-extensions/pi-intercom/broker/spawn.js", import.meta.url).href).resolve("tsx");
@@ -439,8 +437,9 @@ function getWindowsBrokerCommandLine(brokerPath, extensionDir = EXTENSION_DIR, n
 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
 `);
@@ -463,7 +462,7 @@ function getBrokerLaunchSpec(brokerPath, brokerCommand, brokerArgs, extensionDir
     return {
       kind: "windows-launcher",
       command: "wscript.exe",
-      args: [launcherPath],
+      args: ["//B", "//NoLogo", launcherPath],
       launcherPath,
       launcherCommandLine: getWindowsBrokerCommandLine(brokerPath, extensionDir, nodePath, brokerCommand, brokerArgs, stderrLogPath)
     };
@@ -490,38 +489,33 @@ function toError2(error) {
 async function spawnBrokerIfNeeded(brokerCommand, brokerArgs) {
   if (isNativeSupervisorChannelActive() || (ensureIntercomRuntimeDir(INTERCOM_DIR), await isBrokerRunning()))
     return;
-  if (!acquireSpawnLock()) {
-    await waitForBroker();
-    return;
-  }
+  let ownsLock = acquireSpawnLock();
   try {
+    if (!ownsLock) {
+      await waitForBroker();
+      return;
+    }
     if (await isBrokerRunning())
       return;
     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 stderrFd;
+    launch.kind === "windows-launcher" ? writeFileSync(BROKER_STDERR, "", { mode: INTERCOM_RUNTIME_FILE_MODE }) : stderrFd = openSync(BROKER_STDERR, "w", INTERCOM_RUNTIME_FILE_MODE);
     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));
+      let child = spawn(launch.command, launch.args, getBrokerSpawnOptions(EXTENSION_DIR, process.env, stderrFd));
       child.unref(), await new Promise((resolve2, reject) => {
-        let cleanup = () => {
-          child.off("error", onError), child.off("exit", onExit);
+        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 (!(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"}`));
+          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(() => {
+        child.once("error", onError), child.once("exit", onExit), waitForBroker(5e3, healthCheck.signal).then(() => {
           cleanup(), resolve2();
         }, (error) => {
           cleanup(), reject(toError2(error));
@@ -534,8 +528,12 @@ async function spawnBrokerIfNeeded(brokerCommand, brokerArgs) {
         } catch {
         }
     }
+  } catch (error) {
+    let cause = toError2(error);
+    throw new Error(`${cause.message}
+Startup log: ${BROKER_STDERR}`, { cause });
   } finally {
-    releaseSpawnLock();
+    ownsLock && releaseSpawnLock();
   }
 }
 async function isBrokerRunning() {
@@ -627,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");
 }
@@ -1219,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();
@@ -1581,19 +1579,22 @@ ${entry.bodyText}`,
     let parsed = parseSubagentIntercomPayload(payload);
     if (!parsed)
       return;
-    let relayGeneration = runtimeGeneration, key = options.acknowledge && parsed.requestId ? `${relayGeneration}:${parsed.requestId}` : void 0, delivery = key ? resultDeliveries.get(key) : void 0;
+    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);
       try {
         if (!relayStillLive())
           return !1;
         if (currentSessionTargetMatches(parsed.to))
-          return deliverLocalSubagentRelayMessage(options.sender, options.status, parsed.message), !0;
+          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 deliverLocalSubagentRelayMessage(options.sender, options.status, parsed.message), !0;
+          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.");