@bacnh85/pi-subagent 0.14.1 → 0.15.1

package/extensions/index.ts

@@ -61,6 +61,16 @@ import { type SubagentThread, threadStore } from "./threads.ts";
 import { SUBAGENT_REQUEST_EVENT, runNamedAgent, type SubagentRunRequest } from "./service.ts";
 import { resolveModel } from "./model.ts";
 import { ThreadViewer, type ThreadViewerCallbacks } from "./thread-viewer.ts";
+import { createTaskWidgetController, renderLiveThreadLine, type TaskWidgetController } from "./widget.ts";
+import {
+  startBackgroundTask,
+  cancelBackgroundTask,
+  getBackgroundTask,
+  snapshotTask,
+  clearBackgroundTasks,
+} from "./background.ts";
+import { parseStructuredResult } from "./result.ts";
+import { appendHistory, readHistory, markInterruptedOnRestart, trimHistory, getHistoryPath } from "./history.ts";
 
 // ---------------------------------------------------------------------------
 // Constants
@@ -85,6 +95,9 @@ function getTrustedConfig(ctx: ExtensionContext): { allowUnconfirmedProjectAgent
   };
 }
 
+/** Session-scoped approvals for project-local agents ("Trust for this session"). */
+const trustedProjectAgentDirs = new Set<string>();
+
 
 // ---------------------------------------------------------------------------
 // Tool parameter schema
@@ -111,6 +124,20 @@ const AgentScopeSchema = StringEnum(["user", "project", "both"] as const, {
 });
 
 const SubagentParams = Type.Object({
+  operation: Type.Optional(
+    Type.Union([Type.Literal("status"), Type.Literal("cancel")], {
+      description: 'Task control: inspect ("status") or cancel ("cancel") an existing task by taskId, without starting a new agent. Omit for normal start/resume.',
+    }),
+  ),
+  taskId: Type.Optional(
+    Type.String({ description: "Existing background task id, for operation: status/cancel" }),
+  ),
+  background: Type.Optional(
+    Type.Boolean({
+      description: "Run async (single mode only). You will be notified on completion — DO NOT poll or sleep. Default: false.",
+      default: false,
+    }),
+  ),
   agent: Type.Optional(Type.String({ description: "Name of the agent to invoke (single mode)" })),
   task: Type.Optional(Type.String({ description: "Task to delegate (single mode)" })),
   tasks: Type.Optional(
@@ -140,6 +167,8 @@ interface SubagentDetails {
   agentScope: AgentScope;
   projectAgentsDir: string | null;
   results: SubAgentResult[];
+  /** Set when a background task was started (single mode + background:true). */
+  backgroundTaskId?: string;
 }
 
 // ---------------------------------------------------------------------------
@@ -149,11 +178,31 @@ interface SubagentDetails {
 export default function (pi: ExtensionAPI) {
   let currentCtx: ExtensionContext | undefined;
 
+  // Live progress widget — fed by threadStore subscriptions (per SDK event).
+  const widget: TaskWidgetController = createTaskWidgetController(
+    () => threadStore.getAllThreads(),
+    (listener) => threadStore.subscribe(listener),
+  );
+
   // Invalidate agent cache + clear thread store on session replacement.
   pi.on("session_start", (event, ctx) => {
     currentCtx = ctx;
     if (event.reason === "reload") invalidateAgentCache();
     threadStore.clear();
+    trustedProjectAgentDirs.clear();
+    // Clear any widget from a prior session.
+    widget.clearWidgetIfIdle();
+    // Mark prior-session running tasks as interrupted (we can't resume them).
+    // ponytail: honest about the in-process ceiling — no live-session resume.
+    try {
+      markInterruptedOnRestart(path.join(ctx.cwd, CONFIG_DIR_NAME));
+    } catch { /* history file not writable — non-fatal */ }
+  });
+
+  // Clear the widget + abort background tasks on shutdown.
+  pi.on("session_shutdown", () => {
+    widget.dispose();
+    clearBackgroundTasks();
   });
 
   // Resolve bundled agents directory relative to this extension file
@@ -203,6 +252,7 @@ export default function (pi: ExtensionAPI) {
       return;
     }
     const thread = threadStore.createThread({ agentName: agent.name, task: request.task, mode: "single", color: agent.color ? AGENT_TO_THEME_COLOR[agent.color as AgentColor] : undefined });
+    if (ctx.mode === "tui") widget.ensureWidget(ctx);
     void runNamedAgent({
       agent: request.readOnly ? { ...agent, tools: ["read", "grep", "find", "ls"] } : agent,
       task: request.task,
@@ -231,13 +281,75 @@ export default function (pi: ExtensionAPI) {
     });
   });
 
-  // /subagent command — list available agents
+  // Register renderer for background-task completion (follow-up turn).
+  pi.registerMessageRenderer?.("pi-subagent-complete", (message, _opts, theme) => {
+    const d = (message.details ?? {}) as {
+      agent?: string; status?: string; summary?: string; full_output?: string;
+      elapsed_ms?: number; model?: string; usage?: { turns?: number; cost?: number };
+    };
+    const fg = theme.fg.bind(theme);
+    const isErr = d.status && d.status !== "completed";
+    const icon = isErr ? fg("error", "✗") : fg("success", "✓");
+    const container = new Container();
+    const agentColor = "accent";
+    container.addChild(new Text(
+      `${icon} ${fg(agentColor, theme.bold(d.agent ?? "subagent"))} ${fg("muted", `[background · ${d.status ?? "done"}]`)}`,
+      0, 0,
+    ));
+    if (d.full_output) {
+      const md = new Markdown(d.full_output.trim(), 0, 0, getMarkdownTheme());
+      for (const line of md.render(100)) {
+        container.addChild(new Text(line, 0, 0));
+      }
+    }
+    const usageParts: string[] = [];
+    if (d.usage?.turns) usageParts.push(`${d.usage.turns} turn${d.usage.turns > 1 ? "s" : ""}`);
+    if (d.usage?.cost) usageParts.push(`$${d.usage.cost.toFixed(4)}`);
+    if (d.elapsed_ms) {
+      const secs = Math.round(d.elapsed_ms / 1000);
+      usageParts.push(`${secs}s`);
+    }
+    if (d.model) usageParts.push(d.model);
+    if (usageParts.length > 0) {
+      container.addChild(new Text(fg("dim", usageParts.join(" · ")), 0, 0));
+    }
+    return container;
+  });
   pi.registerCommand("subagent", {
     description: "List available sub-agents, reload agent definitions, or show agent details",
     handler: async (args, ctx) => {
       const cmd = args.trim().toLowerCase();
       const discovery = discoverAgents(ctx.cwd, "both", bundledAgentsDir);
 
+      // /subagent history — list recent task delegations (durable metadata).
+      if (cmd === "history" || cmd === "hist") {
+        const piDir = path.join(ctx.cwd, CONFIG_DIR_NAME);
+        const entries = readHistory(piDir)
+          .sort((a, b) => (b.completedAt ?? b.startedAt) - (a.completedAt ?? a.startedAt))
+          .slice(0, 20);
+        if (entries.length === 0) {
+          pi.sendMessage({
+            customType: "pi-subagent",
+            content: "No task history yet. History is recorded when subagent tasks complete.",
+            display: true,
+          });
+          return;
+        }
+        const lines = entries.map((e) => {
+          const time = new Date(e.startedAt).toLocaleString();
+          const statusIcon = e.status === "completed" ? "✓" : e.status === "interrupted" ? "⚠" : "✗";
+          const bg = e.background ? " [bg]" : "";
+          const summary = e.summary ? ` — ${e.summary.slice(0, 60)}` : "";
+          return `  ${statusIcon} ${e.agent}${bg} · ${time}${summary}`;
+        });
+        pi.sendMessage({
+          customType: "pi-subagent",
+          content: `Recent task history (${entries.length}${entries.length === 20 ? "+" : ""}):\n${lines.join("\n")}\n\nFile: ${getHistoryPath(piDir)}`,
+          display: true,
+        });
+        return;
+      }
+
       if (cmd === "reload" || cmd === "refresh") {
         invalidateAgentCache();
         const fresh = discoverAgents(ctx.cwd, "both", bundledAgentsDir);
@@ -349,6 +461,8 @@ export default function (pi: ExtensionAPI) {
     description: [
       "Delegate tasks to specialized subagents with isolated context (SDK-based, minimal overhead).",
       "Modes: single (agent + task), parallel (tasks array, max 8, 4 concurrent), chain (sequential with {previous}).",
+      "Task control: operation \"status\" or \"cancel\" with taskId inspects/cancels an existing background task without starting an agent.",
+      "Background: single mode accepts background:true to run detached; completion arrives as a follow-up turn.",
       `Default agent scope is "user" (from ${path.join(getAgentDir(), "agents")}).`,
       `To enable project-local agents in ${CONFIG_DIR_NAME}/agents, set agentScope: "both" or "project".`,
     ].join(" "),
@@ -358,6 +472,8 @@ export default function (pi: ExtensionAPI) {
       "Use subagent to delegate work that would flood the main context with search results or file contents.",
       "Modes: single {agent, task}, parallel {tasks: [...]} (max 8, 4 concurrent), chain {chain: [...]} (sequential with {previous}).",
       "Bundled agents: scout (fast recon), tester (verification), worker (implementation), general-purpose (fallback), planner (planning), reviewer (review).",
+      "For background single tasks use background:true — you will be notified on completion; DO NOT poll or sleep.",
+      "Use operation: \"status\" with taskId to inspect a running/completed background task; operation: \"cancel\" to abort one.",
       "Use /subagent to list all available agents or /subagent <name> for agent details.",
     ],
     async execute(_toolCallId, params, signal, onUpdate, ctx) {
@@ -404,6 +520,47 @@ export default function (pi: ExtensionAPI) {
         };
       }
 
+      // Control requests (status/cancel) legitimately have no mode — handle
+      // them before the mode-count validation rejects them.
+      if (params.operation === "status" || params.operation === "cancel") {
+        const taskId = params.taskId;
+        if (!taskId) {
+          return {
+            content: [{ type: "text" as const, text: `Missing taskId for operation "${params.operation}". Provide the taskId returned when the task was started.` }],
+            details: makeDetails("single")([]),
+            isError: true,
+          };
+        }
+        const bgTask = getBackgroundTask(taskId);
+        if (params.operation === "status") {
+          if (!bgTask) {
+            return { content: [{ type: "text" as const, text: `No background task with id "${taskId}".` }], details: makeDetails("single")([]) };
+          }
+          const snap = snapshotTask(bgTask);
+          const lines = [
+            `Task ${snap.id} (${snap.agent}): ${snap.status}`,
+            `Elapsed: ${Math.round(snap.elapsedMs / 1000)}s`,
+            `Task: ${snap.task}`,
+          ];
+          if (snap.result) {
+            lines.push(`Output: ${String(snap.result.output).slice(0, 2000)}`);
+          } else {
+            lines.push("(still running — no final output yet)");
+          }
+          return { content: [{ type: "text" as const, text: lines.join("\n") }], details: makeDetails("single")([]) };
+        }
+
+        // cancel
+        const result = cancelBackgroundTask(taskId);
+        if (result.outcome === "not_found") {
+          return { content: [{ type: "text" as const, text: `No background task with id "${taskId}".` }], details: makeDetails("single")([]), isError: true };
+        }
+        if (result.outcome === "already_done") {
+          return { content: [{ type: "text" as const, text: `Task ${taskId} already finished (${result.task?.status}).` }], details: makeDetails("single")([]) };
+        }
+        return { content: [{ type: "text" as const, text: `Cancelled background task ${taskId}.` }], details: makeDetails("single")([]) };
+      }
+
       // Validate: exactly one mode
       if (modeCount !== 1) {
         const available = agents.map((a) => `${a.name} (${a.source})`).join(", ") || "none";
@@ -438,19 +595,22 @@ export default function (pi: ExtensionAPI) {
 
         if (projectAgentsRequested.length > 0) {
           if (confirmProjectAgents) {
-            if (ctx.hasUI) {
+            const dir = discovery.projectAgentsDir ?? "(unknown)";
+            if (trustedProjectAgentDirs.has(dir)) {
+              // Previously approved "Trust for this session" for this agents dir.
+            } else if (ctx.hasUI) {
               const names = projectAgentsRequested.map((a) => a.name).join(", ");
-              const dir = discovery.projectAgentsDir ?? "(unknown)";
-              const ok = await ctx.ui.confirm(
-                "Run project-local agents?",
-                `Agents: ${names}\nSource: ${dir}\n\nProject agents are repo-controlled. Only continue for trusted repositories.`,
+              const choice = await ctx.ui.select(
+                `Run project-local agents?\n\nAgents: ${names}\nSource: ${dir}\n\nProject agents are repo-controlled. Only continue for trusted repositories.`,
+                ["Allow once", "Trust for this session", "Deny"],
               );
-              if (!ok) {
+              if (choice !== "Allow once" && choice !== "Trust for this session") {
                 return {
                   content: [{ type: "text", text: "Canceled: project-local agents not approved." }],
                   details: makeDetails(hasChain ? "chain" : hasTasks ? "parallel" : "single")([]),
                 };
               }
+              if (choice === "Trust for this session") trustedProjectAgentDirs.add(dir);
             } else {
               // Fail closed in headless sessions.
               return {
@@ -486,6 +646,39 @@ export default function (pi: ExtensionAPI) {
         return safe.path;
       }
 
+      // Helper: record a completed foreground task to the history registry.
+      // ponytail: best-effort — history is non-fatal metadata for /subagent history.
+      function recordForegroundHistory(
+        agentName: string,
+        taskText: string,
+        result: SubAgentResult,
+        startedAt: number,
+        background = false,
+      ): void {
+        try {
+          const output = getFinalOutput(result.messages) || getResultOutput(result) || "";
+          const structured = parseStructuredResult(output);
+          const status = isFailedResult(result)
+            ? result.stopReason === "timeout"
+              ? "timeout"
+              : result.stopReason === "aborted"
+                ? "aborted"
+                : "failed"
+            : "completed";
+          appendHistory(path.join(ctx.cwd, CONFIG_DIR_NAME), {
+            id: `fg-${startedAt.toString(36)}-${Math.random().toString(36).slice(2, 6)}`,
+            agent: agentName,
+            task: taskText,
+            status,
+            startedAt,
+            completedAt: Date.now(),
+            summary: structured.summary,
+            background,
+            model: result.model,
+          });
+        } catch { /* history file not writable — non-fatal */ }
+      }
+
       // Helper: validate and normalise tools for an agent. Returns the effective
       // tool list and whether extensions must be loaded (any non-built-in tool).
       function resolveChildTools(agentTools: string[] | undefined, sandbox?: string, readOnly?: boolean): { tools: string[]; loadExtensions: boolean } {
@@ -591,9 +784,13 @@ export default function (pi: ExtensionAPI) {
         const candidates = getModelCandidates(agent);
         const triedModels: string[] = [];
 
+        // Transport keep-alive only: resets parent idle timeout so a long child
+        // run isn't killed. The visible progress now lives in the live widget;
+        // we no longer push the plain "still running…" text.
         const stopHeartbeat = onUpdate ? startHeartbeat(() => {
           onHeartbeat?.();
-          onUpdate({ content: [{ type: "text", text: `Subagent ${agentName} is still running…` }], details: heartbeatDetails?.() ?? makeDetails("single")([]) });
+          onUpdate({ content: [{ type: "text", text: "" }], details: heartbeatDetails?.() ?? makeDetails("single")([]) });
+          widget.requestRender();
         }) : undefined;
         try {
           const tryWithFallback = async (): Promise<SubAgentResult> => {
@@ -713,6 +910,7 @@ export default function (pi: ExtensionAPI) {
             toolCallId: _toolCallId,
             color: agentToThemeColor(step.agent),
           });
+          if (ctx.mode === "tui") widget.ensureWidget(ctx);
           const result = await runOne(
             step.agent, taskWithContext, step.cwd,
             signal, step.timeout ?? params.timeout,
@@ -725,6 +923,7 @@ export default function (pi: ExtensionAPI) {
             status: isFailedResult(result) ? (result.stopReason === "aborted" ? "aborted" : "failed") : "completed",
             result,
           });
+          recordForegroundHistory(step.agent, taskWithContext, result, thread.createdAt);
           results.push(result);
 
           const isError = isFailedResult(result);
@@ -809,6 +1008,7 @@ export default function (pi: ExtensionAPI) {
               color: agentToThemeColor(t.agent),
             }),
           );
+          if (ctx.mode === "tui") widget.ensureWidget(ctx);
 
           const allResults: SubAgentResult[] = new Array(params.tasks.length);
           // Initialize placeholder results for streaming
@@ -882,6 +1082,7 @@ export default function (pi: ExtensionAPI) {
                   status: isFailedResult(result) ? (result.stopReason === "aborted" ? "aborted" : "failed") : "completed",
                   result,
                 });
+                recordForegroundHistory(t.agent, t.task, result, parallelThreads[index].createdAt);
                 // Early-abort: if this task failed and abortOnFailure is set
                 if (abortOnFailure && isFailedResult(result) && !abortCause) {
                   abortCause = result.stopReason === "timeout" ? "timeout" : "sibling";
@@ -920,6 +1121,23 @@ export default function (pi: ExtensionAPI) {
 
       // --- Single mode ---
       if (params.agent && params.task) {
+        // Background: run detached, return receipt immediately, notify on completion.
+        if (params.background) {
+          const { taskId, receipt } = startBackgroundTask({
+            agent: params.agent,
+            task: params.task,
+            cwd: params.cwd,
+            timeout: params.timeout,
+            agentColor: agentToThemeColor(params.agent),
+            toolCallId: _toolCallId,
+            deps: { pi, ctx, runOne, threadStore },
+          });
+          if (ctx.mode === "tui") widget.ensureWidget(ctx);
+          return {
+            content: [{ type: "text", text: receipt }],
+            details: { ...makeDetails("single")([]), backgroundTaskId: taskId },
+          };
+        }
         const thread = threadStore.createThread({
           agentName: params.agent,
           task: params.task,
@@ -927,6 +1145,7 @@ export default function (pi: ExtensionAPI) {
           toolCallId: _toolCallId,
           color: agentToThemeColor(params.agent),
         });
+        if (ctx.mode === "tui") widget.ensureWidget(ctx);
         const result = await runOne(
           params.agent, params.task, params.cwd,
           signal, params.timeout,
@@ -939,6 +1158,7 @@ export default function (pi: ExtensionAPI) {
           status: isFailedResult(result) ? (result.stopReason === "aborted" ? "aborted" : "failed") : "completed",
           result,
         });
+        recordForegroundHistory(params.agent, params.task, result, thread.createdAt);
         const isError = isFailedResult(result);
 
         if (onUpdate) {
@@ -981,48 +1201,79 @@ export default function (pi: ExtensionAPI) {
     // TUI rendering
     // ------------------------------------------------------------------
 
-    renderCall(args, theme, _context) {
+    renderCall(args, theme, context) {
       const scope: AgentScope = args.agentScope ?? "user";
       const fg = theme.fg.bind(theme);
+      const now = Date.now();
+
+      // Live-render driver: while the tool executes, re-render every second
+      // (bash.js pattern) so elapsed + tool-call count stay fresh in the TUI.
+      // The interval lives in shared renderer state, cleared by renderResult.
+      const state = context.state as { interval?: ReturnType<typeof setInterval> };
+      if (context.executionStarted && !state.interval) {
+        state.interval = setInterval(() => context.invalidate(), 1000);
+      }
+
+      // Look up threads for this tool call (stable toolCallId).
+      const threads = threadStore
+        .getAllThreads()
+        .filter((t) => t.toolCallId === context.toolCallId);
+      const runningThread = threads.find((t) => t.status === "running");
+
+      // Task control (status/cancel) — no agent/task; show the operation.
+      if (args.operation) {
+        return new Text(
+          fg("accent", String(args.operation)) +
+          fg("muted", args.taskId ? ` [${args.taskId}]` : ""),
+          0, 0,
+        );
+      }
 
       // Chain
       if (args.chain && args.chain.length > 0) {
         let text =
-          fg("toolTitle", theme.bold("subagent ")) +
           fg("accent", `chain (${args.chain.length} steps)`) +
           fg("muted", ` [${scope}]`);
         for (let i = 0; i < Math.min(args.chain.length, 3); i++) {
           const step = args.chain[i];
           const cleanTask = step.task.replace(/\{previous\}/g, "").trim();
           const preview = cleanTask.length > 40 ? `${cleanTask.slice(0, 40)}...` : cleanTask;
+          const stepThread = threads[i];
+          const live = stepThread && stepThread.status === "running"
+            ? "\n  " + renderLiveThreadLine(stepThread, theme, now, resolveAgentColor(step.agent))
+            : "";
           text +=
             "\n  " +
             fg("muted", `${i + 1}.`) +
             " " +
             fg(resolveAgentColor(step.agent), step.agent) +
-            fg("dim", ` ${preview}`);
+            fg("dim", ` ${preview}`) +
+            live;
         }
         if (args.chain.length > 3)
           text += `\n  ${fg("muted", `... +${args.chain.length - 3} more`)}`;
         return new Text(text, 0, 0);
       }
 
-      // Parallel
+      // Parallel — live line per task with a running thread.
       if (args.tasks && args.tasks.length > 0) {
         let text =
-          fg("toolTitle", theme.bold("subagent ")) +
           fg("accent", `parallel (${args.tasks.length} tasks)`) +
           fg("muted", ` [${scope}]`);
         for (const t of args.tasks.slice(0, 3)) {
           const preview = t.task.length > 40 ? `${t.task.slice(0, 40)}...` : t.task;
-          text += `\n  ${fg(resolveAgentColor(t.agent), t.agent)}${fg("dim", ` ${preview}`)}`;
+          const taskThread = threads.find((th) => th.agentName === t.agent && th.task === t.task);
+          const live = taskThread && taskThread.status === "running"
+            ? "\n  " + renderLiveThreadLine(taskThread, theme, now, resolveAgentColor(t.agent))
+            : "";
+          text += `\n  ${fg(resolveAgentColor(t.agent), t.agent)}${fg("dim", ` ${preview}`)}${live}`;
         }
         if (args.tasks.length > 3)
           text += `\n  ${fg("muted", `... +${args.tasks.length - 3} more`)}`;
         return new Text(text, 0, 0);
       }
 
-      // Single
+      // Single — live header while running, static summary otherwise.
       const agentName = args.agent || "...";
       const preview = args.task
         ? args.task.length > 60
@@ -1030,14 +1281,25 @@ export default function (pi: ExtensionAPI) {
           : args.task
         : "...";
       let text =
-        fg("toolTitle", theme.bold("subagent ")) +
         fg(resolveAgentColor(agentName), agentName) +
-        fg("muted", ` [${scope}]`);
-      text += `\n  ${fg("dim", preview)}`;
+        fg("muted", ` [${scope}]`) +
+        (args.background ? fg("dim", " bg") : "");
+      if (runningThread) {
+        text += "\n" + renderLiveThreadLine(runningThread, theme, now, resolveAgentColor(agentName));
+      } else {
+        text += `\n  ${fg("dim", preview)}`;
+      }
       return new Text(text, 0, 0);
     },
 
     renderResult(result, { expanded }, theme, _context) {
+      // Stop the live-render interval started by renderCall (shared state).
+      const state = _context.state as { interval?: ReturnType<typeof setInterval> };
+      if (state?.interval) {
+        clearInterval(state.interval);
+        state.interval = undefined;
+      }
+
       const details = result.details as SubagentDetails | undefined;
       if (!details || details.results.length === 0) {
         const text = result.content[0];

package/extensions/render.ts

@@ -10,7 +10,7 @@ import * as os from "node:os";
 import { getMarkdownTheme } from "@earendil-works/pi-coding-agent";
 import { Container, Markdown, Spacer, Text } from "@earendil-works/pi-tui";
 import type { Message } from "@earendil-works/pi-ai";
-import { type SubAgentResult, isFailedResult, getResultOutput } from "./runner.ts";
+import { type SubAgentResult, isFailedResult, getResultOutput, getFinalOutput } from "./runner.ts";
 
 // ---------------------------------------------------------------------------
 // Safe type guards
@@ -41,11 +41,24 @@ function formatTokens(count: number): string {
   return `${(count / 1000000).toFixed(1)}M`;
 }
 
+// ---------------------------------------------------------------------------
+// Duration formatting (inline to avoid a widget↔render import cycle)
+// ---------------------------------------------------------------------------
+
+function formatMs(ms: number): string {
+  if (ms >= 60_000) return `${Math.floor(ms / 60_000)}m ${Math.floor((ms % 60_000) / 1_000)}s`;
+  if (ms >= 1_000) return `${(ms / 1_000).toFixed(1)}s`;
+  return `${ms}ms`;
+}
+
 export function formatUsageStats(
   usage: { input: number; output: number; cacheRead: number; cacheWrite: number; cost: number; contextTokens?: number; turns?: number },
   model?: string,
+  opts?: { toolCount?: number; durationMs?: number },
 ): string {
   const parts: string[] = [];
+  if (opts?.toolCount) parts.push(`${opts.toolCount} toolcall${opts.toolCount > 1 ? "s" : ""}`);
+  if (opts?.durationMs && opts.durationMs > 0) parts.push(formatMs(opts.durationMs));
   if (usage.turns) parts.push(`${usage.turns} turn${usage.turns > 1 ? "s" : ""}`);
   if (usage.input) parts.push(`↑${formatTokens(usage.input)}`);
   if (usage.output) parts.push(`↓${formatTokens(usage.output)}`);
@@ -154,30 +167,27 @@ export function getDisplayItems(messages: Message[]): DisplayItem[] {
   return items;
 }
 
-// ---------------------------------------------------------------------------
-// Collapsed renderer
-// ---------------------------------------------------------------------------
-
-const COLLAPSED_ITEM_COUNT = 10;
-
-function renderDisplayItems(
-  items: DisplayItem[],
-  theme: { fg: (c: string, t: string) => string },
-  limit?: number,
-): string {
-  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 = 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, theme.fg.bind(theme))}\n`;
+/**
+ * First prose line of a markdown answer: skips code fences (delimiter AND
+ * interior), ATX headings, blockquotes, bullets, ordered lists, and tables.
+ * Returns "" when no prose line exists.
+ */
+function firstProseLine(raw: string): string {
+  let inFence = false;
+  for (const rawLine of raw.split("\n")) {
+    const line = rawLine.trim();
+    if (!line) continue;
+    // Toggle fenced code blocks (``` or ~~~, optionally with a language tag).
+    if (/^[`~]{3,}/.test(line)) {
+      inFence = !inFence;
+      continue;
     }
+    if (inFence) continue;
+    // Skip structural markdown lines.
+    if (/^(#{1,6}\s|\s*[>|*+-]\s|\s*\d+\.\s|\|)/.test(line)) continue;
+    return line;
   }
-  return text.trimEnd();
+  return "";
 }
 
 // ---------------------------------------------------------------------------
@@ -192,8 +202,9 @@ export function renderSingleResult(
 ): Container | Text {
   const isError = isFailedResult(result);
   const icon = isError ? theme.fg("error", "✗") : theme.fg("success", "✓");
-  const displayItems = getDisplayItems(result.messages);
+  const displayItems = expanded ? getDisplayItems(result.messages) : [];
   const finalOutput = getResultOutput(result);
+  const toolCount = result.messages.filter((m) => m.role === "toolResult").length;
 
   if (expanded) {
     const mdTheme = getMarkdownTheme();
@@ -248,7 +259,9 @@ export function renderSingleResult(
     return container;
   }
 
-  // Collapsed
+  // Collapsed — compact: icon + agent, answer preview, usage, hint.
+  // No tool-call trace here (Claude Code / pi-task style) — the trace lives
+  // in Ctrl+O (expanded) and /agent (thread viewer).
   let text = `${icon} ${theme.fg(agentColor ?? "toolTitle", theme.bold(result.agent))}`;
   if (isError && result.stopReason) {
     const reasonColor = result.stopReason === "timeout" ? "warning" : "error";
@@ -258,16 +271,34 @@ export function renderSingleResult(
     const messageColor = result.stopReason === "timeout" ? "warning" : "error";
     text += `\n${theme.fg(messageColor, `Error: ${result.errorMessage}`)}`;
   }
-  else if (displayItems.length === 0) text += `\n${theme.fg("muted", "(no output)")}`;
-  else {
-    text += `\n${renderDisplayItems(displayItems, theme, COLLAPSED_ITEM_COUNT)}`;
-    if (displayItems.length > COLLAPSED_ITEM_COUNT) {
-      text += `\n${theme.fg("muted", "(Ctrl+O to expand)")}`;
+  // Success preview: first prose line of the final answer, skipping markdown
+  // structural lines (fences + interior, headings, bullets, tables). Error
+  // results show their message once on the Error: line; never echo under ⎿.
+  const rawOutput = getFinalOutput(result.messages);
+  if (!isError) {
+    const prose = firstProseLine(rawOutput);
+    if (prose) {
+      const preview = prose.length > 200 ? `${prose.slice(0, 197)}...` : prose;
+      text += `\n${theme.fg("dim", `⎿ ${preview}`)}`;
+    } else if (rawOutput.trim() === "" && displayItems.length === 0) {
+      text += `\n${theme.fg("muted", "(no output)")}`;
+    } else if (rawOutput.trim() !== "") {
+      // All-structural output (headings/bullets/fences only) — still say so.
+      text += `\n${theme.fg("dim", "⎿ (markdown answer — Ctrl+O to view)")}`;
     }
+  } else if (!result.errorMessage && rawOutput.trim() === "" && !result.stderr) {
+    // Error with no message, no stderr, no assistant output — say so.
+    // (When errorMessage IS set, the Error: line above already conveys it.)
+    text += `\n${theme.fg("muted", "(no output)")}`;
   }
-  const usageStr = formatUsageStats(result.usage, result.model);
+  const usageStr = formatUsageStats(result.usage, result.model, { toolCount, durationMs: result.durationMs });
   if (usageStr) text += `\n${theme.fg("dim", usageStr)}`;
   if (result.patch) text += `\n${theme.fg("success", "🌿 worktree")} (${result.patch.split("\n").length} diff lines)`;
+  // Hint: getResultOutput always returns at least "(no output)", so finalOutput
+  // is always truthy — show the hint whenever there's any trace to expand.
+  if (displayItems.length > 0 || (finalOutput && finalOutput !== "(no output)") || result.messages.length > 0) {
+    text += `\n${theme.fg("muted", "(Ctrl+O to expand · /agent for full thread)")}`;
+  }
   return new Text(text, 0, 0);
 }