zidane 6.1.13 → 6.2.6

package/dist/tui.js

@@ -1,5 +1,5 @@
-import { $ as useMcpAuthState, $n as buildPlanSystem, $t as restoreChainFallbacks, A as runOAuthLogin, Bt as createDiscoverySlot, Ct as SETTINGS_CHOICES, D as formatPathForCwd, Dt as clampFps, Et as SettingsProvider, G as buildVisibleMcpRows, Gt as useConfig, Ht as useDiscovery, J as createFileMcpCredentialStore, Jt as buildRunModel, K as indexOfServerRow, Kt as resolveConfig, L as loadMcpToolsCache, M as buildMcpServers, Mt as resolveTheme, O as fetchOAuthRedirect, Ot as useSettings, P as discoverProjectMcps, Q as useMcpAuthDispatch, Qn as buildBuildSystem, Qt as providerKeySetChanged, R as mcpToolsCachePath, St as SETTINGS_CATEGORIES, T as suggestSafelistEntries, Tn as accentColor, Tt as SETTINGS_TOGGLES, U as useMcpToolToggleMap, Ut as useDiscoveryOptional, V as subscribeMcpToolsCache, Vn as useActiveTodos, Vt as DiscoveryProvider, Wt as ConfigProvider, Xt as chainsEqual, Yt as chainPositionOf, Z as McpAuthProvider, Zt as filterChainFallbacks, _ as useSafeModeQueue, _n as discoverAgentsMd, _r as toolCallPreview, _t as buildHints, a as useSurfaces, an as bootTick, at as buildResumedToolResultsTurn, b as getSafelist, br as usageByModel, bt as useEnabledToggleSet, c as useStreamBuffer, cr as lastContextSizeFromTurns, ct as makeRequestInteraction, d as discoverProjectSkills, dr as marginTopFor, dt as useInteractionsActions, er as envSection, et as getMcpAuthStatus, ft as useInteractionsQueue, g as useSafeModeActions, gn as chatAutoCompactBehavior, gt as truncateTrailing, h as SafeModeProvider, hr as sumRunCosts, ht as hintsLength, i as useSelectStyle, ir as compactSummaryEvent, it as PRESENT_PLAN_TOOL, j as supportsOAuth, jn as TODO_STATUS_GLYPHS, jt as resolveChipColor, k as oauthUsesManualCodePaste, l as buildSkillsConfig, lr as listSessionMeta, lt as pendingInteractionsFromTurns, m as writeSessionExport, mr as stripSpawnTokensLine, mt as clipHintsToWidth, n as ThemeProvider, nn as useCompletion, nr as createChatTurnsReadTool, nt as ASK_USER_TOOL, on as buildUpdateHint, or as deriveSessionTitle, ot as createInteractionTools, pr as serverToolResultSummary, pt as EMPTY_HINTS, q as parentServerName, qt as resolveStoragePaths, r as useColors, rn as tryOpenBrowser, rt as InteractionsProvider, s as useTheme, sn as useUpdateCheck, sr as eventsFromTurns, t as computeTurnAnchors, tn as toggleChainEntry, tr as chatReferenceTokensForPrompt, u as defaultSkillScanPaths, ur as loadState, vr as toolResultText, wt as SETTINGS_INPUTS, x as isOnSafelist, xt as DEFAULT_SETTINGS, y as addToSafelist, yr as updateToolEventOutcomes, yt as listProjectFiles, z as refreshMcpToolsCatalog } from "./transcript-anchors-DAf0Mr_9.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, en as inlineLoadedExtension, et as disposeExtensionRegistry, f as cleanupPersistedSession, g as resolveTasksDir, h as resolvePersistDir, ht as isSpawnTool, it as createExtensionHostRuntimeBridge, lt as basic_default, m as resolveMcpWarningsDir, mn as effectiveContextWindow, nn as parseExtensionScanPathEnv, on as coerceExtensionConfigInput, pn as OUTPUT_RESERVE_TOKENS, 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-CZ3WSWqR.js";
+import { $ as useMcpAuthState, $n as buildPlanSystem, $t as restoreChainFallbacks, A as runOAuthLogin, Bt as createDiscoverySlot, Ct as SETTINGS_CHOICES, D as formatPathForCwd, Dt as clampFps, Et as SettingsProvider, G as buildVisibleMcpRows, Gt as useConfig, Ht as useDiscovery, J as createFileMcpCredentialStore, Jt as buildRunModel, K as indexOfServerRow, Kt as resolveConfig, L as loadMcpToolsCache, M as buildMcpServers, Mt as resolveTheme, O as fetchOAuthRedirect, Ot as useSettings, P as discoverProjectMcps, Q as useMcpAuthDispatch, Qn as buildBuildSystem, Qt as providerKeySetChanged, R as mcpToolsCachePath, St as SETTINGS_CATEGORIES, T as suggestSafelistEntries, Tn as accentColor, Tt as SETTINGS_TOGGLES, U as useMcpToolToggleMap, Ut as useDiscoveryOptional, V as subscribeMcpToolsCache, Vn as useActiveTodos, Vt as DiscoveryProvider, Wt as ConfigProvider, Xt as chainsEqual, Yt as chainPositionOf, Z as McpAuthProvider, Zt as filterChainFallbacks, _ as useSafeModeQueue, _n as discoverAgentsMd, _r as toolCallPreview, _t as buildHints, a as useSurfaces, an as bootTick, at as buildResumedToolResultsTurn, b as getSafelist, br as usageByModel, bt as useEnabledToggleSet, c as useStreamBuffer, cr as lastContextSizeFromTurns, ct as makeRequestInteraction, d as discoverProjectSkills, dr as marginTopFor, dt as useInteractionsActions, er as envSection, et as getMcpAuthStatus, ft as useInteractionsQueue, g as useSafeModeActions, gn as chatAutoCompactBehavior, gt as truncateTrailing, h as SafeModeProvider, hr as sumRunCosts, ht as hintsLength, i as useSelectStyle, ir as compactSummaryEvent, it as PRESENT_PLAN_TOOL, j as supportsOAuth, jn as TODO_STATUS_GLYPHS, jt as resolveChipColor, k as oauthUsesManualCodePaste, l as buildSkillsConfig, lr as listSessionMeta, lt as pendingInteractionsFromTurns, m as writeSessionExport, mr as stripSpawnTokensLine, mt as clipHintsToWidth, n as ThemeProvider, nn as useCompletion, nr as createChatTurnsReadTool, nt as ASK_USER_TOOL, on as buildUpdateHint, or as deriveSessionTitle, ot as createInteractionTools, pr as serverToolResultSummary, pt as EMPTY_HINTS, q as parentServerName, qt as resolveStoragePaths, r as useColors, rn as tryOpenBrowser, rt as InteractionsProvider, s as useTheme, sn as useUpdateCheck, sr as eventsFromTurns, t as computeTurnAnchors, tn as toggleChainEntry, tr as chatReferenceTokensForPrompt, u as defaultSkillScanPaths, ur as loadState, vr as toolResultText, wt as SETTINGS_INPUTS, x as isOnSafelist, xt as DEFAULT_SETTINGS, y as addToSafelist, yr as updateToolEventOutcomes, yt as listProjectFiles, z as refreshMcpToolsCatalog } from "./transcript-anchors-cc4gsU-j.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-D11SxCvA.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";
@@ -12,14 +12,14 @@ import { replaceDynamicSection } from "./prompt.js";
 import { a as getExtensionSessionState, i as demoteStaleRunningStatus, o as loadSession, s as setExtensionSessionState, t as createSession } from "./session-D7JSEMME.js";
 import { o as withTimeout } from "./timeout-BDetbuN6.js";
 import { n as connectMcpServers, u as McpOAuthProvider } from "./mcp-CkHUripi.js";
-import { c as commandBlockToEvent, d as executeCommand, f as parseCommandInvocation, i as shouldAutoGenerateTitle, l as commandBlocksToContent, r as generateSessionTitle, t as generateStructuredData } from "./generate-data-WL_yGVL6.js";
-import { s as resolveCompletionSubmit } from "./completion-core-CXYSVhZo.js";
+import { a as generateStructuredData, c as shouldAutoGenerateTitle, f as commandBlockToEvent, g as parseCommandInvocation, h as executeCommand, n as patchInlineGhost, p as commandBlocksToContent, r as resolveInlineSuggestion, s as generateSessionTitle, t as createPathAutocompleteProvider } from "./inline-autocomplete-BAwBcZtD.js";
+import { s as resolveCompletionSubmit } from "./completion-core-BRo86R_L.js";
 import { i as installSkillFromSpec, r as SkillInstallError } from "./skills-BlmY7QhV.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-Bp_tRj_e.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-D5FfJtLf.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-Ys_7TmRj.js";
 import { createDockerContext } from "./contexts/docker.js";
 import { createTuiStore } from "./session/sqlite.js";
-import { A as buildLinearRamp, D as createFilesCompletionProvider, F as isUserBashEvent, H as buildUnifiedDiff, I as isVisible, J as previewEditPayload, K as extractEditPayload, L as promptHistoryFromEvents, M as EDIT_TOOL_NAMES, N as isEditErrorResult, P as isTurnHighlighted, Q as buildEditOutcomesAnnotation, R as selectableTurnIds, S as splitMarkdownCodeBlocks, T as uniqueSkillNamesFromReferences, U as clipDiffForRender, V as buildContextualDiff, X as summarizeEditPayload, _ as filterModelCatalog, a as TOOL_DISPLAY, at as summarizeOutcomes, b as chunkMarkdownForRender, ct as createChatsCompletionProvider, d as finalizeStreamingMarkdown, et as mergeApprovalAndBodyOutcomes, f as finalizeStreamingMarkdownForOwner, g as buildModelCatalog, h as splitPromptSegments, i as turnAsText, it as stripEditOutcomesAnnotation, j as BASH_CALL_ID_PREFIX, k as blendHsl, m as turnContextSize, n as deleteTurnSafely, nt as resolveApprovalForPayload, o as displayNameFor, q as filetypeFromPath, r as truncateTurnsAt, rt as rewriteMultiEditHeader, s as formatToolCall, tt as parseEditOutcomesFromResult, u as capTranscriptEvents, v as indexOfEntry, w as createSkillsCompletionProvider, x as normalizeMarkdownCodeFences, z as turnSelectionOwnership } from "./turn-operations-D9p-y9EC.js";
+import { $ as buildEditOutcomesAnnotation, A as blendHsl, B as turnSelectionOwnership, C as stripHtmlCommentsOutsideCode, E as uniqueSkillNamesFromReferences, F as isTurnHighlighted, H as buildContextualDiff, I as isUserBashEvent, J as filetypeFromPath, L as isVisible, M as BASH_CALL_ID_PREFIX, N as EDIT_TOOL_NAMES, O as createFilesCompletionProvider, P as isEditErrorResult, R as promptHistoryFromEvents, S as splitMarkdownCodeBlocks, T as createSkillsCompletionProvider, U as buildUnifiedDiff, W as clipDiffForRender, Y as previewEditPayload, Z as summarizeEditPayload, _ as filterModelCatalog, a as TOOL_DISPLAY, at as stripEditOutcomesAnnotation, b as chunkMarkdownForRender, d as finalizeStreamingMarkdown, f as finalizeStreamingMarkdownForOwner, g as buildModelCatalog, h as splitPromptSegments, i as turnAsText, it as rewriteMultiEditHeader, j as buildLinearRamp, lt as createChatsCompletionProvider, m as turnContextSize, n as deleteTurnSafely, nt as parseEditOutcomesFromResult, o as displayNameFor, ot as summarizeOutcomes, q as extractEditPayload, r as truncateTurnsAt, rt as resolveApprovalForPayload, s as formatToolCall, tt as mergeApprovalAndBodyOutcomes, u as capTranscriptEvents, v as indexOfEntry, x as normalizeMarkdownCodeFences, z as selectableTurnIds } from "./turn-operations-CXjRaltC.js";
 import { basename, dirname, join, relative, resolve } from "node:path";
 import { Buffer } from "node:buffer";
 import * as fs from "node:fs";
@@ -50,16 +50,18 @@ function scoreCommands(catalog, query) {
 	const scored = [];
 	for (const command of catalog) {
 		const name = command.name.toLowerCase();
+		const aliases = (command.aliases ?? []).map((a) => a.toLowerCase());
+		const group = command.group?.toLowerCase();
 		const desc = command.description.toLowerCase();
 		if (q.length === 0) scored.push({
 			command,
 			rank: 4
 		});
-		else if (name.startsWith(q)) scored.push({
+		else if (name.startsWith(q) || aliases.some((a) => a.startsWith(q))) scored.push({
 			command,
 			rank: 0
 		});
-		else if (name.includes(q)) scored.push({
+		else if (name.includes(q) || aliases.some((a) => a.includes(q)) || group !== void 0 && q.length >= 2 && group.startsWith(q)) scored.push({
 			command,
 			rank: 1
 		});
@@ -76,7 +78,7 @@ function scoreCommands(catalog, query) {
 	return scored.map(({ command }) => ({
 		id: command.name,
 		label: command.name,
-		description: command.description,
+		description: command.aliases?.length ? `${command.description} (alias: ${command.aliases.map((a) => `/${a}`).join(", ")})` : command.description,
 		insertText: `/${command.name} `,
 		data: command
 	}));
@@ -97,7 +99,7 @@ function createCommandsCompletionProvider(opts) {
 			if (spaceIdx !== -1) {
 				if (ctx.text.trimStart()[0] !== "/") return [];
 				const typed = query.slice(0, spaceIdx).toLowerCase();
-				const command = opts.getCommands().find((c) => c.name.toLowerCase() === typed);
+				const command = opts.getCommands().find((c) => c.name.toLowerCase() === typed || c.aliases?.some((a) => a.toLowerCase() === typed));
 				if (!command?.completeArgs) return [];
 				const argsPrefix = query.slice(spaceIdx + 1).replace(/^\s+/, "");
 				return Promise.resolve(command.completeArgs(argsPrefix)).then((suggestions) => (suggestions ?? []).map((s) => ({
@@ -1254,6 +1256,36 @@ function RenderCall({ render }) {
 	return /* @__PURE__ */ jsx$1(Fragment, { children: render() });
 }
 //#endregion
+//#region src/tui/terminal-sanitize.ts
+/**
+* Terminal-display sanitation.
+*
+* Provider and model text is written into a terminal cell buffer that does
+* NOT neutralize control bytes: a raw ESC sequence in model output would be
+* forwarded to the user's terminal at paint time (recolor, cursor moves,
+* window retitling — classic escape injection). Applied once at the
+* rendering boundary — persistence and provider round-trips keep raw text.
+*
+* Lives in `src/tui` (not `src/chat`): the chat layer is renderer-agnostic
+* by invariant and must not carry escape-sequence literals.
+*/
+/** CSI sequences: ESC [ params intermediates final. */
+const ANSI_CSI = /\u001B\[[0-9:;<=>?]*[ -/]*[@-~]/g;
+/** OSC sequences (window title, hyperlinks, …), terminated by BEL or ST. */
+const ANSI_OSC = /\u001B\][\s\S]*?(?:\u0007|\u001B\\)/g;
+/** Any remaining ESC + one char (SS2/SS3, unterminated introducers, …). */
+const ANSI_ESC_OTHER = /\u001B[\s\S]?/g;
+/** C0 controls except \n and \t (\r is normalized to \n beforehand), plus DEL. */
+const CONTROL_CHARS = /[\u0000-\u0008\v\f\u000E-\u001F\u007F]/g;
+/**
+* Make arbitrary provider/model/tool text safe to paint into a terminal
+* cell buffer: normalize \r to \n, drop ANSI escape sequences, drop the
+* remaining C0 control characters (keeping \n and \t).
+*/
+function stripTerminalControlChars(text) {
+	return text.replace(/\r\n?/g, "\n").replace(ANSI_OSC, "").replace(ANSI_CSI, "").replace(ANSI_ESC_OTHER, "").replace(CONTROL_CHARS, "");
+}
+//#endregion
 //#region src/tui/theme.ts
 /**
 * Resolve a theme color string to an OpenTUI `RGBA`.
@@ -2138,7 +2170,8 @@ function rowStyle(paddingLeft) {
 function EventLineImpl({ event, previous, depthOffset = 0, hideChildLabel = false, selected = false, settleCodeEpoch = 0 }) {
 	const COLOR = useColors();
 	const { settings } = useSettings();
-	const safeText = event.text === "" ? " " : event.text;
+	const cleanText = stripTerminalControlChars(event.text);
+	const safeText = cleanText === "" ? " " : cleanText;
 	const effectiveDepth = Math.max(0, (event.depth ?? 0) - depthOffset);
 	const row = rowStyle(indentFor(settings.hideSubagentOutput && (event.kind === "spawn-start" || event.kind === "spawn-end") ? 0 : effectiveDepth));
 	const child = isChild(event);
@@ -2158,7 +2191,8 @@ function EventLineImpl({ event, previous, depthOffset = 0, hideChildLabel = fals
 		});
 		case "thinking": {
 			const startsRun = !(previous?.kind === "thinking" && previous.childId === event.childId);
-			const thinkingText = safeText.replace(/\*\*([^*]+)\*\*/g, "$1");
+			const thinkingText = safeText.replace(/<!--[\s\S]*?-->/g, "").replace(/\*\*([^*]+)\*\*/g, "$1").trimEnd();
+			if (thinkingText.trim() === "") return null;
 			return /* @__PURE__ */ jsx$1("box", {
 				style: row,
 				children: /* @__PURE__ */ jsxs("box", {
@@ -2900,7 +2934,7 @@ const MarkdownBlock = memo(({ text, dim, selected = false, settleCodeEpoch = 0 }
 		dimmed: dim
 	});
 	const renderer = useRenderer();
-	const content = normalizeMarkdownCodeFences(text.replace(/^\n+|\n+$/g, ""));
+	const content = normalizeMarkdownCodeFences(stripHtmlCommentsOutsideCode(stripTerminalControlChars(text)).replace(/^\n+|\n+$/g, ""));
 	const chunks = useMemo(() => chunkMarkdownForRender(content), [content]);
 	const bag = useRef({
 		ctx: renderer,
@@ -5998,17 +6032,48 @@ function CompletionPopup({ state, visibleRows = 6 }) {
 		});
 		height = 3;
 	} else {
-		const rows = Math.min(state.items.length, visibleRows);
+		const showSections = state.items.some((it) => it.section);
+		const displayRows = [];
+		let prevSection;
+		for (const [index, item] of state.items.entries()) {
+			if (showSections && item.section && item.section !== prevSection) {
+				displayRows.push({
+					kind: "header",
+					section: item.section
+				});
+				prevSection = item.section;
+			}
+			displayRows.push({
+				kind: "item",
+				item,
+				index
+			});
+		}
+		const rows = Math.min(displayRows.length, visibleRows);
+		const selectedRow = displayRows.findIndex((r) => r.kind === "item" && r.index === state.selectedIndex);
 		const half = Math.floor(rows / 2);
-		let start = Math.max(0, state.selectedIndex - half);
-		if (start + rows > state.items.length) start = state.items.length - rows;
-		const slice = state.items.slice(start, start + rows);
-		const showSections = new Set(state.items.map((it) => it.section).filter(Boolean)).size > 1;
+		let start = Math.max(0, selectedRow - half);
+		if (start + rows > displayRows.length) start = displayRows.length - rows;
+		const slice = displayRows.slice(start, start + rows);
 		height = 2 + rows + 1;
 		body = /* @__PURE__ */ jsxs(Fragment, { children: [/* @__PURE__ */ jsx$1("box", {
 			style: { flexDirection: "column" },
-			children: slice.map((item, i) => {
-				const focused = start + i === state.selectedIndex;
+			children: slice.map((row, i) => {
+				if (row.kind === "header") return /* @__PURE__ */ jsx$1("box", {
+					style: {
+						height: 1,
+						overflow: "hidden",
+						flexShrink: 0
+					},
+					children: /* @__PURE__ */ jsx$1("text", {
+						fg: COLOR.mute,
+						wrapMode: "none",
+						children: `── ${row.section} ${"─".repeat(200)}`
+					})
+				}, `header:${row.section}:${start + i}`);
+				const { item, index } = row;
+				const focused = index === state.selectedIndex;
+				const titleFg = (item.providerId !== void 0 ? SURFACE.chips[item.providerId] : void 0)?.bg ?? (item.providerId === "commands" ? COLOR.accent : SELECT.textColor);
 				return /* @__PURE__ */ jsx$1("box", {
 					style: {
 						height: 1,
@@ -6024,12 +6089,8 @@ function CompletionPopup({ state, visibleRows = 6 }) {
 								fg: focused ? COLOR.brand : COLOR.mute,
 								children: focused ? "▶ " : "  "
 							}),
-							showSections && item.section && /* @__PURE__ */ jsxs("span", {
-								fg: COLOR.mute,
-								children: [item.section, "  "]
-							}),
 							/* @__PURE__ */ jsx$1("span", {
-								fg: focused ? COLOR.brand : SELECT.textColor,
+								fg: focused ? COLOR.brand : titleFg,
 								children: item.label
 							}),
 							item.description && /* @__PURE__ */ jsxs("span", {
@@ -9463,7 +9524,7 @@ const MIME_BY_EXT = {
 * default-value reference at the prop destructure.
 */
 const EMPTY_QUEUED_MESSAGES = [];
-function ChatScreen({ cwd, events, busy, compacting = false, queuedMessages = EMPTY_QUEUED_MESSAGES, queueSelectionIndex = null, queueShortcuts, onEnterQueueFromEmptyPrompt, settings, onSubmit, session, pending, onApproval, pendingInteraction, onInteraction, completionProviders, onCompletionTab, enterSelectsCompletion, onPopupOpenChange, selectedTurnId, 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, promptTriggerHints, attachImageBinding, editorBinding, sessionDetailsBinding, liveSession = null }) {
 	const COLOR = useColors();
 	const titleText = session?.title ?? "New session";
 	const sessionShortcutKey = formatBindingForDisplay(sessionDetailsBinding);
@@ -9577,6 +9638,7 @@ function ChatScreen({ cwd, events, busy, compacting = false, queuedMessages = EM
 					userPrompts,
 					onSubmit,
 					completionProviders,
+					inlineAutocompleteProviders,
 					onCompletionTab,
 					enterSelectsCompletion,
 					onPopupOpenChange: handlePopupOpenChange,
@@ -9898,7 +9960,15 @@ function previewText(text) {
 }
 /** Stable empty providers reference — avoids `useCompletion` rerun on every render when no providers are wired. */
 const EMPTY_PROVIDERS = [];
-function PromptBlock({ userPrompts, onSubmit, completionProviders, onCompletionTab, enterSelectsCompletion, onPopupOpenChange, selectMode = null, triggerHints, busy = false, onEnterQueueFromEmpty, attachImageBinding, editorBinding }) {
+/** Stable empty reference for the inline-autocomplete effect's dep array. */
+const EMPTY_INLINE_PROVIDERS = [];
+/**
+* Debounce before querying inline-autocomplete providers. Long enough to
+* skip intermediate keystrokes while typing a path, short enough that the
+* ghost feels immediate on a pause.
+*/
+const INLINE_GHOST_DEBOUNCE_MS = 120;
+function PromptBlock({ userPrompts, onSubmit, completionProviders, inlineAutocompleteProviders, onCompletionTab, enterSelectsCompletion, onPopupOpenChange, selectMode = null, triggerHints, busy = false, onEnterQueueFromEmpty, attachImageBinding, editorBinding }) {
 	const focused = useModalAwareFocus();
 	const renderer = useRenderer();
 	const COLOR = useColors();
@@ -9984,6 +10054,9 @@ function PromptBlock({ userPrompts, onSubmit, completionProviders, onCompletionT
 		shellModeRef.current = on;
 		setShellMode(on);
 	}, []);
+	const [ghost, setGhost] = useState(null);
+	const ghostRef = useRef(null);
+	ghostRef.current = ghost;
 	/**
 	* Pull the latest buffer state from the OpenTUI textarea ref. Called from
 	* `onContentChange` + `onKeyDown` so cursor moves (without text changes)
@@ -10001,9 +10074,49 @@ function PromptBlock({ userPrompts, onSubmit, completionProviders, onCompletionT
 			text: ta.plainText,
 			cursor: ta.cursorOffset
 		});
+		setGhost((prev) => patchInlineGhost(prev, ta.plainText, ta.cursorOffset));
 		const total = ta.editorView.getTotalVirtualLineCount();
 		setContentLines(Math.max(MIN_CONTENT_LINES, total));
 	}, []);
+	const inlineProviders = inlineAutocompleteProviders ?? EMPTY_INLINE_PROVIDERS;
+	const inlineEnabled = settings.inlineAutocomplete && inlineProviders.length > 0;
+	useEffect(() => {
+		const atWordBoundary = bufferState.cursor === bufferState.text.length || /\s/.test(bufferState.text[bufferState.cursor]);
+		if (!inlineEnabled || popupOpen || selectMode !== null || shellMode || bufferState.text.length === 0 || !atWordBoundary) {
+			setGhost(null);
+			return;
+		}
+		const controller = new AbortController();
+		const { text, cursor } = bufferState;
+		const timer = setTimeout(() => {
+			resolveInlineSuggestion(inlineProviders, {
+				text,
+				cursor,
+				cwd: process.cwd(),
+				signal: controller.signal
+			}).then((res) => {
+				if (controller.signal.aborted) return;
+				const suffixes = (res?.suffixes ?? []).map((s) => s.split("\n")[0]).filter((s) => s.length > 0);
+				setGhost(suffixes.length > 0 ? {
+					suffixes,
+					index: 0,
+					text,
+					cursor
+				} : null);
+			});
+		}, INLINE_GHOST_DEBOUNCE_MS);
+		return () => {
+			controller.abort();
+			clearTimeout(timer);
+		};
+	}, [
+		bufferState,
+		inlineEnabled,
+		popupOpen,
+		selectMode,
+		shellMode,
+		inlineProviders
+	]);
 	/**
 	* Open the current prompt in `$EDITOR` (git-style round-trip). The
 	* external-editor module is pure; the TUI handoff is owned here — suspend
@@ -10255,6 +10368,30 @@ function PromptBlock({ userPrompts, onSubmit, completionProviders, onCompletionT
 			return;
 		}
 		if (event.ctrl || event.shift || event.meta) return;
+		if (ghostRef.current) {
+			const g = ghostRef.current;
+			if (event.name === "tab") {
+				const ta = textareaRef.current;
+				if (ta && ta.plainText === g.text && ta.cursorOffset === g.cursor) {
+					event.preventDefault();
+					ta.insertText(g.suffixes[g.index]);
+					setGhost(null);
+					syncBuffer();
+					return;
+				}
+			}
+			if ((event.name === "up" || event.name === "down") && g.suffixes.length > 1) {
+				event.preventDefault();
+				const delta = event.name === "down" ? 1 : -1;
+				setGhost({
+					...g,
+					index: (g.index + delta + g.suffixes.length) % g.suffixes.length
+				});
+				return;
+			}
+			if (event.name === "escape") setGhost(null);
+			else if (event.name === "left" || event.name === "right" || event.name === "home" || event.name === "end" || event.name === "pageup" || event.name === "pagedown" || event.name === "up" || event.name === "down") setGhost(null);
+		}
 		if (event.name !== "up" && event.name !== "down") return;
 		const buffer = textareaRef.current;
 		if (!buffer) return;
@@ -10292,6 +10429,27 @@ function PromptBlock({ userPrompts, onSubmit, completionProviders, onCompletionT
 		attachments,
 		showNotice
 	]);
+	const ghostPosition = useMemo(() => {
+		if (!ghost) return null;
+		const ta = textareaRef.current;
+		if (!ta || ta.plainText !== ghost.text || ta.cursorOffset !== ghost.cursor) return null;
+		const cursor = ta.visualCursor;
+		if (cursor.visualRow < 0 || cursor.visualRow >= Math.min(MAX_CONTENT_LINES, contentLines)) return null;
+		return {
+			row: cursor.visualRow,
+			col: cursor.visualCol
+		};
+	}, [
+		ghost,
+		contentLines,
+		bufferState
+	]);
+	const ghostTail = useMemo(() => {
+		if (!ghost) return "";
+		const rest = ghost.text.slice(ghost.cursor);
+		const nl = rest.indexOf("\n");
+		return nl === -1 ? rest : rest.slice(0, nl);
+	}, [ghost]);
 	const boxHeight = Math.min(MAX_CONTENT_LINES, contentLines) + 2;
 	return /* @__PURE__ */ jsxs("box", {
 		style: {
@@ -10347,7 +10505,7 @@ function PromptBlock({ userPrompts, onSubmit, completionProviders, onCompletionT
 						flexDirection: "column",
 						flexShrink: 0
 					},
-					children: [/* @__PURE__ */ jsx$1("box", {
+					children: [/* @__PURE__ */ jsxs("box", {
 						style: {
 							border: true,
 							borderColor: selectMode ? COLOR.warn : shellMode ? COLOR.accent : COLOR.borderActive,
@@ -10356,7 +10514,7 @@ function PromptBlock({ userPrompts, onSubmit, completionProviders, onCompletionT
 							height: boxHeight,
 							flexDirection: "column"
 						},
-						children: /* @__PURE__ */ jsx$1("textarea", {
+						children: [/* @__PURE__ */ jsx$1("textarea", {
 							ref: textareaRef,
 							focused: focused && !selectMode,
 							keyBindings: TEXTAREA_BINDINGS,
@@ -10371,7 +10529,24 @@ function PromptBlock({ userPrompts, onSubmit, completionProviders, onCompletionT
 							onContentChange: syncBuffer,
 							onKeyDown,
 							onPaste
-						})
+						}), ghostPosition !== null && ghost !== null && /* @__PURE__ */ jsx$1("box", {
+							style: {
+								position: "absolute",
+								top: ghostPosition.row,
+								left: 1 + ghostPosition.col,
+								right: 1,
+								height: 1,
+								overflow: "hidden",
+								backgroundColor: SURFACE.background
+							},
+							children: /* @__PURE__ */ jsxs("text", {
+								wrapMode: "none",
+								children: [/* @__PURE__ */ jsx$1("span", {
+									fg: COLOR.dim,
+									children: ghost.suffixes[ghost.index]
+								}), ghostTail.length > 0 && /* @__PURE__ */ jsx$1("span", { children: ghostTail })]
+							})
+						})]
 					}), /* @__PURE__ */ jsx$1(PromptHints, {
 						selectMode,
 						triggerHints,
@@ -11909,6 +12084,10 @@ const EMPTY_TOOLS = Object.freeze({});
 /** Stable empty defaults for the extension-config props — keep memo deps from churning. */
 const EMPTY_CONFIG_CATEGORIES = Object.freeze({});
 const EMPTY_CONFIG_ITEMS = Object.freeze({});
+/** How long a config action's run-result message stays before yielding to the live probe. */
+const CONFIG_ACTION_DONE_TTL_MS = 8e3;
+/** Errors linger longer — the user may need to read them — but expire too. */
+const CONFIG_ACTION_ERROR_TTL_MS = 2e4;
 const TAB_LABELS = {
 	...Object.fromEntries(SETTINGS_CATEGORIES.map((c) => [c.id, c.label])),
 	keybindings: "Keybindings",
@@ -12009,7 +12188,77 @@ function SettingsModal({ skillsCatalog: skillsCatalogProp, mcpsCatalog: mcpsCata
 			}
 		});
 	}, [settings.extensionConfig, setSetting]);
+	const writeConfigValues = useCallback((extName, values) => {
+		const prev = settings.extensionConfig ?? {};
+		const prevExt = prev[extName] ?? {};
+		setSetting("extensionConfig", {
+			...prev,
+			[extName]: {
+				...prevExt,
+				...values
+			}
+		});
+	}, [settings.extensionConfig, setSetting]);
+	const [configAction, setConfigAction] = useState(null);
+	const [actionProbes, setActionProbes] = useState({});
+	const [actionProbeNonce, setActionProbeNonce] = useState(0);
+	useEffect(() => {
+		if (!configAction || configAction.state === "busy") return;
+		const ttl = configAction.state === "error" ? CONFIG_ACTION_ERROR_TTL_MS : CONFIG_ACTION_DONE_TTL_MS;
+		const id = setTimeout(() => {
+			setConfigAction((current) => current === configAction ? null : current);
+			setActionProbeNonce((n) => n + 1);
+		}, ttl);
+		return () => clearTimeout(id);
+	}, [configAction]);
+	const writeConfigValuesRef = useRef(writeConfigValues);
+	writeConfigValuesRef.current = writeConfigValues;
+	const extensionConfigItemsRef = useRef(extensionConfigItems);
+	extensionConfigItemsRef.current = extensionConfigItems;
+	const configActionBusyRef = useRef(false);
+	const runConfigAction = useCallback((extName, item) => {
+		if (configActionBusyRef.current) return;
+		configActionBusyRef.current = true;
+		setConfigAction({
+			extName,
+			key: item.key,
+			state: "busy"
+		});
+		(async () => {
+			try {
+				const result = await item.run() ?? void 0;
+				const { accepted, rejected } = sanitizeExtensionConfigActionPatch(extensionConfigItemsRef.current[extName], result?.config);
+				const acceptedKeys = Object.keys(accepted);
+				if (acceptedKeys.length > 0) writeConfigValuesRef.current(extName, accepted);
+				const parts = [];
+				if (result?.message) parts.push(result.message);
+				else if (acceptedKeys.length > 0) parts.push(`updated ${acceptedKeys.join(", ")}`);
+				else parts.push("done");
+				if (rejected.length > 0) parts.push(`(ignored invalid: ${rejected.join(", ")})`);
+				setConfigAction({
+					extName,
+					key: item.key,
+					state: "done",
+					text: parts.join(" ")
+				});
+			} catch (err) {
+				setConfigAction({
+					extName,
+					key: item.key,
+					state: "error",
+					text: errorMessage(err)
+				});
+			} finally {
+				configActionBusyRef.current = false;
+			}
+			setActionProbeNonce((n) => n + 1);
+		})();
+	}, []);
 	const activateConfigRow = useCallback((extName, item) => {
+		if (item.type === "action") {
+			runConfigAction(extName, item);
+			return;
+		}
 		const current = resolveExtensionConfigValue(item, settings.extensionConfig?.[extName]?.[item.key]);
 		if (item.type === "boolean") {
 			writeConfigValue(extName, item.key, !current);
@@ -12031,7 +12280,8 @@ function SettingsModal({ skillsCatalog: skillsCatalogProp, mcpsCatalog: mcpsCata
 	}, [
 		settings.extensionConfig,
 		writeConfigValue,
-		modelCatalog
+		modelCatalog,
+		runConfigAction
 	]);
 	const applyModelEdit = useCallback((ids) => {
 		if (configEdit) writeConfigValue(configEdit.extName, configEdit.key, ids.join(", "));
@@ -12057,6 +12307,16 @@ function SettingsModal({ skillsCatalog: skillsCatalogProp, mcpsCatalog: mcpsCata
 	const [expandedExtensions, setExpandedExtensions] = useState(() => /* @__PURE__ */ new Set());
 	const onRefreshMcpToolsRef = useRef(actions?.onRefreshMcpTools);
 	onRefreshMcpToolsRef.current = actions?.onRefreshMcpTools;
+	const [mcpToolsRefreshing, setMcpToolsRefreshing] = useState(false);
+	const fireMcpToolsRefresh = useCallback(() => {
+		const run = onRefreshMcpToolsRef.current;
+		if (!run) return;
+		setMcpToolsRefreshing(true);
+		Promise.resolve(run()).catch(() => {}).finally(() => setMcpToolsRefreshing(false));
+	}, []);
+	const mcpsCatalogLiveRef = useRef([]);
+	mcpsCatalogLiveRef.current = mcpsCatalog;
+	const mcpColdProbedRef = useRef(/* @__PURE__ */ new Set());
 	const tabOrder = useMemo(() => {
 		const tabs = [...SETTINGS_CATEGORIES.map((c) => c.id)];
 		if (keybindings) tabs.push("keybindings");
@@ -12073,6 +12333,40 @@ function SettingsModal({ skillsCatalog: skillsCatalogProp, mcpsCatalog: mcpsCata
 		logs
 	]);
 	const [activeTab, setActiveTab] = useState(tabOrder[0]);
+	useEffect(() => {
+		if (activeTab !== "extensions") return;
+		let cancelled = false;
+		for (const [extName, byKey] of Object.entries(extensionConfigItems)) for (const item of Object.values(byKey)) {
+			if (item.type !== "action" || typeof item.status !== "function") continue;
+			(async () => {
+				let status;
+				try {
+					status = await Promise.race([Promise.resolve(item.status()), new Promise((resolve) => setTimeout(resolve, 3e3))]);
+				} catch {
+					status = void 0;
+				}
+				if (cancelled) return;
+				const mapKey = `${extName}:${item.key}`;
+				setActionProbes((prev) => {
+					if (status && typeof status.message === "string") return {
+						...prev,
+						[mapKey]: status
+					};
+					if (!(mapKey in prev)) return prev;
+					const next = { ...prev };
+					delete next[mapKey];
+					return next;
+				});
+			})();
+		}
+		return () => {
+			cancelled = true;
+		};
+	}, [
+		activeTab,
+		extensionConfigItems,
+		actionProbeNonce
+	]);
 	const [extEditNotice, setExtEditNotice] = useState(null);
 	const [extOp, setExtOp] = useState(null);
 	const [removeArmed, setRemoveArmed] = useState(null);
@@ -12183,8 +12477,23 @@ function SettingsModal({ skillsCatalog: skillsCatalogProp, mcpsCatalog: mcpsCata
 	}, [tabOrder, activeTab]);
 	useEffect(() => {
 		if (activeTab !== "mcps") return;
-		onRefreshMcpToolsRef.current?.();
-	}, [activeTab]);
+		if (!onRefreshMcpToolsRef.current) return;
+		for (const d of mcpsCatalogLiveRef.current) mcpColdProbedRef.current.add(d.config.name);
+		fireMcpToolsRefresh();
+	}, [activeTab, fireMcpToolsRefresh]);
+	useEffect(() => {
+		if (activeTab !== "mcps") return;
+		const cold = mcpsCatalog.filter((d) => mcpsToggle.enabledSet.has(d.config.name) && (mcpToolsByServer[d.config.name]?.length ?? 0) === 0 && !mcpColdProbedRef.current.has(d.config.name));
+		if (cold.length === 0) return;
+		for (const d of cold) mcpColdProbedRef.current.add(d.config.name);
+		fireMcpToolsRefresh();
+	}, [
+		activeTab,
+		mcpsCatalog,
+		mcpsToggle.enabledSet,
+		mcpToolsByServer,
+		fireMcpToolsRefresh
+	]);
 	const extensionThemes = extensionThemesProp ?? [];
 	const generalItems = useMemo(() => {
 		const toggles = SETTINGS_TOGGLES.map((t) => ({
@@ -12322,13 +12631,19 @@ function SettingsModal({ skillsCatalog: skillsCatalogProp, mcpsCatalog: mcpsCata
 		const row = mcpVisibleRows[cursor];
 		if (!row || row.kind !== "server") return;
 		const name = row.entry.config.name;
+		if ((mcpToolsByServer[name]?.length ?? 0) === 0) fireMcpToolsRefresh();
 		setExpandedMcps((prev) => {
 			if (prev.has(name)) return prev;
 			const next = new Set(prev);
 			next.add(name);
 			return next;
 		});
-	}, [mcpVisibleRows, cursor]);
+	}, [
+		mcpVisibleRows,
+		cursor,
+		mcpToolsByServer,
+		fireMcpToolsRefresh
+	]);
 	const collapseFocusedMcpRow = useCallback(() => {
 		const row = mcpVisibleRows[cursor];
 		if (!row) return;
@@ -12558,8 +12873,12 @@ function SettingsModal({ skillsCatalog: skillsCatalogProp, mcpsCatalog: mcpsCata
 			if (activeTab === "mcps") {
 				const row = mcpVisibleRows[cursor];
 				if (!row) return;
-				if (row.kind === "server") mcpsToggle.toggle(row.entry.config.name);
-				else if (row.kind === "tool") mcpToolToggleMap[row.serverName]?.toggle(row.tool.name);
+				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") {
@@ -12680,7 +12999,7 @@ function SettingsModal({ skillsCatalog: skillsCatalogProp, mcpsCatalog: mcpsCata
 			}
 			if (activeTab === "mcps") {
 				if (actions?.onRefreshMcps) actions.onRefreshMcps();
-				if (actions?.onRefreshMcpTools) actions.onRefreshMcpTools();
+				fireMcpToolsRefresh();
 			}
 		}
 	});
@@ -12785,7 +13104,9 @@ function SettingsModal({ skillsCatalog: skillsCatalogProp, mcpsCatalog: mcpsCata
 						onCommitEdit: commitConfigEdit,
 						modelCatalog,
 						onApplyModelEdit: applyModelEdit,
-						onCancelEdit: cancelConfigEdit
+						onCancelEdit: cancelConfigEdit,
+						actionStatus: configAction,
+						actionProbes
 					}),
 					activeTab === "mcps" && /* @__PURE__ */ jsx$1(McpsList, {
 						rows: mcpVisibleRows,
@@ -12793,6 +13114,7 @@ function SettingsModal({ skillsCatalog: skillsCatalogProp, mcpsCatalog: mcpsCata
 						enabledSet: mcpsToggle.enabledSet,
 						toolToggleMap: mcpToolToggleMap,
 						toolsByServer: mcpToolsByServer,
+						toolsRefreshing: mcpToolsRefreshing,
 						expanded: expandedMcps,
 						totalCount: mcpsCatalog.length,
 						cursor,
@@ -13058,8 +13380,8 @@ function GeneralList({ items, cursor, highlightBg, query, contentCols, editingKe
 		})
 	});
 }
-const EXTENSION_CONFIG_INDENT = 0;
-function ExtensionsList({ rows, enabledSet, extensionConfig, categories, totalCount, cursor, highlightBg, query, contentCols, editing, inputRef, onCommitEdit, modelCatalog, onApplyModelEdit, onCancelEdit }) {
+const EXTENSION_CONFIG_INDENT = 3;
+function ExtensionsList({ rows, enabledSet, extensionConfig, categories, totalCount, cursor, highlightBg, query, contentCols, editing, inputRef, onCommitEdit, modelCatalog, onApplyModelEdit, onCancelEdit, actionStatus, actionProbes }) {
 	const COLOR = useColors();
 	const home = homedir();
 	if (totalCount === 0) return /* @__PURE__ */ jsxs("box", {
@@ -13206,7 +13528,19 @@ function ExtensionsList({ rows, enabledSet, extensionConfig, categories, totalCo
 				const childBg = childFocused ? highlightBg : void 0;
 				const value = resolveExtensionConfigValue(item, extensionConfig?.[group.ext.name]?.[item.key]);
 				const childDesc = truncateToCols(item.description ?? "", descCols);
-				if (item.type === "boolean") childEls.push(/* @__PURE__ */ jsx$1(ToggleRow, {
+				if (item.type === "action") {
+					const status = actionStatus && actionStatus.extName === group.ext.name && actionStatus.key === item.key ? actionStatus : null;
+					childEls.push(/* @__PURE__ */ jsx$1(ConfigActionRow, {
+						id: anchorIdFor(index),
+						indent: EXTENSION_CONFIG_INDENT,
+						label: item.label,
+						description: childDesc,
+						status,
+						probe: actionProbes[`${group.ext.name}:${item.key}`] ?? null,
+						focused: childFocused,
+						bg: childBg
+					}, item.key));
+				} else if (item.type === "boolean") childEls.push(/* @__PURE__ */ jsx$1(ToggleRow, {
 					id: anchorIdFor(index),
 					indent: EXTENSION_CONFIG_INDENT,
 					label: item.label,
@@ -13345,6 +13679,53 @@ function CreateExtensionButton() {
 		})]
 	});
 }
+function ConfigActionRow({ id, label, description, status, probe, focused, bg, indent = 0 }) {
+	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", {
+		id,
+		style: {
+			flexDirection: "column",
+			flexShrink: 0,
+			paddingLeft: 1 + indent,
+			paddingRight: 1,
+			backgroundColor: bg
+		},
+		children: [/* @__PURE__ */ jsxs("text", {
+			wrapMode: "none",
+			children: [
+				/* @__PURE__ */ jsx$1("span", {
+					fg: focused ? COLOR.brand : COLOR.mute,
+					children: focused ? "▶ " : "  "
+				}),
+				/* @__PURE__ */ jsx$1("span", {
+					fg: COLOR.mute,
+					children: SPACER_CHECKBOX_WIDTH
+				}),
+				/* @__PURE__ */ jsx$1("span", {
+					fg: focused ? COLOR.brand : COLOR.dim,
+					children: label
+				}),
+				statusText && /* @__PURE__ */ jsxs(Fragment, { children: [/* @__PURE__ */ jsx$1("span", {
+					fg: COLOR.mute,
+					children: ": "
+				}), /* @__PURE__ */ jsx$1("span", {
+					fg: statusColor,
+					children: statusText
+				})] }),
+				focused && status?.state !== "busy" && /* @__PURE__ */ jsx$1("span", {
+					fg: COLOR.brand,
+					children: " ↵ run"
+				})
+			]
+		}), description && /* @__PURE__ */ jsx$1("text", {
+			wrapMode: "none",
+			fg: COLOR.mute,
+			children: `${COL_TITLE}${description}`
+		})]
+	});
+}
 function ConfigInputRow({ id, label, description, value, editing, initial, inputRef, onCommit, focused, bg, indent = 0 }) {
 	const COLOR = useColors();
 	return /* @__PURE__ */ jsxs("box", {
@@ -13552,7 +13933,7 @@ function SkillsList({ items, enabledSet, totalCount, cursor, highlightBg, query,
 		})
 	});
 }
-function McpsList({ rows, filteredCount, enabledSet, toolToggleMap, toolsByServer, expanded, totalCount, cursor, highlightBg, query, errors, authState, contentCols }) {
+function McpsList({ rows, filteredCount, enabledSet, toolToggleMap, toolsByServer, toolsRefreshing, expanded, totalCount, cursor, highlightBg, query, errors, authState, contentCols }) {
 	const COLOR = useColors();
 	const home = homedir();
 	if (totalCount === 0) return /* @__PURE__ */ jsxs("box", {
@@ -13651,7 +14032,8 @@ function McpsList({ rows, filteredCount, enabledSet, toolToggleMap, toolsByServe
 					anchorId: anchorIdFor(index),
 					focused,
 					bg,
-					COLOR
+					COLOR,
+					refreshing: toolsRefreshing
 				});
 			})]
 		}, `group:${group.server.entry.config.name}`))]
@@ -13726,7 +14108,7 @@ function renderToolListRow({ serverName, tool, focused, bg, enabled, anchorId, C
 		]
 	}, `tool:${serverName}/${tool.name}`);
 }
-function renderEmptyToolsListRow({ serverName, anchorId, focused, bg, COLOR }) {
+function renderEmptyToolsListRow({ serverName, anchorId, focused, bg, COLOR, refreshing }) {
 	return /* @__PURE__ */ jsxs("text", {
 		id: anchorId,
 		wrapMode: "none",
@@ -13736,7 +14118,7 @@ function renderEmptyToolsListRow({ serverName, anchorId, focused, bg, COLOR }) {
 			children: focused ? TOOL_ROW_FOCUS_INDENT$1 : TOOL_ROW_INDENT$1
 		}), /* @__PURE__ */ jsx$1("span", {
 			fg: COLOR.mute,
-			children: "⟲ No cached tools yet. Send any prompt with this server enabled to populate."
+			children: refreshing ? "⟲ Fetching tool list…" : "⟲ No tools reported — check the server command or login; ctrl+r retries."
 		})]
 	}, `tool-empty:${serverName}`);
 }
@@ -14157,6 +14539,37 @@ function renderMcpDetailPanel(entry, status, COLOR) {
 			})
 		]
 	});
+	if (status.kind === "bootstrap-error") return /* @__PURE__ */ jsxs("box", {
+		style: {
+			flexDirection: "column",
+			border: ["top"],
+			borderColor: COLOR.border,
+			paddingTop: 1
+		},
+		children: [
+			/* @__PURE__ */ jsx$1("text", {
+				fg: COLOR.error,
+				children: `Server failed to start: ${entry.config.name}`
+			}),
+			/* @__PURE__ */ jsx$1("text", {
+				fg: COLOR.dim,
+				children: status.error
+			}),
+			/* @__PURE__ */ jsxs("text", {
+				fg: COLOR.mute,
+				children: [
+					"Fix the command / URL in mcps.json, then",
+					" ",
+					/* @__PURE__ */ jsx$1("span", {
+						fg: COLOR.warn,
+						children: "ctrl+r"
+					}),
+					" ",
+					"to re-probe."
+				]
+			})
+		]
+	});
 	return null;
 }
 function renderInlineMcpBadge(status, COLOR) {
@@ -14178,6 +14591,10 @@ function renderInlineMcpBadge(status, COLOR) {
 			fg: COLOR.error,
 			children: " · ✗ login failed"
 		});
+		case "bootstrap-error": return /* @__PURE__ */ jsx$1("span", {
+			fg: COLOR.error,
+			children: " · ✗ failed to start"
+		});
 	}
 }
 function renderMcpErrors(errors, home, warnColor) {
@@ -14309,7 +14726,7 @@ function Hints({ activeTab, focusedMcp, focusedMcpRow, focusedMcpStatus, canRefr
 				" · ",
 				/* @__PURE__ */ jsx$1("span", {
 					fg: COLOR.warn,
-					children: "ctrl+R"
+					children: "ctrl+r"
 				}),
 				" refresh"
 			] }),
@@ -15894,6 +16311,58 @@ function AppShell() {
 		config.extensionScanPaths
 	]);
 	/**
+	* Hot-load on enable: toggling an extension ON in Settings → Extensions
+	* used to take effect only at the next launch — live filtering can remove
+	* an already-loaded extension's contributions, but it can't import a
+	* module that boot skipped, so the row stayed blank (no version, no
+	* settings) until a reboot. This effect closes that asymmetry: when a
+	* newly-enabled name matches a registry entry whose `setup()` never ran,
+	* it rides the same rebuild path as `/reload` and the disk watcher —
+	* `registryBuildOptions` reads the allowlist through the eagerly-written
+	* `enabledExtensionsRef`, so the rebuild sees the fresh toggle. The
+	* settings modal renders registry state as live props, so the extension's
+	* config items appear immediately, modal still open.
+	*
+	* Toggling OFF needs nothing here (`filterExtensionRegistry` handles it
+	* reactively), and re-enabling an extension that is still in `loaded`
+	* (same-session toggle round-trip) is also pure filtering — only
+	* never-set-up entries trigger the reload. Errored entries are excluded:
+	* a rebuild wouldn't fix them, and the modal already surfaces the error.
+	*/
+	const handledEnabledExtensionsRef = useRef(settings.enabledExtensions);
+	const [enableRetryNonce, setEnableRetryNonce] = useState(0);
+	useEffect(() => {
+		const prev = handledEnabledExtensionsRef.current;
+		const next = settings.enabledExtensions;
+		if (next === void 0 || next === prev) return;
+		const prevSet = new Set(prev ?? []);
+		const registry = extensionRegistryLiveRef.current;
+		const needsLoad = next.filter((name) => !prevSet.has(name) && (registry.inactive.some((e) => e.name === name && !e.error) || registry.loaded.some((e) => e.name === name && !e.setupRan && !e.error)));
+		if (needsLoad.length === 0) {
+			handledEnabledExtensionsRef.current = next;
+			return;
+		}
+		if (extensionAutoReloadInFlightRef.current || runningRef.current) {
+			const id = setTimeout(() => setEnableRetryNonce((n) => n + 1), EXTENSION_WATCH_POLL_MS);
+			return () => clearTimeout(id);
+		}
+		handledEnabledExtensionsRef.current = next;
+		extensionAutoReloadInFlightRef.current = true;
+		(async () => {
+			try {
+				await reloadExtensionsRef.current();
+				streamRef.current?.appendImmediate({
+					kind: "info",
+					text: `\u{1F50C} Enabled ${needsLoad.join(", ")} — settings and UI are live; agent tools apply next run.`
+				});
+			} catch (err) {
+				debugLog("extension enable: hot-load failed", err);
+			} finally {
+				extensionAutoReloadInFlightRef.current = false;
+			}
+		})();
+	}, [settings.enabledExtensions, enableRetryNonce]);
+	/**
 	* Auto-wake trigger for background-task notifications. When a
 	* backgrounded shell task exits while the agent is IDLE, nothing would
 	* otherwise deliver the queued `<task-notification>` until the user
@@ -15917,6 +16386,11 @@ function AppShell() {
 	const [showQuitConfirm, setShowQuitConfirm] = useState(false);
 	const showQuitConfirmRef = useRef(false);
 	showQuitConfirmRef.current = showQuitConfirm;
+	useEffect(() => {
+		if (!showQuitConfirm) return;
+		modal.lock();
+		return () => modal.unlock();
+	}, [showQuitConfirm, modal]);
 	const [quitConfirmSelected, setQuitConfirmSelected] = useState("cancel");
 	const quitConfirmSelectedRef = useRef("cancel");
 	quitConfirmSelectedRef.current = quitConfirmSelected;
@@ -16059,6 +16533,7 @@ function AppShell() {
 			const key = command.name.toLowerCase();
 			if (seen.has(key)) continue;
 			seen.add(key);
+			for (const alias of command.aliases ?? []) seen.add(alias.toLowerCase());
 			merged.push(command);
 		}
 		return merged;
@@ -16093,6 +16568,7 @@ function AppShell() {
 		visibleChatCatalog,
 		liveExtensionCompletionProviders
 	]);
+	const inlineAutocompleteProviders = useMemo(() => [createPathAutocompleteProvider({ cwd: () => process.cwd() }), ...filterExtensionRegistry(extensionRegistry, settings.enabledExtensions).inlineAutocompleteProviders], [extensionRegistry, settings.enabledExtensions]);
 	useEffect(() => {
 		const handle = agentRef.current?.handle;
 		if (handle) handle.cwd = cwd;
@@ -16575,12 +17051,16 @@ function AppShell() {
 		});
 		agent.hooks.hook("mcp:bootstrap:end", (ctx) => {
 			if (ctx.ok) return;
-			if (mcpsCatalogRef.current.find((d) => d.config.name === ctx.name)?.config.auth !== "oauth") return;
-			dispatchAuthRef.current({
+			if (mcpsCatalogRef.current.find((d) => d.config.name === ctx.name)?.config.auth === "oauth") dispatchAuthRef.current({
 				type: "auth-error",
 				name: ctx.name,
 				error: ctx.error.message
 			});
+			else dispatchAuthRef.current({
+				type: "bootstrap-error",
+				name: ctx.name,
+				error: ctx.error.message
+			});
 		});
 		agent.hooks.hook("mcp:auth:url", ({ name, url }) => {
 			dispatchAuthRef.current({
@@ -18330,7 +18810,7 @@ function AppShell() {
 	/** Route a submitted prompt to the command executor when it's a `/cmd`, otherwise to the model. */
 	const runPromptOrCommand = useCallback(async (prompt, references, attachments, opts) => {
 		if (!opts?.wake) {
-			const invocation = parseCommandInvocation(prompt, commandsRef.current.map((c) => c.name));
+			const invocation = parseCommandInvocation(prompt, commandsRef.current);
 			if (invocation) {
 				await runCommand(invocation);
 				return;
@@ -18401,7 +18881,7 @@ function AppShell() {
 		suppressWakeRef.current = false;
 		(async () => {
 			let effectivePrompt = prompt;
-			if (parseCommandInvocation(prompt, commandsRef.current.map((c) => c.name)) === null && parseBashInvocation(prompt) === null) for (const contribution of extensionRegistry.promptTransforms) try {
+			if (parseCommandInvocation(prompt, commandsRef.current) === null && parseBashInvocation(prompt) === null) for (const contribution of extensionRegistry.promptTransforms) try {
 				const out = await contribution.value(effectivePrompt);
 				if (out === void 0) continue;
 				if (typeof out === "string") {
@@ -19667,6 +20147,7 @@ function AppShell() {
 						pendingInteraction,
 						onInteraction: onInteractionResolve,
 						completionProviders,
+						inlineAutocompleteProviders,
 						onCompletionTab: (providerId) => {
 							if (providerId !== "chats") return false;
 							toggleChatReferenceScope();
@@ -20257,7 +20738,7 @@ function ToggleListModal({ catalog, keyOf, settingKey, gcKeys, title, renderDeta
 				children: [
 					onRefresh && /* @__PURE__ */ jsxs("span", { children: [/* @__PURE__ */ jsx$1("span", {
 						fg: COLOR.warn,
-						children: "ctrl+R"
+						children: "ctrl+r"
 					}), " refresh · "] }),
 					/* @__PURE__ */ jsx$1("span", {
 						fg: COLOR.warn,
@@ -20316,7 +20797,7 @@ function ToggleListModal({ catalog, keyOf, settingKey, gcKeys, title, renderDeta
 					" toggle · ",
 					onRefresh && /* @__PURE__ */ jsxs("span", { children: [/* @__PURE__ */ jsx$1("span", {
 						fg: COLOR.warn,
-						children: "ctrl+R"
+						children: "ctrl+r"
 					}), " refresh · "] }),
 					/* @__PURE__ */ jsx$1("span", {
 						fg: COLOR.warn,
@@ -20343,10 +20824,11 @@ function ToggleListModal({ catalog, keyOf, settingKey, gcKeys, title, renderDeta
 *     folder without leaving the TUI.
 *
 * Enabled state lives in `settings.enabledExtensions` (mirrors
-* `enabledSkills` / `enabledMcps`). Toggling takes effect on the NEXT
-* launch — extension registration is a boot-time concern (themes /
-* agents / providers / keybindings all fold into the resolved config
-* at `resolveConfig` time).
+* `enabledSkills` / `enabledMcps`). Toggling OFF filters the live
+* registry immediately; toggling ON an extension that boot skipped
+* hot-reloads the registry (see "Hot-load on enable" in app.tsx), so
+* its `setup()` runs and its settings appear without a restart.
+* Agent-side contributions (tools / hooks) apply on the next run.
 */
 function ExtensionsSettingsModal({ catalog, inactive }) {
 	const COLOR = useColors();
@@ -21034,7 +21516,7 @@ function displayPath(path, home) {
 * 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
+* 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.