pi-subagents 0.57.0 → 0.59.0

package/src/runs/background/notify.ts

@@ -15,7 +15,21 @@ import {
 	resolveCompletionBatchConfig,
 } from "./completion-batcher.ts";
 import { SUBAGENT_ASYNC_COMPLETE_EVENT, SUBAGENT_FOREGROUND_COMPLETE_EVENT, type ParallelHandoffReference, type ScheduleOrigin, type SubagentState } from "../../shared/types.ts";
+import { safeTerminalText } from "../../shared/display-text.ts";
+import { resolveSubagentResultStatus } from "../../intercom/result-intercom.ts";
 import { isUnexplainedProcessSignal } from "../shared/process-signal.ts";
+import type { ResultDeliveryOwnership } from "./result-delivery-ownership.ts";
+
+export interface SubagentNotifyChildOutput {
+	workflowKey?: string;
+	runId?: string;
+	agent?: string;
+	status: string;
+	savedOutputPath?: string;
+	preview: string;
+	previewTruncated?: boolean;
+	previewUnavailableReason?: string;
+}
 
 export interface SubagentNotifyDetails {
 	agent: string;
@@ -26,6 +40,7 @@ export interface SubagentNotifyDetails {
 	durationMs?: number;
 	workflowRunId?: string;
 	childRuns?: Array<{ runId: string; workflowKey?: string; agent?: string; status?: string }>;
+	childOutputs?: SubagentNotifyChildOutput[];
 	reconciledFromDetachedChild?: string;
 	sessionLabel?: string;
 	sessionValue?: string;
@@ -56,7 +71,14 @@ export interface CompletionNotification {
 		workflowKey?: string;
 		agent?: string;
 		status?: string;
+		state?: string;
 		success?: boolean;
+		output?: string;
+		structuredOutput?: unknown;
+		outputState?: "present" | "absent" | "unknown";
+		outputReference?: string | { path?: string };
+		artifactPaths?: { outputPath?: string };
+		detached?: boolean;
 		exitCode?: number | null;
 		processSignal?: string | null;
 		interrupted?: boolean;
@@ -91,6 +113,7 @@ export interface RegisterSubagentNotifyOptions {
 	batchConfig?: CompletionBatchConfig;
 	timers?: NotifyTimerApi;
 	now?: () => number;
+	ownership?: Pick<ResultDeliveryOwnership, "owns">;
 }
 
 export interface CompletionNotifier {
@@ -98,6 +121,115 @@ export interface CompletionNotifier {
 	dispose(): void;
 }
 
+const CHILD_OUTPUT_PREVIEW_MAX_BYTES = 4 * 1024;
+const CHILD_OUTPUT_PREVIEW_COUNT = 8;
+const PREVIEW_TRUNCATION_MARKER = "...[preview truncated]";
+type CompletionChild = NonNullable<CompletionNotification["results"]>[number];
+
+function truncateUtf8Head(value: string, maxBytes: number): { text: string; truncated: boolean } {
+	const bytes = Buffer.from(value, "utf8");
+	if (bytes.length <= maxBytes) return { text: value, truncated: false };
+	const markerBytes = Buffer.byteLength(PREVIEW_TRUNCATION_MARKER, "utf8");
+	const contentBytes = Math.max(0, maxBytes - markerBytes);
+	let end = contentBytes;
+	while (end > 0 && (bytes[end]! & 0xc0) === 0x80) end -= 1;
+	return {
+		text: `${bytes.subarray(0, end).toString("utf8")}${PREVIEW_TRUNCATION_MARKER}`,
+		truncated: true,
+	};
+}
+
+function boundedSafeText(value: string, maxBytes = 1_024): string {
+	return truncateUtf8Head(safeTerminalText(value).replace(/\n/g, "\\n"), maxBytes).text;
+}
+
+function outputPathFromReference(value: CompletionChild["outputReference"]): string | undefined {
+	if (typeof value === "string" && value.trim()) return value.trim();
+	if (value && typeof value === "object" && typeof value.path === "string" && value.path.trim()) return value.path.trim();
+	return undefined;
+}
+
+function childSavedOutputPath(child: CompletionChild): string | undefined {
+	return outputPathFromReference(child.outputReference);
+}
+
+function childStatus(child: CompletionChild, workflowState?: string): string {
+	const knownStatus = child.status === "complete"
+		? "completed"
+		: child.status === "completed" || child.status === "failed" || child.status === "paused" || child.status === "stopped" || child.status === "detached"
+			? child.status
+		: undefined;
+	if (knownStatus) return knownStatus;
+	return resolveSubagentResultStatus({
+		success: child.success,
+		state: child.state ?? (child.success === undefined ? workflowState : undefined),
+		interrupted: child.interrupted,
+		detached: child.detached,
+		processSignal: child.processSignal,
+		timedOut: child.timedOut,
+		stopped: child.stopped,
+		turnBudgetExceeded: child.turnBudgetExceeded,
+		exitCode: typeof child.exitCode === "number" ? child.exitCode : undefined,
+	});
+}
+
+function structuredOutputText(value: unknown): string | undefined {
+	if (value === undefined) return undefined;
+	try {
+		const serialized = JSON.stringify(value, null, 2);
+		return typeof serialized === "string" ? serialized : undefined;
+	} catch {
+		return undefined;
+	}
+}
+
+function childInlinePreview(child: CompletionChild): { preview?: string; truncated?: boolean; unavailableReason?: string } {
+	const output = typeof child.output === "string" ? child.output : "";
+	const outputReference = childSavedOutputPath(child);
+	const referenceOnly = Boolean(outputReference && output.trim().startsWith("Output saved to:"));
+	const raw = child.outputState === "absent" || referenceOnly ? structuredOutputText(child.structuredOutput) : output || structuredOutputText(child.structuredOutput);
+	if (!raw?.trim()) {
+		return { unavailableReason: referenceOnly ? "saved output is file-only" : "no safe inline output" };
+	}
+	const safe = safeTerminalText(raw);
+	if (!safe.trim()) return { unavailableReason: "no safe inline output" };
+	const bounded = truncateUtf8Head(safe, CHILD_OUTPUT_PREVIEW_MAX_BYTES);
+	return { preview: bounded.text, ...(bounded.truncated ? { truncated: true } : {}) };
+}
+
+function formatChildOutputBlock(children: SubagentNotifyChildOutput[] | undefined): string | undefined {
+	if (!children?.length) return undefined;
+	const lines = ["Child outputs:"];
+	for (let index = 0; index < children.length; index++) {
+		const child = children[index]!;
+		const key = child.workflowKey ? boundedSafeText(child.workflowKey) : "unavailable";
+		const runId = child.runId ? boundedSafeText(child.runId) : "unavailable";
+		const status = boundedSafeText(child.status) || "unavailable";
+		lines.push(`- key=${key} run=${runId} status=${status}`);
+		lines.push(`  Saved output: ${child.savedOutputPath ? boundedSafeText(child.savedOutputPath) : "unavailable"}`);
+		if (index >= CHILD_OUTPUT_PREVIEW_COUNT) {
+			lines.push("  Preview: unavailable (notice preview budget exceeded)");
+			continue;
+		}
+		if (!child.preview) {
+			lines.push(`  Preview: unavailable (${child.previewUnavailableReason ?? "no safe inline output"})`);
+			continue;
+		}
+		lines.push("  Preview:");
+		for (const line of child.preview.split("\n")) lines.push(`    | ${line}`);
+	}
+	if (children.length > CHILD_OUTPUT_PREVIEW_COUNT) {
+		lines.push(`- ${children.length - CHILD_OUTPUT_PREVIEW_COUNT} additional child preview(s) omitted by notice budget; child run metadata is retained below.`);
+	}
+	return lines.join("\n");
+}
+
+function formatResultPreview(details: SubagentNotifyDetails): string {
+	const summary = details.resultPreview.trim() ? details.resultPreview : "(no output)";
+	const childOutputs = formatChildOutputBlock(details.childOutputs);
+	return childOutputs ? `${summary}\n\n${childOutputs}` : summary;
+}
+
 function formatSessionLine(details: SubagentNotifyDetails): string | undefined {
 	if (!details.sessionValue) return undefined;
 	return details.sessionLabel ? `${details.sessionLabel}: ${details.sessionValue}` : details.sessionValue;
@@ -129,7 +261,7 @@ export function formatSingleCompletion(details: SubagentNotifyDetails): string {
 		"",
 		scheduleLine,
 		scheduleLine ? "" : undefined,
-		details.resultPreview.trim() ? details.resultPreview : "(no output)",
+		formatResultPreview(details),
 		details.handoffPath ? "" : undefined,
 		details.handoffPath ? `Parallel handoff: ${details.handoffPath}` : undefined,
 		correlationLines.length && !details.handoffPath ? "" : undefined,
@@ -216,7 +348,7 @@ export function formatGroupedCompletion(details: SubagentNotifyDetails[]): strin
 		if (!detail) continue;
 		const sessionLine = formatSessionLine(detail);
 		blocks.push(`${index + 1}. ${detail.agent}${detail.taskInfo ?? ""}${detail.scheduleOrigin ? ` — scheduled run from ${detail.scheduleOrigin.name ?? detail.scheduleOrigin.id} (schedule ${detail.scheduleOrigin.id})` : ""}`);
-		blocks.push(detail.resultPreview.trim() ? detail.resultPreview : "(no output)");
+		blocks.push(formatResultPreview(detail));
 		if (detail.handoffPath) blocks.push(`Parallel handoff: ${detail.handoffPath}`);
 		blocks.push(...formatCorrelationLines(detail));
 		if (sessionLine) blocks.push(sessionLine);
@@ -228,6 +360,8 @@ export function formatGroupedCompletion(details: SubagentNotifyDetails[]): strin
 interface PendingCompletion {
 	key: string;
 	details: SubagentNotifyDetails;
+	sessionId: string;
+	completionOwnerId: unknown;
 	triggerTurn: boolean;
 	resolve(accepted: boolean): void;
 }
@@ -271,6 +405,7 @@ export function buildCompletionDetails(result: CompletionNotification): Subagent
 	const paused = !stopped && !result.success && (
 		result.exitCode === 0
 		|| result.state === "paused"
+		|| result.interrupted === true
 		|| summary.startsWith("Paused after interrupt.")
 	);
 	const status = stopped ? "stopped" : paused ? "paused" : result.success ? "completed" : "failed";
@@ -286,14 +421,34 @@ export function buildCompletionDetails(result: CompletionNotification): Subagent
 	const rawRunId = typeof result.runId === "string" ? result.runId : typeof result.id === "string" ? result.id : undefined;
 	const workflowRunId = (result.mode === "workflow" || agent === "workflow") && rawRunId ? rawRunId : undefined;
 	const childRuns = result.results?.flatMap((child) => {
-		if (typeof child.runId !== "string" || !child.runId.trim()) return [];
+		const runId = typeof child.runId === "string" && child.runId.trim() ? child.runId.trim() : undefined;
+		const workflowKey = typeof child.workflowKey === "string" && child.workflowKey.trim() ? child.workflowKey.trim() : undefined;
+		if (!runId && (!workflowRunId || !workflowKey)) return [];
 		return [{
-			runId: child.runId,
-			...(typeof child.workflowKey === "string" ? { workflowKey: child.workflowKey } : {}),
+			runId: runId ?? "unavailable",
+			...(workflowKey ? { workflowKey } : {}),
 			...(typeof child.agent === "string" ? { agent: child.agent } : {}),
-			...(typeof child.status === "string" ? { status: child.status } : {}),
+			status: childStatus(child, workflowRunId ? result.state : undefined),
 		}];
 	}) ?? [];
+	const childOutputs = workflowRunId && result.results?.length
+		? result.results.map((child) => {
+			const inline = childInlinePreview(child);
+			const workflowKey = typeof child.workflowKey === "string" && child.workflowKey.trim() ? child.workflowKey.trim() : undefined;
+			const runId = typeof child.runId === "string" && child.runId.trim() ? child.runId.trim() : undefined;
+			const savedOutputPath = childSavedOutputPath(child);
+			return {
+				...(workflowKey ? { workflowKey } : {}),
+				...(runId ? { runId } : {}),
+				...(typeof child.agent === "string" ? { agent: child.agent } : {}),
+				status: childStatus(child, result.state),
+				...(savedOutputPath ? { savedOutputPath } : {}),
+				...(inline.preview ? { preview: inline.preview } : { preview: "" }),
+				...(inline.truncated ? { previewTruncated: true } : {}),
+				...(inline.unavailableReason ? { previewUnavailableReason: inline.unavailableReason } : {}),
+			};
+		})
+		: undefined;
 	const reconciledFromDetachedChild = typeof result.reconciledFromDetachedChild === "string" ? result.reconciledFromDetachedChild : undefined;
 	const session =
 		result.shareUrl
@@ -318,6 +473,7 @@ export function buildCompletionDetails(result: CompletionNotification): Subagent
 		...(handoffPath ? { handoffPath } : {}),
 		...(workflowRunId ? { workflowRunId } : {}),
 		...(childRuns.length ? { childRuns } : {}),
+		...(childOutputs?.length ? { childOutputs } : {}),
 		...(reconciledFromDetachedChild ? { reconciledFromDetachedChild } : {}),
 		...(session ? { sessionLabel: session.label, sessionValue: session.value } : {}),
 	};
@@ -335,6 +491,10 @@ export default function registerSubagentNotify(
 	const batchConfig = resolveCompletionBatchConfig(options.batchConfig);
 	const batchers = new Map<string, CompletionBatcher<PendingCompletion>>();
 	let disposed = false;
+	const ownsResult = options.ownership?.owns
+		?? ((sessionId: string, completionOwnerId: unknown) => sessionId === state.currentSessionId
+			&& typeof completionOwnerId === "string"
+			&& completionOwnerId === state.completionOwnerId);
 
 	const settle = (items: PendingCompletion[], accepted: boolean) => {
 		for (const item of items) {
@@ -343,7 +503,18 @@ export default function registerSubagentNotify(
 			item.resolve(accepted);
 		}
 	};
-	const emit = (items: PendingCompletion[]) => settle(items, sendCompletion(pi, items));
+	const emit = (items: PendingCompletion[]) => {
+		const accepted: PendingCompletion[] = [];
+		const rejected: PendingCompletion[] = [];
+		for (const item of items) {
+			const owned = item.details.source === "foreground"
+				? item.sessionId === state.currentSessionId
+				: ownsResult(item.sessionId, item.completionOwnerId);
+			(owned ? accepted : rejected).push(item);
+		}
+		settle(rejected, false);
+		settle(accepted, sendCompletion(pi, accepted));
+	};
 	const getBatcher = (result: CompletionNotification) => {
 		const key = completionBatchKey(result);
 		let batcher = batchers.get(key);
@@ -360,8 +531,10 @@ export default function registerSubagentNotify(
 	};
 
 	const deliver = (result: CompletionNotification): Promise<boolean> => {
-		if (disposed || typeof result.sessionId !== "string" || result.sessionId !== state.currentSessionId) return Promise.resolve(false);
-		if (result.source !== "foreground" && (!state.completionOwnerId || result.completionOwnerId !== state.completionOwnerId)) return Promise.resolve(false);
+		if (disposed || typeof result.sessionId !== "string") return Promise.resolve(false);
+		if (result.source === "foreground") {
+			if (result.sessionId !== state.currentSessionId) return Promise.resolve(false);
+		} else if (!ownsResult(result.sessionId, result.completionOwnerId)) return Promise.resolve(false);
 		if (result.intercomDelivered === true) return Promise.resolve(true);
 		const key = buildCompletionKey(result, "notify");
 		const seenAt = seen.get(key);
@@ -376,6 +549,8 @@ export default function registerSubagentNotify(
 		const item: PendingCompletion = {
 			key,
 			details,
+			sessionId: result.sessionId,
+			completionOwnerId: result.completionOwnerId,
 			triggerTurn: result.triggerTurn !== false,
 			resolve,
 		};

package/src/runs/background/result-delivery-ownership.ts

@@ -0,0 +1,45 @@
+import type { SubagentState } from "../../shared/types.ts";
+
+const MAX_CLAIMED_PREDECESSOR_SESSIONS = 8;
+
+type ResultDeliveryState = Pick<SubagentState, "currentSessionId" | "completionOwnerId">;
+
+export interface ResultDeliveryOwnership {
+	owns(sessionId: string, completionOwnerId: unknown): boolean;
+	claimedSessionIds(): readonly string[];
+	claimPredecessor(previousSessionFile: string | undefined, previousRuntimeSessionId: string | null): boolean;
+	clear(): void;
+}
+
+export function createResultDeliveryOwnership(state: ResultDeliveryState): ResultDeliveryOwnership {
+	const claimed = new Map<string, string>();
+
+	const currentOwner = (): string | undefined => typeof state.completionOwnerId === "string" && state.completionOwnerId
+		? state.completionOwnerId
+		: undefined;
+
+	return {
+		owns(sessionId, completionOwnerId) {
+			const owner = currentOwner();
+			if (!owner || completionOwnerId !== owner) return false;
+			return sessionId === state.currentSessionId || claimed.get(sessionId) === owner;
+		},
+		claimedSessionIds() {
+			const owner = currentOwner();
+			if (!owner) return [];
+			return [...claimed].flatMap(([sessionId, claimedOwner]) => claimedOwner === owner ? [sessionId] : []);
+		},
+		claimPredecessor(previousSessionFile, previousRuntimeSessionId) {
+			const owner = currentOwner();
+			if (!owner || !previousSessionFile || !previousRuntimeSessionId) return false;
+			if (previousSessionFile !== previousRuntimeSessionId || state.currentSessionId !== previousRuntimeSessionId) return false;
+			claimed.delete(previousRuntimeSessionId);
+			claimed.set(previousRuntimeSessionId, owner);
+			while (claimed.size > MAX_CLAIMED_PREDECESSOR_SESSIONS) claimed.delete(claimed.keys().next().value!);
+			return true;
+		},
+		clear() {
+			claimed.clear();
+		},
+	};
+}

package/src/runs/background/result-files.ts

@@ -343,7 +343,8 @@ export function resultPayloadPathForMissionObserverRun(resultsDir: string, runId
 		if (!entry || entry.runId !== runId) return undefined;
 		return resultPayloadLocationFromIndex(resultsDir, entry)?.path;
 	} catch (error) {
-		if ((error as NodeJS.ErrnoException).code !== "ENOENT" && !isUnaddressableResultCandidate(error)) console.error(`Ignoring invalid async result observer index for '${runId}':`, error);
+		const code = (error as NodeJS.ErrnoException).code;
+		if (code !== "ENOENT" && code !== "ENOTDIR" && !isUnaddressableResultCandidate(error)) console.error(`Ignoring invalid async result observer index for '${runId}':`, error);
 		return undefined;
 	}
 }

package/src/runs/background/result-watcher.ts

@@ -25,6 +25,7 @@ import { recordWaitCompletion } from "./wait-completions.ts";
 import { MISSION_BINDING_FILE, syncMissionFromAsyncCompletion } from "../../missions/lifecycle.ts";
 import { missionObserverResultCandidateFiles, promotePendingResultFile, removeMissionObserverIndex, removeResultIndex, resultCandidateFilesForSession, resultPayloadPathForIndexedRun, resultPayloadPathForMissionObserverRun, resultPayloadPathForSessionRun, writeAsyncResultFile, writeResultIndexForData } from "./result-files.ts";
 import type { CompletionNotifier, CompletionNotification } from "./notify.ts";
+import type { ResultDeliveryOwnership } from "./result-delivery-ownership.ts";
 
 const WATCHER_RESTART_DELAY_MS = 3000;
 const POLL_INTERVAL_MS = 3000;
@@ -60,10 +61,13 @@ type ResultWatcherDeps = {
 	/** Control how slow result-index scans are logged. Defaults to \"activity\". */
 	resultScanLogging?: "all" | "activity" | "off";
 	platform?: NodeJS.Platform;
+	/** Shared current/predecessor session ownership used by the notifier. */
+	ownership?: Pick<ResultDeliveryOwnership, "owns" | "claimedSessionIds">;
 };
 
 type ResultFileChild = {
 	agent?: string;
+	sessionName?: string;
 	output?: string;
 	structuredOutput?: unknown;
 	outputState?: SubagentOutputState;
@@ -200,6 +204,7 @@ export function createResultWatcher(
 	deps: ResultWatcherDeps = {},
 ): {
 	startResultWatcher: () => void;
+	transitionResultDelivery: () => void;
 	primeExistingResults: (options?: { triggerTurn?: boolean }) => void;
 	refreshResultDelivery: () => void;
 	stopResultWatcher: () => void;
@@ -218,14 +223,16 @@ export function createResultWatcher(
 	// The sole in-memory ownership lease. It is acquired for one active session
 	// and revoked before the watcher, queues, or callbacks are torn down.
 	let activeSessionId: string | null = null;
+	const ownsResult = deps.ownership?.owns
+		?? ((sessionId: string, completionOwnerId: unknown) => sessionId === state.currentSessionId
+			&& typeof completionOwnerId === "string"
+			&& completionOwnerId === state.completionOwnerId);
+	const claimedSessionIds = () => deps.ownership?.claimedSessionIds() ?? [];
 
 	const ownsCompletion = (sessionId: string, completionOwnerId: unknown, epoch: number) => {
 		if (!deliveryActive || epoch !== deliveryEpoch) return false;
 		if (!activeSessionId && state.currentSessionId) activeSessionId = state.currentSessionId;
-		return activeSessionId === sessionId
-			&& state.currentSessionId === sessionId
-			&& typeof completionOwnerId === "string"
-			&& completionOwnerId === state.completionOwnerId;
+		return activeSessionId === state.currentSessionId && ownsResult(sessionId, completionOwnerId);
 	};
 
 	const scheduleResult = (file: string, triggerTurn: boolean, delayMs = 0) => {
@@ -246,8 +253,11 @@ export function createResultWatcher(
 	const resultPayloadPath = (file: string, observed?: ReadonlySet<string>): string | undefined => {
 		if (file !== path.basename(file) || !file.endsWith(".json")) return undefined;
 		const runId = file.replace(/\.json$/i, "");
-		const sessionResult = state.currentSessionId ? resultPayloadPathForSessionRun(resultsDir, state.currentSessionId, runId) : undefined;
-		if (sessionResult) return sessionResult;
+		for (const sessionId of [state.currentSessionId, ...claimedSessionIds()]) {
+			if (!sessionId) continue;
+			const sessionResult = resultPayloadPathForSessionRun(resultsDir, sessionId, runId);
+			if (sessionResult) return sessionResult;
+		}
 		const observerResult = resultPayloadPathForMissionObserverRun(resultsDir, runId);
 		if (observerResult) return observerResult;
 		if (observed?.has(runId)) {
@@ -308,7 +318,7 @@ export function createResultWatcher(
 		// Missing identity stays on the normal parser path so malformed or legacy
 		// files keep their existing diagnostics and compatibility behavior.
 		if (!identity.sessionId) return true;
-		if (identity.sessionId === state.currentSessionId && identity.completionOwnerId === state.completionOwnerId) return true;
+		if (ownsResult(identity.sessionId, identity.completionOwnerId)) return true;
 		if (identity.asyncDir && fsApi.existsSync(path.join(identity.asyncDir, MISSION_BINDING_FILE))) return true;
 		if (identity.runId && (observed ?? observedRunIds()).has(identity.runId)) return true;
 		return Boolean(deps.observeCompletion && !deps.observedCompletionRunIds);
@@ -473,6 +483,7 @@ export function createResultWatcher(
 							: undefined;
 				return {
 					agent: result.agent ?? data.agent ?? `step-${index + 1}`,
+					...(result.sessionName ? { sessionName: result.sessionName } : {}),
 					status: resolveSubagentResultStatus({
 						success: result.success,
 						state: childState,
@@ -621,8 +632,9 @@ export function createResultWatcher(
 	};
 	const indexedResultCandidates = (observed: ReadonlySet<string>): string[] => {
 		const files = new Set<string>();
-		if (state.currentSessionId) {
-			for (const file of resultCandidateFilesForSession(resultsDir, state.currentSessionId)) files.add(file);
+		for (const sessionId of [state.currentSessionId, ...claimedSessionIds()]) {
+			if (!sessionId) continue;
+			for (const file of resultCandidateFilesForSession(resultsDir, sessionId)) files.add(file);
 		}
 		for (const runId of state.asyncJobs.keys()) files.add(`${runId}.json`);
 		for (const file of missionObserverResultCandidateFiles(resultsDir)) files.add(file);
@@ -755,6 +767,13 @@ export function createResultWatcher(
 		}
 	};
 
+	const transitionResultDelivery = () => {
+		deliveryActive = true;
+		activeSessionId = state.currentSessionId;
+		deliveryEpoch += 1;
+		identityCache.clear();
+	};
+
 	const stopResultWatcher = () => {
 		deliveryActive = false;
 		activeSessionId = null;
@@ -769,5 +788,5 @@ export function createResultWatcher(
 		identityCache.clear();
 	};
 
-	return { startResultWatcher, primeExistingResults, stopResultWatcher, refreshResultDelivery: () => { primeExistingResults(); startDemandPolling(); } };
+	return { startResultWatcher, transitionResultDelivery, primeExistingResults, stopResultWatcher, refreshResultDelivery: () => { primeExistingResults(); startDemandPolling(); } };
 }

package/src/runs/background/resume-guidance.ts

@@ -39,7 +39,7 @@ export function formatResumeFirstFailedRunDetail(run: AsyncRunSummary): string |
 }
 
 export function formatResumeFirstFailedRunsNote(runs: AsyncRunSummary[]): string {
-	const failedRuns = runs.filter((run) => run.state === "failed");
+	const failedRuns = runs.filter((run) => run.state === "failed" || run.state === "partial");
 	const detachGuidance = failedRuns
 		.map(formatIntercomDetachGuidance)
 		.filter((guidance): guidance is string => Boolean(guidance));

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

@@ -27,7 +27,7 @@ export interface RetainedChild {
 }
 
 function isRetainedChildState(state: AsyncRunSummary["state"]): state is RetainedChildState {
-	return state === "complete" || state === "failed" || state === "paused" || state === "stopped";
+	return state === "complete" || state === "failed" || state === "partial" || state === "paused" || state === "stopped";
 }
 
 function isTerminalStepStatus(status: AsyncRunSummary["steps"][number]["status"]): boolean {

package/src/runs/background/run-status.ts

@@ -23,6 +23,7 @@ import { attachRootChildrenToSteps, findNestedRouteForRootId, projectNestedRegis
 import { readMissionBinding } from "../../missions/lifecycle.ts";
 import { formatWorkflowJsonPreview } from "../../workflows/scripted-workflow.ts";
 import { parseWorkflowChildSummary } from "../../workflows/workflow-child-summary.ts";
+import { formatWorkflowPreflightPlanSummary, formatWorkflowPreflightWarningSummary } from "../../workflows/workflow-preflight.ts";
 import { formatRunFanoutBudget, getRunFanoutBudgetSnapshot, readRunFanoutBudgetDescriptor } from "../shared/run-fanout-budget.ts";
 import { getExternalJobProvider } from "../../api/external-job-provider.ts";
 
@@ -64,13 +65,14 @@ function formatCapacityOwner(inspect: ActiveAsyncCapacityInspection): string[] {
 }
 
 function formatWorkflowDebug(status: AsyncStatus): string[] {
-	if (status.mode !== "workflow" && !status.parentWorkflowRunId && !status.workflowKey) return [];
+	if (status.mode !== "workflow" && !status.parentWorkflowRunId && !status.workflowKey && !status.lane) return [];
 	const lines = [
 		status.parentWorkflowRunId ? `Workflow parent: ${status.parentWorkflowRunId}${status.workflowKey ? ` (${status.workflowKey})` : ""}` : undefined,
 		status.mode === "workflow" ? `Workflow children: ${(status.steps ?? []).length}` : undefined,
+		status.lane ? `Lane: ${status.lane.key}${status.lane.mode ? ` (${status.lane.mode})` : ""}` : undefined,
 	].filter((line): line is string => line !== undefined);
 	for (const [index, step] of (status.steps ?? []).entries()) {
-		lines.push(`  ${index + 1}. key ${step.workflowKey ?? "n/a"} · ${step.agent} · ${step.status} · async ${step.async === undefined ? "unknown" : step.async ? "yes" : "no"}${step.runId ? ` · run ${step.runId}` : ""}`);
+		lines.push(`  ${index + 1}. key ${step.workflowKey ?? "n/a"} · ${runStatusStepDisplayName(step)} · ${step.status} · async ${step.async === undefined ? "unknown" : step.async ? "yes" : "no"}${step.runId ? ` · run ${step.runId}` : ""}${step.lane ? ` · lane ${step.lane.key}` : ""}${step.worktreePath ? ` · worktree ${step.worktreePath} · branch ${step.branch ?? "unknown"}` : ""}`);
 	}
 	return lines;
 }
@@ -88,6 +90,7 @@ function formatRunLifecycleDebug(input: { status: AsyncStatus; asyncDir: string;
 		`Mode: ${status.mode}`,
 		status.parentWorkflowRunId ? `Workflow parent: ${status.parentWorkflowRunId}` : undefined,
 		status.workflowKey ? `Workflow key: ${status.workflowKey}` : undefined,
+		status.lane ? `Lane: ${status.lane.key}${status.lane.mode ? ` (${status.lane.mode})` : ""}` : undefined,
 		`Status process terminal: ${formatProcessTerminal(overlayProcessTerminal)}`,
 		`Sidecar process terminal: ${formatProcessTerminal(sidecarProcessTerminal)}`,
 		...formatCapacityOwner(capacity),
@@ -152,7 +155,12 @@ function stepLineLabel(status: AsyncStatus, index: number): string {
 	return `Step ${index + 1}`;
 }
 
+function runStatusStepDisplayName(step: { agent: string; sessionName?: string; label?: string }): string {
+	return step.sessionName?.trim() || (step.label ? `${step.label} (${step.agent})` : step.agent);
+}
+
 function nestedRunDisplayName(run: NestedRunSummary): string {
+	if (run.sessionName?.trim()) return run.sessionName.trim();
 	if (run.agent) return run.agent;
 	if (run.agents?.length) return run.agents.join(", ");
 	return run.id;
@@ -197,7 +205,7 @@ function formatRememberedForegroundStatus(run: ForegroundResumeRun): string {
 	for (const child of run.children) {
 		const output = rememberedForegroundChildOutput(child).trim().split(/\r?\n/).find((line) => line.trim());
 		const parts = [
-			`${child.index + 1}. ${child.agent} ${child.status}`,
+			`${child.index + 1}. ${child.sessionName?.trim() || child.agent} ${child.status}`,
 			child.exitCode !== undefined ? `exit ${child.exitCode}` : undefined,
 			child.detachedReason ? `detached: ${child.detachedReason}` : undefined,
 			child.acceptance ? `acceptance: ${child.acceptance.status}` : undefined,
@@ -241,7 +249,7 @@ function formatRememberedForegroundTranscript(run: ForegroundResumeRun, options:
 	const lines = [
 		`Run: ${run.runId}`,
 		`State: ${child.status}`,
-		`Child: ${index} (${child.agent})`,
+		`Child: ${index} (${child.sessionName?.trim() || child.agent})`,
 		child.sessionFile ? `Session: ${child.sessionFile}` : undefined,
 		child.transcriptPath ? `Transcript: ${child.transcriptPath}` : undefined,
 		child.artifactPaths?.outputPath ? `Output: ${child.artifactPaths.outputPath}` : undefined,
@@ -277,7 +285,7 @@ function formatNestedExactStatus(rootRunId: string, run: NestedRunSummary): stri
 		for (const [index, step] of run.steps.entries()) {
 			const activity = step.status === "running" ? formatActivityLabel(step.lastActivityAt, step.activityState) : undefined;
 			const budget = step.turnBudget ? `, turn budget: ${step.turnBudget.turnCount}/${step.turnBudget.maxTurns}+${step.turnBudget.graceTurns} (${step.turnBudget.outcome})` : "";
-			lines.push(`  ${index + 1}. ${step.agent} ${step.status}${activity ? `, ${activity}` : ""}${budget}${step.error ? `, error: ${step.error}` : ""}`);
+			lines.push(`  ${index + 1}. ${step.sessionName?.trim() || step.agent} ${step.status}${activity ? `, ${activity}` : ""}${budget}${step.error ? `, error: ${step.error}` : ""}`);
 			lines.push(...formatNestedRunStatusLines(step.children, { indent: "    ", commandHints: true }));
 		}
 	}
@@ -504,6 +512,8 @@ export function inspectSubagentStatus(params: RunStatusParams, deps: RunStatusDe
 				statusActivityText ? `Activity: ${statusActivityText}` : undefined,
 				steeringText ? `Steering: ${steeringText}` : undefined,
 				`Mode: ${status.mode}`,
+				...(status.preflight ? [formatWorkflowPreflightPlanSummary(status.preflight)] : []),
+				...(status.workflow?.preflightWarnings?.length ? [formatWorkflowPreflightWarningSummary(status.workflow.preflightWarnings)] : []),
 				runFanoutBudget ? formatRunFanoutBudget(runFanoutBudget) : undefined,
 				status.parentWorkflowRunId ? `Workflow parent: ${status.parentWorkflowRunId}${status.workflowKey ? ` (${status.workflowKey})` : ""}` : undefined,
 				status.mode === "workflow" && workflowReturnPreview !== undefined ? `Return: ${workflowReturnPreview}` : undefined,
@@ -535,7 +545,7 @@ export function inspectSubagentStatus(params: RunStatusParams, deps: RunStatusDe
 				const errorText = step.error ? `, error: ${step.error}` : "";
 				const acceptanceText = step.acceptance?.status ? `, acceptance: ${step.acceptance.status}` : "";
 				const budgetText = step.turnBudget ? `, turn budget: ${step.turnBudget.turnCount}/${step.turnBudget.maxTurns}+${step.turnBudget.graceTurns} (${step.turnBudget.outcome})` : "";
-				const display = step.label ? `${step.label} (${step.agent})` : step.agent;
+				const display = runStatusStepDisplayName(step);
 				const phase = step.phase ? `[${step.phase}] ` : "";
 				lines.push(`${stepLineLabel(status, index)}: ${phase}${display} ${step.status}${modelText}${stepActivityText ? `, ${stepActivityText}` : ""}${steeringSuffix}${acceptanceText}${budgetText}${errorText}`);
 				if (step.runner?.type === "external-cli") {
@@ -608,7 +618,7 @@ export function inspectSubagentStatus(params: RunStatusParams, deps: RunStatusDe
 
 			const workflowChildren = parseWorkflowChildSummary(status.workflowChildren);
 			if (workflowChildren && workflowChildren.workflowRunId !== status.runId) throw new Error("workflowChildren.workflowRunId does not match async status runId.");
-			return { content: [{ type: "text", text: lines.join("\n") }], details: { mode: "single", results: [], ...(workflowChildren ? { workflowChildren } : {}), ...(runFanoutBudget ? { runFanoutBudget } : {}), ...(processTerminal ? { lifecycleStatus: { processTerminal } } : {}) } };
+			return { content: [{ type: "text", text: lines.join("\n") }], details: { mode: "single", results: [], ...(status.preflight ? { preflight: status.preflight } : {}), ...(status.workflow?.preflightWarnings?.length ? { preflightWarnings: status.workflow.preflightWarnings } : {}), ...(workflowChildren ? { workflowChildren } : {}), ...(runFanoutBudget ? { runFanoutBudget } : {}), ...(processTerminal ? { lifecycleStatus: { processTerminal } } : {}) } };
 		}
 	}
 
@@ -622,7 +632,7 @@ export function inspectSubagentStatus(params: RunStatusParams, deps: RunStatusDe
 		}
 		try {
 			const raw = fs.readFileSync(resultPath, "utf-8");
-			const data = JSON.parse(raw) as { id?: string; runId?: string; toolCallId?: string; agent?: string; success?: boolean; summary?: string; output?: string; exitCode?: number; state?: string; stopped?: boolean; timedOut?: boolean; turnBudgetExceeded?: boolean; processSignal?: string | null; sessionFile?: string; parallelHandoff?: { path?: string }; results?: Array<{ agent?: string; runId?: string; workflowKey?: string; output?: string; summary?: string; sessionFile?: string; state?: string; success?: boolean; exitCode?: number | null; stopped?: boolean; timedOut?: boolean; turnBudgetExceeded?: boolean; interrupted?: boolean; processSignal?: string | null }> };
+			const data = JSON.parse(raw) as { id?: string; runId?: string; toolCallId?: string; agent?: string; success?: boolean; summary?: string; output?: string; exitCode?: number; state?: string; stopped?: boolean; timedOut?: boolean; turnBudgetExceeded?: boolean; processSignal?: string | null; sessionFile?: string; parallelHandoff?: { path?: string }; results?: Array<{ agent?: string; sessionName?: string; runId?: string; workflowKey?: string; output?: string; summary?: string; sessionFile?: string; state?: string; success?: boolean; exitCode?: number | null; stopped?: boolean; timedOut?: boolean; turnBudgetExceeded?: boolean; interrupted?: boolean; processSignal?: string | null }> };
 			if (params.view === "transcript") {
 				try {
 					return { content: [{ type: "text", text: formatAsyncResultTranscript(data, resultPath, { index: params.index, lines: params.lines }) }], details: { mode: "single", results: [] } };