pi-subagents 0.72.1 → 0.73.0

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

@@ -101,7 +101,7 @@ import { deepFreezeWorkflowArgs, normalizeWorkflowArgs, resolveWorkflowResource
 import { stableJsonDigest } from "../../shared/launch-contract.js";
 import { cleanupWorktrees, createWorktrees, preflightWorktreeSource, withWorktreeTransaction, diffWorktrees, formatWorktreeDiffSummary, } from "../shared/worktree.js";
 import { createWorktreeCleanupPlan, formatWorktreeCleanupPlan } from "../shared/worktree-cleanup-plan.js";
-import { DIRS, DEFAULT_ARTIFACT_CONFIG, 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, wrapForkTask, } from "../../shared/types.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"]);
@@ -1518,6 +1518,14 @@ async function resumeAsyncRun(input) {
             details: { mode: "management", results: [] },
         };
     }
+    const timeoutOverflowError = timerDelayOverflowError("timeoutMs", input.params.timeoutMs);
+    if (timeoutOverflowError) {
+        return {
+            content: [{ type: "text", text: timeoutOverflowError }],
+            isError: true,
+            details: { mode: "management", results: [] },
+        };
+    }
     if (input.params.model !== undefined) {
         return {
             content: [{ type: "text", text: "action='resume' reuses the persisted child model and does not accept a model override." }],
@@ -2134,6 +2142,28 @@ function canonicalizeAgentName(name, agents, diagnostics, context) {
         return { error: formatUnknownAgentError(name, context) };
     return { name: resolved.agent.name };
 }
+// Mirrors child launch: workflow children without their own cwd/agentScope discover agents at the workflow cwd and scope.
+function workflowValidationOptions(deps, params, runtimeCwd, parentModelProvider) {
+    const cwd = resolveRequestedCwd(runtimeCwd, params.cwd);
+    const scope = resolveExecutionAgentScope(params.agentScope);
+    let discovered;
+    return {
+        maxSubagentSpawnsPerRun: params.maxSubagentSpawnsPerRun ?? resolveMaxSubagentSpawnsPerRun(deps.config.maxSubagentSpawnsPerRun),
+        agentNameError: (name) => {
+            discovered ??= deps.discoverAgents(cwd, scope, parentModelProvider());
+            const { agents } = discovered;
+            const resolved = resolveAgentName(name, agents);
+            if (resolved.agent || resolved.error)
+                return canonicalizeAgentName(name, agents, discovered.agentDiagnostics, diagnosticContextFromDiscovery(discovered, cwd, scope)).error;
+            const requested = name.trim().toLowerCase();
+            const suggestion = [...new Set(agents.flatMap((agent) => [agent.name, ...(agent.localName ? [agent.localName] : []), ...(agent.aliases ?? [])]))]
+                .map((candidate) => ({ candidate, distance: editDistance(requested, candidate.toLowerCase()) }))
+                .filter(({ candidate, distance }) => distance <= Math.max(1, Math.floor(candidate.length / 4)) || hasSingleAdjacentTransposition(requested, candidate.toLowerCase()))
+                .sort((left, right) => left.distance - right.distance || left.candidate.localeCompare(right.candidate))[0]?.candidate;
+            return `Unknown agent '${name}'.${suggestion ? ` Did you mean '${suggestion}'?` : ""} Use subagent({ action: "list" }) to inspect agents.`;
+        },
+    };
+}
 function canonicalizeExecutionParams(params, agents, diagnostics, context) {
     const resolve = (name, location) => {
         const result = canonicalizeAgentName(name, agents, diagnostics, context);
@@ -2535,6 +2565,11 @@ export { DEFAULT_ASYNC_TIMEOUT_MS };
  * for a timer must stay within this bound.
  */
 const MAX_TIMER_DELAY_MS = 2_147_483_647;
+function timerDelayOverflowError(name, value) {
+    return typeof value === "number" && value > MAX_TIMER_DELAY_MS
+        ? `${name} must be a positive integer no larger than ${MAX_TIMER_DELAY_MS}.`
+        : undefined;
+}
 /**
  * Resolve the optional global default runtime deadline from extension config
  * (`config.timeoutMs`). Returns undefined for unset or invalid values so callers
@@ -2559,6 +2594,9 @@ export function resolveForegroundTimeout(params, defaultTimeoutMs) {
         if (typeof value !== "number" || !Number.isInteger(value) || value <= 0) {
             return { error: `${name} must be a positive integer.` };
         }
+        const overflowError = timerDelayOverflowError(name, value);
+        if (overflowError)
+            return { error: overflowError };
     }
     if (rawTimeout !== undefined && rawMaxRuntime !== undefined && rawTimeout !== rawMaxRuntime) {
         return { error: "timeoutMs and maxRuntimeMs are aliases; provide only one value or use the same value for both." };
@@ -3170,6 +3208,36 @@ function writeWorkflowAggregateOutput(outputPath, text, producedChildOutputPaths
 function appendWorkflowOutputWarning(text, warning) {
     return warning ? `${text}\n\n${warning}` : text;
 }
+const WORKFLOW_TRACE_ERROR_MAX_CHARS = 500;
+// Return, emits, console, and trace errors (which carry child text) have no size limit of their
+// own, so only they are cut; other host sections stay whole. The saved full result is uncut.
+function formatWorkflowResultText(input) {
+    const traceSection = (error) => input.trace.length > 0
+        ? [`Call trace:\n${input.trace.map((entry) => `${entry.line}${entry.error ? ` — ${error(entry.error)}` : ""}`).join("\n")}`]
+        : [];
+    const fullText = [...input.head, ...input.script, ...traceSection((error) => error), ...input.tail].join("\n\n");
+    const outputWarning = writeWorkflowAggregateOutput(input.aggregateOutputPath, fullText, input.producedChildOutputPaths);
+    const scriptText = input.script.join("\n\n");
+    const config = { ...DEFAULT_MAX_OUTPUT, ...input.maxOutput };
+    const scriptCut = truncateOutput(scriptText, config).truncated;
+    const traceCut = input.trace.some((entry) => (entry.error?.length ?? 0) > WORKFLOW_TRACE_ERROR_MAX_CHARS);
+    let shownScriptText = scriptText;
+    let saveWarning;
+    let savedPath;
+    if (scriptCut || traceCut) {
+        const aggregateHoldsFullText = input.aggregateOutputPath !== undefined && !outputWarning
+            && !input.producedChildOutputPaths.has(resolveWorkflowHostOutputClaimPath(input.aggregateOutputPath));
+        if (!aggregateHoldsFullText)
+            saveWarning = writeWorkflowAggregateOutput(input.fullResultPath, fullText, new Set());
+        savedPath = aggregateHoldsFullText ? input.aggregateOutputPath : saveWarning ? undefined : input.fullResultPath;
+        if (scriptCut)
+            shownScriptText = truncateOutput(scriptText, config, savedPath).text;
+    }
+    const shownTrace = traceSection((error) => error.length > WORKFLOW_TRACE_ERROR_MAX_CHARS ? `${error.slice(0, WORKFLOW_TRACE_ERROR_MAX_CHARS)}… (+${error.length - WORKFLOW_TRACE_ERROR_MAX_CHARS} chars)` : error);
+    const traceNote = traceCut && !scriptCut && savedPath ? [`[TRUNCATED: trace errors shortened - full output at ${savedPath}]`] : [];
+    const text = [...input.head, ...(shownScriptText ? [shownScriptText] : []), ...shownTrace, ...input.tail, ...traceNote].join("\n\n");
+    return appendWorkflowOutputWarning(appendWorkflowOutputWarning(text, outputWarning), saveWarning);
+}
 export function resolveWorkflowChildLocalCwd(input) {
     if (input.params.machine !== undefined)
         return input.workflowCwd;
@@ -4536,6 +4604,15 @@ export function createSubagentExecutor(deps) {
         if (capacityOverrideError)
             return buildRequestedModeError(requestParams, capacityOverrideError);
         let workflowPreflight;
+        // Only workflow requests read the session here; other actions (for example doctor) must not.
+        const resolveWorkflowParentModel = () => parentModelOverride !== undefined
+            ? parentModelOverride
+            : (() => {
+                const currentParentModel = normalizeParentModel(ctx.model);
+                return (preserveActiveSession
+                    ? currentParentModel
+                    : rememberParentModel(deps.state, resolveCurrentSessionId(ctx.sessionManager), currentParentModel)) ?? null;
+            })();
         try {
             if (requestParams.preflight !== undefined && requestParams.workflowScript === undefined && requestParams.workflowScriptPath === undefined) {
                 throw new Error("preflight requires workflowScript or workflowScriptPath.");
@@ -4547,9 +4624,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 ?? "", {
-                    maxSubagentSpawnsPerRun: requestParams.maxSubagentSpawnsPerRun ?? resolveMaxSubagentSpawnsPerRun(deps.config.maxSubagentSpawnsPerRun),
-                });
+                const validation = validateWorkflowScript(requestParams.workflowScript ?? "", workflowValidationOptions(deps, requestParams, ctx.cwd, () => resolveWorkflowParentModel()?.provider));
                 const invalidValidation = { ...validation, ok: false, errors: [...validation.errors, { message }] };
                 return {
                     content: [{ type: "text", text: JSON.stringify(invalidValidation) }],
@@ -4560,9 +4635,7 @@ export function createSubagentExecutor(deps) {
             return buildRequestedModeError(requestParams, message);
         }
         if (requestParams.action?.trim() === "validate") {
-            const validation = validateWorkflowScript(requestParams.workflowScript ?? "", {
-                maxSubagentSpawnsPerRun: requestParams.maxSubagentSpawnsPerRun ?? resolveMaxSubagentSpawnsPerRun(deps.config.maxSubagentSpawnsPerRun),
-            });
+            const validation = validateWorkflowScript(requestParams.workflowScript ?? "", workflowValidationOptions(deps, requestParams, ctx.cwd, () => resolveWorkflowParentModel()?.provider));
             return buildWorkflowValidationResult(validation, "management", workflowPreflight);
         }
         const normalizedAction = typeof requestParams.action === "string" ? requestParams.action.trim() : requestParams.action;
@@ -4581,14 +4654,13 @@ export function createSubagentExecutor(deps) {
             const workflowArgsEvidence = requestParams.args === undefined ? undefined : { args: requestParams.args, argsDigest: stableJsonDigest(requestParams.args) };
             const workflowArgs = workflowArgsEvidence?.args;
             const workflowArgsDigest = workflowArgsEvidence?.argsDigest;
-            const workflowValidation = validateWorkflowScript(requestParams.workflowScript, {
-                maxSubagentSpawnsPerRun: requestParams.maxSubagentSpawnsPerRun ?? resolveMaxSubagentSpawnsPerRun(deps.config.maxSubagentSpawnsPerRun),
-            });
+            const workflowParentModel = resolveWorkflowParentModel();
+            const workflowValidation = validateWorkflowScript(requestParams.workflowScript, workflowValidationOptions(deps, requestParams, ctx.cwd, () => workflowParentModel?.provider));
             if (!workflowValidation.ok && publicExecution)
                 return buildWorkflowValidationResult(workflowValidation, "workflow", workflowPreflight);
-            const spawnBudgetErrors = workflowValidation.errors.filter((error) => error.kind === "spawn-budget");
-            if (spawnBudgetErrors.length > 0) {
-                return buildRequestedModeError(requestParams, `Workflow '${_id}' validation failed before child launch; no children launched. ${spawnBudgetErrors.map((error) => error.message).join(" ")}`);
+            const launchBlockingErrors = workflowValidation.errors.filter((error) => error.kind === "spawn-budget" || error.kind === "agent");
+            if (launchBlockingErrors.length > 0) {
+                return buildRequestedModeError(requestParams, `Workflow '${_id}' validation failed before child launch; no children launched. ${launchBlockingErrors.map((error) => error.message).join(" ")}`);
             }
             for (const warning of workflowValidation.warnings ?? [])
                 console.warn(`[pi-subagents] ${warning.message}`);
@@ -4603,14 +4675,6 @@ export function createSubagentExecutor(deps) {
                 if (requestParams.async !== false)
                     return buildRequestedModeError(requestParams, "Workflow child permit supports foreground workflow roots only; set async:false.");
             }
-            const workflowParentModel = parentModelOverride !== undefined
-                ? parentModelOverride
-                : (() => {
-                    const currentParentModel = normalizeParentModel(ctx.model);
-                    return (preserveActiveSession
-                        ? currentParentModel
-                        : rememberParentModel(deps.state, resolveCurrentSessionId(ctx.sessionManager), currentParentModel)) ?? null;
-                })();
             if (requestParams.extensionBindings !== undefined) {
                 try {
                     requestParams.extensionBindings = normalizeExtensionBindings(requestParams.extensionBindings).value;
@@ -4620,6 +4684,13 @@ export function createSubagentExecutor(deps) {
                 }
             }
             const parentCwd = ctx.cwd;
+            for (const [name, value] of [["timeoutMs", requestParams.timeoutMs], ["maxRuntimeMs", requestParams.maxRuntimeMs]]) {
+                if (value === undefined)
+                    continue;
+                const overflowError = timerDelayOverflowError(name, value);
+                if (overflowError)
+                    return buildRequestedModeError(requestParams, overflowError);
+            }
             const timeout = requestParams.timeoutMs ?? requestParams.maxRuntimeMs ?? (requestParams.async === false ? resolveConfigDefaultTimeoutMs(deps.config.timeoutMs) ?? DEFAULT_FOREGROUND_TIMEOUT_MS : undefined);
             const workflowUsageBudget = validateUsageBudgetConfig(requestParams.usageBudget ?? deps.config.usageBudget, requestParams.usageBudget ? "usageBudget" : "config.usageBudget");
             if (workflowUsageBudget.error)
@@ -5522,10 +5593,13 @@ export function createSubagentExecutor(deps) {
                         });
                         const finalPreflightWarnings = workflowPreflightWarnings(workflowPreflight, workflow.trace, { settled: true });
                         const finalPreflightTrace = annotateWorkflowPreflightTrace(workflow.trace, workflowPreflight);
-                        const returnPreview = formatWorkflowValue(workflow.value).slice(0, 1_000);
-                        const emitPreview = workflow.emits.length > 0 ? ` Emitted: ${workflow.emits.map(formatWorkflowValue).join(", ").slice(0, 1_000)}` : "";
+                        const returnText = formatWorkflowValue(workflow.value);
+                        const emitText = workflow.emits.map(formatWorkflowValue).join(", ");
+                        const returnPreview = returnText.length > 1_000 ? `${returnText.slice(0, 1_000)}…` : returnText;
+                        const emitPreview = workflow.emits.length > 0 ? ` Emitted: ${emitText.length > 1_000 ? `${emitText.slice(0, 1_000)}…` : emitText}` : "";
+                        const previewNote = returnText.length > 1_000 || emitText.length > 1_000 ? ` (truncated; full return value and emits: ${statusPath} (workflow.value, workflow.emits))` : "";
                         const runningSummary = workflowRunningChildrenSummary(workflow.children);
-                        const summary = `${runningSummary ? `Workflow dispatch completed; ${runningSummary}` : `Workflow completed with ${workflow.children.length} child run(s).`} Return: ${returnPreview}${emitPreview} Trace: ${workflow.trace.length} event(s).${workflowOutputPathMappingSummary(workflow.children)}${finalPreflightWarnings.length ? ` ${finalPreflightWarnings.join(" ")}` : ""}`;
+                        const summary = `${runningSummary ? `Workflow dispatch completed; ${runningSummary}` : `Workflow completed with ${workflow.children.length} child run(s).`} Return: ${returnPreview}${emitPreview}${previewNote} Trace: ${workflow.trace.length} event(s).${workflowOutputPathMappingSummary(workflow.children)}${finalPreflightWarnings.length ? ` ${finalPreflightWarnings.join(" ")}` : ""}`;
                         const outputWarning = writeWorkflowAggregateOutput(workflowAggregateOutputPath, summary, producedChildOutputPaths);
                         const resultSummary = appendWorkflowOutputWarning(summary, outputWarning);
                         const workflowUsage = sumResultsUsage(workflowResults);
@@ -5576,15 +5650,17 @@ export function createSubagentExecutor(deps) {
                         const workflowChildren = workflowChildSummary({ parentToolCallId: toolCallId, workflowRunId, workflowState, inventoryComplete: true, trace: partial.trace, children: partial.children, steps: status.steps });
                         const finalPreflightWarnings = workflowPreflightWarnings(workflowPreflight, partial.trace, { settled: true });
                         const finalPreflightTrace = annotateWorkflowPreflightTrace(partial.trace, workflowPreflight);
-                        status = compactOptional({ ...status, state, stopped: stopped || undefined, activityState: pauseForDetached || status.activityState === "needs_attention" ? "needs_attention" : undefined, error: workflowFailureMessage(error, workflowRunId, partial.children), endedAt: Date.now(), workflow: { trace: finalPreflightTrace, emits: partial.emits, console: partial.console, ...(workflowArgsEvidence ?? {}), ...(workflowResource ? { resource: workflowResource.provenance } : {}), ...(finalPreflightWarnings.length ? { preflightWarnings: finalPreflightWarnings } : {}) }, workflowChildren });
+                        status = compactOptional({ ...status, state, stopped: stopped || undefined, activityState: pauseForDetached || status.activityState === "needs_attention" ? "needs_attention" : undefined, error: workflowFailureMessage(error, workflowRunId, partial.children), endedAt: Date.now(), workflow: { trace: finalPreflightTrace, emits: partial.emits, console: partial.console, ...(error instanceof WorkflowScriptError && error.errorKind ? { failureKind: error.errorKind } : {}), ...(workflowArgsEvidence ?? {}), ...(workflowResource ? { resource: workflowResource.provenance } : {}), ...(finalPreflightWarnings.length ? { preflightWarnings: finalPreflightWarnings } : {}) }, workflowChildren });
                         if (pauseForDetached) {
                             const promoted = promotePausedWorkflowIfSettled(status);
                             if (promoted)
                                 status = promoted;
                         }
+                        // A script can throw an error of any size; status.json keeps the full text.
+                        const errorPreview = status.error && status.error.length > 1_000 ? `${status.error.slice(0, 1_000)}… (truncated; full error: ${statusPath} (error))` : status.error;
                         const terminalSummary = `${status.state === "complete"
                             ? "Workflow completed after detached child finished."
-                            : status.error ?? (pauseForDetached ? "Workflow paused." : "Workflow failed.")}${workflowOutputPathMappingSummary(partial.children)}${finalPreflightWarnings.length ? ` ${finalPreflightWarnings.join(" ")}` : ""}`;
+                            : errorPreview ?? (pauseForDetached ? "Workflow paused." : "Workflow failed.")}${workflowOutputPathMappingSummary(partial.children)}${finalPreflightWarnings.length ? ` ${finalPreflightWarnings.join(" ")}` : ""}`;
                         const outputWarning = writeWorkflowAggregateOutput(workflowAggregateOutputPath, terminalSummary, producedChildOutputPaths);
                         const resultSummary = appendWorkflowOutputWarning(terminalSummary, outputWarning);
                         const receiptState = status.state === "complete" ? "complete" : status.state === "paused" ? "paused" : status.state === "stopped" ? "stopped" : "failed";
@@ -5632,6 +5708,9 @@ export function createSubagentExecutor(deps) {
             const workflowOutput = typeof workflowChildDefaults.output === "string" || typeof workflowChildDefaults.output === "boolean" ? workflowChildDefaults.output : undefined;
             const configuredOutputBaseDir = resolveConfiguredSingleRunOutputBaseDir(deps);
             const workflowAggregateOutputPath = resolveSingleOutputPath(workflowOutput, ctx.cwd, workflowCwd, resolveSingleRunOutputBaseDir(deps, workflowArtifactsDir, foregroundWorkflowRunId));
+            // A top-level artifact file: outside outputs/, where children save their reports, and
+            // within artifact retention, which only removes top-level files.
+            const workflowFullResultPath = path.join(workflowArtifactsDir, `${sanitizeRunPathSegment(foregroundWorkflowRunId)}_workflow-result.md`);
             const claimedOutputPaths = new Map();
             const childOutputOverrides = new Map();
             const childOutputClaimPaths = new Map();
@@ -5810,27 +5889,26 @@ export function createSubagentExecutor(deps) {
                 const finalPreflightTrace = annotateWorkflowPreflightTrace(workflow.trace, workflowPreflight);
                 const workflowChildren = workflowChildSummary({ parentToolCallId: _id, workflowRunId: foregroundWorkflowRunId, workflowState: "completed", inventoryComplete: true, trace: workflow.trace, children: workflow.children });
                 const receipt = terminalWorkflowReceipt(foregroundWorkflowRunId, "complete", workflow.children, workflowChildren, undefined, [...workflowHostSteps.values()], workflowResource?.provenance, workflowArgsDigest);
-                const traceLines = finalPreflightTrace.map((entry) => `- ${entry.operation} ${entry.key}: ${entry.state}${entry.runId ? ` (${entry.runId})` : ""}${entry.durationMs !== undefined ? ` in ${entry.durationMs}ms` : ""}${entry.warning ? ` — ${entry.warning}` : ""}${entry.error ? ` — ${entry.error}` : ""}`);
+                const trace = finalPreflightTrace.map((entry) => ({ line: `- ${entry.operation} ${entry.key}: ${entry.state}${entry.runId ? ` (${entry.runId})` : ""}${entry.durationMs !== undefined ? ` in ${entry.durationMs}ms` : ""}${entry.warning ? ` — ${entry.warning}` : ""}`, error: entry.error }));
                 const runningSummary = workflowRunningChildrenSummary(workflow.children);
-                const sections = [
-                    ...(workflowPreflight ? [formatWorkflowPreflight(workflowPreflight)] : []),
-                    runningSummary ? `Workflow dispatch completed; ${runningSummary}` : "Workflow completed.",
-                    `Return:\n${formatWorkflowValue(workflow.value)}`,
-                ];
-                if (workflow.emits.length > 0)
-                    sections.push(`Emitted:\n${workflow.emits.map(formatWorkflowValue).join("\n")}`);
-                if (workflow.console.length > 0)
-                    sections.push(`Console:\n${workflow.console.map((entry) => `[${entry.level}] ${entry.text}`).join("\n")}`);
-                if (traceLines.length > 0)
-                    sections.push(`Call trace:\n${traceLines.join("\n")}`);
-                if (finalPreflightWarnings.length > 0)
-                    sections.push(formatWorkflowPreflightWarnings(finalPreflightWarnings));
                 const outputMappings = workflowOutputPathMappingSummary(workflow.children).trim();
-                if (outputMappings)
-                    sections.push(outputMappings);
-                const workflowText = sections.join("\n\n");
-                const outputWarning = writeWorkflowAggregateOutput(workflowAggregateOutputPath, workflowText, producedChildOutputPaths);
-                const displayText = appendWorkflowOutputWarning(workflowText, outputWarning);
+                const displayText = formatWorkflowResultText({
+                    head: [...(workflowPreflight ? [formatWorkflowPreflight(workflowPreflight)] : []), runningSummary ? `Workflow dispatch completed; ${runningSummary}` : "Workflow completed."],
+                    script: [
+                        `Return:\n${formatWorkflowValue(workflow.value)}`,
+                        ...(workflow.emits.length > 0 ? [`Emitted:\n${workflow.emits.map(formatWorkflowValue).join("\n")}`] : []),
+                        ...(workflow.console.length > 0 ? [`Console:\n${workflow.console.map((entry) => `[${entry.level}] ${entry.text}`).join("\n")}`] : []),
+                    ],
+                    trace,
+                    tail: [
+                        ...(finalPreflightWarnings.length > 0 ? [formatWorkflowPreflightWarnings(finalPreflightWarnings)] : []),
+                        ...(outputMappings ? [outputMappings] : []),
+                    ],
+                    maxOutput: requestParams.maxOutput,
+                    aggregateOutputPath: workflowAggregateOutputPath,
+                    fullResultPath: workflowFullResultPath,
+                    producedChildOutputPaths,
+                });
                 return attachWorkflowMission(withRunFanoutBudget({
                     content: [{ type: "text", text: displayText }],
                     details: compactOptional({ mode: "workflow", runId: foregroundWorkflowRunId, results: workflowDetailsResults(workflow.children), ...(workflowPreflight ? { preflight: workflowPreflight } : {}), workflowChildren, totalChildUsage: sumResultsUsage(workflowResults), totalCost: sumResultsCost(workflowResults), usageBudget: usageBudgetState(workflowUsageBudget.budget, sumResultsCost(workflowResults)), workflow: { value: workflow.value, trace: finalPreflightTrace, emits: workflow.emits, console: workflow.console, ...(workflowArgsEvidence ?? {}), ...(workflowResource ? { resource: workflowResource.provenance } : {}), ...(finalPreflightWarnings.length ? { preflightWarnings: finalPreflightWarnings } : {}), receipt }, chatProgress }),
@@ -5841,32 +5919,32 @@ export function createSubagentExecutor(deps) {
                 const text = workflowFailureMessage(error, foregroundWorkflowRunId, partial.children);
                 const finalPreflightWarnings = workflowPreflightWarnings(workflowPreflight, partial.trace, { settled: true });
                 const finalPreflightTrace = annotateWorkflowPreflightTrace(partial.trace, workflowPreflight);
-                const traceLines = finalPreflightTrace.map((entry) => `- ${entry.operation} ${entry.key}: ${entry.state}${entry.runId ? ` (${entry.runId})` : ""}${entry.warning ? ` — ${entry.warning}` : ""}${entry.error ? ` — ${entry.error}` : ""}`);
-                const sections = [
-                    ...(workflowPreflight ? [formatWorkflowPreflight(workflowPreflight)] : []),
-                    `Workflow failed: ${text}`,
-                ];
-                if (partial.emits.length > 0)
-                    sections.push(`Emitted:\n${partial.emits.map(formatWorkflowValue).join("\n")}`);
-                if (partial.console.length > 0)
-                    sections.push(`Console:\n${partial.console.map((entry) => `[${entry.level}] ${entry.text}`).join("\n")}`);
-                if (traceLines.length > 0)
-                    sections.push(`Call trace:\n${traceLines.join("\n")}`);
-                if (finalPreflightWarnings.length > 0)
-                    sections.push(formatWorkflowPreflightWarnings(finalPreflightWarnings));
+                const trace = finalPreflightTrace.map((entry) => ({ line: `- ${entry.operation} ${entry.key}: ${entry.state}${entry.runId ? ` (${entry.runId})` : ""}${entry.warning ? ` — ${entry.warning}` : ""}`, error: entry.error }));
                 const outputMappings = workflowOutputPathMappingSummary(partial.children).trim();
-                if (outputMappings)
-                    sections.push(outputMappings);
-                const workflowText = sections.join("\n\n");
-                const outputWarning = writeWorkflowAggregateOutput(workflowAggregateOutputPath, workflowText, producedChildOutputPaths);
-                const displayText = appendWorkflowOutputWarning(workflowText, outputWarning);
+                const displayText = formatWorkflowResultText({
+                    head: workflowPreflight ? [formatWorkflowPreflight(workflowPreflight)] : [],
+                    script: [
+                        `Workflow failed: ${text}`,
+                        ...(partial.emits.length > 0 ? [`Emitted:\n${partial.emits.map(formatWorkflowValue).join("\n")}`] : []),
+                        ...(partial.console.length > 0 ? [`Console:\n${partial.console.map((entry) => `[${entry.level}] ${entry.text}`).join("\n")}`] : []),
+                    ],
+                    trace,
+                    tail: [
+                        ...(finalPreflightWarnings.length > 0 ? [formatWorkflowPreflightWarnings(finalPreflightWarnings)] : []),
+                        ...(outputMappings ? [outputMappings] : []),
+                    ],
+                    maxOutput: requestParams.maxOutput,
+                    aggregateOutputPath: workflowAggregateOutputPath,
+                    fullResultPath: workflowFullResultPath,
+                    producedChildOutputPaths,
+                });
                 const workflowChildren = workflowChildSummary({ parentToolCallId: _id, workflowRunId: foregroundWorkflowRunId, workflowState: "failed", inventoryComplete: true, trace: partial.trace, children: partial.children });
                 const terminalOutcome = workflowFailureTerminalOutcome(error, partial.children, usageBudgetState(workflowUsageBudget.budget, sumResultsCost(workflowResults)));
                 const receipt = terminalWorkflowReceipt(foregroundWorkflowRunId, "failed", partial.children, workflowChildren, terminalOutcome, [...workflowHostSteps.values()], workflowResource?.provenance, workflowArgsDigest);
                 return attachWorkflowMission(withRunFanoutBudget({
                     content: [{ type: "text", text: displayText }],
                     isError: true,
-                    details: compactOptional({ mode: "workflow", runId: foregroundWorkflowRunId, results: workflowDetailsResults(partial.children), ...(workflowPreflight ? { preflight: workflowPreflight } : {}), workflowChildren, totalChildUsage: sumResultsUsage(workflowResults), totalCost: sumResultsCost(workflowResults), usageBudget: usageBudgetState(workflowUsageBudget.budget, sumResultsCost(workflowResults)), workflow: { trace: finalPreflightTrace, emits: partial.emits, console: partial.console, ...(workflowArgsEvidence ?? {}), ...(workflowResource ? { resource: workflowResource.provenance } : {}), ...(finalPreflightWarnings.length ? { preflightWarnings: finalPreflightWarnings } : {}), receipt }, chatProgress }),
+                    details: compactOptional({ mode: "workflow", runId: foregroundWorkflowRunId, results: workflowDetailsResults(partial.children), ...(workflowPreflight ? { preflight: workflowPreflight } : {}), workflowChildren, totalChildUsage: sumResultsUsage(workflowResults), totalCost: sumResultsCost(workflowResults), usageBudget: usageBudgetState(workflowUsageBudget.budget, sumResultsCost(workflowResults)), workflow: { trace: finalPreflightTrace, emits: partial.emits, console: partial.console, ...(error instanceof WorkflowScriptError && error.errorKind ? { failureKind: error.errorKind } : {}), ...(workflowArgsEvidence ?? {}), ...(workflowResource ? { resource: workflowResource.provenance } : {}), ...(finalPreflightWarnings.length ? { preflightWarnings: finalPreflightWarnings } : {}), receipt }, chatProgress }),
                 }, workflowFanoutBudget));
             }
             finally {