@narumitw/pi-subagents 0.16.0 → 0.17.1

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@narumitw/pi-subagents",
-	"version": "0.16.0",
+	"version": "0.17.1",
 	"description": "Pi extension for delegating work to specialized isolated subagents.",
 	"type": "module",
 	"license": "MIT",

package/src/execution.ts

@@ -286,6 +286,34 @@ export async function executeSubagent(
 					const emitParallelUpdate = () => {
 						status.update(parallelStatus(doneCount, allResults.length, runningCount));
 						if (onUpdate) {
+							const aggregator = params.aggregator;
+							const pendingAggregator: SingleResult | undefined =
+								aggregator && !signal?.aborted && doneCount === allResults.length
+									? {
+											agent: aggregator.agent,
+											agentSource:
+												agents.find((agent) => agent.name === aggregator.agent)?.source ?? "unknown",
+											task: aggregator.task,
+											exitCode: -1,
+											messages: [],
+											stderr: "",
+											usage: {
+												input: 0,
+												output: 0,
+												cacheRead: 0,
+												cacheWrite: 0,
+												cost: 0,
+												contextTokens: 0,
+												turns: 0,
+											},
+											thinkingLevel: resolveThinkingLevel(
+												aggregator.agent,
+												aggregator.thinkingLevel,
+											),
+											timeoutMs: resolveTimeoutMs(aggregator.agent, aggregator.timeoutMs),
+											finalOutput: "",
+										}
+									: undefined;
 							onUpdate({
 								content: [
 									{
@@ -293,7 +321,7 @@ export async function executeSubagent(
 										text: `Parallel: ${doneCount}/${allResults.length} done, ${runningCount} running...`,
 									},
 								],
-								details: makeDetails("parallel")([...allResults]),
+								details: makeDetails("parallel")([...allResults], pendingAggregator),
 							});
 						}
 					};

package/src/render.ts

@@ -38,6 +38,8 @@ export function formatUsageStats(
 	},
 	model?: string,
 	thinkingLevel?: SubagentThinkingLevel,
+	actualProvider?: string,
+	actualModel?: string,
 ): string {
 	const parts: string[] = [];
 	if (usage.turns) parts.push(`${usage.turns} turn${usage.turns > 1 ? "s" : ""}`);
@@ -46,14 +48,27 @@ export function formatUsageStats(
 	if (usage.cacheRead) parts.push(`R${formatTokens(usage.cacheRead)}`);
 	if (usage.cacheWrite) parts.push(`W${formatTokens(usage.cacheWrite)}`);
 	if (usage.cost) parts.push(`$${usage.cost.toFixed(4)}`);
-	if (usage.contextTokens && usage.contextTokens > 0) {
+	if (usage.contextTokens && usage.contextTokens > 0)
 		parts.push(`ctx:${formatTokens(usage.contextTokens)}`);
-	}
-	if (model) parts.push(model);
-	if (thinkingLevel) parts.push(`thinking:${thinkingLevel}`);
+	const actual =
+		actualProvider && actualModel
+			? `${actualProvider}/${actualModel}`
+			: (actualModel ?? actualProvider);
+	if (actual ?? model) parts.push(actual ?? model ?? "");
+	if (thinkingLevel) parts.push(`requested-thinking:${thinkingLevel}`);
 	return parts.join(" ");
 }
 
+function formatResultUsageStats(result: SingleResult): string {
+	return formatUsageStats(
+		result.usage,
+		result.model,
+		result.thinkingLevel,
+		result.actualProvider,
+		result.actualModel,
+	);
+}
+
 function formatToolCall(
 	toolName: string,
 	args: Record<string, unknown>,
@@ -103,7 +118,11 @@ function formatToolCall(
 		case "find": {
 			const pattern = (args.pattern || "*") as string;
 			const rawPath = (args.path || ".") as string;
-			return themeFg("muted", "find ") + themeFg("accent", pattern) + themeFg("dim", ` in ${shortenPath(rawPath)}`);
+			return (
+				themeFg("muted", "find ") +
+				themeFg("accent", pattern) +
+				themeFg("dim", ` in ${shortenPath(rawPath)}`)
+			);
 		}
 		case "grep": {
 			const pattern = (args.pattern || "") as string;
@@ -131,400 +150,496 @@ function getDisplayItems(messages: Message[]): DisplayItem[] {
 	for (const msg of messages) {
 		if (msg.role === "assistant") {
 			for (const part of msg.content) {
-				if (part.type === "text") items.push({ type: "text", text: part.text });
-				else if (part.type === "toolCall") items.push({ type: "toolCall", name: part.name, args: part.arguments });
+				if (part.type === "text") {
+					const text = part.text.trim();
+					if (text) items.push({ type: "text", text });
+				} else if (part.type === "toolCall") {
+					items.push({ type: "toolCall", name: part.name, args: part.arguments });
+				}
 			}
 		}
 	}
 	return items;
 }
+function getCollapsedDisplayItems(result: SingleResult): { items: DisplayItem[]; total: number } {
+	if (result.recentActivity && result.recentActivity.length > 0) {
+		return {
+			items: result.recentActivity,
+			total: Math.max(result.recentActivity.length, result.recentActivityTotal ?? 0),
+		};
+	}
+	const items = getDisplayItems(result.messages);
+	return { items, total: items.length };
+}
 
 export function renderSubagentCall(args: SubagentParams, theme: Theme) {
-			const scope: AgentScope = args.agentScope ?? "user";
-			if (args.chain && args.chain.length > 0) {
-				let text =
-					theme.fg("toolTitle", theme.bold("subagent ")) +
-					theme.fg("accent", `chain (${args.chain.length} steps)`) +
-					theme.fg("muted", ` [${scope}]`);
-				for (let i = 0; i < Math.min(args.chain.length, 3); i++) {
-					const step = args.chain[i];
-					// Clean up {previous} placeholder for display
-					const cleanTask = step.task.replace(/\{previous\}/g, "").trim();
-					const preview = cleanTask.length > 40 ? `${cleanTask.slice(0, 40)}...` : cleanTask;
-					text +=
-						"\n  " +
-						theme.fg("muted", `${i + 1}.`) +
-						" " +
-						theme.fg("accent", step.agent) +
-						theme.fg("dim", ` ${preview}`);
-				}
-				if (args.chain.length > 3) text += `\n  ${theme.fg("muted", `... +${args.chain.length - 3} more`)}`;
-				return new Text(text, 0, 0);
-			}
-			if (args.tasks && args.tasks.length > 0) {
-				let text =
-					theme.fg("toolTitle", theme.bold("subagent ")) +
-					theme.fg("accent", `parallel (${args.tasks.length} tasks)`) +
-					theme.fg("muted", ` [${scope}]`);
-				for (const t of args.tasks.slice(0, 3)) {
-					const preview = t.task.length > 40 ? `${t.task.slice(0, 40)}...` : t.task;
-					text += `\n  ${theme.fg("accent", t.agent)}${theme.fg("dim", ` ${preview}`)}`;
-				}
-				if (args.tasks.length > 3) text += `\n  ${theme.fg("muted", `... +${args.tasks.length - 3} more`)}`;
-				if (args.aggregator) {
-					const preview =
-						args.aggregator.task.length > 40 ? `${args.aggregator.task.slice(0, 40)}...` : args.aggregator.task;
-					text += `\n  ${theme.fg("muted", "fan-in → ")}${theme.fg("accent", args.aggregator.agent)}${theme.fg(
-						"dim",
-						` ${preview}`,
-					)}`;
-				}
-				return new Text(text, 0, 0);
-			}
-			const agentName = args.agent || "...";
-			const preview = args.task ? (args.task.length > 60 ? `${args.task.slice(0, 60)}...` : args.task) : "...";
-			let text =
-				theme.fg("toolTitle", theme.bold("subagent ")) +
-				theme.fg("accent", agentName) +
-				theme.fg("muted", ` [${scope}]`);
-			text += `\n  ${theme.fg("dim", preview)}`;
-			return new Text(text, 0, 0);
+	const scope: AgentScope = args.agentScope ?? "user";
+	if (args.chain && args.chain.length > 0) {
+		let text =
+			theme.fg("toolTitle", theme.bold("subagent ")) +
+			theme.fg("accent", `chain (${args.chain.length} steps)`) +
+			theme.fg("muted", ` [${scope}]`);
+		for (let i = 0; i < Math.min(args.chain.length, 3); i++) {
+			const step = args.chain[i];
+			// Clean up {previous} placeholder for display
+			const cleanTask = step.task.replace(/\{previous\}/g, "").trim();
+			const preview = cleanTask.length > 40 ? `${cleanTask.slice(0, 40)}...` : cleanTask;
+			text +=
+				"\n  " +
+				theme.fg("muted", `${i + 1}.`) +
+				" " +
+				theme.fg("accent", step.agent) +
+				theme.fg("dim", ` ${preview}`);
+		}
+		if (args.chain.length > 3)
+			text += `\n  ${theme.fg("muted", `... +${args.chain.length - 3} more`)}`;
+		return new Text(text, 0, 0);
+	}
+	if (args.tasks && args.tasks.length > 0) {
+		let text =
+			theme.fg("toolTitle", theme.bold("subagent ")) +
+			theme.fg("accent", `parallel (${args.tasks.length} tasks)`) +
+			theme.fg("muted", ` [${scope}]`);
+		for (const t of args.tasks.slice(0, 3)) {
+			const preview = t.task.length > 40 ? `${t.task.slice(0, 40)}...` : t.task;
+			text += `\n  ${theme.fg("accent", t.agent)}${theme.fg("dim", ` ${preview}`)}`;
+		}
+		if (args.tasks.length > 3)
+			text += `\n  ${theme.fg("muted", `... +${args.tasks.length - 3} more`)}`;
+		if (args.aggregator) {
+			const preview =
+				args.aggregator.task.length > 40
+					? `${args.aggregator.task.slice(0, 40)}...`
+					: args.aggregator.task;
+			text += `\n  ${theme.fg("muted", "fan-in → ")}${theme.fg("accent", args.aggregator.agent)}${theme.fg(
+				"dim",
+				` ${preview}`,
+			)}`;
+		}
+		return new Text(text, 0, 0);
+	}
+	const agentName = args.agent || "...";
+	const preview = args.task
+		? args.task.length > 60
+			? `${args.task.slice(0, 60)}...`
+			: args.task
+		: "...";
+	let text =
+		theme.fg("toolTitle", theme.bold("subagent ")) +
+		theme.fg("accent", agentName) +
+		theme.fg("muted", ` [${scope}]`);
+	text += `\n  ${theme.fg("dim", preview)}`;
+	return new Text(text, 0, 0);
 }
 
 export function renderSubagentResult(
 	result: AgentToolResult<SubagentDetails>,
-	{ expanded }: ToolRenderResultOptions,
+	{ expanded, isPartial }: ToolRenderResultOptions,
 	theme: Theme,
 ) {
-			const details = result.details as SubagentDetails | undefined;
-			if (!details || details.results.length === 0) {
-				const text = result.content[0];
-				return new Text(text?.type === "text" ? text.text : "(no output)", 0, 0);
+	const details = result.details as SubagentDetails | undefined;
+	if (!details || details.results.length === 0) {
+		const text = result.content[0];
+		return new Text(text?.type === "text" ? text.text : "(no output)", 0, 0);
+	}
+
+	const mdTheme = getMarkdownTheme();
+
+	const renderDisplayItems = (items: DisplayItem[], limit?: number, total = items.length) => {
+		const toShow = limit ? items.slice(-limit) : items;
+		const skipped = Math.max(0, total - toShow.length);
+		let text = "";
+		if (skipped > 0) text += theme.fg("muted", `... ${skipped} earlier items\n`);
+		for (const item of toShow) {
+			if (item.type === "text") {
+				const preview = expanded ? item.text : item.text.split("\n").slice(0, 3).join("\n");
+				text += `${theme.fg("toolOutput", preview)}\n`;
+			} else {
+				text += `${theme.fg("muted", "→ ") + formatToolCall(item.name, item.args, theme.fg.bind(theme))}\n`;
 			}
+		}
+		return text.trimEnd();
+	};
 
-			const mdTheme = getMarkdownTheme();
-
-			const renderDisplayItems = (items: DisplayItem[], limit?: number) => {
-				const toShow = limit ? items.slice(-limit) : items;
-				const skipped = limit && items.length > limit ? items.length - limit : 0;
-				let text = "";
-				if (skipped > 0) text += theme.fg("muted", `... ${skipped} earlier items\n`);
-				for (const item of toShow) {
-					if (item.type === "text") {
-						const preview = expanded ? item.text : item.text.split("\n").slice(0, 3).join("\n");
-						text += `${theme.fg("toolOutput", preview)}\n`;
-					} else {
-						text += `${theme.fg("muted", "→ ") + formatToolCall(item.name, item.args, theme.fg.bind(theme))}\n`;
-					}
+	if (details.mode === "single" && details.results.length === 1) {
+		const r = details.results[0];
+		const isError = isResultError(r);
+		const icon = isError
+			? theme.fg("error", "✗")
+			: isPartial
+				? theme.fg("warning", "⏳")
+				: theme.fg("success", "✓");
+		const displayItems = getDisplayItems(r.messages);
+		const finalOutput = getResultFinalOutput(r);
+
+		if (expanded) {
+			const container = new Container();
+			let header = `${icon} ${theme.fg("toolTitle", theme.bold(r.agent))}${theme.fg("muted", ` (${r.agentSource})`)}`;
+			if (isError && r.stopReason) header += ` ${theme.fg("error", `[${r.stopReason}]`)}`;
+			container.addChild(new Text(header, 0, 0));
+			if (isError && r.errorMessage)
+				container.addChild(new Text(theme.fg("error", `Error: ${r.errorMessage}`), 0, 0));
+			container.addChild(new Spacer(1));
+			container.addChild(new Text(theme.fg("muted", "─── Task ───"), 0, 0));
+			container.addChild(new Text(theme.fg("dim", r.task), 0, 0));
+			container.addChild(new Spacer(1));
+			container.addChild(new Text(theme.fg("muted", "─── Output ───"), 0, 0));
+			if (displayItems.length === 0 && !finalOutput) {
+				container.addChild(new Text(theme.fg("muted", "(no output)"), 0, 0));
+			} else {
+				for (const item of displayItems) {
+					if (item.type === "toolCall")
+						container.addChild(
+							new Text(
+								theme.fg("muted", "→ ") +
+									formatToolCall(item.name, item.args, theme.fg.bind(theme)),
+								0,
+								0,
+							),
+						);
+				}
+				if (finalOutput) {
+					container.addChild(new Spacer(1));
+					container.addChild(new Markdown(finalOutput.trim(), 0, 0, mdTheme));
 				}
-				return text.trimEnd();
-			};
+			}
+			const usageStr = formatResultUsageStats(r);
+			if (usageStr) {
+				container.addChild(new Spacer(1));
+				container.addChild(new Text(theme.fg("dim", usageStr), 0, 0));
+			}
+			return container;
+		}
 
-			if (details.mode === "single" && details.results.length === 1) {
-				const r = details.results[0];
-				const isError = isResultError(r);
-				const icon = isError ? theme.fg("error", "✗") : theme.fg("success", "✓");
+		const collapsed = getCollapsedDisplayItems(r);
+		let text = `${icon} ${theme.fg("toolTitle", theme.bold(r.agent))}${theme.fg("muted", ` (${r.agentSource})`)}`;
+		if (isError && r.stopReason) text += ` ${theme.fg("error", `[${r.stopReason}]`)}`;
+		if (isError && r.errorMessage) text += `\n${theme.fg("error", `Error: ${r.errorMessage}`)}`;
+		if (collapsed.items.length > 0) {
+			text += `\n${renderDisplayItems(collapsed.items, COLLAPSED_ITEM_COUNT, collapsed.total)}`;
+			if (collapsed.total > COLLAPSED_ITEM_COUNT)
+				text += `\n${theme.fg("muted", "(Ctrl+O to expand)")}`;
+		} else if (finalOutput.trim()) {
+			text += `\n${theme.fg("toolOutput", finalOutput.trim().split("\n").slice(0, 3).join("\n"))}`;
+		} else if (!isError || !r.errorMessage) {
+			text += `\n${theme.fg("muted", isPartial && !isError ? "(running...)" : "(no output)")}`;
+		}
+		const usageStr = formatResultUsageStats(r);
+		if (usageStr) text += `\n${theme.fg("dim", usageStr)}`;
+		return new Text(text, 0, 0);
+	}
+
+	const aggregateUsage = (results: SingleResult[]) => {
+		const total = { input: 0, output: 0, cacheRead: 0, cacheWrite: 0, cost: 0, turns: 0 };
+		for (const r of results) {
+			total.input += r.usage.input;
+			total.output += r.usage.output;
+			total.cacheRead += r.usage.cacheRead;
+			total.cacheWrite += r.usage.cacheWrite;
+			total.cost += r.usage.cost;
+			total.turns += r.usage.turns;
+		}
+		return total;
+	};
+
+	if (details.mode === "chain") {
+		const currentResult = details.results.at(-1);
+		const currentIsRunning =
+			isPartial && currentResult !== undefined && !isResultError(currentResult);
+		const successCount = details.results.filter(
+			(result) => !isResultError(result) && (!currentIsRunning || result !== currentResult),
+		).length;
+		const icon = currentIsRunning
+			? theme.fg("warning", "⏳")
+			: successCount === details.results.length
+				? theme.fg("success", "✓")
+				: theme.fg("error", "✗");
+
+		if (expanded) {
+			const container = new Container();
+			container.addChild(
+				new Text(
+					icon +
+						" " +
+						theme.fg("toolTitle", theme.bold("chain ")) +
+						theme.fg("accent", `${successCount}/${details.results.length} steps`),
+					0,
+					0,
+				),
+			);
+
+			for (const r of details.results) {
+				const rFailed = isResultError(r);
+				const rIcon = rFailed
+					? theme.fg("error", "✗")
+					: currentIsRunning && r === currentResult
+						? theme.fg("warning", "⏳")
+						: theme.fg("success", "✓");
 				const displayItems = getDisplayItems(r.messages);
 				const finalOutput = getResultFinalOutput(r);
 
-				if (expanded) {
-					const container = new Container();
-					let header = `${icon} ${theme.fg("toolTitle", theme.bold(r.agent))}${theme.fg("muted", ` (${r.agentSource})`)}`;
-					if (isError && r.stopReason) header += ` ${theme.fg("error", `[${r.stopReason}]`)}`;
-					container.addChild(new Text(header, 0, 0));
-					if (isError && r.errorMessage)
-						container.addChild(new Text(theme.fg("error", `Error: ${r.errorMessage}`), 0, 0));
-					container.addChild(new Spacer(1));
-					container.addChild(new Text(theme.fg("muted", "─── Task ───"), 0, 0));
-					container.addChild(new Text(theme.fg("dim", r.task), 0, 0));
-					container.addChild(new Spacer(1));
-					container.addChild(new Text(theme.fg("muted", "─── Output ───"), 0, 0));
-					if (displayItems.length === 0 && !finalOutput) {
-						container.addChild(new Text(theme.fg("muted", "(no output)"), 0, 0));
-					} else {
-						for (const item of displayItems) {
-							if (item.type === "toolCall")
-								container.addChild(
-									new Text(
-										theme.fg("muted", "→ ") + formatToolCall(item.name, item.args, theme.fg.bind(theme)),
-										0,
-										0,
-									),
-								);
-						}
-						if (finalOutput) {
-							container.addChild(new Spacer(1));
-							container.addChild(new Markdown(finalOutput.trim(), 0, 0, mdTheme));
-						}
-					}
-					const usageStr = formatUsageStats(r.usage, r.model, r.thinkingLevel);
-					if (usageStr) {
-						container.addChild(new Spacer(1));
-						container.addChild(new Text(theme.fg("dim", usageStr), 0, 0));
+				container.addChild(new Spacer(1));
+				container.addChild(
+					new Text(
+						`${theme.fg("muted", `─── Step ${r.step}: `) + theme.fg("accent", r.agent)} ${rIcon}`,
+						0,
+						0,
+					),
+				);
+				container.addChild(new Text(theme.fg("muted", "Task: ") + theme.fg("dim", r.task), 0, 0));
+				if (rFailed && r.errorMessage)
+					container.addChild(new Text(theme.fg("error", `Error: ${r.errorMessage}`), 0, 0));
+
+				// Show tool calls
+				for (const item of displayItems) {
+					if (item.type === "toolCall") {
+						container.addChild(
+							new Text(
+								theme.fg("muted", "→ ") +
+									formatToolCall(item.name, item.args, theme.fg.bind(theme)),
+								0,
+								0,
+							),
+						);
 					}
-					return container;
 				}
 
-				let text = `${icon} ${theme.fg("toolTitle", theme.bold(r.agent))}${theme.fg("muted", ` (${r.agentSource})`)}`;
-				if (isError && r.stopReason) text += ` ${theme.fg("error", `[${r.stopReason}]`)}`;
-				if (isError && r.errorMessage) text += `\n${theme.fg("error", `Error: ${r.errorMessage}`)}`;
-				else if (displayItems.length === 0) text += `\n${theme.fg("muted", "(no output)")}`;
-				else {
-					text += `\n${renderDisplayItems(displayItems, COLLAPSED_ITEM_COUNT)}`;
-					if (displayItems.length > COLLAPSED_ITEM_COUNT) text += `\n${theme.fg("muted", "(Ctrl+O to expand)")}`;
+				// Show final output as markdown
+				if (finalOutput) {
+					container.addChild(new Spacer(1));
+					container.addChild(new Markdown(finalOutput.trim(), 0, 0, mdTheme));
 				}
-				const usageStr = formatUsageStats(r.usage, r.model, r.thinkingLevel);
-				if (usageStr) text += `\n${theme.fg("dim", usageStr)}`;
-				return new Text(text, 0, 0);
+
+				const stepUsage = formatResultUsageStats(r);
+				if (stepUsage) container.addChild(new Text(theme.fg("dim", stepUsage), 0, 0));
 			}
 
-			const aggregateUsage = (results: SingleResult[]) => {
-				const total = { input: 0, output: 0, cacheRead: 0, cacheWrite: 0, cost: 0, turns: 0 };
-				for (const r of results) {
-					total.input += r.usage.input;
-					total.output += r.usage.output;
-					total.cacheRead += r.usage.cacheRead;
-					total.cacheWrite += r.usage.cacheWrite;
-					total.cost += r.usage.cost;
-					total.turns += r.usage.turns;
-				}
-				return total;
-			};
+			const usageStr = formatUsageStats(aggregateUsage(details.results));
+			if (usageStr) {
+				container.addChild(new Spacer(1));
+				container.addChild(new Text(theme.fg("dim", `Total: ${usageStr}`), 0, 0));
+			}
+			return container;
+		}
 
-			if (details.mode === "chain") {
-				const successCount = details.results.filter((result) => !isResultError(result)).length;
-				const icon = successCount === details.results.length ? theme.fg("success", "✓") : theme.fg("error", "✗");
+		// Collapsed view
+		let text =
+			icon +
+			" " +
+			theme.fg("toolTitle", theme.bold("chain ")) +
+			theme.fg("accent", `${successCount}/${details.results.length} steps`);
+		for (const r of details.results) {
+			const rFailed = isResultError(r);
+			const rIcon = rFailed
+				? theme.fg("error", "✗")
+				: currentIsRunning && r === currentResult
+					? theme.fg("warning", "⏳")
+					: theme.fg("success", "✓");
+			const collapsed = getCollapsedDisplayItems(r);
+			const finalOutput = getResultFinalOutput(r).trim();
+			text += `\n\n${theme.fg("muted", `─── Step ${r.step}: `)}${theme.fg("accent", r.agent)} ${rIcon}`;
+			if (rFailed && r.errorMessage)
+				text += `\n${theme.fg("error", `Error: ${r.errorMessage}`)}`;
+			if (collapsed.items.length > 0)
+				text += `\n${renderDisplayItems(collapsed.items, 5, collapsed.total)}`;
+			else if (currentIsRunning && r === currentResult)
+				text += `\n${theme.fg("muted", "(running...)")}`;
+			else if (finalOutput)
+				text += `\n${theme.fg("toolOutput", finalOutput.split("\n").slice(0, 3).join("\n"))}`;
+			else if (!rFailed || !r.errorMessage) text += `\n${theme.fg("muted", "(no output)")}`;
+		}
+		const usageStr = formatUsageStats(aggregateUsage(details.results));
+		if (usageStr) text += `\n\n${theme.fg("dim", `Total: ${usageStr}`)}`;
+		text += `\n${theme.fg("muted", "(Ctrl+O to expand)")}`;
+		return new Text(text, 0, 0);
+	}
 
-				if (expanded) {
-					const container = new Container();
-					container.addChild(
-						new Text(
-							icon +
-								" " +
-								theme.fg("toolTitle", theme.bold("chain ")) +
-								theme.fg("accent", `${successCount}/${details.results.length} steps`),
-							0,
-							0,
-						),
-					);
+	if (details.mode === "parallel") {
+		const resultIsRunning = (result: SingleResult) =>
+			result.exitCode === -1 && !isResultError(result);
+		const running = details.results.filter(resultIsRunning).length;
+		const successCount = details.results.filter(
+			(result) => result.exitCode !== -1 && !isResultError(result),
+		).length;
+		const failCount = details.results.filter(isResultError).length;
+		const aggregator = details.aggregator;
+		const aggregatorFailed = aggregator ? isResultError(aggregator) : false;
+		const aggregatorRunning = aggregator
+			? !aggregatorFailed && (isPartial || aggregator.exitCode === -1)
+			: false;
+		const pendingSuccessfulSettlement =
+			isPartial && !aggregator && running === 0 && failCount === 0;
+		const isRunning = running > 0 || aggregatorRunning || pendingSuccessfulSettlement;
+		const icon = isRunning
+			? theme.fg("warning", "⏳")
+			: failCount > 0 || aggregatorFailed
+				? theme.fg("warning", "◐")
+				: theme.fg("success", "✓");
+		const status = isRunning
+			? aggregatorRunning
+				? `${successCount + failCount}/${details.results.length} done, fan-in running`
+				: running > 0
+					? `${successCount + failCount}/${details.results.length} done, ${running} running`
+					: `${successCount + failCount}/${details.results.length} done, running`
+			: aggregator
+				? `${successCount}/${details.results.length} tasks + fan-in`
+				: `${successCount}/${details.results.length} tasks`;
+
+		if (expanded && !isRunning) {
+			const container = new Container();
+			container.addChild(
+				new Text(
+					`${icon} ${theme.fg("toolTitle", theme.bold("parallel "))}${theme.fg("accent", status)}`,
+					0,
+					0,
+				),
+			);
 
-					for (const r of details.results) {
-						const rIcon = !isResultError(r) ? theme.fg("success", "✓") : theme.fg("error", "✗");
-						const displayItems = getDisplayItems(r.messages);
-						const finalOutput = getResultFinalOutput(r);
+			for (const r of details.results) {
+				const rFailed = isResultError(r);
+				const rIcon = rFailed
+					? theme.fg("error", "✗")
+					: resultIsRunning(r)
+						? theme.fg("warning", "⏳")
+						: theme.fg("success", "✓");
+				const displayItems = getDisplayItems(r.messages);
+				const finalOutput = getResultFinalOutput(r);
 
-						container.addChild(new Spacer(1));
+				container.addChild(new Spacer(1));
+				container.addChild(
+					new Text(`${theme.fg("muted", "─── ") + theme.fg("accent", r.agent)} ${rIcon}`, 0, 0),
+				);
+				container.addChild(new Text(theme.fg("muted", "Task: ") + theme.fg("dim", r.task), 0, 0));
+				if (rFailed && r.errorMessage)
+					container.addChild(new Text(theme.fg("error", `Error: ${r.errorMessage}`), 0, 0));
+
+				// Show tool calls
+				for (const item of displayItems) {
+					if (item.type === "toolCall") {
 						container.addChild(
 							new Text(
-								`${theme.fg("muted", `─── Step ${r.step}: `) + theme.fg("accent", r.agent)} ${rIcon}`,
+								theme.fg("muted", "→ ") +
+									formatToolCall(item.name, item.args, theme.fg.bind(theme)),
 								0,
 								0,
 							),
 						);
-						container.addChild(new Text(theme.fg("muted", "Task: ") + theme.fg("dim", r.task), 0, 0));
-
-						// Show tool calls
-						for (const item of displayItems) {
-							if (item.type === "toolCall") {
-								container.addChild(
-									new Text(
-										theme.fg("muted", "→ ") + formatToolCall(item.name, item.args, theme.fg.bind(theme)),
-										0,
-										0,
-									),
-								);
-							}
-						}
-
-						// Show final output as markdown
-						if (finalOutput) {
-							container.addChild(new Spacer(1));
-							container.addChild(new Markdown(finalOutput.trim(), 0, 0, mdTheme));
-						}
-
-						const stepUsage = formatUsageStats(r.usage, r.model, r.thinkingLevel);
-						if (stepUsage) container.addChild(new Text(theme.fg("dim", stepUsage), 0, 0));
-					}
-
-					const usageStr = formatUsageStats(aggregateUsage(details.results));
-					if (usageStr) {
-						container.addChild(new Spacer(1));
-						container.addChild(new Text(theme.fg("dim", `Total: ${usageStr}`), 0, 0));
 					}
-					return container;
 				}
 
-				// Collapsed view
-				let text =
-					icon +
-					" " +
-					theme.fg("toolTitle", theme.bold("chain ")) +
-					theme.fg("accent", `${successCount}/${details.results.length} steps`);
-				for (const r of details.results) {
-					const rIcon = !isResultError(r) ? theme.fg("success", "✓") : theme.fg("error", "✗");
-					const displayItems = getDisplayItems(r.messages);
-					text += `\n\n${theme.fg("muted", `─── Step ${r.step}: `)}${theme.fg("accent", r.agent)} ${rIcon}`;
-					if (displayItems.length === 0) text += `\n${theme.fg("muted", "(no output)")}`;
-					else text += `\n${renderDisplayItems(displayItems, 5)}`;
+				// Show final output as markdown
+				if (finalOutput) {
+					container.addChild(new Spacer(1));
+					container.addChild(new Markdown(finalOutput.trim(), 0, 0, mdTheme));
 				}
-				const usageStr = formatUsageStats(aggregateUsage(details.results));
-				if (usageStr) text += `\n\n${theme.fg("dim", `Total: ${usageStr}`)}`;
-				text += `\n${theme.fg("muted", "(Ctrl+O to expand)")}`;
-				return new Text(text, 0, 0);
+
+				const taskUsage = formatResultUsageStats(r);
+				if (taskUsage) container.addChild(new Text(theme.fg("dim", taskUsage), 0, 0));
 			}
 
-			if (details.mode === "parallel") {
-				const running = details.results.filter((result) => result.exitCode === -1).length;
-				const successCount = details.results.filter(
-					(result) => result.exitCode !== -1 && !isResultError(result),
-				).length;
-				const failCount = details.results.filter(
-					(result) => result.exitCode !== -1 && isResultError(result),
-				).length;
-				const aggregator = details.aggregator;
-				const aggregatorRunning = aggregator?.exitCode === -1;
-				const aggregatorFailed = aggregator
-					? aggregator.exitCode !== -1 && isResultError(aggregator)
-					: false;
-				const isRunning = running > 0 || aggregatorRunning;
-				const icon = isRunning
-					? theme.fg("warning", "⏳")
-					: failCount > 0 || aggregatorFailed
-						? theme.fg("warning", "◐")
+			if (aggregator) {
+				const rIcon = aggregatorFailed
+					? theme.fg("error", "✗")
+					: aggregatorRunning
+						? theme.fg("warning", "⏳")
 						: theme.fg("success", "✓");
-				const status = isRunning
-					? aggregatorRunning
-						? `${successCount + failCount}/${details.results.length} done, fan-in running`
-						: `${successCount + failCount}/${details.results.length} done, ${running} running`
-					: aggregator
-						? `${successCount}/${details.results.length} tasks + fan-in`
-						: `${successCount}/${details.results.length} tasks`;
-
-				if (expanded && !isRunning) {
-					const container = new Container();
+				const displayItems = getDisplayItems(aggregator.messages);
+				const finalOutput = getResultFinalOutput(aggregator);
+
+				container.addChild(new Spacer(1));
+				container.addChild(
+					new Text(
+						`${theme.fg("muted", "─── fan-in → ") + theme.fg("accent", aggregator.agent)} ${rIcon}`,
+						0,
+						0,
+					),
+				);
+				container.addChild(
+					new Text(theme.fg("muted", "Task: ") + theme.fg("dim", aggregator.task), 0, 0),
+				);
+				if (aggregatorFailed && aggregator.errorMessage)
 					container.addChild(
-						new Text(
-							`${icon} ${theme.fg("toolTitle", theme.bold("parallel "))}${theme.fg("accent", status)}`,
-							0,
-							0,
-						),
+						new Text(theme.fg("error", `Error: ${aggregator.errorMessage}`), 0, 0),
 					);
-
-					for (const r of details.results) {
-						const rIcon = !isResultError(r) ? theme.fg("success", "✓") : theme.fg("error", "✗");
-						const displayItems = getDisplayItems(r.messages);
-						const finalOutput = getResultFinalOutput(r);
-
-						container.addChild(new Spacer(1));
-						container.addChild(
-							new Text(`${theme.fg("muted", "─── ") + theme.fg("accent", r.agent)} ${rIcon}`, 0, 0),
-						);
-						container.addChild(new Text(theme.fg("muted", "Task: ") + theme.fg("dim", r.task), 0, 0));
-
-						// Show tool calls
-						for (const item of displayItems) {
-							if (item.type === "toolCall") {
-								container.addChild(
-									new Text(
-										theme.fg("muted", "→ ") + formatToolCall(item.name, item.args, theme.fg.bind(theme)),
-										0,
-										0,
-									),
-								);
-							}
-						}
-
-						// Show final output as markdown
-						if (finalOutput) {
-							container.addChild(new Spacer(1));
-							container.addChild(new Markdown(finalOutput.trim(), 0, 0, mdTheme));
-						}
-
-						const taskUsage = formatUsageStats(r.usage, r.model, r.thinkingLevel);
-						if (taskUsage) container.addChild(new Text(theme.fg("dim", taskUsage), 0, 0));
-					}
-
-					if (aggregator) {
-						const rIcon = !isResultError(aggregator)
-							? theme.fg("success", "✓")
-							: theme.fg("error", "✗");
-						const displayItems = getDisplayItems(aggregator.messages);
-						const finalOutput = getResultFinalOutput(aggregator);
-
-						container.addChild(new Spacer(1));
+				for (const item of displayItems) {
+					if (item.type === "toolCall") {
 						container.addChild(
 							new Text(
-								`${theme.fg("muted", "─── fan-in → ") + theme.fg("accent", aggregator.agent)} ${rIcon}`,
+								theme.fg("muted", "→ ") +
+									formatToolCall(item.name, item.args, theme.fg.bind(theme)),
 								0,
 								0,
 							),
 						);
-						container.addChild(new Text(theme.fg("muted", "Task: ") + theme.fg("dim", aggregator.task), 0, 0));
-						for (const item of displayItems) {
-							if (item.type === "toolCall") {
-								container.addChild(
-									new Text(
-										theme.fg("muted", "→ ") + formatToolCall(item.name, item.args, theme.fg.bind(theme)),
-										0,
-										0,
-									),
-								);
-							}
-						}
-						if (finalOutput) {
-							container.addChild(new Spacer(1));
-							container.addChild(new Markdown(finalOutput.trim(), 0, 0, mdTheme));
-						}
-						const fanInUsage = formatUsageStats(aggregator.usage, aggregator.model, aggregator.thinkingLevel);
-						if (fanInUsage) container.addChild(new Text(theme.fg("dim", fanInUsage), 0, 0));
-					}
-
-					const usageResults = aggregator ? [...details.results, aggregator] : details.results;
-					const usageStr = formatUsageStats(aggregateUsage(usageResults));
-					if (usageStr) {
-						container.addChild(new Spacer(1));
-						container.addChild(new Text(theme.fg("dim", `Total: ${usageStr}`), 0, 0));
 					}
-					return container;
-				}
-
-				// Collapsed view (or still running)
-				let text = `${icon} ${theme.fg("toolTitle", theme.bold("parallel "))}${theme.fg("accent", status)}`;
-				for (const r of details.results) {
-					const rIcon =
-						r.exitCode === -1
-							? theme.fg("warning", "⏳")
-							: !isResultError(r)
-								? theme.fg("success", "✓")
-								: theme.fg("error", "✗");
-					const displayItems = getDisplayItems(r.messages);
-					text += `\n\n${theme.fg("muted", "─── ")}${theme.fg("accent", r.agent)} ${rIcon}`;
-					if (displayItems.length === 0)
-						text += `\n${theme.fg("muted", r.exitCode === -1 ? "(running...)" : "(no output)")}`;
-					else text += `\n${renderDisplayItems(displayItems, 5)}`;
 				}
-				if (aggregator) {
-					const rIcon =
-						aggregator.exitCode === -1
-							? theme.fg("warning", "⏳")
-							: !isResultError(aggregator)
-								? theme.fg("success", "✓")
-								: theme.fg("error", "✗");
-					const displayItems = getDisplayItems(aggregator.messages);
-					text += `\n\n${theme.fg("muted", "─── fan-in → ")}${theme.fg("accent", aggregator.agent)} ${rIcon}`;
-					if (displayItems.length === 0)
-						text += `\n${theme.fg("muted", aggregator.exitCode === -1 ? "(running...)" : "(no output)")}`;
-					else text += `\n${renderDisplayItems(displayItems, 5)}`;
-				}
-				if (!isRunning) {
-					const usageResults = aggregator ? [...details.results, aggregator] : details.results;
-					const usageStr = formatUsageStats(aggregateUsage(usageResults));
-					if (usageStr) text += `\n\n${theme.fg("dim", `Total: ${usageStr}`)}`;
+				if (finalOutput) {
+					container.addChild(new Spacer(1));
+					container.addChild(new Markdown(finalOutput.trim(), 0, 0, mdTheme));
 				}
-				if (!expanded) text += `\n${theme.fg("muted", "(Ctrl+O to expand)")}`;
-				return new Text(text, 0, 0);
+				const fanInUsage = formatResultUsageStats(aggregator);
+				if (fanInUsage) container.addChild(new Text(theme.fg("dim", fanInUsage), 0, 0));
+			}
+
+			const usageResults = aggregator ? [...details.results, aggregator] : details.results;
+			const usageStr = formatUsageStats(aggregateUsage(usageResults));
+			if (usageStr) {
+				container.addChild(new Spacer(1));
+				container.addChild(new Text(theme.fg("dim", `Total: ${usageStr}`), 0, 0));
 			}
+			return container;
+		}
+
+		// Collapsed view (or still running)
+		let text = `${icon} ${theme.fg("toolTitle", theme.bold("parallel "))}${theme.fg("accent", status)}`;
+		for (const r of details.results) {
+			const rFailed = isResultError(r);
+			const rRunning = resultIsRunning(r);
+			const rIcon = rFailed
+				? theme.fg("error", "✗")
+				: rRunning
+					? theme.fg("warning", "⏳")
+					: theme.fg("success", "✓");
+			const collapsed = getCollapsedDisplayItems(r);
+			const finalOutput = getResultFinalOutput(r).trim();
+			text += `\n\n${theme.fg("muted", "─── ")}${theme.fg("accent", r.agent)} ${rIcon}`;
+			if (rFailed && r.errorMessage)
+				text += `\n${theme.fg("error", `Error: ${r.errorMessage}`)}`;
+			if (collapsed.items.length > 0)
+				text += `\n${renderDisplayItems(collapsed.items, 5, collapsed.total)}`;
+			else if (rRunning) text += `\n${theme.fg("muted", "(running...)")}`;
+			else if (finalOutput)
+				text += `\n${theme.fg("toolOutput", finalOutput.split("\n").slice(0, 3).join("\n"))}`;
+			else if (!rFailed || !r.errorMessage) text += `\n${theme.fg("muted", "(no output)")}`;
+		}
+		if (aggregator) {
+			const rIcon = aggregatorFailed
+				? theme.fg("error", "✗")
+				: aggregatorRunning
+					? theme.fg("warning", "⏳")
+					: theme.fg("success", "✓");
+			const collapsed = getCollapsedDisplayItems(aggregator);
+			const finalOutput = getResultFinalOutput(aggregator).trim();
+			text += `\n\n${theme.fg("muted", "─── fan-in → ")}${theme.fg("accent", aggregator.agent)} ${rIcon}`;
+			if (aggregatorFailed && aggregator.errorMessage)
+				text += `\n${theme.fg("error", `Error: ${aggregator.errorMessage}`)}`;
+			if (collapsed.items.length > 0)
+				text += `\n${renderDisplayItems(collapsed.items, 5, collapsed.total)}`;
+			else if (aggregatorRunning) text += `\n${theme.fg("muted", "(running...)")}`;
+			else if (finalOutput)
+				text += `\n${theme.fg("toolOutput", finalOutput.split("\n").slice(0, 3).join("\n"))}`;
+			else if (!aggregatorFailed || !aggregator.errorMessage)
+				text += `\n${theme.fg("muted", "(no output)")}`;
+		}
+		if (!isRunning) {
+			const usageResults = aggregator ? [...details.results, aggregator] : details.results;
+			const usageStr = formatUsageStats(aggregateUsage(usageResults));
+			if (usageStr) text += `\n\n${theme.fg("dim", `Total: ${usageStr}`)}`;
+		}
+		if (!expanded) text += `\n${theme.fg("muted", "(Ctrl+O to expand)")}`;
+		return new Text(text, 0, 0);
+	}
 
-			const text = result.content[0];
-			return new Text(text?.type === "text" ? text.text : "(no output)", 0, 0);
+	const text = result.content[0];
+	return new Text(text?.type === "text" ? text.text : "(no output)", 0, 0);
 }

package/src/runner.ts

@@ -5,12 +5,7 @@ import * as path from "node:path";
 import type { AgentToolResult } from "@earendil-works/pi-agent-core";
 import type { Message } from "@earendil-works/pi-ai";
 import { withFileMutationQueue } from "@earendil-works/pi-coding-agent";
-import type {
-	AgentConfig,
-	AgentScope,
-	AgentSource,
-	SubagentThinkingLevel,
-} from "./agents.js";
+import type { AgentConfig, AgentScope, AgentSource, SubagentThinkingLevel } from "./agents.js";
 import {
 	appendBounded,
 	DEFAULT_MAX_CONTEXT_BYTES,
@@ -32,6 +27,13 @@ export interface UsageStats {
 	contextTokens: number;
 	turns: number;
 }
+export type RecentActivityItem =
+	| { type: "text"; text: string }
+	| { type: "toolCall"; name: string; args: Record<string, unknown> };
+
+const MAX_RECENT_ACTIVITY_ITEMS = 10;
+const MAX_RECENT_ACTIVITY_BYTES = 8 * 1024;
+const MAX_RECENT_ACTIVITY_ARGUMENT_BYTES = 1024;
 
 export interface SingleResult {
 	agent: string;
@@ -42,6 +44,10 @@ export interface SingleResult {
 	stderr: string;
 	usage: UsageStats;
 	model?: string;
+	actualProvider?: string;
+	actualModel?: string;
+	recentActivity?: RecentActivityItem[];
+	recentActivityTotal?: number;
 	thinkingLevel?: SubagentThinkingLevel;
 	stopReason?: string;
 	errorMessage?: string;
@@ -89,6 +95,8 @@ export function getResultFinalOutput(result: SingleResult): string {
 export function isResultError(result: SingleResult): boolean {
 	return (
 		(result.exitCode !== 0 && result.exitCode !== -1) ||
+		result.timedOut === true ||
+		result.stopReason === "timeout" ||
 		result.stopReason === "error" ||
 		result.stopReason === "aborted"
 	);
@@ -102,27 +110,124 @@ export function formatResultFailure(result: SingleResult): string {
 	return truncateUtf8(combined, DEFAULT_MAX_CONTEXT_BYTES).text;
 }
 
-function boundMessageText(message: Message, maxBytes: number): { message: Message; bytes: number; truncated: boolean } {
-	const serializedBytes = Buffer.byteLength(JSON.stringify(message), "utf8");
-	if (serializedBytes <= maxBytes) return { message, bytes: serializedBytes, truncated: false };
-	if (!Array.isArray(message.content)) return { message, bytes: Math.min(serializedBytes, maxBytes), truncated: true };
-	let remaining = maxBytes;
-	const content = message.content
-		.filter((part) => part.type === "text")
-		.map((part) => {
-			const bounded = truncateUtf8(part.text, remaining);
-			remaining = Math.max(0, remaining - Buffer.byteLength(bounded.text, "utf8"));
-			return { ...part, text: bounded.text };
-		});
-	const boundedMessage = { ...message, content } as Message;
-	return {
-		message: boundedMessage,
-		bytes: Math.min(Buffer.byteLength(JSON.stringify(boundedMessage), "utf8"), maxBytes),
-		truncated: true,
+function boundMessageText(
+	message: Message,
+	maxBytes: number,
+): { message?: Message; bytes: number; truncated: boolean } {
+	const originalBytes = Buffer.byteLength(JSON.stringify(message), "utf8");
+	if (Number.isSafeInteger(maxBytes) && maxBytes >= 0 && originalBytes <= maxBytes) {
+		return { message, bytes: originalBytes, truncated: false };
+	}
+	if (!Number.isSafeInteger(maxBytes) || maxBytes < 0) return { bytes: 0, truncated: true };
+
+	const content: Array<
+		| { type: "text"; text: string }
+		| { type: "toolCall"; id: string; name: string; arguments: Record<string, unknown> }
+	> = [];
+	const bounded = () => ({ ...message, content }) as Message;
+	const fits = () => Buffer.byteLength(JSON.stringify(bounded()), "utf8") <= maxBytes;
+	const addText = (text: string, prepend = false) => {
+		if (!text.trim()) return;
+		const part = { type: "text" as const, text: "" };
+		if (prepend) content.unshift(part);
+		else content.push(part);
+		if (!fits()) {
+			content.splice(content.indexOf(part), 1);
+			return;
+		}
+		let low = 0;
+		let high = Buffer.byteLength(text, "utf8");
+		while (low < high) {
+			const middle = Math.ceil((low + high) / 2);
+			part.text = truncateUtf8(text, middle).text;
+			if (fits()) low = middle;
+			else high = middle - 1;
+		}
+		part.text = truncateUtf8(text, low).text;
+		if (!part.text.trim()) content.splice(content.indexOf(part), 1);
+	};
+	const addToolCall = (part: Extract<Message["content"][number], { type: "toolCall" }>) => {
+		const toolCall = {
+			type: "toolCall" as const,
+			id: part.id,
+			name: part.name,
+			arguments: part.arguments,
+		};
+		content.unshift(toolCall);
+		if (fits()) return;
+		const arguments_: Record<string, unknown> = {};
+		for (const key of ["command", "path", "file_path", "pattern", "url"]) {
+			const value = part.arguments[key];
+			if (typeof value === "string") arguments_[key] = truncateUtf8(value, 256).text;
+		}
+		toolCall.arguments = arguments_;
+		if (fits()) return;
+		toolCall.arguments = {};
+		if (!fits()) content.shift();
+	};
+
+	if (message.role === "assistant") {
+		for (let index = message.content.length - 1; index >= 0; index--) {
+			const part = message.content[index];
+			if (part.type === "text") addText(part.text, true);
+			else if (part.type === "toolCall") addToolCall(part);
+		}
+	} else {
+		for (const part of message.content) {
+			if (typeof part === "object" && part && part.type === "text") addText(part.text);
+		}
+	}
+
+	if (content.length === 0) return { bytes: 0, truncated: true };
+	const result = bounded();
+	const bytes = Buffer.byteLength(JSON.stringify(result), "utf8");
+	return { message: result, bytes, truncated: true };
+}
+function compactRecentActivityArguments(args: Record<string, unknown>): Record<string, unknown> {
+	if (Buffer.byteLength(JSON.stringify(args), "utf8") <= MAX_RECENT_ACTIVITY_ARGUMENT_BYTES)
+		return args;
+	const compact: Record<string, unknown> = {};
+	for (const key of ["command", "path", "file_path", "pattern", "url", "selector"]) {
+		const value = args[key];
+		if (typeof value === "string") compact[key] = truncateUtf8(value, 256).text;
+		else if (typeof value === "number" || typeof value === "boolean") compact[key] = value;
+	}
+	return compact;
+}
+
+function appendRecentActivity(result: SingleResult, message: Message): void {
+	if (message.role !== "assistant") return;
+	const append = (item: RecentActivityItem) => {
+		result.recentActivity ??= [];
+		result.recentActivityTotal = (result.recentActivityTotal ?? 0) + 1;
+		result.recentActivity.push(item);
+		if (result.recentActivity.length > MAX_RECENT_ACTIVITY_ITEMS) {
+			result.recentActivity.splice(0, result.recentActivity.length - MAX_RECENT_ACTIVITY_ITEMS);
+		}
+		while (
+			Buffer.byteLength(JSON.stringify(result.recentActivity), "utf8") > MAX_RECENT_ACTIVITY_BYTES
+		) {
+			result.recentActivity.shift();
+		}
 	};
+	for (const part of message.content) {
+		if (part.type === "text") {
+			const text = part.text.trim();
+			if (text) append({ type: "text", text: truncateUtf8(text, 1024).text });
+		} else if (part.type === "toolCall") {
+			append({
+				type: "toolCall",
+				name: part.name,
+				args: compactRecentActivityArguments(part.arguments),
+			});
+		}
+	}
 }
 
-export function buildFanInContext(results: SingleResult[], maxBytes = DEFAULT_MAX_CONTEXT_BYTES): string {
+export function buildFanInContext(
+	results: SingleResult[],
+	maxBytes = DEFAULT_MAX_CONTEXT_BYTES,
+): string {
 	const text = results
 		.map((result, index) => {
 			const failed = isResultError(result);
@@ -170,7 +275,10 @@ export async function mapWithConcurrencyLimit<TIn, TOut>(
 	return results;
 }
 
-async function writePromptToTempFile(agentName: string, prompt: string): Promise<{ dir: string; filePath: string }> {
+async function writePromptToTempFile(
+	agentName: string,
+	prompt: string,
+): Promise<{ dir: string; filePath: string }> {
 	const tmpDir = await fs.promises.mkdtemp(path.join(os.tmpdir(), "pi-subagent-"));
 	const safeName = agentName.replace(/[^\w.-]+/g, "_");
 	const filePath = path.join(tmpDir, `prompt-${safeName}.md`);
@@ -231,8 +339,15 @@ function signalProcess(proc: ReturnType<typeof spawn>, signal: NodeJS.Signals):
 	}
 }
 
-export function terminateProcess(proc: ReturnType<typeof spawn>, graceMs = KILL_GRACE_MS): () => void {
-	let closed = proc.exitCode !== null || proc.signalCode !== null;
+export function terminateProcess(
+	proc: ReturnType<typeof spawn>,
+	graceMs = KILL_GRACE_MS,
+): () => void {
+	const leaderExited = proc.exitCode !== null || proc.signalCode !== null;
+	const capturedOutputClosed = [proc.stdout, proc.stderr].every(
+		(stream) => !stream || stream.readableEnded || stream.destroyed,
+	);
+	let closed = leaderExited && capturedOutputClosed;
 	const onClose = () => {
 		closed = true;
 	};
@@ -275,7 +390,15 @@ export async function runSingleAgent(
 			exitCode: 1,
 			messages: [],
 			stderr: `Unknown agent: "${agentName}". Available agents: ${available}.`,
-			usage: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0, cost: 0, contextTokens: 0, turns: 0 },
+			usage: {
+				input: 0,
+				output: 0,
+				cacheRead: 0,
+				cacheWrite: 0,
+				cost: 0,
+				contextTokens: 0,
+				turns: 0,
+			},
 			thinkingLevel,
 			step,
 			finalOutput: "",
@@ -295,7 +418,15 @@ export async function runSingleAgent(
 		exitCode: 0,
 		messages: [],
 		stderr: "",
-		usage: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0, cost: 0, contextTokens: 0, turns: 0 },
+		usage: {
+			input: 0,
+			output: 0,
+			cacheRead: 0,
+			cacheWrite: 0,
+			cost: 0,
+			contextTokens: 0,
+			turns: 0,
+		},
 		model: agent.model ?? undefined,
 		thinkingLevel,
 		step,
@@ -394,21 +525,37 @@ export async function runSingleAgent(
 					},
 				});
 			} catch (error) {
-				currentResult.stderr = setErrorMessage(error instanceof Error ? error.message : String(error));
+				currentResult.stderr = setErrorMessage(
+					error instanceof Error ? error.message : String(error),
+				);
 				finish(1);
 				return;
 			}
 
-			let capturedMessageBytes = 0;
 			const addMessage = (msg: Message) => {
-				if (currentResult.messages.length >= DEFAULT_MAX_MESSAGES) {
+				const boundedMessage = boundMessageText(msg, DEFAULT_MAX_OUTPUT_BYTES - 2);
+				currentResult.truncated ||= boundedMessage.truncated;
+				if (!boundedMessage.message) return;
+				while (
+					currentResult.messages.length >= DEFAULT_MAX_MESSAGES ||
+					Buffer.byteLength(
+						JSON.stringify([...currentResult.messages, boundedMessage.message]),
+						"utf8",
+					) > DEFAULT_MAX_OUTPUT_BYTES
+				) {
+					const removed = currentResult.messages.shift();
+					if (!removed) break;
+					currentResult.truncated = true;
+				}
+				if (
+					Buffer.byteLength(
+						JSON.stringify([...currentResult.messages, boundedMessage.message]),
+						"utf8",
+					) > DEFAULT_MAX_OUTPUT_BYTES
+				) {
 					currentResult.truncated = true;
 					return;
 				}
-				const remaining = Math.max(0, DEFAULT_MAX_OUTPUT_BYTES - capturedMessageBytes);
-				const boundedMessage = boundMessageText(msg, remaining);
-				capturedMessageBytes += boundedMessage.bytes;
-				currentResult.truncated ||= boundedMessage.truncated;
 				currentResult.messages.push(boundedMessage.message);
 			};
 			const processEvent = (raw: unknown) => {
@@ -424,6 +571,7 @@ export async function runSingleAgent(
 							terminalAssistantOutput = output.text;
 						}
 					}
+					appendRecentActivity(currentResult, msg);
 					addMessage(msg);
 					if (msg.role === "assistant") {
 						currentResult.usage.turns++;
@@ -436,7 +584,9 @@ export async function runSingleAgent(
 							currentResult.usage.cost += usage.cost?.total || 0;
 							currentResult.usage.contextTokens = usage.totalTokens || 0;
 						}
-						if (!currentResult.model && msg.model) currentResult.model = msg.model;
+						if (msg.provider) currentResult.actualProvider = msg.provider;
+						if (msg.responseModel ?? msg.model)
+							currentResult.actualModel = msg.responseModel ?? msg.model;
 						if (msg.stopReason) currentResult.stopReason = msg.stopReason;
 						if (msg.errorMessage) setErrorMessage(msg.errorMessage);
 					}
@@ -475,7 +625,11 @@ export async function runSingleAgent(
 
 			proc.stdout?.on("data", (data) => decoder.push(data));
 			proc.stderr?.on("data", (data) => {
-				const bounded = appendBounded(currentResult.stderr, data.toString(), DEFAULT_MAX_STDERR_BYTES);
+				const bounded = appendBounded(
+					currentResult.stderr,
+					data.toString(),
+					DEFAULT_MAX_STDERR_BYTES,
+				);
 				currentResult.stderr = bounded.text;
 				currentResult.truncated ||= bounded.truncated;
 			});