zidane 5.6.5 → 5.6.8

package/dist/tui.js

@@ -1,11 +1,11 @@
-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-b2ICQ1Y5.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 { $n as ensureKeybindingsFile, A as getSafelist, At as clipHintsToWidth, B as oauthUsesManualCodePaste, Bi as buildPlanSystem, Bt as SETTINGS_CATEGORIES, Cn as stripSpawnTokensLine, Cr as bootTick, D as useSafeModeQueue, Dn as toolResultText, Dt as useInteractionsActions, E as useSafeModeActions, En as toolCallPreview, F as suggestSafelistEntry, Fn as extractEditPayload, Fr as shouldAutoCompact, Ft as buildHints, G as indexOfEntry, Gn as resolveApprovalForPayload, Gt as useSettings, H as supportsOAuth, Hr as setProviderCredential, Ht as SETTINGS_TOGGLES, In as filetypeFromPath, Ir as detectAuth, J as discoverProjectMcps, Jn as summarizeOutcomes, Jt as resolveChipColor, K as buildMcpServers, Kn as rewriteMultiEditHeader, L as splitPromptSegments, Ln as previewEditPayload, Lt as listProjectFiles, Mn as buildUnifiedDiff, Mt as truncateTrailing, Oi as useActiveTodos, On as turnSelectionOwnership, Ot as useInteractionsQueue, Pr as AUTO_COMPACT_MIN_GROWTH_FRACTION, Pt as generateSessionTitle, Q as loadMcpToolsCache, Qn as KEYBINDING_KEY_COL_WIDTH, Qr as modelSupportsReasoning, R as formatPathForCwd, Rt as useEnabledToggleSet, Sn as selectableTurnIds, St as createInteractionTools, T as SafeModeProvider, Tr as useUpdateCheck, Tt as pendingInteractionsFromTurns, U as buildModelCatalog, Un as mergeApprovalAndBodyOutcomes, Ut as SettingsProvider, V as runOAuthLogin, Vi as envSection, Vn as buildEditOutcomesAnnotation, Vt as SETTINGS_CHOICES, W as filterModelCatalog, Wn as parseEditOutcomesFromResult, Wt as clampFps, Xn as KEYBINDING_DEFS, Xr as getContextWindow, Yt as resolveTheme, _ as turnContextSize, _n as lastContextSizeFromTurns, _t as splitMarkdownCodeBlocks, a as computeTurnAnchors, ai as findGitRoot, an as ConfigProvider, b as defaultSkillScanPaths, bn as marginTopFor, br as buildLinearRamp, c as formatToolCall, ct as parentServerName, d as useSelectStyle, er as formatBindingForDisplay, et as refreshMcpToolsCatalog, f as useSurfaces, fi as accentColor, fn as deriveSessionTitle, fr as createFilesCompletionProvider, ft as McpAuthProvider, g as finalizeStreamingMarkdownForOwner, gn as isVisible, h as finalizeStreamingMarkdown, hn as isTurnHighlighted, ht as getMcpAuthStatus, i as turnAsText, in as useDiscoveryOptional, it as useMcpToolToggleMap, j as isOnSafelist, jn as buildContextualDiff, jt as hintsLength, k as addToSafelist, kn as updateToolEventOutcomes, kt as EMPTY_HINTS, l as ThemeProvider, lr as createSkillsCompletionProvider, lt as createFileMcpCredentialStore, m as useTheme, mn as isEditErrorResult, mt as useMcpAuthState, n as deleteTurnSafely, ni as piIdOf, nn as DiscoveryProvider, nr as keybindingsPath, nt as subscribeMcpToolsCache, o as TOOL_DISPLAY, on as useConfig, ot as buildVisibleMcpRows, pn as eventsFromTurns, pt as useMcpAuthDispatch, qn as stripEditOutcomesAnnotation, r as truncateTurnsAt, ri as discoverAgentsMd, rn as useDiscovery, rr as matchesBinding, s as displayNameFor, sn as resolveConfig, st as indexOfServerRow, tn as createDiscoverySlot, tr as groupBindings, u as useColors, un as EDIT_TOOL_NAMES, ur as uniqueSkillNamesFromReferences, v as useStreamBuffer, vi as TODO_STATUS_GLYPHS, vn as listSessionMeta, vr as useCompletion, w as writeSessionExport, wn as sumRunCosts, wr as buildUpdateHint, wt as makeRequestInteraction, x as discoverProjectSkills, xr as tryOpenBrowser, xt as buildResumedToolResultsTurn, y as buildSkillsConfig, yr as blendHsl, yt as InteractionsProvider, z as fetchOAuthRedirect, zi as buildBuildSystem, zn as summarizeEditPayload, zt as DEFAULT_SETTINGS } from "./turn-operations-D2rHrTQv.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-B9aQpZVx.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 { s as McpOAuthProvider, t as connectMcpServers } from "./mcp-Wzf0qxaj.js";
+import { C as summaryToTurn, a as selectFilesFromSession, r as buildPostCompactAttachments, s as compactConversation, t as loginMcpServer } from "./login-CwLWX6vP.js";
 import { n as formatTokenUsage } from "./stats-Lc3zL3RM.js";
-import { n as loadSession, t as createSession } from "./session-BoEW_wCR.js";
+import { n as loadSession, t as createSession } from "./session-PUzXZlG6.js";
 import { createTuiStore } from "./session/sqlite.js";
 import { basename, join, relative } from "node:path";
 import { homedir } from "node:os";
@@ -1967,11 +1967,40 @@ function makeMarkdownRenderNode(bag) {
 			wrapper.marginTop = topMargin;
 			return wrapper;
 		}
+		if (inner instanceof CodeRenderable) pinContentTrim(inner);
 		inner.marginTop = topMargin;
 		return inner;
 	};
 }
 /**
+* Install an instance-level `content` accessor on a prose
+* {@link CodeRenderable} that strips trailing newlines before
+* delegating to the prototype setter. Runs once per block on
+* creation; subsequent markdown delta passes call
+* `applyMarkdownCodeRenderable` which writes `token.raw` directly into
+* `.content` and re-enters our setter, so updates stay trimmed too.
+*
+* Idempotent — re-applies cleanly if a block is recreated on a
+* type-change (which destroys + re-creates the renderable anyway).
+*/
+function pinContentTrim(renderable) {
+	const desc = Object.getOwnPropertyDescriptor(Object.getPrototypeOf(renderable), "content");
+	if (!desc?.set || !desc.get) return;
+	const protoSet = desc.set;
+	const protoGet = desc.get;
+	Object.defineProperty(renderable, "content", {
+		get() {
+			return protoGet.call(this);
+		},
+		set(value) {
+			const next = typeof value === "string" ? value.replace(/\n+$/, "") : value;
+			protoSet.call(this, next);
+		},
+		configurable: true
+	});
+	renderable.content = renderable.content;
+}
+/**
 * Pull the trailing block index out of an OpenTUI renderable id. Returns
 * `0` for any id that doesn't match the expected `…-block-N` shape — the
 * spacing rule then treats unparseable ids as "first block" (no
@@ -2017,7 +2046,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;
@@ -2428,6 +2457,7 @@ function ToolCallBlock({ event, display, dim }) {
 	});
 	return /* @__PURE__ */ jsxs("text", {
 		fg: dim ? COLOR.dim : COLOR.model,
+		wrapMode: "none",
 		children: [
 			/* @__PURE__ */ jsx("span", {
 				fg: COLOR.mute,
@@ -2807,6 +2837,7 @@ function CwdPickerModal({ currentCwd, onPick }) {
 */
 const FILES_REFRESH_THROTTLE_MS = 3e3;
 const SKILLS_REFRESH_THROTTLE_MS = 3e4;
+const MCP_TOOLS_CACHE_POLL_MS = 4e3;
 function debugLog$1(...args) {
 	if (process.env.ZIDANE_DEBUG) process.stderr.write(`[zidane/tui] ${args.map(errorMessage).join(" ")}\n`);
 }
@@ -2822,6 +2853,7 @@ function DiscoveryShell({ children }) {
 	const [mcpsCatalog, setMcpsCatalog] = useState([]);
 	const [mcpsErrors, setMcpsErrors] = useState([]);
 	const [filesCatalog, setFilesCatalog] = useState([]);
+	const [mcpToolsByServer, setMcpToolsByServer] = useState(() => readToolsByServer(dataDir));
 	const filesSlotRef = useRef(null);
 	const skillsSlotRef = useRef(null);
 	useEffect(() => {
@@ -2923,11 +2955,22 @@ function DiscoveryShell({ children }) {
 		config.prefix,
 		mcpCredentialStore
 	]);
+	useEffect(() => {
+		const id = setInterval(() => {
+			try {
+				setMcpToolsByServer(readToolsByServer(dataDir));
+			} catch (err) {
+				debugLog$1("mcp-tools-cache refresh failed", err);
+			}
+		}, MCP_TOOLS_CACHE_POLL_MS);
+		return () => clearInterval(id);
+	}, [dataDir]);
 	return /* @__PURE__ */ jsx(DiscoveryProvider, {
 		value: useMemo(() => ({
 			skillsCatalog,
 			mcpsCatalog,
 			mcpsErrors,
+			mcpToolsByServer,
 			filesCatalog,
 			refreshSkills,
 			refreshMcps,
@@ -2938,6 +2981,7 @@ function DiscoveryShell({ children }) {
 			skillsCatalog,
 			mcpsCatalog,
 			mcpsErrors,
+			mcpToolsByServer,
 			filesCatalog,
 			refreshSkills,
 			refreshMcps,
@@ -2948,6 +2992,19 @@ function DiscoveryShell({ children }) {
 		children
 	});
 }
+/**
+* Read the on-disk MCP tools cache into a `serverName → tools` map.
+* Strips the per-entry timestamp / transport metadata that the cache
+* file keeps for diagnostics; consumers downstream of the context
+* only need the schemas. Best-effort — a corrupt cache produces an
+* empty map and the next bootstrap re-populates.
+*/
+function readToolsByServer(dataDir) {
+	const cache = loadMcpToolsCache({ dataDir });
+	const out = {};
+	for (const [name, entry] of Object.entries(cache)) out[name] = entry.tools;
+	return out;
+}
 //#endregion
 //#region src/tui/effort-picker.tsx
 const BASE_LEVELS = [
@@ -7964,6 +8021,13 @@ function statusColor(status, COLOR) {
 }
 //#endregion
 //#region src/tui/settings-modal.tsx
+/**
+* Stable empty default for `mcpToolsByServer` — using a fresh `{}` per
+* render would invalidate `useMemo` deps that reference it (and
+* needlessly re-run filtered / visible-row computation when the cache
+* is cold).
+*/
+const EMPTY_TOOLS = Object.freeze({});
 const TAB_LABELS = {
 	...Object.fromEntries(SETTINGS_CATEGORIES.map((c) => [c.id, c.label])),
 	keybindings: "Keybindings",
@@ -7979,6 +8043,29 @@ function anchorIdFor(index) {
 }
 const COL_TITLE = "      ";
 const SPACER_CHECKBOX_WIDTH = "    ";
+/**
+* Truncate `s` to `maxCols` terminal columns, appending an ellipsis
+* when it overflows. Used by every settings list to keep long
+* descriptions on a single line (`wrapMode="none"` clips silently
+* mid-word without an indicator; this gives the reader a clear "more
+* text was here" signal instead).
+*
+* Whitespace is normalised first so embedded `\n` in descriptions
+* doesn't blow up the budget — single space as separator everywhere.
+*
+* Column counting assumes 1 col per code point. Most descriptions in
+* this UI are ASCII; a CJK or wide-emoji description would over-count
+* its width by ~1 col per wide char but that just slightly under-
+* truncates rather than overflowing the row, which is the failure
+* mode we care about.
+*/
+function truncateToCols(s, maxCols) {
+	const clean = s.replace(/\s+/g, " ").trim();
+	if (maxCols <= 0) return "";
+	if (clean.length <= maxCols) return clean;
+	if (maxCols === 1) return "…";
+	return `${clean.slice(0, maxCols - 1)}…`;
+}
 function SettingsModal({ skillsCatalog: skillsCatalogProp, mcpsCatalog: mcpsCatalogProp, mcpsErrors: mcpsErrorsProp, keybindings, keybindingsPath, authentication, actions } = {}) {
 	const COLOR = useColors();
 	const SURFACE = useSurfaces();
@@ -7986,10 +8073,13 @@ function SettingsModal({ skillsCatalog: skillsCatalogProp, mcpsCatalog: mcpsCata
 	const authState = useMcpAuthState();
 	const inputRef = useRef(null);
 	const scrollboxRef = useRef(null);
+	const { width: termWidth } = useTerminalDimensions();
+	const contentCols = Math.max(40, Math.min(160, termWidth - 4) - 2 - 4 - 2 - 1);
 	const discovery = useDiscoveryOptional();
 	const skillsCatalog = discovery?.skillsCatalog ?? skillsCatalogProp ?? [];
 	const mcpsCatalog = discovery?.mcpsCatalog ?? mcpsCatalogProp ?? [];
 	const mcpsErrors = discovery?.mcpsErrors ?? mcpsErrorsProp;
+	const mcpToolsByServer = discovery?.mcpToolsByServer ?? EMPTY_TOOLS;
 	const skillsToggle = useEnabledToggleSet({
 		catalog: skillsCatalog,
 		keyOf: (s) => s.name,
@@ -8000,6 +8090,10 @@ function SettingsModal({ skillsCatalog: skillsCatalogProp, mcpsCatalog: mcpsCata
 		keyOf: (m) => m.config.name,
 		settingKey: "enabledMcps"
 	});
+	const mcpToolToggleMap = useMcpToolToggleMap({ catalogByServer: mcpToolsByServer });
+	const [expandedMcps, setExpandedMcps] = useState(() => /* @__PURE__ */ new Set());
+	const onRefreshMcpToolsRef = useRef(actions?.onRefreshMcpTools);
+	onRefreshMcpToolsRef.current = actions?.onRefreshMcpTools;
 	const tabOrder = useMemo(() => {
 		const tabs = [...SETTINGS_CATEGORIES.map((c) => c.id)];
 		if (keybindings) tabs.push("keybindings");
@@ -8013,6 +8107,10 @@ function SettingsModal({ skillsCatalog: skillsCatalogProp, mcpsCatalog: mcpsCata
 	useEffect(() => {
 		if (!tabOrder.includes(activeTab)) setActiveTab(tabOrder[0]);
 	}, [tabOrder, activeTab]);
+	useEffect(() => {
+		if (activeTab !== "mcps") return;
+		onRefreshMcpToolsRef.current?.();
+	}, [activeTab]);
 	useEffect(() => {
 		inputRef.current?.focus();
 	}, []);
@@ -8061,13 +8159,22 @@ function SettingsModal({ skillsCatalog: skillsCatalogProp, mcpsCatalog: mcpsCata
 		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 filteredMcps = useMemo(() => mcpsCatalog.filter((m) => matchesQuery(mcpCorpus(m, mcpToolsByServer), query)), [
+		mcpsCatalog,
+		query,
+		mcpToolsByServer
+	]);
+	const mcpVisibleRows = useMemo(() => buildVisibleMcpRows(filteredMcps, expandedMcps, mcpToolsByServer), [
+		filteredMcps,
+		expandedMcps,
+		mcpToolsByServer
+	]);
 	const filteredProviders = useMemo(() => (authentication?.providers ?? []).filter((p) => matchesQuery(providerCorpus(p), query)), [authentication?.providers, query]);
 	const authRowCount = filteredProviders.length + (authentication ? 1 : 0);
 	const filteredSize = {
 		...Object.fromEntries(SETTINGS_CATEGORIES.map((c) => [c.id, filteredByCategory[c.id].length])),
 		skills: filteredSkills.length,
-		mcps: filteredMcps.length,
+		mcps: mcpVisibleRows.length,
 		keybindings: 0,
 		authentication: authRowCount
 	};
@@ -8075,7 +8182,7 @@ function SettingsModal({ skillsCatalog: skillsCatalogProp, mcpsCatalog: mcpsCata
 	const moveCursor = useCallback((delta) => setCursorByTab((prev) => {
 		const size = filteredSize[activeTab];
 		if (size === 0) return prev;
-		const next = ((prev[activeTab] + delta) % size + size) % size;
+		const next = ((Math.min(prev[activeTab], size - 1) + delta) % size + size) % size;
 		return {
 			...prev,
 			[activeTab]: next
@@ -8088,19 +8195,86 @@ function SettingsModal({ skillsCatalog: skillsCatalogProp, mcpsCatalog: mcpsCata
 			[activeTab]: 0
 		}));
 	}, [activeTab]);
+	const expandFocusedMcpRow = useCallback(() => {
+		const row = mcpVisibleRows[cursor];
+		if (!row || row.kind !== "server") return;
+		const name = row.entry.config.name;
+		setExpandedMcps((prev) => {
+			if (prev.has(name)) return prev;
+			const next = new Set(prev);
+			next.add(name);
+			return next;
+		});
+	}, [mcpVisibleRows, cursor]);
+	const collapseFocusedMcpRow = useCallback(() => {
+		const row = mcpVisibleRows[cursor];
+		if (!row) return;
+		const parentName = parentServerName(row);
+		if (row.kind !== "server") {
+			const parentIndex = indexOfServerRow(mcpVisibleRows, parentName);
+			if (parentIndex >= 0) setCursorByTab((prev) => ({
+				...prev,
+				mcps: parentIndex
+			}));
+		}
+		setExpandedMcps((prev) => {
+			if (!prev.has(parentName)) return prev;
+			const next = new Set(prev);
+			next.delete(parentName);
+			return next;
+		});
+	}, [mcpVisibleRows, cursor]);
+	/**
+	* Single `tab` press toggles between expanded / collapsed based on
+	* the focused row's current state. The split helpers above remain
+	* useful for `→` / `←` (a "tree-style" navigation contract some
+	* users expect — expand-only / collapse-only). Toggle is the
+	* default that the footer hint advertises.
+	*/
+	const toggleExpandFocusedMcpRow = useCallback(() => {
+		const row = mcpVisibleRows[cursor];
+		if (!row) return;
+		const parentName = parentServerName(row);
+		if (expandedMcps.has(parentName)) collapseFocusedMcpRow();
+		else expandFocusedMcpRow();
+	}, [
+		mcpVisibleRows,
+		cursor,
+		expandedMcps,
+		collapseFocusedMcpRow,
+		expandFocusedMcpRow
+	]);
+	const mcpRowCount = mcpVisibleRows.length;
 	useEffect(() => {
 		if (activeTab === "keybindings") return;
 		const sb = scrollboxRef.current;
 		if (!sb) return;
-		const handle = requestAnimationFrame(() => {
-			sb.scrollChildIntoView(anchorIdFor(cursor));
+		let inner = 0;
+		const outer = requestAnimationFrame(() => {
+			inner = requestAnimationFrame(() => {
+				sb.scrollChildIntoView(anchorIdFor(cursor));
+			});
 		});
-		return () => cancelAnimationFrame(handle);
+		return () => {
+			cancelAnimationFrame(outer);
+			if (inner) cancelAnimationFrame(inner);
+		};
 	}, [
 		cursor,
 		activeTab,
-		query
+		query,
+		mcpRowCount
 	]);
+	useEffect(() => {
+		if (mcpRowCount === 0) return;
+		setCursorByTab((prev) => {
+			if (prev.mcps < mcpRowCount) return prev;
+			return {
+				...prev,
+				mcps: mcpRowCount - 1
+			};
+		});
+	}, [mcpRowCount]);
 	useEffect(() => {
 		if (activeTab !== "keybindings") return;
 		const sb = scrollboxRef.current;
@@ -8110,7 +8284,8 @@ function SettingsModal({ skillsCatalog: skillsCatalogProp, mcpsCatalog: mcpsCata
 		});
 		return () => cancelAnimationFrame(handle);
 	}, [activeTab]);
-	const focusedMcp = filteredMcps[cursor];
+	const focusedMcpRow = activeTab === "mcps" ? mcpVisibleRows[cursor] : void 0;
+	const focusedMcp = focusedMcpRow ? mcpsCatalog.find((m) => m.config.name === parentServerName(focusedMcpRow)) : void 0;
 	const focusedMcpStatus = focusedMcp ? getMcpAuthStatus(authState, focusedMcp.config.name) : void 0;
 	const oauthPasteActive = activeTab === "mcps" && focusedMcpStatus?.kind === "authorizing" && !!focusedMcpStatus.url;
 	useKeyboard((key) => {
@@ -8155,6 +8330,10 @@ function SettingsModal({ skillsCatalog: skillsCatalogProp, mcpsCatalog: mcpsCata
 			});
 			return;
 		}
+		if (activeTab === "mcps" && key.name === "tab") {
+			toggleExpandFocusedMcpRow();
+			return;
+		}
 		if (key.name === "return") {
 			if (isCategoryTab(activeTab)) {
 				const it = filteredByCategory[activeTab][cursor];
@@ -8174,8 +8353,10 @@ function SettingsModal({ skillsCatalog: skillsCatalogProp, mcpsCatalog: mcpsCata
 				return;
 			}
 			if (activeTab === "mcps") {
-				const m = filteredMcps[cursor];
-				if (m) mcpsToggle.toggle(m.config.name);
+				const row = mcpVisibleRows[cursor];
+				if (!row) return;
+				if (row.kind === "server") mcpsToggle.toggle(row.entry.config.name);
+				else if (row.kind === "tool") mcpToolToggleMap[row.serverName]?.toggle(row.tool.name);
 				return;
 			}
 			if (activeTab === "keybindings") {
@@ -8198,11 +8379,12 @@ function SettingsModal({ skillsCatalog: skillsCatalogProp, mcpsCatalog: mcpsCata
 			return;
 		}
 		if (activeTab === "mcps" && focusedMcp && focusedMcpStatus) {
-			if (key.ctrl && key.name === "l" && canLogin$1(focusedMcp, focusedMcpStatus)) {
+			const onServerRow = focusedMcpRow?.kind === "server";
+			if (onServerRow && key.ctrl && key.name === "l" && canLogin$1(focusedMcp, focusedMcpStatus)) {
 				actions?.onLoginMcp?.(focusedMcp.config.name);
 				return;
 			}
-			if (key.ctrl && key.name === "o" && canLogout$1(focusedMcpStatus)) {
+			if (onServerRow && key.ctrl && key.name === "o" && canLogout$1(focusedMcpStatus)) {
 				actions?.onLogoutMcp?.(focusedMcp.config.name);
 				return;
 			}
@@ -8213,7 +8395,10 @@ function SettingsModal({ skillsCatalog: skillsCatalogProp, mcpsCatalog: mcpsCata
 				actions.onRefreshSkills();
 				return;
 			}
-			if (activeTab === "mcps" && actions?.onRefreshMcps) actions.onRefreshMcps();
+			if (activeTab === "mcps") {
+				if (actions?.onRefreshMcps) actions.onRefreshMcps();
+				if (actions?.onRefreshMcpTools) actions.onRefreshMcpTools();
+			}
 		}
 	});
 	const totalsByCategory = useMemo(() => {
@@ -8277,12 +8462,14 @@ function SettingsModal({ skillsCatalog: skillsCatalogProp, mcpsCatalog: mcpsCata
 					minHeight: 4
 				},
 				stickyScroll: false,
+				viewportCulling: false,
 				children: [
 					isCategoryTab(activeTab) && /* @__PURE__ */ jsx(GeneralList, {
 						items: filteredByCategory[activeTab],
 						cursor,
 						highlightBg: SURFACE.selection,
-						query
+						query,
+						contentCols
 					}),
 					activeTab === "skills" && /* @__PURE__ */ jsx(SkillsList, {
 						items: filteredSkills,
@@ -8290,16 +8477,22 @@ function SettingsModal({ skillsCatalog: skillsCatalogProp, mcpsCatalog: mcpsCata
 						totalCount: skillsCatalog.length,
 						cursor,
 						highlightBg: SURFACE.selection,
-						query
+						query,
+						contentCols
 					}),
 					activeTab === "mcps" && /* @__PURE__ */ jsx(McpsList, {
-						items: filteredMcps,
+						rows: mcpVisibleRows,
+						filteredCount: filteredMcps.length,
 						enabledSet: mcpsToggle.enabledSet,
+						toolToggleMap: mcpToolToggleMap,
+						toolsByServer: mcpToolsByServer,
+						expanded: expandedMcps,
 						totalCount: mcpsCatalog.length,
 						cursor,
 						highlightBg: SURFACE.selection,
 						query,
 						errors: mcpsErrors,
+						contentCols,
 						authState
 					}),
 					activeTab === "keybindings" && keybindings && /* @__PURE__ */ jsx(KeybindingsList, {
@@ -8331,6 +8524,7 @@ function SettingsModal({ skillsCatalog: skillsCatalogProp, mcpsCatalog: mcpsCata
 				children: /* @__PURE__ */ jsx(Hints, {
 					activeTab,
 					focusedMcp,
+					focusedMcpRow,
 					focusedMcpStatus,
 					canRefreshSkills: !!actions?.onRefreshSkills,
 					canRefreshMcps: !!actions?.onRefreshMcps
@@ -8374,9 +8568,10 @@ function TabStrip({ order, active, counts }) {
 		})
 	});
 }
-function GeneralList({ items, cursor, highlightBg, query }) {
+function GeneralList({ items, cursor, highlightBg, query, contentCols }) {
 	const { settings } = useSettings();
 	if (items.length === 0) return /* @__PURE__ */ jsx(EmptyRow, { label: query ? `no settings match "${query}"` : "no settings" });
+	const descCols = Math.max(0, contentCols - 1 - 1 - 6);
 	return /* @__PURE__ */ jsx("box", {
 		style: { flexDirection: "column" },
 		children: items.map((item, i) => {
@@ -8386,7 +8581,7 @@ function GeneralList({ items, cursor, highlightBg, query }) {
 			if (item.kind === "toggle") return /* @__PURE__ */ jsx(ToggleRow, {
 				id,
 				label: item.label,
-				description: item.description,
+				description: truncateToCols(item.description, descCols),
 				enabled: settings[item.key],
 				focused,
 				bg
@@ -8397,7 +8592,7 @@ function GeneralList({ items, cursor, highlightBg, query }) {
 				return /* @__PURE__ */ jsx(ChoiceRow, {
 					id,
 					label: item.label,
-					description: item.description,
+					description: truncateToCols(item.description, descCols),
 					value: opt?.label ?? String(current),
 					cyclable: item.options.length > 1,
 					focused,
@@ -8407,14 +8602,14 @@ function GeneralList({ items, cursor, highlightBg, query }) {
 			return /* @__PURE__ */ jsx(ActionRow$1, {
 				id,
 				label: item.label,
-				description: item.description,
+				description: truncateToCols(item.description, descCols),
 				focused,
 				bg
 			}, item.id);
 		})
 	});
 }
-function SkillsList({ items, enabledSet, totalCount, cursor, highlightBg, query }) {
+function SkillsList({ items, enabledSet, totalCount, cursor, highlightBg, query, contentCols }) {
 	const COLOR = useColors();
 	if (totalCount === 0) return /* @__PURE__ */ jsxs("box", {
 		style: { flexDirection: "column" },
@@ -8449,12 +8644,14 @@ function SkillsList({ items, enabledSet, totalCount, cursor, highlightBg, query
 		})]
 	});
 	if (items.length === 0) return /* @__PURE__ */ jsx(EmptyRow, { label: `no skills match "${query}"` });
+	const descCols = Math.max(0, contentCols - 1 - 1 - 6);
 	return /* @__PURE__ */ jsx("box", {
 		style: { flexDirection: "column" },
 		children: items.map((entry, i) => {
 			const focused = i === cursor;
 			const bg = focused ? highlightBg : void 0;
 			const enabled = enabledSet.has(entry.name);
+			const description = truncateToCols(entry.description ?? "", descCols);
 			return /* @__PURE__ */ jsxs("box", {
 				id: anchorIdFor(i),
 				style: {
@@ -8483,13 +8680,13 @@ function SkillsList({ items, enabledSet, totalCount, cursor, highlightBg, query
 				}), /* @__PURE__ */ jsx("text", {
 					wrapMode: "none",
 					fg: COLOR.mute,
-					children: `${COL_TITLE}${entry.description ?? ""}`
+					children: `${COL_TITLE}${description}`
 				})]
 			}, entry.name);
 		})
 	});
 }
-function McpsList({ items, enabledSet, totalCount, cursor, highlightBg, query, errors, authState }) {
+function McpsList({ rows, filteredCount, enabledSet, toolToggleMap, toolsByServer, expanded, totalCount, cursor, highlightBg, query, errors, authState, contentCols }) {
 	const COLOR = useColors();
 	const home = homedir();
 	if (totalCount === 0) return /* @__PURE__ */ jsxs("box", {
@@ -8508,7 +8705,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/ "
@@ -8528,53 +8730,150 @@ function McpsList({ items, enabledSet, totalCount, cursor, highlightBg, query, e
 			})
 		]
 	});
-	if (items.length === 0) return /* @__PURE__ */ jsxs("box", {
+	if (filteredCount === 0) return /* @__PURE__ */ jsxs("box", {
 		style: { flexDirection: "column" },
 		children: [renderMcpErrors(errors, home, COLOR.warn), /* @__PURE__ */ jsx(EmptyRow, { label: `no servers match "${query}"` })]
 	});
+	const groups = [];
+	for (let i = 0; i < rows.length; i++) {
+		const row = rows[i];
+		if (row.kind === "server") {
+			groups.push({
+				serverIndex: i,
+				server: row,
+				children: []
+			});
+			continue;
+		}
+		const last = groups[groups.length - 1];
+		if (last) last.children.push({
+			row,
+			index: i
+		});
+	}
 	return /* @__PURE__ */ jsxs("box", {
 		style: { flexDirection: "column" },
-		children: [renderMcpErrors(errors, home, COLOR.warn), items.map((entry, i) => {
-			const focused = i === cursor;
-			const bg = focused ? highlightBg : void 0;
-			const name = entry.config.name;
-			const enabled = enabledSet.has(name);
-			const status = getMcpAuthStatus(authState, name);
-			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: focused ? "▶ " : "  "
-						}),
-						/* @__PURE__ */ jsx("span", {
-							fg: enabled ? COLOR.accent : COLOR.mute,
-							children: enabled ? "[✓] " : "[ ] "
-						}),
-						/* @__PURE__ */ jsx("span", {
-							fg: focused ? COLOR.brand : COLOR.dim,
-							children: name
-						}),
-						renderInlineMcpBadge(status, COLOR)
-					]
-				}), /* @__PURE__ */ jsx("text", {
-					wrapMode: "none",
-					fg: COLOR.mute,
-					children: `${COL_TITLE}${mcpDetail(entry)}`
-				})]
-			}, name);
-		})]
+		children: [renderMcpErrors(errors, home, COLOR.warn), groups.map((group) => /* @__PURE__ */ jsxs("box", {
+			style: { flexDirection: "column" },
+			children: [renderServerListRow({
+				entry: group.server.entry,
+				focused: group.serverIndex === cursor,
+				bg: group.serverIndex === cursor ? highlightBg : void 0,
+				enabled: enabledSet.has(group.server.entry.config.name),
+				expanded: expanded.has(group.server.entry.config.name),
+				toolEnabledSet: toolToggleMap[group.server.entry.config.name]?.enabledSet,
+				toolTotal: toolsByServer[group.server.entry.config.name]?.length,
+				anchorId: anchorIdFor(group.serverIndex),
+				status: getMcpAuthStatus(authState, group.server.entry.config.name),
+				COLOR,
+				contentCols
+			}), group.children.map(({ row, index }) => {
+				const focused = index === cursor;
+				const bg = focused ? highlightBg : void 0;
+				if (row.kind === "tool") return renderToolListRow({
+					serverName: row.serverName,
+					tool: row.tool,
+					focused,
+					bg,
+					enabled: toolToggleMap[row.serverName]?.enabledSet.has(row.tool.name) ?? true,
+					anchorId: anchorIdFor(index),
+					COLOR,
+					contentCols
+				});
+				return renderEmptyToolsListRow({
+					serverName: row.serverName,
+					anchorId: anchorIdFor(index),
+					focused,
+					bg,
+					COLOR
+				});
+			})]
+		}, `group:${group.server.entry.config.name}`))]
 	});
 }
+function renderServerListRow({ entry, focused, bg, enabled, expanded, toolEnabledSet, toolTotal, anchorId, status, COLOR, contentCols }) {
+	const name = entry.config.name;
+	const chevron = expanded ? "▾" : "▸";
+	const toolCountChip = toolEnabledSet && typeof toolTotal === "number" ? ` (${toolEnabledSet.size}/${toolTotal})` : "";
+	const detailRaw = mcpDetail(entry);
+	const detailBudget = Math.max(0, contentCols - 2 - 2 - 4 - name.length - toolCountChip.length - 10 - 3);
+	const detail = detailRaw ? truncateToCols(detailRaw, detailBudget) : "";
+	return /* @__PURE__ */ jsxs("text", {
+		id: anchorId,
+		wrapMode: "none",
+		bg,
+		children: [
+			/* @__PURE__ */ jsx("span", {
+				fg: focused ? COLOR.brand : COLOR.mute,
+				children: focused ? "▶ " : "  "
+			}),
+			/* @__PURE__ */ jsx("span", {
+				fg: focused ? COLOR.brand : COLOR.mute,
+				children: `${chevron} `
+			}),
+			/* @__PURE__ */ jsx("span", {
+				fg: enabled ? COLOR.accent : COLOR.mute,
+				children: enabled ? "[✓] " : "[ ] "
+			}),
+			/* @__PURE__ */ jsx("span", {
+				fg: focused ? COLOR.brand : COLOR.dim,
+				children: name
+			}),
+			toolCountChip && /* @__PURE__ */ jsx("span", {
+				fg: COLOR.mute,
+				children: toolCountChip
+			}),
+			renderInlineMcpBadge(status, COLOR),
+			detail && /* @__PURE__ */ jsx("span", {
+				fg: COLOR.mute,
+				children: ` · ${detail}`
+			})
+		]
+	}, `server:${name}`);
+}
+const TOOL_ROW_INDENT$1 = "      ";
+const TOOL_ROW_FOCUS_INDENT$1 = "    ▶ ";
+function renderToolListRow({ serverName, tool, focused, bg, enabled, anchorId, COLOR, contentCols }) {
+	const descBudget = Math.max(0, contentCols - 6 - 4 - tool.name.length - 2);
+	const description = truncateToCols(tool.description ?? "", descBudget);
+	return /* @__PURE__ */ jsxs("text", {
+		id: anchorId,
+		wrapMode: "none",
+		bg,
+		children: [
+			/* @__PURE__ */ jsx("span", {
+				fg: focused ? COLOR.brand : COLOR.mute,
+				children: focused ? TOOL_ROW_FOCUS_INDENT$1 : TOOL_ROW_INDENT$1
+			}),
+			/* @__PURE__ */ jsx("span", {
+				fg: enabled ? COLOR.accent : COLOR.mute,
+				children: enabled ? "[✓] " : "[ ] "
+			}),
+			/* @__PURE__ */ jsx("span", {
+				fg: focused ? COLOR.brand : COLOR.dim,
+				children: tool.name
+			}),
+			description && /* @__PURE__ */ jsxs("span", {
+				fg: focused ? COLOR.dim : COLOR.mute,
+				children: ["  ", description]
+			})
+		]
+	}, `tool:${serverName}/${tool.name}`);
+}
+function renderEmptyToolsListRow({ serverName, anchorId, focused, bg, COLOR }) {
+	return /* @__PURE__ */ jsxs("text", {
+		id: anchorId,
+		wrapMode: "none",
+		bg,
+		children: [/* @__PURE__ */ jsx("span", {
+			fg: focused ? COLOR.brand : COLOR.mute,
+			children: focused ? TOOL_ROW_FOCUS_INDENT$1 : TOOL_ROW_INDENT$1
+		}), /* @__PURE__ */ jsx("span", {
+			fg: COLOR.mute,
+			children: "⟲ No cached tools yet. Send any prompt with this server enabled to populate."
+		})]
+	}, `tool-empty:${serverName}`);
+}
 function KeybindingsList({ bindings, query }) {
 	const sections = useMemo(() => groupBindings(bindings), [bindings]);
 	const filteredSections = useMemo(() => {
@@ -8932,21 +9231,21 @@ function renderMcpDetailPanel(entry, status, COLOR) {
 function renderInlineMcpBadge(status, COLOR) {
 	switch (status.kind) {
 		case "idle": return null;
-		case "authed": return /* @__PURE__ */ jsxs("span", {
+		case "authed": return /* @__PURE__ */ jsx("span", {
 			fg: COLOR.accent,
-			children: ["  ", "✓ authed"]
+			children: " · ✓ authed"
 		});
-		case "needs-auth": return /* @__PURE__ */ jsxs("span", {
+		case "needs-auth": return /* @__PURE__ */ jsx("span", {
 			fg: COLOR.warn,
-			children: ["  ", "! needs login"]
+			children: " · ! needs login"
 		});
-		case "authorizing": return /* @__PURE__ */ jsxs("span", {
+		case "authorizing": return /* @__PURE__ */ jsx("span", {
 			fg: COLOR.warn,
-			children: ["  ", "… authorizing"]
+			children: " · … authorizing"
 		});
-		case "error": return /* @__PURE__ */ jsxs("span", {
+		case "error": return /* @__PURE__ */ jsx("span", {
 			fg: COLOR.error,
-			children: ["  ", "✗ login failed"]
+			children: " · ✗ login failed"
 		});
 	}
 }
@@ -8960,10 +9259,11 @@ function renderMcpErrors(errors, home, warnColor) {
 		}, err.path))
 	});
 }
-function Hints({ activeTab, focusedMcp, focusedMcpStatus, canRefreshSkills, canRefreshMcps }) {
+function Hints({ activeTab, focusedMcp, focusedMcpRow, focusedMcpStatus, canRefreshSkills, canRefreshMcps }) {
 	const COLOR = useColors();
-	const showLogin = activeTab === "mcps" && !!focusedMcp && !!focusedMcpStatus && canLogin$1(focusedMcp, focusedMcpStatus);
-	const showLogout = activeTab === "mcps" && !!focusedMcpStatus && canLogout$1(focusedMcpStatus);
+	const onServerRow = focusedMcpRow?.kind === "server";
+	const showLogin = activeTab === "mcps" && onServerRow && !!focusedMcp && !!focusedMcpStatus && canLogin$1(focusedMcp, focusedMcpStatus);
+	const showLogout = activeTab === "mcps" && onServerRow && !!focusedMcpStatus && canLogout$1(focusedMcpStatus);
 	const showCancel = activeTab === "mcps" && focusedMcpStatus?.kind === "authorizing";
 	const showRefresh = activeTab === "skills" && canRefreshSkills || activeTab === "mcps" && canRefreshMcps;
 	return /* @__PURE__ */ jsxs("text", {
@@ -8984,6 +9284,14 @@ function Hints({ activeTab, focusedMcp, focusedMcpStatus, canRefreshSkills, canR
 				children: "↵"
 			}),
 			isCategoryTab(activeTab) ? " toggle/cycle/select" : activeTab === "keybindings" ? " edit file" : activeTab === "authentication" ? " switch / re-authenticate" : " toggle",
+			activeTab === "mcps" && focusedMcpRow && /* @__PURE__ */ jsxs("span", { children: [
+				" · ",
+				/* @__PURE__ */ jsx("span", {
+					fg: COLOR.warn,
+					children: "tab"
+				}),
+				focusedMcpRow.kind === "server" ? " expand/collapse" : " collapse"
+			] }),
 			showLogin && /* @__PURE__ */ jsxs("span", { children: [
 				" · ",
 				/* @__PURE__ */ jsx("span", {
@@ -9039,13 +9347,15 @@ function generalCorpus(item) {
 function skillCorpus(s) {
 	return `${s.name} ${s.description ?? ""}`.toLowerCase();
 }
-function mcpCorpus(m) {
+function mcpCorpus(m, toolsByServer) {
+	const toolCorpus = (toolsByServer[m.config.name] ?? []).map((t) => `${t.name} ${t.description ?? ""}`).join(" ");
 	return [
 		m.config.name,
 		m.config.transport,
 		m.config.command ?? "",
 		m.config.url ?? "",
-		(m.config.args ?? []).join(" ")
+		(m.config.args ?? []).join(" "),
+		toolCorpus
 	].join(" ").toLowerCase();
 }
 function keybindingCorpus(row) {
@@ -9892,6 +10202,8 @@ function AppShell() {
 	mcpsCatalogRef.current = mcpsCatalog;
 	const enabledMcpsRef = useRef(settings.enabledMcps);
 	enabledMcpsRef.current = settings.enabledMcps;
+	const disabledMcpToolsRef = useRef(settings.disabledMcpTools);
+	disabledMcpToolsRef.current = settings.disabledMcpTools;
 	const filesCatalogRef = useRef(filesCatalog);
 	filesCatalogRef.current = filesCatalog;
 	const ensureFilesCatalogRef = useRef(ensureFilesCatalog);
@@ -10229,7 +10541,8 @@ function AppShell() {
 		});
 		const projectMcps = buildMcpServers({
 			discovered: mcpsCatalogRef.current,
-			enabled: enabledMcpsRef.current
+			enabled: enabledMcpsRef.current,
+			...disabledMcpToolsRef.current ? { disabledTools: disabledMcpToolsRef.current } : {}
 		});
 		const allowInteraction = allowInteractionRef.current !== false;
 		const interactionTools = allowInteraction ? createInteractionTools({ requestInteraction: makeRequestInteraction(interactions) }) : {};
@@ -10394,6 +10707,15 @@ function AppShell() {
 				reason
 			});
 		});
+		agent.hooks.hook("mcp:bootstrap:end", (ctx) => {
+			if (ctx.ok) return;
+			if (mcpsCatalogRef.current.find((d) => d.config.name === ctx.name)?.config.auth !== "oauth") return;
+			dispatchAuthRef.current({
+				type: "auth-error",
+				name: ctx.name,
+				error: ctx.error.message
+			});
+		});
 		agent.hooks.hook("mcp:auth:url", ({ name, url }) => {
 			dispatchAuthRef.current({
 				type: "auth-url",
@@ -10629,6 +10951,7 @@ function AppShell() {
 		agent.hooks.hook("agent:done", () => {
 			pendingAnnotationsRef.current.clear();
 		});
+		subscribeMcpToolsCache(agent.hooks, { dataDir });
 		return agent;
 	}, [
 		providerRegistry,
@@ -11306,6 +11629,24 @@ function AppShell() {
 	const onCancelLoginMcp = useCallback((name) => {
 		mcpLoginAbortsRef.current.get(name)?.abort();
 	}, []);
+	const onRefreshMcpTools = useCallback(async () => {
+		const agent = agentRef.current;
+		if (!agent) return;
+		const servers = mcpsCatalogRef.current.map((d) => d.config);
+		if (servers.length === 0) return;
+		try {
+			await refreshMcpToolsCatalog({
+				servers,
+				hooks: agent.hooks,
+				buildAuthProvider: (cfg) => new McpOAuthProvider({
+					name: cfg.name,
+					store: mcpCredentialStore
+				})
+			});
+		} catch (err) {
+			debugLog("refreshMcpToolsCatalog failed", err);
+		}
+	}, [mcpCredentialStore]);
 	const onOpenKeybindingsFile = useCallback(() => {
 		modal.close();
 		(async () => {
@@ -11812,7 +12153,8 @@ function AppShell() {
 					onLogoutMcp,
 					onCancelLoginMcp,
 					onRefreshSkills,
-					onRefreshMcps
+					onRefreshMcps,
+					onRefreshMcpTools
 				}
 			}));
 			return;
@@ -12282,55 +12624,100 @@ function initTreeSitterWorker() {
 //#endregion
 //#region src/tui/mcps-settings.tsx
 /**
-* MCP server picker. Shows discovered entries with three columns:
+* MCP server picker. Hierarchical: each server is one row, and an
+* expanded server reveals one row per advertised tool. The full surface:
 *
-*   [enabled?]  <name>  <transport · detail>  <auth status>
+*     ▼ [✓] linear             stdio · npx -y mcp-remote …    (5/7) ✓ authed
+*           [✓] create_issue   Create a new Linear issue
+*           [✓] list_issues    Query issues by status / assignee
+*           [ ] update_issue   Update fields on an existing issue
+*     ▶ [✓] chrome-devtools    stdio · npx -y chrome-devtools-mcp@latest
 *
 * Keybindings:
 *
-*   ↑ / ↓ / k / j    navigate
-*   enter / space    toggle enabled/disabled
-*   l                login (needs-auth or error rows; opens browser)
-*   o                logout (authed rows; wipes stored tokens)
-*   esc              close — also cancels an in-flight `authorizing` row
+*   ↑ / ↓ / k / j      navigate (over servers AND visible tool rows)
+*   → / tab            expand the focused server
+*   ← / shift+tab      collapse — on a tool row, also snaps the cursor
+*                      back to the parent server
+*   enter / space      toggle — server toggles `enabledMcps`; tool toggles
+*                      `disabledMcpTools[serverName]`
+*   l                  login (server rows only — needs-auth / error)
+*   o                  logout (server rows only — authed / error /
+*                      authorizing)
+*   r                  refresh discovery
+*   esc                close — also cancels an in-flight `authorizing`
+*                      row
 *
-* Status badge legend:
+* Status badge legend (server row only):
 *
 *   ✓ authed         tokens stored + bootstrap connected
-*   ! needs login   bootstrap needs OAuth, no tokens
+*   ! needs login    bootstrap needs OAuth, no tokens
 *   … authorizing    interactive login in flight
 *   ✗ <error>        login attempt failed
 *
-* The state behind the badges is read via `useMcpAuthState()` so updates
-* propagate live while the modal is open — a `mcp:auth:url` arriving from
-* an in-flight login flips the row to `authorizing` without re-opening.
+* The (N/M) chip on a server header counts ENABLED / TOTAL advertised
+* tools, drawn only when the tool catalog has loaded. Without a catalog
+* (server never bootstrapped this profile, cache cold) the chip is
+* suppressed and the empty-state row under the expanded server explains
+* how to populate.
 *
 * Errors (`DiscoveryError[]`) surface in a warn-colored preamble so a
 * broken `mcps.json` is loud rather than invisible.
 */
-function McpsSettingsModal({ catalog, errors, onLogin, onLogout, onCancelLogin, onRefresh }) {
+function McpsSettingsModal({ catalog, errors, toolsByServer, onLogin, onLogout, onCancelLogin, onRefresh }) {
 	const COLOR = useColors();
 	const home = homedir();
 	const authState = useMcpAuthState();
-	const { enabledSet, toggle } = useEnabledToggleSet({
+	const { enabledSet: serverEnabledSet, toggle: toggleServer } = useEnabledToggleSet({
 		catalog,
 		keyOf: (d) => d.config.name,
 		settingKey: "enabledMcps"
 	});
+	const toolToggleMap = useMcpToolToggleMap({ catalogByServer: toolsByServer });
+	const [expanded, setExpanded] = useState(() => /* @__PURE__ */ new Set());
 	const [cursor, setCursorRaw] = useState(0);
+	const rows = useMemo(() => buildVisibleMcpRows(catalog, expanded, toolsByServer), [
+		catalog,
+		expanded,
+		toolsByServer
+	]);
 	const moveCursor = useCallback((delta) => setCursorRaw((prev) => {
-		if (catalog.length === 0) return prev;
-		return ((prev + delta) % catalog.length + catalog.length) % catalog.length;
-	}), [catalog.length]);
-	const safeCursor = Math.min(cursor, Math.max(0, catalog.length - 1));
-	const focusedEntry = catalog[safeCursor];
+		if (rows.length === 0) return prev;
+		return ((prev + delta) % rows.length + rows.length) % rows.length;
+	}), [rows.length]);
+	const safeCursor = Math.min(cursor, Math.max(0, rows.length - 1));
+	const focusedRow = rows[safeCursor];
+	const focusedServerName = focusedRow ? focusedRow.kind === "server" ? focusedRow.entry.config.name : focusedRow.serverName : void 0;
+	const focusedEntry = focusedServerName ? catalog.find((c) => c.config.name === focusedServerName) : void 0;
 	const focusedStatus = focusedEntry ? getMcpAuthStatus(authState, focusedEntry.config.name) : void 0;
 	const inputActive = focusedStatus?.kind === "authorizing" && !!focusedStatus.url;
+	const collapseFocused = useCallback(() => {
+		if (!focusedRow) return;
+		const parentName = focusedRow.kind === "server" ? focusedRow.entry.config.name : focusedRow.serverName;
+		if (focusedRow.kind !== "server") {
+			const parentIndex = indexOfServerRow(rows, parentName);
+			if (parentIndex >= 0) setCursorRaw(parentIndex);
+		}
+		setExpanded((prev) => {
+			if (!prev.has(parentName)) return prev;
+			const next = new Set(prev);
+			next.delete(parentName);
+			return next;
+		});
+	}, [focusedRow, rows]);
+	const expandFocused = useCallback(() => {
+		if (!focusedRow || focusedRow.kind !== "server") return;
+		setExpanded((prev) => {
+			if (prev.has(focusedRow.entry.config.name)) return prev;
+			const next = new Set(prev);
+			next.add(focusedRow.entry.config.name);
+			return next;
+		});
+	}, [focusedRow]);
 	useKeyboard((key) => {
 		if (key.name === "escape" && focusedEntry) {
-			const name = focusedEntry.config.name;
-			if (getMcpAuthStatus(authState, name).kind === "authorizing") {
-				onCancelLogin(name);
+			if (getMcpAuthStatus(authState, focusedEntry.config.name).kind === "authorizing") {
+				onCancelLogin(focusedEntry.config.name);
 				return;
 			}
 		}
@@ -12343,21 +12730,36 @@ function McpsSettingsModal({ catalog, errors, onLogin, onLogout, onCancelLogin,
 			moveCursor(1);
 			return;
 		}
-		if (catalog.length === 0) return;
-		const entry = catalog[safeCursor];
-		if (!entry) return;
-		const name = entry.config.name;
-		const status = getMcpAuthStatus(authState, name);
+		if (rows.length === 0) return;
+		if (!focusedRow) return;
+		if (key.name === "tab") {
+			const row = rows[safeCursor];
+			const parentName = row ? parentServerName(row) : void 0;
+			if (parentName && expanded.has(parentName)) collapseFocused();
+			else expandFocused();
+			return;
+		}
+		if (key.name === "right") {
+			expandFocused();
+			return;
+		}
+		if (key.name === "left") {
+			collapseFocused();
+			return;
+		}
 		if (key.name === "return" || key.name === "space") {
-			toggle(name);
+			if (focusedRow.kind === "server") toggleServer(focusedRow.entry.config.name);
+			else if (focusedRow.kind === "tool") toolToggleMap[focusedRow.serverName]?.toggle(focusedRow.tool.name);
 			return;
 		}
-		if (key.name === "l" && canLogin(entry, status)) {
-			onLogin(name);
+		if (focusedRow.kind !== "server") return;
+		const status = getMcpAuthStatus(authState, focusedRow.entry.config.name);
+		if (key.name === "l" && canLogin(focusedRow.entry, status)) {
+			onLogin(focusedRow.entry.config.name);
 			return;
 		}
 		if (key.name === "o" && canLogout(status)) {
-			onLogout(name);
+			onLogout(focusedRow.entry.config.name);
 			return;
 		}
 		if (key.name === "r" && onRefresh) onRefresh();
@@ -12378,7 +12780,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/ "
@@ -12435,46 +12842,185 @@ function McpsSettingsModal({ catalog, errors, onLogin, onLogout, onCancelLogin,
 			})
 		]
 	});
+	const groups = [];
+	for (let i = 0; i < rows.length; i++) {
+		const row = rows[i];
+		if (row.kind === "server") {
+			groups.push({
+				serverIndex: i,
+				server: row,
+				children: []
+			});
+			continue;
+		}
+		const last = groups[groups.length - 1];
+		if (last) last.children.push({
+			row,
+			index: i
+		});
+	}
 	return /* @__PURE__ */ jsxs(Modal, {
-		title: ` mcp servers · ${enabledSet.size} / ${catalog.length} enabled `,
+		title: ` mcp servers · ${serverEnabledSet.size} / ${catalog.length} enabled `,
 		children: [
 			renderErrors(errors, home, COLOR.warn),
 			/* @__PURE__ */ jsx("box", {
 				style: { flexDirection: "column" },
-				children: catalog.map((entry, i) => {
-					const focused = i === safeCursor;
-					const name = entry.config.name;
-					const enabled = enabledSet.has(name);
-					const status = getMcpAuthStatus(authState, name);
-					return /* @__PURE__ */ jsxs("text", {
-						fg: focused ? COLOR.brand : COLOR.dim,
-						children: [
-							/* @__PURE__ */ jsx("span", {
-								fg: focused ? COLOR.brand : COLOR.mute,
-								children: focused ? "▶ " : "  "
-							}),
-							/* @__PURE__ */ jsx("span", {
-								fg: enabled ? COLOR.accent : COLOR.mute,
-								children: enabled ? "[✓] " : "[ ] "
-							}),
-							/* @__PURE__ */ jsx("span", {
-								fg: focused ? COLOR.brand : COLOR.dim,
-								children: name
-							}),
-							/* @__PURE__ */ jsxs("span", {
-								fg: COLOR.mute,
-								children: ["  ", detailFor(entry)]
-							}),
-							renderInlineBadge(status, COLOR)
-						]
-					}, name);
-				})
+				children: groups.map((group) => /* @__PURE__ */ jsxs("box", {
+					style: { flexDirection: "column" },
+					children: [renderRow({
+						row: group.server,
+						focused: group.serverIndex === safeCursor,
+						serverEnabledSet,
+						toolEnabledSet: toolToggleMap[group.server.entry.config.name]?.enabledSet,
+						toolCatalog: toolsByServer,
+						authState,
+						expanded,
+						COLOR
+					}), group.children.map(({ row, index }) => renderRow({
+						row,
+						focused: index === safeCursor,
+						serverEnabledSet,
+						toolEnabledSet: toolToggleMap[parentServerName(row)]?.enabledSet,
+						toolCatalog: toolsByServer,
+						authState,
+						expanded,
+						COLOR
+					}))]
+				}, `group:${group.server.entry.config.name}`))
 			}),
 			focusedEntry && focusedStatus && renderDetailPanel(focusedEntry, focusedStatus, COLOR),
-			renderActionHints(focusedEntry, focusedStatus, !!onRefresh, COLOR)
+			renderActionHints({
+				focusedRow,
+				focusedEntry,
+				focusedStatus,
+				expanded,
+				showRefresh: !!onRefresh,
+				COLOR
+			})
 		]
 	});
 }
+function renderRow({ row, focused, serverEnabledSet, toolEnabledSet, toolCatalog, authState, expanded, COLOR }) {
+	if (row.kind === "server") return renderServerRow({
+		entry: row.entry,
+		focused,
+		serverEnabledSet,
+		toolEnabledSet,
+		toolCatalog,
+		authState,
+		expanded,
+		COLOR
+	});
+	if (row.kind === "tool") return renderToolRow({
+		row,
+		focused,
+		toolEnabledSet,
+		COLOR
+	});
+	return renderEmptyToolsRow({
+		row,
+		focused,
+		COLOR
+	});
+}
+function renderServerRow({ entry, focused, serverEnabledSet, toolEnabledSet, toolCatalog, authState, expanded, COLOR }) {
+	const name = entry.config.name;
+	const enabled = serverEnabledSet.has(name);
+	const status = getMcpAuthStatus(authState, name);
+	const cached = toolCatalog[name];
+	const chevron = expanded.has(name) ? "▼" : "◀";
+	const toolCountChip = cached && toolEnabledSet ? ` (${toolEnabledSet.size}/${cached.length})` : "";
+	return /* @__PURE__ */ jsxs("box", {
+		style: {
+			flexDirection: "row",
+			height: 1,
+			paddingRight: 1
+		},
+		children: [
+			/* @__PURE__ */ jsxs("text", {
+				wrapMode: "none",
+				fg: focused ? COLOR.brand : COLOR.dim,
+				children: [
+					/* @__PURE__ */ jsx("span", {
+						fg: focused ? COLOR.brand : COLOR.mute,
+						children: focused ? "▶ " : "  "
+					}),
+					/* @__PURE__ */ jsx("span", {
+						fg: enabled ? COLOR.accent : COLOR.mute,
+						children: enabled ? "[✓] " : "[ ] "
+					}),
+					/* @__PURE__ */ jsx("span", {
+						fg: focused ? COLOR.brand : COLOR.dim,
+						children: name
+					}),
+					/* @__PURE__ */ jsxs("span", {
+						fg: COLOR.mute,
+						children: ["  ", detailFor(entry)]
+					}),
+					toolCountChip && /* @__PURE__ */ jsx("span", {
+						fg: COLOR.mute,
+						children: toolCountChip
+					}),
+					renderInlineBadge(status, COLOR)
+				]
+			}),
+			/* @__PURE__ */ jsx("box", { style: { flexGrow: 1 } }),
+			/* @__PURE__ */ jsx("text", {
+				wrapMode: "none",
+				children: /* @__PURE__ */ jsx("span", {
+					fg: focused ? COLOR.brand : COLOR.mute,
+					children: chevron
+				})
+			})
+		]
+	}, `server:${name}`);
+}
+const TOOL_ROW_INDENT = "      ";
+const TOOL_ROW_FOCUS_INDENT = "    ▶ ";
+function renderToolRow({ row, focused, toolEnabledSet, COLOR }) {
+	const enabled = toolEnabledSet?.has(row.tool.name) ?? true;
+	const description = trimToWidth(row.tool.description ?? "", 60);
+	return /* @__PURE__ */ jsxs("text", {
+		fg: focused ? COLOR.brand : COLOR.dim,
+		children: [
+			/* @__PURE__ */ jsx("span", {
+				fg: focused ? COLOR.brand : COLOR.mute,
+				children: focused ? TOOL_ROW_FOCUS_INDENT : TOOL_ROW_INDENT
+			}),
+			/* @__PURE__ */ jsx("span", {
+				fg: enabled ? COLOR.accent : COLOR.mute,
+				children: enabled ? "[✓] " : "[ ] "
+			}),
+			/* @__PURE__ */ jsx("span", {
+				fg: focused ? COLOR.brand : COLOR.dim,
+				children: row.tool.name
+			}),
+			description && /* @__PURE__ */ jsxs("span", {
+				fg: COLOR.mute,
+				children: ["  ", description]
+			})
+		]
+	}, `tool:${row.serverName}/${row.tool.name}`);
+}
+function renderEmptyToolsRow({ row, focused, COLOR }) {
+	return /* @__PURE__ */ jsxs("text", { children: [/* @__PURE__ */ jsx("span", {
+		fg: focused ? COLOR.brand : COLOR.mute,
+		children: focused ? TOOL_ROW_FOCUS_INDENT : TOOL_ROW_INDENT
+	}), /* @__PURE__ */ jsx("span", {
+		fg: COLOR.mute,
+		children: "⟲ No cached tools yet. Send any prompt with this server enabled to populate."
+	})] }, `tool-empty:${row.serverName}`);
+}
+/**
+* Cap a single-line description at `max` columns, suffixing `…` if it
+* overflows. Renderer uses one column per char; surrogate-pair safety
+* isn't a concern here because tool descriptions are ASCII in practice.
+*/
+function trimToWidth(s, max) {
+	const clean = s.replace(/\s+/g, " ").trim();
+	if (clean.length <= max) return clean;
+	return `${clean.slice(0, Math.max(0, max - 1))}…`;
+}
 function detailFor(entry) {
 	const transport = entry.config.transport;
 	return `${transport} · ${transport === "stdio" ? entry.config.command ?? "" : entry.config.url ?? ""}`;
@@ -12580,11 +13126,14 @@ function renderDetailPanel(entry, status, COLOR) {
 	});
 	return null;
 }
-function renderActionHints(entry, status, showRefresh, COLOR) {
-	const effectiveStatus = status ?? { kind: "idle" };
-	const canL = entry ? canLogin(entry, effectiveStatus) : false;
-	const canO = canLogout(effectiveStatus);
+function renderActionHints({ focusedRow, focusedEntry, focusedStatus, expanded, showRefresh, COLOR }) {
+	const effectiveStatus = focusedStatus ?? { kind: "idle" };
+	const onServerRow = focusedRow?.kind === "server";
+	const canL = onServerRow && focusedEntry ? canLogin(focusedEntry, effectiveStatus) : false;
+	const canO = onServerRow ? canLogout(effectiveStatus) : false;
 	const canCancel = effectiveStatus.kind === "authorizing";
+	const canExpand = onServerRow && focusedEntry ? !expanded.has(focusedEntry.config.name) : false;
+	const canCollapse = focusedRow?.kind === "tool" || (onServerRow && focusedEntry ? expanded.has(focusedEntry.config.name) : false);
 	return /* @__PURE__ */ jsxs("text", {
 		fg: COLOR.mute,
 		children: [
@@ -12598,6 +13147,22 @@ function renderActionHints(entry, status, showRefresh, COLOR) {
 				children: "↵"
 			}),
 			" toggle",
+			canExpand && /* @__PURE__ */ jsxs("span", { children: [
+				" · ",
+				/* @__PURE__ */ jsx("span", {
+					fg: COLOR.warn,
+					children: "→"
+				}),
+				" expand"
+			] }),
+			canCollapse && /* @__PURE__ */ jsxs("span", { children: [
+				" · ",
+				/* @__PURE__ */ jsx("span", {
+					fg: COLOR.warn,
+					children: "←"
+				}),
+				" collapse"
+			] }),
 			canL && /* @__PURE__ */ jsxs("span", { children: [
 				" · ",
 				/* @__PURE__ */ jsx("span", {