@dyyz1993/pi-coding-agent 0.74.24 → 0.74.27

package/dist/extensions/subagent/prompts/implement-and-review.md

@@ -0,0 +1,10 @@
+---
+description: Worker implements, reviewer reviews, worker applies feedback
+---
+Use the subagent tool with the chain parameter to execute this workflow:
+
+1. First, use the "worker" agent to implement: $@
+2. Then, use the "reviewer" agent to review the implementation from the previous step (use {previous} placeholder)
+3. Finally, use the "worker" agent to apply the feedback from the review (use {previous} placeholder)
+
+Execute this as a chain, passing output between steps via {previous}.

package/dist/extensions/subagent/prompts/implement.md

@@ -0,0 +1,10 @@
+---
+description: Full implementation workflow - scout gathers context, planner creates plan, worker implements
+---
+Use the subagent tool with the chain parameter to execute this workflow:
+
+1. First, use the "scout" agent to find all code relevant to: $@
+2. Then, use the "planner" agent to create an implementation plan for "$@" using the context from the previous step (use {previous} placeholder)
+3. Finally, use the "worker" agent to implement the plan from the previous step (use {previous} placeholder)
+
+Execute this as a chain, passing output between steps via {previous}.

package/dist/extensions/subagent/prompts/scout-and-plan.md

@@ -0,0 +1,9 @@
+---
+description: Scout gathers context, planner creates implementation plan (no implementation)
+---
+Use the subagent tool with the chain parameter to execute this workflow:
+
+1. First, use the "scout" agent to find all code relevant to: $@
+2. Then, use the "planner" agent to create an implementation plan for "$@" using the context from the previous step (use {previous} placeholder)
+
+Execute this as a chain, passing output between steps via {previous}. Do NOT implement - just return the plan.

package/dist/extensions/subagent-ext/contract.d.ts

@@ -0,0 +1,2 @@
+export { SUBAGENT_CHANNEL_NAME as SUBAGENT_EXT_CHANNEL_NAME, type SubagentChannelContract as SubagentExtChannelContract, type SubagentEventPayload as SubagentEventPayload, type SubagentStartPayload } from "../subagent-shared/contract.js";
+//# sourceMappingURL=contract.d.ts.map

package/dist/extensions/subagent-ext/contract.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"contract.d.ts","sourceRoot":"","sources":["contract.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,IAAI,yBAAyB,EAAE,KAAK,uBAAuB,IAAI,0BAA0B,EAAE,KAAK,oBAAoB,IAAI,oBAAoB,EAAE,KAAK,oBAAoB,EAAE,MAAM,gCAAgC,CAAC","sourcesContent":["export { SUBAGENT_CHANNEL_NAME as SUBAGENT_EXT_CHANNEL_NAME, type SubagentChannelContract as SubagentExtChannelContract, type SubagentEventPayload as SubagentEventPayload, type SubagentStartPayload } from \"../subagent-shared/contract.js\";\n"]}

package/dist/extensions/subagent-ext/contract.js

@@ -0,0 +1,2 @@
+export { SUBAGENT_CHANNEL_NAME as SUBAGENT_EXT_CHANNEL_NAME } from "../subagent-shared/contract.js";
+//# sourceMappingURL=contract.js.map

package/dist/extensions/subagent-ext/contract.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"contract.js","sourceRoot":"","sources":["contract.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,IAAI,yBAAyB,EAA4I,MAAM,gCAAgC,CAAC","sourcesContent":["export { SUBAGENT_CHANNEL_NAME as SUBAGENT_EXT_CHANNEL_NAME, type SubagentChannelContract as SubagentExtChannelContract, type SubagentEventPayload as SubagentEventPayload, type SubagentStartPayload } from \"../subagent-shared/contract.js\";\n"]}

package/dist/extensions/subagent-ext/contract.ts

@@ -0,0 +1 @@
+export { SUBAGENT_CHANNEL_NAME as SUBAGENT_EXT_CHANNEL_NAME, type SubagentChannelContract as SubagentExtChannelContract, type SubagentEventPayload as SubagentEventPayload, type SubagentStartPayload } from "../subagent-shared/contract.js";

package/dist/extensions/subagent-ext/index.ts

@@ -0,0 +1,347 @@
+import { spawn } from "node:child_process";
+import { randomUUID } from "node:crypto";
+import * as fs from "node:fs";
+import * as os from "node:os";
+import * as path from "node:path";
+import type { AgentToolResult, AgentToolUpdateCallback } from "@dyyz1993/pi-agent-core";
+import { Type } from "typebox";
+import type { ExtensionAPI, ExtensionContext } from "@dyyz1993/pi-coding-agent";
+import { createTypedChannel, getAgentDir } from "@dyyz1993/pi-coding-agent";
+import type { Message } from "@dyyz1993/pi-ai";
+import {
+	SUBAGENT_CHANNEL_NAME,
+	type SubagentChannelContract,
+	type SubagentEventPayload,
+	cleanupTempFiles,
+	getFinalOutput,
+	writePromptToTempFile,
+} from "../subagent-shared/index.js";
+
+function getSubagentDir(): string {
+	return path.join(getAgentDir(), "memory", "subagent");
+}
+
+export interface SubagentParams {
+	systemPrompt?: string;
+	description: string;
+	instruction: string;
+	cwd?: string;
+	model?: string;
+	maxTurns?: number;
+	thinkingLevel?: string;
+	extensions?: string[];
+	permissionMode?: string;
+	tools?: string[];
+}
+
+export interface SubagentSessionInfo {
+	toolCallId: string;
+	sessionId: string;
+	sessionPath: string;
+	description: string;
+	instruction: string;
+	systemPrompt?: string;
+	startedAt: number;
+	completedAt?: number;
+	exitCode?: number;
+	finalText?: string;
+	error?: string;
+}
+
+export interface SubagentDetails {
+	sessionId: string;
+	sessionPath: string;
+	description: string;
+	instruction: string;
+	events: unknown[];
+	messageCount: number;
+	startedAt: number;
+	completedAt?: number;
+	exitCode?: number;
+}
+
+const SubagentParamsSchema = Type.Object({
+	systemPrompt: Type.Optional(
+		Type.String({ description: "System prompt defining the sub-agent's role and behavior" }),
+	),
+	description: Type.String({ description: "Brief description of the sub-agent's purpose" }),
+	instruction: Type.String({ description: "The task instruction to execute" }),
+	cwd: Type.Optional(Type.String({ description: "Working directory for the sub-agent process" })),
+	model: Type.Optional(Type.String({ description: "Model to use (e.g. 'sonnet', 'gpt-4o')" })),
+	maxTurns: Type.Optional(Type.Number({ description: "Maximum number of agent turns" })),
+	thinkingLevel: Type.Optional(Type.String({ description: "Thinking level: off, minimal, low, medium, high, xhigh" })),
+	extensions: Type.Optional(Type.Array(Type.String(), { description: "Extension paths to load in the child process" })),
+	permissionMode: Type.Optional(
+		Type.String({ description: "Permission mode: auto, acceptEdits, plan, dontAsk, always-allow, always-deny" }),
+	),
+	tools: Type.Optional(Type.Array(Type.String(), { description: "Tool names to enable" })),
+});
+
+export function parseJsonLine(line: string): unknown | null {
+	if (!line.trim()) return null;
+	try {
+		return JSON.parse(line);
+	} catch (err) {
+		console.debug("[subagent-ext] JSON line parse failed:", err instanceof Error ? err.message : err);
+		return null;
+	}
+}
+
+export function extractTextFromEvent(event: Record<string, unknown>): string {
+	const tryExtract = (content: unknown): string => {
+		if (!Array.isArray(content)) return "";
+		for (const c of content) {
+			if (
+				c &&
+				typeof c === "object" &&
+				"type" in c &&
+				c.type === "text" &&
+				"text" in c &&
+				typeof c.text === "string" &&
+				c.text
+			) {
+				return c.text;
+			}
+		}
+		return "";
+	};
+	let text = tryExtract(event.content);
+	if (text) return text;
+	if (event.message && typeof event.message === "object" && event.message !== null) {
+		text = tryExtract((event.message as Record<string, unknown>).content);
+	}
+	return text;
+}
+
+export interface SubagentResult {
+	finalText: string;
+	events: unknown[];
+	exitCode: number;
+}
+
+export function runSubagent(
+	args: string[],
+	cwd: string,
+	channel: { send: (data: unknown) => void },
+	sessionId: string,
+	signal?: AbortSignal,
+	timeoutMs = 300_000,
+): Promise<SubagentResult> {
+	return new Promise((resolve, reject) => {
+		let settled = false;
+		let stdoutBuffer = "";
+		let finalText = "";
+		const events: unknown[] = [];
+
+		const child = spawn("pi", args, {
+			cwd,
+			stdio: ["ignore", "pipe", "pipe"],
+		});
+
+		const finish = (result: SubagentResult) => {
+			if (settled) return;
+			settled = true;
+			clearTimeout(timeout);
+			cleanupAbort?.();
+			resolve(result);
+		};
+
+		const fail = (err: Error) => {
+			if (settled) return;
+			settled = true;
+			clearTimeout(timeout);
+			cleanupAbort?.();
+			if (!child.killed) child.kill("SIGTERM");
+			reject(err);
+		};
+
+		const timeout = setTimeout(() => {
+			fail(new Error(`SubAgent timed out (${timeoutMs / 1000}s)`));
+		}, timeoutMs);
+
+		let cleanupAbort: (() => void) | undefined;
+
+		child.stdout.on("data", (data: Buffer) => {
+			stdoutBuffer += data.toString();
+			const lines = stdoutBuffer.split("\n");
+			stdoutBuffer = lines.pop() || "";
+
+			for (const line of lines) {
+				const obj = parseJsonLine(line);
+				if (!obj) continue;
+				events.push(obj);
+
+				const text = extractTextFromEvent(obj as Record<string, unknown>);
+				if (text) finalText = text;
+
+				channel.send({ event: obj, sessionId });
+			}
+		});
+
+		child.on("error", (err) => {
+			fail(err);
+		});
+
+		child.on("exit", (code) => {
+			finish({
+				finalText: finalText || "(no output)",
+				events,
+				exitCode: code ?? 1,
+			});
+		});
+
+		if (signal) {
+			const killChild = () => {
+				if (!child.killed) child.kill("SIGTERM");
+			};
+			if (signal.aborted) {
+				killChild();
+			} else {
+				signal.addEventListener("abort", killChild, { once: true });
+				cleanupAbort = () => signal.removeEventListener("abort", killChild);
+			}
+		}
+	});
+}
+
+export default function subagentExtension(pi: ExtensionAPI): void {
+	const rawChannel = pi.registerChannel(SUBAGENT_CHANNEL_NAME);
+	const channel = createTypedChannel<SubagentChannelContract>(rawChannel).server;
+
+	pi.registerTool({
+		name: "subagent",
+		label: "SubAgent",
+		description: [
+			"Spawn a sub-agent with isolated context via IPC (JSON mode).",
+			"The sub-agent runs in a separate pi process with its own session file.",
+			"Real-time events are forwarded through the 'subagent' channel.",
+			"Session metadata is stored for later history retrieval.",
+		].join(" "),
+		promptSnippet: "subagent(description, instruction) — delegate a task to a sub-agent",
+		parameters: SubagentParamsSchema,
+
+		async execute(
+			toolCallId: string,
+			params: SubagentParams,
+			signal: AbortSignal | undefined,
+			_onUpdate: AgentToolUpdateCallback<SubagentDetails> | undefined,
+			ctx: ExtensionContext,
+		): Promise<AgentToolResult<SubagentDetails>> {
+			const { systemPrompt, description, instruction, cwd, model, maxTurns, thinkingLevel, extensions, tools } = params;
+			const sessionId = randomUUID().slice(0, 8);
+			const effectiveCwd = cwd ?? ctx.cwd;
+			const sessionDir = getSubagentDir();
+			const sessionPath = path.join(sessionDir, `subagent-${sessionId}.jsonl`);
+			const startedAt = Date.now();
+
+			const details: SubagentDetails = {
+				sessionId,
+				sessionPath,
+				description,
+				instruction,
+				events: [],
+				messageCount: 0,
+				startedAt,
+			};
+
+			const onUpdate = _onUpdate;
+			let tmpPromptPath: string | null = null;
+			let tmpPromptDir: string | null = null;
+
+			const wrappedChannel = {
+				send: (data: unknown) => {
+					channel.emit("event", data as SubagentEventPayload);
+					const payload = data as { event: Record<string, unknown> };
+					if (payload.event) {
+						details.events.push(payload.event);
+						if (payload.event.type === "message_end") {
+							details.messageCount++;
+						}
+						if (onUpdate) {
+							const text = extractTextFromEvent(payload.event) || "(running...)";
+							onUpdate({
+								content: [{ type: "text", text }],
+								details: { ...details },
+							});
+						}
+					}
+				},
+			};
+
+			try {
+				channel.emit("subagent_start", {
+					event: { type: "subagent_start", toolCallId, description, instruction },
+					sessionId,
+				});
+
+			const effectiveModel = model ?? (ctx.model ? `${ctx.model.provider}/${ctx.model.id}` : undefined);
+			const useExtensions = extensions && extensions.length > 0;
+			const baseArgs: string[] = ["--mode", "json", "-p"];
+			if (!useExtensions) baseArgs.push("--no-extensions");
+			baseArgs.push("--session", sessionPath);
+			if (effectiveModel) baseArgs.push("--model", effectiveModel);
+			if (maxTurns && maxTurns > 0) baseArgs.push("--max-turns", String(maxTurns));
+			if (thinkingLevel) baseArgs.push("--thinking", thinkingLevel);
+			if (tools && tools.length > 0) baseArgs.push("--tools", tools.join(","));
+			if (useExtensions) {
+				for (const ext of extensions!) baseArgs.push("-e", ext);
+			}
+			const args = baseArgs;
+				if (systemPrompt?.trim()) {
+					const tmp = await writePromptToTempFile("subagent", systemPrompt, "pi-subagent-prompt-");
+					tmpPromptDir = tmp.dir;
+					tmpPromptPath = tmp.filePath;
+					args.push("--append-system-prompt", tmpPromptPath);
+				}
+				args.push(instruction);
+
+				const result = await runSubagent(args, effectiveCwd, wrappedChannel, sessionId, signal);
+
+				details.events = result.events;
+				details.exitCode = result.exitCode;
+				details.completedAt = Date.now();
+
+				pi.appendEntry("subagent", {
+					toolCallId,
+					sessionId,
+					sessionPath,
+					description,
+					instruction,
+					systemPrompt: systemPrompt ? "(provided)" : undefined,
+					startedAt,
+					completedAt: details.completedAt,
+					exitCode: result.exitCode,
+					finalText: result.finalText,
+				} satisfies SubagentSessionInfo);
+
+				return {
+					content: [{ type: "text", text: result.finalText }],
+					details,
+				};
+			} catch (err) {
+				details.completedAt = Date.now();
+				details.exitCode = 1;
+				const errorMessage = err instanceof Error ? err.message : String(err);
+
+				pi.appendEntry("subagent", {
+					toolCallId,
+					sessionId,
+					sessionPath,
+					description,
+					instruction,
+					startedAt,
+					completedAt: details.completedAt,
+					exitCode: 1,
+					error: errorMessage,
+				} satisfies SubagentSessionInfo);
+
+				return {
+					content: [{ type: "text", text: `SubAgent failed: ${errorMessage}` }],
+					details,
+				};
+			} finally {
+				cleanupTempFiles(tmpPromptPath, tmpPromptDir, "subagent-ext");
+			}
+		},
+	});
+}

package/dist/extensions/subagent-shared/contract.d.ts

@@ -0,0 +1,25 @@
+import type { ChannelContract } from "@dyyz1993/pi-coding-agent";
+export declare const SUBAGENT_CHANNEL_NAME = "subagent";
+export interface SubagentEventPayload {
+    event: unknown;
+    sessionId: string;
+    taskId?: string;
+    [key: string]: unknown;
+}
+export interface SubagentStartPayload {
+    event: {
+        type: "subagent_start";
+        toolCallId: string;
+        description: string;
+        instruction: string;
+    };
+    sessionId: string;
+}
+export interface SubagentChannelContract extends ChannelContract {
+    methods?: Record<string, never>;
+    events: {
+        event: SubagentEventPayload;
+        subagent_start: SubagentStartPayload;
+    };
+}
+//# sourceMappingURL=contract.d.ts.map

package/dist/extensions/subagent-shared/contract.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"contract.d.ts","sourceRoot":"","sources":["contract.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAEjE,eAAO,MAAM,qBAAqB,aAAa,CAAC;AAEhD,MAAM,WAAW,oBAAoB;IACpC,KAAK,EAAE,OAAO,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACvB;AAED,MAAM,WAAW,oBAAoB;IACpC,KAAK,EAAE;QACN,IAAI,EAAE,gBAAgB,CAAC;QACvB,UAAU,EAAE,MAAM,CAAC;QACnB,WAAW,EAAE,MAAM,CAAC;QACpB,WAAW,EAAE,MAAM,CAAC;KACpB,CAAC;IACF,SAAS,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,uBAAwB,SAAQ,eAAe;IAC/D,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;IAChC,MAAM,EAAE;QACP,KAAK,EAAE,oBAAoB,CAAC;QAC5B,cAAc,EAAE,oBAAoB,CAAC;KACrC,CAAC;CACF","sourcesContent":["import type { ChannelContract } from \"@dyyz1993/pi-coding-agent\";\n\nexport const SUBAGENT_CHANNEL_NAME = \"subagent\";\n\nexport interface SubagentEventPayload {\n\tevent: unknown;\n\tsessionId: string;\n\ttaskId?: string;\n\t[key: string]: unknown;\n}\n\nexport interface SubagentStartPayload {\n\tevent: {\n\t\ttype: \"subagent_start\";\n\t\ttoolCallId: string;\n\t\tdescription: string;\n\t\tinstruction: string;\n\t};\n\tsessionId: string;\n}\n\nexport interface SubagentChannelContract extends ChannelContract {\n\tmethods?: Record<string, never>;\n\tevents: {\n\t\tevent: SubagentEventPayload;\n\t\tsubagent_start: SubagentStartPayload;\n\t};\n}\n"]}

package/dist/extensions/subagent-shared/contract.js

@@ -0,0 +1,2 @@
+export const SUBAGENT_CHANNEL_NAME = "subagent";
+//# sourceMappingURL=contract.js.map

package/dist/extensions/subagent-shared/contract.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"contract.js","sourceRoot":"","sources":["contract.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,qBAAqB,GAAG,UAAU,CAAC","sourcesContent":["import type { ChannelContract } from \"@dyyz1993/pi-coding-agent\";\n\nexport const SUBAGENT_CHANNEL_NAME = \"subagent\";\n\nexport interface SubagentEventPayload {\n\tevent: unknown;\n\tsessionId: string;\n\ttaskId?: string;\n\t[key: string]: unknown;\n}\n\nexport interface SubagentStartPayload {\n\tevent: {\n\t\ttype: \"subagent_start\";\n\t\ttoolCallId: string;\n\t\tdescription: string;\n\t\tinstruction: string;\n\t};\n\tsessionId: string;\n}\n\nexport interface SubagentChannelContract extends ChannelContract {\n\tmethods?: Record<string, never>;\n\tevents: {\n\t\tevent: SubagentEventPayload;\n\t\tsubagent_start: SubagentStartPayload;\n\t};\n}\n"]}

package/dist/extensions/subagent-shared/contract.ts

@@ -0,0 +1,28 @@
+import type { ChannelContract } from "@dyyz1993/pi-coding-agent";
+
+export const SUBAGENT_CHANNEL_NAME = "subagent";
+
+export interface SubagentEventPayload {
+	event: unknown;
+	sessionId: string;
+	taskId?: string;
+	[key: string]: unknown;
+}
+
+export interface SubagentStartPayload {
+	event: {
+		type: "subagent_start";
+		toolCallId: string;
+		description: string;
+		instruction: string;
+	};
+	sessionId: string;
+}
+
+export interface SubagentChannelContract extends ChannelContract {
+	methods?: Record<string, never>;
+	events: {
+		event: SubagentEventPayload;
+		subagent_start: SubagentStartPayload;
+	};
+}

package/dist/extensions/subagent-shared/index.ts

@@ -0,0 +1,4 @@
+export { SUBAGENT_CHANNEL_NAME, type SubagentChannelContract, type SubagentEventPayload, type SubagentStartPayload } from "./contract.js";
+export { type DisplayItem, type SingleResult, type SubagentDetailsBase, type UsageStats } from "./types.js";
+export { accumulateUsage, cleanupTempFiles, formatTokens, formatUsageStats, getDisplayItems, getFinalOutput, makeUsage, writePromptToTempFile } from "./utils.js";
+export { aggregateUsage, COLLAPSED_ITEM_COUNT, formatToolCall, renderDisplayItems, renderSingleResult } from "./render.js";

package/dist/extensions/subagent-shared/render.ts

@@ -0,0 +1,166 @@
+import * as os from "node:os";
+import type { Theme, ThemeColor } from "@dyyz1993/pi-coding-agent";
+import { getMarkdownTheme } from "@dyyz1993/pi-coding-agent";
+import { type Component, Container, Markdown, Spacer, Text } from "@dyyz1993/pi-tui";
+import type { DisplayItem, SingleResult, UsageStats } from "./types.js";
+import { formatUsageStats, getDisplayItems, getFinalOutput } from "./utils.js";
+
+const COLLAPSED_ITEM_COUNT = 10;
+
+export function formatToolCall(
+	toolName: string,
+	args: Record<string, unknown>,
+	themeFg: (color: ThemeColor, text: string) => string,
+): string {
+	const shortenPath = (p: string) => {
+		const home = os.homedir();
+		return p.startsWith(home) ? `~${p.slice(home.length)}` : p;
+	};
+
+	switch (toolName) {
+		case "bash": {
+			const command = (args.command as string) || "...";
+			const preview = command.length > 60 ? `${command.slice(0, 60)}...` : command;
+			return themeFg("muted", "$ ") + themeFg("toolOutput", preview);
+		}
+		case "read": {
+			const rawPath = (args.file_path || args.path || "...") as string;
+			const filePath = shortenPath(rawPath);
+			const offset = args.offset as number | undefined;
+			const limit = args.limit as number | undefined;
+			let text = themeFg("accent", filePath);
+			if (offset !== undefined || limit !== undefined) {
+				const startLine = offset ?? 1;
+				const endLine = limit !== undefined ? startLine + limit - 1 : "";
+				text += themeFg("warning", `:${startLine}${endLine ? `-${endLine}` : ""}`);
+			}
+			return themeFg("muted", "read ") + text;
+		}
+		case "write": {
+			const rawPath = (args.file_path || args.path || "...") as string;
+			const filePath = shortenPath(rawPath);
+			const content = (args.content || "") as string;
+			const lines = content.split("\n").length;
+			let text = themeFg("muted", "write ") + themeFg("accent", filePath);
+			if (lines > 1) text += themeFg("dim", ` (${lines} lines)`);
+			return text;
+		}
+		case "edit": {
+			const rawPath = (args.file_path || args.path || "...") as string;
+			return themeFg("muted", "edit ") + themeFg("accent", shortenPath(rawPath));
+		}
+		case "ls": {
+			const rawPath = (args.path || ".") as string;
+			return themeFg("muted", "ls ") + themeFg("accent", shortenPath(rawPath));
+		}
+		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)}`);
+		}
+		case "grep": {
+			const pattern = (args.pattern || "") as string;
+			const rawPath = (args.path || ".") as string;
+			return (
+				themeFg("muted", "grep ") +
+				themeFg("accent", `/${pattern}/`) +
+				themeFg("dim", ` in ${shortenPath(rawPath)}`)
+			);
+		}
+		default: {
+			const argsStr = JSON.stringify(args);
+			const preview = argsStr.length > 50 ? `${argsStr.slice(0, 50)}...` : argsStr;
+			return themeFg("accent", toolName) + themeFg("dim", ` ${preview}`);
+		}
+	}
+}
+
+function renderDisplayItemsInner(
+	items: DisplayItem[],
+	expanded: boolean,
+	theme: Theme,
+	limit?: number,
+): string {
+	const fg = (c: string, t: string) => theme.fg(c as ThemeColor, t);
+	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, fg)}\n`;
+		}
+	}
+	return text.trimEnd();
+}
+
+export function renderSingleResult(r: SingleResult, expanded: boolean, theme: Theme): Component {
+	const mdTheme = getMarkdownTheme();
+	const fg = (c: string, t: string) => theme.fg(c as ThemeColor, t);
+	const isError =
+		r.exitCode !== 0 || r.stopReason === "error" || r.stopReason === "aborted" || r.stopReason === "timeout";
+	const icon = isError ? theme.fg("error", "✗") : theme.fg("success", "✓");
+	const displayItems = getDisplayItems(r.messages);
+	const finalOutput = getFinalOutput(r.messages);
+
+	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, fg), 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);
+		if (usageStr) {
+			container.addChild(new Spacer(1));
+			container.addChild(new Text(theme.fg("dim", usageStr), 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${renderDisplayItemsInner(displayItems, expanded, theme, COLLAPSED_ITEM_COUNT)}`;
+		if (displayItems.length > COLLAPSED_ITEM_COUNT) text += `\n${theme.fg("muted", "(Ctrl+O to expand)")}`;
+	}
+	const usageStr = formatUsageStats(r.usage, r.model);
+	if (usageStr) text += `\n${theme.fg("dim", usageStr)}`;
+	return new Text(text, 0, 0);
+}
+
+export function aggregateUsage(results: SingleResult[]): UsageStats {
+	const total: UsageStats = { input: 0, output: 0, cacheRead: 0, cacheWrite: 0, cost: 0, contextTokens: 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;
+}
+
+export { renderDisplayItemsInner as renderDisplayItems, COLLAPSED_ITEM_COUNT };

package/dist/extensions/subagent-shared/types.ts

@@ -0,0 +1,35 @@
+import type { Message } from "@dyyz1993/pi-ai";
+
+export interface UsageStats {
+	input: number;
+	output: number;
+	cacheRead: number;
+	cacheWrite: number;
+	cost: number;
+	contextTokens: number;
+	turns: number;
+}
+
+export interface SingleResult {
+	agent: string;
+	agentSource: "user" | "project" | "unknown" | "builtin" | "plugin" | "flag" | "policy";
+	task: string;
+	exitCode: number;
+	messages: Message[];
+	stderr: string;
+	usage: UsageStats;
+	model?: string;
+	stopReason?: string;
+	errorMessage?: string;
+	step?: number;
+	sessionPath?: string;
+}
+
+export type DisplayItem =
+	| { type: "text"; text: string }
+	| { type: "toolCall"; name: string; args: Record<string, unknown> };
+
+export interface SubagentDetailsBase {
+	agentScope: string;
+	projectAgentsDir: string | null;
+}