pi-subagents 0.82.1 → 0.83.0

package/bundle/{chunk-UTT254JE.js → chunk-6B4ITO2W.js}

@@ -1,7 +1,7 @@
 // package.json
 var package_default = {
   name: "pi-subagents",
-  version: "0.82.1",
+  version: "0.83.0",
   private: true,
   description: "Pi extension for single-agent delegation and scripted multi-agent workflows",
   author: "Nico Bailon",
@@ -50,6 +50,7 @@ var package_default = {
     "index.ts",
     "src/**/*.ts",
     "*.mjs",
+    "workflow-script-worker.cjs",
     "agents/",
     "skills/**/*",
     "prompts/**/*",
@@ -112,14 +113,17 @@ var package_default = {
   devDependencies: {
     "@earendil-works/pi-agent-core": "1.2.0",
     "@earendil-works/pi-ai": "1.2.0",
+    "@earendil-works/pi-coding-agent": "1.2.0",
     "@earendil-works/pi-tui": "1.2.0",
     "@oxlint/plugins": "1.80.0",
     "@types/node": "24.13.3",
     esbuild: "0.28.2",
     oxlint: "1.80.0",
-    typescript: "5.9.3",
-    "@earendil-works/pi-coding-agent": "1.2.0",
-    typebox: "1.3.27"
+    typebox: "1.3.27",
+    typescript: "5.9.3"
+  },
+  overrides: {
+    undici: "$undici"
   }
 };
 

package/bundle/{chunk-CIZQXJ5Q.js → chunk-7F5SK2U3.js}

@@ -2,7 +2,7 @@ import {
   CHAIN_RUNS_DIR,
   RUNNER_LAUNCHER_NAME_PATTERN,
   RUNNER_LAUNCHER_NAME_RULE
-} from "./chunk-5LFLVSTM.js";
+} from "./chunk-JEZOSEWG.js";
 import {
   previewDisplayText,
   sanitizeDisplayText,
@@ -1203,9 +1203,7 @@ function serializeAgent(config, options = {}) {
   }
   if (config.model || preserve("model")) lines.push(`model: ${config.model ?? ""}`);
   if (config.fast === true || preserve("fast")) lines.push(`fast: ${config.fast === void 0 ? "" : config.fast ? "true" : "false"}`);
-  if (config.thinking && (config.thinking !== "off" || preserve("thinking")) || !config.thinking && preserve("thinking")) {
-    lines.push(`thinking: ${config.thinking ?? ""}`);
-  }
+  if (config.thinking || preserve("thinking")) lines.push(`thinking: ${config.thinking ?? ""}`);
   if (!preservingExistingFrontmatter || preserve("systemPromptMode")) lines.push(`systemPromptMode: ${config.systemPromptMode}`);
   if (!preservingExistingFrontmatter || preserve("inheritProjectContext")) lines.push(`inheritProjectContext: ${config.inheritProjectContext ? "true" : "false"}`);
   if (config.inheritGlobalContext || preserve("inheritGlobalContext")) lines.push(`inheritGlobalContext: ${config.inheritGlobalContext ? "true" : "false"}`);
@@ -4232,6 +4230,35 @@ function defaultInheritProjectContext(name) {
 function defaultInheritSkills() {
   return false;
 }
+var BUILTIN_OVERRIDE_FIELDS = {
+  description: true,
+  advertise: true,
+  machine: true,
+  output: true,
+  outputMode: true,
+  defaultReads: true,
+  model: true,
+  defaultProvider: true,
+  fast: true,
+  thinking: true,
+  systemPromptMode: true,
+  inheritProjectContext: true,
+  inheritGlobalContext: true,
+  inheritSkills: true,
+  defaultContext: true,
+  acceptanceRole: true,
+  disabled: true,
+  systemPrompt: true,
+  skills: true,
+  tools: true,
+  excludeTools: true,
+  allowNestedSubagents: true,
+  allowedAgents: true,
+  extensions: true,
+  subagentOnlyExtensions: true,
+  mutationTools: true,
+  toolBudget: true
+};
 var EMPTY_SUBAGENT_SETTINGS = { overrides: {}, providerOverrides: {} };
 var agentFrontmatterFields = /* @__PURE__ */ new WeakMap();
 var AGENT_SOURCE_PRIORITY = {
@@ -4830,6 +4857,11 @@ function parseBuiltinOverrideEntry(name, value, filePath) {
   if (Object.hasOwn(input, "launcher")) {
     throw new Error(`Builtin override '${name}' in '${filePath}' sets 'launcher', which settings overrides do not support; set 'launcher' in a user agent file instead.`);
   }
+  for (const key of Object.keys(input)) {
+    if (Object.hasOwn(BUILTIN_OVERRIDE_FIELDS, key)) continue;
+    const suggestion = closestMatch(key, Object.keys(BUILTIN_OVERRIDE_FIELDS));
+    throw new Error(`Builtin override '${name}' in '${filePath}' has unknown field '${key}'.${suggestion ? ` Did you mean '${suggestion}'?` : ""}`);
+  }
   const override = {};
   if ("description" in input) {
     if (typeof input.description === "string" && input.description.trim()) {
@@ -4862,8 +4894,9 @@ function parseBuiltinOverrideEntry(name, value, filePath) {
     else throw new Error(`Builtin override '${name}' in '${filePath}' has invalid 'fast'; expected a boolean.`);
   }
   if ("thinking" in input) {
-    if (typeof input.thinking === "string" || input.thinking === false) override.thinking = input.thinking;
-    else throw new Error(`Builtin override '${name}' in '${filePath}' has invalid 'thinking'; expected a string or false.`);
+    const level = THINKING_LEVELS.find((candidate) => candidate === input.thinking);
+    if (level !== void 0 || input.thinking === false) override.thinking = level ?? false;
+    else throw new Error(`Builtin override '${name}' in '${filePath}' has invalid 'thinking'; expected one of ${THINKING_LEVELS.join(", ")}, or false.`);
   }
   if ("systemPromptMode" in input) {
     if (input.systemPromptMode === "append" || input.systemPromptMode === "replace") {

package/bundle/{chunk-OYF6AFDY.js → chunk-BKFWQ642.js}

@@ -4,10 +4,10 @@ import {
 import {
   resolveWatchPath,
   writeAtomicJson
-} from "./chunk-CIZQXJ5Q.js";
+} from "./chunk-7F5SK2U3.js";
 import {
   POLL_INTERVAL_MS
-} from "./chunk-5LFLVSTM.js";
+} from "./chunk-JEZOSEWG.js";
 
 // src/runs/background/control-channel.ts
 import { randomUUID } from "node:crypto";

package/bundle/{chunk-ZIV4J4HG.js → chunk-CDI3GMNV.js}

@@ -11,10 +11,10 @@ import {
   startWatchdogDiffBaselineCapture,
   writeUserWatchdogEnabled,
   writeWatchdogModelSettings
-} from "./chunk-VSUSLDNW.js";
+} from "./chunk-CZTMUBUI.js";
 import {
   resolveGitRepositoryIdentity
-} from "./chunk-FXUXCX2K.js";
+} from "./chunk-4BW55BTL.js";
 import {
   listAsyncRuns,
   ownsRun,
@@ -22,7 +22,7 @@ import {
   parseWorkflowChildSummary,
   readAsyncRecoveryDescriptor,
   resolveRetainedWorktreeCwd
-} from "./chunk-6XJB7PIX.js";
+} from "./chunk-OOFW75PV.js";
 import {
   deepFreezeWorkflowArgs,
   normalizeWorkflowArgs
@@ -50,21 +50,21 @@ import {
   resolveMissionStoreLocation,
   validateMissionId,
   workflowRunParamsFingerprint
-} from "./chunk-46XKCPJR.js";
+} from "./chunk-5ESXK62X.js";
 import {
   requestAsyncCommand,
   watchAsyncControlInbox
-} from "./chunk-OYF6AFDY.js";
+} from "./chunk-BKFWQ642.js";
 import {
   supervisorChannelDir
-} from "./chunk-4SDU2BZX.js";
+} from "./chunk-CSSZRTKY.js";
 import {
   createHerdrClient,
   detectHerdr
-} from "./chunk-52UBALJL.js";
+} from "./chunk-WG2OTTAK.js";
 import {
   getProjectSubagentsDir
-} from "./chunk-5TYMSZX3.js";
+} from "./chunk-VTMNBPCQ.js";
 import {
   ExternalJobProviderError,
   getExternalJobProvider,
@@ -74,7 +74,7 @@ import {
 } from "./chunk-YYREO77V.js";
 import {
   mergeRuntimeAgents
-} from "./chunk-YKEWIB4M.js";
+} from "./chunk-JHZ6DZ5M.js";
 import {
   CODE_OWNED_EXTERNAL_CLI_ADAPTER_LABEL,
   PI_CODING_AGENT_PACKAGE,
@@ -129,7 +129,7 @@ import {
   withFileLease,
   writeAtomicJson,
   writePrivateAtomicJson
-} from "./chunk-CIZQXJ5Q.js";
+} from "./chunk-7F5SK2U3.js";
 import {
   DIRS,
   INTERCOM_DETACH_REQUEST_EVENT,
@@ -142,7 +142,7 @@ import {
   SUBAGENT_FOREGROUND_COMPLETE_EVENT,
   SUBAGENT_RESULT_INTERCOM_DELIVERY_EVENT,
   SUBAGENT_RESULT_INTERCOM_EVENT
-} from "./chunk-5LFLVSTM.js";
+} from "./chunk-JEZOSEWG.js";
 import {
   previewDisplayText,
   safeTerminalText,
@@ -3199,10 +3199,7 @@ function preservedAgentFrontmatterFields(agent, cfg) {
   if (hasKey(cfg, "extensions")) changed("extensions");
   if (hasKey(cfg, "subagentOnlyExtensions")) changed("subagentOnlyExtensions");
   if (hasKey(cfg, "mutationTools")) changed("mutationTools");
-  if (hasKey(cfg, "thinking")) {
-    changed("thinking");
-    if (cfg.thinking === "off") fields.add("thinking");
-  }
+  if (hasKey(cfg, "thinking")) changed("thinking");
   if (hasKey(cfg, "systemPromptMode")) {
     changed("systemPromptMode");
     fields.add("systemPromptMode");
@@ -3358,12 +3355,11 @@ function applyAgentConfig(target, cfg) {
     else return "config.mutationTools must be a comma-separated string, empty string, or false when provided.";
   }
   if (hasKey(cfg, "thinking")) {
-    if (cfg.thinking === false || cfg.thinking === "") delete target.thinking;
-    else if (typeof cfg.thinking === "string") {
-      const thinking = cfg.thinking.trim();
-      if (thinking) target.thinking = thinking;
-      else delete target.thinking;
-    } else return "config.thinking must be a string or false when provided.";
+    const thinking = typeof cfg.thinking === "string" ? cfg.thinking.trim() : cfg.thinking;
+    const level = THINKING_LEVELS.find((candidate) => candidate === thinking);
+    if (thinking === false || thinking === "") delete target.thinking;
+    else if (level) target.thinking = level;
+    else return `config.thinking must be one of ${THINKING_LEVELS.join(", ")}, or false when provided.`;
   }
   if (hasKey(cfg, "systemPromptMode")) {
     if (cfg.systemPromptMode === "append" || cfg.systemPromptMode === "replace") target.systemPromptMode = cfg.systemPromptMode;
@@ -7314,11 +7310,14 @@ function resetExtensionCacheOnReload(loader) {
   return true;
 }
 function applyProcessEnv(values) {
-  if (!values) return;
+  if (!values) return () => {
+  };
+  const previous = Object.fromEntries(Object.keys(values).map((name) => [name, process.env[name]]));
   for (const [name, value] of Object.entries(values)) {
     if (value === void 0) delete process.env[name];
     else process.env[name] = value;
   }
+  return () => applyProcessEnv(previous);
 }
 function selectedBuiltinMcpExtension(pi, selections, readinessTool) {
   const createMcpExtension = pi.createMcpExtension;
@@ -7534,7 +7533,10 @@ function createDefaultChildSessionFactory(options = {}) {
           await commands?.shutdown();
           const runner = session2.extensionRunner;
           if (runner.hasHandlers("session_shutdown")) {
-            await Promise.race([runner.emit({ type: "session_shutdown", reason: "quit" }), new Promise((resolve4) => setTimeout(resolve4, shutdownTimeoutMs).unref?.())]);
+            let bound;
+            await Promise.race([runner.emit({ type: "session_shutdown", reason: "quit" }), new Promise((resolve4) => {
+              bound = setTimeout(resolve4, shutdownTimeoutMs);
+            })]).finally(() => clearTimeout(bound));
           }
         } catch (error2) {
           launch.onExtensionError?.({ extensionPath: "<session>", event: "session_shutdown", error: error2 });
@@ -7543,8 +7545,7 @@ function createDefaultChildSessionFactory(options = {}) {
         }
       };
       let inheritedProviders = /* @__PURE__ */ new Set();
-      const open = async () => {
-        applyProcessEnv(launch.processEnv);
+      const openSession = async () => {
         if (!resetExtensionCacheOnReload(loader) && (launch.ambientExtensions || launch.extensionPaths.length)) launch.onExtensionError?.({ extensionPath: "<loader>", event: "load", error: new Error("pi's extension cache reset is unavailable; extensions loaded into this child share module state with other sessions in this process.") });
         await loader.reload();
         if (requiredPaths.size > 0) for (const extension of loader.getExtensions().extensions) resolvedExtensionPaths.set(extension.path, extension.resolvedPath);
@@ -7608,6 +7609,14 @@ function createDefaultChildSessionFactory(options = {}) {
         }
         return session2;
       };
+      const open = async () => {
+        const restoreEnv = applyProcessEnv(launch.processEnv);
+        try {
+          return await openSession();
+        } finally {
+          if (launch.restoreProcessEnv) restoreEnv();
+        }
+      };
       const opened = loading.catch(() => {
       }).then(open);
       loading = opened;
@@ -7709,7 +7718,7 @@ function childSessionFactory() {
 }
 function createLazyPlacementFactory(local) {
   let placed;
-  const factory = async () => placed ??= (await import("./chunk-PDZWJCHD.js")).createPlacementAwareChildSessionFactory(local);
+  const factory = async () => placed ??= (await import("./chunk-XXKG3P2W.js")).createPlacementAwareChildSessionFactory(local);
   return {
     async create(launch) {
       return launch.machine ? (await factory()).create(launch) : local.create(launch);
@@ -7933,6 +7942,7 @@ function prepareWorkflowResume(input) {
 // src/extension/subagent-options.ts
 import { isDeepStrictEqual } from "node:util";
 import { Compile } from "typebox/compile";
+import { Value } from "typebox/value";
 var optionKeys = new Set(SUBAGENT_OPTION_KEYS);
 var ALIAS_HINTS = { runId: "id (top-level)", maxRuntimeMs: "options.timeoutMs", isolation: "worktree (top-level)" };
 var optionsValidator = Compile(SubagentOptionParams);
@@ -7944,6 +7954,12 @@ function flattenSubagentToolOptions(params, disabled) {
   if (!options || typeof options !== "object" || Array.isArray(options)) throw new Error("subagent: options must be an object.");
   const removedField = removedModelWorkflowFieldError(options);
   if (removedField) throw new Error(removedField);
+  const { script, ...rest } = options;
+  if (script !== void 0) {
+    if (typeof script !== "string" || !script.trim()) throw new Error("subagent: options.script must be the workflow script's source text.");
+    if (topLevel.workflow !== void 0) throw new Error("subagent: options.script replaces workflow; pass only one of them.");
+    return { ...flattenSubagentToolOptions({ ...topLevel, options: rest }, disabled), workflowScript: script };
+  }
   const entries = Object.entries(options);
   const enabledKeys = SUBAGENT_OPTION_KEYS.filter((key) => !disabled?.params.has(key));
   const unknown = entries.map(([key]) => key).filter((key) => !optionKeys.has(key));
@@ -7959,13 +7975,14 @@ function flattenSubagentToolOptions(params, disabled) {
   }
   const disabledKey = entries.find(([key]) => disabled?.params.has(key))?.[0];
   if (disabledKey) throw new Error(`subagent option 'options.${disabledKey}' is disabled by config ${disabled.params.get(disabledKey)}.`);
-  if (!optionsValidator.Check(options)) {
-    const errors = [...optionsValidator.Errors(options)].slice(0, 4).map((error2) => `options${error2.instancePath.replaceAll("/", ".")} ${error2.message}`);
+  const converted = Value.Convert(SubagentOptionParams, structuredClone(options));
+  if (!optionsValidator.Check(converted)) {
+    const errors = [...optionsValidator.Errors(converted)].slice(0, 4).map((error2) => `options${error2.instancePath.replaceAll("/", ".")} ${error2.message}`);
     throw new Error(`subagent: ${errors.join("; ")}.`);
   }
-  const conflicts = entries.filter(([key, value]) => topLevel[key] !== void 0 && !isDeepStrictEqual(topLevel[key], value)).map(([key]) => `'${key}'`);
+  const conflicts = Object.entries(converted).filter(([key, value]) => topLevel[key] !== void 0 && !isDeepStrictEqual(topLevel[key], value)).map(([key]) => `'${key}'`);
   if (conflicts.length > 0) throw new Error(`subagent: ${conflicts.join(", ")} given both at the top level and in options with different values; give each once.`);
-  return { ...topLevel, ...options };
+  return { ...topLevel, ...converted };
 }
 
 // src/runs/background/retained-children.ts

package/bundle/{chunk-3JCDWF4V.js → chunk-CGXWSNPA.js}

@@ -15,15 +15,15 @@ import {
   resolveCurrentSessionId,
   resolveWatchdogReviewModel,
   startWatchdogDiffBaselineCapture
-} from "./chunk-VSUSLDNW.js";
+} from "./chunk-CZTMUBUI.js";
 import {
   MODEL_ONLY_TOOL,
   agentStreamOptions,
   opencodeSessionHeaders
-} from "./chunk-6XJB7PIX.js";
+} from "./chunk-OOFW75PV.js";
 import {
   inheritedNestedRouteOf
-} from "./chunk-46XKCPJR.js";
+} from "./chunk-5ESXK62X.js";
 import {
   CHILD_WATCHDOG_STATUS_EVENT,
   MISSING_STRUCTURED_ACCEPTANCE_REPORT_ERROR,
@@ -39,10 +39,10 @@ import {
   toolBudgetSoftNudge,
   validateAcceptanceReport,
   validateStructuredOutputValue
-} from "./chunk-CIZQXJ5Q.js";
+} from "./chunk-7F5SK2U3.js";
 import {
   INTERCOM_SESSION_IDENTITY_EVENT
-} from "./chunk-5LFLVSTM.js";
+} from "./chunk-JEZOSEWG.js";
 
 // src/runs/shared/subagent-prompt-runtime.ts
 import { createHash } from "node:crypto";
@@ -851,6 +851,7 @@ function registerSubagentPromptRuntime(pi, config, drainObservation) {
   onRuntimeEvent("session_start", (_event, ctx) => {
     const sessionManager = ctx?.sessionManager;
     waitState.currentSessionId = sessionManager ? resolveCurrentSessionId(sessionManager) : null;
+    waitState.supervisorOwnerSessionId = sessionManager?.getSessionId() || null;
     registerNativeSupervisorClientOnce();
   });
   onRuntimeEvent("agent_start", () => {
@@ -892,25 +893,18 @@ function registerSubagentPromptRuntime(pi, config, drainObservation) {
   if (config.forkCacheKey) onRuntimeEvent("before_provider_headers", (event, ctx) => {
     applyForkSessionAffinity(event?.headers, ctx?.model, config.parentSessionId, readInherited(ctx)?.model);
   });
-  if (config.forkCacheKey) onRuntimeEvent("context_with_system", (event, ctx) => {
+  onRuntimeEvent("context_with_system", (event, ctx) => {
     if (!event || typeof event !== "object" || !("messages" in event) || !Array.isArray(event.messages)) return void 0;
-    const fork = readInherited(ctx);
-    if (!fork) return void 0;
-    const messages = projectForkRequest(event.messages, fork.system, fork.forkedAt, { boundary });
-    return messages === event.messages ? void 0 : { messages };
-  });
-  onRuntimeEvent("context", (event, ctx) => {
-    if (!event || typeof event !== "object" || !("messages" in event) || !Array.isArray(event.messages)) return void 0;
-    const forkedAt = config.forkCacheKey ? Date.parse(ctx?.sessionManager?.getHeader()?.timestamp ?? "") : Number.NaN;
-    const messages = stripParentOnlySubagentMessages(event.messages, {
+    const fork = config.forkCacheKey ? readInherited(ctx) : void 0;
+    const stripped = stripParentOnlySubagentMessages(event.messages, {
       sanitizeToolIds: !COMPOSITE_TOOL_ID_APIS.has(ctx?.model?.api ?? ""),
       // Providers that reuse the Codex Responses wire under their own api id (e.g. cliproxyapi-codex-responses) split call_id|item_id the same way.
       preserveBoundedCompositeToolIds: ctx?.model?.api?.endsWith("-codex-responses") === true,
       preserveFanoutToolHistory: config.fanoutChild,
-      ...Number.isFinite(forkedAt) ? { inheritedBefore: forkedAt } : {}
+      ...fork ? { inheritedBefore: fork.forkedAt } : {}
     });
-    if (messages === event.messages) return void 0;
-    return { messages };
+    const messages = fork ? projectForkRequest(stripped, fork.system, fork.forkedAt, { boundary }) : stripped;
+    return messages === event.messages ? void 0 : { messages };
   });
   const routingName = config.intercomSessionName;
   let intercomIdClaimed = false;

package/bundle/{chunk-JYUKW2SY.js → chunk-CNLDYEH4.js}

@@ -1,26 +1,26 @@
 import {
   rewriteSubagentPrompt
-} from "./chunk-3JCDWF4V.js";
+} from "./chunk-CGXWSNPA.js";
 import {
   package_default
-} from "./chunk-UTT254JE.js";
-import "./chunk-VSUSLDNW.js";
+} from "./chunk-6B4ITO2W.js";
+import "./chunk-CZTMUBUI.js";
 import {
   MODEL_ONLY_TOOL
-} from "./chunk-6XJB7PIX.js";
+} from "./chunk-OOFW75PV.js";
 import "./chunk-NF7IEKBH.js";
 import {
   appendAgentRefinementOverlay
-} from "./chunk-PLCCBLPY.js";
-import "./chunk-46XKCPJR.js";
+} from "./chunk-Y3I6H6DV.js";
+import "./chunk-5ESXK62X.js";
 import "./chunk-NIXWDZZV.js";
-import "./chunk-XSWOTIA3.js";
+import "./chunk-MHX22USZ.js";
 import "./chunk-7F6RKT6W.js";
 import {
   assertNoToolModifierEntries
-} from "./chunk-4SDU2BZX.js";
+} from "./chunk-CSSZRTKY.js";
 import "./chunk-CTPAE36Y.js";
-import "./chunk-5TYMSZX3.js";
+import "./chunk-VTMNBPCQ.js";
 import {
   HERDR_PI_MAX_FRAME_BYTES,
   HERDR_PI_PROTOCOL,
@@ -30,15 +30,15 @@ import {
   encodeHerdrPiFrame,
   validateHerdrPiRunId
 } from "./chunk-4QFZZV3O.js";
-import "./chunk-N2BN7BF5.js";
+import "./chunk-XA3DY6UG.js";
 import {
   buildAgentMemoryInjection,
   buildSkillInjection,
   discoverAgents,
   resolveExistingReadPaths,
   resolveSkills
-} from "./chunk-CIZQXJ5Q.js";
-import "./chunk-5LFLVSTM.js";
+} from "./chunk-7F5SK2U3.js";
+import "./chunk-JEZOSEWG.js";
 import "./chunk-YFCK7H2S.js";
 import "./chunk-Z7KVHQHL.js";
 

package/bundle/{chunk-4SDU2BZX.js → chunk-CSSZRTKY.js}

@@ -7,10 +7,10 @@ import {
   getAgentDir,
   getConfigDirName,
   getProjectConfigDir
-} from "./chunk-CIZQXJ5Q.js";
+} from "./chunk-7F5SK2U3.js";
 import {
   TEMP_ROOT_DIR
-} from "./chunk-5LFLVSTM.js";
+} from "./chunk-JEZOSEWG.js";
 import {
   capabilityCeilingAgentRestrictionSources,
   intersectSubagentCapabilityCeilings,

package/bundle/{chunk-VSUSLDNW.js → chunk-CZTMUBUI.js}

@@ -11,7 +11,7 @@ import {
   projectTimeoutRecovery,
   readAsyncRecoveryDescriptor,
   utf8Tail
-} from "./chunk-6XJB7PIX.js";
+} from "./chunk-OOFW75PV.js";
 import {
   MAX_ARGS_BYTES,
   MAX_ARGS_DEPTH,
@@ -24,17 +24,17 @@ import {
   resultFilePath,
   resultPayloadMatchesSessionRun,
   resultPayloadPathForSessionRun
-} from "./chunk-46XKCPJR.js";
+} from "./chunk-5ESXK62X.js";
 import {
   shouldUseNativeFsWatch
 } from "./chunk-NIXWDZZV.js";
 import {
   PROJECT_SUBAGENTS_RELATIVE_DIR
-} from "./chunk-5TYMSZX3.js";
+} from "./chunk-VTMNBPCQ.js";
 import {
   listBackgroundWorkWakeChannels,
   snapshotBackgroundWork
-} from "./chunk-N2BN7BF5.js";
+} from "./chunk-XA3DY6UG.js";
 import {
   SUBAGENT_WATCHDOG_WARNING_TYPE,
   THINKING_LEVELS,
@@ -55,7 +55,7 @@ import {
   withSettingsFileLease,
   writeAtomicJson,
   writePrivateAtomicJson
-} from "./chunk-CIZQXJ5Q.js";
+} from "./chunk-7F5SK2U3.js";
 import {
   ASYNC_DIR,
   DIRS,
@@ -67,7 +67,7 @@ import {
   SUBAGENT_FOREGROUND_COMPLETE_EVENT,
   SUBAGENT_RESULT_INTERCOM_EVENT,
   TEMP_ROOT_DIR
-} from "./chunk-5LFLVSTM.js";
+} from "./chunk-JEZOSEWG.js";
 
 // src/intercom/native-supervisor-channel.ts
 import { randomUUID } from "node:crypto";
@@ -2530,7 +2530,9 @@ function backgroundWorkIdentity(item) {
 function backgroundWorkForSession(deps, nowMs) {
   const sessionId = deps.state.currentSessionId;
   if (!sessionId) throw new Error("bg_wait requires an active session identity to scope background work safely.");
-  return deps.backgroundWork?.snapshot(sessionId, nowMs) ?? snapshotBackgroundWork(sessionId, nowMs);
+  const piSessionId = deps.state.supervisorOwnerSessionId;
+  const sessionIds = piSessionId ? [sessionId, piSessionId] : [sessionId];
+  return deps.backgroundWork?.snapshot(sessionIds, nowMs) ?? snapshotBackgroundWork(sessionIds, nowMs);
 }
 function waitRunScopes(deps) {
   return [
@@ -3231,7 +3233,7 @@ function hasOutstandingWork(deps, sessionId, nowMs, observation) {
   const detachedForeground = [...deps.state.foregroundRuns?.values() ?? []].some(
     (run) => run.sessionId === sessionId && run.children.some((child) => child.status === "detached")
   );
-  return asyncRuns.length > 0 || snapshotBackgroundWork(sessionId, nowMs).items.length > 0 || detachedForeground;
+  return asyncRuns.length > 0 || backgroundWorkForSession(deps, nowMs).items.length > 0 || detachedForeground;
 }
 async function drainOutstandingWork(deps, observation) {
   const sessionId = deps.state.currentSessionId;