@ashx-j/lunr 0.2.26 → 0.2.28

package/dist/node-runtime/{pi-subagents-7IBSSGEW.js → pi-subagents-QPU3OXE4.js}

@@ -24,7 +24,6 @@ import {
   SUBAGENT_CONTROL_MESSAGE_TYPE,
   SUBAGENT_FANOUT_CHILD_ENV,
   SUBAGENT_FOREGROUND_COMPLETE_EVENT,
-  SUBAGENT_PARENT_SESSION_ENV,
   SUBAGENT_RESULT_INTERCOM_EVENT,
   SUBAGENT_STEERING_NOTICE_EVENT,
   SUPERVISOR_PROGRESS_TYPE,
@@ -77,7 +76,6 @@ import {
   resolveAsyncRunLocation,
   resolveCommunicationPeer,
   resolveCurrentSessionId,
-  resolveSubagentRequestParams,
   resolveSubagentResultStatus,
   resolveSubagentRunId,
   resolveTurnBudgetConfig,
@@ -94,47 +92,56 @@ import {
   validateExecutionAcceptance,
   validateToolBudgetConfig,
   writeAtomicJson
-} from "./chunk-2CFDTH5B.js";
+} from "./chunk-RLGY2QIL.js";
 import {
+  controlNotificationKey,
   formatControlNoticeMessage
 } from "./chunk-OAR4TYZE.js";
 import {
   getSubagentSpinnerDefinition
 } from "./chunk-US544NN6.js";
 import "./chunk-5ZH3ZFIZ.js";
-import "./chunk-PTFBPO3C.js";
-import "./chunk-YWOJIGFY.js";
+import "./chunk-ZEVFBFNF.js";
+import "./chunk-YSB6URMT.js";
+import "./chunk-6ZZHGUSA.js";
 import "./chunk-53YJI7JU.js";
-import "./chunk-5ZQXRPMC.js";
-import "./chunk-XHIRAZ26.js";
-import "./chunk-5Q4A37RB.js";
+import "./chunk-IAZSK7KK.js";
+import "./chunk-TCT6PCUR.js";
 import {
   subagentCommunicationEnabled
-} from "./chunk-I74LN5JG.js";
-import "./chunk-UOEDI7RP.js";
-import "./chunk-2HMIRK7W.js";
+} from "./chunk-HUD2RFJW.js";
+import "./chunk-4KNKQGHM.js";
+import "./chunk-LHV3V67B.js";
 import "./chunk-URD2SLIT.js";
 import {
   createSubagentCancellation,
   registerSubagentCancellation
 } from "./chunk-BBUVIEZB.js";
-import "./chunk-WIF24I7G.js";
-import "./chunk-M3LZLQW2.js";
+import {
+  resolveSubagentRequestParams
+} from "./chunk-APVM5NEU.js";
+import "./chunk-F2V2F4ZG.js";
+import "./chunk-BDRGN3L2.js";
 import "./chunk-FY4A63RK.js";
-import "./chunk-KKUTQQV7.js";
-import "./chunk-CSFI6YXL.js";
+import "./chunk-RYRGL7P4.js";
+import "./chunk-ES6PBSIE.js";
 import "./chunk-FVDOXRUD.js";
 import "./chunk-UJOCPOMX.js";
 import "./chunk-IMLCWLPI.js";
 import "./chunk-RQ2Q5IYR.js";
-import "./chunk-B4HP6ZWM.js";
+import {
+  collectChildUsage,
+  collectUsageRequests,
+  totalRequestUsage
+} from "./chunk-SWWHZ2RI.js";
+import "./chunk-RHCGYWO7.js";
 import {
   keyText
-} from "./chunk-GS42T6MX.js";
+} from "./chunk-QW3AAHWN.js";
 import {
   getMarkdownTheme
-} from "./chunk-RDDAZOMU.js";
-import "./chunk-FQMM2EZ2.js";
+} from "./chunk-JL4HYQXK.js";
+import "./chunk-64XTQNLA.js";
 import "./chunk-Q4Q6D4IY.js";
 import "./chunk-BRJX2PRC.js";
 
@@ -290,7 +297,7 @@ function usageTokenTotal(usage) {
 function compactResultTokens(result2) {
   let progress = result2.progress || result2.progressSummary;
   if (progress && progress.tokens > 0)
-    return progress.tokens;
+    return Math.max(progress.tokens, usageTokenTotal(result2.usage));
   let fromUsage = usageTokenTotal(result2.usage);
   return fromUsage > 0 ? fromUsage : progress?.tokens ?? 0;
 }
@@ -738,7 +745,7 @@ function buildWidgetLines(jobs, theme, width = getTermWidth(), expanded = !1, no
   }
   return lines;
 }
-var activeWidget, SubagentAsyncWidget = class {
+var activeWidgets = /* @__PURE__ */ new Map(), SubagentAsyncWidget = class {
   jobs;
   expanded;
   theme;
@@ -781,7 +788,9 @@ var activeWidget, SubagentAsyncWidget = class {
     this.cachedWidth = void 0, this.cachedLines = void 0;
   }
   dispose() {
-    this.disposed = !0, this.stopTimer(), activeWidget === this && (activeWidget = void 0);
+    this.disposed = !0, this.stopTimer();
+    for (let [owner, widget] of activeWidgets)
+      widget === this && activeWidgets.delete(owner);
   }
   render(width) {
     let theme = this.theme;
@@ -796,23 +805,29 @@ var activeWidget, SubagentAsyncWidget = class {
     return this.cachedWidth = width, this.cachedLines = padded, padded;
   }
 };
-function disposeSubagentWidget() {
-  activeWidget?.dispose(), activeWidget = void 0;
+function disposeSubagentWidget(ctx) {
+  if (ctx) {
+    activeWidgets.get(ctx.ui)?.dispose(), activeWidgets.delete(ctx.ui);
+    return;
+  }
+  for (let widget of activeWidgets.values())
+    widget.dispose();
+  activeWidgets.clear();
 }
 function renderWidget(ctx, jobs) {
   if (jobs.length === 0) {
-    resetWidgetLayoutSession(), disposeSubagentWidget(), ctx.hasUI && ctx.ui.setWidget(WIDGET_KEY, void 0);
+    resetWidgetLayoutSession(), disposeSubagentWidget(ctx), ctx.hasUI && ctx.ui.setWidget(WIDGET_KEY, void 0);
     return;
   }
   if (!ctx.hasUI)
     return;
-  let expanded = ctx.ui.getToolsExpanded?.() ?? !1, requestRender = () => ctx.ui.requestRender?.();
+  let expanded = ctx.ui.getToolsExpanded?.() ?? !1, requestRender = () => ctx.ui.requestRender?.(), activeWidget = activeWidgets.get(ctx.ui);
   if (activeWidget) {
     activeWidget.setJobs(jobs), activeWidget.setExpanded(expanded), activeWidget.setRequestRender(requestRender), ctx.ui.requestRender?.();
     return;
   }
   let widget = new SubagentAsyncWidget(jobs, void 0, { expanded, requestRender });
-  activeWidget = widget, ctx.ui.setWidget(WIDGET_KEY, (_tui, theme) => (widget.setTheme(theme), widget));
+  activeWidgets.set(ctx.ui, widget), ctx.ui.setWidget(WIDGET_KEY, (_tui, theme) => (widget.setTheme(theme), widget));
 }
 function compactResultTerminalStatus(result2) {
   if (result2.stopped)
@@ -1866,18 +1881,20 @@ ${baseOutput}` : ""}` : output, sessionPath = result2.sessionFile ?? (resultChil
     if (!state.watcher) {
       state.watcherRestartTimer && (timers.clearTimeout(state.watcherRestartTimer), timers.clearInterval(state.watcherRestartTimer), state.watcherRestartTimer = null);
       try {
-        let watchDir = resolveWatchPath(resultsDir, fsApi.realpathSync.native);
-        state.watcher = fsApi.watch(watchDir, (ev, file) => {
-          if (ev !== "rename" || !file)
+        let watchDir = resolveWatchPath(resultsDir, fsApi.realpathSync.native), watcher = fsApi.watch(watchDir, (ev, file) => {
+          if (state.watcher !== watcher || ev !== "rename" || !file)
             return;
           let fileName = file.toString();
           fileName.endsWith(".json") && state.resultFileCoalescer.schedule(fileName);
-        }), state.watcher.on("error", (error) => {
-          if (shouldFallBackToPolling(error)) {
-            startPollingFallback(error);
-            return;
+        });
+        state.watcher = watcher, watcher.on("error", (error) => {
+          if (state.watcher === watcher) {
+            if (shouldFallBackToPolling(error)) {
+              startPollingFallback(error);
+              return;
+            }
+            report(`Subagent result watcher failed for '${resultsDir}':`, error), state.watcher?.close(), state.watcher = null, scheduleRestart();
           }
-          report(`Subagent result watcher failed for '${resultsDir}':`, error), state.watcher?.close(), state.watcher = null, scheduleRestart();
         }), state.watcher.unref?.();
       } catch (error) {
         if (shouldFallBackToPolling(error)) {
@@ -2308,6 +2325,7 @@ function parseFrontmatter(content) {
 // packages/coding-agent/dist/builtin-extensions/pi-subagents/src/slash/prompt-workflows.js
 var RESERVED_COMMAND_NAMES = /* @__PURE__ */ new Set([
   "chain-prompts",
+  "chain-workflows",
   "prompt-workflow",
   "run",
   "chain",
@@ -2531,8 +2549,8 @@ function registerPromptWorkflowCommands(input) {
         ctx.ui.notify(error instanceof Error ? error.message : String(error), "error");
       }
     }
-  }), pi.registerCommand("chain-prompts", {
-    description: "Run prompt templates as a native subagent chain: /chain-prompts analyze -> fix -- args",
+  }), pi.registerCommand("chain-workflows", {
+    description: "Run prompt workflows as a native subagent chain: /chain-workflows analyze -> fix -- args",
     handler: async (rawArgs, ctx) => {
       let { declaration, argsText } = splitChainDeclaration(rawArgs), workflows = discoverPromptWorkflows(ctx.cwd);
       if (!declaration || declaration === "list") {
@@ -2541,7 +2559,7 @@ function registerPromptWorkflowCommands(input) {
       }
       let runtime = parseRuntimeOptions(shellWords(argsText)), names = splitPromptChain(declaration);
       if (names.length === 0) {
-        ctx.ui.notify("Usage: /chain-prompts prompt-a -> prompt-b -- args", "error");
+        ctx.ui.notify("Usage: /chain-workflows prompt-a -> prompt-b -- args", "error");
         return;
       }
       try {
@@ -3242,49 +3260,10 @@ var SubagentsStopSelector = class {
   }
 };
 function emptyUsage() {
-  return { input: 0, output: 0, cacheRead: 0, cacheWrite: 0, cost: 0, turns: 0 };
+  return { input: 0, output: 0, cacheRead: 0, cacheWrite: 0, cost: 0, turns: 0, unknownRequests: 0, partialRequests: 0, unknownCosts: 0 };
 }
 function addUsage(target, source) {
-  target.input += source.input, target.output += source.output, target.cacheRead += source.cacheRead, target.cacheWrite += source.cacheWrite, target.cost += source.cost, target.turns += source.turns;
-}
-function usageHasValue(usage) {
-  return usage.input !== 0 || usage.output !== 0 || usage.cacheRead !== 0 || usage.cacheWrite !== 0 || usage.cost !== 0 || usage.turns !== 0;
-}
-function assistantUsageFromMessage(message) {
-  if (!message || typeof message != "object")
-    return;
-  let msg = message;
-  if (msg.role !== "assistant" || !msg.usage || typeof msg.usage != "object")
-    return;
-  let usage = msg.usage;
-  return {
-    input: typeof usage.input == "number" ? usage.input : 0,
-    output: typeof usage.output == "number" ? usage.output : 0,
-    cacheRead: typeof usage.cacheRead == "number" ? usage.cacheRead : 0,
-    cacheWrite: typeof usage.cacheWrite == "number" ? usage.cacheWrite : 0,
-    cost: typeof usage.cost?.total == "number" ? usage.cost.total : 0,
-    turns: 1
-  };
-}
-function isSubagentDetails(value) {
-  if (!value || typeof value != "object")
-    return !1;
-  let details = value;
-  return typeof details.mode == "string" && Array.isArray(details.results);
-}
-function detailsFromSessionEntry(entry) {
-  if (!entry || typeof entry != "object")
-    return;
-  let record = entry;
-  if (record.type === "custom_message" && record.customType === SLASH_RESULT_TYPE) {
-    let details = resolveSlashMessageDetails(record.details)?.result.details;
-    return isSubagentDetails(details) ? details : void 0;
-  }
-  if (record.type !== "message" || !record.message || typeof record.message != "object")
-    return;
-  let message = record.message;
-  if (!(message.role !== "toolResult" || message.toolName !== "subagent"))
-    return isSubagentDetails(message.details) ? message.details : void 0;
+  target.input += source.input, target.output += source.output, target.cacheRead += source.cacheRead, target.cacheWrite += source.cacheWrite, target.cost += source.cost, target.turns += source.turns, target.unknownRequests += source.unknownRequests ?? 0, target.partialRequests += source.partialRequests ?? 0, target.unknownCosts += source.unknownCosts ?? 0;
 }
 function formatCostUsage(label, usage) {
   let extras = [
@@ -3292,26 +3271,13 @@ function formatCostUsage(label, usage) {
     usage.cacheWrite ? `cache write ${formatTokens(usage.cacheWrite)}` : "",
     usage.turns ? `${usage.turns} turn${usage.turns === 1 ? "" : "s"}` : ""
   ].filter(Boolean);
-  return `${label}: \u2191${formatTokens(usage.input)} \u2193${formatTokens(usage.output)} $${usage.cost.toFixed(4)}${extras.length ? ` (${extras.join(", ")})` : ""}`;
+  return `${label}: \u2191${formatTokens(usage.input + usage.cacheRead + usage.cacheWrite)} \u2193${formatTokens(usage.output)} $${usage.cost.toFixed(4)}${extras.length ? ` (${extras.join(", ")})` : ""}`;
 }
 function buildSubagentCostReport(ctx) {
-  let parent = emptyUsage(), childTotal = emptyUsage(), total = emptyUsage(), children = [];
-  for (let entry of ctx.sessionManager.getBranch()) {
-    let message = entry.type === "message" ? entry.message : void 0, parentUsage = assistantUsageFromMessage(message);
-    parentUsage && addUsage(parent, parentUsage);
-    let details = detailsFromSessionEntry(entry);
-    if (details)
-      for (let result2 of details.results) {
-        if (!usageHasValue(result2.usage))
-          continue;
-        let usage = { ...result2.usage };
-        children.push({
-          label: `Child ${children.length + 1} (${result2.agent})`,
-          usage,
-          ...result2.sessionFile ? { sessionFile: result2.sessionFile } : {}
-        }), addUsage(childTotal, usage);
-      }
-  }
+  let parent = emptyUsage(), childTotal = emptyUsage(), total = emptyUsage(), children = [], entries = ctx.sessionManager.getEntries(), parentTotals = totalRequestUsage(collectUsageRequests(entries));
+  Object.assign(parent, { ...parentTotals, turns: collectUsageRequests(entries).length });
+  for (let child of collectChildUsage(entries))
+    children.push({ label: `Child ${children.length + 1} (${child.label})`, usage: child, sessionFile: child.sessionFile }), addUsage(childTotal, child);
   addUsage(total, parent), addUsage(total, childTotal);
   let lines = [
     "Subagent cost",
@@ -6191,7 +6157,8 @@ function sendCompletion(pi, details) {
   pi.sendMessage({
     customType: "subagent-notify",
     content,
-    display: !0
+    display: !0,
+    details: { children: details.flatMap((detail) => detail.children ?? []) }
   }, { triggerTurn: details.some((detail) => detail.status !== "stopped") });
 }
 function completionBatchKey(result2) {
@@ -6206,6 +6173,7 @@ function buildCompletionDetails(result2) {
   return {
     agent,
     status,
+    children: result2.results?.map((child, index) => ({ ...child, childId: child.childId ?? `${result2.id}:${index}` })),
     ...result2.source ? { source: result2.source } : {},
     ...taskInfo ? { taskInfo } : {},
     resultPreview: [
@@ -6239,31 +6207,13 @@ ${JSON.stringify(report, null, 2)}
   };
 }
 function registerSubagentNotify(pi, state, options = {}) {
-  let unsubscribeStoreKey = "__pi_subagents_notify_unsubscribe__", batcherStoreKey = "__pi_subagents_notify_batcher__", globalStore = globalThis, previousUnsubscribe = globalStore[unsubscribeStoreKey];
-  if (typeof previousUnsubscribe == "function")
-    try {
-      previousUnsubscribe();
-    } catch {
-    }
-  let previousBatcher = globalStore[batcherStoreKey];
-  if (previousBatcher && typeof previousBatcher.dispose == "function")
-    try {
-      previousBatcher.dispose();
-    } catch {
-    }
-  let seen = getGlobalSeenMap("__pi_subagents_notify_seen__"), ttlMs = 600 * 1e3, nowFn = options.now ?? Date.now, batchConfig = resolveCompletionBatchConfig(options.batchConfig), batchers = /* @__PURE__ */ new Map();
-  globalStore[batcherStoreKey] = {
-    dispose() {
-      for (let batcher of batchers.values())
-        batcher.dispose();
-      batchers.clear();
-    }
-  };
-  let handleComplete = (data) => {
+  let disposed = !1, seen = getGlobalSeenMap("__pi_subagents_notify_seen__"), ttlMs = 600 * 1e3, nowFn = options.now ?? Date.now, batchConfig = resolveCompletionBatchConfig(options.batchConfig), batchers = /* @__PURE__ */ new Map(), handleComplete = (data) => {
+    if (disposed)
+      return;
     let result2 = data;
     if (typeof result2.sessionId != "string" || result2.sessionId !== state.currentSessionId)
       return;
-    let now = nowFn(), key = buildCompletionKey(result2, "notify");
+    let now = nowFn(), key = `${result2.sessionId}:${buildCompletionKey(result2, "notify")}`;
     if (markSeenWithTtl(seen, key, now, ttlMs))
       return;
     let details = buildCompletionDetails(result2);
@@ -6274,7 +6224,9 @@ function registerSubagentNotify(pi, state, options = {}) {
     let batchKey = completionBatchKey(result2), batcher = batchers.get(batchKey);
     if (batcher || (batcher = createCompletionBatcher({
       config: batchConfig,
-      emit: (items) => sendCompletion(pi, items),
+      emit: (items) => {
+        !disposed && result2.sessionId === state.currentSessionId && sendCompletion(pi, items);
+      },
       ...options.timers ? { timers: options.timers } : {},
       now: nowFn
     }), batchers.set(batchKey, batcher)), details.status !== "completed") {
@@ -6286,9 +6238,15 @@ function registerSubagentNotify(pi, state, options = {}) {
     pi.events.on(SUBAGENT_ASYNC_COMPLETE_EVENT, handleComplete),
     pi.events.on(SUBAGENT_FOREGROUND_COMPLETE_EVENT, handleComplete)
   ].filter((unsubscribe) => typeof unsubscribe == "function");
-  globalStore[unsubscribeStoreKey] = () => {
-    for (let unsubscribe of unsubscribers)
-      unsubscribe();
+  return () => {
+    if (!disposed) {
+      disposed = !0;
+      for (let batcher of batchers.values())
+        batcher.dispose();
+      batchers.clear();
+      for (let unsubscribe of unsubscribers)
+        unsubscribe();
+    }
   };
 }
 
@@ -6639,12 +6597,6 @@ function createSlashResultComponent(details, options, theme) {
 function registerSubagentExtension(pi) {
   if (process.env[SUBAGENT_CHILD_ENV] === "1")
     return;
-  let globalStore = globalThis, runtimeCleanupStoreKey = "__piSubagentRuntimeCleanup", previousRuntimeCleanup = globalStore[runtimeCleanupStoreKey];
-  if (typeof previousRuntimeCleanup == "function")
-    try {
-      previousRuntimeCleanup();
-    } catch {
-    }
   ensureAccessibleDir(RESULTS_DIR), ensureAccessibleDir(ASYNC_DIR), cleanupOldChainDirs();
   let config = normalizeAsyncLaunchConfig(loadConfig()), waitToolConfig = resolveWaitToolConfig(config.waitTool), tempArtifactsDir = getArtifactsDir(null);
   cleanupAllArtifactDirs(DEFAULT_ARTIFACT_CONFIG.cleanupDays);
@@ -6671,13 +6623,7 @@ function registerSubagentExtension(pi) {
       clear: () => {
       }
     }
-  }, supervisorChannel = createNativeSupervisorChannel(pi, state), mainWatchdog = registerMainWatchdog(pi), { startResultWatcher, primeExistingResults, stopResultWatcher } = createResultWatcher(pi, state, RESULTS_DIR, 600 * 1e3);
-  startResultWatcher(), primeExistingResults();
-  let generation = 0, executorPromise, pendingLaunches = /* @__PURE__ */ new Set(), pendingAsyncLaunches = /* @__PURE__ */ new Set(), unregisterCancellation, runtimeCleanup = () => {
-    generation++, supervisorChannel.cancelOwnedQuestions("parent runtime replaced"), state.sessionGeneration = (state.sessionGeneration ?? 0) + 1, executorPromise = void 0, pendingLaunches.clear(), pendingAsyncLaunches.clear(), unregisterCancellation?.(), mainWatchdog.dispose(), stopResultWatcher(), scheduledRunManager.stop(), supervisorChannel.dispose(), clearPendingForegroundControlNotices(state), disposeSubagentWidget(), state.poller && (clearInterval(state.poller), state.poller = null);
-  };
-  globalStore[runtimeCleanupStoreKey] = runtimeCleanup;
-  let { ensurePoller, refreshWidget, handleStarted, handleComplete: trackComplete, resetJobs, restoreActiveJobs } = createAsyncJobTracker(pi, state, ASYNC_DIR, {
+  }, supervisorChannel = createNativeSupervisorChannel(pi, state), mainWatchdog = registerMainWatchdog(pi), { startResultWatcher, primeExistingResults, stopResultWatcher } = createResultWatcher(pi, state, RESULTS_DIR, 600 * 1e3), generation = 0, executorPromise, pendingLaunches = /* @__PURE__ */ new Set(), pendingAsyncLaunches = /* @__PURE__ */ new Set(), unregisterCancellation, { ensurePoller, refreshWidget, handleStarted, handleComplete: trackComplete, resetJobs, restoreActiveJobs } = createAsyncJobTracker(pi, state, ASYNC_DIR, {
     widgetEnabled: config.asyncWidget !== !1
   }), handleComplete = (data) => {
     trackComplete(data);
@@ -6701,7 +6647,7 @@ function registerSubagentExtension(pi) {
       try {
         let currentGeneration = generation;
         if (signal?.throwIfAborted(), !executorPromise) {
-          let pending = import("./subagent-executor-LPZ4BHWE.js").then(({ createSubagentExecutor }) => {
+          let pending = import("./subagent-executor-UI6SHG3X.js").then(({ createSubagentExecutor }) => {
             if (generation !== currentGeneration)
               throw new Error("Subagent session changed before initialization");
             return createSubagentExecutor({
@@ -6805,19 +6751,7 @@ function registerSubagentExtension(pi) {
   }), pi.on("agent_end", async (_event, ctx) => {
     ctx.hasUI || await drainOutstandingWork({ state, events: pi.events, hasPendingMessages: () => ctx.hasPendingMessages() });
   }), registerSlashCommands(pi, state);
-  let eventUnsubscribeStoreKey = "__piSubagentEventUnsubscribes", controlNoticeSeenStoreKey = "__piSubagentVisibleControlNotices", previousEventUnsubscribes = globalStore[eventUnsubscribeStoreKey];
-  if (Array.isArray(previousEventUnsubscribes)) {
-    for (let unsubscribe of previousEventUnsubscribes)
-      if (typeof unsubscribe == "function")
-        try {
-          unsubscribe();
-        } catch {
-        }
-  }
-  registerSubagentNotify(pi, state, { batchConfig: config.completionBatch });
-  let existingVisibleControlNotices = globalStore[controlNoticeSeenStoreKey], visibleControlNotices = existingVisibleControlNotices instanceof Set ? existingVisibleControlNotices : /* @__PURE__ */ new Set();
-  globalStore[controlNoticeSeenStoreKey] = visibleControlNotices;
-  let controlEventHandler = (payload) => {
+  let disposeNotify = registerSubagentNotify(pi, state, { batchConfig: config.completionBatch }), visibleControlNotices = /* @__PURE__ */ new Set(), controlEventHandler = (payload) => {
     handleSubagentControlNotice({
       pi,
       state,
@@ -6833,7 +6767,7 @@ function registerSubagentExtension(pi) {
     pi.events.on(SUBAGENT_STEERING_NOTICE_EVENT, steeringNoticeHandler),
     rpcBridge.dispose
   ];
-  globalStore[eventUnsubscribeStoreKey] = eventUnsubscribes, pi.on("tool_result", (event, ctx) => {
+  pi.on("tool_result", (event, ctx) => {
     event.toolName === "subagent" && ctx.hasUI && (state.lastUiContext = ctx, state.asyncJobs.size > 0 && (refreshWidget(ctx), ensurePoller()));
   });
   let cleanupSessionArtifacts = (ctx) => {
@@ -6843,34 +6777,47 @@ function registerSubagentExtension(pi) {
     } catch {
     }
   }, resetSessionState = (ctx) => {
-    if (generation++, supervisorChannel.cancelOwnedQuestions("parent session replaced"), state.sessionGeneration = (state.sessionGeneration ?? 0) + 1, executorPromise = void 0, pendingLaunches.clear(), pendingAsyncLaunches.clear(), unregisterCancellation?.(), state.baseCwd = ctx.cwd, state.currentSessionId = resolveCurrentSessionId(ctx.sessionManager), state.subagentSpawns = { sessionId: state.currentSessionId, count: 0 }, !process.env[SUBAGENT_CHILD_ENV]) {
-      let sessionId2 = ctx.sessionManager.getSessionId();
-      sessionId2 && (process.env[SUBAGENT_PARENT_SESSION_ENV] = sessionId2);
+    generation++, disposeNotify(), disposeNotify = registerSubagentNotify(pi, state, { batchConfig: config.completionBatch }), stopResultWatcher(), supervisorChannel.dispose(), state.sessionGeneration = (state.sessionGeneration ?? 0) + 1, executorPromise = void 0, pendingLaunches.clear(), pendingAsyncLaunches.clear(), unregisterCancellation?.(), state.baseCwd = ctx.cwd, state.currentSessionId = resolveCurrentSessionId(ctx.sessionManager), state.subagentSpawns = { sessionId: state.currentSessionId, count: 0 }, state.lastUiContext = ctx, cleanupSessionArtifacts(ctx), clearPendingForegroundControlNotices(state), visibleControlNotices.clear();
+    for (let entry of ctx.sessionManager.getEntries()) {
+      if (entry.type !== "custom_message" && entry.type !== "custom" || entry.customType !== SUBAGENT_CONTROL_MESSAGE_TYPE)
+        continue;
+      let data = entry.type === "custom_message" ? entry.details : entry.data;
+      if (!data || typeof data != "object" || !("event" in data))
+        continue;
+      let details = data;
+      typeof details.event?.runId != "string" || typeof details.event.type != "string" || visibleControlNotices.add(controlNotificationKey(details.event, details.childIntercomTarget));
     }
-    state.lastUiContext = ctx, cleanupSessionArtifacts(ctx), clearPendingForegroundControlNotices(state), resetJobs(ctx), restoreActiveJobs(ctx);
+    resetJobs(ctx), restoreActiveJobs(ctx);
     let sessionId = state.currentSessionId, sessionGeneration = generation;
-    sessionId && (unregisterCancellation = registerSubagentCancellation(sessionId, createSubagentCancellation({
-      pendingLaunches: pendingAsyncLaunches,
-      isCurrent: () => generation === sessionGeneration && state.currentSessionId === sessionId,
-      getActiveRunIds: () => [...state.asyncJobs.values()].filter((job) => job.sessionId === sessionId && (job.status === "queued" || job.status === "running")).map((job) => job.asyncId),
-      async stopRun(id) {
-        return !(await executor.execute(randomUUID4(), { action: "stop", id }, new AbortController().signal, void 0, ctx)).isError;
-      }
-    }))), scheduledRunManager.bindSession(ctx), restoreSlashFinalSnapshots(ctx.sessionManager.getEntries()), primeExistingResults();
+    if (sessionId) {
+      let cancellation = createSubagentCancellation({
+        pendingLaunches: pendingAsyncLaunches,
+        isCurrent: () => generation === sessionGeneration && state.currentSessionId === sessionId,
+        getActiveRunIds: () => [...state.asyncJobs.values()].filter((job) => job.sessionId === sessionId && (job.status === "queued" || job.status === "running")).map((job) => job.asyncId),
+        async stopRun(id) {
+          return !(await executor.execute(randomUUID4(), { action: "stop", id }, new AbortController().signal, void 0, ctx)).isError;
+        }
+      }), unregisters = [.../* @__PURE__ */ new Set([sessionId, ctx.sessionManager.getSessionId()])].filter((id) => !!id).map((id) => registerSubagentCancellation(id, cancellation));
+      unregisterCancellation = () => {
+        for (let unregister of unregisters)
+          unregister();
+      };
+    }
+    scheduledRunManager.bindSession(ctx), restoreSlashFinalSnapshots(ctx.sessionManager.getEntries()), startResultWatcher(), primeExistingResults();
   };
   pi.on("session_start", (_event, ctx) => {
     resetSessionState(ctx), rpcBridge.emitReady(ctx), supervisorChannel.start();
   }), pi.on("session_shutdown", () => {
-    generation++, supervisorChannel.cancelOwnedQuestions("parent session shutdown"), state.sessionGeneration = (state.sessionGeneration ?? 0) + 1, executorPromise = void 0, pendingLaunches.clear(), pendingAsyncLaunches.clear(), unregisterCancellation?.(), delete process.env[SUBAGENT_PARENT_SESSION_ENV];
+    generation++, supervisorChannel.cancelOwnedQuestions("parent session shutdown"), state.sessionGeneration = (state.sessionGeneration ?? 0) + 1, executorPromise = void 0, pendingLaunches.clear(), pendingAsyncLaunches.clear(), unregisterCancellation?.(), disposeNotify(), mainWatchdog.dispose();
     for (let unsubscribe of eventUnsubscribes)
       try {
         unsubscribe();
       } catch {
       }
-    globalStore[eventUnsubscribeStoreKey] === eventUnsubscribes && delete globalStore[eventUnsubscribeStoreKey], stopResultWatcher(), scheduledRunManager.stop(), state.poller && clearInterval(state.poller), state.poller = null, clearPendingForegroundControlNotices(state);
+    stopResultWatcher(), scheduledRunManager.stop(), state.poller && clearInterval(state.poller), state.poller = null, clearPendingForegroundControlNotices(state);
     for (let timer of state.cleanupTimers.values())
       clearTimeout(timer);
-    state.cleanupTimers.clear(), state.asyncJobs.clear(), clearSlashSnapshots(), slashBridge.cancelAll(), slashBridge.dispose(), promptTemplateBridge.cancelAll(), promptTemplateBridge.dispose(), supervisorChannel.dispose(), globalStore[runtimeCleanupStoreKey] === runtimeCleanup && delete globalStore[runtimeCleanupStoreKey], disposeSubagentWidget();
+    state.cleanupTimers.clear(), state.asyncJobs.clear(), clearSlashSnapshots(), slashBridge.cancelAll(), slashBridge.dispose(), promptTemplateBridge.cancelAll(), promptTemplateBridge.dispose(), supervisorChannel.dispose(), state.lastUiContext && disposeSubagentWidget(state.lastUiContext);
     try {
       state.lastUiContext?.hasUI && state.lastUiContext.ui.setWidget(WIDGET_KEY, void 0);
     } catch (error) {