@tintinweb/pi-subagents 0.3.1 → 0.4.1

package/dist/ui/conversation-viewer.d.ts

@@ -0,0 +1,31 @@
+/**
+ * conversation-viewer.ts — Live conversation overlay for viewing agent sessions.
+ *
+ * Displays a scrollable, live-updating view of an agent's conversation.
+ * Subscribes to session events for real-time streaming updates.
+ */
+import { type Component, type TUI } from "@mariozechner/pi-tui";
+import type { AgentSession } from "@mariozechner/pi-coding-agent";
+import type { Theme } from "./agent-widget.js";
+import { type AgentActivity } from "./agent-widget.js";
+import type { AgentRecord } from "../types.js";
+export declare class ConversationViewer implements Component {
+    private tui;
+    private session;
+    private record;
+    private activity;
+    private theme;
+    private done;
+    private scrollOffset;
+    private autoScroll;
+    private unsubscribe;
+    private lastInnerW;
+    private closed;
+    constructor(tui: TUI, session: AgentSession, record: AgentRecord, activity: AgentActivity | undefined, theme: Theme, done: (result: undefined) => void);
+    handleInput(data: string): void;
+    render(width: number): string[];
+    invalidate(): void;
+    dispose(): void;
+    private viewportHeight;
+    private buildContentLines;
+}

package/dist/ui/conversation-viewer.js

@@ -0,0 +1,236 @@
+/**
+ * conversation-viewer.ts — Live conversation overlay for viewing agent sessions.
+ *
+ * Displays a scrollable, live-updating view of an agent's conversation.
+ * Subscribes to session events for real-time streaming updates.
+ */
+import { matchesKey, truncateToWidth, visibleWidth, wrapTextWithAnsi } from "@mariozechner/pi-tui";
+import { formatTokens, formatDuration, getDisplayName, getPromptModeLabel, describeActivity } from "./agent-widget.js";
+import { extractText } from "../context.js";
+/** Lines consumed by chrome: top border + header + header sep + footer sep + footer + bottom border. */
+const CHROME_LINES = 6;
+const MIN_VIEWPORT = 3;
+export class ConversationViewer {
+    tui;
+    session;
+    record;
+    activity;
+    theme;
+    done;
+    scrollOffset = 0;
+    autoScroll = true;
+    unsubscribe;
+    lastInnerW = 0;
+    closed = false;
+    constructor(tui, session, record, activity, theme, done) {
+        this.tui = tui;
+        this.session = session;
+        this.record = record;
+        this.activity = activity;
+        this.theme = theme;
+        this.done = done;
+        this.unsubscribe = session.subscribe(() => {
+            if (this.closed)
+                return;
+            this.tui.requestRender();
+        });
+    }
+    handleInput(data) {
+        if (matchesKey(data, "escape") || matchesKey(data, "q")) {
+            this.closed = true;
+            this.done(undefined);
+            return;
+        }
+        const totalLines = this.buildContentLines(this.lastInnerW).length;
+        const viewportHeight = this.viewportHeight();
+        const maxScroll = Math.max(0, totalLines - viewportHeight);
+        if (matchesKey(data, "up") || matchesKey(data, "k")) {
+            this.scrollOffset = Math.max(0, this.scrollOffset - 1);
+            this.autoScroll = this.scrollOffset >= maxScroll;
+        }
+        else if (matchesKey(data, "down") || matchesKey(data, "j")) {
+            this.scrollOffset = Math.min(maxScroll, this.scrollOffset + 1);
+            this.autoScroll = this.scrollOffset >= maxScroll;
+        }
+        else if (matchesKey(data, "pageUp")) {
+            this.scrollOffset = Math.max(0, this.scrollOffset - viewportHeight);
+            this.autoScroll = false;
+        }
+        else if (matchesKey(data, "pageDown")) {
+            this.scrollOffset = Math.min(maxScroll, this.scrollOffset + viewportHeight);
+            this.autoScroll = this.scrollOffset >= maxScroll;
+        }
+        else if (matchesKey(data, "home")) {
+            this.scrollOffset = 0;
+            this.autoScroll = false;
+        }
+        else if (matchesKey(data, "end")) {
+            this.scrollOffset = maxScroll;
+            this.autoScroll = true;
+        }
+    }
+    render(width) {
+        if (width < 6)
+            return []; // too narrow for any meaningful rendering
+        const th = this.theme;
+        const innerW = width - 4; // border + padding
+        this.lastInnerW = innerW;
+        const lines = [];
+        const pad = (s, len) => {
+            const vis = visibleWidth(s);
+            return s + " ".repeat(Math.max(0, len - vis));
+        };
+        const row = (content) => th.fg("border", "│") + " " + truncateToWidth(pad(content, innerW), innerW) + " " + th.fg("border", "│");
+        const hrTop = th.fg("border", `╭${"─".repeat(width - 2)}╮`);
+        const hrBot = th.fg("border", `╰${"─".repeat(width - 2)}╯`);
+        const hrMid = row(th.fg("dim", "─".repeat(innerW)));
+        // Header
+        lines.push(hrTop);
+        const name = getDisplayName(this.record.type);
+        const modeLabel = getPromptModeLabel(this.record.type);
+        const modeTag = modeLabel ? ` ${th.fg("dim", `(${modeLabel})`)}` : "";
+        const statusIcon = this.record.status === "running"
+            ? th.fg("accent", "●")
+            : this.record.status === "completed"
+                ? th.fg("success", "✓")
+                : this.record.status === "error"
+                    ? th.fg("error", "✗")
+                    : th.fg("dim", "○");
+        const duration = formatDuration(this.record.startedAt, this.record.completedAt);
+        const headerParts = [duration];
+        const toolUses = this.activity?.toolUses ?? this.record.toolUses;
+        if (toolUses > 0)
+            headerParts.unshift(`${toolUses} tool${toolUses === 1 ? "" : "s"}`);
+        if (this.activity?.session) {
+            try {
+                const tokens = this.activity.session.getSessionStats().tokens.total;
+                if (tokens > 0)
+                    headerParts.push(formatTokens(tokens));
+            }
+            catch { /* */ }
+        }
+        lines.push(row(`${statusIcon} ${th.bold(name)}${modeTag}  ${th.fg("muted", this.record.description)} ${th.fg("dim", "·")} ${th.fg("dim", headerParts.join(" · "))}`));
+        lines.push(hrMid);
+        // Content area — rebuild every render (live data, no cache needed)
+        const contentLines = this.buildContentLines(innerW);
+        const viewportHeight = this.viewportHeight();
+        const maxScroll = Math.max(0, contentLines.length - viewportHeight);
+        if (this.autoScroll) {
+            this.scrollOffset = maxScroll;
+        }
+        const visibleStart = Math.min(this.scrollOffset, maxScroll);
+        const visible = contentLines.slice(visibleStart, visibleStart + viewportHeight);
+        for (let i = 0; i < viewportHeight; i++) {
+            lines.push(row(visible[i] ?? ""));
+        }
+        // Footer
+        lines.push(hrMid);
+        const scrollPct = contentLines.length <= viewportHeight
+            ? "100%"
+            : `${Math.round(((visibleStart + viewportHeight) / contentLines.length) * 100)}%`;
+        const footerLeft = th.fg("dim", `${contentLines.length} lines · ${scrollPct}`);
+        const footerRight = th.fg("dim", "↑↓ scroll · PgUp/PgDn · Esc close");
+        const footerGap = Math.max(1, innerW - visibleWidth(footerLeft) - visibleWidth(footerRight));
+        lines.push(row(footerLeft + " ".repeat(footerGap) + footerRight));
+        lines.push(hrBot);
+        return lines;
+    }
+    invalidate() { }
+    dispose() {
+        this.closed = true;
+        if (this.unsubscribe) {
+            this.unsubscribe();
+            this.unsubscribe = undefined;
+        }
+    }
+    // ---- Private ----
+    viewportHeight() {
+        return Math.max(MIN_VIEWPORT, this.tui.terminal.rows - CHROME_LINES);
+    }
+    buildContentLines(width) {
+        if (width <= 0)
+            return [];
+        const th = this.theme;
+        const messages = this.session.messages;
+        const lines = [];
+        if (messages.length === 0) {
+            lines.push(th.fg("dim", "(waiting for first message...)"));
+            return lines;
+        }
+        let needsSeparator = false;
+        for (const msg of messages) {
+            if (msg.role === "user") {
+                const text = typeof msg.content === "string"
+                    ? msg.content
+                    : extractText(msg.content);
+                if (!text.trim())
+                    continue;
+                if (needsSeparator)
+                    lines.push(th.fg("dim", "───"));
+                lines.push(th.fg("accent", "[User]"));
+                for (const line of wrapTextWithAnsi(text.trim(), width)) {
+                    lines.push(line);
+                }
+            }
+            else if (msg.role === "assistant") {
+                const textParts = [];
+                const toolCalls = [];
+                for (const c of msg.content) {
+                    if (c.type === "text" && c.text)
+                        textParts.push(c.text);
+                    else if (c.type === "toolCall") {
+                        toolCalls.push(c.toolName ?? "unknown");
+                    }
+                }
+                if (needsSeparator)
+                    lines.push(th.fg("dim", "───"));
+                lines.push(th.bold("[Assistant]"));
+                if (textParts.length > 0) {
+                    for (const line of wrapTextWithAnsi(textParts.join("\n").trim(), width)) {
+                        lines.push(line);
+                    }
+                }
+                for (const name of toolCalls) {
+                    lines.push(truncateToWidth(th.fg("muted", `  [Tool: ${name}]`), width));
+                }
+            }
+            else if (msg.role === "toolResult") {
+                const text = extractText(msg.content);
+                const truncated = text.length > 500 ? text.slice(0, 500) + "... (truncated)" : text;
+                if (!truncated.trim())
+                    continue;
+                if (needsSeparator)
+                    lines.push(th.fg("dim", "───"));
+                lines.push(th.fg("dim", "[Result]"));
+                for (const line of wrapTextWithAnsi(truncated.trim(), width)) {
+                    lines.push(th.fg("dim", line));
+                }
+            }
+            else if (msg.role === "bashExecution") {
+                const bash = msg;
+                if (needsSeparator)
+                    lines.push(th.fg("dim", "───"));
+                lines.push(truncateToWidth(th.fg("muted", `  $ ${bash.command}`), width));
+                if (bash.output?.trim()) {
+                    const out = bash.output.length > 500
+                        ? bash.output.slice(0, 500) + "... (truncated)"
+                        : bash.output;
+                    for (const line of wrapTextWithAnsi(out.trim(), width)) {
+                        lines.push(th.fg("dim", line));
+                    }
+                }
+            }
+            else {
+                continue;
+            }
+            needsSeparator = true;
+        }
+        // Streaming indicator for running agents
+        if (this.record.status === "running" && this.activity) {
+            const act = describeActivity(this.activity.activeTools, this.activity.responseText);
+            lines.push("");
+            lines.push(truncateToWidth(th.fg("accent", "▍ ") + th.fg("dim", act), width));
+        }
+        return lines;
+    }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tintinweb/pi-subagents",
-  "version": "0.3.1",
+  "version": "0.4.1",
   "description": "A pi extension extension that brings smart Claude Code-style autonomous sub-agents to pi.",
   "author": "tintinweb",
   "license": "MIT",

package/src/agent-manager.ts

@@ -33,8 +33,6 @@ interface SpawnOptions {
   isolated?: boolean;
   inheritContext?: boolean;
   thinkingLevel?: ThinkingLevel;
-  systemPromptOverride?: string;
-  systemPromptAppend?: string;
   isBackground?: boolean;
   /** Called on tool start/end with activity info (for streaming progress to UI). */
   onToolActivity?: (activity: ToolActivity) => void;
@@ -122,8 +120,6 @@ export class AgentManager {
       isolated: options.isolated,
       inheritContext: options.inheritContext,
       thinkingLevel: options.thinkingLevel,
-      systemPromptOverride: options.systemPromptOverride,
-      systemPromptAppend: options.systemPromptAppend,
       signal: record.abortController!.signal,
       onToolActivity: (activity) => {
         if (activity.type === "end") record.toolUses++;
@@ -275,6 +271,28 @@ export class AgentManager {
     }
   }
 
+  /** Whether any agents are still running or queued. */
+  hasRunning(): boolean {
+    return [...this.agents.values()].some(
+      r => r.status === "running" || r.status === "queued",
+    );
+  }
+
+  /** Wait for all running and queued agents to complete (including queued ones). */
+  async waitForAll(): Promise<void> {
+    // Loop because drainQueue respects the concurrency limit — as running
+    // agents finish they start queued ones, which need awaiting too.
+    while (true) {
+      this.drainQueue();
+      const pending = [...this.agents.values()]
+        .filter(r => r.status === "running" || r.status === "queued")
+        .map(r => r.promise)
+        .filter(Boolean);
+      if (pending.length === 0) break;
+      await Promise.allSettled(pending);
+    }
+  }
+
   dispose() {
     clearInterval(this.cleanupInterval);
     // Clear queue

package/src/agent-runner.ts

@@ -84,10 +84,6 @@ export interface RunOptions {
   isolated?: boolean;
   inheritContext?: boolean;
   thinkingLevel?: ThinkingLevel;
-  /** Override system prompt entirely (for custom agents with promptMode: "replace"). */
-  systemPromptOverride?: string;
-  /** Append to default system prompt (for custom agents with promptMode: "append"). */
-  systemPromptAppend?: string;
   /** Called on tool start/end with activity info. */
   onToolActivity?: (activity: ToolActivity) => void;
   /** Called on streaming text deltas from the assistant response. */
@@ -142,57 +138,27 @@ export async function runAgent(
   const agentConfig = getAgentConfig(type);
   const env = await detectEnv(options.pi, ctx.cwd);
 
-  // Build system prompt: custom override > custom append > config-driven
+  // Get parent system prompt for append-mode agents
+  const parentSystemPrompt = ctx.getSystemPrompt();
+
+  // Build system prompt from agent config
   let systemPrompt: string;
-  if (options.systemPromptOverride) {
-    systemPrompt = options.systemPromptOverride;
-  } else if (options.systemPromptAppend) {
-    // Build a default prompt and append to it
-    const defaultConfig = agentConfig ?? {
-      name: type,
-      description: "",
-      builtinToolNames: [],
-      extensions: true,
-      skills: true,
-      systemPrompt: "",
-      promptMode: "replace" as const,
-      inheritContext: false,
-      runInBackground: false,
-      isolated: false,
-    };
-    systemPrompt = buildAgentPrompt(defaultConfig, ctx.cwd, env) + "\n\n" + options.systemPromptAppend;
-  } else if (agentConfig) {
-    systemPrompt = buildAgentPrompt(agentConfig, ctx.cwd, env);
+  if (agentConfig) {
+    systemPrompt = buildAgentPrompt(agentConfig, ctx.cwd, env, parentSystemPrompt);
   } else {
-    // Unknown type — use a minimal general-purpose prompt
+    // Unknown type fallback: general-purpose (defensive — unreachable in practice
+    // since index.ts resolves unknown types to "general-purpose" before calling runAgent)
     systemPrompt = buildAgentPrompt({
       name: type,
       description: "General-purpose agent",
-      builtinToolNames: [],
+      systemPrompt: "",
+      promptMode: "append",
       extensions: true,
       skills: true,
-      systemPrompt: `# Role
-You are a general-purpose coding agent for complex, multi-step tasks.
-You have full access to read, write, edit files, and execute commands.
-Do what has been asked; nothing more, nothing less.
-
-# Tool Usage
-- Use the read tool instead of cat/head/tail
-- Use the edit tool instead of sed/awk
-- Use the write tool instead of echo/heredoc
-- Use the find tool instead of bash find/ls for file search
-- Use the grep tool instead of bash grep/rg for content search
-- Make independent tool calls in parallel
-
-# Output
-- Use absolute file paths
-- Do not use emojis
-- Be concise but complete`,
-      promptMode: "replace",
       inheritContext: false,
       runInBackground: false,
       isolated: false,
-    }, ctx.cwd, env);
+    }, ctx.cwd, env, parentSystemPrompt);
   }
 
   const tools = getToolsForType(type, ctx.cwd);

package/src/agent-types.ts

@@ -125,6 +125,7 @@ export function getConfig(type: string): {
   builtinToolNames: string[];
   extensions: true | string[] | false;
   skills: true | string[] | false;
+  promptMode: "replace" | "append";
 } {
   const key = resolveKey(type);
   const config = key ? agents.get(key) : undefined;
@@ -135,6 +136,7 @@ export function getConfig(type: string): {
       builtinToolNames: config.builtinToolNames ?? BUILTIN_TOOL_NAMES,
       extensions: config.extensions,
       skills: config.skills,
+      promptMode: config.promptMode,
     };
   }
 
@@ -147,6 +149,7 @@ export function getConfig(type: string): {
       builtinToolNames: gp.builtinToolNames ?? BUILTIN_TOOL_NAMES,
       extensions: gp.extensions,
       skills: gp.skills,
+      promptMode: gp.promptMode,
     };
   }
 
@@ -157,21 +160,7 @@ export function getConfig(type: string): {
     builtinToolNames: BUILTIN_TOOL_NAMES,
     extensions: true,
     skills: true,
+    promptMode: "append",
   };
 }
 
-// ---- Backwards-compatible aliases ----
-
-/** @deprecated Use registerAgents instead */
-export const registerCustomAgents = registerAgents;
-
-/** @deprecated Use getAgentConfig instead */
-export function getCustomAgentConfig(name: string): AgentConfig | undefined {
-  const key = resolveKey(name);
-  return key ? agents.get(key) : undefined;
-}
-
-/** @deprecated Use getUserAgentNames instead */
-export function getCustomAgentNames(): string[] {
-  return getUserAgentNames();
-}

package/src/default-agents.ts

@@ -18,42 +18,8 @@ export const DEFAULT_AGENTS: Map<string, AgentConfig> = new Map([
       // builtinToolNames omitted — means "all available tools" (resolved at lookup time)
       extensions: true,
       skills: true,
-      systemPrompt: `# Role
-You are a general-purpose coding agent for complex, multi-step tasks.
-You have full access to read, write, edit files, and execute commands.
-Do what has been asked; nothing more, nothing less.
-
-# Tool Usage
-- Use the read tool instead of cat/head/tail
-- Use the edit tool instead of sed/awk
-- Use the write tool instead of echo/heredoc
-- Use the find tool instead of bash find/ls for file search
-- Use the grep tool instead of bash grep/rg for content search
-- Make independent tool calls in parallel
-
-# File Operations
-- NEVER create files unless absolutely necessary
-- Prefer editing existing files over creating new ones
-- NEVER create documentation files unless explicitly requested
-
-# Git Safety
-- NEVER update git config
-- NEVER run destructive git commands (push --force, reset --hard, checkout ., restore ., clean -f, branch -D) without explicit request
-- NEVER skip hooks (--no-verify, --no-gpg-sign) unless explicitly asked
-- NEVER force push to main/master — warn the user if they request it
-- Always create NEW commits, never amend existing ones. When a pre-commit hook fails, the commit did NOT happen — so --amend would modify the PREVIOUS commit. Fix the issue, re-stage, and create a NEW commit
-- Stage specific files by name, not git add -A or git add .
-- NEVER commit changes unless the user explicitly asks
-- NEVER push unless the user explicitly asks
-- NEVER use git commands with the -i flag (like git rebase -i or git add -i) — they require interactive input
-- Do not use --no-edit with git rebase commands
-- Do not commit files that likely contain secrets (.env, credentials.json, etc); warn the user if they request it
-
-# Output
-- Use absolute file paths
-- Do not use emojis
-- Be concise but complete`,
-      promptMode: "replace",
+      systemPrompt: "",
+      promptMode: "append",
       inheritContext: false,
       runInBackground: false,
       isolated: false,

package/src/index.ts

@@ -30,6 +30,7 @@ import {
   formatMs,
   formatDuration,
   getDisplayName,
+  getPromptModeLabel,
   describeActivity,
   type AgentDetails,
   type AgentActivity,
@@ -120,20 +121,6 @@ function buildDetails(
   };
 }
 
-/** Resolve system prompt overrides from an agent config. */
-function resolveCustomPrompt(config: AgentConfig | undefined): {
-  systemPromptOverride?: string;
-  systemPromptAppend?: string;
-} {
-  if (!config?.systemPrompt) return {};
-  // Default agents use their systemPrompt via buildAgentPrompt in agent-runner,
-  // not via override/append. Only non-default agents use this path.
-  if (config.isDefault) return {};
-  if (config.promptMode === "append") return { systemPromptAppend: config.systemPrompt };
-  return { systemPromptOverride: config.systemPrompt };
-}
-
-
 export default function (pi: ExtensionAPI) {
   /** Reload agents from .pi/agents/*.md and merge with defaults (called on init and each Agent invocation). */
   const reloadCustomAgents = () => {
@@ -161,9 +148,11 @@ export default function (pi: ExtensionAPI) {
     agentActivity.delete(record.id);
     widget.markFinished(record.id);
 
+    const tokens = safeFormatTokens(record.session);
+    const toolStats = tokens ? `Tool uses: ${record.toolUses} | ${tokens}` : `Tool uses: ${record.toolUses}`;
     pi.sendUserMessage(
       `Background agent completed: ${displayName} (${record.description})\n` +
-      `Agent ID: ${record.id} | Status: ${status} | Tool uses: ${record.toolUses} | Duration: ${duration}\n\n` +
+      `Agent ID: ${record.id} | Status: ${status} | ${toolStats} | Duration: ${duration}\n\n` +
       resultPreview,
       { deliverAs: "followUp" },
     );
@@ -180,7 +169,9 @@ export default function (pi: ExtensionAPI) {
         ? record.result.slice(0, 300) + "\n...(truncated)"
         : record.result
       : "No output.";
-    return `- ${displayName} (${record.description})\n  ID: ${record.id} | Status: ${status} | Tools: ${record.toolUses} | Duration: ${duration}\n  ${resultPreview}`;
+    const tokens = safeFormatTokens(record.session);
+    const toolStats = tokens ? `Tools: ${record.toolUses} | ${tokens}` : `Tools: ${record.toolUses}`;
+    return `- ${displayName} (${record.description})\n  ID: ${record.id} | Status: ${status} | ${toolStats} | Duration: ${duration}\n  ${resultPreview}`;
   }
 
   // ---- Group join manager ----
@@ -239,6 +230,21 @@ export default function (pi: ExtensionAPI) {
     widget.update();
   });
 
+  // Expose manager via Symbol.for() global registry for cross-package access.
+  // Standard Node.js pattern for cross-package singletons (used by OpenTelemetry, etc.).
+  const MANAGER_KEY = Symbol.for("pi-subagents:manager");
+  (globalThis as any)[MANAGER_KEY] = {
+    waitForAll: () => manager.waitForAll(),
+    hasRunning: () => manager.hasRunning(),
+  };
+
+  // Wait for all subagents on shutdown, then dispose the manager
+  pi.on("session_shutdown", async () => {
+    delete (globalThis as any)[MANAGER_KEY];
+    await manager.waitForAll();
+    manager.dispose();
+  });
+
   // Live widget: show running agents above editor
   const widget = new AgentWidget(manager, agentActivity);
 
@@ -539,8 +545,6 @@ Guidelines:
       const runInBackground = params.run_in_background ?? customConfig?.runInBackground ?? false;
       const isolated = params.isolated ?? customConfig?.isolated ?? false;
 
-      const { systemPromptOverride, systemPromptAppend } = resolveCustomPrompt(customConfig);
-
       // Build display tags for non-default config
       const parentModelId = ctx.model?.id;
       const effectiveModelId = model?.id;
@@ -548,6 +552,8 @@ Guidelines:
         ? (model?.name ?? effectiveModelId).replace(/^Claude\s+/i, "").toLowerCase()
         : undefined;
       const agentTags: string[] = [];
+      const modeLabel = getPromptModeLabel(subagentType);
+      if (modeLabel) agentTags.push(modeLabel);
       if (thinking) agentTags.push(`thinking: ${thinking}`);
       if (isolated) agentTags.push("isolated");
       // Shared base fields for all AgentDetails in this call
@@ -589,8 +595,6 @@ Guidelines:
           isolated,
           inheritContext,
           thinkingLevel: thinking,
-          systemPromptOverride,
-          systemPromptAppend,
           isBackground: true,
           ...bgCallbacks,
         });
@@ -680,8 +684,6 @@ Guidelines:
         isolated,
         inheritContext,
         thinkingLevel: thinking,
-        systemPromptOverride,
-        systemPromptAppend,
         ...fgCallbacks,
       });
 
@@ -707,8 +709,10 @@ Guidelines:
       }
 
       const durationMs = (record.completedAt ?? Date.now()) - record.startedAt;
+      const statsParts = [`${record.toolUses} tool uses`];
+      if (tokenText) statsParts.push(tokenText);
       return textResult(
-        `${fallbackNote}Agent completed in ${formatMs(durationMs)} (${record.toolUses} tool uses)${getStatusNote(record.status)}.\n\n` +
+        `${fallbackNote}Agent completed in ${formatMs(durationMs)} (${statsParts.join(", ")})${getStatusNote(record.status)}.\n\n` +
         (record.result ?? "No output."),
         details,
       );
@@ -750,10 +754,12 @@ Guidelines:
 
       const displayName = getDisplayName(record.type);
       const duration = formatDuration(record.startedAt, record.completedAt);
+      const tokens = safeFormatTokens(record.session);
+      const toolStats = tokens ? `Tool uses: ${record.toolUses} | ${tokens}` : `Tool uses: ${record.toolUses}`;
 
       let output =
         `Agent: ${record.id}\n` +
-        `Type: ${displayName} | Status: ${record.status} | Tool uses: ${record.toolUses} | Duration: ${duration}\n` +
+        `Type: ${displayName} | Status: ${record.status} | ${toolStats} | Duration: ${duration}\n` +
         `Description: ${record.description}\n\n`;
 
       if (record.status === "running") {