@juicesharp/rpiv-pi 0.12.0 → 0.12.2

package/extensions/subagent-widget/renderer-override.test.ts

@@ -0,0 +1,98 @@
+import type { Theme } from "@mariozechner/pi-coding-agent";
+import { Text } from "@mariozechner/pi-tui";
+import { describe, expect, it, vi } from "vitest";
+
+// Stub the full renderer so the terminal-state branch returns a recognisable sentinel
+// instead of executing nicobailon's real renderer (which needs a full Theme).
+// vi.hoisted is required because vi.mock factories are top-hoisted and can't close
+// over file-level consts.
+const { renderSubagentResultMock } = vi.hoisted(() => ({
+	renderSubagentResultMock: vi.fn(() => ({ __sentinel: "full-render" }) as unknown),
+}));
+vi.mock("pi-subagents/render", () => ({ renderSubagentResult: renderSubagentResultMock }));
+
+import { buildQuietRenderResult } from "./renderer-override.js";
+
+function makeTheme(): Theme {
+	return {
+		fg: (_c: string, t: string) => t,
+		bold: (t: string) => t,
+	} as unknown as Theme;
+}
+
+describe("buildQuietRenderResult — layout-stable quiet card", () => {
+	it("emits ONE Text line when progress.status === 'running'", () => {
+		const render = buildQuietRenderResult();
+		const out = render(
+			{ details: { results: [{ agent: "x", progress: { status: "running" } }] } },
+			{ expanded: false },
+			makeTheme(),
+		);
+		expect(out).toBeInstanceOf(Text);
+		expect(renderSubagentResultMock).not.toHaveBeenCalled();
+	});
+
+	it("emits ONE Text line when progress.status === 'pending'", () => {
+		const render = buildQuietRenderResult();
+		const out = render(
+			{ details: { results: [{ agent: "x", progress: { status: "pending" } }] } },
+			{ expanded: false },
+			makeTheme(),
+		);
+		expect(out).toBeInstanceOf(Text);
+	});
+
+	it("emits ONE Text line when progress is MISSING (pre-progress partial update)", () => {
+		const render = buildQuietRenderResult();
+		// First partialResult often arrives before pi-subagents stamps progress.
+		// Previously fell through to full renderer → N-line card mid-stream →
+		// layout shift → physical-row stacking. Now stays 1-line.
+		const out = render({ details: { results: [{ agent: "x" }] } }, { expanded: false }, makeTheme());
+		expect(out).toBeInstanceOf(Text);
+		expect(renderSubagentResultMock).not.toHaveBeenCalled();
+	});
+
+	it("emits ONE Text line when result.details itself is missing (very first frame)", () => {
+		const render = buildQuietRenderResult();
+		const out = render({}, { expanded: false }, makeTheme());
+		expect(out).toBeInstanceOf(Text);
+	});
+
+	it("delegates to full renderer once exitCode lands (terminal state)", () => {
+		renderSubagentResultMock.mockClear();
+		const render = buildQuietRenderResult();
+		const out = render(
+			{ details: { results: [{ agent: "x", exitCode: 0, progress: { status: "complete" } }] } },
+			{ expanded: false },
+			makeTheme(),
+		);
+		expect(renderSubagentResultMock).toHaveBeenCalledOnce();
+		expect((out as { __sentinel?: string }).__sentinel).toBe("full-render");
+	});
+
+	it("delegates to full renderer on error stopReason", () => {
+		renderSubagentResultMock.mockClear();
+		const render = buildQuietRenderResult();
+		const out = render(
+			{ details: { results: [{ agent: "x", stopReason: "error" }] } },
+			{ expanded: false },
+			makeTheme(),
+		);
+		expect(renderSubagentResultMock).toHaveBeenCalledOnce();
+		expect((out as { __sentinel?: string }).__sentinel).toBe("full-render");
+	});
+
+	it("treats exitCode present + status=running as NON-terminal (streaming finalisation window)", () => {
+		renderSubagentResultMock.mockClear();
+		const render = buildQuietRenderResult();
+		// Mid-transition frames can have exitCode set before progress.status
+		// leaves "running". Should stay quiet until status clears.
+		const out = render(
+			{ details: { results: [{ agent: "x", exitCode: 0, progress: { status: "running" } }] } },
+			{ expanded: false },
+			makeTheme(),
+		);
+		expect(out).toBeInstanceOf(Text);
+		expect(renderSubagentResultMock).not.toHaveBeenCalled();
+	});
+});

package/extensions/subagent-widget/renderer-override.ts

@@ -34,30 +34,45 @@ interface ProgressLike {
 interface ResultLike {
 	agent?: string;
 	progress?: ProgressLike;
+	exitCode?: number;
+	stopReason?: string;
 }
 interface DetailsLike {
 	results?: ResultLike[];
 }
 
-function buildQuietRenderResult(): (
+// Layout-stable quiet card height: while the subagent is non-terminal, emit EXACTLY
+// one `Text` line. If we fell through to the full renderer whenever progress.status
+// was missing (pre-progress partial updates), the card would flip 1-line ↔ N-line
+// every few frames mid-stream — same physical-row-stacking pathology that ghosted
+// the overlay rows before the run-tracker newline fix.
+//
+// Terminal state: exitCode or stopReason is present on the last SingleResult AND
+// progress.status is not in the running set. Anything else is treated as running,
+// including "no progress yet" (status === undefined) and the first tool_execution_*
+// frames before pi-subagents has stamped progress.
+function isTerminal(r: ResultLike | undefined): boolean {
+	if (!r) return false;
+	const status = r.progress?.status;
+	if (status === "pending" || status === "running") return false;
+	return r.exitCode != null || r.stopReason != null;
+}
+
+export function buildQuietRenderResult(): (
 	result: { details?: DetailsLike; content?: Array<{ type: string; text?: string }> },
 	options: { expanded: boolean },
 	theme: Theme,
 ) => unknown {
 	return (result, options, theme) => {
 		const r = result.details?.results?.[0];
-		const status: string | undefined = r?.progress?.status;
-		if (status !== "pending" && status !== "running") {
+		if (isTerminal(r)) {
 			return renderSubagentResult(result, options, theme);
 		}
-		// renderCall already shows "subagent <agent>" above — avoid repeating
-		// the identity. Todo-style glyph + status (single line), directly
-		// under the tool-call header. Glyphs mirror packages/rpiv-todo/
-		// todo-overlay.ts:28-35 for a consistent status language across
-		// overlays.
+		// Non-terminal → single-line status. Renders under the tool-call header,
+		// glyph at column 0 to align with "subagent <agent>" above. Glyphs mirror
+		// packages/rpiv-todo/todo-overlay.ts:28-35 for consistent status language.
+		const status = r?.progress?.status ?? "running";
 		const glyph = status === "pending" ? theme.fg("dim", "○") : theme.fg("warning", "◐");
-		// Glyph at column 0 — aligned directly under the "s" of "subagent"
-		// in the renderCall line above (pi prints that at column 0 too).
 		return new Text(`${glyph} ${theme.fg("muted", status)}`, 0, 0);
 	};
 }

package/extensions/subagent-widget/run-tracker.test.ts

@@ -199,3 +199,53 @@ describe("run-tracker __resetState", () => {
 		expect(hasAnyVisible()).toBe(false);
 	});
 });
+
+describe("run-tracker newline sanitization", () => {
+	it("collapses embedded newlines in single-mode task descriptions", () => {
+		__resetState();
+		onStart("t1", {
+			agent: "peer-comparator",
+			task: "Peer-mirror check.\n\nPeerPairs (orchestrator-computed):\n[list of tuples]\n\nFor each pair, Read BOTH files.",
+		});
+		const [run] = listRuns();
+		expect(run.description).not.toMatch(/[\r\n]/);
+		expect(run.description.startsWith("Peer-mirror check.")).toBe(true);
+		expect(run.description).toContain("PeerPairs (orchestrator-computed):");
+	});
+
+	it("collapses newlines in displayName too (defensive)", () => {
+		__resetState();
+		onStart("t1", { agent: "weird\nname", task: "x" });
+		const [run] = listRuns();
+		expect(run.displayName).not.toMatch(/[\r\n]/);
+		expect(run.displayName).toBe("weird name");
+	});
+
+	it("sanitizes errorMessage on terminal state", () => {
+		__resetState();
+		onStart("t1", { agent: "x", task: "t" });
+		onEnd(
+			"t1",
+			{
+				details: makeDetails("single", [
+					makeResult({
+						exitCode: 1,
+						stopReason: "error",
+						errorMessage: "boom\nat foo\nat bar",
+					}),
+				]),
+			},
+			true,
+		);
+		const [run] = listRuns();
+		expect(run.errorMessage).not.toMatch(/[\r\n]/);
+		expect(run.errorMessage).toBe("boom at foo at bar");
+	});
+
+	it("preserves single-line descriptions unchanged", () => {
+		__resetState();
+		onStart("t1", { agent: "scout", task: "probe auth module" });
+		const [run] = listRuns();
+		expect(run.description).toBe("probe auth module");
+	});
+});

package/extensions/subagent-widget/run-tracker.ts

@@ -21,6 +21,13 @@ interface SubagentArgs {
 	chain?: Array<{ agent: string; task: string }>;
 }
 
+// Multi-line skill prompts (e.g. peer-comparator with `PeerPairs (orchestrator-computed):` inlined)
+// must not ship embedded newlines into the widget's string[] output — pi-tui tracks logical lines
+// but the terminal splits on \n into physical rows it can't clear, leaving stale duplicate blocks.
+function oneLine(s: string): string {
+	return s.replace(/\s*[\r\n]+\s*/g, " ").trim();
+}
+
 function inferMode(args: SubagentArgs): RunMode {
 	if (args.chain && args.chain.length > 0) return "chain";
 	if (args.tasks && args.tasks.length > 0) return "parallel";
@@ -44,17 +51,17 @@ function deriveDisplay(args: SubagentArgs, mode: RunMode): { displayName: string
 		const steps = args.chain ?? [];
 		return {
 			displayName: `chain (${steps.length} steps)`,
-			description: steps.map((s) => s.agent).join(" → "),
+			description: oneLine(steps.map((s) => s.agent).join(" → ")),
 		};
 	}
 	if (mode === "parallel") {
 		const tasks = args.tasks ?? [];
 		return {
 			displayName: `parallel (${tasks.length} tasks)`,
-			description: tasks[0]?.agent ?? "",
+			description: oneLine(tasks[0]?.agent ?? ""),
 		};
 	}
-	return { displayName: args.agent ?? "subagent", description: args.task ?? "" };
+	return { displayName: oneLine(args.agent ?? "subagent"), description: oneLine(args.task ?? "") };
 }
 
 function deriveTerminalStatus(isError: boolean, results: readonly SingleResult[]): RunStatus {
@@ -107,7 +114,8 @@ export function onEnd(toolCallId: string, result: { details?: SubagentDetails }
 	run.completedAt = Date.now();
 	run.status = deriveTerminalStatus(isError, run.results);
 	const last = run.results[run.results.length - 1];
-	run.errorMessage = last?.errorMessage || (isError ? last?.stderr : undefined) || undefined;
+	const rawErr = last?.errorMessage || (isError ? last?.stderr : undefined) || undefined;
+	run.errorMessage = rawErr ? oneLine(rawErr) : undefined;
 	finishedAge.set(toolCallId, 0);
 }
 

package/extensions/subagent-widget/widget.render.test.ts

@@ -220,3 +220,49 @@ describe("SubagentWidget render — invalidate", () => {
 		expect(captured.length).toBe(2);
 	});
 });
+
+describe("SubagentWidget render — newline safety", () => {
+	it("never emits embedded newlines even with multi-line tasks (running)", () => {
+		onStart("t1", {
+			agent: "peer-comparator",
+			task: "Peer-mirror check.\n\nPeerPairs (orchestrator-computed):\n[list of (new_file, peer_file) tuples]\n\nFor each pair, Read BOTH files in full.",
+		});
+		onUpdate("t1", makeDetails("single", [makeResult()]));
+		const { ctx, captured } = makeUICtx();
+		const lines = renderOnce(new SubagentWidget(), ctx, captured);
+		for (const line of lines) {
+			expect(line).not.toMatch(/[\r\n]/);
+		}
+	});
+
+	it("never emits embedded newlines after the run completes (finished line)", () => {
+		onStart("t1", {
+			agent: "peer-comparator",
+			task: "Peer-mirror check.\n\nPeerPairs (orchestrator-computed):\n[list]",
+		});
+		onEnd("t1", { details: makeDetails("single", [makeResult()]) }, false);
+		const { ctx, captured } = makeUICtx();
+		const lines = renderOnce(new SubagentWidget(), ctx, captured);
+		for (const line of lines) {
+			expect(line).not.toMatch(/[\r\n]/);
+		}
+	});
+
+	it("never emits embedded newlines in error trail", () => {
+		onStart("t1", { agent: "scout", task: "x" });
+		onEnd(
+			"t1",
+			{
+				details: makeDetails("single", [
+					makeResult({ exitCode: 1, stopReason: "error", errorMessage: "boom\nstack\nmore" }),
+				]),
+			},
+			true,
+		);
+		const { ctx, captured } = makeUICtx();
+		const lines = renderOnce(new SubagentWidget(), ctx, captured);
+		for (const line of lines) {
+			expect(line).not.toMatch(/[\r\n]/);
+		}
+	});
+});

package/extensions/subagent-widget/widget.ts

@@ -21,6 +21,10 @@ import type { AgentProgress, SingleResult, TrackedRun } from "./types.js";
 // Strip SGR ANSI escapes to measure visible width for layout math.
 const ANSI_RE = /\x1b\[[0-9;]*m/g;
 const visibleLen = (s: string): number => s.replace(ANSI_RE, "").length;
+// Defensive: any \n in a returned string[] element splits into physical rows pi-tui can't
+// track, leaving stale artifacts every frame. Run-tracker sanitizes at ingest; this guard
+// covers any future caller that mutates description/displayName directly on the tracked run.
+const oneLine = (s: string): string => s.replace(/\s*[\r\n]+\s*/g, " ");
 
 export class SubagentWidget {
 	private uiCtx: ExtensionUIContext | undefined;
@@ -187,10 +191,10 @@ export class SubagentWidget {
 			const total = run.results.length;
 			descriptor = total > 0 ? `${done}/${total} done` : "starting";
 		} else {
-			descriptor = run.description;
+			descriptor = oneLine(run.description);
 		}
 
-		const prefix = `${theme.fg("dim", "├─")} ${theme.fg("accent", frame)} ${theme.bold(run.displayName)}`;
+		const prefix = `${theme.fg("dim", "├─")} ${theme.fg("accent", frame)} ${theme.bold(oneLine(run.displayName))}`;
 		const tail = `${theme.fg("dim", "·")} ${theme.fg("dim", stats)}`;
 		// Overhead: "  " between prefix+descriptor, " " between descriptor+tail.
 		const budget = Math.max(0, width - visibleLen(prefix) - 2 - 1 - visibleLen(tail));
@@ -221,11 +225,11 @@ export class SubagentWidget {
 			trail = theme.fg("warning", " aborted");
 		} else {
 			icon = theme.fg("error", "✗");
-			const msg = run.errorMessage ? `: ${run.errorMessage.slice(0, 60)}` : "";
+			const msg = run.errorMessage ? `: ${oneLine(run.errorMessage).slice(0, 60)}` : "";
 			trail = theme.fg("error", ` error${msg}`);
 		}
 		const body =
-			`${icon} ${theme.fg("dim", run.displayName)}  ${theme.fg("dim", run.description)} ` +
+			`${icon} ${theme.fg("dim", oneLine(run.displayName))}  ${theme.fg("dim", oneLine(run.description))} ` +
 			`${theme.fg("dim", "·")} ${theme.fg("dim", stats)}${trail}`;
 		return truncate(`${theme.fg("dim", "├─")} ${body}`);
 	}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@juicesharp/rpiv-pi",
-  "version": "0.12.0",
+  "version": "0.12.2",
   "description": "Skill-based development workflow for Pi Agent — discover, research, design, plan, implement, validate",
   "keywords": [
     "pi-package",