@iowarp/clio-coder 0.4.0 → 0.4.1

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

@@ -38,7 +38,6 @@ import { renderSessionHtml } from "./export-html/index.js";
 import { dateLocal } from "./format-time.js";
 import type { OracleDigestSources } from "./oracle.js";
 import type { PendingModelScope } from "./overlays/model-scope.js";
-import type { SettingsCenterRowId, SettingsSectionId } from "./overlays/settings.js";
 import {
 	type ContextClearCommandOptions,
 	type CouncilDispatchOutcome,
@@ -46,6 +45,7 @@ import {
 	type InitCommandOptions,
 	parseSlashCommand,
 	type RunIo,
+	type SettingsAreaId,
 	type SlashCommandContext,
 	type SlashCommandDispatchResult,
 	type TaskMemorySeedCommandResult,
@@ -145,7 +145,8 @@ export interface InteractiveSlashRuntimeDeps {
 	 * Absent on a host with no overlay layer, where the swap stays session-scoped.
 	 */
 	openModelScope?: (ref: PendingModelScope) => void;
-	openSettings: (section?: SettingsSectionId, rowId?: SettingsCenterRowId) => void;
+	openSettings: (area?: SettingsAreaId, group?: string) => void;
+	openFleetRuns?: () => void;
 	openResume: () => void;
 	startNewSession: () => void;
 	openTree: () => void;
@@ -174,11 +175,7 @@ export interface InteractiveSlashRuntime {
 }
 
 /** Owns slash-command context construction and its asynchronous command state. */
-const OUTPUT_VERBOSITIES: ReadonlyArray<ClioSettings["terminal"]["outputVerbosity"]> = [
-	"minimal",
-	"default",
-	"verbose",
-];
+const OUTPUT_VERBOSITIES: ReadonlyArray<ClioSettings["interface"]["outputDetail"]> = ["minimal", "default", "verbose"];
 
 /** Thinking capability of the active orchestrator target and model, or null when unresolved. */
 export function resolveThinkingCapability(
@@ -187,9 +184,9 @@ export function resolveThinkingCapability(
 ): ResolvedThinkingCapability | null {
 	const resolved = resolveModelRuntimeCapabilitiesForProviders(
 		providers,
-		settings.orchestrator.target,
-		settings.orchestrator.model,
-		settings.orchestrator.thinkingLevel ?? "off",
+		settings.chat.target,
+		settings.chat.model,
+		settings.chat.thinkingLevel ?? "off",
 	);
 	return resolved?.thinking ?? null;
 }
@@ -370,7 +367,8 @@ export function createInteractiveSlashRuntime(deps: InteractiveSlashRuntimeDeps)
 			deps.requestRender();
 		}
 	};
-	const context: SlashCommandContext = {
+	let context: SlashCommandContext;
+	context = {
 		io: deps.io,
 		notice: appendCommandNotice,
 		echoOperatorCommand: (text) => {
@@ -392,7 +390,7 @@ export function createInteractiveSlashRuntime(deps: InteractiveSlashRuntimeDeps)
 		openSkillsHub: deps.openSkillsHub,
 		listExtensions: () => deps.extensions?.list(cwd(), { all: true }) ?? [],
 		listAgents: () => deps.agents?.listSpecs().filter((spec) => spec.audience !== "internal") ?? [],
-		listDelegationAgents: () => deps.getSettings?.().delegation.agents ?? [],
+		listDelegationAgents: () => deps.getSettings?.().integrations.externalAgents.entries ?? [],
 		exportShareArchive: (outPath) => {
 			if (!deps.share) throw new Error("share domain is not loaded");
 			const path = resolve(outPath);
@@ -423,7 +421,8 @@ export function createInteractiveSlashRuntime(deps: InteractiveSlashRuntimeDeps)
 		oracleBriefing: oracleBriefingSources,
 		startHandoff: deps.startHandoff,
 		...(deps.startFleetRun ? { startFleetRun: deps.startFleetRun } : {}),
-		...(deps.getSettings ? { getWorkerRosters: () => deps.getSettings?.().workers.rosters ?? {} } : {}),
+		...(deps.openFleetRuns ? { openFleetRuns: deps.openFleetRuns } : {}),
+		...(deps.getSettings ? { getWorkerRosters: () => deps.getSettings?.().fleet.rosters ?? {} } : {}),
 		...(deps.runCouncilDispatch ? { runCouncilDispatch: deps.runCouncilDispatch } : {}),
 		openContextView: deps.openContextView,
 		openTasks: deps.openTasks,
@@ -467,24 +466,53 @@ export function createInteractiveSlashRuntime(deps: InteractiveSlashRuntimeDeps)
 			// has no mandate to do.
 			if (deps.commitSetting) {
 				const next = structuredClone(settings) as ClioSettings;
-				next.orchestrator.thinkingLevel = match;
-				deps.commitSetting("orchestrator.thinkingLevel", next, "session");
+				next.chat.thinkingLevel = match;
+				deps.commitSetting("chat.thinkingLevel", next, "session");
 			} else {
 				deps.onSetThinkingLevel(match);
 			}
 			deps.refreshFooter();
 			return { status: "applied", level: match, display: labelFor(match) };
 		},
+		thinkingLevelChoices: () => {
+			const settings = deps.getSettings?.();
+			if (!settings) return [];
+			const thinking = resolveThinkingCapability(deps.providers, settings);
+			return (thinking?.supportedLevels ?? (["off"] as ReadonlyArray<ThinkingLevel>)).map((value) => ({
+				value,
+				label: thinkingLevelChoiceLabel(thinking?.mechanism ?? null, value),
+			}));
+		},
+		openThinkingPicker: () => {
+			const choices = context.thinkingLevelChoices?.() ?? [];
+			if (choices.length === 0) {
+				appendCommandNotice("error", "thinking level cannot be set right now");
+				return;
+			}
+			void deps
+				.openAskUser([
+					{
+						question: "Choose the thinking level for this chat.",
+						header: "Thinking",
+						options: choices.map(({ label }) => ({ label })),
+					},
+				])
+				.then((result) => {
+					const answer = result.cancelled ? undefined : result.answers[0]?.answer;
+					const selected = choices.find(({ label }) => label === answer);
+					if (selected) dispatchSlashCommand({ kind: "thinking-set", level: selected.value }, context);
+				});
+		},
 		setOutputVerbosity: (verbosity) => {
 			if (!deps.getSettings || !(deps.commitSetting || deps.writeSettings)) return { status: "unavailable" };
 			const requested = verbosity.trim().toLowerCase();
 			const match = OUTPUT_VERBOSITIES.find((candidate) => candidate === requested);
 			if (!match) return { status: "unsupported", verbosity, supported: OUTPUT_VERBOSITIES };
 			const next = structuredClone(deps.getSettings()) as ClioSettings;
-			next.terminal.outputVerbosity = match;
+			next.interface.outputDetail = match;
 			// Session scope: /output changes this session and leaves settings.yaml
 			// alone. Saving it as the default is what Settings → Terminal is for.
-			if (deps.commitSetting) deps.commitSetting("terminal.outputVerbosity", next, "session");
+			if (deps.commitSetting) deps.commitSetting("interface.outputDetail", 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;
@@ -493,6 +521,24 @@ export function createInteractiveSlashRuntime(deps: InteractiveSlashRuntimeDeps)
 			deps.refreshFooter();
 			return { status: "applied", verbosity: match };
 		},
+		openOutputPicker: () => {
+			void deps
+				.openAskUser([
+					{
+						question: "Choose transcript detail for this session.",
+						header: "Output",
+						options: OUTPUT_VERBOSITIES.map((value) => ({
+							label: `${value[0]?.toUpperCase()}${value.slice(1)}`,
+						})),
+					},
+				])
+				.then((result) => {
+					if (result.cancelled) return;
+					const answer = result.answers[0]?.answer.toLowerCase();
+					const selected = OUTPUT_VERBOSITIES.find((value) => value === answer);
+					if (selected) dispatchSlashCommand({ kind: "output-set", verbosity: selected }, context);
+				});
+		},
 		openModel: deps.openModel,
 		providers: deps.providers,
 		applyModelRef: (ref) => {

package/src/interactive/interactive-subscriptions.ts

@@ -88,7 +88,7 @@ export function createInteractiveSubscriptions(deps: InteractiveSubscriptionsDep
 			BusChannels.DispatchProgress,
 			folded((payload) => {
 				const workerEvent = payload.event as { type?: unknown } | null | undefined;
-				if (workerEvent?.type === "clio_steer_received") {
+				if (workerEvent?.type === "clio_coder_steer_received") {
 					deps.notify("success", `steer received by ${payload.agentId} (${payload.runId})`, `steer:${payload.runId}`);
 				}
 				return workers.progress(payload);

package/src/interactive/interactive-tickers.ts

@@ -34,7 +34,7 @@ export interface InteractiveTickersDeps {
 	clearScheduledInterval?: (handle: InteractiveTickerHandle) => void;
 }
 
-export function formatTaskBoardIslandLines(board: TaskBoardSnapshot): string[] {
+function formatTaskBoardIslandLines(board: TaskBoardSnapshot): string[] {
 	const theme = clioTheme();
 	const counts = taskBoardCounts(board);
 	const active = board.tasks.find((task) => task.status === "active");

package/src/interactive/keybinding-manager.ts

@@ -18,7 +18,7 @@
  * so editor/select components honor overrides out of the box.
  *
  * User overrides go through `validateKeybindings` first. Unmappable strings
- * (e.g. `clio.exit: "banana"`) are dropped so they cannot silently replace
+ * (e.g. `clio-coder.exit: "banana"`) are dropped so they cannot silently replace
  * the default binding; they still surface through `invalidBindings()` so
  * `/settings` and the boot stderr notice can point at the offending entry.
  */
@@ -184,7 +184,7 @@ interface ValidationResult {
 }
 
 /**
- * Normalize and validate the raw `settings.keybindings` block. Invalid
+ * Normalize and validate the raw `settings.interface.keybindings` block. Invalid
  * entries are dropped from the returned `valid` config so pi-tui keeps
  * the default binding in effect; callers render `invalid` as a diagnostic.
  */
@@ -472,14 +472,14 @@ function buildManager(
  * Build a `ClioKeybindingManager` from the provided settings snapshot. The
  * resulting manager is also installed as pi-tui's global so editor and
  * select components pick up the same overrides. Callers are expected to
- * recreate the manager if `settings.keybindings` is replaced wholesale;
+ * recreate the manager if `settings.interface.keybindings` is replaced wholesale;
  * partial live updates should instead go through `manager` state.
  */
 export function createKeybindingManager(
 	settings: Readonly<ClioSettings>,
 	env: NodeJS.ProcessEnv | Readonly<Record<string, string | undefined>> = process.env,
 ): ClioKeybindingManager {
-	const { valid, invalid } = validateKeybindings(settings.keybindings ?? {});
+	const { valid, invalid } = validateKeybindings(settings.interface.keybindings ?? {});
 	const inner = new KeybindingsManager(CLIO_KEYBINDINGS, valid);
 	setKeybindings(inner);
 	return buildManager(inner, invalid, detectPlatformKeybindingWarnings(valid, detectTerminalKeySupport(env)));

package/src/interactive/layout.ts

@@ -20,7 +20,7 @@ export interface FullscreenLayout {
 	transcript: ScrollView;
 }
 
-export function buildFullscreenLayout(
+function buildFullscreenLayout(
 	parts: LayoutParts,
 	options: Pick<LayoutOptions, "fullscreenScrollbar"> = {},
 ): FullscreenLayout {

package/src/interactive/memory-overlay.ts

@@ -29,7 +29,7 @@ const EMPTY_MESSAGE = "no approved lessons, task-bank entries, or memory steps c
  * row of its own until it finishes, and an operator who cannot see it in flight
  * reads an unchanged bank as an idle memory agent.
  */
-export function formatMemoryStatusLine(status: TaskMemoryOperatorStatus, contentWidth: number): string {
+function formatMemoryStatusLine(status: TaskMemoryOperatorStatus, contentWidth: number): string {
 	const theme = clioTheme();
 	const width = Math.max(1, Math.floor(contentWidth));
 	const units = [
@@ -145,7 +145,7 @@ function activityItems(events: ReadonlyArray<TaskMemoryActivityEvent>, group: st
  * section titles and they are the only place a reader learns that a class is
  * empty: a group with no rows renders no header at all.
  */
-export function buildMemoryOverlayItems(
+function buildMemoryOverlayItems(
 	status: TaskMemoryOperatorStatus,
 	records: ReadonlyArray<MemoryRecord>,
 ): ListOverlayItem[] {

package/src/interactive/modal-marker.ts

@@ -49,22 +49,13 @@ export const MODAL_MARKER_BASE_TITLE = "clio";
 export const MODAL_MARKER_TITLE_PATTERN = /^clio \[modal:([a-z0-9][a-z0-9-]*)(?:\+([1-9]\d*))?\]$/u;
 
 /** Render the title for a modal stack, outermost first. */
-export function formatModalMarkerTitle(stack: readonly string[]): string {
+function formatModalMarkerTitle(stack: readonly string[]): string {
 	const top = stack.at(-1);
 	if (top === undefined) return MODAL_MARKER_BASE_TITLE;
 	const beneath = stack.length - 1;
 	return `${MODAL_MARKER_BASE_TITLE} [modal:${top}${beneath > 0 ? `+${beneath}` : ""}]`;
 }
 
-/** Read a marker title back. Returns null for the base title and for anything else. */
-export function parseModalMarkerTitle(title: string): { id: string; depth: number } | null {
-	const match = MODAL_MARKER_TITLE_PATTERN.exec(title);
-	const id = match?.[1];
-	if (id === undefined) return null;
-	const beneath = match?.[2];
-	return { id, depth: beneath === undefined ? 1 : 1 + Number.parseInt(beneath, 10) };
-}
-
 /** One modal's claim on the keyboard, released when the overlay goes away. */
 export interface ModalMarkerHandle {
 	/** Drop this modal from the stack. Idempotent; a second call is inert. */
@@ -152,19 +143,9 @@ function createModalMarkerRegistry(): ModalMarkerRegistry {
 	return { enter, stack: (): readonly string[] => activeIds() };
 }
 
-let registry = createModalMarkerRegistry();
+const registry = createModalMarkerRegistry();
 
 /** Push a modal onto the process-wide stack. See {@link ModalMarkerRegistry.enter}. */
 export function enterModal(id: string, sink?: ModalMarkerSink | null): ModalMarkerHandle {
 	return registry.enter(id, sink);
 }
-
-/** The ids that currently own keys, outermost first. */
-export function modalMarkerStack(): readonly string[] {
-	return registry.stack();
-}
-
-/** Drop every claim and forget the sink. Tests use it to isolate; nothing in the app does. */
-export function resetModalMarker(): void {
-	registry = createModalMarkerRegistry();
-}

package/src/interactive/mutation-preview.ts

@@ -96,7 +96,7 @@ function canonicalJson(value: unknown): string {
  * anything else about the arguments does, which is the point: a call that
  * differs from the previewed one cannot inherit its preview.
  */
-export function callArgumentsDigest(args: Record<string, unknown> | undefined): string {
+function callArgumentsDigest(args: Record<string, unknown> | undefined): string {
 	return createHash("sha256")
 		.update(canonicalJson(args ?? {}), "utf8")
 		.digest("hex")

package/src/interactive/overlay-frame.ts

@@ -133,7 +133,7 @@ export interface HintEntry {
  * dropped `[Enter] use`, which is the only way to commit. The commit key and
  * the way out are what a narrow footer is for.
  */
-export function isCriticalHintKey(key: string): boolean {
+function isCriticalHintKey(key: string): boolean {
 	const canonical = canonicalizeKey(key);
 	// `type` joins the commit key and the way out because on a list of a hundred
 	// models, typing is how a reader reaches the row they want at all; the
@@ -190,7 +190,7 @@ export function fitHintEntries(entries: ReadonlyArray<HintEntry>, maxWidth: numb
  */
 export const FILTER_HINT: HintEntry = { key: "type", verb: "filter" };
 
-export function canonicalizeKey(key: string): string {
+function canonicalizeKey(key: string): string {
 	const trimmed = key.trim();
 	if (trimmed === "R") return "R";
 	const lower = trimmed.toLowerCase();
@@ -240,7 +240,7 @@ export function buildResponsiveHint(
  * labels but recovers the key, which is all the critical-key classification
  * needs, so a plain-string overlay gets the same protection as a structured one.
  */
-export function elideHint(hint: string, maxCleanWidth: number): string {
+function elideHint(hint: string, maxCleanWidth: number): string {
 	const parts = hint.split(" · ");
 	if (parts.length <= 2) return hint;
 	const entries: HintEntry[] = parts.map((part) => {
@@ -297,14 +297,6 @@ export function diagnosticSeverityToken(severity: RuntimeResolutionDiagnostic["s
 	return severity === "error" ? "error" : severity === "warning" ? "warning" : "muted";
 }
 
-export function runtimeResolutionDiagnosticLine(diagnostic: RuntimeResolutionDiagnostic, width: number): string {
-	return clioTheme().fg(diagnosticSeverityToken(diagnostic.severity), fitDiagnosticLine(diagnostic, width));
-}
-
-function fitDiagnosticLine(diagnostic: RuntimeResolutionDiagnostic, width: number): string {
-	return padAnsi(formatRuntimeResolutionDiagnostic(diagnostic), Math.max(1, width));
-}
-
 export type FrameAlign = "left" | "center" | "right";
 
 /**
@@ -313,7 +305,7 @@ export type FrameAlign = "left" | "center" | "right";
  * row and places the box itself; this is what the box would have been anchored
  * to if the engine were still doing the placing.
  */
-export function frameAlignForAnchor(anchor: OverlayOptions["anchor"]): FrameAlign {
+function frameAlignForAnchor(anchor: OverlayOptions["anchor"]): FrameAlign {
 	if (anchor === undefined) return "center";
 	if (anchor === "left-center" || anchor.endsWith("-left")) return "left";
 	if (anchor === "right-center" || anchor.endsWith("-right")) return "right";

package/src/interactive/overlay-general-openers.ts

@@ -12,6 +12,7 @@ import {
 	proposeMemoryPromotion,
 } from "../domains/memory/index.js";
 import type { ObservabilityContract } from "../domains/observability/index.js";
+import { renderCostAggregate } from "../domains/observability/index.js";
 import { foregroundStreamUsage } from "../domains/providers/index.js";
 import type { ContextLedger } from "../domains/session/context-ledger.js";
 import type { SessionMeta } from "../domains/session/index.js";
@@ -486,7 +487,7 @@ export function createOverlayGeneralOpeners(deps: OverlayGeneralOpenersDeps): Ov
 			fleetRootId,
 			dispatch: deps.dispatch,
 			agents: { getSpec: (agentId) => agents.getSpec(agentId) },
-			attributionEnabled: deps.getSettings?.().attribution.gitCommits ?? true,
+			attributionEnabled: deps.getSettings?.().integrations.git.commitAttribution ?? true,
 			vars: preview.vars,
 			onStepDispatched: (event) => {
 				deps.setFleetRunPhase?.(event.assignmentId, { wave: event.waveIndex, stepId: event.stepId });
@@ -496,7 +497,10 @@ export function createOverlayGeneralOpeners(deps: OverlayGeneralOpenersDeps): Ov
 			.then((outcome) => {
 				deps.notify(
 					outcome.cleanRun ? "success" : "warning",
-					`fleet ${preview.name}: ${outcome.succeededStepCount}/${outcome.requiredStepCount} steps succeeded, cost $${outcome.totalCostUsd.toFixed(4)}`,
+					// `totalCost` rather than the bare `totalCostUsd` sum: a run whose
+					// receipts were all unpriced reads as not measured instead of as a
+					// measured $0.0000 nobody put a number on.
+					`fleet ${preview.name}: ${outcome.succeededStepCount}/${outcome.requiredStepCount} steps succeeded, cost ${renderCostAggregate(outcome.totalCost)}`,
 					"fleet-run:settled",
 				);
 			})

package/src/interactive/overlay-key-routing.ts

@@ -111,7 +111,7 @@ function mutationScrollDelta(data: string): number {
 }
 
 /** Pure permission overlay key router: returns true when the input was consumed. */
-export function routePermissionOverlayKey(data: string, deps: PermissionOverlayKeyDeps): boolean {
+function routePermissionOverlayKey(data: string, deps: PermissionOverlayKeyDeps): boolean {
 	if (matchesKey(data, "enter") && !isKeyRelease(data)) {
 		// Consumed either way: with a draft the press changes nothing, and the
 		// composer rail says what clears it. Letting it fall through would hand
@@ -158,7 +158,7 @@ export function routePermissionOverlayKey(data: string, deps: PermissionOverlayK
 }
 
 /** Pure overlay key router for the dispatch board. */
-export function routeDispatchBoardOverlayKey(data: string, deps: DispatchBoardOverlayKeyDeps): boolean {
+function routeDispatchBoardOverlayKey(data: string, deps: DispatchBoardOverlayKeyDeps): boolean {
 	if (isEscapeKey(data)) {
 		deps.closeOverlay();
 		return true;
@@ -247,11 +247,11 @@ export function routeOverlayKey(
 ): boolean {
 	if (overlayState === "closed") return false;
 	if (
-		(overlayState === "dispatch-board" && matches(data, "clio.dispatchBoard.toggle")) ||
-		(overlayState === "tasks" && matches(data, "clio.tasks.open")) ||
-		(overlayState === "tree" && matches(data, "clio.session.tree")) ||
-		(overlayState === "model" && matches(data, "clio.model.select")) ||
-		(overlayState === "help" && matches(data, "clio.leader"))
+		(overlayState === "dispatch-board" && matches(data, "clio-coder.dispatchBoard.toggle")) ||
+		(overlayState === "tasks" && matches(data, "clio-coder.tasks.open")) ||
+		(overlayState === "tree" && matches(data, "clio-coder.session.tree")) ||
+		(overlayState === "model" && matches(data, "clio-coder.model.select")) ||
+		(overlayState === "help" && matches(data, "clio-coder.leader"))
 	) {
 		deps.closeOverlay();
 		return true;

package/src/interactive/overlay-lifecycle.ts

@@ -272,7 +272,7 @@ export function createOverlayLifecycle(deps: OverlayLifecycleRuntimeDeps): Overl
 		...(deps.app.toolRegistry ? { toolRegistry: deps.app.toolRegistry } : {}),
 		bus: deps.app.bus,
 		dispatch: deps.app.dispatch,
-		getAutonomy: () => deps.app.getSettings?.().autonomy ?? "auto-edit",
+		getAutonomy: () => deps.app.getSettings?.().safety.autonomy ?? "auto-edit",
 		getOverlayState: () => overlayTransitions.state,
 		openPermissionOverlay: (view, inspect) => {
 			if (overlayTransitions.state === "permission-confirm") return false;

package/src/interactive/overlay-model-selectors.ts

@@ -76,11 +76,11 @@ export function createOverlayModelSelectors(deps: OverlayModelSelectorsDeps): Ov
 				if (!deps.getSettings || !deps.writeSettings) return;
 				const next = structuredClone(deps.getSettings()) as ClioSettings;
 				const value = `${ref.target}/${ref.model}`;
-				const current = new Set(next.modelSelector?.favorites ?? []);
+				const current = new Set(next.chat.modelPicker?.favorites ?? []);
 				if (favorite) current.add(value);
 				else current.delete(value);
-				next.modelSelector = {
-					...(next.modelSelector ?? { recentLimit: 12, favorites: [] }),
+				next.chat.modelPicker = {
+					...(next.chat.modelPicker ?? { recentLimit: 12, favorites: [] }),
 					favorites: [...current],
 				};
 				deps.writeSettings(next);

package/src/interactive/overlays/agents.ts

@@ -34,7 +34,7 @@ export function openAgentsOverlay(tui: TUI, ctx: SlashCommandContext, onClose: (
 	const delegationItems: ListOverlayItem[] = delegationAgents.map((agent) => {
 		const fullCmd = [agent.command, ...agent.args].join(" ");
 		const label = `${agent.id.padEnd(18)}${fullCmd}`;
-		const meta = `governance=${agent.toolGovernance ?? "clio-policy"}`;
+		const meta = `governance=${agent.toolGovernance ?? "clio-coder-policy"}`;
 		return {
 			id: agent.id,
 			label,
@@ -44,7 +44,7 @@ export function openAgentsOverlay(tui: TUI, ctx: SlashCommandContext, onClose: (
 				const lines = [
 					`# ACP Delegation Agent: ${agent.id}`,
 					`**Command:** \`${fullCmd}\``,
-					`**Governance:** ${agent.toolGovernance ?? "clio-policy"}`,
+					`**Governance:** ${agent.toolGovernance ?? "clio-coder-policy"}`,
 				];
 				if (agent.labels && Object.keys(agent.labels).length > 0) {
 					lines.push(`**Labels:**`);

package/src/interactive/overlays/ask-user.ts

@@ -110,7 +110,7 @@ const ELLIPSIS = "…";
  * should not take the screen. A round that follows an answered one has captured
  * answers to keep on screen, which is the full surface's whole job.
  */
-export function askUserSurface(questions: ReadonlyArray<AskUserQuestion>, priorRounds = 0): AskUserSurface {
+function askUserSurface(questions: ReadonlyArray<AskUserQuestion>, priorRounds = 0): AskUserSurface {
 	if (priorRounds > 0 || questions.length !== 1) return "interview";
 	const question = questions[0];
 	if (!question) return "interview";
@@ -245,6 +245,16 @@ function fitLine(text: string, width: number): string {
 	return truncateToWidth(text, safeWidth, ELLIPSIS, true);
 }
 
+/** Wrap a prose value inside the columns left by its one-time row label. */
+function wrapLabeledValue(prefix: string, value: string, width: number): string[] {
+	const safeWidth = Math.max(1, width);
+	const prefixWidth = visibleWidth(prefix);
+	const valueWidth = Math.max(1, safeWidth - prefixWidth);
+	return wrapTextWithAnsi(value, valueWidth).map((line, index) =>
+		fitLine(`${index === 0 ? prefix : " ".repeat(prefixWidth)}${line}`, safeWidth),
+	);
+}
+
 function compactTitle(question: AskUserQuestion): string {
 	return (question.header ?? question.question).replace(/\s+/g, " ").trim();
 }
@@ -398,7 +408,8 @@ class AskUserOverlayView implements Component {
 
 		this.contentOverflows = false;
 		const controlLines = this.renderControlLines(safeWidth);
-		const statusLines = this.status.length > 0 ? ["", fitLine(clioTheme().fg("dim", this.status), safeWidth)] : [];
+		const statusLines =
+			this.status.length > 0 ? ["", ...wrapTextWithAnsi(clioTheme().fg("dim", this.status), safeWidth)] : [];
 		const headerLine = this.renderQuestionHeader(question, safeWidth);
 		const headerLines = headerLine.length > 0 ? [headerLine] : [];
 		const bottom = [...statusLines, "", ...controlLines];
@@ -426,7 +437,7 @@ class AskUserOverlayView implements Component {
 	private renderInterview(question: AskUserQuestion, width: number, maxRows: number): string[] {
 		const theme = clioTheme();
 		const controlLines = this.renderControlLines(width);
-		const statusLines = this.status.length > 0 ? ["", fitLine(theme.fg("dim", this.status), width)] : [];
+		const statusLines = this.status.length > 0 ? ["", ...wrapTextWithAnsi(theme.fg("dim", this.status), width)] : [];
 		const headerLine = this.renderQuestionHeader(question, width);
 		const headerLines = headerLine.length > 0 ? [headerLine] : [];
 		const stripLines = [this.renderQuestionStrip(width), ""];
@@ -606,11 +617,14 @@ class AskUserOverlayView implements Component {
 		const lines = [
 			screenTitle(theme, "Interview"),
 			"",
-			theme.fg(
-				"muted",
-				this.history.length > 0
-					? "Answer sent. Waiting for Clio to prepare the next interview question."
-					: "Waiting for Clio to prepare the interview.",
+			...wrapTextWithAnsi(
+				theme.fg(
+					"muted",
+					this.history.length > 0
+						? "Answer sent. Waiting for Clio to prepare the next interview question."
+						: "Waiting for Clio to prepare the interview.",
+				),
+				width,
 			),
 		];
 		if (this.history.length > 0) {
@@ -618,7 +632,7 @@ class AskUserOverlayView implements Component {
 			for (let index = 0; index < this.history.length; index += 1) {
 				const answer = this.history[index];
 				if (!answer) continue;
-				lines.push(fitLine(`${theme.fg("dim", `${index + 1}.`)} ${theme.fg("muted", answer.answer)}`, width));
+				lines.push(...wrapLabeledValue(`${theme.fg("dim", `${index + 1}.`)} `, theme.fg("muted", answer.answer), width));
 			}
 		}
 		return lines.map((line) => fitLine(line, width)).slice(0, maxRows);
@@ -767,7 +781,7 @@ class AskUserOverlayView implements Component {
 		for (let index = 0; index < this.history.length; index += 1) {
 			const answer = this.history[index];
 			if (!answer) continue;
-			rows.push(fitLine(`${theme.fg("dim", `${index + 1}.`)} ${theme.fg("muted", answer.answer)}`, width));
+			rows.push(...wrapLabeledValue(`${theme.fg("dim", `${index + 1}.`)} `, theme.fg("muted", answer.answer), width));
 		}
 		// A round of one question needs no per-question roll: the strip already
 		// names the round and the question is on screen above this.
@@ -775,7 +789,7 @@ class AskUserOverlayView implements Component {
 			for (let index = 0; index < this.questions.length; index += 1) {
 				const answer = this.states[index]?.answer.trim();
 				const value = answer && answer.length > 0 ? theme.fg("muted", answer) : theme.fg("dim", "pending");
-				rows.push(fitLine(`${theme.fg("dim", `Q${index + 1}`)} ${value}`, width));
+				rows.push(...wrapLabeledValue(`${theme.fg("dim", `Q${index + 1}`)} `, value, width));
 			}
 		}
 		if (rows.length === 0) return [];

package/src/interactive/overlays/context-reset.ts

@@ -1,4 +1,5 @@
 import {
+	type Component,
 	type OverlayHandle,
 	type SelectItem,
 	SelectList,
@@ -6,6 +7,7 @@ import {
 	type TUI,
 	truncateToWidth,
 	visibleWidth,
+	wrapTextWithAnsi,
 } from "../../engine/tui.js";
 import { buildHint, DEFAULT_SELECT_THEME, FocusBox, showClioOverlayFrame } from "../overlay-frame.js";
 import type { ContextClearCommandOptions } from "../slash-commands.js";
@@ -29,7 +31,7 @@ export function contextResetOptions(choice: ContextResetMutationChoice): Context
 }
 
 /** Three intentional outcomes, ordered with the least destructive action first. */
-export function buildContextResetItems(): SelectItem[] {
+function buildContextResetItems(): SelectItem[] {
 	return [
 		{
 			value: "preserve-clio-md",
@@ -67,6 +69,10 @@ function buildSelectPresentation(items: ReadonlyArray<SelectItem>): {
 			truncatePrimary: ({ text, maxWidth, item, isSelected }) => {
 				const label = singleLine(text);
 				const description = descriptions.get(item.value) ?? "";
+				// The focused description is rendered in full below the list. Keeping
+				// only its label here prevents the same explanation appearing once cut
+				// and once wrapped on the same decision surface.
+				if (isSelected) return truncateToWidth(label, maxWidth, ELLIPSIS, true);
 				if (description.length === 0 || maxWidth < 44) {
 					return truncateToWidth(label, maxWidth, ELLIPSIS, true);
 				}
@@ -76,13 +82,31 @@ function buildSelectPresentation(items: ReadonlyArray<SelectItem>): {
 				const spacing = " ".repeat(Math.max(1, labelWidth + 2 - visibleWidth(fittedLabel)));
 				const descriptionWidth = Math.max(1, maxWidth - visibleWidth(fittedLabel) - visibleWidth(spacing));
 				const fittedDescription = truncateToWidth(description, descriptionWidth, ELLIPSIS, true);
-				const body = `${fittedLabel}${spacing}${fittedDescription}`;
-				return isSelected ? body : `${fittedLabel}${clioTheme().fg("muted", `${spacing}${fittedDescription}`)}`;
+				return `${fittedLabel}${clioTheme().fg("muted", `${spacing}${fittedDescription}`)}`;
 			},
 		},
 	};
 }
 
+function describedSelect(list: SelectList, choices: ReadonlyArray<SelectItem>): Component {
+	return {
+		render(width: number): string[] {
+			const rows = list.render(width);
+			const selected = list.getSelectedItem();
+			const description = choices.find((choice) => choice.value === selected?.value)?.description;
+			if (!description) return rows;
+			const indent = "  ";
+			const wrapped = wrapTextWithAnsi(
+				clioTheme().fg("muted", singleLine(description)),
+				Math.max(1, width - visibleWidth(indent)),
+			).map((line) => `${indent}${line}`);
+			return [...rows, ...wrapped];
+		},
+		handleInput: (data: string) => list.handleInput(data),
+		invalidate: () => list.invalidate(),
+	};
+}
+
 /** Open the `/context reset` choice dialog. Cancel paths never reach onReset. */
 export function openContextResetOverlay(tui: TUI, deps: OpenContextResetOverlayDeps): OverlayHandle {
 	const choices = buildContextResetItems();
@@ -99,7 +123,7 @@ export function openContextResetOverlay(tui: TUI, deps: OpenContextResetOverlayD
 		deps.onCancel();
 	};
 
-	return showClioOverlayFrame(tui, new FocusBox(list), {
+	return showClioOverlayFrame(tui, new FocusBox(describedSelect(list, choices)), {
 		anchor: "center",
 		width: CONTEXT_RESET_OVERLAY_WIDTH,
 		markerId: "context-reset",