@iowarp/clio-coder 0.4.9 → 0.5.0

package/src/interactive/footer/widgets.ts

@@ -6,10 +6,11 @@ import {
 	type TokenThroughputSnapshot,
 	type UsageBreakdown,
 } from "../../domains/observability/index.js";
+import { describeLocalCapacity, type LocalCapacity } from "../../domains/scheduling/local-capacity.js";
 import type { ContextUsageBreakdown } from "../../domains/session/context-accounting.js";
 import type { ContextLedger, ContextLedgerCategory } from "../../domains/session/context-ledger.js";
 import { type TaskBoardSnapshot, taskBoardCounts } from "../../domains/session/task-board.js";
-import { truncateToWidth, visibleWidth } from "../../engine/tui.js";
+import { truncateToWidth, visibleWidth, wrapTextWithAnsi } from "../../engine/tui.js";
 import { CONTEXT_CATEGORY_TOKEN, contextCategorySwatch, renderContextMeterBar } from "../context-meter.js";
 import {
 	agentDisplayLabel,
@@ -37,8 +38,8 @@ import {
 	joinSections,
 	sectionTag,
 } from "../theme/index.js";
-
 import { fitIdentityLabel } from "../theme/labels.js";
+import { isHelperRun } from "../worker-stream.js";
 
 export interface ToolTallySnapshot {
 	tools: Readonly<Record<string, number>>;
@@ -128,12 +129,14 @@ export interface AgentWorkFacts {
 	lastTurn: TurnSummary | null;
 	/** Session task board declared through the tasks tool; null before any plan. */
 	taskBoard?: TaskBoardSnapshot | null;
+	/** Local node worker limit and what bound it; null when unknown. */
+	localCapacity?: LocalCapacity | null;
 }
 
 /** Responsive bands for the expanded footer. */
 export const EXPANDED_WIDE = 80;
 export const EXPANDED_MID = 70;
-export const EXPANDED_ULTRAWIDE = 120;
+export const EXPANDED_ULTRAWIDE = 220;
 
 /** Compact footer shows the git section only when there is room for it. */
 const COMPACT_GIT_MIN_WIDTH = 72;
@@ -240,9 +243,9 @@ function collapseRemote(remote: string | null): string | null {
 }
 
 /**
- * Compact primary row: workspace identity on the left and a meaningful work
- * phase on the right. The editor rail owns model and thinking labels. The
- * branch appears here, and only here, across the whole screen.
+ * Workspace/status row helper: workspace identity on the left and a meaningful
+ * work phase on the right. The active compact dashboard layout is composed in
+ * dashboard.ts, including its separate route and thinking labels.
  */
 export function compactPrimaryLine(
 	workspace: WorkspaceFacts,
@@ -261,10 +264,22 @@ export function compactPrimaryLine(
 	dispatchRows: ReadonlyArray<DispatchBoardRow> = [],
 	tick = 0,
 	now = Date.now(),
+	localCapacity: LocalCapacity | null = null,
 ): string {
 	const safeWidth = Math.max(1, Math.floor(width));
 	let git = safeWidth >= COMPACT_GIT_MIN_WIDTH ? gitChip(theme, workspace.branch, workspace.dirty) : null;
-	let right = buildHarnessStatePill(theme, status, toolCounts, dispatchRows, tick, now, safeWidth, true);
+	let right = buildHarnessStatePill(
+		theme,
+		status,
+		toolCounts,
+		dispatchRows,
+		tick,
+		now,
+		safeWidth,
+		true,
+		false,
+		localCapacity,
+	);
 	// A long temporary parent must yield before the active worker count.
 	const cwd = fitIdentityLabel(workspace.cwd, Math.max(8, safeWidth - visibleWidth(right) - 1));
 	let left = joinSections(theme, [theme.fg("muted", cwd), git]);
@@ -275,7 +290,18 @@ export function compactPrimaryLine(
 	}
 
 	if (visibleWidth(left) + 1 + visibleWidth(right) > safeWidth) {
-		right = buildHarnessStatePill(theme, status, toolCounts, dispatchRows, tick, now, safeWidth, false);
+		right = buildHarnessStatePill(
+			theme,
+			status,
+			toolCounts,
+			dispatchRows,
+			tick,
+			now,
+			safeWidth,
+			false,
+			false,
+			localCapacity,
+		);
 	}
 
 	if (visibleWidth(left) + 1 + visibleWidth(right) > safeWidth) {
@@ -461,14 +487,25 @@ function renderDashboardRow(theme: ClioTheme, row: DashboardRow, keyWidth: numbe
 	return `${key}${value}`;
 }
 
-function dashboardBlock(theme: ClioTheme, label: string, rows: ReadonlyArray<DashboardRow>): string[] {
+function dashboardBlock(
+	theme: ClioTheme,
+	label: string,
+	rows: ReadonlyArray<DashboardRow>,
+	width = Number.POSITIVE_INFINITY,
+): string[] {
 	const keyWidth = rows.reduce((max, row) => (row.kind === "kv" ? Math.max(max, row.key.length) : max), 0);
-	const body = rows
-		.map((row) => renderDashboardRow(theme, row, keyWidth))
-		.filter((row): row is string => typeof row === "string" && row.length > 0);
-	// Every quadrant tag shares one structure color. The tag names the quadrant;
-	// the color is not a per-quadrant signal, so all four render bold accentDeep
-	// rather than the old info/accent/reason/success carnival.
+	const body = rows.flatMap((row) => {
+		const rendered = renderDashboardRow(theme, row, keyWidth);
+		if (!rendered) return [];
+		if (!Number.isFinite(width)) return [rendered];
+		if (row.kind !== "kv") return wrapTextWithAnsi(rendered, Math.max(1, width));
+		const prefixWidth = Math.min(keyWidth + 1, Math.max(0, width - 1));
+		const value = row.styled ? (row.value ?? "") : theme.fg(row.valueToken ?? "muted", row.value ?? "");
+		return wrapTextWithAnsi(value, Math.max(1, width - prefixWidth)).map(
+			(line, index) =>
+				`${index === 0 ? theme.fg("dim", `${row.key.padEnd(keyWidth)} `.slice(0, prefixWidth)) : " ".repeat(prefixWidth)}${line}`,
+		);
+	});
 	return [sectionTag(theme, "accentDeep", label.toUpperCase(), 0), ...body];
 }
 
@@ -491,12 +528,17 @@ function legendRow(value: string | null | undefined): DashboardRow {
 export function workspaceQuadrant(facts: WorkspaceFacts, _options: ExpandedQuadrantOptions = {}): string[] {
 	const theme = clioTheme();
 	const remote = collapseRemote(facts.remote);
-	return dashboardBlock(theme, "Workspace", [
-		kv("cwd", facts.cwd),
-		styledKv("git", gitValue(theme, facts.branch, facts.dirty)),
-		kv("type", facts.projectType),
-		kv("remote", remote),
-	]);
+	return dashboardBlock(
+		theme,
+		"Workspace",
+		[
+			kv("cwd", facts.cwd),
+			styledKv("git", gitValue(theme, facts.branch, facts.dirty)),
+			kv("type", facts.projectType),
+			kv("remote", remote),
+		],
+		_options.width,
+	);
 }
 
 function sessionIdentity(facts: SessionFacts): { key: string; value: string } | null {
@@ -513,7 +555,7 @@ function capabilitiesValue(theme: ClioTheme, capabilities: string[] | null): str
 	);
 }
 
-export function sessionQuadrant(facts: SessionFacts, options: ExpandedQuadrantOptions = {}): string[] {
+export function sessionQuadrant(facts: SessionFacts, _options: ExpandedQuadrantOptions = {}): string[] {
 	const theme = clioTheme();
 	const identity = sessionIdentity(facts);
 	const memory = facts.memoryIntervention;
@@ -530,25 +572,30 @@ export function sessionQuadrant(facts: SessionFacts, options: ExpandedQuadrantOp
 					...(memory.stepInFlight ? [theme.fg("reason", "working")] : []),
 					...(memory.lastDecision ? [theme.fg("dim", memory.lastDecision)] : []),
 				],
-				Math.max(1, (options.width ?? Number.POSITIVE_INFINITY) - 9),
+				Number.POSITIVE_INFINITY,
 			)
 		: null;
-	return dashboardBlock(theme, "Session", [
-		identity ? kv(identity.key, identity.value, "accent") : statusRow(null),
-		kv("target", facts.target, "accent"),
-		kv("think", facts.thinking, "reason"),
-		styledKv("caps", capabilitiesValue(theme, facts.capabilities)),
-		// accentDeep is a structure color reserved for the section tag; the autonomy
-		// value is a plain fact and reads muted like the other neutral values.
-		kv("autonomy", facts.safety),
-		kv("profile", facts.toolProfile),
-		kv(
-			"output",
-			facts.outputStyle && facts.outputStyle !== "standard" ? facts.outputStyle : null,
-			facts.outputStyle === "detailed" ? "accent" : "muted",
-		),
-		styledKv("memory", memoryValue),
-	]);
+	return dashboardBlock(
+		theme,
+		"Session",
+		[
+			identity ? kv(identity.key, identity.value, "accent") : statusRow(null),
+			kv("target", facts.target, "accent"),
+			kv("think", facts.thinking, "reason"),
+			styledKv("caps", capabilitiesValue(theme, facts.capabilities)),
+			// accentDeep is a structure color reserved for the section tag; the autonomy
+			// value is a plain fact and reads muted like the other neutral values.
+			kv("autonomy", facts.safety),
+			kv("profile", facts.toolProfile),
+			kv(
+				"output",
+				facts.outputStyle && facts.outputStyle !== "standard" ? facts.outputStyle : null,
+				facts.outputStyle === "detailed" ? "accent" : "muted",
+			),
+			styledKv("memory", memoryValue),
+		],
+		_options.width,
+	);
 }
 
 function expandedContextBarCells(width: number | undefined): number {
@@ -584,6 +631,7 @@ function sourceState(theme: ClioTheme, facts: ContextEngineFacts): string | null
 const CONTEXT_SHORT_LABEL: Readonly<Record<ContextLedgerCategory, string>> = {
 	system: "sys",
 	tools: "tools",
+	toolResults: "results",
 	agents: "agt",
 	skills: "skl",
 	memory: "mem",
@@ -616,6 +664,12 @@ function ledgerChatChips(theme: ClioTheme, ledger: ContextLedger): string {
 	const chat = ledger.groups.find((group) => group.category === "messages")?.tokens ?? 0;
 	return joinChips(theme, [
 		theme.fg("accent", `chat ${formatFooterTokens(chat)}`),
+		ledger.groups.some((group) => group.category === "toolResults")
+			? theme.fg(
+					"tool",
+					`results ${formatFooterTokens(ledger.groups.find((group) => group.category === "toolResults")?.tokens ?? 0)}`,
+				)
+			: null,
 		ledger.reserveTokens > 0 ? theme.fg("dim", `rsv ${formatFooterTokens(ledger.reserveTokens)}`) : null,
 		ledger.contextWindow > 0
 			? theme.style("frame", `free ${formatFooterTokens(ledger.freeTokens)}`, { dim: true })
@@ -693,18 +747,23 @@ export function contextQuadrant(facts: ContextEngineFacts, options: ExpandedQuad
 
 	const usedTokens = hasLedger && ledger ? ledger.usedTokens : facts.used;
 	const windowTokens = hasLedger && ledger ? ledger.contextWindow : facts.contextWindow;
-	return dashboardBlock(theme, "Context", [
-		statusRow(bar),
-		kv("used", formatUsedWindow(usedTokens, windowTokens)),
-		fill ? styledKv("fill", fill) : statusRow(null),
-		chatFree ? styledKv("chat", chatFree) : statusRow(null),
-		kv("compact", formatCompaction(facts)),
-		styledKv("source", sourceState(theme, facts)),
-		facts.extensions && facts.extensions.installed > 0
-			? kv("ext", `${facts.extensions.active}/${facts.extensions.installed}`)
-			: statusRow(null),
-		...legendRows.map((row) => legendRow(row)),
-	]);
+	return dashboardBlock(
+		theme,
+		"Context",
+		[
+			statusRow(bar),
+			kv("used", formatUsedWindow(usedTokens, windowTokens)),
+			fill ? styledKv("fill", fill) : statusRow(null),
+			chatFree ? styledKv("budget", chatFree) : statusRow(null),
+			kv("compact", formatCompaction(facts)),
+			styledKv("source", sourceState(theme, facts)),
+			facts.extensions && facts.extensions.installed > 0
+				? kv("ext", `${facts.extensions.active}/${facts.extensions.installed}`)
+				: statusRow(null),
+			...legendRows.map((row) => legendRow(row)),
+		],
+		options.width,
+	);
 }
 
 function stopReasonStyle(reason: TurnSummary["stopReason"]): { glyph: string; token: ClioToken } {
@@ -722,7 +781,7 @@ function stopReasonStyle(reason: TurnSummary["stopReason"]): { glyph: string; to
  * rather than clipping a receipt id into a string that still reads like a valid
  * trace argument.
  */
-function workerLine(theme: ClioTheme, row: DispatchBoardRow, width: number): string {
+function workerLine(theme: ClioTheme, row: DispatchBoardRow, _width: number): string {
 	const presentation = dispatchStatusPresentation(row.status, { compact: true });
 	// The Activity section already promotes the fleet summary (or dispatch phase)
 	// to action orange. Worker rows remain readable without repeating that signal.
@@ -734,7 +793,13 @@ function workerLine(theme: ClioTheme, row: DispatchBoardRow, width: number): str
 		theme.fg("dim", formatCompactMs(row.elapsedMs)),
 		...(row.receiptId !== undefined ? [theme.fg("dim", row.receiptId)] : []),
 	];
-	return fitUnits(theme, dispatchRowPrefix(theme, row).text, units, Math.max(1, Math.floor(width)));
+	if (row.progress?.toolCalls !== undefined) units.push(theme.fg("muted", `${row.progress.toolCalls} calls`));
+	if (row.progress?.contextTokens !== undefined)
+		units.push(theme.fg("muted", `context ${formatFooterTokens(row.progress.contextTokens)}`));
+	if (row.progress?.inputTokens !== undefined || row.inputTokens > 0 || row.outputTokens > 0) {
+		units.push(theme.fg("dim", `↑${formatFooterTokens(row.inputTokens)} ↓${formatFooterTokens(row.outputTokens)}`));
+	}
+	return `${dispatchRowPrefix(theme, row).text}${units.join(" · ")}`;
 }
 
 interface ActivityQuadrantOptions extends ExpandedQuadrantOptions {
@@ -881,6 +946,7 @@ export function activityQuadrant(facts: AgentWorkFacts, options: ActivityQuadran
 				statusWidth,
 				true,
 				fleetSummaryIsAction,
+				facts.localCapacity ?? null,
 			),
 		),
 	];
@@ -919,15 +985,16 @@ export function activityQuadrant(facts: AgentWorkFacts, options: ActivityQuadran
 	// counted out loud instead of vanishing, so the row count an operator sees
 	// always reconciles with the `fleet` line above it.
 	const workerWidth = options.width !== undefined && Number.isFinite(options.width) ? options.width : 48;
-	for (const row of facts.dispatchRows.slice(0, maxWorkers)) rows.push(statusRow(workerLine(theme, row, workerWidth)));
-	const hiddenWorkers = facts.dispatchRows.length - maxWorkers;
+	const fleetRows = facts.dispatchRows;
+	for (const row of fleetRows.slice(0, maxWorkers)) rows.push(statusRow(workerLine(theme, row, workerWidth)));
+	const hiddenWorkers = fleetRows.length - maxWorkers;
 	if (hiddenWorkers > 0) rows.push(statusRow(theme.fg("dim", `+${hiddenWorkers} more`)));
 	if (facts.taskBoard && facts.taskBoard.tasks.length > 0) {
 		rows.push(styledKv("tasks", taskBoardValue(theme, facts.taskBoard)));
 		rows.push(statusRow(activeTaskLine(theme, facts.taskBoard)));
 	}
 	rows.push(kv("tools", meaningfulToolTally(facts.toolTally)));
-	return dashboardBlock(theme, "Activity", rows);
+	return dashboardBlock(theme, "Activity", rows, options.width);
 }
 
 /**
@@ -941,6 +1008,8 @@ export function zipColumns(
 	rightWidth: number,
 	sep: string,
 ): string[] {
+	left = left.flatMap((line) => wrapTextWithAnsi(line, Math.max(1, leftWidth)));
+	right = right.flatMap((line) => wrapTextWithAnsi(line, Math.max(1, rightWidth)));
 	const rowCount = Math.max(left.length, right.length);
 	const lines: string[] = [];
 	for (let i = 0; i < rowCount; i += 1) {
@@ -950,6 +1019,9 @@ export function zipColumns(
 }
 
 export function zipColumnBlocks(blocks: ReadonlyArray<string[]>, widths: ReadonlyArray<number>, sep: string): string[] {
+	blocks = blocks.map((block, index) =>
+		block.flatMap((line) => wrapTextWithAnsi(line, Math.max(1, widths[index] ?? 1))),
+	);
 	const rowCount = blocks.reduce((max, block) => Math.max(max, block.length), 0);
 	const lines: string[] = [];
 	for (let row = 0; row < rowCount; row += 1) {
@@ -989,7 +1061,12 @@ function harnessPhasePresentation(status: AgentStatus, width: number, now: numbe
 		case "thinking":
 			return { glyph: GLYPH.phaseThinking, label: "Thinking", token: "reason", live: true };
 		case "writing":
-			return { glyph: GLYPH.phaseWriting, label: "Writing", token: "accent", live: true };
+			return {
+				glyph: GLYPH.phaseWriting,
+				label: status.preparingToolCall ? "Preparing tool call" : "Writing",
+				token: "accent",
+				live: true,
+			};
 		case "tool_running":
 			return {
 				glyph: GLYPH.phaseTool,
@@ -1041,10 +1118,24 @@ function activeWorkerRows(rows: ReadonlyArray<DispatchBoardRow>): ReadonlyArray<
 	return rows.filter((row) => row.status === "running" || row.status === "stale" || row.status === "enqueued");
 }
 
-/** Background work stays a count beside the main phase. */
-function activeWorkerChip(rows: ReadonlyArray<DispatchBoardRow>): string {
-	const count = activeWorkerRows(rows).length;
-	return `${count} worker${count === 1 ? "" : "s"}`;
+/**
+ * Background work stays a count beside the main phase. When a host limit holds
+ * local demand below what is queued, the chip names that limit.
+ */
+function activeWorkerChip(rows: ReadonlyArray<DispatchBoardRow>, localCapacity: LocalCapacity | null = null): string {
+	const active = activeWorkerRows(rows);
+	const helpers = active.filter(isHelperRun).length;
+	const workers = active.length - helpers;
+	const chip = [
+		helpers > 0 ? `${helpers} helper${helpers === 1 ? "" : "s"}` : null,
+		workers > 0 ? `${workers} worker${workers === 1 ? "" : "s"}` : null,
+	]
+		.filter(Boolean)
+		.join(" · ");
+	if (localCapacity === null) return chip;
+	const localDemand = active.filter((row) => row.node === undefined || row.node === "local").length;
+	const bound = localDemand > localCapacity.limit ? describeLocalCapacity(localCapacity) : null;
+	return bound === null ? chip : `${chip} · ${bound}`;
 }
 
 function harnessBadge(
@@ -1053,13 +1144,14 @@ function harnessBadge(
 	toolCounts: ToolTallySnapshot,
 	dispatchRows: ReadonlyArray<DispatchBoardRow>,
 	fleetSummaryIsAction = false,
+	localCapacity: LocalCapacity | null = null,
 ): string {
 	const workers = activeWorkerRows(dispatchRows).length;
 	const activeTools = finiteNonNegative(toolCounts.active);
 	// Active fleet work is a Clio-signature state; it gets the action color.
 	if (workers > 0) {
 		const token = status.phase === "dispatching" ? "muted" : fleetSummaryIsAction ? "accent" : "action";
-		return theme.fg(token, activeWorkerChip(dispatchRows));
+		return theme.fg(token, activeWorkerChip(dispatchRows, localCapacity));
 	}
 	const badgeText = activeTools > 0 ? `tools ${activeTools}` : null;
 	return badgeText ? theme.fg("muted", badgeText) : "";
@@ -1079,9 +1171,12 @@ function buildHarnessStatePill(
 	width: number,
 	showBadge = true,
 	fleetSummaryIsAction = false,
+	localCapacity: LocalCapacity | null = null,
 ): string {
 	const safeWidth = Math.max(1, Math.floor(width));
-	const badge = showBadge ? harnessBadge(theme, status, toolCounts, dispatchRows, fleetSummaryIsAction) : "";
+	const badge = showBadge
+		? harnessBadge(theme, status, toolCounts, dispatchRows, fleetSummaryIsAction, localCapacity)
+		: "";
 	// Idleness is absence of work, not a phase worth narrating. If a tool or
 	// fleet remains live while the harness settles, keep that activity without
 	// prefixing it with an idle glyph.

package/src/interactive/footer-panel.ts

@@ -1,8 +1,10 @@
 import type { TokenThroughputSnapshot, UsageBreakdown } from "../domains/observability/index.js";
+import { sanitizeCallTargetText } from "../domains/safety/call-target.js";
 import { type Text, truncateToWidth, visibleWidth } from "../engine/tui.js";
 import type { DispatchBoardRow, DispatchBoardStatus } from "./dispatch-board.js";
 import { formatReasoningChip } from "./status/reasoning.js";
 import { type ClioTheme, formatCompactMs, formatContextPercent, GLYPH } from "./theme/index.js";
+import { isHelperRun } from "./worker-stream.js";
 
 /**
  * Render a token count with a single-letter magnitude suffix so the footer
@@ -86,13 +88,33 @@ function dispatchStatusCounts(rows: ReadonlyArray<DispatchBoardRow>): {
 
 export function dispatchSegment(rows: ReadonlyArray<DispatchBoardRow> | null | undefined): string | null {
 	if (!rows || rows.length === 0) return null;
-	const counts = dispatchStatusCounts(rows);
-	const parts: string[] = [];
-	if (counts.active > 0) parts.push(`${counts.active} active`);
-	if (counts.completed > 0) parts.push(`${counts.completed} done`);
-	if (counts.failed > 0) parts.push(`${counts.failed} fail`);
-	if (counts.tokens > 0) parts.push(`${formatFooterTokens(counts.tokens)}tok`);
-	return `dispatch ${parts.length > 0 ? parts.join(" ") : `${rows.length} runs`}`;
+	const groups = [
+		{ label: "helpers", rows: rows.filter(isHelperRun) },
+		{ label: "dispatch", rows: rows.filter((row) => !isHelperRun(row)) },
+	];
+	return groups
+		.filter((group) => group.rows.length > 0)
+		.map((group) => {
+			const counts = dispatchStatusCounts(group.rows);
+			const parts: string[] = [];
+			if (group.label === "helpers") {
+				const names = new Map<string, number>();
+				for (const row of group.rows) names.set(row.agentId, (names.get(row.agentId) ?? 0) + 1);
+				parts.push(
+					[...names]
+						.slice(0, 2)
+						.map(([name, count]) => `${sanitizeCallTargetText(name).slice(0, 24)}${count > 1 ? ` ×${count}` : ""}`)
+						.join(", "),
+				);
+				if (names.size > 2) parts.push(`+${names.size - 2} kinds`);
+			}
+			if (counts.active > 0) parts.push(`${counts.active} active`);
+			if (counts.completed > 0) parts.push(`${counts.completed} done`);
+			if (counts.failed > 0) parts.push(`${counts.failed} fail`);
+			if (counts.tokens > 0) parts.push(`${formatFooterTokens(counts.tokens)}tok`);
+			return `${group.label} ${parts.length > 0 ? parts.join(" ") : `${group.rows.length} runs`}`;
+		})
+		.join(" · ");
 }
 
 export interface FooterPanel {