@pi-archimedes/subagent 1.5.0 → 1.7.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-archimedes/subagent",
-  "version": "1.5.0",
+  "version": "1.7.0",
   "type": "module",
   "keywords": [
     "pi-package"
@@ -11,7 +11,7 @@
   ],
   "main": "./src/index.ts",
   "dependencies": {
-    "@pi-archimedes/core": "1.5.0"
+    "@pi-archimedes/core": "1.7.0"
   },
   "peerDependencies": {
     "@earendil-works/pi-ai": ">=0.1.0",

package/src/compact.ts

@@ -1,6 +1,6 @@
 import { Text } from "@earendil-works/pi-tui";
 import type { SubagentDetails, SubagentProgress, SubagentResult, SubagentToolResult } from "./types.js";
-import { formatTokens, formatDuration, formatCost, truncLine, buildStatsLine } from "./format.js";
+import { formatTokens, formatDuration, formatCost, truncLine, buildStatsLine, buildAgentLabel } from "./format.js";
 
 type Theme = { fg: (token: string, text: string) => string; bold: (text: string) => string };
 type RenderContext = { state: Record<string, unknown>; invalidate: () => void };
@@ -39,7 +39,7 @@ export function buildActivityLine(
   if (data.currentTool) {
     const arrow = theme.fg("muted", "↳ ");
     const argsPreview = data.currentToolArgs
-      ? truncLine(data.currentToolArgs ?? "", 60)
+      ? truncLine(data.currentToolArgs, 60)
       : "";
     const durationPart = data.currentToolStartedAt
       ? " | " + formatDuration(Date.now() - data.currentToolStartedAt)
@@ -90,6 +90,7 @@ export function renderCompactSingle(
   theme: Theme,
   context: RenderContext,
 ): Text {
+  // agentName sourced from result; defaults to "subagent"
   const agentName = result.agent ?? "subagent";
   const summary = result.progressSummary ?? { toolCount: 0, tokens: 0, durationMs: 0 };
   const isRunning = progress?.status === "running";
@@ -133,7 +134,8 @@ export function renderCompactSingle(
     ? theme.fg("accent", modelName)
     : "";
   const expandHint = theme.fg("muted", "(ctrl+o)");
-  let output = [modelLabel, statsPart, expandHint].filter(Boolean).join(" ");
+  const agentLabel = buildAgentLabel(agentName, result.task, theme);
+  let output = agentLabel + "\n" + [modelLabel, statsPart, expandHint].filter(Boolean).join(" ");
   output += "\n" + activityLine;
 
   text.setText(output);
@@ -150,7 +152,7 @@ export function renderCompactParallel(
 ): Text {
   const lines = details.results.map((result, i) => {
     const progress = details.progress?.[i];
-    const agentName = result.agent ?? "agent-" + i;
+    const agentName = result.agent ?? "subagent";
     const summary = result.progressSummary ?? { toolCount: 0, tokens: 0, durationMs: 0 };
     const isRunning = progress?.status === "running";
     // Prefer result.exitCode as the source of truth for completion status
@@ -189,7 +191,7 @@ export function renderCompactParallel(
     };
     const activityLine = buildActivityLine(activityData, theme);
 
-    let line = `${glyphColored} ${agentName}${statsPart}`;
+    let line = `${glyphColored} ${buildAgentLabel(agentName, result.task, theme)}${statsPart}`;
     if (activityLine) {
       line += "\n" + activityLine;
     }
@@ -208,6 +210,7 @@ export function renderCompactProgress(
   theme: Theme,
   context: RenderContext,
 ): Text {
+  // agentName sourced from progress; defaults to "subagent"
   const agentName = progress.agent ?? "subagent";
   const status = progress.status;
   const isRunning = status === "running";
@@ -253,7 +256,8 @@ export function renderCompactProgress(
     : "";
   const statsPart = statsLine;
   const expandHint = theme.fg("muted", "(ctrl+o)");
-  let output = [modelLabel, statsPart, expandHint].filter(Boolean).join(" ");
+  const agentLabel = buildAgentLabel(agentName, progress.task, theme);
+  let output = agentLabel + "\n" + [modelLabel, statsPart, expandHint].filter(Boolean).join(" ");
   output += "\n" + activityLine;
 
   text.setText(output);
@@ -269,7 +273,7 @@ export function renderCompactParallelProgress(
   context: RenderContext,
 ): Text {
   const lines = (details.progress ?? []).map((progress, i) => {
-    const agentName = progress.agent ?? "agent-" + i;
+    const agentName = progress.agent ?? "subagent";
     const status = progress.status;
     const isRunning = status === "running";
 
@@ -301,7 +305,7 @@ export function renderCompactParallelProgress(
     };
     const activityLine = buildActivityLine(activityData, theme);
 
-    let line = `${glyphColored} ${agentName}${statsPart}`;
+    let line = `${glyphColored} ${buildAgentLabel(agentName, progress.task, theme)}${statsPart}`;
     if (activityLine) {
       line += "\n" + activityLine;
     }

package/src/execute.ts

@@ -16,7 +16,7 @@ export interface ExecuteOptions {
 }
 
 /**
- * Execute a single subagent synchronously — blocks until completion.
+ * Execute a single subagent — waits for completion before resolving.
  */
 export async function executeSubagent(options: ExecuteOptions): Promise<SubagentResult> {
   const agentName = options.agent ?? "subagent";
@@ -95,7 +95,7 @@ export async function executeSubagent(options: ExecuteOptions): Promise<Subagent
   } catch (err) {
     const errorMessage = err instanceof Error ? err.message : String(err);
     const durationMs = Date.now() - startTime;
-    return {
+    const result: SubagentResult = {
       agent: agentName,
       task: options.task,
       exitCode: 1,
@@ -135,6 +135,10 @@ export async function executeSubagent(options: ExecuteOptions): Promise<Subagent
       },
       progressSummary: { toolCount: 0, tokens: 0, durationMs },
     };
+    // Emit final failure progress so executeParallel's progress slot updates
+    // from the pending placeholder to "failed" (prevents stale "Starting..." display).
+    options.onUpdate?.(result.progress!);
+    return result;
   }
 }
 
@@ -146,19 +150,41 @@ export async function executeParallel(options: {
   signal: AbortSignal | undefined;
   onUpdate: ((progress: SubagentProgress[]) => void) | undefined;
 }): Promise<SubagentResult[]> {
-  // Collect latest progress per agent for aggregated reporting
-  const latestProgress = new Map<string, SubagentProgress>();
+  // Pre-fill one pending slot per task, keyed by task index (NOT agent name).
+  // This keeps all N lines stacked from t=0 in stable task order, with no
+  // collisions when multiple subagents share an agent name (e.g. 8 x "general").
+  const latestProgress: SubagentProgress[] = options.tasks.map((taskDef) => ({
+    agent: taskDef.agent ?? "subagent",
+    status: "running" as const,
+    task: taskDef.task,
+    currentTool: undefined,
+    currentToolArgs: undefined,
+    currentToolStartedAt: undefined,
+    toolCount: 0,
+    inputTokens: 0,
+    outputTokens: 0,
+    tokens: 0,
+    cost: 0,
+    durationMs: 0,
+    error: undefined,
+    output: undefined,
+    recentOutput: undefined,
+    toolCalls: undefined,
+    // Match the model executeSubagent will report for this task, so the
+    // pending placeholder's model label matches the streaming label exactly.
+    model: taskDef.model,
+  }));
 
   const results = await Promise.all(
-    options.tasks.map((taskDef) =>
+    options.tasks.map((taskDef, index) =>
       executeSubagent({
         ...taskDef,
         signal: options.signal,
         onUpdate: (progress: SubagentProgress) => {
-          // Store latest progress keyed by agent name
-          latestProgress.set(progress.agent, progress);
-          // Emit aggregated progress across ALL agents
-          options.onUpdate?.([...latestProgress.values()]);
+          // Store latest progress in this task's stable slot (by index).
+          latestProgress[index] = progress;
+          // Emit all N entries in stable task order.
+          options.onUpdate?.([...latestProgress]);
         },
       }),
     ),

package/src/expanded.ts

@@ -1,6 +1,6 @@
 import { Text } from "@earendil-works/pi-tui";
 import type { SubagentDetails, SubagentProgress, SubagentResult } from "./types.js";
-import { formatTokens, formatDuration, truncLine, buildStatsLine } from "./format.js";
+import { formatTokens, formatDuration, truncLine, buildStatsLine, buildAgentLabel } from "./format.js";
 
 type Theme = { fg: (token: string, text: string) => string; bold: (text: string) => string };
 
@@ -13,6 +13,9 @@ export function buildExpandedText(
 ): string {
   const lines: string[] = [];
 
+  lines.push(buildAgentLabel(result.agent, result.task, theme));
+  lines.push("");
+
   // Stats line (same as compact view)
   const modelName = progress?.model ?? result.model;
   const modelLabel = modelName ? theme.fg("accent", modelName) : "";
@@ -85,6 +88,9 @@ export function renderProgressExpanded(
 ): Text {
   const lines: string[] = [];
 
+  lines.push(buildAgentLabel(progress.agent, progress.task, theme));
+  lines.push("");
+
   // Stats line (same as compact view)
   const modelLabel = progress.model ? theme.fg("accent", progress.model) : "";
   const statsLine = buildStatsLine({
@@ -158,6 +164,9 @@ export function buildProgressExpandedText(
 ): string {
   const lines: string[] = [];
 
+  lines.push(buildAgentLabel(progress.agent, progress.task, theme));
+  lines.push("");
+
   // Stats line (same as compact view)
   const modelLabel = progress.model ? theme.fg("accent", progress.model) : "";
   const statsLine = buildStatsLine({

package/src/format.test.ts

@@ -0,0 +1,30 @@
+import { describe, it, expect } from "vitest";
+import { truncLine } from "./format.js";
+
+// ── truncLine ───────────────────────────────────────────────────────────────
+
+describe("truncLine", () => {
+  it("returns text unchanged when within limit", () => {
+    expect(truncLine("hello", 10)).toBe("hello");
+  });
+
+  it("truncates with '...' when exceeding limit", () => {
+    expect(truncLine("hello world", 8)).toBe("hello...");
+  });
+
+  it("stops at newline boundary instead of bleeding into next line", () => {
+    expect(truncLine("line one\nline two\nline three", 15)).toBe("line one...");
+  });
+
+  it("truncates first line if it itself exceeds limit", () => {
+    expect(truncLine("this is a very long first line\nsecond", 12)).toBe("this is a...");
+  });
+
+  it("handles multiple consecutive newlines", () => {
+    expect(truncLine("a\n\n\nb", 10)).toBe("a...");
+  });
+
+  it("handles text starting with newline", () => {
+    expect(truncLine("\nhello", 10)).toBe("...");
+  });
+});

package/src/format.ts

@@ -1,5 +1,3 @@
-import { clampLine } from "@pi-archimedes/core/text";
-
 export function formatTokens(n: number): string {
   if (n >= 1_000_000) return (n / 1_000_000).toFixed(1) + "M";
   if (n >= 1_000) return Math.round(n / 1_000) + "k";
@@ -22,8 +20,25 @@ export function formatCost(cost: number): string {
   return "$" + cost.toFixed(2);
 }
 
-export function truncLine(text: string, width: number): string {
-  return clampLine(text, width);
+/**
+ * Truncate plain text to a max character length, appending "..." if truncated.
+ *
+ * Unlike truncateToWidth from pi-tui, this does not handle wide characters or
+ * measure ANSI display width. The benefit: the "..." is plain text so it
+ * inherits any ANSI color wrapper applied around the result (pi-tui's
+ * truncateToWidth appends "..." after closing color codes, leaving it unstyled).
+ *
+ * If the text contains newlines, truncates at the first newline boundary
+ * rather than bleeding into the next line.
+ */
+export function truncLine(text: string, maxLen: number): string {
+  // Check for newline first — it's a hard boundary regardless of length
+  const nlIdx = text.indexOf("\n");
+  if (nlIdx !== -1) {
+    return text.slice(0, nlIdx).slice(0, maxLen - 3) + "...";
+  }
+  if (text.length <= maxLen) return text;
+  return text.slice(0, maxLen - 3) + "...";
 }
 
 export interface StatsData {
@@ -57,3 +72,18 @@ export function buildStatsLine(
 
   return parts.map(p => theme.fg("dim", "· " + p)).join(" ");
 }
+
+// Build an agent label for display: "agentName: truncated task preview".
+// Truncation width of 60 keeps compact rows readable on standard terminal widths
+// while still showing meaningful task context.
+export function buildAgentLabel(
+  agent: string,
+  task: string | undefined,
+  theme: { fg: (token: string, text: string) => string; bold: (text: string) => string },
+): string {
+  const name = theme.bold(agent);
+  if (task) {
+    return name + theme.fg("dim", ": " + truncLine(task, 60));
+  }
+  return name;
+}

package/src/handlers.test.ts

@@ -0,0 +1,32 @@
+import { describe, it, expect } from "vitest";
+import { extractArgsPreview } from "./handlers.js";
+
+// ── extractArgsPreview ──────────────────────────────────────────────────────
+
+describe("extractArgsPreview", () => {
+  it("returns string args truncated", () => {
+    const long = "a".repeat(200);
+    expect(extractArgsPreview(long)).toBe("a".repeat(120));
+  });
+
+  it("replaces newlines in string args", () => {
+    expect(extractArgsPreview("hello\nworld")).toBe("hello world");
+  });
+
+  it("replaces newlines in single-key object value", () => {
+    const args = { command: "cat file.txt\ngrep -A5 \"test\"" };
+    const result = extractArgsPreview(args);
+    expect(result).not.toContain("\n");
+    expect(result).toBe("cat file.txt grep -A5 \"test\"");
+  });
+
+  it("replaces newlines in multi-key longest string value", () => {
+    const args = { short: "x", long: "hello\nworld\nfoo" };
+    expect(extractArgsPreview(args)).toBe("hello world foo");
+  });
+
+  it("handles number and boolean values", () => {
+    expect(extractArgsPreview({ count: 42 })).toBe("42");
+    expect(extractArgsPreview({ enabled: true })).toBe("true");
+  });
+});

package/src/handlers.ts

@@ -15,14 +15,17 @@ export interface JsonEvent {
  * Generic: no hardcoded tool names.
  */
 export function extractArgsPreview(args: unknown): string {
-  if (typeof args === "string") return args.slice(0, ARGS_PREVIEW_MAX);
+  if (typeof args === "string") {
+    // Replace newlines so previews stay single-line
+    return args.replace(/\n/g, " ").slice(0, ARGS_PREVIEW_MAX);
+  }
   if (args && typeof args === "object" && !Array.isArray(args)) {
     const obj = args as Record<string, unknown>;
     const keys = Object.keys(obj);
     // Single-key object: show the value directly (or serialize if complex)
     if (keys.length === 1) {
       const v = obj[keys[0]!];
-      if (typeof v === "string") return v.slice(0, ARGS_PREVIEW_MAX);
+      if (typeof v === "string") return v.replace(/\n/g, " ").slice(0, ARGS_PREVIEW_MAX);
       if (typeof v === "number" || typeof v === "boolean") return String(v);
       // Complex value (array/nested object) — serialize just this value
       const serialized = JSON.stringify(v);
@@ -35,7 +38,7 @@ export function extractArgsPreview(args: unknown): string {
         best = v;
       }
     }
-    if (best) return best.slice(0, ARGS_PREVIEW_MAX);
+    if (best) return best.replace(/\n/g, " ").slice(0, ARGS_PREVIEW_MAX);
   }
   const serialized = JSON.stringify(args);
   return serialized?.slice(0, ARGS_PREVIEW_MAX) ?? "";