@oh-my-pi/pi-coding-agent 3.13.1337 → 3.15.0

package/src/core/tools/task/agents.ts

@@ -5,11 +5,11 @@
  */
 
 // Embed agent markdown files at build time
-import browserMd from "./bundled-agents/browser.md" with { type: "text" };
-import exploreMd from "./bundled-agents/explore.md" with { type: "text" };
-import planMd from "./bundled-agents/plan.md" with { type: "text" };
-import reviewerMd from "./bundled-agents/reviewer.md" with { type: "text" };
-import taskMd from "./bundled-agents/task.md" with { type: "text" };
+import browserMd from "../../../prompts/browser.md" with { type: "text" };
+import exploreMd from "../../../prompts/explore.md" with { type: "text" };
+import planMd from "../../../prompts/plan.md" with { type: "text" };
+import reviewerMd from "../../../prompts/reviewer.md" with { type: "text" };
+import taskMd from "../../../prompts/task.md" with { type: "text" };
 import type { AgentDefinition, AgentSource } from "./types";
 
 const EMBEDDED_AGENTS: { name: string; content: string }[] = [

package/src/core/tools/task/commands.ts

@@ -9,9 +9,9 @@ import { type SlashCommand, slashCommandCapability } from "../../../capability/s
 import { loadSync } from "../../../discovery";
 
 // Embed command markdown files at build time
-import architectPlanMd from "./bundled-commands/architect-plan.md" with { type: "text" };
-import implementMd from "./bundled-commands/implement.md" with { type: "text" };
-import implementWithCriticMd from "./bundled-commands/implement-with-critic.md" with { type: "text" };
+import architectPlanMd from "../../../prompts/architect-plan.md" with { type: "text" };
+import implementMd from "../../../prompts/implement.md" with { type: "text" };
+import implementWithCriticMd from "../../../prompts/implement-with-critic.md" with { type: "text" };
 
 const EMBEDDED_COMMANDS: { name: string; content: string }[] = [
 	{ name: "architect-plan.md", content: architectPlanMd },

package/src/core/tools/task/executor.ts

@@ -100,6 +100,38 @@ function extractToolArgsPreview(args: Record<string, unknown>): string {
 	return "";
 }
 
+function getNumberField(record: Record<string, unknown>, key: string): number | undefined {
+	if (!Object.hasOwn(record, key)) return undefined;
+	const value = record[key];
+	return typeof value === "number" && Number.isFinite(value) ? value : 0;
+}
+
+function firstNumberField(record: Record<string, unknown>, keys: string[]): number | undefined {
+	for (const key of keys) {
+		const value = getNumberField(record, key);
+		if (value !== undefined) return value;
+	}
+	return undefined;
+}
+
+/**
+ * Normalize usage objects from different event formats.
+ */
+function getUsageTokens(usage: unknown): number {
+	if (!usage || typeof usage !== "object") return 0;
+	const record = usage as Record<string, unknown>;
+
+	const totalTokens = firstNumberField(record, ["totalTokens", "total_tokens"]);
+	if (totalTokens !== undefined && totalTokens > 0) return totalTokens;
+
+	const input = firstNumberField(record, ["input", "input_tokens", "inputTokens"]) ?? 0;
+	const output = firstNumberField(record, ["output", "output_tokens", "outputTokens"]) ?? 0;
+	const cacheRead = firstNumberField(record, ["cacheRead", "cache_read", "cacheReadTokens"]) ?? 0;
+	const cacheWrite = firstNumberField(record, ["cacheWrite", "cache_write", "cacheWriteTokens"]) ?? 0;
+
+	return input + output + cacheRead + cacheWrite;
+}
+
 /**
  * Run a single agent as a subprocess.
  */
@@ -369,7 +401,7 @@ export async function runSubprocess(options: ExecutorOptions): Promise<SingleRes
 					const messageUsage = event.message?.usage || event.usage;
 					if (messageUsage) {
 						// Accumulate tokens across messages (not overwrite)
-						progress.tokens += (messageUsage.input_tokens || 0) + (messageUsage.output_tokens || 0);
+						progress.tokens += getUsageTokens(messageUsage);
 					}
 					// If pending termination, now we have tokens - terminate
 					if (pendingTermination && !resolved) {

package/src/core/tools/task/index.ts

@@ -14,6 +14,7 @@
  */
 
 import type { AgentTool } from "@oh-my-pi/pi-agent-core";
+import type { Usage } from "@oh-my-pi/pi-ai";
 import type { Theme } from "../../../modes/interactive/theme/theme";
 import { cleanupTempDir, createTempArtifactsDir, getArtifactsDir } from "./artifacts";
 import { discoverAgents, getAgent } from "./discovery";
@@ -42,6 +43,79 @@ function formatBytes(bytes: number): string {
 	return `${(bytes / (1024 * 1024)).toFixed(1)}M`;
 }
 
+function createUsageTotals(): Usage {
+	return {
+		input: 0,
+		output: 0,
+		cacheRead: 0,
+		cacheWrite: 0,
+		totalTokens: 0,
+		cost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0, total: 0 },
+	};
+}
+
+function addUsageTotals(target: Usage, usage: Partial<Usage>): void {
+	const input = usage.input ?? 0;
+	const output = usage.output ?? 0;
+	const cacheRead = usage.cacheRead ?? 0;
+	const cacheWrite = usage.cacheWrite ?? 0;
+	const totalTokens = usage.totalTokens ?? input + output + cacheRead + cacheWrite;
+	const cost =
+		usage.cost ??
+		({
+			input: 0,
+			output: 0,
+			cacheRead: 0,
+			cacheWrite: 0,
+			total: 0,
+		} satisfies Usage["cost"]);
+
+	target.input += input;
+	target.output += output;
+	target.cacheRead += cacheRead;
+	target.cacheWrite += cacheWrite;
+	target.totalTokens += totalTokens;
+	target.cost.input += cost.input;
+	target.cost.output += cost.output;
+	target.cost.cacheRead += cost.cacheRead;
+	target.cost.cacheWrite += cost.cacheWrite;
+	target.cost.total += cost.total;
+}
+
+function parseSubagentUsage(events: string[] | undefined): Usage | undefined {
+	if (!events || events.length === 0) return undefined;
+
+	const totals = createUsageTotals();
+	let hasUsage = false;
+
+	for (const line of events) {
+		let event: unknown;
+		try {
+			event = JSON.parse(line);
+		} catch {
+			continue;
+		}
+
+		if (!event || typeof event !== "object") continue;
+		const record = event as Record<string, unknown>;
+		if (record.type !== "message_end") continue;
+
+		const message = record.message;
+		if (!message || typeof message !== "object") continue;
+		const msgRecord = message as Record<string, unknown>;
+		if (msgRecord.role !== "assistant") continue;
+		if (msgRecord.stopReason === "aborted" || msgRecord.stopReason === "error") continue;
+
+		const usage = msgRecord.usage;
+		if (!usage || typeof usage !== "object") continue;
+
+		addUsageTotals(totals, usage as Partial<Usage>);
+		hasUsage = true;
+	}
+
+	return hasUsage ? totals : undefined;
+}
+
 /** Session context interface */
 interface SessionContext {
 	getSessionFile: () => string | null;
@@ -393,19 +467,31 @@ export function createTaskTool(
 					});
 				});
 
+				const aggregatedUsage = createUsageTotals();
+				let hasAggregatedUsage = false;
+				const resultsWithUsage = results.map((result) => {
+					const usage = parseSubagentUsage(result.jsonlEvents);
+					if (usage) {
+						addUsageTotals(aggregatedUsage, usage);
+						hasAggregatedUsage = true;
+						return { ...result, usage };
+					}
+					return result;
+				});
+
 				// Collect output paths (artifacts already written by executor in real-time)
 				const outputPaths: string[] = [];
-				for (const result of results) {
+				for (const result of resultsWithUsage) {
 					if (result.artifactPaths) {
 						outputPaths.push(result.artifactPaths.outputPath);
 					}
 				}
 
 				// Build final output - match plugin format
-				const successCount = results.filter((r) => r.exitCode === 0).length;
+				const successCount = resultsWithUsage.filter((r) => r.exitCode === 0).length;
 				const totalDuration = Date.now() - startTime;
 
-				const summaries = results.map((r) => {
+				const summaries = resultsWithUsage.map((r) => {
 					const status = r.exitCode === 0 ? "completed" : `failed (exit ${r.exitCode})`;
 					const output = r.output.trim() || r.stderr.trim() || "(no output)";
 					const preview = output.split("\n").slice(0, 5).join("\n");
@@ -415,14 +501,14 @@ export function createTaskTool(
 						? ` [${r.outputMeta.lineCount} lines, ${formatBytes(r.outputMeta.charCount)}]`
 						: "";
 					const pathInfo = !hasOutputTool && r.artifactPaths?.outputPath ? ` (${r.artifactPaths.outputPath})` : "";
-					return `[${r.agent}] ${status}${meta} → ${outputId}${pathInfo}\n${preview}`;
+					return `[${r.agent}] ${status}${meta} ${outputId}${pathInfo}\n${preview}`;
 				});
 
 				const skippedNote =
 					skippedSelfRecursion > 0
 						? ` (${skippedSelfRecursion} ${blockedAgent} task${skippedSelfRecursion > 1 ? "s" : ""} skipped - self-recursion blocked)`
 						: "";
-				const summary = `${successCount}/${results.length} succeeded${skippedNote} [${formatDuration(totalDuration)}]\n\n${summaries.join("\n\n---\n\n")}`;
+				const summary = `${successCount}/${resultsWithUsage.length} succeeded${skippedNote} [${formatDuration(totalDuration)}]\n\n${summaries.join("\n\n---\n\n")}`;
 
 				// Cleanup temp directory if used
 				if (tempArtifactsDir) {
@@ -433,8 +519,9 @@ export function createTaskTool(
 					content: [{ type: "text", text: summary }],
 					details: {
 						projectAgentsDir,
-						results,
+						results: resultsWithUsage,
 						totalDurationMs: totalDuration,
+						usage: hasAggregatedUsage ? aggregatedUsage : undefined,
 						outputPaths,
 					},
 				};

package/src/core/tools/task/render.ts

@@ -44,29 +44,91 @@ export function formatDuration(ms: number): string {
 /**
  * Truncate text to max length with ellipsis.
  */
-function truncate(text: string, maxLen: number): string {
+function truncate(text: string, maxLen: number, ellipsis: string): string {
 	if (text.length <= maxLen) return text;
-	return `${text.slice(0, maxLen - 3)}...`;
+	const sliceLen = Math.max(0, maxLen - ellipsis.length);
+	return `${text.slice(0, sliceLen)}${ellipsis}`;
 }
 
 /**
  * Get status icon for agent state.
+ * For running status, uses animated spinner if spinnerFrame is provided.
  */
-function getStatusIcon(status: AgentProgress["status"]): string {
+function getStatusIcon(status: AgentProgress["status"], theme: Theme, spinnerFrame?: number): string {
 	switch (status) {
 		case "pending":
-			return "○";
-		case "running":
-			return "◐";
+			return theme.status.pending;
+		case "running": {
+			// Use animated spinner if frame is provided, otherwise static icon
+			if (spinnerFrame === undefined) return theme.status.running;
+			const frames = theme.spinnerFrames;
+			return frames[spinnerFrame % frames.length];
+		}
 		case "completed":
-			return "✓";
+			return theme.status.success;
 		case "failed":
-			return "✗";
+			return theme.status.error;
 		case "aborted":
-			return "⊘";
+			return theme.status.aborted;
 	}
 }
 
+function formatBadge(label: string, color: "success" | "error" | "warning" | "accent" | "muted", theme: Theme): string {
+	const left = theme.format.bracketLeft;
+	const right = theme.format.bracketRight;
+	return theme.fg(color, `${left}${label}${right}`);
+}
+
+function formatFindingSummary(findings: ReportFindingDetails[], theme: Theme): string {
+	if (findings.length === 0) return theme.fg("dim", "Findings: none");
+
+	const counts = new Map<number, number>();
+	for (const finding of findings) {
+		counts.set(finding.priority, (counts.get(finding.priority) ?? 0) + 1);
+	}
+
+	const parts: string[] = [];
+	for (const priority of [0, 1, 2, 3]) {
+		const label = PRIORITY_LABELS[priority] ?? "P?";
+		const color = priority === 0 ? "error" : priority === 1 ? "warning" : "muted";
+		const count = counts.get(priority) ?? 0;
+		parts.push(theme.fg(color, `${label}:${count}`));
+	}
+
+	return `${theme.fg("dim", "Findings:")} ${parts.join(theme.sep.dot)}`;
+}
+
+function renderOutputSection(
+	output: string,
+	continuePrefix: string,
+	expanded: boolean,
+	theme: Theme,
+	maxCollapsed = 3,
+	maxExpanded = 10,
+): string[] {
+	const lines: string[] = [];
+	const outputLines = output.split("\n").filter((line) => line.trim());
+	if (outputLines.length === 0) return lines;
+
+	lines.push(`${continuePrefix}${theme.fg("dim", "Output")}`);
+
+	const previewCount = expanded ? maxExpanded : maxCollapsed;
+	for (const line of outputLines.slice(0, previewCount)) {
+		lines.push(`${continuePrefix}  ${theme.fg("dim", truncate(line, 70, theme.format.ellipsis))}`);
+	}
+
+	if (outputLines.length > previewCount) {
+		lines.push(
+			`${continuePrefix}  ${theme.fg(
+				"dim",
+				`${theme.format.ellipsis} ${outputLines.length - previewCount} more lines`,
+			)}`,
+		);
+	}
+
+	return lines;
+}
+
 /**
  * Render the tool call arguments.
  */
@@ -76,24 +138,36 @@ export function renderCall(args: TaskParams, theme: Theme): Component {
 	if (args.tasks.length === 1) {
 		// Single task - show agent and task preview
 		const task = args.tasks[0];
-		const taskPreview = truncate(task.task, 60);
+		const taskPreview = truncate(task.task, 60, theme.format.ellipsis);
 		return new Text(`${label} ${theme.fg("accent", task.agent)}: ${theme.fg("muted", taskPreview)}`, 0, 0);
 	}
 
 	// Multiple tasks - show count and agent names
 	const agents = args.tasks.map((t) => t.agent).join(", ");
-	return new Text(`${label} ${theme.fg("muted", `${args.tasks.length} agents: ${truncate(agents, 50)}`)}`, 0, 0);
+	return new Text(
+		`${label} ${theme.fg("muted", `${args.tasks.length} agents: ${truncate(agents, 50, theme.format.ellipsis)}`)}`,
+		0,
+		0,
+	);
 }
 
 /**
  * Render streaming progress for a single agent.
  */
-function renderAgentProgress(progress: AgentProgress, isLast: boolean, expanded: boolean, theme: Theme): string[] {
+function renderAgentProgress(
+	progress: AgentProgress,
+	isLast: boolean,
+	expanded: boolean,
+	theme: Theme,
+	spinnerFrame?: number,
+): string[] {
 	const lines: string[] = [];
-	const prefix = isLast ? "└─" : "├─";
-	const continuePrefix = isLast ? "   " : "│  ";
+	const prefix = isLast
+		? `${theme.boxSharp.bottomLeft}${theme.boxSharp.horizontal}`
+		: `${theme.boxSharp.teeRight}${theme.boxSharp.horizontal}`;
+	const continuePrefix = isLast ? "   " : `${theme.boxSharp.vertical}  `;
 
-	const icon = getStatusIcon(progress.status);
+	const icon = getStatusIcon(progress.status, theme, spinnerFrame);
 	const iconColor =
 		progress.status === "completed"
 			? "success"
@@ -105,35 +179,43 @@ function renderAgentProgress(progress: AgentProgress, isLast: boolean, expanded:
 	const agentId = `${progress.agent}(${progress.index})`;
 	let statusLine = `${prefix} ${theme.fg(iconColor, icon)} ${theme.fg("accent", agentId)}`;
 
+	// Only show badge for non-running states (spinner already indicates running)
+	if (progress.status !== "running") {
+		const statusLabel =
+			progress.status === "completed"
+				? "done"
+				: progress.status === "failed"
+					? "failed"
+					: progress.status === "aborted"
+						? "aborted"
+						: "pending";
+		statusLine += ` ${formatBadge(statusLabel, iconColor, theme)}`;
+	}
+
 	if (progress.status === "running") {
-		const taskPreview = truncate(progress.task, 40);
-		statusLine += `: ${theme.fg("muted", taskPreview)}`;
-		statusLine += ` · ${theme.fg("dim", `${progress.toolCount} tools`)}`;
+		const taskPreview = truncate(progress.task, 40, theme.format.ellipsis);
+		statusLine += ` ${theme.fg("muted", taskPreview)}`;
+		statusLine += `${theme.sep.dot}${theme.fg("dim", `${progress.toolCount} tools`)}`;
 		if (progress.tokens > 0) {
-			statusLine += ` · ${theme.fg("dim", `${formatTokens(progress.tokens)} tokens`)}`;
+			statusLine += `${theme.sep.dot}${theme.fg("dim", `${formatTokens(progress.tokens)} tokens`)}`;
 		}
 	} else if (progress.status === "completed") {
-		statusLine += `: ${theme.fg("success", "done")}`;
-		statusLine += ` · ${theme.fg("dim", `${progress.toolCount} tools`)}`;
-		statusLine += ` · ${theme.fg("dim", `${formatTokens(progress.tokens)} tokens`)}`;
-	} else if (progress.status === "aborted") {
-		statusLine += `: ${theme.fg("error", "aborted")}`;
-	} else if (progress.status === "failed") {
-		statusLine += `: ${theme.fg("error", "failed")}`;
+		statusLine += `${theme.sep.dot}${theme.fg("dim", `${progress.toolCount} tools`)}`;
+		statusLine += `${theme.sep.dot}${theme.fg("dim", `${formatTokens(progress.tokens)} tokens`)}`;
 	}
 
 	lines.push(statusLine);
 
 	// Current tool (if running)
 	if (progress.status === "running" && progress.currentTool) {
-		let toolLine = `${continuePrefix}⎿ ${theme.fg("muted", progress.currentTool)}`;
+		let toolLine = `${continuePrefix}${theme.tree.hook} ${theme.fg("muted", progress.currentTool)}`;
 		if (progress.currentToolArgs) {
-			toolLine += `: ${theme.fg("dim", truncate(progress.currentToolArgs, 40))}`;
+			toolLine += `: ${theme.fg("dim", truncate(progress.currentToolArgs, 40, theme.format.ellipsis))}`;
 		}
 		if (progress.currentToolStartMs) {
 			const elapsed = Date.now() - progress.currentToolStartMs;
 			if (elapsed > 5000) {
-				toolLine += ` · ${theme.fg("warning", formatDuration(elapsed))}`;
+				toolLine += `${theme.sep.dot}${theme.fg("warning", formatDuration(elapsed))}`;
 			}
 		}
 		lines.push(toolLine);
@@ -153,7 +235,9 @@ function renderAgentProgress(progress: AgentProgress, isLast: boolean, expanded:
 					}
 				}
 				if (dataArray.length > 3) {
-					lines.push(`${continuePrefix}${theme.fg("dim", `... ${dataArray.length - 3} more`)}`);
+					lines.push(
+						`${continuePrefix}${theme.fg("dim", `${theme.format.ellipsis} ${dataArray.length - 3} more`)}`,
+					);
 				}
 			}
 		}
@@ -161,10 +245,8 @@ function renderAgentProgress(progress: AgentProgress, isLast: boolean, expanded:
 
 	// Expanded view: recent output and tools
 	if (expanded && progress.status === "running") {
-		// Recent output
-		for (const line of progress.recentOutput.slice(0, 3)) {
-			lines.push(`${continuePrefix}  ${theme.fg("dim", truncate(line, 60))}`);
-		}
+		const output = progress.recentOutput.join("\n");
+		lines.push(...renderOutputSection(output, continuePrefix, true, theme, 2, 6));
 	}
 
 	return lines;
@@ -184,7 +266,7 @@ function renderReviewResult(
 
 	// Verdict line
 	const verdictColor = summary.overall_correctness === "correct" ? "success" : "error";
-	const verdictIcon = summary.overall_correctness === "correct" ? "✓" : "✗";
+	const verdictIcon = summary.overall_correctness === "correct" ? theme.status.success : theme.status.error;
 	lines.push(
 		`${continuePrefix}${theme.fg(verdictColor, verdictIcon)} Patch is ${theme.fg(verdictColor, summary.overall_correctness)} ${theme.fg("dim", `(${(summary.confidence * 100).toFixed(0)}% confidence)`)}`,
 	);
@@ -192,19 +274,21 @@ function renderReviewResult(
 	// Explanation preview (first ~80 chars when collapsed, full when expanded)
 	if (summary.explanation) {
 		if (expanded) {
-			// Full explanation, wrapped
+			lines.push(`${continuePrefix}${theme.fg("dim", "Summary")}`);
 			const explanationLines = summary.explanation.split("\n");
 			for (const line of explanationLines) {
-				lines.push(`${continuePrefix}${theme.fg("dim", line)}`);
+				lines.push(`${continuePrefix}  ${theme.fg("dim", line)}`);
 			}
 		} else {
 			// Preview: first sentence or ~100 chars
-			const preview = truncate(`${summary.explanation.split(/[.!?]/)[0]}.`, 100);
-			lines.push(`${continuePrefix}${theme.fg("dim", preview)}`);
+			const preview = truncate(`${summary.explanation.split(/[.!?]/)[0]}.`, 100, theme.format.ellipsis);
+			lines.push(`${continuePrefix}${theme.fg("dim", `Summary: ${preview}`)}`);
 		}
 	}
 
-	// Findings in tree structure
+	// Findings summary + list
+	lines.push(`${continuePrefix}${formatFindingSummary(findings, theme)}`);
+
 	if (findings.length > 0) {
 		lines.push(`${continuePrefix}`); // Spacing
 		lines.push(...renderFindings(findings, continuePrefix, expanded, theme));
@@ -228,8 +312,10 @@ function renderFindings(
 	for (let i = 0; i < displayCount; i++) {
 		const finding = findings[i];
 		const isLastFinding = i === displayCount - 1 && (expanded || findings.length <= 3);
-		const findingPrefix = isLastFinding ? "└─" : "├─";
-		const findingContinue = isLastFinding ? "   " : "│  ";
+		const findingPrefix = isLastFinding
+			? `${theme.boxSharp.bottomLeft}${theme.boxSharp.horizontal}`
+			: `${theme.boxSharp.teeRight}${theme.boxSharp.horizontal}`;
+		const findingContinue = isLastFinding ? "   " : `${theme.boxSharp.vertical}  `;
 
 		const priority = PRIORITY_LABELS[finding.priority] ?? "P?";
 		const color = finding.priority === 0 ? "error" : finding.priority === 1 ? "warning" : "muted";
@@ -251,7 +337,9 @@ function renderFindings(
 	}
 
 	if (!expanded && findings.length > 3) {
-		lines.push(`${continuePrefix}${theme.fg("dim", `... ${findings.length - 3} more findings`)}`);
+		lines.push(
+			`${continuePrefix}${theme.fg("dim", `${theme.format.ellipsis} ${findings.length - 3} more findings`)}`,
+		);
 	}
 
 	return lines;
@@ -262,23 +350,24 @@ function renderFindings(
  */
 function renderAgentResult(result: SingleResult, isLast: boolean, expanded: boolean, theme: Theme): string[] {
 	const lines: string[] = [];
-	const prefix = isLast ? "└─" : "├─";
-	const continuePrefix = isLast ? "   " : "│  ";
+	const prefix = isLast
+		? `${theme.boxSharp.bottomLeft}${theme.boxSharp.horizontal}`
+		: `${theme.boxSharp.teeRight}${theme.boxSharp.horizontal}`;
+	const continuePrefix = isLast ? "   " : `${theme.boxSharp.vertical}  `;
 
 	const aborted = result.aborted ?? false;
 	const success = !aborted && result.exitCode === 0;
-	const icon = aborted ? "⊘" : success ? "✓" : "✗";
+	const icon = aborted ? theme.status.aborted : success ? theme.status.success : theme.status.error;
 	const iconColor = success ? "success" : "error";
 	const statusText = aborted ? "aborted" : success ? "done" : "failed";
 
 	// Main status line - include index for Output tool ID derivation
 	const agentId = `${result.agent}(${result.index})`;
-	let statusLine = `${prefix} ${theme.fg(iconColor, icon)} ${theme.fg("accent", agentId)}`;
-	statusLine += `: ${theme.fg(iconColor, statusText)}`;
+	let statusLine = `${prefix} ${theme.fg(iconColor, icon)} ${theme.fg("accent", agentId)} ${formatBadge(statusText, iconColor, theme)}`;
 	if (result.tokens > 0) {
-		statusLine += ` · ${theme.fg("dim", `${formatTokens(result.tokens)} tokens`)}`;
+		statusLine += `${theme.sep.dot}${theme.fg("dim", `${formatTokens(result.tokens)} tokens`)}`;
 	}
-	statusLine += ` · ${theme.fg("dim", formatDuration(result.durationMs))}`;
+	statusLine += `${theme.sep.dot}${theme.fg("dim", formatDuration(result.durationMs))}`;
 
 	if (result.truncated) {
 		statusLine += ` ${theme.fg("warning", "[truncated]")}`;
@@ -299,8 +388,9 @@ function renderAgentResult(result: SingleResult, isLast: boolean, expanded: bool
 	}
 	if (reportFindingData && reportFindingData.length > 0) {
 		lines.push(
-			`${continuePrefix}${theme.fg("warning", "!")} ${theme.fg("dim", "Review summary missing (submit_review not called)")}`,
+			`${continuePrefix}${theme.fg("warning", theme.status.warning)} ${theme.fg("dim", "Review summary missing (submit_review not called)")}`,
 		);
+		lines.push(`${continuePrefix}${formatFindingSummary(reportFindingData, theme)}`);
 		lines.push(`${continuePrefix}`); // Spacing
 		lines.push(...renderFindings(reportFindingData, continuePrefix, expanded, theme));
 		return lines;
@@ -339,21 +429,12 @@ function renderAgentResult(result: SingleResult, isLast: boolean, expanded: bool
 
 	// Fallback to output preview if no custom rendering
 	if (!hasCustomRendering) {
-		const outputLines = result.output.split("\n").filter((l) => l.trim());
-		const previewCount = expanded ? 8 : 3;
-
-		for (const line of outputLines.slice(0, previewCount)) {
-			lines.push(`${continuePrefix}${theme.fg("dim", truncate(line, 70))}`);
-		}
-
-		if (outputLines.length > previewCount) {
-			lines.push(`${continuePrefix}${theme.fg("dim", `... ${outputLines.length - previewCount} more lines`)}`);
-		}
+		lines.push(...renderOutputSection(result.output, continuePrefix, expanded, theme, 3, 12));
 	}
 
 	// Error message
 	if (result.error && !success) {
-		lines.push(`${continuePrefix}${theme.fg("error", truncate(result.error, 70))}`);
+		lines.push(`${continuePrefix}${theme.fg("error", truncate(result.error, 70, theme.format.ellipsis))}`);
 	}
 
 	return lines;
@@ -367,13 +448,13 @@ export function renderResult(
 	options: RenderResultOptions,
 	theme: Theme,
 ): Component {
-	const { expanded, isPartial } = options;
+	const { expanded, isPartial, spinnerFrame } = options;
 	const details = result.details;
 
 	if (!details) {
 		// Fallback to simple text
 		const text = result.content.find((c) => c.type === "text")?.text || "";
-		return new Text(theme.fg("dim", truncate(text, 100)), 0, 0);
+		return new Text(theme.fg("dim", truncate(text, 100, theme.format.ellipsis)), 0, 0);
 	}
 
 	const lines: string[] = [];
@@ -382,7 +463,7 @@ export function renderResult(
 		// Streaming progress view
 		details.progress.forEach((progress, i) => {
 			const isLast = i === details.progress!.length - 1;
-			lines.push(...renderAgentProgress(progress, isLast, expanded, theme));
+			lines.push(...renderAgentProgress(progress, isLast, expanded, theme, spinnerFrame));
 		});
 	} else if (details.results.length > 0) {
 		// Final results view
@@ -407,7 +488,7 @@ export function renderResult(
 		if (failCount > 0) {
 			summary += theme.fg("error", `${failCount} failed`);
 		}
-		summary += ` · ${theme.fg("dim", formatDuration(details.totalDurationMs))}`;
+		summary += `${theme.sep.dot}${theme.fg("dim", formatDuration(details.totalDurationMs))}`;
 		lines.push(summary);
 
 		// Artifacts suppressed from user view - available via session file

package/src/core/tools/task/types.ts

@@ -1,17 +1,9 @@
+import type { Usage } from "@oh-my-pi/pi-ai";
 import { type Static, Type } from "@sinclair/typebox";
 
 /** Source of an agent definition */
 export type AgentSource = "bundled" | "user" | "project";
 
-/** Single task item for parallel execution */
-export const taskItemSchema = Type.Object({
-	agent: Type.String({ description: "Agent name" }),
-	task: Type.String({ description: "Task description for the agent" }),
-	model: Type.Optional(Type.String({ description: "Model override for this task" })),
-});
-
-export type TaskItem = Static<typeof taskItemSchema>;
-
 /** Maximum tasks per call */
 export const MAX_PARALLEL_TASKS = 32;
 
@@ -36,6 +28,15 @@ export const OMP_BLOCKED_AGENT_ENV = "OMP_BLOCKED_AGENT";
 /** Environment variable containing allowed spawn list (propagated to subprocesses) */
 export const OMP_SPAWNS_ENV = "OMP_SPAWNS";
 
+/** Single task item for parallel execution */
+export const taskItemSchema = Type.Object({
+	agent: Type.String({ description: "Agent name" }),
+	task: Type.String({ description: "Task description for the agent" }),
+	model: Type.Optional(Type.String({ description: "Model override for this task" })),
+});
+
+export type TaskItem = Static<typeof taskItemSchema>;
+
 /** Task tool parameters */
 export const taskSchema = Type.Object({
 	context: Type.Optional(Type.String({ description: "Shared context prepended to all task prompts" })),
@@ -121,6 +122,8 @@ export interface SingleResult {
 	aborted?: boolean;
 	jsonlEvents?: string[];
 	artifactPaths?: { inputPath: string; outputPath: string; jsonlPath?: string };
+	/** Aggregated usage from the subprocess, if available. */
+	usage?: Usage;
 	/** Data extracted by registered subprocess tool handlers (keyed by tool name) */
 	extractedToolData?: Record<string, unknown[]>;
 	/** Output metadata for Output tool integration */
@@ -132,6 +135,8 @@ export interface TaskToolDetails {
 	projectAgentsDir: string | null;
 	results: SingleResult[];
 	totalDurationMs: number;
+	/** Aggregated usage across all subagents. */
+	usage?: Usage;
 	outputPaths?: string[];
 	progress?: AgentProgress[];
 }