@gotgenes/pi-subagents 6.15.0 → 6.16.1

package/src/ui/agent-widget.ts

@@ -5,28 +5,11 @@
  * Uses the callback form of setWidget for themed rendering.
  */
 
-import { truncateToWidth } from "@earendil-works/pi-tui";
 import type { AgentManager } from "../agent-manager.js";
 import { AgentTypeRegistry } from "../agent-types.js";
-import type { SubagentType } from "../types.js";
-import { getLifetimeTotal, getSessionContextPercent } from "../usage.js";
 import type { AgentActivityTracker } from "./agent-activity-tracker.js";
-import {
-  describeActivity,
-  ERROR_STATUSES,
-  formatMs,
-  formatSessionTokens,
-  formatTurns,
-  getDisplayName,
-  getPromptModeLabel,
-  SPINNER,
-  type Theme,
-} from "./display.js";
-
-// ---- Constants ----
-
-/** Maximum number of rendered lines before overflow collapse kicks in. */
-const MAX_WIDGET_LINES = 12;
+import { ERROR_STATUSES, type Theme } from "./display.js";
+import { renderWidgetLines } from "./widget-renderer.js";
 
 // ---- Types ----
 
@@ -113,177 +96,17 @@ export class AgentWidget {
     }
   }
 
-  /** Render a finished agent line. */
-  private renderFinishedLine(a: { id: string; type: SubagentType; status: string; description: string; toolUses: number; startedAt: number; completedAt?: number; error?: string }, theme: Theme): string {
-    const name = getDisplayName(a.type, this.registry);
-    const modeLabel = getPromptModeLabel(a.type, this.registry);
-    const duration = formatMs((a.completedAt ?? Date.now()) - a.startedAt);
-
-    let icon: string;
-    let statusText: string;
-    if (a.status === "completed") {
-      icon = theme.fg("success", "✓");
-      statusText = "";
-    } else if (a.status === "steered") {
-      icon = theme.fg("warning", "✓");
-      statusText = theme.fg("warning", " (turn limit)");
-    } else if (a.status === "stopped") {
-      icon = theme.fg("dim", "■");
-      statusText = theme.fg("dim", " stopped");
-    } else if (a.status === "error") {
-      icon = theme.fg("error", "✗");
-      const errMsg = a.error ? `: ${a.error.slice(0, 60)}` : "";
-      statusText = theme.fg("error", ` error${errMsg}`);
-    } else {
-      // aborted
-      icon = theme.fg("error", "✗");
-      statusText = theme.fg("warning", " aborted");
-    }
-
-    const parts: string[] = [];
-    const activity = this.agentActivity.get(a.id);
-    if (activity) parts.push(formatTurns(activity.turnCount, activity.maxTurns));
-    if (a.toolUses > 0) parts.push(`${a.toolUses} tool use${a.toolUses === 1 ? "" : "s"}`);
-    parts.push(duration);
-
-    const modeTag = modeLabel ? ` ${theme.fg("dim", `(${modeLabel})`)}` : "";
-    return `${icon} ${theme.fg("dim", name)}${modeTag}  ${theme.fg("dim", a.description)} ${theme.fg("dim", "·")} ${theme.fg("dim", parts.join(" · "))}${statusText}`;
-  }
-
-  /**
-   * Render the widget content. Called from the registered widget's render() callback,
-   * reading live state each time instead of capturing it in a closure.
-   */
+  /** Delegate rendering to the pure widget-renderer module. */
   private renderWidget(tui: any, theme: Theme): string[] {
-    const allAgents = this.manager.listAgents();
-    const running = allAgents.filter(a => a.status === "running");
-    const queued = allAgents.filter(a => a.status === "queued");
-    const finished = allAgents.filter(a =>
-      a.status !== "running" && a.status !== "queued" && a.completedAt
-      && this.shouldShowFinished(a.id, a.status),
-    );
-
-    const hasActive = running.length > 0 || queued.length > 0;
-    const hasFinished = finished.length > 0;
-
-    // Nothing to show — return empty (widget will be unregistered by update())
-    if (!hasActive && !hasFinished) return [];
-
-    const w = tui.terminal.columns;
-    const truncate = (line: string) => truncateToWidth(line, w);
-    const headingColor = hasActive ? "accent" : "dim";
-    const headingIcon = hasActive ? "●" : "○";
-    const frame = SPINNER[this.widgetFrame % SPINNER.length];
-
-    // Build sections separately for overflow-aware assembly.
-    // Each running agent = 2 lines (header + activity), finished = 1 line, queued = 1 line.
-
-    const finishedLines: string[] = [];
-    for (const a of finished) {
-      finishedLines.push(truncate(theme.fg("dim", "├─") + " " + this.renderFinishedLine(a, theme)));
-    }
-
-    const runningLines: string[][] = []; // each entry is [header, activity]
-    for (const a of running) {
-      const name = getDisplayName(a.type, this.registry);
-      const modeLabel = getPromptModeLabel(a.type, this.registry);
-      const modeTag = modeLabel ? ` ${theme.fg("dim", `(${modeLabel})`)}` : "";
-      const elapsed = formatMs(Date.now() - a.startedAt);
-
-      const bg = this.agentActivity.get(a.id);
-      const toolUses = bg?.toolUses ?? a.toolUses;
-      const tokens = getLifetimeTotal(bg?.lifetimeUsage);
-      const contextPercent = getSessionContextPercent(bg?.session);
-      const tokenText = tokens > 0 ? formatSessionTokens(tokens, contextPercent, theme, a.compactionCount) : "";
-
-      const parts: string[] = [];
-      if (bg) parts.push(formatTurns(bg.turnCount, bg.maxTurns));
-      if (toolUses > 0) parts.push(`${toolUses} tool use${toolUses === 1 ? "" : "s"}`);
-      if (tokenText) parts.push(tokenText);
-      parts.push(elapsed);
-      const statsText = parts.join(" · ");
-
-      const activity = bg ? describeActivity(bg.activeTools, bg.responseText) : "thinking…";
-
-      runningLines.push([
-        truncate(theme.fg("dim", "├─") + ` ${theme.fg("accent", frame)} ${theme.bold(name)}${modeTag}  ${theme.fg("muted", a.description)} ${theme.fg("dim", "·")} ${theme.fg("dim", statsText)}`),
-        truncate(theme.fg("dim", "│  ") + theme.fg("dim", `  ⎿  ${activity}`)),
-      ]);
-    }
-
-    const queuedLine = queued.length > 0
-      ? truncate(theme.fg("dim", "├─") + ` ${theme.fg("muted", "◦")} ${theme.fg("dim", `${queued.length} queued`)}`)
-      : undefined;
-
-    // Assemble with overflow cap (heading + overflow indicator = 2 reserved lines).
-    const maxBody = MAX_WIDGET_LINES - 1; // heading takes 1 line
-    const totalBody = finishedLines.length + runningLines.length * 2 + (queuedLine ? 1 : 0);
-
-    const lines: string[] = [truncate(theme.fg(headingColor, headingIcon) + " " + theme.fg(headingColor, "Agents"))];
-
-    if (totalBody <= maxBody) {
-      // Everything fits — add all lines and fix up connectors for the last item.
-      lines.push(...finishedLines);
-      for (const pair of runningLines) lines.push(...pair);
-      if (queuedLine) lines.push(queuedLine);
-
-      // Fix last connector: swap ├─ → └─ and │ → space for activity lines.
-      if (lines.length > 1) {
-        const last = lines.length - 1;
-        lines[last] = lines[last].replace("├─", "└─");
-        // If last item is a running agent activity line, fix indent of that line
-        // and fix the header line above it.
-        if (runningLines.length > 0 && !queuedLine) {
-          // The last two lines are the last running agent's header + activity.
-          if (last >= 2) {
-            lines[last - 1] = lines[last - 1].replace("├─", "└─");
-            lines[last] = lines[last].replace("│  ", "   ");
-          }
-        }
-      }
-    } else {
-      // Overflow — prioritize: running > queued > finished.
-      // Reserve 1 line for overflow indicator.
-      let budget = maxBody - 1;
-      let hiddenRunning = 0;
-      let hiddenFinished = 0;
-
-      // 1. Running agents (2 lines each)
-      for (const pair of runningLines) {
-        if (budget >= 2) {
-          lines.push(...pair);
-          budget -= 2;
-        } else {
-          hiddenRunning++;
-        }
-      }
-
-      // 2. Queued line
-      if (queuedLine && budget >= 1) {
-        lines.push(queuedLine);
-        budget--;
-      }
-
-      // 3. Finished agents
-      for (const fl of finishedLines) {
-        if (budget >= 1) {
-          lines.push(fl);
-          budget--;
-        } else {
-          hiddenFinished++;
-        }
-      }
-
-      // Overflow summary
-      const overflowParts: string[] = [];
-      if (hiddenRunning > 0) overflowParts.push(`${hiddenRunning} running`);
-      if (hiddenFinished > 0) overflowParts.push(`${hiddenFinished} finished`);
-      const overflowText = overflowParts.join(", ");
-      lines.push(truncate(theme.fg("dim", "└─") + ` ${theme.fg("dim", `+${hiddenRunning + hiddenFinished} more (${overflowText})`)}`)
-      );
-    }
-
-    return lines;
+    return renderWidgetLines({
+      agents: this.manager.listAgents(),
+      activityMap: this.agentActivity,
+      registry: this.registry,
+      spinnerFrame: this.widgetFrame,
+      terminalWidth: tui.terminal.columns,
+      theme,
+      shouldShowFinished: (id, status) => this.shouldShowFinished(id, status),
+    });
   }
 
   /** Force an immediate widget update. */

package/src/ui/conversation-viewer.ts

@@ -155,11 +155,11 @@ export class ConversationViewer implements Component {
     const duration = formatDuration(this.record.startedAt, this.record.completedAt);
 
     const headerParts: string[] = [duration];
-    const toolUses = this.activity?.toolUses ?? this.record.toolUses;
+    const toolUses = this.record.toolUses;
     if (toolUses > 0) headerParts.unshift(`${toolUses} tool${toolUses === 1 ? "" : "s"}`);
-    const tokens = getLifetimeTotal(this.activity?.lifetimeUsage);
+    const tokens = getLifetimeTotal(this.record.lifetimeUsage);
     if (tokens > 0) {
-      const percent = getSessionContextPercent(this.activity?.session);
+      const percent = getSessionContextPercent(this.record.session);
       headerParts.push(formatSessionTokens(tokens, percent, th, this.record.compactionCount));
     }
 

package/src/ui/display.ts

@@ -94,7 +94,8 @@ export function formatSessionTokens(
     annot.push(theme.fg("dim", `↻${compactions}`));
   }
   if (annot.length === 0) return tokenStr;
-  return `${tokenStr} (${annot.join(" · ")})`;
+  const sep = theme.fg("dim", " · ");
+  return `${tokenStr} ${theme.fg("dim", "(")}${annot.join(sep)}${theme.fg("dim", ")")}`;
 }
 
 /** Format turn count with optional max limit: "⟳5≤30" or "⟳5". */

package/src/ui/ui-observer.ts

@@ -40,7 +40,7 @@ export function subscribeUIObserver(
 		}
 
 		if (event.type === "tool_execution_end") {
-			tracker.onToolEnd(event.toolName);
+			tracker.onToolDone(event.toolName);
 			onUpdate?.();
 		}
 
@@ -61,16 +61,5 @@ export function subscribeUIObserver(
 			onUpdate?.();
 		}
 
-		if (event.type === "message_end" && event.message?.role === "assistant") {
-			const u = event.message.usage;
-			if (u) {
-				tracker.onUsageUpdate({
-					input: u.input ?? 0,
-					output: u.output ?? 0,
-					cacheWrite: u.cacheWrite ?? 0,
-				});
-				onUpdate?.();
-			}
-		}
 	});
 }

package/src/ui/widget-renderer.ts

@@ -0,0 +1,236 @@
+/**
+ * widget-renderer.ts — Pure rendering functions for the agent widget.
+ *
+ * All functions are stateless: they receive data and return formatted strings.
+ * No timers, no SDK types, no side effects. Consumed by AgentWidget.
+ */
+
+import { truncateToWidth } from "@earendil-works/pi-tui";
+import type { AgentConfigLookup } from "../agent-types.js";
+import type { SubagentType } from "../types.js";
+import type { LifetimeUsage, SessionLike } from "../usage.js";
+import { getLifetimeTotal, getSessionContextPercent } from "../usage.js";
+import {
+	describeActivity,
+	formatMs,
+	formatSessionTokens,
+	formatTurns,
+	getDisplayName,
+	getPromptModeLabel,
+	SPINNER,
+	type Theme,
+} from "./display.js";
+
+// ── Data interfaces ──────────────────────────────────────────────────────────
+
+/** Minimal agent snapshot for rendering — no class methods, no mutation surface. */
+export interface WidgetAgent {
+	readonly id: string;
+	readonly type: SubagentType;
+	readonly status: string;
+	readonly description: string;
+	readonly toolUses: number;
+	readonly startedAt: number;
+	readonly completedAt?: number;
+	readonly error?: string;
+	readonly lifetimeUsage?: Readonly<LifetimeUsage>;
+	readonly compactionCount: number;
+}
+
+/** Read-only activity snapshot for widget rendering. */
+export interface WidgetActivity {
+	readonly activeTools: ReadonlyMap<string, string>;
+	readonly responseText: string;
+	readonly turnCount: number;
+	readonly maxTurns?: number;
+	readonly session?: SessionLike;
+}
+
+// ── Per-agent rendering ──────────────────────────────────────────────────────
+
+/** Render a single finished agent line (no tree connector prefix). */
+export function renderFinishedLine(
+	agent: WidgetAgent,
+	activity: WidgetActivity | undefined,
+	registry: AgentConfigLookup,
+	theme: Theme,
+): string {
+	const name = getDisplayName(agent.type, registry);
+	const modeLabel = getPromptModeLabel(agent.type, registry);
+	const duration = formatMs((agent.completedAt ?? Date.now()) - agent.startedAt);
+
+	let icon: string;
+	let statusText: string;
+	if (agent.status === "completed") {
+		icon = theme.fg("success", "✓");
+		statusText = "";
+	} else if (agent.status === "steered") {
+		icon = theme.fg("warning", "✓");
+		statusText = theme.fg("warning", " (turn limit)");
+	} else if (agent.status === "stopped") {
+		icon = theme.fg("dim", "■");
+		statusText = theme.fg("dim", " stopped");
+	} else if (agent.status === "error") {
+		icon = theme.fg("error", "✗");
+		const errMsg = agent.error ? `: ${agent.error.slice(0, 60)}` : "";
+		statusText = theme.fg("error", ` error${errMsg}`);
+	} else {
+		// aborted
+		icon = theme.fg("error", "✗");
+		statusText = theme.fg("warning", " aborted");
+	}
+
+	const parts: string[] = [];
+	if (activity) parts.push(formatTurns(activity.turnCount, activity.maxTurns));
+	if (agent.toolUses > 0) parts.push(`${agent.toolUses} tool use${agent.toolUses === 1 ? "" : "s"}`);
+	parts.push(duration);
+
+	const modeTag = modeLabel ? ` ${theme.fg("dim", `(${modeLabel})`)}` : "";
+	return `${icon} ${theme.fg("dim", name)}${modeTag}  ${theme.fg("dim", agent.description)} ${theme.fg("dim", "·")} ${theme.fg("dim", parts.join(" · "))}${statusText}`;
+}
+
+/** Render a single running agent as header + activity line pair (no tree connector prefix). */
+export function renderRunningLines(
+	agent: WidgetAgent,
+	activity: WidgetActivity | undefined,
+	registry: AgentConfigLookup,
+	spinnerFrame: number,
+	theme: Theme,
+): [header: string, activity: string] {
+	const name = getDisplayName(agent.type, registry);
+	const modeLabel = getPromptModeLabel(agent.type, registry);
+	const modeTag = modeLabel ? ` ${theme.fg("dim", `(${modeLabel})`)}` : "";
+	const elapsed = formatMs(Date.now() - agent.startedAt);
+
+	const tokens = getLifetimeTotal(agent.lifetimeUsage);
+	const contextPercent = activity?.session ? getSessionContextPercent(activity.session) : null;
+	const tokenText = tokens > 0 ? formatSessionTokens(tokens, contextPercent, theme, agent.compactionCount) : "";
+
+	const parts: string[] = [];
+	if (activity) parts.push(formatTurns(activity.turnCount, activity.maxTurns));
+	if (agent.toolUses > 0) parts.push(`${agent.toolUses} tool use${agent.toolUses === 1 ? "" : "s"}`);
+	if (tokenText) parts.push(tokenText);
+	parts.push(elapsed);
+	const statsText = parts.join(" · ");
+
+	const frame = SPINNER[spinnerFrame % SPINNER.length];
+	const activityText = activity ? describeActivity(activity.activeTools, activity.responseText) : "thinking\u2026";
+
+	const header = `${theme.fg("accent", frame)} ${theme.bold(name)}${modeTag}  ${theme.fg("muted", agent.description)} ${theme.fg("dim", "·")} ${theme.fg("dim", statsText)}`;
+	const activityLine = theme.fg("dim", `  \u23BF  ${activityText}`);
+
+	return [header, activityLine];
+}
+
+// ── Full widget rendering ────────────────────────────────────────────────────
+
+/** Maximum number of rendered lines before overflow collapse kicks in. */
+const MAX_WIDGET_LINES = 12;
+
+/** Pure rendering of the widget body. Returns lines to display. */
+export function renderWidgetLines(params: {
+	agents: readonly WidgetAgent[];
+	activityMap: ReadonlyMap<string, WidgetActivity>;
+	registry: AgentConfigLookup;
+	spinnerFrame: number;
+	terminalWidth: number;
+	theme: Theme;
+	shouldShowFinished: (agentId: string, status: string) => boolean;
+}): string[] {
+	const { agents, activityMap, registry, spinnerFrame, terminalWidth, theme, shouldShowFinished } = params;
+
+	const running = agents.filter(a => a.status === "running");
+	const queued = agents.filter(a => a.status === "queued");
+	const finished = agents.filter(a =>
+		a.status !== "running" && a.status !== "queued" && a.completedAt
+		&& shouldShowFinished(a.id, a.status),
+	);
+
+	const hasActive = running.length > 0 || queued.length > 0;
+	const hasFinished = finished.length > 0;
+
+	if (!hasActive && !hasFinished) return [];
+
+	const truncate = (line: string) => truncateToWidth(line, terminalWidth);
+	const headingColor = hasActive ? "accent" : "dim";
+	const headingIcon = hasActive ? "\u25CF" : "\u25CB";
+
+	// Build sections separately for overflow-aware assembly.
+	const finishedLines: string[] = [];
+	for (const a of finished) {
+		finishedLines.push(truncate(theme.fg("dim", "\u251C\u2500") + " " + renderFinishedLine(a, activityMap.get(a.id), registry, theme)));
+	}
+
+	const runningLines: [string, string][] = [];
+	for (const a of running) {
+		const [header, act] = renderRunningLines(a, activityMap.get(a.id), registry, spinnerFrame, theme);
+		runningLines.push([
+			truncate(theme.fg("dim", "\u251C\u2500") + ` ${header}`),
+			truncate(theme.fg("dim", "\u2502  ") + act),
+		]);
+	}
+
+	const queuedLine = queued.length > 0
+		? truncate(theme.fg("dim", "\u251C\u2500") + ` ${theme.fg("muted", "\u25E6")} ${theme.fg("dim", `${queued.length} queued`)}`)
+		: undefined;
+
+	// Assemble with overflow cap (heading takes 1 line).
+	const maxBody = MAX_WIDGET_LINES - 1;
+	const totalBody = finishedLines.length + runningLines.length * 2 + (queuedLine ? 1 : 0);
+
+	const lines: string[] = [truncate(theme.fg(headingColor, headingIcon) + " " + theme.fg(headingColor, "Agents"))];
+
+	if (totalBody <= maxBody) {
+		lines.push(...finishedLines);
+		for (const pair of runningLines) lines.push(...pair);
+		if (queuedLine) lines.push(queuedLine);
+
+		// Fix last connector: swap \u251C\u2500 \u2192 \u2514\u2500 and \u2502 \u2192 space for activity lines.
+		if (lines.length > 1) {
+			const last = lines.length - 1;
+			lines[last] = lines[last].replace("\u251C\u2500", "\u2514\u2500");
+			if (runningLines.length > 0 && !queuedLine) {
+				if (last >= 2) {
+					lines[last - 1] = lines[last - 1].replace("\u251C\u2500", "\u2514\u2500");
+					lines[last] = lines[last].replace("\u2502  ", "   ");
+				}
+			}
+		}
+	} else {
+		// Overflow — prioritize: running > queued > finished.
+		let budget = maxBody - 1;
+		let hiddenRunning = 0;
+		let hiddenFinished = 0;
+
+		for (const pair of runningLines) {
+			if (budget >= 2) {
+				lines.push(...pair);
+				budget -= 2;
+			} else {
+				hiddenRunning++;
+			}
+		}
+
+		if (queuedLine && budget >= 1) {
+			lines.push(queuedLine);
+			budget--;
+		}
+
+		for (const fl of finishedLines) {
+			if (budget >= 1) {
+				lines.push(fl);
+				budget--;
+			} else {
+				hiddenFinished++;
+			}
+		}
+
+		const overflowParts: string[] = [];
+		if (hiddenRunning > 0) overflowParts.push(`${hiddenRunning} running`);
+		if (hiddenFinished > 0) overflowParts.push(`${hiddenFinished} finished`);
+		const overflowText = overflowParts.join(", ");
+		lines.push(truncate(theme.fg("dim", "\u2514\u2500") + ` ${theme.fg("dim", `+${hiddenRunning + hiddenFinished} more (${overflowText})`)}`));
+	}
+
+	return lines;
+}