@pi-archimedes/subagent 2.2.0 → 2.4.0

package/src/compact.ts

@@ -1,6 +1,7 @@
 import { Text } from "@earendil-works/pi-tui";
 import type { SubagentDetails, SubagentProgress, SubagentResult, SubagentToolCall, SubagentToolResult } from "./types.js";
-import { formatTokens, formatDuration, formatCost, truncLine, buildStatsLine, buildAgentLabel } from "./format.js";
+import { formatDuration, truncLine, buildStatsLine, buildAgentLabel } from "./format.js";
+import { renderToolCallLine } from "@pi-archimedes/core/tool-render";
 
 type Theme = { fg: (token: string, text: string) => string; bold: (text: string) => string };
 type RenderContext = { state: Record<string, unknown>; invalidate: () => void };
@@ -35,52 +36,43 @@ export function buildActivityLine(
     return theme.fg("error", "✗ Failed");
   }
 
-  // Running: show the current tool with live duration (grey while running)
+  // Running: show the current tool with the running glyph ▸ + live duration.
   if (data.currentTool) {
-    const arrow = theme.fg("muted", "↳ ");
     const argsPreview = data.currentToolArgs
       ? truncLine(data.currentToolArgs, 60)
       : "";
     const durationPart = data.currentToolStartedAt
       ? " | " + formatDuration(Date.now() - data.currentToolStartedAt)
       : "";
-    let line = theme.fg("muted", data.currentTool);
-    if (argsPreview) {
-      line += theme.fg("dim", ": " + argsPreview);
-    }
-    if (durationPart) {
-      line += theme.fg("dim", durationPart);
-    }
-    return arrow + line;
+    const suffix = (argsPreview ? ": " + argsPreview : "") + durationPart;
+    return renderToolCallLine("running", data.currentTool, suffix, theme);
   }
 
-  // Running, no active tool: show the most recently completed tool call
-  // Color only the tool name green (success) or red (error)
+  // Running, no active tool: show the most recently completed tool call with
+  // its status glyph (✓ ok / ✗ error) and matching name colour.
   if (data.toolCalls && data.toolCalls.length > 0) {
     const lastCall = data.toolCalls[data.toolCalls.length - 1];
     if (lastCall) {
       if (typeof lastCall === "string") {
-        return theme.fg("dim", "↳ " + truncLine(lastCall, 60));
+        return renderToolCallLine("success", truncLine(lastCall, 60), "", theme);
       }
-      const color = lastCall.error ? "error" : "success";
-      const arrow = theme.fg("muted", "↳ ");
-      const name = theme.fg(color, lastCall.name);
-      const argsPart = lastCall.argsPreview
-        ? theme.fg("dim", ": " + truncLine(lastCall.argsPreview, 60))
+      const status = lastCall.error ? "error" : "success";
+      const suffix = lastCall.argsPreview
+        ? ": " + truncLine(lastCall.argsPreview, 60)
         : "";
-      return arrow + name + argsPart;
+      return renderToolCallLine(status, lastCall.name, suffix, theme);
     }
   }
 
-  // Running, no tool history: show first line of streamed output if any
+  // Running, no tool history: show first line of streamed output (▸, muted).
   if (data.finalOutput) {
     const firstLine = data.finalOutput.split("\n")[0] ?? "";
-    return theme.fg("muted", "↳ " + truncLine(firstLine, 80));
+    return renderToolCallLine("running", truncLine(firstLine, 80), "", theme);
   }
 
   // Running, no info yet
   if (data.status === "running") {
-    return theme.fg("muted", "↳ Starting...");
+    return renderToolCallLine("running", "Starting...", "", theme);
   }
 
   return "";
@@ -88,13 +80,37 @@ export function buildActivityLine(
 
 // ── Status glyph ────────────────────────────────────────────────────────────
 
-function statusGlyph(isRunning: boolean, status: string): string {
-  if (isRunning) return "↳";
-  return status === "completed" ? "✓" : "✗";
-}
 
 // ── Compact single agent ────────────────────────────────────────────────────
 
+type AgentBlockData = {
+  agentName: string;
+  task: string | undefined;
+  model: string | undefined;
+  statsData: Parameters<typeof buildStatsLine>[0];
+  activity: ActivityData;
+};
+
+// Shared 3-line agent block used by both the single and parallel compact
+// views so they render identically:
+//   <agent>: <task>
+//   <model> · <stats>
+//   <activity>          (status lives here — "✓ Done" / "✗ Failed" / ▸ tool)
+function buildAgentBlock(data: AgentBlockData, theme: Theme): string {
+  const statsLine = buildStatsLine(data.statsData, theme);
+  const modelLabel = data.model ? theme.fg("accent", data.model) : "";
+  const activityLine = buildActivityLine(data.activity, theme);
+  const label = buildAgentLabel(data.agentName, data.task, theme);
+
+  return (
+    label +
+    "\n" +
+    [modelLabel, statsLine].filter(Boolean).join(" ") +
+    "\n" +
+    activityLine
+  );
+}
+
 export function renderCompactSingle(
   text: Text,
   result: SubagentResult,
@@ -119,36 +135,30 @@ export function renderCompactSingle(
     ? Date.now() - (context.state[timeKey] as number)
     : summary.durationMs;
 
-  const statsData = {
-    turns: result.usage.turns ?? 0,
-    toolCount: summary.toolCount,
-    tokens: summary.tokens,
-    durationMs: liveDuration,
-    cost: result.usage.cost ?? 0,
-  };
-  const statsLine = buildStatsLine(statsData, theme);
-
-  const statsPart = statsLine;
-
-  // Activity: arrow + current tool if running, status if finished
-  const activityLine = buildActivityLine({
-    currentTool: progress?.currentTool,
-    currentToolArgs: progress?.currentToolArgs,
-    currentToolStartedAt: progress?.currentToolStartedAt,
-    finalOutput: result.finalOutput,
-    status: isRunning ? "running" : status,
-    error: result.error,
-    toolCalls: progress?.toolCalls,
-  }, theme);
-
-  const modelName = progress?.model ?? result.model;
-  const modelLabel = modelName
-    ? theme.fg("accent", modelName)
-    : "";
-  const expandHint = theme.fg("muted", "(ctrl+o)");
-  const agentLabel = buildAgentLabel(agentName, result.task, theme);
-  let output = agentLabel + "\n" + [modelLabel, statsPart, expandHint].filter(Boolean).join(" ");
-  output += "\n" + activityLine;
+  const output = buildAgentBlock(
+    {
+      agentName,
+      task: result.task,
+      model: progress?.model ?? result.model,
+      statsData: {
+        turns: result.usage.turns ?? 0,
+        toolCount: summary.toolCount,
+        tokens: summary.tokens,
+        durationMs: liveDuration,
+        cost: result.usage.cost ?? 0,
+      },
+      activity: {
+        currentTool: progress?.currentTool,
+        currentToolArgs: progress?.currentToolArgs,
+        currentToolStartedAt: progress?.currentToolStartedAt,
+        finalOutput: result.finalOutput,
+        status: isRunning ? "running" : status,
+        error: result.error,
+        toolCalls: progress?.toolCalls,
+      },
+    },
+    theme,
+  );
 
   text.setText(output);
   return text;
@@ -175,39 +185,30 @@ export function renderCompactParallel(
       ? "running"
       : result.exitCode === 0 ? "completed" : "failed";
 
-    const glyph = statusGlyph(isRunning, status);
-    const glyphColored = status === "completed"
-      ? theme.fg("success", glyph)
-      : status === "failed"
-        ? theme.fg("error", glyph)
-        : theme.fg("muted", glyph);
-
-    const statsData = {
-      turns: result.usage.turns ?? 0,
-      toolCount: summary.toolCount,
-      tokens: summary.tokens,
-      durationMs: summary.durationMs,
-      cost: result.usage.cost ?? 0,
-    };
-    const statsLine = buildStatsLine(statsData, theme);
-    const statsPart = statsLine ? "  " + statsLine : "";
-
-    const activityData = {
-      currentTool: progress?.currentTool,
-      currentToolArgs: progress?.currentToolArgs,
-      currentToolStartedAt: progress?.currentToolStartedAt,
-      finalOutput: result.finalOutput,
-      status,
-      error: result.error,
-      toolCalls: progress?.toolCalls,
-    };
-    const activityLine = buildActivityLine(activityData, theme);
-
-    let line = `${glyphColored} ${buildAgentLabel(agentName, result.task, theme)}${statsPart}`;
-    if (activityLine) {
-      line += "\n" + activityLine;
-    }
-    return line;
+    return buildAgentBlock(
+      {
+        agentName,
+        task: result.task,
+        model: progress?.model ?? result.model,
+        statsData: {
+          turns: result.usage.turns ?? 0,
+          toolCount: summary.toolCount,
+          tokens: summary.tokens,
+          durationMs: summary.durationMs,
+          cost: result.usage.cost ?? 0,
+        },
+        activity: {
+          currentTool: progress?.currentTool,
+          currentToolArgs: progress?.currentToolArgs,
+          currentToolStartedAt: progress?.currentToolStartedAt,
+          finalOutput: result.finalOutput,
+          status,
+          error: result.error,
+          toolCalls: progress?.toolCalls,
+        },
+      },
+      theme,
+    );
   });
 
   text.setText(lines.join("\n"));
@@ -227,13 +228,6 @@ export function renderCompactProgress(
   const status = progress.status;
   const isRunning = status === "running";
 
-  const glyph = statusGlyph(isRunning, status);
-  const glyphColored = status === "completed"
-    ? theme.fg("success", glyph)
-    : status === "failed"
-      ? theme.fg("error", glyph)
-      : theme.fg("muted", glyph);
-
   // Track start time for live duration
   const timeKey = "_subagentStartTime_" + agentName;
   if (isRunning && context.state[timeKey] === undefined) {
@@ -243,34 +237,30 @@ export function renderCompactProgress(
     ? Date.now() - (context.state[timeKey] as number)
     : progress.durationMs;
 
-  const statsData = {
-    turns: 0,
-    toolCount: progress.toolCount,
-    tokens: progress.tokens,
-    durationMs: liveDuration,
-    cost: progress.cost,
-  };
-  const statsLine = buildStatsLine(statsData, theme);
-
-  // Activity: arrow + current tool if running, status if finished
-  const activityLine = buildActivityLine({
-    currentTool: progress.currentTool,
-    currentToolArgs: progress.currentToolArgs,
-    currentToolStartedAt: progress.currentToolStartedAt,
-    finalOutput: undefined,
-    status,
-    error: progress.error,
-    toolCalls: progress.toolCalls,
-  }, theme);
-
-  const modelLabel = progress.model
-    ? theme.fg("accent", progress.model)
-    : "";
-  const statsPart = statsLine;
-  const expandHint = theme.fg("muted", "(ctrl+o)");
-  const agentLabel = buildAgentLabel(agentName, progress.task, theme);
-  let output = agentLabel + "\n" + [modelLabel, statsPart, expandHint].filter(Boolean).join(" ");
-  output += "\n" + activityLine;
+  const output = buildAgentBlock(
+    {
+      agentName,
+      task: progress.task,
+      model: progress.model,
+      statsData: {
+        turns: 0,
+        toolCount: progress.toolCount,
+        tokens: progress.tokens,
+        durationMs: liveDuration,
+        cost: progress.cost,
+      },
+      activity: {
+        currentTool: progress.currentTool,
+        currentToolArgs: progress.currentToolArgs,
+        currentToolStartedAt: progress.currentToolStartedAt,
+        finalOutput: undefined,
+        status,
+        error: progress.error,
+        toolCalls: progress.toolCalls,
+      },
+    },
+    theme,
+  );
 
   text.setText(output);
   return text;
@@ -284,44 +274,34 @@ export function renderCompactParallelProgress(
   theme: Theme,
   context: RenderContext,
 ): Text {
-  const lines = (details.progress ?? []).map((progress, i) => {
+  const lines = (details.progress ?? []).map((progress) => {
     const agentName = progress.agent ?? "subagent";
     const status = progress.status;
-    const isRunning = status === "running";
-
-    const glyph = statusGlyph(isRunning, status);
-    const glyphColored = status === "completed"
-      ? theme.fg("success", glyph)
-      : status === "failed"
-        ? theme.fg("error", glyph)
-        : theme.fg("muted", glyph);
-
-    const statsData = {
-      turns: 0,
-      toolCount: progress.toolCount,
-      tokens: progress.tokens,
-      durationMs: progress.durationMs,
-      cost: progress.cost,
-    };
-    const statsLine = buildStatsLine(statsData, theme);
-    const statsPart = statsLine ? "  " + statsLine : "";
-
-    const activityData = {
-      currentTool: progress.currentTool,
-      currentToolArgs: progress.currentToolArgs,
-      currentToolStartedAt: progress.currentToolStartedAt,
-      finalOutput: undefined,
-      status,
-      error: progress.error,
-      toolCalls: progress.toolCalls,
-    };
-    const activityLine = buildActivityLine(activityData, theme);
-
-    let line = `${glyphColored} ${buildAgentLabel(agentName, progress.task, theme)}${statsPart}`;
-    if (activityLine) {
-      line += "\n" + activityLine;
-    }
-    return line;
+
+    return buildAgentBlock(
+      {
+        agentName,
+        task: progress.task,
+        model: progress.model,
+        statsData: {
+          turns: 0,
+          toolCount: progress.toolCount,
+          tokens: progress.tokens,
+          durationMs: progress.durationMs,
+          cost: progress.cost,
+        },
+        activity: {
+          currentTool: progress.currentTool,
+          currentToolArgs: progress.currentToolArgs,
+          currentToolStartedAt: progress.currentToolStartedAt,
+          finalOutput: undefined,
+          status,
+          error: progress.error,
+          toolCalls: progress.toolCalls,
+        },
+      },
+      theme,
+    );
   });
 
   text.setText(lines.join("\n"));

package/src/expanded.ts

@@ -1,23 +1,22 @@
 import { Text } from "@earendil-works/pi-tui";
 import type { SubagentDetails, SubagentProgress, SubagentResult, SubagentToolCall } from "./types.js";
-import { formatTokens, formatDuration, truncLine, buildStatsLine, buildAgentLabel } from "./format.js";
+import { formatDuration, truncLine, buildStatsLine, buildAgentLabel } from "./format.js";
+import { renderToolCallLine } from "@pi-archimedes/core/tool-render";
 
 type Theme = { fg: (token: string, text: string) => string; bold: (text: string) => string };
 
 // ── Helpers ─────────────────────────────────────────────────────────────────
 
+// A completed tool call renders with a status glyph (✓ ok / ✗ error) and its
+// name coloured to match. Legacy string-form calls (old persisted sessions)
+// carry no status, so they render as a neutral success line.
 function formatToolCall(call: SubagentToolCall | string, theme: Theme): string {
-  // Backward compat: old persisted sessions may have toolCalls as string[]
   if (typeof call === "string") {
-    return theme.fg("dim", "↳ " + call);
-  }
-  const arrow = theme.fg("muted", "↳ ");
-  const color = call.error ? "error" : "success";
-  const name = theme.fg(color, call.name);
-  const argsPart = call.argsPreview
-    ? theme.fg("dim", ": " + call.argsPreview)
-    : "";
-  return arrow + name + argsPart;
+    return renderToolCallLine("success", call, "", theme);
+  }
+  const status = call.error ? "error" : "success";
+  const suffix = call.argsPreview ? ": " + call.argsPreview : "";
+  return renderToolCallLine(status, call.name, suffix, theme);
 }
 
 // ── Expanded completed result ───────────────────────────────────────────────
@@ -42,8 +41,7 @@ export function buildExpandedText(
     durationMs: result.progressSummary?.durationMs,
     cost: result.usage.cost,
   }, theme);
-  const expandHint = theme.fg("muted", "(ctrl+o)");
-  const statsParts = [modelLabel, statsLine, expandHint].filter(Boolean);
+  const statsParts = [modelLabel, statsLine].filter(Boolean);
   if (statsParts.length > 0) {
     lines.push(statsParts.join(" "));
   }
@@ -116,8 +114,7 @@ export function renderProgressExpanded(
     durationMs: progress.durationMs,
     cost: progress.cost,
   }, theme);
-  const expandHint = theme.fg("muted", "(ctrl+o)");
-  const statsParts = [modelLabel, statsLine, expandHint].filter(Boolean);
+  const statsParts = [modelLabel, statsLine].filter(Boolean);
   if (statsParts.length > 0) {
     lines.push(statsParts.join(" "));
   }
@@ -136,7 +133,7 @@ export function renderProgressExpanded(
     }
   }
 
-  // Activity (current tool with spinner)
+  // Activity (current tool, marked with the running glyph ▸)
   if (progress.currentTool) {
     lines.push("");
     const argsPreview = progress.currentToolArgs
@@ -145,14 +142,8 @@ export function renderProgressExpanded(
     const durationPart = progress.currentToolStartedAt
       ? " | " + formatDuration(Date.now() - progress.currentToolStartedAt)
       : "";
-    let line = theme.fg("muted", progress.currentTool);
-    if (argsPreview) {
-      line += theme.fg("dim", ": " + argsPreview);
-    }
-    if (durationPart) {
-      line += theme.fg("dim", durationPart);
-    }
-    lines.push(line);
+    const suffix = (argsPreview ? ": " + argsPreview : "") + durationPart;
+    lines.push(renderToolCallLine("running", progress.currentTool, suffix, theme));
   }
 
   // Status at bottom
@@ -192,8 +183,7 @@ export function buildProgressExpandedText(
     durationMs: progress.durationMs,
     cost: progress.cost,
   }, theme);
-  const expandHint = theme.fg("muted", "(ctrl+o)");
-  const statsParts = [modelLabel, statsLine, expandHint].filter(Boolean);
+  const statsParts = [modelLabel, statsLine].filter(Boolean);
   if (statsParts.length > 0) {
     lines.push(statsParts.join(" "));
   }

package/src/index.ts

@@ -1,10 +1,12 @@
 import type { ExtensionAPI, ExtensionCommandContext, ExtensionContext, Theme } from "@earendil-works/pi-coding-agent";
-import { Text, TUI } from "@earendil-works/pi-tui";
+import { Text, type TUI } from "@earendil-works/pi-tui";
 import { Type } from "typebox";
+import { SUBAGENT_PARAMS_SCHEMA } from "./tool-schema.js";
 import { executeSubagent, executeParallel } from "./execute.js";
 // agent-manager.js lazy-loaded below to keep subagent tool registration fast
 import { renderSubagentResult } from "./render.js";
 import { OVERLAY_CHROME } from "@pi-archimedes/core/overlay";
+import { renderToolHeader } from "@pi-archimedes/core/tool-render";
 import { discoverAgents, discoverAgentsAll, findAgent, formatAgentList } from "./agents.js";
 import { validateModel, firstError } from "./model-validation.js";
 import type {
@@ -14,38 +16,6 @@ import type {
   SubagentToolResult,
 } from "./types.js";
 
-// ── JSON Schema for tool parameters (TypeBox) ──────────────────────────────
-
-const TaskItem = Type.Object({
-  agent: Type.Optional(Type.String({
-    description: "Agent name for this task (optional). If omitted, runs config-less.",
-  })),
-  task: Type.String(),
-  model: Type.Optional(Type.String()),
-  cwd: Type.Optional(Type.String()),
-});
-
-const SUBAGENT_PARAMS_SCHEMA = Type.Object({
-  agent: Type.Optional(Type.String({
-    description: "Agent name (optional). If omitted, the subagent runs config-less — parent's current model, all tools, no system-prompt override. Call list_agents to see available agents.",
-  })),
-  task: Type.Optional(Type.String({
-    description: "Task description for the subagent. Required when not using 'tasks' array.",
-  })),
-  tasks: Type.Optional(Type.Array(TaskItem, {
-    description: "Multiple tasks for parallel execution. Required when not using 'task'.",
-  })),
-  model: Type.Optional(Type.String({
-    description: "Model override for the subagent",
-  })),
-  async: Type.Optional(Type.Boolean({
-    description: "Run asynchronously (fire-and-forget)",
-  })),
-  cwd: Type.Optional(Type.String({
-    description: "Working directory for the subagent",
-  })),
-});
-
 // ── Theme helper type for render functions ──────────────────────────────────
 
 interface RenderTheme {
@@ -236,13 +206,13 @@ export function registerSubagent(pi: ExtensionAPI): void {
       (ctx as Record<string, unknown>).lastComponent = text;
 
       if (tasks && tasks.length > 0) {
-        const label = theme.fg("toolTitle", theme.bold("subagent")) + " " + tasks.length + " tasks";
-        text.setText(label);
+        text.setText(
+          renderToolHeader("subagent", `${tasks.length} tasks`, theme),
+        );
       } else if (agent) {
-        const label = theme.fg("toolTitle", theme.bold("subagent")) + " " + theme.fg("accent", agent);
-        text.setText(label);
+        text.setText(renderToolHeader("subagent", agent, theme));
       } else {
-        text.setText(theme.fg("toolTitle", theme.bold("subagent")));
+        text.setText(renderToolHeader("subagent", undefined, theme));
       }
 
       return text;