@iowarp/clio-coder 0.3.9 → 0.4.1

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");
@@ -120,6 +120,7 @@ export function openInteropOverlay(tui: TUI, ctx: SlashCommandContext, onClose:
 	};
 
 	const handle: ListOverlayHandle = openListOverlay(tui, {
+		markerId: "interop",
 		title: "Interop",
 		items: buildItems(deps),
 		filterable: true,

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[] = [];
@@ -137,6 +137,7 @@ export function openLibraryInstallConfirmOverlay(
 	const handle = showClioOverlayFrame(tui, focus, {
 		anchor: "center",
 		width: confirmOverlayWidth(options.columns),
+		markerId: "library-install",
 		title: LIBRARY_INSTALL_CONFIRM_TITLE,
 		footerHint: buildResponsiveHint([{ key: "Enter", verb: "install" }], { key: "Esc", verb: "cancel" }),
 	});

package/src/interactive/overlays/library-tabs.ts

@@ -0,0 +1,28 @@
+/**
+ * The Skills Hub's tab table.
+ *
+ * It sits in its own module rather than inside `skills-hub.ts` because the slash
+ * registry parses `/library <kind>` against it, and the registry has to stay off
+ * the render module graph. Pulling the whole hub overlay in for four ids made
+ * `src/cli/run.ts` a second, disjoint reacher of the interactive theme and
+ * `src/engine/tui.ts`, which splits the merged chunk the Stage 0 instant shell
+ * depends on. See `tests/contracts/instant-shell-import-graph.test.ts`.
+ *
+ * Pure data plus its membership test: no rendering, no overlay state.
+ * `skills-hub.ts` re-exports both symbols, so every existing importer keeps the
+ * path it had.
+ */
+
+import type { LibraryEntryKind } from "../../domains/resources/index.js";
+
+/** The hub's tabs, in the order ←/→ walks them. `skill` is the original view. */
+export const LIBRARY_TABS: ReadonlyArray<{ id: LibraryEntryKind; label: string }> = [
+	{ id: "skill", label: "Skills" },
+	{ id: "agent", label: "Agents" },
+	{ id: "prompt", label: "Prompts" },
+	{ id: "fleet", label: "Fleets" },
+];
+
+export function isLibraryTab(value: string): value is LibraryEntryKind {
+	return LIBRARY_TABS.some((tab) => tab.id === value);
+}

package/src/interactive/overlays/list-overlay.ts

@@ -742,11 +742,20 @@ export interface ListOverlayHandle extends OverlayHandle {
 	activeTabId(): string;
 }
 
-export function openListOverlay(tui: TUI, options: ListOverlayOptions): ListOverlayHandle {
+/**
+ * The marker id rides on the opener rather than on `ListOverlayOptions` because
+ * it belongs to the mounted modal, not to the view: the view renders the same
+ * rows whether it is a modal or a body inside something else. It is named by
+ * the surface rather than derived from `title`, because a tabbed overlay's
+ * rendered title names the active tab while the modal holding the keyboard has
+ * not changed hands.
+ */
+export function openListOverlay(tui: TUI, options: ListOverlayOptions & { markerId: string }): ListOverlayHandle {
 	const view = new ListOverlayView(options, () => tui.requestRender());
 	const handle = showClioOverlayFrame(tui, view, {
 		anchor: "center",
 		width: 100,
+		markerId: options.markerId,
 		// A function, not the string: on a tabbed overlay the title names the tab
 		// and must be re-read after every switch.
 		title: () => view.title(),

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,
@@ -149,6 +149,7 @@ export function openMessagePickerOverlay(tui: TUI, deps: OpenMessagePickerOverla
 	return showClioOverlayFrame(tui, box, {
 		anchor: "center",
 		width: MESSAGE_PICKER_OVERLAY_WIDTH,
+		markerId: "message-picker",
 		title: "Fork",
 		footerHint: rows.length > 0 ? buildHint([{ key: "Enter", verb: "select" }]) : buildHint([]),
 	});

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

@@ -0,0 +1,86 @@
+/**
+ * Where a `/model` swap lands: this session, or this session and settings.yaml.
+ *
+ * Smoke pass 2 (G3) swapped the live model mid-conversation and found the
+ * orchestrator role rewritten in settings.yaml with no prompt, so the next
+ * launch came up pointed at an endpoint that no longer existed. Every other
+ * durable change in the product goes through the settings center's scoped
+ * commit; this is that commit for the one path that used to skip it.
+ *
+ * Session is first and selected by default: a mid-conversation swap is a thing
+ * the operator is trying, and the cheap answer to a bad try is closing the
+ * session rather than editing a file.
+ */
+
+import type { ThinkingLevel } from "../../core/defaults.js";
+import { type OverlayHandle, type SelectItem, SelectList, type TUI } from "../../engine/tui.js";
+import { buildHint, DEFAULT_SELECT_THEME, FocusBox, showClioOverlayFrame } from "../overlay-frame.js";
+
+export const MODEL_SCOPE_OVERLAY_WIDTH = 72;
+
+export type ModelScopeChoice = "session" | "global";
+
+/** The swap awaiting a destination. `thinkingLevel` is set only when the operator named one. */
+export interface PendingModelScope {
+	target: string;
+	model: string;
+	thinkingLevel?: ThinkingLevel;
+}
+
+export interface OpenModelScopeOverlayDeps {
+	ref: PendingModelScope;
+	/** Called only for one of the two applying choices. */
+	onChoose: (scope: ModelScopeChoice) => void;
+	/** Called for the explicit Cancel row and for Esc. Nothing has changed yet. */
+	onCancel: () => void;
+}
+
+/** The swap as the operator typed it, for the dialog title. */
+export function formatPendingModelScope(ref: PendingModelScope): string {
+	const thinking = ref.thinkingLevel ? ` thinking=${ref.thinkingLevel}` : "";
+	return `${ref.target}/${ref.model}${thinking}`;
+}
+
+/** Three outcomes, least durable first, matching the settings center's order. */
+function buildModelScopeItems(): SelectItem[] {
+	return [
+		{
+			value: "session",
+			label: "Apply this session",
+			description: "route this session only; settings.yaml is untouched",
+		},
+		{
+			value: "global",
+			label: "Apply and save globally",
+			description: "also the orchestrator route the next launch starts on",
+		},
+		{
+			value: "cancel",
+			label: "Cancel",
+			description: "keep the current model",
+		},
+	];
+}
+
+export function openModelScopeOverlay(tui: TUI, deps: OpenModelScopeOverlayDeps): OverlayHandle {
+	const items = buildModelScopeItems();
+	const list = new SelectList(items, items.length, DEFAULT_SELECT_THEME);
+	list.onSelect = (item: SelectItem): void => {
+		if (item.value === "session" || item.value === "global") {
+			deps.onChoose(item.value);
+			return;
+		}
+		deps.onCancel();
+	};
+	list.onCancel = (): void => {
+		deps.onCancel();
+	};
+
+	return showClioOverlayFrame(tui, new FocusBox(list), {
+		anchor: "center",
+		width: MODEL_SCOPE_OVERLAY_WIDTH,
+		markerId: "model-scope",
+		title: `Apply ${formatPendingModelScope(deps.ref)}`,
+		footerHint: buildHint([{ key: "Enter", verb: "select" }]),
+	});
+}

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,
@@ -1085,6 +1093,7 @@ export function openModelOverlay(tui: TUI, deps: OpenModelOverlayDeps): OverlayH
 	const handle = showClioOverlayFrame(tui, view, {
 		anchor: "center",
 		width: overlayWidth,
+		markerId: "model",
 		title: "Models",
 		footerHint: buildHint([
 			FILTER_HINT,

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;
 	});
 
@@ -67,6 +73,7 @@ export function openPromptsOverlay(tui: TUI, ctx: SlashCommandContext, onClose:
 	const allItems = [...items, ...diagnosticItems];
 
 	return openListOverlay(tui, {
+		markerId: "prompts",
 		title: "Prompt Templates",
 		items: allItems,
 		filterable: true,

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,
@@ -271,6 +271,7 @@ export function openSessionOverlay(tui: TUI, deps: OpenSessionOverlayDeps): Over
 	const handle = showClioOverlayFrame(tui, box, {
 		anchor: "center",
 		width: SESSION_OVERLAY_WIDTH,
+		markerId: "resume",
 		title: "Sessions",
 		footerHint: buildHint([FILTER_HINT, { key: "Enter", verb: "resume" }]),
 	});

package/src/interactive/overlays/settings-sections.ts

@@ -0,0 +1,30 @@
+/**
+ * The Settings Center's section table.
+ *
+ * It sits in its own module rather than inside `settings.ts` because the slash
+ * registry parses `/settings <section>` and every `/targets`-style deep link
+ * against it, and the registry has to stay off the render module graph. Pulling
+ * the whole settings overlay in for eleven ids made `src/cli/run.ts` a second,
+ * disjoint reacher of the interactive theme and `src/engine/tui.ts`, which
+ * splits the merged chunk the Stage 0 instant shell depends on. See
+ * `tests/contracts/instant-shell-import-graph.test.ts`.
+ *
+ * Pure data: no imports, no rendering, no settings I/O. `settings.ts` re-exports
+ * both symbols, so every existing importer keeps the path it had.
+ */
+
+export const SETTINGS_SECTIONS = [
+	{ id: "safety", label: "Autonomy & Safety", group: "CORE" },
+	{ id: "orchestrator", label: "Orchestrator", group: "CORE" },
+	{ id: "fleet", label: "Fleet", group: "ROUTING" },
+	{ id: "targets", label: "Targets", group: "ROUTING" },
+	{ id: "models", label: "Models", group: "ROUTING" },
+	{ id: "budget", label: "Budget", group: "RUNTIME" },
+	{ id: "compaction", label: "Compaction", group: "RUNTIME" },
+	{ id: "retry", label: "Retry", group: "RUNTIME" },
+	{ id: "terminal", label: "Terminal", group: "EXPERIENCE" },
+	{ id: "watchdog", label: "Watchdog", group: "EXPERIENCE" },
+	{ id: "advanced", label: "Advanced", group: "EXPERIENCE" },
+] as const;
+
+export type SettingsSectionId = (typeof SETTINGS_SECTIONS)[number]["id"];