@selesai/code 0.13.0 → 0.13.2

package/dist/extensions/pi-subagents/src/runs/background/fleet-view.ts

@@ -18,6 +18,7 @@ import { readStatus } from "../../shared/utils.ts";
 import { formatNestedRunStatusLines } from "../shared/nested-render.ts";
 import { contextModeLabel, summarizeContextModes } from "../shared/context-mode.ts";
 import { formatAsyncRunOutputPath, formatAsyncRunProgressLabel, listAsyncRuns, type AsyncRunSummary } from "./async-status.ts";
+import { isTrustedRecordedSessionFile } from "../../shared/session-file-trust.ts";
 
 const DEFAULT_TRANSCRIPT_LINES = 80;
 const MAX_TRANSCRIPT_LINES = 500;
@@ -43,6 +44,8 @@ interface TranscriptOptions {
 	index?: number;
 	lines?: number;
 	sessionRoots?: string[];
+	trustedSessionFiles?: string[];
+	trustedSessionFileRoot?: string;
 }
 
 interface TextTailResult {
@@ -69,6 +72,14 @@ function uniqueStrings(values: Array<string | undefined>): string[] {
 	return result;
 }
 
+function fleetChildDisplayName(child: { agent?: string; sessionName?: string }, fallback = "subagent"): string {
+	return child.sessionName?.trim() || child.agent || fallback;
+}
+
+function fleetStepDisplayName(step: Pick<AsyncJobStep, "agent" | "sessionName" | "label">): string {
+	return step.sessionName?.trim() || (step.label ? `${step.label} (${step.agent})` : step.agent);
+}
+
 function resolveMaybeRelative(asyncDir: string, filePath: string | undefined): string | undefined {
 	if (!filePath) return undefined;
 	return path.resolve(asyncDir, filePath);
@@ -120,10 +131,13 @@ function readTextTail(filePath: string, maxLines: number): TextTailResult {
 	}
 }
 
-function readContainedTextTail(filePath: string, maxLines: number, trustedRoots: string[], label: string): TextTailResult {
-	if (trustedRoots.length === 0) return { path: filePath, lines: [], truncated: false, error: `Refusing to read ${label} transcript path without a trusted root: ${filePath}` };
+function readContainedTextTail(filePath: string, maxLines: number, trustedRoots: string[], label: string, trustedFiles: string[] = [], trustedFileRoot?: string): TextTailResult {
+	if (trustedRoots.length === 0 && (!trustedFileRoot || trustedFiles.length === 0)) return { path: filePath, lines: [], truncated: false, error: `Refusing to read ${label} transcript path without a trusted root: ${filePath}` };
 	const resolvedPath = path.resolve(filePath);
-	if (!trustedRoots.some((root) => pathWithin(root, resolvedPath))) {
+	const recordedCandidate = trustedFileRoot
+		&& pathWithin(trustedFileRoot, resolvedPath)
+		&& trustedFiles.some((file) => path.resolve(file) === resolvedPath);
+	if (!trustedRoots.some((root) => pathWithin(root, resolvedPath)) && !recordedCandidate) {
 		return { path: filePath, lines: [], truncated: false, error: `Refusing to read ${label} transcript path outside trusted roots: ${filePath}` };
 	}
 	let lstat: fs.Stats;
@@ -143,7 +157,7 @@ function readContainedTextTail(filePath: string, maxLines: number, trustedRoots:
 	} catch (error) {
 		return { path: filePath, lines: [], truncated: false, error: getErrorMessage(error) };
 	}
-	if (!realRoots.some((root) => pathWithin(root, realPath))) {
+	if (!realRoots.some((root) => pathWithin(root, realPath)) && !isTrustedRecordedSessionFile(realPath, trustedFiles, trustedFileRoot)) {
 		return { path: filePath, lines: [], truncated: false, error: `Refusing to read ${label} transcript path outside trusted roots: ${filePath}` };
 	}
 	return readTextTail(resolvedPath, maxLines);
@@ -213,8 +227,8 @@ function sessionMessageLine(record: unknown): string | undefined {
 
 /** Structured session tail: parsed content parts, newest last, bounded by
  *  maxMessages. Same trusted-root containment as the prose transcript tail. */
-export function readSessionMessagesTail(sessionFile: string, maxMessages: number, trustedRoots: string[]): { messages: SessionTranscriptMessage[]; warnings: string[]; truncated: boolean } {
-	const tail = readContainedTextTail(sessionFile, Math.max(maxMessages * 4, maxMessages), trustedRoots, "session");
+export function readSessionMessagesTail(sessionFile: string, maxMessages: number, trustedRoots: string[], trustedFiles: string[] = [], trustedFileRoot?: string): { messages: SessionTranscriptMessage[]; warnings: string[]; truncated: boolean } {
+	const tail = readContainedTextTail(sessionFile, Math.max(maxMessages * 4, maxMessages), trustedRoots, "session", trustedFiles, trustedFileRoot);
 	const warnings: string[] = [];
 	if (tail.error) warnings.push(`Session read failed for ${sessionFile}: ${tail.error}`);
 	const parsedMessages: SessionTranscriptMessage[] = [];
@@ -235,8 +249,8 @@ export function readSessionMessagesTail(sessionFile: string, maxMessages: number
 	return { messages, warnings, truncated: tail.truncated || parsedMessages.length > messages.length };
 }
 
-function readSessionTranscriptTail(sessionFile: string, maxLines: number, trustedRoots: string[]): { lines: string[]; warnings: string[] } {
-	const tail = readContainedTextTail(sessionFile, Math.max(maxLines * 4, maxLines), trustedRoots, "session");
+function readSessionTranscriptTail(sessionFile: string, maxLines: number, trustedRoots: string[], trustedFiles: string[] = [], trustedFileRoot?: string): { lines: string[]; warnings: string[] } {
+	const tail = readContainedTextTail(sessionFile, Math.max(maxLines * 4, maxLines), trustedRoots, "session", trustedFiles, trustedFileRoot);
 	const warnings: string[] = [];
 	if (tail.error) warnings.push(`Session read failed for ${sessionFile}: ${tail.error}`);
 	const lines: string[] = [];
@@ -277,7 +291,8 @@ function formatActivityFacts(input: {
 }
 
 function foregroundModeName(control: ForegroundControl): string {
-	if (control.mode === "single" && control.currentAgent) return control.currentAgent;
+	const currentDisplayName = control.sessionName?.trim() || control.currentAgent;
+	if (control.mode === "single" && currentDisplayName) return currentDisplayName;
 	return control.mode;
 }
 
@@ -296,7 +311,8 @@ function formatForegroundFleetLines(controls: ForegroundControl[]): string[] {
 			toolCount: control.toolCount,
 			...(control.tokens !== undefined ? { tokens: { total: control.tokens } } : {}),
 		});
-		const current = control.currentAgent ? ` | ${control.currentAgent}${control.currentIndex !== undefined ? ` #${control.currentIndex}` : ""}` : "";
+		const currentDisplayName = control.sessionName?.trim() || control.currentAgent;
+		const current = currentDisplayName ? ` | ${currentDisplayName}${control.currentIndex !== undefined ? ` #${control.currentIndex}` : ""}` : "";
 		lines.push(`- ${control.runId} | running | ${foregroundModeName(control)}${current}${activity ? ` | ${activity}` : ""}`);
 		lines.push(`  status: subagent({ action: "status", id: "${control.runId}" })`);
 		lines.push("  transcript: live in the expanded foreground result; persisted session transcript appears after completion when sessions are enabled.");
@@ -311,7 +327,7 @@ function formatDetachedForegroundFleetLines(runs: ForegroundRun[]): string[] {
 	const ordered = [...runs].sort((left, right) => right.updatedAt - left.updatedAt);
 	for (const run of ordered) {
 		const detachedChildren = run.children.filter((child) => child.status === "detached");
-		const childSummary = detachedChildren.map((child) => `${child.agent} #${child.index}`).join(", ");
+		const childSummary = detachedChildren.map((child) => `${fleetChildDisplayName(child)} #${child.index}`).join(", ");
 		lines.push(`- ${run.runId} | detached | ${run.mode}${childSummary ? ` | ${childSummary}` : ""}`);
 		lines.push(`  status: subagent({ action: "status", id: "${run.runId}" })`);
 		lines.push(`  recovery: reply to the supervisor request first, then wait with subagent_wait({ id: "${run.runId}" }); do not resume or launch a replacement while any child remains detached.`);
@@ -332,7 +348,7 @@ function formatAsyncFleetLines(runs: AsyncRunSummary[]): string[] {
 		lines.push(`  status: subagent({ action: "status", id: "${run.id}" })`);
 		lines.push(`  transcript: subagent({ action: "status", id: "${run.id}", view: "transcript" })`);
 		for (const step of run.steps) {
-			const display = step.label ? `${step.label} (${step.agent})` : step.agent;
+			const display = fleetStepDisplayName(step);
 			const stepContext = contextModeLabel(step.context);
 			const phase = step.phase ? `[${step.phase}] ` : "";
 			const stepActivity = formatActivityFacts(step);
@@ -429,7 +445,7 @@ function selectTranscriptStep(status: AsyncStatus, options: TranscriptOptions):
 	}
 	const step = selectedIndex !== undefined ? steps[selectedIndex] : undefined;
 	const hint = options.index === undefined && steps.length > 1
-		? `Tip: pass index to inspect a specific child transcript (${steps.map((candidate, index) => `${index}=${candidate.agent}`).join(", ")}).`
+		? `Tip: pass index to inspect a specific child transcript (${steps.map((candidate, index) => `${index}=${fleetChildDisplayName(candidate)}`).join(", ")}).`
 		: undefined;
 	return { index: selectedIndex, step, hint };
 }
@@ -439,7 +455,7 @@ function stepStateLine(mode: SubagentRunMode, index: number | undefined, step: A
 	const modelThinking = formatModelThinking(step.model, step.thinking);
 	const context = contextModeLabel(step.context);
 	const parts = [
-		`${mode === "parallel" ? "Agent" : "Step"}: ${index} (${step.agent})${context ? ` ${context}` : ""}`,
+		`${mode === "parallel" ? "Agent" : "Step"}: ${index} (${fleetChildDisplayName(step)})${context ? ` ${context}` : ""}`,
 		step.status,
 		formatActivityFacts(step),
 		modelThinking,
@@ -523,7 +539,7 @@ export function formatAsyncRunTranscript(status: AsyncStatus, asyncDir: string,
 		transcriptSource = "Recent output from status.json";
 	}
 	if (transcriptLines.length === 0 && sessionFile) {
-		const sessionTail = readSessionTranscriptTail(sessionFile, lineLimit, options.sessionRoots ?? []);
+		const sessionTail = readSessionTranscriptTail(sessionFile, lineLimit, options.sessionRoots ?? [], options.trustedSessionFiles, options.trustedSessionFileRoot);
 		transcriptLines = sessionTail.lines;
 		warnings.push(...sessionTail.warnings);
 		if (transcriptLines.length > 0) transcriptSource = `Session transcript tail from ${sessionFile}`;
@@ -547,14 +563,14 @@ export function formatNestedRunTranscript(run: NestedRunSummary, options: Transc
 		`Nested run: ${run.id}`,
 		`State: ${run.state}`,
 		run.mode ? `Mode: ${run.mode}` : undefined,
-		run.agent ? `Agent: ${run.agent}` : run.agents?.length ? `Agents: ${run.agents.join(", ")}` : undefined,
+		run.sessionName?.trim() ? `Agent: ${run.sessionName.trim()}` : run.agent ? `Agent: ${run.agent}` : run.agents?.length ? `Agents: ${run.agents.join(", ")}` : undefined,
 	].filter((line): line is string => Boolean(line));
 	appendKnownArtifacts(lines, { outputPaths: [], sessionFile: run.sessionFile });
 	if (!run.sessionFile) {
 		appendTranscriptBody(lines, "Transcript tail", [], false);
 		return safeTranscriptLines(lines);
 	}
-	const sessionTail = readSessionTranscriptTail(run.sessionFile, lineLimit, options.sessionRoots ?? []);
+	const sessionTail = readSessionTranscriptTail(run.sessionFile, lineLimit, options.sessionRoots ?? [], options.trustedSessionFiles, options.trustedSessionFileRoot);
 	if (sessionTail.warnings.length) {
 		lines.push("Warnings:");
 		for (const warning of sessionTail.warnings) lines.push(`  ${warning}`);
@@ -573,14 +589,14 @@ export function formatAsyncResultTranscript(data: {
 	sessionFile?: string;
 	agent?: string;
 	exitCode?: number | null;
-	results?: Array<{ agent?: string; output?: string; summary?: string; sessionFile?: string; state?: string; success?: boolean; exitCode?: number | null }>;
+	results?: Array<{ agent?: string; sessionName?: string; output?: string; summary?: string; sessionFile?: string; state?: string; success?: boolean; exitCode?: number | null }>;
 }, resultPath: string, options: TranscriptOptions = {}): string {
 	const lineLimit = transcriptLineLimit(options.lines);
 	const runId = data.runId ?? data.id ?? path.basename(resultPath, ".json");
 	const children = Array.isArray(data.results)
 		? data.results
 		: data.agent
-			? [{ agent: data.agent, output: data.output, summary: data.summary, sessionFile: data.sessionFile, state: data.state, success: data.success, exitCode: data.exitCode }]
+			? [{ agent: data.agent, sessionName: undefined, output: data.output, summary: data.summary, sessionFile: data.sessionFile, state: data.state, success: data.success, exitCode: data.exitCode }]
 			: [];
 	let index = options.index;
 	if (index !== undefined && !Number.isInteger(index)) throw new Error("Transcript index must be an integer.");
@@ -595,8 +611,8 @@ export function formatAsyncResultTranscript(data: {
 	const lines = [
 		`Run: ${runId}`,
 		`State: ${data.state ?? (data.success ? "complete" : "failed")}`,
-		index !== undefined && child ? `Child: ${index} (${child.agent ?? "subagent"})` : undefined,
-		index === undefined && children.length > 1 ? `Tip: pass index to inspect a specific child transcript (${children.map((candidate, childIndex) => `${childIndex}=${candidate.agent ?? "subagent"}`).join(", ")}).` : undefined,
+		index !== undefined && child ? `Child: ${index} (${fleetChildDisplayName(child)})` : undefined,
+		index === undefined && children.length > 1 ? `Tip: pass index to inspect a specific child transcript (${children.map((candidate, childIndex) => `${childIndex}=${fleetChildDisplayName(candidate)}`).join(", ")}).` : undefined,
 	].filter((line): line is string => Boolean(line));
 	appendKnownArtifacts(lines, { outputPaths: [], sessionFile, resultPath });
 	appendTranscriptBody(lines, "Result transcript tail", transcriptLines.filter((line) => line.trim()), output.split(/\r?\n/).length > lineLimit);

package/dist/extensions/pi-subagents/src/runs/background/inspect-rpc.ts

@@ -218,19 +218,19 @@ function readOutputArtifact(outputPath: string): { output?: string; errorText?:
 	}
 }
 
-function readSessionBackedOutput(sessionPath: string, trustedRoots: string[]): { output?: string } {
-	if (trustedRoots.length === 0) return {};
+function readSessionBackedOutput(sessionPath: string, trustedRoots: string[], trustedSessionFileRoot?: string): { output?: string } {
+	if (trustedRoots.length === 0 && !trustedSessionFileRoot) return {};
 	// The archive retains the child's session file as its output record. The
 	// final answer is the terminal assistant message's text — all text parts
 	// of that one session record, not just the last part.
-	const tail = readSessionMessagesTail(sessionPath, MAX_MESSAGE_LINES, trustedRoots);
+	const tail = readSessionMessagesTail(sessionPath, MAX_MESSAGE_LINES, trustedRoots, [sessionPath], trustedSessionFileRoot);
 	const last = tail.messages.findLast((message) => message.role === "assistant" && message.kind === "text");
 	if (!last) return {};
 	const parts = tail.messages.filter((message) => message.recordIndex === last.recordIndex && message.kind === "text");
 	return { output: parts.map((part) => part.text).join("\n") };
 }
 
-function readResultOutput(resultsDir: string, sessionId: string, runId: string, stepIndex: number | undefined, trustedRoots: string[], stepAgent: string | undefined, now: () => number): { output?: string; errorText?: string } {
+function readResultOutput(resultsDir: string, sessionId: string, runId: string, stepIndex: number | undefined, trustedRoots: string[], stepAgent: string | undefined, now: () => number, trustedSessionFileRoot?: string): { output?: string; errorText?: string } {
 	const resultPath = resultPayloadPathForSessionRun(resultsDir, sessionId, runId);
 	if (resultPath) return resultOutput(JSON.parse(fs.readFileSync(resultPath, "utf-8")) as unknown, stepIndex);
 	// Read the raw record first: readCompletionReplay best-effort deletes
@@ -284,7 +284,7 @@ function readResultOutput(resultsDir: string, sessionId: string, runId: string,
 	if (artifactPath) return readOutputArtifact(artifactPath);
 	const sessionEntry = archive?.entries.find((entry) => entry.source === "session" && matches(entry));
 	const sessionPath = sessionEntry?.source === "session" ? sessionEntry.path : undefined;
-	if (sessionPath) return readSessionBackedOutput(sessionPath, trustedRoots);
+	if (sessionPath) return readSessionBackedOutput(sessionPath, trustedRoots, trustedSessionFileRoot);
 	const output = archive?.entries.find((entry) => entry.source === "result-tail" && matches(entry))?.text;
 	return output ? { output } : {};
 }
@@ -377,8 +377,8 @@ export function buildInspectReply(request: InspectRequest, deps: InspectDeps = {
 
 		let messages: InspectReplyMessage[] | undefined;
 		let task: string | undefined;
-		if (sessionFile && trustedRoots.length > 0) {
-			const tail = readSessionMessagesTail(sessionFile, lineLimit, trustedRoots);
+		if (sessionFile && (trustedRoots.length > 0 || deps.state?.trustedSessionFileRoot)) {
+			const tail = readSessionMessagesTail(sessionFile, lineLimit, trustedRoots, [sessionFile], deps.state?.trustedSessionFileRoot);
 			if (tail.messages.length > 0) {
 				messages = tail.messages.map(toReplyMessage);
 				// The delegated task is the child session's first user message, but
@@ -393,7 +393,7 @@ export function buildInspectReply(request: InspectRequest, deps: InspectDeps = {
 			}
 		}
 
-		const result = readResultOutput(resultsDir, currentSessionId, node.status.runId, node.stepIndex, trustedRoots, step?.agent, deps.now ?? Date.now);
+		const result = readResultOutput(resultsDir, currentSessionId, node.status.runId, node.stepIndex, trustedRoots, step?.agent, deps.now ?? Date.now, deps.state?.trustedSessionFileRoot);
 		const failedText = step?.error ?? node.status.error;
 		if (result.output === undefined && result.errorText === undefined && failedText !== undefined) {
 			return errorReply(request, "internal", "Inspection could not read the async run artifacts.");

package/dist/extensions/pi-subagents/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/dist/extensions/pi-subagents/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();
+		},
+	};
+}