@iowarp/clio-coder 0.4.5 → 0.4.6

package/src/interactive/chat-renderer.ts

@@ -14,7 +14,6 @@
  */
 
 import { existsSync } from "node:fs";
-import { ToolNames } from "../core/tool-names.js";
 import { foldWorkingSet } from "../domains/context/working-set/fold.js";
 import { compactionCut } from "../domains/context/working-set/visible.js";
 import { captureSkillContext } from "../domains/session/compaction/compact.js";
@@ -52,7 +51,6 @@ import {
 } from "../engine/messages.js";
 import { wrapTextWithAnsi } from "../engine/tui.js";
 import type { AgentMessage } from "../engine/types.js";
-import { toolPresentationPolicy } from "../tools/presentation.js";
 import { toolResultPresentationText } from "../tools/result-disposition.js";
 import type { ChatLoopEvent, RetryStatusPayload } from "./chat-loop.js";
 import { isSelfExplainingAbort, toolResultSummary } from "./chat-loop-messages.js";
@@ -69,7 +67,7 @@ import {
 	type StreamPacer,
 	type StreamPacerSlice,
 } from "./stream-pacer.js";
-import { type FoldOverride, policyToolFold, resolveFold, type TranscriptDetailPolicy } from "./transcript-detail.js";
+import type { TranscriptDetailPolicy } from "./transcript-detail.js";
 import { readWorkerReceiptFactsForReplay } from "./worker-receipts.js";
 import { workerEntriesFromRunEntries } from "./worker-replay.js";
 import type { WorkerReceiptReader } from "./worker-stream.js";
@@ -804,25 +802,24 @@ function appendReplayLine(chatPanel: ChatPanel, text: string): void {
 function renderBashExecutionEntry(
 	entry: BashExecutionEntry,
 	width: number,
-	folded: boolean,
+	detail: TranscriptDetailPolicy,
 	unbounded: boolean,
 ): string[] {
 	const normalizedOutput = entry.output.replace(/\r\n/g, "\n").replace(/\r/g, "\n").replace(/\s+$/g, "");
 	return renderBashTranscriptExecution(
 		{
 			command: entry.command,
-			output: unbounded ? normalizedOutput : truncateReplayText(normalizedOutput),
+			output: normalizedOutput,
 			running: false,
 			exitCode: entry.exitCode,
 			cancelled: entry.cancelled,
 			truncated: entry.truncated,
 			fullOutputPath: entry.fullOutputPath,
 			excludeFromContext: entry.excludeFromContext,
-			folded,
 		},
 		width,
 		undefined,
-		{ unbounded, diffStyle: "plain" },
+		{ unbounded, diffStyle: "plain", detail },
 	);
 }
 
@@ -1259,16 +1256,16 @@ export function rehydrateChatPanelFromTurns(
 			case "message": {
 				if (entry.role === "user") {
 					runAssistantMessages = [];
-					const text = truncateReplayText(replayedUserText(entry));
+					const text = replayedUserText(entry);
 					if (text.length > 0) chatPanel.appendUser(text);
 					break;
 				}
 				if (entry.role === "assistant") {
 					const text = chatMessageText(entry);
 					const failure = messageFailure(entry);
-					const richMessage = richMessageFromEntry(entry, MAX_REPLAY_TEXT_CHARS);
+					const richMessage = richMessageFromEntry(entry, Number.POSITIVE_INFINITY);
 					if (richMessage || text.length > 0 || failure) {
-						const message = richMessage ?? makeTextMessage("assistant", truncateReplayText(text), entry.timestamp);
+						const message = richMessage ?? makeTextMessage("assistant", text, entry.timestamp);
 						if (failure) {
 							(message as { stopReason?: string; errorMessage?: string }).stopReason = failure.stopReason;
 							(message as { stopReason?: string; errorMessage?: string }).errorMessage = failure.errorMessage;
@@ -1303,7 +1300,7 @@ export function rehydrateChatPanelFromTurns(
 							type: "tool_execution_end",
 							toolCallId: fallbackId,
 							toolName: result.name,
-							result: displayReplayToolResult(result.result, options.unboundedToolBodies === true),
+							result: displayReplayToolResult(result.result, true),
 							isError: result.isError,
 							...(result.durationMs !== undefined ? { durationMs: result.durationMs } : {}),
 							...(resultSummary !== undefined ? { resultSummary } : {}),
@@ -1312,12 +1309,12 @@ export function rehydrateChatPanelFromTurns(
 							...(evictedReason !== undefined ? { evictedReason } : {}),
 						} as ChatLoopEvent);
 					} else {
-						chatPanel.appendReplayBlock((width) =>
+						chatPanel.appendReplayBlock((width, detail, unbounded) =>
 							renderToolResultOnly(
 								{
 									toolCallId: result.id ?? "",
 									toolName: result.name,
-									result: displayReplayToolResult(result.result, options.unboundedToolBodies === true),
+									result: displayReplayToolResult(result.result, true),
 									isError: result.isError,
 									...(result.durationMs !== undefined ? { durationMs: result.durationMs } : {}),
 									...(resultSummary !== undefined ? { resultSummary } : {}),
@@ -1326,7 +1323,7 @@ export function rehydrateChatPanelFromTurns(
 									...(evictedReason !== undefined ? { evictedReason } : {}),
 								},
 								width,
-								{ unbounded: options.unboundedToolBodies === true },
+								{ unbounded: unbounded || options.unboundedToolBodies === true, detail },
 							),
 						);
 					}
@@ -1345,21 +1342,8 @@ export function rehydrateChatPanelFromTurns(
 				break;
 			}
 			case "bashExecution": {
-				let fold: FoldOverride;
-				const presentation = toolPresentationPolicy(ToolNames.Bash, undefined);
-				const policyFold = (detail: TranscriptDetailPolicy) => policyToolFold(detail, presentation);
-				const unbounded = options.unboundedToolBodies === true;
-				chatPanel.appendReplayBlock(
-					(width, detail) =>
-						renderBashExecutionEntry(entry, width, resolveFold(fold, policyFold(detail)) === "folded", unbounded),
-					undefined,
-					{
-						policyFold,
-						fold: () => fold,
-						setFold: (next: FoldOverride) => {
-							fold = next;
-						},
-					},
+				chatPanel.appendReplayBlock((width, detail, unbounded) =>
+					renderBashExecutionEntry(entry, width, detail, unbounded || options.unboundedToolBodies === true),
 				);
 				break;
 			}
@@ -1427,5 +1411,4 @@ export function rehydrateChatPanelFromTurns(
 	// whatever the operator had opened or folded before the switch belonged to
 	// the transcript they left. /export reaches the same policy with a verbose
 	// panel, so nothing here is terminal-only.
-	chatPanel.clearFoldOverrides();
 }

package/src/interactive/dispatch-board.ts

@@ -246,9 +246,7 @@ export interface DispatchOriginPresentation {
  * surface; a board row sits under the fleet summary, which already owns the
  * quadrant's single orange, so here the filled glyph carries origin by shape.
  */
-export function dispatchOriginPresentation(
-	row: Pick<DispatchBoardRow, "requestOrigin">,
-): DispatchOriginPresentation | null {
+function dispatchOriginPresentation(row: Pick<DispatchBoardRow, "requestOrigin">): DispatchOriginPresentation | null {
 	if (row.requestOrigin === "user") return { glyph: GLYPH.workerHuman, token: "accent" };
 	if (row.requestOrigin === "agent") return { glyph: GLYPH.workerAgent, token: "muted" };
 	if (row.requestOrigin === "internal") return { glyph: GLYPH.workerInternal, token: "dim" };

package/src/interactive/editor-submit.ts

@@ -1,9 +1,8 @@
 import { combineBashOutput, runBashCommand } from "../core/bash-exec.js";
+import { type ExternalEditResult, editTextExternally, resolveExternalEditor } from "../core/external-editor.js";
 import type { PendingSkillRequest } from "../core/skill-activation.js";
-import { ToolNames } from "../core/tool-names.js";
 import type { DispatchContract } from "../domains/dispatch/contract.js";
 import type { SessionContract, SessionEntry } from "../domains/session/index.js";
-import { toolPresentationPolicy } from "../tools/presentation.js";
 import type { ChatLoop } from "./chat-loop.js";
 import type { ChatPanel } from "./chat-panel.js";
 import { bashExecutionEntryInput, parseEditorBashCommand, unguardPastedEditorOperator } from "./editor-bash.js";
@@ -13,16 +12,8 @@ import {
 	type RunningDispatchRef,
 	resolveSteerTarget,
 } from "./editor-steer.js";
-import { type ExternalEditResult, editTextExternally, resolveExternalEditor } from "./external-editor.js";
 import { type BashTranscriptExecution, renderBashTranscriptExecution } from "./renderers/tool-execution.js";
 import { parseSlashCommand, type RunIo, type SlashCommand, type SlashCommandDispatchResult } from "./slash-commands.js";
-import {
-	type FoldOverride,
-	policyRunningToolFold,
-	policyToolFold,
-	resolveFold,
-	type TranscriptDetailPolicy,
-} from "./transcript-detail.js";
 
 const EDITOR_BASH_TIMEOUT_MS = 300_000;
 /** Existing bash TERM-to-KILL grace (5s), plus settlement and session append. */
@@ -86,6 +77,7 @@ export interface EditorSubmitSessionTranscript {
 }
 
 export interface EditorSubmitDeps {
+	onLocalBashRunning?: (running: boolean) => void;
 	editor: EditorSubmitEditor;
 	ui: EditorSubmitUi;
 	io: RunIo;
@@ -171,35 +163,19 @@ export function createEditorSubmitController(deps: EditorSubmitDeps): EditorSubm
 			totalBytes: 0,
 			excludeFromContext: parsed.excludeFromContext,
 		};
-		// The operator's bash row follows the same rule as a model bash call: the
-		// transcript detail policy (through bash's presentation once settled)
-		// unless the operator overrode this one block with the expand key.
-		let fold: FoldOverride;
-		const bashPresentation = toolPresentationPolicy(ToolNames.Bash, undefined);
-		const policyFold = (detail: TranscriptDetailPolicy) =>
-			execution.running ? policyRunningToolFold(detail) : policyToolFold(detail, bashPresentation);
 		deps.chatPanel.appendReplayBlock(
-			(width, detail) =>
+			(width, detail, unbounded) =>
 				renderBashTranscriptExecution(
-					{
-						...execution,
-						folded: resolveFold(fold, policyFold(detail)) === "folded",
-						...(execution.running ? { elapsedMs: Math.max(0, performance.now() - startedAt) } : {}),
-					},
+					{ ...execution, ...(execution.running ? { elapsedMs: Math.max(0, performance.now() - startedAt) } : {}) },
 					width,
+					undefined,
+					{ detail, ...(unbounded ? { unbounded } : {}) },
 				),
 			() => execution.running,
-			{
-				policyFold,
-				fold: () => fold,
-				setFold: (next: FoldOverride) => {
-					fold = next;
-					deps.ui.requestRender();
-				},
-			},
 		);
 		deps.ui.requestRender();
 
+		deps.onLocalBashRunning?.(true);
 		let settlement!: Promise<void>;
 		settlement = (async () => {
 			try {
@@ -249,6 +225,7 @@ export function createEditorSubmitController(deps: EditorSubmitDeps): EditorSubm
 				execution.error = msg;
 				deps.io.stderr(`[bash] ${msg}\n`);
 			} finally {
+				deps.onLocalBashRunning?.(false);
 				if (activeEditorBash === abort) activeEditorBash = null;
 				if (activeEditorBashSettlement === settlement) activeEditorBashSettlement = null;
 				deps.ui.requestRender();

package/src/interactive/footer/dashboard.ts

@@ -139,7 +139,12 @@ function statusText(status: AgentStatus | undefined, now: number, width: number,
 	if (!status || status.phase === "idle") return null;
 	const verb = resolveFooterVerb(status, now, width);
 	if (!verb) return status.phase.replace(/_/g, " ");
-	return status.phase === "ended" ? verb.text : `${spinnerFrame(frame)} ${verb.text}`;
+	return status.phase === "ended" ||
+		status.phase === "tool_blocked" ||
+		status.phase === "stuck" ||
+		status.tool?.toolName === "ask_user"
+		? verb.text
+		: `${spinnerFrame(frame)} ${verb.text}`;
 }
 
 /** Null before anything has been priced, so the footer shows no cost field at all. */
@@ -172,7 +177,7 @@ function renderFooterCompactLines(state: FooterDashboardRenderState, width: numb
 			state.throughput,
 			state.sessionTokens,
 			state.sessionCost,
-			state.session.outputVerbosity,
+			state.session.outputStyle,
 			state.session.leaderArmed ?? false,
 			state.session.shutdownArmed ?? false,
 		),
@@ -434,7 +439,7 @@ export function buildFooterDashboard(deps: FooterDashboardDeps): FooterDashboard
 				capabilities,
 				safety,
 				toolProfile,
-				outputVerbosity: settings?.interface.outputDetail ?? "default",
+				outputStyle: settings?.interface.outputDetail ?? "standard",
 				leaderArmed: deps.getLeaderArmed?.() ?? false,
 				shutdownArmed: deps.getShutdownArmed?.() ?? false,
 				memoryIntervention: taskMemory

package/src/interactive/footer/widgets.ts

@@ -1,4 +1,4 @@
-import type { OutputVerbosity } from "../../core/defaults.js";
+import type { OutputStyle } from "../../core/defaults.js";
 import { ToolNames } from "../../core/tool-names.js";
 import {
 	type CostAggregate,
@@ -14,7 +14,6 @@ import { CONTEXT_CATEGORY_TOKEN, contextCategorySwatch, renderContextMeterBar }
 import {
 	agentDisplayLabel,
 	type DispatchBoardRow,
-	dispatchOriginPresentation,
 	dispatchRowPrefix,
 	dispatchStatusPresentation,
 } from "../dispatch-board.js";
@@ -70,7 +69,7 @@ export interface SessionFacts {
 	safety: string | null;
 	toolProfile: string | null;
 	/** Active transcript detail mode, shown in the dashboard so visibility is never implicit. */
-	outputVerbosity?: OutputVerbosity | null;
+	outputStyle?: OutputStyle | null;
 	/**
 	 * Ctrl+G armed the portable leader and is waiting for the next key. Shown
 	 * because the frame between the two keystrokes was otherwise identical to
@@ -391,7 +390,7 @@ export function compactSecondaryLine(
 	throughput: TokenThroughputSnapshot | null = null,
 	sessionTokens: UsageBreakdown | null = null,
 	sessionCost: CostAggregate | null = null,
-	outputVerbosity?: OutputVerbosity | null,
+	outputStyle?: OutputStyle | null,
 	leaderArmed = false,
 	shutdownArmed = false,
 ): string {
@@ -427,15 +426,15 @@ export function compactSecondaryLine(
 		context.used ?? undefined,
 		maxRightWidth,
 		compactMetricChipLimit(safeWidth),
-		outputVerbosity,
+		outputStyle,
 		leaderArmed,
 		shutdownArmed,
 	);
 	// At the smallest widths the context meter consumes the entire secondary
 	// row, so keep a compact mode marker on the left instead of silently hiding
 	// the active transcript setting.
-	if (outputVerbosity && outputVerbosity !== "default" && visibleWidth(right) === 0) {
-		const marker = outputVerbosity === "minimal" ? "m" : outputVerbosity === "verbose" ? "v" : "d";
+	if (outputStyle && outputStyle !== "standard" && visibleWidth(right) === 0) {
+		const marker = outputStyle === "compact" ? "C" : outputStyle === "detailed" ? "D" : "S";
 		left = `${left}${theme.fg("dim", ` out:${marker}`)}`;
 	}
 	return joinColumns(left, right, safeWidth);
@@ -541,8 +540,8 @@ export function sessionQuadrant(facts: SessionFacts, options: ExpandedQuadrantOp
 		kv("profile", facts.toolProfile),
 		kv(
 			"output",
-			facts.outputVerbosity && facts.outputVerbosity !== "default" ? facts.outputVerbosity : null,
-			facts.outputVerbosity === "verbose" ? "accent" : "muted",
+			facts.outputStyle && facts.outputStyle !== "standard" ? facts.outputStyle : null,
+			facts.outputStyle === "detailed" ? "accent" : "muted",
 		),
 		styledKv("memory", memoryValue),
 	]);
@@ -965,35 +964,41 @@ type HarnessPhasePresentation = {
 
 function shortToolLabel(status: AgentStatus, width: number): string {
 	const name = status.tool?.toolName?.trim();
-	if (name === ToolNames.AskUser) return width < 72 ? "ask" : "waiting for user";
-	if (!name || width < 72) return "tool";
+	if (name === ToolNames.AskUser) return "Needs input";
+	if (name === ToolNames.Dispatch) return "Waiting for worker";
+	if (!name || width < 72) return "Running tool";
 	const nameWidth = width >= 100 ? 18 : 12;
 	// The pill label is never padded; truncate without pad so the tool name is
 	// followed by a single space before the badge, not a column of blanks.
-	return `tool ${truncateToWidth(name, nameWidth, "…", false)}`;
+	return `Running ${truncateToWidth(name, nameWidth, "…", false)}`;
 }
 
 function harnessPhasePresentation(status: AgentStatus, width: number, now: number): HarnessPhasePresentation {
 	const ultraNarrow = width < 48;
 	switch (status.phase) {
 		case "idle":
-			return { glyph: GLYPH.queued, label: "idle", token: "muted", live: false };
+			return { glyph: GLYPH.queued, label: "Ready", token: "muted", live: false };
 		case "preparing":
-			return { glyph: GLYPH.phaseWaiting, label: "prep", token: "info", live: true };
+			return { glyph: GLYPH.phaseWaiting, label: "Preparing", token: "info", live: true };
 		case "waiting_model":
-			return { glyph: GLYPH.phaseWaiting, label: "waiting", token: "info", live: true };
+			return { glyph: GLYPH.phaseWaiting, label: "Waiting for model", token: "info", live: true };
 		case "thinking":
-			return { glyph: GLYPH.phaseThinking, label: "thinking", token: "reason", live: true };
+			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: "Writing", token: "accent", live: true };
 		case "tool_running":
-			return { glyph: GLYPH.phaseTool, label: shortToolLabel(status, width), token: "accent", live: true };
+			return {
+				glyph: GLYPH.phaseTool,
+				label: shortToolLabel(status, width),
+				token: "accent",
+				live: status.tool?.toolName !== ToolNames.AskUser,
+			};
 		case "tool_blocked":
 			// Attention states hold a static glyph rather than spinning: the work
 			// has paused for a human, so the pill should not read as live progress.
 			// The phase fires only on PermissionRequested, so the pill names the
 			// wait for confirmation; "blocked" would contradict the ask overlay.
-			return { glyph: GLYPH.phaseBlocked, label: "confirm", token: "warning", live: false };
+			return { glyph: GLYPH.phaseBlocked, label: "Needs approval", token: "warning", live: false };
 		case "retrying": {
 			const attempt = status.retry?.attempt ?? 0;
 			const maxAttempts = status.retry?.maxAttempts ?? 0;
@@ -1005,15 +1010,26 @@ function harnessPhasePresentation(status: AgentStatus, width: number, now: numbe
 			};
 		}
 		case "compacting":
-			return { glyph: GLYPH.phaseCompact, label: "compacting", token: "reason", live: true };
+			return { glyph: GLYPH.phaseCompact, label: "Compacting context", token: "reason", live: true };
 		case "dispatching":
-			return { glyph: GLYPH.phaseDispatch, label: "dispatch", token: "action", live: true };
+			return { glyph: GLYPH.phaseDispatch, label: "Waiting for worker", token: "action", live: true };
 		case "stuck": {
-			const seconds = Math.max(0, Math.floor((now - status.since) / 1000));
-			return { glyph: GLYPH.warn, label: ultraNarrow ? "stuck" : `stuck ${seconds}s`, token: "error", live: false };
+			const seconds = Math.max(0, Math.floor((now - status.lastMeaningfulAt) / 1000));
+			return {
+				glyph: GLYPH.warn,
+				label: ultraNarrow ? "No output" : `No output · ${seconds}s`,
+				token: "warning",
+				live: false,
+			};
+		}
+		case "ended": {
+			const stop = status.summary?.stopReason;
+			if (stop === "error") return { glyph: GLYPH.error, label: "Failed", token: "error", live: false };
+			if (stop === "aborted" || stop === "cancelled")
+				return { glyph: GLYPH.cancelled, label: "Cancelled", token: "muted", live: false };
+			if (stop === "length") return { glyph: GLYPH.warn, label: "Output limit", token: "warning", live: false };
+			return { glyph: GLYPH.ok, label: "Ready", token: "success", live: false };
 		}
-		case "ended":
-			return { glyph: GLYPH.ok, label: "done", token: "success", live: false };
 	}
 }
 
@@ -1021,31 +1037,10 @@ function activeWorkerRows(rows: ReadonlyArray<DispatchBoardRow>): ReadonlyArray<
 	return rows.filter((row) => row.status === "running" || row.status === "stale" || row.status === "enqueued");
 }
 
-/**
- * The live worker count, split by who asked once more than one kind is running:
- * `◇1 ◆3` says the operator has one run of their own alongside three the model
- * started, which `fleet 4` cannot. A single kind keeps the plain count, and so
- * does a set holding a run whose origin never reached the projection, because a
- * split that cannot name every active run would report a total that is short.
- *
- * The chip keeps one color. Its token says the fleet is busy; origin is carried
- * by glyph shape, which is the same pair the board rows and the transcript
- * blocks use.
- */
+/** Background work stays a count beside the main phase. */
 function activeWorkerChip(rows: ReadonlyArray<DispatchBoardRow>): string {
-	const active = activeWorkerRows(rows);
-	const counts = new Map<string, number>();
-	for (const row of active) {
-		const glyph = dispatchOriginPresentation(row)?.glyph;
-		if (glyph === undefined) return `fleet ${active.length}`;
-		counts.set(glyph, (counts.get(glyph) ?? 0) + 1);
-	}
-	if (counts.size < 2) return `fleet ${active.length}`;
-	const order = [GLYPH.workerHuman, GLYPH.workerAgent, GLYPH.workerInternal];
-	return order
-		.filter((glyph) => counts.has(glyph))
-		.map((glyph) => `${glyph}${counts.get(glyph)}`)
-		.join(" ");
+	const count = activeWorkerRows(rows).length;
+	return `${count} worker${count === 1 ? "" : "s"}`;
 }
 
 function harnessBadge(
@@ -1066,8 +1061,8 @@ function harnessBadge(
 	return badgeText ? theme.fg("muted", badgeText) : "";
 }
 
-function outputVerbosityLabel(verbosity: OutputVerbosity): string {
-	return verbosity === "minimal" ? "min" : verbosity === "verbose" ? "verbose" : "default";
+function outputStyleLabel(verbosity: OutputStyle): string {
+	return verbosity.charAt(0).toUpperCase() + verbosity.slice(1);
 }
 
 function buildHarnessStatePill(
@@ -1112,7 +1107,6 @@ const CHIP_RANK_SHUTDOWN = -2;
 const CHIP_RANK_LEADER = -1;
 const CHIP_RANK_TOTALS = 0;
 const CHIP_RANK_DETAIL = 1;
-const CHIP_RANK_DEFERRED = 2;
 
 interface RankedChip {
 	text: string;
@@ -1156,20 +1150,17 @@ function buildMetricStrip(
 	liveInputTokens: number | null | undefined,
 	maxWidth: number,
 	maxChipsCount = 6,
-	outputVerbosity?: OutputVerbosity | null,
+	outputStyle?: OutputStyle | null,
 	leaderArmed = false,
 	shutdownArmed = false,
 ): string {
 	const safeMaxWidth = Math.max(0, Math.floor(maxWidth));
 	if (safeMaxWidth <= 0) return "";
 	const isStreaming = status.phase !== "idle" && status.phase !== "ended";
-	const meaningfulVerbosity = outputVerbosity && outputVerbosity !== "default" ? outputVerbosity : null;
-	if (!isStreaming && !lastTurn && !meaningfulVerbosity && !leaderArmed && !shutdownArmed) return "";
+	const style = outputStyle ?? "standard";
 
 	const candidates: Array<string | null> = [];
-	/** Per-turn detail that ranks below the session totals when the strip is cut. */
-	const deferred: Array<string | null> = [];
-	if (isStreaming) {
+	if (isStreaming && outputStyle === "detailed") {
 		const tps = finiteNonNegative(throughput?.tokensPerSecond);
 		const rounded = tps > 0 ? (tps >= 10 ? Math.round(tps) : Math.round(tps * 10) / 10) : null;
 		candidates.push(rounded !== null ? theme.fg("success", `${GLYPH.speed}${rounded}/s`) : null);
@@ -1186,39 +1177,7 @@ function buildMetricStrip(
 			finiteNonNegative(lastTurn?.inputTokens) ||
 			finiteNonNegative(sessionTokens?.input);
 		candidates.push(inputTokens > 0 ? theme.fg("muted", `${GLYPH.up}${formatFooterTokens(inputTokens)}`) : null);
-	} else if (lastTurn) {
-		const stop = stopReasonStyle(lastTurn.stopReason);
-		candidates.push(theme.fg(stop.token, `${stop.glyph} ${formatCompactMs(lastTurn.elapsedMs)}`));
-		candidates.push(
-			theme.fg(
-				"muted",
-				`${GLYPH.up}${formatFooterTokens(lastTurn.inputTokens)} ${GLYPH.down}${formatFooterTokens(lastTurn.outputTokens)}`,
-			),
-		);
-		candidates.push(reasoningChip(theme, lastTurn));
-		// Held back so the session totals below outrank them. The chip list is cut
-		// to `maxChipsCount` before it is measured, and with cache and tools ahead
-		// of the totals an 80-column terminal spent the whole budget on per-turn
-		// detail: the cost field disappeared from the footer at the exact moment
-		// it acquired a value, while `/cost` on the same session read `cost
-		// unknown`. Two surfaces, two answers, because of a slice.
-		deferred.push(
-			lastTurn.cacheReadTokens > 0 || lastTurn.cacheWriteTokens > 0
-				? theme.fg(
-						"dim",
-						`cache ${formatFooterTokens(lastTurn.cacheReadTokens)}/${formatFooterTokens(lastTurn.cacheWriteTokens)}`,
-					)
-				: null,
-		);
-		if (lastTurn.toolCount > 0) {
-			const label = `${lastTurn.toolCount} tool${lastTurn.toolCount === 1 ? "" : "s"}`;
-			const errors = lastTurn.toolErrorCount > 0 ? theme.fg("error", ` ${lastTurn.toolErrorCount}${GLYPH.error}`) : "";
-			deferred.push(`${theme.fg("muted", label)}${errors}`);
-		} else {
-			deferred.push(null);
-		}
 	}
-	if (meaningfulVerbosity) deferred.push(theme.fg("muted", `out ${outputVerbosityLabel(meaningfulVerbosity)}`));
 
 	const fallbackTotal = finiteNonNegative(sessionTokens?.input) + finiteNonNegative(sessionTokens?.output);
 	const cumulativeTotal = finiteNonNegative(sessionTokens?.totalTokens) || fallbackTotal;
@@ -1232,6 +1191,7 @@ function buildMetricStrip(
 
 	const chipLimit = Math.max(0, Math.floor(maxChipsCount));
 	const chips: RankedChip[] = [];
+	pushChip(chips, theme.fg("muted", outputStyleLabel(style)), CHIP_RANK_LEADER);
 	// Ranked above every measurement: the strip is cut by dropping the
 	// lowest-ranked chip, and these two are the answer to "did that key
 	// register". The quit hint outranks the leader because its window is
@@ -1245,6 +1205,5 @@ function buildMetricStrip(
 	for (const chip of candidates) pushChip(chips, chip, CHIP_RANK_DETAIL);
 	pushChip(chips, totalChip, CHIP_RANK_TOTALS);
 	pushChip(chips, costChip, CHIP_RANK_DETAIL);
-	for (const chip of deferred) pushChip(chips, chip, CHIP_RANK_DEFERRED);
 	return joinChips(theme, selectChips(theme, chips, chipLimit, safeMaxWidth));
 }

package/src/interactive/interactive-application.ts

@@ -1,5 +1,6 @@
 import type { PermissionRequestedPayload } from "../core/bus-events.js";
 import type { ClioSettings } from "../core/config.js";
+import { nextOutputStyle } from "../core/defaults.js";
 import type { SafeEventBus } from "../core/event-bus.js";
 import { expandInlineFileReferencesAsync } from "../core/file-references.js";
 import type { PendingSkillRequest } from "../core/skill-activation.js";
@@ -326,11 +327,7 @@ export interface KeyBindingDeps {
 	cycleScopedModelForward: () => void;
 	cycleScopedModelBackward: () => void;
 	dismissNotifications: () => void;
-	toggleToolExpansion: () => void;
-	toggleAllToolExpansion: () => void;
-	toggleLiveToolOutput: () => void;
-	toggleThinkingExpansion: () => void;
-	toggleAllThinkingExpansion: () => void;
+	cycleOutputStyle: () => void;
 	openExternalEditor: () => void;
 	queueFollowUp: () => void;
 	interruptWithMessage: () => void;
@@ -361,18 +358,12 @@ export function resolveCtrlCAction(deps: CtrlCActionDeps): CtrlCAction {
 
 function dispatchInteractiveAction(id: ClioKeybinding, deps: KeyBindingDeps): boolean {
 	switch (id) {
+		case "clio-coder.output.cycle":
+			deps.cycleOutputStyle();
+			return true;
 		case "clio-coder.notifications.dismiss":
 			deps.dismissNotifications();
 			return true;
-		case "clio-coder.tool.expand":
-			deps.toggleToolExpansion();
-			return true;
-		case "clio-coder.tool.expandAll":
-			deps.toggleAllToolExpansion();
-			return true;
-		case "clio-coder.tool.liveOutput":
-			deps.toggleLiveToolOutput();
-			return true;
 		case "clio-coder.editor.external":
 			deps.openExternalEditor();
 			return true;
@@ -385,12 +376,6 @@ function dispatchInteractiveAction(id: ClioKeybinding, deps: KeyBindingDeps): bo
 		case "clio-coder.message.dequeue":
 			deps.restoreQueuedFollowUps();
 			return true;
-		case "clio-coder.thinking.expand":
-			deps.toggleThinkingExpansion();
-			return true;
-		case "clio-coder.thinking.expandAll":
-			deps.toggleAllThinkingExpansion();
-			return true;
 		case "clio-coder.status.toggle":
 			deps.toggleStatus();
 			return true;
@@ -671,8 +656,6 @@ export async function createInteractiveApplication(deps: InteractiveDeps): Promi
 		recordToolStart: (toolName, toolCallId) => presentation.recordToolStart(toolCallId, toolName),
 		recordToolEnd: (_toolName, toolCallId, isError, truncated) =>
 			presentation.recordToolEnd({ toolCallId, isError, truncated }),
-		setStatusLine: (line) => chatPanel.setStatusLine(line),
-		setLiveReasoning: (view) => chatPanel.setLiveReasoning(view),
 		setLastTurnSummary: (summary) => presentation.setLastTurnSummary(summary),
 		startTerminalProgress: () => agentProgress.start(),
 		stopTerminalProgress: () => agentProgress.stop(),
@@ -710,7 +693,6 @@ export async function createInteractiveApplication(deps: InteractiveDeps): Promi
 		chatPanel: {
 			appendReplayBlock: (...args) => chatRenderer.mutate(() => chatPanel.appendReplayBlock(...args), "slash-output"),
 			appendUser: (text, status) => chatRenderer.mutate(() => chatPanel.appendUser(text, status), "user-submit"),
-			clearFoldOverrides: () => chatRenderer.mutate(() => chatPanel.clearFoldOverrides(), "output-detail"),
 		},
 		beforeSemanticSubmit: () => chatRenderer.flush(),
 		settleVisibleFrame: (reason) => chatRenderer.flushAndCommit(reason),
@@ -788,6 +770,7 @@ export async function createInteractiveApplication(deps: InteractiveDeps): Promi
 	});
 
 	const editorSubmit = createEditorSubmitController({
+		onLocalBashRunning: presentation.setLocalBashRunning,
 		editor,
 		ui: tui,
 		io,
@@ -1065,6 +1048,16 @@ export async function createInteractiveApplication(deps: InteractiveDeps): Promi
 		dispatchAction: dispatchInteractiveAction,
 		actions: {
 			canExit: () => editor.getText().length === 0,
+			cycleOutputStyle: () => {
+				const settings = deps.getSettings?.();
+				if (!settings || !deps.commitSetting) return;
+				presentation.changeOutputStyle(() => {
+					const next = structuredClone(settings) as ClioSettings;
+					next.interface.outputDetail = nextOutputStyle(next.interface.outputDetail);
+					deps.commitSetting?.("interface.outputDetail", next, "session");
+				});
+				footer.refresh();
+			},
 			availableThinkingLevels: () => availableInteractiveThinkingLevels(deps),
 			onCycleThinking: () => deps.onCycleThinking?.(),
 			cycleScopedModelForward: () => {
@@ -1123,25 +1116,6 @@ export async function createInteractiveApplication(deps: InteractiveDeps): Promi
 		editorSubmit,
 		requestRender: () => tui.requestRender(),
 		notifications,
-		chatPanel: {
-			toggleLastToolExpanded: () => chatPanel.toggleLastToolExpanded(),
-			toggleAllToolsExpanded: () => chatPanel.toggleAllToolsExpanded(),
-			toggleLiveToolOutput: () => chatPanel.toggleLiveToolOutput(),
-			toggleLastThinking: () => {
-				let changed = false;
-				chatRenderer.mutate(() => {
-					changed = chatPanel.toggleLastThinking();
-				}, "thinking-visibility");
-				return changed;
-			},
-			toggleAllThinking: () => {
-				let changed = false;
-				chatRenderer.mutate(() => {
-					changed = chatPanel.toggleAllThinking();
-				}, "thinking-visibility");
-				return changed;
-			},
-		},
 		shutdown: {
 			stopTickers: presentation.stopTickers,
 			disposeInteractiveTickers: interactiveTickers.dispose,