zidane 6.2.23 → 6.2.24

package/dist/tui.js

@@ -1,25 +1,25 @@
-import { $ as McpAuthProvider, $t as filterChainFallbacks, A as runOAuthLogin, At as useSettings, B as mcpToolsCachePath, Ct as DEFAULT_SETTINGS, D as formatPathForCwd, Dn as accentColor, Dt as SETTINGS_TOGGLES, Et as SETTINGS_INPUTS, F as parseJsonTolerant, G as useMcpToolToggleMap, Gt as useDiscoveryOptional, Ht as createDiscoverySlot, I as parseMcpsFile, J as indexOfServerRow, Jt as resolveConfig, Kt as ConfigProvider, L as parseClaudeState, M as buildMcpServers, N as defaultMcpsConfigPaths, Nn as TODO_STATUS_GLYPHS, Nt as resolveChipColor, O as fetchOAuthRedirect, Ot as SettingsProvider, P as discoverProjectMcps, Pt as resolveTheme, Qt as chainsEqual, Sr as usageByModel, St as useEnabledToggleSet, T as suggestSafelistEntries, Tt as SETTINGS_CHOICES, U as subscribeMcpToolsCache, Un as useActiveTodos, Ut as DiscoveryProvider, V as refreshMcpToolsCatalog, Wt as useDiscovery, X as createFileMcpCredentialStore, Xt as buildRunModel, Y as parentServerName, Yt as resolveStoragePaths, Zt as chainPositionOf, _ as useSafeModeQueue, _r as sumRunCosts, _t as hintsLength, a as useSurfaces, an as tryOpenBrowser, at as InteractionsProvider, b as getSafelist, br as toolResultText, c as useStreamBuffer, cn as buildUpdateHint, cr as deriveSessionTitle, ct as createInteractionTools, d as discoverProjectSkills, dr as listSessionMeta, dt as pendingInteractionsFromTurns, en as providerKeySetChanged, er as buildBuildSystem, et as useMcpAuthDispatch, fr as loadState, g as useSafeModeActions, gr as stripSpawnTokensLine, gt as clipHintsToWidth, h as SafeModeProvider, hr as serverToolResultSummary, ht as EMPTY_HINTS, i as useSelectStyle, in as useCompletion, ir as createChatTurnsReadTool, it as ASK_USER_TOOL, j as supportsOAuth, k as oauthUsesManualCodePaste, kt as clampFps, l as buildSkillsConfig, ln as useUpdateCheck, lr as eventsFromTurns, m as writeSessionExport, mt as useInteractionsQueue, n as ThemeProvider, nr as envSection, nt as getMcpAuthStatus, or as compactSummaryEvent, ot as PRESENT_PLAN_TOOL, pr as marginTopFor, pt as useInteractionsActions, q as buildVisibleMcpRows, qt as useConfig, r as useColors, rn as toggleChainEntry, rr as chatReferenceTokensForPrompt, s as useTheme, sn as bootTick, st as buildResumedToolResultsTurn, t as computeTurnAnchors, tn as restoreChainFallbacks, tr as buildPlanSystem, tt as useMcpAuthState, u as defaultSkillScanPaths, ur as lastContextSizeFromTurns, ut as makeRequestInteraction, vn as chatAutoCompactBehavior, vt as truncateTrailing, wt as SETTINGS_CATEGORIES, x as isOnSafelist, xr as updateToolEventOutcomes, xt as listProjectFiles, y as addToSafelist, yn as discoverAgentsMd, yr as toolCallPreview, yt as buildHints, z as loadMcpToolsCache } from "./transcript-anchors-CqzIr74w.js";
-import { $ as composeExtensionPreset, B as ExtensionInstallError, Bt as ensureKeybindingsFile, Et as createModelSearchTool, H as installExtensionFromSpec, Ht as groupBindings, J as createExtensionHud, K as removeInstalledExtension, P as summaryToTurn, St as tailTruncate, Ut as keybindingsPath, Vt as formatBindingForDisplay, Wt as matchesBinding, X as discoverAndBuildExtensionRegistry, Y as registerExtensionHostModules, Yt as resolveExtensionKeybindings, _ as buildPostCompactAttachments, c as applyCompactSummaryCutoff, dn as sanitizeExtensionConfigActionPatch, en as inlineLoadedExtension, et as disposeExtensionRegistry, f as cleanupPersistedSession, g as resolveTasksDir, h as resolvePersistDir, hn as effectiveContextWindow, ht as isSpawnTool, it as createExtensionHostRuntimeBridge, lt as basic_default, m as resolveMcpWarningsDir, mn as OUTPUT_RESERVE_TOKENS, nn as parseExtensionScanPathEnv, on as coerceExtensionConfigInput, q as updateInstalledExtension, rn as scanExtensionDirectories, rt as partitionExtensionCatalog, t as createAgent, tt as filterExtensionRegistry, un as resolveExtensionConfigValue, wt as looksBinary, x as compactConversation, y as selectFilesFromSession, z as createExtensionPromptBridge, zt as KEYBINDING_KEY_COL_WIDTH } from "./agent-BSIMsEtD.js";
+import { $ as McpAuthProvider, $t as filterChainFallbacks, A as runOAuthLogin, At as useSettings, B as mcpToolsCachePath, Ct as DEFAULT_SETTINGS, D as formatPathForCwd, Dn as accentColor, Dt as SETTINGS_TOGGLES, Et as SETTINGS_INPUTS, F as parseJsonTolerant, G as useMcpToolToggleMap, Gt as useDiscoveryOptional, Ht as createDiscoverySlot, I as parseMcpsFile, J as indexOfServerRow, Jt as resolveConfig, Kt as ConfigProvider, L as parseClaudeState, M as buildMcpServers, N as defaultMcpsConfigPaths, Nn as TODO_STATUS_GLYPHS, Nt as resolveChipColor, O as fetchOAuthRedirect, Ot as SettingsProvider, P as discoverProjectMcps, Pt as resolveTheme, Qt as chainsEqual, Sr as usageByModel, St as useEnabledToggleSet, T as suggestSafelistEntries, Tt as SETTINGS_CHOICES, U as subscribeMcpToolsCache, Un as useActiveTodos, Ut as DiscoveryProvider, V as refreshMcpToolsCatalog, Wt as useDiscovery, X as createFileMcpCredentialStore, Xt as buildRunModel, Y as parentServerName, Yt as resolveStoragePaths, Zt as chainPositionOf, _ as useSafeModeQueue, _r as sumRunCosts, _t as hintsLength, a as useSurfaces, an as tryOpenBrowser, at as InteractionsProvider, b as getSafelist, br as toolResultText, c as useStreamBuffer, cn as buildUpdateHint, cr as deriveSessionTitle, ct as createInteractionTools, d as discoverProjectSkills, dr as listSessionMeta, dt as pendingInteractionsFromTurns, en as providerKeySetChanged, er as buildBuildSystem, et as useMcpAuthDispatch, fr as loadState, g as useSafeModeActions, gr as stripSpawnTokensLine, gt as clipHintsToWidth, h as SafeModeProvider, hr as serverToolResultSummary, ht as EMPTY_HINTS, i as useSelectStyle, in as useCompletion, ir as createChatTurnsReadTool, it as ASK_USER_TOOL, j as supportsOAuth, k as oauthUsesManualCodePaste, kt as clampFps, l as buildSkillsConfig, ln as useUpdateCheck, lr as eventsFromTurns, m as writeSessionExport, mt as useInteractionsQueue, n as ThemeProvider, nr as envSection, nt as getMcpAuthStatus, or as compactSummaryEvent, ot as PRESENT_PLAN_TOOL, pr as marginTopFor, pt as useInteractionsActions, q as buildVisibleMcpRows, qt as useConfig, r as useColors, rn as toggleChainEntry, rr as chatReferenceTokensForPrompt, s as useTheme, sn as bootTick, st as buildResumedToolResultsTurn, t as computeTurnAnchors, tn as restoreChainFallbacks, tr as buildPlanSystem, tt as useMcpAuthState, u as defaultSkillScanPaths, ur as lastContextSizeFromTurns, ut as makeRequestInteraction, vn as chatAutoCompactBehavior, vt as truncateTrailing, wt as SETTINGS_CATEGORIES, x as isOnSafelist, xr as updateToolEventOutcomes, xt as listProjectFiles, y as addToSafelist, yn as discoverAgentsMd, yr as toolCallPreview, yt as buildHints, z as loadMcpToolsCache } from "./transcript-anchors-Ded7iJjG.js";
+import { $ as composeExtensionPreset, B as ExtensionInstallError, Bt as ensureKeybindingsFile, Et as createModelSearchTool, H as installExtensionFromSpec, Ht as groupBindings, J as createExtensionHud, K as removeInstalledExtension, P as summaryToTurn, St as tailTruncate, Ut as keybindingsPath, Vt as formatBindingForDisplay, Wt as matchesBinding, X as discoverAndBuildExtensionRegistry, Y as registerExtensionHostModules, Yt as resolveExtensionKeybindings, _ as buildPostCompactAttachments, c as applyCompactSummaryCutoff, dn as sanitizeExtensionConfigActionPatch, en as inlineLoadedExtension, et as disposeExtensionRegistry, f as cleanupPersistedSession, g as resolveTasksDir, h as resolvePersistDir, hn as effectiveContextWindow, ht as isSpawnTool, it as createExtensionHostRuntimeBridge, lt as basic_default, m as resolveMcpWarningsDir, mn as OUTPUT_RESERVE_TOKENS, nn as parseExtensionScanPathEnv, on as coerceExtensionConfigInput, q as updateInstalledExtension, rn as scanExtensionDirectories, rt as partitionExtensionCatalog, t as createAgent, tt as filterExtensionRegistry, un as resolveExtensionConfigValue, wt as looksBinary, x as compactConversation, y as selectFilesFromSession, z as createExtensionPromptBridge, zt as KEYBINDING_KEY_COL_WIDTH } from "./agent-tLfGSSQw.js";
 import { a as formatDuration, c as previewLine, i as fmtTokens, l as shortId, n as compactPath, o as formatTaskStatus, r as fmtCost, s as formatTaskSummary, t as ageString } from "./format-BF745pLL.js";
 import { n as appendCapped } from "./output-cap-kBUHBlnq.js";
 import { i as killProcessGroup, n as SUPPORTS_PROCESS_GROUPS, r as createProcessContext } from "./contexts-A4ep-iJs.js";
 import { l as errorMessage } from "./errors-DJUxZg9b.js";
-import { M as findGitRoot, j as projectUserPaths } from "./resolve-x5mlFtLX.js";
+import { M as findGitRoot, j as projectUserPaths } from "./resolve-BPTA1RpX.js";
 import { a as createRingBufferSink, i as createLoggingHooks, l as logFileTimestamp, n as createFileSink, o as fanoutSink, r as createLogger, s as formatLogLine, t as consoleSink } from "./logger-DBX9uYOw.js";
 import { i as sniffImageMediaType } from "./media-sniff-Bn76JxAu.js";
 import { d as McpOAuthProvider, i as nonOwningMcpView, n as connectMcpServers, p as hasAuthorizationHeader } from "./mcp-H6bqyM94.js";
-import { n as flattenTurns, r as formatTokenUsage, t as effectiveInputFromTurn } from "./stats-DAKBEKjc.js";
 import { replaceDynamicSection } from "./prompt.js";
-import { a as getExtensionSessionState, i as demoteStaleRunningStatus, o as loadSession, s as setExtensionSessionState, t as createSession } from "./session-Dbvz1ZUE.js";
+import { a as getExtensionSessionState, c as setExtensionSessionState, i as demoteStaleRunningStatus, o as loadSession, t as createSession } from "./session-jLsc_kMH.js";
+import { n as flattenTurns, r as formatTokenUsage, t as effectiveInputFromTurn } from "./stats-DAKBEKjc.js";
 import { o as withTimeout } from "./timeout-BDetbuN6.js";
 import { a as generateStructuredData, c as shouldAutoGenerateTitle, f as commandBlockToEvent, g as parseCommandInvocation, h as executeCommand, n as patchInlineGhost, p as commandBlocksToContent, r as resolveInlineSuggestion, s as generateSessionTitle, t as createPathAutocompleteProvider } from "./inline-autocomplete-BAwBcZtD.js";
 import { s as resolveCompletionSubmit } from "./completion-core-BRo86R_L.js";
-import { i as installSkillFromSpec, r as SkillInstallError } from "./skills-C1vGKbqv.js";
-import { i as ZIDANE_EXTENSION_SKILL_NAME, l as withZidaneExtensionSkill, o as extensionDirForCwd, r as EXTENSION_EDIT_METADATA_KEY, s as extensionScaffold, t as loginMcpServer } from "./login-BkZ_d5sT.js";
+import { i as installSkillFromSpec, r as SkillInstallError } from "./skills-C7eIjWYm.js";
+import { i as ZIDANE_EXTENSION_SKILL_NAME, l as withZidaneExtensionSkill, o as extensionDirForCwd, r as EXTENSION_EDIT_METADATA_KEY, s as extensionScaffold, t as loginMcpServer } from "./login-DfJGuHUj.js";
 import { C as restoreModelOptions, S as piIdOf, _ as modelOptionsFor, m as getContextWindow, p as enabledModelOptions, s as setProviderCredential, t as detectAuth, v as modelSupportsReasoning } from "./auth-CpdQebUy.js";
 import { createDockerContext } from "./contexts/docker.js";
 import { createTuiStore } from "./session/sqlite.js";
-import { $ as extractEditPayload, B as isVisible, C as chunkMarkdownForRender, E as stripHtmlCommentsOutsideCode, F as BASH_CALL_ID_PREFIX, G as streamEventSearchText, H as promptHistoryFromEvents, I as EDIT_TOOL_NAMES, J as buildContextualDiff, K as turnSelectionOwnership, L as isEditErrorResult, N as blendHsl, O as createSkillsCompletionProvider, P as buildLinearRamp, R as isTurnHighlighted, T as splitMarkdownCodeBlocks, U as selectableTurnIds, V as isVisibleDuringSearch, W as selectionAfterTurnRemoval, X as clipDiffForRender, Y as buildUnifiedDiff, _ as turnContextSize, a as TOOL_DISPLAY, at as buildEditOutcomesAnnotation, b as filterModelCatalog, ct as parseEditOutcomesFromResult, d as finalizeStreamingMarkdown, dt as stripEditOutcomesAnnotation, et as filetypeFromPath, f as finalizeStreamingMarkdownForOwner, ft as summarizeOutcomes, g as revealEarlierTranscriptEvents, h as replaceTranscriptTurnEvents, ht as createChatsCompletionProvider, i as turnAsText, j as createFilesCompletionProvider, k as uniqueSkillNamesFromReferences, lt as resolveApprovalForPayload, n as deleteTurnSafely, o as displayNameFor, p as hiddenEarlierTranscriptCount, r as truncateTurnsAt, rt as summarizeEditPayload, s as formatToolCall, st as mergeApprovalAndBodyOutcomes, tt as previewEditPayload, u as capTranscriptEvents, ut as rewriteMultiEditHeader, v as splitPromptSegments, w as normalizeMarkdownCodeFences, y as buildModelCatalog, z as isUserBashEvent } from "./turn-operations-CokV32wf.js";
+import { $ as extractEditPayload, B as isVisible, C as chunkMarkdownForRender, E as stripHtmlCommentsOutsideCode, F as BASH_CALL_ID_PREFIX, G as streamEventSearchText, H as promptHistoryFromEvents, I as EDIT_TOOL_NAMES, J as buildContextualDiff, K as turnSelectionOwnership, L as isEditErrorResult, N as blendHsl, O as createSkillsCompletionProvider, P as buildLinearRamp, R as isTurnHighlighted, T as splitMarkdownCodeBlocks, U as selectableTurnIds, V as isVisibleDuringSearch, W as selectionAfterTurnRemoval, X as clipDiffForRender, Y as buildUnifiedDiff, _ as turnContextSize, a as TOOL_DISPLAY, at as buildEditOutcomesAnnotation, b as filterModelCatalog, ct as parseEditOutcomesFromResult, d as finalizeStreamingMarkdown, dt as stripEditOutcomesAnnotation, et as filetypeFromPath, f as finalizeStreamingMarkdownForOwner, ft as summarizeOutcomes, g as revealEarlierTranscriptEvents, h as replaceTranscriptTurnEvents, ht as createChatsCompletionProvider, i as turnAsText, j as createFilesCompletionProvider, k as uniqueSkillNamesFromReferences, lt as resolveApprovalForPayload, n as deleteTurnSafely, o as displayNameFor, p as hiddenEarlierTranscriptCount, r as truncateTurnsAt, rt as summarizeEditPayload, s as formatToolCall, st as mergeApprovalAndBodyOutcomes, tt as previewEditPayload, u as capTranscriptEvents, ut as rewriteMultiEditHeader, v as splitPromptSegments, w as normalizeMarkdownCodeFences, y as buildModelCatalog, z as isUserBashEvent } from "./turn-operations-ClGa1vnb.js";
 import { a as searchHighlightRanges, c as searchSessionHistoryIndexAsync, i as highlightSegments, n as buildSessionSearchIndexAsync, r as filterSessionSearchCatalog, u as searchSessionIndexAsync } from "./history-search-C4bk1Wz_.js";
 import { basename, dirname, join, relative, resolve } from "node:path";
 import { Buffer } from "node:buffer";
@@ -483,7 +483,12 @@ async function importClaudeSessions(store, opts = {}) {
 		failed: []
 	};
 	for (const file of listClaudeSessionFiles(opts)) try {
-		const converted = convertClaudeSession(readFileSync(file.path, "utf8"), { fallbackId: basename(file.path, ".jsonl") });
+		const fallbackId = basename(file.path, ".jsonl");
+		if (await store.load(fallbackId)) {
+			result.skipped++;
+			continue;
+		}
+		const converted = convertClaudeSession(readFileSync(file.path, "utf8"), { fallbackId });
 		if (!converted) {
 			result.empty++;
 			continue;
@@ -1676,6 +1681,200 @@ function segmentDiffStatLine(line) {
 	}];
 }
 //#endregion
+//#region src/tui/clickable.tsx
+/** Glyph / word aliases → OpenTUI key names (`parse.keypress` conventions). */
+const KEY_NAME_ALIASES = {
+	"esc": "escape",
+	"↵": "return",
+	"enter": "return",
+	"tab": "tab",
+	"space": "space",
+	"⌫": "backspace",
+	"backspace": "backspace",
+	"pgup": "pageup",
+	"pgdn": "pagedown",
+	"↑": "up",
+	"↓": "down",
+	"←": "left",
+	"→": "right",
+	"↑↓": "down",
+	"←→": "right",
+	"del": "delete"
+};
+/** Decorative pseudo-keys that must never dispatch (chips, markers). */
+const NON_KEYS = /* @__PURE__ */ new Set([
+	"✦",
+	"·",
+	"…"
+]);
+/**
+* Parse a hint key spec (`ctrl+g`, `shift+↵`, `esc`, `a`, `↑↓`) into a
+* dispatchable {@link ParsedKey}, or `null` when the spec is decorative
+* or ambiguous (the hint then renders non-clickable). Modifier segments
+* are order-insensitive; the final segment is the key itself.
+*/
+function parseHintKeySpec(spec) {
+	const trimmed = spec.trim().toLowerCase();
+	if (!trimmed || NON_KEYS.has(trimmed)) return null;
+	const segments = (trimmed.split("/")[0] ?? "").split("+").map((s) => s.trim()).filter(Boolean);
+	if (segments.length === 0) return null;
+	const keyPart = segments[segments.length - 1] ?? "";
+	const modifiers = segments.slice(0, -1);
+	const mods = {
+		ctrl: false,
+		meta: false,
+		shift: false,
+		option: false
+	};
+	for (const mod of modifiers) if (mod === "ctrl" || mod === "control") mods.ctrl = true;
+	else if (mod === "shift") mods.shift = true;
+	else if (mod === "alt" || mod === "option") mods.option = true;
+	else if (mod === "meta" || mod === "cmd" || mod === "super") mods.meta = true;
+	else return null;
+	const name = KEY_NAME_ALIASES[keyPart] ?? (keyPart.length === 1 ? keyPart : null);
+	if (!name) return null;
+	const sequence = keySequence(name, mods);
+	return {
+		name,
+		...mods,
+		sequence,
+		number: /^\d$/.test(name),
+		raw: sequence,
+		eventType: "press",
+		source: "raw"
+	};
+}
+/** Byte sequences real terminals send for the named specials we synthesize. */
+const NAMED_KEY_SEQUENCES = {
+	return: "\r",
+	tab: "	",
+	escape: "\x1B",
+	space: " ",
+	backspace: "",
+	delete: "\x1B[3~",
+	up: "\x1B[A",
+	down: "\x1B[B",
+	right: "\x1B[C",
+	left: "\x1B[D",
+	pageup: "\x1B[5~",
+	pagedown: "\x1B[6~"
+};
+/**
+* The `sequence`/`raw` a REAL keypress would carry — without it the
+* synthetic event is second-class: focused inputs insert text from
+* `key.sequence` (so a clicked `@ files` hint must actually type `@`),
+* and some handlers match on `sequence` rather than `name`. Modifier
+* chords return `''`: their handlers dispatch on `name` + flags, and
+* fabricating control bytes would risk double interpretation.
+*/
+function keySequence(name, mods) {
+	if (mods.ctrl || mods.meta || mods.option) return "";
+	if (mods.shift) return name === "tab" ? "\x1B[Z" : "";
+	if (name.length === 1) return name;
+	return NAMED_KEY_SEQUENCES[name] ?? "";
+}
+/**
+* Dispatch a hint key spec through the renderer's key pipeline. Returns
+* `false` for unparseable specs (no-op). Exposed for non-hint surfaces
+* that want the same click==keypress contract.
+*/
+function dispatchHintKey(renderer, spec) {
+	const parsed = parseHintKeySpec(spec);
+	if (!parsed) return false;
+	renderer.keyInput.processParsedKey(parsed);
+	return true;
+}
+/**
+* True when a row click landed on the row's `[✓] ` checkbox cell — the
+* columns `[startCol, startCol + width)` of the FIRST line of the target
+* renderable. Rows that must stay single `<text>` renderables (the MCP
+* list documents an OpenTUI layout regression forbidding box wrappers)
+* can't make the checkbox its own renderable, so zone-splitting works by
+* coordinate instead: `event.x/y` are absolute, the target renderable
+* knows its own absolute origin, and the difference is the glyph column.
+* The `y` check pins line 0 so wrapped continuation lines can't false-
+* positive into the checkbox range. Degrades to `false` (row semantics)
+* when the target's geometry is unavailable.
+*/
+function inCheckboxZone(event, startCol, width = 4) {
+	const target = event.target;
+	if (!target || typeof target.x !== "number" || typeof target.y !== "number") return false;
+	if (event.y - target.y !== 0) return false;
+	const col = event.x - target.x;
+	return col >= startCol && col < startCol + width;
+}
+/** Spans for one hint's text content — shared by hover and rest states. */
+function hintSpans(hint, COLOR, hovered) {
+	const keyColor = hovered ? COLOR.accent : hint.keyColor ?? COLOR.warn;
+	const labelColor = hovered ? COLOR.accent : hint.labelColor ?? COLOR.dim;
+	return /* @__PURE__ */ jsxs(Fragment, { children: [
+		hint.key !== "" && /* @__PURE__ */ jsx$1("span", {
+			fg: keyColor,
+			children: hint.key
+		}),
+		hint.extra && /* @__PURE__ */ jsx$1("span", {
+			fg: hint.extra.keyColor ?? COLOR.mute,
+			children: hint.extra.key
+		}),
+		/* @__PURE__ */ jsx$1("span", {
+			fg: labelColor,
+			children: hint.key === "" ? hint.label : ` ${hint.label}`
+		}),
+		hint.extra && /* @__PURE__ */ jsx$1("span", {
+			fg: hint.extra.labelColor ?? COLOR.dim,
+			children: ` ${hint.extra.label}`
+		})
+	] });
+}
+/**
+* One hint as its own `<text>` renderable — clickable when its key spec
+* parses, hover-highlighted in the theme accent. Non-parseable hints
+* render identically but inert, so decorative chips cost nothing.
+*/
+function ClickableHint({ hint }) {
+	const COLOR = useColors();
+	const renderer = useRenderer();
+	const [hovered, setHovered] = useState(false);
+	if (!(parseHintKeySpec(hint.key) !== null)) return /* @__PURE__ */ jsx$1("text", {
+		selectable: false,
+		children: hintSpans(hint, COLOR, false)
+	});
+	return /* @__PURE__ */ jsx$1("text", {
+		selectable: false,
+		onMouseDown: (event) => {
+			event.stopPropagation();
+			event.preventDefault();
+			dispatchHintKey(renderer, hint.key);
+		},
+		onMouseOver: () => setHovered(true),
+		onMouseOut: () => setHovered(false),
+		children: hintSpans(hint, COLOR, hovered)
+	});
+}
+/**
+* A row of clickable hints with ` · ` separators — the renderable-per-hint
+* replacement for the span-based `renderHintSpans`. Text content is
+* byte-identical to the span renderer, so existing `hintsLength` width
+* math keeps holding.
+*/
+function HintRow({ hints }) {
+	const COLOR = useColors();
+	return /* @__PURE__ */ jsx$1("box", {
+		style: {
+			flexDirection: "row",
+			flexWrap: "wrap"
+		},
+		children: hints.map((hint, i) => /* @__PURE__ */ jsxs("box", {
+			style: { flexDirection: "row" },
+			children: [i > 0 && /* @__PURE__ */ jsx$1("text", {
+				selectable: false,
+				fg: COLOR.mute,
+				children: " · "
+			}), /* @__PURE__ */ jsx$1(ClickableHint, { hint })]
+		}, `${hint.key}\u0000${hint.label}\u0000${i}`))
+	});
+}
+//#endregion
 //#region src/tui/crush-throbber.tsx
 /** @jsxImportSource @opentui/react */
 const CRUSH_RUNES = "0123456789abcdefABCDEF~!@#$£€%^&*()+=_";
@@ -2311,7 +2510,7 @@ function onInputSubmit(handler) {
 * Width tiering is driven by plain-text length estimates — close enough
 * since the segments are ASCII-heavy.
 */
-function Footer({ hints, context, cost = null, status = null, compactionTokens = null, compactionStartedAt = null }) {
+function Footer({ hints, context, cost = null, status = null, compactionTokens = null, compactionStartedAt = null, retry = null }) {
 	const { width } = useTerminalDimensions();
 	const showCost = typeof cost === "number" && cost > 0;
 	const inner = Math.max(0, width - 2);
@@ -2325,8 +2524,8 @@ function Footer({ hints, context, cost = null, status = null, compactionTokens =
 		const timer = setInterval(() => setCompactTick((t) => t + 1), 1e3);
 		return () => clearInterval(timer);
 	}, [status]);
-	const statusLabel = status === "compacting" ? compactingLabel(compactionTokens, compactionStartedAt) : status === "searching" ? " Searching messages…" : "";
-	const sW = status === "compacting" || status === "searching" ? 2 + statusLabel.length : status === "asking" ? 3 : status ? 2 : 0;
+	const statusLabel = status === "compacting" ? compactingLabel(compactionTokens, compactionStartedAt) : status === "searching" ? " Searching messages…" : status === "retrying" ? retryingLabel(retry) : "";
+	const sW = status === "compacting" || status === "searching" || status === "retrying" ? 2 + statusLabel.length : status === "asking" ? 3 : status ? 2 : 0;
 	if (hW + sW + (rightW > 0 ? rightW + 1 : 0) <= inner) return /* @__PURE__ */ jsxs("box", {
 		style: {
 			flexDirection: "row",
@@ -2395,17 +2594,25 @@ function RightStatus({ cost, context }) {
 function FooterStatusIcon({ status, label = "" }) {
 	const COLOR = useColors();
 	if (!status) return null;
-	const glyph = status === "asking" ? /* @__PURE__ */ jsx$1("span", { children: "❓" }) : status === "busy" ? /* @__PURE__ */ jsx$1(StatusSpinner, { color: COLOR.warn }) : /* @__PURE__ */ jsx$1(StatusSpinner, { color: COLOR.accent });
+	const glyph = status === "asking" ? /* @__PURE__ */ jsx$1("span", { children: "❓" }) : status === "busy" || status === "retrying" ? /* @__PURE__ */ jsx$1(StatusSpinner, { color: COLOR.warn }) : /* @__PURE__ */ jsx$1(StatusSpinner, { color: COLOR.accent });
 	return /* @__PURE__ */ jsxs("text", { children: [
 		/* @__PURE__ */ jsx$1("span", { children: " " }),
 		glyph,
 		label && /* @__PURE__ */ jsx$1("span", {
-			fg: COLOR.accent,
+			fg: status === "retrying" ? COLOR.warn : COLOR.accent,
 			children: label
 		})
 	] });
 }
 /**
+* Footer label for the retrying state — ` Retrying (n/max)...` where `n`
+* is the attempt about to be issued. Plain string for the same width-math
+* reason as {@link compactingLabel}.
+*/
+function retryingLabel(retry) {
+	return retry ? ` Retrying (${retry.attempt}/${retry.max})...` : " Retrying...";
+}
+/**
 * Footer label for the compacting state — ` Compacting...` plus liveness:
 * a `~2.1k` output-token estimate once the summary streams, and an elapsed
 * suffix while it doesn't (prompt ingestion is minutes of silence on
@@ -2419,11 +2626,7 @@ function compactingLabel(estTokens, startedAt) {
 	return typeof estTokens === "number" && estTokens > 0 ? `${base} ~${fmtTokens(estTokens)}${elapsed}` : `${base}${elapsed}`;
 }
 function HintsText({ hints }) {
-	const COLOR = useColors();
-	return /* @__PURE__ */ jsx$1("text", {
-		fg: COLOR.dim,
-		children: renderHintSpans(hints, COLOR)
-	});
+	return /* @__PURE__ */ jsx$1(HintRow, { hints });
 }
 /**
 * Pure renderer for a list of {@link Hint}s as colored spans —
@@ -7851,7 +8054,7 @@ const BULK_ACTIONS = [
 		destructive: true
 	}
 ];
-function ActionBar({ actions, selected, customLabel }) {
+function ActionBar({ actions, selected, customLabel, onActivate, onHover }) {
 	const COLOR = useColors();
 	const SURFACE = useSurfaces();
 	return /* @__PURE__ */ jsx$1("box", {
@@ -7869,6 +8072,12 @@ function ActionBar({ actions, selected, customLabel }) {
 					marginRight: 2,
 					flexShrink: 0
 				},
+				onMouseDown: (event) => {
+					event.stopPropagation();
+					event.preventDefault();
+					onActivate?.(action, i);
+				},
+				onMouseOver: () => onHover?.(i),
 				children: isSelected ? /* @__PURE__ */ jsx$1("text", {
 					bg: tint,
 					fg: SURFACE.background,
@@ -8030,7 +8239,9 @@ function SingleEditApprovalModal({ request, payload, priorContent, priorError, t
 				})]
 			}), /* @__PURE__ */ jsx$1(ActionBar, {
 				actions: BULK_ACTIONS,
-				selected
+				selected,
+				onActivate: (action) => decide(action.decision),
+				onHover: setSelected
 			})]
 		}), /* @__PURE__ */ jsxs("text", {
 			style: {
@@ -8355,6 +8566,10 @@ function MultiEditApprovalModal({ request, payload, priorContent, priorError, ta
 					customLabel: {
 						idx: 0,
 						label: applyLabel
+					},
+					onActivate: (action) => decide(resolveDecision(action.decision)),
+					onHover: (i) => {
+						if (zone === "actions") setActionIdx(i);
 					}
 				})
 			]
@@ -9341,6 +9556,19 @@ function MultiSelectQuestionInput({ question, initialChoiceIds, onSubmit }) {
 			const isPicked = picked.has(choice.id);
 			return /* @__PURE__ */ jsxs("text", {
 				wrapMode: "word",
+				onMouseDown: (event) => {
+					event.stopPropagation();
+					event.preventDefault();
+					setCursor(i);
+					if (!inCheckboxZone(event, 5)) return;
+					setPicked((prev) => {
+						const next = new Set(prev);
+						if (next.has(choice.id)) next.delete(choice.id);
+						else next.add(choice.id);
+						return next;
+					});
+				},
+				onMouseOver: () => setCursor(i),
 				children: [
 					/* @__PURE__ */ jsx$1("span", {
 						fg: COLOR.mute,
@@ -9364,25 +9592,28 @@ function MultiSelectQuestionInput({ question, initialChoiceIds, onSubmit }) {
 					})
 				]
 			}, choice.id);
-		}), /* @__PURE__ */ jsxs("text", {
-			fg: COLOR.mute,
-			children: [
-				"   ",
-				/* @__PURE__ */ jsx$1("span", {
-					fg: COLOR.warn,
-					children: "space"
-				}),
-				" toggle · ",
-				/* @__PURE__ */ jsx$1("span", {
-					fg: COLOR.warn,
-					children: "↵"
-				}),
-				` submit${required ? " · " : ""}`,
-				required && /* @__PURE__ */ jsx$1("span", {
-					fg: COLOR.warn,
-					children: "required"
-				})
-			]
+		}), /* @__PURE__ */ jsxs("box", {
+			style: { flexDirection: "row" },
+			children: [/* @__PURE__ */ jsx$1("text", {
+				fg: COLOR.mute,
+				children: "   "
+			}), /* @__PURE__ */ jsx$1(HintRow, { hints: [
+				{
+					key: "space",
+					label: "toggle",
+					labelColor: COLOR.mute
+				},
+				{
+					key: "↵",
+					label: "submit",
+					labelColor: COLOR.mute
+				},
+				...required ? [{
+					key: "",
+					label: "required",
+					labelColor: COLOR.warn
+				}] : []
+			] })]
 		})]
 	});
 }
@@ -9407,7 +9638,9 @@ function OptionList({ items, initialCursor, onPick }) {
 		if (typeof initialCursor !== "number" || items.length === 0) return 0;
 		return Math.max(0, Math.min(items.length - 1, initialCursor));
 	});
+	const [clickArmed, setClickArmed] = useState(false);
 	const moveCursor = useCallback((delta) => {
+		setClickArmed(true);
 		setCursor((c) => {
 			if (items.length === 0) return c;
 			return ((c + delta) % items.length + items.length) % items.length;
@@ -9438,6 +9671,16 @@ function OptionList({ items, initialCursor, onPick }) {
 			const isCursor = i === cursor;
 			return /* @__PURE__ */ jsxs("text", {
 				wrapMode: "word",
+				onMouseDown: (event) => {
+					event.stopPropagation();
+					event.preventDefault();
+					if (isCursor && clickArmed) {
+						onPick(item.id);
+						return;
+					}
+					setCursor(i);
+					setClickArmed(true);
+				},
 				children: [
 					/* @__PURE__ */ jsx$1("span", {
 						fg: COLOR.mute,
@@ -9680,6 +9923,7 @@ function McpAuthorizingPanel({ serverName, authUrl, maxLineWidth, chromeWidth, i
 	const COLOR = useColors();
 	const inputRef = useRef(null);
 	const [hint, setHint] = useState(null);
+	const status = hint && hint.tone !== "error" ? hint.text : "complete the login in your browser — waiting for the callback…";
 	const onSubmit = useCallback(() => {
 		const value = inputRef.current?.value?.trim() ?? "";
 		if (!value) return;
@@ -9709,32 +9953,36 @@ function McpAuthorizingPanel({ serverName, authUrl, maxLineWidth, chromeWidth, i
 	return /* @__PURE__ */ jsxs("box", {
 		style: {
 			flexDirection: "column",
-			border: ["top"],
-			borderColor: COLOR.border,
-			paddingTop: 1
+			flexShrink: 0
 		},
-		children: [
-			/* @__PURE__ */ jsx$1("text", {
-				fg: COLOR.brand,
-				children: `Authorizing ${serverName}`
-			}),
-			/* @__PURE__ */ jsx$1("text", {
-				fg: COLOR.dim,
-				children: "Your browser should have opened — complete the login, then return here."
-			}),
-			/* @__PURE__ */ jsx$1(OAuthAuthBlock, {
-				authUrl,
-				maxLineWidth,
-				chromeWidth,
-				paste: {
-					inputRef,
-					focused: inputFocused,
-					onSubmit,
-					placeholder: "paste redirect URL and press enter…",
-					hint: hint ?? void 0
-				}
-			})
-		]
+		children: [/* @__PURE__ */ jsxs("box", {
+			style: {
+				flexDirection: "column",
+				border: true,
+				borderColor: COLOR.border,
+				padding: 1,
+				gap: 1
+			},
+			children: [
+				/* @__PURE__ */ jsx$1(Spinner, { label: status }),
+				/* @__PURE__ */ jsx$1(OAuthAuthBlock, {
+					authUrl,
+					maxLineWidth,
+					chromeWidth: (chromeWidth ?? 14) + 4,
+					paste: {
+						inputRef,
+						focused: inputFocused,
+						onSubmit,
+						placeholder: "paste redirect URL and press enter…",
+						hint: hint?.tone === "error" ? hint : void 0
+					}
+				}),
+				/* @__PURE__ */ jsx$1("text", {
+					fg: COLOR.dim,
+					children: "esc cancel — the server stays signed out until you retry"
+				})
+			]
+		}), /* @__PURE__ */ jsx$1(TitleOverlay, { title: `authorizing ${serverName} — OAuth` })]
 	});
 }
 //#endregion
@@ -10796,7 +11044,13 @@ function SessionsScreen({ sessions, currentId, focusedSessionId, onPick, onCreat
 						focused: idx === cursorIndex && focused,
 						isCurrent: row.kind === "session" && row.rowId === currentId,
 						showProject: showAllProjects,
-						currentProjectRoot
+						currentProjectRoot,
+						onHover: focused ? () => moveCursor(idx) : void 0,
+						onClick: focused ? () => {
+							moveCursor(idx);
+							if (row.kind === "new") onCreate();
+							else onPick(row.rowId);
+						} : void 0
 					}, row.rowId)), filteredSessions.length === 0 && query.trim().length > 0 && /* @__PURE__ */ jsxs("text", {
 						wrapMode: "none",
 						children: [
@@ -10838,7 +11092,7 @@ function SessionsScreen({ sessions, currentId, focusedSessionId, onPick, onCreat
 * exactly the width of the focus + current markers above — so the first
 * stat (the turn count) sits flush under the title's first letter.
 */
-function SessionRow({ row, anchorId, focused, isCurrent, separator = false, showProject = false, currentProjectRoot }) {
+function SessionRow({ row, anchorId, focused, isCurrent, separator = false, showProject = false, currentProjectRoot, onClick, onHover }) {
 	const COLOR = useColors();
 	const SURFACE = useSurfaces();
 	const STATS_INDENT = "    ";
@@ -10854,9 +11108,18 @@ function SessionRow({ row, anchorId, focused, isCurrent, separator = false, show
 			borderColor: COLOR.border
 		} : {}
 	};
+	const mouseProps = {
+		...onClick ? { onMouseDown: (event) => {
+			event.stopPropagation();
+			event.preventDefault();
+			onClick();
+		} } : {},
+		...onHover ? { onMouseOver: () => onHover() } : {}
+	};
 	if (row.kind === "new") return /* @__PURE__ */ jsxs("box", {
 		id: anchorId,
 		style: rowStyle,
+		...mouseProps,
 		children: [/* @__PURE__ */ jsxs("text", {
 			wrapMode: "none",
 			children: [
@@ -10890,6 +11153,7 @@ function SessionRow({ row, anchorId, focused, isCurrent, separator = false, show
 	return /* @__PURE__ */ jsxs("box", {
 		id: anchorId,
 		style: rowStyle,
+		...mouseProps,
 		children: [
 			/* @__PURE__ */ jsxs("text", {
 				wrapMode: "none",
@@ -12302,7 +12566,6 @@ const PROMPT_HINTS_SELECT_QUEUE = [{
 * shortcuts that actually do something in the active mode.
 */
 function PromptHints({ selectMode, searchMode = false, triggerHints, busy = false }) {
-	const COLOR = useColors();
 	const { settings } = useSettings();
 	const { width: termWidth } = useTerminalDimensions();
 	const minimalResting = !selectMode && !searchMode && !busy && settings.uiMode === "minimal";
@@ -12319,21 +12582,21 @@ function PromptHints({ selectMode, searchMode = false, triggerHints, busy = fals
 		termWidth
 	]);
 	if (hints.length === 0) return null;
-	return /* @__PURE__ */ jsxs("text", {
+	return /* @__PURE__ */ jsxs("box", {
 		style: {
 			position: "absolute",
 			top: 0,
-			right: 1
+			right: 1,
+			flexDirection: "row"
 		},
-		fg: COLOR.dim,
 		children: [
-			/* @__PURE__ */ jsx$1("span", {
-				fg: COLOR.mute,
+			/* @__PURE__ */ jsx$1("text", {
+				selectable: false,
 				children: " "
 			}),
-			renderHintSpans(hints, COLOR),
-			/* @__PURE__ */ jsx$1("span", {
-				fg: COLOR.mute,
+			/* @__PURE__ */ jsx$1(HintRow, { hints }),
+			/* @__PURE__ */ jsx$1("text", {
+				selectable: false,
 				children: " "
 			})
 		]
@@ -14434,8 +14697,8 @@ function SettingsModal({ skillsCatalog: skillsCatalogProp, mcpsCatalog: mcpsCata
 			[activeTab]: 0
 		}));
 	}, [activeTab]);
-	const expandFocusedMcpRow = useCallback(() => {
-		const row = mcpVisibleRows[cursor];
+	const expandMcpRowAt = useCallback((index) => {
+		const row = mcpVisibleRows[index];
 		if (!row || row.kind !== "server") return;
 		const name = row.entry.config.name;
 		if ((mcpToolsByServer[name]?.length ?? 0) === 0) fireMcpToolsRefresh();
@@ -14447,12 +14710,11 @@ function SettingsModal({ skillsCatalog: skillsCatalogProp, mcpsCatalog: mcpsCata
 		});
 	}, [
 		mcpVisibleRows,
-		cursor,
 		mcpToolsByServer,
 		fireMcpToolsRefresh
 	]);
-	const collapseFocusedMcpRow = useCallback(() => {
-		const row = mcpVisibleRows[cursor];
+	const collapseMcpRowAt = useCallback((index) => {
+		const row = mcpVisibleRows[index];
 		if (!row) return;
 		const parentName = parentServerName(row);
 		if (row.kind !== "server") {
@@ -14468,7 +14730,18 @@ function SettingsModal({ skillsCatalog: skillsCatalogProp, mcpsCatalog: mcpsCata
 			next.delete(parentName);
 			return next;
 		});
-	}, [mcpVisibleRows, cursor]);
+	}, [mcpVisibleRows]);
+	const toggleExpandMcpRowAt = useCallback((index) => {
+		const row = mcpVisibleRows[index];
+		if (!row) return;
+		if (expandedMcps.has(parentServerName(row))) collapseMcpRowAt(index);
+		else expandMcpRowAt(index);
+	}, [
+		mcpVisibleRows,
+		expandedMcps,
+		collapseMcpRowAt,
+		expandMcpRowAt
+	]);
 	/**
 	* Single `tab` press toggles between expanded / collapsed based on
 	* the focused row's current state. The split helpers above remain
@@ -14476,21 +14749,9 @@ function SettingsModal({ skillsCatalog: skillsCatalogProp, mcpsCatalog: mcpsCata
 	* 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 toggleExpandFocusedExtensionRow = useCallback(() => {
-		const row = extensionVisibleRows[cursor];
+	const toggleExpandFocusedMcpRow = useCallback(() => toggleExpandMcpRowAt(cursor), [toggleExpandMcpRowAt, cursor]);
+	const toggleExpandExtensionRowAt = useCallback((index) => {
+		const row = extensionVisibleRows[index];
 		const parentName = parentExtensionName(row);
 		if (!parentName) return;
 		setExpandedExtensions((prev) => {
@@ -14507,7 +14768,8 @@ function SettingsModal({ skillsCatalog: skillsCatalogProp, mcpsCatalog: mcpsCata
 			} else next.add(parentName);
 			return next;
 		});
-	}, [extensionVisibleRows, cursor]);
+	}, [extensionVisibleRows]);
+	const toggleExpandFocusedExtensionRow = useCallback(() => toggleExpandExtensionRowAt(cursor), [toggleExpandExtensionRowAt, cursor]);
 	const mcpRowCount = mcpVisibleRows.length;
 	const extensionRowCount = extensionVisibleRows.length;
 	useEffect(() => {
@@ -14597,6 +14859,148 @@ function SettingsModal({ skillsCatalog: skillsCatalogProp, mcpsCatalog: mcpsCata
 	useEffect(() => {
 		if (editingInputKey) editInputRef.current?.focus();
 	}, [editingInputKey]);
+	/**
+	* Activate the row at `index` on the ACTIVE tab — the ↵ semantics
+	* (toggle / cycle / open editor / run action), extracted so row
+	* CLICKS can activate the clicked row directly. Cursor-based
+	* callers (the keyboard handler) pass `cursor`.
+	*/
+	const activateRowAt = useCallback((index) => {
+		if (isCategoryTab(activeTab)) {
+			const it = filteredByCategory[activeTab][index];
+			if (!it) return;
+			if (it.kind === "toggle") toggleBoolean(it.key);
+			else if (it.kind === "choice") {
+				const current = settings[it.key];
+				const idx = it.options.findIndex((o) => o.value === current);
+				const next = it.options[(idx + 1) % it.options.length];
+				if (next) setSetting(it.key, next.value);
+			} else if (it.kind === "input") setEditingInputKey(it.key);
+			else it.onPick();
+			return;
+		}
+		if (activeTab === "skills") {
+			const s = filteredSkills[index];
+			if (s) skillsToggle.toggle(s.name);
+			return;
+		}
+		if (activeTab === "extensions") {
+			const row = extensionVisibleRows[index];
+			if (!row) return;
+			if (row.kind === "extension") extensionsToggle.toggle(row.ext.name);
+			else if (row.kind === "config") activateConfigRow(row.extName, row.item);
+			return;
+		}
+		if (activeTab === "mcps") {
+			const row = mcpVisibleRows[index];
+			if (!row) return;
+			if (row.kind === "server") {
+				const name = row.entry.config.name;
+				const enabling = !mcpsToggle.enabledSet.has(name);
+				mcpsToggle.toggle(name);
+				if (enabling && (mcpToolsByServer[name]?.length ?? 0) === 0) fireMcpToolsRefresh();
+			} else if (row.kind === "tool") mcpToolToggleMap[row.serverName]?.toggle(row.tool.name);
+			return;
+		}
+		if (activeTab === "keybindings") {
+			actions?.onOpenKeybindings?.();
+			return;
+		}
+		if (activeTab === "authentication") {
+			const provider = filteredProviders[index];
+			if (provider) actions?.onConfigureProvider?.(provider);
+		}
+	}, [
+		activeTab,
+		filteredByCategory,
+		settings,
+		setSetting,
+		toggleBoolean,
+		filteredSkills,
+		skillsToggle,
+		extensionVisibleRows,
+		extensionsToggle,
+		activateConfigRow,
+		mcpVisibleRows,
+		mcpsToggle,
+		mcpToolsByServer,
+		fireMcpToolsRefresh,
+		mcpToolToggleMap,
+		actions,
+		filteredProviders
+	]);
+	/**
+	* True while an inline editor or overlay dialog owns the modal's input
+	* — the same states the keyboard handler early-returns on. Mouse paths
+	* (`clickRowAt`, tab-strip clicks) must honor it too: a click on a row
+	* or tab underneath an open dialog would otherwise toggle settings or
+	* switch tabs behind the user's back. Also drives the lists' `focused`
+	* prop, so "list looks focused" and "list accepts input" cannot drift.
+	*/
+	const modalInputCaptured = oauthPasteActive || configEditActive || editingInputKey !== null || extInstallActive || skillInstallActive || skillImportAllActive || mcpAddActive;
+	/**
+	* Row CLICK dispatch: focus the clicked row, then act on it. Expandable
+	* headers (MCP servers, extensions with config) expand/collapse — the
+	* disclosure is the row's primary affordance; everything else gets the
+	* ↵ semantics (toggle / cycle / edit / action). Rows stay single
+	* renderables (the MCP list documents an OpenTUI layout regression that
+	* forbids box wrappers there), so the whole row is one click target —
+	* the enable checkbox on expandable headers remains ↵.
+	*/
+	/**
+	* Row CLICK dispatch, by ZONE:
+	*
+	*   - `checkbox` — the click landed on the row's `[✓] ` cell (rows
+	*     compute this by glyph column — see `inCheckboxZone`): flip the
+	*     toggle (↵ semantics). The checkbox is a SOLO target, including
+	*     the enable checkbox on MCP server / extension header rows.
+	*   - `row` — anywhere else: expandable headers expand/collapse;
+	*     checkbox-bearing rows only FOCUS (a body click must never flip
+	*     state the user didn't aim at); rows whose whole body is one
+	*     action (choices, inputs, actions, auth) activate.
+	*/
+	const clickRowAt = useCallback((index, zone = "row") => {
+		if (modalInputCaptured) return;
+		setCursorByTab((prev) => ({
+			...prev,
+			[activeTab]: index
+		}));
+		if (zone === "checkbox") {
+			activateRowAt(index);
+			return;
+		}
+		if (activeTab === "mcps") {
+			if (mcpVisibleRows[index]?.kind === "server") toggleExpandMcpRowAt(index);
+			return;
+		}
+		if (activeTab === "extensions") {
+			const row = extensionVisibleRows[index];
+			if (row?.kind === "extension") {
+				if (row.hasConfig) toggleExpandExtensionRowAt(index);
+				return;
+			}
+			if (row?.kind === "config" && row.item.type === "boolean") return;
+			activateRowAt(index);
+			return;
+		}
+		if (activeTab === "skills") return;
+		if (isCategoryTab(activeTab) && filteredByCategory[activeTab][index]?.kind === "toggle") return;
+		activateRowAt(index);
+	}, [
+		activeTab,
+		modalInputCaptured,
+		mcpVisibleRows,
+		extensionVisibleRows,
+		filteredByCategory,
+		toggleExpandMcpRowAt,
+		toggleExpandExtensionRowAt,
+		activateRowAt
+	]);
+	/** Tab-strip clicks — same input-capture guard as row clicks. */
+	const clickTab = useCallback((id) => {
+		if (modalInputCaptured) return;
+		setActiveTab(id);
+	}, [modalInputCaptured]);
 	useKeyboard((key) => {
 		if (configEditActive) {
 			if (key.name === "escape" && configEdit?.kind !== "model") setConfigEdit(null);
@@ -14659,51 +15063,7 @@ function SettingsModal({ skillsCatalog: skillsCatalogProp, mcpsCatalog: mcpsCata
 			return;
 		}
 		if (key.name === "return") {
-			if (isCategoryTab(activeTab)) {
-				const it = filteredByCategory[activeTab][cursor];
-				if (!it) return;
-				if (it.kind === "toggle") toggleBoolean(it.key);
-				else if (it.kind === "choice") {
-					const current = settings[it.key];
-					const idx = it.options.findIndex((o) => o.value === current);
-					const next = it.options[(idx + 1) % it.options.length];
-					if (next) setSetting(it.key, next.value);
-				} else if (it.kind === "input") setEditingInputKey(it.key);
-				else it.onPick();
-				return;
-			}
-			if (activeTab === "skills") {
-				const s = filteredSkills[cursor];
-				if (s) skillsToggle.toggle(s.name);
-				return;
-			}
-			if (activeTab === "extensions") {
-				const row = extensionVisibleRows[cursor];
-				if (!row) return;
-				if (row.kind === "extension") extensionsToggle.toggle(row.ext.name);
-				else if (row.kind === "config") activateConfigRow(row.extName, row.item);
-				return;
-			}
-			if (activeTab === "mcps") {
-				const row = mcpVisibleRows[cursor];
-				if (!row) return;
-				if (row.kind === "server") {
-					const name = row.entry.config.name;
-					const enabling = !mcpsToggle.enabledSet.has(name);
-					mcpsToggle.toggle(name);
-					if (enabling && (mcpToolsByServer[name]?.length ?? 0) === 0) fireMcpToolsRefresh();
-				} else if (row.kind === "tool") mcpToolToggleMap[row.serverName]?.toggle(row.tool.name);
-				return;
-			}
-			if (activeTab === "keybindings") {
-				actions?.onOpenKeybindings?.();
-				return;
-			}
-			if (activeTab === "authentication") {
-				const provider = filteredProviders[cursor];
-				if (provider) actions?.onConfigureProvider?.(provider);
-				return;
-			}
+			activateRowAt(cursor);
 			return;
 		}
 		if (activeTab === "extensions") {
@@ -14908,7 +15268,8 @@ function SettingsModal({ skillsCatalog: skillsCatalogProp, mcpsCatalog: mcpsCata
 				children: /* @__PURE__ */ jsx$1(TabStrip, {
 					order: tabOrder,
 					active: activeTab,
-					counts: tabCounts
+					counts: tabCounts,
+					onSelect: clickTab
 				})
 			}),
 			/* @__PURE__ */ jsx$1("box", {
@@ -14922,7 +15283,7 @@ function SettingsModal({ skillsCatalog: skillsCatalogProp, mcpsCatalog: mcpsCata
 				},
 				children: /* @__PURE__ */ jsx$1("input", {
 					ref: inputRef,
-					focused: !oauthPasteActive && !configEditActive && !editingInputKey && !extInstallActive && !skillInstallActive && !skillImportAllActive && !mcpAddActive,
+					focused: !modalInputCaptured,
 					placeholder: searchPlaceholder(activeTab),
 					onInput: handleQueryChange,
 					onSubmit: () => {},
@@ -14941,6 +15302,7 @@ function SettingsModal({ skillsCatalog: skillsCatalogProp, mcpsCatalog: mcpsCata
 				viewportCulling: false,
 				children: [
 					isCategoryTab(activeTab) && /* @__PURE__ */ jsx$1(GeneralList, {
+						onRowClick: clickRowAt,
 						items: filteredByCategory[activeTab],
 						cursor,
 						highlightBg: SURFACE.selection,
@@ -14949,6 +15311,7 @@ function SettingsModal({ skillsCatalog: skillsCatalogProp, mcpsCatalog: mcpsCata
 						editingKey: editingInputKey
 					}),
 					activeTab === "skills" && /* @__PURE__ */ jsx$1(SkillsList, {
+						onRowClick: clickRowAt,
 						items: filteredSkills,
 						enabledSet: skillsToggle.enabledSet,
 						totalCount: skillsCatalog.length,
@@ -14958,6 +15321,7 @@ function SettingsModal({ skillsCatalog: skillsCatalogProp, mcpsCatalog: mcpsCata
 						contentCols
 					}),
 					activeTab === "extensions" && /* @__PURE__ */ jsx$1(ExtensionsList, {
+						onRowClick: clickRowAt,
 						rows: extensionVisibleRows,
 						enabledSet: extensionsToggle.enabledSet,
 						extensionConfig: settings.extensionConfig,
@@ -14977,6 +15341,7 @@ function SettingsModal({ skillsCatalog: skillsCatalogProp, mcpsCatalog: mcpsCata
 						actionProbes
 					}),
 					activeTab === "mcps" && /* @__PURE__ */ jsx$1(McpsList, {
+						onRowClick: clickRowAt,
 						rows: mcpVisibleRows,
 						filteredCount: filteredMcps.length,
 						enabledSet: mcpsToggle.enabledSet,
@@ -15183,9 +15548,10 @@ function SettingsModal({ skillsCatalog: skillsCatalogProp, mcpsCatalog: mcpsCata
 		]
 	});
 }
-function TabStrip({ order, active, counts }) {
+function TabStrip({ order, active, counts, onSelect }) {
 	const COLOR = useColors();
 	const SURFACE = useSurfaces();
+	const [hoveredTab, setHoveredTab] = useState(null);
 	return /* @__PURE__ */ jsx$1("box", {
 		style: {
 			flexDirection: "row",
@@ -15193,11 +15559,19 @@ function TabStrip({ order, active, counts }) {
 		},
 		children: order.map((id, i) => {
 			const isActive = id === active;
+			const hovered = hoveredTab === id && !isActive;
 			const label = TAB_LABELS[id];
 			const tabCounts = counts[id];
 			const showBadge = !!tabCounts;
 			const badge = tabCounts ? tabCounts.current !== tabCounts.total ? `${tabCounts.current}/${tabCounts.total}` : `${tabCounts.total}` : "";
 			return /* @__PURE__ */ jsx$1("box", {
+				onMouseDown: (event) => {
+					event.stopPropagation();
+					event.preventDefault();
+					onSelect(id);
+				},
+				onMouseOver: () => setHoveredTab(id),
+				onMouseOut: () => setHoveredTab((current) => current === id ? null : current),
 				style: {
 					paddingLeft: 1,
 					paddingRight: 1,
@@ -15207,10 +15581,10 @@ function TabStrip({ order, active, counts }) {
 				children: /* @__PURE__ */ jsxs("text", {
 					wrapMode: "none",
 					children: [/* @__PURE__ */ jsx$1("span", {
-						fg: isActive ? COLOR.brand : COLOR.dim,
+						fg: isActive ? COLOR.brand : hovered ? COLOR.accent : COLOR.dim,
 						children: label
 					}), showBadge && /* @__PURE__ */ jsx$1("span", {
-						fg: isActive ? COLOR.brand : COLOR.mute,
+						fg: isActive ? COLOR.brand : hovered ? COLOR.accent : COLOR.mute,
 						children: `  ${badge}`
 					})]
 				})
@@ -15218,7 +15592,7 @@ function TabStrip({ order, active, counts }) {
 		})
 	});
 }
-function GeneralList({ items, cursor, highlightBg, query, contentCols, editingKey }) {
+function GeneralList({ items, cursor, highlightBg, query, contentCols, editingKey, onRowClick }) {
 	const { settings } = useSettings();
 	if (items.length === 0) return /* @__PURE__ */ jsx$1(EmptyRow, { label: query ? `no settings match "${query}"` : "no settings" });
 	const descCols = Math.max(0, contentCols - 1 - 1 - 6);
@@ -15229,6 +15603,7 @@ function GeneralList({ items, cursor, highlightBg, query, contentCols, editingKe
 			const bg = focused ? highlightBg : void 0;
 			const id = anchorIdFor(i);
 			if (item.kind === "toggle") return /* @__PURE__ */ jsx$1(ToggleRow, {
+				onClick: (zone) => onRowClick?.(i, zone),
 				id,
 				label: item.label,
 				description: truncateToCols(item.description, descCols),
@@ -15240,6 +15615,7 @@ function GeneralList({ items, cursor, highlightBg, query, contentCols, editingKe
 				const current = settings[item.key];
 				const opt = item.options.find((o) => o.value === current);
 				return /* @__PURE__ */ jsx$1(ChoiceRow, {
+					onClick: () => onRowClick?.(i),
 					id,
 					label: item.label,
 					description: truncateToCols(item.description, descCols),
@@ -15250,6 +15626,7 @@ function GeneralList({ items, cursor, highlightBg, query, contentCols, editingKe
 				}, item.key);
 			}
 			if (item.kind === "input") return /* @__PURE__ */ jsx$1(InputRow, {
+				onClick: () => onRowClick?.(i),
 				id,
 				label: item.label,
 				description: truncateToCols(item.description, descCols),
@@ -15270,7 +15647,7 @@ function GeneralList({ items, cursor, highlightBg, query, contentCols, editingKe
 	});
 }
 const EXTENSION_CONFIG_INDENT = 3;
-function ExtensionsList({ rows, enabledSet, extensionConfig, categories, totalCount, cursor, highlightBg, query, contentCols, editing, inputRef, onCommitEdit, modelCatalog, onApplyModelEdit, onCancelEdit, actionStatus, actionProbes }) {
+function ExtensionsList({ rows, enabledSet, extensionConfig, categories, totalCount, cursor, highlightBg, query, contentCols, editing, inputRef, onCommitEdit, modelCatalog, onApplyModelEdit, onCancelEdit, actionStatus, actionProbes, onRowClick }) {
 	const COLOR = useColors();
 	const home = homedir();
 	if (totalCount === 0) return /* @__PURE__ */ jsxs("box", {
@@ -15420,6 +15797,7 @@ function ExtensionsList({ rows, enabledSet, extensionConfig, categories, totalCo
 				if (item.type === "action") {
 					const status = actionStatus && actionStatus.extName === group.ext.name && actionStatus.key === item.key ? actionStatus : null;
 					childEls.push(/* @__PURE__ */ jsx$1(ConfigActionRow, {
+						onClick: () => onRowClick?.(index),
 						id: anchorIdFor(index),
 						indent: EXTENSION_CONFIG_INDENT,
 						label: item.label,
@@ -15430,6 +15808,7 @@ function ExtensionsList({ rows, enabledSet, extensionConfig, categories, totalCo
 						bg: childBg
 					}, item.key));
 				} else if (item.type === "boolean") childEls.push(/* @__PURE__ */ jsx$1(ToggleRow, {
+					onClick: (zone) => onRowClick?.(index, zone),
 					id: anchorIdFor(index),
 					indent: EXTENSION_CONFIG_INDENT,
 					label: item.label,
@@ -15441,6 +15820,7 @@ function ExtensionsList({ rows, enabledSet, extensionConfig, categories, totalCo
 				else if (item.type === "enum") {
 					const opt = item.options.find((o) => o.value === value);
 					childEls.push(/* @__PURE__ */ jsx$1(ChoiceRow, {
+						onClick: () => onRowClick?.(index),
 						id: anchorIdFor(index),
 						indent: EXTENSION_CONFIG_INDENT,
 						label: item.label,
@@ -15489,6 +15869,11 @@ function ExtensionsList({ rows, enabledSet, extensionConfig, categories, totalCo
 						id: anchorIdFor(group.index),
 						wrapMode: "none",
 						bg,
+						onMouseDown: onRowClick && ((event) => {
+							event.stopPropagation();
+							event.preventDefault();
+							onRowClick(group.index, inCheckboxZone(event, 4) ? "checkbox" : "row");
+						}),
 						children: [
 							/* @__PURE__ */ jsx$1("span", {
 								fg: focused ? COLOR.brand : COLOR.mute,
@@ -15568,11 +15953,16 @@ function CreateExtensionButton() {
 		})]
 	});
 }
-function ConfigActionRow({ id, label, description, status, probe, focused, bg, indent = 0 }) {
+function ConfigActionRow({ id, label, description, status, probe, focused, bg, indent = 0, onClick }) {
 	const COLOR = useColors();
 	const statusText = (status?.state === "busy" ? "running…" : status?.text) ?? probe?.message;
 	const statusColor = status ? status.state === "error" ? COLOR.error : status.state === "busy" ? COLOR.mute : COLOR.accent : probe ? probe.state === "error" ? COLOR.error : probe.state === "off" ? COLOR.mute : COLOR.accent : COLOR.mute;
 	return /* @__PURE__ */ jsxs("box", {
+		onMouseDown: onClick && ((event) => {
+			event.stopPropagation();
+			event.preventDefault();
+			onClick();
+		}),
 		id,
 		style: {
 			flexDirection: "column",
@@ -15745,7 +16135,7 @@ function ConfigModelPickerRow({ id, label, description, catalog, multi, initial,
 		]
 	});
 }
-function SkillsList({ items, enabledSet, totalCount, cursor, highlightBg, query, contentCols }) {
+function SkillsList({ items, enabledSet, totalCount, cursor, highlightBg, query, contentCols, onRowClick }) {
 	const COLOR = useColors();
 	if (totalCount === 0) return /* @__PURE__ */ jsxs("box", {
 		style: { flexDirection: "column" },
@@ -15790,6 +16180,11 @@ function SkillsList({ items, enabledSet, totalCount, cursor, highlightBg, query,
 			const description = truncateToCols(entry.description ?? "", descCols);
 			const origin = skillOriginLabel(entry);
 			return /* @__PURE__ */ jsxs("box", {
+				onMouseDown: onRowClick && ((event) => {
+					event.stopPropagation();
+					event.preventDefault();
+					onRowClick(i, "row");
+				}),
 				id: anchorIdFor(i),
 				style: {
 					flexDirection: "column",
@@ -15800,6 +16195,11 @@ function SkillsList({ items, enabledSet, totalCount, cursor, highlightBg, query,
 				},
 				children: [/* @__PURE__ */ jsxs("text", {
 					wrapMode: "none",
+					onMouseDown: onRowClick && ((event) => {
+						event.stopPropagation();
+						event.preventDefault();
+						onRowClick(i, inCheckboxZone(event, 2) ? "checkbox" : "row");
+					}),
 					children: [
 						/* @__PURE__ */ jsx$1("span", {
 							fg: focused ? COLOR.brand : COLOR.mute,
@@ -15827,7 +16227,7 @@ function SkillsList({ items, enabledSet, totalCount, cursor, highlightBg, query,
 		})
 	});
 }
-function McpsList({ rows, filteredCount, enabledSet, toolToggleMap, toolsByServer, toolsRefreshing, expanded, totalCount, cursor, highlightBg, query, errors, authState, contentCols }) {
+function McpsList({ rows, filteredCount, enabledSet, toolToggleMap, toolsByServer, toolsRefreshing, expanded, totalCount, cursor, highlightBg, query, errors, authState, contentCols, onRowClick }) {
 	const COLOR = useColors();
 	const home = homedir();
 	if (totalCount === 0) return /* @__PURE__ */ jsxs("box", {
@@ -15897,6 +16297,7 @@ function McpsList({ rows, filteredCount, enabledSet, toolToggleMap, toolsByServe
 		children: [renderMcpErrors(errors, home, COLOR.warn, COLOR.dim), groups.map((group) => /* @__PURE__ */ jsxs("box", {
 			style: { flexDirection: "column" },
 			children: [renderServerListRow({
+				onClick: onRowClick ? (zone) => onRowClick(group.serverIndex, zone) : void 0,
 				entry: group.server.entry,
 				focused: group.serverIndex === cursor,
 				bg: group.serverIndex === cursor ? highlightBg : void 0,
@@ -15912,6 +16313,7 @@ function McpsList({ rows, filteredCount, enabledSet, toolToggleMap, toolsByServe
 				const focused = index === cursor;
 				const bg = focused ? highlightBg : void 0;
 				if (row.kind === "tool") return renderToolListRow({
+					onClick: onRowClick ? (zone) => onRowClick(index, zone) : void 0,
 					serverName: row.serverName,
 					tool: row.tool,
 					focused,
@@ -15933,7 +16335,7 @@ function McpsList({ rows, filteredCount, enabledSet, toolToggleMap, toolsByServe
 		}, `group:${group.server.entry.config.name}`))]
 	});
 }
-function renderServerListRow({ entry, focused, bg, enabled, expanded, toolEnabledSet, toolTotal, anchorId, status, COLOR, contentCols }) {
+function renderServerListRow({ onClick, 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})` : "";
@@ -15944,6 +16346,11 @@ function renderServerListRow({ entry, focused, bg, enabled, expanded, toolEnable
 		id: anchorId,
 		wrapMode: "none",
 		bg,
+		onMouseDown: onClick && ((event) => {
+			event.stopPropagation();
+			event.preventDefault();
+			onClick(inCheckboxZone(event, 4) ? "checkbox" : "row");
+		}),
 		children: [
 			/* @__PURE__ */ jsx$1("span", {
 				fg: focused ? COLOR.brand : COLOR.mute,
@@ -15975,13 +16382,18 @@ function renderServerListRow({ entry, focused, bg, enabled, expanded, toolEnable
 }
 const TOOL_ROW_INDENT$1 = "      ";
 const TOOL_ROW_FOCUS_INDENT$1 = "    ▶ ";
-function renderToolListRow({ serverName, tool, focused, bg, enabled, anchorId, COLOR, contentCols }) {
+function renderToolListRow({ onClick, 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,
+		onMouseDown: onClick && ((event) => {
+			event.stopPropagation();
+			event.preventDefault();
+			onClick(inCheckboxZone(event, 6) ? "checkbox" : "row");
+		}),
 		children: [
 			/* @__PURE__ */ jsx$1("span", {
 				fg: focused ? COLOR.brand : COLOR.mute,
@@ -16204,9 +16616,14 @@ function AuthenticationList({ view, providers, cursor, highlightBg, query }) {
 		]
 	});
 }
-function ToggleRow({ id, label, description, enabled, focused, bg, indent = 0 }) {
+function ToggleRow({ id, label, description, enabled, focused, bg, indent = 0, onClick }) {
 	const COLOR = useColors();
 	return /* @__PURE__ */ jsxs("box", {
+		onMouseDown: onClick && ((event) => {
+			event.stopPropagation();
+			event.preventDefault();
+			onClick("row");
+		}),
 		id,
 		style: {
 			flexDirection: "column",
@@ -16217,6 +16634,11 @@ function ToggleRow({ id, label, description, enabled, focused, bg, indent = 0 })
 		},
 		children: [/* @__PURE__ */ jsxs("text", {
 			wrapMode: "none",
+			onMouseDown: onClick && ((event) => {
+				event.stopPropagation();
+				event.preventDefault();
+				onClick(inCheckboxZone(event, 2) ? "checkbox" : "row");
+			}),
 			children: [
 				/* @__PURE__ */ jsx$1("span", {
 					fg: focused ? COLOR.brand : COLOR.mute,
@@ -16238,9 +16660,14 @@ function ToggleRow({ id, label, description, enabled, focused, bg, indent = 0 })
 		})]
 	});
 }
-function ChoiceRow({ id, label, description, value, cyclable, focused, bg, indent = 0 }) {
+function ChoiceRow({ id, label, description, value, cyclable, focused, bg, indent = 0, onClick }) {
 	const COLOR = useColors();
 	return /* @__PURE__ */ jsxs("box", {
+		onMouseDown: onClick && ((event) => {
+			event.stopPropagation();
+			event.preventDefault();
+			onClick();
+		}),
 		id,
 		style: {
 			flexDirection: "column",
@@ -16284,9 +16711,14 @@ function ChoiceRow({ id, label, description, value, cyclable, focused, bg, inden
 		})]
 	});
 }
-function ActionRow$1({ id, label, description, focused, bg }) {
+function ActionRow$1({ id, label, description, focused, bg, onClick }) {
 	const COLOR = useColors();
 	return /* @__PURE__ */ jsxs("box", {
+		onMouseDown: onClick && ((event) => {
+			event.stopPropagation();
+			event.preventDefault();
+			onClick();
+		}),
 		id,
 		style: {
 			flexDirection: "column",
@@ -16322,10 +16754,15 @@ function ActionRow$1({ id, label, description, focused, bg }) {
 		})]
 	});
 }
-function InputRow({ id, label, description, value, placeholder, editing, focused, bg }) {
+function InputRow({ id, label, description, value, placeholder, editing, focused, bg, onClick }) {
 	const COLOR = useColors();
 	const hasValue = value.length > 0;
 	return /* @__PURE__ */ jsxs("box", {
+		onMouseDown: onClick && ((event) => {
+			event.stopPropagation();
+			event.preventDefault();
+			onClick();
+		}),
 		id,
 		style: {
 			flexDirection: "column",
@@ -16508,155 +16945,89 @@ function Hints({ activeTab, focusedMcp, focusedMcpRow, focusedMcpStatus, canRefr
 	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", {
-		fg: COLOR.mute,
-		children: [
-			/* @__PURE__ */ jsx$1("span", {
-				fg: COLOR.warn,
-				children: "←→"
-			}),
-			" tabs · ",
-			/* @__PURE__ */ jsx$1("span", {
-				fg: COLOR.warn,
-				children: "↑↓"
-			}),
-			activeTab === "keybindings" || activeTab === "logs" ? " scroll · " : " navigate · ",
-			activeTab === "logs" ? /* @__PURE__ */ jsxs(Fragment, { children: [/* @__PURE__ */ jsx$1("span", {
-				fg: COLOR.warn,
-				children: "ctrl+l"
-			}), " level · type to filter"] }) : /* @__PURE__ */ jsxs(Fragment, { children: [/* @__PURE__ */ jsx$1("span", {
-				fg: COLOR.warn,
-				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$1("span", {
-					fg: COLOR.warn,
-					children: "tab"
-				}),
-				focusedMcpRow.kind === "server" ? " expand/collapse" : " collapse"
-			] }),
-			activeTab === "extensions" && focusedExtensionExpandable && /* @__PURE__ */ jsxs("span", { children: [
-				" · ",
-				/* @__PURE__ */ jsx$1("span", {
-					fg: COLOR.warn,
-					children: "tab"
-				}),
-				" settings"
-			] }),
-			activeTab === "extensions" && canEditExtension && /* @__PURE__ */ jsxs("span", { children: [
-				" · ",
-				/* @__PURE__ */ jsx$1("span", {
-					fg: COLOR.warn,
-					children: "ctrl+e"
-				}),
-				" edit"
-			] }),
-			activeTab === "extensions" && canCreateExtension && /* @__PURE__ */ jsxs("span", { children: [
-				" · ",
-				/* @__PURE__ */ jsx$1("span", {
-					fg: COLOR.warn,
-					children: "ctrl+a"
-				}),
-				" create"
-			] }),
-			activeTab === "extensions" && canUpdateExtension && /* @__PURE__ */ jsxs("span", { children: [
-				" · ",
-				/* @__PURE__ */ jsx$1("span", {
-					fg: COLOR.warn,
-					children: "ctrl+u"
-				}),
-				" update"
-			] }),
-			activeTab === "extensions" && canRemoveExtension && /* @__PURE__ */ jsxs("span", { children: [
-				" · ",
-				/* @__PURE__ */ jsx$1("span", {
-					fg: COLOR.warn,
-					children: "ctrl+x"
-				}),
-				" remove"
-			] }),
-			activeTab === "extensions" && canInstallExtension && /* @__PURE__ */ jsxs("span", { children: [
-				" · ",
-				/* @__PURE__ */ jsx$1("span", {
-					fg: COLOR.warn,
-					children: "ctrl+g"
-				}),
-				" install"
-			] }),
-			activeTab === "skills" && canInstallSkill && /* @__PURE__ */ jsxs("span", { children: [
-				" · ",
-				/* @__PURE__ */ jsx$1("span", {
-					fg: COLOR.warn,
-					children: "ctrl+g"
-				}),
-				" install"
-			] }),
-			activeTab === "skills" && canRemoveSkill && /* @__PURE__ */ jsxs("span", { children: [
-				" · ",
-				/* @__PURE__ */ jsx$1("span", {
-					fg: COLOR.warn,
-					children: "ctrl+x"
-				}),
-				" delete"
-			] }),
-			activeTab === "mcps" && canAddMcp && /* @__PURE__ */ jsxs("span", { children: [
-				" · ",
-				/* @__PURE__ */ jsx$1("span", {
-					fg: COLOR.warn,
-					children: "ctrl+g"
-				}),
-				" add server"
-			] }),
-			activeTab === "mcps" && canRemoveMcp && onServerRow && /* @__PURE__ */ jsxs("span", { children: [
-				" · ",
-				/* @__PURE__ */ jsx$1("span", {
-					fg: COLOR.warn,
-					children: "ctrl+x"
-				}),
-				" remove"
-			] }),
-			showLogin && /* @__PURE__ */ jsxs("span", { children: [
-				" · ",
-				/* @__PURE__ */ jsx$1("span", {
-					fg: COLOR.warn,
-					children: "ctrl+L"
-				}),
-				" login"
-			] }),
-			showLogout && /* @__PURE__ */ jsxs("span", { children: [
-				" · ",
-				/* @__PURE__ */ jsx$1("span", {
-					fg: COLOR.warn,
-					children: "ctrl+O"
-				}),
-				" logout"
-			] }),
-			showRefresh && /* @__PURE__ */ jsxs("span", { children: [
-				" · ",
-				/* @__PURE__ */ jsx$1("span", {
-					fg: COLOR.warn,
-					children: "ctrl+r"
-				}),
-				" refresh"
-			] }),
-			showCancel ? /* @__PURE__ */ jsxs("span", { children: [
-				" · ",
-				/* @__PURE__ */ jsx$1("span", {
-					fg: COLOR.warn,
-					children: "esc"
-				}),
-				" cancel"
-			] }) : /* @__PURE__ */ jsxs("span", { children: [
-				" · ",
-				/* @__PURE__ */ jsx$1("span", {
-					fg: COLOR.warn,
-					children: "esc"
-				}),
-				" close"
-			] })
-		]
-	});
+	return /* @__PURE__ */ jsx$1(HintRow, { hints: [
+		{
+			key: "←→",
+			label: "tabs"
+		},
+		{
+			key: "↑↓",
+			label: activeTab === "keybindings" || activeTab === "logs" ? "scroll" : "navigate"
+		},
+		...activeTab === "logs" ? [{
+			key: "ctrl+l",
+			label: "level"
+		}, {
+			key: "",
+			label: "type to filter"
+		}] : [{
+			key: "↵",
+			label: isCategoryTab(activeTab) ? "toggle/cycle/select" : activeTab === "keybindings" ? "edit file" : activeTab === "authentication" ? "switch / re-authenticate" : "toggle"
+		}],
+		...activeTab === "mcps" && focusedMcpRow ? [{
+			key: "tab",
+			label: focusedMcpRow.kind === "server" ? "expand/collapse" : "collapse"
+		}] : [],
+		...activeTab === "extensions" && focusedExtensionExpandable ? [{
+			key: "tab",
+			label: "settings"
+		}] : [],
+		...activeTab === "extensions" && canEditExtension ? [{
+			key: "ctrl+e",
+			label: "edit"
+		}] : [],
+		...activeTab === "extensions" && canCreateExtension ? [{
+			key: "ctrl+a",
+			label: "create"
+		}] : [],
+		...activeTab === "extensions" && canUpdateExtension ? [{
+			key: "ctrl+u",
+			label: "update"
+		}] : [],
+		...activeTab === "extensions" && canRemoveExtension ? [{
+			key: "ctrl+x",
+			label: "remove"
+		}] : [],
+		...activeTab === "extensions" && canInstallExtension ? [{
+			key: "ctrl+g",
+			label: "install"
+		}] : [],
+		...activeTab === "skills" && canInstallSkill ? [{
+			key: "ctrl+g",
+			label: "install"
+		}] : [],
+		...activeTab === "skills" && canRemoveSkill ? [{
+			key: "ctrl+x",
+			label: "delete"
+		}] : [],
+		...activeTab === "mcps" && canAddMcp ? [{
+			key: "ctrl+g",
+			label: "add server"
+		}] : [],
+		...activeTab === "mcps" && canRemoveMcp && onServerRow ? [{
+			key: "ctrl+x",
+			label: "remove"
+		}] : [],
+		...showLogin ? [{
+			key: "ctrl+L",
+			label: "login"
+		}] : [],
+		...showLogout ? [{
+			key: "ctrl+O",
+			label: "logout"
+		}] : [],
+		...showRefresh ? [{
+			key: "ctrl+r",
+			label: "refresh"
+		}] : [],
+		{
+			key: "esc",
+			label: showCancel ? "cancel" : "close"
+		}
+	].map((h) => ({
+		...h,
+		labelColor: COLOR.mute
+	})) });
 }
 function generalCorpus(item) {
 	const parts = [item.label, item.description];
@@ -16796,7 +17167,10 @@ function composeTerminalTitle(opts) {
 * bring it back later. No-op when `out` isn't a TTY.
 */
 function saveTerminalTitle(out = process.stdout) {
-	if (out.isTTY) out.write(TITLE_STACK_PUSH);
+	if (!out.isTTY) return;
+	try {
+		out.write(TITLE_STACK_PUSH);
+	} catch {}
 }
 /**
 * Clear our title and pop the previously-saved one. No-op when `out`
@@ -16804,7 +17178,10 @@ function saveTerminalTitle(out = process.stdout) {
 * otherwise the clear would wipe a title zidane never set.
 */
 function restoreTerminalTitle(out = process.stdout) {
-	if (out.isTTY) out.write(TITLE_STACK_RESTORE);
+	if (!out.isTTY) return;
+	try {
+		out.write(TITLE_STACK_RESTORE);
+	} catch {}
 }
 //#endregion
 //#region src/tui/todos-modal.tsx
@@ -18258,6 +18635,22 @@ function AppShell() {
 	*/
 	const [compacting, setCompacting] = useState(false);
 	/**
+	* Live provider-retry indicator — set by `stream:retry` (and the bubbled
+	* `child:stream:retry`, since a stalled subagent stalls the pipeline the
+	* user is watching), cleared when the SAME source streams output again
+	* or the run ends. Keyed by source (`'parent'` / childId) so a parallel
+	* batch can't hide one child's still-active backoff behind a sibling's
+	* output — the motivating /review case runs many children at once.
+	* Drives the footer's `Retrying (n/max)` status; last retry wins the
+	* single slot.
+	*/
+	const [retryInfo, setRetryInfo] = useState(null);
+	/** Source-scoped functional clear — bails re-render when nothing matches (hot path: every stream delta). */
+	const clearRetryInfo = useCallback((source) => setRetryInfo((prev) => prev !== null && prev.source === source ? null : prev), []);
+	useEffect(() => {
+		if (!busy) setRetryInfo((prev) => prev === null ? prev : null);
+	}, [busy]);
+	/**
 	* Rough token estimate of the in-flight compaction summary, painted
 	* next to the footer's "Compacting…" label (`null` = no live estimate
 	* yet). Fed by the loop's throttled `compact:progress` hook and the
@@ -19181,8 +19574,26 @@ function AppShell() {
 			});
 			if (pendingAutoLoginMcpRef.current === name) pendingAutoLoginMcpRef.current = null;
 		});
-		agent.hooks.hook("stream:thinking", ({ delta, turnId }) => stream.queueStreamDelta("thinking", delta, { turnId }));
-		agent.hooks.hook("stream:text", ({ delta, turnId }) => stream.queueStreamDelta("markdown", delta, { turnId }));
+		agent.hooks.hook("stream:thinking", ({ delta, turnId }) => {
+			clearRetryInfo("parent");
+			stream.queueStreamDelta("thinking", delta, { turnId });
+		});
+		agent.hooks.hook("stream:text", ({ delta, turnId }) => {
+			clearRetryInfo("parent");
+			stream.queueStreamDelta("markdown", delta, { turnId });
+		});
+		agent.hooks.hook("stream:retry", ({ nextAttempt, maxAttempts }) => setRetryInfo({
+			attempt: nextAttempt,
+			max: maxAttempts,
+			source: "parent"
+		}));
+		agent.hooks.hook("child:stream:retry", ({ nextAttempt, maxAttempts, childId }) => setRetryInfo({
+			attempt: nextAttempt,
+			max: maxAttempts,
+			source: childId
+		}));
+		agent.hooks.hook("stream:error", () => clearRetryInfo("parent"));
+		agent.hooks.hook("child:stream:error", ({ childId }) => clearRetryInfo(childId));
 		agent.hooks.hook("stream:server_tool_use", ({ id, name, input, turnId }) => {
 			stream.appendImmediate({
 				kind: "tool",
@@ -19432,6 +19843,7 @@ function AppShell() {
 			});
 		});
 		agent.hooks.hook("child:stream:thinking", ({ delta, childId, depth, turnId }) => {
+			clearRetryInfo(childId);
 			stream.queueStreamDelta("thinking", delta, {
 				childId,
 				depth,
@@ -19439,6 +19851,7 @@ function AppShell() {
 			});
 		});
 		agent.hooks.hook("child:stream:text", ({ delta, childId, depth, turnId }) => {
+			clearRetryInfo(childId);
 			stream.queueStreamDelta("markdown", delta, {
 				childId,
 				depth,
@@ -21539,9 +21952,10 @@ function AppShell() {
 	]);
 	onLoginMcpRef.current = onLoginMcp;
 	const onLogoutMcp = useCallback((name) => {
+		const hadTokens = !!mcpCredentialStore.load(name)?.tokens;
 		mcpCredentialStore.delete(name);
 		const entry = mcpsCatalogRef.current.find((d) => d.config.name === name);
-		dispatchAuth(entry?.config.auth === "oauth" ? {
+		dispatchAuth(entry?.config.auth === "oauth" || hadTokens ? {
 			type: "auth-required",
 			name,
 			reason: "no-tokens"
@@ -22655,9 +23069,10 @@ function AppShell() {
 				hints,
 				context: contextUsage,
 				cost: footerCost,
-				status: transcriptSearchMode && transcriptSearchSearching ? "searching" : pendingInteraction?.kind === "question" ? "asking" : compacting ? "compacting" : busy ? "busy" : null,
+				status: transcriptSearchMode && transcriptSearchSearching ? "searching" : pendingInteraction?.kind === "question" ? "asking" : compacting ? "compacting" : retryInfo && busy ? "retrying" : busy ? "busy" : null,
 				compactionTokens,
-				compactionStartedAt
+				compactionStartedAt,
+				retry: retryInfo
 			}),
 			showQuitConfirm && /* @__PURE__ */ jsxs("box", {
 				position: "absolute",
@@ -22679,12 +23094,24 @@ function AppShell() {
 					gap: 2,
 					children: [/* @__PURE__ */ jsx$1("box", {
 						backgroundColor: quitConfirmSelected === "cancel" ? COLOR.accent : void 0,
+						onMouseDown: (event) => {
+							event.stopPropagation();
+							event.preventDefault();
+							if (quitConfirmSelectedRef.current === "cancel") setShowQuitConfirm(false);
+							else setQuitConfirmSelected("cancel");
+						},
 						children: /* @__PURE__ */ jsx$1("text", {
 							fg: quitConfirmSelected === "cancel" ? SURFACE.modal : COLOR.dim,
 							children: " Cancel "
 						})
 					}), /* @__PURE__ */ jsx$1("box", {
 						backgroundColor: quitConfirmSelected === "quit" ? COLOR.warn : void 0,
+						onMouseDown: (event) => {
+							event.stopPropagation();
+							event.preventDefault();
+							if (quitConfirmSelectedRef.current === "quit") renderer.destroy();
+							else setQuitConfirmSelected("quit");
+						},
 						children: /* @__PURE__ */ jsx$1("text", {
 							fg: quitConfirmSelected === "quit" ? SURFACE.modal : COLOR.dim,
 							children: " Quit "