zidane 5.0.4 → 5.0.5

package/dist/tui.js

@@ -2,7 +2,7 @@ import { d as createAgent } from "./tools-CLazLRb4.js";
 import { n as formatTokenUsage } from "./stats-DZIsGqzu.js";
 import { n as loadSession, t as createSession } from "./session-791hhrFa.js";
 import { createTuiStore } from "./session/sqlite.js";
-import { $t as piIdOf, C as useSafeModeQueue, Ct as findGitRoot, D as isOnSafelist, E as getSafelist, Et as uniqueSkillNamesFromReferences, F as supportsOAuth, Ft as detectAuth, G as shortId, H as ageString, I as buildMcpServers, J as DEFAULT_SETTINGS, K as listProjectFiles, N as splitPromptSegments, Ot as createFilesCompletionProvider, P as runOAuthLogin, Pt as useCompletion, Q as useSettings, R as discoverProjectMcps, S as useSafeModeActions, St as toolResultText, T as addToSafelist, Tt as createSkillsCompletionProvider, U as compactPath, V as generateSessionTitle, Vt as setProviderCredential, W as fmtTokens, X as SETTINGS_TOGGLES, Y as SETTINGS_CHOICES, Yt as modelSupportsReasoning, Z as SettingsProvider, _ as discoverProjectSkills, a as ThemeProvider, b as writeSessionExport, c as useSurfaces, ct as ConfigProvider, d as finalizeStreamingMarkdown, f as finalizeStreamingMarkdownForOwner, ft as deriveSessionTitle, g as defaultSkillScanPaths, h as buildSkillsConfig, ht as listSessionMeta, i as turnAsText, j as suggestSafelistEntry, lt as useConfig, m as useStreamBuffer, mt as lastContextSizeFromTurns, n as deleteTurnSafely, nt as resolveTheme, o as useColors, p as turnContextSize, pt as eventsFromTurns, q as useEnabledToggleSet, qt as getContextWindow, r as truncateTurnsAt, s as useSelectStyle, tt as resolveChipColor, u as useTheme, ut as resolveConfig, vt as selectableTurnIds, x as SafeModeProvider, xt as toolCallPreview, yt as stripSpawnTokensLine } from "./turn-operations-BF3hMNgo.js";
+import { $ as SETTINGS_TOGGLES, C as useSafeModeQueue, D as isOnSafelist, E as getSafelist, Et as findGitRoot, F as supportsOAuth, G as ageString, I as buildModelCatalog, J as shortId, K as compactPath, L as filterModelCatalog, Lt as useCompletion, N as splitPromptSegments, Ot as createSkillsCompletionProvider, P as runOAuthLogin, Q as SETTINGS_CHOICES, Qt as modelSupportsReasoning, R as indexOfEntry, Rt as detectAuth, S as useSafeModeActions, St as stripSpawnTokensLine, T as addToSafelist, Tt as toolResultText, V as discoverProjectMcps, W as generateSessionTitle, Wt as setProviderCredential, X as useEnabledToggleSet, Xt as getContextWindow, Y as listProjectFiles, Z as DEFAULT_SETTINGS, _ as discoverProjectSkills, _t as lastContextSizeFromTurns, a as ThemeProvider, at as resolveTheme, b as writeSessionExport, c as useSurfaces, d as finalizeStreamingMarkdown, dt as ConfigProvider, et as SettingsProvider, f as finalizeStreamingMarkdownForOwner, ft as useConfig, g as defaultSkillScanPaths, gt as eventsFromTurns, h as buildSkillsConfig, ht as deriveSessionTitle, i as turnAsText, it as resolveChipColor, j as suggestSafelistEntry, jt as createFilesCompletionProvider, kt as uniqueSkillNamesFromReferences, m as useStreamBuffer, n as deleteTurnSafely, nn as piIdOf, o as useColors, p as turnContextSize, pt as resolveConfig, q as fmtTokens, r as truncateTurnsAt, s as useSelectStyle, tt as useSettings, u as useTheme, vt as listSessionMeta, wt as toolCallPreview, x as SafeModeProvider, xt as selectableTurnIds, z as buildMcpServers } from "./turn-operations-DZ3TrljX.js";
 import { Buffer } from "node:buffer";
 import { createContext, createElement, memo, useCallback, useContext, useEffect, useMemo, useRef, useState } from "react";
 import { RGBA, SyntaxStyle, addDefaultParsers, createCliRenderer, defaultTextareaKeyBindings, getTreeSitterClient } from "@opentui/core";
@@ -108,7 +108,7 @@ function Modal({ title, bottomTitle, onClose, disableEscape = false, children, m
 //#endregion
 //#region src/tui/agent-picker.tsx
 /** Cap the scroll window — a long custom registry shouldn't push the modal off-screen. */
-const VISIBLE_ROW_CAP$1 = 10;
+const VISIBLE_ROW_CAP = 10;
 /**
 * Modal that lists the registered {@link AgentProfile}s and lets the user
 * pick one. Rows show: `● selected · label  description`.
@@ -130,8 +130,8 @@ function AgentPickerModal({ agents, currentAgentId, onPick }) {
 		description: p.description,
 		value: p.id
 	})), [profiles, currentAgentId]);
-	if (profiles.length === 0) return /* @__PURE__ */ jsx(EmptyState$2, {});
-	const visibleRows = Math.min(options.length, VISIBLE_ROW_CAP$1);
+	if (profiles.length === 0) return /* @__PURE__ */ jsx(EmptyState$1, {});
+	const visibleRows = Math.min(options.length, VISIBLE_ROW_CAP);
 	const currentMissing = initialIndex < 0;
 	const safeIndex = currentMissing ? 0 : initialIndex;
 	return /* @__PURE__ */ jsxs(Modal, {
@@ -176,7 +176,7 @@ function AgentPickerModal({ agents, currentAgentId, onPick }) {
 		]
 	});
 }
-function EmptyState$2() {
+function EmptyState$1() {
 	const COLOR = useColors();
 	return /* @__PURE__ */ jsxs(Modal, {
 		title: "select agent",
@@ -733,7 +733,7 @@ function Transcript({ events, settings, selectedTurnId = null }) {
 		});
 		return () => cancelAnimationFrame(handle);
 	}, [selectedTurnId, anchors]);
-	if (items.length === 0) return /* @__PURE__ */ jsx(EmptyState$1, {});
+	if (items.length === 0) return /* @__PURE__ */ jsx(EmptyState, {});
 	return /* @__PURE__ */ jsx("scrollbox", {
 		ref: scrollboxRef,
 		focusable: false,
@@ -905,7 +905,7 @@ function SubagentBlock({ events, previous, selectedTurnId = null, anchorIds }) {
 		}, i))
 	});
 }
-function EmptyState$1() {
+function EmptyState() {
 	return /* @__PURE__ */ jsx("box", {
 		style: {
 			flexGrow: 1,
@@ -1216,12 +1216,6 @@ function ToolResultBlock({ text, indent }) {
 }
 //#endregion
 //#region src/tui/effort-picker.tsx
-/**
-* Reasoning effort options surfaced in the picker. Mirrors {@link ThinkingLevel}
-* minus `'adaptive'` (Anthropic-only — opt in via {@link EffortPickerModal}'s
-* `supportsAdaptive` flag rather than confusing OpenAI / OpenRouter users with
-* a level their model silently treats as `'off'`).
-*/
 const BASE_LEVELS = [
 	{
 		id: "off",
@@ -1248,58 +1242,162 @@ const ADAPTIVE_LEVEL = {
 	id: "adaptive",
 	description: "model decides per-turn (Anthropic)"
 };
-/**
-* Modal that lets the user pick a reasoning effort for the active model.
-* Only surfaced for models whose registry entry reports
-* `reasoning: true` — see `modelSupportsReasoning`.
-*
-* `'adaptive'` is Anthropic-only; pass `supportsAdaptive` to surface it.
-*/
 function EffortPickerModal({ current, supportsAdaptive, onPick }) {
 	const COLOR = useColors();
-	const SELECT_THEME = useSelectStyle();
-	const levels = useMemo(() => supportsAdaptive ? [...BASE_LEVELS, ADAPTIVE_LEVEL] : BASE_LEVELS, [supportsAdaptive]);
-	const options = useMemo(() => levels.map((l) => ({
-		name: `${l.id === current ? "● " : "  "}${l.id}`,
-		description: l.description,
-		value: l.id
-	})), [levels, current]);
-	const initialIndex = useMemo(() => {
+	const SURFACE = useSurfaces();
+	const inputRef = useRef(null);
+	const [query, setQuery] = useState("");
+	const levels = useMemo(() => {
+		return (supportsAdaptive ? [...BASE_LEVELS, ADAPTIVE_LEVEL] : BASE_LEVELS).map((l) => ({
+			...l,
+			searchCorpus: `${l.id} ${l.description}`.toLowerCase()
+		}));
+	}, [supportsAdaptive]);
+	const filtered = useMemo(() => {
+		const trimmed = query.trim().toLowerCase();
+		if (!trimmed) return levels;
+		const terms = trimmed.split(/\s+/);
+		return levels.filter((l) => terms.every((t) => l.searchCorpus.includes(t)));
+	}, [levels, query]);
+	const [selectedIdx, setSelectedIdx] = useState(() => {
 		const idx = levels.findIndex((l) => l.id === current);
-		return idx < 0 ? levels.findIndex((l) => l.id === "medium") : idx;
-	}, [levels, current]);
+		if (idx >= 0) return idx;
+		const fallback = levels.findIndex((l) => l.id === "medium");
+		return fallback < 0 ? 0 : fallback;
+	});
+	const handleQueryChange = useCallback((next) => {
+		setQuery(next);
+		setSelectedIdx(0);
+	}, []);
+	const safeIndex = filtered.length === 0 ? 0 : Math.min(selectedIdx, filtered.length - 1);
+	const commit = () => {
+		const row = filtered[safeIndex];
+		if (row) onPick(row.id);
+	};
+	useEffect(() => {
+		inputRef.current?.focus();
+	}, []);
+	useKeyboard((key) => {
+		if (key.name === "up") {
+			setSelectedIdx((i) => Math.max(0, i - 1));
+			return;
+		}
+		if (key.name === "down") {
+			setSelectedIdx((i) => Math.min(filtered.length - 1, i + 1));
+			return;
+		}
+		if (key.name === "return") commit();
+	});
 	return /* @__PURE__ */ jsxs(Modal, {
 		title: "select reasoning effort",
-		children: [/* @__PURE__ */ jsx("select", {
-			...SELECT_THEME,
-			focused: true,
-			options,
-			wrapSelection: true,
-			selectedIndex: Math.max(0, initialIndex),
-			style: { height: levels.length },
-			onSelect: (_idx, option) => {
-				if (option) onPick(option.value);
-			}
-		}), /* @__PURE__ */ jsxs("text", {
-			fg: COLOR.mute,
+		maxWidth: 80,
+		children: [
+			/* @__PURE__ */ jsx("box", {
+				style: {
+					border: true,
+					borderColor: COLOR.borderActive,
+					paddingLeft: 1,
+					paddingRight: 1,
+					height: 3
+				},
+				children: /* @__PURE__ */ jsx("input", {
+					ref: inputRef,
+					focused: true,
+					placeholder: "search effort levels…",
+					onInput: handleQueryChange,
+					onSubmit: () => {},
+					style: { flexGrow: 1 }
+				})
+			}),
+			/* @__PURE__ */ jsx("box", {
+				style: {
+					flexDirection: "column",
+					flexShrink: 0
+				},
+				children: filtered.length === 0 ? /* @__PURE__ */ jsxs("text", {
+					fg: COLOR.dim,
+					children: [/* @__PURE__ */ jsx("span", {
+						fg: COLOR.mute,
+						children: "no levels match "
+					}), /* @__PURE__ */ jsx("span", {
+						fg: COLOR.warn,
+						children: query.trim()
+					})]
+				}) : filtered.map((level, i) => /* @__PURE__ */ jsx(EffortRow, {
+					level,
+					isCurrent: level.id === current,
+					isFocused: i === safeIndex,
+					highlightBg: SURFACE.selection
+				}, level.id))
+			}),
+			/* @__PURE__ */ jsxs("text", {
+				fg: COLOR.dim,
+				children: [
+					/* @__PURE__ */ jsx("span", {
+						fg: COLOR.warn,
+						children: "↑↓"
+					}),
+					" navigate · ",
+					/* @__PURE__ */ jsx("span", {
+						fg: COLOR.warn,
+						children: "↵"
+					}),
+					" select · ",
+					/* @__PURE__ */ jsx("span", {
+						fg: COLOR.warn,
+						children: "esc"
+					}),
+					" close · ",
+					/* @__PURE__ */ jsx("span", {
+						fg: COLOR.mute,
+						children: `${filtered.length} / ${levels.length} level${levels.length === 1 ? "" : "s"}`
+					})
+				]
+			})
+		]
+	});
+}
+/**
+* Single row in the picker. Mirrors `ModelRow` in `model-picker.tsx`:
+* `●` marker for the current pick, single-space middle-dot separators,
+* focused row gets the `surfaces.selection` background lift.
+*/
+function EffortRow({ level, isCurrent, isFocused, highlightBg }) {
+	const COLOR = useColors();
+	const marker = isCurrent ? "●" : " ";
+	return /* @__PURE__ */ jsx("box", {
+		style: {
+			height: 1,
+			paddingLeft: 1,
+			paddingRight: 1,
+			flexShrink: 0,
+			backgroundColor: isFocused ? highlightBg : void 0
+		},
+		children: /* @__PURE__ */ jsxs("text", {
+			wrapMode: "none",
 			children: [
 				/* @__PURE__ */ jsx("span", {
-					fg: COLOR.warn,
-					children: "↑↓"
+					fg: isCurrent ? COLOR.brand : COLOR.mute,
+					children: marker
 				}),
-				" navigate · ",
 				/* @__PURE__ */ jsx("span", {
-					fg: COLOR.warn,
-					children: "↵"
+					fg: COLOR.mute,
+					children: " "
 				}),
-				" select · ",
 				/* @__PURE__ */ jsx("span", {
-					fg: COLOR.warn,
-					children: "esc"
+					fg: isFocused ? COLOR.brand : COLOR.dim,
+					children: level.id
 				}),
-				" close"
+				/* @__PURE__ */ jsx("span", {
+					fg: COLOR.mute,
+					children: " · "
+				}),
+				/* @__PURE__ */ jsx("span", {
+					fg: COLOR.mute,
+					children: level.description
+				})
 			]
-		})]
+		})
 	});
 }
 //#endregion
@@ -1465,50 +1563,134 @@ function McpsSettingsModal({ catalog }) {
 }
 //#endregion
 //#region src/tui/model-picker.tsx
-/** Cap the visible scroll window so a 30-model list doesn't push the modal off-screen. */
-const VISIBLE_ROW_CAP = 12;
 /**
-* Modal that lists the available models for the current provider and lets
-* the user pick one. Options come from the active `ProviderDescriptor` —
-* either its declared `models` list or, when absent, pi-ai's built-in
-* registry looked up via `piProviderId`.
+* Cross-provider, searchable model picker.
+*
+* The picker unions every available provider's models into one flat
+* catalog, lets the user filter with a typed query, and returns both
+* the chosen provider and model id on commit. Pick a model from a
+* different provider than the current one and the caller is expected
+* to swap the active `ProviderAuth` + rebuild the agent — see
+* `app.tsx`'s `onPickModel` for the canonical wiring.
 *
-* Each row shows: `● selected · name (ctx N · reasoning · vision)`.
+* Geometry:
+*   - Top: single-row search input. The input owns focus so the user
+*     can type immediately; ↑/↓/↵/⎋ are intercepted before the input's
+*     text handler sees them so navigation works without losing focus.
+*   - Middle: windowed list of catalog rows around the current
+*     selection. Each row shows the model name (or id) in brand color,
+*     the provider label in dim, and a compact capability suffix
+*     (`ctx 200k · reasoning · vision`).
+*   - Bottom: shortcut hint row.
+*
+* Empty states:
+*   - No available providers → "no providers configured" notice.
+*   - Query has no matches → "no matches" row, keep the search input
+*     live so the user can backspace out.
 */
-function ModelPickerModal({ models, currentModelId, onPick }) {
+/** Visible rows in the windowed list. Keeps the modal a stable size on long catalogs. */
+const VISIBLE_ROWS = 10;
+function ModelPickerModal({ providers, modelsFor, current, onPick }) {
 	const COLOR = useColors();
-	const SELECT_THEME = useSelectStyle();
-	const initialIndex = useMemo(() => models.findIndex((m) => m.id === currentModelId), [models, currentModelId]);
-	const options = useMemo(() => models.map((m) => ({
-		name: `${m.id === currentModelId ? "● " : "  "}${m.name ?? m.id}`,
-		description: describeModel(m),
-		value: m.id
-	})), [models, currentModelId]);
-	if (models.length === 0) return /* @__PURE__ */ jsx(EmptyState, {});
-	const visibleRows = Math.min(options.length, VISIBLE_ROW_CAP);
-	const currentMissing = initialIndex < 0;
-	const safeIndex = currentMissing ? 0 : initialIndex;
+	const SURFACE = useSurfaces();
+	const inputRef = useRef(null);
+	const [query, setQuery] = useState("");
+	useEffect(() => {
+		inputRef.current?.focus();
+	}, []);
+	const catalog = useMemo(() => buildModelCatalog({
+		providers,
+		modelsFor,
+		current
+	}), [
+		providers,
+		modelsFor,
+		current
+	]);
+	const filtered = useMemo(() => filterModelCatalog(catalog, query), [catalog, query]);
+	const [selectedIdx, setSelectedIdx] = useState(() => Math.max(0, indexOfEntry(catalog, current)));
+	const handleQueryChange = useCallback((next) => {
+		setQuery(next);
+		setSelectedIdx(0);
+	}, []);
+	const safeIndex = filtered.length === 0 ? 0 : Math.min(selectedIdx, filtered.length - 1);
+	const commit = () => {
+		const row = filtered[safeIndex];
+		if (row) onPick({
+			providerKey: row.providerKey,
+			modelId: row.model.id
+		});
+	};
+	const viewport = useMemo(() => {
+		if (filtered.length <= VISIBLE_ROWS) return {
+			start: 0,
+			slice: filtered
+		};
+		const half = Math.floor(VISIBLE_ROWS / 2);
+		let start = Math.max(0, safeIndex - half);
+		if (start + VISIBLE_ROWS > filtered.length) start = filtered.length - VISIBLE_ROWS;
+		return {
+			start,
+			slice: filtered.slice(start, start + VISIBLE_ROWS)
+		};
+	}, [filtered, safeIndex]);
+	useKeyboard((key) => {
+		if (key.name === "up") {
+			setSelectedIdx((i) => Math.max(0, i - 1));
+			return;
+		}
+		if (key.name === "down") {
+			setSelectedIdx((i) => Math.min(filtered.length - 1, i + 1));
+			return;
+		}
+		if (key.name === "return") commit();
+	});
+	if (providers.length === 0) return /* @__PURE__ */ jsx(EmptyProvidersState, {});
 	return /* @__PURE__ */ jsxs(Modal, {
 		title: "select model",
+		maxWidth: 100,
 		children: [
-			currentMissing && /* @__PURE__ */ jsx("text", {
-				fg: COLOR.warn,
-				children: `Current model "${currentModelId}" is not in this registry — pick one below to switch.`
+			/* @__PURE__ */ jsx("box", {
+				style: {
+					border: true,
+					borderColor: COLOR.borderActive,
+					paddingLeft: 1,
+					paddingRight: 1,
+					height: 3
+				},
+				children: /* @__PURE__ */ jsx("input", {
+					ref: inputRef,
+					focused: true,
+					placeholder: "search models — provider, name, capability…",
+					onInput: handleQueryChange,
+					onSubmit: () => {},
+					style: { flexGrow: 1 }
+				})
 			}),
-			/* @__PURE__ */ jsx("select", {
-				...SELECT_THEME,
-				focused: true,
-				options,
-				wrapSelection: true,
-				selectedIndex: safeIndex,
-				showScrollIndicator: options.length > visibleRows,
-				style: { height: visibleRows },
-				onSelect: (_idx, option) => {
-					if (option) onPick(option.value);
-				}
+			/* @__PURE__ */ jsx("box", {
+				style: {
+					flexDirection: "column",
+					height: VISIBLE_ROWS,
+					flexShrink: 0
+				},
+				children: filtered.length === 0 ? /* @__PURE__ */ jsxs("text", {
+					fg: COLOR.dim,
+					children: [/* @__PURE__ */ jsx("span", {
+						fg: COLOR.mute,
+						children: "no models match "
+					}), /* @__PURE__ */ jsx("span", {
+						fg: COLOR.warn,
+						children: query.trim()
+					})]
+				}) : viewport.slice.map((entry, i) => /* @__PURE__ */ jsx(ModelRow, {
+					entry,
+					isCurrent: entry.providerKey === current.providerKey && entry.model.id === current.modelId,
+					isFocused: viewport.start + i === safeIndex,
+					highlightBg: SURFACE.selection
+				}, `${entry.providerKey}:${entry.model.id}`))
 			}),
 			/* @__PURE__ */ jsxs("text", {
-				fg: COLOR.mute,
+				fg: COLOR.dim,
 				children: [
 					/* @__PURE__ */ jsx("span", {
 						fg: COLOR.warn,
@@ -1524,38 +1706,94 @@ function ModelPickerModal({ models, currentModelId, onPick }) {
 						fg: COLOR.warn,
 						children: "esc"
 					}),
-					" close"
+					" close · ",
+					/* @__PURE__ */ jsx("span", {
+						fg: COLOR.mute,
+						children: `${filtered.length} / ${catalog.length} model${catalog.length === 1 ? "" : "s"}`
+					})
 				]
 			})
 		]
 	});
 }
-function EmptyState() {
+/**
+* Single row in the picker. Renders the model name in `brand`, the
+* provider tag in `dim`, and the capability suffix in `mute`. The
+* focused row gets a subtle selection background (same surface as
+* select-turn mode in the transcript) so it pops without a separate
+* marker glyph competing with the `●` "current" indicator.
+*/
+function ModelRow({ entry, isCurrent, isFocused, highlightBg }) {
+	const COLOR = useColors();
+	const marker = isCurrent ? "●" : " ";
+	return /* @__PURE__ */ jsx("box", {
+		style: {
+			height: 1,
+			paddingLeft: 1,
+			paddingRight: 1,
+			flexShrink: 0,
+			backgroundColor: isFocused ? highlightBg : void 0
+		},
+		children: /* @__PURE__ */ jsxs("text", {
+			wrapMode: "none",
+			children: [
+				/* @__PURE__ */ jsx("span", {
+					fg: isCurrent ? COLOR.brand : COLOR.mute,
+					children: marker
+				}),
+				/* @__PURE__ */ jsx("span", {
+					fg: COLOR.mute,
+					children: " "
+				}),
+				/* @__PURE__ */ jsx("span", {
+					fg: isFocused ? COLOR.brand : COLOR.dim,
+					children: entry.model.name ?? entry.model.id
+				}),
+				/* @__PURE__ */ jsx("span", {
+					fg: COLOR.mute,
+					children: " · "
+				}),
+				/* @__PURE__ */ jsx("span", {
+					fg: COLOR.model,
+					children: entry.providerLabel
+				}),
+				/* @__PURE__ */ jsx("span", {
+					fg: COLOR.mute,
+					children: " · "
+				}),
+				/* @__PURE__ */ jsx("span", {
+					fg: COLOR.mute,
+					children: describeModel(entry.model)
+				})
+			]
+		})
+	});
+}
+function EmptyProvidersState() {
 	const COLOR = useColors();
 	return /* @__PURE__ */ jsxs(Modal, {
 		title: "select model",
 		children: [/* @__PURE__ */ jsx("text", {
 			fg: COLOR.dim,
-			children: "No models available for this provider."
+			children: "No authed providers — configure one via"
 		}), /* @__PURE__ */ jsxs("text", {
-			fg: COLOR.mute,
+			fg: COLOR.dim,
 			children: [
-				"Set",
 				/* @__PURE__ */ jsx("span", {
 					fg: COLOR.model,
-					children: " models "
+					children: " settings → re-configure providers"
 				}),
-				"on the provider descriptor (or a",
+				" or ",
 				/* @__PURE__ */ jsx("span", {
 					fg: COLOR.model,
-					children: " piProviderId "
+					children: "esc → sessions → settings"
 				}),
-				"that pi-ai recognizes) to populate this list."
+				" first."
 			]
 		})]
 	});
 }
-/** "ctx 200k · reasoning · vision" — compact per-model description. */
+/** "ctx 200k · reasoning · vision" — compact capability blurb. */
 function describeModel(m) {
 	const parts = [`ctx ${fmtTokens(m.contextWindow)}`];
 	if (m.reasoning) parts.push("reasoning");
@@ -4131,6 +4369,7 @@ function AppShell() {
 	const SURFACE = useSurfaces();
 	const queue = useSafeModeQueue();
 	const { requestApproval, resolveHead, denyAll } = useSafeModeActions();
+	const pendingApproval = queue[0] ?? null;
 	const { providers: providerRegistry, agents: agentRegistry, initialAgentId, store, stateStore, modelsFor, resumeProvider, initialPicked, initialState } = config;
 	const lastResumedSessionId = initialState.lastSessionId;
 	const dataDir = config.paths.userDir;
@@ -4497,6 +4736,13 @@ function AppShell() {
 		settings.showAllProjects,
 		sessionProjectRoot
 	]);
+	const [availableProviders, setAvailableProviders] = useState([]);
+	const refreshAvailableProviders = useCallback(() => {
+		setAvailableProviders(detectAuth(config.paths.userDir, providerRegistry).filter((p) => p.available));
+	}, [config.paths.userDir, providerRegistry]);
+	useEffect(() => {
+		refreshAvailableProviders();
+	}, [refreshAvailableProviders]);
 	const onPickProvider = useCallback(async (p) => {
 		const next = makePicked(p);
 		if (!next) return;
@@ -4505,13 +4751,15 @@ function AppShell() {
 			...stateStore.load(),
 			lastProvider: p.key
 		});
+		refreshAvailableProviders();
 		if ((await refreshSessions()).length === 0) await activateSession(null, p.key);
 		else setScreen("sessions");
 	}, [
 		refreshSessions,
 		activateSession,
 		makePicked,
-		stateStore
+		stateStore,
+		refreshAvailableProviders
 	]);
 	const onCreateSession = useCallback(async () => {
 		if (picked) await activateSession(null, picked.provider.key);
@@ -4532,33 +4780,63 @@ function AppShell() {
 		denyAll();
 		agentRef.current?.abort();
 	}, [denyAll]);
-	const onPickModel = useCallback((modelId) => {
-		setPicked((prev) => {
-			if (!prev) return prev;
-			const descriptor = providerRegistry[prev.provider.key];
-			const prior = stateStore.load();
-			stateStore.save({
-				...prior,
-				lastModelByProvider: {
-					...prior.lastModelByProvider,
-					[prev.provider.key]: modelId
-				}
-			});
-			const nextEffort = descriptor ? effortForModel(descriptor, modelId, prior.lastEffortByModel) : void 0;
-			return nextEffort ? {
-				...prev,
-				model: modelId,
-				effort: nextEffort
-			} : {
-				provider: prev.provider,
-				model: modelId
-			};
+	/**
+	* Pick a `{ providerKey, modelId }` tuple from the cross-provider
+	* model picker. Two branches:
+	*
+	*   - **Same provider, different model** — update `picked.model` +
+	*     remember it in `lastModelByProvider`. The active agent keeps
+	*     running; `agent.run({ model })` accepts the model per-call so
+	*     no session rebuild is needed.
+	*   - **Different provider** — swap the active `ProviderAuth`,
+	*     persist BOTH `lastProvider` + `lastModelByProvider`, then
+	*     re-activate the current session against the new provider's
+	*     factory. The session id (and conversation history) is
+	*     preserved; only the bound agent + provider instance change.
+	*
+	* Either branch re-resolves the reasoning effort: a non-reasoning
+	* model loses its `effort`, a reasoning model gets the remembered
+	* per-model value (falling back to a sensible default).
+	*/
+	const onPickModel = useCallback(async (next) => {
+		const nextProvider = availableProviders.find((p) => p.key === next.providerKey);
+		if (!nextProvider) {
+			debugLog("onPickModel: unknown provider key", next.providerKey);
+			modal.close();
+			return;
+		}
+		const descriptor = providerRegistry[nextProvider.key];
+		const prior = stateStore.load();
+		const providerChanged = picked?.provider.key !== nextProvider.key;
+		stateStore.save({
+			...prior,
+			...providerChanged ? { lastProvider: nextProvider.key } : {},
+			lastModelByProvider: {
+				...prior.lastModelByProvider,
+				[nextProvider.key]: next.modelId
+			}
+		});
+		const nextEffort = descriptor ? effortForModel(descriptor, next.modelId, prior.lastEffortByModel) : void 0;
+		setPicked(nextEffort ? {
+			provider: nextProvider,
+			model: next.modelId,
+			effort: nextEffort
+		} : {
+			provider: nextProvider,
+			model: next.modelId
 		});
 		modal.close();
+		if (providerChanged && currentSession && !busy && !pendingApproval) await activateSession(currentSession.id, nextProvider.key);
 	}, [
-		modal,
+		availableProviders,
+		providerRegistry,
 		stateStore,
-		providerRegistry
+		modal,
+		picked,
+		currentSession,
+		busy,
+		pendingApproval,
+		activateSession
 	]);
 	const onPickEffort = useCallback((effort) => {
 		setPicked((prev) => {
@@ -4661,7 +4939,6 @@ function AppShell() {
 			setBusy(false);
 		}
 	}, [picked, stream]);
-	const pendingApproval = queue[0] ?? null;
 	const onReauth = useMemo(() => {
 		if (busy || pendingApproval) return void 0;
 		return () => {
@@ -4932,7 +5209,7 @@ function AppShell() {
 			}
 			return;
 		}
-		if (key.ctrl && key.name === "," && screen !== "auth") {
+		if (key.ctrl && key.name === "o" && screen !== "auth") {
 			modal.open(/* @__PURE__ */ jsx(SettingsModal, { actions: {
 				onReauth,
 				onOpenSkills: onOpenSkillsSettings,
@@ -4952,8 +5229,12 @@ function AppShell() {
 		}
 		if (key.ctrl && key.name === "m" && screen === "chat" && picked && !busy) {
 			modal.open(/* @__PURE__ */ jsx(ModelPickerModal, {
-				models: modelsFor(picked.provider.key),
-				currentModelId: picked.model,
+				providers: availableProviders,
+				modelsFor,
+				current: {
+					providerKey: picked.provider.key,
+					modelId: picked.model
+				},
 				onPick: onPickModel
 			}));
 			return;
@@ -5159,7 +5440,7 @@ function buildHints({ screen, busy, pending, currentSession, hasMultipleAgents,
 			label: "session"
 		},
 		{
-			key: "ctrl+,",
+			key: "ctrl+o",
 			label: "settings"
 		},
 		{
@@ -5190,7 +5471,7 @@ function buildHints({ screen, busy, pending, currentSession, hasMultipleAgents,
 			label: "session"
 		}] : [],
 		{
-			key: "ctrl+,",
+			key: "ctrl+o",
 			label: "settings"
 		},
 		{