@iowarp/clio-coder 0.4.0 → 0.4.1

package/src/interactive/overlays/cwd-fallback.ts

@@ -11,6 +11,7 @@
  */
 
 import {
+	type Component,
 	type OverlayHandle,
 	type SelectItem,
 	SelectList,
@@ -18,6 +19,7 @@ import {
 	type TUI,
 	truncateToWidth,
 	visibleWidth,
+	wrapTextWithAnsi,
 } from "../../engine/tui.js";
 import { buildHint, DEFAULT_SELECT_THEME, FocusBox, showClioOverlayFrame } from "../overlay-frame.js";
 import { clioTheme } from "../theme/index.js";
@@ -69,6 +71,10 @@ function buildSelectPresentation(items: ReadonlyArray<SelectItem>): {
 			truncatePrimary: ({ text, maxWidth, item, isSelected }) => {
 				const label = singleLine(text);
 				const description = descriptions.get(item.value) ?? "";
+				// The selected explanation is the recovery decision the operator is
+				// reading, so it renders in full beneath the list instead of appearing
+				// here as an ellipsized fragment.
+				if (isSelected) return truncateToWidth(label, maxWidth, ELLIPSIS, true);
 				if (description.length === 0 || maxWidth < 32) {
 					return truncateToWidth(label, maxWidth, ELLIPSIS, true);
 				}
@@ -80,18 +86,36 @@ function buildSelectPresentation(items: ReadonlyArray<SelectItem>): {
 				const spacing = " ".repeat(Math.max(1, labelWidth + 2 - visibleWidth(fittedLabel)));
 				const descWidth = Math.max(1, maxWidth - visibleWidth(fittedLabel) - visibleWidth(spacing));
 				const fittedDescription = truncateToWidth(description, descWidth, ELLIPSIS, true);
-				const body = `${fittedLabel}${spacing}${fittedDescription}`;
-				return isSelected ? body : `${fittedLabel}${theme.fg("muted", `${spacing}${fittedDescription}`)}`;
+				return `${fittedLabel}${theme.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(),
+	};
+}
+
 /**
  * Pure builder. Exposed so tests can assert row shape without booting the TUI.
  * Two rows: Continue (uses process cwd) and Cancel (returns to picker).
  */
-export function buildCwdFallbackItems(args: {
+function buildCwdFallbackItems(args: {
 	currentCwd: string;
 	sessionCwd: string;
 	reason: CwdFallbackReason;
@@ -131,7 +155,7 @@ export function openCwdFallbackOverlay(tui: TUI, deps: OpenCwdFallbackOverlayDep
 		deps.onCancel();
 		deps.onClose();
 	};
-	const box = new FocusBox(list);
+	const box = new FocusBox(describedSelect(list, items));
 	return showClioOverlayFrame(tui, box, {
 		anchor: "center",
 		width: CWD_FALLBACK_OVERLAY_WIDTH,

package/src/interactive/overlays/decisions.ts

@@ -113,7 +113,7 @@ function decisionLines(decision: DecisionRecord, selected: boolean, expanded: bo
 	return lines;
 }
 
-export function formatDecisionsOverlayBodyLines(
+function formatDecisionsOverlayBodyLines(
 	interviews: ReadonlyArray<DecisionLedgerEntry>,
 	selectedIndex = 0,
 	expandedKey: string | null = null,
@@ -183,7 +183,9 @@ class DecisionsOverlayBody implements Component {
 					),
 			);
 		}
-		if (this.status) body.push("", fitLine(clioTheme().fg("warning", this.status), width));
+		if (this.status) {
+			body.push("", ...wrapTextWithAnsi(clioTheme().fg("warning", this.status), Math.max(1, width)));
+		}
 		return body;
 	}
 

package/src/interactive/overlays/fleet-run-approval.ts

@@ -51,14 +51,14 @@ export interface OpenFleetRunApprovalOverlayOptions {
 }
 
 /** The declared boundary as one phrase: an empty allowlist is a claim, not an absence. */
-export function formatWriteBoundary(writes: ReadonlyArray<string> | undefined): string {
+function formatWriteBoundary(writes: ReadonlyArray<string> | undefined): string {
 	if (writes === undefined) return "writes unenforced";
 	if (writes.length === 0) return "writes nothing";
 	return `writes ${writes.join(", ")}`;
 }
 
 /** One step as its facts: kind, who runs it, where, its scope, and its boundary. */
-export function formatFleetRunPreviewStep(step: FleetRunPreviewStep): string {
+function formatFleetRunPreviewStep(step: FleetRunPreviewStep): string {
 	const loop = step.loop === undefined ? "" : ` (${step.loop.loopId} ${step.loop.role} ${step.loop.attempt})`;
 	if (step.kind === "code") {
 		const gate = step.gate === undefined ? "" : ` · gate path ${step.gate.path}`;
@@ -95,7 +95,7 @@ function formatBudgetLine(preview: FleetRunPreview): string {
  * Render the body. Waves in order, each step with its facts, then the argv a
  * code step will actually run, and last the budget the run is admitted under.
  */
-export function formatFleetRunApprovalBody(subject: FleetRunApprovalSubject, width: number, scroll: number): string[] {
+function formatFleetRunApprovalBody(subject: FleetRunApprovalSubject, width: number, scroll: number): string[] {
 	const theme = clioTheme();
 	const contentWidth = Math.max(1, Math.floor(width));
 	const rows: string[] = [];

package/src/interactive/overlays/handoff-review.ts

@@ -27,7 +27,7 @@ const HANDOFF_REVIEW_MAX_WIDTH = 100;
 /** Rows of document shown at once. Anything longer scrolls. */
 export const HANDOFF_REVIEW_VISIBLE_ROWS = 20;
 
-export function handoffReviewOverlayWidth(columns: number): number {
+function handoffReviewOverlayWidth(columns: number): number {
 	return Math.max(HANDOFF_REVIEW_MIN_WIDTH, Math.min(HANDOFF_REVIEW_MAX_WIDTH, columns - 4));
 }
 
@@ -57,7 +57,7 @@ export interface HandoffReviewOverlaySession extends OverlayHandle {
  * Render the body. Pure so the layout is testable without a TUI: the goal, a
  * rule, then the scrolled document window.
  */
-export function formatHandoffReviewBody(goal: string, document: string, width: number, scroll: number): string[] {
+function formatHandoffReviewBody(goal: string, document: string, width: number, scroll: number): string[] {
 	const theme = clioTheme();
 	const contentWidth = Math.max(1, Math.floor(width));
 	const lines: string[] = [];

package/src/interactive/overlays/interop.ts

@@ -62,7 +62,7 @@ function planLines(proposal: InteropProposal): string[] {
 		...renderProposalEntry(proposal).split("\n"),
 		"```",
 		`**projectContext:** ${INHERITED_PROJECT_CONTEXT} (inherited; the peer receives your task text, never the project projection)`,
-		"**toolGovernance:** clio-policy (its tool calls are gated by Clio safety)",
+		"**toolGovernance:** clio-coder-policy (its tool calls are gated by Clio safety)",
 	];
 	if (proposal.needsNetworkInstall) {
 		lines.push("**Adapter:** not installed locally; npx fetches it the first time you delegate");

package/src/interactive/overlays/library-install-confirm.ts

@@ -62,7 +62,7 @@ function confirmOverlayWidth(columns: number): number {
 }
 
 /** Render the plan: what is being installed, alongside what, and to where. */
-export function formatLibraryInstallConfirmBody(subject: LibraryInstallConfirmSubject, width: number): string[] {
+function formatLibraryInstallConfirmBody(subject: LibraryInstallConfirmSubject, width: number): string[] {
 	const theme = clioTheme();
 	const contentWidth = Math.max(1, Math.floor(width));
 	const rows: string[] = [];

package/src/interactive/overlays/message-picker.ts

@@ -107,7 +107,7 @@ function rowsToItems(rows: ReadonlyArray<MessagePickerRow>): SelectItem[] {
 	}));
 }
 
-export function createMessagePickerContent(
+function createMessagePickerContent(
 	rows: ReadonlyArray<MessagePickerRow>,
 	onFork: (parentTurnId: string) => void,
 	onClose: () => void,

package/src/interactive/overlays/model-selector.ts

@@ -30,13 +30,14 @@ import {
 	type TUI,
 	truncateToWidth,
 	visibleWidth,
+	wrapTextWithAnsi,
 } from "../../engine/tui.js";
 import {
 	buildHint,
 	clioError,
+	diagnosticSeverityToken,
 	FILTER_HINT,
 	formatRuntimeResolutionDiagnostic,
-	runtimeResolutionDiagnosticLine,
 	showClioOverlayFrame,
 } from "../overlay-frame.js";
 import { type ClioToken, clioTheme, GLYPH } from "../theme/index.js";
@@ -357,18 +358,15 @@ function buildSummary(rows: ReadonlyArray<ModelRow>, targets: number, activeRef:
  * row per candidate wire model (see `modelsForTarget`). Targets without
  * a resolvable wire model still render a single "no-model" row so users can
  * see the target exists and why it is not selectable. Scope stars come from
- * `settings.scope`: both plain `targetId` and `targetId/wireModelId` refs
+ * `settings.chat.modelPicker.cycleSet`: both plain `targetId` and `targetId/wireModelId` refs
  * match so a user can pin either granularity.
  */
-export function buildModelItems(deps: {
-	settings: Readonly<ClioSettings>;
-	providers: ProvidersContract;
-}): ModelItemsResult {
-	const activeTarget = deps.settings.orchestrator?.target?.trim() ?? "";
-	const activeModel = deps.settings.orchestrator?.model?.trim() ?? "";
+function buildModelItems(deps: { settings: Readonly<ClioSettings>; providers: ProvidersContract }): ModelItemsResult {
+	const activeTarget = deps.settings.chat?.target?.trim() ?? "";
+	const activeModel = deps.settings.chat?.model?.trim() ?? "";
 	const activeRef = activeTarget && activeModel ? `${activeTarget}/${activeModel}` : activeTarget;
-	const favoriteSet = new Set(deps.settings.modelSelector?.favorites ?? []);
-	const recentSet = new Set(listRecentModels({ limit: deps.settings.modelSelector?.recentLimit ?? 12 }));
+	const favoriteSet = new Set(deps.settings.chat.modelPicker?.favorites ?? []);
+	const recentSet = new Set(listRecentModels({ limit: deps.settings.chat.modelPicker?.recentLimit ?? 12 }));
 	const list = [...deps.providers.list()]
 		.filter((status) => {
 			return status.runtime !== null && isOrchestratorEligibleRuntime(status.runtime);
@@ -383,7 +381,7 @@ export function buildModelItems(deps: {
 				a.target.id.localeCompare(b.target.id)
 			);
 		});
-	const scopeSet = new Set(deps.settings.scope ?? []);
+	const scopeSet = new Set(deps.settings.chat.modelPicker.cycleSet ?? []);
 	const items: SelectItem[] = [];
 	const refs: ModelSelection[] = [];
 	const rows: ModelRow[] = [];
@@ -403,7 +401,7 @@ export function buildModelItems(deps: {
 							providers: deps.providers,
 							status,
 							wireModelId: fallbackModel,
-							requestedThinkingLevel: deps.settings.orchestrator?.thinkingLevel,
+							requestedThinkingLevel: deps.settings.chat?.thinkingLevel,
 						})
 					: null;
 			const rowCaps = resolution?.capabilities ?? status.capabilities;
@@ -457,7 +455,7 @@ export function buildModelItems(deps: {
 				providers: deps.providers,
 				status,
 				wireModelId: wireModel,
-				requestedThinkingLevel: deps.settings.orchestrator?.thinkingLevel,
+				requestedThinkingLevel: deps.settings.chat?.thinkingLevel,
 			});
 			const rowCaps = resolution.capabilities;
 			const decisions = resolution.capabilityDecisions;
@@ -665,18 +663,23 @@ function formatModelDetail(row: ModelRow, width: number): string[] {
 	// The detail block is quiet scaffolding beneath the selected row; only the
 	// diagnostics carry a semantic token, so the two fact lines render dim.
 	return [
-		theme.fg("dim", fitLine(`${state} ${ref} · ${availability} · auth ${row.authText}`, width)),
-		theme.fg(
-			"dim",
-			fitLine(
+		...wrapTextWithAnsi(theme.fg("dim", `${state} ${ref} · ${availability} · auth ${row.authText}`), width),
+		...wrapTextWithAnsi(
+			theme.fg(
+				"dim",
 				`source ${sourceLabel(row.source)}${loadState} · ${row.runtimeName} · ${row.apiFamily} · max output ${row.maxTokens} · thinking ${row.thinking ?? "-"} · streaming ${row.streaming === false ? "no" : "yes"} · ${capabilityNames(row.caps)}`,
-				width,
 			),
+			width,
 		),
 		...(row.diagnostics ?? [])
 			.filter((entry) => entry.severity !== "info")
 			.slice(0, 2)
-			.map((entry) => runtimeResolutionDiagnosticLine(entry, width)),
+			.flatMap((entry) =>
+				wrapTextWithAnsi(
+					theme.fg(diagnosticSeverityToken(entry.severity), formatRuntimeResolutionDiagnostic(entry)),
+					width,
+				),
+			),
 	];
 }
 
@@ -765,23 +768,24 @@ function renderModelOverlayLines(input: {
 				width,
 			),
 		),
-		theme.fg("dim", fitLine(`current ${active} · focus shows current, favorites, recent, and target defaults`, width)),
+		...wrapTextWithAnsi(
+			theme.fg("dim", `current ${active} · focus shows current, favorites, recent, and target defaults`),
+			width,
+		),
 	];
 	const refreshLine = refreshStatusLine(input.refreshing, input.refreshError);
 	if (refreshLine)
-		lines.push(
-			input.refreshError ? clioError(fitLine(refreshLine, width)) : theme.fg("dim", fitLine(refreshLine, width)),
-		);
-	if (input.selectionError) lines.push(clioError(fitLine(input.selectionError, width)));
+		lines.push(...wrapTextWithAnsi(input.refreshError ? clioError(refreshLine) : theme.fg("dim", refreshLine), width));
+	if (input.selectionError) lines.push(...wrapTextWithAnsi(clioError(input.selectionError), width));
 	lines.push(formatModelHeader(width));
 	if (filtered.length === 0) {
 		lines.push(
-			theme.fg(
-				"muted",
-				fitLine(
+			...wrapTextWithAnsi(
+				theme.fg(
+					"muted",
 					searching ? "  no models match the current filter" : "  no focused models; type to search or press Tab for all",
-					width,
 				),
+				width,
 			),
 		);
 	} else {
@@ -989,8 +993,12 @@ export class ModelOverlayView implements Component {
 		if (kb.matches(data, "tui.select.confirm") || matchesKey(data, "enter") || data === "\n") {
 			const row = this.selectedRow();
 			if (row?.selectable) {
-				this.onSelect({ target: row.target, model: row.model });
+				// Close the picker before handing the selection to its owner. The
+				// application opens the session/global scope confirmation from
+				// onSelect; closing afterwards would immediately close that new overlay
+				// and leave the model binding unchanged.
 				this.onClose();
+				this.onSelect({ target: row.target, model: row.model });
 				return;
 			}
 			this.selectionError = row
@@ -1056,8 +1064,8 @@ export function openModelOverlay(tui: TUI, deps: OpenModelOverlayDeps): OverlayH
 	};
 	const initial = build();
 	const overlayWidth = resolveOverlayWidth(tui.terminal?.columns ?? 0);
-	const activeTarget = currentSettings().orchestrator?.target?.trim();
-	const activeModel = currentSettings().orchestrator?.model?.trim();
+	const activeTarget = currentSettings().chat?.target?.trim();
+	const activeModel = currentSettings().chat?.model?.trim();
 	const view = new ModelOverlayView(
 		initial.rows,
 		initial.summary,

package/src/interactive/overlays/prompts.ts

@@ -11,7 +11,12 @@ export function openPromptsOverlay(tui: TUI, ctx: SlashCommandContext, onClose:
 	const promptsList = ctx.listPrompts();
 	const items: ListOverlayItem[] = promptsList.items.map((template) => {
 		const usage = `/${template.name}${template.argumentHint ? ` ${template.argumentHint}` : ""}`;
-		const label = `${usage.padEnd(28)}${template.description}`;
+		// The usage already carries the argument synopsis. Repeating it in the
+		// right-aligned metadata column starves the description at 60 columns, and
+		// a usage longer than the alignment stop used to join directly to its first
+		// word (`[description]Capture`). Two literal cells remain a separator even
+		// when the command has outgrown the nominal column.
+		const label = `${usage.padEnd(28)}  ${template.description}`;
 		const item: ListOverlayItem = {
 			id: template.name,
 			label,
@@ -26,7 +31,9 @@ export function openPromptsOverlay(tui: TUI, ctx: SlashCommandContext, onClose:
 					lines.push(`**Unavailable:** ${template.unavailable}`);
 				}
 				if (!template.trusted) {
-					lines.push("**Untrusted:** set `skills.trustProjectCompatRoots` before this template will expand.");
+					lines.push(
+						"**Untrusted:** set `integrations.projectResources.trustProjectImports` before this template will expand.",
+					);
 				}
 				return lines;
 			},
@@ -39,8 +46,7 @@ export function openPromptsOverlay(tui: TUI, ctx: SlashCommandContext, onClose:
 				: template.trusted
 					? undefined
 					: clioTheme().fg("warning", "untrusted");
-		if (marker) item.meta = template.argumentHint ? `${template.argumentHint} · ${marker}` : marker;
-		else if (template.argumentHint) item.meta = template.argumentHint;
+		if (marker) item.meta = marker;
 		return item;
 	});
 

package/src/interactive/overlays/session-selector.ts

@@ -74,7 +74,7 @@ function metaStrip(meta: SessionMeta, now: number): string {
  * (status, last-activity, msg count, target/model) in the primary column
  * and the first user-message preview in the description column.
  */
-export function buildSessionItems(sessions: ReadonlyArray<SessionMeta>, now: number = Date.now()): SelectItem[] {
+function buildSessionItems(sessions: ReadonlyArray<SessionMeta>, now: number = Date.now()): SelectItem[] {
 	return sessions.map((meta) => {
 		const labels = meta.labels && meta.labels.length > 0 ? `  labels: ${meta.labels.join(", ")}` : "";
 		return {
@@ -117,7 +117,7 @@ function isBareEscape(data: string): boolean {
 }
 
 /** @internal */
-export function createSessionOverlayBox(
+function createSessionOverlayBox(
 	sessions: ReadonlyArray<SessionMeta>,
 	onSelect: (sessionId: string) => void,
 	onClose: () => void,