zidane 6.2.23 → 6.2.26

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, Bn as pruneTodosByRun, 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-CnmxZ8QR.js";
+import { B as createExtensionPromptBridge, Bt as KEYBINDING_KEY_COL_WIDTH, Ct as tailTruncate, Dt as createModelSearchTool, F as summaryToTurn, Gt as matchesBinding, Ht as formatBindingForDisplay, J as updateInstalledExtension, S as compactConversation, Tt as looksBinary, U as installExtensionFromSpec, Ut as groupBindings, V as ExtensionInstallError, Vt as ensureKeybindingsFile, Wt as keybindingsPath, X as registerExtensionHostModules, Xt as resolveExtensionKeybindings, Y as createExtensionHud, Z as discoverAndBuildExtensionRegistry, _ as resolveTasksDir, at as createExtensionHostRuntimeBridge, b as selectFilesFromSession, c as applyCompactSummaryCutoff, dn as resolveExtensionConfigValue, et as composeExtensionPreset, f as cleanupPersistedSession, fn as sanitizeExtensionConfigActionPatch, g as resolvePersistDir, gn as effectiveContextWindow, gt as isSpawnTool, h as resolveMcpWarningsDir, hn as OUTPUT_RESERVE_TOKENS, in as scanExtensionDirectories, it as partitionExtensionCatalog, m as rehomePersistedStubs, nt as filterExtensionRegistry, q as removeInstalledExtension, rn as parseExtensionScanPathEnv, sn as coerceExtensionConfigInput, t as createAgent, tn as inlineLoadedExtension, tt as disposeExtensionRegistry, ut as basic_default, v as buildPostCompactAttachments } from "./agent--VPMZ0nT.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 { n as appendCapped } from "./output-cap-DM1HrgIp.js";
+import { i as killProcessGroup, n as SUPPORTS_PROCESS_GROUPS, r as createProcessContext } from "./contexts-0rmrBhTK.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 { 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-CbcdZpfC.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 { 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 { 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-afiadwf0.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, w as renderDefaultCallbackPage } from "./auth-DIT_DMwa.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-4tnvKwfJ.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";
@@ -198,33 +198,70 @@ function claudeProjectSlug(path) {
 * `projectRoot` is derived.
 */
 function listClaudeSessionFiles(opts = {}) {
+	const out = [];
+	walkClaudeSessionFiles(opts, opts.allProjects ? (file) => out.push(file) : (file, scoped) => {
+		if (scoped()) out.push(file);
+	});
+	return out;
+}
+/**
+* Detection-preview counts — scoped and all-projects figures from ONE
+* directory walk (the naive two-listing approach reads every project dir
+* twice). The scoped classification (with its per-file cwd peek for
+* candidate dirs) runs at most once per file via the lazy `scoped()`
+* thunk.
+*/
+function countClaudeSessionFiles(opts = {}) {
+	let project = 0;
+	let all = 0;
+	walkClaudeSessionFiles({
+		...opts,
+		allProjects: false
+	}, (_file, scoped) => {
+		all++;
+		if (scoped()) project++;
+	}, true);
+	return {
+		project,
+		all
+	};
+}
+/**
+* Shared walk under `~/.claude/projects`. `visit` receives every
+* transcript of every CANDIDATE dir (scoped mode) or every dir
+* (`allProjects` / `visitAllDirs`), plus a lazy `scoped()` thunk that
+* answers "does this file belong to the current project?" — lazy because
+* the answer can cost a `transcriptProjectRoot` peek (up to the whole
+* file), which pure all-projects listings never need.
+*/
+function walkClaudeSessionFiles(opts, visit, visitAllDirs = false) {
 	const { projectRoot, home } = roots(opts);
 	const projectsDir = resolve(home, ".claude/projects");
-	if (!existsSync(projectsDir)) return [];
+	if (!existsSync(projectsDir)) return;
 	const slugs = [claudeProjectSlug(projectRoot), claudeProjectSlug(realpathOr(projectRoot))];
 	const exact = new Set(slugs);
 	const prefixes = [...new Set(slugs.map((s) => `${s}-`))];
 	const wantedRoots = /* @__PURE__ */ new Set([projectRoot, realpathOr(projectRoot)]);
-	const out = [];
 	for (const entry of readdirSync(projectsDir, { withFileTypes: true })) {
 		if (!entry.isDirectory()) continue;
 		const exactMatch = exact.has(entry.name);
-		if (!opts.allProjects && !exactMatch && !prefixes.some((p) => entry.name.startsWith(p))) continue;
+		const candidate = exactMatch || prefixes.some((p) => entry.name.startsWith(p));
+		if (!opts.allProjects && !visitAllDirs && !candidate) continue;
 		const projectDir = join(projectsDir, entry.name);
 		for (const file of readdirSync(projectDir)) {
 			if (!file.endsWith(".jsonl")) continue;
 			const path = join(projectDir, file);
-			if (!opts.allProjects) {
+			const scoped = () => {
+				if (!candidate) return false;
 				const root = transcriptProjectRoot(path);
-				if (root === null ? !exactMatch : !(wantedRoots.has(root) || wantedRoots.has(realpathOr(root)))) continue;
-			}
-			out.push({
+				return root === null ? exactMatch : wantedRoots.has(root) || wantedRoots.has(realpathOr(root));
+			};
+			visit({
 				path,
 				projectDir
-			});
+			}, scoped);
 		}
 	}
-	return out;
 }
 /**
 * Peek a transcript's project root: scan the first chunk for the first
@@ -363,7 +400,7 @@ function convertClaudeSession(jsonl, opts = {}) {
 		});
 	}
 	if (turns.length === 0) return null;
-	const id = claudeSessionId ?? opts.fallbackId ?? crypto.randomUUID();
+	const id = opts.fallbackId ?? claudeSessionId ?? crypto.randomUUID();
 	const projectRoot = cwd ? findGitRoot(cwd) ?? cwd : void 0;
 	return {
 		session: {
@@ -375,7 +412,8 @@ function convertClaudeSession(jsonl, opts = {}) {
 			metadata: {
 				...title ? { title } : {},
 				importedFrom: "claude-code",
-				claudeSessionId: id
+				claudeSessionId: id,
+				...claudeSessionId && claudeSessionId !== id ? { claudeLineageId: claudeSessionId } : {}
 			},
 			createdAt: turns[0].createdAt,
 			updatedAt: turns[turns.length - 1].createdAt
@@ -483,13 +521,14 @@ 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") });
-		if (!converted) {
-			result.empty++;
+		const fallbackId = basename(file.path, ".jsonl");
+		if (await store.load(fallbackId)) {
+			result.skipped++;
 			continue;
 		}
-		if (await store.load(converted.session.id)) {
-			result.skipped++;
+		const converted = convertClaudeSession(readFileSync(file.path, "utf8"), { fallbackId });
+		if (!converted) {
+			result.empty++;
 			continue;
 		}
 		await store.save(converted.session);
@@ -519,7 +558,8 @@ function importClaudeMcps(opts = {}) {
 	const result = {
 		copied: [],
 		skipped: [],
-		failed: []
+		failed: [],
+		duplicates: []
 	};
 	const nativeNames = /* @__PURE__ */ new Set();
 	for (const candidate of defaultMcpsConfigPaths({
@@ -562,7 +602,10 @@ function importClaudeMcps(opts = {}) {
 	}
 	const seen = /* @__PURE__ */ new Set();
 	for (const { servers, scope } of sources) for (const server of servers) {
-		if (seen.has(server.name)) continue;
+		if (seen.has(server.name)) {
+			result.duplicates.push(server.name);
+			continue;
+		}
 		seen.add(server.name);
 		if (nativeNames.has(server.name)) {
 			result.skipped.push(server.name);
@@ -679,13 +722,28 @@ async function importFromClaudeCode(store, opts = {}) {
 	if (opts.skills !== false) summary.skills = importClaudeSkills(opts);
 	return summary;
 }
+/**
+* Per-catalog fzf instance, keyed on catalog reference identity —
+* `suggest()` runs per keystroke and `new Fzf(...)` walks the whole
+* command list to build its match structures. The getter returns a
+* stable array until a registry rebuild swaps it.
+*/
+const fzfByCatalog = /* @__PURE__ */ new WeakMap();
+function fzfFor(catalog) {
+	let fzf = fzfByCatalog.get(catalog);
+	if (!fzf) {
+		fzf = new Fzf(catalog, {
+			selector: (c) => c.name,
+			casing: "case-insensitive"
+		});
+		fzfByCatalog.set(catalog, fzf);
+	}
+	return fzf;
+}
 /** Filter + rank commands against a query (name-priority, then description, then fuzzy on name). */
 function scoreCommands(catalog, query) {
 	const q = query.trim().toLowerCase();
-	const fuzzyHits = q.length > 0 ? new Set(new Fzf([...catalog], {
-		selector: (c) => c.name,
-		casing: "case-insensitive"
-	}).find(q).map((r) => r.item)) : null;
+	const fuzzyHits = q.length > 0 ? new Set(fzfFor(catalog).find(q).map((r) => r.item)) : null;
 	const scored = [];
 	for (const command of catalog) {
 		const name = command.name.toLowerCase();
@@ -805,12 +863,252 @@ function attachMcpWarnLog(hooks, opts) {
 	} };
 }
 //#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([
+	"✦",
+	"·",
+	"…"
+]);
+/** Mac-style modifier glyphs → word modifiers (`⌘k`, `⌘+k`, `⇧↵`, …). */
+const GLYPH_MODIFIERS = {
+	"⌘": "meta",
+	"⌃": "ctrl",
+	"⌥": "option",
+	"⇧": "shift"
+};
+/**
+* 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;
+	let first = trimmed.split("/")[0] ?? "";
+	first = first.replace(/[⌘⌃⌥⇧]/g, (glyph) => `${GLYPH_MODIFIERS[glyph]}+`).replace(/\+\+/g, "+");
+	if (first.startsWith("^") && first.length > 1) first = `ctrl+${first.slice(1)}`;
+	const segments = first.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] ?? (/^f(?:[1-9]|1[0-2])$/.test(keyPart) ? keyPart : null) ?? (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.
+*
+* CONTRACT NOTE: `processParsedKey` wraps the parsed key in a real
+* `KeyEvent`, so handlers receive the same object type as terminal
+* input — but synthesized modifier chords carry an empty
+* `sequence`/`raw` (fabricating control bytes would risk double
+* interpretation by byte-level consumers). Every handler in this app
+* discriminates on `name` + modifier flags, which is the contract this
+* dispatch guarantees; a future handler matching on non-empty
+* `sequence` for chords would see synthesized clicks differ from real
+* keystrokes.
+*/
+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: hovered ? COLOR.accent : 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: hovered ? COLOR.accent : 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)
+	});
+}
+/**
+* Modal-footer flavor of {@link HintRow}: same clickable hints, but with
+* the modal convention's mute labels (footers historically rendered as
+* `<text fg={mute}>` prose) and falsy-entry filtering so call sites can
+* express conditional hints inline:
+*
+* ```tsx
+* <ModalHints hints={[
+*   { key: '↑↓', label: 'navigate' },
+*   onRefresh && { key: 'ctrl+r', label: 'refresh' },
+*   { key: 'esc', label: 'close' },
+* ]}
+* />
+* ```
+*
+* Per-hint `keyColor`/`labelColor` overrides still win over the defaults.
+*/
+function ModalHints({ hints }) {
+	const COLOR = useColors();
+	return /* @__PURE__ */ jsx$1(HintRow, { hints: hints.filter((h) => Boolean(h)).map((h) => ({
+		labelColor: COLOR.mute,
+		...h
+	})) });
+}
+/**
+* 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/modal.tsx
 const ModalContext = createContext(null);
 function ModalRoot({ children }) {
 	const [active, setActive] = useState(null);
 	const [lockCount, setLockCount] = useState(0);
 	const [escLockCount, setEscLockCount] = useState(0);
+	const backdropRef = useRef(null);
+	const renderer = useRenderer();
 	const api = useMemo(() => ({
 		open: (node) => setActive(node),
 		close: () => setActive(null),
@@ -837,6 +1135,7 @@ function ModalRoot({ children }) {
 			},
 			children
 		}), active && /* @__PURE__ */ jsx$1("box", {
+			ref: backdropRef,
 			style: {
 				position: "absolute",
 				top: 0,
@@ -847,6 +1146,12 @@ function ModalRoot({ children }) {
 				justifyContent: "center",
 				zIndex: 100
 			},
+			onMouseDown: (event) => {
+				if (event.target !== backdropRef.current) return;
+				event.stopPropagation();
+				event.preventDefault();
+				dispatchHintKey(renderer, "esc");
+			},
 			children: active
 		})]
 	});
@@ -990,26 +1295,20 @@ function AgentPickerModal({ agents, currentAgentId, onPick }) {
 					if (option) onPick(option.value);
 				}
 			}),
-			/* @__PURE__ */ jsxs("text", {
-				fg: COLOR.mute,
-				children: [
-					/* @__PURE__ */ jsx$1("span", {
-						fg: COLOR.warn,
-						children: "↑↓"
-					}),
-					" navigate · ",
-					/* @__PURE__ */ jsx$1("span", {
-						fg: COLOR.warn,
-						children: "↵"
-					}),
-					" select · ",
-					/* @__PURE__ */ jsx$1("span", {
-						fg: COLOR.warn,
-						children: "esc"
-					}),
-					" close"
-				]
-			})
+			/* @__PURE__ */ jsx$1(ModalHints, { hints: [
+				{
+					key: "↑↓",
+					label: "navigate"
+				},
+				{
+					key: "↵",
+					label: "select"
+				},
+				{
+					key: "esc",
+					label: "close"
+				}
+			] })
 		]
 	});
 }
@@ -1217,31 +1516,28 @@ function CancelToolModal({ inFlight, onCancel, onCancelAll, onClose }) {
 				callIdColWidth,
 				childColWidth
 			}, row.callId))
-		}), /* @__PURE__ */ jsxs("text", {
-			fg: COLOR.dim,
-			children: [
-				/* @__PURE__ */ jsx$1("span", {
-					fg: COLOR.warn,
-					children: "↑↓"
-				}),
-				" navigate · ",
-				/* @__PURE__ */ jsx$1("span", {
-					fg: COLOR.warn,
-					children: "↵"
-				}),
-				" cancel selected · ",
-				/* @__PURE__ */ jsx$1("span", {
-					fg: COLOR.warn,
-					children: "a"
-				}),
-				" cancel all · ",
-				/* @__PURE__ */ jsx$1("span", {
-					fg: COLOR.warn,
-					children: "esc"
-				}),
-				" close"
-			]
-		})]
+		}), /* @__PURE__ */ jsx$1(ModalHints, { hints: [
+			{
+				key: "↑↓",
+				label: "navigate",
+				labelColor: COLOR.dim
+			},
+			{
+				key: "↵",
+				label: "cancel selected",
+				labelColor: COLOR.dim
+			},
+			{
+				key: "a",
+				label: "cancel all",
+				labelColor: COLOR.dim
+			},
+			{
+				key: "esc",
+				label: "close",
+				labelColor: COLOR.dim
+			}
+		] })]
 	});
 }
 function CancelToolRow({ row, isFocused, highlightBg, elapsedColWidth, callIdColWidth, childColWidth }) {
@@ -1354,13 +1650,7 @@ function ClaudeImportModal({ store, cwd, prefix, onDone }) {
 	const [summary, setSummary] = useState(null);
 	const [error, setError] = useState(null);
 	const runningRef = useRef(false);
-	const counts = useMemo(() => ({
-		project: listClaudeSessionFiles({ cwd }).length,
-		all: listClaudeSessionFiles({
-			cwd,
-			allProjects: true
-		}).length
-	}), [cwd]);
+	const counts = useMemo(() => countClaudeSessionFiles({ cwd }), [cwd]);
 	const rows = [
 		{
 			key: "sessions",
@@ -1415,18 +1705,19 @@ function ClaudeImportModal({ store, cwd, prefix, onDone }) {
 			await onDone?.(result);
 		} catch {}
 	};
+	/** ↵/space/click on a row: the Import row runs, every other row toggles. */
+	const activateRow = (row) => {
+		if (row.key === "run") runImport();
+		else setOptions((prev) => ({
+			...prev,
+			[row.key]: !prev[row.key]
+		}));
+	};
 	useKeyboard((key) => {
 		if (phase !== "pick") return;
 		if (key.name === "up" || key.ctrl && key.name === "p") setCursor((c) => (c - 1 + rows.length) % rows.length);
 		else if (key.name === "down" || key.ctrl && key.name === "n") setCursor((c) => (c + 1) % rows.length);
-		else if (key.name === "return" || key.name === "space") {
-			const row = rows[cursor];
-			if (row.key === "run") runImport();
-			else setOptions((prev) => ({
-				...prev,
-				[row.key]: !prev[row.key]
-			}));
-		}
+		else if (key.name === "return" || key.name === "space") activateRow(rows[cursor]);
 	});
 	if (phase === "running") return /* @__PURE__ */ jsx$1(Modal, {
 		title: "Import from Claude Code",
@@ -1453,26 +1744,35 @@ function ClaudeImportModal({ store, cwd, prefix, onDone }) {
 						summary.sessions.failed.length > 0 ? `, ${summary.sessions.failed.length} failed` : ""
 					]
 				}),
+				summary?.sessions && failLine(summary.sessions.failed.map((f) => f.error)) !== null && /* @__PURE__ */ jsx$1("text", {
+					fg: COLOR.error,
+					children: failLine(summary.sessions.failed.map((f) => f.error))
+				}),
 				summary?.mcps && /* @__PURE__ */ jsx$1("text", {
 					fg: COLOR.dim,
 					children: copyLine("mcp servers", summary.mcps)
 				}),
+				summary?.mcps && failLine(summary.mcps.failed.map((f) => `${f.name}: ${f.error}`)) !== null && /* @__PURE__ */ jsx$1("text", {
+					fg: COLOR.error,
+					children: failLine(summary.mcps.failed.map((f) => `${f.name}: ${f.error}`))
+				}),
 				summary?.skills && /* @__PURE__ */ jsx$1("text", {
 					fg: COLOR.dim,
 					children: copyLine("skills", summary.skills)
 				}),
+				summary?.skills && failLine(summary.skills.failed.map((f) => `${f.name}: ${f.error}`)) !== null && /* @__PURE__ */ jsx$1("text", {
+					fg: COLOR.error,
+					children: failLine(summary.skills.failed.map((f) => `${f.name}: ${f.error}`))
+				}),
 				summary?.notes.map((note) => /* @__PURE__ */ jsx$1("text", {
 					fg: COLOR.mute,
 					children: `· ${note}`
 				}, note))
 			]
-		}), /* @__PURE__ */ jsxs("text", {
-			fg: COLOR.mute,
-			children: [/* @__PURE__ */ jsx$1("span", {
-				fg: COLOR.warn,
-				children: "esc"
-			}), " close"]
-		})]
+		}), /* @__PURE__ */ jsx$1(ModalHints, { hints: [{
+			key: "esc",
+			label: "close"
+		}] })]
 	});
 	const enabledFor = (key) => key === "run" ? void 0 : options[key];
 	return /* @__PURE__ */ jsxs(Modal, {
@@ -1484,6 +1784,14 @@ function ClaudeImportModal({ store, cwd, prefix, onDone }) {
 				const enabled = enabledFor(row.key);
 				return /* @__PURE__ */ jsxs("text", {
 					fg: focused ? COLOR.brand : COLOR.dim,
+					selectable: false,
+					onMouseOver: () => setCursor(i),
+					onMouseDown: (event) => {
+						event.stopPropagation();
+						event.preventDefault();
+						setCursor(i);
+						activateRow(row);
+					},
 					children: [
 						/* @__PURE__ */ jsx$1("span", {
 							fg: focused ? COLOR.brand : COLOR.mute,
@@ -1504,32 +1812,32 @@ function ClaudeImportModal({ store, cwd, prefix, onDone }) {
 					]
 				}, row.key);
 			})
-		}), /* @__PURE__ */ jsxs("text", {
-			fg: COLOR.mute,
-			children: [
-				/* @__PURE__ */ jsx$1("span", {
-					fg: COLOR.warn,
-					children: "↑↓"
-				}),
-				" navigate · ",
-				/* @__PURE__ */ jsx$1("span", {
-					fg: COLOR.warn,
-					children: "↵"
-				}),
-				" toggle / run · ",
-				/* @__PURE__ */ jsx$1("span", {
-					fg: COLOR.warn,
-					children: "esc"
-				}),
-				" close"
-			]
-		})]
+		}), /* @__PURE__ */ jsx$1(ModalHints, { hints: [
+			{
+				key: "↑↓",
+				label: "navigate"
+			},
+			{
+				key: "↵",
+				label: "toggle / run"
+			},
+			{
+				key: "esc",
+				label: "close"
+			}
+		] })]
 	});
 }
+/** First failure reason (+count of the rest), or null when nothing failed. */
+function failLine(errors) {
+	if (errors.length === 0) return null;
+	return errors.length > 1 ? `  ⚠ ${errors[0]} (+${errors.length - 1} more)` : `  ⚠ ${errors[0]}`;
+}
 function copyLine(label, result) {
 	const parts = [];
 	parts.push(result.copied.length > 0 ? `${result.copied.length} copied (${result.copied.join(", ")})` : "none copied");
 	if (result.skipped.length > 0) parts.push(`${result.skipped.length} skipped as native (${result.skipped.join(", ")})`);
+	if (result.duplicates && result.duplicates.length > 0) parts.push(`${result.duplicates.length} duplicate source entr${result.duplicates.length === 1 ? "y" : "ies"} dropped (${result.duplicates.join(", ")})`);
 	if (result.failed.length > 0) parts.push(`${result.failed.length} failed`);
 	return `${label}: ${parts.join(" · ")}`;
 }
@@ -2311,7 +2619,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, contextKey = null }) {
 	const { width } = useTerminalDimensions();
 	const showCost = typeof cost === "number" && cost > 0;
 	const inner = Math.max(0, width - 2);
@@ -2325,8 +2633,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",
@@ -2343,7 +2651,8 @@ function Footer({ hints, context, cost = null, status = null, compactionTokens =
 			/* @__PURE__ */ jsx$1("box", { style: { flexGrow: 1 } }),
 			/* @__PURE__ */ jsx$1(RightStatus, {
 				cost: showCost ? cost : null,
-				context
+				context,
+				contextKey: contextKey ?? null
 			})
 		]
 	});
@@ -2370,22 +2679,43 @@ function Footer({ hints, context, cost = null, status = null, compactionTokens =
 			},
 			children: [/* @__PURE__ */ jsx$1("box", { style: { flexGrow: 1 } }), /* @__PURE__ */ jsx$1(RightStatus, {
 				cost: showCost ? cost : null,
-				context
+				context,
+				contextKey: contextKey ?? null
 			})]
 		})]
 	});
 }
-function RightStatus({ cost, context }) {
+function RightStatus({ cost, context, contextKey }) {
 	const COLOR = useColors();
+	const renderer = useRenderer();
+	const [hovered, setHovered] = useState(false);
 	if (cost == null && !context) return null;
-	return /* @__PURE__ */ jsxs("text", { children: [
-		cost != null && /* @__PURE__ */ jsx$1(CostIndicator, { cost }),
+	const body = /* @__PURE__ */ jsxs(Fragment, { children: [
+		cost != null && /* @__PURE__ */ jsx$1(CostIndicator, {
+			cost,
+			accent: hovered
+		}),
 		cost != null && context && /* @__PURE__ */ jsx$1("span", {
 			fg: COLOR.mute,
 			children: " · "
 		}),
-		context && /* @__PURE__ */ jsx$1(ContextIndicator, { context })
+		context && /* @__PURE__ */ jsx$1(ContextIndicator, {
+			context,
+			accent: hovered
+		})
 	] });
+	if (!(contextKey !== null && parseHintKeySpec(contextKey) !== null)) return /* @__PURE__ */ jsx$1("text", { children: body });
+	return /* @__PURE__ */ jsx$1("text", {
+		selectable: false,
+		onMouseDown: (event) => {
+			event.stopPropagation();
+			event.preventDefault();
+			dispatchHintKey(renderer, contextKey);
+		},
+		onMouseOver: () => setHovered(true),
+		onMouseOut: () => setHovered(false),
+		children: body
+	});
 }
 /**
 * Right-edge status in the Footer's left section. Busy stays glyph-only;
@@ -2395,17 +2725,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 +2757,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 —
@@ -2463,14 +2797,15 @@ function renderHintSpans(hints, COLOR) {
 		})
 	] }, i));
 }
-function ContextIndicator({ context }) {
+function ContextIndicator({ context, accent = false }) {
 	const COLOR = useColors();
 	const ratio = context.max > 0 ? context.used / context.max : 0;
 	const pct = Math.round(ratio * 100);
-	const color = ratio >= .85 ? COLOR.error : ratio >= .6 ? COLOR.warn : COLOR.dim;
+	const color = accent ? COLOR.accent : ratio >= .85 ? COLOR.error : ratio >= .6 ? COLOR.warn : COLOR.dim;
+	const muted = accent ? COLOR.accent : COLOR.mute;
 	return /* @__PURE__ */ jsxs("span", { children: [
 		/* @__PURE__ */ jsx$1("span", {
-			fg: COLOR.mute,
+			fg: muted,
 			children: "ctx "
 		}),
 		/* @__PURE__ */ jsx$1("span", {
@@ -2478,7 +2813,7 @@ function ContextIndicator({ context }) {
 			children: fmtTokens(context.used)
 		}),
 		/* @__PURE__ */ jsx$1("span", {
-			fg: COLOR.mute,
+			fg: muted,
 			children: ` / ${fmtTokens(context.max)} `
 		}),
 		/* @__PURE__ */ jsx$1("span", {
@@ -2487,11 +2822,11 @@ function ContextIndicator({ context }) {
 		})
 	] });
 }
-function CostIndicator({ cost }) {
+function CostIndicator({ cost, accent = false }) {
 	const COLOR = useColors();
-	const fg = COLOR.money ?? COLOR.warn;
+	const fg = accent ? COLOR.accent : COLOR.money ?? COLOR.warn;
 	return /* @__PURE__ */ jsxs("span", { children: [/* @__PURE__ */ jsx$1("span", {
-		fg: COLOR.mute,
+		fg: accent ? COLOR.accent : COLOR.mute,
 		children: "$"
 	}), /* @__PURE__ */ jsx$1("span", {
 		fg,
@@ -2560,8 +2895,11 @@ function renderGradientText(text, from, to) {
 * </box>
 * ```
 */
-function TitleOverlay({ title, meta = null, titleColor, parentWidth, statusIcon = null, statusIconCells = 1 }) {
+function TitleOverlay({ title, meta = null, titleColor, parentWidth, statusIcon = null, statusIconCells = 1, clickKey = null }) {
 	const COLOR = useColors();
+	const renderer = useRenderer();
+	const [titleHovered, setTitleHovered] = useState(false);
+	const clickable = clickKey !== null && parseHintKeySpec(clickKey) !== null;
 	const { width: termWidth } = useTerminalDimensions();
 	const useGradient = titleColor === void 0;
 	const gradientFrom = COLOR.throbber?.to ?? COLOR.accent;
@@ -2574,32 +2912,51 @@ function TitleOverlay({ title, meta = null, titleColor, parentWidth, statusIcon
 	const showMeta = meta != null && metaLen > 0 && title.length + iconReserve + TITLE_OVERLAY_WRAP + TITLE_OVERLAY_GAP + metaLen + TITLE_OVERLAY_META_WRAP <= inner;
 	const titleBudget = (showMeta ? inner - (metaLen + TITLE_OVERLAY_META_WRAP) - TITLE_OVERLAY_GAP - TITLE_OVERLAY_WRAP : inner - TITLE_OVERLAY_WRAP) - iconReserve;
 	const visibleTitle = titleBudget <= 0 ? "" : truncateTrailing(title, titleBudget);
-	return /* @__PURE__ */ jsxs(Fragment, { children: [(visibleTitle || statusIcon) && /* @__PURE__ */ jsxs("text", {
+	const titleBody = /* @__PURE__ */ jsxs(Fragment, { children: [
+		/* @__PURE__ */ jsx$1("span", {
+			fg: COLOR.mute,
+			children: " "
+		}),
+		titleHovered ? /* @__PURE__ */ jsx$1("span", {
+			fg: COLOR.accent,
+			children: visibleTitle
+		}) : useGradient && visibleTitle.length > 0 ? renderGradientText(visibleTitle, gradientFrom, gradientTo) : /* @__PURE__ */ jsx$1("span", {
+			fg,
+			children: visibleTitle
+		}),
+		statusIcon && /* @__PURE__ */ jsx$1("span", {
+			fg: COLOR.mute,
+			children: " "
+		}),
+		statusIcon,
+		/* @__PURE__ */ jsx$1("span", {
+			fg: COLOR.mute,
+			children: " "
+		})
+	] });
+	return /* @__PURE__ */ jsxs(Fragment, { children: [(visibleTitle || statusIcon) && (clickable ? /* @__PURE__ */ jsx$1("text", {
 		style: {
 			position: "absolute",
 			top: 0,
 			left: 1
 		},
-		children: [
-			/* @__PURE__ */ jsx$1("span", {
-				fg: COLOR.mute,
-				children: " "
-			}),
-			useGradient && visibleTitle.length > 0 ? renderGradientText(visibleTitle, gradientFrom, gradientTo) : /* @__PURE__ */ jsx$1("span", {
-				fg,
-				children: visibleTitle
-			}),
-			statusIcon && /* @__PURE__ */ jsx$1("span", {
-				fg: COLOR.mute,
-				children: " "
-			}),
-			statusIcon,
-			/* @__PURE__ */ jsx$1("span", {
-				fg: COLOR.mute,
-				children: " "
-			})
-		]
-	}), showMeta && meta && /* @__PURE__ */ jsxs("text", {
+		selectable: false,
+		onMouseDown: (event) => {
+			event.stopPropagation();
+			event.preventDefault();
+			dispatchHintKey(renderer, clickKey);
+		},
+		onMouseOver: () => setTitleHovered(true),
+		onMouseOut: () => setTitleHovered(false),
+		children: titleBody
+	}) : /* @__PURE__ */ jsx$1("text", {
+		style: {
+			position: "absolute",
+			top: 0,
+			left: 1
+		},
+		children: titleBody
+	})), showMeta && meta && /* @__PURE__ */ jsxs("text", {
 		style: {
 			position: "absolute",
 			top: 0,
@@ -2691,14 +3048,79 @@ function StatusSpinner({ color }) {
 		children: useSpinnerFrame()
 	});
 }
-function Transcript({ events, settings, selectedTurnId = null, busy = false, searchQuery, searchPending = false, onLoadEarlier }) {
+/**
+* Bordered container for one run of subagent events. The box's border +
+* left padding give the visual "this is a subagent" affordance, so events
+* inside render with `depthOffset: 1` — a direct child of the parent
+* (depth 1) sits flush against the box's inner padding rather than being
+* indented twice. Grandchildren (depth ≥ 2) still indent further, so
+* nested subagents remain visually distinct.
+*
+* Memoized like {@link EventLine} so completed historical runs don't
+* re-execute per drain tick — but with a custom comparator:
+* `partitionTranscript` / `computeTurnAnchors` rebuild the per-run
+* `events` / `anchorIds` arrays on every transcript change, so the default
+* shallow compare would never bail while streaming. The inner event
+* references (and the deterministic anchor-id strings) ARE stable until
+* their content changes, so an element-wise compare recovers the bail-out.
+*/
+const SubagentBlock = memo(({ events, previous, selectedTurnId = null, anchorIds, codeSettleTargets, codeSettleEpoch = 0, live, searchQuery, searchTitleMatches }) => {
 	const COLOR = useColors();
-	const showThrobber = busy && settings.showThrobber;
-	const codeSettle = useRef({
-		wasBusy: false,
-		epoch: 0,
-		activeTargets: /* @__PURE__ */ new Set(),
-		targets: /* @__PURE__ */ new Set()
+	const childIds = useMemo(() => {
+		const set = /* @__PURE__ */ new Set();
+		for (const e of events) if (e.childId) set.add(e.childId);
+		return Array.from(set);
+	}, [events]);
+	const title = childIds.length === 0 ? " subagent " : childIds.length === 1 ? ` ${childIds[0]} ` : ` subagents · ${childIds.join(", ")} `;
+	const marginTop = previous ? 1 : 0;
+	const hideChildLabel = childIds.length === 1;
+	return /* @__PURE__ */ jsx$1("box", {
+		title,
+		style: {
+			border: true,
+			borderColor: COLOR.brand,
+			paddingLeft: 1,
+			paddingRight: 1,
+			paddingTop: 0,
+			paddingBottom: 0,
+			marginTop,
+			flexDirection: "column",
+			flexShrink: 0,
+			alignSelf: "stretch"
+		},
+		children: events.map((evt, i) => /* @__PURE__ */ jsx$1(EventLine, {
+			event: evt,
+			previous: events[i - 1],
+			depthOffset: 1,
+			selected: selectedTurnId !== null && evt.turnId === selectedTurnId,
+			anchorId: anchorIds?.[i],
+			hideChildLabel,
+			settleCodeEpoch: codeSettleTargets?.has(evt) ? codeSettleEpoch : 0,
+			liveSpawn: evt.kind === "spawn-start" ? live?.find((spawn) => spawn.id === evt.childId) : void 0,
+			searchQuery,
+			searchTitleMatch: evt.kind === "tool" && evt.callId !== void 0 && searchTitleMatches?.callIds.has(evt.callId) || (evt.kind === "spawn-start" || evt.kind === "spawn-end") && evt.childId !== void 0 && searchTitleMatches?.childIds.has(evt.childId)
+		}, i))
+	});
+}, (prev, next) => sameElements(prev.events, next.events) && sameElements(prev.anchorIds, next.anchorIds) && prev.previous === next.previous && prev.selectedTurnId === next.selectedTurnId && prev.codeSettleTargets === next.codeSettleTargets && prev.codeSettleEpoch === next.codeSettleEpoch && prev.live === next.live && prev.searchQuery === next.searchQuery && prev.searchTitleMatches === next.searchTitleMatches);
+/** Element-wise `===` over possibly-rebuilt arrays — see {@link SubagentBlock}. */
+function sameElements(a, b) {
+	if (a === b) return true;
+	if (!a || !b || a.length !== b.length) return false;
+	return a.every((value, i) => value === b[i]);
+}
+const NO_SEARCH_MATCHES = {
+	direct: /* @__PURE__ */ new Set(),
+	callIds: /* @__PURE__ */ new Set(),
+	childIds: /* @__PURE__ */ new Set()
+};
+function Transcript({ events, settings, selectedTurnId = null, busy = false, searchQuery, searchPending = false, onLoadEarlier, onSelectTurn, onOpenTurn }) {
+	const COLOR = useColors();
+	const showThrobber = busy && settings.showThrobber;
+	const codeSettle = useRef({
+		wasBusy: false,
+		epoch: 0,
+		activeTargets: /* @__PURE__ */ new Set(),
+		targets: /* @__PURE__ */ new Set()
 	});
 	const lastUserPromptIndex = events.findLastIndex((event) => event.kind === "user-prompt");
 	if (busy) {
@@ -2716,14 +3138,10 @@ function Transcript({ events, settings, selectedTurnId = null, busy = false, sea
 	const throbberLabel = events.length > 0 && events[events.length - 1].kind === "thinking" ? "Thinking" : void 0;
 	const ownership = useMemo(() => turnSelectionOwnership(events), [events]);
 	const searchMatches = useMemo(() => {
+		if (!searchQuery) return NO_SEARCH_MATCHES;
 		const direct = /* @__PURE__ */ new Set();
 		const callIds = /* @__PURE__ */ new Set();
 		const childIds = /* @__PURE__ */ new Set();
-		if (!searchQuery) return {
-			direct,
-			callIds,
-			childIds
-		};
 		const stack = [];
 		for (const event of events) {
 			if (event.kind === "spawn-start") stack.push(event);
@@ -2752,9 +3170,13 @@ function Transcript({ events, settings, selectedTurnId = null, busy = false, sea
 		searchMatches
 	]);
 	const scrollboxRef = useRef(null);
+	const mouseSelectionRef = useRef(false);
+	const pressedTurnRef = useRef(null);
 	const rowVisibility = useRef(createRowVisibilityStore());
 	const loadEarlierRef = useRef(onLoadEarlier);
 	loadEarlierRef.current = onLoadEarlier;
+	const eventsRef = useRef(events);
+	eventsRef.current = events;
 	const earlierLoad = useRef(null);
 	const earlierLoadArmed = useRef(false);
 	useEffect(() => {
@@ -2767,7 +3189,7 @@ function Transcript({ events, settings, selectedTurnId = null, busy = false, sea
 			});
 			const topThreshold = Math.max(4, Math.floor(sb.viewport.height / 4));
 			if (sb.scrollTop > topThreshold) earlierLoadArmed.current = true;
-			else if (earlierLoadArmed.current && !earlierLoad.current && loadEarlierRef.current && hiddenEarlierTranscriptCount(events) > 0) {
+			else if (earlierLoadArmed.current && !earlierLoad.current && loadEarlierRef.current && hiddenEarlierTranscriptCount(eventsRef.current) > 0) {
 				earlierLoadArmed.current = false;
 				const snapshot = {
 					oldHeight: sb.scrollHeight,
@@ -2781,7 +3203,7 @@ function Transcript({ events, settings, selectedTurnId = null, busy = false, sea
 			}
 		}, 200);
 		return () => clearInterval(timer);
-	}, [events]);
+	}, []);
 	useEffect(() => {
 		const pending = earlierLoad.current;
 		if (!pending) return;
@@ -2835,6 +3257,10 @@ function Transcript({ events, settings, selectedTurnId = null, busy = false, sea
 	}, [items, events]);
 	useEffect(() => {
 		if (!selectedTurnId) return;
+		if (mouseSelectionRef.current) {
+			mouseSelectionRef.current = false;
+			return;
+		}
 		let handle = 0;
 		let attempts = 0;
 		const align = () => {
@@ -2895,7 +3321,7 @@ function Transcript({ events, settings, selectedTurnId = null, busy = false, sea
 			children: [items.map((item, i) => {
 				if (item.kind === "event") {
 					const live = liveByItem.get(i);
-					return /* @__PURE__ */ jsx$1(EventLine, {
+					const line = /* @__PURE__ */ jsx$1(EventLine, {
 						event: item.event,
 						previous: item.previous,
 						selected: isTurnHighlighted(item.event, selectedTurnId, ownership),
@@ -2904,6 +3330,33 @@ function Transcript({ events, settings, selectedTurnId = null, busy = false, sea
 						liveSpawn: live?.[0],
 						searchQuery,
 						searchTitleMatch: item.event.kind === "tool" && item.event.callId !== void 0 && searchMatches.callIds.has(item.event.callId) || (item.event.kind === "spawn-start" || item.event.kind === "spawn-end") && item.event.childId !== void 0 && searchMatches.childIds.has(item.event.childId)
+					});
+					const selectActive = selectedTurnId !== null && (onSelectTurn !== void 0 || onOpenTurn !== void 0);
+					const targetTurn = item.event.turnId && !item.event.childId ? ownership.get(item.event.turnId) ?? item.event.turnId : null;
+					const active = selectActive && targetTurn !== null;
+					return /* @__PURE__ */ jsx$1("box", {
+						style: { flexDirection: "column" },
+						onMouseOver: active ? () => {
+							if (targetTurn === selectedTurnId) return;
+							if (onSelectTurn?.(targetTurn) !== false) mouseSelectionRef.current = true;
+						} : void 0,
+						onMouseDown: active && onOpenTurn ? (event) => {
+							pressedTurnRef.current = event.button === 0 ? {
+								turnId: targetTurn,
+								x: event.x,
+								y: event.y
+							} : null;
+						} : void 0,
+						onMouseUp: active && onOpenTurn ? (event) => {
+							const pressed = pressedTurnRef.current;
+							pressedTurnRef.current = null;
+							if (event.button !== 0 || pressed === null || pressed.turnId !== targetTurn) return;
+							if (pressed.x !== event.x || pressed.y !== event.y) return;
+							event.stopPropagation();
+							event.preventDefault();
+							if (onOpenTurn(targetTurn) !== false && targetTurn !== selectedTurnId) mouseSelectionRef.current = true;
+						} : void 0,
+						children: line
 					}, i);
 				}
 				return /* @__PURE__ */ jsx$1(SubagentBlock, {
@@ -3051,52 +3504,6 @@ function partitionTranscript(events, settings, searchReveal) {
 	return items;
 }
 /**
-* Bordered container for one run of subagent events. The box's border +
-* left padding give the visual "this is a subagent" affordance, so events
-* inside render with `depthOffset: 1` — a direct child of the parent
-* (depth 1) sits flush against the box's inner padding rather than being
-* indented twice. Grandchildren (depth ≥ 2) still indent further, so
-* nested subagents remain visually distinct.
-*/
-function SubagentBlock({ events, previous, selectedTurnId = null, anchorIds, codeSettleTargets, codeSettleEpoch = 0, live, searchQuery, searchTitleMatches }) {
-	const COLOR = useColors();
-	const childIds = useMemo(() => {
-		const set = /* @__PURE__ */ new Set();
-		for (const e of events) if (e.childId) set.add(e.childId);
-		return Array.from(set);
-	}, [events]);
-	const title = childIds.length === 0 ? " subagent " : childIds.length === 1 ? ` ${childIds[0]} ` : ` subagents · ${childIds.join(", ")} `;
-	const marginTop = previous ? 1 : 0;
-	const hideChildLabel = childIds.length === 1;
-	return /* @__PURE__ */ jsx$1("box", {
-		title,
-		style: {
-			border: true,
-			borderColor: COLOR.brand,
-			paddingLeft: 1,
-			paddingRight: 1,
-			paddingTop: 0,
-			paddingBottom: 0,
-			marginTop,
-			flexDirection: "column",
-			flexShrink: 0,
-			alignSelf: "stretch"
-		},
-		children: events.map((evt, i) => /* @__PURE__ */ jsx$1(EventLine, {
-			event: evt,
-			previous: events[i - 1],
-			depthOffset: 1,
-			selected: selectedTurnId !== null && evt.turnId === selectedTurnId,
-			anchorId: anchorIds?.[i],
-			hideChildLabel,
-			settleCodeEpoch: codeSettleTargets?.has(evt) ? codeSettleEpoch : 0,
-			liveSpawn: evt.kind === "spawn-start" ? live?.find((spawn) => spawn.id === evt.childId) : void 0,
-			searchQuery,
-			searchTitleMatch: evt.kind === "tool" && evt.callId !== void 0 && searchTitleMatches?.callIds.has(evt.callId) || (evt.kind === "spawn-start" || evt.kind === "spawn-end") && evt.childId !== void 0 && searchTitleMatches?.childIds.has(evt.childId)
-		}, i))
-	});
-}
-/**
 * Stable one-row subagent lifecycle layout. Identity/model/task stay in
 * the left lane for the whole run; only the right tail changes:
 * active `2 turns · 14s · ⠋ tool call`, done `4 turns`.
@@ -4716,29 +5123,23 @@ function ContextPanelModal({ breakdown, modelUsage }) {
 					children: "~"
 				}), " estimated — exact counts unavailable for this provider"]
 			}),
-			/* @__PURE__ */ jsx$1("text", {
-				fg: COLOR.dim,
-				children: expandableIds.length > 0 ? /* @__PURE__ */ jsxs(Fragment, { children: [
-					/* @__PURE__ */ jsx$1("span", {
-						fg: COLOR.warn,
-						children: "↑↓"
-					}),
-					" navigate · ",
-					/* @__PURE__ */ jsx$1("span", {
-						fg: COLOR.warn,
-						children: "↵/space"
-					}),
-					" expand · ",
-					/* @__PURE__ */ jsx$1("span", {
-						fg: COLOR.warn,
-						children: "esc"
-					}),
-					" close"
-				] }) : /* @__PURE__ */ jsxs(Fragment, { children: [/* @__PURE__ */ jsx$1("span", {
-					fg: COLOR.warn,
-					children: "esc"
-				}), " close"] })
-			})
+			/* @__PURE__ */ jsx$1(ModalHints, { hints: [
+				expandableIds.length > 0 && {
+					key: "↑↓",
+					label: "navigate",
+					labelColor: COLOR.dim
+				},
+				expandableIds.length > 0 && {
+					key: "↵/space",
+					label: "expand",
+					labelColor: COLOR.dim
+				},
+				{
+					key: "esc",
+					label: "close",
+					labelColor: COLOR.dim
+				}
+			] })
 		]
 	});
 }
@@ -5247,26 +5648,23 @@ function CreateExtensionModal({ userRoot, projectRoot, loadProjectExtensions, on
 				fg: COLOR.error,
 				children: error
 			}),
-			/* @__PURE__ */ jsxs("text", {
-				fg: COLOR.dim,
-				children: [
-					/* @__PURE__ */ jsx$1("span", {
-						fg: COLOR.warn,
-						children: "tab"
-					}),
-					" scope · ",
-					/* @__PURE__ */ jsx$1("span", {
-						fg: COLOR.warn,
-						children: "↵"
-					}),
-					" create · ",
-					/* @__PURE__ */ jsx$1("span", {
-						fg: COLOR.warn,
-						children: "esc"
-					}),
-					" cancel"
-				]
-			})
+			/* @__PURE__ */ jsx$1(ModalHints, { hints: [
+				{
+					key: "tab",
+					label: "scope",
+					labelColor: COLOR.dim
+				},
+				{
+					key: "↵",
+					label: "create",
+					labelColor: COLOR.dim
+				},
+				{
+					key: "esc",
+					label: "cancel",
+					labelColor: COLOR.dim
+				}
+			] })
 		]
 	});
 }
@@ -5575,40 +5973,37 @@ function CwdPickerModal({ currentCwd, onPick }) {
 					}, result.item.path);
 				})
 			}),
-			/* @__PURE__ */ jsxs("text", {
-				fg: COLOR.dim,
-				children: [
-					/* @__PURE__ */ jsx$1("span", {
-						fg: COLOR.warn,
-						children: "↑↓"
-					}),
-					" navigate · ",
-					/* @__PURE__ */ jsx$1("span", {
-						fg: COLOR.warn,
-						children: "tab"
-					}),
-					" enter dir · ",
-					/* @__PURE__ */ jsx$1("span", {
-						fg: COLOR.warn,
-						children: "←"
-					}),
-					" parent · ",
-					/* @__PURE__ */ jsx$1("span", {
-						fg: COLOR.warn,
-						children: "↵"
-					}),
-					" select · ",
-					/* @__PURE__ */ jsx$1("span", {
-						fg: COLOR.warn,
-						children: "esc"
-					}),
-					" close · ",
-					/* @__PURE__ */ jsx$1("span", {
-						fg: COLOR.mute,
-						children: `${results.length} match${results.length === 1 ? "" : "es"}`
-					})
-				]
-			})
+			/* @__PURE__ */ jsx$1(ModalHints, { hints: [
+				{
+					key: "↑↓",
+					label: "navigate",
+					labelColor: COLOR.dim
+				},
+				{
+					key: "tab",
+					label: "enter dir",
+					labelColor: COLOR.dim
+				},
+				{
+					key: "←",
+					label: "parent",
+					labelColor: COLOR.dim
+				},
+				{
+					key: "↵",
+					label: "select",
+					labelColor: COLOR.dim
+				},
+				{
+					key: "esc",
+					label: "close",
+					labelColor: COLOR.dim
+				},
+				{
+					key: "",
+					label: `${results.length} match${results.length === 1 ? "" : "es"}`
+				}
+			] })
 		]
 	});
 }
@@ -5895,6 +6290,21 @@ async function resolveExtensionModalNode(node) {
 let nextClientId = 1;
 /** Mirror of the TUI's ZIDANE_DEBUG-gated logger — silent by default. */
 const debugFallback = process.env.ZIDANE_DEBUG ? (op, error) => console.error(`[zidane/tui] history search ${op} fell back to the main thread:`, error) : () => {};
+/**
+* Rough searchable-size estimate for degraded builds — string block
+* payloads only, mirroring what index extraction keeps (attachments /
+* base64 are stripped there). Cheap enough to run inline; only feeds the
+* byte budget, so precision doesn't matter.
+*/
+function estimateTurnsBytes(turns) {
+	let total = 0;
+	for (const turn of turns) for (const block of turn.content) {
+		const b = block;
+		if (typeof b.text === "string") total += b.text.length;
+		if (typeof b.output === "string") total += b.output.length;
+	}
+	return total;
+}
 function workerUrl() {
 	if (typeof Bun !== "undefined" && Bun.isStandaloneExecutable) return new URL("./history-search-worker.ts", import.meta.url);
 	return new URL(import.meta.url.endsWith(".ts") ? "./history-search-worker.ts" : "./history-search-worker.js", import.meta.url);
@@ -5909,6 +6319,12 @@ var HistorySearchWorkerClient = class {
 		this.createWorker = createWorker;
 	}
 	indexes = /* @__PURE__ */ new WeakMap();
+	/**
+	* Handles whose index lives in the worker (a successful `build`). Only
+	* these are safe to `slim()` — a degraded handle's turns are the sole
+	* source for its main-thread fallback index.
+	*/
+	workerBuilt = /* @__PURE__ */ new WeakSet();
 	registrations = /* @__PURE__ */ new Map();
 	rebuilds = /* @__PURE__ */ new Map();
 	pending = /* @__PURE__ */ new Map();
@@ -5926,10 +6342,11 @@ var HistorySearchWorkerClient = class {
 		if (this.unavailable) return {
 			indexId,
 			length: turns.length,
+			bytes: estimateTurnsBytes(turns),
 			turns
 		};
 		try {
-			return {
+			const handle = {
 				...await this.request({
 					type: "build",
 					indexId,
@@ -5937,16 +6354,47 @@ var HistorySearchWorkerClient = class {
 				}, signal),
 				turns
 			};
+			this.workerBuilt.add(handle);
+			return handle;
 		} catch (error) {
 			if (signal?.aborted) throw signal.reason;
 			debugFallback("build", error);
 			return {
 				indexId,
 				length: turns.length,
+				bytes: estimateTurnsBytes(turns),
 				turns
 			};
 		}
 	}
+	/**
+	* Drop the handle's main-thread turn retention once the worker owns the
+	* index. Callers whose turns are alive anyway (live session, transcript
+	* search) skip this; the cross-session cache calls it so 64 cached
+	* handles don't pin 64 full sessions on the main thread. A slimmed
+	* handle can't rebuild after a worker-side eviction — the caller is
+	* expected to self-heal by rebuilding from the store on failure.
+	*/
+	slim(index) {
+		if (!this.workerBuilt.has(index)) return;
+		index.turns = void 0;
+	}
+	/**
+	* Main-thread eviction notice: free the handle's retained data AND the
+	* worker's cached index. Without this the worker kept its copy until
+	* its own LRU happened to cycle it out. Fire-and-forget by design.
+	*/
+	release(index) {
+		index.turns = void 0;
+		index.fallback = void 0;
+		if (!this.worker) return;
+		try {
+			this.worker.postMessage({
+				type: "release",
+				indexId: index.indexId
+			});
+		} catch {}
+	}
 	async search(index, query, limit, signal) {
 		if (this.unavailable) return searchSessionIndexAsync(await this.fallbackIndex(index, signal), query, {
 			limit,
@@ -6016,6 +6464,7 @@ var HistorySearchWorkerClient = class {
 	rebuild(index) {
 		const inFlight = this.rebuilds.get(index.indexId);
 		if (inFlight) return inFlight;
+		if (!index.turns) return Promise.reject(/* @__PURE__ */ new Error(`History search index released: ${index.indexId}`));
 		const rebuild = this.request({
 			type: "build",
 			indexId: index.indexId,
@@ -6026,10 +6475,13 @@ var HistorySearchWorkerClient = class {
 	}
 	fallbackIndex(index, signal) {
 		if (!("indexId" in index)) return Promise.resolve(index);
-		if (!index.fallback) index.fallback = buildSessionSearchIndexAsync(index.turns).catch((error) => {
-			index.fallback = void 0;
-			throw error;
-		});
+		if (!index.fallback) {
+			if (!index.turns) return Promise.reject(/* @__PURE__ */ new Error(`History search index released: ${index.indexId}`));
+			index.fallback = buildSessionSearchIndexAsync(index.turns).catch((error) => {
+				index.fallback = void 0;
+				throw error;
+			});
+		}
 		signal?.throwIfAborted();
 		return index.fallback;
 	}
@@ -6085,6 +6537,10 @@ var HistorySearchWorkerClient = class {
 			}
 		});
 		this.registrations.set(indexId, registration);
+		registration.catch(() => {
+			this.registrations.delete(indexId);
+			this.indexes.delete(index);
+		});
 		return registration.then(() => indexId);
 	}
 	request(payload, signal) {
@@ -6455,26 +6911,23 @@ function ModelOptionsPickerModal({ supportsReasoning, supportsAdaptive, currentE
 					})]
 				}, `option:${row.option.id}`);
 			})]
-		}), /* @__PURE__ */ jsxs("text", {
-			fg: COLOR.dim,
-			children: [
-				/* @__PURE__ */ jsx$1("span", {
-					fg: COLOR.warn,
-					children: "↑↓"
-				}),
-				" navigate · ",
-				/* @__PURE__ */ jsx$1("span", {
-					fg: COLOR.warn,
-					children: "↵/space"
-				}),
-				" select/toggle · ",
-				/* @__PURE__ */ jsx$1("span", {
-					fg: COLOR.warn,
-					children: "esc"
-				}),
-				" close"
-			]
-		})]
+		}), /* @__PURE__ */ jsx$1(ModalHints, { hints: [
+			{
+				key: "↑↓",
+				label: "navigate",
+				labelColor: COLOR.dim
+			},
+			{
+				key: "↵/space",
+				label: "select/toggle",
+				labelColor: COLOR.dim
+			},
+			{
+				key: "esc",
+				label: "close",
+				labelColor: COLOR.dim
+			}
+		] })]
 	});
 }
 function SectionHeader({ label, color }) {
@@ -6795,38 +7248,37 @@ function ModelPickerModal({ providers, modelsFor, current, onPick, chain, onAppl
 					chainPosition: chainMode ? chainPositionOf(chainState, entry.providerKey, entry.model.id) : null
 				}, `${entry.providerKey}:${entry.model.id}`))
 			}),
-			/* @__PURE__ */ jsxs("text", {
-				fg: COLOR.dim,
-				children: [
-					/* @__PURE__ */ jsx$1("span", {
-						fg: COLOR.warn,
-						children: "↑↓"
-					}),
-					" navigate · ",
-					/* @__PURE__ */ jsx$1("span", {
-						fg: COLOR.warn,
-						children: "↵"
-					}),
-					chainMode ? " add/remove · " : " select · ",
-					chainMode && /* @__PURE__ */ jsxs(Fragment, { children: [/* @__PURE__ */ jsx$1("span", {
-						fg: COLOR.warn,
-						children: "ctrl+shift+↑↓"
-					}), " reorder · "] }),
-					/* @__PURE__ */ jsx$1("span", {
-						fg: COLOR.warn,
-						children: "esc"
-					}),
-					chainMode ? " apply · " : " close · ",
-					chainMode && /* @__PURE__ */ jsx$1("span", {
-						fg: COLOR.brand,
-						children: `${chainState.length} selected · `
-					}),
-					/* @__PURE__ */ jsx$1("span", {
-						fg: COLOR.mute,
-						children: `${filtered.length} / ${catalog.length} model${catalog.length === 1 ? "" : "s"}`
-					})
-				]
-			})
+			/* @__PURE__ */ jsx$1(ModalHints, { hints: [
+				{
+					key: "↑↓",
+					label: "navigate",
+					labelColor: COLOR.dim
+				},
+				{
+					key: "↵",
+					label: chainMode ? "add/remove" : "select",
+					labelColor: COLOR.dim
+				},
+				chainMode && {
+					key: "ctrl+shift+↑↓",
+					label: "reorder",
+					labelColor: COLOR.dim
+				},
+				{
+					key: "esc",
+					label: chainMode ? "apply" : "close",
+					labelColor: COLOR.dim
+				},
+				chainMode && {
+					key: "",
+					label: `${chainState.length} selected`,
+					labelColor: COLOR.brand
+				},
+				{
+					key: "",
+					label: `${filtered.length} / ${catalog.length} model${catalog.length === 1 ? "" : "s"}`
+				}
+			] })
 		]
 	});
 }
@@ -6987,38 +7439,37 @@ function ModelSelectList({ catalog, multi = false, initial, onApply, onCancel, v
 					chainPosition: multi ? picks.includes(entry.model.id) ? picks.indexOf(entry.model.id) + 1 : null : null
 				}, `${entry.providerKey}:${entry.model.id}`))
 			}),
-			/* @__PURE__ */ jsxs("text", {
-				fg: COLOR.dim,
-				children: [
-					/* @__PURE__ */ jsx$1("span", {
-						fg: COLOR.warn,
-						children: "↑↓"
-					}),
-					" navigate · ",
-					/* @__PURE__ */ jsx$1("span", {
-						fg: COLOR.warn,
-						children: "↵"
-					}),
-					multi ? " add/remove · " : " select · ",
-					multi && /* @__PURE__ */ jsxs(Fragment, { children: [/* @__PURE__ */ jsx$1("span", {
-						fg: COLOR.warn,
-						children: "ctrl+shift+↑↓"
-					}), " reorder · "] }),
-					/* @__PURE__ */ jsx$1("span", {
-						fg: COLOR.warn,
-						children: "esc"
-					}),
-					multi ? " apply · " : " cancel · ",
-					multi && /* @__PURE__ */ jsx$1("span", {
-						fg: COLOR.brand,
-						children: `${picks.length} selected · `
-					}),
-					/* @__PURE__ */ jsx$1("span", {
-						fg: COLOR.mute,
-						children: `${filtered.length} / ${deduped.length} model${deduped.length === 1 ? "" : "s"}`
-					})
-				]
-			})
+			/* @__PURE__ */ jsx$1(ModalHints, { hints: [
+				{
+					key: "↑↓",
+					label: "navigate",
+					labelColor: COLOR.dim
+				},
+				{
+					key: "↵",
+					label: multi ? "add/remove" : "select",
+					labelColor: COLOR.dim
+				},
+				multi && {
+					key: "ctrl+shift+↑↓",
+					label: "reorder",
+					labelColor: COLOR.dim
+				},
+				{
+					key: "esc",
+					label: multi ? "apply" : "cancel",
+					labelColor: COLOR.dim
+				},
+				multi && {
+					key: "",
+					label: `${picks.length} selected`,
+					labelColor: COLOR.brand
+				},
+				{
+					key: "",
+					label: `${filtered.length} / ${deduped.length} model${deduped.length === 1 ? "" : "s"}`
+				}
+			] })
 		]
 	});
 }
@@ -7565,33 +8016,27 @@ function CompletionPopup({ state, visibleRows = 6 }) {
 					})
 				}, item.id);
 			})
-		}), /* @__PURE__ */ jsxs("text", {
-			fg: COLOR.mute,
-			children: [
-				/* @__PURE__ */ jsx$1("span", {
-					fg: COLOR.warn,
-					children: "↑↓"
-				}),
-				" navigate · ",
-				/* @__PURE__ */ jsx$1("span", {
-					fg: COLOR.warn,
-					children: enterSelects ? "↵" : "tab"
-				}),
-				" select · ",
-				enterSelects ? /* @__PURE__ */ jsxs(Fragment, { children: [/* @__PURE__ */ jsx$1("span", {
-					fg: COLOR.warn,
-					children: "tab"
-				}), " scope · "] }) : /* @__PURE__ */ jsxs(Fragment, { children: [/* @__PURE__ */ jsx$1("span", {
-					fg: COLOR.warn,
-					children: "↵"
-				}), " submit · "] }),
-				/* @__PURE__ */ jsx$1("span", {
-					fg: COLOR.warn,
-					children: "esc"
-				}),
-				" close"
-			]
-		})] });
+		}), /* @__PURE__ */ jsx$1(ModalHints, { hints: [
+			{
+				key: "↑↓",
+				label: "navigate"
+			},
+			{
+				key: enterSelects ? "↵" : "tab",
+				label: "select"
+			},
+			enterSelects ? {
+				key: "tab",
+				label: "scope"
+			} : {
+				key: "↵",
+				label: "submit"
+			},
+			{
+				key: "esc",
+				label: "close"
+			}
+		] })] });
 	}
 	return /* @__PURE__ */ jsxs("box", {
 		style: {
@@ -7851,7 +8296,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 +8314,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 +8481,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 +8808,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 +9798,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 +9834,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 +9880,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 +9913,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,
@@ -9676,10 +10161,11 @@ function toneColor(tone, COLOR) {
 * the parent picker's `useKeyboard` (via a ref) to suppress single-key
 * shortcuts (`l` / `o` / `r`) while the user is typing into the input.
 */
-function McpAuthorizingPanel({ serverName, authUrl, maxLineWidth, chromeWidth, inputFocused }) {
+function McpAuthorizingPanel({ serverName, authUrl, maxLineWidth, chromeWidth, inputFocused, fill = false }) {
 	const COLOR = useColors();
 	const inputRef = useRef(null);
 	const [hint, setHint] = useState(null);
+	const status = hint && hint.tone !== "error" ? hint.text : authUrl === null ? "starting login flow…" : "complete the login in your browser — waiting for the callback…";
 	const onSubmit = useCallback(() => {
 		const value = inputRef.current?.value?.trim() ?? "";
 		if (!value) return;
@@ -9709,32 +10195,37 @@ function McpAuthorizingPanel({ serverName, authUrl, maxLineWidth, chromeWidth, i
 	return /* @__PURE__ */ jsxs("box", {
 		style: {
 			flexDirection: "column",
-			border: ["top"],
-			borderColor: COLOR.border,
-			paddingTop: 1
+			...fill ? { flexGrow: 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,
+				...fill ? { flexGrow: 1 } : {}
+			},
+			children: [
+				/* @__PURE__ */ jsx$1(Spinner, { label: status }),
+				authUrl !== null && /* @__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 +11287,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 +11335,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 +11351,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 +11396,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",
@@ -11083,7 +11590,7 @@ const EMPTY_QUEUED_MESSAGES = [];
 function shouldRenderTranscriptSearch(searchMode, query) {
 	return searchMode && query.trim().length > 0;
 }
-function ChatScreen({ cwd, events, busy, compacting = false, queuedMessages = EMPTY_QUEUED_MESSAGES, queueSelectionIndex = null, queueShortcuts, onEnterQueueFromEmptyPrompt, settings, onSubmit, session, pending, onApproval, pendingInteraction, onInteraction, completionProviders, inlineAutocompleteProviders, onCompletionTab, enterSelectsCompletion, onPopupOpenChange, selectedTurnId, transcriptSearchMode = false, transcriptSearchQuery = "", transcriptSearchEvents = [], transcriptSearchSearching = false, onTranscriptSearchModeChange, onTranscriptSearchQueryChange, onTranscriptSearchNavigate, onTranscriptSearchOpen, onLoadEarlierTranscript, promptTriggerHints, attachImageBinding, editorBinding, sessionDetailsBinding, liveSession = null }) {
+function ChatScreen({ cwd, events, busy, compacting = false, queuedMessages = EMPTY_QUEUED_MESSAGES, queueSelectionIndex = null, queueShortcuts, onEnterQueueFromEmptyPrompt, settings, onSubmit, session, pending, onApproval, pendingInteraction, onInteraction, completionProviders, inlineAutocompleteProviders, onCompletionTab, enterSelectsCompletion, onPopupOpenChange, selectedTurnId, onSelectTurn, onOpenTurn, transcriptSearchMode = false, transcriptSearchQuery = "", transcriptSearchEvents = [], transcriptSearchSearching = false, onTranscriptSearchModeChange, onTranscriptSearchQueryChange, onTranscriptSearchNavigate, onTranscriptSearchOpen, onLoadEarlierTranscript, promptTriggerHints, attachImageBinding, editorBinding, sessionDetailsBinding, liveSession = null }) {
 	const COLOR = useColors();
 	const titleText = session?.title ?? "New session";
 	const sessionShortcutKey = formatBindingForDisplay(sessionDetailsBinding);
@@ -11173,6 +11680,8 @@ function ChatScreen({ cwd, events, busy, compacting = false, queuedMessages = EM
 					events: displayedEvents,
 					settings,
 					selectedTurnId: selectedTurnId ?? null,
+					onSelectTurn,
+					onOpenTurn,
 					searchQuery: transcriptSearchActive ? transcriptSearchQuery : void 0,
 					searchPending: transcriptSearchSearching,
 					busy: !transcriptSearchActive && busy && !pending && !pendingInteraction,
@@ -11221,7 +11730,8 @@ function ChatScreen({ cwd, events, busy, compacting = false, queuedMessages = EM
 			] }),
 			/* @__PURE__ */ jsx$1(TitleOverlay, {
 				title: titleText,
-				meta: metaSegments
+				meta: metaSegments,
+				clickKey: sessionDetailsBinding ?? null
 			})
 		]
 	});
@@ -12302,7 +12812,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 +12828,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: " "
 			})
 		]
@@ -12896,81 +13405,64 @@ function ActionRow$2({ pending, copyStatus, titleStatus, titleError, hasGenerate
 			})]
 		});
 	}
-	if (copyStatus === "copied") return /* @__PURE__ */ jsxs("text", {
-		fg: COLOR.dim,
-		children: [
-			/* @__PURE__ */ jsx$1("span", {
-				fg: COLOR.accent,
-				children: "✓ session id copied"
-			}),
-			" · ",
-			/* @__PURE__ */ jsx$1("span", {
-				fg: COLOR.warn,
-				children: keys.delete
-			}),
-			" delete · ",
-			/* @__PURE__ */ jsx$1("span", {
-				fg: COLOR.warn,
-				children: "esc"
-			}),
-			" close"
-		]
-	});
-	if (copyStatus === "failed") return /* @__PURE__ */ jsxs("text", {
-		fg: COLOR.dim,
-		children: [
-			/* @__PURE__ */ jsx$1("span", {
-				fg: COLOR.error,
-				children: "copy failed (terminal may not support OSC 52)"
-			}),
-			" · ",
-			/* @__PURE__ */ jsx$1("span", {
-				fg: COLOR.warn,
-				children: "esc"
-			}),
-			" close"
-		]
-	});
-	return /* @__PURE__ */ jsxs("text", {
-		fg: COLOR.dim,
-		children: [
-			hasGenerate && /* @__PURE__ */ jsxs(Fragment, { children: [/* @__PURE__ */ jsx$1("span", {
-				fg: COLOR.warn,
-				children: keys.generate
-			}), " title · "] }),
-			hasExport && /* @__PURE__ */ jsxs(Fragment, { children: [
-				/* @__PURE__ */ jsx$1("span", {
-					fg: COLOR.warn,
-					children: keys.markdown
-				}),
-				"/",
-				/* @__PURE__ */ jsx$1("span", {
-					fg: COLOR.warn,
-					children: keys.json
-				}),
-				" export · "
-			] }),
-			hasCompact && /* @__PURE__ */ jsxs(Fragment, { children: [/* @__PURE__ */ jsx$1("span", {
-				fg: COLOR.warn,
-				children: keys.compact
-			}), " compact · "] }),
-			/* @__PURE__ */ jsx$1("span", {
-				fg: COLOR.warn,
-				children: keys.delete
-			}),
-			" delete · ",
-			/* @__PURE__ */ jsx$1("span", {
-				fg: COLOR.warn,
-				children: keys.copy
-			}),
-			" copy · ",
-			/* @__PURE__ */ jsx$1("span", {
-				fg: COLOR.warn,
-				children: "esc"
-			}),
-			" close"
-		]
-	});
+	if (copyStatus === "copied") return /* @__PURE__ */ jsx$1(ModalHints, { hints: [
+		{
+			key: "",
+			label: "✓ session id copied",
+			labelColor: COLOR.accent
+		},
+		{
+			key: keys.delete,
+			label: "delete",
+			labelColor: COLOR.dim
+		},
+		{
+			key: "esc",
+			label: "close",
+			labelColor: COLOR.dim
+		}
+	] });
+	if (copyStatus === "failed") return /* @__PURE__ */ jsx$1(ModalHints, { hints: [{
+		key: "",
+		label: "copy failed (terminal may not support OSC 52)",
+		labelColor: COLOR.error
+	}, {
+		key: "esc",
+		label: "close",
+		labelColor: COLOR.dim
+	}] });
+	return /* @__PURE__ */ jsx$1(ModalHints, { hints: [
+		hasGenerate && {
+			key: keys.generate,
+			label: "title",
+			labelColor: COLOR.dim
+		},
+		hasExport && {
+			key: `${keys.markdown}/${keys.json}`,
+			label: "export",
+			labelColor: COLOR.dim
+		},
+		hasCompact && {
+			key: keys.compact,
+			label: "compact",
+			labelColor: COLOR.dim
+		},
+		{
+			key: keys.delete,
+			label: "delete",
+			labelColor: COLOR.dim
+		},
+		{
+			key: keys.copy,
+			label: "copy",
+			labelColor: COLOR.dim
+		},
+		{
+			key: "esc",
+			label: "close",
+			labelColor: COLOR.dim
+		}
+	] });
 }
 /**
 * Sum token + cost figures across every {@link SessionRun}. Preference
@@ -14434,8 +14926,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 +14939,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 +14959,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 +14978,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 +14997,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(() => {
@@ -14590,13 +15081,163 @@ function SettingsModal({ skillsCatalog: skillsCatalogProp, mcpsCatalog: mcpsCata
 	useEffect(() => {
 		setMcpRemoveArmed(null);
 	}, [focusedMcp?.config.name, activeTab]);
-	const oauthPasteActive = activeTab === "mcps" && focusedMcpStatus?.kind === "authorizing" && !!focusedMcpStatus.url;
+	const authorizingMcp = activeTab === "mcps" ? mcpsCatalog.map((entry) => ({
+		entry,
+		status: getMcpAuthStatus(authState, entry.config.name)
+	})).find(({ status }) => status.kind === "authorizing") : void 0;
+	const oauthPasteActive = !!authorizingMcp && authorizingMcp.status.kind === "authorizing" && !!authorizingMcp.status.url;
 	useEffect(() => {
-		if (!oauthPasteActive && !editingInputKey) inputRef.current?.focus();
-	}, [oauthPasteActive, editingInputKey]);
+		if (!oauthPasteActive && !editingInputKey && !authorizingMcp) inputRef.current?.focus();
+	}, [
+		oauthPasteActive,
+		editingInputKey,
+		authorizingMcp
+	]);
 	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);
@@ -14604,8 +15245,8 @@ function SettingsModal({ skillsCatalog: skillsCatalogProp, mcpsCatalog: mcpsCata
 		}
 		if (extInstallActive || skillInstallActive || skillImportAllActive) return;
 		if (mcpAddActive) return;
-		if (key.name === "escape" && oauthPasteActive && focusedMcp) {
-			actions?.onCancelLoginMcp?.(focusedMcp.config.name);
+		if (key.name === "escape" && oauthPasteActive && authorizingMcp) {
+			actions?.onCancelLoginMcp?.(authorizingMcp.entry.config.name);
 			return;
 		}
 		if (oauthPasteActive) return;
@@ -14659,51 +15300,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") {
@@ -14787,7 +15384,7 @@ function SettingsModal({ skillsCatalog: skillsCatalogProp, mcpsCatalog: mcpsCata
 				actions?.onLogoutMcp?.(focusedMcp.config.name);
 				return;
 			}
-			if (key.name === "escape" && focusedMcpStatus.kind === "authorizing") actions?.onCancelLoginMcp?.(focusedMcp.config.name);
+			if (key.name === "escape" && authorizingMcp) actions?.onCancelLoginMcp?.(authorizingMcp.entry.config.name);
 		}
 		if (key.ctrl && !key.shift && key.name === "l" && activeTab === "logs") {
 			key.preventDefault();
@@ -14908,10 +15505,11 @@ 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", {
+			!authorizingMcp && /* @__PURE__ */ jsx$1("box", {
 				style: {
 					border: true,
 					borderColor: COLOR.borderActive,
@@ -14922,14 +15520,26 @@ 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: () => {},
 					style: { flexGrow: 1 }
 				})
 			}),
-			/* @__PURE__ */ jsxs("scrollbox", {
+			authorizingMcp ? /* @__PURE__ */ jsx$1("box", {
+				style: {
+					flexGrow: 1,
+					flexDirection: "column"
+				},
+				children: /* @__PURE__ */ jsx$1(McpAuthorizingPanel, {
+					serverName: authorizingMcp.entry.config.name,
+					authUrl: authorizingMcp.status.kind === "authorizing" ? authorizingMcp.status.url ?? null : null,
+					maxLineWidth: 154,
+					inputFocused: true,
+					fill: true
+				})
+			}) : /* @__PURE__ */ jsxs("scrollbox", {
 				ref: scrollboxRef,
 				focusable: false,
 				style: {
@@ -14941,6 +15551,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 +15560,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 +15570,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 +15590,7 @@ function SettingsModal({ skillsCatalog: skillsCatalogProp, mcpsCatalog: mcpsCata
 						actionProbes
 					}),
 					activeTab === "mcps" && /* @__PURE__ */ jsx$1(McpsList, {
+						onRowClick: clickRowAt,
 						rows: mcpVisibleRows,
 						filteredCount: filteredMcps.length,
 						enabledSet: mcpsToggle.enabledSet,
@@ -15020,7 +15634,7 @@ function SettingsModal({ skillsCatalog: skillsCatalogProp, mcpsCatalog: mcpsCata
 					highlightBg: SURFACE.selection
 				})
 			}),
-			activeTab === "mcps" && focusedMcp && focusedMcpStatus && /* @__PURE__ */ jsx$1("box", {
+			activeTab === "mcps" && !authorizingMcp && focusedMcp && focusedMcpStatus && /* @__PURE__ */ jsx$1("box", {
 				style: { flexShrink: 0 },
 				children: renderMcpDetailPanel(focusedMcp, focusedMcpStatus, COLOR)
 			}),
@@ -15090,27 +15704,27 @@ function SettingsModal({ skillsCatalog: skillsCatalogProp, mcpsCatalog: mcpsCata
 							style: { flexGrow: 1 }
 						})
 					}),
-					/* @__PURE__ */ jsxs("text", {
-						fg: COLOR.mute,
-						children: [
-							/* @__PURE__ */ jsx$1("span", {
-								fg: COLOR.warn,
-								children: "↵"
-							}),
-							" save · ",
-							/* @__PURE__ */ jsx$1("span", {
-								fg: COLOR.warn,
-								children: "esc"
-							}),
-							` cancel · empty = ${editingInputItem.placeholder}`
-						]
-					})
+					/* @__PURE__ */ jsx$1(ModalHints, { hints: [
+						{
+							key: "↵",
+							label: "save"
+						},
+						{
+							key: "esc",
+							label: "cancel"
+						},
+						{
+							key: "",
+							label: `empty = ${editingInputItem.placeholder}`
+						}
+					] })
 				]
 			}),
 			/* @__PURE__ */ jsx$1("box", {
 				style: { flexShrink: 0 },
 				children: /* @__PURE__ */ jsx$1(Hints, {
 					activeTab,
+					authorizing: !!authorizingMcp,
 					focusedMcp,
 					focusedMcpRow,
 					focusedMcpStatus,
@@ -15183,9 +15797,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 +15808,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 +15830,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 +15841,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 +15852,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 +15864,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 +15875,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 +15896,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 +16046,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 +16057,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 +16069,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 +16118,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 +16202,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 +16384,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 +16429,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 +16444,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 +16476,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 +16546,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 +16562,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 +16584,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 +16595,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 +16631,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 +16865,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 +16883,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 +16909,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 +16960,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 +17003,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",
@@ -16379,29 +17065,7 @@ function EmptyRow({ label }) {
 	});
 }
 function renderMcpDetailPanel(entry, status, COLOR) {
-	if (status.kind === "authorizing") {
-		if (!status.url) return /* @__PURE__ */ jsxs("box", {
-			style: {
-				flexDirection: "column",
-				border: ["top"],
-				borderColor: COLOR.border,
-				paddingTop: 1
-			},
-			children: [/* @__PURE__ */ jsx$1("text", {
-				fg: COLOR.brand,
-				children: `Authorizing ${entry.config.name}`
-			}), /* @__PURE__ */ jsx$1("text", {
-				fg: COLOR.dim,
-				children: "Starting login flow…"
-			})]
-		});
-		return /* @__PURE__ */ jsx$1(McpAuthorizingPanel, {
-			serverName: entry.config.name,
-			authUrl: status.url,
-			maxLineWidth: 154,
-			inputFocused: true
-		});
-	}
+	if (status.kind === "authorizing") return null;
 	if (status.kind === "error") return /* @__PURE__ */ jsxs("box", {
 		style: {
 			flexDirection: "column",
@@ -16501,162 +17165,96 @@ function renderMcpErrors(errors, home, warnColor, dimColor) {
 		}, err.path))
 	});
 }
-function Hints({ activeTab, focusedMcp, focusedMcpRow, focusedMcpStatus, canRefreshSkills, canRefreshMcps, canEditExtension, canCreateExtension, canUpdateExtension, canRemoveExtension, canInstallExtension, canInstallSkill, canAddMcp, canRemoveSkill, canRemoveMcp, focusedExtensionExpandable }) {
+function Hints({ activeTab, authorizing = false, focusedMcp, focusedMcpRow, focusedMcpStatus, canRefreshSkills, canRefreshMcps, canEditExtension, canCreateExtension, canUpdateExtension, canRemoveExtension, canInstallExtension, canInstallSkill, canAddMcp, canRemoveSkill, canRemoveMcp, focusedExtensionExpandable }) {
 	const COLOR = useColors();
 	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 showCancel = activeTab === "mcps" && 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 +17394,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 +17405,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
@@ -17300,26 +17904,23 @@ function TurnDetailsModal({ turn, toolResultTurns = [], searchQuery, index, tota
 					children: "— no previewable content —"
 				})
 			}),
-			editing ? /* @__PURE__ */ jsxs("text", {
-				fg: COLOR.dim,
-				children: [
-					/* @__PURE__ */ jsx$1("span", {
-						fg: COLOR.warn,
-						children: "↵"
-					}),
-					" save · ",
-					/* @__PURE__ */ jsx$1("span", {
-						fg: COLOR.warn,
-						children: "shift+↵"
-					}),
-					" newline · ",
-					/* @__PURE__ */ jsx$1("span", {
-						fg: COLOR.warn,
-						children: "esc"
-					}),
-					" cancel"
-				]
-			}) : /* @__PURE__ */ jsx$1(ActionRow, {
+			editing ? /* @__PURE__ */ jsx$1(ModalHints, { hints: [
+				{
+					key: "↵",
+					label: "save",
+					labelColor: COLOR.dim
+				},
+				{
+					key: "shift+↵",
+					label: "newline",
+					labelColor: COLOR.dim
+				},
+				{
+					key: "esc",
+					label: "cancel",
+					labelColor: COLOR.dim
+				}
+			] }) : /* @__PURE__ */ jsx$1(ActionRow, {
 				pending,
 				copyStatus,
 				canCopy: fullText.length > 0,
@@ -17381,81 +17982,72 @@ function ActionRow({ pending, copyStatus, canCopy, canEdit, forkKey, deleteKey,
 			" cancel"
 		]
 	});
-	if (copyStatus === "copied") return /* @__PURE__ */ jsxs("text", {
-		fg: COLOR.dim,
-		children: [
-			/* @__PURE__ */ jsx$1("span", {
-				fg: COLOR.accent,
-				children: "✓ copied"
-			}),
-			" · ",
-			/* @__PURE__ */ jsx$1("span", {
-				fg: COLOR.warn,
-				children: forkKey
-			}),
-			" fork · ",
-			/* @__PURE__ */ jsx$1("span", {
-				fg: COLOR.warn,
-				children: deleteKey
-			}),
-			" delete · ",
-			/* @__PURE__ */ jsx$1("span", {
-				fg: canEdit ? COLOR.warn : COLOR.mute,
-				children: editKey
-			}),
-			canEdit ? " edit · " : " (no text) · ",
-			/* @__PURE__ */ jsx$1("span", {
-				fg: COLOR.warn,
-				children: "esc"
-			}),
-			" close"
-		]
-	});
-	if (copyStatus === "failed") return /* @__PURE__ */ jsxs("text", {
-		fg: COLOR.dim,
-		children: [
-			/* @__PURE__ */ jsx$1("span", {
-				fg: COLOR.error,
-				children: "copy failed (terminal may not support OSC 52)"
-			}),
-			" · ",
-			/* @__PURE__ */ jsx$1("span", {
-				fg: COLOR.warn,
-				children: "esc"
-			}),
-			" close"
-		]
-	});
-	return /* @__PURE__ */ jsxs("text", {
-		fg: COLOR.dim,
-		children: [
-			/* @__PURE__ */ jsx$1("span", {
-				fg: COLOR.warn,
-				children: forkKey
-			}),
-			" fork · ",
-			/* @__PURE__ */ jsx$1("span", {
-				fg: COLOR.warn,
-				children: deleteKey
-			}),
-			" delete · ",
-			/* @__PURE__ */ jsx$1("span", {
-				fg: canCopy ? COLOR.warn : COLOR.mute,
-				children: copyKey
-			}),
-			canCopy ? " copy · " : " (nothing to copy) · ",
-			/* @__PURE__ */ jsx$1("span", {
-				fg: canEdit ? COLOR.warn : COLOR.mute,
-				children: editKey
-			}),
-			canEdit ? " edit · " : " (no text) · ",
-			/* @__PURE__ */ jsx$1("span", {
-				fg: COLOR.warn,
-				children: "esc"
-			}),
-			" close"
-		]
-	});
+	if (copyStatus === "copied") return /* @__PURE__ */ jsx$1(ModalHints, { hints: [
+		{
+			key: "",
+			label: "✓ copied",
+			labelColor: COLOR.accent
+		},
+		{
+			key: forkKey,
+			label: "fork",
+			labelColor: COLOR.dim
+		},
+		{
+			key: deleteKey,
+			label: "delete",
+			labelColor: COLOR.dim
+		},
+		{
+			key: editKey,
+			label: canEdit ? "edit" : "(no text)",
+			keyColor: canEdit ? COLOR.warn : COLOR.mute,
+			labelColor: COLOR.dim
+		},
+		{
+			key: "esc",
+			label: "close",
+			labelColor: COLOR.dim
+		}
+	] });
+	if (copyStatus === "failed") return /* @__PURE__ */ jsx$1(ModalHints, { hints: [{
+		key: "",
+		label: "copy failed (terminal may not support OSC 52)",
+		labelColor: COLOR.error
+	}, {
+		key: "esc",
+		label: "close",
+		labelColor: COLOR.dim
+	}] });
+	return /* @__PURE__ */ jsx$1(ModalHints, { hints: [
+		{
+			key: forkKey,
+			label: "fork",
+			labelColor: COLOR.dim
+		},
+		{
+			key: deleteKey,
+			label: "delete",
+			labelColor: COLOR.dim
+		},
+		{
+			key: copyKey,
+			label: canCopy ? "copy" : "(nothing to copy)",
+			keyColor: canCopy ? COLOR.warn : COLOR.mute,
+			labelColor: COLOR.dim
+		},
+		{
+			key: editKey,
+			label: canEdit ? "edit" : "(no text)",
+			keyColor: canEdit ? COLOR.warn : COLOR.mute,
+			labelColor: COLOR.dim
+		},
+		{
+			key: "esc",
+			label: "close",
+			labelColor: COLOR.dim
+		}
+	] });
 }
 function buildPreviewEntries(turns, limit) {
 	const entries = [];
@@ -17592,10 +18184,20 @@ const BASH_PAINT_INTERVAL_MS = 100;
 const BASH_RESULT_MAX_BYTES = 32 * 1024;
 /** Rolling-tail window while output streams — matches the renderer's bash display cap. */
 const BASH_STREAM_TAIL_LINES = 10;
-/** Last `n` lines of `text` (terminal-style rolling tail for live bash output). */
+/**
+* Last `n` lines of `text` (terminal-style rolling tail for live bash
+* output). Backward newline scan, not `split` — this runs per output
+* chunk against the full accumulation (up to 1MB), and re-splitting the
+* whole snapshot every chunk is O(n²) in total streamed bytes.
+*/
 function lastLines(text, n) {
-	const lines = text.split("\n");
-	return lines.length <= n ? text : lines.slice(lines.length - n).join("\n");
+	let idx = text.length;
+	for (let i = 0; i < n; i++) {
+		if (idx === 0) return text;
+		idx = text.lastIndexOf("\n", idx - 1);
+		if (idx === -1) return text;
+	}
+	return text.slice(idx + 1);
 }
 /**
 * Poll cadence for out-of-band extension install detection (see the
@@ -17606,6 +18208,14 @@ const EXTENSION_WATCH_POLL_MS = 3e3;
 /** LRU bound for cross-session search indexes (full lowercased text per session). */
 const SESSION_SEARCH_INDEX_CACHE_MAX = 64;
 /**
+* Byte budget for the same cache, using each handle's indexed-text size
+* (reported by the worker build). The count cap alone lets 64 huge
+* sessions pin hundreds of MB (index copy in the worker, plus any
+* main-thread fallback indexes); the budget evicts LRU-first once the
+* summed estimate crosses it, keeping worst-case retention predictable.
+*/
+const SESSION_SEARCH_INDEX_CACHE_MAX_BYTES = 64 * 1024 * 1024;
+/**
 * Surface failures that are normally silenced (teardown / save) when the
 * `ZIDANE_DEBUG` env var is set. Logging via `console.error` would otherwise
 * trigger OpenTUI's error console overlay and clutter the UI for end users.
@@ -17847,6 +18457,9 @@ function AppShell() {
 		if (renderer.targetFps !== fps) renderer.targetFps = fps;
 		if (renderer.maxFps !== fps) renderer.maxFps = fps;
 	}, [renderer, settings.targetFps]);
+	useEffect(() => {
+		if (renderer.useMouse !== settings.mouseInteractions) renderer.useMouse = settings.mouseInteractions;
+	}, [renderer, settings.mouseInteractions]);
 	const lastCopiedRef = useRef("");
 	useSelectionHandler((selection) => {
 		if (selection.isDragging) return;
@@ -18258,6 +18871,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
@@ -18577,9 +19206,17 @@ function AppShell() {
 		store,
 		getAllowedTokens: () => chatReferenceTokensRef.current
 	}), [store]);
+	const visibleChatCatalogCache = useRef(/* @__PURE__ */ new WeakMap());
 	const visibleChatCatalog = useCallback((catalog) => {
-		const currentId = currentSessionIdRef.current;
-		return currentId ? catalog.filter((entry) => entry.id !== currentId) : [...catalog];
+		const currentId = currentSessionIdRef.current ?? null;
+		const hit = visibleChatCatalogCache.current.get(catalog);
+		if (hit && hit.currentId === currentId) return hit.result;
+		const result = currentId ? catalog.filter((entry) => entry.id !== currentId) : [...catalog];
+		visibleChatCatalogCache.current.set(catalog, {
+			currentId,
+			result
+		});
+		return result;
 	}, []);
 	const ensureChatCatalog = useCallback(async () => {
 		const [projectList, allList] = await Promise.all([listSessionMeta(store, { projectRoot: projectDir }), listSessionMeta(store)]);
@@ -19181,8 +19818,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 +20087,7 @@ function AppShell() {
 			});
 		});
 		agent.hooks.hook("child:stream:thinking", ({ delta, childId, depth, turnId }) => {
+			clearRetryInfo(childId);
 			stream.queueStreamDelta("thinking", delta, {
 				childId,
 				depth,
@@ -19439,6 +20095,7 @@ function AppShell() {
 			});
 		});
 		agent.hooks.hook("child:stream:text", ({ delta, childId, depth, turnId }) => {
+			clearRetryInfo(childId);
 			stream.queueStreamDelta("markdown", delta, {
 				childId,
 				depth,
@@ -19512,6 +20169,7 @@ function AppShell() {
 		});
 		agent.hooks.hook("agent:done", () => {
 			pendingAnnotationsRef.current.clear();
+			pruneTodosByRun(session);
 		});
 		subscribeMcpToolsCache(agent.hooks, { dataDir });
 		return agent;
@@ -19578,7 +20236,9 @@ function AppShell() {
 								const cachedLive = liveSessionSearchIndexRef.current;
 								if (cachedLive?.sessionId === meta.id && cachedLive.updatedAt === meta.updatedAt && cachedLive.turnCount === live.turns.length) index = cachedLive.index;
 								else {
+									const staleLive = liveSessionSearchIndexRef.current;
 									index = await (historySearchWorkerRef.current ??= new HistorySearchWorkerClient()).build(live.turns, abortController.signal);
+									if (staleLive) historySearchWorkerRef.current?.release(staleLive.index);
 									liveSessionSearchIndexRef.current = {
 										sessionId: meta.id,
 										updatedAt: meta.updatedAt,
@@ -19593,15 +20253,25 @@ function AppShell() {
 							} else {
 								const turns = await store.getTurns(meta.id);
 								index = await (historySearchWorkerRef.current ??= new HistorySearchWorkerClient()).build(turns, abortController.signal);
+								historySearchWorkerRef.current?.slim(index);
 								const cache = sessionSearchCacheRef.current;
+								const stale = cache.get(meta.id);
+								if (stale) historySearchWorkerRef.current?.release(stale.index);
 								cache.set(meta.id, {
 									updatedAt: meta.updatedAt,
 									index
 								});
-								while (cache.size > SESSION_SEARCH_INDEX_CACHE_MAX) {
+								let totalBytes = 0;
+								for (const entry of cache.values()) totalBytes += entry.index.bytes;
+								while (cache.size > 1 && (cache.size > SESSION_SEARCH_INDEX_CACHE_MAX || totalBytes > SESSION_SEARCH_INDEX_CACHE_MAX_BYTES)) {
 									const oldest = cache.keys().next().value;
 									if (oldest === void 0) break;
+									const evicted = cache.get(oldest);
 									cache.delete(oldest);
+									if (evicted) {
+										totalBytes -= evicted.index.bytes;
+										historySearchWorkerRef.current?.release(evicted.index);
+									}
 								}
 							}
 							if (generation !== sessionSearchGenerationRef.current) return;
@@ -19609,7 +20279,24 @@ function AppShell() {
 							if (match) matches.set(meta.id, match);
 						} catch (error) {
 							if (abortController.signal.aborted) throw abortController.signal.reason instanceof DOMException ? abortController.signal.reason : error;
-							debugLog("session content search skipped a session", error);
+							const broken = sessionSearchCacheRef.current.get(meta.id);
+							if (broken) {
+								sessionSearchCacheRef.current.delete(meta.id);
+								historySearchWorkerRef.current?.release(broken.index);
+								try {
+									const turns = await store.getTurns(meta.id);
+									const retry = await (historySearchWorkerRef.current ??= new HistorySearchWorkerClient()).build(turns, abortController.signal);
+									try {
+										const match = await historySearchWorkerRef.current.history(retry, query, 3, abortController.signal);
+										if (match) matches.set(meta.id, match);
+									} finally {
+										historySearchWorkerRef.current?.release(retry);
+									}
+								} catch (retryError) {
+									if (abortController.signal.aborted) throw abortController.signal.reason instanceof DOMException ? abortController.signal.reason : retryError;
+									debugLog("session content search retry failed", retryError);
+								}
+							} else debugLog("session content search skipped a session", error);
 						}
 						done++;
 						if (done === sessions.length || done % 4 === 0) setSessionContentSearchProgress({
@@ -20759,6 +21446,7 @@ function AppShell() {
 		const ctx = {
 			args: invocation.args,
 			argv: invocation.argv,
+			invokedAs: invocation.invokedAs,
 			...attachments.length > 0 ? { attachments: attachments.map((a) => ({
 				name: a.name,
 				mediaType: a.mediaType,
@@ -21508,6 +22196,10 @@ function AppShell() {
 	const onLoginMcp = useCallback(async (name) => {
 		const entry = mcpsCatalogRef.current.find((d) => d.config.name === name);
 		if (!entry) return;
+		for (const [other, ctrl] of mcpLoginAbortsRef.current) if (other !== name && !ctrl.signal.aborted) {
+			debugLog(`mcp-login: refusing concurrent login for "${name}"`, `"${other}" is still authorizing`);
+			return;
+		}
 		mcpLoginAbortsRef.current.get(name)?.abort();
 		const ac = new AbortController();
 		mcpLoginAbortsRef.current.set(name, ac);
@@ -21519,6 +22211,7 @@ function AppShell() {
 			await loginMcpServer(entry.config, {
 				store: mcpCredentialStore,
 				signal: ac.signal,
+				renderCallbackPage: renderDefaultCallbackPage,
 				hooks: agentRef.current?.hooks,
 				onAuthorizationUrl: (url) => tryOpenBrowser(url.toString())
 			});
@@ -21539,9 +22232,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"
@@ -21610,6 +22304,7 @@ function AppShell() {
 		(async () => {
 			const cached = transcriptSearchIndexRef.current;
 			const index = cached?.sessionId === session.id && cached.events === events ? cached.index : await (historySearchWorkerRef.current ??= new HistorySearchWorkerClient()).build(turns, abortController.signal);
+			if (cached && cached.index !== index) historySearchWorkerRef.current?.release(cached.index);
 			transcriptSearchIndexRef.current = {
 				sessionId: session.id,
 				events,
@@ -21737,7 +22432,14 @@ function AppShell() {
 			store,
 			...source.projectRoot ? { projectRoot: source.projectRoot } : {}
 		});
-		fork.setTurns(slice);
+		const rehomed = await rehomePersistedStubs(slice, resolvePersistDir({
+			userDir: cacheDir,
+			sessionId: source.id
+		}), resolvePersistDir({
+			userDir: cacheDir,
+			sessionId: fork.id
+		}));
+		fork.setTurns(rehomed);
 		fork.setRuns(inheritedRuns);
 		try {
 			await fork.save();
@@ -21750,7 +22452,8 @@ function AppShell() {
 	}, [
 		picked,
 		store,
-		activateSession
+		activateSession,
+		cacheDir
 	]);
 	const onDeleteTurn = useCallback(async (turnId) => {
 		const session = sessionRef.current;
@@ -22094,9 +22797,7 @@ function AppShell() {
 		onExportSession,
 		keybindings
 	]);
-	const openSelectedTurn = useCallback(() => {
-		const id = selectedTurnId;
-		if (!id) return;
+	const openTurnDetails = useCallback((id) => {
 		const session = sessionRef.current;
 		if (!session) return;
 		const turn = session.turns.find((t) => t.id === id);
@@ -22127,7 +22828,6 @@ function AppShell() {
 		}));
 	}, [
 		modal,
-		selectedTurnId,
 		turnIds,
 		transcriptSearchMode,
 		transcriptSearchQuery,
@@ -22137,7 +22837,54 @@ function AppShell() {
 		onEditTurn,
 		keybindings
 	]);
+	const openSelectedTurn = useCallback(() => {
+		if (selectedTurnId) openTurnDetails(selectedTurnId);
+	}, [selectedTurnId, openTurnDetails]);
+	const onTranscriptSelectTurn = useCallback((id) => {
+		if (!(transcriptSearchMode ? transcriptSearchTurnIds : turnIds).includes(id)) return false;
+		setSelectedTurnId(id);
+		return true;
+	}, [
+		transcriptSearchMode,
+		transcriptSearchTurnIds,
+		turnIds
+	]);
+	const onTranscriptOpenTurn = useCallback((id) => {
+		if (!(transcriptSearchMode ? transcriptSearchTurnIds : turnIds).includes(id)) return false;
+		setSelectedTurnId(id);
+		openTurnDetails(id);
+		return true;
+	}, [
+		transcriptSearchMode,
+		transcriptSearchTurnIds,
+		turnIds,
+		openTurnDetails
+	]);
 	useKeyboard((key) => {
+		if (showQuitConfirmRef.current) {
+			if (key.name === "escape") {
+				setShowQuitConfirm(false);
+				setQuitConfirmSelected("cancel");
+				return;
+			}
+			if (key.name === "c" && key.ctrl && !key.shift) {
+				renderer.destroy();
+				return;
+			}
+			if (key.name === "return") {
+				if (quitConfirmSelectedRef.current === "quit") renderer.destroy();
+				else {
+					setShowQuitConfirm(false);
+					setQuitConfirmSelected("cancel");
+				}
+				return;
+			}
+			if (key.name === "tab" || key.name === "left" || key.name === "right") {
+				setQuitConfirmSelected((prev) => prev === "cancel" ? "quit" : "cancel");
+				return;
+			}
+			return;
+		}
 		if (modal.isOpen) return;
 		if (transcriptSearchMode && screen === "chat") {
 			if (key.name === "escape") onTranscriptSearchModeChange(false);
@@ -22349,7 +23096,7 @@ function AppShell() {
 			}));
 			return;
 		}
-		if (key.ctrl && !key.shift && !key.meta && (key.name === "c" || key.name === "x") && !showQuitConfirmRef.current) {
+		if (key.ctrl && !key.shift && !key.meta && (key.name === "c" || key.name === "x")) {
 			const editor = renderer.currentFocusedEditor;
 			if (editor?.hasSelection()) {
 				const text = editor.getSelectedText();
@@ -22358,30 +23105,6 @@ function AppShell() {
 				return;
 			}
 		}
-		if (showQuitConfirmRef.current) {
-			if (key.name === "escape") {
-				setShowQuitConfirm(false);
-				setQuitConfirmSelected("cancel");
-				return;
-			}
-			if (key.name === "c" && key.ctrl && !key.shift) {
-				renderer.destroy();
-				return;
-			}
-			if (key.name === "return") {
-				if (quitConfirmSelectedRef.current === "quit") renderer.destroy();
-				else {
-					setShowQuitConfirm(false);
-					setQuitConfirmSelected("cancel");
-				}
-				return;
-			}
-			if (key.name === "tab" || key.name === "left" || key.name === "right") {
-				setQuitConfirmSelected((prev) => prev === "cancel" ? "quit" : "cancel");
-				return;
-			}
-			return;
-		}
 		if (key.name === "c" && key.ctrl && !key.shift) {
 			const mode = settingsRef.current.ctrlCBehavior;
 			if (mode === "quit") {
@@ -22635,6 +23358,8 @@ function AppShell() {
 						enterSelectsCompletion: (providerId) => providerId === "chats",
 						onPopupOpenChange,
 						selectedTurnId,
+						onSelectTurn: onTranscriptSelectTurn,
+						onOpenTurn: onTranscriptOpenTurn,
 						transcriptSearchMode,
 						transcriptSearchQuery,
 						transcriptSearchEvents,
@@ -22655,17 +23380,19 @@ 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,
+				contextKey: keybindings.openContextPanel
 			}),
 			showQuitConfirm && /* @__PURE__ */ jsxs("box", {
 				position: "absolute",
 				top: "50%",
 				left: "50%",
 				marginTop: -3,
-				marginLeft: -18,
-				width: 36,
+				marginLeft: -21,
+				width: 42,
 				height: 7,
 				borderStyle: "rounded",
 				borderColor: COLOR.warn,
@@ -22674,23 +23401,52 @@ function AppShell() {
 				alignItems: "center",
 				justifyContent: "center",
 				gap: 1,
-				children: [/* @__PURE__ */ jsx$1("text", { children: "Quit zidane?" }), /* @__PURE__ */ jsxs("box", {
-					flexDirection: "row",
-					gap: 2,
-					children: [/* @__PURE__ */ jsx$1("box", {
-						backgroundColor: quitConfirmSelected === "cancel" ? COLOR.accent : void 0,
-						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,
-						children: /* @__PURE__ */ jsx$1("text", {
-							fg: quitConfirmSelected === "quit" ? SURFACE.modal : COLOR.dim,
-							children: " Quit "
-						})
-					})]
-				})]
+				children: [
+					/* @__PURE__ */ jsx$1("text", { children: "Quit zidane?" }),
+					/* @__PURE__ */ jsxs("box", {
+						flexDirection: "row",
+						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 "
+							})
+						})]
+					}),
+					/* @__PURE__ */ jsx$1(ModalHints, { hints: [
+						{
+							key: "tab",
+							label: "switch"
+						},
+						{
+							key: "↵",
+							label: "confirm"
+						},
+						{
+							key: "esc",
+							label: "cancel"
+						}
+					] })
+				]
 			})
 		]
 	});
@@ -23107,30 +23863,27 @@ function EffortPickerModal({ current, supportsAdaptive, onPick }) {
 					highlightBg: SURFACE.selection
 				}, level.id))
 			}),
-			/* @__PURE__ */ jsxs("text", {
-				fg: COLOR.dim,
-				children: [
-					/* @__PURE__ */ jsx$1("span", {
-						fg: COLOR.warn,
-						children: "↑↓"
-					}),
-					" navigate · ",
-					/* @__PURE__ */ jsx$1("span", {
-						fg: COLOR.warn,
-						children: "↵"
-					}),
-					" select · ",
-					/* @__PURE__ */ jsx$1("span", {
-						fg: COLOR.warn,
-						children: "esc"
-					}),
-					" close · ",
-					/* @__PURE__ */ jsx$1("span", {
-						fg: COLOR.mute,
-						children: `${filtered.length} / ${levels.length} level${levels.length === 1 ? "" : "s"}`
-					})
-				]
-			})
+			/* @__PURE__ */ jsx$1(ModalHints, { hints: [
+				{
+					key: "↑↓",
+					label: "navigate",
+					labelColor: COLOR.dim
+				},
+				{
+					key: "↵",
+					label: "select",
+					labelColor: COLOR.dim
+				},
+				{
+					key: "esc",
+					label: "close",
+					labelColor: COLOR.dim
+				},
+				{
+					key: "",
+					label: `${filtered.length} / ${levels.length} level${levels.length === 1 ? "" : "s"}`
+				}
+			] })
 		]
 	});
 }
@@ -23221,20 +23974,13 @@ function ToggleListModal({ catalog, keyOf, settingKey, gcKeys, title, renderDeta
 		children: [
 			preamble,
 			emptyState,
-			/* @__PURE__ */ jsxs("text", {
-				fg: COLOR.mute,
-				children: [
-					onRefresh && /* @__PURE__ */ jsxs("span", { children: [/* @__PURE__ */ jsx$1("span", {
-						fg: COLOR.warn,
-						children: "ctrl+r"
-					}), " refresh · "] }),
-					/* @__PURE__ */ jsx$1("span", {
-						fg: COLOR.warn,
-						children: "esc"
-					}),
-					" close"
-				]
-			})
+			/* @__PURE__ */ jsx$1(ModalHints, { hints: [onRefresh && {
+				key: "ctrl+r",
+				label: "refresh"
+			}, {
+				key: "esc",
+				label: "close"
+			}] })
 		]
 	});
 	return /* @__PURE__ */ jsxs(Modal, {
@@ -23270,30 +24016,24 @@ function ToggleListModal({ catalog, keyOf, settingKey, gcKeys, title, renderDeta
 					}, name);
 				})
 			}),
-			/* @__PURE__ */ jsxs("text", {
-				fg: COLOR.mute,
-				children: [
-					/* @__PURE__ */ jsx$1("span", {
-						fg: COLOR.warn,
-						children: "↑↓"
-					}),
-					" navigate · ",
-					/* @__PURE__ */ jsx$1("span", {
-						fg: COLOR.warn,
-						children: "↵"
-					}),
-					" toggle · ",
-					onRefresh && /* @__PURE__ */ jsxs("span", { children: [/* @__PURE__ */ jsx$1("span", {
-						fg: COLOR.warn,
-						children: "ctrl+r"
-					}), " refresh · "] }),
-					/* @__PURE__ */ jsx$1("span", {
-						fg: COLOR.warn,
-						children: "esc"
-					}),
-					" close"
-				]
-			})
+			/* @__PURE__ */ jsx$1(ModalHints, { hints: [
+				{
+					key: "↑↓",
+					label: "navigate"
+				},
+				{
+					key: "↵",
+					label: "toggle"
+				},
+				onRefresh && {
+					key: "ctrl+r",
+					label: "refresh"
+				},
+				{
+					key: "esc",
+					label: "close"
+				}
+			] })
 		]
 	});
 }
@@ -23603,20 +24343,13 @@ function McpsSettingsModal({ catalog, errors, toolsByServer, onLogin, onLogout,
 					children: " { \"mcpServers\": { ... } } "
 				}), "wrapper from Claude Code / Cursor also works."]
 			}),
-			/* @__PURE__ */ jsxs("text", {
-				fg: COLOR.mute,
-				children: [
-					onRefresh && /* @__PURE__ */ jsxs("span", { children: [/* @__PURE__ */ jsx$1("span", {
-						fg: COLOR.warn,
-						children: "r"
-					}), " refresh · "] }),
-					/* @__PURE__ */ jsx$1("span", {
-						fg: COLOR.warn,
-						children: "esc"
-					}),
-					" close"
-				]
-			})
+			/* @__PURE__ */ jsx$1(ModalHints, { hints: [onRefresh && {
+				key: "r",
+				label: "refresh"
+			}, {
+				key: "esc",
+				label: "close"
+			}] })
 		]
 	});
 	const groups = [];
@@ -23671,8 +24404,7 @@ function McpsSettingsModal({ catalog, errors, toolsByServer, onLogin, onLogout,
 				focusedEntry,
 				focusedStatus,
 				expanded,
-				showRefresh: !!onRefresh,
-				COLOR
+				showRefresh: !!onRefresh
 			})
 		]
 	});
@@ -23903,7 +24635,7 @@ function renderDetailPanel(entry, status, COLOR) {
 	});
 	return null;
 }
-function renderActionHints({ focusedRow, focusedEntry, focusedStatus, expanded, showRefresh, COLOR }) {
+function renderActionHints({ focusedRow, focusedEntry, focusedStatus, expanded, showRefresh }) {
 	const effectiveStatus = focusedStatus ?? { kind: "idle" };
 	const onServerRow = focusedRow?.kind === "server";
 	const canL = onServerRow && focusedEntry ? canLogin(focusedEntry, effectiveStatus) : false;
@@ -23911,77 +24643,44 @@ function renderActionHints({ focusedRow, focusedEntry, focusedStatus, expanded,
 	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: [
-			/* @__PURE__ */ jsx$1("span", {
-				fg: COLOR.warn,
-				children: "↑↓"
-			}),
-			" navigate · ",
-			/* @__PURE__ */ jsx$1("span", {
-				fg: COLOR.warn,
-				children: "↵"
-			}),
-			" toggle",
-			canExpand && /* @__PURE__ */ jsxs("span", { children: [
-				" · ",
-				/* @__PURE__ */ jsx$1("span", {
-					fg: COLOR.warn,
-					children: "→"
-				}),
-				" expand"
-			] }),
-			canCollapse && /* @__PURE__ */ jsxs("span", { children: [
-				" · ",
-				/* @__PURE__ */ jsx$1("span", {
-					fg: COLOR.warn,
-					children: "←"
-				}),
-				" collapse"
-			] }),
-			canL && /* @__PURE__ */ jsxs("span", { children: [
-				" · ",
-				/* @__PURE__ */ jsx$1("span", {
-					fg: COLOR.warn,
-					children: "l"
-				}),
-				" login"
-			] }),
-			canO && /* @__PURE__ */ jsxs("span", { children: [
-				" · ",
-				/* @__PURE__ */ jsx$1("span", {
-					fg: COLOR.warn,
-					children: "o"
-				}),
-				" logout"
-			] }),
-			showRefresh && /* @__PURE__ */ jsxs("span", { children: [
-				" · ",
-				/* @__PURE__ */ jsx$1("span", {
-					fg: COLOR.warn,
-					children: "r"
-				}),
-				" refresh"
-			] }),
-			canCancel && /* @__PURE__ */ jsxs("span", { children: [
-				" · ",
-				/* @__PURE__ */ jsx$1("span", {
-					fg: COLOR.warn,
-					children: "esc"
-				}),
-				" cancel"
-			] }),
-			!canCancel && /* @__PURE__ */ jsxs("span", { children: [
-				" · ",
-				/* @__PURE__ */ jsx$1("span", {
-					fg: COLOR.warn,
-					children: "esc"
-				}),
-				" close"
-			] })
-		]
-	});
+	return /* @__PURE__ */ jsx$1(ModalHints, { hints: [
+		{
+			key: "↑↓",
+			label: "navigate"
+		},
+		{
+			key: "↵",
+			label: "toggle"
+		},
+		canExpand && {
+			key: "→",
+			label: "expand"
+		},
+		canCollapse && {
+			key: "←",
+			label: "collapse"
+		},
+		canL && {
+			key: "l",
+			label: "login"
+		},
+		canO && {
+			key: "o",
+			label: "logout"
+		},
+		showRefresh && {
+			key: "r",
+			label: "refresh"
+		},
+		canCancel && {
+			key: "esc",
+			label: "cancel"
+		},
+		!canCancel && {
+			key: "esc",
+			label: "close"
+		}
+	] });
 }
 function renderErrors(errors, home, warnColor) {
 	if (!errors || errors.length === 0) return null;
@@ -24206,6 +24905,7 @@ async function runTui(options = {}) {
 		debounceDelay: 0,
 		targetFps: bootFps,
 		maxFps: bootFps,
+		useMouse: config.initialSettings.mouseInteractions ?? DEFAULT_SETTINGS.mouseInteractions,
 		gatherStats
 	});
 	bootTick("runTui:after-createCliRenderer");