@fosterg4/pi-subagent 1.0.3 → 1.0.6

package/index.ts

@@ -36,6 +36,7 @@ import {
 } from "./agents.ts";
 import { type ValidationResult, validateSchema } from "./validate.ts";
 import { fmt, usageLine, sumUsage } from "./utils.ts";
+import { AgentWidget, type WidgetEntry } from "./ui.ts";
 
 const MAX_PARALLEL_TASKS = 8;
 const MAX_CONCURRENCY = 4;
@@ -236,6 +237,7 @@ async function runSingleAgent(
 	signal: AbortSignal | undefined,
 	onUpdate: OnUpdateCallback | undefined,
 	makeDetails: (results: SingleResult[]) => SubagentDetails,
+	onStats?: (stats: { turns: number; tokens: number }) => void,
 ): Promise<SingleResult> {
 	const agent = agents.find((a) => a.name === agentName);
 
@@ -373,6 +375,8 @@ async function runSingleAgent(
 							currentResult.usage.cost += usage.cost?.total || 0;
 							currentResult.usage.contextTokens = usage.totalTokens || 0;
 						}
+						const total = currentResult.usage.input + currentResult.usage.output + currentResult.usage.cacheRead;
+						onStats?.({ turns: currentResult.usage.turns, tokens: total });
 						if (!currentResult.model && msg.model)
 							currentResult.model = msg.model;
 						if (msg.stopReason) currentResult.stopReason = msg.stopReason;
@@ -640,8 +644,20 @@ export default function (pi: ExtensionAPI) {
 			if (params.chain && params.chain.length > 0) {
 				const results: SingleResult[] = [];
 				let previousStructured: Record<string, unknown> | undefined;
+				let widgetHandle: ReturnType<typeof pi.ui.custom> | undefined;
+
+				const closeWidget = () => {
+					if (widgetTimer) { clearInterval(widgetTimer); widgetTimer = undefined; }
+					if (widgetHandle) {
+						widgetHandle.close();
+						widgetHandle = undefined;
+					}
+					widgetRef = undefined;
+				};
 
 				for (let i = 0; i < params.chain.length; i++) {
+					closeWidget();
+
 					const step = params.chain[i];
 					let taskWithContext = step.task;
 
@@ -651,13 +667,32 @@ export default function (pi: ExtensionAPI) {
 							/\{previous\}/g,
 							JSON.stringify(previousStructured, null, 2),
 						);
-					} else {
+					} else if (i > 0) {
 						taskWithContext = taskWithContext.replace(
 							/\{previous\}/g,
 							getFinalOutput(results[i - 1]?.messages ?? ""),
 						);
 					}
 
+					// Spawn live widget for this step
+					let widgetRef: AgentWidget | undefined;
+					let widgetTimer: ReturnType<typeof setInterval> | undefined;
+					if (ctx.hasUI) {
+						widgetRef = new AgentWidget();
+						widgetRef.addAgent(step.agent, step.task.replace(/\{[^}]+\}/g, "").trim());
+						widgetHandle = ctx.ui.custom(
+							(_tui, _theme, _kb, done) => {
+								widgetTimer = setInterval(() => widgetRef?.invalidate(), 200);
+								return widgetRef!;
+							},
+							{ overlay: true },
+						);
+					}
+
+					const stepStats = (stats: { turns: number; tokens: number }) => {
+						widgetRef?.invalidate();
+					};
+
 					const chainUpdate: OnUpdateCallback | undefined = onUpdate
 						? (partial) => {
 								const currentResult = partial.details?.results[0];
@@ -681,6 +716,7 @@ export default function (pi: ExtensionAPI) {
 						signal,
 						chainUpdate,
 						makeDetails("chain"),
+						stepStats,
 					);
 					results.push(result);
 
@@ -697,6 +733,7 @@ export default function (pi: ExtensionAPI) {
 					}
 
 					if (isFailedResult(result)) {
+						closeWidget();
 						const errorMsg = getResultOutput(result);
 						return {
 							content: [
@@ -711,6 +748,8 @@ export default function (pi: ExtensionAPI) {
 					}
 				}
 
+				closeWidget();
+
 				const lastResult = results[results.length - 1];
 				return {
 					content: [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fosterg4/pi-subagent",
-  "version": "1.0.3",
+  "version": "1.0.6",
   "description": "Delegate tasks to specialized subagents with isolated context windows, structured JSON handoff, contract schemas, and live TUI streaming",
   "keywords": [
     "pi-package",

package/ui.ts

@@ -0,0 +1,174 @@
+/**
+ * Claude Code-style live progress widget for subagent execution.
+ *
+ * Renders a compact overlay showing spinner + agent name + stats.
+ * Designed to be used with pi's ctx.ui.custom(…) overlay system.
+ *
+ * Usage:
+ *   const widget = new AgentWidget();
+ *   widget.addAgent("scout", "Find auth files");
+ *   const handle = ctx.ui.custom(widget, { overlay: true });
+ *   widget.updateAgent("scout", { turns: 3, tokens: 12400, elapsedMs: 4100 });
+ *   handle.close();
+ */
+
+import { fmt } from "./utils.ts";
+
+// ---------------------------------------------------------------------------
+// Types
+// ---------------------------------------------------------------------------
+
+export type AgentStatus = "running" | "done" | "error";
+
+export interface WidgetEntry {
+	name: string;
+	task: string;
+	status: AgentStatus;
+	turns: number;
+	tokens: number;
+	contextUsagePct?: number;
+	elapsedMs: number;
+	model?: string;
+}
+
+// ---------------------------------------------------------------------------
+// Spinner
+// ---------------------------------------------------------------------------
+
+const SPINNER_FRAMES = ["⠋", "⠙", "⠹", "⠸", "⠼", "⠴", "⠦", "⠧", "⠇", "⠏"];
+
+// ---------------------------------------------------------------------------
+// Helpers
+// ---------------------------------------------------------------------------
+
+function formatTime(ms: number): string {
+	const s = ms / 1000;
+	if (s < 10) return `${s.toFixed(1)}s`;
+	if (s < 60) return `${Math.round(s)}s`;
+	const m = Math.floor(s / 60);
+	const sec = Math.round(s % 60);
+	return `${m}m${sec}s`;
+}
+
+function statusIcon(status: AgentStatus, frame: number): string {
+	switch (status) {
+		case "done":
+			return "✓";
+		case "error":
+			return "✗";
+		case "running":
+		default:
+			return SPINNER_FRAMES[frame % SPINNER_FRAMES.length];
+	}
+}
+
+// ---------------------------------------------------------------------------
+// Widget
+// ---------------------------------------------------------------------------
+
+export class AgentWidget {
+	private entries: WidgetEntry[] = [];
+	private frame = 0;
+	private startTimes: Map<string, number> = new Map();
+
+	addAgent(name: string, task: string): void {
+		const exists = this.entries.find((e) => e.name === name);
+		if (exists) return;
+		this.entries.push({
+			name,
+			task,
+			status: "running",
+			turns: 0,
+			tokens: 0,
+			elapsedMs: 0,
+		});
+		this.startTimes.set(name, Date.now());
+		this.invalidate();
+	}
+
+	updateAgent(name: string, update: Partial<WidgetEntry>): void {
+		const entry = this.entries.find((e) => e.name === name);
+		if (!entry) return;
+		Object.assign(entry, update);
+		this.invalidate();
+	}
+
+	removeAgent(name: string): void {
+		this.entries = this.entries.filter((e) => e.name !== name);
+		this.startTimes.delete(name);
+		this.invalidate();
+	}
+
+	getAgent(name: string): WidgetEntry | undefined {
+		return this.entries.find((e) => e.name === name);
+	}
+
+	markDone(name: string): void {
+		const entry = this.entries.find((e) => e.name === name);
+		if (entry) { entry.status = "done"; }
+		this.invalidate();
+	}
+
+	invalidate(): void {
+		// No cache to invalidate — render() is always fresh
+	}
+
+	private entryLine(entry: WidgetEntry, width: number): string[] {
+		const lines: string[] = [];
+		const now = Date.now();
+		const elapsedMs = entry.elapsedMs || (now - (this.startTimes.get(entry.name) ?? now));
+
+		const icon = statusIcon(entry.status, this.frame);
+		const parts: string[] = [];
+
+		// Always show icon + name
+		let line = `\u00A0${icon} ${entry.name}`;
+
+		// Turns
+		parts.push(entry.turns > 0 ? `↻${entry.turns}` : "↻0");
+
+		// Tokens
+		if (entry.tokens > 0) {
+			const tokStr = fmt(entry.tokens);
+			parts.push(`${tokStr} token`);
+			if (entry.contextUsagePct !== undefined && entry.contextUsagePct > 0) {
+				parts.push(`(${entry.contextUsagePct}%)`);
+			}
+		}
+
+		// Time
+		if (elapsedMs > 99) parts.push(formatTime(elapsedMs));
+		else parts.push("0.0s");
+
+		// Model
+		if (entry.model) parts.push(entry.model);
+
+		line += ` · ${parts.join(" · ")}`;
+		if (line.length > width) line = line.slice(0, width - 3) + "…";
+		lines.push(line);
+
+		// Activity sub-line (running agents only)
+		if (entry.task && entry.status === "running") {
+			const preview = entry.task.length > 60 ? `${entry.task.slice(0, 57)}…` : entry.task;
+			lines.push(`  ⎿  ${preview}`);
+		}
+
+		return lines;
+	}
+
+	render(width: number): string[] {
+		const lines: string[] = [];
+
+		if (this.entries.length === 0) return [];
+
+		// Header
+		lines.push("\u25CF Agents");
+
+		for (const entry of this.entries) {
+			lines.push(...this.entryLine(entry, width));
+		}
+
+		this.frame++;
+		return lines;
+	}
+}