@pi-archimedes/subagent 2.7.1 → 2.7.3

package/README.md

@@ -44,7 +44,7 @@ The `agent` field is optional — omitting it is not a built-in default agent, a
 }
 ```
 
-**The dispatch waits.** A call — single or parallel — blocks until every task completes and returns the combined results, each optionally carrying the child's `childSessionId`. There is an `async` field in the schema; the implementation ignores it, so don't plan on fire-and-forget: batch the work into `tasks` and let the call block on all of it.
+**The dispatch waits.** A call — single or parallel — blocks until every task completes and returns the combined results, each optionally carrying the child's `childSessionId`. There is an `async` field in the schema; the implementation ignores it, so don't plan on fire-and-forget: batch the work into `tasks` and let the call block on all of it. In parallel mode each result section carries the child's final output beneath its metrics line.
 
 ### Model and thinking resolution
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-archimedes/subagent",
-  "version": "2.7.1",
+  "version": "2.7.3",
   "repository": {
     "type": "git",
     "url": "https://github.com/danielcherubini/pi-archimedes.git"
@@ -15,8 +15,8 @@
   ],
   "main": "./src/index.ts",
   "dependencies": {
-    "@pi-archimedes/core": "2.7.1",
-    "@pi-archimedes/todo": "2.7.1"
+    "@pi-archimedes/core": "2.7.3",
+    "@pi-archimedes/todo": "2.7.3"
   },
   "peerDependencies": {
     "@earendil-works/pi-ai": ">=0.1.0",

package/src/format.test.ts

@@ -1,5 +1,21 @@
 import { describe, it, expect } from "vitest";
-import { truncLine } from "./format.js";
+import { truncLine, formatParallelResults } from "./format.js";
+import type { SubagentResult } from "./types.js";
+
+function makeResult(overrides: Partial<SubagentResult> = {}): SubagentResult {
+  return {
+    agent: "test-agent",
+    task: "do something",
+    exitCode: 0,
+    usage: { input: 100, output: 50, cacheRead: 0, cacheWrite: 0, cost: 0.01, turns: 3 },
+    model: "gpt-4",
+    finalOutput: undefined,
+    error: undefined,
+    progress: undefined,
+    progressSummary: { toolCount: 5, tokens: 150, durationMs: 3000 },
+    ...overrides,
+  };
+}
 
 // ── truncLine ───────────────────────────────────────────────────────────────
 
@@ -28,3 +44,76 @@ describe("truncLine", () => {
     expect(truncLine("\nhello", 10)).toBe("...");
   });
 });
+
+describe("formatParallelResults", () => {
+  it("renders header + body per task with exactly one blank line between sections", () => {
+    const r1 = makeResult({
+      agent: "researcher",
+      progressSummary: { toolCount: 31, tokens: 12345, durationMs: 153000 },
+      finalOutput: "Found the bug.\n", // trailing newline: pins trimEnd
+    });
+    const r2 = makeResult({
+      agent: "reviewer",
+      progressSummary: { toolCount: 4, tokens: 2000, durationMs: 12000 },
+      finalOutput: "Looks good.",
+    });
+    expect(formatParallelResults([r1, r2])).toBe(
+      "✓ researcher 31 tools · 12k tok · 153s\nFound the bug.\n\n✓ reviewer 4 tools · 2k tok · 12s\nLooks good.",
+    );
+  });
+
+  it("rounds tokens and duration with Math.round", () => {
+    const r = makeResult({
+      progressSummary: { toolCount: 1, tokens: 12500, durationMs: 154000 },
+      finalOutput: "x",
+    });
+    expect(formatParallelResults([r])).toBe("✓ test-agent 1 tools · 13k tok · 154s\nx");
+  });
+
+  it("renders header only when progressSummary is absent (synthetic case)", () => {
+    const r = makeResult({ progressSummary: undefined });
+    expect(formatParallelResults([r])).toBe("✓ test-agent\ncompleted");
+  });
+
+  it("uses the ✗ glyph for non-zero exit codes", () => {
+    const r = makeResult({ exitCode: 1, finalOutput: "done" });
+    expect(formatParallelResults([r])).toBe("✗ test-agent 5 tools · 0k tok · 3s\ndone");
+  });
+
+  it("falls back to 'completed' when there is no finalOutput and no error", () => {
+    const r = makeResult();
+    expect(formatParallelResults([r])).toBe("✓ test-agent 5 tools · 0k tok · 3s\ncompleted");
+  });
+
+  it("uses the error text as the body when there is no finalOutput", () => {
+    const r = makeResult({ exitCode: 1, error: "spawn failed" });
+    expect(formatParallelResults([r])).toBe("✗ test-agent 5 tools · 0k tok · 3s\nspawn failed");
+  });
+
+  it("prefers finalOutput over error when both are set", () => {
+    const r = makeResult({ finalOutput: "out", error: "boom" });
+    expect(formatParallelResults([r])).toBe("✓ test-agent 5 tools · 0k tok · 3s\nout");
+  });
+
+  it("keeps internal newlines in a multi-line body and trims only the tail", () => {
+    const r1 = makeResult({
+      agent: "researcher",
+      finalOutput: "line one\nline two\n",
+    });
+    const r2 = makeResult({
+      agent: "reviewer",
+      finalOutput: "second",
+    });
+    expect(formatParallelResults([r1, r2])).toBe(
+      "✓ researcher 5 tools · 0k tok · 3s\nline one\nline two\n\n✓ reviewer 5 tools · 0k tok · 3s\nsecond",
+    );
+  });
+
+  it("keeps duplicate agent names distinguishable by position and body", () => {
+    const a = makeResult({ agent: "researcher", finalOutput: "first" });
+    const b = makeResult({ agent: "researcher", finalOutput: "second" });
+    expect(formatParallelResults([a, b])).toBe(
+      "✓ researcher 5 tools · 0k tok · 3s\nfirst\n\n✓ researcher 5 tools · 0k tok · 3s\nsecond",
+    );
+  });
+});

package/src/format.ts

@@ -1,3 +1,5 @@
+import type { SubagentResult } from "./types.js";
+
 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";
@@ -41,6 +43,27 @@ export function truncLine(text: string, maxLen: number): string {
   return text.slice(0, maxLen - 3) + "...";
 }
 
+/**
+ * Renders one section per parallel result. The header line is intentionally
+ * byte-identical to the pre-#55 metrics summary (a contract, not an
+ * accident); the body mirrors the single-mode fallback chain
+ * (finalOutput ?? error ?? "completed"), `trimEnd()`-ed so sections stay
+ * separated by exactly one blank line, and is deliberately untruncated by
+ * design (see docs/decisions/0020-subagent-parallel-full-output.md).
+ */
+export function formatParallelResults(results: SubagentResult[]): string {
+  const sections = results.map((r) => {
+    const status = r.exitCode === 0 ? "✓" : "✗";
+    const summary = r.progressSummary
+      ? `${r.progressSummary.toolCount} tools · ${Math.round(r.progressSummary.tokens / 1000)}k tok · ${Math.round(r.progressSummary.durationMs / 1000)}s`
+      : "";
+    const header = `${status} ${r.agent}${summary ? " " + summary : ""}`;
+    const body = (r.finalOutput ?? r.error ?? "completed").trimEnd();
+    return `${header}\n${body}`;
+  });
+  return sections.join("\n\n");
+}
+
 export interface StatsData {
   turns: number | undefined;
   toolCount: number | undefined;

package/src/index.ts

@@ -3,6 +3,7 @@ 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";
+import { formatParallelResults } from "./format.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";
@@ -110,7 +111,7 @@ export function registerSubagent(pi: ExtensionAPI): void {
         });
 
         return {
-          content: [{ type: "text", text: formatResultsSummary(results) }],
+          content: [{ type: "text", text: formatParallelResults(results) }],
           details: {
             mode: "parallel",
             results,
@@ -281,17 +282,6 @@ function formatProgressSummary(progress: SubagentProgress[]): string {
   return lines.join("\n");
 }
 
-function formatResultsSummary(results: SubagentResult[]): string {
-  const lines = results.map((r) => {
-    const status = r.exitCode === 0 ? "✓" : "✗";
-    const summary = r.progressSummary
-      ? `${r.progressSummary.toolCount} tools · ${Math.round(r.progressSummary.tokens / 1000)}k tok · ${Math.round(r.progressSummary.durationMs / 1000)}s`
-      : "";
-    return `${status} ${r.agent}${summary ? " " + summary : ""}`;
-  });
-  return lines.join("\n");
-}
-
 // ── Command registration ────────────────────────────────────────────────────
 
 export function registerAgentsCommand(pi: ExtensionAPI): void {