zidane 6.0.1 → 6.1.1

package/dist/tui.js

@@ -1,24 +1,24 @@
-import { $ as useMcpAuthState, $n as eventsFromTurns, $t as useUpdateCheck, A as runOAuthLogin, Bt as createDiscoverySlot, Cn as TODO_STATUS_GLYPHS, Ct as SETTINGS_CHOICES, D as formatPathForCwd, Dt as clampFps, Et as SettingsProvider, G as buildVisibleMcpRows, Gn as buildPlanSystem, Gt as useConfig, Ht as useDiscovery, J as createFileMcpCredentialStore, Jn as createChatTurnsReadTool, Jt as useCompletion, K as indexOfServerRow, Kn as envSection, Kt as resolveConfig, L as loadMcpToolsCache, M as buildMcpServers, Mt as resolveTheme, Nn as useActiveTodos, O as fetchOAuthRedirect, Ot as useSettings, P as discoverProjectMcps, Q as useMcpAuthDispatch, Qn as deriveSessionTitle, Qt as buildUpdateHint, St as SETTINGS_CATEGORIES, T as suggestSafelistEntries, Tt as SETTINGS_TOGGLES, U as useMcpToolToggleMap, Ut as useDiscoveryOptional, V as subscribeMcpToolsCache, Vt as DiscoveryProvider, Wn as buildBuildSystem, Wt as ConfigProvider, Xn as compactSummaryEvent, Yt as tryOpenBrowser, Z as McpAuthProvider, Zt as bootTick, _ as useSafeModeQueue, _n as accentColor, _t as buildHints, a as useSurfaces, ar as serverToolResultSummary, at as buildResumedToolResultsTurn, b as getSafelist, bt as useEnabledToggleSet, c as useStreamBuffer, cn as chatAutoCompactBehavior, ct as makeRequestInteraction, d as discoverProjectSkills, dr as updateToolEventOutcomes, dt as useInteractionsActions, er as lastContextSizeFromTurns, et as getMcpAuthStatus, ft as useInteractionsQueue, g as useSafeModeActions, gt as truncateTrailing, h as SafeModeProvider, ht as hintsLength, i as useSelectStyle, it as PRESENT_PLAN_TOOL, j as supportsOAuth, jt as resolveChipColor, k as oauthUsesManualCodePaste, l as buildSkillsConfig, ln as discoverAgentsMd, lr as toolCallPreview, lt as pendingInteractionsFromTurns, m as writeSessionExport, mt as clipHintsToWidth, n as ThemeProvider, nr as loadState, nt as ASK_USER_TOOL, or as stripSpawnTokensLine, ot as createInteractionTools, pt as EMPTY_HINTS, q as parentServerName, qn as chatReferenceTokensForPrompt, qt as resolveStoragePaths, r as useColors, rr as marginTopFor, rt as InteractionsProvider, s as useTheme, sr as sumRunCosts, t as computeTurnAnchors, tr as listSessionMeta, u as defaultSkillScanPaths, ur as toolResultText, wt as SETTINGS_INPUTS, x as isOnSafelist, xt as DEFAULT_SETTINGS, y as addToSafelist, yt as listProjectFiles, z as refreshMcpToolsCatalog } from "./transcript-anchors-DSRPWjiH.js";
-import { $ as filterExtensionRegistry, B as installExtensionFromSpec, Ft as formatBindingForDisplay, G as updateInstalledExtension, It as groupBindings, J as discoverAndBuildExtensionRegistry, Jt as inlineLoadedExtension, K as createExtensionHud, L as createExtensionPromptBridge, Lt as keybindingsPath, M as summaryToTurn, Nt as KEYBINDING_KEY_COL_WIDTH, Pt as ensureKeybindingsFile, Q as disposeExtensionRegistry, R as ExtensionInstallError, Rt as matchesBinding, Ut as resolveExtensionKeybindings, W as removeInstalledExtension, Xt as parseExtensionScanPathEnv, Z as composeExtensionPreset, _ as selectFilesFromSession, cn as effectiveContextWindow, en as coerceExtensionConfigInput, f as resolveMcpWarningsDir, h as buildPostCompactAttachments, in as resolveExtensionConfigValue, m as resolveTasksDir, nt as createExtensionHostRuntimeBridge, o as applyCompactSummaryCutoff, p as resolvePersistDir, q as registerExtensionHostModules, sn as OUTPUT_RESERVE_TOKENS, st as basic_default, t as createAgent, tt as partitionExtensionCatalog, u as cleanupPersistedSession, y as compactConversation } from "./agent-DkSmGkDM.js";
-import { a as formatTaskStatus, c as shortId, i as formatDuration, n as compactPath, o as formatTaskSummary, r as fmtTokens, s as previewLine, t as ageString } from "./format-BNOXpl-1.js";
-import { n as createProcessContext } from "./contexts-Vone3qQQ.js";
+import { $ as useMcpAuthState, $n as buildPlanSystem, $t as restoreChainFallbacks, A as runOAuthLogin, Bt as createDiscoverySlot, Ct as SETTINGS_CHOICES, D as formatPathForCwd, Dt as clampFps, Et as SettingsProvider, G as buildVisibleMcpRows, Gt as useConfig, Ht as useDiscovery, J as createFileMcpCredentialStore, Jt as buildRunModel, K as indexOfServerRow, Kt as resolveConfig, L as loadMcpToolsCache, M as buildMcpServers, Mt as resolveTheme, O as fetchOAuthRedirect, Ot as useSettings, P as discoverProjectMcps, Q as useMcpAuthDispatch, Qn as buildBuildSystem, Qt as providerKeySetChanged, R as mcpToolsCachePath, St as SETTINGS_CATEGORIES, T as suggestSafelistEntries, Tn as accentColor, Tt as SETTINGS_TOGGLES, U as useMcpToolToggleMap, Ut as useDiscoveryOptional, V as subscribeMcpToolsCache, Vn as useActiveTodos, Vt as DiscoveryProvider, Wt as ConfigProvider, Xt as chainsEqual, Yt as chainPositionOf, Z as McpAuthProvider, Zt as filterChainFallbacks, _ as useSafeModeQueue, _n as discoverAgentsMd, _r as toolCallPreview, _t as buildHints, a as useSurfaces, an as bootTick, at as buildResumedToolResultsTurn, b as getSafelist, br as usageByModel, bt as useEnabledToggleSet, c as useStreamBuffer, cr as lastContextSizeFromTurns, ct as makeRequestInteraction, d as discoverProjectSkills, dr as marginTopFor, dt as useInteractionsActions, er as envSection, et as getMcpAuthStatus, ft as useInteractionsQueue, g as useSafeModeActions, gn as chatAutoCompactBehavior, gt as truncateTrailing, h as SafeModeProvider, hr as sumRunCosts, ht as hintsLength, i as useSelectStyle, ir as compactSummaryEvent, it as PRESENT_PLAN_TOOL, j as supportsOAuth, jn as TODO_STATUS_GLYPHS, jt as resolveChipColor, k as oauthUsesManualCodePaste, l as buildSkillsConfig, lr as listSessionMeta, lt as pendingInteractionsFromTurns, m as writeSessionExport, mr as stripSpawnTokensLine, mt as clipHintsToWidth, n as ThemeProvider, nn as useCompletion, nr as createChatTurnsReadTool, nt as ASK_USER_TOOL, on as buildUpdateHint, or as deriveSessionTitle, ot as createInteractionTools, pr as serverToolResultSummary, pt as EMPTY_HINTS, q as parentServerName, qt as resolveStoragePaths, r as useColors, rn as tryOpenBrowser, rt as InteractionsProvider, s as useTheme, sn as useUpdateCheck, sr as eventsFromTurns, t as computeTurnAnchors, tn as toggleChainEntry, tr as chatReferenceTokensForPrompt, u as defaultSkillScanPaths, ur as loadState, vr as toolResultText, wt as SETTINGS_INPUTS, x as isOnSafelist, xt as DEFAULT_SETTINGS, y as addToSafelist, yr as updateToolEventOutcomes, yt as listProjectFiles, z as refreshMcpToolsCatalog } from "./transcript-anchors-CBaghfwl.js";
+import { $ as composeExtensionPreset, $t as inlineLoadedExtension, B as ExtensionInstallError, Bt as formatBindingForDisplay, H as installExtensionFromSpec, Ht as keybindingsPath, J as createExtensionHud, Jt as resolveExtensionKeybindings, K as removeInstalledExtension, P as summaryToTurn, Rt as KEYBINDING_KEY_COL_WIDTH, Tt as createModelSearchTool, Ut as matchesBinding, Vt as groupBindings, X as discoverAndBuildExtensionRegistry, Y as registerExtensionHostModules, _ as buildPostCompactAttachments, an as coerceExtensionConfigInput, c as applyCompactSummaryCutoff, et as disposeExtensionRegistry, f as cleanupPersistedSession, fn as OUTPUT_RESERVE_TOKENS, g as resolveTasksDir, h as resolvePersistDir, ht as isSpawnTool, it as createExtensionHostRuntimeBridge, ln as resolveExtensionConfigValue, lt as basic_default, m as resolveMcpWarningsDir, nn as scanExtensionDirectories, pn as effectiveContextWindow, q as updateInstalledExtension, rt as partitionExtensionCatalog, t as createAgent, tn as parseExtensionScanPathEnv, tt as filterExtensionRegistry, x as compactConversation, y as selectFilesFromSession, z as createExtensionPromptBridge, zt as ensureKeybindingsFile } from "./agent-Bq32ZJSo.js";
+import { a as formatDuration, c as previewLine, i as fmtTokens, l as shortId, n as compactPath, o as formatTaskStatus, r as fmtCost, s as formatTaskSummary, t as ageString } from "./format-BF745pLL.js";
+import { n as createProcessContext } from "./contexts-BIbcfBFH.js";
 import { l as errorMessage } from "./errors-DJUxZg9b.js";
-import { M as findGitRoot, j as projectUserPaths } from "./resolve-Cr8JSL_O.js";
+import { M as findGitRoot, j as projectUserPaths } from "./resolve-CC8Lmwcj.js";
 import { a as createRingBufferSink, i as createLoggingHooks, l as logFileTimestamp, n as createFileSink, o as fanoutSink, r as createLogger, s as formatLogLine, t as consoleSink } from "./logger-DBX9uYOw.js";
 import { i as sniffImageMediaType } from "./media-sniff-Bn76JxAu.js";
 import { r as formatTokenUsage, t as effectiveInputFromTurn } from "./stats-DAKBEKjc.js";
 import { replaceDynamicSection } from "./prompt.js";
-import { a as getExtensionSessionState, i as demoteStaleRunningStatus, o as loadSession, s as setExtensionSessionState, t as createSession } from "./session-CsdDIPY8.js";
+import { a as getExtensionSessionState, i as demoteStaleRunningStatus, o as loadSession, s as setExtensionSessionState, t as createSession } from "./session-D7JSEMME.js";
 import { o as withTimeout } from "./timeout-BDetbuN6.js";
 import { n as connectMcpServers, u as McpOAuthProvider } from "./mcp-CcvuVXB9.js";
 import { c as commandBlockToEvent, d as executeCommand, f as parseCommandInvocation, i as shouldAutoGenerateTitle, l as commandBlocksToContent, r as generateSessionTitle, t as generateStructuredData } from "./generate-data-WL_yGVL6.js";
 import { s as resolveCompletionSubmit } from "./completion-core-CXYSVhZo.js";
-import { i as installSkillFromSpec, r as SkillInstallError } from "./skills-Bsb0rvWI.js";
-import { i as ZIDANE_EXTENSION_SKILL_NAME, l as withZidaneExtensionSkill, o as extensionDirForCwd, r as EXTENSION_EDIT_METADATA_KEY, s as extensionScaffold, t as loginMcpServer } from "./login-DOF8pMVM.js";
-import { C as restoreModelOptions, S as piIdOf, _ as modelOptionsFor, m as getContextWindow, p as enabledModelOptions, s as setProviderCredential, t as detectAuth, v as modelSupportsReasoning } from "./auth-BDSu_0t3.js";
+import { i as installSkillFromSpec, r as SkillInstallError } from "./skills-BjeXSRlQ.js";
+import { i as ZIDANE_EXTENSION_SKILL_NAME, l as withZidaneExtensionSkill, o as extensionDirForCwd, r as EXTENSION_EDIT_METADATA_KEY, s as extensionScaffold, t as loginMcpServer } from "./login-DZLG__2f.js";
+import { C as restoreModelOptions, S as piIdOf, _ as modelOptionsFor, m as getContextWindow, p as enabledModelOptions, s as setProviderCredential, t as detectAuth, v as modelSupportsReasoning } from "./auth-D5FfJtLf.js";
 import { createDockerContext } from "./contexts/docker.js";
 import { createTuiStore } from "./session/sqlite.js";
-import { $ as rewriteMultiEditHeader, A as buildLinearRamp, D as createFilesCompletionProvider, F as selectableTurnIds, H as extractEditPayload, I as turnSelectionOwnership, J as buildEditOutcomesAnnotation, K as summarizeEditPayload, M as isEditErrorResult, N as isTurnHighlighted, P as isVisible, Q as resolveApprovalForPayload, R as buildContextualDiff, S as splitMarkdownCodeBlocks, T as uniqueSkillNamesFromReferences, U as filetypeFromPath, W as previewEditPayload, X as mergeApprovalAndBodyOutcomes, Z as parseEditOutcomesFromResult, _ as filterModelCatalog, a as TOOL_DISPLAY, b as chunkMarkdownForRender, d as finalizeStreamingMarkdown, et as stripEditOutcomesAnnotation, f as finalizeStreamingMarkdownForOwner, g as buildModelCatalog, h as splitPromptSegments, i as turnAsText, it as createChatsCompletionProvider, j as EDIT_TOOL_NAMES, k as blendHsl, m as turnContextSize, n as deleteTurnSafely, o as displayNameFor, r as truncateTurnsAt, s as formatToolCall, tt as summarizeOutcomes, u as capTranscriptEvents, v as indexOfEntry, w as createSkillsCompletionProvider, x as normalizeMarkdownCodeFences, z as buildUnifiedDiff } from "./turn-operations-Dq9Kx7m2.js";
+import { $ as rewriteMultiEditHeader, A as buildLinearRamp, D as createFilesCompletionProvider, F as selectableTurnIds, H as extractEditPayload, I as turnSelectionOwnership, J as buildEditOutcomesAnnotation, K as summarizeEditPayload, M as isEditErrorResult, N as isTurnHighlighted, P as isVisible, Q as resolveApprovalForPayload, R as buildContextualDiff, S as splitMarkdownCodeBlocks, T as uniqueSkillNamesFromReferences, U as filetypeFromPath, W as previewEditPayload, X as mergeApprovalAndBodyOutcomes, Z as parseEditOutcomesFromResult, _ as filterModelCatalog, a as TOOL_DISPLAY, b as chunkMarkdownForRender, d as finalizeStreamingMarkdown, et as stripEditOutcomesAnnotation, f as finalizeStreamingMarkdownForOwner, g as buildModelCatalog, h as splitPromptSegments, i as turnAsText, it as createChatsCompletionProvider, j as EDIT_TOOL_NAMES, k as blendHsl, m as turnContextSize, n as deleteTurnSafely, o as displayNameFor, r as truncateTurnsAt, s as formatToolCall, tt as summarizeOutcomes, u as capTranscriptEvents, v as indexOfEntry, w as createSkillsCompletionProvider, x as normalizeMarkdownCodeFences, z as buildUnifiedDiff } from "./turn-operations-CEt_l3fy.js";
 import { basename, dirname, join, relative, resolve } from "node:path";
 import { Buffer } from "node:buffer";
 import * as fs from "node:fs";
@@ -2183,6 +2183,13 @@ function EventLineImpl({ event, previous, depthOffset = 0, hideChildLabel = fals
 						fg: COLOR.mute,
 						children: " · "
 					})] }),
+					event.model !== void 0 && /* @__PURE__ */ jsxs(Fragment, { children: [/* @__PURE__ */ jsx$1("span", {
+						fg: COLOR.model,
+						children: event.model
+					}), /* @__PURE__ */ jsx$1("span", {
+						fg: COLOR.mute,
+						children: " · "
+					})] }),
 					/* @__PURE__ */ jsx$1("span", {
 						fg: COLOR.dim,
 						children: safeText
@@ -3378,7 +3385,7 @@ function pctLabel(tokens, denom) {
 	const raw = tokens / denom * 100;
 	return raw < 1 ? "<1%" : `${Math.round(raw)}%`;
 }
-function ContextPanelModal({ breakdown }) {
+function ContextPanelModal({ breakdown, modelUsage }) {
 	const COLOR = useColors();
 	const [expanded, setExpanded] = useState(() => /* @__PURE__ */ new Set());
 	const expandableIds = useMemo(() => breakdown.categories.filter((c) => c.items && c.items.length > 0).map((c) => c.id), [breakdown]);
@@ -3492,6 +3499,10 @@ function ContextPanelModal({ breakdown }) {
 						usage: breakdown.usage,
 						COLOR
 					}),
+					modelUsage && modelUsage.length > 0 && /* @__PURE__ */ jsx$1(ModelUsageRows, {
+						rows: modelUsage,
+						COLOR
+					}),
 					breakdown.extensionSections?.map((section) => /* @__PURE__ */ jsx$1(ExtensionSectionRows, {
 						section,
 						COLOR
@@ -3683,6 +3694,82 @@ function UsageRows({ usage, COLOR }) {
 		}, r.label))
 	] });
 }
+/**
+* Session-wide token + spend totals per model, one row each — the surface
+* that makes cost-tiered subagent delegation legible (cheap workers show
+* as their own rows at their own rates). Costs come from per-turn usage:
+* provider-reported when available, locally estimated otherwise; `≥`
+* marks models where some turns had no rate (the figure is a floor).
+*/
+function ModelUsageRows({ rows, COLOR }) {
+	return /* @__PURE__ */ jsxs(Fragment, { children: [
+		/* @__PURE__ */ jsx$1("box", { style: {
+			height: 1,
+			flexShrink: 0
+		} }),
+		/* @__PURE__ */ jsx$1("box", {
+			style: {
+				height: 1,
+				flexShrink: 0
+			},
+			children: /* @__PURE__ */ jsx$1("text", {
+				wrapMode: "none",
+				fg: COLOR.mute,
+				children: "usage by model"
+			})
+		}),
+		rows.map((r) => {
+			const sent = r.input + r.cacheRead + r.cacheCreation;
+			return /* @__PURE__ */ jsxs("box", {
+				style: {
+					flexDirection: "row",
+					height: 1,
+					flexShrink: 0
+				},
+				children: [
+					/* @__PURE__ */ jsx$1("text", {
+						wrapMode: "none",
+						fg: COLOR.model,
+						children: r.modelId
+					}),
+					/* @__PURE__ */ jsx$1("box", { style: { flexGrow: 1 } }),
+					/* @__PURE__ */ jsxs("text", {
+						wrapMode: "none",
+						children: [
+							/* @__PURE__ */ jsx$1("span", {
+								fg: COLOR.mute,
+								children: `${r.turns} turn${r.turns === 1 ? "" : "s"} · `
+							}),
+							/* @__PURE__ */ jsx$1("span", {
+								fg: COLOR.dim,
+								children: fmtTokens(sent)
+							}),
+							/* @__PURE__ */ jsx$1("span", {
+								fg: COLOR.mute,
+								children: " in · "
+							}),
+							/* @__PURE__ */ jsx$1("span", {
+								fg: COLOR.dim,
+								children: fmtTokens(r.output)
+							}),
+							/* @__PURE__ */ jsx$1("span", {
+								fg: COLOR.mute,
+								children: " out"
+							}),
+							r.cost > 0 && /* @__PURE__ */ jsxs(Fragment, { children: [/* @__PURE__ */ jsx$1("span", {
+								fg: COLOR.mute,
+								children: ` · ${r.costComplete ? "" : "≥"}`
+							}), /* @__PURE__ */ jsx$1("span", {
+								fg: COLOR.money ?? COLOR.warn,
+								children: fmtCost(r.cost)
+							})] })
+						]
+					})
+				]
+			}, r.modelId);
+		})
+	] });
+}
 function ExtensionSectionRows({ section, COLOR }) {
 	return /* @__PURE__ */ jsxs(Fragment, { children: [
 		/* @__PURE__ */ jsx$1("box", { style: {
@@ -3990,7 +4077,7 @@ const HOME = homedir();
 const MAX_ENTRIES = 5e4;
 const MAX_DEPTH = 5;
 const WALK_BATCH_SIZE = 64;
-const SKIP_DIRS = new Set([
+const SKIP_DIRS = /* @__PURE__ */ new Set([
 	"node_modules",
 	".git",
 	".hg",
@@ -4453,8 +4540,12 @@ function DiscoveryShell({ children }) {
 		mcpCredentialStore
 	]);
 	useEffect(() => {
+		let lastSignature = cacheFileSignature(dataDir);
 		const id = setInterval(() => {
 			try {
+				const signature = cacheFileSignature(dataDir);
+				if (signature === lastSignature) return;
+				lastSignature = signature;
 				setMcpToolsByServer(readToolsByServer(dataDir));
 			} catch (err) {
 				debugLog$1("mcp-tools-cache refresh failed", err);
@@ -4496,6 +4587,15 @@ function DiscoveryShell({ children }) {
 * only need the schemas. Best-effort — a corrupt cache produces an
 * empty map and the next bootstrap re-populates.
 */
+/**
+* Cheap change signature for the MCP tools cache file — `null` when the
+* file doesn't exist yet. mtime+size catches every write the atomic
+* save path produces (fresh tmp file + rename ⇒ new inode/mtime).
+*/
+function cacheFileSignature(dataDir) {
+	const stat = statSync(mcpToolsCachePath(dataDir), { throwIfNoEntry: false });
+	return stat ? `${stat.mtimeMs}:${stat.size}` : null;
+}
 function readToolsByServer(dataDir) {
 	const cache = loadMcpToolsCache({ dataDir });
 	const out = {};
@@ -4954,7 +5054,17 @@ function OptionRow({ option, isEnabled, isFocused, highlightBg }) {
 * 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.
+* `app.tsx`'s `onApplyModelChain` for the canonical wiring.
+*
+* Two commit modes:
+*   - **Single pick** (`onPick`, default): ↵ commits the highlighted row
+*     and the caller closes the modal — the original behavior, still
+*     used by the compaction-model picker and external hosts.
+*   - **Ordered multi-select** (`onApplyChain`): ↵ toggles the highlighted
+*     row in a numbered fallback chain (the number is the row's 1-based
+*     position — the order rows were picked is the order the agent falls
+*     back in), esc applies the chain and closes. Esc with an unchanged
+*     (or emptied) chain is a plain cancel.
 *
 * Geometry:
 *   - Top: single-row search input. The input owns focus so the user
@@ -4973,7 +5083,7 @@ function OptionRow({ option, isEnabled, isFocused, highlightBg }) {
 */
 /** 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 }) {
+function ModelPickerModal({ providers, modelsFor, current, onPick, chain, onApplyChain }) {
 	const COLOR = useColors();
 	const SURFACE = useSurfaces();
 	const inputRef = useRef(null);
@@ -4997,13 +5107,35 @@ function ModelPickerModal({ providers, modelsFor, current, onPick }) {
 		setSelectedIdx(0);
 	}, []);
 	const safeIndex = filtered.length === 0 ? 0 : Math.min(selectedIdx, filtered.length - 1);
+	const chainMode = onApplyChain !== void 0;
+	const [initialChain] = useState(() => chain && chain.length > 0 ? [...chain] : [{
+		provider: current.providerKey,
+		model: current.modelId
+	}]);
+	const [chainState, setChainState] = useState(initialChain);
+	const modalApi = useModalState();
 	const commit = () => {
 		const row = filtered[safeIndex];
-		if (row) onPick({
+		if (!row) return;
+		if (chainMode) {
+			setChainState((prev) => toggleChainEntry(prev, {
+				provider: row.providerKey,
+				model: row.model.id
+			}));
+			return;
+		}
+		onPick?.({
 			providerKey: row.providerKey,
 			modelId: row.model.id
 		});
 	};
+	const handleClose = () => {
+		if (chainMode && chainState.length > 0 && !chainsEqual(chainState, initialChain)) {
+			onApplyChain?.(chainState);
+			return;
+		}
+		modalApi?.close();
+	};
 	const viewport = useMemo(() => {
 		if (filtered.length <= VISIBLE_ROWS) return {
 			start: 0,
@@ -5035,8 +5167,9 @@ function ModelPickerModal({ providers, modelsFor, current, onPick }) {
 	});
 	if (providers.length === 0) return /* @__PURE__ */ jsx$1(EmptyProvidersState, {});
 	return /* @__PURE__ */ jsxs(Modal, {
-		title: "select model",
+		title: chainMode ? "select models — order = fallback priority" : "select model",
 		maxWidth: 100,
+		onClose: handleClose,
 		children: [
 			/* @__PURE__ */ jsx$1("box", {
 				style: {
@@ -5074,7 +5207,8 @@ function ModelPickerModal({ providers, modelsFor, current, onPick }) {
 					entry,
 					isCurrent: entry.providerKey === current.providerKey && entry.model.id === current.modelId,
 					isFocused: viewport.start + i === safeIndex,
-					highlightBg: SURFACE.selection
+					highlightBg: SURFACE.selection,
+					chainPosition: chainMode ? chainPositionOf(chainState, entry.providerKey, entry.model.id) : null
 				}, `${entry.providerKey}:${entry.model.id}`))
 			}),
 			/* @__PURE__ */ jsxs("text", {
@@ -5089,12 +5223,16 @@ function ModelPickerModal({ providers, modelsFor, current, onPick }) {
 						fg: COLOR.warn,
 						children: "↵"
 					}),
-					" select · ",
+					chainMode ? " add/remove · " : " select · ",
 					/* @__PURE__ */ jsx$1("span", {
 						fg: COLOR.warn,
 						children: "esc"
 					}),
-					" close · ",
+					chainMode ? " apply · " : " close · ",
+					chainMode && /* @__PURE__ */ jsx$1("span", {
+						fg: COLOR.brand,
+						children: `${chainState.length} selected · `
+					}),
 					/* @__PURE__ */ jsx$1("span", {
 						fg: COLOR.mute,
 						children: `${filtered.length} / ${catalog.length} model${catalog.length === 1 ? "" : "s"}`
@@ -5111,9 +5249,10 @@ function ModelPickerModal({ providers, modelsFor, current, onPick }) {
 * 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 }) {
+function ModelRow({ entry, isCurrent, isFocused, highlightBg, chainPosition = null }) {
 	const COLOR = useColors();
-	const marker = isCurrent ? "●" : " ";
+	const marker = chainPosition !== null ? chainPosition > 9 ? "+" : String(chainPosition) : isCurrent ? "●" : " ";
+	const markerColor = chainPosition !== null || isCurrent ? COLOR.brand : COLOR.mute;
 	return /* @__PURE__ */ jsx$1("box", {
 		style: {
 			height: 1,
@@ -5126,7 +5265,7 @@ function ModelRow({ entry, isCurrent, isFocused, highlightBg }) {
 			wrapMode: "none",
 			children: [
 				/* @__PURE__ */ jsx$1("span", {
-					fg: isCurrent ? COLOR.brand : COLOR.mute,
+					fg: markerColor,
 					children: marker
 				}),
 				/* @__PURE__ */ jsx$1("span", {
@@ -5818,7 +5957,7 @@ function ExtensionBanners() {
 }
 //#endregion
 //#region src/tui/file-edit-approval-modal.tsx
-const FILE_EDIT_TOOLS = new Set([
+const FILE_EDIT_TOOLS = /* @__PURE__ */ new Set([
 	"edit",
 	"multi_edit",
 	"write_file"
@@ -7521,7 +7660,8 @@ function OpenBrowserButton({ authUrl }) {
 	const feedbackTimer = useRef(null);
 	const trigger = useCallback(() => {
 		tryOpenBrowser(authUrl);
-		setFeedback(writeToClipboard(authUrl) ? "opened in browser · URL copied to clipboard" : "opened in browser");
+		const copied = writeToClipboard(authUrl);
+		setFeedback(copied ? "opened in browser · URL copied to clipboard" : "opened in browser");
 		if (feedbackTimer.current) clearTimeout(feedbackTimer.current);
 		feedbackTimer.current = setTimeout(setFeedback, 4e3, null);
 	}, [authUrl]);
@@ -8540,7 +8680,8 @@ function SessionsScreen({ sessions, currentId, focusedSessionId, onPick, onCreat
 	]);
 	const moveCursor = useCallback((nextIndex) => {
 		if (!onFocusChange || rows.length === 0) return;
-		const row = rows[(nextIndex % rows.length + rows.length) % rows.length];
+		const clamped = (nextIndex % rows.length + rows.length) % rows.length;
+		const row = rows[clamped];
 		onFocusChange(row?.rowId ?? null);
 	}, [rows, onFocusChange]);
 	const commitCurrent = useCallback(() => {
@@ -10642,7 +10783,8 @@ const LOG_LEVEL_CYCLE = [
 ];
 /** Next min-level in {@link LOG_LEVEL_CYCLE}, wrapping around. */
 function nextLogLevel(level) {
-	return LOG_LEVEL_CYCLE[(LOG_LEVEL_CYCLE.indexOf(level) + 1) % LOG_LEVEL_CYCLE.length];
+	const i = LOG_LEVEL_CYCLE.indexOf(level);
+	return LOG_LEVEL_CYCLE[(i + 1) % LOG_LEVEL_CYCLE.length];
 }
 /** Retain only records at or above `minLevel`. Preserves order. */
 function filterLogRecords(records, minLevel) {
@@ -11175,7 +11317,8 @@ function McpAddDialog({ active, existingNames, onSubmit, onCancel }) {
 		}
 		const cycles = key.name === "left" ? -1 : key.name === "right" || key.name === "space" ? 1 : 0;
 		if (cycles !== 0 && row === "transport") {
-			setTransport(MCP_TRANSPORTS[(MCP_TRANSPORTS.indexOf(transport) + cycles + MCP_TRANSPORTS.length) % MCP_TRANSPORTS.length]);
+			const t = MCP_TRANSPORTS.indexOf(transport);
+			setTransport(MCP_TRANSPORTS[(t + cycles + MCP_TRANSPORTS.length) % MCP_TRANSPORTS.length]);
 			return;
 		}
 		if (cycles !== 0 && row === "scope") setScope((s) => s === "user" ? "project" : "user");
@@ -11582,7 +11725,7 @@ function SettingsModal({ skillsCatalog: skillsCatalogProp, mcpsCatalog: mcpsCata
 			description: `current: ${settings.compactionModel || "main model"} — pick any provider's model for compaction summaries (pick the main model to clear)`,
 			onPick: actions.onPickCompactionModel
 		});
-		const inputs = SETTINGS_INPUTS.filter((inp) => inp.key !== "sessionIcon" || settings.terminalTitle === "icon-session").map((inp) => ({
+		const inputs = SETTINGS_INPUTS.filter((inp) => inp.key !== "sessionIcon" && inp.key !== "attentionIcon" && inp.key !== "activeIcon" || settings.terminalTitle === "icon-session").map((inp) => ({
 			kind: "input",
 			...inp
 		}));
@@ -11837,7 +11980,8 @@ function SettingsModal({ skillsCatalog: skillsCatalogProp, mcpsCatalog: mcpsCata
 		if (!key.ctrl && !key.meta && !key.shift && (key.name === "left" || key.name === "right")) {
 			key.preventDefault();
 			const idx = tabOrder.indexOf(activeTab);
-			setActiveTab(key.name === "left" ? tabOrder[(idx - 1 + tabOrder.length) % tabOrder.length] : tabOrder[(idx + 1) % tabOrder.length]);
+			const next = key.name === "left" ? tabOrder[(idx - 1 + tabOrder.length) % tabOrder.length] : tabOrder[(idx + 1) % tabOrder.length];
+			setActiveTab(next);
 			return;
 		}
 		if (key.name === "up" || key.ctrl && key.name === "p") {
@@ -13677,8 +13821,9 @@ const TITLE_STACK_PUSH = "\x1B[22;0t";
 const TITLE_STACK_RESTORE = "\x1B]0;\x07\x1B[23;0t";
 /**
 * Make a string safe to hand to the terminal as a window/icon title.
-* Session titles come from user content and `sessionIcon` is free text,
-* so a stray control byte (newline, BEL, ESC, …) could terminate the OSC
+* Session titles come from user content and the icon settings
+* (`sessionIcon` / `attentionIcon`) are free text, so a stray control
+* byte (newline, BEL, ESC, …) could terminate the OSC
 * title sequence early or smuggle escape sequences through it. Strip
 * control characters, collapse whitespace to single spaces, trim, and
 * clamp to a sane length — a title is a one-line label, not a payload.
@@ -13687,6 +13832,32 @@ function sanitizeTitle(raw) {
 	return [...raw.replace(/[\u0000-\u001F\u007F-\u009F]/g, " ").replace(/\s+/g, " ").trim()].slice(0, 256).join("");
 }
 /**
+* Compose the window title for the active (non-`'off'`) `terminalTitle`
+* modes. Pure — the TUI's title effect owns WHEN to apply it (and the
+* save/restore dance for `'off'`); this owns WHAT it says:
+*
+*   - `'app'`          — always `zidane`.
+*   - `'session'`      — the session title, falling back to `zidane`.
+*   - `'icon-session'` — `{icon} · {title}`, where the icon reflects the
+*     agent's state, most-urgent first:
+*       1. `attentionIcon` (⚠️ when empty) while the agent is blocked on
+*          user input (tool approval / `ask_user` / `present_plan`) — a
+*          backgrounded tab flags "zidane needs you". Wins over `active`
+*          because an approval mid-run blocks the stream anyway.
+*       2. `activeIcon` (⚡ when empty) while a run is streaming — the
+*          tab reads "working" at a glance.
+*       3. `sessionIcon` (⚽ when empty) — idle.
+*
+* Callers still pass the result through {@link sanitizeTitle} — icons
+* and session titles are both free text.
+*/
+function composeTerminalTitle(opts) {
+	const sessionTitle = opts.sessionTitle?.trim() || "zidane";
+	if (opts.mode === "app") return "zidane";
+	if (opts.mode === "session") return sessionTitle;
+	return `${opts.awaitingInput ? opts.attentionIcon.trim() || "⚠️" : opts.active ? opts.activeIcon.trim() || "⚡" : opts.sessionIcon.trim() || "⚽"} · ${sessionTitle}`;
+}
+/**
 * Push the current terminal title so {@link restoreTerminalTitle} can
 * bring it back later. No-op when `out` isn't a TTY.
 */
@@ -14333,7 +14504,7 @@ function blockSummary(turn) {
 }
 //#endregion
 //#region src/tui/app.tsx
-const BUILTIN_COMPLETION_PROVIDER_IDS = new Set([
+const BUILTIN_COMPLETION_PROVIDER_IDS = /* @__PURE__ */ new Set([
 	"commands",
 	"skills",
 	"files",
@@ -14346,7 +14517,7 @@ const BUILTIN_COMPLETION_PROVIDER_IDS = new Set([
 * section into the commands+skills popover. Extensions extend `/` via
 * `ctx.registerCommand`; a raw completion provider must pick its own char.
 */
-const BUILTIN_COMPLETION_TRIGGERS = new Set([
+const BUILTIN_COMPLETION_TRIGGERS = /* @__PURE__ */ new Set([
 	"/",
 	"@",
 	"#"
@@ -14362,6 +14533,12 @@ const BUILTIN_COMPLETION_TRIGGERS = new Set([
 */
 const SKILL_ACTIVATION_TIMEOUT_MS = 60 * 1e3;
 /**
+* Poll cadence for out-of-band extension install detection (see the
+* auto-reload effect near `runningRef`). A scan is a handful of readdirs
+* and lstats — cheap enough that latency, not cost, picked the number.
+*/
+const EXTENSION_WATCH_POLL_MS = 3e3;
+/**
 * Surface failures that are normally silenced (teardown / save) when the
 * `ZIDANE_DEBUG` env var is set. Logging via `console.error` would otherwise
 * trigger OpenTUI's error console overlay and clutter the UI for end users.
@@ -14619,6 +14796,10 @@ function AppShell() {
 	useEffect(() => {
 		userInstructionsScopeRef.current = settings.userInstructionsScope;
 	}, [settings.userInstructionsScope]);
+	const subagentModelsRef = useRef(settings.subagentModels);
+	useEffect(() => {
+		subagentModelsRef.current = settings.subagentModels;
+	}, [settings.subagentModels]);
 	const autoCompactRef = useRef(settings.autoCompact);
 	useEffect(() => {
 		autoCompactRef.current = settings.autoCompact;
@@ -14965,6 +15146,14 @@ function AppShell() {
 	const [events, setEvents] = useState([]);
 	const [busy, setBusy] = useState(false);
 	/**
+	* The provider+model the run actually advanced to after a `model:fallback`
+	* — `null` while the primary target is serving. Drives the footer's model
+	* chip (actual model id, warn-colored to read as "temporary") and resets
+	* at every run submission because fallback is run-sticky: each new run
+	* starts from the primary again.
+	*/
+	const [activeFallback, setActiveFallback] = useState(null);
+	/**
 	* Drives the compaction UI indicator — the small spinner painted over the
 	* session title. Toggled by the loop-native `compact:start` / `compact:end`
 	* hooks (and the manual `onCompactSession` flow).
@@ -15006,6 +15195,95 @@ function AppShell() {
 	*/
 	const runningRef = useRef(false);
 	/**
+	* Auto-`/reload` on out-of-band extension installs. The Settings-panel
+	* lifecycle (ctrl+g/u/x) already ends in a hot reload, but extensions
+	* can also land on disk without the panel: the agent running an
+	* installer through the shell tool mid-conversation, a second terminal,
+	* a plain `git clone` into a scan root. Those used to sit invisible
+	* until a manual `/reload` or restart.
+	*
+	* Detection is a low-frequency poll of `scanExtensionDirectories` — the
+	* SAME entry enumeration discovery uses (trust boundaries, project/user
+	* precedence, `ZIDANE_EXTENSION_DIRS`), so the watcher can't drift from
+	* what a reload would actually see. The signature is the entry set
+	* (name + resolved path), NOT file contents — in-place code edits don't
+	* trip it; this reacts to extensions appearing/disappearing, exactly
+	* the "installed a new extension" event. (fs.watch was rejected: scan
+	* roots routinely don't exist yet, and watching parents-of-missing-dirs
+	* across platforms costs more complexity than a 3s readdir poll.)
+	*
+	* Deliberately skipped while a run is in flight (reload mid-run would
+	* dispose extension instances whose tools the agent may be holding) and
+	* while a modal is open (the Settings install flow does its own reload;
+	* polling under it would race a second discovery pass). Both gates
+	* self-resolve — the next tick catches up. The modal gate is read
+	* through a ref, NOT an effect dep: `useModal()`'s api object is
+	* rebuilt on every open/close, and depending on it would re-seed the
+	* baseline right as a modal closes — silently absorbing anything that
+	* landed on disk while it was open.
+	*
+	* Trust posture matches `/reload` exactly: a newly appeared extension
+	* still goes through the same enable/allowlist + project-trust rules —
+	* auto-reload never auto-enables anything the manual path wouldn't.
+	*
+	* Known accepted gap: the baseline seeds from a fresh disk scan at
+	* mount, so an install landing between boot discovery and shell mount
+	* (seconds, e.g. while on the auth screen) is absorbed unloaded.
+	* Seeding from the registry's own entry set would close it, but the
+	* registry legitimately diverges from raw scan enumeration (trust
+	* rejection, allowlists, selection dedupe) — any systematic divergence
+	* would turn into a permanent reload-every-tick loop. Loop-proof beats
+	* complete here: baseline and tick MUST come from the same function.
+	*/
+	const modalRef = useRef(modal);
+	modalRef.current = modal;
+	const extensionAutoReloadInFlightRef = useRef(false);
+	useEffect(() => {
+		const scanSignature = () => {
+			try {
+				return scanExtensionDirectories({
+					cwd: cwdRef.current,
+					prefix: config.prefix,
+					...config.extensionScanPaths.length > 0 ? { extensionScanPaths: config.extensionScanPaths } : {}
+				}).map((e) => `${e.name}\u0000${e.dir}`).sort().join("\n");
+			} catch (err) {
+				debugLog("extension watch: scan failed", err);
+				return null;
+			}
+		};
+		let lastSignature = scanSignature();
+		const id = setInterval(() => {
+			if (extensionAutoReloadInFlightRef.current || runningRef.current || modalRef.current.isOpen) return;
+			const next = scanSignature();
+			if (next === null) return;
+			if (lastSignature === null) {
+				lastSignature = next;
+				return;
+			}
+			if (next === lastSignature) return;
+			lastSignature = next;
+			extensionAutoReloadInFlightRef.current = true;
+			(async () => {
+				try {
+					const { active, inactive } = await reloadExtensionsRef.current();
+					streamRef.current?.appendImmediate({
+						kind: "info",
+						text: `\u{1F50C} Extensions changed on disk — reloaded: ${active} active${inactive > 0 ? `, ${inactive} inactive (enable in Settings → Extensions)` : ""}. Agent-side contributions apply on the next run.`
+					});
+				} catch (err) {
+					debugLog("extension watch: auto-reload failed", err);
+				} finally {
+					extensionAutoReloadInFlightRef.current = false;
+				}
+			})();
+		}, EXTENSION_WATCH_POLL_MS);
+		return () => clearInterval(id);
+	}, [
+		extensionRegistry,
+		config.prefix,
+		config.extensionScanPaths
+	]);
+	/**
 	* Auto-wake trigger for background-task notifications. When a
 	* backgrounded shell task exits while the agent is IDLE, nothing would
 	* otherwise deliver the queued `<task-notification>` until the user
@@ -15106,16 +15384,25 @@ function AppShell() {
 			saveTerminalTitle();
 			titleSavedRef.current = true;
 		}
-		const sessionTitle = currentSession?.title?.trim() || "zidane";
-		let title;
-		if (settings.terminalTitle === "app") title = "zidane";
-		else if (settings.terminalTitle === "icon-session") title = `${settings.sessionIcon.trim() || "⚽"} · ${sessionTitle}`;
-		else title = sessionTitle;
+		const title = composeTerminalTitle({
+			mode: settings.terminalTitle,
+			sessionTitle: currentSession?.title,
+			sessionIcon: settings.sessionIcon,
+			attentionIcon: settings.attentionIcon,
+			activeIcon: settings.activeIcon,
+			awaitingInput: pendingApproval !== null || pendingInteraction !== null,
+			active: busy
+		});
 		renderer.setTerminalTitle(sanitizeTitle(title));
 	}, [
 		renderer,
 		settings.terminalTitle,
 		settings.sessionIcon,
+		settings.attentionIcon,
+		settings.activeIcon,
+		busy,
+		pendingApproval,
+		pendingInteraction,
 		currentSession?.title,
 		restoreTitle
 	]);
@@ -15327,9 +15614,14 @@ function AppShell() {
 		const model = modelId ?? remembered ?? descriptor.defaultModel ?? descriptor.factory().meta.defaultModel;
 		const effort = effortForModel(descriptor, model, initialState.lastEffortByModel);
 		const opts = restoreModelOptions(descriptor, model, initialState.lastModelOptionsByModel);
+		const fallbacks = restoreChainFallbacks(initialState.lastModelChain, {
+			provider: provider.key,
+			model
+		}, (k) => providerRegistry[k] !== void 0);
 		return {
 			provider,
 			model,
+			...fallbacks.length > 0 ? { fallbacks } : {},
 			...effort ? { effort } : {},
 			...opts ? { modelOptions: opts } : {}
 		};
@@ -15343,9 +15635,66 @@ function AppShell() {
 		suppressWakeRef.current = true;
 		agentRef.current?.abort();
 	}, [denyAll, interactions]);
+	/**
+	* `ProviderKey` → runtime `Provider.name` for the providers constructed
+	* into the CURRENT agent. Replaced wholesale on every `buildAgent` so a
+	* run never pins a fallback entry to a provider the live agent doesn't
+	* own (`buildRunModel` drops entries with no mapping). Chain entries
+	* carry chat-level keys; the agent loop matches on instance names —
+	* this map is the bridge.
+	*/
+	const providerNameByKeyRef = useRef(/* @__PURE__ */ new Map());
+	/**
+	* The `model` option for chat runs: the bare primary model id when no
+	* fallbacks are configured (byte-identical to single-model behavior),
+	* else the pinned `{ provider, model }` chain — validated against the
+	* current agent's provider map so a stale chain degrades to fewer
+	* targets instead of a run-time resolution error. Each target carries
+	* its model's context window from the chat catalog so the loop re-bases
+	* the auto-compact trigger when a fallback advances (the run-level
+	* `autoCompact.contextWindow` is sized for the primary).
+	*/
+	const runModelFor = useCallback((p) => {
+		const fallbacks = p.fallbacks ?? [];
+		if (fallbacks.length === 0) return p.model;
+		return buildRunModel([{
+			provider: p.provider.key,
+			model: p.model
+		}, ...fallbacks], (k) => providerNameByKeyRef.current.get(k), (entry) => {
+			const d = providerRegistry[entry.provider];
+			return d ? getContextWindow(d, entry.model) ?? void 0 : void 0;
+		});
+	}, [providerRegistry]);
 	const buildAgent = useCallback((session, key) => {
 		const descriptor = providerRegistry[key];
 		if (!descriptor) throw new Error(`No provider registered for key "${key}"`);
+		const primaryProvider = descriptor.factory();
+		const nameByKey = /* @__PURE__ */ new Map([[key, primaryProvider.name]]);
+		const extraProviders = [];
+		const seenNames = /* @__PURE__ */ new Set([primaryProvider.name]);
+		for (const entry of pickedRef.current?.fallbacks ?? []) {
+			if (nameByKey.has(entry.provider)) continue;
+			const d = providerRegistry[entry.provider];
+			if (!d) {
+				debugLog("buildAgent: fallback provider not registered, skipping", entry.provider);
+				continue;
+			}
+			let instance;
+			try {
+				instance = d.factory();
+			} catch (err) {
+				debugLog(`buildAgent: fallback provider "${entry.provider}" factory threw, skipping`, err);
+				continue;
+			}
+			if (seenNames.has(instance.name)) {
+				debugLog(`buildAgent: duplicate provider name "${instance.name}", skipping fallback provider`, entry.provider);
+				continue;
+			}
+			seenNames.add(instance.name);
+			nameByKey.set(entry.provider, instance.name);
+			extraProviders.push(instance);
+		}
+		providerNameByKeyRef.current = nameByKey;
 		const profile = pickedAgentRef.current;
 		const skillsScan = defaultSkillScanPaths({
 			cwd: projectDir,
@@ -15356,7 +15705,7 @@ function AppShell() {
 		const userEnabledSkills = enabledSkillsRef.current;
 		const skillsConfig = buildSkillsConfig({
 			scan: skillsScan,
-			enabled: userEnabledSkills === void 0 ? void 0 : Array.from(new Set([...userEnabledSkills, ...extensionSkillNames]))
+			enabled: userEnabledSkills === void 0 ? void 0 : Array.from(/* @__PURE__ */ new Set([...userEnabledSkills, ...extensionSkillNames]))
 		});
 		const projectMcps = buildMcpServers({
 			discovered: mcpsCatalogRef.current,
@@ -15391,6 +15740,20 @@ function AppShell() {
 			sessionId: session.id
 		});
 		const composedPreset = composeExtensionPreset(liveExtensionRegistry, profile.preset);
+		const modelCatalogTools = {};
+		if (subagentModelsRef.current) {
+			const catalog = [];
+			for (const [providerKey, providerName] of nameByKey) for (const info of modelsFor(providerKey)) catalog.push({
+				provider: providerName,
+				model: info
+			});
+			const presetSpawn = composedPreset.tools?.spawn;
+			if (catalog.length > 0 && presetSpawn && isSpawnTool(presetSpawn)) {
+				modelCatalogTools.spawn = presetSpawn.withModels(catalog);
+				if (composedPreset.tools && "model_search" in composedPreset.tools) debugLog("buildAgent: preset already registers a \"model_search\" tool — shadowing it with the spawn model catalog", "model_search");
+				modelCatalogTools.model_search = createModelSearchTool(catalog);
+			}
+		}
 		const execution = launch?.context === "docker" ? createDockerContext({
 			image: launch.image,
 			cwd: actualCwd
@@ -15413,7 +15776,8 @@ function AppShell() {
 			tools: {
 				...interactionTools,
 				chatTurnsRead: chatTurnsReadTool,
-				...composedPreset.tools ?? {}
+				...composedPreset.tools ?? {},
+				...modelCatalogTools
 			},
 			contextBreakdownSections: [...liveExtensionRegistry.contextBreakdownSections, ...liveExtensionRegistry.contextPanelSections],
 			behavior: {
@@ -15422,7 +15786,7 @@ function AppShell() {
 				tasksDir
 			},
 			execution,
-			provider: descriptor.factory(),
+			provider: extraProviders.length > 0 ? [primaryProvider, ...extraProviders] : primaryProvider,
 			session,
 			mcpConnector: (configs) => connectMcpServers(configs, void 0, agent.hooks, { buildAuthProvider: (cfg) => new McpOAuthProvider({
 				name: cfg.name,
@@ -15613,6 +15977,16 @@ function AppShell() {
 				turnId
 			});
 		});
+		agent.hooks.hook("model:fallback", ({ from, to, err }) => {
+			setActiveFallback({
+				provider: to.provider,
+				model: to.model
+			});
+			stream.appendImmediate({
+				kind: "info",
+				text: `⚠ model fallback: ${from.provider}/${from.model} failed (${errorMessage(err)}) — continuing on ${to.provider}/${to.model}`
+			});
+		});
 		agent.hooks.hook("tool:before", async ({ callId, name, input, turnId }) => {
 			registerInFlightTool({
 				callId,
@@ -15736,6 +16110,10 @@ function AppShell() {
 			}
 			stream.flushAndUpdate(finalizeStreamingMarkdown);
 		});
+		agent.hooks.hook("child:turn:after", ({ usage }) => {
+			const turnCost = usage.cost ?? 0;
+			if (turnCost > 0) setSessionCost((prev) => prev + turnCost);
+		});
 		agent.hooks.hook("agent:done", () => {
 			const reason = lastFinishReasonRef.current;
 			lastFinishReasonRef.current = void 0;
@@ -15781,13 +16159,14 @@ function AppShell() {
 			setLastInputTokens(ctx.effectiveTokens);
 			lastInputTokensRef.current = ctx.effectiveTokens;
 		});
-		agent.hooks.hook("spawn:before", ({ id, task, depth }) => {
+		agent.hooks.hook("spawn:before", ({ id, task, depth, model }) => {
 			const taskPreview = previewLine(task, 80);
 			stream.appendImmediate({
 				kind: "spawn-start",
 				text: taskPreview,
 				childId: id,
-				depth: depth ?? 1
+				depth: depth ?? 1,
+				...model ? { model } : {}
 			});
 		});
 		agent.hooks.hook("spawn:complete", ({ id, depth, status, stats }) => {
@@ -15893,6 +16272,7 @@ function AppShell() {
 		return agent;
 	}, [
 		providerRegistry,
+		modelsFor,
 		stream,
 		gateDecision,
 		cancelRunOnDenial,
@@ -15908,7 +16288,8 @@ function AppShell() {
 		extensionRegistry
 	]);
 	const refreshSessions = useCallback(async () => {
-		const list = await listSessionMeta(store, settings.showAllProjects ? void 0 : { projectRoot: projectDir });
+		const filter = settings.showAllProjects ? void 0 : { projectRoot: projectDir };
+		const list = await listSessionMeta(store, filter);
 		setSessions(list);
 		return list;
 	}, [
@@ -16015,10 +16396,11 @@ function AppShell() {
 		setEvents(capTranscriptEvents(eventsFromTurns(session.turns, session.runs)));
 		runningRef.current = true;
 		setBusy(true);
+		setActiveFallback(null);
 		try {
 			const runModelOptions = enabledModelOptions(currentPicked.modelOptions);
 			await agent.run({
-				model: currentPicked.model,
+				model: runModelFor(currentPicked),
 				...currentPicked.effort ? { thinking: currentPicked.effort } : {},
 				...Object.keys(runModelOptions).length > 0 ? { modelOptions: runModelOptions } : {},
 				behavior: {
@@ -16060,8 +16442,10 @@ function AppShell() {
 		sessionRef.current = session;
 		agentRef.current = buildAgent(session, key);
 		if (extensionRegistrySwapKeyRef.current === null || extensionRegistrySwapKeyRef.current === extensionRegistry) pendingAgentRebuildRef.current = false;
-		setActiveSkillNames(readPinnedSkills(session.metadata["zidane.activeSkills"]));
+		const persistedPins = readPinnedSkills(session.metadata["zidane.activeSkills"]);
+		setActiveSkillNames(persistedPins);
 		setEvents(capTranscriptEvents(eventsFromTurns(session.turns, session.runs)));
+		setActiveFallback(null);
 		const replayedTokens = lastContextSizeFromTurns(session.turns, session.runs);
 		setLastInputTokens(replayedTokens);
 		lastInputTokensRef.current = replayedTokens;
@@ -16149,7 +16533,8 @@ function AppShell() {
 	]);
 	const [availableProviders, setAvailableProviders] = useState([]);
 	const refreshAvailableProviders = useCallback(() => {
-		setAvailableProviders(detectAuth(config.paths.userDir, providerRegistry).filter((p) => p.available));
+		const detected = detectAuth(config.paths.userDir, providerRegistry);
+		setAvailableProviders(detected.filter((p) => p.available));
 	}, [config.paths.userDir, providerRegistry]);
 	useEffect(() => {
 		refreshAvailableProviders();
@@ -16456,30 +16841,36 @@ function AppShell() {
 		else setQueueSelectionIndex(Math.min(pushIdx, messageQueueRef.current.length - 1));
 	}, []);
 	/**
-	* Pick a `{ providerKey, modelId }` tuple from the cross-provider
-	* model picker. Two branches:
+	* Apply a model chain from the cross-provider picker's ordered
+	* multi-select. Entry 0 is the PRIMARY (same role as the old
+	* single-pick: provider swap, effort, options); entries 1+ become
+	* run-level fallbacks (`agent.run({ model: [...] })`).
 	*
-	*   - **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.
+	* Persistence mirrors the old single-pick path (`lastProvider` +
+	* `lastModelByProvider` track the primary) plus the additive
+	* `lastModelChain`. Fallback entries are re-validated against the
+	* live auth list; stale entries drop with a debug log.
 	*
-	* 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).
+	* The session re-activates (agent rebuild) when the primary provider
+	* changed OR the chain's provider-key SET changed — the agent must
+	* own an instance for every chain provider. A pure model / order
+	* change within the same providers stays a per-run swap, exactly
+	* like same-provider single picks always have.
 	*/
-	const onPickModel = useCallback(async (next) => {
-		const nextProvider = availableProviders.find((p) => p.key === next.providerKey);
+	const onApplyModelChain = useCallback(async (chain) => {
+		const primary = chain[0];
+		if (!primary) {
+			modal.close();
+			return;
+		}
+		const nextProvider = availableProviders.find((p) => p.key === primary.provider);
 		if (!nextProvider) {
-			debugLog("onPickModel: unknown provider key", next.providerKey);
+			debugLog("onApplyModelChain: unknown provider key", primary.provider);
 			modal.close();
 			return;
 		}
+		const fallbacks = filterChainFallbacks(chain.slice(1), primary, (k) => availableProviders.some((p) => p.key === k) && providerRegistry[k] !== void 0);
+		if (fallbacks.length < chain.length - 1) debugLog("onApplyModelChain: dropped unavailable/duplicate fallback entries", chain.length - 1 - fallbacks.length);
 		const descriptor = providerRegistry[nextProvider.key];
 		const prior = stateStore.load();
 		const providerChanged = picked?.provider.key !== nextProvider.key;
@@ -16488,19 +16879,34 @@ function AppShell() {
 			...providerChanged ? { lastProvider: nextProvider.key } : {},
 			lastModelByProvider: {
 				...prior.lastModelByProvider,
-				[nextProvider.key]: next.modelId
-			}
+				[nextProvider.key]: primary.model
+			},
+			lastModelChain: [{
+				provider: primary.provider,
+				model: primary.model
+			}, ...fallbacks]
 		});
-		const nextEffort = descriptor ? effortForModel(descriptor, next.modelId, prior.lastEffortByModel) : void 0;
-		const nextOptions = descriptor ? restoreModelOptions(descriptor, next.modelId, prior.lastModelOptionsByModel) : void 0;
-		setPicked({
+		const nextEffort = descriptor ? effortForModel(descriptor, primary.model, prior.lastEffortByModel) : void 0;
+		const nextOptions = descriptor ? restoreModelOptions(descriptor, primary.model, prior.lastModelOptionsByModel) : void 0;
+		const updated = {
 			provider: nextProvider,
-			model: next.modelId,
+			model: primary.model,
+			...fallbacks.length > 0 ? { fallbacks } : {},
 			...nextEffort ? { effort: nextEffort } : {},
 			...nextOptions ? { modelOptions: nextOptions } : {}
-		});
+		};
+		const prevChain = picked ? [{
+			provider: picked.provider.key,
+			model: picked.model
+		}, ...picked.fallbacks ?? []] : [];
+		setPicked(updated);
+		setActiveFallback(null);
+		pickedRef.current = updated;
 		modal.close();
-		if (providerChanged && currentSession && !busy && !pendingApproval) await activateSession(currentSession.id, nextProvider.key);
+		if ((providerChanged || providerKeySetChanged(prevChain, [{
+			provider: primary.provider,
+			model: primary.model
+		}, ...fallbacks])) && currentSession && !busy && !pendingApproval) await activateSession(currentSession.id, nextProvider.key);
 	}, [
 		availableProviders,
 		providerRegistry,
@@ -16535,7 +16941,8 @@ function AppShell() {
 			modelsFor,
 			current,
 			onPick: (next) => {
-				setSetting("compactionModel", next.providerKey === picked.provider.key && next.modelId === picked.model ? "" : `${next.providerKey}/${next.modelId}`);
+				const isMain = next.providerKey === picked.provider.key && next.modelId === picked.model;
+				setSetting("compactionModel", isMain ? "" : `${next.providerKey}/${next.modelId}`);
 				modal.close();
 			}
 		}));
@@ -16676,7 +17083,7 @@ function AppShell() {
 			});
 		}
 		const newRefs = uniqueSkillNamesFromReferences(references);
-		const skillNames = Array.from(new Set([...activeSkillNamesRef.current, ...newRefs]));
+		const skillNames = Array.from(/* @__PURE__ */ new Set([...activeSkillNamesRef.current, ...newRefs]));
 		for (const name of skillNames) try {
 			await withTimeout(agent.activateSkill(name), {
 				operation: `activateSkill(${name})`,
@@ -16713,8 +17120,9 @@ function AppShell() {
 				};
 			})];
 			const runModelOptions = enabledModelOptions(picked.modelOptions);
+			setActiveFallback(null);
 			await agent.run({
-				model: picked.model,
+				model: runModelFor(picked),
 				prompt: runPrompt,
 				...picked.effort ? { thinking: picked.effort } : {},
 				...Object.keys(runModelOptions).length > 0 ? { modelOptions: runModelOptions } : {},
@@ -16848,8 +17256,9 @@ function AppShell() {
 				const before = session.turns.length;
 				const beforeRuns = session.runs.length;
 				const runModelOptions = enabledModelOptions(picked.modelOptions);
+				setActiveFallback(null);
 				await agent.run({
-					model: picked.model,
+					model: runModelFor(picked),
 					prompt: agentPrompt,
 					...picked.effort ? { thinking: picked.effort } : {},
 					...Object.keys(runModelOptions).length > 0 ? { modelOptions: runModelOptions } : {},
@@ -17256,7 +17665,8 @@ function AppShell() {
 		if (!session || !p) return;
 		const stale = agentRef.current;
 		const staleWarnLog = warnLogRef.current;
-		agentRef.current = buildAgentRef.current(session, p.provider.key);
+		const fresh = buildAgentRef.current(session, p.provider.key);
+		agentRef.current = fresh;
 		if (stale) await stale.destroy().catch((err) => debugLog("rebuildActiveAgent: destroy failed", err));
 		if (staleWarnLog) await staleWarnLog.close().catch((err) => debugLog("rebuildActiveAgent: warnLog.close failed", err));
 	}, []);
@@ -17353,7 +17763,8 @@ function AppShell() {
 	]);
 	const onLogoutMcp = useCallback((name) => {
 		mcpCredentialStore.delete(name);
-		dispatchAuth(mcpsCatalogRef.current.find((d) => d.config.name === name)?.config.auth === "oauth" ? {
+		const entry = mcpsCatalogRef.current.find((d) => d.config.name === name);
+		dispatchAuth(entry?.config.auth === "oauth" ? {
 			type: "auth-required",
 			name,
 			reason: "no-tokens"
@@ -17415,7 +17826,8 @@ function AppShell() {
 			const idx = turnIds.indexOf(prev);
 			if (idx === -1) return turnIds[turnIds.length - 1];
 			const len = turnIds.length;
-			return turnIds[((idx + direction) % len + len) % len];
+			const nextIdx = ((idx + direction) % len + len) % len;
+			return turnIds[nextIdx];
 		});
 	}, [turnIds]);
 	const onForkTurn = useCallback(async (turnId) => {
@@ -17929,7 +18341,11 @@ function AppShell() {
 					providerKey: picked.provider.key,
 					modelId: picked.model
 				},
-				onPick: onPickModel
+				chain: [{
+					provider: picked.provider.key,
+					model: picked.model
+				}, ...picked.fallbacks ?? []],
+				onApplyChain: onApplyModelChain
 			}));
 			return;
 		}
@@ -17964,7 +18380,13 @@ function AppShell() {
 				autocompactBuffer: OUTPUT_RESERVE_TOKENS,
 				...settings.autoCompact && settings.autoCompactThreshold ? { compactThreshold: settings.autoCompactThreshold } : {}
 			}).then((breakdown) => {
-				if (breakdown && agentRef.current === agent) modal.open(/* @__PURE__ */ jsx$1(ContextPanelModal, { breakdown }));
+				if (breakdown && agentRef.current === agent) {
+					const modelUsage = usageByModel(sessionRef.current?.runs ?? []);
+					modal.open(/* @__PURE__ */ jsx$1(ContextPanelModal, {
+						breakdown,
+						modelUsage
+					}));
+				}
 			}).catch((err) => debugLog("getContextBreakdown failed", err));
 			return;
 		}
@@ -18135,8 +18557,8 @@ function AppShell() {
 			currentSession,
 			hasMultipleAgents,
 			uiMode: settings.uiMode,
-			modelLabel: picked?.model ?? null,
-			modelColor: COLOR.model,
+			modelLabel: activeFallback ? activeFallback.model : picked ? `${picked.model}${picked.fallbacks && picked.fallbacks.length > 0 ? ` +${picked.fallbacks.length}` : ""}` : null,
+			modelColor: activeFallback ? COLOR.warn : COLOR.model,
 			effortLabel: modelHasReasoning ? picked?.effort ?? "medium" : null,
 			effortColor: COLOR.warn,
 			modelOptionsLabel: (() => {