@ashx-j/lunr 0.2.25 → 0.2.27

package/dist/node-runtime/{pi-subagents-DNY7EAIG.js → pi-subagents-LT3CTO4E.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,45 +92,51 @@ import {
   validateExecutionAcceptance,
   validateToolBudgetConfig,
   writeAtomicJson
-} from "./chunk-3XPLBUEM.js";
+} from "./chunk-RLGY2QIL.js";
 import {
+  controlNotificationKey,
   formatControlNoticeMessage
 } from "./chunk-OAR4TYZE.js";
 import {
   getSubagentSpinnerDefinition
 } from "./chunk-US544NN6.js";
 import "./chunk-5ZH3ZFIZ.js";
-import "./chunk-OVX6X377.js";
-import "./chunk-YDO2F2IA.js";
+import "./chunk-ZEVFBFNF.js";
+import "./chunk-YSB6URMT.js";
+import "./chunk-6ZZHGUSA.js";
 import "./chunk-53YJI7JU.js";
-import "./chunk-5ZQXRPMC.js";
-import "./chunk-AD6VXAO7.js";
+import "./chunk-IAZSK7KK.js";
+import "./chunk-TCT6PCUR.js";
 import {
   subagentCommunicationEnabled
-} from "./chunk-6XL67VVY.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-ZXSGTGJ6.js";
-import "./chunk-M3LZLQW2.js";
-import "./chunk-KKUTQQV7.js";
-import "./chunk-CSFI6YXL.js";
+import {
+  resolveSubagentRequestParams
+} from "./chunk-APVM5NEU.js";
+import "./chunk-F2V2F4ZG.js";
+import "./chunk-BDRGN3L2.js";
+import "./chunk-FY4A63RK.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 "./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";
 
@@ -349,7 +353,7 @@ function formatCompactRowStats(tokens, durationMs) {
   return `${formatTokenStat(tokens)} \xB7 ${durationMs > 0 ? formatDuration(durationMs) : "0ms"}`;
 }
 function formatCompactSubagentRow(theme, width, parts) {
-  let stats = formatCompactRowStats(parts.tokens, parts.durationMs), body = [
+  let stats = parts.waiting ? "waiting" : formatCompactRowStats(parts.tokens, parts.durationMs), body = [
     `${parts.prefix ?? ""}${parts.glyph} ${themeBold(theme, parts.description)}`,
     parts.modelBadge ? theme.fg("dim", parts.modelBadge) : "",
     theme.fg("dim", stats),
@@ -634,13 +638,13 @@ function compactTerminalStatus(status) {
     return "detached";
 }
 function compactJobProgress(job, step, now = Date.now()) {
-  let running = (step?.status ?? job.status) === "running", tokens = step?.tokens?.total ?? job.totalTokens?.total ?? 0;
+  let running = (step?.status ?? job.status) === "running", wholeJob = !step || !job.steps?.length && job.agents?.length === 1, tokens = step?.tokens?.total ?? (wholeJob ? job.totalTokens?.total : void 0) ?? 0;
   if (step?.durationMs !== void 0)
     return {
       tokens,
       durationMs: liveDurationMs({ durationMs: step.durationMs, lastActivityAt: step.lastActivityAt }, running, now)
     };
-  let startedAt = step?.startedAt ?? job.startedAt;
+  let startedAt = step?.startedAt ?? (wholeJob ? job.startedAt : void 0);
   if (startedAt === void 0)
     return { tokens, durationMs: 0 };
   let endedAt = running ? now : step?.endedAt ?? step?.lastActivityAt ?? job.updatedAt ?? now;
@@ -660,7 +664,8 @@ function compactJobLines(job, step, theme, width, now = Date.now()) {
     modelBadge,
     tokens: progress.tokens,
     durationMs: progress.durationMs,
-    terminalStatus: compactTerminalStatus(step?.status ?? job.status)
+    terminalStatus: compactTerminalStatus(step?.status ?? job.status),
+    waiting: step?.status === "pending" || (step?.status ?? job.status) === "queued"
   })];
 }
 var RESERVED_NON_WIDGET_ROWS = 19, widgetLayoutSession;
@@ -735,7 +740,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;
@@ -778,7 +783,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;
@@ -793,23 +800,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)
@@ -1038,7 +1051,7 @@ var SkillOverride = Type.Unsafe({
 }), OutputModeOverride = Type.String({
   enum: ["inline", "file-only"],
   description: "Return saved output inline (default) or only a concise file reference. file-only requires output to be a path."
-}), TIER_SELECTION_DESCRIPTION = "Choose the lowest model tier that can reliably complete the task: 'light' for quick checks, fact gathering, and small code inspections; 'standard' for everyday coding, clearly described bugs, and focused reviews; 'heavy' for complex implementation, difficult debugging, architectural decisions, and large or high-risk reviews.", TierOverride = Type.Optional(Type.String({
+}), TIER_SELECTION_DESCRIPTION = "Choose for the child's specific assignment: 'light' for bounded lookups and straightforward verification; 'standard' by default for implementation, debugging, testing, research synthesis, planning, and focused review, including multi-file work; 'heavy' only for a specific reasoning difficulty that makes standard insufficient, such as tightly coupled systems, conflicting architectural constraints, subtle concurrency/state bugs, or security-critical adversarial analysis. When uncertain, choose standard. Length, file count, unfamiliarity, and importance alone do not justify heavy. Heavy does not require a failed standard attempt; escalation should address a reasoning limitation, not missing context or tools.", TierOverride = Type.Optional(Type.String({
   enum: ["light", "standard", "heavy"],
   description: `Required by default. ${TIER_SELECTION_DESCRIPTION} Do not combine with model. The configured tier model must be available and authenticated.`
 })), ModelOverride = Type.Optional(Type.String({
@@ -1863,18 +1876,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)) {
@@ -2305,6 +2320,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",
@@ -2528,8 +2544,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") {
@@ -2538,7 +2554,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 {
@@ -4867,7 +4883,7 @@ ${communication.message}`, 0, 0);
 }
 function renderCommunicationCard(communication, expanded, theme) {
   let box = new Box(1, 1, (text) => theme.bg("toolSuccessBg", text));
-  return box.addChild(new Text2(theme.fg("toolTitle", theme.bold(`\u25CF subagent ${communication.kind}`)), 0, 0)), expanded && box.addChild(renderCommunicationBody(communication, theme)), box;
+  return box.addChild(new Text2(theme.fg("toolTitle", theme.bold(`\u25CF subagent ${communication.kind === "handoff" ? "progress" : communication.kind}`)), 0, 0)), expanded && box.addChild(renderCommunicationBody(communication, theme)), box;
 }
 function renderCommunicationCall(name, args, theme, context, communication, displayTitle) {
   let container = new Container2(), details = context?.result?.details, saved = readCommunication(details?.communication) ?? communication, action = args.action ?? (args.reason === "need_decision" ? "request" : args.reason === "interview_request" ? "interview" : args.reason === "progress_update" ? "progress" : args.reason), title = theme.fg("toolTitle", theme.bold(`${name}${action ? ` ${action}` : ""}`));
@@ -6236,31 +6252,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);
@@ -6271,7 +6269,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") {
@@ -6283,9 +6283,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();
+    }
   };
 }
 
@@ -6340,10 +6346,13 @@ function loadConfig() {
 import * as fs9 from "node:fs";
 import * as path11 from "node:path";
 var CUSTOM_TOOL_DESCRIPTION_FILE = "subagent-tool-description.md", CUSTOM_TOOL_DESCRIPTION_MAX_BYTES = 50 * 1024, SUBAGENT_TIER_GUIDANCE = `TIER SELECTION:
-\u2022 Choose the lowest tier that can reliably complete the task.
-\u2022 light: Use for simple, straightforward tasks that require little reasoning. Good for quick checks, finding information, collecting facts for research, inspecting a small amount of code, or verifying a specific fact.
-\u2022 standard: Use for moderately difficult work and everyday coding tasks. Good for writing simple code, fixing a clearly described bug, reviewing a focused change, or completing work with clear requirements. Use heavy when the task requires deep architectural understanding or complex reasoning.
-\u2022 heavy: Use for complex or ambiguous tasks that require deep reasoning and strong code understanding. Good for implementing complex plans, debugging difficult or poorly understood problems, reviewing large or high-risk changes, and making architectural decisions.`, SUBAGENT_COORDINATION_GUIDANCE = "Define file ownership, local decision authority, and required outputs at launch. Establish shared contracts before dependent parallel work; use chains and artifacts to pass results. When enabled, native child intercom reaches the supervisor only, not siblings. Reserve parent relays for actionable exceptions, not routine progress or implementation approvals.", SUBAGENT_SAFETY_GUIDANCE = `SAFETY-CRITICAL SUBAGENT GUIDANCE:
+\u2022 Choose the tier for the child's specific assignment, not the size or importance of the overall project.
+\u2022 light: Use for bounded lookups, fact gathering, small code inspections, and straightforward verification.
+\u2022 standard: Default for implementation, debugging, testing, research synthesis, planning, and focused code review. Standard can handle multi-file changes and unfamiliar code when the assignment has a clear goal.
+\u2022 heavy: Reserve for tasks whose central difficulty requires reasoning across tightly coupled systems, resolving conflicting architectural constraints, diagnosing subtle concurrency or state bugs, or adversarial analysis of security-critical behavior.
+\u2022 Before choosing heavy, identify the specific difficulty that makes standard insufficient. Task length, file count, unfamiliarity, importance, or the words "review" and "architecture" are not enough by themselves.
+\u2022 When uncertain between standard and heavy, choose standard. Use heavy upfront when the difficulty is already clear; do not require a failed standard attempt.
+\u2022 If standard gets blocked, distinguish missing context, unavailable tools, and unclear requirements from a reasoning limitation. Escalate for the reasoning limitation, passing along findings rather than restarting the investigation.`, SUBAGENT_COORDINATION_GUIDANCE = "Define file ownership, local decision authority, and required outputs at launch. Establish shared contracts before dependent parallel work; use chains and artifacts to pass results. When enabled, native child intercom reaches the supervisor only, not siblings. Reserve parent relays for actionable exceptions, not routine progress or implementation approvals.", SUBAGENT_SAFETY_GUIDANCE = `SAFETY-CRITICAL SUBAGENT GUIDANCE:
 \u2022 Prompt children directly. There is no agent roster. Every execution task needs task (the full child prompt) and description (a concise UI label).
 \u2022 Every executable child chooses exactly one of tier: "light"|"standard"|"heavy" (default) or model: "provider/id" when the user names a model. Do not pass both, and do not use inherit. Missing, disabled, unconfigured, unavailable, or unauthenticated selections fail before launch.
 \u2022 Optional thinking (off/minimal/low/medium/high/xhigh/max) is only valid with an explicit model. Tier launches use the configured tier thinking level.
@@ -6373,7 +6382,7 @@ CHAIN TEMPLATE VARIABLES (use in task and description strings):
 \u2022 {chain_dir} - Shared directory for chain files (e.g., <tmpdir>/pi-subagents-<scope>/chain-runs/abc123/)
 
 CHAIN EXAMPLES:
-\u2022 Sequential: { chain: [{task:"Analyze {task}", description:"Analyze request", tier:"standard"}, {task:"Plan based on {previous}", description:"Draft plan", tier:"heavy"}] }
+\u2022 Sequential: { chain: [{task:"Analyze {task}", description:"Analyze request", tier:"standard"}, {task:"Plan based on {previous}", description:"Draft plan", tier:"standard"}] }
 \u2022 Parallel fan-out: { chain: [{parallel: [{task:"Check part of {task}", description:"Check one part", tier:"light", permissions:"read-only", count: 3}]}] }
 \u2022 Mixed: { chain: [{task:"Research {task}", description:"Research request", tier:"standard", permissions:"read-only"}, {parallel: [{task:"Review {previous}", description:"Review findings", tier:"light", permissions:"read-only", count: 2}]}, {task:"Summarize {previous}", description:"Summarize reviews", tier:"standard"}] }
 
@@ -6633,12 +6642,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);
@@ -6665,13 +6668,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);
@@ -6695,7 +6692,7 @@ function registerSubagentExtension(pi) {
       try {
         let currentGeneration = generation;
         if (signal?.throwIfAborted(), !executorPromise) {
-          let pending = import("./subagent-executor-KZZQGAKV.js").then(({ createSubagentExecutor }) => {
+          let pending = import("./subagent-executor-Q5F7DBVM.js").then(({ createSubagentExecutor }) => {
             if (generation !== currentGeneration)
               throw new Error("Subagent session changed before initialization");
             return createSubagentExecutor({
@@ -6799,19 +6796,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,
@@ -6827,7 +6812,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) => {
@@ -6837,34 +6822,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) {