@d3ara1n/pi-subagent 0.2.0 → 0.3.0

package/README.md

@@ -44,7 +44,7 @@ This means:
 ## TUI Display
 
 - **During execution**: Shows role, elapsed time, turn count, and live tool calls
-- **Collapsed result**: `✓ explorer · 找到了登录/注册/token三块逻辑` + recent tool calls + usage stats
+- **Collapsed result**: `✓ explorer · Found login, registration, and token logic` + recent tool calls + usage stats
 - **Expanded result** (Ctrl+O): Full task text, all tool calls, final output as rendered Markdown, and usage details
 
 ## Requirements
@@ -56,7 +56,7 @@ This means:
 ## Installation
 
 ```bash
-pi extension add @d3ara1n/pi-subagent
+pi install @d3ara1n/pi-subagent
 ```
 
 ## Configuration
@@ -70,7 +70,7 @@ Edit `~/.pi/agent/settings.json`:
     "timeoutMs": 300000,
 
     // Summary generation — uses a lightweight model to create
-    // a one-line Chinese summary for the TUI display
+    // a one-line summary for the TUI display
     "summary": {
       "role": "utility",    // pi-model-roles role for summarization
       "enabled": true        // set false to disable

package/package.json

@@ -1,6 +1,7 @@
 {
   "name": "@d3ara1n/pi-subagent",
-  "version": "0.2.0",
+  "version": "0.3.0",
+  "type": "module",
   "description": "Role-based subagent orchestration for pi — delegates tasks to specialized pi child processes with configurable model roles",
   "main": "src/index.ts",
   "keywords": [

package/src/index.ts

@@ -15,7 +15,7 @@ import { Container, Markdown, Spacer, Text } from "@earendil-works/pi-tui";
 import { Type } from "typebox";
 import type { ModelRolesAPI } from "@d3ara1n/pi-model-roles";
 import { getModelRolesAPI } from "@d3ara1n/pi-model-roles";
-import type { SubagentConfig, SubagentDetails, SubagentResult, SubagentRole } from "./types.ts";
+import type { SubagentConfig, SubagentDetails, SubagentResult, SubagentRole, ToolStatus, ActivityEntry } from "./types.ts";
 import { DEFAULT_CONFIG } from "./types.ts";
 import { loadSubagentConfig } from "./config.ts";
 import { BUILTIN_ROLES } from "./roles.ts";
@@ -44,21 +44,16 @@ function formatUsageStats(usage: SubagentResult["usage"], model?: string): strin
 }
 
 type DisplayItem =
-	| { type: "text"; text: string }
-	| { type: "toolCall"; name: string; args: Record<string, any> };
-
-function getDisplayItems(messages: SubagentResult["messages"]): DisplayItem[] {
-	const items: DisplayItem[] = [];
-	for (const msg of messages) {
-		if (msg.role === "assistant") {
-			for (const part of msg.content) {
-				if (part.type === "text" && part.text) items.push({ type: "text", text: part.text });
-				else if (part.type === "toolCall" && part.name)
-					items.push({ type: "toolCall", name: part.name, args: part.arguments ?? {} });
-			}
-		}
-	}
-	return items;
+	| { type: "toolCall"; name: string; args: Record<string, any>; status?: ToolStatus }
+	| { type: "thinking"; status?: ToolStatus };
+
+/** Map the real-time activity log into renderable display items (in order). */
+function buildDisplayItems(activityLog: ActivityEntry[]): DisplayItem[] {
+	return activityLog.map((a) =>
+		a.kind === "thinking"
+			? { type: "thinking", status: a.status }
+			: { type: "toolCall", name: a.toolName ?? "?", args: a.args ?? {}, status: a.status },
+	);
 }
 
 function shortenPath(p: string): string {
@@ -126,6 +121,35 @@ function formatToolCall(
 	}
 }
 
+/** Per-tool-call visual styling: prefix glyph + color function keyed by status. */
+function statusStyle(
+	status: ToolStatus | undefined,
+	fg: (color: string, text: string) => string,
+): { prefix: string; color: (c: string, text: string) => string } {
+	switch (status) {
+		case "running":
+			return { prefix: fg("accent", "\u25CF "), color: fg };
+		case "failed":
+			return { prefix: fg("error", "\u2717 "), color: (_c, text) => fg("error", text) };
+		case "done":
+		default:
+			return { prefix: fg("dim", "\u2192 "), color: (_c, text) => fg("dim", text) };
+	}
+}
+
+/** Render a thinking-block row: diamond glyph + label, colored by status.
+ * Running = hollow diamond (unformed thought); done = solid diamond (settled). */
+function formatThinking(
+	status: ToolStatus | undefined,
+	fg: (color: string, text: string) => string,
+): string {
+	if (status === "running") {
+		return fg("accent", "\u25C7 thinking");
+	}
+	// done (or unknown) — dim past tense, solid diamond
+	return fg("dim", "\u25C6 thought");
+}
+
 function renderDisplayItems(
 	items: DisplayItem[],
 	limit: number | undefined,
@@ -136,11 +160,11 @@ function renderDisplayItems(
 	let text = "";
 	if (skipped > 0) text += fg("muted", `... ${skipped} earlier items\n`);
 	for (const item of toShow) {
-		if (item.type === "text") {
-			const preview = item.text.split("\n").slice(0, 3).join("\n");
-			text += `${fg("toolOutput", preview.length > 120 ? preview.slice(0, 120) + "..." : preview)}\n`;
+		if (item.type === "thinking") {
+			text += `${formatThinking(item.status, fg)}\n`;
 		} else {
-			text += `${fg("muted", "\u2192 ")}${formatToolCall(item.name, item.args, fg)}\n`;
+			const { prefix, color } = statusStyle(item.status, fg);
+			text += `${prefix}${formatToolCall(item.name, item.args, color)}\n`;
 		}
 	}
 	return text.trimEnd();
@@ -187,8 +211,8 @@ async function generateSummary(
 			resolved.model,
 			{
 				systemPrompt:
-					"Summarize the following agent output in one concise Chinese sentence (max 60 characters). Focus on what was accomplished, not how. Output only the summary, no preamble.",
-				messages: [{ role: "user", content: summaryInput }],
+					"Summarize the following agent output in one concise sentence (max 60 characters). Respond in the same language as the input. Focus on what was accomplished, not how. Output only the summary, no preamble.",
+				messages: [{ role: "user", content: summaryInput, timestamp: Date.now() }],
 			},
 			{
 				maxTokens: 100,
@@ -338,6 +362,7 @@ export default function subagentExtension(pi: ExtensionAPI) {
 							text: `Unknown subagent role: ${params.role}. Available: ${Object.keys(availableRoles).join(", ")}`,
 						},
 					],
+					details: undefined as any,
 				};
 			}
 
@@ -348,6 +373,7 @@ export default function subagentExtension(pi: ExtensionAPI) {
 			} catch {
 				return {
 					content: [{ type: "text", text: "pi-model-roles is not initialized. Cannot resolve model for subagent." }],
+					details: undefined as any,
 				};
 			}
 
@@ -355,6 +381,7 @@ export default function subagentExtension(pi: ExtensionAPI) {
 			if (!resolved.model) {
 				return {
 					content: [{ type: "text", text: `Role "${roleDef.role}" could not be resolved. Model not available.` }],
+					details: undefined as any,
 				};
 			}
 
@@ -371,6 +398,7 @@ export default function subagentExtension(pi: ExtensionAPI) {
 					output: "",
 					stderr: "",
 					usage: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0, cost: 0, contextTokens: 0, turns: 0 },
+					activityLog: [],
 				};
 				onUpdate({
 					content: [{ type: "text", text: `${params.role}: running...` }],
@@ -407,6 +435,7 @@ export default function subagentExtension(pi: ExtensionAPI) {
 							},
 							model: partial.model,
 							stopReason: partial.stopReason,
+							activityLog: partial.activityLog ?? [],
 						};
 						const statusText = `${params.role}  ${elapsed}s  ${liveResult.usage.turns} turn${liveResult.usage.turns !== 1 ? "s" : ""}`;
 						onUpdate({
@@ -511,7 +540,7 @@ export default function subagentExtension(pi: ExtensionAPI) {
 			} else {
 				icon = theme.fg("success", "\u2713");
 			}
-			const displayItems = getDisplayItems(r.messages);
+			const displayItems = buildDisplayItems(r.activityLog);
 			const finalOutput = getFinalOutput(r.messages);
 			const mdTheme = getMarkdownTheme();
 
@@ -532,20 +561,21 @@ export default function subagentExtension(pi: ExtensionAPI) {
 				}
 
 				container.addChild(new Spacer(1));
-				const toolCalls = displayItems.filter((item) => item.type === "toolCall");
-				if (toolCalls.length === 0) {
+				const activity = displayItems.filter((item) => item.type === "toolCall" || item.type === "thinking");
+				if (activity.length === 0) {
 					const runningLabel = isRunning ? "(waiting for first event...)" : "(none)";
 					container.addChild(new Text(theme.fg("muted", runningLabel), 0, 0));
 				} else {
-					for (const item of toolCalls) {
-						container.addChild(
-							new Text(
-								theme.fg("muted", "\u2192 ") +
-									formatToolCall(item.name, item.args, theme.fg.bind(theme)),
-								0,
-								0,
-							),
-						);
+					const fg = theme.fg.bind(theme) as (color: string, text: string) => string;
+					for (const item of activity) {
+						if (item.type === "thinking") {
+							container.addChild(new Text(formatThinking(item.status, fg), 0, 0));
+						} else {
+							const { prefix, color } = statusStyle(item.status, fg);
+							container.addChild(
+								new Text(prefix + formatToolCall(item.name, item.args, color), 0, 0),
+							);
+						}
 					}
 				}
 
@@ -569,11 +599,11 @@ export default function subagentExtension(pi: ExtensionAPI) {
 
 			if (isRunning) {
 				// Running: show recent tool calls only
-				const toolCalls = displayItems.filter((item) => item.type === "toolCall");
-				if (toolCalls.length === 0) {
+				const activity = displayItems.filter((item) => item.type === "toolCall" || item.type === "thinking");
+				if (activity.length === 0) {
 					text += `\n${theme.fg("muted", "(running...)")}`;
 				} else {
-					const rendered = renderDisplayItems(toolCalls, 5, theme.fg.bind(theme));
+					const rendered = renderDisplayItems(activity, 5, theme.fg.bind(theme) as (color: string, text: string) => string);
 					if (rendered) text += `\n${rendered}`;
 				}
 			} else {

package/src/spawn.ts

@@ -140,6 +140,7 @@ export async function spawnSubagent(
 		output: "",
 		stderr: "",
 		usage: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0, cost: 0, contextTokens: 0, turns: 0 },
+		activityLog: [],
 	};
 
 	let tmpDir: string | null = null;
@@ -183,9 +184,12 @@ export async function spawnSubagent(
 				usage: { ...result.usage },
 				model: result.model,
 				stopReason: result.stopReason,
+				activityLog: result.activityLog.map((a) => ({ ...a })),
 			});
 		};
 
+		let thinkingCounter = 0;
+
 		const processLine = (line: string) => {
 			if (!line.trim()) return;
 			let event: any;
@@ -225,10 +229,47 @@ export async function spawnSubagent(
 				emitProgress();
 			}
 
-			if (event.type === "tool_result_end" && event.message) {
-				result.messages.push(event.message as SubagentMessage);
+			// Activity log: track thinking blocks and tool calls in arrival order.
+			// Both update in place so the TUI reflects real-time state.
+			if (event.type === "tool_execution_start" && event.toolCallId) {
+				result.activityLog.push({
+					kind: "toolCall",
+					id: event.toolCallId,
+					status: "running",
+					toolName: event.toolName,
+					args: event.args ?? {},
+				});
+				emitProgress();
+			} else if (event.type === "tool_execution_end" && event.toolCallId) {
+				const entry = result.activityLog.find((a) => a.id === event.toolCallId);
+				if (entry) entry.status = event.isError ? "failed" : "done";
 				emitProgress();
 			}
+
+			// Thinking-block lifecycle: pi wraps thinking_start/end inside
+			// message_update.assistantMessageEvent. These arrive BEFORE message_end,
+			// so we can't rely on messages[] to show real-time thinking state —
+			// register them in the activity log directly.
+			const aev = event.assistantMessageEvent;
+			if (event.type === "message_update" && aev) {
+				if (aev.type === "thinking_start") {
+					result.activityLog.push({
+						kind: "thinking",
+						id: `thinking-${thinkingCounter++}`,
+						status: "running",
+					});
+					emitProgress();
+				} else if (aev.type === "thinking_end") {
+					// Mark the most recent still-running thinking block as done.
+					for (let i = result.activityLog.length - 1; i >= 0; i--) {
+						if (result.activityLog[i].kind === "thinking" && result.activityLog[i].status === "running") {
+							result.activityLog[i].status = "done";
+							break;
+						}
+					}
+					emitProgress();
+				}
+			}
 		};
 
 		// Build env with optional subagent allowlist and tmpdir for researcher role

package/src/types.ts

@@ -45,6 +45,20 @@ export interface SubagentRole {
   fallbackRole?: string;
 }
 
+/** Status of an individual tool call within a subagent run. */
+export type ToolStatus = "running" | "done" | "failed";
+
+/** A single entry in the real-time activity log (thinking block or tool call). */
+export interface ActivityEntry {
+  kind: "thinking" | "toolCall";
+  /** Synthetic id (thinking-N) or the toolCallId from the event stream. */
+  id: string;
+  status: ToolStatus;
+  /** Tool name + args (toolCall only). */
+  toolName?: string;
+  args?: Record<string, any>;
+}
+
 /** Usage statistics from a subagent execution. */
 export interface SubagentUsage {
   input: number;
@@ -104,6 +118,8 @@ export interface SubagentResult {
   stopReason?: string;
   /** Error message if failed */
   errorMessage?: string;
+  /** Real-time activity log: thinking blocks and tool calls in arrival order. */
+  activityLog: ActivityEntry[];
 }
 
 /** TUI details structure passed via tool result details. */