@iowarp/clio-coder 0.3.2 → 0.3.3

package/src/interactive/chat-renderer.ts

@@ -13,6 +13,7 @@
  * `isTransparentAssistantWrapper`.
  */
 
+import { ToolNames } from "../core/tool-names.js";
 import type {
 	BashExecutionEntry,
 	BranchSummaryEntry,
@@ -38,6 +39,7 @@ 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 type { ChatLoopEvent, RetryStatusPayload } from "./chat-loop.js";
 import { isSelfExplainingAbort } from "./chat-loop-messages.js";
 import type { ChatPanel } from "./chat-panel.js";
@@ -53,6 +55,7 @@ import {
 	type StreamPacer,
 	type StreamPacerSlice,
 } from "./stream-pacer.js";
+import { type FoldOverride, policyToolFold, resolveFold, 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";
@@ -468,18 +471,18 @@ function toolCallMessageFromEntry(entry: MessageEntry): AgentMessage {
 	} as unknown as AgentMessage;
 }
 
-function toolResultContent(result: unknown): unknown[] {
+function toolResultContent(result: unknown, unbounded = false): unknown[] {
 	const obj = payloadObject(result);
 	if (Array.isArray(obj?.content)) {
-		return cloneContentBlocks(obj.content, MAX_REPLAY_TEXT_CHARS) ?? [];
+		return cloneContentBlocks(obj.content, unbounded ? undefined : MAX_REPLAY_TEXT_CHARS) ?? [];
 	}
-	if (isTextResult(result)) return [{ type: "text", text: truncateReplayText(result.text) }];
-	if (typeof result === "string") return [{ type: "text", text: truncateReplayText(result) }];
-	return [{ type: "text", text: stringifyPreview(result, 10_000) }];
+	if (isTextResult(result)) return [{ type: "text", text: unbounded ? result.text : truncateReplayText(result.text) }];
+	if (typeof result === "string") return [{ type: "text", text: unbounded ? result : truncateReplayText(result) }];
+	return [{ type: "text", text: stringifyPreview(result, unbounded ? Number.POSITIVE_INFINITY : 10_000) }];
 }
 
-function displayReplayToolResult(result: unknown): unknown {
-	const content = toolResultContent(result);
+function displayReplayToolResult(result: unknown, unbounded = false): unknown {
+	const content = toolResultContent(result, unbounded);
 	// Preserve the details record (observation envelope, exec records) so the
 	// replayed ledger line carries the same outcome facts as the live one.
 	const details = payloadObject(result)?.details;
@@ -704,19 +707,28 @@ function appendReplayLine(chatPanel: ChatPanel, text: string): void {
 	chatPanel.appendReplayBlock((width) => renderReplayLine(truncateReplayText(text), width));
 }
 
-function renderBashExecutionEntry(entry: BashExecutionEntry, width: number): string[] {
+function renderBashExecutionEntry(
+	entry: BashExecutionEntry,
+	width: number,
+	folded: boolean,
+	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: truncateReplayText(entry.output.replace(/\r\n/g, "\n").replace(/\r/g, "\n").replace(/\s+$/g, "")),
+			output: unbounded ? normalizedOutput : truncateReplayText(normalizedOutput),
 			running: false,
 			exitCode: entry.exitCode,
 			cancelled: entry.cancelled,
 			truncated: entry.truncated,
 			fullOutputPath: entry.fullOutputPath,
 			excludeFromContext: entry.excludeFromContext,
+			folded,
 		},
 		width,
+		undefined,
+		{ unbounded, diffStyle: "plain" },
 	);
 }
 
@@ -1066,6 +1078,7 @@ export function rehydrateChatPanelFromTurns(
 	options: RehydrateChatPanelOptions = {},
 ): void {
 	const pendingToolIds: string[] = [];
+	let runAssistantMessages: AgentMessage[] = [];
 	const selected = selectReplayEntries(turns, options);
 	// One block per assignment, drawn where its first attempt started. Later
 	// attempts of the same assignment fold into that block as `↻` rail lines, so
@@ -1079,6 +1092,7 @@ export function rehydrateChatPanelFromTurns(
 		switch (entry.kind) {
 			case "message": {
 				if (entry.role === "user") {
+					runAssistantMessages = [];
 					const text = truncateReplayText(replayedUserText(entry));
 					if (text.length > 0) chatPanel.appendUser(text);
 					break;
@@ -1094,7 +1108,8 @@ export function rehydrateChatPanelFromTurns(
 							(message as { stopReason?: string; errorMessage?: string }).errorMessage = failure.errorMessage;
 						}
 						chatPanel.applyEvent({ type: "message_end", message });
-						chatPanel.applyEvent({ type: "agent_end", messages: [message] });
+						runAssistantMessages.push(message);
+						chatPanel.applyEvent({ type: "agent_end", messages: runAssistantMessages });
 					}
 					break;
 				}
@@ -1120,7 +1135,7 @@ export function rehydrateChatPanelFromTurns(
 							type: "tool_execution_end",
 							toolCallId: fallbackId,
 							toolName: result.name,
-							result: displayReplayToolResult(result.result),
+							result: displayReplayToolResult(result.result, options.unboundedToolBodies === true),
 							isError: result.isError,
 							...(result.durationMs !== undefined ? { durationMs: result.durationMs } : {}),
 							...(result.resultSummary !== undefined ? { resultSummary: result.resultSummary } : {}),
@@ -1133,7 +1148,7 @@ export function rehydrateChatPanelFromTurns(
 								{
 									toolCallId: result.id ?? "",
 									toolName: result.name,
-									result: displayReplayToolResult(result.result),
+									result: displayReplayToolResult(result.result, options.unboundedToolBodies === true),
 									isError: result.isError,
 									...(result.durationMs !== undefined ? { durationMs: result.durationMs } : {}),
 									...(result.resultSummary !== undefined ? { resultSummary: result.resultSummary } : {}),
@@ -1159,9 +1174,25 @@ export function rehydrateChatPanelFromTurns(
 				}
 				break;
 			}
-			case "bashExecution":
-				chatPanel.appendReplayBlock((width) => renderBashExecutionEntry(entry, width));
+			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;
+						},
+					},
+				);
 				break;
+			}
 			case "custom":
 				if (rendersCustomEntry(entry)) chatPanel.appendReplayBlock((width) => renderCustomEntry(entry, width));
 				break;
@@ -1220,9 +1251,9 @@ export function rehydrateChatPanelFromTurns(
 			isError: true,
 		});
 	}
-	// Replay favors a compact historical ledger even though fresh non-resource
-	// calls auto-expand for live arguments and output. Collapse reconstructed
-	// tools explicitly; /export re-expands them afterward via
-	// toggleAllToolsExpanded, while /resume and /fork retain the compact form.
-	chatPanel.collapseAllTools();
+	// A rehydrated transcript starts from the transcript detail policy alone:
+	// 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/editor-submit.ts

@@ -1,7 +1,9 @@
 import { combineBashOutput, runBashCommand } from "../core/bash-exec.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 } from "./editor-bash.js";
@@ -14,6 +16,13 @@ import {
 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;
 
@@ -154,16 +163,32 @@ 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) =>
+			(width, detail) =>
 				renderBashTranscriptExecution(
 					{
 						...execution,
+						folded: resolveFold(fold, policyFold(detail)) === "folded",
 						...(execution.running ? { elapsedMs: Math.max(0, performance.now() - startedAt) } : {}),
 					},
 					width,
 				),
 			() => execution.running,
+			{
+				policyFold,
+				fold: () => fold,
+				setFold: (next: FoldOverride) => {
+					fold = next;
+					deps.ui.requestRender();
+				},
+			},
 		);
 		deps.ui.requestRender();
 

package/src/interactive/footer/widgets.ts

@@ -19,7 +19,13 @@ import {
 	dispatchStatusPresentation,
 } from "../dispatch-board.js";
 import { buildSegmentedContextBar, CONTEXT_BAR_LABEL_WIDTH, formatFooterTokens } from "../footer-panel.js";
-import { type AgentStatus, spinnerFrame, type TurnSummary } from "../status/index.js";
+import {
+	type AgentStatus,
+	formatReasoningChip,
+	reasoningFromSummary,
+	spinnerFrame,
+	type TurnSummary,
+} from "../status/index.js";
 import {
 	type ClioTheme,
 	type ClioToken,
@@ -706,11 +712,8 @@ export function formatLastTurn(theme: ClioTheme, summary: TurnSummary): string {
 	];
 	// Zero suppresses the chip, the same rule the chat panel's turn line follows:
 	// a turn that spent no reasoning tokens states nothing by printing `r0`.
-	if (typeof summary.reasoningTokens === "number" && summary.reasoningTokens > 0) {
-		const marker =
-			summary.reasoningTokenProvenance === "estimated" || summary.reasoningTokenProvenance === "mixed" ? "≈" : "";
-		parts.push(theme.fg("reason", `r${marker}${summary.reasoningTokens}`));
-	}
+	const chip = formatReasoningChip(reasoningFromSummary(summary), String);
+	if (chip !== null) parts.push(theme.fg("reason", chip));
 	if (summary.cacheReadTokens > 0 || summary.cacheWriteTokens > 0) {
 		parts.push(theme.fg("dim", `cache ${summary.cacheReadTokens}/${summary.cacheWriteTokens}`));
 	}
@@ -802,6 +805,17 @@ function liveTokenValue(
 	return joined.length > 0 ? joined : null;
 }
 
+/**
+ * The last turn's reasoning chip, or null when the turn spent none. Every
+ * surface that shows reasoning reads the same projection, so the transcript,
+ * this footer, and the receipt cannot disagree about the count or whether it
+ * is provider-attested.
+ */
+function reasoningChip(theme: ClioTheme, lastTurn: TurnSummary): string | null {
+	const chip = formatReasoningChip(reasoningFromSummary(lastTurn), formatFooterTokens);
+	return chip === null ? null : theme.fg("reason", chip);
+}
+
 function lastTurnOutcome(theme: ClioTheme, lastTurn: TurnSummary): string {
 	const stop = stopReasonStyle(lastTurn.stopReason);
 	return theme.fg(stop.token, `${stop.glyph} ${formatCompactMs(lastTurn.elapsedMs)}`);
@@ -813,12 +827,7 @@ function lastTurnDetails(theme: ClioTheme, lastTurn: TurnSummary): string {
 			"muted",
 			`${GLYPH.up}${formatFooterTokens(lastTurn.inputTokens)} ${GLYPH.down}${formatFooterTokens(lastTurn.outputTokens)}`,
 		),
-		lastTurn.reasoningTokens !== undefined && lastTurn.reasoningTokens > 0
-			? theme.fg(
-					"reason",
-					`r${lastTurn.reasoningTokenProvenance === "estimated" || lastTurn.reasoningTokenProvenance === "mixed" ? "≈" : ""}${formatFooterTokens(lastTurn.reasoningTokens)}`,
-				)
-			: null,
+		reasoningChip(theme, lastTurn),
 		lastTurn.cacheReadTokens > 0 || lastTurn.cacheWriteTokens > 0
 			? theme.fg(
 					"dim",
@@ -1202,14 +1211,7 @@ export function buildMetricStrip(
 				`${GLYPH.up}${formatFooterTokens(lastTurn.inputTokens)} ${GLYPH.down}${formatFooterTokens(lastTurn.outputTokens)}`,
 			),
 		);
-		candidates.push(
-			lastTurn.reasoningTokens !== undefined && lastTurn.reasoningTokens > 0
-				? theme.fg(
-						"reason",
-						`r${lastTurn.reasoningTokenProvenance === "estimated" || lastTurn.reasoningTokenProvenance === "mixed" ? "≈" : ""}${formatFooterTokens(lastTurn.reasoningTokens)}`,
-					)
-				: null,
-		);
+		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

package/src/interactive/footer-panel.ts

@@ -1,6 +1,7 @@
 import type { TokenThroughputSnapshot, UsageBreakdown } from "../domains/observability/index.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";
 
 /**
@@ -37,7 +38,11 @@ export function tokensSegment(usage: UsageBreakdown | null | undefined): string
 	const reasoning = Math.max(0, usage.reasoningTokens ?? 0);
 	const total = Math.max(0, usage.totalTokens ?? input + output);
 	if (input + output + reasoning + total === 0) return null;
-	const reasoningPart = reasoning > 0 ? ` r${formatFooterTokens(reasoning)}` : "";
+	// Session totals are summed from provider usage payloads, so the chip carries
+	// no `≈`. It is built by the same formatter every other reasoning surface
+	// uses rather than by a fourth copy of the marker rule.
+	const reasoningChip = formatReasoningChip({ tokens: reasoning, provenance: "provider" }, formatFooterTokens);
+	const reasoningPart = reasoningChip === null ? "" : ` ${reasoningChip}`;
 	const totalPart = total > 0 ? ` Σ${formatFooterTokens(total)}` : "";
 	return `${GLYPH.up}${formatFooterTokens(input)} ${GLYPH.down}${formatFooterTokens(output)}${reasoningPart}${totalPart}`;
 }

package/src/interactive/interactive-application.ts

@@ -560,6 +560,7 @@ export async function createInteractiveApplication(deps: InteractiveDeps): Promi
 		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(),
@@ -591,6 +592,7 @@ export async function createInteractiveApplication(deps: InteractiveDeps): Promi
 		chatPanel: {
 			appendReplayBlock: (...args) => chatRenderer.mutate(() => chatPanel.appendReplayBlock(...args), "slash-output"),
 			appendUser: (text) => chatRenderer.mutate(() => chatPanel.appendUser(text), "user-submit"),
+			clearFoldOverrides: () => chatRenderer.mutate(() => chatPanel.clearFoldOverrides(), "output-detail"),
 		},
 		beforeSemanticSubmit: () => chatRenderer.flush(),
 		settleVisibleFrame: (reason) => chatRenderer.flushAndCommit(reason),

package/src/interactive/interactive-event-projection.ts

@@ -28,6 +28,8 @@ import {
 import {
 	type AgentStatus,
 	INLINE_STATUS_INDENT_COLS,
+	type ReasoningUsageView,
+	reasoningFromTally,
 	resolveInlineVerb,
 	type StatusPhase,
 	spinnerFrame,
@@ -67,6 +69,11 @@ export interface InteractiveEventProjectionDeps {
 	recordToolStart: (toolName: string, toolCallId: string) => void;
 	recordToolEnd: (toolName: string, toolCallId: string, isError: boolean, truncated: boolean) => void;
 	setStatusLine: (line: InteractiveStatusLine | null) => void;
+	/**
+	 * Publish the live turn's reasoning projection to the transcript. Optional so
+	 * a host without a chat panel still gets every other projection.
+	 */
+	setLiveReasoning?: (view: ReasoningUsageView | null) => void;
 	setLastTurnSummary: (summary: TurnSummary) => void;
 	startTerminalProgress: () => void;
 	stopTerminalProgress: () => void;
@@ -177,6 +184,11 @@ export function createInteractiveEventProjection(deps: InteractiveEventProjectio
 	let statusInlineFrame = 0;
 	primaryUnsubscribers.push(
 		deps.status.subscribe((status) => {
+			// One projection of the run tally reaches the transcript, so the live
+			// line, the turn receipt, and the footer state the same number.
+			deps.setLiveReasoning?.(
+				status.phase === "idle" || status.phase === "ended" ? null : reasoningFromTally(status.runTally),
+			);
 			if (status.phase === "idle") {
 				deps.setStatusLine(null);
 			} else if (status.phase === "ended") {

package/src/interactive/interactive-slash-runtime.ts

@@ -54,7 +54,7 @@ export interface InteractiveSlashSubmitExpansion {
 }
 
 type SlashChat = Pick<ChatLoop, "getSessionId" | "isStreaming" | "submit">;
-type SlashChatPanel = Pick<ChatPanel, "appendReplayBlock" | "appendUser">;
+type SlashChatPanel = Pick<ChatPanel, "appendReplayBlock" | "appendUser" | "clearFoldOverrides">;
 type SlashResources = Pick<ResourcesContract, "prompts" | "expandPromptTemplate" | "reload">;
 type SlashExtensions = Pick<ExtensionsContract, "list">;
 type SlashAgents = Pick<AgentsContract, "getSpec" | "listSpecs">;
@@ -398,6 +398,11 @@ export function createInteractiveSlashRuntime(deps: InteractiveSlashRuntimeDeps)
 			// alone. Saving it as the default is what Settings → Terminal is for.
 			if (deps.commitSetting) deps.commitSetting("terminal.outputVerbosity", next, "session");
 			else deps.writeSettings?.(next);
+			// `/output` is also the explicit reset action for transcript folds. Do
+			// this even when the requested level already matches the current one;
+			// the render-time change detector cannot observe a same-value command.
+			deps.chatPanel.clearFoldOverrides();
+			deps.refreshFooter();
 			return { status: "applied", verbosity: match };
 		},
 		openModel: deps.openModel,
@@ -434,11 +439,12 @@ export function createInteractiveSlashRuntime(deps: InteractiveSlashRuntimeDeps)
 			try {
 				const turns = deps.readStructuredEntries(sessionId);
 				// Same pure render pipeline as the live panel and /resume replay: a
-				// throwaway panel is rehydrated from the ledger, every tool segment is
-				// expanded, and the transcript is rendered at a stable width. HTML
-				// converts the resulting ANSI presentation to inline styles; Markdown
-				// keeps the prior plain-text fenced transcript.
-				const exportPanel = createChatPanel({ unboundedToolBodies: true });
+				// throwaway panel is rehydrated from the ledger under the verbose
+				// transcript detail policy (every body open, full receipts) with no
+				// operator overrides, and rendered at a stable width. HTML converts
+				// the resulting ANSI presentation to inline styles; Markdown keeps the
+				// prior plain-text fenced transcript.
+				const exportPanel = createChatPanel({ unboundedToolBodies: true, getOutputVerbosity: () => "verbose" });
 				// Scoped to the leaf the session is on, the same way /resume replays
 				// (issue #107): with a /tree pin persisted and not yet extended, the
 				// file still holds the abandoned branch after the pin, and an unscoped
@@ -449,7 +455,6 @@ export function createInteractiveSlashRuntime(deps: InteractiveSlashRuntimeDeps)
 					unboundedToolBodies: true,
 					...(leafTurnId ? { activeLeafTurnId: leafTurnId } : {}),
 				});
-				exportPanel.toggleAllToolsExpanded();
 				const ansiLines = exportPanel.render(EXPORT_RENDER_WIDTH);
 				// The operator names this file by the day they ran the export, so the
 				// date in it is their calendar date. The header below keeps the ISO