@bastani/atomic 0.9.12 → 0.9.13-alpha.2

package/dist/builtin/subagents/src/tui/render-progress.ts

@@ -0,0 +1,89 @@
+import { formatAgentRunningLabel } from "../shared/status-format.ts";
+import type { Details } from "../shared/types.ts";
+
+export function isDoneResult(result: Details["results"][number]): boolean {
+	const status = result.progress?.status;
+	if (status === "completed") return true;
+	if (status === "running" || status === "pending") return false;
+	if (result.interrupted || result.detached || result.status !== "ok") return false;
+	return true;
+}
+
+export interface MultiProgressLabel {
+	headerLabel: string;
+	itemTitle: "Step" | "Agent";
+	totalCount: number;
+	groupStartIndex: number;
+	groupEndIndex: number;
+	showActiveGroupOnly: boolean;
+}
+
+export function buildMultiProgressLabel(
+	details: Pick<Details, "mode" | "results" | "progress" | "totalSteps">,
+	hasRunning: boolean,
+): MultiProgressLabel {
+	const itemTitle: "Step" | "Agent" = details.mode === "parallel" ? "Agent" : "Step";
+	const totalCount = details.totalSteps ?? details.results.length;
+
+	if (details.mode === "parallel") {
+		const statuses = new Array(totalCount).fill("pending") as Array<
+			"pending" | "running" | "completed" | "failed" | "paused" | "detached"
+		>;
+		for (const progress of details.progress ?? []) {
+			if (progress.index >= 0 && progress.index < totalCount) statuses[progress.index] = progress.status;
+		}
+		for (let i = 0; i < details.results.length; i++) {
+			const result = details.results[i]!;
+			const progressFromArray =
+				details.progress?.find((progress) => progress.index === i) ||
+				details.progress?.find((progress) => progress.agent === result.agent && progress.status === "running");
+			const index = result.progress?.index ?? progressFromArray?.index ?? i;
+			if (index < 0 || index >= totalCount) continue;
+			const status =
+				result.progress?.status ??
+				(result.interrupted || result.status === "interrupted"
+					? "paused"
+					: result.detached || result.status === "continued"
+						? "detached"
+						: result.status === "ok"
+							? "completed"
+							: "failed");
+			statuses[index] = status;
+		}
+		const running = statuses.filter((status) => status === "running").length;
+		const done = statuses.filter((status) => status === "completed").length;
+		const headerLabel = hasRunning
+			? `${formatAgentRunningLabel(running)} · ${done}/${totalCount} done`
+			: `${done}/${totalCount} done`;
+		return {
+			headerLabel,
+			itemTitle,
+			totalCount,
+			groupStartIndex: 0,
+			groupEndIndex: totalCount,
+			showActiveGroupOnly: false,
+		};
+	}
+
+	const done = details.results.filter(isDoneResult).length;
+	const currentStep = Math.min(totalCount, done + (hasRunning ? 1 : 0));
+	const headerLabel = hasRunning ? `step ${currentStep}/${totalCount}` : `step ${done}/${totalCount}`;
+	return {
+		headerLabel,
+		itemTitle,
+		totalCount,
+		groupStartIndex: 0,
+		groupEndIndex: details.results.length,
+		showActiveGroupOnly: false,
+	};
+}
+
+export function resultRowLabel(
+	details: Pick<Details, "mode">,
+	label: MultiProgressLabel,
+	_resultIndex: number,
+	stepNumber: number,
+): string {
+	if (label.itemTitle === "Agent") return `Agent ${stepNumber}/${label.totalCount}`;
+	return details.mode === "parallel" ? `Agent ${stepNumber}` : `Step ${stepNumber}`;
+}

package/dist/builtin/subagents/src/tui/render-result-compact.ts

@@ -1,17 +1,11 @@
 import { keyHintIfBound } from "@bastani/atomic";
 import { type Component, Container, Text } from "@earendil-works/pi-tui";
 import { shortenPath } from "../shared/formatters.ts";
-import type { AgentProgress, AsyncJobStep, Details } from "../shared/types.ts";
+import type { AgentProgress, Details } from "../shared/types.ts";
 import { getSingleResultOutput } from "../shared/utils.ts";
-import {
-	buildChainRenderEntries,
-	buildMultiProgressLabel,
-	type ChainRenderEntry,
-	resultRowLabel,
-	workflowGraphHasStatus,
-} from "./render-chain-graph.ts";
-import { modelThinkingBadge, widgetStepGlyph, widgetStepStatus } from "./render-event-formatting.ts";
+import { modelThinkingBadge } from "./render-event-formatting.ts";
 import { getTermWidth, pulseGlyph, type Theme, truncLine } from "./render-layout.ts";
+import { buildMultiProgressLabel, resultRowLabel } from "./render-progress.ts";
 import {
 	buildLiveStatusLine,
 	compactCurrentActivity,
@@ -43,7 +37,7 @@ export function renderSingleCompact(
 	]);
 	const c = new Container();
 	const width = getTermWidth() - 4;
-	const modelDisplay = modelThinkingBadge(theme, r.model, undefined, r.fastMode);
+	const modelDisplay = modelThinkingBadge(theme, r.model, r.thinking, r.fastMode);
 	c.addChild(
 		new Text(
 			truncLine(
@@ -73,7 +67,7 @@ export function renderSingleCompact(
 
 	c.addChild(new Text(truncLine(theme.fg("dim", `  ⎿  ${resultStatusLine(r, output)}`), width), 0, 0));
 	const preview = firstOutputLine(output);
-	if (preview && r.exitCode === 0 && !hasEmptyTextOutputWithoutOutputTarget(r.task, output)) {
+	if (preview && r.status === "ok" && !hasEmptyTextOutputWithoutOutputTarget(r.task, output)) {
 		c.addChild(new Text(truncLine(theme.fg("dim", `     ${preview}`), width), 0, 0));
 	}
 	if (r.sessionFile)
@@ -91,15 +85,17 @@ export function renderSingleCompact(
 
 export function renderMultiCompact(d: Details, theme: Theme, now?: number, pulseFrame?: number): Component {
 	const hasRunning =
-		d.progress?.some((p) => p.status === "running") ||
-		d.results.some((r) => r.progress?.status === "running") ||
-		workflowGraphHasStatus(d, ["running"]);
-	const failed =
-		d.results.some((r) => r.exitCode !== 0 && r.progress?.status !== "running") ||
-		workflowGraphHasStatus(d, ["failed"]);
-	const paused =
-		d.results.some((r) => (r.interrupted || r.detached) && r.progress?.status !== "running") ||
-		workflowGraphHasStatus(d, ["paused", "detached"]);
+		d.progress?.some((p) => p.status === "running") || d.results.some((r) => r.progress?.status === "running");
+	const failed = d.results.some((r) => r.status === "error" && r.progress?.status !== "running");
+	const paused = d.results.some(
+		(r) =>
+			(r.interrupted ||
+				r.detached ||
+				r.status === "interrupted" ||
+				r.status === "continued" ||
+				r.status === "skipped") &&
+			r.progress?.status !== "running",
+	);
 	let totalSummary = d.progressSummary;
 	if (!totalSummary) {
 		let sawProgress = false;
@@ -110,8 +106,7 @@ export function renderMultiCompact(d: Details, theme: Theme, now?: number, pulse
 			sawProgress = true;
 			summary.toolCount += prog.toolCount;
 			summary.tokens += prog.tokens;
-			summary.durationMs =
-				d.mode === "chain" ? summary.durationMs + prog.durationMs : Math.max(summary.durationMs, prog.durationMs);
+			summary.durationMs = Math.max(summary.durationMs, prog.durationMs);
 		}
 		if (sawProgress) totalSummary = summary;
 	}
@@ -139,55 +134,53 @@ export function renderMultiCompact(d: Details, theme: Theme, now?: number, pulse
 		),
 	);
 
-	const useResultsDirectly = multiLabel.hasParallelInChain || !d.chainAgents?.length;
+	const progressSpan = d.progress?.length ? Math.max(...d.progress.map((p) => p.index + 1)) : 0;
+	const resultsSpan = Math.max(d.results.length, progressSpan, d.mode === "parallel" ? (d.totalSteps ?? 0) : 0);
 	const displayStart = multiLabel.showActiveGroupOnly ? multiLabel.groupStartIndex : 0;
-	const displayEnd = multiLabel.showActiveGroupOnly
-		? multiLabel.groupEndIndex
-		: useResultsDirectly
-			? d.results.length
-			: d.chainAgents!.length;
-	const chainEntries = buildChainRenderEntries(d, multiLabel);
-	const renderEntries =
-		chainEntries ??
-		Array.from({ length: displayEnd - displayStart }, (_, offset): ChainRenderEntry => {
-			const i = displayStart + offset;
-			const r = d.results[i];
-			const fallbackLabel = itemTitle.toLowerCase();
-			const rowNumber = multiLabel.showActiveGroupOnly ? i - multiLabel.groupStartIndex + 1 : i + 1;
-			return {
-				kind: "result",
-				resultIndex: i,
-				rowNumber,
-				agentName: useResultsDirectly
-					? r?.agent || `${fallbackLabel}-${rowNumber}`
-					: d.chainAgents![i] || r?.agent || `${fallbackLabel}-${rowNumber}`,
-			};
-		});
+	const displayEnd = multiLabel.showActiveGroupOnly ? multiLabel.groupEndIndex : resultsSpan;
+	const renderEntries = Array.from({ length: displayEnd - displayStart }, (_, offset) => {
+		const i = displayStart + offset;
+		const r = d.results[i];
+		const progressAgent = d.progress?.find((p) => p.index === i)?.agent;
+		const fallbackLabel = itemTitle.toLowerCase();
+		const rowNumber = multiLabel.showActiveGroupOnly ? i - multiLabel.groupStartIndex + 1 : i + 1;
+		return {
+			resultIndex: i,
+			rowNumber,
+			agentName: r?.agent || progressAgent || `${fallbackLabel}-${rowNumber}`,
+		};
+	});
+	let liveDetailHintShown = false;
 	for (const entry of renderEntries) {
-		if (entry.kind === "placeholder") {
-			const glyph = widgetStepGlyph(entry.status as AsyncJobStep["status"], theme);
-			const statusLabel = widgetStepStatus(entry.status as AsyncJobStep["status"], theme);
-			c.addChild(
-				new Text(
-					truncLine(
-						`  ${glyph} ${entry.stepLabel}: ${themeBold(theme, entry.agentName)} ${theme.fg("dim", "·")} ${statusLabel}`,
-						width,
-					),
-					0,
-					0,
-				),
-			);
-			if (entry.error)
-				c.addChild(new Text(truncLine(theme.fg("error", `    ⎿  Error: ${entry.error}`), width), 0, 0));
-			continue;
-		}
 		const i = entry.resultIndex;
 		const r = d.results[i];
 		const rowNumber = entry.rowNumber;
 		const agentName = entry.agentName;
 		if (!r) {
-			const pendingLabel = chainEntries ? resultRowLabel(d, multiLabel, i, rowNumber) : `${itemTitle} ${rowNumber}`;
-			c.addChild(new Text(truncLine(theme.fg("dim", `  ◦ ${pendingLabel}: ${agentName} · pending`), width), 0, 0));
+			const rowLabel = resultRowLabel(d, multiLabel, i, rowNumber);
+			const runningProg = d.progress?.find((p) => p.index === i && p.status === "running") as
+				| AgentProgress
+				| undefined;
+			if (runningProg) {
+				const runningStats = formatProgressStats(theme, runningProg, true, now);
+				const runningBadge = modelThinkingBadge(
+					theme,
+					runningProg.model,
+					runningProg.thinking,
+					runningProg.fastMode,
+				);
+				const runningLine = `${theme.fg("accent", pulseGlyph(pulseFrame))} ${rowLabel}: ${themeBold(theme, agentName)}${runningBadge}${runningStats ? ` ${theme.fg("dim", "·")} ${runningStats}` : ""}`;
+				c.addChild(new Text(truncLine(`  ${runningLine}`, width), 0, 0));
+				const activity = compactCurrentActivity(runningProg, now);
+				c.addChild(new Text(truncLine(theme.fg("dim", `    ⎿  ${activity}`), width), 0, 0));
+				const expandHint = keyHintIfBound("app.tools.expand", "for live detail");
+				if (expandHint) {
+					c.addChild(new Text(truncLine(theme.fg("accent", `    Press ${expandHint}`), width), 0, 0));
+					liveDetailHintShown = true;
+				}
+				continue;
+			}
+			c.addChild(new Text(truncLine(theme.fg("dim", `  ◦ ${rowLabel}: ${agentName} · pending`), width), 0, 0));
 			continue;
 		}
 		const output = getSingleResultOutput(r);
@@ -204,23 +197,35 @@ export function renderMultiCompact(d: Details, theme: Theme, now?: number, pulse
 					? progressFromArray.index + 1
 					: i + 1;
 		const stepStats = formatProgressStats(theme, rProg, true, now);
+		const modelDisplay = modelThinkingBadge(
+			theme,
+			r.model ?? rProg?.model,
+			r.thinking ?? rProg?.thinking,
+			r.fastMode ?? rProg?.fastMode,
+		);
 		const glyph = rPending ? theme.fg("dim", "◦") : resultGlyph(r, output, theme, rRunning, pulseFrame);
 		const pendingLabel = rPending ? ` ${theme.fg("dim", "· pending")}` : "";
 		const stepLabel = resultRowLabel(d, multiLabel, i, stepNumber);
-		const line = `${glyph} ${stepLabel}: ${themeBold(theme, agentName)}${stepStats ? ` ${theme.fg("dim", "·")} ${stepStats}` : ""}${pendingLabel}`;
+		const line = `${glyph} ${stepLabel}: ${themeBold(theme, agentName)}${modelDisplay}${stepStats ? ` ${theme.fg("dim", "·")} ${stepStats}` : ""}${pendingLabel}`;
 		c.addChild(new Text(truncLine(`  ${line}`, width), 0, 0));
 		if (rRunning && rProg && "status" in rProg) {
 			const activity = compactCurrentActivity(rProg, now);
 			c.addChild(new Text(truncLine(theme.fg("dim", `    ⎿  ${activity}`), width), 0, 0));
 			const expandHint = keyHintIfBound("app.tools.expand", "for live detail");
-			if (expandHint) c.addChild(new Text(truncLine(theme.fg("accent", `    Press ${expandHint}`), width), 0, 0));
+			if (expandHint) {
+				c.addChild(new Text(truncLine(theme.fg("accent", `    Press ${expandHint}`), width), 0, 0));
+				liveDetailHintShown = true;
+			}
 		} else if (
 			!rPending &&
-			(r.exitCode !== 0 || r.interrupted || r.detached || hasEmptyTextOutputWithoutOutputTarget(r.task, output))
+			(r.status !== "ok" || r.interrupted || r.detached || hasEmptyTextOutputWithoutOutputTarget(r.task, output))
 		) {
 			c.addChild(
 				new Text(
-					truncLine(theme.fg(r.exitCode !== 0 ? "error" : "dim", `    ⎿  ${resultStatusLine(r, output)}`), width),
+					truncLine(
+						theme.fg(r.status === "error" ? "error" : "dim", `    ⎿  ${resultStatusLine(r, output)}`),
+						width,
+					),
 					0,
 					0,
 				),
@@ -233,6 +238,10 @@ export function renderMultiCompact(d: Details, theme: Theme, now?: number, pulse
 				new Text(truncLine(theme.fg("dim", `    output: ${shortenPath(r.artifactPaths.outputPath)}`), width), 0, 0),
 			);
 	}
+	if (hasRunning && !liveDetailHintShown) {
+		const groupHint = keyHintIfBound("app.tools.expand", "for live detail");
+		if (groupHint) c.addChild(new Text(truncLine(theme.fg("accent", `  Press ${groupHint}`), width), 0, 0));
+	}
 	if (d.artifacts)
 		c.addChild(new Text(truncLine(theme.fg("dim", `  artifacts: ${shortenPath(d.artifacts.dir)}`), width), 0, 0));
 	return c;

package/dist/builtin/subagents/src/tui/render-result.ts

@@ -2,17 +2,11 @@ import { getMarkdownTheme, keyHintIfBound } from "@bastani/atomic";
 import type { AgentToolResult } from "@earendil-works/pi-agent-core";
 import { type Component, Container, Markdown, Spacer, Text } from "@earendil-works/pi-tui";
 import { formatDuration, formatTokens, formatUsage, shortenPath } from "../shared/formatters.ts";
-import type { AgentProgress, AsyncJobStep, Details } from "../shared/types.ts";
+import type { AgentProgress, Details } from "../shared/types.ts";
 import { getSingleResultOutput } from "../shared/utils.ts";
-import {
-	buildChainRenderEntries,
-	buildMultiProgressLabel,
-	type ChainRenderEntry,
-	resultRowLabel,
-	workflowGraphHasStatus,
-} from "./render-chain-graph.ts";
-import { modelThinkingBadge, widgetStepStatus } from "./render-event-formatting.ts";
+import { modelThinkingBadge } from "./render-event-formatting.ts";
 import { getTermWidth, type Theme, truncLine } from "./render-layout.ts";
+import { buildMultiProgressLabel, resultRowLabel } from "./render-progress.ts";
 import {
 	advanceResultPulseFrame,
 	clearResultAnimationTimer,
@@ -84,7 +78,8 @@ export function renderSubagentResult(
 		);
 		return container;
 	}
-	if (!d?.results.length) {
+	const liveMultiProgress = d?.mode === "parallel" && (d?.progress?.length ?? 0) > 0;
+	if (!d?.results.length && !liveMultiProgress) {
 		const t = result.content[0];
 		const text = t?.type === "text" ? t.text : "(no output)";
 		const contextPrefix = d?.context === "fork" ? `${theme.fg("warning", "[fork]")} ` : "";
@@ -100,9 +95,9 @@ export function renderSubagentResult(
 		const isRunning = r.progress?.status === "running";
 		const icon = isRunning
 			? theme.fg("warning", "running")
-			: r.detached
+			: r.detached || r.status === "continued"
 				? theme.fg("warning", "detached")
-				: r.exitCode === 0
+				: r.status === "ok"
 					? theme.fg("success", "ok")
 					: theme.fg("error", "failed");
 		const contextBadge = d.context === "fork" ? theme.fg("warning", " [fork]") : "";
@@ -117,10 +112,15 @@ export function renderSubagentResult(
 
 		const w = getTermWidth() - 4;
 		const fit = (text: string) => (expanded ? text : truncLine(text, w));
+		const modelDisplay = modelThinkingBadge(theme, r.model, r.thinking, r.fastMode);
 		const toolCallLines = getToolCallLines(r, expanded);
 		const c = new Container();
 		c.addChild(
-			new Text(fit(`${icon} ${theme.fg("toolTitle", theme.bold(r.agent))}${contextBadge}${progressInfo}`), 0, 0),
+			new Text(
+				fit(`${icon} ${theme.fg("toolTitle", theme.bold(r.agent))}${modelDisplay}${contextBadge}${progressInfo}`),
+				0,
+				0,
+			),
 		);
 		c.addChild(new Spacer(1));
 		const taskMaxLen = Math.max(20, w - 8);
@@ -183,7 +183,7 @@ export function renderSubagentResult(
 		if (r.attemptedModels && r.attemptedModels.length > 1) {
 			c.addChild(new Text(fit(theme.fg("dim", `Fallbacks: ${r.attemptedModels.join(" → ")}`)), 0, 0));
 		}
-		c.addChild(new Text(fit(theme.fg("dim", formatUsage(r.usage, r.model))), 0, 0));
+		c.addChild(new Text(fit(theme.fg("dim", formatUsage(r.usage))), 0, 0));
 		if (r.sessionFile) {
 			c.addChild(new Text(fit(theme.fg("dim", `Session: ${shortenPath(r.sessionFile)}`)), 0, 0));
 		}
@@ -198,31 +198,23 @@ export function renderSubagentResult(
 	if (!expanded) return renderMultiCompact(d, theme, options.now, options.pulseFrame);
 
 	const hasRunning =
-		d.progress?.some((p) => p.status === "running") ||
-		d.results.some((r) => r.progress?.status === "running") ||
-		workflowGraphHasStatus(d, ["running"]);
+		d.progress?.some((p) => p.status === "running") || d.results.some((r) => r.progress?.status === "running");
 	const ok = d.results.filter(
-		(r) => r.progress?.status === "completed" || (r.exitCode === 0 && r.progress?.status !== "running"),
+		(r) => r.progress?.status === "completed" || (r.status === "ok" && r.progress?.status !== "running"),
 	).length;
 	const hasEmptyWithoutTarget = d.results.some(
 		(r) =>
-			r.exitCode === 0 &&
+			r.status === "ok" &&
 			r.progress?.status !== "running" &&
 			hasEmptyTextOutputWithoutOutputTarget(r.task, getSingleResultOutput(r)),
 	);
-	const hasWorkflowFailure = workflowGraphHasStatus(d, ["failed"]);
-	const hasWorkflowPause = workflowGraphHasStatus(d, ["paused", "detached"]);
 	const icon = hasRunning
 		? theme.fg("warning", "running")
 		: hasEmptyWithoutTarget
 			? theme.fg("warning", "warning")
-			: hasWorkflowFailure
-				? theme.fg("error", "failed")
-				: hasWorkflowPause
-					? theme.fg("warning", "paused")
-					: ok === d.results.length
-						? theme.fg("success", "ok")
-						: theme.fg("error", "failed");
+			: ok === d.results.length
+				? theme.fg("success", "ok")
+				: theme.fg("error", "failed");
 
 	const totalSummary =
 		d.progressSummary ||
@@ -232,8 +224,7 @@ export function renderSubagentResult(
 				if (prog) {
 					acc.toolCount += prog.toolCount;
 					acc.tokens += prog.tokens;
-					acc.durationMs =
-						d.mode === "chain" ? acc.durationMs + prog.durationMs : Math.max(acc.durationMs, prog.durationMs);
+					acc.durationMs = Math.max(acc.durationMs, prog.durationMs);
 				}
 				return acc;
 			},
@@ -248,33 +239,6 @@ export function renderSubagentResult(
 	const modeLabel = d.mode;
 	const contextBadge = d.context === "fork" ? theme.fg("warning", " [fork]") : "";
 	const multiLabel = buildMultiProgressLabel(d, hasRunning);
-	const itemTitle = multiLabel.itemTitle;
-
-	const chainVis =
-		d.chainAgents?.length && !multiLabel.hasParallelInChain
-			? d.chainAgents
-					.map((agent, i) => {
-						const result = d.results[i];
-						const isFailed = result && result.exitCode !== 0 && result.progress?.status !== "running";
-						const isComplete = result && result.exitCode === 0 && result.progress?.status !== "running";
-						const isEmptyWithoutTarget =
-							Boolean(result) &&
-							Boolean(isComplete) &&
-							hasEmptyTextOutputWithoutOutputTarget(result.task, getSingleResultOutput(result));
-						const isCurrent = i === (d.currentStepIndex ?? d.results.length);
-						const stepIcon = isFailed
-							? theme.fg("error", "failed")
-							: isEmptyWithoutTarget
-								? theme.fg("warning", "warning")
-								: isComplete
-									? theme.fg("success", "done")
-									: isCurrent && hasRunning
-										? theme.fg("warning", "running")
-										: theme.fg("dim", "pending");
-						return `${stepIcon} ${agent}`;
-					})
-					.join(theme.fg("dim", " → "))
-			: null;
 
 	const w = getTermWidth() - 4;
 	const fit = (text: string) => (expanded ? text : truncLine(text, w));
@@ -288,55 +252,64 @@ export function renderSubagentResult(
 			0,
 		),
 	);
-	if (chainVis) {
-		c.addChild(new Text(fit(`  ${chainVis}`), 0, 0));
-	}
 
-	const useResultsDirectly = multiLabel.hasParallelInChain || !d.chainAgents?.length;
+	const progressSpan = d.progress?.length ? Math.max(...d.progress.map((p) => p.index + 1)) : 0;
+	const resultsSpan = Math.max(d.results.length, progressSpan, d.mode === "parallel" ? (d.totalSteps ?? 0) : 0);
 	const displayStart = multiLabel.showActiveGroupOnly ? multiLabel.groupStartIndex : 0;
-	const displayEnd = multiLabel.showActiveGroupOnly
-		? multiLabel.groupEndIndex
-		: useResultsDirectly
-			? d.results.length
-			: d.chainAgents!.length;
-	const chainEntries = buildChainRenderEntries(d, multiLabel);
-	const renderEntries =
-		chainEntries ??
-		Array.from({ length: displayEnd - displayStart }, (_, offset): ChainRenderEntry => {
-			const i = displayStart + offset;
-			const r = d.results[i];
-			const rowNumber = multiLabel.showActiveGroupOnly ? i - multiLabel.groupStartIndex + 1 : i + 1;
-			return {
-				kind: "result",
-				resultIndex: i,
-				rowNumber,
-				agentName: useResultsDirectly
-					? r?.agent || `step-${rowNumber}`
-					: d.chainAgents![i] || r?.agent || `step-${rowNumber}`,
-			};
-		});
+	const displayEnd = multiLabel.showActiveGroupOnly ? multiLabel.groupEndIndex : resultsSpan;
+	const renderEntries = Array.from({ length: displayEnd - displayStart }, (_, offset) => {
+		const i = displayStart + offset;
+		const r = d.results[i];
+		const progressAgent = d.progress?.find((p) => p.index === i)?.agent;
+		const rowNumber = multiLabel.showActiveGroupOnly ? i - multiLabel.groupStartIndex + 1 : i + 1;
+		return {
+			resultIndex: i,
+			rowNumber,
+			agentName: r?.agent || progressAgent || `step-${rowNumber}`,
+		};
+	});
 
 	c.addChild(new Spacer(1));
 
 	for (const entry of renderEntries) {
-		if (entry.kind === "placeholder") {
-			const statusLabel = widgetStepStatus(entry.status as AsyncJobStep["status"], theme);
-			c.addChild(new Text(fit(`  ${statusLabel} ${entry.stepLabel}: ${theme.bold(entry.agentName)}`), 0, 0));
-			c.addChild(
-				new Text(theme.fg(entry.status === "failed" ? "error" : "dim", `    status: ${entry.status}`), 0, 0),
-			);
-			if (entry.error) c.addChild(new Text(theme.fg("error", `    error: ${entry.error}`), 0, 0));
-			c.addChild(new Spacer(1));
-			continue;
-		}
 		const i = entry.resultIndex;
 		const r = d.results[i];
 		const rowNumber = entry.rowNumber;
 		const agentName = entry.agentName;
 
 		if (!r) {
-			const pendingLabel = chainEntries ? resultRowLabel(d, multiLabel, i, rowNumber) : `${itemTitle} ${rowNumber}`;
-			c.addChild(new Text(fit(theme.fg("dim", `  ${pendingLabel}: ${agentName}`)), 0, 0));
+			const rowLabel = resultRowLabel(d, multiLabel, i, rowNumber);
+			const runningProg = d.progress?.find((p) => p.index === i && p.status === "running") as
+				| AgentProgress
+				| undefined;
+			if (runningProg) {
+				const runningStats = ` | ${runningProg.toolCount} tools, ${formatDuration(displayProgressDurationMs(runningProg, options.now))}`;
+				const runningBadge = modelThinkingBadge(
+					theme,
+					runningProg.model,
+					runningProg.thinking,
+					runningProg.fastMode,
+				);
+				c.addChild(
+					new Text(
+						fit(
+							`${theme.fg("warning", "running")} ${rowLabel}: ${theme.bold(theme.fg("warning", agentName))}${runningBadge}${runningStats}`,
+						),
+						0,
+						0,
+					),
+				);
+				const progressSnapshotNow = snapshotNowForProgress(runningProg, options.now);
+				const liveStatusLine = buildLiveStatusLine(runningProg, progressSnapshotNow);
+				if (liveStatusLine) {
+					c.addChild(new Text(fit(theme.fg("accent", `    ${liveStatusLine}`)), 0, 0));
+				}
+				const expandHint = keyHintIfBound("app.tools.expand", "for live detail");
+				if (expandHint) c.addChild(new Text(fit(theme.fg("accent", `    Press ${expandHint}`)), 0, 0));
+				c.addChild(new Spacer(1));
+				continue;
+			}
+			c.addChild(new Text(fit(theme.fg("dim", `  ${rowLabel}: ${agentName}`)), 0, 0));
 			c.addChild(new Text(theme.fg("dim", `    status: pending`), 0, 0));
 			c.addChild(new Spacer(1));
 			continue;
@@ -352,15 +325,22 @@ export function renderSubagentResult(
 		const resultOutput = getSingleResultOutput(r);
 		const statusIcon = rRunning
 			? theme.fg("warning", "running")
-			: r.exitCode !== 0
+			: r.status === "error"
 				? theme.fg("error", "failed")
-				: hasEmptyTextOutputWithoutOutputTarget(r.task, resultOutput)
-					? theme.fg("warning", "warning")
-					: theme.fg("success", "done");
+				: r.status === "skipped" || r.status === "interrupted" || r.status === "continued"
+					? theme.fg("warning", r.status)
+					: hasEmptyTextOutputWithoutOutputTarget(r.task, resultOutput)
+						? theme.fg("warning", "warning")
+						: theme.fg("success", "done");
 		const stats = rProg
 			? ` | ${rProg.toolCount} tools, ${formatDuration(displayProgressDurationMs(rProg, options.now))}`
 			: "";
-		const modelDisplay = modelThinkingBadge(theme, r.model, undefined, r.fastMode);
+		const modelDisplay = modelThinkingBadge(
+			theme,
+			r.model ?? rProg?.model,
+			r.thinking ?? rProg?.thinking,
+			r.fastMode ?? rProg?.fastMode,
+		);
 		const stepLabel = resultRowLabel(d, multiLabel, i, stepNumber);
 		const stepHeader = rRunning
 			? `${statusIcon} ${stepLabel}: ${theme.bold(theme.fg("warning", r.agent))}${modelDisplay}${stats}`

package/dist/builtin/subagents/src/tui/render-stable-output.ts

@@ -14,15 +14,11 @@ export function widgetRenderKey(job: AsyncJobState): string {
 		toolCount: job.toolCount,
 		mode: job.mode,
 		agents: job.agents,
-		currentStep: job.currentStep,
-		chainStepCount: job.chainStepCount,
-		parallelGroups: job.parallelGroups,
 		steps: job.steps,
 		nestedChildren: job.nestedChildren,
 		stepsTotal: job.stepsTotal,
 		runningSteps: job.runningSteps,
 		completedSteps: job.completedSteps,
-		activeParallelGroup: job.activeParallelGroup,
 		startedAt: job.startedAt,
 		updatedAt: job.updatedAt,
 		totalTokens: job.totalTokens,
@@ -65,7 +61,7 @@ export function subagentResultRenderKey(
 		...details.results.map((entry) =>
 			[
 				entry.agent,
-				entry.exitCode,
+				entry.status,
 				entry.interrupted === true ? "interrupted" : "",
 				entry.detached === true ? "detached" : "",
 				progressRenderKey(entry.progress),
@@ -79,7 +75,6 @@ export function subagentResultRenderKey(
 		options.isPartial ? "partial" : "final",
 		options.expanded ? "expanded" : "compact",
 		details.mode,
-		details.currentStepIndex ?? "",
 		details.asyncId ?? "",
 		details.totalSteps ?? "",
 		progressRenderKey(details.progressSummary),

package/dist/builtin/subagents/src/tui/render-status-progress.ts

@@ -134,8 +134,10 @@ export function firstOutputLine(text: string): string {
 
 export function resultStatusLine(result: Details["results"][number], output: string): string {
 	if (result.detached) return result.detachedReason ? `Detached: ${result.detachedReason}` : "Detached";
-	if (result.interrupted) return "Paused";
-	if (result.exitCode !== 0) return `Error: ${result.error ?? (firstOutputLine(output) || `exit ${result.exitCode}`)}`;
+	if (result.status === "continued") return "Continued";
+	if (result.interrupted || result.status === "interrupted") return "Paused";
+	if (result.status === "skipped") return result.error ? `Skipped: ${result.error}` : "Skipped";
+	if (result.status === "error") return `Error: ${result.error ?? (firstOutputLine(output) || "failed")}`;
 	if (hasEmptyTextOutputWithoutOutputTarget(result.task, output)) return "Done (no text output)";
 	return "Done";
 }
@@ -148,9 +150,10 @@ export function resultGlyph(
 	pulseFrame?: number,
 ): string {
 	if (running) return theme.fg("accent", pulseGlyph(pulseFrame));
-	if (result.detached) return theme.fg("warning", "■");
-	if (result.interrupted) return theme.fg("warning", "■");
-	if (result.exitCode !== 0) return theme.fg("error", "✗");
+	if (result.detached || result.status === "continued") return theme.fg("warning", "■");
+	if (result.interrupted || result.status === "interrupted" || result.status === "skipped")
+		return theme.fg("warning", "■");
+	if (result.status === "error") return theme.fg("error", "✗");
 	if (hasEmptyTextOutputWithoutOutputTarget(result.task, output)) return theme.fg("warning", "✓");
 	return theme.fg("success", "✓");
 }