@d3ara1n/pi-subagent 1.6.0 → 1.7.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@d3ara1n/pi-subagent",
-  "version": "1.6.0",
+  "version": "1.7.1",
   "type": "module",
   "description": "Role-based subagent orchestration for pi — delegates tasks to specialized pi child processes with configurable model roles",
   "main": "src/index.ts",

package/src/index.ts

@@ -162,6 +162,10 @@ export default function subagentExtension(pi: ExtensionAPI) {
       "- Parallel: multiple subagent_delegate calls at the same time run concurrently — foreground and background alike, no special flag.",
       "- Background (background: true): non-blocking — returns an id immediately so you can do your own work while the run executes.",
       "",
+      "RUN HISTORY:",
+      "",
+      "- Every spawned run is audited to ~/.pi/subagent/history/{sessionId}/{toolCallId}.json (toolCallId = the delegate call's id). The file holds the FULL raw output even when you received a compressed/truncated version, plus the task, activity log, and usage.",
+      "",
       "BACKGROUND DELEGATION:",
       "",
       "- Use it only when you have your own work this turn (including an ongoing discussion with the user) while the run executes; otherwise let the call block and return the result directly.",

package/src/spawn.ts

@@ -367,11 +367,12 @@ export async function spawnSubagent(
       // RPC command acknowledgements ("response" lines) carry no agent state.
       if (event.type === "response") return;
 
-      // RPC mode is a resident server: after the task completes (agent_end) the
-      // process would idle forever waiting for more stdin commands. We run one
-      // prompt per child, so ending our stdin side triggers its graceful
-      // shutdown (onInputEnd → runtime dispose → exit).
-      if (event.type === "agent_end") {
+      // RPC mode is a resident server. agent_end only marks one low-level run
+      // and may be followed by an automatic retry, compaction, or queued
+      // continuation. agent_settled is the authoritative terminal event. We run
+      // one prompt per child, so ending stdin there triggers graceful shutdown
+      // (onInputEnd → runtime dispose → exit).
+      if (event.type === "agent_settled") {
         try {
           proc?.stdin?.end();
         } catch {
@@ -398,8 +399,11 @@ export async function spawnSubagent(
             );
           }
           if (!result.model && msg.model) result.model = msg.model;
-          if (msg.stopReason) result.stopReason = msg.stopReason;
-          if (msg.errorMessage) result.errorMessage = msg.errorMessage;
+          // message_end is authoritative for the latest assistant attempt. A
+          // successful native retry must clear the transient error left by the
+          // failed attempt instead of triggering a redundant whole-run fallback.
+          result.stopReason = msg.stopReason;
+          result.errorMessage = msg.errorMessage;
 
           // Track last assistant text
           for (const part of msg.content) {

package/src/utils.test.ts

@@ -41,6 +41,7 @@ import {
   createThrottler,
   terminalResultLine,
   buildDisplayItems,
+  formatToolCall,
 } from "./utils.ts";
 import type { ActivityEntry, SubagentResult, SubagentRole } from "./types.ts";
 
@@ -427,6 +428,28 @@ describe("terminalResultLine", () => {
   test("finishedText replaces the success chain (wait's status-only line)", () => {
     assert.equal(terminalResultLine(baseResult(), id, "finished"), "\u2713 finished");
   });
+  test("error message newlines are flattened to one line", () => {
+    assert.equal(
+      terminalResultLine(baseResult({ exitCode: 1, errorMessage: "boom\n  at frame 2\nat frame 3" }), id),
+      "\u2717 boom at frame 2 at frame 3",
+    );
+  });
+});
+
+// ── formatToolCall: single-line guarantee for TUI rows ──
+describe("formatToolCall newline sanitization", () => {
+  const id = (_color: string, text: string) => text;
+
+  test("multi-line bash command renders as one line", () => {
+    const out = formatToolCall("bash", { command: "echo a\necho b\n  echo c" }, id);
+    assert.ok(!out.includes("\n"));
+    assert.equal(out, "$ echo a echo b echo c");
+  });
+  test("default branch preview flattens embedded newlines", () => {
+    const out = formatToolCall("fetch", { url: "https://x.test/a\n/b" }, id);
+    assert.ok(!out.includes("\n"));
+    assert.ok(out.includes("https://x.test/a /b"));
+  });
 });
 
 // ── createThrottler: burst coalescing for onUpdate ──

package/src/utils.ts

@@ -136,10 +136,30 @@ export function shortenPath(p: string): string {
   return p.startsWith(home) ? `~${p.slice(home.length)}` : p;
 }
 
+/** Flatten embedded newlines (multi-line bash commands, patterns, error
+ *  messages) into single spaces so a row never spans multiple terminal lines.
+ *  Every caller renders the result as ONE TUI row — inline rows join it with
+ *  "\n" separators and the :view overlay wraps each row in a border frame. */
+function oneLine(s: string): string {
+  return s.replace(/\s*\r?\n\s*/g, " ");
+}
+
+/**
+ * One-line tool-call row for TUI display. Newline sanitization happens here
+ * at the single choke point so every tool branch is covered.
+ */
 export function formatToolCall(
   toolName: string,
   args: Record<string, unknown>,
   fg: (color: string, text: string) => string,
+): string {
+  return oneLine(renderToolCall(toolName, args, fg));
+}
+
+function renderToolCall(
+  toolName: string,
+  args: Record<string, unknown>,
+  fg: (color: string, text: string) => string,
 ): string {
   switch (toolName) {
     case "subagent_delegate": {
@@ -306,7 +326,7 @@ function failureResultText(r: {
   const isCancelled = r.stopReason === "cancelled";
   return {
     content:
-      r.errorMessage ||
+      oneLine(r.errorMessage || "") ||
       (isTimeout ? "Timed out" : isBudget ? "Budget exceeded" : isCancelled ? "Cancelled" : "failed"),
     // Timeout/budget/cancel are intentional stops with partial output —
     // warning, not the error red reserved for real failures.