zidane 5.6.3 → 5.6.7

package/dist/tui.js

@@ -1,9 +1,9 @@
-import { $r as TODO_STATUS_GLYPHS, $t as isEditErrorResult, A as getSafelist, An as resolveApprovalForPayload, At as SettingsProvider, B as oauthUsesManualCodePaste, Bn as keybindingsPath, Br as piIdOf, Ct as buildHints, D as useSafeModeQueue, Dt as DEFAULT_SETTINGS, E as useSafeModeActions, En as buildEditOutcomesAnnotation, Er as setProviderCredential, Et as useEnabledToggleSet, F as suggestSafelistEntry, Ft as resolveChipColor, G as indexOfEntry, Gt as useDiscoveryOptional, H as supportsOAuth, Ht as createDiscoverySlot, In as KEYBINDING_DEFS, Ir as modelSupportsReasoning, It as resolveTheme, J as discoverProjectMcps, Jn as uniqueSkillNamesFromReferences, Jt as resolveConfig, K as buildMcpServers, Kt as ConfigProvider, L as splitPromptSegments, Mn as stripEditOutcomesAnnotation, Mt as useSettings, Nn as summarizeOutcomes, On as mergeApprovalAndBodyOutcomes, Ot as SETTINGS_CHOICES, Pn as findGitRoot, Pr as getContextWindow, Qt as eventsFromTurns, R as formatPathForCwd, Rn as ensureKeybindingsFile, Si as envSection, Sn as previewEditPayload, St as generateSessionTitle, T as SafeModeProvider, Tt as listProjectFiles, U as buildModelCatalog, Ut as DiscoveryProvider, V as runOAuthLogin, Vn as matchesBinding, W as filterModelCatalog, Wt as useDiscovery, Xn as createFilesCompletionProvider, Yt as EDIT_TOOL_NAMES, Z as createFileMcpCredentialStore, Zt as deriveSessionTitle, _ as turnContextSize, _n as buildUnifiedDiff, _t as EMPTY_HINTS, a as computeTurnAnchors, an as marginTopFor, ar as tryOpenBrowser, at as splitMarkdownCodeBlocks, b as defaultSkillScanPaths, bi as buildBuildSystem, bn as extractEditPayload, br as detectAuth, bt as truncateTrailing, c as formatToolCall, cn as stripSpawnTokensLine, cr as buildUpdateHint, d as useSelectStyle, dn as toolCallPreview, en as isTurnHighlighted, et as McpAuthProvider, f as useSurfaces, fn as toolResultText, ft as makeRequestInteraction, g as finalizeStreamingMarkdownForOwner, gn as buildContextualDiff, gt as useInteractionsQueue, h as finalizeStreamingMarkdown, ht as useInteractionsActions, i as turnAsText, ir as buildLinearRamp, j as isOnSafelist, jn as rewriteMultiEditHeader, jt as clampFps, k as addToSafelist, kn as parseEditOutcomesFromResult, kt as SETTINGS_TOGGLES, l as ThemeProvider, li as useActiveTodos, ln as sumRunCosts, lr as useUpdateCheck, lt as buildResumedToolResultsTurn, m as useTheme, mn as updateToolEventOutcomes, n as deleteTurnSafely, nn as lastContextSizeFromTurns, nr as useCompletion, nt as useMcpAuthState, o as TOOL_DISPLAY, pn as turnSelectionOwnership, pt as pendingInteractionsFromTurns, qn as createSkillsCompletionProvider, qr as accentColor, qt as useConfig, r as truncateTurnsAt, rn as listSessionMeta, rr as blendHsl, rt as getMcpAuthStatus, s as displayNameFor, sn as selectableTurnIds, sr as bootTick, st as InteractionsProvider, tn as isVisible, tt as useMcpAuthDispatch, u as useColors, ut as createInteractionTools, v as useStreamBuffer, vr as AUTO_COMPACT_MIN_GROWTH_FRACTION, vt as clipHintsToWidth, w as writeSessionExport, wn as summarizeEditPayload, x as discoverProjectSkills, xi as buildPlanSystem, xn as filetypeFromPath, y as buildSkillsConfig, yr as shouldAutoCompact, yt as hintsLength, z as fetchOAuthRedirect, zn as formatBindingForDisplay } from "./turn-operations-CH7rnULP.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-Bgx8OBqK.js";
+import { A as getSafelist, Ar as setProviderCredential, At as SETTINGS_TOGGLES, B as oauthUsesManualCodePaste, Bn as KEYBINDING_KEY_COL_WIDTH, Br as modelSupportsReasoning, Cn as extractEditPayload, Cr as shouldAutoCompact, Ct as buildHints, D as useSafeModeQueue, Di as buildBuildSystem, Dn as summarizeEditPayload, Dt as DEFAULT_SETTINGS, E as useSafeModeActions, Et as useEnabledToggleSet, F as suggestSafelistEntry, Fn as stripEditOutcomesAnnotation, G as indexOfEntry, Gn as matchesBinding, Gr as discoverAgentsMd, Gt as useDiscovery, H as supportsOAuth, Hn as formatBindingForDisplay, In as summarizeOutcomes, It as resolveChipColor, J as discoverProjectMcps, Jt as useConfig, K as buildMcpServers, Kt as useDiscoveryOptional, L as splitPromptSegments, Lt as resolveTheme, Mn as parseEditOutcomesFromResult, Mt as clampFps, Nn as resolveApprovalForPayload, Nt as useSettings, Oi as buildPlanSystem, Ot as SETTINGS_CATEGORIES, Pn as rewriteMultiEditHeader, Qn as uniqueSkillNamesFromReferences, Qt as EDIT_TOOL_NAMES, R as formatPathForCwd, Rn as KEYBINDING_DEFS, Rr as getContextWindow, Sr as AUTO_COMPACT_MIN_GROWTH_FRACTION, St as generateSessionTitle, T as SafeModeProvider, Tn as previewEditPayload, Tt as listProjectFiles, U as buildModelCatalog, Un as groupBindings, Ut as createDiscoverySlot, V as runOAuthLogin, Vn as ensureKeybindingsFile, W as filterModelCatalog, Wn as keybindingsPath, Wr as piIdOf, Wt as DiscoveryProvider, Yt as resolveConfig, Z as createFileMcpCredentialStore, Zn as createSkillsCompletionProvider, _ as turnContextSize, _n as updateToolEventOutcomes, _t as EMPTY_HINTS, a as computeTurnAnchors, an as lastContextSizeFromTurns, at as splitMarkdownCodeBlocks, b as defaultSkillScanPaths, bn as buildUnifiedDiff, bt as truncateTrailing, c as formatToolCall, cn as marginTopFor, cr as buildLinearRamp, d as useSelectStyle, dn as stripSpawnTokensLine, dr as bootTick, ei as accentColor, en as deriveSessionTitle, er as createFilesCompletionProvider, et as McpAuthProvider, f as useSurfaces, fn as sumRunCosts, fr as buildUpdateHint, ft as makeRequestInteraction, g as finalizeStreamingMarkdownForOwner, gi as useActiveTodos, gn as turnSelectionOwnership, gt as useInteractionsQueue, h as finalizeStreamingMarkdown, hn as toolResultText, ht as useInteractionsActions, i as turnAsText, in as isVisible, j as isOnSafelist, jn as mergeApprovalAndBodyOutcomes, jt as SettingsProvider, k as addToSafelist, ki as envSection, kn as buildEditOutcomesAnnotation, kt as SETTINGS_CHOICES, l as ThemeProvider, lr as tryOpenBrowser, lt as buildResumedToolResultsTurn, m as useTheme, mn as toolCallPreview, n as deleteTurnSafely, nn as isEditErrorResult, nt as useMcpAuthState, o as TOOL_DISPLAY, oi as TODO_STATUS_GLYPHS, on as listSessionMeta, or as useCompletion, pr as useUpdateCheck, pt as pendingInteractionsFromTurns, qr as findGitRoot, qt as ConfigProvider, r as truncateTurnsAt, rn as isTurnHighlighted, rt as getMcpAuthStatus, s as displayNameFor, sr as blendHsl, st as InteractionsProvider, tn as eventsFromTurns, tt as useMcpAuthDispatch, u as useColors, un as selectableTurnIds, ut as createInteractionTools, v as useStreamBuffer, vt as clipHintsToWidth, w as writeSessionExport, wn as filetypeFromPath, wr as detectAuth, x as discoverProjectSkills, y as buildSkillsConfig, yn as buildContextualDiff, yt as hintsLength, z as fetchOAuthRedirect } from "./turn-operations-D-OQYUgS.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-FerA0zSl.js";
 import { n as createProcessContext } from "./contexts-BOtMvzli.js";
 import { c as errorMessage } from "./errors-DdZXnyXE.js";
 import { s as McpOAuthProvider, t as connectMcpServers } from "./mcp-ngMS0S6N.js";
-import { C as summaryToTurn, a as selectFilesFromSession, r as buildPostCompactAttachments, s as compactConversation, t as loginMcpServer } from "./login-YckkS-Bq.js";
+import { C as summaryToTurn, a as selectFilesFromSession, r as buildPostCompactAttachments, s as compactConversation, t as loginMcpServer } from "./login-Btpliwct.js";
 import { n as formatTokenUsage } from "./stats-Lc3zL3RM.js";
 import { n as loadSession, t as createSession } from "./session-BoEW_wCR.js";
 import { createTuiStore } from "./session/sqlite.js";
@@ -2017,7 +2017,7 @@ MarkdownBlock.displayName = "MarkdownBlock";
 const TOOL_RESULT_MAX_LINES = 6;
 function ToolResultBlock({ text, indent }) {
 	const COLOR = useColors();
-	const rawLines = text.split("\n");
+	const rawLines = stripAnsiSequences(text).split("\n");
 	let end = rawLines.length;
 	while (end > 0 && rawLines[end - 1].trim() === "") end--;
 	if (end === 0) return null;
@@ -3142,23 +3142,7 @@ function EffortRow({ level, isCurrent, isFocused, highlightBg }) {
 }
 //#endregion
 //#region src/tui/keybindings-modal.tsx
-/**
-* Fixed column width for the rendered key — derived once from
-* {@link KEYBINDING_DEFS} so adding an action with a wider default spec
-* (`ctrl+shift+x`, etc.) automatically grows the column instead of
-* truncating the label. Falls back to a sensible minimum so empty /
-* one-glyph defaults don't collapse the layout.
-*/
-const KEY_COL_WIDTH = (() => {
-	let max = 8;
-	for (const def of KEYBINDING_DEFS) {
-		const width = formatBindingForDisplay(def.default).length;
-		if (width > max) max = width;
-	}
-	return max + 2;
-})();
 function KeybindingsModal({ bindings, filePath, onEditFile, onClose }) {
-	const COLOR = useColors();
 	const SURFACE = useSurfaces();
 	const { height: termHeight } = useTerminalDimensions();
 	const scrollRef = useRef(null);
@@ -3192,24 +3176,77 @@ function KeybindingsModal({ bindings, filePath, onEditFile, onClose }) {
 					flexGrow: 1,
 					flexShrink: 1
 				},
-				children: sections.map((section, sectionIdx) => /* @__PURE__ */ jsxs("box", {
-					style: {
-						flexDirection: "column",
-						flexShrink: 0,
-						marginTop: sectionIdx === 0 ? 0 : 1
-					},
-					children: [/* @__PURE__ */ jsx(SectionHeader, { label: section.group }), section.rows.map((row) => /* @__PURE__ */ jsx(BindingRow, {
-						def: row.def,
-						spec: row.spec
-					}, row.def.action))]
-				}, section.group))
+				children: /* @__PURE__ */ jsx(KeybindingsCatalog, { sections })
 			})
-		}), /* @__PURE__ */ jsx(EditFileButton, {
+		}), /* @__PURE__ */ jsx(KeybindingsEditFileButton, {
 			filePath,
-			highlightBg: SURFACE.selection,
-			brand: COLOR.brand,
-			mute: COLOR.mute,
-			dim: COLOR.dim
+			highlightBg: SURFACE.selection
+		})]
+	});
+}
+function KeybindingsCatalog({ sections }) {
+	return /* @__PURE__ */ jsx("box", {
+		style: { flexDirection: "column" },
+		children: sections.map((section, sectionIdx) => /* @__PURE__ */ jsxs("box", {
+			style: {
+				flexDirection: "column",
+				flexShrink: 0,
+				marginTop: sectionIdx === 0 ? 0 : 1
+			},
+			children: [/* @__PURE__ */ jsx(SectionHeader, { label: section.group }), section.rows.map((row) => /* @__PURE__ */ jsx(BindingRow, {
+				def: row.def,
+				spec: row.spec
+			}, row.def.action))]
+		}, section.group))
+	});
+}
+/**
+* Highlighted "Edit keybindings file" button. Used as the standalone
+* modal's pinned footer AND as the Settings-modal Keybindings tab's
+* pinned action row. Activation is the caller's responsibility (the
+* standalone modal uses its own `useKeyboard`; the Settings modal
+* routes `↵` through its top-level handler).
+*/
+function KeybindingsEditFileButton({ filePath, highlightBg }) {
+	const COLOR = useColors();
+	const display = filePath ? compactPath(filePath) : "~/.zidane/keybindings.json";
+	return /* @__PURE__ */ jsxs("box", {
+		style: {
+			flexShrink: 0,
+			flexDirection: "column",
+			paddingLeft: 1,
+			paddingRight: 1,
+			backgroundColor: highlightBg
+		},
+		children: [/* @__PURE__ */ jsxs("text", {
+			wrapMode: "none",
+			children: [
+				/* @__PURE__ */ jsx("span", {
+					fg: COLOR.brand,
+					children: "▶ "
+				}),
+				/* @__PURE__ */ jsx("span", {
+					fg: COLOR.brand,
+					children: "Edit keybindings file"
+				}),
+				/* @__PURE__ */ jsx("span", {
+					fg: COLOR.mute,
+					children: "  "
+				}),
+				/* @__PURE__ */ jsx("span", {
+					fg: COLOR.brand,
+					children: "›"
+				})
+			]
+		}), /* @__PURE__ */ jsxs("text", {
+			wrapMode: "none",
+			children: [/* @__PURE__ */ jsx("span", {
+				fg: COLOR.mute,
+				children: "  "
+			}), /* @__PURE__ */ jsx("span", {
+				fg: COLOR.dim,
+				children: `${display} — restart to apply changes`
+			})]
 		})]
 	});
 }
@@ -3232,7 +3269,7 @@ function SectionHeader({ label }) {
 function BindingRow({ def, spec }) {
 	const COLOR = useColors();
 	const display = formatBindingForDisplay(spec);
-	const keyText = (display || "—").padEnd(KEY_COL_WIDTH, " ");
+	const keyText = (display || "—").padEnd(KEYBINDING_KEY_COL_WIDTH, " ");
 	return /* @__PURE__ */ jsxs("box", {
 		style: {
 			flexDirection: "column",
@@ -3252,7 +3289,7 @@ function BindingRow({ def, spec }) {
 		}), /* @__PURE__ */ jsx("box", {
 			style: {
 				flexShrink: 0,
-				paddingLeft: KEY_COL_WIDTH
+				paddingLeft: KEYBINDING_KEY_COL_WIDTH
 			},
 			children: /* @__PURE__ */ jsx("text", {
 				wrapMode: "word",
@@ -3262,48 +3299,6 @@ function BindingRow({ def, spec }) {
 		})]
 	});
 }
-function EditFileButton({ filePath, highlightBg, brand, mute, dim }) {
-	const display = filePath ? compactPath(filePath) : "~/.zidane/keybindings.json";
-	return /* @__PURE__ */ jsxs("box", {
-		style: {
-			flexShrink: 0,
-			flexDirection: "column",
-			paddingLeft: 1,
-			paddingRight: 1,
-			backgroundColor: highlightBg
-		},
-		children: [/* @__PURE__ */ jsxs("text", {
-			wrapMode: "none",
-			children: [
-				/* @__PURE__ */ jsx("span", {
-					fg: brand,
-					children: "▶ "
-				}),
-				/* @__PURE__ */ jsx("span", {
-					fg: brand,
-					children: "Edit keybindings file"
-				}),
-				/* @__PURE__ */ jsx("span", {
-					fg: mute,
-					children: "  "
-				}),
-				/* @__PURE__ */ jsx("span", {
-					fg: brand,
-					children: "›"
-				})
-			]
-		}), /* @__PURE__ */ jsxs("text", {
-			wrapMode: "none",
-			children: [/* @__PURE__ */ jsx("span", {
-				fg: mute,
-				children: "  "
-			}), /* @__PURE__ */ jsx("span", {
-				fg: dim,
-				children: `${display} — restart to apply changes`
-			})]
-		})]
-	});
-}
 function CountsBadge$1({ count }) {
 	const COLOR = useColors();
 	return /* @__PURE__ */ jsxs("text", {
@@ -3324,36 +3319,6 @@ function CountsBadge$1({ count }) {
 		]
 	});
 }
-/**
-* Walk `KEYBINDING_DEFS` in order and bucket rows into contiguous
-* sections by `group`. Preserves catalog order — if two actions in the
-* same group are split by an entry from another group, they'd render
-* as two separate sections with the same header (catalog order wins
-* over "merge same-group entries" so the on-screen story matches the
-* on-disk file).
-*/
-function groupBindings(bindings) {
-	const sections = [];
-	for (const def of KEYBINDING_DEFS) {
-		const last = sections[sections.length - 1];
-		const spec = bindings[def.action] ?? "";
-		if (last && last.group === def.group) {
-			last.rows.push({
-				def,
-				spec
-			});
-			continue;
-		}
-		sections.push({
-			group: def.group,
-			rows: [{
-				def,
-				spec
-			}]
-		});
-	}
-	return sections;
-}
 //#endregion
 //#region src/tui/model-picker.tsx
 /**
@@ -7999,22 +7964,22 @@ function statusColor(status, COLOR) {
 }
 //#endregion
 //#region src/tui/settings-modal.tsx
-const TAB_ORDER = [
-	"general",
-	"skills",
-	"mcps"
-];
 const TAB_LABELS = {
-	general: "General",
+	...Object.fromEntries(SETTINGS_CATEGORIES.map((c) => [c.id, c.label])),
+	keybindings: "Keybindings",
+	authentication: "Authentication",
 	skills: "Skills",
 	mcps: "MCP servers"
 };
+function isCategoryTab(id) {
+	return id !== "skills" && id !== "mcps" && id !== "keybindings" && id !== "authentication";
+}
 function anchorIdFor(index) {
 	return `settings-row-${index}`;
 }
 const COL_TITLE = "      ";
 const SPACER_CHECKBOX_WIDTH = "    ";
-function SettingsModal({ skillsCatalog: skillsCatalogProp, mcpsCatalog: mcpsCatalogProp, mcpsErrors: mcpsErrorsProp, actions } = {}) {
+function SettingsModal({ skillsCatalog: skillsCatalogProp, mcpsCatalog: mcpsCatalogProp, mcpsErrors: mcpsErrorsProp, keybindings, keybindingsPath, authentication, actions } = {}) {
 	const COLOR = useColors();
 	const SURFACE = useSurfaces();
 	const { settings, toggle: toggleBoolean, setSetting } = useSettings();
@@ -8035,13 +8000,19 @@ function SettingsModal({ skillsCatalog: skillsCatalogProp, mcpsCatalog: mcpsCata
 		keyOf: (m) => m.config.name,
 		settingKey: "enabledMcps"
 	});
-	const [activeTab, setActiveTab] = useState("general");
-	const [cursorByTab, setCursorByTab] = useState({
-		general: 0,
-		skills: 0,
-		mcps: 0
-	});
+	const tabOrder = useMemo(() => {
+		const tabs = [...SETTINGS_CATEGORIES.map((c) => c.id)];
+		if (keybindings) tabs.push("keybindings");
+		if (authentication) tabs.push("authentication");
+		tabs.push("skills", "mcps");
+		return tabs;
+	}, [keybindings, authentication]);
+	const [activeTab, setActiveTab] = useState(tabOrder[0]);
+	const [cursorByTab, setCursorByTab] = useState(() => Object.fromEntries(tabOrder.map((id) => [id, 0])));
 	const [query, setQuery] = useState("");
+	useEffect(() => {
+		if (!tabOrder.includes(activeTab)) setActiveTab(tabOrder[0]);
+	}, [tabOrder, activeTab]);
 	useEffect(() => {
 		inputRef.current?.focus();
 	}, []);
@@ -8055,15 +8026,17 @@ function SettingsModal({ skillsCatalog: skillsCatalogProp, mcpsCatalog: mcpsCata
 			...c
 		}));
 		const acts = [];
-		if (actions?.onOpenKeybindings) acts.push({
+		if (actions?.onOpenKeybindings && !keybindings) acts.push({
 			kind: "action",
+			category: "ui",
 			id: "keybindings",
 			label: "Keybindings",
 			description: "open ~/.zidane/keybindings.json (restart to apply)",
 			onPick: actions.onOpenKeybindings
 		});
-		if (actions?.onReauth) acts.push({
+		if (actions?.onReauth && !authentication) acts.push({
 			kind: "action",
+			category: "agent",
 			id: "reauth",
 			label: "Authentication",
 			description: "switch provider, add another, or re-authenticate",
@@ -8074,14 +8047,29 @@ function SettingsModal({ skillsCatalog: skillsCatalogProp, mcpsCatalog: mcpsCata
 			...choices,
 			...acts
 		];
-	}, [actions]);
-	const filteredGeneral = useMemo(() => generalItems.filter((it) => matchesQuery(generalCorpus(it), query)), [generalItems, query]);
+	}, [
+		actions,
+		keybindings,
+		authentication
+	]);
+	const filteredByCategory = useMemo(() => {
+		const buckets = Object.fromEntries(SETTINGS_CATEGORIES.map((c) => [c.id, []]));
+		for (const it of generalItems) {
+			if (!matchesQuery(generalCorpus(it), query)) continue;
+			buckets[it.category].push(it);
+		}
+		return buckets;
+	}, [generalItems, query]);
 	const filteredSkills = useMemo(() => skillsCatalog.filter((s) => matchesQuery(skillCorpus(s), query)), [skillsCatalog, query]);
 	const filteredMcps = useMemo(() => mcpsCatalog.filter((m) => matchesQuery(mcpCorpus(m), query)), [mcpsCatalog, query]);
+	const filteredProviders = useMemo(() => (authentication?.providers ?? []).filter((p) => matchesQuery(providerCorpus(p), query)), [authentication?.providers, query]);
+	const authRowCount = filteredProviders.length + (authentication ? 1 : 0);
 	const filteredSize = {
-		general: filteredGeneral.length,
+		...Object.fromEntries(SETTINGS_CATEGORIES.map((c) => [c.id, filteredByCategory[c.id].length])),
 		skills: filteredSkills.length,
-		mcps: filteredMcps.length
+		mcps: filteredMcps.length,
+		keybindings: 0,
+		authentication: authRowCount
 	};
 	const cursor = Math.min(cursorByTab[activeTab], Math.max(0, filteredSize[activeTab] - 1));
 	const moveCursor = useCallback((delta) => setCursorByTab((prev) => {
@@ -8101,6 +8089,7 @@ function SettingsModal({ skillsCatalog: skillsCatalogProp, mcpsCatalog: mcpsCata
 		}));
 	}, [activeTab]);
 	useEffect(() => {
+		if (activeTab === "keybindings") return;
 		const sb = scrollboxRef.current;
 		if (!sb) return;
 		const handle = requestAnimationFrame(() => {
@@ -8112,6 +8101,15 @@ function SettingsModal({ skillsCatalog: skillsCatalogProp, mcpsCatalog: mcpsCata
 		activeTab,
 		query
 	]);
+	useEffect(() => {
+		if (activeTab !== "keybindings") return;
+		const sb = scrollboxRef.current;
+		if (!sb) return;
+		const handle = requestAnimationFrame(() => {
+			sb.scrollTo(0);
+		});
+		return () => cancelAnimationFrame(handle);
+	}, [activeTab]);
 	const focusedMcp = filteredMcps[cursor];
 	const focusedMcpStatus = focusedMcp ? getMcpAuthStatus(authState, focusedMcp.config.name) : void 0;
 	const oauthPasteActive = activeTab === "mcps" && focusedMcpStatus?.kind === "authorizing" && !!focusedMcpStatus.url;
@@ -8123,21 +8121,43 @@ function SettingsModal({ skillsCatalog: skillsCatalogProp, mcpsCatalog: mcpsCata
 		if (oauthPasteActive) return;
 		if (!key.ctrl && !key.meta && !key.shift && (key.name === "left" || key.name === "right")) {
 			key.preventDefault();
-			const idx = TAB_ORDER.indexOf(activeTab);
-			setActiveTab(key.name === "left" ? TAB_ORDER[(idx - 1 + TAB_ORDER.length) % TAB_ORDER.length] : TAB_ORDER[(idx + 1) % TAB_ORDER.length]);
+			const idx = tabOrder.indexOf(activeTab);
+			setActiveTab(key.name === "left" ? tabOrder[(idx - 1 + tabOrder.length) % tabOrder.length] : tabOrder[(idx + 1) % tabOrder.length]);
 			return;
 		}
 		if (key.name === "up" || key.ctrl && key.name === "p") {
-			moveCursor(-1);
+			if (activeTab === "keybindings") scrollboxRef.current?.scrollBy(-2);
+			else moveCursor(-1);
 			return;
 		}
 		if (key.name === "down" || key.ctrl && key.name === "n") {
-			moveCursor(1);
+			if (activeTab === "keybindings") scrollboxRef.current?.scrollBy(2);
+			else moveCursor(1);
+			return;
+		}
+		if ((key.name === "pageup" || key.ctrl && key.name === "b") && activeTab === "keybindings") {
+			scrollboxRef.current?.scrollBy(-.5, "viewport");
+			return;
+		}
+		if ((key.name === "pagedown" || key.ctrl && key.name === "f") && activeTab === "keybindings") {
+			scrollboxRef.current?.scrollBy(.5, "viewport");
+			return;
+		}
+		if (key.name === "home" && activeTab === "keybindings") {
+			scrollboxRef.current?.scrollTo(0);
+			return;
+		}
+		if (key.name === "end" && activeTab === "keybindings") {
+			const sb = scrollboxRef.current;
+			if (sb) sb.scrollTo({
+				x: 0,
+				y: sb.scrollHeight
+			});
 			return;
 		}
 		if (key.name === "return") {
-			if (activeTab === "general") {
-				const it = filteredGeneral[cursor];
+			if (isCategoryTab(activeTab)) {
+				const it = filteredByCategory[activeTab][cursor];
 				if (!it) return;
 				if (it.kind === "toggle") toggleBoolean(it.key);
 				else if (it.kind === "choice") {
@@ -8156,6 +8176,24 @@ function SettingsModal({ skillsCatalog: skillsCatalogProp, mcpsCatalog: mcpsCata
 			if (activeTab === "mcps") {
 				const m = filteredMcps[cursor];
 				if (m) mcpsToggle.toggle(m.config.name);
+				return;
+			}
+			if (activeTab === "keybindings") {
+				actions?.onOpenKeybindings?.();
+				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?.();
+				return;
 			}
 			return;
 		}
@@ -8178,23 +8216,29 @@ function SettingsModal({ skillsCatalog: skillsCatalogProp, mcpsCatalog: mcpsCata
 			if (activeTab === "mcps" && actions?.onRefreshMcps) actions.onRefreshMcps();
 		}
 	});
+	const totalsByCategory = useMemo(() => {
+		const t = Object.fromEntries(SETTINGS_CATEGORIES.map((c) => [c.id, 0]));
+		for (const it of generalItems) t[it.category]++;
+		return t;
+	}, [generalItems]);
 	return /* @__PURE__ */ jsxs(Modal, {
 		title: "settings",
-		maxWidth: 140,
+		maxWidth: 160,
 		minWidth: 76,
-		maxHeight: 44,
+		maxHeight: 50,
 		horizontalMargin: 2,
 		verticalMargin: 1,
 		children: [
 			/* @__PURE__ */ jsx("box", {
 				style: { flexShrink: 0 },
 				children: /* @__PURE__ */ jsx(TabStrip, {
+					order: tabOrder,
 					active: activeTab,
 					counts: {
-						general: {
-							current: filteredGeneral.length,
-							total: generalItems.length
-						},
+						...Object.fromEntries(SETTINGS_CATEGORIES.map((c) => [c.id, {
+							current: filteredByCategory[c.id].length,
+							total: totalsByCategory[c.id]
+						}])),
 						skills: {
 							current: filteredSkills.length,
 							total: skillsCatalog.length
@@ -8234,8 +8278,8 @@ function SettingsModal({ skillsCatalog: skillsCatalogProp, mcpsCatalog: mcpsCata
 				},
 				stickyScroll: false,
 				children: [
-					activeTab === "general" && /* @__PURE__ */ jsx(GeneralList, {
-						items: filteredGeneral,
+					isCategoryTab(activeTab) && /* @__PURE__ */ jsx(GeneralList, {
+						items: filteredByCategory[activeTab],
 						cursor,
 						highlightBg: SURFACE.selection,
 						query
@@ -8257,9 +8301,27 @@ function SettingsModal({ skillsCatalog: skillsCatalogProp, mcpsCatalog: mcpsCata
 						query,
 						errors: mcpsErrors,
 						authState
+					}),
+					activeTab === "keybindings" && keybindings && /* @__PURE__ */ jsx(KeybindingsList, {
+						bindings: keybindings,
+						query
+					}),
+					activeTab === "authentication" && authentication && /* @__PURE__ */ jsx(AuthenticationList, {
+						view: authentication,
+						providers: filteredProviders,
+						cursor,
+						highlightBg: SURFACE.selection,
+						query
 					})
 				]
 			}),
+			activeTab === "keybindings" && /* @__PURE__ */ jsx("box", {
+				style: { flexShrink: 0 },
+				children: /* @__PURE__ */ jsx(KeybindingsEditFileButton, {
+					filePath: keybindingsPath,
+					highlightBg: SURFACE.selection
+				})
+			}),
 			activeTab === "mcps" && focusedMcp && focusedMcpStatus && /* @__PURE__ */ jsx("box", {
 				style: { flexShrink: 0 },
 				children: renderMcpDetailPanel(focusedMcp, focusedMcpStatus, COLOR)
@@ -8277,7 +8339,7 @@ function SettingsModal({ skillsCatalog: skillsCatalogProp, mcpsCatalog: mcpsCata
 		]
 	});
 }
-function TabStrip({ active, counts }) {
+function TabStrip({ order, active, counts }) {
 	const COLOR = useColors();
 	const SURFACE = useSurfaces();
 	return /* @__PURE__ */ jsx("box", {
@@ -8285,16 +8347,17 @@ function TabStrip({ active, counts }) {
 			flexDirection: "row",
 			height: 1
 		},
-		children: TAB_ORDER.map((id, i) => {
+		children: order.map((id, i) => {
 			const isActive = id === active;
 			const label = TAB_LABELS[id];
-			const { current, total } = counts[id];
-			const badge = current !== total ? `${current}/${total}` : `${total}`;
+			const tabCounts = counts[id];
+			const showBadge = !!tabCounts;
+			const badge = tabCounts ? tabCounts.current !== tabCounts.total ? `${tabCounts.current}/${tabCounts.total}` : `${tabCounts.total}` : "";
 			return /* @__PURE__ */ jsx("box", {
 				style: {
 					paddingLeft: 1,
 					paddingRight: 1,
-					marginRight: i === TAB_ORDER.length - 1 ? 0 : 1,
+					marginRight: i === order.length - 1 ? 0 : 1,
 					backgroundColor: isActive ? SURFACE.selection : void 0
 				},
 				children: /* @__PURE__ */ jsxs("text", {
@@ -8302,7 +8365,7 @@ function TabStrip({ active, counts }) {
 					children: [/* @__PURE__ */ jsx("span", {
 						fg: isActive ? COLOR.brand : COLOR.dim,
 						children: label
-					}), /* @__PURE__ */ jsx("span", {
+					}), showBadge && /* @__PURE__ */ jsx("span", {
 						fg: isActive ? COLOR.brand : COLOR.mute,
 						children: `  ${badge}`
 					})]
@@ -8445,7 +8508,12 @@ function McpsList({ items, enabledSet, totalCount, cursor, highlightBg, query, e
 						fg: COLOR.model,
 						children: " mcps.json "
 					}),
-					"into",
+					"(or",
+					/* @__PURE__ */ jsx("span", {
+						fg: COLOR.model,
+						children: " mcp.json "
+					}),
+					") into",
 					/* @__PURE__ */ jsx("span", {
 						fg: COLOR.model,
 						children: " .zidane/ "
@@ -8512,6 +8580,179 @@ function McpsList({ items, enabledSet, totalCount, cursor, highlightBg, query, e
 		})]
 	});
 }
+function KeybindingsList({ bindings, query }) {
+	const sections = useMemo(() => groupBindings(bindings), [bindings]);
+	const filteredSections = useMemo(() => {
+		if (!query.trim()) return sections;
+		return sections.map((section) => ({
+			group: section.group,
+			rows: section.rows.filter((row) => matchesQuery(keybindingCorpus(row), query))
+		})).filter((s) => s.rows.length > 0);
+	}, [sections, query]);
+	if (filteredSections.length === 0) return /* @__PURE__ */ jsx(EmptyRow, { label: `no keybindings match "${query}"` });
+	return /* @__PURE__ */ jsx(KeybindingsCatalog, { sections: filteredSections });
+}
+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: [
+			/* @__PURE__ */ jsxs("box", {
+				style: {
+					flexDirection: "column",
+					flexShrink: 0,
+					paddingLeft: 1,
+					paddingRight: 1
+				},
+				children: [
+					/* @__PURE__ */ jsx("text", {
+						wrapMode: "none",
+						children: /* @__PURE__ */ jsx("span", {
+							fg: COLOR.brand,
+							children: "Current"
+						})
+					}),
+					/* @__PURE__ */ jsxs("text", {
+						wrapMode: "none",
+						children: [
+							/* @__PURE__ */ jsx("span", {
+								fg: COLOR.mute,
+								children: "  provider  "
+							}),
+							/* @__PURE__ */ jsx("span", {
+								fg: view.currentProviderLabel ? COLOR.accent : COLOR.mute,
+								children: view.currentProviderLabel ?? "— not selected —"
+							}),
+							view.currentProviderKey && view.currentProviderLabel && view.currentProviderKey !== view.currentProviderLabel.toLowerCase() && /* @__PURE__ */ jsx("span", {
+								fg: COLOR.dim,
+								children: `  (${view.currentProviderKey})`
+							})
+						]
+					}),
+					/* @__PURE__ */ jsxs("text", {
+						wrapMode: "none",
+						children: [/* @__PURE__ */ jsx("span", {
+							fg: COLOR.mute,
+							children: "  model     "
+						}), /* @__PURE__ */ jsx("span", {
+							fg: view.currentModel ? COLOR.model : COLOR.mute,
+							children: view.currentModel ?? "— not selected —"
+						})]
+					})
+				]
+			}),
+			/* @__PURE__ */ jsx("box", {
+				style: {
+					flexDirection: "column",
+					flexShrink: 0,
+					marginTop: 1,
+					paddingLeft: 1,
+					paddingRight: 1
+				},
+				children: /* @__PURE__ */ jsxs("text", {
+					wrapMode: "none",
+					children: [/* @__PURE__ */ jsx("span", {
+						fg: COLOR.brand,
+						children: "Providers"
+					}), /* @__PURE__ */ jsx("span", {
+						fg: COLOR.mute,
+						children: totalProviders > 0 ? `  ${providers.length}/${totalProviders}` : ""
+					})]
+				})
+			}),
+			totalProviders === 0 && /* @__PURE__ */ jsx("box", {
+				style: {
+					paddingLeft: 3,
+					paddingRight: 1
+				},
+				children: /* @__PURE__ */ jsx("text", {
+					fg: COLOR.mute,
+					children: "No providers registered."
+				})
+			}),
+			totalProviders > 0 && providers.length === 0 && /* @__PURE__ */ jsx(EmptyRow, { label: `no providers match "${query}"` }),
+			providers.map((p, i) => {
+				const isCurrent = view.currentProviderKey === p.key;
+				const focused = i === cursor;
+				const bg = focused ? highlightBg : void 0;
+				const marker = focused ? "▶ " : isCurrent ? "▸ " : "  ";
+				const labelColor = focused || isCurrent ? COLOR.brand : p.available ? COLOR.dim : COLOR.mute;
+				return /* @__PURE__ */ jsxs("box", {
+					id: anchorIdFor(i),
+					style: {
+						flexDirection: "column",
+						flexShrink: 0,
+						paddingLeft: 1,
+						paddingRight: 1,
+						backgroundColor: bg
+					},
+					children: [/* @__PURE__ */ jsxs("text", {
+						wrapMode: "none",
+						children: [
+							/* @__PURE__ */ jsx("span", {
+								fg: focused ? COLOR.brand : COLOR.mute,
+								children: marker
+							}),
+							/* @__PURE__ */ jsx("span", {
+								fg: labelColor,
+								children: p.label
+							}),
+							/* @__PURE__ */ jsx("span", {
+								fg: p.available ? COLOR.accent : COLOR.mute,
+								children: p.available ? "  ✓ configured" : "  · not configured"
+							}),
+							isCurrent && /* @__PURE__ */ jsx("span", {
+								fg: COLOR.mute,
+								children: "  (active)"
+							})
+						]
+					}), p.methods.length > 0 && /* @__PURE__ */ jsx("text", {
+						wrapMode: "none",
+						fg: COLOR.mute,
+						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", {
@@ -8656,7 +8897,7 @@ function renderMcpDetailPanel(entry, status, COLOR) {
 		return /* @__PURE__ */ jsx(McpAuthorizingPanel, {
 			serverName: entry.config.name,
 			authUrl: status.url,
-			maxLineWidth: 134,
+			maxLineWidth: 154,
 			inputFocused: true
 		});
 	}
@@ -8742,12 +8983,12 @@ function Hints({ activeTab, focusedMcp, focusedMcpStatus, canRefreshSkills, canR
 				fg: COLOR.warn,
 				children: "↑↓"
 			}),
-			" navigate · ",
+			activeTab === "keybindings" ? " scroll · " : " navigate · ",
 			/* @__PURE__ */ jsx("span", {
 				fg: COLOR.warn,
 				children: "↵"
 			}),
-			activeTab === "general" ? " toggle/cycle/select" : " toggle",
+			isCategoryTab(activeTab) ? " toggle/cycle/select" : activeTab === "keybindings" ? " edit file" : activeTab === "authentication" ? " switch / re-authenticate" : " toggle",
 			showLogin && /* @__PURE__ */ jsxs("span", { children: [
 				" · ",
 				/* @__PURE__ */ jsx("span", {
@@ -8812,6 +9053,12 @@ function mcpCorpus(m) {
 		(m.config.args ?? []).join(" ")
 	].join(" ").toLowerCase();
 }
+function keybindingCorpus(row) {
+	return `${row.spec} ${row.def.label} ${row.def.description} ${row.def.action}`.toLowerCase();
+}
+function providerCorpus(p) {
+	return `${p.label} ${p.key} ${p.methods.map((m) => `${m.source} ${m.detail}`).join(" ")}`.toLowerCase();
+}
 function mcpDetail(entry) {
 	const transport = entry.config.transport;
 	return `${transport} · ${transport === "stdio" ? entry.config.command ?? "" : entry.config.url ?? ""}`;
@@ -8824,11 +9071,11 @@ function canLogout$1(status) {
 	return status.kind === "authed" || status.kind === "error" || status.kind === "authorizing";
 }
 function searchPlaceholder(tab) {
-	switch (tab) {
-		case "general": return "search settings — name, description…";
-		case "skills": return "search skills — name, description…";
-		case "mcps": return "search MCP servers — name, transport, command/URL…";
-	}
+	if (tab === "skills") return "search skills — name, description…";
+	if (tab === "mcps") return "search MCP servers — name, transport, command/URL…";
+	if (tab === "keybindings") return "search keybindings — action, key, description…";
+	if (tab === "authentication") return "search providers — name, method…";
+	return `search ${TAB_LABELS[tab].toLowerCase()} settings — name, description…`;
 }
 function displayPath$1(path, home) {
 	if (home && path.startsWith(`${home}/`)) return `~/${path.slice(home.length + 1)}`;
@@ -9564,6 +9811,7 @@ function AppShell() {
 	const lastResumedSessionId = initialState.lastSessionId;
 	const resumeLastSessionOnLaunch = initialState.settings?.resumeLastSession ?? true;
 	const dataDir = config.paths.userDir;
+	const cacheDir = config.paths.cacheDir;
 	const [pickedAgent, setPickedAgent] = useState(() => agentRegistry[initialAgentId] ?? Object.values(agentRegistry)[0]);
 	const pickedAgentRef = useRef(pickedAgent);
 	const safeModeEnabledRef = useRef(settings.safeMode);
@@ -9591,6 +9839,10 @@ function AppShell() {
 	useEffect(() => {
 		allowInteractionRef.current = settings.allowInteraction;
 	}, [settings.allowInteraction]);
+	const userInstructionsScopeRef = useRef(settings.userInstructionsScope);
+	useEffect(() => {
+		userInstructionsScopeRef.current = settings.userInstructionsScope;
+	}, [settings.userInstructionsScope]);
 	const autoCompactRef = useRef(settings.autoCompact);
 	useEffect(() => {
 		autoCompactRef.current = settings.autoCompact;
@@ -9987,14 +10239,20 @@ function AppShell() {
 		const allowInteraction = allowInteractionRef.current !== false;
 		const interactionTools = allowInteraction ? createInteractionTools({ requestInteraction: makeRequestInteraction(interactions) }) : {};
 		const actualCwd = cwdRef.current;
+		const agentsMd = discoverAgentsMd({
+			cwd: actualCwd,
+			prefix: config.prefix,
+			scope: userInstructionsScopeRef.current
+		});
 		const envOpts = {
 			cwd: actualCwd,
 			...projectDir !== actualCwd ? { projectRoot: projectDir } : {},
-			allowInteraction
+			allowInteraction,
+			...agentsMd.block ? { userInstructions: agentsMd.block } : {}
 		};
 		const builtInSystem = profile.id === "build" ? buildBuildSystem(envOpts) : profile.id === "plan" ? buildPlanSystem(envOpts) : null;
 		const persistDir = resolvePersistDir({
-			userDir: dataDir,
+			userDir: cacheDir,
 			sessionId: session.id
 		});
 		const persistBehavior = persistToolResultsRef.current === false ? {
@@ -10002,7 +10260,7 @@ function AppShell() {
 			persistDir
 		} : { persistDir };
 		const tasksDir = resolveTasksDir({
-			userDir: dataDir,
+			userDir: cacheDir,
 			sessionId: session.id
 		});
 		const agent = createAgent({
@@ -10386,6 +10644,7 @@ function AppShell() {
 		config.prefix,
 		interactions,
 		dataDir,
+		cacheDir,
 		mcpCredentialStore,
 		registerInFlightTool,
 		unregisterInFlightTool
@@ -11191,11 +11450,11 @@ function AppShell() {
 			return;
 		}
 		cleanupPersistedSession(resolvePersistDir({
-			userDir: dataDir,
+			userDir: cacheDir,
 			sessionId: id
 		}));
 		cleanupPersistedSession(resolveTasksDir({
-			userDir: dataDir,
+			userDir: cacheDir,
 			sessionId: id
 		}));
 		const wasCurrent = id === currentSession?.id;
@@ -11217,7 +11476,8 @@ function AppShell() {
 		teardown,
 		refreshSessions,
 		stateStore,
-		dataDir
+		dataDir,
+		cacheDir
 	]);
 	const onGenerateTitle = useCallback(async (sessionId, signal) => {
 		if (!picked) throw new Error("No provider picked — open the chat screen first.");
@@ -11535,15 +11795,31 @@ function AppShell() {
 			return;
 		}
 		if (matchesBinding(key, keybindings.openSettings) && screen !== "auth") {
-			modal.open(/* @__PURE__ */ jsx(SettingsModal, { actions: {
-				onReauth,
-				onOpenKeybindings: onOpenKeybindingsFile,
-				onLoginMcp,
-				onLogoutMcp,
-				onCancelLoginMcp,
-				onRefreshSkills,
-				onRefreshMcps
-			} }));
+			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),
+				authentication: {
+					currentProviderLabel: picked?.provider.label,
+					currentProviderKey: picked?.provider.key,
+					currentModel: picked?.model,
+					providers: allProviders
+				},
+				actions: {
+					onReauth,
+					onPickProvider: onPickProviderFromSettings,
+					onOpenKeybindings: onOpenKeybindingsFile,
+					onLoginMcp,
+					onLogoutMcp,
+					onCancelLoginMcp,
+					onRefreshSkills,
+					onRefreshMcps
+				}
+			}));
 			return;
 		}
 		if (matchesBinding(key, keybindings.openSessionDetails)) {
@@ -11654,7 +11930,7 @@ function AppShell() {
 		packageName: autoUpdateConfig?.packageName ?? "",
 		currentVersion: autoUpdateConfig?.currentVersion ?? "",
 		enabled: !!autoUpdateConfig && settings.checkForUpdates,
-		cacheDir: dataDir,
+		cacheDir,
 		registry: autoUpdateConfig?.registry,
 		channel: autoUpdateConfig?.channel,
 		cacheTtlMs: autoUpdateConfig?.cacheTtlMs
@@ -12107,7 +12383,12 @@ function McpsSettingsModal({ catalog, errors, onLogin, onLogout, onCancelLogin,
 						fg: COLOR.model,
 						children: " mcps.json "
 					}),
-					"into",
+					"(or",
+					/* @__PURE__ */ jsx("span", {
+						fg: COLOR.model,
+						children: " mcp.json "
+					}),
+					") into",
 					/* @__PURE__ */ jsx("span", {
 						fg: COLOR.model,
 						children: " .zidane/ "