zidane 5.1.13 → 5.1.15

package/dist/tui.js

@@ -1,18 +1,19 @@
-import { S as resolvePersistDir, b as cleanupPersistedSession, d as createAgent } from "./tools-BG2wMa3X.js";
-import { s as McpOAuthProvider, t as connectMcpServers } from "./mcp-CUt-N8zn.js";
-import { C as summaryToTurn, a as selectFilesFromSession, r as buildPostCompactAttachments, s as compactConversation, t as loginMcpServer } from "./login-Cc6Q-Fpu.js";
+import { S as resolvePersistDir, b as cleanupPersistedSession, d as createAgent } from "./tools-Duptt9yy.js";
+import { o as errorMessage } from "./errors-COmsomd5.js";
+import { s as McpOAuthProvider, t as connectMcpServers } from "./mcp-B1psg7jf.js";
+import { C as summaryToTurn, a as selectFilesFromSession, r as buildPostCompactAttachments, s as compactConversation, t as loginMcpServer } from "./login-DrnEZZVv.js";
 import { n as formatTokenUsage } from "./stats-DgOvY7wd.js";
-import { n as loadSession, t as createSession } from "./session-DtLD1Sl1.js";
+import { n as loadSession, t as createSession } from "./session-DOJgRXvF.js";
 import { createTuiStore } from "./session/sqlite.js";
-import { $ as getMcpAuthStatus, $t as toolCallPreview, A as isOnSafelist, B as filterModelCatalog, Bn as setProviderCredential, Bt as eventsFromTurns, C as writeSessionExport, Cn as uniqueSkillNamesFromReferences, Ct as SettingsProvider, E as useSafeModeQueue, Ft as ConfigProvider, Gt as listSessionMeta, H as buildMcpServers, Ht as isTurnHighlighted, I as splitPromptSegments, It as useConfig, Jn as getContextWindow, L as runOAuthLogin, Lt as resolveConfig, Mn as tryOpenBrowser, Nn as shouldAutoCompact, O as addToSafelist, Ot as resolveChipColor, P as suggestSafelistEntry, Pn as detectAuth, Q as useMcpAuthState, R as supportsOAuth, Sn as createSkillsCompletionProvider, St as SETTINGS_TOGGLES, T as useSafeModeActions, Tn as createFilesCompletionProvider, Tt as useSettings, Ut as isVisible, V as indexOfEntry, Vt as isEditErrorResult, W as discoverProjectMcps, Wt as lastContextSizeFromTurns, X as McpAuthProvider, Xn as modelSupportsReasoning, Xt as stripSpawnTokensLine, Yt as selectableTurnIds, Z as useMcpAuthDispatch, Zt as sumRunCosts, _ as useStreamBuffer, _t as shortId, a as TOOL_DISPLAY, at as createInteractionTools, b as discoverProjectSkills, br as buildPlanSystem, bt as DEFAULT_SETTINGS, c as ThemeProvider, ct as pendingInteractionsFromTurns, d as useSurfaces, dt as useInteractionsQueue, en as toolResultText, er as piIdOf, g as turnContextSize, gn as matchesBinding, gt as fmtTokens, h as finalizeStreamingMarkdownForOwner, ht as compactPath, i as turnAsText, it as buildResumedToolResultsTurn, jn as useCompletion, k as getSafelist, kt as resolveTheme, l as useColors, m as finalizeStreamingMarkdown, mn as ensureKeybindingsFile, mt as ageString, n as deleteTurnSafely, nn as buildContextualDiff, nt as InteractionsProvider, o as displayNameFor, on as extractEditPayload, or as accentColor, p as useTheme, pt as generateSessionTitle, q as createFileMcpCredentialStore, qt as marginTopFor, r as truncateTurnsAt, rn as buildUnifiedDiff, s as formatToolCall, sn as filetypeFromPath, st as makeRequestInteraction, tn as turnSelectionOwnership, u as useSelectStyle, un as findGitRoot, ut as useInteractionsActions, v as buildSkillsConfig, vt as listProjectFiles, w as SafeModeProvider, wt as clampFps, xt as SETTINGS_CHOICES, y as defaultSkillScanPaths, yr as buildBuildSystem, yt as useEnabledToggleSet, z as buildModelCatalog, zt as deriveSessionTitle } from "./turn-operations-CDmQ2h-T.js";
+import { $ as useMcpAuthState, $n as setProviderCredential, $t as lastContextSizeFromTurns, A as getSafelist, At as useSettings, B as buildModelCatalog, Bn as useCompletion, Bt as createDiscoverySlot, Cn as ensureKeybindingsFile, Ct as listProjectFiles, D as useSafeModeQueue, Dt as SETTINGS_TOGGLES, E as useSafeModeActions, Et as SETTINGS_CHOICES, F as suggestSafelistEntry, G as discoverProjectMcps, Gn as bootTick, Gt as useConfig, H as indexOfEntry, Hn as buildLinearRamp, Ht as useDiscovery, J as createFileMcpCredentialStore, Jt as deriveSessionTitle, Kn as shouldAutoCompact, Kt as resolveConfig, L as splitPromptSegments, Mn as uniqueSkillNamesFromReferences, Mr as buildBuildSystem, Nr as buildPlanSystem, Nt as resolveChipColor, Ot as SettingsProvider, Pn as createFilesCompletionProvider, Pt as resolveTheme, Q as useMcpAuthDispatch, Qt as isVisible, R as runOAuthLogin, St as shortId, T as SafeModeProvider, Tn as matchesBinding, Tt as DEFAULT_SETTINGS, U as buildMcpServers, Un as tryOpenBrowser, Ut as useDiscoveryOptional, V as filterModelCatalog, Vn as blendHsl, Vt as DiscoveryProvider, Wt as ConfigProvider, Xt as isEditErrorResult, Yt as eventsFromTurns, Z as McpAuthProvider, Zt as isTurnHighlighted, _ as turnContextSize, a as computeTurnAnchors, an as stripSpawnTokensLine, b as defaultSkillScanPaths, bt as compactPath, c as formatToolCall, cn as toolCallPreview, d as useSelectStyle, dn as buildContextualDiff, en as listSessionMeta, et as getMcpAuthStatus, f as useSurfaces, fn as buildUnifiedDiff, ft as useInteractionsActions, g as finalizeStreamingMarkdownForOwner, gn as filetypeFromPath, gt as truncateTrailing, h as finalizeStreamingMarkdown, hn as extractEditPayload, ht as hintsLength, i as turnAsText, in as selectableTurnIds, it as InteractionsProvider, j as isOnSafelist, jn as createSkillsCompletionProvider, k as addToSafelist, kt as clampFps, l as ThemeProvider, ln as toolResultText, lr as modelSupportsReasoning, lt as makeRequestInteraction, m as useTheme, mt as clipHintsToWidth, n as deleteTurnSafely, nn as marginTopFor, nt as splitMarkdownCodeBlocks, o as TOOL_DISPLAY, on as sumRunCosts, ot as buildResumedToolResultsTurn, pr as piIdOf, pt as useInteractionsQueue, qn as detectAuth, r as truncateTurnsAt, s as displayNameFor, sr as getContextWindow, st as createInteractionTools, u as useColors, un as turnSelectionOwnership, ut as pendingInteractionsFromTurns, v as useStreamBuffer, vt as generateSessionTitle, w as writeSessionExport, wt as useEnabledToggleSet, x as discoverProjectSkills, xt as fmtTokens, y as buildSkillsConfig, yn as findGitRoot, yr as accentColor, yt as ageString, z as supportsOAuth } from "./turn-operations-DNKpDGQi.js";
 import { spawn } from "node:child_process";
 import { Buffer } from "node:buffer";
 import * as fs from "node:fs";
 import { homedir } from "node:os";
 import { createContext, createElement, memo, useCallback, useContext, useEffect, useMemo, useRef, useState } from "react";
+import { Fragment, jsx, jsxs } from "@opentui/react/jsx-runtime";
 import { BoxRenderable, CodeRenderable, RGBA, SyntaxStyle, TextRenderable, addDefaultParsers, createCliRenderer, decodePasteBytes, defaultTextareaKeyBindings, getTreeSitterClient, stripAnsiSequences } from "@opentui/core";
 import { createRoot, useKeyboard, useRenderer, useSelectionHandler, useTerminalDimensions } from "@opentui/react";
-import { Fragment, jsx, jsxs } from "@opentui/react/jsx-runtime";
 //#region src/tui/modal.tsx
 const ModalContext = createContext(null);
 function ModalRoot({ children }) {
@@ -318,95 +319,6 @@ function writeToClipboard(text) {
 	return osc || helper;
 }
 //#endregion
-//#region src/tui/color-gradient.ts
-/** Parse `#rrggbb` (case-insensitive) into `[r, g, b]` 0–255 integers. */
-function parseHex(hex) {
-	const h = hex.replace("#", "");
-	return [
-		Number.parseInt(h.slice(0, 2), 16),
-		Number.parseInt(h.slice(2, 4), 16),
-		Number.parseInt(h.slice(4, 6), 16)
-	];
-}
-/** Convert sRGB 0–255 → HSL 0–1. */
-function rgbToHsl(r, g, b) {
-	r /= 255;
-	g /= 255;
-	b /= 255;
-	const max = Math.max(r, g, b);
-	const min = Math.min(r, g, b);
-	const l = (max + min) / 2;
-	if (max === min) return [
-		0,
-		0,
-		l
-	];
-	const d = max - min;
-	const s = l > .5 ? d / (2 - max - min) : d / (max + min);
-	let h;
-	if (max === r) h = (g - b) / d + (g < b ? 6 : 0);
-	else if (max === g) h = (b - r) / d + 2;
-	else h = (r - g) / d + 4;
-	return [
-		h / 6,
-		s,
-		l
-	];
-}
-/** Convert HSL 0–1 → sRGB 0–255. Standard piecewise formula. */
-function hslToRgb(h, s, l) {
-	if (s === 0) return [
-		l * 255,
-		l * 255,
-		l * 255
-	];
-	const hue2rgb = (p, q, t) => {
-		if (t < 0) t += 1;
-		if (t > 1) t -= 1;
-		if (t < 1 / 6) return p + (q - p) * 6 * t;
-		if (t < 1 / 2) return q;
-		if (t < 2 / 3) return p + (q - p) * (2 / 3 - t) * 6;
-		return p;
-	};
-	const q = l < .5 ? l * (1 + s) : l + s - l * s;
-	const p = 2 * l - q;
-	return [
-		hue2rgb(p, q, h + 1 / 3) * 255,
-		hue2rgb(p, q, h) * 255,
-		hue2rgb(p, q, h - 1 / 3) * 255
-	];
-}
-function toHex(rgb) {
-	const pad = (v) => Math.round(Math.max(0, Math.min(255, v))).toString(16).padStart(2, "0");
-	return `#${pad(rgb[0])}${pad(rgb[1])}${pad(rgb[2])}`;
-}
-/**
-* Blend two hex colors in HSL space with shortest-path hue interpolation.
-* `t` ∈ [0, 1]; `t=0` returns `from`, `t=1` returns `to`.
-*/
-function blendHsl(from, to, t) {
-	const [r1, g1, b1] = parseHex(from);
-	const [r2, g2, b2] = parseHex(to);
-	const [h1, s1, l1] = rgbToHsl(r1, g1, b1);
-	const [h2, s2, l2] = rgbToHsl(r2, g2, b2);
-	let dh = h2 - h1;
-	if (dh > .5) dh -= 1;
-	else if (dh < -.5) dh += 1;
-	return toHex(hslToRgb((h1 + dh * t + 1) % 1, s1 + (s2 - s1) * t, l1 + (l2 - l1) * t));
-}
-/**
-* Static gradient ramp of length `n` going from `from` (index 0) to
-* `to` (index n-1) in HSL space. For the cycling A→B→A→B ramp the
-* throbber uses, see `buildCycleRamp` in `crush-throbber.tsx`.
-*/
-function buildLinearRamp(from, to, n) {
-	if (n <= 0) return [];
-	if (n === 1) return [blendHsl(from, to, .5)];
-	const ramp = [];
-	for (let i = 0; i < n; i++) ramp.push(blendHsl(from, to, i / (n - 1)));
-	return ramp;
-}
-//#endregion
 //#region src/tui/crush-throbber.tsx
 /** @jsxImportSource @opentui/react */
 const CRUSH_RUNES = "0123456789abcdefABCDEF~!@#$£€%^&*()+=_";
@@ -947,67 +859,6 @@ function metaSegmentsLength(meta) {
 	if (typeof meta === "string") return meta.length;
 	return meta.reduce((sum, seg) => sum + seg.text.length, 0);
 }
-/**
-* Truncate `text` to at most `max` characters, replacing the trailing
-* overflow with `…`. Edge cases:
-*   - `max <= 0` → empty string (no room to render at all).
-*   - `max === 1` → just the ellipsis glyph.
-*   - `text.length <= max` → unchanged.
-*
-* Trailing-style truncation matches the natural read order of titles:
-* the prefix carries enough signal to identify the surface.
-*
-* Exported for unit-tests; consumers should normally lean on
-* {@link TitleOverlay} instead of calling this directly.
-*/
-function truncateTrailing(text, max) {
-	if (max <= 0) return "";
-	if (text.length <= max) return text;
-	if (max === 1) return "…";
-	return `${text.slice(0, max - 1)}…`;
-}
-/**
-* Plain-text width estimate for a list of {@link Hint}s rendered via
-* `renderHintSpans` — `<key> <label> · <key> <label> · …`. Exported so
-* the prompt-box overlay (in `screens.tsx`) can run the same responsive
-* math as the bottom-bar footer when deciding whether trigger hints
-* fit. Pure / total.
-*/
-function hintsLength(hints) {
-	if (hints.length === 0) return 0;
-	return hints.reduce((sum, h, i) => sum + hintLength(h) + (i > 0 ? 3 : 0), 0);
-}
-/** Plain-text width of a single hint as rendered by {@link renderHintSpans}. */
-function hintLength(h) {
-	return h.key.length + 1 + h.label.length + (h.extra ? h.extra.key.length + 1 + h.extra.label.length : 0);
-}
-/** Stable empty list so callers can compare by reference. */
-const EMPTY_HINTS = Object.freeze([]);
-/**
-* Return the longest prefix of `hints` whose rendered width via
-* {@link renderHintSpans} fits within `budget`. Used to degrade hint
-* rows gracefully at narrow terminal widths instead of letting OpenTUI
-* wrap an absolutely-positioned `<text>` mid-segment (which paints the
-* overflow over the prompt box's border and looks like garbled glyphs).
-*
-* Prefix-only (no reordering, no last-hint priority) so the survivors
-* keep their authored order — the user's muscle memory for "leftmost
-* hint = primary action" stays intact as the terminal shrinks.
-*/
-function clipHintsToWidth(hints, budget) {
-	if (budget <= 0 || hints.length === 0) return EMPTY_HINTS;
-	const out = [];
-	let used = 0;
-	for (let i = 0; i < hints.length; i++) {
-		const h = hints[i];
-		const cost = (i > 0 ? 3 : 0) + hintLength(h);
-		if (used + cost > budget) break;
-		out.push(h);
-		used += cost;
-	}
-	if (out.length === 0) return EMPTY_HINTS;
-	return out.length === hints.length ? hints : out;
-}
 function contextIndicatorLength(context) {
 	const ratio = context.max > 0 ? context.used / context.max : 0;
 	const pct = Math.round(ratio * 100);
@@ -1135,41 +986,6 @@ function Transcript({ events, settings, selectedTurnId = null, busy = false }) {
 	});
 }
 /**
-* Per-item anchor ids for auto-scroll. Walks `items` in render order and,
-* for each event, returns either:
-*   - `'turn-anchor-<turnId>'` — the first event of this turn (the
-*     scrollbox's target).
-*   - `undefined` — later event of an already-tagged turn (or a synthetic
-*     event with no `turnId`).
-*
-* `ids[i]` is a tuple per item: length 1 for plain events, length N for
-* subagent runs (one entry per inner event). `idByTurn` is the inverse
-* lookup used by the scroll effect. `lastTurnId` is the most-recently-
-* rendered turn — the scroll effect special-cases it to snap to bottom.
-*
-* Exported so the anchor-tagging matrix can be unit-tested without rendering.
-*/
-function computeTurnAnchors(items) {
-	const idByTurn = /* @__PURE__ */ new Map();
-	let lastTurnId;
-	const tag = (turnId) => {
-		if (!turnId) return void 0;
-		lastTurnId = turnId;
-		if (idByTurn.has(turnId)) return void 0;
-		const id = `turn-anchor-${turnId}`;
-		idByTurn.set(turnId, id);
-		return id;
-	};
-	const ids = [];
-	for (const item of items) if (item.kind === "event") ids.push([tag(item.event.turnId)]);
-	else ids.push(item.events.map((e) => tag(e.turnId)));
-	return {
-		idByTurn,
-		ids,
-		lastTurnId
-	};
-}
-/**
 * Walk the visible-event list once and group consecutive child events
 * (`depth > 0`) into runs so we can wrap each run in a single bordered
 * subagent box.
@@ -1589,7 +1405,7 @@ var CodeBlockWrapper = class extends BoxRenderable {
 			flexDirection: "column",
 			flexShrink: 0,
 			alignSelf: "stretch",
-			backgroundColor: surfaces.background
+			backgroundColor: surfaces.modal
 		});
 		this.body = body;
 		this.bag = options.bag;
@@ -1597,11 +1413,12 @@ var CodeBlockWrapper = class extends BoxRenderable {
 		body.marginTop = 0;
 		body.marginBottom = 0;
 		body.drawUnstyledText = false;
+		body.bg = surfaces.modal;
 		this.header = new BoxRenderable(ctx, {
 			flexDirection: "row",
 			height: 1,
 			alignSelf: "stretch",
-			backgroundColor: surfaces.background
+			backgroundColor: surfaces.modal
 		});
 		this.langLabel = new TextRenderable(ctx, {
 			content: options.lang && options.lang.length > 0 ? options.lang : "code",
@@ -1610,7 +1427,7 @@ var CodeBlockWrapper = class extends BoxRenderable {
 		});
 		this.spacer = new BoxRenderable(ctx, {
 			flexGrow: 1,
-			backgroundColor: surfaces.background
+			backgroundColor: surfaces.modal
 		});
 		this.button = new TextRenderable(ctx, {
 			content: "[copy]",
@@ -1653,9 +1470,10 @@ var CodeBlockWrapper = class extends BoxRenderable {
 	* `[copy]`/`[copied]` button colour (which depends on `this.copied`).
 	*/
 	applyTheme(colors, surfaces) {
-		this.backgroundColor = surfaces.background;
-		this.header.backgroundColor = surfaces.background;
-		this.spacer.backgroundColor = surfaces.background;
+		this.backgroundColor = surfaces.modal;
+		this.header.backgroundColor = surfaces.modal;
+		this.spacer.backgroundColor = surfaces.modal;
+		this.body.bg = surfaces.modal;
 		this.langLabel.fg = colors.mute;
 		this.button.fg = this.copied ? colors.accent : colors.warn;
 	}
@@ -1684,11 +1502,23 @@ var CodeBlockWrapper = class extends BoxRenderable {
 	set fg(value) {
 		this.body.fg = value;
 	}
+	/**
+	* Always reports the live elevated-panel paint: see the setter doc.
+	*/
 	get bg() {
 		return this.body.bg;
 	}
-	set bg(value) {
-		this.body.bg = value;
+	/**
+	* Pinned to {@link ThemeSurfaces.modal} — the elevated code-panel
+	* surface. The markdown's `applyCodeBlockRenderable` writes `bg` on
+	* every delta from whatever surface the parent `<markdown>` carries
+	* (the prose body paint). Forwarding that through would flip the
+	* code panel back to the prose surface on every keystroke and erase
+	* the visual lift. Theme switches are funnelled through
+	* {@link applyTheme} instead, which rewrites `body.bg` directly.
+	*/
+	set bg(_value) {
+		this.body.bg = this.bag.surfaces.modal;
 	}
 	get conceal() {
 		return this.body.conceal;
@@ -2007,6 +1837,156 @@ function ToolCallBlock({ event, display, dim }) {
 	});
 }
 //#endregion
+//#region src/tui/discovery-shell.tsx
+/**
+* SWR throttles. `files` is short so a long-open `@` popover picks up
+* new files within seconds; `skills` is long because SKILL.md changes
+* are rare and the walk is cheap enough that we already eager-load it.
+*/
+const FILES_REFRESH_THROTTLE_MS = 3e3;
+const SKILLS_REFRESH_THROTTLE_MS = 3e4;
+function debugLog$1(...args) {
+	if (process.env.ZIDANE_DEBUG) process.stderr.write(`[zidane/tui] ${args.map(errorMessage).join(" ")}\n`);
+}
+function DiscoveryShell({ children }) {
+	const config = useConfig();
+	const dispatchAuth = useMcpAuthDispatch();
+	const dispatchAuthRef = useRef(dispatchAuth);
+	dispatchAuthRef.current = dispatchAuth;
+	const [projectDir] = useState(() => findGitRoot(process.cwd()) ?? process.cwd());
+	const dataDir = config.paths.userDir;
+	const mcpCredentialStore = useMemo(() => createFileMcpCredentialStore(dataDir), [dataDir]);
+	const [skillsCatalog, setSkillsCatalog] = useState([]);
+	const [mcpsCatalog, setMcpsCatalog] = useState([]);
+	const [mcpsErrors, setMcpsErrors] = useState([]);
+	const [filesCatalog, setFilesCatalog] = useState([]);
+	const filesSlotRef = useRef(null);
+	const skillsSlotRef = useRef(null);
+	useEffect(() => {
+		filesSlotRef.current?.abort();
+		skillsSlotRef.current?.abort();
+		setFilesCatalog([]);
+		setSkillsCatalog([]);
+		const filesSlot = createDiscoverySlot({
+			throttleMs: FILES_REFRESH_THROTTLE_MS,
+			walk: (signal) => listProjectFiles({
+				cwd: projectDir,
+				signal
+			}),
+			onLoad: (items) => {
+				if (filesSlotRef.current === filesSlot) setFilesCatalog(items);
+			},
+			onError: (err, phase) => {
+				debugLog$1(`listProjectFiles ${phase} failed`, err);
+			}
+		});
+		const skillsSlot = createDiscoverySlot({
+			throttleMs: SKILLS_REFRESH_THROTTLE_MS,
+			walk: () => discoverProjectSkills({
+				cwd: projectDir,
+				prefix: config.prefix
+			}),
+			onLoad: (items) => {
+				if (skillsSlotRef.current === skillsSlot) setSkillsCatalog(items);
+			},
+			onError: (err, phase) => {
+				debugLog$1(`discoverProjectSkills ${phase} failed`, err);
+			}
+		});
+		filesSlotRef.current = filesSlot;
+		skillsSlotRef.current = skillsSlot;
+		skillsSlot.ensure().then((skills) => bootTick(`discovery:skills (${skills.length})`));
+		try {
+			const { servers, errors } = discoverProjectMcps({
+				cwd: projectDir,
+				prefix: config.prefix
+			});
+			setMcpsCatalog(servers);
+			setMcpsErrors(errors);
+			bootTick(`discovery:mcps (${servers.length} servers, ${errors.length} parse errors)`);
+			for (const entry of servers) {
+				if (entry.config.auth !== "oauth") continue;
+				const hasTokens = !!mcpCredentialStore.load(entry.config.name)?.tokens;
+				dispatchAuthRef.current(hasTokens ? {
+					type: "auth-success",
+					name: entry.config.name
+				} : {
+					type: "auth-required",
+					name: entry.config.name,
+					reason: "no-tokens"
+				});
+			}
+		} catch (err) {
+			debugLog$1("discoverProjectMcps failed", err);
+		}
+		return () => {
+			filesSlot.abort();
+			skillsSlot.abort();
+		};
+	}, [
+		projectDir,
+		config.prefix,
+		mcpCredentialStore
+	]);
+	const ensureFiles = useCallback(() => filesSlotRef.current?.ensure() ?? Promise.resolve([]), []);
+	const ensureSkills = useCallback(() => skillsSlotRef.current?.ensure() ?? Promise.resolve([]), []);
+	const refreshFiles = useCallback(() => filesSlotRef.current?.refresh() ?? Promise.resolve(), []);
+	const refreshSkills = useCallback(() => skillsSlotRef.current?.refresh() ?? Promise.resolve(), []);
+	const refreshMcps = useCallback(() => {
+		try {
+			const { servers, errors } = discoverProjectMcps({
+				cwd: projectDir,
+				prefix: config.prefix
+			});
+			setMcpsCatalog(servers);
+			setMcpsErrors(errors);
+			for (const entry of servers) {
+				if (entry.config.auth !== "oauth") continue;
+				const hasTokens = !!mcpCredentialStore.load(entry.config.name)?.tokens;
+				dispatchAuthRef.current(hasTokens ? {
+					type: "auth-success",
+					name: entry.config.name
+				} : {
+					type: "auth-required",
+					name: entry.config.name,
+					reason: "no-tokens"
+				});
+			}
+		} catch (err) {
+			debugLog$1("refreshMcps failed", err);
+		}
+		return Promise.resolve();
+	}, [
+		projectDir,
+		config.prefix,
+		mcpCredentialStore
+	]);
+	return /* @__PURE__ */ jsx(DiscoveryProvider, {
+		value: useMemo(() => ({
+			skillsCatalog,
+			mcpsCatalog,
+			mcpsErrors,
+			filesCatalog,
+			refreshSkills,
+			refreshMcps,
+			refreshFiles,
+			ensureSkills,
+			ensureFiles
+		}), [
+			skillsCatalog,
+			mcpsCatalog,
+			mcpsErrors,
+			filesCatalog,
+			refreshSkills,
+			refreshMcps,
+			refreshFiles,
+			ensureSkills,
+			ensureFiles
+		]),
+		children
+	});
+}
+//#endregion
 //#region src/tui/effort-picker.tsx
 const BASE_LEVELS = [
 	{
@@ -2665,7 +2645,7 @@ function FileEditApprovalModal({ request, onDecide }) {
 			return [fs.readFileSync(targetPath, "utf8"), null];
 		} catch (e) {
 			if (e.code === "ENOENT") return ["", null];
-			return ["", e.message];
+			return ["", errorMessage(e)];
 		}
 	}, [targetPath]);
 	const payload = useMemo(() => {
@@ -3679,7 +3659,7 @@ function SetupWizard({ registry, dataDir, onConfigured, onCancel }) {
 			if (descriptor.envKey) process.env[descriptor.envKey] = trimmed;
 			onConfigured();
 		} catch (err) {
-			setError(err instanceof Error ? err.message : String(err));
+			setError(errorMessage(err));
 		}
 	}, [dataDir, onConfigured]);
 	const onOAuthError = useCallback((msg) => {
@@ -3935,7 +3915,7 @@ function OAuthRunningStep({ descriptor, dataDir, onSuccess, onError }) {
 				onSuccess();
 			} catch (err) {
 				if (cancelled) return;
-				onError(err instanceof Error ? err.message : String(err));
+				onError(errorMessage(err));
 			}
 		})();
 		return () => {
@@ -5229,7 +5209,7 @@ function SessionDetailsModal({ session, title, isCurrent, actions, keybindings }
 			setExportStatus("success");
 		} catch (err) {
 			if (!mountedRef.current) return;
-			setExportError(err instanceof Error ? err.message : String(err));
+			setExportError(errorMessage(err));
 			setExportStatus("failed");
 		}
 	};
@@ -5246,7 +5226,7 @@ function SessionDetailsModal({ session, title, isCurrent, actions, keybindings }
 			setTitleStatus("idle");
 		} catch (err) {
 			if (!mountedRef.current || ac.signal.aborted) return;
-			setTitleError(err instanceof Error ? err.message : String(err));
+			setTitleError(errorMessage(err));
 			setTitleStatus("failed");
 		} finally {
 			if (generationAbortRef.current === ac) generationAbortRef.current = null;
@@ -5265,7 +5245,7 @@ function SessionDetailsModal({ session, title, isCurrent, actions, keybindings }
 			setCompactStatus("success");
 		} catch (err) {
 			if (!mountedRef.current || ac.signal.aborted) return;
-			setCompactError(err instanceof Error ? err.message : String(err));
+			setCompactError(errorMessage(err));
 			setCompactStatus("failed");
 		} finally {
 			if (compactAbortRef.current === ac) compactAbortRef.current = null;
@@ -5829,13 +5809,17 @@ function anchorIdFor(index) {
 }
 const COL_TITLE = "      ";
 const SPACER_CHECKBOX_WIDTH = "    ";
-function SettingsModal({ skillsCatalog = [], mcpsCatalog = [], mcpsErrors, actions } = {}) {
+function SettingsModal({ skillsCatalog: skillsCatalogProp, mcpsCatalog: mcpsCatalogProp, mcpsErrors: mcpsErrorsProp, actions } = {}) {
 	const COLOR = useColors();
 	const SURFACE = useSurfaces();
 	const { settings, toggle: toggleBoolean, setSetting } = useSettings();
 	const authState = useMcpAuthState();
 	const inputRef = useRef(null);
 	const scrollboxRef = useRef(null);
+	const discovery = useDiscoveryOptional();
+	const skillsCatalog = discovery?.skillsCatalog ?? skillsCatalogProp ?? [];
+	const mcpsCatalog = discovery?.mcpsCatalog ?? mcpsCatalogProp ?? [];
+	const mcpsErrors = discovery?.mcpsErrors ?? mcpsErrorsProp;
 	const skillsToggle = useEnabledToggleSet({
 		catalog: skillsCatalog,
 		keyOf: (s) => s.name,
@@ -5975,6 +5959,13 @@ function SettingsModal({ skillsCatalog = [], mcpsCatalog = [], mcpsErrors, actio
 			}
 			if (key.name === "escape" && focusedMcpStatus.kind === "authorizing") actions?.onCancelLoginMcp?.(focusedMcp.config.name);
 		}
+		if (key.ctrl && key.name === "r") {
+			if (activeTab === "skills" && actions?.onRefreshSkills) {
+				actions.onRefreshSkills();
+				return;
+			}
+			if (activeTab === "mcps" && actions?.onRefreshMcps) actions.onRefreshMcps();
+		}
 	});
 	return /* @__PURE__ */ jsxs(Modal, {
 		title: "settings",
@@ -6067,7 +6058,9 @@ function SettingsModal({ skillsCatalog = [], mcpsCatalog = [], mcpsErrors, actio
 				children: /* @__PURE__ */ jsx(Hints, {
 					activeTab,
 					focusedMcp,
-					focusedMcpStatus
+					focusedMcpStatus,
+					canRefreshSkills: !!actions?.onRefreshSkills,
+					canRefreshMcps: !!actions?.onRefreshMcps
 				})
 			})
 		]
@@ -6522,11 +6515,12 @@ function renderMcpErrors(errors, home, warnColor) {
 		}, err.path))
 	});
 }
-function Hints({ activeTab, focusedMcp, focusedMcpStatus }) {
+function Hints({ activeTab, focusedMcp, focusedMcpStatus, canRefreshSkills, canRefreshMcps }) {
 	const COLOR = useColors();
 	const showLogin = activeTab === "mcps" && !!focusedMcp && !!focusedMcpStatus && canLogin$1(focusedMcp, focusedMcpStatus);
 	const showLogout = activeTab === "mcps" && !!focusedMcpStatus && canLogout$1(focusedMcpStatus);
 	const showCancel = activeTab === "mcps" && focusedMcpStatus?.kind === "authorizing";
+	const showRefresh = activeTab === "skills" && canRefreshSkills || activeTab === "mcps" && canRefreshMcps;
 	return /* @__PURE__ */ jsxs("text", {
 		fg: COLOR.mute,
 		children: [
@@ -6561,6 +6555,14 @@ function Hints({ activeTab, focusedMcp, focusedMcpStatus }) {
 				}),
 				" logout"
 			] }),
+			showRefresh && /* @__PURE__ */ jsxs("span", { children: [
+				" · ",
+				/* @__PURE__ */ jsx("span", {
+					fg: COLOR.warn,
+					children: "ctrl+R"
+				}),
+				" refresh"
+			] }),
 			showCancel ? /* @__PURE__ */ jsxs("span", { children: [
 				" · ",
 				/* @__PURE__ */ jsx("span", {
@@ -6976,16 +6978,20 @@ function ThemedShell() {
 	const { settings } = useSettings();
 	return /* @__PURE__ */ jsx(ThemeProvider, {
 		theme: useMemo(() => resolveTheme(settings.theme), [settings.theme]),
-		children: /* @__PURE__ */ jsx(MdStyleProvider, { children: /* @__PURE__ */ jsx(ChipStyleProvider, { children: /* @__PURE__ */ jsx(SafeModeProvider, { children: /* @__PURE__ */ jsx(InteractionsProvider, { children: /* @__PURE__ */ jsx(McpAuthProvider, { children: /* @__PURE__ */ jsx(ModalRoot, { children: /* @__PURE__ */ jsx(AppShell, {}) }) }) }) }) }) })
+		children: /* @__PURE__ */ jsx(MdStyleProvider, { children: /* @__PURE__ */ jsx(ChipStyleProvider, { children: /* @__PURE__ */ jsx(SafeModeProvider, { children: /* @__PURE__ */ jsx(InteractionsProvider, { children: /* @__PURE__ */ jsx(McpAuthProvider, { children: /* @__PURE__ */ jsx(DiscoveryShell, { children: /* @__PURE__ */ jsx(ModalRoot, { children: /* @__PURE__ */ jsx(AppShell, {}) }) }) }) }) }) }) })
 	});
 }
 function AppShell() {
+	bootTick("AppShell:render-enter");
 	const renderer = useRenderer();
 	const modal = useModal();
 	const config = useConfig();
 	const { settings } = useSettings();
 	const COLOR = useColors();
 	const SURFACE = useSurfaces();
+	useEffect(() => {
+		bootTick("AppShell:first-effect (post-first-paint)");
+	}, []);
 	const queue = useSafeModeQueue();
 	const { requestApproval, resolveHead, denyAll } = useSafeModeActions();
 	const pendingApproval = queue[0] ?? null;
@@ -7045,70 +7051,11 @@ function AppShell() {
 		safelistRef.current = null;
 	}, [dataDir, projectDir]);
 	const sessionSafelistRef = useRef(/* @__PURE__ */ new Set());
-	const [skillsCatalog, setSkillsCatalog] = useState([]);
-	const [mcpsCatalog, setMcpsCatalog] = useState([]);
-	const [mcpsErrors, setMcpsErrors] = useState([]);
-	const [filesCatalog, setFilesCatalog] = useState([]);
+	const { skillsCatalog, mcpsCatalog, filesCatalog, ensureFiles: ensureFilesCatalog, ensureSkills: ensureSkillsCatalog, refreshSkills: onRefreshSkills, refreshMcps: onRefreshMcps } = useDiscovery();
 	const mcpCredentialStore = useMemo(() => createFileMcpCredentialStore(dataDir), [dataDir]);
 	const dispatchAuth = useMcpAuthDispatch();
 	const dispatchAuthRef = useRef(dispatchAuth);
 	dispatchAuthRef.current = dispatchAuth;
-	useEffect(() => {
-		const ac = new AbortController();
-		let cancelled = false;
-		(async () => {
-			try {
-				const skills = await discoverProjectSkills({
-					cwd: projectDir,
-					prefix: config.prefix
-				});
-				if (!cancelled) setSkillsCatalog(skills);
-			} catch (err) {
-				debugLog("discoverProjectSkills failed", err);
-			}
-		})();
-		(async () => {
-			try {
-				const files = await listProjectFiles({
-					cwd: projectDir,
-					signal: ac.signal
-				});
-				if (!cancelled) setFilesCatalog(files);
-			} catch (err) {
-				debugLog("listProjectFiles failed", err);
-			}
-		})();
-		try {
-			const { servers, errors } = discoverProjectMcps({
-				cwd: projectDir,
-				prefix: config.prefix
-			});
-			setMcpsCatalog(servers);
-			setMcpsErrors(errors);
-			for (const entry of servers) {
-				if (entry.config.auth !== "oauth") continue;
-				const hasTokens = !!mcpCredentialStore.load(entry.config.name)?.tokens;
-				dispatchAuthRef.current(hasTokens ? {
-					type: "auth-success",
-					name: entry.config.name
-				} : {
-					type: "auth-required",
-					name: entry.config.name,
-					reason: "no-tokens"
-				});
-			}
-		} catch (err) {
-			debugLog("discoverProjectMcps failed", err);
-		}
-		return () => {
-			cancelled = true;
-			ac.abort();
-		};
-	}, [
-		projectDir,
-		config.prefix,
-		mcpCredentialStore
-	]);
 	const skillsCatalogRef = useRef(skillsCatalog);
 	skillsCatalogRef.current = skillsCatalog;
 	const enabledSkillsRef = useRef(settings.enabledSkills);
@@ -7119,10 +7066,18 @@ function AppShell() {
 	enabledMcpsRef.current = settings.enabledMcps;
 	const filesCatalogRef = useRef(filesCatalog);
 	filesCatalogRef.current = filesCatalog;
+	const ensureFilesCatalogRef = useRef(ensureFilesCatalog);
+	ensureFilesCatalogRef.current = ensureFilesCatalog;
+	const ensureSkillsCatalogRef = useRef(ensureSkillsCatalog);
+	ensureSkillsCatalogRef.current = ensureSkillsCatalog;
 	const completionProviders = useMemo(() => [createSkillsCompletionProvider({
 		getCatalog: () => skillsCatalogRef.current,
-		getEnabled: () => enabledSkillsRef.current
-	}), createFilesCompletionProvider({ getCatalog: () => filesCatalogRef.current })], []);
+		getEnabled: () => enabledSkillsRef.current,
+		ensureCatalog: () => ensureSkillsCatalogRef.current()
+	}), createFilesCompletionProvider({
+		getCatalog: () => filesCatalogRef.current,
+		ensureCatalog: () => ensureFilesCatalogRef.current()
+	})], [filesCatalog, skillsCatalog]);
 	/**
 	* Single source of truth for "should this call execute?". Returns true to
 	* let the call through, false to refuse it. Handles three short-circuits:
@@ -7618,7 +7573,7 @@ function AppShell() {
 		} catch (err) {
 			stream.appendImmediate({
 				kind: "error",
-				text: err instanceof Error ? err.message : String(err)
+				text: errorMessage(err)
 			});
 		} finally {
 			stream.flushAndUpdate(finalizeStreamingMarkdown);
@@ -7687,13 +7642,19 @@ function AppShell() {
 				const sessionMatchesProject = settings.showAllProjects || data?.projectRoot != null && data.projectRoot === projectDir;
 				if (data && sessionMatchesProject) {
 					await activateSession(lastResumedSessionId, resumeProvider.key);
+					bootTick(`resume:activate (sessionId=${lastResumedSessionId.slice(-8)})`);
 					return;
 				}
 			}
 			const list = await refreshSessions();
 			if (cancelled) return;
-			if (list.length === 0) await activateSession(null, resumeProvider.key);
-			else setScreen("sessions");
+			if (list.length === 0) {
+				await activateSession(null, resumeProvider.key);
+				bootTick("resume:fresh-session (empty list)");
+			} else {
+				setScreen("sessions");
+				bootTick(`resume:sessions-list (${list.length})`);
+			}
 		})();
 		return () => {
 			cancelled = true;
@@ -8008,7 +7969,7 @@ function AppShell() {
 		} catch (err) {
 			stream.appendImmediate({
 				kind: "error",
-				text: err instanceof Error ? err.message : String(err)
+				text: errorMessage(err)
 			});
 		} finally {
 			stream.flushAndUpdate(finalizeStreamingMarkdown);
@@ -8107,7 +8068,7 @@ function AppShell() {
 			if (!agentRef.current) dispatchAuth({
 				type: "auth-error",
 				name,
-				error: err instanceof Error ? err.message : String(err)
+				error: errorMessage(err)
 			});
 		} finally {
 			mcpLoginAbortsRef.current.delete(name);
@@ -8434,7 +8395,7 @@ function AppShell() {
 			if (abort.signal.aborted) return;
 			stream.appendImmediate({
 				kind: "error",
-				text: `Auto-compaction failed: ${err instanceof Error ? err.message : String(err)}`
+				text: `Auto-compaction failed: ${errorMessage(err)}`
 			});
 		}).finally(() => {
 			if (autoCompactInFlightRef.current === compactionPromise) {
@@ -8578,18 +8539,15 @@ function AppShell() {
 			return;
 		}
 		if (matchesBinding(key, keybindings.openSettings) && screen !== "auth") {
-			modal.open(/* @__PURE__ */ jsx(SettingsModal, {
-				skillsCatalog,
-				mcpsCatalog,
-				mcpsErrors,
-				actions: {
-					onReauth,
-					onOpenKeybindings: onOpenKeybindingsFile,
-					onLoginMcp,
-					onLogoutMcp,
-					onCancelLoginMcp
-				}
-			}));
+			modal.open(/* @__PURE__ */ jsx(SettingsModal, { actions: {
+				onReauth,
+				onOpenKeybindings: onOpenKeybindingsFile,
+				onLoginMcp,
+				onLogoutMcp,
+				onCancelLoginMcp,
+				onRefreshSkills,
+				onRefreshMcps
+			} }));
 			return;
 		}
 		if (matchesBinding(key, keybindings.openSessionDetails)) {
@@ -8691,23 +8649,16 @@ function AppShell() {
 		drop: keybindings.dropQueuedMessage
 	}), [keybindings]);
 	const promptTriggerHints = useMemo(() => {
-		const out = [];
-		if (filesCatalog.length > 0) out.push({
+		return [{
 			key: "@",
 			label: "files",
 			keyColor: resolveChipColor(SURFACE.chips, "files").bg
-		});
-		if (skillsCatalog.length > 0) out.push({
+		}, {
 			key: "/",
 			label: "skills",
 			keyColor: resolveChipColor(SURFACE.chips, "skills").bg
-		});
-		return out;
-	}, [
-		filesCatalog,
-		skillsCatalog,
-		SURFACE
-	]);
+		}];
+	}, [SURFACE]);
 	const contextUsage = useMemo(() => {
 		if (screen !== "chat" || !picked) return null;
 		const descriptor = providerRegistry[picked.provider.key];
@@ -9085,16 +9036,45 @@ function resolveLocalParsers() {
 	return resolved;
 }
 let registered = false;
+let workerInitStarted = false;
 /**
-* Register the extra Tree-sitter parsers + start the worker. Idempotent —
-* subsequent calls are no-ops. Safe to invoke from `runTui()` and from
-* composition hosts that mount `<App>` directly.
+* Synchronously append every URL-fetched + locally-vendored grammar to
+* OpenTUI's global parser registry. Cheap (just a couple of `Array.push`
+* calls into a module-level table) and idempotent — subsequent calls
+* are no-ops.
+*
+* Split out from {@link initTreeSitterWorker} so the boot path can land
+* the registry *synchronously* on its critical path (no awaiting
+* required) and defer the heavier worker spin-up below until after the
+* first frame is on screen. OpenTUI's `highlightOnce` self-initialises
+* the worker on first use anyway — registering parsers ahead of time is
+* the only piece that genuinely has to happen synchronously.
 */
-async function setupTreeSitter() {
+function registerTreeSitterParsers() {
 	if (registered) return;
 	registered = true;
 	addDefaultParsers([...EXTRA_PARSERS, ...resolveLocalParsers()]);
-	await getTreeSitterClient().initialize();
+}
+/**
+* Spin up OpenTUI's parser worker thread. Idempotent — concurrent
+* callers share a single in-flight promise; subsequent calls after
+* resolution are no-ops.
+*
+* Safe to fire-and-forget after the renderer mounts: the worker boot
+* is the heaviest step in tree-sitter setup (~40–100ms on most
+* machines) and nothing visible needs it until the first fenced code
+* block highlight, which is many frames away even on the fastest
+* sessions. If a `<markdown>` element happens to call
+* `highlightOnce()` before our explicit init completes, OpenTUI's
+* client guards that call with its own `if (!this.initialized) await
+* this.initialize()` — no race.
+*/
+function initTreeSitterWorker() {
+	if (!workerInitStarted) {
+		workerInitStarted = true;
+		registerTreeSitterParsers();
+	}
+	return getTreeSitterClient().initialize();
 }
 //#endregion
 //#region src/tui/mcps-settings.tsx
@@ -9125,7 +9105,7 @@ async function setupTreeSitter() {
 * Errors (`DiscoveryError[]`) surface in a warn-colored preamble so a
 * broken `mcps.json` is loud rather than invisible.
 */
-function McpsSettingsModal({ catalog, errors, onLogin, onLogout, onCancelLogin }) {
+function McpsSettingsModal({ catalog, errors, onLogin, onLogout, onCancelLogin, onRefresh }) {
 	const COLOR = useColors();
 	const home = homedir();
 	const authState = useMcpAuthState();
@@ -9166,7 +9146,11 @@ function McpsSettingsModal({ catalog, errors, onLogin, onLogout, onCancelLogin }
 			onLogin(name);
 			return;
 		}
-		if (key.name === "o" && canLogout(status)) onLogout(name);
+		if (key.name === "o" && canLogout(status)) {
+			onLogout(name);
+			return;
+		}
+		if (key.name === "r" && onRefresh) onRefresh();
 	});
 	if (catalog.length === 0) return /* @__PURE__ */ jsxs(Modal, {
 		title: "mcp servers",
@@ -9227,10 +9211,17 @@ function McpsSettingsModal({ catalog, errors, onLogin, onLogout, onCancelLogin }
 			}),
 			/* @__PURE__ */ jsxs("text", {
 				fg: COLOR.mute,
-				children: [/* @__PURE__ */ jsx("span", {
-					fg: COLOR.warn,
-					children: "esc"
-				}), " close"]
+				children: [
+					onRefresh && /* @__PURE__ */ jsxs("span", { children: [/* @__PURE__ */ jsx("span", {
+						fg: COLOR.warn,
+						children: "r"
+					}), " refresh · "] }),
+					/* @__PURE__ */ jsx("span", {
+						fg: COLOR.warn,
+						children: "esc"
+					}),
+					" close"
+				]
 			})
 		]
 	});
@@ -9272,7 +9263,7 @@ function McpsSettingsModal({ catalog, errors, onLogin, onLogout, onCancelLogin }
 				})
 			}),
 			focusedEntry && focusedStatus && renderDetailPanel(focusedEntry, focusedStatus, COLOR),
-			renderActionHints(focusedEntry, focusedStatus, COLOR)
+			renderActionHints(focusedEntry, focusedStatus, !!onRefresh, COLOR)
 		]
 	});
 }
@@ -9383,7 +9374,7 @@ function renderDetailPanel(entry, status, COLOR) {
 	});
 	return null;
 }
-function renderActionHints(entry, status, COLOR) {
+function renderActionHints(entry, status, showRefresh, COLOR) {
 	const effectiveStatus = status ?? { kind: "idle" };
 	const canL = entry ? canLogin(entry, effectiveStatus) : false;
 	const canO = canLogout(effectiveStatus);
@@ -9417,6 +9408,14 @@ function renderActionHints(entry, status, COLOR) {
 				}),
 				" logout"
 			] }),
+			showRefresh && /* @__PURE__ */ jsxs("span", { children: [
+				" · ",
+				/* @__PURE__ */ jsx("span", {
+					fg: COLOR.warn,
+					children: "r"
+				}),
+				" refresh"
+			] }),
 			canCancel && /* @__PURE__ */ jsxs("span", { children: [
 				" · ",
 				/* @__PURE__ */ jsx("span", {
@@ -9467,7 +9466,7 @@ function displayPath(path, home) {
 * (chat layer) — a GUI shell can build its own toggle list against the
 * same hook without pulling OpenTUI.
 */
-function ToggleListModal({ catalog, keyOf, settingKey, title, renderDetail, emptyState, preamble }) {
+function ToggleListModal({ catalog, keyOf, settingKey, title, renderDetail, emptyState, preamble, onRefresh }) {
 	const COLOR = useColors();
 	const { enabledSet, toggle } = useEnabledToggleSet({
 		catalog,
@@ -9486,7 +9485,7 @@ function ToggleListModal({ catalog, keyOf, settingKey, title, renderDetail, empt
 		else if (key.name === "return" || key.name === "space") {
 			const entry = catalog[safeCursor];
 			if (entry) toggle(keyOf(entry));
-		}
+		} else if (key.ctrl && key.name === "r" && onRefresh) onRefresh();
 	});
 	if (catalog.length === 0) return /* @__PURE__ */ jsxs(Modal, {
 		title,
@@ -9495,10 +9494,17 @@ function ToggleListModal({ catalog, keyOf, settingKey, title, renderDetail, empt
 			emptyState,
 			/* @__PURE__ */ jsxs("text", {
 				fg: COLOR.mute,
-				children: [/* @__PURE__ */ jsx("span", {
-					fg: COLOR.warn,
-					children: "esc"
-				}), " close"]
+				children: [
+					onRefresh && /* @__PURE__ */ jsxs("span", { children: [/* @__PURE__ */ jsx("span", {
+						fg: COLOR.warn,
+						children: "ctrl+R"
+					}), " refresh · "] }),
+					/* @__PURE__ */ jsx("span", {
+						fg: COLOR.warn,
+						children: "esc"
+					}),
+					" close"
+				]
 			})
 		]
 	});
@@ -9548,6 +9554,10 @@ function ToggleListModal({ catalog, keyOf, settingKey, title, renderDetail, empt
 						children: "↵"
 					}),
 					" toggle · ",
+					onRefresh && /* @__PURE__ */ jsxs("span", { children: [/* @__PURE__ */ jsx("span", {
+						fg: COLOR.warn,
+						children: "ctrl+R"
+					}), " refresh · "] }),
 					/* @__PURE__ */ jsx("span", {
 						fg: COLOR.warn,
 						children: "esc"
@@ -9564,8 +9574,13 @@ function ToggleListModal({ catalog, keyOf, settingKey, title, renderDetail, empt
 * List + toggle modal for discovered skills. State machine + keyboard +
 * row geometry live in `<ToggleListModal>`; this file just supplies the
 * skill-specific column (description) and the empty-state hint.
+*
+* Pass `onRefresh` to expose `ctrl+R` (force re-scan) on the list. The
+* standalone modal is for embedders — the in-app flow goes through
+* `<SettingsModal>` which exposes the same affordance via its own
+* `SettingsActions.onRefreshSkills` plumbing.
 */
-function SkillsSettingsModal({ catalog }) {
+function SkillsSettingsModal({ catalog, onRefresh }) {
 	const COLOR = useColors();
 	return /* @__PURE__ */ jsx(ToggleListModal, {
 		catalog,
@@ -9573,6 +9588,7 @@ function SkillsSettingsModal({ catalog }) {
 		settingKey: "enabledSkills",
 		title: "skills",
 		renderDetail: (skill) => skill.description,
+		onRefresh,
 		emptyState: /* @__PURE__ */ jsxs(Fragment, { children: [/* @__PURE__ */ jsx("text", {
 			fg: COLOR.dim,
 			children: "No skills discovered."
@@ -9662,14 +9678,14 @@ let runTuiInvoked = false;
 async function runTui(options = {}) {
 	if (runTuiInvoked) throw new Error("runTui() can only be invoked once per process. Compose `<App config={resolveConfig(...)} />` against your own renderer if you need to run multiple TUIs in the same lifetime.");
 	runTuiInvoked = true;
-	await setupTreeSitter().catch((err) => {
-		const cause = err instanceof Error ? err.message : String(err);
-		process.stderr.write(`[zidane/tui] tree-sitter setup failed: ${cause}\n`);
-	});
+	bootTick("runTui:enter");
+	registerTreeSitterParsers();
+	bootTick("runTui:after-registerTreeSitterParsers");
 	const config = resolveConfig({
 		...options,
 		store: options.store ?? ((paths) => createTuiStore(paths.db))
 	});
+	bootTick("runTui:after-resolveConfig");
 	let done = () => {};
 	const exited = new Promise((resolve) => {
 		done = resolve;
@@ -9684,17 +9700,22 @@ async function runTui(options = {}) {
 		maxFps: bootFps,
 		gatherStats
 	});
+	bootTick("runTui:after-createCliRenderer");
 	createRoot(renderer).render(/* @__PURE__ */ jsx(App, { config }));
+	bootTick("runTui:after-mount");
+	initTreeSitterWorker().then(() => bootTick("runTui:after-treeSitterWorker"), (err) => {
+		process.stderr.write(`[zidane/tui] tree-sitter setup failed: ${errorMessage(err)}\n`);
+	});
 	await exited;
 	if (gatherStats) try {
 		const s = renderer.getStats();
 		process.stderr.write(`[zidane/tui] render stats: fps=${s.fps.toFixed(1)} avgFrame=${s.averageFrameTime.toFixed(2)}ms min=${s.minFrameTime.toFixed(2)}ms max=${s.maxFrameTime.toFixed(2)}ms frames=${s.frameCount}\n`);
 	} catch (err) {
-		process.stderr.write(`[zidane/tui] render stats unavailable: ${err instanceof Error ? err.message : String(err)}\n`);
+		process.stderr.write(`[zidane/tui] render stats unavailable: ${errorMessage(err)}\n`);
 	}
 	process.exit(0);
 }
 //#endregion
-export { AgentPickerModal, App, AuthScreen, ChatScreen, CompletionPopup, EffortPickerModal, Footer, InteractionBlock, McpsSettingsModal, Modal, ModalRoot, ModelPickerModal, SessionDetailsModal, SessionsScreen, SettingsModal, SkillsSettingsModal, Spinner, StatusSpinner, TOOL_DISPLAY, TitleOverlay, ToggleListModal, Transcript, TurnDetailsModal, accentColor, buildMdStyle, displayNameFor, formatToolCall, hintsLength, isEditErrorResult, isTurnHighlighted, isVisible, marginTopFor, onInputSubmit, renderHintSpans, runTui, selectableTurnIds, splitPromptSegments, turnSelectionOwnership, useMdStyle, useModal, useModalAwareFocus };
+export { AgentPickerModal, App, AuthScreen, ChatScreen, CompletionPopup, EffortPickerModal, Footer, InteractionBlock, McpsSettingsModal, Modal, ModalRoot, ModelPickerModal, SessionDetailsModal, SessionsScreen, SettingsModal, SkillsSettingsModal, Spinner, StatusSpinner, TOOL_DISPLAY, TitleOverlay, ToggleListModal, Transcript, TurnDetailsModal, accentColor, buildMdStyle, clipHintsToWidth, computeTurnAnchors, displayNameFor, formatToolCall, hintsLength, isEditErrorResult, isTurnHighlighted, isVisible, marginTopFor, onInputSubmit, renderHintSpans, runTui, selectableTurnIds, splitMarkdownCodeBlocks, splitPromptSegments, truncateTrailing, turnSelectionOwnership, useMdStyle, useModal, useModalAwareFocus };
 
 //# sourceMappingURL=tui.js.map