zidane 5.6.14 → 5.7.4

package/dist/tui.js

@@ -1,24 +1,27 @@
-import { A as getSafelist, Ai as useActiveTodos, An as turnSelectionOwnership, At as clipHintsToWidth, B as oauthUsesManualCodePaste, Bt as SETTINGS_CATEGORIES, Cr as tryOpenBrowser, D as useSafeModeQueue, Dr as useUpdateCheck, Dt as useInteractionsActions, E as useSafeModeActions, En as sumRunCosts, Er as buildUpdateHint, F as suggestSafelistEntry, Ft as buildHints, G as indexOfEntry, Gn as mergeApprovalAndBodyOutcomes, Gt as useSettings, H as supportsOAuth, Hi as buildPlanSystem, Ht as SETTINGS_TOGGLES, Ir as AUTO_COMPACT_MIN_GROWTH_FRACTION, J as discoverProjectMcps, Jn as rewriteMultiEditHeader, Jt as resolveChipColor, K as buildMcpServers, Kn as parseEditOutcomesFromResult, L as splitPromptSegments, Ln as extractEditPayload, Lr as shouldAutoCompact, Lt as listProjectFiles, Mt as truncateTrailing, Nn as buildContextualDiff, On as toolCallPreview, Ot as useInteractionsQueue, Pn as buildUnifiedDiff, Pt as generateSessionTitle, Q as loadMcpToolsCache, Qn as KEYBINDING_DEFS, Qr as getContextWindow, R as formatPathForCwd, Rn as filetypeFromPath, Rr as detectAuth, Rt as useEnabledToggleSet, Sn as marginTopFor, Sr as buildLinearRamp, St as createInteractionTools, T as SafeModeProvider, Tn as stripSpawnTokensLine, Tr as bootTick, Tt as pendingInteractionsFromTurns, U as buildModelCatalog, Ui as envSection, Un as buildEditOutcomesAnnotation, Ut as SettingsProvider, V as runOAuthLogin, Vi as buildBuildSystem, Vn as summarizeEditPayload, Vt as SETTINGS_CHOICES, W as filterModelCatalog, Wr as setProviderCredential, Wt as clampFps, Xn as summarizeOutcomes, Yn as stripEditOutcomesAnnotation, Yt as resolveTheme, _ as turnContextSize, _n as isTurnHighlighted, _t as splitMarkdownCodeBlocks, a as computeTurnAnchors, ai as discoverAgentsMd, an as useDiscovery, ar as matchesBinding, b as defaultSkillScanPaths, bi as TODO_STATUS_GLYPHS, bn as listSessionMeta, br as useCompletion, c as formatToolCall, cn as useConfig, ct as parentServerName, d as useSelectStyle, dr as createSkillsCompletionProvider, ei as modelSupportsReasoning, er as KEYBINDING_KEY_COL_WIDTH, et as refreshMcpToolsCatalog, f as useSurfaces, fn as EDIT_TOOL_NAMES, fr as uniqueSkillNamesFromReferences, ft as McpAuthProvider, g as finalizeStreamingMarkdownForOwner, gn as isEditErrorResult, h as finalizeStreamingMarkdown, hn as eventsFromTurns, ht as getMcpAuthStatus, i as turnAsText, ii as piIdOf, in as DiscoveryProvider, ir as keybindingsPath, it as useMcpToolToggleMap, j as isOnSafelist, jn as updateToolEventOutcomes, jt as hintsLength, k as addToSafelist, kn as toolResultText, kt as EMPTY_HINTS, l as ThemeProvider, ln as resolveConfig, lt as createFileMcpCredentialStore, m as useTheme, mi as accentColor, mn as deriveSessionTitle, mr as createFilesCompletionProvider, mt as useMcpAuthState, n as deleteTurnSafely, nr as formatBindingForDisplay, nt as subscribeMcpToolsCache, o as TOOL_DISPLAY, on as useDiscoveryOptional, ot as buildVisibleMcpRows, pt as useMcpAuthDispatch, qn as resolveApprovalForPayload, r as truncateTurnsAt, rn as createDiscoverySlot, rr as groupBindings, s as displayNameFor, si as findGitRoot, sn as ConfigProvider, st as indexOfServerRow, tr as ensureKeybindingsFile, u as useColors, v as useStreamBuffer, vn as isVisible, w as writeSessionExport, wn as selectableTurnIds, wt as makeRequestInteraction, x as discoverProjectSkills, xr as blendHsl, xt as buildResumedToolResultsTurn, y as buildSkillsConfig, yn as lastContextSizeFromTurns, yt as InteractionsProvider, z as fetchOAuthRedirect, zn as previewEditPayload, zt as DEFAULT_SETTINGS } from "./turn-operations-UAkOjO-u.js";
-import { A as resolvePersistDir, B as formatTaskStatus, H as previewLine, I as ageString, L as compactPath, O as cleanupPersistedSession, R as fmtTokens, U as shortId, V as formatTaskSummary, j as resolveTasksDir, p as createAgent, z as formatDuration } from "./tools-DhrLrOEr.js";
-import { n as createProcessContext } from "./contexts-BOtMvzli.js";
-import { c as errorMessage } from "./errors-DdZXnyXE.js";
-import { A as replaceDynamicSection } from "./messages-Dym8S_YH.js";
-import { s as McpOAuthProvider, t as connectMcpServers } from "./mcp-DGeB7-3D.js";
-import { C as summaryToTurn, a as selectFilesFromSession, r as buildPostCompactAttachments, s as compactConversation, t as loginMcpServer } from "./login-7tHcckmX.js";
-import { n as formatTokenUsage } from "./stats-Lc3zL3RM.js";
-import { n as loadSession, t as createSession } from "./session-BRIsmBSY.js";
+import { $ as useMcpAuthDispatch, $t as deriveSessionTitle, A as runOAuthLogin, An as buildUpdateHint, At as clampFps, B as refreshMcpToolsCatalog, Bn as AUTO_COMPACT_MIN_GROWTH_FRACTION, Ct as listProjectFiles, D as formatPathForCwd, Dn as tryOpenBrowser, Dt as SETTINGS_CHOICES, En as useCompletion, Et as SETTINGS_CATEGORIES, Ft as resolveTheme, Gt as useDiscovery, H as subscribeMcpToolsCache, Hn as detectAuth, J as parentServerName, Jn as setProviderCredential, Jt as useConfig, K as buildVisibleMcpRows, Kt as useDiscoveryOptional, M as buildMcpServers, Mr as buildBuildSystem, Nr as buildPlanSystem, O as fetchOAuthRedirect, Ot as SETTINGS_TOGGLES, P as discoverProjectMcps, Pr as envSection, Pt as resolveChipColor, Q as McpAuthProvider, Qn as findGitRoot, R as loadMcpToolsCache, T as suggestSafelistEntry, Tt as DEFAULT_SETTINGS, Ut as createDiscoverySlot, Vn as shouldAutoCompact, W as useMcpToolToggleMap, Wt as DiscoveryProvider, Xn as discoverAgentsMd, Y as createFileMcpCredentialStore, Yt as resolveConfig, _ as useSafeModeQueue, _n as ensureKeybindingsFile, _t as hintsLength, a as useSurfaces, ar as accentColor, at as InteractionsProvider, b as getSafelist, bn as keybindingsPath, bt as generateSessionTitle, c as useStreamBuffer, cn as sumRunCosts, ct as createInteractionTools, d as discoverProjectSkills, dn as toolResultText, dr as TODO_STATUS_GLYPHS, dt as pendingInteractionsFromTurns, en as eventsFromTurns, et as useMcpAuthState, fn as updateToolEventOutcomes, g as useSafeModeActions, gn as KEYBINDING_KEY_COL_WIDTH, gt as clipHintsToWidth, h as SafeModeProvider, ht as EMPTY_HINTS, i as useSelectStyle, in as marginTopFor, j as supportsOAuth, jn as useUpdateCheck, jt as useSettings, k as oauthUsesManualCodePaste, kn as bootTick, kt as SettingsProvider, l as buildSkillsConfig, m as writeSessionExport, mn as KEYBINDING_DEFS, mt as useInteractionsQueue, n as ThemeProvider, nn as listSessionMeta, on as serverToolResultSummary, pt as useInteractionsActions, q as indexOfServerRow, qt as ConfigProvider, r as useColors, rt as splitMarkdownCodeBlocks, s as useTheme, sn as stripSpawnTokensLine, st as buildResumedToolResultsTurn, t as computeTurnAnchors, tn as lastContextSizeFromTurns, tt as getMcpAuthStatus, u as defaultSkillScanPaths, un as toolCallPreview, ut as makeRequestInteraction, vn as formatBindingForDisplay, vt as truncateTrailing, wt as useEnabledToggleSet, x as isOnSafelist, xn as matchesBinding, xr as useActiveTodos, xt as buildHints, y as addToSafelist, yn as groupBindings } from "./transcript-anchors-BTSZAPVc.js";
+import { B as enabledModelOptions, E as cleanupPersistedSession, F as OUTPUT_RESERVE_TOKENS, G as modelSupportsReasoning, O as resolvePersistDir, V as getContextWindow, W as modelOptionsFor, X as restoreModelOptions, Y as piIdOf, d as createAgent, k as resolveTasksDir, z as effectiveContextWindow } from "./tools-BGtJK0vo.js";
+import { a as compactPath, c as formatTaskStatus, d as shortId, i as ageString, l as formatTaskSummary, o as fmtTokens, s as formatDuration, u as previewLine } from "./edit-utils-DnfNoj16.js";
+import { l as errorMessage } from "./errors-CoQnKRf1.js";
+import { A as replaceDynamicSection } from "./messages-CvRQTdbR.js";
+import { n as sniffImageMediaType } from "./image-sniff-B7uFSNO1.js";
+import { n as createProcessContext } from "./contexts-BD2U_xpi.js";
+import { s as McpOAuthProvider, t as connectMcpServers } from "./mcp-Kqzz-Rs_.js";
+import { r as formatTokenUsage, t as effectiveInputFromTurn } from "./stats-DAKBEKjc.js";
+import { a as selectFilesFromSession, b as summaryToTurn, r as buildPostCompactAttachments, s as compactConversation, t as loginMcpServer } from "./login-BDeqENSe.js";
+import { n as loadSession, t as createSession } from "./session-BzLou2_-.js";
 import { createTuiStore } from "./session/sqlite.js";
+import { B as summarizeOutcomes, C as buildContextualDiff, D as extractEditPayload, F as mergeApprovalAndBodyOutcomes, G as createFilesCompletionProvider, H as createSkillsCompletionProvider, I as parseEditOutcomesFromResult, L as resolveApprovalForPayload, N as buildEditOutcomesAnnotation, O as filetypeFromPath, Q as buildLinearRamp, R as rewriteMultiEditHeader, U as uniqueSkillNamesFromReferences, Z as blendHsl, _ as isEditErrorResult, a as TOOL_DISPLAY, b as selectableTurnIds, c as finalizeStreamingMarkdown, d as turnContextSize, f as splitPromptSegments, g as EDIT_TOOL_NAMES, h as indexOfEntry, i as turnAsText, j as summarizeEditPayload, k as previewEditPayload, l as finalizeStreamingMarkdownForOwner, m as filterModelCatalog, n as deleteTurnSafely, o as displayNameFor, p as buildModelCatalog, r as truncateTurnsAt, s as formatToolCall, v as isTurnHighlighted, w as buildUnifiedDiff, x as turnSelectionOwnership, y as isVisible, z as stripEditOutcomesAnnotation } from "./turn-operations-CCHfR9eC.js";
 import { basename, join, relative } from "node:path";
-import { homedir } from "node:os";
-import { spawn } from "node:child_process";
+import { Buffer } from "node:buffer";
 import * as fs from "node:fs";
 import { readFileSync, readdirSync, statSync } from "node:fs";
-import { Buffer } from "node:buffer";
+import { spawn } from "node:child_process";
+import { homedir } from "node:os";
 import { createContext, createElement, memo, useCallback, useContext, useEffect, useMemo, useRef, useState } from "react";
+import { Fzf, byLengthAsc } from "fzf";
 import { BoxRenderable, CodeRenderable, RGBA, SyntaxStyle, TextRenderable, addDefaultParsers, createCliRenderer, decodePasteBytes, defaultTextareaKeyBindings, getTreeSitterClient, stripAnsiSequences } from "@opentui/core";
 import { createRoot, useKeyboard, useRenderer, useSelectionHandler, useTerminalDimensions } from "@opentui/react";
 import { Fragment, jsx, jsxs } from "@opentui/react/jsx-runtime";
-import { Fzf, byLengthAsc } from "fzf";
 //#region src/tui/modal.tsx
 const ModalContext = createContext(null);
 function ModalRoot({ children }) {
@@ -2520,6 +2523,418 @@ function TodoInProgressList({ input, dim }) {
 	});
 }
 //#endregion
+//#region src/tui/context-panel.tsx
+/**
+* Distinct categorical palette for the bar + swatches — kept in lock-step with
+* the GUI popover (`CATEGORY_COLORS` in `ChatboxControls.tsx`) so both surfaces
+* read identically. Fixed hues (not theme tokens) so the same category is the
+* same color across every theme and across both surfaces. Deferred/free fall
+* through to muted theme tones via {@link colorFor}.
+*/
+const CATEGORY_HEX = {
+	systemPrompt: "#4f9dff",
+	rules: "#22d3ee",
+	skills: "#a855f7",
+	mcpInstructions: "#eab308",
+	subagentDefs: "#ec4899",
+	tools: "#22c55e",
+	mcpTools: "#f59e0b",
+	conversation: "#fb923c"
+};
+function colorFor(id, COLOR) {
+	return CATEGORY_HEX[id] ?? COLOR.mute;
+}
+/** Percent label — `<1%` for tiny non-zero shares, empty at exactly 0. */
+function pctLabel(tokens, denom) {
+	if (tokens <= 0 || denom <= 0) return "";
+	const raw = tokens / denom * 100;
+	return raw < 1 ? "<1%" : `${Math.round(raw)}%`;
+}
+function ContextPanelModal({ breakdown }) {
+	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]);
+	const [cursor, setCursor] = useState(0);
+	const safeCursor = expandableIds.length === 0 ? 0 : Math.min(cursor, expandableIds.length - 1);
+	useKeyboard((key) => {
+		if (expandableIds.length === 0) return;
+		if (key.name === "up") {
+			setCursor((i) => ((i - 1) % expandableIds.length + expandableIds.length) % expandableIds.length);
+			return;
+		}
+		if (key.name === "down") {
+			setCursor((i) => (i + 1) % expandableIds.length);
+			return;
+		}
+		if (key.name === "return" || key.name === "space") {
+			const id = expandableIds[safeCursor];
+			setExpanded((prev) => {
+				const next = new Set(prev);
+				if (next.has(id)) next.delete(id);
+				else next.add(id);
+				return next;
+			});
+		}
+	});
+	const denom = breakdown.effectiveWindow || breakdown.used || 1;
+	const live = breakdown.categories.filter((c) => !c.deferred);
+	const deferred = breakdown.categories.filter((c) => c.deferred);
+	const pct = Math.round(breakdown.fraction * 100);
+	const usedColor = pct >= 85 ? COLOR.error : pct >= 60 ? COLOR.warn : COLOR.brand;
+	return /* @__PURE__ */ jsxs(Modal, {
+		title: "context window",
+		maxWidth: 76,
+		children: [
+			/* @__PURE__ */ jsxs("box", {
+				style: {
+					flexDirection: "column",
+					flexShrink: 0
+				},
+				children: [
+					/* @__PURE__ */ jsxs("box", {
+						style: {
+							flexDirection: "row",
+							height: 1,
+							flexShrink: 0
+						},
+						children: [
+							/* @__PURE__ */ jsx("text", {
+								wrapMode: "none",
+								fg: COLOR.mute,
+								children: breakdown.modelId
+							}),
+							/* @__PURE__ */ jsx("box", { style: { flexGrow: 1 } }),
+							/* @__PURE__ */ jsxs("text", {
+								wrapMode: "none",
+								children: [
+									/* @__PURE__ */ jsx("span", {
+										fg: usedColor,
+										children: fmtTokens(breakdown.used)
+									}),
+									/* @__PURE__ */ jsx("span", {
+										fg: COLOR.mute,
+										children: ` / ${fmtTokens(breakdown.effectiveWindow)} `
+									}),
+									/* @__PURE__ */ jsx("span", {
+										fg: usedColor,
+										children: `(${pct}%)`
+									})
+								]
+							})
+						]
+					}),
+					/* @__PURE__ */ jsx("box", {
+						style: {
+							height: 1,
+							flexShrink: 0,
+							marginTop: 1
+						},
+						children: /* @__PURE__ */ jsx(StackedBar, {
+							breakdown,
+							denom,
+							COLOR
+						})
+					}),
+					/* @__PURE__ */ jsx("box", { style: {
+						height: 1,
+						flexShrink: 0
+					} }),
+					live.map((cat) => /* @__PURE__ */ jsx(CategoryRows, {
+						cat,
+						denom,
+						COLOR,
+						isCursor: expandableIds[safeCursor] === cat.id,
+						isExpanded: expanded.has(cat.id)
+					}, cat.id)),
+					deferred.length > 0 && /* @__PURE__ */ jsxs(Fragment, { children: [/* @__PURE__ */ jsx("box", { style: {
+						height: 1,
+						flexShrink: 0
+					} }), deferred.map((cat) => /* @__PURE__ */ jsx(CategoryRows, {
+						cat,
+						denom,
+						COLOR,
+						isCursor: expandableIds[safeCursor] === cat.id,
+						isExpanded: expanded.has(cat.id)
+					}, cat.id))] }),
+					breakdown.activeSkills && breakdown.activeSkills.length > 0 && /* @__PURE__ */ jsx(ActiveSkillsRow, {
+						skills: breakdown.activeSkills,
+						COLOR
+					}),
+					breakdown.usage && /* @__PURE__ */ jsx(UsageRows, {
+						usage: breakdown.usage,
+						COLOR
+					})
+				]
+			}),
+			breakdown.hasEstimates && /* @__PURE__ */ jsxs("text", {
+				fg: COLOR.dim,
+				children: [/* @__PURE__ */ jsx("span", {
+					fg: COLOR.mute,
+					children: "~"
+				}), " estimated — exact counts unavailable for this provider"]
+			}),
+			/* @__PURE__ */ jsx("text", {
+				fg: COLOR.dim,
+				children: expandableIds.length > 0 ? /* @__PURE__ */ jsxs(Fragment, { children: [
+					/* @__PURE__ */ jsx("span", {
+						fg: COLOR.warn,
+						children: "↑↓"
+					}),
+					" navigate · ",
+					/* @__PURE__ */ jsx("span", {
+						fg: COLOR.warn,
+						children: "↵/space"
+					}),
+					" expand · ",
+					/* @__PURE__ */ jsx("span", {
+						fg: COLOR.warn,
+						children: "esc"
+					}),
+					" close"
+				] }) : /* @__PURE__ */ jsxs(Fragment, { children: [/* @__PURE__ */ jsx("span", {
+					fg: COLOR.warn,
+					children: "esc"
+				}), " close"] })
+			})
+		]
+	});
+}
+/**
+* Single-row stacked bar that fills the panel width. Layout (left → right):
+*   [ colored category segments ][ free space ][ autocompact buffer ]
+*
+* Sizing uses `flexGrow` weights (×1000 of the window fraction) so the bar
+* stretches to the full container width. Each non-zero colored segment also
+* carries `minWidth: 1` so tiny shares (system/tools at <1% of a 1M window)
+* stay visible instead of collapsing into one color. The autocompact buffer is
+* pinned at the far right — reserved tail headroom, consumed last.
+*/
+function StackedBar({ breakdown, denom, COLOR }) {
+	const live = breakdown.categories.filter((c) => !c.deferred && c.tokens > 0);
+	const buffer = breakdown.categories.find((c) => c.id === "autocompactBuffer" && c.tokens > 0);
+	const MIN_WEIGHT = 14;
+	const w = (tokens) => Math.max(MIN_WEIGHT, Math.round(tokens / denom * 1e3));
+	const colored = live.map((c) => ({
+		id: c.id,
+		weight: w(c.tokens)
+	}));
+	const coloredWeight = colored.reduce((a, s) => a + s.weight, 0);
+	const bufferWeight = buffer ? Math.round(buffer.tokens / denom * 1e3) : 0;
+	const freeWeight = Math.max(0, 1e3 - coloredWeight - bufferWeight);
+	return /* @__PURE__ */ jsxs("box", {
+		style: {
+			flexDirection: "row",
+			flexGrow: 1,
+			height: 1
+		},
+		children: [
+			colored.map((s, i) => /* @__PURE__ */ jsx("box", { style: {
+				flexGrow: s.weight,
+				flexBasis: 0,
+				height: 1,
+				backgroundColor: colorFor(s.id, COLOR)
+			} }, `${s.id}-${i}`)),
+			freeWeight > 0 && /* @__PURE__ */ jsx("box", { style: {
+				flexGrow: freeWeight,
+				flexBasis: 0,
+				height: 1,
+				backgroundColor: COLOR.mute
+			} }),
+			bufferWeight > 0 && /* @__PURE__ */ jsx("box", { style: {
+				flexGrow: bufferWeight,
+				flexBasis: 0,
+				height: 1,
+				backgroundColor: COLOR.dim
+			} })
+		]
+	});
+}
+/**
+* Currently-active skills. Informational — an activated skill's body lives in
+* the conversation (already counted there); this surfaces which are loaded.
+*/
+function ActiveSkillsRow({ skills, COLOR }) {
+	return /* @__PURE__ */ jsxs(Fragment, { children: [
+		/* @__PURE__ */ jsx("box", { style: {
+			height: 1,
+			flexShrink: 0
+		} }),
+		/* @__PURE__ */ jsx("box", {
+			style: {
+				height: 1,
+				flexShrink: 0
+			},
+			children: /* @__PURE__ */ jsx("text", {
+				wrapMode: "none",
+				fg: COLOR.mute,
+				children: "active skills"
+			})
+		}),
+		skills.map((name) => /* @__PURE__ */ jsx("box", {
+			style: {
+				flexDirection: "row",
+				height: 1,
+				flexShrink: 0
+			},
+			children: /* @__PURE__ */ jsxs("text", {
+				wrapMode: "none",
+				children: [/* @__PURE__ */ jsx("span", {
+					fg: CATEGORY_HEX.skills,
+					children: "✦ "
+				}), /* @__PURE__ */ jsx("span", {
+					fg: COLOR.dim,
+					children: name
+				})]
+			})
+		}, name))
+	] });
+}
+/**
+* Exact last-turn token split (cache read / write / fresh input / output).
+* Informational — sits below the categories, all values exact (no `~`).
+*/
+function UsageRows({ usage, COLOR }) {
+	const rows = [
+		{
+			label: "Cached (read)",
+			tokens: usage.cacheRead
+		},
+		{
+			label: "Cache write",
+			tokens: usage.cacheCreation
+		},
+		{
+			label: "Fresh input",
+			tokens: usage.input
+		},
+		{
+			label: "Output",
+			tokens: usage.output
+		}
+	].filter((r) => r.tokens > 0);
+	if (rows.length === 0) return null;
+	return /* @__PURE__ */ jsxs(Fragment, { children: [
+		/* @__PURE__ */ jsx("box", { style: {
+			height: 1,
+			flexShrink: 0
+		} }),
+		/* @__PURE__ */ jsx("box", {
+			style: {
+				height: 1,
+				flexShrink: 0
+			},
+			children: /* @__PURE__ */ jsx("text", {
+				wrapMode: "none",
+				fg: COLOR.mute,
+				children: "last turn"
+			})
+		}),
+		rows.map((r) => /* @__PURE__ */ jsxs("box", {
+			style: {
+				flexDirection: "row",
+				height: 1,
+				flexShrink: 0
+			},
+			children: [
+				/* @__PURE__ */ jsx("text", {
+					wrapMode: "none",
+					fg: COLOR.mute,
+					children: r.label
+				}),
+				/* @__PURE__ */ jsx("box", { style: { flexGrow: 1 } }),
+				/* @__PURE__ */ jsx("text", {
+					wrapMode: "none",
+					fg: COLOR.dim,
+					children: fmtTokens(r.tokens)
+				})
+			]
+		}, r.label))
+	] });
+}
+function CategoryRows({ cat, denom, COLOR, isCursor, isExpanded }) {
+	const SURFACE = useSurfaces();
+	const pct = pctLabel(cat.tokens, denom);
+	const hasItems = !!cat.items && cat.items.length > 0;
+	const labelColor = isCursor ? COLOR.brand : cat.deferred ? COLOR.mute : COLOR.dim;
+	const marker = hasItems ? isExpanded ? " ▾" : " ▸" : "";
+	return /* @__PURE__ */ jsxs("box", {
+		style: {
+			flexDirection: "column",
+			flexShrink: 0
+		},
+		children: [/* @__PURE__ */ jsxs("box", {
+			style: {
+				flexDirection: "row",
+				height: 1,
+				flexShrink: 0,
+				backgroundColor: isCursor && hasItems ? SURFACE.selection : void 0
+			},
+			children: [
+				/* @__PURE__ */ jsxs("text", {
+					wrapMode: "none",
+					children: [
+						/* @__PURE__ */ jsx("span", {
+							fg: colorFor(cat.id, COLOR),
+							children: "■ "
+						}),
+						/* @__PURE__ */ jsx("span", {
+							fg: labelColor,
+							children: cat.label
+						}),
+						marker ? /* @__PURE__ */ jsx("span", {
+							fg: hasItems && isCursor ? COLOR.brand : COLOR.mute,
+							children: marker
+						}) : null
+					]
+				}),
+				/* @__PURE__ */ jsx("box", { style: { flexGrow: 1 } }),
+				/* @__PURE__ */ jsxs("text", {
+					wrapMode: "none",
+					children: [
+						cat.estimated && /* @__PURE__ */ jsx("span", {
+							fg: COLOR.mute,
+							children: "~"
+						}),
+						/* @__PURE__ */ jsx("span", {
+							fg: cat.deferred ? COLOR.mute : COLOR.dim,
+							children: fmtTokens(cat.tokens)
+						}),
+						pct ? /* @__PURE__ */ jsx("span", {
+							fg: COLOR.mute,
+							children: `  ${pct}`
+						}) : null
+					]
+				})
+			]
+		}), isExpanded && hasItems && cat.items.map((item) => /* @__PURE__ */ jsxs("box", {
+			style: {
+				flexDirection: "row",
+				height: 1,
+				paddingLeft: 2,
+				flexShrink: 0
+			},
+			children: [
+				/* @__PURE__ */ jsx("text", {
+					wrapMode: "none",
+					fg: COLOR.mute,
+					children: item.label
+				}),
+				/* @__PURE__ */ jsx("box", { style: { flexGrow: 1 } }),
+				/* @__PURE__ */ jsxs("text", {
+					wrapMode: "none",
+					children: [item.estimated && /* @__PURE__ */ jsx("span", {
+						fg: COLOR.mute,
+						children: "~"
+					}), /* @__PURE__ */ jsx("span", {
+						fg: COLOR.mute,
+						children: fmtTokens(item.tokens)
+					})]
+				})
+			]
+		}, item.id))]
+	});
+}
+//#endregion
 //#region src/tui/cwd-picker.tsx
 const VISIBLE_ROWS$1 = 12;
 const HOME = homedir();
@@ -2667,8 +3082,7 @@ function CwdPickerModal({ currentCwd, onPick }) {
 			start: 0,
 			slice: results
 		};
-		const half = Math.floor(VISIBLE_ROWS$1 / 2);
-		let start = Math.max(0, safeIndex - half);
+		let start = Math.max(0, safeIndex - Math.floor(VISIBLE_ROWS$1 / 2));
 		if (start + VISIBLE_ROWS$1 > results.length) start = results.length - VISIBLE_ROWS$1;
 		return {
 			start,
@@ -3007,200 +3421,8 @@ function readToolsByServer(dataDir) {
 	return out;
 }
 //#endregion
-//#region src/tui/effort-picker.tsx
-const BASE_LEVELS = [
-	{
-		id: "off",
-		description: "no reasoning — fastest, smallest output"
-	},
-	{
-		id: "minimal",
-		description: "tiny reasoning budget (gpt-5 family)"
-	},
-	{
-		id: "low",
-		description: "short reasoning pass"
-	},
-	{
-		id: "medium",
-		description: "balanced — sensible default"
-	},
-	{
-		id: "high",
-		description: "deep reasoning — slowest, longest"
-	}
-];
-const ADAPTIVE_LEVEL = {
-	id: "adaptive",
-	description: "model decides per-turn (Anthropic)"
-};
-function EffortPickerModal({ current, supportsAdaptive, onPick }) {
-	const COLOR = useColors();
-	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);
-		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) => {
-				if (filtered.length === 0) return i;
-				return ((i - 1) % filtered.length + filtered.length) % filtered.length;
-			});
-			return;
-		}
-		if (key.name === "down") {
-			setSelectedIdx((i) => {
-				if (filtered.length === 0) return i;
-				return (i + 1) % filtered.length;
-			});
-			return;
-		}
-		if (key.name === "return") commit();
-	});
-	return /* @__PURE__ */ jsxs(Modal, {
-		title: "select reasoning effort",
-		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: isCurrent ? COLOR.brand : COLOR.mute,
-					children: marker
-				}),
-				/* @__PURE__ */ jsx("span", {
-					fg: COLOR.mute,
-					children: " "
-				}),
-				/* @__PURE__ */ jsx("span", {
-					fg: isFocused ? COLOR.brand : COLOR.dim,
-					children: level.id
-				}),
-				/* @__PURE__ */ jsx("span", {
-					fg: COLOR.mute,
-					children: " · "
-				}),
-				/* @__PURE__ */ jsx("span", {
-					fg: COLOR.mute,
-					children: level.description
-				})
-			]
-		})
-	});
-}
-//#endregion
-//#region src/tui/keybindings-modal.tsx
-function KeybindingsModal({ bindings, filePath, onEditFile, onClose }) {
+//#region src/tui/keybindings-modal.tsx
+function KeybindingsModal({ bindings, filePath, onEditFile, onClose }) {
 	const SURFACE = useSurfaces();
 	const { height: termHeight } = useTerminalDimensions();
 	const scrollRef = useRef(null);
@@ -3251,7 +3473,7 @@ function KeybindingsCatalog({ sections }) {
 				flexShrink: 0,
 				marginTop: sectionIdx === 0 ? 0 : 1
 			},
-			children: [/* @__PURE__ */ jsx(SectionHeader, { label: section.group }), section.rows.map((row) => /* @__PURE__ */ jsx(BindingRow, {
+			children: [/* @__PURE__ */ jsx(SectionHeader$1, { label: section.group }), section.rows.map((row) => /* @__PURE__ */ jsx(BindingRow, {
 				def: row.def,
 				spec: row.spec
 			}, row.def.action))]
@@ -3308,7 +3530,7 @@ function KeybindingsEditFileButton({ filePath, highlightBg }) {
 		})]
 	});
 }
-function SectionHeader({ label }) {
+function SectionHeader$1({ label }) {
 	return /* @__PURE__ */ jsx("box", {
 		style: {
 			flexShrink: 0,
@@ -3324,57 +3546,285 @@ function SectionHeader({ label }) {
 		})
 	});
 }
-function BindingRow({ def, spec }) {
+function BindingRow({ def, spec }) {
+	const COLOR = useColors();
+	const display = formatBindingForDisplay(spec);
+	const keyText = (display || "—").padEnd(KEYBINDING_KEY_COL_WIDTH, " ");
+	return /* @__PURE__ */ jsxs("box", {
+		style: {
+			flexDirection: "column",
+			flexShrink: 0,
+			paddingLeft: 3,
+			paddingRight: 1
+		},
+		children: [/* @__PURE__ */ jsxs("text", {
+			wrapMode: "none",
+			children: [/* @__PURE__ */ jsx("span", {
+				fg: display ? COLOR.warn : COLOR.mute,
+				children: keyText
+			}), /* @__PURE__ */ jsx("span", {
+				fg: COLOR.dim,
+				children: def.label
+			})]
+		}), /* @__PURE__ */ jsx("box", {
+			style: {
+				flexShrink: 0,
+				paddingLeft: KEYBINDING_KEY_COL_WIDTH
+			},
+			children: /* @__PURE__ */ jsx("text", {
+				wrapMode: "word",
+				fg: COLOR.mute,
+				children: def.description
+			})
+		})]
+	});
+}
+function CountsBadge$1({ count }) {
+	const COLOR = useColors();
+	return /* @__PURE__ */ jsxs("text", {
+		wrapMode: "none",
+		children: [
+			/* @__PURE__ */ jsx("span", {
+				fg: COLOR.mute,
+				children: " "
+			}),
+			/* @__PURE__ */ jsx("span", {
+				fg: COLOR.accent,
+				children: String(count)
+			}),
+			/* @__PURE__ */ jsx("span", {
+				fg: COLOR.mute,
+				children: ` action${count === 1 ? "" : "s"} `
+			})
+		]
+	});
+}
+//#endregion
+//#region src/tui/model-options-picker.tsx
+const BASE_LEVELS$1 = [
+	{
+		id: "off",
+		description: "no reasoning — fastest, smallest output"
+	},
+	{
+		id: "minimal",
+		description: "tiny reasoning budget (gpt-5 family)"
+	},
+	{
+		id: "low",
+		description: "short reasoning pass"
+	},
+	{
+		id: "medium",
+		description: "balanced — sensible default"
+	},
+	{
+		id: "high",
+		description: "deep reasoning — slowest, longest"
+	}
+];
+const ADAPTIVE_LEVEL$1 = {
+	id: "adaptive",
+	description: "model decides per-turn (Anthropic)"
+};
+function ModelOptionsPickerModal({ supportsReasoning, supportsAdaptive, currentEffort, options, enabled, onPickEffort, onToggleOption }) {
+	const COLOR = useColors();
+	const SURFACE = useSurfaces();
+	const [selectedIdx, setSelectedIdx] = useState(0);
+	const [localEnabled, setLocalEnabled] = useState(() => ({ ...enabled }));
+	const handleToggle = (optionId) => {
+		setLocalEnabled((prev) => ({
+			...prev,
+			[optionId]: !prev[optionId]
+		}));
+		onToggleOption(optionId);
+	};
+	const rows = useMemo(() => {
+		const out = [];
+		if (supportsReasoning) {
+			const levels = supportsAdaptive ? [...BASE_LEVELS$1, ADAPTIVE_LEVEL$1] : BASE_LEVELS$1;
+			for (const level of levels) out.push({
+				kind: "effort",
+				level
+			});
+		}
+		for (const option of options) out.push({
+			kind: "option",
+			option
+		});
+		return out;
+	}, [
+		supportsReasoning,
+		supportsAdaptive,
+		options
+	]);
+	const safeIndex = rows.length === 0 ? 0 : Math.min(selectedIdx, rows.length - 1);
+	const firstOptionIdx = rows.findIndex((r) => r.kind === "option");
+	useKeyboard((key) => {
+		if (key.name === "up") {
+			setSelectedIdx((i) => rows.length === 0 ? i : ((i - 1) % rows.length + rows.length) % rows.length);
+			return;
+		}
+		if (key.name === "down") {
+			setSelectedIdx((i) => rows.length === 0 ? i : (i + 1) % rows.length);
+			return;
+		}
+		if (key.name === "return" || key.name === "space") {
+			const row = rows[safeIndex];
+			if (!row) return;
+			if (row.kind === "effort") onPickEffort(row.level.id);
+			else handleToggle(row.option.id);
+		}
+	});
+	return /* @__PURE__ */ jsxs(Modal, {
+		title: "model options",
+		maxWidth: 80,
+		children: [/* @__PURE__ */ jsxs("box", {
+			style: {
+				flexDirection: "column",
+				flexShrink: 0
+			},
+			children: [supportsReasoning && /* @__PURE__ */ jsx(SectionHeader, {
+				label: "reasoning effort",
+				color: COLOR.mute
+			}), rows.map((row, i) => {
+				const isFocused = i === safeIndex;
+				if (row.kind === "effort") return /* @__PURE__ */ jsx(EffortRow$1, {
+					level: row.level,
+					isCurrent: row.level.id === currentEffort,
+					isFocused,
+					highlightBg: SURFACE.selection
+				}, `effort:${row.level.id}`);
+				return /* @__PURE__ */ jsxs("box", {
+					style: {
+						flexDirection: "column",
+						flexShrink: 0
+					},
+					children: [i === firstOptionIdx && /* @__PURE__ */ jsxs(Fragment, { children: [supportsReasoning && /* @__PURE__ */ jsx("box", { style: {
+						height: 1,
+						flexShrink: 0
+					} }), /* @__PURE__ */ jsx(SectionHeader, {
+						label: "features",
+						color: COLOR.mute
+					})] }), /* @__PURE__ */ jsx(OptionRow, {
+						option: row.option,
+						isEnabled: localEnabled[row.option.id] === true,
+						isFocused,
+						highlightBg: SURFACE.selection
+					})]
+				}, `option:${row.option.id}`);
+			})]
+		}), /* @__PURE__ */ jsxs("text", {
+			fg: COLOR.dim,
+			children: [
+				/* @__PURE__ */ jsx("span", {
+					fg: COLOR.warn,
+					children: "↑↓"
+				}),
+				" navigate · ",
+				/* @__PURE__ */ jsx("span", {
+					fg: COLOR.warn,
+					children: "↵/space"
+				}),
+				" select/toggle · ",
+				/* @__PURE__ */ jsx("span", {
+					fg: COLOR.warn,
+					children: "esc"
+				}),
+				" close"
+			]
+		})]
+	});
+}
+function SectionHeader({ label, color }) {
+	return /* @__PURE__ */ jsx("box", {
+		style: {
+			height: 1,
+			paddingLeft: 1,
+			flexShrink: 0
+		},
+		children: /* @__PURE__ */ jsx("text", {
+			wrapMode: "none",
+			children: /* @__PURE__ */ jsx("span", {
+				fg: color,
+				children: label
+			})
+		})
+	});
+}
+function EffortRow$1({ 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: isCurrent ? COLOR.brand : COLOR.mute,
+					children: marker
+				}),
+				/* @__PURE__ */ jsx("span", {
+					fg: COLOR.mute,
+					children: " "
+				}),
+				/* @__PURE__ */ jsx("span", {
+					fg: isFocused ? COLOR.brand : COLOR.dim,
+					children: level.id
+				}),
+				/* @__PURE__ */ jsx("span", {
+					fg: COLOR.mute,
+					children: " · "
+				}),
+				/* @__PURE__ */ jsx("span", {
+					fg: COLOR.mute,
+					children: level.description
+				})
+			]
+		})
+	});
+}
+function OptionRow({ option, isEnabled, isFocused, highlightBg }) {
 	const COLOR = useColors();
-	const display = formatBindingForDisplay(spec);
-	const keyText = (display || "—").padEnd(KEYBINDING_KEY_COL_WIDTH, " ");
-	return /* @__PURE__ */ jsxs("box", {
+	const marker = isEnabled ? "[x]" : "[ ]";
+	return /* @__PURE__ */ jsx("box", {
 		style: {
-			flexDirection: "column",
+			height: 1,
+			paddingLeft: 1,
+			paddingRight: 1,
 			flexShrink: 0,
-			paddingLeft: 3,
-			paddingRight: 1
+			backgroundColor: isFocused ? highlightBg : void 0
 		},
-		children: [/* @__PURE__ */ jsxs("text", {
+		children: /* @__PURE__ */ jsxs("text", {
 			wrapMode: "none",
-			children: [/* @__PURE__ */ jsx("span", {
-				fg: display ? COLOR.warn : COLOR.mute,
-				children: keyText
-			}), /* @__PURE__ */ jsx("span", {
-				fg: COLOR.dim,
-				children: def.label
-			})]
-		}), /* @__PURE__ */ jsx("box", {
-			style: {
-				flexShrink: 0,
-				paddingLeft: KEYBINDING_KEY_COL_WIDTH
-			},
-			children: /* @__PURE__ */ jsx("text", {
-				wrapMode: "word",
-				fg: COLOR.mute,
-				children: def.description
-			})
-		})]
-	});
-}
-function CountsBadge$1({ count }) {
-	const COLOR = useColors();
-	return /* @__PURE__ */ jsxs("text", {
-		wrapMode: "none",
-		children: [
-			/* @__PURE__ */ jsx("span", {
-				fg: COLOR.mute,
-				children: " "
-			}),
-			/* @__PURE__ */ jsx("span", {
-				fg: COLOR.accent,
-				children: String(count)
-			}),
-			/* @__PURE__ */ jsx("span", {
-				fg: COLOR.mute,
-				children: ` action${count === 1 ? "" : "s"} `
-			})
-		]
+			children: [
+				/* @__PURE__ */ jsx("span", {
+					fg: isEnabled ? COLOR.brand : COLOR.mute,
+					children: marker
+				}),
+				/* @__PURE__ */ jsx("span", {
+					fg: COLOR.mute,
+					children: " "
+				}),
+				/* @__PURE__ */ jsx("span", {
+					fg: isFocused ? COLOR.brand : COLOR.dim,
+					children: option.label
+				}),
+				option.description ? /* @__PURE__ */ jsxs(Fragment, { children: [/* @__PURE__ */ jsx("span", {
+					fg: COLOR.mute,
+					children: " · "
+				}), /* @__PURE__ */ jsx("span", {
+					fg: COLOR.mute,
+					children: option.description
+				})] }) : null
+			]
+		})
 	});
 }
 //#endregion
@@ -3442,8 +3892,7 @@ function ModelPickerModal({ providers, modelsFor, current, onPick }) {
 			start: 0,
 			slice: filtered
 		};
-		const half = Math.floor(VISIBLE_ROWS / 2);
-		let start = Math.max(0, safeIndex - half);
+		let start = Math.max(0, safeIndex - Math.floor(VISIBLE_ROWS / 2));
 		if (start + VISIBLE_ROWS > filtered.length) start = filtered.length - VISIBLE_ROWS;
 		return {
 			start,
@@ -4525,23 +4974,25 @@ function snippet(s) {
 }
 //#endregion
 //#region src/tui/interaction-block.tsx
-const COMMENT_TEXTAREA_BINDINGS = [
-	...defaultTextareaKeyBindings.filter((b) => b.name !== "return" && !(b.name === "a" && b.ctrl && !b.shift && !b.meta)),
-	{
-		name: "a",
-		ctrl: true,
-		action: "select-all"
-	},
-	{
-		name: "return",
-		action: "submit"
-	},
-	{
-		name: "return",
-		shift: true,
-		action: "newline"
-	}
-];
+const COMMENT_TEXTAREA_BINDINGS = (() => {
+	return [
+		...defaultTextareaKeyBindings.filter((b) => b.name !== "return" && !(b.name === "a" && b.ctrl && !b.shift && !b.meta)),
+		{
+			name: "a",
+			ctrl: true,
+			action: "select-all"
+		},
+		{
+			name: "return",
+			action: "submit"
+		},
+		{
+			name: "return",
+			shift: true,
+			action: "newline"
+		}
+	];
+})();
 /**
 * InteractionBlock — picker UI for `present_plan` and `ask_user` tool calls.
 *
@@ -5615,13 +6066,7 @@ const API_KEY_INPUT_BINDINGS = makeSubmitBindings(false);
 function findByKey(items, value) {
 	return typeof value === "string" ? items.find((i) => i.key === value) : void 0;
 }
-/**
-* Sentinel value used by the picker's "+ add / re-configure" option. Lives
-* outside the provider key namespace (key strings are at least one char, no
-* leading `__`) so we can't collide with a real registry entry.
-*/
-const WIZARD_OPTION_VALUE = "__wizard__";
-function AuthScreen({ onPick }) {
+function AuthScreen({ onPick, initialConfigureKey }) {
 	const config = useConfig();
 	const { providers: registry } = config;
 	const focused = useModalAwareFocus();
@@ -5632,30 +6077,48 @@ function AuthScreen({ onPick }) {
 	useEffect(() => {
 		refresh();
 	}, [refresh]);
-	const [forceWizard, setForceWizard] = useState(false);
+	const [configuring, setConfiguring] = useState(() => initialConfigureKey ? registry[initialConfigureKey] ?? null : null);
 	const available = useMemo(() => providers.filter((p) => p.available), [providers]);
-	const onWizardDone = useCallback(() => {
-		setForceWizard(false);
-		refresh();
-	}, [refresh]);
-	if (available.length === 0 || forceWizard) {
-		const canCancel = forceWizard && available.length > 0;
-		return /* @__PURE__ */ jsx(SetupWizard, {
-			registry,
-			dataDir: config.paths.userDir,
-			onConfigured: onWizardDone,
-			onCancel: canCancel ? () => setForceWizard(false) : void 0
-		});
-	}
+	const onWizardDone = useCallback((descriptorKey) => {
+		setConfiguring(null);
+		const detected = detectAuth(config.paths.userDir, registry);
+		setProviders(detected);
+		const configured = detected.find((p) => p.key === descriptorKey);
+		if (configured?.available) onPick(configured);
+	}, [
+		config.paths.userDir,
+		registry,
+		onPick
+	]);
+	const onSelectProvider = useCallback((p) => {
+		if (p.available) {
+			onPick(p);
+			return;
+		}
+		const descriptor = registry[p.key];
+		if (descriptor) setConfiguring(descriptor);
+	}, [registry, onPick]);
+	if (configuring) return /* @__PURE__ */ jsx(SetupWizard, {
+		registry,
+		dataDir: config.paths.userDir,
+		initialDescriptor: configuring,
+		onConfigured: onWizardDone,
+		onCancel: available.length > 0 ? () => setConfiguring(null) : void 0
+	});
+	if (available.length === 0) return /* @__PURE__ */ jsx(SetupWizard, {
+		registry,
+		dataDir: config.paths.userDir,
+		onConfigured: onWizardDone
+	});
 	const options = [...available.map((p) => ({
 		name: p.label,
 		description: p.methods.map((m) => m.detail).join(" · "),
 		value: p.key
-	})), {
-		name: "+ add or re-configure a provider",
-		description: "launch the setup wizard",
-		value: WIZARD_OPTION_VALUE
-	}];
+	})), ...providers.filter((p) => !p.available).map((p) => ({
+		name: p.label,
+		description: "not configured — press ↵ to set up",
+		value: p.key
+	}))];
 	return /* @__PURE__ */ jsxs("box", {
 		style: {
 			flexDirection: "column",
@@ -5676,57 +6139,114 @@ function AuthScreen({ onPick }) {
 				wrapSelection: true,
 				onSelect: (_idx, option) => {
 					if (!option) return;
-					if (option.value === WIZARD_OPTION_VALUE) {
-						setForceWizard(true);
-						return;
-					}
-					const provider = findByKey(available, option.value);
-					if (provider) onPick(provider);
+					const provider = findByKey(providers, option.value);
+					if (provider) onSelectProvider(provider);
 				},
 				style: { flexGrow: 1 }
 			})
 		}), /* @__PURE__ */ jsx(TitleOverlay, { title: "pick a provider" })]
 	});
 }
-function SetupWizard({ registry, dataDir, onConfigured, onCancel }) {
-	const [step, setStep] = useState({ kind: "pick-provider" });
+/**
+* First credential step for a chosen provider. The method picker only earns
+* its place when there's a genuine choice — i.e. the provider supports OAuth
+* in addition to an API key. For API-key-only providers (e.g. `local`,
+* Cerebras), it's a single-option screen, so we skip it and go straight to the
+* customFields form / API-key input.
+*/
+function firstCredentialStep(descriptor) {
+	if (supportsOAuth(descriptor)) return {
+		kind: "pick-method",
+		descriptor
+	};
+	if (descriptor.customFields && descriptor.customFields.length > 0) return {
+		kind: "enter-custom-fields",
+		descriptor
+	};
+	return {
+		kind: "enter-apikey",
+		descriptor,
+		customFields: {}
+	};
+}
+function SetupWizard({ registry, dataDir, initialDescriptor, onConfigured, onCancel }) {
+	const [step, setStep] = useState(initialDescriptor ? firstCredentialStep(initialDescriptor) : { kind: "pick-provider" });
 	const [error, setError] = useState(null);
 	const descriptors = useMemo(() => Object.values(registry), [registry]);
 	const onPickProvider = useCallback((descriptor) => {
 		setError(null);
-		setStep({
-			kind: "pick-method",
-			descriptor
-		});
+		setStep(firstCredentialStep(descriptor));
 	}, []);
 	const onPickMethod = useCallback((descriptor, method) => {
 		setError(null);
-		if (method === "apikey") setStep({
-			kind: "enter-apikey",
+		if (method === "apikey") if (descriptor.customFields && descriptor.customFields.length > 0) setStep({
+			kind: "enter-custom-fields",
 			descriptor
 		});
+		else setStep({
+			kind: "enter-apikey",
+			descriptor,
+			customFields: {}
+		});
 		else setStep({
 			kind: "oauth-running",
 			descriptor
 		});
 	}, []);
-	const onApiKeySubmit = useCallback((descriptor, value) => {
-		const trimmed = value.trim();
-		if (!trimmed) {
-			setError("API key cannot be empty.");
-			return;
-		}
+	/**
+	* Single write path for any wizard outcome that produces an apikey credential.
+	* Centralizes credential persistence + env-var mirroring so the customFields,
+	* API-key, and customFields-only flows can't drift out of sync.
+	*
+	* Env mirroring stays in lockstep with `applyApiKeyEnv`: anything we store
+	* here is what that function would put back on the next launch, so the
+	* in-process env reflects the on-disk truth.
+	*/
+	const saveApiKeyCredential = useCallback((descriptor, apiKey, customFields) => {
 		try {
 			setProviderCredential(dataDir, descriptor, {
 				kind: "apikey",
-				value: trimmed
+				value: apiKey,
+				...Object.keys(customFields).length > 0 ? { customFields } : {}
 			});
-			if (descriptor.envKey) process.env[descriptor.envKey] = trimmed;
-			onConfigured();
+			if (descriptor.envKey && apiKey) process.env[descriptor.envKey] = apiKey;
+			for (const field of descriptor.customFields ?? []) {
+				const v = customFields[field.key];
+				if (typeof v === "string" && v.length > 0) process.env[field.envVar] = v;
+			}
+			onConfigured(descriptor.key);
 		} catch (err) {
 			setError(errorMessage(err));
 		}
 	}, [dataDir, onConfigured]);
+	const onCustomFieldsSubmit = useCallback((descriptor, values) => {
+		const fields = descriptor.customFields ?? [];
+		const missing = fields.find((f) => f.required && !values[f.key]?.trim());
+		if (missing) {
+			setError(`${missing.label} is required.`);
+			return;
+		}
+		setError(null);
+		const collected = {};
+		for (const field of fields) {
+			const v = values[field.key]?.trim();
+			if (v) collected[field.key] = v;
+		}
+		if (descriptor.envKey) setStep({
+			kind: "enter-apikey",
+			descriptor,
+			customFields: collected
+		});
+		else saveApiKeyCredential(descriptor, "", collected);
+	}, [saveApiKeyCredential]);
+	const onApiKeySubmit = useCallback((descriptor, customFields, value) => {
+		const trimmed = value.trim();
+		if (!trimmed) {
+			setError("API key cannot be empty.");
+			return;
+		}
+		saveApiKeyCredential(descriptor, trimmed, customFields);
+	}, [saveApiKeyCredential]);
 	const onOAuthError = useCallback((msg) => {
 		setError(msg);
 		setStep((prev) => prev.kind === "oauth-running" ? {
@@ -5734,6 +6254,12 @@ function SetupWizard({ registry, dataDir, onConfigured, onCancel }) {
 			descriptor: prev.descriptor
 		} : prev);
 	}, []);
+	const oauthDescriptorRef = useRef(null);
+	oauthDescriptorRef.current = step.kind === "oauth-running" ? step.descriptor : oauthDescriptorRef.current;
+	const onOAuthSuccess = useCallback(() => {
+		const key = oauthDescriptorRef.current?.key;
+		if (key) onConfigured(key);
+	}, [onConfigured]);
 	if (descriptors.length === 0) return /* @__PURE__ */ jsx(EmptyRegistryNotice, {});
 	if (step.kind === "pick-provider") return /* @__PURE__ */ jsx(PickProviderStep, {
 		descriptors,
@@ -5746,15 +6272,21 @@ function SetupWizard({ registry, dataDir, onConfigured, onCancel }) {
 		error,
 		onPick: onPickMethod
 	});
+	if (step.kind === "enter-custom-fields") return /* @__PURE__ */ jsx(EnterCustomFieldsStep, {
+		descriptor: step.descriptor,
+		error,
+		onSubmit: onCustomFieldsSubmit
+	});
 	if (step.kind === "enter-apikey") return /* @__PURE__ */ jsx(EnterApiKeyStep, {
 		descriptor: step.descriptor,
+		customFields: step.customFields,
 		error,
 		onSubmit: onApiKeySubmit
 	});
 	return /* @__PURE__ */ jsx(OAuthRunningStep, {
 		descriptor: step.descriptor,
 		dataDir,
-		onSuccess: onConfigured,
+		onSuccess: onOAuthSuccess,
 		onError: onOAuthError
 	});
 }
@@ -5802,6 +6334,15 @@ function WizardEscHint() {
 		children: "esc to exit"
 	});
 }
+/**
+* Defensive: older descriptor hints ended with a dangling "… Press" (the
+* one-field-at-a-time wizard appended " enter to continue"). The multi-field
+* form renders the hint standalone, so trim a trailing "Press" / "press"
+* (with optional period) to avoid a hanging word. No-op for clean hints.
+*/
+function stripTrailingPressHint(hint) {
+	return hint.replace(/\s*press\.?\s*$/i, "");
+}
 function EmptyRegistryNotice() {
 	const COLOR = useColors();
 	return /* @__PURE__ */ jsxs(WizardPanel, {
@@ -5881,9 +6422,23 @@ function PickMethodStep({ descriptor, error, onPick }) {
 	const focused = useModalAwareFocus();
 	const SELECT_THEME = useSelectStyle();
 	const options = useMemo(() => {
+		const hasCustomFields = (descriptor.customFields?.length ?? 0) > 0;
+		const hasEnvKey = !!descriptor.envKey;
+		let apikeyName;
+		let apikeyDescription;
+		if (!hasEnvKey && hasCustomFields) {
+			apikeyName = "Configure";
+			apikeyDescription = `configure ${descriptor.label} (no API key required)`;
+		} else if (hasEnvKey && hasCustomFields) {
+			apikeyName = "API key";
+			apikeyDescription = `configure & paste your ${descriptor.label} API key`;
+		} else {
+			apikeyName = "API key";
+			apikeyDescription = `paste your ${descriptor.label} API key`;
+		}
 		const items = [{
-			name: "API key",
-			description: `paste your ${descriptor.label} API key`,
+			name: apikeyName,
+			description: apikeyDescription,
 			value: "apikey"
 		}];
 		if (supportsOAuth(descriptor)) {
@@ -5911,13 +6466,139 @@ function PickMethodStep({ descriptor, error, onPick }) {
 		})]
 	});
 }
-function EnterApiKeyStep({ descriptor, error, onSubmit }) {
+/**
+* Multi-field form for {@link ProviderDescriptor.customFields}. All fields
+* render on a single page as a stack of inputs; the user moves between them
+* with ↑/↓ (or tab / shift-tab) and edits any value freely before submitting.
+* A trailing "save" row submits the whole form.
+*
+* Each `<input>` owns its own buffer (none are unmounted while navigating), so
+* returning to an earlier field shows what was already typed. Required fields
+* are validated on submit; the first missing one focuses + reports inline.
+*/
+function EnterCustomFieldsStep({ descriptor, error, onSubmit }) {
+	const screenFocused = useModalAwareFocus();
+	const COLOR = useColors();
+	const fields = useMemo(() => descriptor.customFields ?? [], [descriptor]);
+	const inputRefs = useRef([]);
+	const SAVE_ROW = fields.length;
+	const [focusedRow, setFocusedRow] = useState(0);
+	const collectValues = useCallback(() => {
+		const values = {};
+		fields.forEach((field, i) => {
+			values[field.key] = inputRefs.current[i]?.value ?? "";
+		});
+		return values;
+	}, [fields]);
+	const submit = useCallback(() => {
+		const values = collectValues();
+		const missingIdx = fields.findIndex((f) => f.required && !values[f.key]?.trim());
+		if (missingIdx >= 0) {
+			setFocusedRow(missingIdx);
+			onSubmit(descriptor, values);
+			return;
+		}
+		onSubmit(descriptor, values);
+	}, [
+		descriptor,
+		fields,
+		collectValues,
+		onSubmit
+	]);
+	const move = useCallback((delta) => {
+		setFocusedRow((prev) => {
+			const next = prev + delta;
+			if (next < 0) return 0;
+			if (next > SAVE_ROW) return SAVE_ROW;
+			return next;
+		});
+	}, [SAVE_ROW]);
+	useKeyboard((key) => {
+		if (!screenFocused) return;
+		if (key.name === "up" || key.name === "tab" && key.shift) {
+			move(-1);
+			return;
+		}
+		if (key.name === "down" || key.name === "tab" && !key.shift) {
+			move(1);
+			return;
+		}
+		if (key.name === "return") if (focusedRow >= SAVE_ROW) submit();
+		else move(1);
+	});
+	return /* @__PURE__ */ jsxs(WizardPanel, {
+		title: `configure ${descriptor.label}`,
+		error,
+		children: [
+			/* @__PURE__ */ jsxs("text", {
+				fg: COLOR.dim,
+				children: [
+					/* @__PURE__ */ jsx("span", {
+						fg: COLOR.model,
+						children: "↑/↓"
+					}),
+					" to move between fields · ",
+					/* @__PURE__ */ jsx("span", {
+						fg: COLOR.model,
+						children: "enter"
+					}),
+					" to advance / save · esc to exit"
+				]
+			}),
+			fields.map((field, i) => {
+				const requiredTag = field.required ? " (required)" : " (optional)";
+				const active = focusedRow === i;
+				return /* @__PURE__ */ jsxs("box", {
+					style: { flexDirection: "column" },
+					children: [
+						/* @__PURE__ */ jsx("text", {
+							fg: active ? COLOR.model : COLOR.dim,
+							children: `${field.label}${requiredTag}`
+						}),
+						field.hint && /* @__PURE__ */ jsx("text", {
+							fg: COLOR.dim,
+							children: stripTrailingPressHint(field.hint)
+						}),
+						/* @__PURE__ */ jsx("box", {
+							style: {
+								border: true,
+								borderColor: active ? COLOR.borderActive : COLOR.border,
+								paddingLeft: 1,
+								paddingRight: 1,
+								height: 3
+							},
+							children: /* @__PURE__ */ jsx("input", {
+								ref: (r) => {
+									inputRefs.current[i] = r;
+								},
+								focused: screenFocused && active,
+								keyBindings: API_KEY_INPUT_BINDINGS,
+								placeholder: field.placeholder ?? field.label,
+								onSubmit: () => {},
+								style: { flexGrow: 1 }
+							})
+						})
+					]
+				}, field.key);
+			}),
+			/* @__PURE__ */ jsx("text", {
+				fg: focusedRow === SAVE_ROW ? COLOR.brand : COLOR.dim,
+				children: focusedRow === SAVE_ROW ? "▶ save" : "  save"
+			})
+		]
+	});
+}
+function EnterApiKeyStep({ descriptor, customFields, error, onSubmit }) {
 	const focused = useModalAwareFocus();
 	const inputRef = useRef(null);
 	const COLOR = useColors();
 	const submit = useCallback(() => {
-		onSubmit(descriptor, inputRef.current?.value ?? "");
-	}, [descriptor, onSubmit]);
+		onSubmit(descriptor, customFields, inputRef.current?.value ?? "");
+	}, [
+		descriptor,
+		customFields,
+		onSubmit
+	]);
 	return /* @__PURE__ */ jsxs(WizardPanel, {
 		title: `configure ${descriptor.label} — paste API key`,
 		error,
@@ -6200,7 +6881,7 @@ function SessionsScreen({ sessions, currentId, focusedSessionId, onPick, onCreat
 		const OVERLAY_RESERVED = 6;
 		const TITLE_LEN = 8;
 		const SEP_LEN = 3;
-		const allProjectsLen = showAllProjects ? 12 + SEP_LEN : 0;
+		const allProjectsLen = showAllProjects ? 15 : 0;
 		const countLen = countSegs.reduce((sum, s) => sum + s.text.length, 0);
 		const cwdBudget = Math.max(0, termWidth - 4 - TITLE_LEN - OVERLAY_RESERVED) - countLen - SEP_LEN - allProjectsLen;
 		if (cwdBudget < 6) return countSegs;
@@ -7033,7 +7714,7 @@ function PromptBlock({ userPrompts, onSubmit, completionProviders, onPopupOpenCh
 				if (statSync(resolved).isFile()) {
 					const buf = readFileSync(resolved);
 					const ext = (resolved.split(".").pop() ?? "").toLowerCase();
-					const mediaType = IMAGE_MEDIA_TYPES[ext] ?? MIME_BY_EXT[ext] ?? "application/octet-stream";
+					const mediaType = sniffImageMediaType(buf) ?? IMAGE_MEDIA_TYPES[ext] ?? MIME_BY_EXT[ext] ?? "application/octet-stream";
 					setAttachments((prev) => [...prev, {
 						name: basename(resolved),
 						content: buf,
@@ -8173,7 +8854,7 @@ function SettingsModal({ skillsCatalog: skillsCatalogProp, mcpsCatalog: mcpsCata
 		mcpToolsByServer
 	]);
 	const filteredProviders = useMemo(() => (authentication?.providers ?? []).filter((p) => matchesQuery(providerCorpus(p), query)), [authentication?.providers, query]);
-	const authRowCount = filteredProviders.length + (authentication ? 1 : 0);
+	const authRowCount = filteredProviders.length;
 	const filteredSize = {
 		...Object.fromEntries(SETTINGS_CATEGORIES.map((c) => [c.id, filteredByCategory[c.id].length])),
 		skills: filteredSkills.length,
@@ -8367,16 +9048,8 @@ function SettingsModal({ skillsCatalog: skillsCatalogProp, mcpsCatalog: mcpsCata
 				return;
 			}
 			if (activeTab === "authentication") {
-				if (cursor === filteredProviders.length || !filteredProviders[cursor]) {
-					actions?.onReauth?.();
-					return;
-				}
 				const provider = filteredProviders[cursor];
-				if (provider.available && actions?.onPickProvider) {
-					actions.onPickProvider(provider);
-					return;
-				}
-				actions?.onReauth?.();
+				if (provider) actions?.onConfigureProvider?.(provider);
 				return;
 			}
 			return;
@@ -8893,7 +9566,6 @@ function AuthenticationList({ view, providers, cursor, highlightBg, query }) {
 	const COLOR = useColors();
 	const home = homedir();
 	const totalProviders = view.providers?.length ?? 0;
-	const addRowIndex = providers.length;
 	return /* @__PURE__ */ jsxs("box", {
 		style: { flexDirection: "column" },
 		children: [
@@ -9012,44 +9684,10 @@ function AuthenticationList({ view, providers, cursor, highlightBg, query }) {
 						children: `    ${p.methods.map((m) => `${m.source}: ${displayPath$1(m.detail, home)}`).join(" · ")}`
 					})]
 				}, p.key);
-			}),
-			/* @__PURE__ */ jsx(AuthAddRow, {
-				anchorIndex: addRowIndex,
-				focused: cursor === addRowIndex,
-				highlightBg
 			})
 		]
 	});
 }
-function AuthAddRow({ anchorIndex, focused, highlightBg }) {
-	const COLOR = useColors();
-	const bg = focused ? highlightBg : void 0;
-	return /* @__PURE__ */ jsxs("box", {
-		id: anchorIdFor(anchorIndex),
-		style: {
-			flexDirection: "column",
-			flexShrink: 0,
-			marginTop: 1,
-			paddingLeft: 1,
-			paddingRight: 1,
-			backgroundColor: bg
-		},
-		children: [/* @__PURE__ */ jsxs("text", {
-			wrapMode: "none",
-			children: [/* @__PURE__ */ jsx("span", {
-				fg: focused ? COLOR.brand : COLOR.mute,
-				children: focused ? "▶ " : "  "
-			}), /* @__PURE__ */ jsx("span", {
-				fg: focused ? COLOR.brand : COLOR.dim,
-				children: "+ add or re-configure a provider"
-			})]
-		}), /* @__PURE__ */ jsx("text", {
-			wrapMode: "none",
-			fg: COLOR.mute,
-			children: "    launch the setup wizard"
-		})]
-	});
-}
 function ToggleRow({ id, label, description, enabled, focused, bg }) {
 	const COLOR = useColors();
 	return /* @__PURE__ */ jsxs("box", {
@@ -9600,23 +10238,25 @@ const PREVIEW_CHAR_MAX = 8e3;
 * keeps a comfortable shape rather than stretching to the full height.
 */
 const MAX_MODAL_HEIGHT = 28;
-const EDIT_TEXTAREA_BINDINGS = [
-	...defaultTextareaKeyBindings.filter((b) => b.name !== "return" && !(b.name === "a" && b.ctrl && !b.shift && !b.meta)),
-	{
-		name: "a",
-		ctrl: true,
-		action: "select-all"
-	},
-	{
-		name: "return",
-		action: "submit"
-	},
-	{
-		name: "return",
-		shift: true,
-		action: "newline"
-	}
-];
+const EDIT_TEXTAREA_BINDINGS = (() => {
+	return [
+		...defaultTextareaKeyBindings.filter((b) => b.name !== "return" && !(b.name === "a" && b.ctrl && !b.shift && !b.meta)),
+		{
+			name: "a",
+			ctrl: true,
+			action: "select-all"
+		},
+		{
+			name: "return",
+			action: "submit"
+		},
+		{
+			name: "return",
+			shift: true,
+			action: "newline"
+		}
+	];
+})();
 /**
 * Extract the editable text from a turn — joins all `text` blocks.
 * Non-text blocks (tool_call, tool_result, thinking, etc.) are structural
@@ -10304,6 +10944,7 @@ function AppShell() {
 		if (!resumeProvider) return "auth";
 		return lastResumedSessionId ? "chat" : "sessions";
 	});
+	const [authConfigureKey, setAuthConfigureKey] = useState(void 0);
 	const [picked, setPicked] = useState(() => initialPicked);
 	const pickedRef = useRef(picked);
 	pickedRef.current = picked;
@@ -10523,13 +11164,12 @@ function AppShell() {
 		const remembered = initialState.lastModelByProvider?.[provider.key];
 		const model = modelId ?? remembered ?? descriptor.defaultModel ?? descriptor.factory().meta.defaultModel;
 		const effort = effortForModel(descriptor, model, initialState.lastEffortByModel);
-		return effort ? {
+		const opts = restoreModelOptions(descriptor, model, initialState.lastModelOptionsByModel);
+		return {
 			provider,
 			model,
-			effort
-		} : {
-			provider,
-			model
+			...effort ? { effort } : {},
+			...opts ? { modelOptions: opts } : {}
 		};
 	}, [providerRegistry, initialState]);
 	const cancelRunOnDenial = useCallback((reason) => {
@@ -10760,6 +11400,25 @@ function AppShell() {
 		});
 		agent.hooks.hook("stream:thinking", ({ delta, turnId }) => stream.queueStreamDelta("thinking", delta, { turnId }));
 		agent.hooks.hook("stream:text", ({ delta, turnId }) => stream.queueStreamDelta("markdown", delta, { turnId }));
+		agent.hooks.hook("stream:server_tool_use", ({ id, name, input, turnId }) => {
+			stream.appendImmediate({
+				kind: "tool",
+				text: toolCallPreview(name, input),
+				tool: name,
+				input,
+				callId: id,
+				turnId
+			});
+		});
+		agent.hooks.hook("stream:server_tool_result", ({ toolUseId, toolName, content, turnId }) => {
+			stream.appendImmediate({
+				kind: "tool-result",
+				text: serverToolResultSummary(content),
+				tool: toolName,
+				callId: toolUseId,
+				turnId
+			});
+		});
 		agent.hooks.hook("tool:before", async ({ callId, name, input, turnId }) => {
 			registerInFlightTool({
 				callId,
@@ -10921,6 +11580,29 @@ function AppShell() {
 				turnId
 			});
 		});
+		agent.hooks.hook("child:stream:server_tool_use", ({ id, name, input, childId, depth, turnId }) => {
+			stream.appendImmediate({
+				kind: "tool",
+				text: toolCallPreview(name, input),
+				tool: name,
+				input,
+				callId: id,
+				childId,
+				depth,
+				turnId
+			});
+		});
+		agent.hooks.hook("child:stream:server_tool_result", ({ toolUseId, toolName, content, childId, depth, turnId }) => {
+			stream.appendImmediate({
+				kind: "tool-result",
+				text: serverToolResultSummary(content),
+				tool: toolName,
+				callId: toolUseId,
+				childId,
+				depth,
+				turnId
+			});
+		});
 		agent.hooks.hook("child:tool:before", ({ callId, name, input, childId, depth, turnId, priorContent }) => {
 			registerInFlightTool({
 				callId,
@@ -11068,9 +11750,11 @@ function AppShell() {
 		setEvents(eventsFromTurns(session.turns, session.runs));
 		setBusy(true);
 		try {
+			const runModelOptions = enabledModelOptions(currentPicked.modelOptions);
 			await agent.run({
 				model: currentPicked.model,
-				...currentPicked.effort ? { thinking: currentPicked.effort } : {}
+				...currentPicked.effort ? { thinking: currentPicked.effort } : {},
+				...Object.keys(runModelOptions).length > 0 ? { modelOptions: runModelOptions } : {}
 			});
 			await session.save().catch((err) => debugLog("resume-interaction: session.save failed", err));
 			setCurrentSession((prev) => prev ? {
@@ -11193,6 +11877,7 @@ function AppShell() {
 	const onPickProvider = useCallback(async (p) => {
 		const next = makePicked(p);
 		if (!next) return;
+		setAuthConfigureKey(void 0);
 		setPicked(next);
 		stateStore.save({
 			...stateStore.load(),
@@ -11355,13 +12040,12 @@ function AppShell() {
 			}
 		});
 		const nextEffort = descriptor ? effortForModel(descriptor, next.modelId, prior.lastEffortByModel) : void 0;
-		setPicked(nextEffort ? {
+		const nextOptions = descriptor ? restoreModelOptions(descriptor, next.modelId, prior.lastModelOptionsByModel) : void 0;
+		setPicked({
 			provider: nextProvider,
 			model: next.modelId,
-			effort: nextEffort
-		} : {
-			provider: nextProvider,
-			model: next.modelId
+			...nextEffort ? { effort: nextEffort } : {},
+			...nextOptions ? { modelOptions: nextOptions } : {}
 		});
 		modal.close();
 		if (providerChanged && currentSession && !busy && !pendingApproval) await activateSession(currentSession.id, nextProvider.key);
@@ -11394,6 +12078,32 @@ function AppShell() {
 		});
 		modal.close();
 	}, [modal, stateStore]);
+	const onToggleModelOption = useCallback((optionId) => {
+		setPicked((prev) => {
+			if (!prev) return prev;
+			const next = {
+				...prev.modelOptions ?? {},
+				[optionId]: !prev.modelOptions?.[optionId]
+			};
+			const prior = stateStore.load();
+			stateStore.save({
+				...prior,
+				lastModelOptionsByModel: {
+					...prior.lastModelOptionsByModel,
+					[prev.model]: next
+				}
+			});
+			return {
+				...prev,
+				modelOptions: next
+			};
+		});
+	}, [stateStore]);
+	const modelOptions = useMemo(() => {
+		if (!picked) return [];
+		const descriptor = providerRegistry[picked.provider.key];
+		return descriptor ? modelOptionsFor(descriptor, picked.model) : [];
+	}, [picked, providerRegistry]);
 	const modelHasReasoning = useMemo(() => {
 		if (!picked) return false;
 		const descriptor = providerRegistry[picked.provider.key];
@@ -11497,10 +12207,12 @@ function AppShell() {
 					name: att.name
 				};
 			})];
+			const runModelOptions = enabledModelOptions(picked.modelOptions);
 			await agent.run({
 				model: picked.model,
 				prompt: runPrompt,
-				...picked.effort ? { thinking: picked.effort } : {}
+				...picked.effort ? { thinking: picked.effort } : {},
+				...Object.keys(runModelOptions).length > 0 ? { modelOptions: runModelOptions } : {}
 			});
 			await session.save().catch((err) => debugLog("session.save failed", err));
 			setCurrentSession((prev) => prev ? {
@@ -11558,10 +12270,11 @@ function AppShell() {
 			}
 		})();
 	}, [picked, runSingleMessage]);
-	const onReauth = useMemo(() => {
+	const onConfigureProvider = useMemo(() => {
 		if (busy || pendingApproval) return void 0;
-		return () => {
+		return (provider) => {
 			modal.close();
+			setAuthConfigureKey(provider.key);
 			setScreen("auth");
 		};
 	}, [
@@ -11954,7 +12667,7 @@ function AppShell() {
 			restoredFiles: restoration.restoredFiles,
 			restoredSkills: restoration.restoredSkills,
 			model: result.model,
-			inputTokens: (result.usage.input ?? 0) + (result.usage.cacheRead ?? 0) + (result.usage.cacheCreation ?? 0),
+			inputTokens: effectiveInputFromTurn(result.usage),
 			outputTokens: result.usage.output ?? 0,
 			effectiveTokens
 		};
@@ -12147,10 +12860,6 @@ function AppShell() {
 		}
 		if (matchesBinding(key, keybindings.openSettings) && screen !== "auth") {
 			const allProviders = detectAuth(config.paths.userDir, providerRegistry);
-			const onPickProviderFromSettings = (provider) => {
-				modal.close();
-				onPickProvider(provider);
-			};
 			modal.open(/* @__PURE__ */ jsx(SettingsModal, {
 				keybindings,
 				keybindingsPath: keybindingsPath(config.paths.userDir),
@@ -12161,8 +12870,7 @@ function AppShell() {
 					providers: allProviders
 				},
 				actions: {
-					onReauth,
-					onPickProvider: onPickProviderFromSettings,
+					onConfigureProvider,
 					onOpenKeybindings: onOpenKeybindingsFile,
 					onLoginMcp,
 					onLogoutMcp,
@@ -12196,12 +12904,16 @@ function AppShell() {
 			}));
 			return;
 		}
-		if (matchesBinding(key, keybindings.openEffortPicker) && screen === "chat" && picked && !busy && modelHasReasoning) {
+		if (matchesBinding(key, keybindings.openEffortPicker) && screen === "chat" && picked && !busy && (modelHasReasoning || modelOptions.length > 0)) {
 			const descriptor = providerRegistry[picked.provider.key];
-			modal.open(/* @__PURE__ */ jsx(EffortPickerModal, {
-				current: picked.effort,
+			modal.open(/* @__PURE__ */ jsx(ModelOptionsPickerModal, {
+				supportsReasoning: modelHasReasoning,
 				supportsAdaptive: !!descriptor && piIdOf(descriptor) === "anthropic",
-				onPick: onPickEffort
+				currentEffort: picked.effort,
+				options: modelOptions,
+				enabled: picked.modelOptions,
+				onPickEffort,
+				onToggleOption: onToggleModelOption
 			}));
 			return;
 		}
@@ -12212,6 +12924,21 @@ function AppShell() {
 			}));
 			return;
 		}
+		if (matchesBinding(key, keybindings.openContextPanel) && screen === "chat" && picked) {
+			const agent = agentRef.current;
+			if (!agent) return;
+			const descriptor = providerRegistry[picked.provider.key];
+			const effWindow = effectiveContextWindow(descriptor ? getContextWindow(descriptor, picked.model) : null) ?? void 0;
+			agent.getContextBreakdown({
+				model: picked.model,
+				...effWindow !== void 0 ? { effectiveWindow: effWindow } : {},
+				autocompactBuffer: OUTPUT_RESERVE_TOKENS,
+				...settings.autoCompact && settings.autoCompactThreshold ? { compactThreshold: settings.autoCompactThreshold } : {}
+			}).then((breakdown) => {
+				if (breakdown && agentRef.current === agent) modal.open(/* @__PURE__ */ jsx(ContextPanelModal, { breakdown }));
+			}).catch((err) => debugLog("getContextBreakdown failed", err));
+			return;
+		}
 		if (matchesBinding(key, keybindings.openKeybindings) && screen !== "auth") {
 			modal.open(/* @__PURE__ */ jsx(KeybindingsModal, {
 				bindings: keybindings,
@@ -12353,6 +13080,10 @@ function AppShell() {
 		modelColor: COLOR.model,
 		effortLabel: modelHasReasoning ? picked?.effort ?? "medium" : null,
 		effortColor: COLOR.warn,
+		modelOptionsLabel: (() => {
+			const on = modelOptions.filter((o) => picked?.modelOptions?.[o.id]);
+			return on.length > 0 ? on.map((o) => o.id).join(", ") : null;
+		})(),
 		effortKeyColor: COLOR.warn,
 		agentLabel: pickedAgent.label,
 		agentColor: accentColor(pickedAgent.accent, COLOR),
@@ -12374,6 +13105,7 @@ function AppShell() {
 		pickedAgent,
 		COLOR,
 		modelHasReasoning,
+		modelOptions,
 		keybindings,
 		inFlightTools,
 		backgroundTasks,
@@ -12438,7 +13170,10 @@ function AppShell() {
 					paddingRight: 1
 				},
 				children: [
-					screen === "auth" && /* @__PURE__ */ jsx(AuthScreen, { onPick: onPickProvider }),
+					screen === "auth" && /* @__PURE__ */ jsx(AuthScreen, {
+						onPick: onPickProvider,
+						initialConfigureKey: authConfigureKey
+					}),
 					screen === "sessions" && /* @__PURE__ */ jsx(SessionsScreen, {
 						sessions,
 						currentId: currentSession?.id ?? null,
@@ -12725,6 +13460,198 @@ function initTreeSitterWorker() {
 	return getTreeSitterClient().initialize();
 }
 //#endregion
+//#region src/tui/effort-picker.tsx
+const BASE_LEVELS = [
+	{
+		id: "off",
+		description: "no reasoning — fastest, smallest output"
+	},
+	{
+		id: "minimal",
+		description: "tiny reasoning budget (gpt-5 family)"
+	},
+	{
+		id: "low",
+		description: "short reasoning pass"
+	},
+	{
+		id: "medium",
+		description: "balanced — sensible default"
+	},
+	{
+		id: "high",
+		description: "deep reasoning — slowest, longest"
+	}
+];
+const ADAPTIVE_LEVEL = {
+	id: "adaptive",
+	description: "model decides per-turn (Anthropic)"
+};
+function EffortPickerModal({ current, supportsAdaptive, onPick }) {
+	const COLOR = useColors();
+	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);
+		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) => {
+				if (filtered.length === 0) return i;
+				return ((i - 1) % filtered.length + filtered.length) % filtered.length;
+			});
+			return;
+		}
+		if (key.name === "down") {
+			setSelectedIdx((i) => {
+				if (filtered.length === 0) return i;
+				return (i + 1) % filtered.length;
+			});
+			return;
+		}
+		if (key.name === "return") commit();
+	});
+	return /* @__PURE__ */ jsxs(Modal, {
+		title: "select reasoning effort",
+		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: isCurrent ? COLOR.brand : COLOR.mute,
+					children: marker
+				}),
+				/* @__PURE__ */ jsx("span", {
+					fg: COLOR.mute,
+					children: " "
+				}),
+				/* @__PURE__ */ jsx("span", {
+					fg: isFocused ? COLOR.brand : COLOR.dim,
+					children: level.id
+				}),
+				/* @__PURE__ */ jsx("span", {
+					fg: COLOR.mute,
+					children: " · "
+				}),
+				/* @__PURE__ */ jsx("span", {
+					fg: COLOR.mute,
+					children: level.description
+				})
+			]
+		})
+	});
+}
+//#endregion
 //#region src/tui/mcps-settings.tsx
 /**
 * MCP server picker. Hierarchical: each server is one row, and an
@@ -13590,6 +14517,6 @@ async function runTui(options = {}) {
 	process.exit(0);
 }
 //#endregion
-export { AgentPickerModal, App, AuthScreen, ChatScreen, CompletionPopup, EffortPickerModal, Footer, InteractionBlock, McpsSettingsModal, Modal, ModalRoot, ModelPickerModal, SessionDetailsModal, SessionsScreen, SettingsModal, SkillsSettingsModal, Spinner, StatusSpinner, TOOL_DISPLAY, TitleOverlay, ToggleListModal, Transcript, TurnDetailsModal, accentColor, buildMdStyle, clipHintsToWidth, computeTurnAnchors, displayNameFor, formatToolCall, hintsLength, isEditErrorResult, isTurnHighlighted, isVisible, marginTopFor, onInputSubmit, renderHintSpans, runTui, selectableTurnIds, splitMarkdownCodeBlocks, splitPromptSegments, truncateTrailing, turnSelectionOwnership, useMdStyle, useModal, useModalAwareFocus };
+export { AgentPickerModal, App, AuthScreen, ChatScreen, CompletionPopup, EffortPickerModal, Footer, InteractionBlock, McpsSettingsModal, Modal, ModalRoot, ModelOptionsPickerModal, ModelPickerModal, SessionDetailsModal, SessionsScreen, SettingsModal, SkillsSettingsModal, Spinner, StatusSpinner, TOOL_DISPLAY, TitleOverlay, ToggleListModal, Transcript, TurnDetailsModal, accentColor, buildMdStyle, clipHintsToWidth, computeTurnAnchors, displayNameFor, formatToolCall, hintsLength, isEditErrorResult, isTurnHighlighted, isVisible, marginTopFor, onInputSubmit, renderHintSpans, runTui, selectableTurnIds, splitMarkdownCodeBlocks, splitPromptSegments, truncateTrailing, turnSelectionOwnership, useMdStyle, useModal, useModalAwareFocus };
 
 //# sourceMappingURL=tui.js.map