zidane 6.2.7 → 6.2.10

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-DtOaKu4d.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-DPO6GKX5.js";
+import { $ as useMcpAuthDispatch, $n as buildBuildSystem, $t as providerKeySetChanged, A as runOAuthLogin, B as refreshMcpToolsCatalog, Ct as SETTINGS_CATEGORIES, D as formatPathForCwd, Dt as SettingsProvider, En as accentColor, Et as SETTINGS_TOGGLES, F as mcpsDiscoveryPaths, Gt as ConfigProvider, H as subscribeMcpToolsCache, Hn as useActiveTodos, Ht as DiscoveryProvider, J as parentServerName, Jt as resolveStoragePaths, K as buildVisibleMcpRows, Kt as useConfig, M as buildMcpServers, Mn as TODO_STATUS_GLYPHS, Mt as resolveChipColor, Nt as resolveTheme, O as fetchOAuthRedirect, Ot as clampFps, P as discoverProjectMcps, Q as McpAuthProvider, Qt as filterChainFallbacks, R as loadMcpToolsCache, St as DEFAULT_SETTINGS, T as suggestSafelistEntries, Tt as SETTINGS_INPUTS, Ut as useDiscovery, Vt as createDiscoverySlot, W as useMcpToolToggleMap, Wt as useDiscoveryOptional, Xt as chainPositionOf, Y as createFileMcpCredentialStore, Yt as buildRunModel, Zt as chainsEqual, _ as useSafeModeQueue, _n as chatAutoCompactBehavior, _t as truncateTrailing, a as useSurfaces, ar as compactSummaryEvent, at as PRESENT_PLAN_TOOL, b as getSafelist, br as updateToolEventOutcomes, bt as listProjectFiles, c as useStreamBuffer, cn as useUpdateCheck, cr as eventsFromTurns, d as discoverProjectSkills, dr as loadState, en as restoreChainFallbacks, er as buildPlanSystem, et as useMcpAuthState, fr as marginTopFor, ft as useInteractionsActions, g as useSafeModeActions, gr as sumRunCosts, gt as hintsLength, h as SafeModeProvider, hr as stripSpawnTokensLine, ht as clipHintsToWidth, i as useSelectStyle, in as tryOpenBrowser, it as InteractionsProvider, j as supportsOAuth, k as oauthUsesManualCodePaste, kt as useSettings, l as buildSkillsConfig, lr as lastContextSizeFromTurns, lt as makeRequestInteraction, m as writeSessionExport, mr as serverToolResultSummary, mt as EMPTY_HINTS, n as ThemeProvider, nn as toggleChainEntry, nr as chatReferenceTokensForPrompt, on as bootTick, ot as buildResumedToolResultsTurn, pt as useInteractionsQueue, q as indexOfServerRow, qt as resolveConfig, r as useColors, rn as useCompletion, rr as createChatTurnsReadTool, rt as ASK_USER_TOOL, s as useTheme, sn as buildUpdateHint, sr as deriveSessionTitle, st as createInteractionTools, t as computeTurnAnchors, tr as envSection, tt as getMcpAuthStatus, u as defaultSkillScanPaths, ur as listSessionMeta, ut as pendingInteractionsFromTurns, vn as discoverAgentsMd, vr as toolCallPreview, vt as buildHints, wt as SETTINGS_CHOICES, x as isOnSafelist, xr as usageByModel, xt as useEnabledToggleSet, y as addToSafelist, yr as toolResultText, z as mcpToolsCachePath } from "./transcript-anchors-BUigMBQt.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-6iGNP46b.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";
@@ -7,16 +7,16 @@ import { l as errorMessage } from "./errors-DJUxZg9b.js";
 import { M as findGitRoot, j as projectUserPaths } from "./resolve-HtxmBWs9.js";
 import { a as createRingBufferSink, i as createLoggingHooks, l as logFileTimestamp, n as createFileSink, o as fanoutSink, r as createLogger, s as formatLogLine, t as consoleSink } from "./logger-DBX9uYOw.js";
 import { i as sniffImageMediaType } from "./media-sniff-Bn76JxAu.js";
-import { r as formatTokenUsage, t as effectiveInputFromTurn } from "./stats-DAKBEKjc.js";
+import { n as flattenTurns, r as formatTokenUsage, t as effectiveInputFromTurn } from "./stats-DAKBEKjc.js";
 import { replaceDynamicSection } from "./prompt.js";
-import { a as getExtensionSessionState, i as demoteStaleRunningStatus, o as loadSession, s as setExtensionSessionState, t as createSession } from "./session-Dc1v4Otm.js";
+import { a as getExtensionSessionState, i as demoteStaleRunningStatus, o as loadSession, s as setExtensionSessionState, t as createSession } from "./session-CIXE-Bzp.js";
 import { o as withTimeout } from "./timeout-BDetbuN6.js";
-import { n as connectMcpServers, u as McpOAuthProvider } from "./mcp-CkHUripi.js";
+import { n as connectMcpServers, u as McpOAuthProvider } from "./mcp-BCaN_Gyg.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-Cexpxjfa.js";
+import { i as installSkillFromSpec, r as SkillInstallError } from "./skills-CDpejYOf.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-B5nMPF8w.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-BH6G59RL.js";
 import { createDockerContext } from "./contexts/docker.js";
 import { createTuiStore } from "./session/sqlite.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";
@@ -1971,6 +1971,23 @@ function Transcript({ events, settings, selectedTurnId = null, busy = false }) {
 		scrollbox.scrollBy(direction, key.shift ? "content" : "viewport");
 	}, [modal]));
 	const anchors = useMemo(() => computeTurnAnchors(items), [items]);
+	const liveByItem = useMemo(() => {
+		const map = /* @__PURE__ */ new Map();
+		const open = openSpawns(events);
+		for (let i = items.length - 1; i >= 0 && open.size > 0; i--) {
+			const item = items[i];
+			const here = [];
+			for (const [id, childEvents] of open) if (item.kind === "child-run" ? item.events.some((e) => e.childId === id) : item.event.kind === "spawn-start" && item.event.childId === id) {
+				here.push({
+					id,
+					activity: spawnActivity(childEvents)
+				});
+				open.delete(id);
+			}
+			if (here.length > 0) map.set(i, here.reverse());
+		}
+		return map;
+	}, [items, events]);
 	useEffect(() => {
 		if (!selectedTurnId) return;
 		const scrollbox = scrollboxRef.current;
@@ -2011,20 +2028,29 @@ function Transcript({ events, settings, selectedTurnId = null, busy = false }) {
 				}
 			},
 			children: [items.map((item, i) => {
-				if (item.kind === "event") return /* @__PURE__ */ jsx$1(EventLine, {
-					event: item.event,
-					previous: item.previous,
-					selected: isTurnHighlighted(item.event, selectedTurnId, ownership),
-					anchorId: anchors.ids[i][0],
-					settleCodeEpoch: codeSettle.current.targets.has(item.event) ? codeSettle.current.epoch : 0
-				}, i);
+				if (item.kind === "event") {
+					const live = liveByItem.get(i);
+					const line = /* @__PURE__ */ jsx$1(EventLine, {
+						event: item.event,
+						previous: item.previous,
+						selected: isTurnHighlighted(item.event, selectedTurnId, ownership),
+						anchorId: anchors.ids[i][0],
+						settleCodeEpoch: codeSettle.current.targets.has(item.event) ? codeSettle.current.epoch : 0
+					}, live ? void 0 : i);
+					if (!live) return line;
+					return /* @__PURE__ */ jsxs("box", { children: [line, live.map((spawn) => /* @__PURE__ */ jsx$1(LiveSpawnRow, {
+						spawn,
+						showLabel: true
+					}, spawn.id))] }, i);
+				}
 				return /* @__PURE__ */ jsx$1(SubagentBlock, {
 					events: item.events,
 					previous: item.previous,
 					selectedTurnId,
 					anchorIds: anchors.ids[i],
 					codeSettleTargets: codeSettle.current.targets,
-					codeSettleEpoch: codeSettle.current.epoch
+					codeSettleEpoch: codeSettle.current.epoch,
+					live: liveByItem.get(i)
 				}, i);
 			}), showThrobber && /* @__PURE__ */ jsx$1("box", {
 				style: { marginTop: items.length > 0 ? 1 : 0 },
@@ -2038,14 +2064,56 @@ function Transcript({ events, settings, selectedTurnId = null, busy = false }) {
 	});
 }
 /**
-* 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.
-*
-* When `hideSubagentOutput` is on, `isVisible` already filters most child
-* events out; the surviving `spawn-start` / `spawn-end` markers render as
-* plain entries (no boxing) — there's nothing meaningful to box.
+* Children with a `spawn-start` but no terminal marker yet, mapped to the
+* events they've produced since. Computed against the FULL event list — a
+* parent-depth row (e.g. a background-task banner) can split one child's
+* events across two boxes, and only a global scan knows whether the child
+* actually finished. `spawn:error` emits a child-tagged `error` event and
+* never a `spawn-end`, so that closes the child too. Live-only signal:
+* replayed sessions always synthesize a `spawn-end` per child run, so
+* nothing stays open after a reload.
+*/
+function openSpawns(events) {
+	const open = /* @__PURE__ */ new Map();
+	for (const event of events) {
+		if (!event.childId || (event.depth ?? 0) === 0) continue;
+		if (event.kind === "spawn-start") {
+			open.set(event.childId, []);
+			continue;
+		}
+		if (event.kind === "spawn-end" || event.kind === "error") {
+			open.delete(event.childId);
+			continue;
+		}
+		open.get(event.childId)?.push(event);
+	}
+	return open;
+}
+/**
+* One-word-ish description of what a running child is doing right now,
+* derived from its trailing events: `text` while prose streams, `thinking`
+* during reasoning, the tool name for a single in-flight call, and
+* `tool call ×N` over an uninterrupted burst of calls.
 */
+function spawnActivity(events) {
+	const last = events[events.length - 1];
+	if (!last) return "starting";
+	switch (last.kind) {
+		case "markdown": return "text";
+		case "thinking": return "thinking";
+		case "tool":
+		case "tool-result": {
+			let calls = 0;
+			for (let i = events.length - 1; i >= 0; i--) {
+				const kind = events[i].kind;
+				if (kind === "tool") calls += 1;
+				else if (kind !== "tool-result") break;
+			}
+			return calls > 1 ? `tool call ×${calls}` : last.tool ?? "tool call";
+		}
+		default: return "working";
+	}
+}
 function partitionTranscript(events, settings) {
 	const visible = events.filter((e) => isVisible(e, settings));
 	if (visible.length === 0) return [];
@@ -2093,7 +2161,7 @@ function partitionTranscript(events, settings) {
 * indented twice. Grandchildren (depth ≥ 2) still indent further, so
 * nested subagents remain visually distinct.
 */
-function SubagentBlock({ events, previous, selectedTurnId = null, anchorIds, codeSettleTargets, codeSettleEpoch = 0 }) {
+function SubagentBlock({ events, previous, selectedTurnId = null, anchorIds, codeSettleTargets, codeSettleEpoch = 0, live }) {
 	const COLOR = useColors();
 	const childIds = useMemo(() => {
 		const set = /* @__PURE__ */ new Set();
@@ -2103,7 +2171,7 @@ function SubagentBlock({ events, previous, selectedTurnId = null, anchorIds, cod
 	const title = childIds.length === 0 ? " subagent " : childIds.length === 1 ? ` ${childIds[0]} ` : ` subagents · ${childIds.join(", ")} `;
 	const marginTop = previous ? 1 : 0;
 	const hideChildLabel = childIds.length === 1;
-	return /* @__PURE__ */ jsx$1("box", {
+	return /* @__PURE__ */ jsxs("box", {
 		title,
 		style: {
 			border: true,
@@ -2117,7 +2185,7 @@ function SubagentBlock({ events, previous, selectedTurnId = null, anchorIds, cod
 			flexShrink: 0,
 			alignSelf: "stretch"
 		},
-		children: events.map((evt, i) => /* @__PURE__ */ jsx$1(EventLine, {
+		children: [events.map((evt, i) => /* @__PURE__ */ jsx$1(EventLine, {
 			event: evt,
 			previous: events[i - 1],
 			depthOffset: 1,
@@ -2125,7 +2193,31 @@ function SubagentBlock({ events, previous, selectedTurnId = null, anchorIds, cod
 			anchorId: anchorIds?.[i],
 			hideChildLabel,
 			settleCodeEpoch: codeSettleTargets?.has(evt) ? codeSettleEpoch : 0
-		}, i))
+		}, i)), live?.map((spawn) => /* @__PURE__ */ jsx$1("box", {
+			style: { marginTop: events.length > 0 ? 1 : 0 },
+			children: /* @__PURE__ */ jsx$1(LiveSpawnRow, {
+				spawn,
+				showLabel: !hideChildLabel
+			})
+		}, spawn.id))]
+	});
+}
+/** Spinner + current-activity line for a still-running subagent. */
+function LiveSpawnRow({ spawn, showLabel }) {
+	const COLOR = useColors();
+	return /* @__PURE__ */ jsxs("text", {
+		fg: COLOR.dim,
+		children: [
+			/* @__PURE__ */ jsx$1(StatusSpinner, { color: COLOR.warn }),
+			showLabel && /* @__PURE__ */ jsxs(Fragment, { children: [/* @__PURE__ */ jsx$1("span", {
+				fg: COLOR.brand,
+				children: ` ${spawn.id}`
+			}), /* @__PURE__ */ jsx$1("span", {
+				fg: COLOR.mute,
+				children: " ·"
+			})] }),
+			` ${spawn.activity}`
+		]
 	});
 }
 function EmptyState() {
@@ -4568,11 +4660,14 @@ function CwdPickerModal({ currentCwd, onPick }) {
 const FILES_REFRESH_THROTTLE_MS = 3e3;
 const SKILLS_REFRESH_THROTTLE_MS = 3e4;
 const MCP_TOOLS_CACHE_POLL_MS = 4e3;
+const MCPS_CONFIG_POLL_MS = 3e3;
 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 { settings } = useSettings();
+	const foreignAgents = settings.importForeignConfigs === true;
 	const dispatchAuth = useMcpAuthDispatch();
 	const dispatchAuthRef = useRef(dispatchAuth);
 	dispatchAuthRef.current = dispatchAuth;
@@ -4586,6 +4681,8 @@ function DiscoveryShell({ children }) {
 	const [mcpToolsByServer, setMcpToolsByServer] = useState(() => readToolsByServer(dataDir));
 	const filesSlotRef = useRef(null);
 	const skillsSlotRef = useRef(null);
+	/** Last-published MCP discovery result — see the value-compare in `refreshMcps`. */
+	const mcpsFingerprintRef = useRef(null);
 	useEffect(() => {
 		filesSlotRef.current?.abort();
 		skillsSlotRef.current?.abort();
@@ -4608,7 +4705,8 @@ function DiscoveryShell({ children }) {
 			throttleMs: SKILLS_REFRESH_THROTTLE_MS,
 			walk: () => discoverProjectSkills({
 				cwd: projectDir,
-				prefix: config.prefix
+				prefix: config.prefix,
+				foreignAgents
 			}),
 			onLoad: (items) => {
 				if (skillsSlotRef.current === skillsSlot) setSkillsCatalog(items);
@@ -4623,7 +4721,12 @@ function DiscoveryShell({ children }) {
 		try {
 			const { servers, errors } = discoverProjectMcps({
 				cwd: projectDir,
-				prefix: config.prefix
+				prefix: config.prefix,
+				foreignAgents
+			});
+			mcpsFingerprintRef.current = JSON.stringify({
+				servers,
+				errors
 			});
 			setMcpsCatalog(servers);
 			setMcpsErrors(errors);
@@ -4650,7 +4753,8 @@ function DiscoveryShell({ children }) {
 	}, [
 		projectDir,
 		config.prefix,
-		mcpCredentialStore
+		mcpCredentialStore,
+		foreignAgents
 	]);
 	const ensureFiles = useCallback(() => filesSlotRef.current?.ensure() ?? Promise.resolve([]), []);
 	const ensureSkills = useCallback(() => skillsSlotRef.current?.ensure() ?? Promise.resolve([]), []);
@@ -4660,8 +4764,15 @@ function DiscoveryShell({ children }) {
 		try {
 			const { servers, errors } = discoverProjectMcps({
 				cwd: projectDir,
-				prefix: config.prefix
+				prefix: config.prefix,
+				foreignAgents
 			});
+			const fingerprint = JSON.stringify({
+				servers,
+				errors
+			});
+			if (fingerprint === mcpsFingerprintRef.current) return Promise.resolve();
+			mcpsFingerprintRef.current = fingerprint;
 			setMcpsCatalog(servers);
 			setMcpsErrors(errors);
 			for (const entry of servers) {
@@ -4683,7 +4794,27 @@ function DiscoveryShell({ children }) {
 	}, [
 		projectDir,
 		config.prefix,
-		mcpCredentialStore
+		mcpCredentialStore,
+		foreignAgents
+	]);
+	useEffect(() => {
+		let lastSignature = mcpsConfigSignature(projectDir, config.prefix, foreignAgents);
+		const id = setInterval(() => {
+			try {
+				const signature = mcpsConfigSignature(projectDir, config.prefix, foreignAgents);
+				if (signature === lastSignature) return;
+				lastSignature = signature;
+				refreshMcps();
+			} catch (err) {
+				debugLog$1("mcps config poll failed", err);
+			}
+		}, MCPS_CONFIG_POLL_MS);
+		return () => clearInterval(id);
+	}, [
+		projectDir,
+		config.prefix,
+		refreshMcps,
+		foreignAgents
 	]);
 	useEffect(() => {
 		let lastSignature = cacheFileSignature(dataDir);
@@ -4742,6 +4873,21 @@ function cacheFileSignature(dataDir) {
 	const stat = statSync(mcpToolsCachePath(dataDir), { throwIfNoEntry: false });
 	return stat ? `${stat.mtimeMs}:${stat.size}` : null;
 }
+/**
+* Change signature across every candidate `mcp(s).json` path (project +
+* user, both filename variants). Missing files contribute their bare path
+* so create/delete flips the signature just like an edit does.
+*/
+function mcpsConfigSignature(projectDir, prefix, foreignAgents) {
+	return mcpsDiscoveryPaths({
+		cwd: projectDir,
+		prefix,
+		foreignAgents
+	}).map(({ path }) => {
+		const stat = statSync(path, { throwIfNoEntry: false });
+		return stat ? `${path}:${stat.mtimeMs}:${stat.size}` : path;
+	}).join("|");
+}
 function readToolsByServer(dataDir) {
 	const cache = loadMcpToolsCache({ dataDir });
 	const out = {};
@@ -4963,7 +5109,7 @@ const BASE_LEVELS$1 = [
 	},
 	{
 		id: "minimal",
-		description: "tiny reasoning budget (gpt-5 family)"
+		description: "tiny reasoning budget"
 	},
 	{
 		id: "low",
@@ -4979,16 +5125,16 @@ const BASE_LEVELS$1 = [
 	},
 	{
 		id: "xhigh",
-		description: "very deep reasoning (Anthropic)"
+		description: "very deep reasoning"
 	},
 	{
 		id: "max",
-		description: "maximum reasoning effort (Anthropic)"
+		description: "maximum reasoning effort"
 	}
 ];
 const ADAPTIVE_LEVEL$1 = {
 	id: "adaptive",
-	description: "model decides per-turn (Anthropic)"
+	description: "model decides per-turn"
 };
 function ModelOptionsPickerModal({ supportsReasoning, supportsAdaptive, currentEffort, options, enabled, onPickEffort, onToggleOption }) {
 	const COLOR = useColors();
@@ -11452,13 +11598,17 @@ function filterLogRecords(records, minLevel) {
 }
 //#endregion
 //#region src/tui/settings-form-dialog.tsx
-function FormDialog({ title, error, hint, children }) {
+/** Shared dialog width — pickers use it to size their own ellipsed rows. */
+function formDialogWidth(termWidth) {
+	return Math.min(96, Math.max(48, termWidth - 8));
+}
+function FormDialog({ title, error, hint, contentRows, children }) {
 	const COLOR = useColors();
 	const SURFACE = useSurfaces();
 	const { width: termWidth, height: termHeight } = useTerminalDimensions();
-	const width = Math.min(96, Math.max(48, termWidth - 8));
+	const width = formDialogWidth(termWidth);
 	const left = Math.max(0, Math.floor((termWidth - width) / 2));
-	const top = Math.max(1, Math.floor(termHeight / 2) - 7);
+	const top = contentRows !== void 0 ? Math.max(1, Math.floor((termHeight - (contentRows + 4)) / 2)) : Math.max(1, Math.floor(termHeight / 2) - 7);
 	return /* @__PURE__ */ jsxs("box", {
 		title: ` ${title} `,
 		style: {
@@ -11747,13 +11897,13 @@ function SkillInstallDialog({ active, onSubmit, onCancel }) {
 				focused: row === "source",
 				label: "source",
 				inputRef: sourceRef,
-				placeholder: "owner/repo · skills.sh/owner/repo/skill · pkg@version"
+				placeholder: "owner/repo · skills.sh URL · npx skills add … · pkg@version"
 			}),
 			/* @__PURE__ */ jsx$1(InputRow$1, {
 				focused: row === "skill",
 				label: "skill",
 				inputRef: skillRef,
-				placeholder: "pick one from multi-skill repos (optional)"
+				placeholder: "pick one from multi-skill repos (optional — empty offers import-all)"
 			}),
 			/* @__PURE__ */ jsx$1(CycleRow, {
 				focused: row === "scope",
@@ -11765,6 +11915,130 @@ function SkillInstallDialog({ active, onSubmit, onCancel }) {
 		]
 	});
 }
+/** Rows shown at once in the picker; longer lists scroll around the cursor. */
+const SKILL_PICKER_MAX_VISIBLE = 10;
+/**
+* Shown when a skill install hit a multi-skill source without a selector
+* (`multiple-candidates`): a checkbox picker over everything the repo
+* contains, all pre-selected. `space` toggles the row under the cursor,
+* `a` flips all/none, `enter` imports the checked subset, `esc` cancels
+* back to the idle Skills tab.
+*/
+function SkillImportDialog({ active, source, items, onConfirm, onCancel }) {
+	const COLOR = useColors();
+	const { width: termWidth } = useTerminalDimensions();
+	const [cursor, setCursor] = useState(0);
+	const [checked, setChecked] = useState(() => new Set(items.map((_, i) => i)));
+	const [error, setError] = useState(null);
+	const count = items.length;
+	useKeyboard((key) => {
+		if (!active) return;
+		if (key.name === "escape") {
+			onCancel();
+			return;
+		}
+		if (key.name === "up" || key.name === "tab" && key.shift) {
+			setCursor((c) => (c + count - 1) % count);
+			return;
+		}
+		if (key.name === "down" || key.name === "tab") {
+			setCursor((c) => (c + 1) % count);
+			return;
+		}
+		if (key.name === "space") {
+			setError(null);
+			setChecked((prev) => {
+				const next = new Set(prev);
+				if (next.has(cursor)) next.delete(cursor);
+				else next.add(cursor);
+				return next;
+			});
+			return;
+		}
+		if (key.name === "a") {
+			setError(null);
+			setChecked((prev) => prev.size === count ? /* @__PURE__ */ new Set() : new Set(items.map((_, i) => i)));
+			return;
+		}
+		if (key.name === "return") {
+			const selected = items.filter((_, i) => checked.has(i)).map((item) => item.rel);
+			if (selected.length === 0) {
+				setError("nothing selected — space toggles, a selects all");
+				return;
+			}
+			onConfirm(selected);
+		}
+	});
+	const start = Math.max(0, Math.min(cursor - Math.floor(SKILL_PICKER_MAX_VISIBLE / 2), count - SKILL_PICKER_MAX_VISIBLE));
+	const visible = items.slice(start, start + SKILL_PICKER_MAX_VISIBLE);
+	const innerWidth = formDialogWidth(termWidth) - 6;
+	const hasOverflowUp = start > 0;
+	const hasOverflowDown = start + SKILL_PICKER_MAX_VISIBLE < count;
+	return /* @__PURE__ */ jsxs(FormDialog, {
+		title: "import skills",
+		error,
+		contentRows: 1 + visible.length + (hasOverflowUp ? 1 : 0) + (hasOverflowDown ? 1 : 0),
+		hint: "  ↑↓ move · space toggle · a all/none · enter import · esc cancel",
+		children: [
+			/* @__PURE__ */ jsxs("text", {
+				fg: COLOR.mute,
+				children: [
+					"  ",
+					/* @__PURE__ */ jsx$1("span", {
+						fg: COLOR.warn,
+						children: source
+					}),
+					` — ${checked.size}/${count} selected`
+				]
+			}),
+			hasOverflowUp && /* @__PURE__ */ jsx$1("text", {
+				fg: COLOR.mute,
+				children: `      ↑ ${start} more`
+			}),
+			visible.map((item, vi) => {
+				const i = start + vi;
+				const focusedRow = i === cursor;
+				const isChecked = checked.has(i);
+				const label = clipEnd(item.description ? `${item.rel} — ${item.description}` : item.rel, Math.max(8, innerWidth - 8), item.rel.length);
+				return /* @__PURE__ */ jsxs("text", {
+					fg: COLOR.mute,
+					children: [
+						`  ${focusedRow ? "❯" : " "} [`,
+						/* @__PURE__ */ jsx$1("span", {
+							fg: isChecked ? COLOR.accent : COLOR.mute,
+							children: isChecked ? "✓" : " "
+						}),
+						"] ",
+						/* @__PURE__ */ jsx$1("span", {
+							fg: focusedRow ? COLOR.warn : isChecked ? COLOR.accent : COLOR.mute,
+							children: label.name
+						}),
+						label.rest && /* @__PURE__ */ jsx$1("span", {
+							fg: COLOR.mute,
+							children: label.rest
+						})
+					]
+				}, item.rel);
+			}),
+			hasOverflowDown && /* @__PURE__ */ jsx$1("text", {
+				fg: COLOR.mute,
+				children: `      ↓ ${count - start - SKILL_PICKER_MAX_VISIBLE} more`
+			})
+		]
+	});
+}
+/**
+* Clip `text` to `max` columns with a trailing ellipsis, split into the
+* name segment (first `nameLen` chars — colored per row state) and the
+* dim remainder so the description stays one ellipsed line.
+*/
+function clipEnd(text, max, nameLen) {
+	const clipped = text.length > max ? `${text.slice(0, Math.max(1, max - 1))}…` : text;
+	return {
+		name: clipped.slice(0, Math.min(nameLen, clipped.length)),
+		rest: clipped.slice(Math.min(nameLen, clipped.length))
+	};
+}
 const MCP_TRANSPORTS = [
 	"stdio",
 	"streamable-http",
@@ -12372,6 +12646,7 @@ function SettingsModal({ skillsCatalog: skillsCatalogProp, mcpsCatalog: mcpsCata
 	const [removeArmed, setRemoveArmed] = useState(null);
 	const [extInstallOpen, setExtInstallOpen] = useState(false);
 	const [skillInstallOpen, setSkillInstallOpen] = useState(false);
+	const [skillImportAll, setSkillImportAll] = useState(null);
 	const [skillOp, setSkillOp] = useState(null);
 	const [mcpAdd, setMcpAdd] = useState(false);
 	const [mcpOp, setMcpOp] = useState(null);
@@ -12381,6 +12656,7 @@ function SettingsModal({ skillsCatalog: skillsCatalogProp, mcpsCatalog: mcpsCata
 	const configEditActive = activeTab === "extensions" && configEdit !== null;
 	const extInstallActive = activeTab === "extensions" && extInstallOpen;
 	const skillInstallActive = activeTab === "skills" && skillInstallOpen;
+	const skillImportAllActive = activeTab === "skills" && skillImportAll !== null;
 	const mcpAddActive = activeTab === "mcps" && mcpAdd;
 	useEffect(() => {
 		if (activeTab !== "extensions" && configEdit) setConfigEdit(null);
@@ -12391,14 +12667,18 @@ function SettingsModal({ skillsCatalog: skillsCatalogProp, mcpsCatalog: mcpsCata
 	useEffect(() => {
 		if (activeTab !== "skills" && skillInstallOpen) setSkillInstallOpen(false);
 	}, [activeTab, skillInstallOpen]);
+	useEffect(() => {
+		if (activeTab !== "skills" && skillImportAll) setSkillImportAll(null);
+	}, [activeTab, skillImportAll]);
 	useEffect(() => {
 		if (activeTab !== "mcps" && mcpAdd) setMcpAdd(false);
 	}, [activeTab, mcpAdd]);
 	useEffect(() => {
-		if (!extInstallOpen && !skillInstallOpen && !mcpAdd) inputRef.current?.focus();
+		if (!extInstallOpen && !skillInstallOpen && !skillImportAll && !mcpAdd) inputRef.current?.focus();
 	}, [
 		extInstallOpen,
 		skillInstallOpen,
+		skillImportAll,
 		mcpAdd
 	]);
 	/** Run a skill install off the dialog's payload, streaming progress into the op line. */
@@ -12412,6 +12692,8 @@ function SettingsModal({ skillsCatalog: skillsCatalogProp, mcpsCatalog: mcpsCata
 		actions.onInstallSkill({
 			source: req.source,
 			...req.skill !== void 0 ? { skill: req.skill } : {},
+			...req.all !== void 0 ? { all: req.all } : {},
+			...req.skills !== void 0 ? { skills: req.skills } : {},
 			scope: req.choice,
 			onProgress: (message) => setSkillOp({
 				kind: "busy",
@@ -12420,10 +12702,22 @@ function SettingsModal({ skillsCatalog: skillsCatalogProp, mcpsCatalog: mcpsCata
 		}).then((message) => setSkillOp({
 			kind: "notice",
 			text: message
-		})).catch((err) => setSkillOp({
-			kind: "error",
-			text: errorMessage(err)
-		}));
+		})).catch((err) => {
+			if (err instanceof SkillInstallError && err.code === "multiple-candidates" && err.candidates && err.candidates.length > 0) {
+				setSkillOp(null);
+				const items = err.details && err.details.length === err.candidates.length ? err.details : err.candidates.map((rel) => ({ rel }));
+				setSkillImportAll({
+					source: req.source,
+					scope: req.choice,
+					items
+				});
+				return;
+			}
+			setSkillOp({
+				kind: "error",
+				text: errorMessage(err)
+			});
+		});
 	}, [actions]);
 	/** Add-MCP submit: persist through the host, then surface the outcome. */
 	const runAddMcp = useCallback((result) => {
@@ -12788,7 +13082,7 @@ function SettingsModal({ skillsCatalog: skillsCatalogProp, mcpsCatalog: mcpsCata
 			if (key.name === "escape" && configEdit?.kind !== "model") setConfigEdit(null);
 			return;
 		}
-		if (extInstallActive || skillInstallActive) return;
+		if (extInstallActive || skillInstallActive || skillImportAllActive) return;
 		if (mcpAddActive) return;
 		if (key.name === "escape" && oauthPasteActive && focusedMcp) {
 			actions?.onCancelLoginMcp?.(focusedMcp.config.name);
@@ -13033,7 +13327,7 @@ function SettingsModal({ skillsCatalog: skillsCatalogProp, mcpsCatalog: mcpsCata
 		horizontalMargin: 0,
 		verticalMargin: 0,
 		...version ? { bottomTitle: `zidane v${version}` } : {},
-		disableEscape: configEditActive || !!editingInputKey || extInstallActive || skillInstallActive || mcpAddActive,
+		disableEscape: configEditActive || !!editingInputKey || extInstallActive || skillInstallActive || skillImportAllActive || mcpAddActive,
 		children: [
 			/* @__PURE__ */ jsx$1("box", {
 				style: { flexShrink: 0 },
@@ -13054,7 +13348,7 @@ function SettingsModal({ skillsCatalog: skillsCatalogProp, mcpsCatalog: mcpsCata
 				},
 				children: /* @__PURE__ */ jsx$1("input", {
 					ref: inputRef,
-					focused: !oauthPasteActive && !configEditActive && !editingInputKey && !extInstallActive && !skillInstallActive && !mcpAddActive,
+					focused: !oauthPasteActive && !configEditActive && !editingInputKey && !extInstallActive && !skillInstallActive && !skillImportAllActive && !mcpAddActive,
 					placeholder: searchPlaceholder(activeTab),
 					onInput: handleQueryChange,
 					onSubmit: () => {},
@@ -13285,6 +13579,25 @@ function SettingsModal({ skillsCatalog: skillsCatalogProp, mcpsCatalog: mcpsCata
 				},
 				onCancel: () => setSkillInstallOpen(false)
 			}),
+			skillImportAllActive && skillImportAll && /* @__PURE__ */ jsx$1(SkillImportDialog, {
+				active: skillImportAllActive,
+				source: skillImportAll.source,
+				items: skillImportAll.items,
+				onConfirm: (selected) => {
+					const req = skillImportAll;
+					setSkillImportAll(null);
+					runSkillInstall(selected.length === req.items.length ? {
+						source: req.source,
+						all: true,
+						choice: req.scope
+					} : {
+						source: req.source,
+						skills: selected,
+						choice: req.scope
+					});
+				},
+				onCancel: () => setSkillImportAll(null)
+			}),
 			mcpAddActive && /* @__PURE__ */ jsx$1(McpAddDialog, {
 				active: mcpAddActive,
 				existingNames: mcpsCatalog.map((s) => s.config.name),
@@ -15936,6 +16249,8 @@ function AppShell() {
 	skillsCatalogRef.current = skillsCatalog;
 	const enabledSkillsRef = useRef(settings.enabledSkills);
 	enabledSkillsRef.current = settings.enabledSkills;
+	const importForeignConfigsRef = useRef(settings.importForeignConfigs);
+	importForeignConfigsRef.current = settings.importForeignConfigs;
 	const mcpsCatalogRef = useRef(mcpsCatalog);
 	mcpsCatalogRef.current = mcpsCatalog;
 	const enabledMcpsRef = useRef(settings.enabledMcps);
@@ -16793,7 +17108,8 @@ function AppShell() {
 		const profile = pickedAgentRef.current;
 		const skillsScan = defaultSkillScanPaths({
 			cwd: projectDir,
-			prefix: config.prefix
+			prefix: config.prefix,
+			foreignAgents: importForeignConfigsRef.current === true
 		});
 		const liveExtensionRegistry = filterExtensionRegistry(extensionRegistry, enabledExtensionsRef.current);
 		const extensionSkillNames = liveExtensionRegistry.skills.map((s) => s.name);
@@ -17295,7 +17611,9 @@ function AppShell() {
 			setLastInputTokens(ctx.effectiveTokens);
 			lastInputTokensRef.current = ctx.effectiveTokens;
 		});
+		const spawnStartedAt = /* @__PURE__ */ new Map();
 		agent.hooks.hook("spawn:before", ({ id, task, depth, model }) => {
+			spawnStartedAt.set(id, Date.now());
 			const taskPreview = previewLine(task, 80);
 			stream.appendImmediate({
 				kind: "spawn-start",
@@ -17307,9 +17625,14 @@ function AppShell() {
 		});
 		agent.hooks.hook("spawn:complete", ({ id, depth, status, stats }) => {
 			const tag = status === "aborted" ? "aborted" : status === "error" ? "error" : "done";
+			const startedAt = spawnStartedAt.get(id);
+			spawnStartedAt.delete(id);
+			const elapsed = startedAt !== void 0 ? ` · ${formatDuration(Date.now() - startedAt)}` : "";
+			const cost = flattenTurns(stats).reduce((sum, turn) => sum + (turn.cost ?? 0), 0);
+			const segments = `${elapsed}${cost > 0 ? ` · $${cost.toFixed(cost < .01 ? 4 : 2)}` : ""}`;
 			stream.appendImmediate({
 				kind: "spawn-end",
-				text: `${tag} ${formatTokenUsage(stats)}`,
+				text: segments ? `${tag}${segments} · ${formatTokenUsage(stats)}` : `${tag} ${formatTokenUsage(stats)}`,
 				childId: id,
 				depth: depth ?? 1
 			});
@@ -17904,22 +18227,20 @@ function AppShell() {
 	* catalog refresh makes the new skill togglable immediately.
 	*/
 	const onInstallSkill = useCallback(async (req) => {
-		let result;
-		try {
-			result = await installSkillFromSpec({
-				source: req.source,
-				scope: req.scope,
-				cwd: cwdRef.current,
-				prefix: config.prefix,
-				...req.skill !== void 0 ? { skill: req.skill } : {},
-				...req.onProgress !== void 0 ? { onProgress: req.onProgress } : {}
-			});
-		} catch (err) {
-			if (err instanceof SkillInstallError && err.code === "multiple-candidates") throw new Error(`${err.message} — re-run as “${req.source} <name>”.`);
-			throw err;
-		}
+		const result = await installSkillFromSpec({
+			source: req.source,
+			scope: req.scope,
+			cwd: cwdRef.current,
+			prefix: config.prefix,
+			...req.skill !== void 0 ? { skill: req.skill } : {},
+			...req.all !== void 0 ? { all: req.all } : {},
+			...req.skills !== void 0 ? { skills: req.skills } : {},
+			...req.onProgress !== void 0 ? { onProgress: req.onProgress } : {}
+		});
 		await onRefreshSkills();
-		return result.engine === "skills-cli" ? `installed ${result.installed.join(", ")} via the skills.sh CLI` : `installed ${result.installed.join(", ")} (${req.scope}, ${result.provenance ?? "native"})`;
+		const skippedNote = result.skipped?.length ? ` — skipped existing: ${result.skipped.join(", ")}` : "";
+		const failedNote = result.failed?.length ? ` — ⚠ invalid: ${result.failed.join(", ")}` : "";
+		return result.engine === "skills-cli" ? `installed ${result.installed.join(", ")} via the skills.sh CLI` : `installed ${result.installed.join(", ")} (${req.scope}, ${result.provenance ?? "native"})${skippedNote}${failedNote}`;
 	}, [config.prefix, onRefreshSkills]);
 	/**
 	* Persist a new MCP server (Settings → MCPs → ctrl+g form). Upserts
@@ -20498,7 +20819,7 @@ const BASE_LEVELS = [
 	},
 	{
 		id: "minimal",
-		description: "tiny reasoning budget (gpt-5 family)"
+		description: "tiny reasoning budget"
 	},
 	{
 		id: "low",
@@ -20514,16 +20835,16 @@ const BASE_LEVELS = [
 	},
 	{
 		id: "xhigh",
-		description: "very deep reasoning (Anthropic)"
+		description: "very deep reasoning"
 	},
 	{
 		id: "max",
-		description: "maximum reasoning effort (Anthropic)"
+		description: "maximum reasoning effort"
 	}
 ];
 const ADAPTIVE_LEVEL = {
 	id: "adaptive",
-	description: "model decides per-turn (Anthropic)"
+	description: "model decides per-turn"
 };
 function EffortPickerModal({ current, supportsAdaptive, onPick }) {
 	const COLOR = useColors();