pi-subagents 0.82.1 → 0.83.1

package/src/missions/types.d.ts

@@ -57,6 +57,8 @@ export interface MissionWorkflowChild {
     sessionPath?: string;
     artifactPaths: string[];
     heartbeat?: MissionChildHeartbeat;
+    /** Latest acceptance ledger status reported for the child. */
+    acceptanceStatus?: string;
 }
 export type MissionWorkflowChildUpdate = Pick<MissionWorkflowChild, "workflowRunId" | "key" | "status"> & Partial<Omit<MissionWorkflowChild, "workflowRunId" | "key" | "status" | "startedAt" | "updatedAt" | "artifactPaths" | "heartbeat">> & {
     startedAt?: string;

package/src/runs/background/async-execution.d.ts

@@ -25,7 +25,7 @@ interface AsyncExecutionContext {
     cwd: string;
     currentSessionId: string;
     completionOwnerId?: string;
-    /** Parent session id used by permission-system ask forwarding. */
+    /** Parent Pi session id (`getSessionId()`): keys permission-system ask forwarding and capability ceilings. */
     parentSessionId?: string;
     /** Parent session file, recorded as each new child session's `parentSession` header. */
     parentSessionFile?: string;

package/src/runs/background/async-execution.js

@@ -13,7 +13,7 @@ import { childCacheRetentionEnv } from "../../shared/child-cache-retention.js";
 import { buildEffectiveSystemPrompt } from "../shared/effective-system-prompt.js";
 import { currentCompletionOwnerId } from "../../shared/completion-owner.js";
 import { planChildLaunch, projectChainOutputSchemas, resolveStepBehavior, suppressProgressForReadOnlyTask } from "../shared/child-launch-plan.js";
-import { formatHerdrMachineRunnerUnsupported, resolveMachinePlacement } from "../shared/herdr-machine.js";
+import { formatHerdrMachineRunnerUnsupported, PLACED_RESTORE_UNSUPPORTED, resolveMachinePlacement } from "../shared/herdr-machine.js";
 import { applyThinkingSuffix, projectLaunchResolvedChildExtensions, resolvePiLaunchToolPlan } from "../shared/child-tool-plan.js";
 import { assertClaudeCodeModelScope, isClaudeCodeAdapterId, resolveClaudeCodeOverride } from "../shared/claude-code-adapter.js";
 import { injectSingleOutputInstruction, normalizeSingleOutputOverride, resolveSingleOutputPath, validateFileOnlyOutputMode } from "../shared/single-output.js";
@@ -1233,7 +1233,8 @@ export function executeAsyncChain(id, params) {
         .find((name) => name !== undefined && !lookupRunnerLauncher(ctx.runnerLaunchers, name));
     if (undefinedLauncher !== undefined)
         return formatAsyncStartError(resultMode, `Launcher '${undefinedLauncher}' used by this ${resultMode} is not defined in runnerLaunchers in the user subagent config.`);
-    const capabilityCeiling = params.capabilityCeiling ?? resolveCurrentSubagentCapabilityCeiling(ctx.currentSessionId);
+    const launchParentSessionId = ctx.parentSessionId ?? ctx.currentSessionId;
+    const capabilityCeiling = params.capabilityCeiling ?? resolveCurrentSubagentCapabilityCeiling(launchParentSessionId);
     const inheritedNestedRoute = inheritedNestedRouteOf(ctx.childRuntime);
     const nestedAddress = inheritedNestedRoute ? inheritedNestedParentAddressOf(ctx.childRuntime) : undefined;
     const asyncDir = inheritedNestedRoute
@@ -1336,7 +1337,6 @@ export function executeAsyncChain(id, params) {
     const initialStatusAt = Date.now();
     const initialCompletionOwnerId = ctx.completionOwnerId ?? currentCompletionOwnerId();
     const completionOwnerProcess = currentRecordedPid();
-    const launchParentSessionId = ctx.parentSessionId ?? ctx.currentSessionId;
     try {
         writeRetainedRequiredChildExtensions(asyncDir, params.requiredExtensions ?? ctx.childRuntime?.requiredExtensions ?? resolveRequiredChildExtensions(launchParentSessionId ?? undefined));
     }
@@ -1600,7 +1600,7 @@ export function executeAsyncSingle(id, params) {
         if (unsupported.length > 0)
             return formatAsyncStartError("single", `Agent '${agentConfig.name}' uses runner.type='${externalRunnerType}' and does not support: ${unsupported.join(", ")}.`);
     }
-    const capabilityCeiling = intersectSubagentCapabilityCeilings(params.capabilityCeiling ?? resolveCurrentSubagentCapabilityCeiling(ctx.currentSessionId), ctx.childRuntime?.capabilityCeiling);
+    const capabilityCeiling = intersectSubagentCapabilityCeilings(params.capabilityCeiling ?? resolveCurrentSubagentCapabilityCeiling(ctx.parentSessionId ?? ctx.currentSessionId), ctx.childRuntime?.capabilityCeiling);
     try {
         assertAgentAllowedByCapabilityCeiling(agentConfig.name, capabilityCeiling);
     }
@@ -1612,6 +1612,9 @@ export function executeAsyncSingle(id, params) {
     const machineUnsupported = formatHerdrMachineRunnerUnsupported({ machine: requestedMachine, agentName: agentConfig.name, runnerType: agentConfig.runner?.type, adapter: agentConfig.runner?.type === "external-cli" ? agentConfig.runner.adapter : undefined, worktree: params.worktree });
     if (machineUnsupported)
         return formatAsyncStartError("single", machineUnsupported);
+    // Refuse before the runner starts; the placed launch would refuse only after the run exists.
+    if (requestedMachine && params.revivalLease)
+        return formatAsyncStartError("single", PLACED_RESTORE_UNSUPPORTED);
     const resolvedLauncher = resolveAgentRunnerLauncher(agentConfig, ctx.runnerLaunchers, requestedMachine);
     if (resolvedLauncher.error)
         return formatAsyncStartError("single", resolvedLauncher.error);

package/src/runs/background/async-job-tracker.js

@@ -2,7 +2,7 @@ import * as fs from "node:fs";
 import * as path from "node:path";
 import { renderWidget, widgetRenderKey } from "../../tui/render.js";
 import { formatControlNoticeMessage } from "../shared/subagent-control.js";
-import { DIRS, SUBAGENT_CHILD_STATUS_EVENT, SUBAGENT_CONTROL_EVENT, SUBAGENT_CONTROL_INTERCOM_EVENT, SUBAGENT_STEERING_NOTICE_EVENT, WIDGET_ANIMATION_INTERVAL_MS, } from "../../shared/types.js";
+import { DIRS, SUBAGENT_CHILD_STATUS_EVENT, SUBAGENT_CONTROL_EVENT, SUBAGENT_CONTROL_INTERCOM_EVENT, SUBAGENT_JOBS_CHANGED_EVENT, SUBAGENT_STEERING_NOTICE_EVENT, WIDGET_ANIMATION_INTERVAL_MS, } from "../../shared/types.js";
 import { readStatus, resolveWatchPath } from "../../shared/utils.js";
 import { normalizeParallelGroups } from "./parallel-groups.js";
 import { reconcileAsyncRun, reconcileNestedAsyncDescendants } from "./stale-run-reconciler.js";
@@ -63,6 +63,7 @@ export function createAsyncJobTracker(pi, state, asyncDirRoot, options = {}) {
     };
     const rerenderWidget = (ctx, jobs = Array.from(state.asyncJobs.values())) => {
         options.onJobsChanged?.();
+        pi.events.emit(SUBAGENT_JOBS_CHANGED_EVENT, { version: 1 });
         if (state.widgetsSuspended)
             return;
         renderWidget(ctx, options.widgetEnabled === false ? [] : jobs, options.widgetCollapsed, options.widgetLayout);

package/src/runs/background/async-resume.js

@@ -484,7 +484,8 @@ export function resolveAsyncResumeTarget(params, deps = {}, options = {}) {
     const requireSessionFile = options.requireSessionFile ?? true;
     const location = resolveAsyncRunLocation(params, asyncDirRoot, resultsDir);
     if (!location.asyncDir && !location.resultPath) {
-        throw new Error("Async run not found. Provide id or dir.");
+        const requested = params.id ?? params.runId;
+        throw new Error(requested ? `Async run not found for '${requested}'.` : "Async run not found. Provide id or dir.");
     }
     const reconciliation = location.asyncDir
         ? reconcileAsyncRun(location.asyncDir, { resultsDir, kill: deps.kill, now: deps.now })
@@ -606,7 +607,7 @@ export function resolveAsyncResumeTarget(params, deps = {}, options = {}) {
         ? intersectSubagentCapabilityCeilings(status?.admissionCapabilityCeiling, result?.admissionCapabilityCeiling)
         : intersectSubagentCapabilityCeilings(status?.capabilityCeiling, statusSteps[index]?.capabilityCeiling, result?.capabilityCeiling, resultSteps[index]?.capabilityCeiling);
     const managedWorktreeCwd = location.asyncDir
-        ? resolveRetainedWorktreeCwd(parallelHandoffPath(location.asyncDir), runId, index)
+        ? resolveRetainedWorktreeCwd(parallelHandoffPath(location.asyncDir), runId, index, statusSteps[index]?.worktreePath)
         : undefined;
     const resumeCwd = validateResumeCwd(runId, managedWorktreeCwd ?? status?.cwd ?? result?.cwd ?? recoveryDescriptor?.cwd);
     return {

package/src/runs/background/auto-drain.js

@@ -1,6 +1,5 @@
-import { snapshotBackgroundWork } from "../../api/background-work.js";
 import { listAsyncRuns } from "./async-status.js";
-import { waitForSubagents, waitRunScopes } from "./subagent-wait.js";
+import { backgroundWorkForSession, waitForSubagents, waitRunScopes } from "./subagent-wait.js";
 export const DEFAULT_AUTO_DRAIN_TIMEOUT_MS = 30 * 60 * 1000;
 function resultText(value) {
     return value.content.map((part) => part.type === "text" ? part.text : "").join(" ").trim();
@@ -14,7 +13,7 @@ function hasOutstandingWork(deps, sessionId, nowMs, observation) {
         includeNested: false,
     }, observation?.status));
     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;
 }
 /** Drain all work owned by the current headless session, including work added while draining. */
 export async function drainOutstandingWork(deps, observation) {

package/src/runs/background/fleet-view.js

@@ -164,7 +164,7 @@ function sessionMessageParts(record) {
         }
         if (entry.type === "toolCall" || entry.type === "tool_call") {
             const name = typeof entry.name === "string" ? entry.name : typeof entry.toolName === "string" ? entry.toolName : "tool";
-            parts.push({ role, kind: "toolCall", name, text: `[tool: ${name}${entry.args === undefined ? "" : ` ${stringifyJsonPreview(entry.args)}`}]` });
+            parts.push({ role, kind: "toolCall", name, text: `[tool: ${name}${entry.arguments === undefined ? "" : ` ${stringifyJsonPreview(entry.arguments)}`}]` });
             continue;
         }
         if (entry.type === "toolResult" || entry.type === "tool_result") {

package/src/runs/background/retained-children.js

@@ -52,7 +52,7 @@ function childResumability(run, step) {
     }
     let requiredCwd;
     try {
-        requiredCwd = resolveRetainedWorktreeCwd(parallelHandoffPath(run.asyncDir), run.id, step.index) ?? recoveryDescriptor.cwd ?? run.cwd;
+        requiredCwd = resolveRetainedWorktreeCwd(parallelHandoffPath(run.asyncDir), run.id, step.index, step.worktreePath) ?? recoveryDescriptor.cwd ?? run.cwd;
         if (!requiredCwd || !fs.statSync(requiredCwd).isDirectory())
             return { state: "not-resumable", reason: `required cwd is missing: ${requiredCwd ?? "unknown"}` };
     }

package/src/runs/background/run-child-session.js

@@ -69,6 +69,8 @@ export function runChildSession(input) {
         let queuedDrainHold = false;
         let compactionStartedReceived = false;
         let afterCompactionSettlement = false;
+        let terminalAgentEndReceived = false;
+        let compactionAfterFinalOpen = false;
         let finalDrainTimer;
         let finalHardFinishTimer;
         let watchdogTailTimer;
@@ -216,7 +218,8 @@ export function runChildSession(input) {
             finalDrainTimer = setTimeout(() => {
                 if (settled || promptSettled)
                     return;
-                if (input.launch.capture.finalDrainHeld() || observeQueuedDrainHold()) {
+                // Pi runs auto-compaction after the final agent_end and only then emits agent_settled.
+                if (input.launch.capture.finalDrainHeld() || observeQueuedDrainHold() || compactionAfterFinalOpen) {
                     finalDrainTimer = undefined;
                     armFinalDrainTimer();
                     return;
@@ -231,16 +234,22 @@ export function runChildSession(input) {
                         return;
                     settle(undefined, true);
                 }, HARD_FINISH_MS);
-                finalHardFinishTimer.unref?.();
             }, FINAL_STOP_GRACE_MS);
-            finalDrainTimer.unref?.();
         }
-        const applyChildLifecycle = (action) => {
+        const applyChildLifecycle = (action, event) => {
             if (action === "cancel-drain") {
-                cleanTerminalAssistantStopReceived = false;
+                // After a clean final stop, a non-retrying agent_end may be the child's last event
+                // (Pi may not emit agent_settled), so it re-arms the drain instead of cancelling it.
+                terminalAgentEndReceived = event?.type === "agent_end" && event.willRetry !== true && cleanTerminalAssistantStopReceived;
                 agentSettledReceived = false;
                 clearFinalDrainTimers();
                 clearWatchdogTailTimer();
+                if (terminalAgentEndReceived) {
+                    startFinalDrain();
+                    return;
+                }
+                cleanTerminalAssistantStopReceived = false;
+                compactionAfterFinalOpen = false;
                 return;
             }
             if (action === "start-drain")
@@ -314,11 +323,18 @@ export function runChildSession(input) {
                 compactionStartedReceived = true;
                 if (agentSettledReceived)
                     afterCompactionSettlement = true;
+                if (terminalAgentEndReceived)
+                    compactionAfterFinalOpen = true;
             }
             if (event.type === "compaction_end" && event.willRetry === true) {
                 compactionStartedReceived = false;
                 afterCompactionSettlement = false;
             }
+            if (event.type === "compaction_end" && event.willRetry !== true && compactionAfterFinalOpen) {
+                compactionAfterFinalOpen = false;
+                clearFinalDrainTimers();
+                startFinalDrain();
+            }
             if (event.type === "turn_start" || event.type === "agent_start" || event.type === "auto_retry_start") {
                 queuedDrainHold = false;
             }
@@ -331,7 +347,7 @@ export function runChildSession(input) {
                 agentSettledReceived = true;
                 afterCompactionSettlement = compactionStartedReceived;
             }
-            applyChildLifecycle(lifecycleAction);
+            applyChildLifecycle(lifecycleAction, event);
             if (isChildWatchdogStatusEvent(event)) {
                 if (!input.childWatchdog)
                     return;

package/src/runs/background/subagent-wait.d.ts

@@ -100,7 +100,7 @@ export interface SubagentWaitDeps {
     };
     /** Injectable provider protocol surfaces for deterministic tests. */
     backgroundWork?: {
-        snapshot(sessionId: string, nowMs: number): BackgroundWorkSnapshot;
+        snapshot(sessionIds: readonly string[], nowMs: number): BackgroundWorkSnapshot;
         wakeChannels(): readonly string[];
     };
     /**
@@ -111,6 +111,7 @@ export interface SubagentWaitDeps {
      */
     events?: WaitEventBus;
 }
+export declare function backgroundWorkForSession(deps: Pick<SubagentWaitDeps, "state" | "backgroundWork">, nowMs: number): BackgroundWorkSnapshot;
 export declare function waitRunScopes(deps: Pick<SubagentWaitDeps, "asyncDirRoot" | "resultsDir" | "nestedRootRunId">): Array<{
     asyncDirRoot: string;
     resultsDir: string;

package/src/runs/background/subagent-wait.js

@@ -181,11 +181,14 @@ function hasSupervisorTool(run) {
 function backgroundWorkIdentity(item) {
     return `${item.provider}\0${item.sessionId}\0${item.id}`;
 }
-function backgroundWorkForSession(deps, nowMs) {
+export 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);
+    // Providers may key items by the session file path or by getSessionId(); accept both.
+    const piSessionId = deps.state.supervisorOwnerSessionId;
+    const sessionIds = piSessionId ? [sessionId, piSessionId] : [sessionId];
+    return deps.backgroundWork?.snapshot(sessionIds, nowMs) ?? snapshotBackgroundWork(sessionIds, nowMs);
 }
 export function waitRunScopes(deps) {
     return [

package/src/runs/foreground/execution.js

@@ -561,6 +561,8 @@ async function runSingleAttempt(runtimeCwd, agent, task, model, options, shared)
         let agentSettledReceived = false;
         let queuedDrainHold = false;
         let compactionStartedReceived = false;
+        let terminalAgentEndReceived = false;
+        let compactionAfterFinalOpen = false;
         let finalDrainTimer;
         let finalHardFinishTimer;
         let watchdogTailTimer;
@@ -608,7 +610,8 @@ async function runSingleAttempt(runtimeCwd, agent, task, model, options, shared)
             finalDrainTimer = setTimeout(() => {
                 if (lifecycleFinished || sessionSettled)
                     return;
-                if (capture.finalDrainHeld() || observeQueuedDrainHold()) {
+                // Pi runs auto-compaction after the final agent_end and only then emits agent_settled.
+                if (capture.finalDrainHeld() || observeQueuedDrainHold() || compactionAfterFinalOpen) {
                     finalDrainTimer = undefined;
                     armFinalDrainTimer();
                     return;
@@ -623,9 +626,7 @@ async function runSingleAttempt(runtimeCwd, agent, task, model, options, shared)
                         return;
                     settle(undefined, true);
                 }, HARD_FINISH_MS);
-                finalHardFinishTimer.unref?.();
             }, FINAL_STOP_GRACE_MS);
-            finalDrainTimer.unref?.();
         };
         function armWatchdogTail() {
             if ((!cleanTerminalAssistantStopReceived && !agentSettledReceived) || watchdogTailTimer || lifecycleFinished || sessionSettled)
@@ -644,12 +645,20 @@ async function runSingleAttempt(runtimeCwd, agent, task, model, options, shared)
             }, childWatchdog?.watchdogTailTimeoutMs ?? 120_000);
             watchdogTailTimer.unref?.();
         }
-        const applyChildLifecycle = (action) => {
+        const applyChildLifecycle = (action, event) => {
             if (action === "cancel-drain") {
-                cleanTerminalAssistantStopReceived = false;
+                // After a clean final stop, a non-retrying agent_end may be the child's last event
+                // (Pi may not emit agent_settled), so it re-arms the drain instead of cancelling it.
+                terminalAgentEndReceived = event?.type === "agent_end" && event.willRetry !== true && cleanTerminalAssistantStopReceived;
                 agentSettledReceived = false;
                 clearFinalDrainTimers();
                 clearWatchdogTailTimer();
+                if (terminalAgentEndReceived) {
+                    startFinalDrain();
+                    return;
+                }
+                cleanTerminalAssistantStopReceived = false;
+                compactionAfterFinalOpen = false;
                 return;
             }
             if (action === "start-drain")
@@ -925,11 +934,18 @@ async function runSingleAttempt(runtimeCwd, agent, task, model, options, shared)
                 compactionStartedReceived = true;
                 if (agentSettledReceived)
                     afterCompactionSettlement = true;
+                if (terminalAgentEndReceived)
+                    compactionAfterFinalOpen = true;
             }
             if (evt.type === "compaction_end" && evt.willRetry === true) {
                 compactionStartedReceived = false;
                 afterCompactionSettlement = false;
             }
+            if (evt.type === "compaction_end" && evt.willRetry !== true && compactionAfterFinalOpen) {
+                compactionAfterFinalOpen = false;
+                clearFinalDrainTimers();
+                startFinalDrain();
+            }
             if (evt.type === "turn_start" || evt.type === "agent_start" || evt.type === "auto_retry_start") {
                 queuedDrainHold = false;
             }
@@ -956,7 +972,7 @@ async function runSingleAttempt(runtimeCwd, agent, task, model, options, shared)
                 agentSettledReceived = true;
                 afterCompactionSettlement = compactionStartedReceived;
             }
-            applyChildLifecycle(lifecycleAction);
+            applyChildLifecycle(lifecycleAction, evt);
             if (isChildWatchdogStatusEvent(evt)) {
                 if (!childWatchdog)
                     return;

package/src/runs/foreground/subagent-executor.js

@@ -17,7 +17,7 @@ import { buildDoctorReport } from "../../extension/doctor.js";
 import { readSubagentGuide } from "../../extension/subagent-guide.js";
 import { isWorkflowScriptPath, normalizePublicSubagentExecution, validateWorkflowCapacityOverrides } from "../../extension/public-execution.js";
 import { readReplyWorkflowScript } from "../../extension/reply-workflow-script.js";
-import { disabledFeatureNotice, disabledFeatureUseError, resolveDisabledFeatureSurface } from "../../shared/disabled-features.js";
+import { disabledFeatureNotice, disabledFeatureSectionNotice, disabledFeatureUseError, resolveDisabledFeatureSurface } from "../../shared/disabled-features.js";
 import { runSync } from "./execution.js";
 import { commandAction } from "./command-action.js";
 import { handleWatchdogToolAction, WATCHDOG_TOOL_ACTIONS } from "../../watchdog/tool-actions.js";
@@ -87,7 +87,7 @@ import { formatHerdrMachineRunnerUnsupported, resolveMachinePlacement } from "..
 import { lookupRunnerLauncher, resolveAgentRunnerLauncher } from "../shared/runner-launcher.js";
 import { applyForceTopLevelAsyncOverride } from "../background/top-level-async.js";
 import { handleMissionAction, MISSION_ACTIONS } from "../../missions/actions.js";
-import { attachMissionToLaunchResult, prepareMissionLaunch, writeMissionAsyncBinding } from "../../missions/lifecycle.js";
+import { attachMissionToLaunchResult, missionAcceptanceStatus, prepareMissionLaunch, writeMissionAsyncBinding } from "../../missions/lifecycle.js";
 import { MissionNotFoundError, updateMission } from "../../missions/store.js";
 import { createMissionWorkflowState } from "../../missions/workflow-state.js";
 import { resolveAuthorityDecision } from "../../policy/authority.js";
@@ -678,9 +678,6 @@ function resolveForegroundResumeTarget(params, state, options = {}) {
         ...(child.capabilityCeiling ? { capabilityCeiling: child.capabilityCeiling } : {}),
     };
 }
-function isAsyncRunNotFound(error) {
-    return error instanceof Error && error.message.startsWith("Async run not found.");
-}
 function isMissingExactAsyncStatusFile(error, requested) {
     return error instanceof Error && error.message === `Status file not found for async run '${requested}'.`;
 }
@@ -750,38 +747,12 @@ function resolveResumeTarget(params, state, options = {}) {
             throw foregroundError;
         return asyncTarget;
     }
-    if (foregroundError && !isAsyncRunNotFound(asyncError))
-        throw foregroundError;
     if (foregroundError)
         throw foregroundError;
     if (asyncError)
         throw asyncError;
     throw new Error("Run not found. Provide id or runId.");
 }
-function getAsyncInterruptTarget(state, runId, location, options = {}) {
-    if (location?.asyncDir) {
-        return {
-            asyncId: location.resolvedId ?? runId ?? path.basename(location.asyncDir),
-            asyncDir: location.asyncDir,
-        };
-    }
-    if (runId) {
-        const direct = state.asyncJobs.get(runId);
-        if (direct)
-            return { asyncId: direct.asyncId, asyncDir: direct.asyncDir };
-        if (options.fallbackToNewest === false)
-            return undefined;
-    }
-    let newest;
-    for (const job of state.asyncJobs.values()) {
-        if (job.status !== "running")
-            continue;
-        if (!newest || (job.updatedAt ?? 0) > newest.updatedAt) {
-            newest = { asyncId: job.asyncId, asyncDir: job.asyncDir, updatedAt: job.updatedAt ?? 0 };
-        }
-    }
-    return newest ? { asyncId: newest.asyncId, asyncDir: newest.asyncDir } : undefined;
-}
 function isStaleExtensionContextError(error) {
     if (!(error instanceof Error))
         return false;
@@ -853,13 +824,13 @@ function emitControlNotification(input) {
     }
 }
 function interruptAsyncRun(state, runId, kill, location) {
-    const target = getAsyncInterruptTarget(state, runId, location, { fallbackToNewest: runId === undefined });
+    const target = location?.asyncDir ? { asyncId: location.resolvedId ?? runId, asyncDir: location.asyncDir } : state.asyncJobs.get(runId);
     if (!target)
         return null;
     const status = reconcileAsyncRun(target.asyncDir, omitUndefinedProperties({ kill })).status;
     if (!status || status.state !== "running" || typeof status.pid !== "number") {
         return {
-            content: [{ type: "text", text: `No running async run with an interrupt-capable pid was found for '${runId ?? "current"}'.` }],
+            content: [{ type: "text", text: `No running async run with an interrupt-capable pid was found for '${runId}'.` }],
             isError: true,
             details: { mode: "management", results: [] },
         };
@@ -1086,7 +1057,7 @@ function appendStepToAsyncChain(input) {
         worktreeBranchPrefix: input.deps.config.worktreeBranchPrefix,
         asyncDir: resolved.location.asyncDir,
         validateOutputBindings: false,
-        capabilityCeiling: intersectSubagentCapabilityCeilings(status.capabilityCeiling, resolveCurrentSubagentCapabilityCeiling(asyncCtx.currentSessionId)),
+        capabilityCeiling: intersectSubagentCapabilityCeilings(status.capabilityCeiling, resolveCurrentSubagentCapabilityCeiling(asyncCtx.parentSessionId)),
         requiredExtensions: retainedRequiredExtensions,
     }));
     if ("error" in built) {
@@ -1562,7 +1533,7 @@ async function resumeExternalJobFollowUp(input) {
         availableModels: input.ctx.modelRegistry.getAvailable().map(toModelInfo),
         outputBaseDir: resolveSingleRunOutputBaseDir(input.deps, artifactsDir, runId),
         ...(input.absoluteDeadlineAt !== undefined ? { absoluteDeadlineAt: input.absoluteDeadlineAt } : {}),
-        capabilityCeiling: resolveCurrentSubagentCapabilityCeiling(currentSessionId),
+        capabilityCeiling: resolveCurrentSubagentCapabilityCeiling(input.ctx.sessionManager.getSessionId() ?? undefined),
         runFanoutBudget: createRunFanoutBudget(runId, resolveMaxSubagentSpawnsPerRun(input.deps.config.maxSubagentSpawnsPerRun)),
         activeAsyncCapacity,
         externalJobFollowUp: { sourceRunId: input.target.runId, sourceStepIndex: input.target.index, parentProviderJobId: externalJob.providerJobId, requestId, requestDigest },
@@ -1858,7 +1829,7 @@ async function resumeAsyncRun(input) {
             childIntercomTarget: intercomBridge.active ? (agent, index) => resolveSubagentIntercomTarget(runId, agent, index) : undefined,
             globalConcurrencyLimit: input.deps.config.globalConcurrencyLimit,
             runFanoutBudget: createRunFanoutBudget(runId, resolveMaxSubagentSpawnsPerRun(input.deps.config.maxSubagentSpawnsPerRun)),
-            capabilityCeiling: intersectSubagentCapabilityCeilings("capabilityCeiling" in target ? target.capabilityCeiling : undefined, resolveCurrentSubagentCapabilityCeiling(input.deps.state.currentSessionId)),
+            capabilityCeiling: intersectSubagentCapabilityCeilings("capabilityCeiling" in target ? target.capabilityCeiling : undefined, resolveCurrentSubagentCapabilityCeiling(input.ctx.sessionManager.getSessionId() ?? undefined)),
             thinkingCeiling: target.thinkingCeiling,
             activeAsyncCapacity,
         }));
@@ -2028,7 +1999,7 @@ async function resumeAsyncRun(input) {
         ...(input.params.toolBudget !== undefined ? { toolBudget: input.params.toolBudget } : {}),
         // Recovery descriptors, remembered foreground runs, and current workflow roots
         // preserve parent authority before the selected agent's descendant ceiling.
-        capabilityCeiling: intersectSubagentCapabilityCeilings(recoveryDescriptor?.capabilityCeiling ?? (target.source === "foreground" || (target.source === "async" && target.mode === "workflow") ? target.capabilityCeiling : undefined), resolveCurrentSubagentCapabilityCeiling(input.deps.state.currentSessionId)),
+        capabilityCeiling: intersectSubagentCapabilityCeilings(recoveryDescriptor?.capabilityCeiling ?? (target.source === "foreground" || (target.source === "async" && target.mode === "workflow") ? target.capabilityCeiling : undefined), resolveCurrentSubagentCapabilityCeiling(input.ctx.sessionManager.getSessionId() ?? undefined)),
         runFanoutBudget: input.params.runFanoutBudget ?? recoveryDescriptor?.runFanoutBudget ?? createRunFanoutBudget(runId, resolveMaxSubagentSpawnsPerRun(input.deps.config.maxSubagentSpawnsPerRun)),
         parentWorkflowRunId: input.params.workflowParentRunId,
         workflowKey: input.params.workflowKey,
@@ -5093,7 +5064,7 @@ export function createSubagentExecutor(deps) {
                 const eventsPath = path.join(asyncDir, "events.jsonl");
                 const startedAt = Date.now();
                 const currentSessionId = resolveCurrentSessionId(ctx.sessionManager);
-                const workflowCapabilityCeiling = intersectSubagentCapabilityCeilings(requestParams.capabilityCeiling, resolveCurrentSubagentCapabilityCeiling(currentSessionId));
+                const workflowCapabilityCeiling = intersectSubagentCapabilityCeilings(requestParams.capabilityCeiling, resolveCurrentSubagentCapabilityCeiling(ctx.sessionManager.getSessionId() ?? undefined));
                 const completionOwnerId = deps.state.completionOwnerId ?? currentCompletionOwnerId();
                 deps.state.completionOwnerId = completionOwnerId;
                 const workflowScriptSourceDigest = workflowScriptDigest(requestParams.workflowScript);
@@ -5971,6 +5942,7 @@ export function createSubagentExecutor(deps) {
                                     ...(result.details.results[0]?.sessionFile ? { sessionPath: result.details.results[0].sessionFile } : {}),
                                     artifactPaths: child.artifactPaths,
                                     ...(["completed", "failed"].includes(childStatus) ? { completedAt: new Date().toISOString() } : {}),
+                                    acceptanceStatus: missionAcceptanceStatus(result.details.results),
                                     heartbeat: { status: childStatus, ...(childPhase ? { phase: childPhase } : {}) },
                                 });
                                 if (result.details.asyncId) {
@@ -6137,7 +6109,7 @@ export function createSubagentExecutor(deps) {
             let lastProgressAt = 0;
             let workflowProgressClosed = false;
             const workflowDeadlineAt = timeout === undefined ? undefined : Date.now() + timeout;
-            const workflowCapabilityCeiling = intersectSubagentCapabilityCeilings(requestParams.capabilityCeiling, resolveCurrentSubagentCapabilityCeiling(resolveCurrentSessionId(ctx.sessionManager)));
+            const workflowCapabilityCeiling = intersectSubagentCapabilityCeilings(requestParams.capabilityCeiling, resolveCurrentSubagentCapabilityCeiling(ctx.sessionManager.getSessionId() ?? undefined));
             const sendWorkflowProgress = () => {
                 if (workflowProgressClosed)
                     return;
@@ -6294,6 +6266,7 @@ export function createSubagentExecutor(deps) {
                             ...(result.details.results[0]?.sessionFile ? { sessionPath: result.details.results[0].sessionFile } : {}),
                             artifactPaths: child.artifactPaths,
                             ...(["completed", "failed"].includes(childStatus) ? { completedAt: new Date().toISOString() } : {}),
+                            acceptanceStatus: missionAcceptanceStatus(result.details.results),
                             heartbeat: { status: childStatus, ...(childPhase ? { phase: childPhase } : {}) },
                         });
                         return child;
@@ -6689,10 +6662,7 @@ export function createSubagentExecutor(deps) {
             if (action === "guide") {
                 try {
                     const guide = readSubagentGuide(paramsWithResolvedCwd.topic);
-                    const [topic, section] = paramsWithResolvedCwd.topic?.split("/") ?? [];
-                    const fullNotice = topic === "tool-reference" ? disabledFeatureNotice(disabledFeatures) : undefined;
-                    // Sections are capped at 8,000 chars, so they get a one-line pointer instead of the full list.
-                    const notice = fullNotice && section !== undefined ? "Some options and actions documented here are disabled by config in this session; guide topic tool-reference lists them." : fullNotice;
+                    const notice = paramsWithResolvedCwd.topic?.includes("/") ? disabledFeatureSectionNotice(disabledFeatures) : disabledFeatureNotice(disabledFeatures);
                     return {
                         content: [{ type: "text", text: notice ? `${notice}\n\n${guide}` : guide }],
                         details: { mode: "management", results: [] },
@@ -7064,22 +7034,22 @@ export function createSubagentExecutor(deps) {
                 if (stopResult)
                     return stopResult;
                 return {
-                    content: [{ type: "text", text: "No stoppable async run found in this session." }],
+                    content: [{ type: "text", text: `No stoppable async run found for '${targetRunId}'.` }],
                     isError: true,
                     details: { mode: "management", results: [] },
                 };
             }
             if (action === "interrupt") {
                 const targetRunId = paramsWithResolvedCwd.runId ?? paramsWithResolvedCwd.id;
+                if (!targetRunId)
+                    return { content: [{ type: "text", text: "action='interrupt' requires id." }], isError: true, details: { mode: "management", results: [] } };
                 let resolved;
-                if (targetRunId) {
-                    try {
-                        resolved = resolveSubagentRunId(targetRunId, omitUndefinedProperties({ state: deps.state, nested: nestedResolutionScopeForExecutor(deps) }));
-                    }
-                    catch (error) {
-                        const message = error instanceof Error ? error.message : String(error);
-                        return { content: [{ type: "text", text: message }], isError: true, details: { mode: "management", results: [] } };
-                    }
+                try {
+                    resolved = resolveSubagentRunId(targetRunId, omitUndefinedProperties({ state: deps.state, nested: nestedResolutionScopeForExecutor(deps) }));
+                }
+                catch (error) {
+                    const message = error instanceof Error ? error.message : String(error);
+                    return { content: [{ type: "text", text: message }], isError: true, details: { mode: "management", results: [] } };
                 }
                 if (resolved?.kind === "nested")
                     return interruptNestedRun(resolved);
@@ -7104,7 +7074,7 @@ export function createSubagentExecutor(deps) {
                 if (asyncInterruptResult)
                     return asyncInterruptResult;
                 return {
-                    content: [{ type: "text", text: "No interrupt-capable run found in this session." }],
+                    content: [{ type: "text", text: `No interrupt-capable run found for '${targetRunId}'.` }],
                     isError: true,
                     details: { mode: "management", results: [] },
                 };
@@ -7120,7 +7090,7 @@ export function createSubagentExecutor(deps) {
                 ...ctx,
                 cwd: requestCwd,
                 config: deps.config,
-                currentSessionId: deps.state.currentSessionId ?? ctx.sessionManager.getSessionId() ?? undefined,
+                piSessionId: ctx.sessionManager.getSessionId() ?? undefined,
                 discoverAgentsAll: deps.discoverAgentsAll,
                 runtimeAgentOwner: deps.pi,
                 onAgentsChanged: deps.onAgentsChanged,
@@ -7221,7 +7191,7 @@ export function createSubagentExecutor(deps) {
         let prepareForkSessionForIndex = async () => { };
         // Check before pruner/session preparation, then recheck immediately before each fork
         // because the session capability ceiling can tighten while preparation awaits.
-        const launchCapabilityCeiling = () => intersectSubagentCapabilityCeilings(intersectSubagentCapabilityCeilings(effectiveParams.capabilityCeiling, resolveCurrentSubagentCapabilityCeiling(requestSessionId)), deps.childRuntime?.capabilityCeiling);
+        const launchCapabilityCeiling = () => intersectSubagentCapabilityCeilings(intersectSubagentCapabilityCeilings(effectiveParams.capabilityCeiling, resolveCurrentSubagentCapabilityCeiling(requestPiSessionId)), deps.childRuntime?.capabilityCeiling);
         const assertLaunchableAgentsAllowedBeforeFork = () => {
             if (!contextPolicy.usesFork)
                 return;
@@ -7502,7 +7472,7 @@ export function createSubagentExecutor(deps) {
             scopedModelIds: scopedModelIdsFromContext(ctx),
             parentSessionId: requestSessionId,
             parentPiSessionId: requestPiSessionId,
-            capabilityCeiling: intersectSubagentCapabilityCeilings(effectiveParams.capabilityCeiling, resolveCurrentSubagentCapabilityCeiling(requestSessionId)),
+            capabilityCeiling: intersectSubagentCapabilityCeilings(effectiveParams.capabilityCeiling, resolveCurrentSubagentCapabilityCeiling(requestPiSessionId)),
             runFanoutBudget,
             topLevelAsyncCapacityEligible,
             activeAsyncCapacity,

package/src/runs/shared/capability-ceiling.d.ts

@@ -48,7 +48,8 @@ export declare function parseSubagentCapabilityCeiling(value: unknown, field?: s
 export declare function registerSubagentCapabilityCeiling(options: RegisterSubagentCapabilityCeilingOptions): SubagentCapabilityCeilingHandle;
 export declare function intersectSubagentCapabilityCeilings(...ceilings: Array<ResolvedSubagentCapabilityCeiling | undefined>): ResolvedSubagentCapabilityCeiling | undefined;
 export declare function resolveSubagentCapabilityCeiling(sessionId: string | undefined, inherited?: ResolvedSubagentCapabilityCeiling): ResolvedSubagentCapabilityCeiling | undefined;
-export declare function resolveCurrentSubagentCapabilityCeiling(sessionId: string | undefined): ResolvedSubagentCapabilityCeiling | undefined;
+/** Ceilings are registered under `ctx.sessionManager.getSessionId()`; pass that id, never the session file path. */
+export declare function resolveCurrentSubagentCapabilityCeiling(piSessionId: string | undefined): ResolvedSubagentCapabilityCeiling | undefined;
 export declare function isAgentAllowedByCapabilityCeiling(agentName: string, ceiling: ResolvedSubagentCapabilityCeiling | undefined): boolean;
 export declare function capabilityCeilingAgentRestrictionMessage(agentName: string, ceiling: ResolvedSubagentCapabilityCeiling | undefined): string | undefined;
 export declare function assertAgentAllowedByCapabilityCeiling(agentName: string, ceiling: ResolvedSubagentCapabilityCeiling | undefined): void;

package/src/runs/shared/capability-ceiling.js

@@ -135,8 +135,9 @@ export function resolveSubagentCapabilityCeiling(sessionId, inherited) {
     }
     return intersectSubagentCapabilityCeilings(inherited, ...active);
 }
-export function resolveCurrentSubagentCapabilityCeiling(sessionId) {
-    return resolveSubagentCapabilityCeiling(sessionId, undefined);
+/** Ceilings are registered under `ctx.sessionManager.getSessionId()`; pass that id, never the session file path. */
+export function resolveCurrentSubagentCapabilityCeiling(piSessionId) {
+    return resolveSubagentCapabilityCeiling(piSessionId, undefined);
 }
 export function isAgentAllowedByCapabilityCeiling(agentName, ceiling) {
     return ceiling?.allowedAgents === undefined || ceiling.allowedAgents.includes(agentName);

package/src/runs/shared/child-launch.js

@@ -45,7 +45,7 @@ function escapeXmlAttr(value) {
 function inheritedCapabilityCeiling(inherited) {
     return inherited?.capabilityCeiling;
 }
-/** Environment values external child extensions read; only the runner applies them. */
+/** Environment values external child extensions read in the runner, which hosts only children. */
 function childProcessEnv(input, toolPlan) {
     const env = {};
     env[PI_SUBAGENT_EXTENSION_BINDINGS_ENV] = encodeExtensionBindings(input.extensionBindings);
@@ -222,7 +222,10 @@ export function buildInProcessChildLaunch(input) {
         requiredExtensions: toolPlan.requiredExtensions,
         ambientExtensions,
         hooks: capturedHooks.hooks,
-        ...(input.host === "runner" ? { processEnv: childProcessEnv(input, toolPlan) } : {}),
+        // A foreground child gets only its own bindings, so it never sees those of the session that launched it.
+        ...(input.host === "runner"
+            ? { processEnv: childProcessEnv(input, toolPlan) }
+            : { processEnv: { [PI_SUBAGENT_EXTENSION_BINDINGS_ENV]: encodeExtensionBindings(input.extensionBindings) }, restoreProcessEnv: true }),
         runtime: config,
         noSkills: !input.inheritSkills,
         noContextFiles: !input.inheritProjectContext,

package/src/runs/shared/child-session.d.ts

@@ -80,6 +80,12 @@ export interface ChildSessionLaunch {
      * window one at a time. An undefined value removes the variable.
      */
     processEnv?: Record<string, string | undefined>;
+    /**
+     * Restore the hosting process's previous values of `processEnv` once that
+     * window ends, so a child hosted in the parent's own process leaves the
+     * parent's environment as it found it.
+     */
+    restoreProcessEnv?: boolean;
     /** The typed runtime config the hooks were built from; informational for factories. */
     runtime: ChildRuntimeConfig;
     onExtensionError?: (error: ChildSessionExtensionError) => void;