@iowarp/clio-coder 0.4.7 → 0.4.9

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

@@ -19,6 +19,7 @@ import type {
 	LibraryResource,
 	LibraryResourceKind,
 } from "../../domains/resources/index.js";
+import { sanitizeCallTargetText, sanitizeMultilineDisplayText } from "../../domains/safety/call-target.js";
 import { clioTheme, GLYPH } from "../theme/index.js";
 import type { ListOverlayItem } from "./list-overlay.js";
 
@@ -113,13 +114,19 @@ export function libraryStatusLine(
 	const theme = clioTheme();
 	const mode = view.mode === "browse" ? "Browse" : "Installed";
 	const scope = view.scope === "user" ? "User" : "Project";
-	const core = `${mode} · ${scope}`;
-	if (width < 34) return theme.fg("accent", `${mode}·${scope}`);
-	const parts = [theme.fg("accent", core)];
-	if (view.member) parts.push(theme.fg("dim", `members of ${view.member.ref}`));
-	if (width >= 56) parts.push(theme.fg("dim", `${counts.rows} row${counts.rows === 1 ? "" : "s"}`));
-	if (counts.notices > 0) parts.push(theme.fg("warning", `${counts.notices} notice${counts.notices === 1 ? "" : "s"}`));
+	const unit = view.member ? "member" : view.mode === "browse" ? "package" : "entry";
+	const plural = unit === "entry" ? "entries" : `${unit}s`;
+	const total = `${counts.rows} ${counts.rows === 1 ? unit : plural}`;
+	if (width < 34) return theme.fg("accent", `${mode}·Actions:${scope}`);
+	const parts =
+		width < 72
+			? [theme.fg("accent", width >= 48 ? `${mode} ${total}` : total), theme.fg("dim", `s:${scope}`)]
+			: [theme.fg("accent", `${mode} · Actions: ${scope}`), theme.fg("dim", total)];
+	if (counts.notices > 0)
+		parts.push(theme.fg("warning", `n:${counts.notices} ${counts.notices === 1 ? "notice" : "notices"}`));
+	else if (width < 72) parts.push(theme.fg("dim", "n notices"));
 	if (counts.truncated) parts.push(theme.fg("warning", "incomplete results"));
+	if (view.member && width >= 72) parts.push(theme.fg("dim", `members of ${sanitizeCallTargetText(view.member.ref)}`));
 	return parts.join(theme.fg("frame", " │ "));
 }
 
@@ -178,7 +185,7 @@ export function libraryRowActions(subject: LibraryRowSubject, view: LibraryView)
 			enable: !!here,
 			update: !!here,
 			use: false,
-			open: true,
+			open: subject.record.copies.length > 0,
 			reasons,
 		};
 	}
@@ -246,7 +253,7 @@ export function libraryRowActions(subject: LibraryRowSubject, view: LibraryView)
 		enable: !!owner && selected,
 		update: !!owner && selected,
 		use: usable,
-		open: !!owner,
+		open: false,
 		reasons,
 	};
 }
@@ -256,7 +263,7 @@ function copyStateWord(copy: LibraryCopy): string {
 	if (copy.state === "loadable") return theme.fg("success", "loadable");
 	if (copy.state === "disabled") return theme.fg("warning", "disabled");
 	if (copy.state === "shadowed") return theme.fg("dim", "shadowed");
-	return theme.fg("error", copy.state);
+	return theme.fg("error", sanitizeCallTargetText(copy.state));
 }
 
 function availabilityWord(resource: LibraryResource): string {
@@ -264,15 +271,33 @@ function availabilityWord(resource: LibraryResource): string {
 	if (resource.availability === "available") return theme.fg("success", "available");
 	if (resource.availability === "untrusted") return theme.fg("warning", "untrusted");
 	if (resource.availability === "shadowed") return theme.fg("dim", "shadowed");
-	return theme.fg("error", resource.availability);
+	return theme.fg("error", sanitizeCallTargetText(resource.availability));
 }
 
-function metaOf(parts: ReadonlyArray<string | undefined>): string {
-	return parts.filter((part): part is string => !!part && part.length > 0).join(" · ");
+/** Plain fields are external text; callbacks compose only trusted semantic styling. */
+function metaOf(parts: ReadonlyArray<string | (() => string) | undefined>): string {
+	return parts
+		.map((part) => (typeof part === "function" ? part() : part === undefined ? "" : sanitizeCallTargetText(part)))
+		.filter(Boolean)
+		.join(" · ");
 }
 
 function packageDetail(record: LibraryPackageRecord, view: LibraryView, actions: LibraryRowActions): string[] {
-	const lines = [`# ${record.name}`, `**Kind:** ${record.kind}`, `**Origin:** ${libraryOriginLabel(record.origin)}`];
+	const provider = record.kind !== view.category;
+	const hints = (record.provides ?? []).filter((hint) => view.category === "plugin" || hint.kind === view.category);
+	const lines = [
+		`# ${record.name}`,
+		`**Kind:** ${record.kind}${provider ? ` provider package for ${view.category} recipes` : " package"}`,
+		`**Actions (${view.scope}):** ${libraryActionSummary(actions)}`,
+		"b shows loaded recipes in Installed. Tab toggles detail; PgUp/PgDn scroll.",
+		...(provider ? ["Catalog hints describe potential recipes, not loaded resources."] : []),
+		...(hints.length
+			? [
+					`**Catalog hints (${view.category === "plugin" ? "all kinds" : view.category}):** ${hints.map((hint) => `${hint.kind}:${hint.name}`).join(", ")}`,
+				]
+			: []),
+		`**Origin:** ${libraryOriginLabel(record.origin)}`,
+	];
 	const detail = libraryOriginDetail(record.origin);
 	if (detail) lines.push(`**Source:** \`${detail}\``);
 	lines.push(`**Format:** ${libraryFormatLabel(record.format)}`);
@@ -285,8 +310,8 @@ function packageDetail(record: LibraryPackageRecord, view: LibraryView, actions:
 	);
 	lines.push(`**Selected scope:** ${view.scope}`);
 	if (record.requires?.length) lines.push(`**Requires:** ${record.requires.join(", ")}`);
-	if (record.provides?.length)
-		lines.push(`**Catalog hints:** ${record.provides.map((hint) => `${hint.kind}:${hint.name}`).join(", ")}`);
+	if (view.category !== "plugin" && (record.provides?.length ?? 0) > hints.length)
+		lines.push("Other recipe kinds are listed in the Plugins category.");
 	if (record.provides === undefined && record.copies.length === 0)
 		lines.push("**Contents:** unknown until this package is inspected or installed.");
 	for (const reason of actions.reasons) lines.push(`**Note:** ${reason}`);
@@ -379,9 +404,51 @@ export interface LibraryRowSet {
 	truncated: boolean;
 }
 
-function push(set: LibraryRowSet, id: string, subject: LibraryRowSubject, item: Omit<ListOverlayItem, "id">): void {
+function libraryActionSummary(actions: LibraryRowActions): string {
+	return [
+		actions.use ? "v use" : undefined,
+		actions.open ? "Enter members" : "Enter detail",
+		actions.install ? "i review install" : undefined,
+		actions.enable ? "e review enable/disable" : undefined,
+		actions.update ? "u review update" : undefined,
+		actions.remove ? "r review remove" : undefined,
+	]
+		.filter(Boolean)
+		.join(" · ");
+}
+
+function push(
+	set: LibraryRowSet,
+	view: LibraryView,
+	id: string,
+	subject: LibraryRowSubject,
+	item: Omit<ListOverlayItem, "id">,
+): void {
 	set.subjects.set(id, subject);
-	set.items.push({ id, ...item });
+	const detail = item.detail;
+	set.items.push({
+		id,
+		...item,
+		label:
+			subject.kind === "notice"
+				? clioTheme().fg("warning", sanitizeCallTargetText(item.label))
+				: sanitizeCallTargetText(item.label),
+		...(detail
+			? {
+					detail: (width: number) => {
+						const lines = detail(width).map((line) => sanitizeMultilineDisplayText(line).text);
+						if (subject.kind !== "package" && subject.kind !== "notice")
+							lines.splice(
+								1,
+								0,
+								`**Actions:** ${libraryActionSummary(libraryRowActions(subject, view))}`,
+								"Tab toggles detail. PgUp/PgDn scroll.",
+							);
+						return lines;
+					},
+				}
+			: {}),
+	});
 }
 
 /**
@@ -472,11 +539,11 @@ export function buildLibraryRows(options: LibraryRowOptions): LibraryRowSet {
 		for (const member of options.inspection.resources) {
 			const subject: LibraryRowSubject = { kind: "member", owner, member };
 			const actions = libraryRowActions(subject, view);
-			push(set, `mem:${owner.ref}@${owner.scope}#${member.kind}:${member.name}`, subject, {
+			push(set, view, `mem:${owner.ref}@${owner.scope}#${member.kind}:${member.name}`, subject, {
 				label: member.name,
 				meta: metaOf([
 					member.kind,
-					member.valid ? theme.fg("success", "valid") : theme.fg("error", "invalid"),
+					() => (member.valid ? theme.fg("success", "valid") : theme.fg("error", "invalid")),
 					member.componentId ? `component ${member.componentId}` : undefined,
 				]),
 				group: LIBRARY_GROUP_MEMBERS,
@@ -488,7 +555,7 @@ export function buildLibraryRows(options: LibraryRowOptions): LibraryRowSet {
 				kind: "notice",
 				message: `${item.kind} ${item.id} is declared package metadata, not a recipe. It runs only on an explicit request.`,
 			};
-			push(set, `note:ancillary:${item.kind}:${item.id}`, subject, {
+			push(set, view, `note:ancillary:${item.kind}:${item.id}`, subject, {
 				label: `${item.kind}: ${item.id}`,
 				meta: theme.fg("dim", "companion file"),
 				group: LIBRARY_GROUP_NOTICES,
@@ -498,7 +565,7 @@ export function buildLibraryRows(options: LibraryRowOptions): LibraryRowSet {
 		}
 		for (const diagnostic of options.inspection.diagnostics) {
 			const subject: LibraryRowSubject = { kind: "notice", message: diagnostic };
-			push(set, `note:member-diag:${set.notices}`, subject, {
+			push(set, view, `note:member-diag:${set.notices}`, subject, {
 				label: `${theme.fg("warning", GLYPH.warnInline)} ${diagnostic}`,
 				meta: theme.fg("dim", "inspection"),
 				group: LIBRARY_GROUP_NOTICES,
@@ -512,15 +579,20 @@ export function buildLibraryRows(options: LibraryRowOptions): LibraryRowSet {
 			const actions = libraryRowActions(subject, view);
 			const here = record.copies.find((copy) => copy.scope === view.scope);
 			const hints = (record.provides ?? []).filter((hint) => view.category === "plugin" || hint.kind === view.category);
-			push(set, `pkg:${record.ref}`, subject, {
-				label: record.name,
+			push(set, view, `pkg:${record.ref}`, subject, {
+				label: record.kind !== view.category ? `${record.name} [${record.kind}]` : record.name,
 				meta: metaOf([
+					here ? `${here.scope} ${here.state}` : `not installed (${view.scope})`,
+					hints.length > 0 ? `${hints.length} ${view.category === "plugin" ? "recipe" : view.category} hints` : undefined,
 					libraryOriginLabel(record.origin),
 					record.version ? `v${record.version}` : undefined,
-					here ? theme.fg("success", `${here.scope} ${here.state}`) : theme.fg("dim", "not in this scope"),
-					hints.length > 0 ? `${hints.length} hinted` : undefined,
 				]),
-				group: record.copies.length > 0 ? LIBRARY_GROUP_INSTALLED : LIBRARY_GROUP_AVAILABLE,
+				group:
+					record.kind !== view.category
+						? "Provider packages"
+						: record.copies.length > 0
+							? LIBRARY_GROUP_INSTALLED
+							: LIBRARY_GROUP_AVAILABLE,
 				detail: () => packageDetail(record, view, actions),
 			});
 		}
@@ -528,13 +600,13 @@ export function buildLibraryRows(options: LibraryRowOptions): LibraryRowSet {
 		for (const copy of inventory.copies) {
 			const subject: LibraryRowSubject = { kind: "copy", copy };
 			const actions = libraryRowActions(subject, view);
-			push(set, `copy:${copy.ref}@${copy.scope}`, subject, {
+			push(set, view, `copy:${copy.ref}@${copy.scope}`, subject, {
 				label: copy.name,
 				meta: metaOf([
-					libraryOriginLabel(copy.origin),
 					copy.scope,
-					copyStateWord(copy),
-					copy.trust === "foreign" ? theme.fg("warning", "foreign") : undefined,
+					() => copyStateWord(copy),
+					libraryOriginLabel(copy.origin),
+					copy.trust === "foreign" ? () => theme.fg("warning", "foreign") : undefined,
 				]),
 				group: LIBRARY_GROUP_INSTALLED,
 				detail: () => copyDetail(copy, view, actions),
@@ -543,12 +615,12 @@ export function buildLibraryRows(options: LibraryRowOptions): LibraryRowSet {
 		for (const resource of inventory.resources) {
 			const subject: LibraryRowSubject = { kind: "recipe", resource };
 			const actions = libraryRowActions(subject, view);
-			push(set, `res:${resource.key}`, subject, {
+			push(set, view, `res:${resource.key}`, subject, {
 				label: resource.name,
 				meta: metaOf([
-					libraryOriginLabel(resource.origin),
+					() => availabilityWord(resource),
 					resource.owner ? resource.owner.ref : resource.source.class,
-					availabilityWord(resource),
+					libraryOriginLabel(resource.origin),
 				]),
 				group: resource.owner ? LIBRARY_GROUP_INSTALLED : LIBRARY_GROUP_UNMANAGED,
 				detail: () => resourceDetail(resource, actions),
@@ -562,11 +634,18 @@ export function buildLibraryRows(options: LibraryRowOptions): LibraryRowSet {
 		(entry): entry is string => entry !== undefined,
 	)) {
 		const subject: LibraryRowSubject = { kind: "notice", message };
-		push(set, `note:${set.notices}`, subject, {
+		push(set, view, `note:${set.notices}`, subject, {
 			label: `${theme.fg("warning", GLYPH.warnInline)} ${message}`,
 			meta: theme.fg("dim", "library"),
 			group: LIBRARY_GROUP_NOTICES,
-			detail: () => ["# Library notice", "", message],
+			detail: () => [
+				"# Library notice",
+				"",
+				"Discovery notices cover all categories.",
+				"From browse focus, n returns to resources. Esc clears a filter or leaves search focus before returning to the parent browser.",
+				"",
+				message,
+			],
 		});
 		set.notices += 1;
 	}

package/src/interactive/overlays/library.ts

@@ -48,10 +48,10 @@ export const LIBRARY_TITLE = "Library";
 
 /** @internal exported for contract tests */
 export const LIBRARY_EMPTY_BROWSE =
-	"No packages of this kind in the index. Register one with clio-coder library register <path>, or press o to import from another local agent.";
+	"No packages of this kind in the index. Browse counts packages, not runnable recipes. Press b for loaded recipes in Installed. Register one with clio-coder library register <path>, or press o to import from another local agent.";
 /** @internal exported for contract tests */
 export const LIBRARY_EMPTY_INSTALLED =
-	"Nothing of this kind is installed or loaded here. Press b for Browse to see what can be installed.";
+	"No entries of this kind are listed by the Library inventory. Action scope selects a package destination, not which recipes can run. Press b for installable packages.";
 
 export interface LibraryOverlayDeps {
 	/** The package lifecycle. Plans are reviewed before anything is written. */
@@ -204,13 +204,17 @@ export function openLibraryOverlay(tui: TUI, deps: LibraryOverlayDeps): OverlayH
 			...(failure ? { failure } : {}),
 		});
 		if (category === view.category) rowSet = set;
-		return set.items;
+		return set.items.filter((item) => set.subjects.get(item.id)?.kind !== "notice");
 	};
 
 	const tabs: ListOverlayTab[] = LIBRARY_TABS.map((tab) => ({
 		id: tab.id,
 		label: tab.label,
 		items: () => rowsFor(tab.id),
+		countLabel: (count) => {
+			const unit = view.member && tab.id === view.category ? "member" : view.mode === "browse" ? "package" : "entry";
+			return `${count} ${count === 1 ? unit : unit === "entry" ? "entries" : `${unit}s`}`;
+		},
 	}));
 
 	// eslint-disable-next-line prefer-const -- the action closures need the handle they are opened from.
@@ -429,8 +433,45 @@ export function openLibraryOverlay(tui: TUI, deps: LibraryOverlayDeps): OverlayH
 		handle.refreshTabs();
 	};
 
+	/** A child keeps the resource browser's cursor, search draft and focus intact. */
+	const openNotices = (): void => {
+		if (busy) return;
+		busy = true;
+		const items = rowSet.items.filter((item) => rowSet.subjects.get(item.id)?.kind === "notice");
+		const close = (): void => {
+			child = null;
+			busy = false;
+			notices.hide();
+			if (closed) return;
+			handle.setHidden(false);
+			handle.focus();
+		};
+		handle.setHidden(true);
+		const notices = (deps.openList ?? openListOverlay)(tui, {
+			markerId: "library",
+			title: "Library notices",
+			items,
+			filterable: true,
+			explicitSearch: true,
+			fullScreen: true,
+			layout: "split",
+			status: () => `${items.length} ${items.length === 1 ? "notice" : "notices"} · browse focus: n back`,
+			emptyMessage:
+				"No notices in this view. From browse focus, n returns to resources. Esc clears a filter or leaves search focus before returning to the parent browser.",
+			globalHints: [{ key: "n", verb: "resources", critical: true }],
+			globalActions: { n: close },
+			onClose: close,
+		});
+		child = { hide: () => notices.hide(), release: () => {} };
+		notices.toggleDetail();
+	};
+
 	const status = (width: number): string =>
-		libraryStatusLine(view, { rows: rowSet.items.length, notices: rowSet.notices, truncated: rowSet.truncated }, width);
+		libraryStatusLine(
+			view,
+			{ rows: rowSet.items.length - rowSet.notices, notices: rowSet.notices, truncated: rowSet.truncated },
+			width,
+		);
 
 	/**
 	 * The keys the selected row actually offers.
@@ -447,7 +488,7 @@ export function openLibraryOverlay(tui: TUI, deps: LibraryOverlayDeps): OverlayH
 		const actions = libraryRowActions(subject, view);
 		const entries: Array<{ key: string; verb: string }> = [];
 		if (actions.use) entries.push({ key: "v", verb: "use" });
-		if (actions.open) entries.push({ key: "Enter", verb: "members" });
+		entries.push({ key: "Enter", verb: actions.open ? "members" : "detail" });
 		if (actions.install) entries.push({ key: "i", verb: "install" });
 		if (actions.enable)
 			entries.push({
@@ -497,10 +538,12 @@ export function openLibraryOverlay(tui: TUI, deps: LibraryOverlayDeps): OverlayH
 		globalHints: [
 			{ key: "b", verb: "browse/installed", short: "view", critical: true },
 			{ key: "s", verb: "user/project", short: "scope", critical: true },
+			{ key: "n", verb: "notices", critical: true },
 			{ key: "o", verb: "import" },
 			{ key: "R", verb: "refresh" },
 		],
 		globalActions: {
+			n: openNotices,
 			b: () => {
 				view.mode = view.mode === "browse" ? "installed" : "browse";
 				view.member = undefined;
@@ -547,6 +590,10 @@ export function openLibraryOverlay(tui: TUI, deps: LibraryOverlayDeps): OverlayH
 		onClose: deps.onClose,
 	});
 
+	// The narrow layout opens with the selected inspector visible. Tab retains
+	// its existing toggle; wide layouts already draw detail beside the list.
+	handle.toggleDetail();
+
 	/**
 	 * What `/library <verb> <ref>` asked for, run after the caller has this
 	 * handle.

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

@@ -45,6 +45,8 @@ export interface ListOverlayTab {
 	id: string;
 	label: string;
 	items: () => ReadonlyArray<ListOverlayItem>;
+	/** Optional footer count wording; defaults to the count followed by the tab label. */
+	countLabel?: (count: number) => string;
 }
 
 export interface ListOverlayOptions {
@@ -381,7 +383,8 @@ export class ListOverlayView implements Component {
 		const tab = this.activeTab();
 		if (tab === undefined) return null;
 		const count = this.tabCounts.get(tab.id) ?? this.items.length;
-		return { key: "←→", verb: `tab · ${count} ${tab.label.toLowerCase()}`, short: "tab", critical: true };
+		const countLabel = tab.countLabel?.(count) ?? `${count} ${tab.label.toLowerCase()}`;
+		return { key: "←→", verb: `tab · ${countLabel}`, short: "tab", critical: true };
 	}
 
 	getHint(): string {

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

@@ -1,4 +1,5 @@
 import { basename } from "node:path";
+import { sanitizeCallTargetText } from "../../domains/safety/call-target.js";
 import type { SessionContract, SessionMeta } from "../../domains/session/contract.js";
 import {
 	getKeybindings,
@@ -22,15 +23,12 @@ export const SESSION_ESCAPE_GRACE_MS = 75;
 const ESC = String.fromCharCode(27);
 
 /**
- * SelectList allocates the primary column to the label and uses any
- * remaining width for the description. The picker treats the meta strip
- * (status glyph, time, count, target) as the primary column and the
- * conversation preview as the description, so users scan the right column
- * for the topic they remember.
+ * Identity owns the primary column. SelectList drops the secondary metadata
+ * when space is tight, so the task remains recognizable at narrow widths.
  */
 const SESSION_LAYOUT: SelectListLayoutOptions = {
-	minPrimaryColumnWidth: 52,
-	maxPrimaryColumnWidth: 60,
+	minPrimaryColumnWidth: 32,
+	maxPrimaryColumnWidth: 52,
 };
 
 /**
@@ -44,20 +42,21 @@ export function formatRelativeTime(iso: string | null | undefined, now: number =
 }
 
 function shortTarget(meta: SessionMeta): string {
-	const target = meta.target?.trim();
-	const model = meta.model?.trim();
+	const target = sanitizeCallTargetText(meta.target ?? "");
+	const model = sanitizeCallTargetText(meta.model ?? "");
 	if (!target && !model) return "no target";
 	if (target && model) return `${target}/${model}`;
-	return target ?? model ?? "no target";
+	return target || model || "no target";
 }
 
 function previewLine(meta: SessionMeta): string {
-	const explicit = meta.firstMessagePreview?.trim();
+	const explicit = sanitizeCallTargetText(meta.firstMessagePreview ?? "");
 	if (explicit) return explicit;
-	const name = meta.name?.trim();
+	const name = sanitizeCallTargetText(meta.name ?? "");
 	if (name) return `(${name})`;
-	const cwdLeaf = meta.cwd ? basename(meta.cwd) : "";
-	return cwdLeaf ? `(no preview · ${cwdLeaf})` : "(no preview)";
+	const cwdLeaf = sanitizeCallTargetText(meta.cwd ? basename(meta.cwd) : "");
+	const id = sanitizeCallTargetText(meta.id) || "Unnamed session";
+	return `${id} · ${cwdLeaf || "no preview"}`;
 }
 
 function metaStrip(meta: SessionMeta, now: number): string {
@@ -70,17 +69,17 @@ function metaStrip(meta: SessionMeta, now: number): string {
 }
 
 /**
- * Pure builder used by the /resume overlay. Each row carries a meta strip
- * (status, last-activity, msg count, target/model) in the primary column
- * and the first user-message preview in the description column.
+ * The first message or fallback identity stays visible as metadata yields.
+ * Keep the canonical ID as the selection value, independent of display text.
  */
 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(", ")}` : "";
+		const labels = meta.labels?.map(sanitizeCallTargetText).filter(Boolean).join(", ");
+		const details = [metaStrip(meta, now), labels ? `labels: ${labels}` : ""].filter(Boolean);
 		return {
 			value: meta.id,
-			label: metaStrip(meta, now),
-			description: `${previewLine(meta)}${labels}`,
+			label: previewLine(meta),
+			description: details.join(" · "),
 		};
 	});
 }
@@ -128,6 +127,7 @@ function createSessionOverlayBox(
 	const allSessions = [...sessions];
 	let filtered = [...sessions];
 	let lastQuery = "";
+	let selectedSessionId: string | undefined;
 	let list = buildList(filtered);
 	let pendingEscape = "";
 	let pendingEscapeTimer: ReturnType<typeof setTimeout> | null = null;
@@ -173,15 +173,20 @@ function createSessionOverlayBox(
 	}
 
 	function applyFilter(): void {
+		// Keep identity through reordering and an empty-result query/undo.
+		selectedSessionId = list.getSelectedItem()?.value ?? selectedSessionId;
 		filtered = filterSessions(allSessions, lastQuery);
 		list = buildList(filtered);
+		const selectedIndex = filtered.findIndex((session) => session.id === selectedSessionId);
+		if (selectedIndex >= 0) list.setSelectedIndex(selectedIndex);
+		selectedSessionId = list.getSelectedItem()?.value ?? selectedSessionId;
 		rebuildChildren();
 	}
 
 	function commitSelection(): void {
-		const first = filtered[0];
-		if (!first) return;
-		onSelect(first.id);
+		const selected = list.getSelectedItem();
+		if (!selected) return;
+		onSelect(selected.value);
 		closeOverlay();
 	}
 

package/src/interactive/overlays/settings.ts

@@ -230,6 +230,7 @@ export const SETTINGS_LABELS_BY_ID = {
 	"retry.baseDelayMs": "Base delay (ms)",
 	"retry.maxDelayMs": "Max delay (ms)",
 	"retry.streamStallMs": "Stream stall timeout (ms)",
+	"retry.firstTokenStallMs": "First token timeout (ms)",
 	"terminal.showTerminalProgress": "Terminal progress badges",
 	"terminal.outputVerbosity": "Output style",
 	"terminal.tuiMode": "TUI mode",
@@ -347,7 +348,14 @@ export const SETTINGS_SECTION_ROWS = {
 		"context.workingSet.protectLastTurns",
 		"context.workingSet.minEvictableTokens",
 	],
-	retry: ["retry.enabled", "retry.maxRetries", "retry.baseDelayMs", "retry.maxDelayMs", "retry.streamStallMs"],
+	retry: [
+		"retry.enabled",
+		"retry.maxRetries",
+		"retry.baseDelayMs",
+		"retry.maxDelayMs",
+		"retry.streamStallMs",
+		"retry.firstTokenStallMs",
+	],
 	terminal: [
 		"terminal.showTerminalProgress",
 		"terminal.outputVerbosity",
@@ -450,6 +458,7 @@ const SETTINGS_DESCRIPTIONS_BY_ID = {
 	"retry.baseDelayMs": "Initial retry delay in milliseconds.",
 	"retry.maxDelayMs": "Maximum retry delay in milliseconds.",
 	"retry.streamStallMs": "Silence on an in-flight stream past this long is treated as a wedged backend.",
+	"retry.firstTokenStallMs": "Silence allowed before a call's first token, for backends that load the model on demand.",
 	"terminal.showTerminalProgress": "Emit OSC 9;4 progress badges during agent turns.",
 	"terminal.outputVerbosity": "How much reasoning, tool input, and live tool output appears in the transcript.",
 	"terminal.tuiMode": "Use regular terminal scrollback or a fullscreen transcript with a sticky composer and footer.",
@@ -508,6 +517,8 @@ const SETTINGS_HELP_BY_ID: Partial<Record<EditableSettingId, string>> = {
 		"Covers the wiki documenter and the bootstrap scout. Continuous output satisfies the heartbeat watchdog and a run mid-generation spends no tool calls, so this is the only guard that ends a degenerate generator. Healthy runs finish in minutes. Whole milliseconds of at least 1 · default: 900000 (15 minutes).",
 	"retry.streamStallMs":
 		"Measured from the last token received, not from the request, so a slow-but-alive stream is never aborted. The retry then follows the same enabled/maxRetries/delay settings above. Whole milliseconds · default: 180000 (three minutes).",
+	"retry.firstTokenStallMs":
+		"Measured from the request until the first token. A local server that slept reloads the model and prefills cold first, so this window is longer than the stream stall timeout; the larger of the two applies. 0 never aborts a call that has not started streaming. Whole milliseconds · default: 600000 (ten minutes).",
 	"library.catalog":
 		"Absolute path, or blank for the catalog in your config directory. The catalog is the index `clio-coder library` reads; installed resources land in the usual skill and resource roots either way. Default: blank.",
 	"library.remote":
@@ -1925,6 +1936,9 @@ function buildSettingItems(settings: Readonly<ClioSettings>, options?: BuildSett
 		settingItem("retry.streamStallMs", String(retry.streamStallMs), {
 			values: ["60000", "120000", "180000", "300000", "600000"],
 		}),
+		settingItem("retry.firstTokenStallMs", String(retry.firstTokenStallMs), {
+			values: ["180000", "300000", "600000", "900000", "1800000"],
+		}),
 		settingItem("terminal.showTerminalProgress", String(terminal.terminalProgress), {
 			values: ["false", "true"],
 		}),
@@ -2752,6 +2766,11 @@ function applySettingChange(settings: ClioSettings, id: string, value: string):
 				settings.chat.retry.streamStallMs = next;
 			});
 			return;
+		case "retry.firstTokenStallMs":
+			applyNonNegativeInteger(value, (next) => {
+				settings.chat.retry.firstTokenStallMs = next;
+			});
+			return;
 		case "library.catalog":
 		case "library.remote": {
 			const key = id.slice("library.".length) as "catalog" | "remote";