pi-subagents 0.74.0 → 0.75.0

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

@@ -19,6 +19,7 @@ import { isWorkflowScriptPath, normalizePublicSubagentExecution, validateWorkflo
 import { readReplyWorkflowScript } from "../../extension/reply-workflow-script.js";
 import { disabledFeatureNotice, 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";
 import { applyWatchdogLaunchRules } from "../../watchdog/rules.js";
 import { childWatchdogProgressForModel } from "../../watchdog/child-status.js";
@@ -54,7 +55,7 @@ import { usageBudgetExceededMessage, usageBudgetState, validateUsageBudgetConfig
 import { assertAgentAllowedByCapabilityCeiling, intersectSubagentCapabilityCeilings, resolveCurrentSubagentCapabilityCeiling } from "../shared/capability-ceiling.js";
 import { isAgentContract } from "../shared/agent-contract.js";
 import { normalizeExtensionBindings } from "../shared/extension-bindings.js";
-import { resolveRequiredChildExtensions } from "../../shared/required-child-extensions.js";
+import { assertRequiredChildExtensionsAdmitted, hasMandatoryRequiredChildExtensions, readRetainedRequiredChildExtensions, resolveRequiredChildExtensions } from "../../shared/required-child-extensions.js";
 import { finalizeSingleOutput, injectSingleOutputInstruction, normalizeSingleOutputOverride, outputPathMappingFromTask, resolveSingleOutputPath, validateFileOnlyOutputMode } from "../shared/single-output.js";
 import { assertJsonSchemaObject, cleanupStructuredOutputRuntime, createStructuredOutputRuntime } from "../shared/structured-output.js";
 import { compactForegroundDetails, getSingleResultOutput, PROMPT_REDACTED, readStatus, resolveChildCwd, sumResultsCost, sumResultsUsage, toAgentToolUsage } from "../../shared/utils.js";
@@ -109,8 +110,8 @@ import { cleanupWorktrees, createWorktrees, preflightWorktreeSource, withWorktre
 import { createWorktreeCleanupPlan, formatWorktreeCleanupPlan } from "../shared/worktree-cleanup-plan.js";
 import { DIRS, DEFAULT_ARTIFACT_CONFIG, DEFAULT_MAX_OUTPUT, DEFAULT_FORK_PREAMBLE, SUBAGENT_ACTIONS, SUBAGENT_ASYNC_STARTED_EVENT, SUBAGENT_CHILD_STATUS_EVENT, SUBAGENT_CONTROL_EVENT, SUBAGENT_CONTROL_INTERCOM_EVENT, SUBAGENT_FOREGROUND_COMPLETE_EVENT, SUBAGENT_LIFECYCLE_ARTIFACT_VERSION, checkSubagentDepth, resolveChildMaxSubagentDepth, resolveCurrentMaxSubagentDepth, resolveMaxSubagentSpawnsPerRun, truncateOutput, wrapForkTask, } from "../../shared/types.js";
 import { deriveChildSessionName } from "../../shared/child-session-name.js";
-const MUTATING_MANAGEMENT_ACTIONS = new Set(["create", "update", "delete", "eject", "disable", "enable", "reset", "grant-spawn-budget", "watchdog.configure", "mission.create", "mission.update", "mission.resolve-decision", "mission.attach-run", "mission.close", "inspector.open", "inspector.close", "project.open", "project.close", "worktree.discard", "worktree.cleanup", "lane.recordMerge", "lane.recordSupersession", "refine", "refine.rollback", "dismiss", "schedule.create", "schedule.pause", "schedule.resume", "schedule.run", "schedule.run-due", "schedule.delete"]);
-const DESTRUCTIVE_MANAGEMENT_ACTIONS = new Set(["delete", "eject", "disable", "reset", "mission.close", "worktree.discard", "refine.rollback", "inspector.close", "project.close", "stop", "interrupt", "schedule.delete"]);
+const MUTATING_MANAGEMENT_ACTIONS = new Set(["command.yield", "command.cancel", "create", "update", "delete", "eject", "disable", "enable", "reset", "grant-spawn-budget", "watchdog.configure", "mission.create", "mission.update", "mission.resolve-decision", "mission.attach-run", "mission.close", "inspector.open", "inspector.close", "project.open", "project.close", "worktree.discard", "worktree.cleanup", "lane.recordMerge", "lane.recordSupersession", "refine", "refine.rollback", "dismiss", "schedule.create", "schedule.pause", "schedule.resume", "schedule.run", "schedule.run-due", "schedule.delete"]);
+const DESTRUCTIVE_MANAGEMENT_ACTIONS = new Set(["command.cancel", "delete", "eject", "disable", "reset", "mission.close", "worktree.discard", "refine.rollback", "inspector.close", "project.close", "stop", "interrupt", "schedule.delete"]);
 function resolveSteerDeliveryMode(mode) {
     return mode === "steer" || mode === "follow_up" || mode === "auto" ? mode : undefined;
 }
@@ -960,6 +961,17 @@ function appendStepToAsyncChain(input) {
             details: { mode: "management", results: [] },
         };
     }
+    let retainedRequiredExtensions;
+    try {
+        retainedRequiredExtensions = readRetainedRequiredChildExtensions(resolved.location.asyncDir);
+    }
+    catch (error) {
+        return {
+            content: [{ type: "text", text: `Cannot append step to run '${resolved.id}': ${error instanceof Error ? error.message : String(error)}` }],
+            isError: true,
+            details: { mode: "management", results: [] },
+        };
+    }
     const pendingAppendRequests = readPendingChainAppendRequests(resolved.location.asyncDir);
     const reservedOutputNames = new Set([
         ...Object.keys(status.outputs ?? {}),
@@ -1031,6 +1043,7 @@ function appendStepToAsyncChain(input) {
         asyncDir: resolved.location.asyncDir,
         validateOutputBindings: false,
         capabilityCeiling: intersectSubagentCapabilityCeilings(status.capabilityCeiling, resolveCurrentSubagentCapabilityCeiling(asyncCtx.currentSessionId)),
+        requiredExtensions: retainedRequiredExtensions,
     }));
     if ("error" in built) {
         return {
@@ -3069,6 +3082,7 @@ async function runAsyncPath(data, deps) {
             goal: params.task ?? "",
             agentConfig: a,
             recoveryAgentConfig: data.recoveryAgents.find((agent) => agent.name === params.agent),
+            requiredExtensions: data.requiredExtensions,
             ctx: asyncCtx,
             availableModels,
             cwd: effectiveCwd,
@@ -3455,8 +3469,10 @@ async function runSinglePath(data, deps) {
     }
     let foregroundMachine;
     const requestedMachine = params.machine ?? agentConfig.machine;
+    const requiredExtensions = data.requiredExtensions ?? deps.childRuntime?.requiredExtensions ?? resolveRequiredChildExtensions(data.parentPiSessionId);
     if (requestedMachine) {
         try {
+            assertRequiredChildExtensionsAdmitted([requiredExtensions], { agent: agentConfig.name, runnerType: agentConfig.runner?.type, machine: requestedMachine });
             foregroundMachine = resolveHerdrMachinePlacement({ machine: requestedMachine, cwd: ctx.cwd, stepCwd: params.machineCwd }).machine;
         }
         catch (error) {
@@ -3643,7 +3659,6 @@ async function runSinglePath(data, deps) {
         }
         : undefined;
     const deadlineAt = data.deadlineAt ?? (data.timeoutMs !== undefined ? Date.now() + data.timeoutMs : undefined);
-    const requiredExtensions = deps.childRuntime?.requiredExtensions ?? resolveRequiredChildExtensions(data.parentPiSessionId);
     let r;
     let resolveDetachedWorkflowChild;
     const detachedWorkflowChild = params.workflowAwaitDetached === true
@@ -3900,6 +3915,7 @@ function duplicateSubagentCallResult(params) {
 }
 const workflowLaunchObservers = new WeakMap();
 const workflowOwnedUsageBudgets = new WeakMap();
+const workflowRetainedRequiredExtensions = new WeakMap();
 /**
  * Terminal-mission retention can remove a mission while its children still
  * report. Remember it to prevent later heartbeats from warning repeatedly.
@@ -4087,7 +4103,11 @@ function workflowOutputPathMappingSummary(children) {
     return mappings.length > 0 ? ` Output path mappings: ${mappings.join("; ")}.` : "";
 }
 function workflowDetailsResults(children) {
-    return children.flatMap((child) => (child.results ?? []).map((result) => result.workflowKey ? result : { ...result, workflowKey: child.key }));
+    return children.flatMap((child) => (child.results ?? []).map((result) => ({
+        ...result,
+        workflowKey: result.workflowKey ?? child.key,
+        ...(child.runId && !result.runId ? { runId: child.runId } : {}),
+    })));
 }
 function workflowSteerReceipt(key, result) {
     const steering = result.details.steering;
@@ -4625,6 +4645,7 @@ export function createSubagentExecutor(deps) {
     const execute = async (_id, params, signal, onUpdate, ctx, preserveActiveSession = false, parentModelOverride) => {
         const workflowLaunchObserver = workflowLaunchObservers.get(params);
         const inheritedUsageBudget = workflowOwnedUsageBudgets.get(params);
+        const retainedRequiredExtensions = workflowRetainedRequiredExtensions.get(params);
         const delegatedThinkingOverride = delegatedThinkingOverrides.get(params);
         const allowZeroToolBudget = delegatedZeroToolBudgets.has(params);
         const delegatedExecution = delegatedExecutions.has(params);
@@ -4655,6 +4676,12 @@ export function createSubagentExecutor(deps) {
                     ? currentParentModel
                     : rememberParentModel(deps.state, resolveCurrentSessionId(ctx.sessionManager), currentParentModel)) ?? null;
             })();
+        // validate checks args with the same normalization launch uses, reported beside script errors.
+        const validateWorkflowRequest = () => {
+            const validation = validateWorkflowScript(requestParams.workflowScript ?? "", workflowValidationOptions(deps, requestParams, ctx.cwd, () => resolveWorkflowParentModel()?.provider));
+            const normalizedArgs = normalizeWorkflowArgs(requestParams.args);
+            return "error" in normalizedArgs ? { ...validation, ok: false, errors: [...validation.errors, { message: normalizedArgs.error }] } : validation;
+        };
         try {
             if (requestParams.preflight !== undefined && requestParams.workflowScript === undefined) {
                 throw new Error("preflight requires workflow: true or a workflow script path.");
@@ -4666,7 +4693,7 @@ export function createSubagentExecutor(deps) {
         catch (error) {
             const message = error instanceof Error ? error.message : String(error);
             if (requestParams.action?.trim() === "validate") {
-                const validation = validateWorkflowScript(requestParams.workflowScript ?? "", workflowValidationOptions(deps, requestParams, ctx.cwd, () => resolveWorkflowParentModel()?.provider));
+                const validation = validateWorkflowRequest();
                 const invalidValidation = { ...validation, ok: false, errors: [...validation.errors, { message }] };
                 return {
                     content: [{ type: "text", text: JSON.stringify(invalidValidation) }],
@@ -4677,8 +4704,7 @@ export function createSubagentExecutor(deps) {
             return buildRequestedModeError(requestParams, message);
         }
         if (requestParams.action?.trim() === "validate") {
-            const validation = validateWorkflowScript(requestParams.workflowScript ?? "", workflowValidationOptions(deps, requestParams, ctx.cwd, () => resolveWorkflowParentModel()?.provider));
-            return buildWorkflowValidationResult(validation, "management", workflowPreflight);
+            return buildWorkflowValidationResult(validateWorkflowRequest(), "management", workflowPreflight);
         }
         const normalizedAction = typeof requestParams.action === "string" ? requestParams.action.trim() : requestParams.action;
         if (normalizedAction === "resume" && requestParams.extensionBindings !== undefined)
@@ -4713,6 +4739,9 @@ export function createSubagentExecutor(deps) {
             const acceptanceErrors = validateAcceptanceInput(requestParams.acceptance);
             if (acceptanceErrors.length > 0)
                 return buildRequestedModeError(requestParams, acceptanceErrors.join(" "));
+            // Capture mandatory host extensions at admission: script children may launch after the host disposes its registration.
+            const admittedRequiredExtensions = retainedRequiredExtensions ?? deps.childRuntime?.requiredExtensions ?? resolveRequiredChildExtensions(ctx.sessionManager.getSessionId() ?? undefined);
+            const workflowRequiredExtensions = hasMandatoryRequiredChildExtensions(admittedRequiredExtensions) ? admittedRequiredExtensions : undefined;
             const foregroundWorkflowRunId = encodeIndexSegment(_id);
             if (delegatedWorkflowPermit) {
                 const permitError = validateWorkflowChildPermitRoot(delegatedWorkflowPermit, foregroundWorkflowRunId);
@@ -5588,6 +5617,8 @@ export function createSubagentExecutor(deps) {
                                     preparedChildParams = childRequest;
                                     if (workflowUsageBudget.budget)
                                         workflowOwnedUsageBudgets.set(childRequest, workflowUsageBudget.budget);
+                                    if (workflowRequiredExtensions)
+                                        workflowRetainedRequiredExtensions.set(childRequest, workflowRequiredExtensions);
                                     workflowLaunchObservers.set(childRequest, (launch) => {
                                         if (launch.runId)
                                             appendWorkflowChildJournal(asyncDir, { type: "start", key, fingerprint: journalFingerprint, runId: launch.runId });
@@ -5910,6 +5941,8 @@ export function createSubagentExecutor(deps) {
                             preparedChildParams = childRequest;
                             if (workflowUsageBudget.budget)
                                 workflowOwnedUsageBudgets.set(childRequest, workflowUsageBudget.budget);
+                            if (workflowRequiredExtensions)
+                                workflowRetainedRequiredExtensions.set(childRequest, workflowRequiredExtensions);
                             if (delegatedWorkflowPermit) {
                                 if (childRequest.async !== false)
                                     throw new Error("Workflow child permit supports one foreground child only.");
@@ -6178,7 +6211,7 @@ export function createSubagentExecutor(deps) {
                     return { content: [{ type: "text", text: error instanceof Error ? error.message : String(error) }], isError: true, details: { mode: "management", results: [] } };
                 }
             }
-            const policyAction = action === "stop" ? "stopRun" : action === "steer" ? "steerRun" : action === "schedule.create" ? "scheduleCreate" : action === "inspector.open" ? "inspectorOpen" : action === "project.open" ? "projectOpen" : undefined;
+            const policyAction = action === "stop" || action === "command.cancel" ? "stopRun" : action === "steer" || action === "command.yield" ? "steerRun" : action === "schedule.create" ? "scheduleCreate" : action === "inspector.open" ? "inspectorOpen" : action === "project.open" ? "projectOpen" : undefined;
             if (policyAction) {
                 // Child-safe mode is a hard capability boundary; the policy is an operator
                 // preference. Refuse first, so the gate never prompts for an action that is
@@ -6402,6 +6435,23 @@ export function createSubagentExecutor(deps) {
                     details: { mode: "management", results: [], spawnBudget, activeAsyncCapacity },
                 };
             }
+            if (["command.status", "command.yield", "command.cancel"].includes(action)) {
+                try {
+                    if (deps.allowMutatingManagementActions === false && action !== "command.status")
+                        throw new Error(`Action '${action}' is not available from child-safe subagent fanout mode.`);
+                    const targetRunId = paramsWithResolvedCwd.id ?? paramsWithResolvedCwd.runId;
+                    if (!targetRunId || paramsWithResolvedCwd.dir)
+                        throw new Error(`${action} requires id or runId; directory targets are not supported.`);
+                    deps.state.currentSessionId = resolveCurrentSessionId(ctx.sessionManager);
+                    const target = resolveSubagentRunId(targetRunId, { state: deps.state, nested: nestedResolutionScopeForExecutor(deps) });
+                    if (!target)
+                        throw new Error(`No run found for '${targetRunId}'.`);
+                    return await commandAction({ state: deps.state, target, operation: action.slice("command.".length), index: paramsWithResolvedCwd.index, toolCallId: paramsWithResolvedCwd.toolCallId, signal });
+                }
+                catch (error) {
+                    return { content: [{ type: "text", text: error instanceof Error ? error.message : String(error) }], isError: true, details: { mode: "management", results: [] } };
+                }
+            }
             if (action === "status" || action === "debug.run") {
                 if (!preserveActiveSession)
                     deps.state.currentSessionId = resolveCurrentSessionId(ctx.sessionManager);
@@ -7088,6 +7138,7 @@ export function createSubagentExecutor(deps) {
             toolBudget: runToolBudget.toolBudget,
             usageBudget: usageBudget.budget,
             inheritedUsageBudget,
+            requiredExtensions: retainedRequiredExtensions,
             allowZeroToolBudget,
             configToolBudget: configToolBudget.toolBudget,
             configToolTimeoutMs: deps.config.toolTimeoutMs,
@@ -7373,7 +7424,9 @@ export function createSubagentExecutor(deps) {
         }
         else if (workflow !== undefined || publicParams.workflowScript !== undefined) {
             const normalizedArgs = normalizeWorkflowArgs(publicParams.args);
-            if ("error" in normalizedArgs)
+            // validate reports args errors with its script errors; launch rejects them here.
+            const validateOnly = publicParams.action === "validate";
+            if ("error" in normalizedArgs && !validateOnly)
                 return errorResult(normalizedArgs.error);
             let workflowScript = publicParams.workflowScript;
             if (workflow !== undefined) {
@@ -7383,7 +7436,7 @@ export function createSubagentExecutor(deps) {
                 workflowScript = source.script;
             }
             const { workflow: _workflow, ...withoutWorkflowSource } = publicParams;
-            publicParams = { ...withoutWorkflowSource, workflowScript, args: deepFreezeWorkflowArgs(normalizedArgs.args) };
+            publicParams = { ...withoutWorkflowSource, workflowScript, args: "error" in normalizedArgs ? publicParams.args : deepFreezeWorkflowArgs(normalizedArgs.args) };
         }
         publicExecutions.add(publicParams);
         return executeWithSingleDispatchGuard(id, publicParams, signal, onUpdate, ctx);