@iowarp/clio-coder 0.4.4 → 0.4.6

package/src/interactive/chat-renderer.ts

@@ -14,9 +14,9 @@
  */
 
 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";
 import type {
 	BashExecutionEntry,
 	BranchSummaryEntry,
@@ -25,12 +25,14 @@ import type {
 	FileEntryEntry,
 	MessageEntry,
 	ModelChangeEntry,
+	PreservedSkillContext,
 	ProtectedArtifactEntry,
 	SessionEntry,
 	SessionInfoEntry,
 	ThinkingLevelChangeEntry,
 	WorkerRunEntry,
 } from "../domains/session/entries.js";
+import { latestSkillContextState, verifiedSkillContextCheckpoint } from "../domains/session/entries.js";
 import {
 	HANDOFF_NOTE_CUSTOM_TYPE,
 	HANDOFF_SEED_CUSTOM_TYPE,
@@ -49,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";
@@ -66,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";
@@ -334,6 +335,8 @@ export function createCoalescingChatRenderer(deps: CreateCoalescingChatRendererD
  * Options for the rehydrate helper used by /resume and /fork.
  */
 export interface RehydrateChatPanelOptions {
+	/** Unprojected ledger for verifying historical skill receipts after eviction projection. */
+	skillContextEntries?: ReadonlyArray<SessionEntry>;
 	/**
 	 * Select the active branch ancestry without truncating later sidecars.
 	 * Live compaction replay uses this so a summary appended after the current
@@ -451,6 +454,7 @@ function richMessageFromEntry(entry: MessageEntry, maxTextChars?: number): Agent
 			"responseModelIdObservation",
 			"responseModel",
 			"responseId",
+			"providerThinkingLevel",
 			"gatewayRouting",
 			"diagnostics",
 			"contextUsageInvalidated",
@@ -798,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 },
 	);
 }
 
@@ -1068,6 +1071,15 @@ function appendContextMessage(
 	out.push(makeTextMessage(role, truncateReplayText(trimmed), timestamp));
 }
 
+const UNVERIFIED_SKILL_CHECKPOINT_TEXT =
+	"Preserved skill instructions on this checkpoint failed integrity verification and were not replayed. If a skill still applies, ask the operator to run /skill <name> again.";
+
+/** Selected but unverifiable: name the skill and the exact ledger ref instead of dropping it. */
+function unverifiedSkillContextText(skill: PreservedSkillContext): string {
+	const activation = skill.activation;
+	return `Preserved skill instructions for ${activation.name} (source=${activation.source} hash=${activation.hash} path=${activation.filePath}) could not be re-verified against this session's ledger and were not replayed. If the skill still applies, recall the original load with context(scope="recall", ref="${skill.resultRef}") or ask the operator to run /skill ${activation.name} again.`;
+}
+
 function skillActivationContextText(entry: Extract<SessionEntry, { kind: "skillActivation" }>): string {
 	const activation = entry.activation;
 	const turn = activation.turnId ? ` turn=${activation.turnId}` : "";
@@ -1080,6 +1092,16 @@ export function buildReplayAgentMessagesFromTurns(
 ): AgentMessage[] {
 	const out = createOrderedReplaySink();
 	const seenToolCalls = new Set<string>();
+	const activeEntries = truncateAtTurn(
+		filterEntriesToActivePath(turns, options.activeLeafTurnId ?? options.uptoTurnId),
+		options.uptoTurnId,
+	);
+	const skillState = latestSkillContextState(activeEntries);
+	const evidence = truncateAtTurn(
+		filterEntriesToActivePath(options.skillContextEntries ?? turns, options.activeLeafTurnId ?? options.uptoTurnId),
+		options.uptoTurnId,
+	);
+	const verified = captureSkillContext(evidence, skillState);
 	for (const entry of selectReplayEntries(turns, options)) {
 		switch (entry.kind) {
 			case "message": {
@@ -1113,8 +1135,43 @@ export function buildReplayAgentMessagesFromTurns(
 				break;
 			case "compactionSummary":
 				appendContextMessage(out, "user", compactionContextText(entry), entry.timestamp);
+				if (entry.userContext)
+					out.push(
+						makeTextMessage("user", `Active user instructions (verbatim):\n${entry.userContext.text}`, entry.timestamp),
+					);
+				if (entry.skillContext !== undefined) {
+					const retainedSkills = entry.skillContext.skills.length;
+					if (!verifiedSkillContextCheckpoint(entry.skillContext)) {
+						// The raw pairs behind a tampered checkpoint are already outside the
+						// replay window. Say so rather than dropping the skill without a trace.
+						if (retainedSkills > 0) {
+							out.push(makeTextMessage("user", UNVERIFIED_SKILL_CHECKPOINT_TEXT, entry.timestamp));
+						}
+						break;
+					}
+					for (const skill of entry.skillContext.skills) {
+						// An explicit later state that no longer names this activation is a
+						// deliberate off or replacement; it leaves no trace, by design.
+						if (skillState && !skillState.unknown && !skillState.activationRefs.includes(skill.activationRef)) continue;
+						const receipt = verified?.skills.find((candidate) => candidate.activationRef === skill.activationRef);
+						if (!receipt || JSON.stringify(receipt) !== JSON.stringify(skill)) {
+							// Still selected, but its original receipt cannot be re-verified
+							// (masked, rewritten, or unknown state). Never inject unverified
+							// bytes, and never lose the skill silently either.
+							out.push(makeTextMessage("user", unverifiedSkillContextText(skill), entry.timestamp));
+							continue;
+						}
+						// This is historical instruction context, not a generated summary or a tool result.
+						// Keep the exact captured blocks outside summary replay's text cap.
+						out.push(makeTextMessage("user", `Preserved skill request (verbatim):\n${skill.requestText}`, entry.timestamp));
+						out.push(makeTextMessage("user", `Verified loaded skill: ${JSON.stringify(skill.activation)}`, entry.timestamp));
+						for (const block of skill.content) out.push(makeTextMessage("user", block.text, entry.timestamp));
+					}
+				}
 				break;
 			case "skillActivation":
+				if (entry.activation.runId !== undefined || (skillState && !skillState.activationRefs.includes(entry.turnId)))
+					break;
 				appendContextMessage(out, "user", skillActivationContextText(entry), entry.timestamp);
 				break;
 			// The one custom entry that becomes a model message. `/handoff` seeds a
@@ -1199,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;
@@ -1243,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 } : {}),
@@ -1252,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 } : {}),
@@ -1266,7 +1323,7 @@ export function rehydrateChatPanelFromTurns(
 									...(evictedReason !== undefined ? { evictedReason } : {}),
 								},
 								width,
-								{ unbounded: options.unboundedToolBodies === true },
+								{ unbounded: unbounded || options.unboundedToolBodies === true, detail },
 							),
 						);
 					}
@@ -1285,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;
 			}
@@ -1367,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/context-recall-command.ts

@@ -65,6 +65,7 @@ function headlineFor(ref: string, tokens: number, state: EvictedState | undefine
 	if (state !== undefined) {
 		parts.push(state.by === undefined ? `evicted: ${state.reason}` : `evicted: ${state.reason} by ${state.by}`);
 	}
+	if (state === undefined) parts.push("summarized");
 	parts.push(`${formatTokens(tokens)} tokens`);
 	if (offloadPath !== undefined) parts.push(`offload: ${offloadPath}`);
 	return `[/context recall] ${parts.join(" · ")}`;
@@ -85,7 +86,7 @@ export function runOperatorRecall(ref: string, deps: OperatorRecallDeps): Operat
 	// A ref that resolves to nothing is usually a typo or a stale marker; the
 	// shared message ends with the refs the operator could have typed instead.
 	if (!resolved.ok)
-		return { ok: false, message: `[/context recall] ${recallErrorMessage(resolved.error, entries, view)}` };
+		return { ok: false, message: `[/context recall] ${recallErrorMessage(resolved.error, entries, view, leaf)}` };
 	const { result } = resolved;
 	const fields = buildRecallFields(result, { trigger: "operator" });
 	try {

package/src/interactive/dispatch-board.ts

@@ -8,7 +8,11 @@ import {
 } from "../domains/dispatch/budget-envelope.js";
 import { type DispatchRequestOrigin, type RunKind, runKindSupportsLiveSteering } from "../domains/dispatch/types.js";
 import { describeWriteBoundaryAttributionDowngrade } from "../domains/dispatch/write-boundary.js";
-import type { TrustSummaryProjection, TrustVerdict } from "../domains/evidence/trust-projection.js";
+import {
+	type TrustSummaryProjection,
+	type TrustVerdict,
+	trustStateWord,
+} from "../domains/evidence/trust-projection.js";
 import type { ObservabilityContract, ObservabilityRunSummary } from "../domains/observability/contract.js";
 import {
 	COST_NOT_MEASURED,
@@ -242,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" };
@@ -774,7 +776,18 @@ function renderTaskIslandRow(row: DispatchBoardRow, width: number): string[] {
 		? `  ${theme.fg("muted", truncateToWidth(row.taskSummary, Math.max(1, width - 2), "…", false))}`
 		: null;
 
-	return [padAnsi(line1, width), ...(task ? [padAnsi(task, width)] : []), padAnsi(telemetry, width)];
+	const quality = isTerminalStatus(row.status)
+		? wrapTextWithAnsi(
+				`  quality: ${trustStateWord("validationGrounding", row.trust?.axes.validationGrounding ?? "unknown")}`,
+				width,
+			)
+		: [];
+	return [
+		padAnsi(line1, width),
+		...quality.map((line) => padAnsi(theme.fg("muted", line), width)),
+		...(task ? [padAnsi(task, width)] : []),
+		padAnsi(telemetry, width),
+	];
 }
 
 /**

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,18 +12,12 @@ 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. */
+export const EDITOR_BASH_SHUTDOWN_MS = 6000;
 
 /**
  * Command shapes whose text is put back in the editor after the parser rejects
@@ -84,6 +77,7 @@ export interface EditorSubmitSessionTranscript {
 }
 
 export interface EditorSubmitDeps {
+	onLocalBashRunning?: (running: boolean) => void;
 	editor: EditorSubmitEditor;
 	ui: EditorSubmitUi;
 	io: RunIo;
@@ -125,18 +119,22 @@ export interface EditorSubmitController {
 	restoreQueuedFollowUpsToEditor(): void;
 	hasActiveEditorBash(): boolean;
 	cancelActiveEditorBash(): boolean;
+	/** Stop shell admission, cancel the owned command, and await its persisted result. */
+	shutdownEditorBash(): Promise<void>;
 }
 
 type EditorSteerSubmission = "unhandled" | "accepted" | "rejected";
 
 /** Owns editor submission and the one local bash process attached to it. */
 export function createEditorSubmitController(deps: EditorSubmitDeps): EditorSubmitController {
+	let shuttingDown = false;
 	let activeEditorBash: AbortController | null = null;
 	let activeEditorBashSettlement: Promise<void> | null = null;
 
 	const runEditorBash = (text: string): boolean => {
 		const parsed = parseEditorBashCommand(text);
 		if (!parsed) return false;
+		if (shuttingDown) return true;
 		if (deps.chat.isStreaming()) {
 			deps.io.stderr("[bash] response in progress. Press Esc to cancel the active run before running a local command.\n");
 			return true;
@@ -165,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 {
@@ -243,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();
@@ -394,12 +377,14 @@ export function createEditorSubmitController(deps: EditorSubmitDeps): EditorSubm
 		const literalText = unguardPastedEditorOperator(text);
 		const trimmed = literalText.trim();
 		if (trimmed.length === 0) return;
+		if (shuttingDown) throw new Error("editor is shutting down");
 		signal?.throwIfAborted();
 		deps.collapseLaunchpadBeforeSubmit?.();
 		if (parseEditorBashCommand(text)) {
 			while (deps.chat.isStreaming()) await awaitWithAbort(deps.chat.whenSettled(), signal);
 			while (activeEditorBashSettlement) await awaitWithAbort(activeEditorBashSettlement, signal);
 			signal?.throwIfAborted();
+			if (shuttingDown) throw new Error("editor is shutting down");
 			deps.editor.addToHistory(literalText);
 			runEditorBash(text);
 			deps.ui.requestRender();
@@ -529,6 +514,11 @@ export function createEditorSubmitController(deps: EditorSubmitDeps): EditorSubm
 		interruptFromEditor,
 		restoreQueuedFollowUpsToEditor,
 		hasActiveEditorBash: () => activeEditorBash !== null,
+		shutdownEditorBash: async () => {
+			shuttingDown = true;
+			activeEditorBash?.abort();
+			await activeEditorBashSettlement;
+		},
 		cancelActiveEditorBash: () => {
 			if (!activeEditorBash) return false;
 			activeEditorBash.abort();

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