pi-subagents 0.83.0 → 0.84.0

package/bundle/{chunk-VTMNBPCQ.js → chunk-D3JAFGMO.js}

@@ -1,6 +1,6 @@
 import {
   getAgentDir
-} from "./chunk-7F5SK2U3.js";
+} from "./chunk-LNRJCP2Y.js";
 import {
   TEMP_ARTIFACTS_DIR
 } from "./chunk-JEZOSEWG.js";

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

@@ -11,10 +11,10 @@ import {
   startWatchdogDiffBaselineCapture,
   writeUserWatchdogEnabled,
   writeWatchdogModelSettings
-} from "./chunk-CZTMUBUI.js";
+} from "./chunk-7BWGNDNK.js";
 import {
   resolveGitRepositoryIdentity
-} from "./chunk-4BW55BTL.js";
+} from "./chunk-NENDSQUY.js";
 import {
   listAsyncRuns,
   ownsRun,
@@ -22,7 +22,7 @@ import {
   parseWorkflowChildSummary,
   readAsyncRecoveryDescriptor,
   resolveRetainedWorktreeCwd
-} from "./chunk-OOFW75PV.js";
+} from "./chunk-L3WFKBEI.js";
 import {
   deepFreezeWorkflowArgs,
   normalizeWorkflowArgs
@@ -50,21 +50,21 @@ import {
   resolveMissionStoreLocation,
   validateMissionId,
   workflowRunParamsFingerprint
-} from "./chunk-5ESXK62X.js";
+} from "./chunk-CGN2TVE7.js";
 import {
   requestAsyncCommand,
   watchAsyncControlInbox
-} from "./chunk-BKFWQ642.js";
+} from "./chunk-F4ASL6OV.js";
 import {
   supervisorChannelDir
-} from "./chunk-CSSZRTKY.js";
+} from "./chunk-V2BZYLEP.js";
 import {
   createHerdrClient,
   detectHerdr
-} from "./chunk-WG2OTTAK.js";
+} from "./chunk-2DHZTCOL.js";
 import {
   getProjectSubagentsDir
-} from "./chunk-VTMNBPCQ.js";
+} from "./chunk-D3JAFGMO.js";
 import {
   ExternalJobProviderError,
   getExternalJobProvider,
@@ -74,7 +74,7 @@ import {
 } from "./chunk-YYREO77V.js";
 import {
   mergeRuntimeAgents
-} from "./chunk-JHZ6DZ5M.js";
+} from "./chunk-G2Z6ZH26.js";
 import {
   CODE_OWNED_EXTERNAL_CLI_ADAPTER_LABEL,
   PI_CODING_AGENT_PACKAGE,
@@ -129,7 +129,7 @@ import {
   withFileLease,
   writeAtomicJson,
   writePrivateAtomicJson
-} from "./chunk-7F5SK2U3.js";
+} from "./chunk-LNRJCP2Y.js";
 import {
   DIRS,
   INTERCOM_DETACH_REQUEST_EVENT,
@@ -155,7 +155,7 @@ import {
   capabilityCeilingAgentRestrictionSources,
   isAgentAllowedByCapabilityCeiling,
   resolveCurrentSubagentCapabilityCeiling
-} from "./chunk-Z7KVHQHL.js";
+} from "./chunk-QXASAHIA.js";
 
 // src/inspectors/herdr/actions.ts
 import * as fs from "node:fs";
@@ -3757,7 +3757,7 @@ function handleList(params, ctx) {
   const d = discoverCatalog(ctx, ctx.cwd, ctx.model?.provider);
   let scopedAgents = effectiveAgentsForScope(scope, d, ctx.runtimeAgentOwner, ctx.model?.provider);
   scopedAgents = scopedAgents.sort((a, b) => a.name.localeCompare(b.name));
-  const capabilityCeiling = resolveCurrentSubagentCapabilityCeiling(ctx.currentSessionId);
+  const capabilityCeiling = resolveCurrentSubagentCapabilityCeiling(ctx.piSessionId);
   const visibleAgents = scopedAgents.filter((a) => !a.disabled);
   const agents = visibleAgents.filter((a) => isAgentAllowedByCapabilityCeiling(a.name, capabilityCeiling));
   const restrictedAgents = visibleAgents.filter((a) => !isAgentAllowedByCapabilityCeiling(a.name, capabilityCeiling));
@@ -3809,7 +3809,7 @@ function handleModels(params, ctx) {
   const availableModels = ctx.modelRegistry.getAvailable().map(toModelInfo);
   const currentModel = ctx.model ? { provider: ctx.model.provider, id: ctx.model.id } : void 0;
   const preferredProvider = ctx.model?.provider;
-  const capabilityCeiling = resolveCurrentSubagentCapabilityCeiling(ctx.currentSessionId);
+  const capabilityCeiling = resolveCurrentSubagentCapabilityCeiling(ctx.piSessionId);
   let selectedAgents = effectiveAgents;
   if (requestedAgent) {
     const matches = findAgentsInDiscovery(requestedAgent, discovered, scope, ctx.runtimeAgentOwner, ctx.model?.provider);
@@ -7683,6 +7683,9 @@ function createDefaultChildSessionFactory(options = {}) {
         get inheritedProvider() {
           return session.model && inheritedProviders.has(session.model.provider) ? session.model.provider : void 0;
         },
+        get claimedProvider() {
+          return session.model && !inheritedProviders.has(session.model.provider) && modelRuntime.getRegisteredProviderIds().includes(session.model.provider) ? session.model.provider : void 0;
+        },
         get virtualModelId() {
           return session.model?.api === "pi-virtual" ? `${session.model.provider}/${session.model.id}` : void 0;
         },
@@ -7718,7 +7721,7 @@ function childSessionFactory() {
 }
 function createLazyPlacementFactory(local) {
   let placed;
-  const factory = async () => placed ??= (await import("./chunk-XXKG3P2W.js")).createPlacementAwareChildSessionFactory(local);
+  const factory = async () => placed ??= (await import("./chunk-J5YL7LYR.js")).createPlacementAwareChildSessionFactory(local);
   return {
     async create(launch) {
       return launch.machine ? (await factory()).create(launch) : local.create(launch);
@@ -8026,7 +8029,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 || !fs16.statSync(requiredCwd).isDirectory()) return { state: "not-resumable", reason: `required cwd is missing: ${requiredCwd ?? "unknown"}` };
   } catch (error2) {
     return { state: "not-resumable", reason: `resume dependency unavailable: ${error2 instanceof Error ? error2.message : String(error2)}` };

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

@@ -4,7 +4,7 @@ import {
 import {
   resolveWatchPath,
   writeAtomicJson
-} from "./chunk-7F5SK2U3.js";
+} from "./chunk-LNRJCP2Y.js";
 import {
   POLL_INTERVAL_MS
 } from "./chunk-JEZOSEWG.js";

package/bundle/{chunk-JHZ6DZ5M.js → chunk-G2Z6ZH26.js}

@@ -8,7 +8,7 @@ import {
   validateCodeOwnedProfileRunner,
   validatePermissionRules,
   validateToolBudgetConfig
-} from "./chunk-7F5SK2U3.js";
+} from "./chunk-LNRJCP2Y.js";
 
 // src/agents/runtime-agent-registry.ts
 var RUNTIME_AGENT_REGISTRY_KEY = "pi-subagents.runtime-agents.v1";

package/bundle/{chunk-XXKG3P2W.js → chunk-J5YL7LYR.js}

@@ -13,10 +13,10 @@ import {
   rexGlobalArgs,
   runBoundedCommand,
   sshMachineAccess
-} from "./chunk-P2NCCTZP.js";
+} from "./chunk-2D52JFLF.js";
 import {
   package_default
-} from "./chunk-6B4ITO2W.js";
+} from "./chunk-NKQ6JNAS.js";
 import {
   HERDR_PI_MODE_ENV,
   HERDR_PI_PROTOCOL,
@@ -29,10 +29,10 @@ import {
 import {
   getAgentDir,
   getPiSpawnCommand
-} from "./chunk-7F5SK2U3.js";
+} from "./chunk-LNRJCP2Y.js";
 import "./chunk-JEZOSEWG.js";
 import "./chunk-YFCK7H2S.js";
-import "./chunk-Z7KVHQHL.js";
+import "./chunk-QXASAHIA.js";
 
 // src/runs/shared/herdr-placed-run.ts
 import { randomBytes as randomBytes2 } from "node:crypto";

package/bundle/{chunk-LDMXJIA6.js → chunk-JG4QKI5M.js}

@@ -3,7 +3,7 @@ import {
   projectRuntimeAcknowledgedExtensions,
   registerSubagentPromptBoundary,
   registerSubagentPromptRuntime
-} from "./chunk-CGXWSNPA.js";
+} from "./chunk-XDQORLZ5.js";
 import {
   INSPECTOR_ACTIONS,
   canQueueRetainedAsyncFollowUp,
@@ -25,13 +25,13 @@ import {
   updateSteeringTarget,
   waitForSteeringAction,
   workflowAsyncChildSteeringGuidance
-} from "./chunk-527E3D2J.js";
+} from "./chunk-4E7BKDTX.js";
 import {
   PLACED_RESTORE_UNSUPPORTED,
   formatHerdrMachineRunnerUnsupported,
   isRexLocalMachine,
   resolveMachinePlacement
-} from "./chunk-P2NCCTZP.js";
+} from "./chunk-2D52JFLF.js";
 import {
   COMPLETION_ACTION,
   DEFAULT_CONTROL_CONFIG,
@@ -120,7 +120,7 @@ import {
   workflowStopCause,
   writeWorkflowLaunchRecord,
   writeWorkflowReceipt
-} from "./chunk-CDI3GMNV.js";
+} from "./chunk-DZDETGRJ.js";
 import {
   NATIVE_SUPERVISOR_TOOL_NAME,
   SUBAGENT_PARENT_SESSION_ENV,
@@ -136,7 +136,7 @@ import {
   resolveWatchdogConfig,
   sendRuleViolationWarning,
   writeWatchdogModelSettings
-} from "./chunk-CZTMUBUI.js";
+} from "./chunk-7BWGNDNK.js";
 import {
   MAX_REMEMBERED_FOREGROUND_RUNS,
   discardRunningForegroundRun,
@@ -149,7 +149,7 @@ import {
   resolveSubagentRunId,
   resolveWorkflowChatProgress,
   stopAsyncRun
-} from "./chunk-4BW55BTL.js";
+} from "./chunk-NENDSQUY.js";
 import {
   MODEL_ONLY_TOOL,
   RunFanoutLimitError,
@@ -211,7 +211,7 @@ import {
   writeParallelHandoffGroup,
   writeRunFanoutBudgetDescriptor,
   writeWorktreeSetupHandoff
-} from "./chunk-OOFW75PV.js";
+} from "./chunk-L3WFKBEI.js";
 import {
   authorizeWorkflowResourceHost,
   claimWorkflowChildPermit,
@@ -228,10 +228,10 @@ import {
   canPreferFork,
   createForkContextResolver,
   resolveSubagentLaunchContext
-} from "./chunk-HLE22FSH.js";
+} from "./chunk-SSG7IEP5.js";
 import {
   handleRefinementAction
-} from "./chunk-Y3I6H6DV.js";
+} from "./chunk-LFDBD4PW.js";
 import {
   ActiveAsyncCapacityError,
   acquireActiveAsyncCapacity,
@@ -246,7 +246,7 @@ import {
   resolveDisabledFeatureSurface,
   resolveMaxActiveAsyncRunsPerSession,
   transferActiveAsyncCapacity
-} from "./chunk-RZJN63GU.js";
+} from "./chunk-PALJGGYC.js";
 import {
   DEFAULT_STALE_TERMINAL_ACTIVE_MARKER_MS,
   MACHINE_DIFF_OPTIONS,
@@ -280,6 +280,7 @@ import {
   inheritedNestedParentAddressOf,
   inheritedNestedRouteOf,
   initializeProcessTerminal,
+  missionAcceptanceStatus,
   nestedResultsPath,
   nestedRunNotActiveMessage,
   nestedRunScope,
@@ -325,7 +326,7 @@ import {
   writeNestedControlRequest,
   writeNestedControlResult,
   writeNestedEvent
-} from "./chunk-5ESXK62X.js";
+} from "./chunk-CGN2TVE7.js";
 import {
   closeSteerInbox,
   consumeSteerRequests,
@@ -333,7 +334,7 @@ import {
   readRevivalBriefs,
   requestAsyncSteer,
   watchAsyncControlInbox
-} from "./chunk-BKFWQ642.js";
+} from "./chunk-F4ASL6OV.js";
 import "./chunk-NIXWDZZV.js";
 import {
   INTERCOM_BRIDGE_MARKER,
@@ -342,7 +343,7 @@ import {
   resolveIntercomBridge,
   resolveIntercomSessionTarget,
   resolveSubagentIntercomTarget
-} from "./chunk-MHX22USZ.js";
+} from "./chunk-C5P5CHYK.js";
 import {
   resolveLaunchBinding,
   stableJsonDigest
@@ -356,7 +357,7 @@ import {
   resolvePiLaunchToolPlan,
   resolveRuntimeModulePath,
   supervisorChannelDir
-} from "./chunk-CSSZRTKY.js";
+} from "./chunk-V2BZYLEP.js";
 import {
   assertRequiredChildExtensionsAdmitted,
   hasMandatoryRequiredChildExtensions,
@@ -367,7 +368,7 @@ import {
 import {
   HERDR_PROJECT_PANE_ACTIONS,
   handleHerdrProjectPaneAction
-} from "./chunk-WG2OTTAK.js";
+} from "./chunk-2DHZTCOL.js";
 import "./chunk-7J4ZXMY7.js";
 import {
   PROJECT_SUBAGENTS_RELATIVE_DIR,
@@ -380,12 +381,12 @@ import {
   getProjectSubagentsDir,
   writeArtifact,
   writeMetadata
-} from "./chunk-VTMNBPCQ.js";
+} from "./chunk-D3JAFGMO.js";
 import "./chunk-XA3DY6UG.js";
 import {
   getExternalJobProvider
 } from "./chunk-YYREO77V.js";
-import "./chunk-JHZ6DZ5M.js";
+import "./chunk-G2Z6ZH26.js";
 import {
   ChainOutputValidationError,
   MAX_STREAMED_RECENT_TOOLS,
@@ -531,7 +532,7 @@ import {
   writeAtomicJson,
   writeInitialProgressFile,
   writePrivateAtomicJson
-} from "./chunk-7F5SK2U3.js";
+} from "./chunk-LNRJCP2Y.js";
 import {
   CHAIN_RUNS_DIR,
   DEFAULT_ARTIFACT_CONFIG,
@@ -569,7 +570,7 @@ import {
   assertAgentAllowedByCapabilityCeiling,
   intersectSubagentCapabilityCeilings,
   resolveCurrentSubagentCapabilityCeiling
-} from "./chunk-Z7KVHQHL.js";
+} from "./chunk-QXASAHIA.js";
 
 // src/runs/foreground/subagent-executor.ts
 import { randomUUID as randomUUID5 } from "node:crypto";
@@ -1648,6 +1649,11 @@ function sourceUnderNodeModules() {
 function supportsNativeRunner(nodeExecutable) {
   return Boolean(process.features.typescript) && typeof nodeModule.registerHooks === "function" && nodeExecutable === process.execPath && !sourceUnderNodeModules();
 }
+function parentExtensionProviderForChild(ctx, disableAmbientExtensions, model, availableModels, preferredProvider) {
+  if (!disableAmbientExtensions || !ctx.parentProviderRegistry) return void 0;
+  const provider = findModelInfo(model, availableModels, preferredProvider)?.provider;
+  return provider && ctx.parentProviderRegistry.getRegisteredProviderIds().includes(provider) ? provider : void 0;
+}
 var DEFAULT_ASYNC_TIMEOUT_MS = 30 * 60 * 1e3;
 function formatAsyncStartedMessage(headline, interactive) {
   const guidance = interactive ? [
@@ -2375,6 +2381,7 @@ function buildAsyncRunnerSteps(id, params) {
       runtimeSnapshotHost: ctx.pi
     });
     const launchResolvedExtensions = externalRunner ? void 0 : projectLaunchResolvedChildExtensions(toolPlan);
+    const parentExtensionProvider = externalRunner || machine ? void 0 : parentExtensionProviderForChild(ctx, toolPlan.disableAmbientExtensions, selectedModel, availableModels, a.modelProvider ?? ctx.currentModelProvider);
     if (externalRunner && permissionRules) {
       throw new AsyncStartValidationError(`Agent '${a.name}' uses runner.type='${externalRunnerType}', which cannot enforce native Pi child permission rules.`);
     }
@@ -2404,6 +2411,7 @@ function buildAsyncRunnerSteps(id, params) {
       thinking: resolveEffectiveThinking(selectedModel, effectiveThinking),
       ...thinkingCeiling ? { thinkingCeiling } : {},
       launchResolvedExtensions,
+      ...parentExtensionProvider ? { parentExtensionProvider } : {},
       ...requestedModel ? { requestedModel } : {},
       ...primaryModelFromParent ? { skipPrimaryModelVerification: true } : {},
       ...availableModels && availableModels.length > 0 ? { modelVerificationRegistry: availableModels } : {},
@@ -2621,7 +2629,8 @@ function executeAsyncChain(id, params) {
   if (acceptanceErrors.length > 0) return formatAsyncStartError(resultMode, acceptanceErrors.join(" "));
   const undefinedLauncher = chain.flatMap(getStepAgents).map((name) => agents.find((agent) => agent.name === name)?.launcher).find((name) => name !== void 0 && !lookupRunnerLauncher(ctx.runnerLaunchers, name));
   if (undefinedLauncher !== void 0) 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 inheritedNestedRoute2 = inheritedNestedRouteOf(ctx.childRuntime);
   const nestedAddress = inheritedNestedRoute2 ? inheritedNestedParentAddressOf(ctx.childRuntime) : void 0;
   const asyncDir = inheritedNestedRoute2 ? path5.join(TEMP_ROOT_DIR, "nested-subagent-runs", inheritedNestedRoute2.rootRunId, id) : path5.join(DIRS.async, id);
@@ -2713,7 +2722,6 @@ 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 ?? void 0));
   } catch (error) {
@@ -2973,7 +2981,7 @@ function executeAsyncSingle(id, params) {
     if (extensionBindings !== void 0) unsupported.push("extension bindings");
     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);
   } catch (error) {
@@ -3160,6 +3168,7 @@ function executeAsyncSingle(id, params) {
     runtimeSnapshotHost: ctx.pi
   });
   const launchResolvedExtensions = externalRunner ? void 0 : projectLaunchResolvedChildExtensions(toolPlan);
+  const parentExtensionProvider = externalRunner || machine ? void 0 : parentExtensionProviderForChild(ctx, toolPlan.disableAmbientExtensions, selectedModel, availableModels, agentConfig.modelProvider ?? ctx.currentModelProvider);
   const fast = params.fast ?? agentConfig.fast;
   const launchThinking = resolveEffectiveThinking(selectedModel, effectiveThinking);
   const { definitionDigest, launchContractDigest } = resolveLaunchBinding({
@@ -3282,6 +3291,7 @@ function executeAsyncSingle(id, params) {
             ...params.fast ?? agentConfig.fast ? { fast: params.fast ?? agentConfig.fast } : {},
             thinking: resolveEffectiveThinking(selectedModel, effectiveThinking),
             ...thinkingCeiling ? { thinkingCeiling } : {},
+            ...parentExtensionProvider ? { parentExtensionProvider } : {},
             ...requestedModel ? { requestedModel } : {},
             ...modelOrigin === "inherited" ? { skipPrimaryModelVerification: true } : {},
             ...availableModels && availableModels.length > 0 ? { modelVerificationRegistry: availableModels } : {},
@@ -10251,9 +10261,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}'.`;
 }
@@ -10311,32 +10318,10 @@ function resolveResumeTarget(params, state, options = {}) {
     if (isResumeAmbiguity(foregroundError) && !resumeTargetExact(asyncTarget, requested)) 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 ?? path18.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 void 0;
-  }
-  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 } : void 0;
-}
 function isStaleExtensionContextError2(error) {
   if (!(error instanceof Error)) return false;
   return /extension ctx is stale|stale after session replacement or reload/i.test(error.message);
@@ -10396,12 +10381,12 @@ function emitControlNotification(input) {
   }
 }
 function interruptAsyncRun(state, runId, kill, location) {
-  const target = getAsyncInterruptTarget(state, runId, location, { fallbackToNewest: runId === void 0 });
+  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: [] }
     };
@@ -10581,6 +10566,7 @@ function appendStepToAsyncChain(input) {
     parentSessionId: input.ctx.sessionManager.getSessionId() ?? void 0,
     parentSessionFile: input.ctx.sessionManager.getSessionFile() ?? void 0,
     currentModelProvider: parentModel?.provider,
+    parentProviderRegistry: input.ctx.modelRegistry,
     currentModel: parentModel,
     scopedModelIds: scopedModelIdsFromContext(input.ctx),
     modelScope: discoveredForAppend.modelScope,
@@ -10618,7 +10604,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) {
@@ -10983,6 +10969,7 @@ async function resumeExternalJobFollowUp(input) {
       parentSessionId: input.ctx.sessionManager.getSessionId() ?? void 0,
       parentSessionFile: input.ctx.sessionManager.getSessionFile() ?? void 0,
       currentModelProvider: parentModel?.provider,
+      parentProviderRegistry: input.ctx.modelRegistry,
       currentModel: parentModel,
       scopedModelIds: scopedModelIdsFromContext(input.ctx),
       modelScope: input.modelScope,
@@ -11011,7 +10998,7 @@ async function resumeExternalJobFollowUp(input) {
     availableModels: input.ctx.modelRegistry.getAvailable().map(toModelInfo),
     outputBaseDir: resolveSingleRunOutputBaseDir(input.deps, artifactsDir, runId),
     ...input.absoluteDeadlineAt !== void 0 ? { absoluteDeadlineAt: input.absoluteDeadlineAt } : {},
-    capabilityCeiling: resolveCurrentSubagentCapabilityCeiling(currentSessionId),
+    capabilityCeiling: resolveCurrentSubagentCapabilityCeiling(input.ctx.sessionManager.getSessionId() ?? void 0),
     runFanoutBudget: createRunFanoutBudget(runId, resolveMaxSubagentSpawnsPerRun(input.deps.config.maxSubagentSpawnsPerRun)),
     activeAsyncCapacity,
     externalJobFollowUp: { sourceRunId: input.target.runId, sourceStepIndex: input.target.index, parentProviderJobId: externalJob.providerJobId, requestId, requestDigest }
@@ -11252,6 +11239,7 @@ async function resumeAsyncRun(input) {
         parentSessionId: input.ctx.sessionManager.getSessionId() ?? void 0,
         parentSessionFile: input.ctx.sessionManager.getSessionFile() ?? void 0,
         currentModelProvider: parentModel2?.provider,
+        parentProviderRegistry: input.ctx.modelRegistry,
         currentModel: parentModel2,
         scopedModelIds: scopedModelIdsFromContext(input.ctx),
         modelScope,
@@ -11288,7 +11276,7 @@ async function resumeAsyncRun(input) {
       childIntercomTarget: intercomBridge.active ? (agent, index) => resolveSubagentIntercomTarget(runId2, agent, index) : void 0,
       globalConcurrencyLimit: input.deps.config.globalConcurrencyLimit,
       runFanoutBudget: createRunFanoutBudget(runId2, resolveMaxSubagentSpawnsPerRun(input.deps.config.maxSubagentSpawnsPerRun)),
-      capabilityCeiling: intersectSubagentCapabilityCeilings("capabilityCeiling" in target ? target.capabilityCeiling : void 0, resolveCurrentSubagentCapabilityCeiling(input.deps.state.currentSessionId)),
+      capabilityCeiling: intersectSubagentCapabilityCeilings("capabilityCeiling" in target ? target.capabilityCeiling : void 0, resolveCurrentSubagentCapabilityCeiling(input.ctx.sessionManager.getSessionId() ?? void 0)),
       thinkingCeiling: target.thinkingCeiling,
       activeAsyncCapacity: activeAsyncCapacity2
     }));
@@ -11375,6 +11363,7 @@ async function resumeAsyncRun(input) {
       parentSessionId: input.ctx.sessionManager.getSessionId() ?? void 0,
       parentSessionFile: input.ctx.sessionManager.getSessionFile() ?? void 0,
       currentModelProvider: parentModel?.provider,
+      parentProviderRegistry: input.ctx.modelRegistry,
       currentModel: parentModel,
       scopedModelIds: scopedModelIdsFromContext(input.ctx),
       modelScope,
@@ -11440,7 +11429,7 @@ async function resumeAsyncRun(input) {
     ...input.params.toolBudget !== void 0 ? { 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 : void 0), resolveCurrentSubagentCapabilityCeiling(input.deps.state.currentSessionId)),
+    capabilityCeiling: intersectSubagentCapabilityCeilings(recoveryDescriptor?.capabilityCeiling ?? (target.source === "foreground" || target.source === "async" && target.mode === "workflow" ? target.capabilityCeiling : void 0), resolveCurrentSubagentCapabilityCeiling(input.ctx.sessionManager.getSessionId() ?? void 0)),
     runFanoutBudget: input.params.runFanoutBudget ?? recoveryDescriptor?.runFanoutBudget ?? createRunFanoutBudget(runId, resolveMaxSubagentSpawnsPerRun(input.deps.config.maxSubagentSpawnsPerRun)),
     parentWorkflowRunId: input.params.workflowParentRunId,
     workflowKey: input.params.workflowKey,
@@ -12436,6 +12425,7 @@ async function runAsyncPath(data, deps) {
     parentSessionId: data.parentPiSessionId,
     parentSessionFile: ctx.sessionManager.getSessionFile() ?? void 0,
     currentModelProvider: parentModel?.provider,
+    parentProviderRegistry: ctx.modelRegistry,
     currentModel: parentModel,
     scopedModelIds: data.scopedModelIds,
     modelScope: data.modelScope,
@@ -14175,7 +14165,7 @@ function createSubagentExecutor(deps) {
         const eventsPath = path18.join(asyncDir, "events.jsonl");
         const startedAt = Date.now();
         const currentSessionId = resolveCurrentSessionId(ctx.sessionManager);
-        const workflowCapabilityCeiling2 = intersectSubagentCapabilityCeilings(requestParams.capabilityCeiling, resolveCurrentSubagentCapabilityCeiling(currentSessionId));
+        const workflowCapabilityCeiling2 = intersectSubagentCapabilityCeilings(requestParams.capabilityCeiling, resolveCurrentSubagentCapabilityCeiling(ctx.sessionManager.getSessionId() ?? void 0));
         const completionOwnerId = deps2.state.completionOwnerId ?? currentCompletionOwnerId();
         deps2.state.completionOwnerId = completionOwnerId;
         const workflowScriptSourceDigest = workflowScriptDigest(requestParams.workflowScript);
@@ -14919,6 +14909,7 @@ Parent action: ${COMPLETION_ACTION}` : content,
                   ...result2.details.results[0]?.sessionFile ? { sessionPath: result2.details.results[0].sessionFile } : {},
                   artifactPaths: child.artifactPaths,
                   ...["completed", "failed"].includes(childStatus) ? { completedAt: (/* @__PURE__ */ new Date()).toISOString() } : {},
+                  acceptanceStatus: missionAcceptanceStatus(result2.details.results),
                   heartbeat: { status: childStatus, ...childPhase ? { phase: childPhase } : {} }
                 });
                 if (result2.details.asyncId) {
@@ -15063,7 +15054,7 @@ Parent action: ${COMPLETION_ACTION}` : content,
       let lastProgressAt = 0;
       let workflowProgressClosed = false;
       const workflowDeadlineAt = timeout === void 0 ? void 0 : Date.now() + timeout;
-      const workflowCapabilityCeiling = intersectSubagentCapabilityCeilings(requestParams.capabilityCeiling, resolveCurrentSubagentCapabilityCeiling(resolveCurrentSessionId(ctx.sessionManager)));
+      const workflowCapabilityCeiling = intersectSubagentCapabilityCeilings(requestParams.capabilityCeiling, resolveCurrentSubagentCapabilityCeiling(ctx.sessionManager.getSessionId() ?? void 0));
       const sendWorkflowProgress = () => {
         if (workflowProgressClosed) return;
         if (activityTimer) clearTimeout(activityTimer);
@@ -15196,6 +15187,7 @@ Parent action: ${COMPLETION_ACTION}` : content,
               ...result2.details.results[0]?.sessionFile ? { sessionPath: result2.details.results[0].sessionFile } : {},
               artifactPaths: child.artifactPaths,
               ...["completed", "failed"].includes(childStatus) ? { completedAt: (/* @__PURE__ */ new Date()).toISOString() } : {},
+              acceptanceStatus: missionAcceptanceStatus(result2.details.results),
               heartbeat: { status: childStatus, ...childPhase ? { phase: childPhase } : {} }
             });
             return child;
@@ -15902,21 +15894,20 @@ ${item.text}` } : item)
         );
         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: deps2.state, nested: nestedResolutionScopeForExecutor(deps2) }));
-          } 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: deps2.state, nested: nestedResolutionScopeForExecutor(deps2) }));
+        } 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);
         const foreground = getForegroundControl(deps2.state, resolved?.kind === "foreground" ? resolved.id : targetRunId);
@@ -15944,7 +15935,7 @@ ${item.text}` } : item)
         );
         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: [] }
         };
@@ -15960,7 +15951,7 @@ ${item.text}` } : item)
         ...ctx,
         cwd: requestCwd,
         config: deps2.config,
-        currentSessionId: deps2.state.currentSessionId ?? ctx.sessionManager.getSessionId() ?? void 0,
+        piSessionId: ctx.sessionManager.getSessionId() ?? void 0,
         discoverAgentsAll: deps2.discoverAgentsAll,
         runtimeAgentOwner: deps2.pi,
         onAgentsChanged: deps2.onAgentsChanged
@@ -16062,7 +16053,7 @@ ${item.text}` } : item)
     let prepareForkSessionForIndex = async () => {
     };
     const launchCapabilityCeiling = () => intersectSubagentCapabilityCeilings(
-      intersectSubagentCapabilityCeilings(effectiveParams.capabilityCeiling, resolveCurrentSubagentCapabilityCeiling(requestSessionId)),
+      intersectSubagentCapabilityCeilings(effectiveParams.capabilityCeiling, resolveCurrentSubagentCapabilityCeiling(requestPiSessionId)),
       deps2.childRuntime?.capabilityCeiling
     );
     const assertLaunchableAgentsAllowedBeforeFork = () => {
@@ -16308,7 +16299,7 @@ ${item.text}` } : item)
       scopedModelIds: scopedModelIdsFromContext(ctx),
       parentSessionId: requestSessionId,
       parentPiSessionId: requestPiSessionId,
-      capabilityCeiling: intersectSubagentCapabilityCeilings(effectiveParams.capabilityCeiling, resolveCurrentSubagentCapabilityCeiling(requestSessionId)),
+      capabilityCeiling: intersectSubagentCapabilityCeilings(effectiveParams.capabilityCeiling, resolveCurrentSubagentCapabilityCeiling(requestPiSessionId)),
       runFanoutBudget,
       topLevelAsyncCapacityEligible,
       activeAsyncCapacity,