@bastani/atomic 0.9.11-alpha.8 → 0.9.11

package/dist/builtin/subagents/src/tui/render-chain-graph.ts

@@ -1,11 +1,14 @@
-import type { AsyncParallelGroupStatus, Details, WorkflowNodeStatus } from "../shared/types.ts";
 import { formatAgentRunningLabel } from "../shared/status-format.ts";
+import type { AsyncParallelGroupStatus, Details, WorkflowNodeStatus } from "../shared/types.ts";
 
 export function parseParallelGroupAgentCount(label: string | undefined): number | undefined {
-	if (!label || !label.startsWith("[") || !label.endsWith("]")) return undefined;
+	if (!label?.startsWith("[") || !label.endsWith("]")) return undefined;
 	const inner = label.slice(1, -1).trim();
 	if (!inner) return 0;
-	return inner.split("+").map((part) => part.trim()).filter(Boolean).length;
+	return inner
+		.split("+")
+		.map((part) => part.trim())
+		.filter(Boolean).length;
 }
 
 export interface ChainStepSpan {
@@ -30,12 +33,28 @@ export function buildChainStepSpans(details: Pick<Details, "chainAgents" | "work
 					.filter((value): value is number => typeof value === "number");
 				const start = childFlatIndexes.length ? Math.min(...childFlatIndexes) : flatCursor;
 				const count = node.children?.length ?? 0;
-				spans.push({ stepIndex: node.stepIndex, start, count, isParallel: true, status: node.status, label: node.label, error: node.error });
+				spans.push({
+					stepIndex: node.stepIndex,
+					start,
+					count,
+					isParallel: true,
+					status: node.status,
+					label: node.label,
+					error: node.error,
+				});
 				flatCursor = Math.max(flatCursor, start + count);
 				continue;
 			}
 			const start = node.flatIndex ?? flatCursor;
-			spans.push({ stepIndex: node.stepIndex, start, count: 1, isParallel: false, status: node.status, label: node.label, error: node.error });
+			spans.push({
+				stepIndex: node.stepIndex,
+				start,
+				count: 1,
+				isParallel: false,
+				status: node.status,
+				label: node.label,
+				error: node.error,
+			});
 			flatCursor = Math.max(flatCursor, start + 1);
 		}
 		if (spans.length) return spans.sort((left, right) => left.stepIndex - right.stepIndex);
@@ -54,13 +73,19 @@ export function buildChainStepSpans(details: Pick<Details, "chainAgents" | "work
 	return spans;
 }
 
-export function isChainParallelGroupActive(details: Pick<Details, "mode" | "chainAgents" | "currentStepIndex" | "workflowGraph">): boolean {
+export function isChainParallelGroupActive(
+	details: Pick<Details, "mode" | "chainAgents" | "currentStepIndex" | "workflowGraph">,
+): boolean {
 	if (details.mode !== "chain") return false;
 	if (details.currentStepIndex === undefined) return false;
 	return buildChainStepSpans(details).some((span) => span.stepIndex === details.currentStepIndex && span.isParallel);
 }
 
-export function buildAsyncChainStepSpans(total: number, stepCount: number, parallelGroups: AsyncParallelGroupStatus[] = []): ChainStepSpan[] {
+export function buildAsyncChainStepSpans(
+	total: number,
+	stepCount: number,
+	parallelGroups: AsyncParallelGroupStatus[] = [],
+): ChainStepSpan[] {
 	const spans: ChainStepSpan[] = [];
 	let flatIndex = 0;
 	for (let stepIndex = 0; stepIndex < total; stepIndex++) {
@@ -84,7 +109,10 @@ export function isDoneResult(result: Details["results"][number]): boolean {
 	return result.exitCode === 0;
 }
 
-export function workflowGraphHasStatus(details: Pick<Details, "workflowGraph">, statuses: WorkflowNodeStatus[]): boolean {
+export function workflowGraphHasStatus(
+	details: Pick<Details, "workflowGraph">,
+	statuses: WorkflowNodeStatus[],
+): boolean {
 	return details.workflowGraph?.nodes.some((node) => statuses.includes(node.status)) ?? false;
 }
 
@@ -126,7 +154,8 @@ export function buildChainRenderEntries(details: Details, label: MultiProgressLa
 				kind: "result",
 				resultIndex: index,
 				rowNumber: index + 1,
-				agentName: details.results[index]?.agent ?? details.chainAgents?.[span.stepIndex] ?? `step-${span.stepIndex + 1}`,
+				agentName:
+					details.results[index]?.agent ?? details.chainAgents?.[span.stepIndex] ?? `step-${span.stepIndex + 1}`,
 			});
 		}
 	}
@@ -144,7 +173,13 @@ export interface MultiProgressLabel {
 	showActiveGroupOnly: boolean;
 }
 
-export function buildMultiProgressLabel(details: Pick<Details, "mode" | "results" | "progress" | "totalSteps" | "currentStepIndex" | "chainAgents" | "workflowGraph">, hasRunning: boolean): MultiProgressLabel {
+export function buildMultiProgressLabel(
+	details: Pick<
+		Details,
+		"mode" | "results" | "progress" | "totalSteps" | "currentStepIndex" | "chainAgents" | "workflowGraph"
+	>,
+	hasRunning: boolean,
+): MultiProgressLabel {
 	const stepSpans = buildChainStepSpans(details);
 	const hasParallelInChain = details.mode === "chain" && stepSpans.some((span) => span.isParallel);
 	const activeParallelGroup = isChainParallelGroupActive(details);
@@ -152,22 +187,22 @@ export function buildMultiProgressLabel(details: Pick<Details, "mode" | "results
 
 	if (details.mode === "parallel") {
 		const totalCount = details.totalSteps ?? details.results.length;
-		const statuses = new Array(totalCount).fill("pending") as Array<"pending" | "running" | "completed" | "failed" | "detached">;
+		const statuses = new Array(totalCount).fill("pending") as Array<
+			"pending" | "running" | "completed" | "failed" | "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 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.detached
-					? "detached"
-					: result.exitCode === 0
-						? "completed"
-						: "failed");
+			const status =
+				result.progress?.status ??
+				(result.interrupted || result.detached ? "detached" : result.exitCode === 0 ? "completed" : "failed");
 			statuses[index] = status;
 		}
 		const running = statuses.filter((status) => status === "running").length;
@@ -175,7 +210,16 @@ export function buildMultiProgressLabel(details: Pick<Details, "mode" | "results
 		const headerLabel = hasRunning
 			? `${formatAgentRunningLabel(running)} · ${done}/${totalCount} done`
 			: `${done}/${totalCount} done`;
-		return { headerLabel, itemTitle, totalCount, hasParallelInChain, activeParallelGroup, groupStartIndex: 0, groupEndIndex: totalCount, showActiveGroupOnly: false };
+		return {
+			headerLabel,
+			itemTitle,
+			totalCount,
+			hasParallelInChain,
+			activeParallelGroup,
+			groupStartIndex: 0,
+			groupEndIndex: totalCount,
+			showActiveGroupOnly: false,
+		};
 	}
 
 	if (activeParallelGroup) {
@@ -203,7 +247,16 @@ export function buildMultiProgressLabel(details: Pick<Details, "mode" | "results
 		const headerLabel = hasRunning
 			? `step ${currentStepIndex + 1}/${totalSteps} · parallel group: ${formatAgentRunningLabel(running)} · ${done}/${groupSize} done`
 			: `step ${currentStepIndex + 1}/${totalSteps} · parallel group: ${done}/${groupSize} done`;
-		return { headerLabel, itemTitle, totalCount: groupSize, hasParallelInChain, activeParallelGroup, groupStartIndex: groupStart, groupEndIndex: groupEnd, showActiveGroupOnly: true };
+		return {
+			headerLabel,
+			itemTitle,
+			totalCount: groupSize,
+			hasParallelInChain,
+			activeParallelGroup,
+			groupStartIndex: groupStart,
+			groupEndIndex: groupEnd,
+			showActiveGroupOnly: true,
+		};
 	}
 
 	if (details.mode === "chain" && details.chainAgents?.length) {
@@ -213,34 +266,69 @@ export function buildMultiProgressLabel(details: Pick<Details, "mode" | "results
 			if (span.count === 0) return span.status === "completed";
 			for (let index = span.start; index < span.start + span.count; index++) {
 				const progressEntry = details.progress?.find((progress) => progress.index === index);
-				const resultEntry = details.results.find((result) => result.progress?.index === index) ?? details.results[index];
-				if (progressEntry?.status === "running" || progressEntry?.status === "pending" || progressEntry?.status === "failed") return false;
+				const resultEntry =
+					details.results.find((result) => result.progress?.index === index) ?? details.results[index];
+				if (
+					progressEntry?.status === "running" ||
+					progressEntry?.status === "pending" ||
+					progressEntry?.status === "failed"
+				)
+					return false;
 				if (!resultEntry || !isDoneResult(resultEntry)) return false;
 			}
 			return true;
 		}).length;
-		const currentStep = details.currentStepIndex !== undefined ? details.currentStepIndex + 1 : Math.min(totalCount, doneLogical + (hasRunning ? 1 : 0));
+		const currentStep =
+			details.currentStepIndex !== undefined
+				? details.currentStepIndex + 1
+				: Math.min(totalCount, doneLogical + (hasRunning ? 1 : 0));
 		const headerLabel = hasRunning ? `step ${currentStep}/${totalCount}` : `step ${doneLogical}/${totalCount}`;
-		return { headerLabel, itemTitle, totalCount, hasParallelInChain, activeParallelGroup, groupStartIndex: 0, groupEndIndex: details.results.length, showActiveGroupOnly: false };
+		return {
+			headerLabel,
+			itemTitle,
+			totalCount,
+			hasParallelInChain,
+			activeParallelGroup,
+			groupStartIndex: 0,
+			groupEndIndex: details.results.length,
+			showActiveGroupOnly: false,
+		};
 	}
 
 	const totalCount = details.totalSteps ?? details.results.length;
-	const currentStep = details.currentStepIndex !== undefined ? details.currentStepIndex + 1 : Math.min(totalCount, details.results.filter(isDoneResult).length + (hasRunning ? 1 : 0));
+	const currentStep =
+		details.currentStepIndex !== undefined
+			? details.currentStepIndex + 1
+			: Math.min(totalCount, details.results.filter(isDoneResult).length + (hasRunning ? 1 : 0));
 	const done = details.results.filter(isDoneResult).length;
 	const headerLabel = hasRunning ? `step ${currentStep}/${totalCount}` : `step ${done}/${totalCount}`;
-	return { headerLabel, itemTitle, totalCount, hasParallelInChain, activeParallelGroup, groupStartIndex: 0, groupEndIndex: details.results.length, showActiveGroupOnly: false };
+	return {
+		headerLabel,
+		itemTitle,
+		totalCount,
+		hasParallelInChain,
+		activeParallelGroup,
+		groupStartIndex: 0,
+		groupEndIndex: details.results.length,
+		showActiveGroupOnly: false,
+	};
 }
 
-export function resultRowLabel(details: Pick<Details, "mode" | "chainAgents" | "workflowGraph">, label: MultiProgressLabel, resultIndex: number, stepNumber: number): string {
+export function resultRowLabel(
+	details: Pick<Details, "mode" | "chainAgents" | "workflowGraph">,
+	label: MultiProgressLabel,
+	resultIndex: number,
+	stepNumber: number,
+): string {
 	if (details.mode === "chain" && label.hasParallelInChain) {
-		const span = buildChainStepSpans(details).find((candidate) => resultIndex >= candidate.start && resultIndex < candidate.start + candidate.count);
+		const span = buildChainStepSpans(details).find(
+			(candidate) => resultIndex >= candidate.start && resultIndex < candidate.start + candidate.count,
+		);
 		if (span?.isParallel) return `Agent ${resultIndex - span.start + 1}/${span.count}`;
 		if (span) return `Step ${span.stepIndex + 1}`;
 	}
 	if (label.itemTitle === "Agent") {
-		const localStepNumber = label.activeParallelGroup
-			? Math.max(1, stepNumber - label.groupStartIndex)
-			: stepNumber;
+		const localStepNumber = label.activeParallelGroup ? Math.max(1, stepNumber - label.groupStartIndex) : stepNumber;
 		return `Agent ${localStepNumber}/${label.totalCount}`;
 	}
 	return `Step ${stepNumber}`;

package/dist/builtin/subagents/src/tui/render-event-formatting.ts

@@ -1,11 +1,23 @@
 import * as path from "node:path";
-import { MAX_SUBAGENT_NESTING_DEPTH, type AsyncJobState, type AsyncJobStep, type NestedRunSummary, type NestedStepSummary } from "../shared/types.ts";
 import { flatToLogicalStepIndex } from "../runs/background/parallel-groups.ts";
-import { formatDuration, formatModelThinking, shortenPath } from "../shared/formatters.ts";
 import { formatNestedAggregate } from "../runs/shared/nested-render.ts";
+import { formatDuration, formatModelThinking, shortenPath } from "../shared/formatters.ts";
 import { formatAgentRunningLabel } from "../shared/status-format.ts";
-import { buildLiveStatusLine, formatCurrentToolLine, formatTokenStat, formatToolUseStat, statJoin } from "./render-status-progress.ts";
-import { runningGlyph, runningPulseGlyph, truncLine, type Theme } from "./render-layout.ts";
+import {
+	type AsyncJobState,
+	type AsyncJobStep,
+	MAX_SUBAGENT_NESTING_DEPTH,
+	type NestedRunSummary,
+	type NestedStepSummary,
+} from "../shared/types.ts";
+import { runningGlyph, runningPulseGlyph, type Theme, truncLine } from "./render-layout.ts";
+import {
+	buildLiveStatusLine,
+	formatCurrentToolLine,
+	formatTokenStat,
+	formatToolUseStat,
+	statJoin,
+} from "./render-status-progress.ts";
 
 export function formatWidgetAgents(agents: string[]): string {
 	const distinct = [...new Set(agents)];
@@ -24,7 +36,8 @@ export function widgetJobName(job: AsyncJobState): string {
 
 export function widgetActivity(job: AsyncJobState): string {
 	const facts: string[] = [];
-	if (job.currentTool && job.currentToolStartedAt !== undefined && job.updatedAt !== undefined) facts.push(`${job.currentTool} ${formatDuration(Math.max(0, job.updatedAt - job.currentToolStartedAt))}`);
+	if (job.currentTool && job.currentToolStartedAt !== undefined && job.updatedAt !== undefined)
+		facts.push(`${job.currentTool} ${formatDuration(Math.max(0, job.updatedAt - job.currentToolStartedAt))}`);
 	else if (job.currentTool) facts.push(job.currentTool);
 	if (job.currentPath) facts.push(shortenPath(job.currentPath));
 	if (job.turnCount !== undefined) facts.push(`${job.turnCount} turns`);
@@ -40,7 +53,6 @@ export function widgetActivity(job: AsyncJobState): string {
 	return "Done";
 }
 
-
 export function widgetStatusGlyph(job: AsyncJobState, theme: Theme, pulseFrame?: number): string {
 	if (job.status === "running") return theme.fg("accent", runningPulseGlyph(pulseFrame));
 	if (job.status === "queued") return theme.fg("muted", "◦");
@@ -75,7 +87,8 @@ export function widgetStepStatus(status: AsyncJobStep["status"], theme: Theme):
 
 export function widgetStepActivity(step: NonNullable<AsyncJobState["steps"]>[number], snapshotNow?: number): string {
 	const facts: string[] = [];
-	if (step.currentTool && step.currentToolStartedAt !== undefined && snapshotNow !== undefined) facts.push(`${step.currentTool} ${formatDuration(Math.max(0, snapshotNow - step.currentToolStartedAt))}`);
+	if (step.currentTool && step.currentToolStartedAt !== undefined && snapshotNow !== undefined)
+		facts.push(`${step.currentTool} ${formatDuration(Math.max(0, snapshotNow - step.currentToolStartedAt))}`);
 	else if (step.currentTool) facts.push(step.currentTool);
 	if (step.currentPath) facts.push(shortenPath(step.currentPath));
 	if (step.turnCount !== undefined) facts.push(`${step.turnCount} turns`);
@@ -89,7 +102,7 @@ export function widgetStepActivity(step: NonNullable<AsyncJobState["steps"]>[num
 
 export function widgetStats(job: AsyncJobState, theme: Theme): string {
 	const parts: string[] = [];
-	const stepsTotal = job.stepsTotal ?? (job.agents?.length ?? 1);
+	const stepsTotal = job.stepsTotal ?? job.agents?.length ?? 1;
 	if (job.activeParallelGroup) {
 		const running = job.runningSteps ?? (job.status === "running" ? 1 : 0);
 		const done = job.completedSteps ?? (job.status === "complete" ? stepsTotal : 0);
@@ -97,9 +110,12 @@ export function widgetStats(job: AsyncJobState, theme: Theme): string {
 			if (job.status === "running" && running > 0) parts.push(formatAgentRunningLabel(running));
 			if (stepsTotal > 0) parts.push(`${done}/${stepsTotal} done`);
 		} else {
-			const activeGroup = job.currentStep !== undefined
-				? job.parallelGroups?.find((group) => job.currentStep! >= group.start && job.currentStep! < group.start + group.count)
-				: job.parallelGroups?.find((group) => group.start === 0);
+			const activeGroup =
+				job.currentStep !== undefined
+					? job.parallelGroups?.find(
+							(group) => job.currentStep! >= group.start && job.currentStep! < group.start + group.count,
+						)
+					: job.parallelGroups?.find((group) => group.start === 0);
 			const logicalStep = activeGroup?.stepIndex ?? job.currentStep ?? 0;
 			const total = job.chainStepCount ?? stepsTotal;
 			const groupParts = [`${done}/${stepsTotal} done`];
@@ -118,7 +134,8 @@ export function widgetStats(job: AsyncJobState, theme: Theme): string {
 	}
 	if (job.toolCount !== undefined) parts.push(formatToolUseStat(job.toolCount));
 	if (job.totalTokens?.total) parts.push(formatTokenStat(job.totalTokens.total));
-	if (job.startedAt !== undefined && job.updatedAt !== undefined) parts.push(formatDuration(Math.max(0, job.updatedAt - job.startedAt)));
+	if (job.startedAt !== undefined && job.updatedAt !== undefined)
+		parts.push(formatDuration(Math.max(0, job.updatedAt - job.startedAt)));
 	return statJoin(theme, parts);
 }
 
@@ -136,7 +153,12 @@ export function modelThinkingBadge(theme: Theme, model?: string, thinking?: stri
 	return label ? theme.fg("dim", ` (${label})`) : "";
 }
 
-export function widgetStepActivityLine(step: NonNullable<AsyncJobState["steps"]>[number], width: number, expanded: boolean, snapshotNow?: number): string {
+export function widgetStepActivityLine(
+	step: NonNullable<AsyncJobState["steps"]>[number],
+	width: number,
+	expanded: boolean,
+	snapshotNow?: number,
+): string {
 	const toolLine = formatCurrentToolLine(step, width, expanded, snapshotNow);
 	if (toolLine) return toolLine;
 	const activity = buildLiveStatusLine(step, snapshotNow);
@@ -145,7 +167,10 @@ export function widgetStepActivityLine(step: NonNullable<AsyncJobState["steps"]>
 	return "";
 }
 
-export function widgetOutputPath(job: AsyncJobState, step: NonNullable<AsyncJobState["steps"]>[number]): string | undefined {
+export function widgetOutputPath(
+	job: AsyncJobState,
+	step: NonNullable<AsyncJobState["steps"]>[number],
+): string | undefined {
 	if (typeof step.index !== "number") return undefined;
 	return path.join(job.asyncDir, `output-${step.index}.log`);
 }
@@ -156,7 +181,11 @@ export function nestedRunName(run: NestedRunSummary): string {
 	return run.id;
 }
 
-export function nestedStatusGlyph(state: NestedRunSummary["state"] | NestedStepSummary["status"], theme: Theme, pulseFrame?: number): string {
+export function nestedStatusGlyph(
+	state: NestedRunSummary["state"] | NestedStepSummary["status"],
+	theme: Theme,
+	pulseFrame?: number,
+): string {
 	if (state === "running") return theme.fg("accent", runningPulseGlyph(pulseFrame));
 	if (state === "complete" || state === "completed") return theme.fg("success", "✓");
 	if (state === "failed") return theme.fg("error", "✗");
@@ -164,10 +193,23 @@ export function nestedStatusGlyph(state: NestedRunSummary["state"] | NestedStepS
 	return theme.fg("muted", "◦");
 }
 
-
-export function nestedActivity(input: Pick<NestedRunSummary | NestedStepSummary, "activityState" | "lastActivityAt" | "currentTool" | "currentToolStartedAt" | "currentPath" | "turnCount" | "toolCount">, state: NestedRunSummary["state"] | NestedStepSummary["status"], snapshotNow?: number): string {
+export function nestedActivity(
+	input: Pick<
+		NestedRunSummary | NestedStepSummary,
+		| "activityState"
+		| "lastActivityAt"
+		| "currentTool"
+		| "currentToolStartedAt"
+		| "currentPath"
+		| "turnCount"
+		| "toolCount"
+	>,
+	state: NestedRunSummary["state"] | NestedStepSummary["status"],
+	snapshotNow?: number,
+): string {
 	const facts: string[] = [];
-	if (input.currentTool && input.currentToolStartedAt !== undefined && snapshotNow !== undefined) facts.push(`${input.currentTool} ${formatDuration(Math.max(0, snapshotNow - input.currentToolStartedAt))}`);
+	if (input.currentTool && input.currentToolStartedAt !== undefined && snapshotNow !== undefined)
+		facts.push(`${input.currentTool} ${formatDuration(Math.max(0, snapshotNow - input.currentToolStartedAt))}`);
 	else if (input.currentTool) facts.push(input.currentTool);
 	if (input.currentPath) facts.push(shortenPath(input.currentPath));
 	if (input.turnCount !== undefined) facts.push(`${input.turnCount} turns`);
@@ -183,7 +225,15 @@ export function nestedActivity(input: Pick<NestedRunSummary | NestedStepSummary,
 	return "Done";
 }
 
-export function formatNestedWidgetLines(children: NestedRunSummary[] | undefined, theme: Theme, width: number, expanded: boolean, snapshotNow?: number, lineBudget = expanded ? 12 : 1, now?: number): string[] {
+export function formatNestedWidgetLines(
+	children: NestedRunSummary[] | undefined,
+	theme: Theme,
+	width: number,
+	expanded: boolean,
+	snapshotNow?: number,
+	lineBudget = expanded ? 12 : 1,
+	now?: number,
+): string[] {
 	if (!children?.length || lineBudget <= 0) return [];
 	if (!expanded) {
 		const aggregate = formatNestedAggregate(children);
@@ -207,15 +257,28 @@ export function formatNestedWidgetLines(children: NestedRunSummary[] | undefined
 			}
 			const activity = nestedActivity(child, child.state, snapshotNow ?? child.lastUpdate);
 			const error = child.error ? ` · ${child.error}` : "";
-			lines.push(theme.fg("dim", `${prefix}↳ ${nestedStatusGlyph(child.state, theme, now)} ${nestedRunName(child)} · ${child.state} · ${activity}${error}`));
+			lines.push(
+				theme.fg(
+					"dim",
+					`${prefix}↳ ${nestedStatusGlyph(child.state, theme, now)} ${nestedRunName(child)} · ${child.state} · ${activity}${error}`,
+				),
+			);
 			if (depth === maxDepth) {
-				const aggregate = formatNestedAggregate([...(child.steps?.flatMap((step) => step.children ?? []) ?? []), ...(child.children ?? [])]);
+				const aggregate = formatNestedAggregate([
+					...(child.steps?.flatMap((step) => step.children ?? []) ?? []),
+					...(child.children ?? []),
+				]);
 				if (aggregate && lines.length < lineBudget) lines.push(theme.fg("dim", `${prefix}  ↳ ${aggregate}`));
 				continue;
 			}
 			for (const step of child.steps ?? []) {
 				if (lines.length >= lineBudget) return;
-				lines.push(theme.fg("dim", `${prefix}  ↳ ${nestedStatusGlyph(step.status, theme, now)} ${step.agent} · ${step.status} · ${nestedActivity(step, step.status, snapshotNow ?? child.lastUpdate)}`));
+				lines.push(
+					theme.fg(
+						"dim",
+						`${prefix}  ↳ ${nestedStatusGlyph(step.status, theme, now)} ${step.agent} · ${step.status} · ${nestedActivity(step, step.status, snapshotNow ?? child.lastUpdate)}`,
+					),
+				);
 				append(step.children, depth + 1, `${prefix}    `);
 			}
 			append(child.children, depth + 1, `${prefix}  `);

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

@@ -20,11 +20,21 @@ function fuzzyScore(query: string, text: string): number {
 	return qi === lq.length ? score : 0;
 }
 
-export function fuzzyFilter<T extends { name: string; description: string; model?: string }>(items: T[], query: string): T[] {
+export function fuzzyFilter<T extends { name: string; description: string; model?: string }>(
+	items: T[],
+	query: string,
+): T[] {
 	const q = query.trim();
 	if (!q) return items;
 	return items
-		.map((item) => ({ item, score: Math.max(fuzzyScore(q, item.name), fuzzyScore(q, item.description) * 0.8, fuzzyScore(q, item.model ?? "") * 0.6) }))
+		.map((item) => ({
+			item,
+			score: Math.max(
+				fuzzyScore(q, item.name),
+				fuzzyScore(q, item.description) * 0.8,
+				fuzzyScore(q, item.model ?? "") * 0.6,
+			),
+		}))
 		.filter((x) => x.score > 0)
 		.sort((a, b) => b.score - a.score)
 		.map((x) => x.item);
@@ -48,9 +58,9 @@ export function renderHeader(text: string, width: number, theme: Theme): string
 	const padLeft = Math.floor(padLen / 2);
 	const padRight = padLen - padLeft;
 	return (
-		theme.fg("border", "╭" + "─".repeat(padLeft)) +
+		theme.fg("border", `╭${"─".repeat(padLeft)}`) +
 		theme.fg("accent", text) +
-		theme.fg("border", "─".repeat(padRight) + "╮")
+		theme.fg("border", `${"─".repeat(padRight)}╮`)
 	);
 }
 
@@ -73,8 +83,8 @@ export function renderFooter(text: string, width: number, theme: Theme): string
 	const padLeft = Math.floor(padLen / 2);
 	const padRight = padLen - padLeft;
 	return (
-		theme.fg("border", "╰" + "─".repeat(padLeft)) +
+		theme.fg("border", `╰${"─".repeat(padLeft)}`) +
 		theme.fg("dim", text) +
-		theme.fg("border", "─".repeat(padRight) + "╯")
+		theme.fg("border", `${"─".repeat(padRight)}╯`)
 	);
 }

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

@@ -54,7 +54,7 @@ export function truncLine(text: string, maxWidth: number): string {
 			const graphemeWidth = visibleWidth(grapheme);
 
 			if (currentWidth + graphemeWidth > targetWidth) {
-				return result + activeStyles.join("") + "…";
+				return `${result + activeStyles.join("")}…`;
 			}
 
 			result += grapheme;
@@ -63,7 +63,7 @@ export function truncLine(text: string, maxWidth: number): string {
 		i = end;
 	}
 
-	return result + activeStyles.join("") + "…";
+	return `${result + activeStyles.join("")}…`;
 }
 
 export const RUNNING_FRAMES = ["⠋", "⠙", "⠹", "⠸", "⠼", "⠴", "⠦", "⠧", "⠇", "⠏"];
@@ -85,7 +85,12 @@ export const RUNNING_FRAMES = ["⠋", "⠙", "⠹", "⠸", "⠼", "⠴", "⠦",
  */
 export const RUNNING_ANIMATION_MS = 80;
 
-type ProgressSeedSource = Partial<Pick<AgentProgress, "index" | "toolCount" | "tokens" | "durationMs" | "lastActivityAt" | "currentToolStartedAt" | "turnCount">>;
+type ProgressSeedSource = Partial<
+	Pick<
+		AgentProgress,
+		"index" | "toolCount" | "tokens" | "durationMs" | "lastActivityAt" | "currentToolStartedAt" | "turnCount"
+	>
+>;
 
 /**
  * Wall-clock-derived animation frame counter. Advances exactly one step every