brl-subagent 2.3.9 → 2.5.0

package/src/tui.ts

@@ -1,3 +1,4 @@
+// Purpose: All TUI surfaces: config menus, preset/template managers, history, live monitor, and result rendering.
 /**
  * brl-subagent — TUI Components
  *
@@ -13,11 +14,10 @@ import type {
 	ToolRenderResultOptions,
 } from "@earendil-works/pi-coding-agent";
 import { DynamicBorder, getMarkdownTheme } from "@earendil-works/pi-coding-agent";
-import { Container, type SelectItem, SelectList, Spacer, Text, Markdown } from "@earendil-works/pi-tui";
+import { Container, type Component, type SelectItem, SelectList, Spacer, Text, Markdown, matchesKey } from "@earendil-works/pi-tui";
 import type { Api, Model } from "@earendil-works/pi-ai";
 import type { AgentToolResult } from "@earendil-works/pi-agent-core";
 import type {
-	SubagentPreset,
 	TaskTemplate,
 	SubagentResult,
 	SubagentRun,
@@ -28,7 +28,6 @@ import type {
 	GraphDetails,
 	DelegateTaskDetails,
 	GraphTask,
-	SubTaskResult,
 	ThinkingLevel,
 	UsageStats,
 	FileDiff,
@@ -42,8 +41,7 @@ import {
 	COLLAPSED_OUTPUT_LINES,
 	COLLAPSED_DIFF_FILES_PREVIEW,
 	EXPANDED_HUNKS_PER_FILE,
-	RESERVED_NAME_PATTERN,
-	RESERVED_COMMAND_NAMES,
+	DEFAULT_OUTPUT_CAP_BYTES,
 	formatTokens,
 	formatUsageStats,
 	formatModel,
@@ -52,15 +50,16 @@ import {
 	isSubagentError,
 	isMultiSubagentDetails,
 	isGraphDetails,
+	isUnsettledPartial,
 } from "./types";
 import { buildFileAccessReport, buildSecretsExposureReport, generateComplianceSummary } from "./reports";
-import { extractParamNames, loadAllTemplates, validateTemplatePresetRefs } from "./templates";
+import { extractParamNames } from "./templates";
 import { parseDiff } from "./diff";
-import { formatPresetSummary, getPreset, getAllPresets, writePresetFile, loadCustomPresets, parseFrontmatter } from "./presets";
-import { formatRunDuration } from "./history";
+import { formatPresetSummary, getPreset, loadCustomPresets } from "./presets";
+import { buildOutputHonestyLines, formatRunDuration } from "./history";
 import * as fs from "node:fs";
 import * as path from "node:path";
-import { sweepStaleLiveSubagents, type SessionState } from "./state";
+import { collapseRunsForHistory, sweepStaleLiveSubagents, type SessionState } from "./state";
 import { getAgent } from "./session-manager";
 import { computeSLAMetrics, computeCostTrend, formatSparkline } from "./metrics";
 import { formatElapsed, liveRowName, liveSpinner, formatLiveRowDim } from "./tui-format";
@@ -638,185 +637,6 @@ export async function showComplianceMenu(
 
 // Preset management UI
 
-export async function showAddPreset(
-	ctx: ExtensionContext,
-	state: SessionState,
-): Promise<void> {
-	// 1. Prompt for name
-	const name = await ctx.ui.input("Preset name (e.g., read-only-audit):");
-	if (!name?.trim()) return;
-	const trimmedName = name.trim();
-
-	// 2. Validate name (reserved patterns, existing presets)
-	if (RESERVED_NAME_PATTERN.test(trimmedName)) {
-		ctx.ui.notify("Names starting and ending with '__' are reserved.", "error");
-		return;
-	}
-	if (RESERVED_COMMAND_NAMES.has(trimmedName)) {
-		ctx.ui.notify("Name '" + trimmedName + "' is reserved for a command.", "error");
-		return;
-	}
-	if (getPreset(trimmedName, state.builtinPresets, state.customPresets)) {
-		ctx.ui.notify(`Preset "${trimmedName}" already exists.`, "error");
-		return;
-	}
-
-	// 3. Description
-	const description = await ctx.ui.input("Description (optional):");
-
-	// 4. Thinking level
-	const thinkingItems: SelectItem[] = [
-		{ value: "", label: "(not set — use conductor's choice)" },
-		...THINKING_LEVELS.map((level) => ({ value: level, label: level })),
-	];
-	const thinkingResult = await showSelectList(ctx, "Default Thinking Level", thinkingItems, 8);
-
-	// 5. Tool scope
-	const scopeItems: SelectItem[] = [
-		{ value: "all", label: "All tools (default)" },
-		{ value: "readonly", label: "Read-only (read, grep, find, ls)" },
-		{ value: "custom", label: "Custom tool list..." },
-	];
-	const scopeResult = await showSelectList(ctx, "Tool Scope", scopeItems, 5);
-
-	let tools: string[] | undefined;
-	let excludeTools: string[] | undefined;
-	let noBuiltinTools: boolean | undefined;
-
-	if (scopeResult === "readonly") {
-		tools = ["read", "grep", "find", "ls"];
-		excludeTools = ["write", "edit", "bash"];
-	} else if (scopeResult === "custom") {
-		const toolsStr = await ctx.ui.input("Tools (comma-separated):");
-		if (toolsStr?.trim()) tools = toolsStr.split(",").map((t) => t.trim()).filter(Boolean);
-	}
-
-	// 6. Inheritance
-	const inheritItems: SelectItem[] = [
-		{ value: "true", label: "Inherit system prompt (default)" },
-		{ value: "false", label: "No inheritance (standalone)" },
-	];
-	const inheritResult = await showSelectList(ctx, "System Prompt Inheritance", inheritItems, 3);
-
-	// 7. System prompt body
-	const systemPrompt = await ctx.ui.input("System prompt (optional, multi-line not supported yet):");
-
-	// 8. Build preset object
-	const preset: SubagentPreset = {
-		name: trimmedName,
-		description: description?.trim() || undefined,
-		thinkingLevel: thinkingResult || undefined,
-		inheritSystemPrompt: inheritResult === "false" ? false : undefined,
-		tools,
-		excludeTools,
-		noBuiltinTools,
-		systemPrompt: systemPrompt?.trim() || undefined,
-	};
-
-	// 9. Ask where to save
-	const locationItems: SelectItem[] = [
-		{ value: "project", label: "Project (.pi/brl-subagent/presets/)" },
-		{ value: "global", label: "Global (~/.pi/agent/brl-subagent/presets/)" },
-	];
-	const location = await showSelectList(ctx, "Save Location", locationItems, 3);
-	if (!location) return;
-
-	const homedir = process.env.HOME || process.env.USERPROFILE || "";
-	const targetDir = location === "project"
-		? path.join(ctx.cwd, ".pi", "brl-subagent", "presets")
-		: path.join(homedir, ".pi", "agent", "brl-subagent", "presets");
-
-	// 10. Write file
-	try {
-		writePresetFile(preset, targetDir);
-		// 11. Refresh custom presets
-		state.customPresets = loadCustomPresets(ctx.cwd, state.log);
-		// Reload templates alongside presets — both are file-derived, and a
-		// preset add/remove may fix (or break) a template's `preset:` reference.
-		// Full stack: custom (project+global) merged over builtins.
-		state.config.templates = loadAllTemplates(ctx.cwd, state.log);
-		// Issue #81: re-check template `preset:` refs after the mutation — warn
-		// (never skip) for dangling references instead of preset-less runs.
-		validateTemplatePresetRefs(
-			state.config.templates,
-			getAllPresets(state.builtinPresets, state.customPresets),
-			state.log,
-		);
-		ctx.ui.notify(`Preset "${trimmedName}" saved to ${location === "project" ? "project" : "global"} directory`, "info");
-	} catch (err) {
-		ctx.ui.notify(`Failed to save preset: ${(err as Error).message}`, "error");
-	}
-}
-
-export async function showRemovePreset(
-	ctx: ExtensionContext,
-	state: SessionState,
-): Promise<void> {
-	const homedir = process.env.HOME || process.env.USERPROFILE || "";
-	const projectDir = path.join(ctx.cwd, ".pi", "brl-subagent", "presets");
-	const globalDir = path.join(homedir, ".pi", "agent", "brl-subagent", "presets");
-
-	// Scan both directories for .md files
-	const entries: Array<{ name: string; source: "project" | "global"; filePath: string }> = [];
-
-	for (const dir of [projectDir, globalDir]) {
-		const source = dir === projectDir ? "project" : "global";
-		try {
-			const files = fs.readdirSync(dir);
-			for (const file of files) {
-				if (!file.endsWith(".md")) continue;
-				const filePath = path.join(dir, file);
-				try {
-					const content = fs.readFileSync(filePath, "utf-8");
-					const { meta } = parseFrontmatter(content);
-					if (meta.name && typeof meta.name === "string") {
-						entries.push({ name: meta.name as string, source, filePath });
-					}
-				} catch {
-					// Skip unparseable files
-				}
-			}
-		} catch {
-			// Directory doesn't exist — fine
-		}
-	}
-
-	if (entries.length === 0) {
-		ctx.ui.notify("No custom presets to remove.", "info");
-		return;
-	}
-
-	// Show list with source indicators
-	const items: SelectItem[] = entries.map((e) => ({
-		value: e.filePath,
-		label: `[${e.source === "project" ? "P" : "G"}] ${e.name}`,
-		description: e.source === "project" ? "Project-local" : "Global",
-	}));
-
-	const result = await showSelectList(ctx, "Remove Preset", items, 10);
-	if (!result) return;
-
-	// Delete the file
-	try {
-		fs.unlinkSync(result);
-		state.customPresets = loadCustomPresets(ctx.cwd, state.log);
-		// Reload templates too — a removed preset may orphan a template's
-		// `preset:` reference, so both file-derived collections refresh together.
-		// Full stack: custom (project+global) merged over builtins.
-		state.config.templates = loadAllTemplates(ctx.cwd, state.log);
-		// Issue #81: re-check template `preset:` refs after the mutation — warn
-		// (never skip) for dangling references instead of preset-less runs.
-		validateTemplatePresetRefs(
-			state.config.templates,
-			getAllPresets(state.builtinPresets, state.customPresets),
-			state.log,
-		);
-		ctx.ui.notify("Preset removed", "info");
-	} catch (err) {
-		ctx.ui.notify(`Failed to remove preset: ${(err as Error).message}`, "error");
-	}
-}
-
 export async function showPresetManager(
 	ctx: ExtensionContext,
 	state: SessionState,
@@ -1270,127 +1090,253 @@ export async function showRunHistory(
 	state: SessionState,
 	persistState: () => void,
 ): Promise<void> {
-	const runs = state.getRunEntries(ctx).reverse();
-
-	if (runs.length === 0) {
-		ctx.ui.notify("No subagent runs recorded yet. Delegate a task to see history.", "info");
-		return;
-	}
-
 	const statusIcon: Record<string, string> = {
 		running: ctx.ui.theme.fg("accent", "◉"),
 		done: ctx.ui.theme.fg("success", "✓"),
 		failed: ctx.ui.theme.fg("error", "✗"),
 	};
 
-	const items: SelectItem[] = runs.map((r) => {
-		const icon = statusIcon[r.status] || "·";
-		const name = r.label || r.task.slice(0, 60);
-		const model = r.model.split("/").pop() || r.model;
-		const when = r.finishedAt ? formatRunDuration(r.durationMs || 0) : "running...";
-		const cost = r.cost ? ` $${r.cost.toFixed(4)}` : "";
-		const desc = `${r.thinkingLevel} · ${model} · ${when}${cost}`;
-		return { value: r.id, label: `${icon} ${name}`, description: desc };
-	});
+	// Browse loop (issue #260): list → detail → list … until the LIST is exited
+	// with Esc. Closing a detail returns here, not to the /brl-subagent menu.
+	while (true) {
+		// One row per SETTLED run (issue #259): collapse each run's spawn+terminal
+		// entry pair to its terminal-preferred record; in-flight runs are omitted
+		// (the live monitor owns running state).
+		const runs = collapseRunsForHistory(state.getRunEntries(ctx));
+
+		if (runs.length === 0) {
+			ctx.ui.notify("No subagent runs recorded yet. Delegate a task to see history.", "info");
+			return;
+		}
 
-	const selectedId = await showSelectList(ctx, "Subagent History", items, 15);
-	if (!selectedId) return;
+		const items: SelectItem[] = runs.map((r) => {
+			const icon = statusIcon[r.status] || "·";
+			const name = r.label || r.task.slice(0, 60);
+			const model = r.model.split("/").pop() || r.model;
+			const when = r.finishedAt ? formatRunDuration(r.durationMs || 0) : "running...";
+			const cost = r.cost ? ` $${r.cost.toFixed(4)}` : "";
+			const desc = `${r.thinkingLevel} · ${model} · ${when}${cost}`;
+			return { value: r.id, label: `${icon} ${name}`, description: desc };
+		});
 
-	const run = runs.find((r) => r.id === selectedId);
-	if (!run) return;
+		const selectedId = await showSelectList(ctx, "Subagent History", items, 15);
+		if (!selectedId) return; // Esc at the list exits to the menu
 
-	// Mark as seen
-	if (state.markRunSeen(run.id)) {
-		persistState();
-		import("./concurrency").then(({ updateProgressStatus }) => {
-			updateProgressStatus(state, ctx);
-		});
+		const run = runs.find((r) => r.id === selectedId);
+		if (!run) continue; // selected run pruned since listing — re-show the list
+
+		// Mark as seen
+		if (state.markRunSeen(run.id)) {
+			persistState();
+			import("./concurrency").then(({ updateProgressStatus }) => {
+				updateProgressStatus(state, ctx);
+			});
+		}
+
+		await showRunDetail(ctx, run);
 	}
+}
 
-	// Show detail view
-	await ctx.ui.custom<void>((tui, theme, _kb, done) => {
-		const container = new Container();
-		container.addChild(new DynamicBorder((s: string) => theme.fg("accent", s)));
+/**
+ * Number of output lines a run-detail viewport shows at once (issue #261):
+ * the stored text can be up to the 100 KB cap, so the panel is height-capped
+ * and scrolled rather than dumped whole (which would push the footer and
+ * header off-screen).
+ */
+const RUN_DETAIL_OUTPUT_VIEWPORT_LINES = 12;
 
-		const statusLabel =
-			run.status === "done" ? "Completed" : run.status === "failed" ? "Failed" : "Running";
-		container.addChild(
-			new Text(
-				theme.fg(
-					"toolTitle",
-					theme.bold(`${run.label || "Subagent"} — ${statusLabel}`),
-				),
-				1,
-				0,
-			),
-		);
-		container.addChild(new Text("", 0, 0));
-		container.addChild(
-			new Text(theme.fg("dim", `Task: ${run.task.slice(0, 200)}`), 1, 0),
-		);
-		container.addChild(
-			new Text(
-				theme.fg("dim", `Model: ${run.model} · Thinking: ${run.thinkingLevel}`),
-				1,
-				0,
-			),
-		);
-		container.addChild(new Text(theme.fg("dim", `Started: ${run.startedAt}`), 1, 0));
-		if (run.finishedAt) {
-			container.addChild(
+/**
+ * Detail view for one settled run (issue #260, #261): ↑/↓ and PgUp/PgDn scroll
+ * the stored output; any OTHER key — including Esc — closes it. The
+ * showRunHistory browse loop re-shows the list on return.
+ *
+ * The output region follows the approval dialog's full-diff view structure
+ * (see `showApprovalDialog.buildDiffView` / `withDiffKeybinding`: a bordered
+ * Container with a title, the content, and a return footer) but adds the
+ * height cap + scroll state that view lacks. Output is wrapped through the
+ * same `Text` component those views use, so wrapping/padding stay consistent.
+ */
+async function showRunDetail(ctx: ExtensionContext, run: SubagentRun): Promise<void> {
+	const outputText = run.fullOutput ?? run.outputSummary ?? "";
+	await ctx.ui.custom<void>((tui, theme, kb, done) => {
+		// First line of the viewport (0 = top). Mutated by scroll keys and
+		// clamped to the wrapped-content length on every render.
+		let scrollTop = 0;
+		// Wrapped output lines for the current width, and the width they were
+		// produced at, so a resize re-wraps and a redraw does not.
+		let wrappedLines: string[] = [];
+		let wrappedWidth = -1;
+
+		const wrapOutput = (width: number): string[] => {
+			if (width === wrappedWidth) return wrappedLines;
+			wrappedLines = new Text(theme.fg("toolOutput", outputText), 1, 0).render(width);
+			wrappedWidth = width;
+			return wrappedLines;
+		};
+
+		const buildOutputSection = (width: number): Container => {
+			const section = new Container();
+			const lines = wrapOutput(width);
+			const total = lines.length;
+			const maxScroll = Math.max(0, total - RUN_DETAIL_OUTPUT_VIEWPORT_LINES);
+			if (scrollTop > maxScroll) scrollTop = maxScroll;
+			if (scrollTop < 0) scrollTop = 0;
+			const from = total === 0 ? 0 : Math.min(scrollTop + 1, total);
+			const to = Math.min(scrollTop + RUN_DETAIL_OUTPUT_VIEWPORT_LINES, total);
+			const indicator =
+				total > RUN_DETAIL_OUTPUT_VIEWPORT_LINES
+					? `  (lines ${from}\u2013${to} of ${total} \u00b7 \u2191\u2193 / PgUp\u00b7PgDn)`
+					: `  (${total} line${total === 1 ? "" : "s"})`;
+
+			section.addChild(
 				new Text(
-					theme.fg(
-						"dim",
-						`Finished: ${run.finishedAt} (${formatRunDuration(run.durationMs || 0)})`,
-					),
+					theme.fg("muted", "\u2500\u2500\u2500 Output \u2500\u2500\u2500") + theme.fg("dim", indicator),
 					1,
 					0,
 				),
 			);
-		}
-		if (run.cost) {
+
+			if (total === 0) {
+				section.addChild(new Text(theme.fg("dim", "(no output recorded)"), 1, 0));
+				return section;
+			}
+
+			// Height-capped viewport: the output was already wrapped to `width`
+			// above, so hand the sliced lines back directly instead of feeding them
+			// through another Text (which would re-wrap at the padded width).
+			const viewport: Component = {
+				render: () => lines.slice(scrollTop, scrollTop + RUN_DETAIL_OUTPUT_VIEWPORT_LINES),
+				invalidate: () => {
+					wrappedWidth = -1;
+				},
+			};
+			section.addChild(viewport);
+			return section;
+		};
+
+		const buildDetailView = (width: number): Container => {
+			const container = new Container();
+			container.addChild(new DynamicBorder((s: string) => theme.fg("accent", s)));
+
+			const statusLabel =
+				run.status === "done" ? "Completed" : run.status === "failed" ? "Failed" : "Running";
 			container.addChild(
 				new Text(
 					theme.fg(
-						"dim",
-						`Cost: $${run.cost.toFixed(4)} · ↑${formatTokens(run.tokensIn || 0)} ↓${formatTokens(run.tokensOut || 0)}`,
+						"toolTitle",
+						theme.bold(`${run.label || "Subagent"} — ${statusLabel}`),
 					),
 					1,
 					0,
 				),
 			);
-		}
-		if (run.errorMessage) {
-			container.addChild(new Spacer(1));
+			container.addChild(new Text("", 0, 0));
 			container.addChild(
-				new Text(theme.fg("error", `Error: ${run.errorMessage}`), 1, 0),
+				new Text(theme.fg("dim", `Task: ${run.task.slice(0, 200)}`), 1, 0),
 			);
-		}
-		if (run.outputSummary) {
-			container.addChild(new Spacer(1));
 			container.addChild(
 				new Text(
-					theme.fg("muted", "\u2500\u2500\u2500 Output Preview \u2500\u2500\u2500"),
+					theme.fg("dim", `Model: ${run.model} · Thinking: ${run.thinkingLevel}`),
 					1,
 					0,
 				),
 			);
-			container.addChild(
-				new Text(theme.fg("toolOutput", run.outputSummary), 1, 0),
-			);
-			if ((run.outputSummary || "").length >= 200) {
-				container.addChild(new Text(theme.fg("dim", "(first 200 characters)"), 1, 0));
+			container.addChild(new Text(theme.fg("dim", `Started: ${run.startedAt}`), 1, 0));
+			if (run.finishedAt) {
+				container.addChild(
+					new Text(
+						theme.fg(
+							"dim",
+							`Finished: ${run.finishedAt} (${formatRunDuration(run.durationMs || 0)})`,
+						),
+						1,
+						0,
+					),
+				);
+			}
+			if (run.cost) {
+				container.addChild(
+					new Text(
+						theme.fg(
+							"dim",
+							`Cost: $${run.cost.toFixed(4)} · ↑${formatTokens(run.tokensIn || 0)} ↓${formatTokens(run.tokensOut || 0)}`,
+						),
+						1,
+						0,
+					),
+				);
+			}
+			if (run.errorMessage) {
+				container.addChild(new Spacer(1));
+				container.addChild(
+					new Text(theme.fg("error", `Error: ${run.errorMessage}`), 1, 0),
+				);
 			}
-		}
 
-		container.addChild(new Spacer(1));
-		container.addChild(new Text(theme.fg("dim", "Press any key to close"), 1, 0));
-		container.addChild(new DynamicBorder((s: string) => theme.fg("accent", s)));
+			container.addChild(new Spacer(1));
+			container.addChild(buildOutputSection(width));
+			// Honest disclosures (issue #261): the transcript is the only place the
+			// uncapped text lives, and the cap is stated when it was hit.
+			for (const line of buildOutputHonestyLines(run, DEFAULT_OUTPUT_CAP_BYTES)) {
+				container.addChild(new Text(theme.fg("dim", line), 1, 0));
+			}
+
+			container.addChild(new Spacer(1));
+			container.addChild(
+				new Text(
+					theme.fg("dim", "\u2191\u2193 scroll \u00b7 alt+\u2191\u2193 page \u00b7 any other key to close"),
+					1,
+					0,
+				),
+			);
+			container.addChild(new DynamicBorder((s: string) => theme.fg("accent", s)));
+			return container;
+		};
 
 		return {
-			render: (w: number) => container.render(w),
-			invalidate: () => container.invalidate(),
-			handleInput: (_data: string) => done(),
+			render: (w: number) => buildDetailView(w).render(w),
+			invalidate: () => {},
+			handleInput: (data: string) => {
+				// Paging: alt+↑ / alt+↓. Checked BEFORE the plain arrows so an
+				// alt-modified sequence can never be consumed as a line step.
+				// PgUp/PgDn are unusable here: the host binds them to the
+				// alt-screen transcript scroll (`tui.altScreen.pageUp/pageDown`)
+				// and consumes them before a `ctx.ui.custom` overlay sees input —
+				// pi 1.0.2 has no viewport-owner registration for overlays. The
+				// PgUp/PgDn checks below stay for inline mode, where they do
+				// reach the overlay.
+				if (matchesKey(data, "alt+up")) {
+					scrollTop -= RUN_DETAIL_OUTPUT_VIEWPORT_LINES;
+					tui.requestRender();
+					return;
+				}
+				if (matchesKey(data, "alt+down")) {
+					scrollTop += RUN_DETAIL_OUTPUT_VIEWPORT_LINES;
+					tui.requestRender();
+					return;
+				}
+				if (kb.matches(data, "tui.select.up")) {
+					scrollTop -= 1;
+					tui.requestRender();
+					return;
+				}
+				if (kb.matches(data, "tui.select.down")) {
+					scrollTop += 1;
+					tui.requestRender();
+					return;
+				}
+				if (kb.matches(data, "tui.select.pageUp")) {
+					scrollTop -= RUN_DETAIL_OUTPUT_VIEWPORT_LINES;
+					tui.requestRender();
+					return;
+				}
+				if (kb.matches(data, "tui.select.pageDown")) {
+					scrollTop += RUN_DETAIL_OUTPUT_VIEWPORT_LINES;
+					tui.requestRender();
+					return;
+				}
+				done();
+			},
 		};
 	});
 }
@@ -2179,29 +2125,6 @@ function renderCollapsedText(
 	return text;
 }
 
-// ---------------------------------------------------------------------------
-// Chain / parallel helper: one-line subtask summary
-// ---------------------------------------------------------------------------
-
-function renderSubTaskSummary(
-	result: SubTaskResult,
-	theme: {
-		fg: (color: string, text: string) => string;
-	},
-	maxLines: number,
-): string {
-	const isError = isSubagentError(result);
-	const icon = isError
-		? theme.fg("error", "\u2717")
-		: theme.fg("success", "\u2713");
-	const label = result.label
-		? theme.fg("accent", `${result.label}: `)
-		: "";
-	const output = getFinalOutput(result.messages);
-	const preview = output.split("\n").slice(0, maxLines).join("\n");
-	return `${icon} ${label}${theme.fg("toolOutput", preview)}`;
-}
-
 // ---------------------------------------------------------------------------
 // Chain / parallel collapsed rendering
 // ---------------------------------------------------------------------------
@@ -3008,7 +2931,19 @@ export function renderDelegateResult(
 	}
 
 	// Single subagent mode (original)
-	if (!details || details.exitCode === -1) {
+	// Issue #298 (C2): the partial-vs-settled decision lives in ONE place —
+	// `isUnsettledPartial` (src/types.ts) owns the overloaded `exitCode === -1`
+	// disambiguation (the #206 streaming sentinel vs the #295 settled signal
+	// death). Do not re-derive it here; the terminal-status structural ratchet
+	// fails a local copy. A genuine partial (or a result with no details yet)
+	// renders the raw running text; a classified -1 is a settled FAILURE and
+	// takes the verdict branch below (✗ + error line + expanded-transcript
+	// binding), never raw text.
+	//
+	// The leading `!details` is a type-narrowing aid for the settled branch below
+	// (TS cannot narrow through a function call); it is NOT a second copy of the
+	// decision — the predicate owns the no-details case too.
+	if (!details || isUnsettledPartial(details)) {
 		const text = result.content[0];
 		return new Text(text?.type === "text" ? text.text : "(running\u2026)", 0, 0);
 	}