zidane 6.4.4 → 6.5.0

package/dist/tui.js

@@ -1,13 +1,14 @@
-import { $t as toggleChainEntry, A as redirectUriFromAuthUrl, At as resolveTheme, Bt as useDiscovery, Cr as sumRunCosts, Ct as SETTINGS_TOGGLES, D as formatPathForCwd, Dr as updateToolEventOutcomes, Er as toolResultText, Et as useSettings, F as loadMcpToolsCache, G as parentServerName, Gt as resolveStoragePaths, Ht as ConfigProvider, I as mcpToolsCachePath, Jt as chainsEqual, K as createFileMcpCredentialStore, Kn as pruneTodosByRun, Kt as buildRunModel, L as refreshMcpToolsCatalog, M as runOAuthLogin, N as supportsOAuth, Nn as accentColor, O as fetchOAuthRedirect, Or as usageByModel, Q as getMcpAuthStatus, Rt as createDiscoverySlot, Sr as stripSpawnTokensLine, St as SETTINGS_INPUTS, T as suggestSafelistEntries, Tn as discoverAgentsMd, Tr as toolCallPreview, Tt as clampFps, U as buildVisibleMcpRows, Ut as useConfig, V as useMcpToolToggleMap, Vt as useDiscoveryOptional, W as indexOfServerRow, Wt as resolveConfig, X as useMcpAuthDispatch, Xt as providerKeySetChanged, Y as McpAuthProvider, Yn as useActiveTodos, Yt as filterChainFallbacks, Z as useMcpAuthState, Zt as restoreChainFallbacks, _ as useSafeModeQueue, _r as listSessionMeta, _t as listProjectFiles, a as useSurfaces, an as removeMcpServer, b as getSafelist, bt as SETTINGS_CATEGORIES, c as useStreamBuffer, cr as envSection, d as discoverProjectSkills, dn as tryOpenBrowser, dt as EMPTY_HINTS, en as useCompletion, et as ASK_USER_TOOL, fr as compactSummaryEvent, ft as clipHintsToWidth, g as useSafeModeActions, gr as lastContextSizeFromTurns, h as SafeModeProvider, hn as useUpdateCheck, hr as eventsFromTurns, ht as buildHints, i as useSelectStyle, in as mcpsWritePath, it as createInteractionTools, j as oauthUsesManualCodePaste, kt as resolveChipColor, l as buildSkillsConfig, ln as discoverProjectMcps, lr as chatReferenceTokensForPrompt, lt as useInteractionsActions, m as writeSessionExport, mn as buildUpdateHint, mr as deriveSessionTitle, mt as truncateTrailing, n as ThemeProvider, nn as hasClaudeCodeSetup, nt as PRESENT_PLAN_TOOL, on as upsertMcpServer, or as buildBuildSystem, ot as makeRequestInteraction, pn as bootTick, pt as hintsLength, qt as chainPositionOf, r as useColors, rn as importFromClaudeCode, rt as buildResumedToolResultsTurn, s as useTheme, sn as buildMcpServers, sr as buildPlanSystem, st as pendingInteractionsFromTurns, t as computeTurnAnchors, tn as countClaudeSessionFiles, tt as InteractionsProvider, u as defaultSkillScanPaths, ur as createChatTurnsReadTool, ut as useInteractionsQueue, vr as loadState, vt as useEnabledToggleSet, wn as chatAutoCompactBehavior, wt as SettingsProvider, x as isOnSafelist, xr as serverToolResultSummary, xt as SETTINGS_CHOICES, y as addToSafelist, yr as marginTopFor, yt as DEFAULT_SETTINGS, z as subscribeMcpToolsCache, zn as TODO_STATUS_GLYPHS, zt as DiscoveryProvider } from "./transcript-anchors-CgDzYin1.js";
-import { $ as removeInstalledExtension, At as looksBinary, C as resolveTasksDir, E as selectFilesFromSession, Gt as KEYBINDING_KEY_COL_WIDTH, Jt as groupBindings, K as createExtensionPromptBridge, Kt as ensureKeybindingsFile, Mt as createModelSearchTool, O as compactConversation, Ot as tailTruncate, S as resolveSessionDir, Sn as effectiveContextWindow, V as summaryToTurn, Xt as matchesBinding, Y as installExtensionFromSpec, Yt as keybindingsPath, _ as rehomePersistedStubs, _n as resolveExtensionConfigValue, at as composeExtensionPreset, b as resolveMcpWarningsDir, c as applyCompactSummaryCutoff, et as updateInstalledExtension, ht as basic_default, ln as parseExtensionScanPathEnv, lt as partitionExtensionCatalog, m as cleanupPersistedSession, nt as discoverAndBuildExtensionRegistry, ot as disposeExtensionRegistry, pn as coerceExtensionConfigInput, q as ExtensionInstallError, qt as formatBindingForDisplay, rn as registerExtensionHostModules, sn as inlineLoadedExtension, st as filterExtensionRegistry, t as createAgent, tn as resolveExtensionKeybindings, tt as createExtensionHud, un as scanExtensionDirectories, ut as createExtensionHostRuntimeBridge, v as resolveLegacyPersistDir, vn as sanitizeExtensionConfigActionPatch, w as buildPostCompactAttachments, x as resolvePersistDir, xn as OUTPUT_RESERVE_TOKENS, xt as isSpawnTool, y as resolveLegacySessionDir } from "./agent-8sUadp5M.js";
+import { $t as toggleChainEntry, A as redirectUriFromAuthUrl, At as resolveTheme, Bn as TODO_STATUS_GLYPHS, Bt as useDiscovery, Cr as stripSpawnTokensLine, Ct as SETTINGS_TOGGLES, D as formatPathForCwd, Dr as toolResultText, En as discoverAgentsMd, Er as toolCallPreview, Et as useSettings, F as loadMcpToolsCache, G as parentServerName, Gt as resolveStoragePaths, Ht as ConfigProvider, I as mcpToolsCachePath, Jt as chainsEqual, K as createFileMcpCredentialStore, Kt as buildRunModel, L as refreshMcpToolsCatalog, M as runOAuthLogin, N as supportsOAuth, O as fetchOAuthRedirect, Or as updateToolEventOutcomes, Pn as accentColor, Q as getMcpAuthStatus, Rt as createDiscoverySlot, Sr as serverToolResultSummary, St as SETTINGS_INPUTS, T as suggestSafelistEntries, Tn as chatAutoCompactBehavior, Tt as clampFps, U as buildVisibleMcpRows, Ut as useConfig, V as useMcpToolToggleMap, Vt as useDiscoveryOptional, W as indexOfServerRow, Wt as resolveConfig, X as useMcpAuthDispatch, Xn as useActiveTodos, Xt as providerKeySetChanged, Y as McpAuthProvider, Yt as filterChainFallbacks, Z as useMcpAuthState, Zt as restoreChainFallbacks, _ as useSafeModeQueue, _r as lastContextSizeFromTurns, _t as listProjectFiles, a as useSurfaces, an as removeMcpServer, b as getSafelist, br as marginTopFor, bt as SETTINGS_CATEGORIES, c as useStreamBuffer, cn as dedupMcpServersByName, cr as buildPlanSystem, d as discoverProjectSkills, dr as createChatTurnsReadTool, dt as EMPTY_HINTS, en as useCompletion, et as ASK_USER_TOOL, fn as tryOpenBrowser, ft as clipHintsToWidth, g as useSafeModeActions, gn as useUpdateCheck, gr as eventsFromTurns, h as SafeModeProvider, hn as buildUpdateHint, hr as deriveSessionTitle, ht as buildHints, i as useSelectStyle, in as mcpsWritePath, it as createInteractionTools, j as oauthUsesManualCodePaste, kr as usageByModel, kt as resolveChipColor, l as buildSkillsConfig, lr as envSection, lt as useInteractionsActions, m as writeSessionExport, mn as bootTick, mt as truncateTrailing, n as ThemeProvider, nn as hasClaudeCodeSetup, nt as PRESENT_PLAN_TOOL, on as upsertMcpServer, ot as makeRequestInteraction, pr as compactSummaryEvent, pt as hintsLength, qn as pruneTodosByRun, qt as chainPositionOf, r as useColors, rn as importFromClaudeCode, rt as buildResumedToolResultsTurn, s as useTheme, sn as buildMcpServers, sr as buildBuildSystem, st as pendingInteractionsFromTurns, t as computeTurnAnchors, tn as countClaudeSessionFiles, tt as InteractionsProvider, u as defaultSkillScanPaths, un as discoverProjectMcps, ur as chatReferenceTokensForPrompt, ut as useInteractionsQueue, vr as listSessionMeta, vt as useEnabledToggleSet, wr as sumRunCosts, wt as SettingsProvider, x as isOnSafelist, xt as SETTINGS_CHOICES, y as addToSafelist, yr as loadState, yt as DEFAULT_SETTINGS, z as subscribeMcpToolsCache, zt as DiscoveryProvider } from "./transcript-anchors-D4IxJifV.js";
+import { $ as removeInstalledExtension, C as resolveTasksDir, Cn as effectiveContextWindow, E as selectFilesFromSession, Gt as KEYBINDING_KEY_COL_WIDTH, Jt as groupBindings, K as createExtensionPromptBridge, Kt as ensureKeybindingsFile, Nt as createModelSearchTool, O as compactConversation, S as resolveSessionDir, Sn as OUTPUT_RESERVE_TOKENS, St as isSpawnTool, V as summaryToTurn, Xt as matchesBinding, Y as installExtensionFromSpec, Yt as keybindingsPath, _ as rehomePersistedStubs, at as composeExtensionPreset, b as resolveMcpWarningsDir, c as applyCompactSummaryCutoff, ct as filterRegistryPlugins, dn as createDebugLog, dt as createExtensionHostRuntimeBridge, et as updateInstalledExtension, gt as basic_default, jt as looksBinary, kt as tailTruncate, ln as parseExtensionScanPathEnv, m as cleanupPersistedSession, mn as coerceExtensionConfigInput, nt as discoverAndBuildExtensionRegistry, ot as disposeExtensionRegistry, q as ExtensionInstallError, qt as formatBindingForDisplay, rn as registerExtensionHostModules, sn as inlineLoadedExtension, st as filterExtensionRegistry, t as createAgent, tn as resolveExtensionKeybindings, tt as createExtensionHud, un as scanExtensionDirectories, ut as partitionExtensionCatalog, v as resolveLegacyPersistDir, vn as resolveExtensionConfigValue, w as buildPostCompactAttachments, x as resolvePersistDir, y as resolveLegacySessionDir, yn as sanitizeExtensionConfigActionPatch } from "./agent-SQ6rxfpT.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-C9zukcCj.js";
 import { i as killProcessGroup, n as SUPPORTS_PROCESS_GROUPS, r as createProcessContext } from "./contexts-DWVt7MvF.js";
 import { u as errorMessage } from "./errors-BwBxu3zD.js";
-import { M as findGitRoot } from "./resolve-CZJxds85.js";
+import { R as projectUserPaths, c as SkillInstallError, l as installSkillFromSpec, z as findGitRoot } from "./skills-Cp9vnBwd.js";
+import { n as defaultPluginDataRoot, r as loadAgentPlugin } from "./plugins-2PMTVcp-.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-UKijEaiQ.js";
-import { g as hasAuthorizationHeader, m as McpOAuthProvider, n as connectMcpServers, s as nonOwningMcpView } from "./mcp-3GXUBwur.js";
+import { _ as hasAuthorizationHeader, h as McpOAuthProvider, n as connectMcpServers, s as nonOwningMcpView } from "./mcp-D27rP47I.js";
 import { C as estimateRebilledCostUsd } from "./openai-compat-B3c_hzwf.js";
 import { replaceDynamicSection } from "./prompt.js";
 import { a as getExtensionSessionState, c as setExtensionSessionState, i as demoteStaleRunningStatus, o as loadSession, t as createSession } from "./session-cr9VdoEO.js";
@@ -16,18 +17,17 @@ import { o as withTimeout } from "./timeout-BDetbuN6.js";
 import { i as installCacheBreakLogger } from "./cache-telemetry-ehVdWsg2.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-D0MPvBaS.js";
 import { s as resolveCompletionSubmit } from "./completion-core-BRo86R_L.js";
-import { i as installSkillFromSpec, r as SkillInstallError } from "./skills-Dd6XCi4s.js";
-import { a as ZIDANE_EXTENSION_SKILL_NAME, d as extensionScaffold, f as readSkillEditMarker, h as withZidaneSkillEditSkill, i as SKILL_EDIT_METADATA_KEY, l as editSessionMetadata, m as withZidaneExtensionSkill, o as ZIDANE_SKILL_EDIT_SKILL_NAME, t as loginMcpServer, u as extensionDirForCwd } from "./login-CMVVnAHS.js";
+import { a as ZIDANE_EXTENSION_SKILL_NAME, d as extensionScaffold, f as readSkillEditMarker, h as withZidaneSkillEditSkill, i as SKILL_EDIT_METADATA_KEY, l as editSessionMetadata, m as withZidaneExtensionSkill, o as ZIDANE_SKILL_EDIT_SKILL_NAME, t as loginMcpServer, u as extensionDirForCwd } from "./login-XZDS4K2o.js";
 import { C as restoreModelOptions, S as piIdOf, _ as modelOptionsFor, m as getContextWindow, p as enabledModelOptions, s as setProviderCredential, t as detectAuth, v as modelSupportsReasoning, w as renderDefaultCallbackPage } from "./auth-BzYbbdN_.js";
 import { createDockerContext } from "./contexts/docker.js";
 import { createTuiStore } from "./session/sqlite.js";
 import { $ as buildContextualDiff, A as createSkillsCompletionProvider, B as EDIT_TOOL_NAMES, C as chunkMarkdownForRender, D as splitMarkdownCodeBlocks, E as normalizeMarkdownCodeFences, G as isVisibleDuringSearch, H as isTurnHighlighted, I as createCommandsCompletionProvider, J as selectableTurnIds, K as promptHistoryFromEvents, L as blendHsl, N as createFilesCompletionProvider, O as stripHtmlCommentsOutsideCode, R as buildLinearRamp, T as codeTokenHasClosingFence, U as isUserBashEvent, V as isEditErrorResult, W as isVisible, X as streamEventSearchText, Y as selectionAfterTurnRemoval, Z as turnSelectionOwnership, _ as turnContextSize, _t as summarizeOutcomes, a as TOOL_DISPLAY, at as filetypeFromPath, b as filterModelCatalog, bt as createChatsCompletionProvider, ct as summarizeEditPayload, d as finalizeStreamingMarkdown, et as buildUnifiedDiff, f as finalizeStreamingMarkdownForOwner, ft as mergeApprovalAndBodyOutcomes, g as revealEarlierTranscriptEvents, gt as stripEditOutcomesAnnotation, h as replaceTranscriptTurnEvents, ht as rewriteMultiEditHeader, i as turnAsText, it as extractEditPayload, j as uniqueSkillNamesFromReferences, mt as resolveApprovalForPayload, n as deleteTurnSafely, o as displayNameFor, ot as previewEditPayload, p as hiddenEarlierTranscriptCount, pt as parseEditOutcomesFromResult, q as retagUserPromptEvents, r as truncateTurnsAt, s as formatToolCall, tt as clipDiffForRender, u as capTranscriptEvents, ut as buildEditOutcomesAnnotation, v as splitPromptSegments, w as closeDanglingCodeFence, y as buildModelCatalog, z as BASH_CALL_ID_PREFIX } from "./turn-operations-CAvi8NYt.js";
 import { a as searchHighlightRanges, c as searchSessionHistoryIndexAsync, i as highlightSegments, n as buildSessionSearchIndexAsync, r as filterSessionSearchCatalog, u as searchSessionIndexAsync } from "./history-search-C4bk1Wz_.js";
-import { basename, dirname, join, relative, resolve } from "node:path";
+import { basename, delimiter, dirname, join, relative, resolve } from "node:path";
 import { Buffer } from "node:buffer";
 import * as fs from "node:fs";
 import { createWriteStream, existsSync, mkdirSync, mkdtempSync, readFileSync, readdirSync, rmSync, statSync, writeFileSync } from "node:fs";
-import { readFile, unlink } from "node:fs/promises";
+import { readFile, readdir, stat, unlink } from "node:fs/promises";
 import { spawn, spawnSync } from "node:child_process";
 import { homedir, tmpdir } from "node:os";
 import { Fzf, byLengthAsc } from "fzf";
@@ -43,6 +43,144 @@ import * as OpenTuiReactJsxDevRuntime from "@opentui/react/jsx-dev-runtime";
 import * as OpenTuiReactJsxRuntime from "@opentui/react/jsx-runtime";
 import { Fragment, jsx as jsx$1, jsxs } from "@opentui/react/jsx-runtime";
 import * as ReactJsxDevRuntime from "react/jsx-dev-runtime";
+//#region src/chat/plugins-discovery.ts
+/** Subdirectory each search root is probed for. */
+const PLUGINS_SUBPATH = "plugins";
+/**
+* Resolve the plugin search roots. First-found wins on name collision;
+* earlier entries take precedence.
+*
+* Search order — see {@link projectUserPaths}:
+*
+*   1. `{project}/.agents/plugins`
+*   2. `{project}/.zidane/plugins`
+*   3. `~/.agents/plugins`
+*   4. `~/.zidane/plugins`
+*
+* Non-existent paths are returned; the walk skips them.
+*
+* Unlike skills and MCP servers there is no foreign-agent or Ruler variant:
+* Agent Plugins is a vendor-neutral format, so `.agents/plugins` IS the
+* cross-tool location. Nothing to import from a competitor's directory.
+*/
+function defaultPluginScanPaths(opts = {}) {
+	return projectUserPaths({
+		subPath: PLUGINS_SUBPATH,
+		...opts
+	});
+}
+/**
+* Parse a platform-delimited list of additional plugin scan roots. Mirrors
+* `parseExtensionScanPathEnv` in `../extensions/discovery`:
+*
+*   ZIDANE_PLUGIN_DIRS=/repo/plugins bun run tui
+*
+* Each path is a scan ROOT whose immediate children are plugin directories
+* (`<root>/<name>/plugin.json`), not a single plugin directory.
+*
+* This exists because the four default roots are all dot-directories, and
+* `.zidane/` is gitignored — so a repo has nowhere TRACKED to keep example or
+* first-party plugins for local dogfooding. Extensions solved the same
+* problem the same way.
+*/
+function parsePluginScanPathEnv(value = process.env.ZIDANE_PLUGIN_DIRS) {
+	if (!value) return [];
+	return value.split(delimiter).map((p) => p.trim()).filter(Boolean);
+}
+/**
+* Load every plugin reachable from the default search roots.
+*
+* Each immediate child directory of a root is one plugin — the same
+* depth-1 rule the spec applies inside `skills/`. A child that isn't a
+* directory, or that holds no `plugin.json`, is silently skipped: dropping a
+* README next to your plugins is not an error.
+*
+* Dedup is by plugin NAME, not directory name, because the manifest owns
+* identity — two directories called `tools/` shipping different plugins are
+* two plugins, and one plugin vendored at two scopes is one plugin.
+*/
+async function discoverProjectPlugins(opts = {}) {
+	const roots = [...defaultPluginScanPaths(opts), ...(opts.extraRoots ?? []).map((path) => ({
+		path,
+		source: "project"
+	}))].filter((p) => existsSync(p.path));
+	const dataRoot = defaultPluginDataRoot({
+		...opts.prefix !== void 0 ? { prefix: opts.prefix } : {},
+		...opts.home !== void 0 ? { home: opts.home } : {}
+	});
+	const plugins = [];
+	const errors = [];
+	const seen = /* @__PURE__ */ new Set();
+	for (const root of roots) {
+		if (opts.signal?.aborted) break;
+		let entries;
+		try {
+			entries = await readdir(root.path);
+		} catch (err) {
+			errors.push({
+				path: root.path,
+				source: root.source,
+				message: `Could not read plugin directory: ${err instanceof Error ? err.message : String(err)}`
+			});
+			continue;
+		}
+		for (const entry of entries.sort()) {
+			if (opts.signal?.aborted) break;
+			const dir = join(root.path, entry);
+			try {
+				if (!(await stat(dir)).isDirectory()) continue;
+			} catch {
+				continue;
+			}
+			const loaded = await loadAgentPlugin(dir, {
+				source: root.source,
+				dataRoot
+			});
+			if (!loaded.ok && loaded.diagnostics.some((d) => d.code === "manifest-missing")) continue;
+			const name = loaded.manifest?.name ?? basename(dir);
+			if (seen.has(name)) continue;
+			seen.add(name);
+			plugins.push({
+				name,
+				plugin: loaded,
+				source: root.source,
+				path: dir
+			});
+		}
+	}
+	return {
+		plugins,
+		errors
+	};
+}
+/**
+* Map the user's enabled-plugin list onto the contributions a host merges
+* into the agent.
+*
+* Conventions match `enabledSkills` / `enabledMcps`:
+*   - `undefined` → every discovered plugin is enabled (default)
+*   - `[]`        → all off
+*   - `[names]`   → allowlist
+*
+* A plugin that failed to load contributes nothing regardless of the
+* allowlist — `ok: false` means components were never discovered.
+*/
+function buildPluginContributions(opts) {
+	const allow = opts.enabled === void 0 ? null : new Set(opts.enabled);
+	const skills = [];
+	const mcpServers = [];
+	for (const entry of opts.discovered) {
+		if (!entry.plugin.ok) continue;
+		if (allow !== null && !allow.has(entry.name)) continue;
+		skills.push(...entry.plugin.skills);
+		mcpServers.push(...entry.plugin.mcpServers);
+	}
+	return {
+		skills,
+		mcpServers
+	};
+}
+//#endregion
 //#region src/mcp/warn-log.ts
 /**
 * Subscribe to `mcp:warn`
@@ -5620,9 +5758,7 @@ function useProjectLocation() {
 const FILES_REFRESH_THROTTLE_MS = 3e3;
 const SKILLS_REFRESH_THROTTLE_MS = 3e4;
 const MCP_TOOLS_CACHE_POLL_MS = 4e3;
-function debugLog$1(...args) {
-	if (process.env.ZIDANE_DEBUG) process.stderr.write(`[zidane/tui] ${args.map(errorMessage).join(" ")}\n`);
-}
+const debugLog$1 = createDebugLog("tui");
 function DiscoveryShell({ children }) {
 	const config = useConfig();
 	const { settings } = useSettings();
@@ -5635,6 +5771,7 @@ function DiscoveryShell({ children }) {
 	const dataDir = config.paths.userDir;
 	const mcpCredentialStore = useMemo(() => createFileMcpCredentialStore(dataDir), [dataDir]);
 	const [skillsCatalog, setSkillsCatalog] = useState([]);
+	const [pluginsCatalog, setPluginsCatalog] = useState([]);
 	const [mcpsCatalog, setMcpsCatalog] = useState([]);
 	const [mcpsErrors, setMcpsErrors] = useState([]);
 	const [filesCatalog, setFilesCatalog] = useState([]);
@@ -5674,13 +5811,16 @@ function DiscoveryShell({ children }) {
 	}, [mcpCredentialStore]);
 	const filesSlotRef = useRef(null);
 	const skillsSlotRef = useRef(null);
+	const pluginsSlotRef = useRef(null);
 	/** Last-published MCP discovery result — see the value-compare in `refreshMcps`. */
 	const mcpsFingerprintRef = useRef(null);
 	useEffect(() => {
 		filesSlotRef.current?.abort();
 		skillsSlotRef.current?.abort();
+		pluginsSlotRef.current?.abort();
 		setFilesCatalog([]);
 		setSkillsCatalog([]);
+		setPluginsCatalog([]);
 		const filesSlot = createDiscoverySlot({
 			throttleMs: FILES_REFRESH_THROTTLE_MS,
 			walk: (signal) => listProjectFiles({
@@ -5709,9 +5849,30 @@ function DiscoveryShell({ children }) {
 				debugLog$1(`discoverProjectSkills ${phase} failed`, err);
 			}
 		});
+		const pluginsSlot = createDiscoverySlot({
+			throttleMs: SKILLS_REFRESH_THROTTLE_MS,
+			walk: async (signal) => {
+				const { plugins, errors } = await discoverProjectPlugins({
+					cwd: projectDir,
+					prefix: config.prefix,
+					...config.pluginScanPaths.length > 0 ? { extraRoots: config.pluginScanPaths } : {},
+					...signal ? { signal } : {}
+				});
+				for (const error of errors) debugLog$1("discoverProjectPlugins", `${error.source}: ${error.path} — ${error.message}`);
+				return plugins;
+			},
+			onLoad: (items) => {
+				if (pluginsSlotRef.current === pluginsSlot) setPluginsCatalog(items);
+			},
+			onError: (err, phase) => {
+				debugLog$1(`discoverProjectPlugins ${phase} failed`, err);
+			}
+		});
 		filesSlotRef.current = filesSlot;
 		skillsSlotRef.current = skillsSlot;
+		pluginsSlotRef.current = pluginsSlot;
 		skillsSlot.ensure().then((skills) => bootTick(`discovery:skills (${skills.length})`));
+		pluginsSlot.ensure().then((plugins) => bootTick(`discovery:plugins (${plugins.length})`));
 		try {
 			const { servers, errors } = discoverProjectMcps({
 				cwd: projectDir,
@@ -5733,6 +5894,7 @@ function DiscoveryShell({ children }) {
 		return () => {
 			filesSlot.abort();
 			skillsSlot.abort();
+			pluginsSlot.abort();
 		};
 	}, [
 		projectDir,
@@ -5745,6 +5907,7 @@ function DiscoveryShell({ children }) {
 	const ensureSkills = useCallback(() => skillsSlotRef.current?.ensure() ?? Promise.resolve([]), []);
 	const refreshFiles = useCallback(() => filesSlotRef.current?.refresh() ?? Promise.resolve(), []);
 	const refreshSkills = useCallback(() => skillsSlotRef.current?.refresh() ?? Promise.resolve(), []);
+	const refreshPlugins = useCallback(() => pluginsSlotRef.current?.refresh() ?? Promise.resolve(), []);
 	const refreshMcps = useCallback(() => {
 		try {
 			const { servers, errors } = discoverProjectMcps({
@@ -5791,22 +5954,26 @@ function DiscoveryShell({ children }) {
 	return /* @__PURE__ */ jsx$1(DiscoveryProvider, {
 		value: useMemo(() => ({
 			skillsCatalog,
+			pluginsCatalog,
 			mcpsCatalog,
 			mcpsErrors,
 			mcpToolsByServer,
 			filesCatalog,
 			refreshSkills,
+			refreshPlugins,
 			refreshMcps,
 			refreshFiles,
 			ensureSkills,
 			ensureFiles
 		}), [
 			skillsCatalog,
+			pluginsCatalog,
 			mcpsCatalog,
 			mcpsErrors,
 			mcpToolsByServer,
 			filesCatalog,
 			refreshSkills,
+			refreshPlugins,
 			refreshMcps,
 			refreshFiles,
 			ensureSkills,
@@ -13340,9 +13507,230 @@ function statusColor(status, COLOR) {
 	}
 }
 //#endregion
+//#region src/chat/contribution-origin.ts
+/**
+* Union the three skill sources into the list the Skills tab shows, in the
+* precedence the AGENT applies — so the tab can never advertise a skill the
+* agent dropped, or attribute a name to the copy that lost.
+*
+* Precedence is extension > plugin > disk, and it is not arbitrary:
+* `resolveSkills` seeds its map in catalog order with later entries
+* overwriting earlier, `app.tsx` concatenates plugin skills BEFORE extension
+* ones, and catalog entries shadow anything discovered on disk. The reasoning
+* for extension-over-plugin lives at that concat: extension code is something
+* the user installed deliberately, whereas a project-scope plugin arrives with
+* a repo clone, so a cloned repo must not shadow a user's extension skill by
+* reusing its name.
+*/
+function mergeSkillCatalog(opts) {
+	const byName = /* @__PURE__ */ new Map();
+	for (const skill of opts.disk ?? []) byName.set(skill.name, skill);
+	for (const skill of opts.plugin ?? []) byName.set(skill.name, skill);
+	for (const skill of opts.extension ?? []) byName.set(skill.name, skill);
+	return [...byName.values()].sort((a, b) => a.name.localeCompare(b.name));
+}
+/**
+* Badge for a skill row, read straight off the skill's own metadata.
+*
+* `undefined` for a skill discovered on disk — no badge means "this came from a
+* directory you control", which is what makes a badge mean "something
+* contributed this".
+*
+* A plugin loaded BY an extension stamps both keys; the plugin wins, because
+* the plugin is what supplied the skill and the extension is only how it
+* arrived. `mcpOriginBadge` resolves the same collision the same way, so a row
+* in either tab reads identically for the same underlying situation.
+*/
+function skillOriginBadge(skill) {
+	const plugin = skill.metadata?.["zidane.plugin"];
+	if (plugin) return `plugin:${plugin}`;
+	const extension = skill.metadata?.["zidane.extension"];
+	return extension ? `ext:${extension}` : void 0;
+}
+//#endregion
+//#region src/tui/plugin-list.ts
+/** Normalize a disk-discovered plugin. */
+function pluginEntryFromDisk(discovered) {
+	return normalize({
+		name: discovered.name,
+		plugin: discovered.plugin,
+		origin: {
+			kind: "disk",
+			scope: discovered.source,
+			dir: discovered.path
+		}
+	});
+}
+/** Normalize a plugin an extension loaded. */
+function pluginEntryFromExtension(record) {
+	return normalize({
+		name: record.name,
+		plugin: record.plugin,
+		origin: {
+			kind: "extension",
+			extensionName: record.extensionName,
+			dir: record.dir
+		}
+	});
+}
+function normalize(opts) {
+	const { name, plugin, origin } = opts;
+	return {
+		name,
+		...plugin.manifest?.version !== void 0 ? { version: plugin.manifest.version } : {},
+		...plugin.manifest?.description !== void 0 ? { description: plugin.manifest.description } : {},
+		origin,
+		ok: plugin.ok,
+		components: { ...plugin.components },
+		contributions: {
+			skills: plugin.skills.map((s) => ({
+				name: s.name,
+				...s.description !== void 0 ? { description: s.description } : {}
+			})),
+			mcpServers: plugin.mcpServers.map((s) => ({
+				name: s.name,
+				transport: s.transport
+			}))
+		},
+		diagnostics: plugin.diagnostics
+	};
+}
+/**
+* Build the full plugin list from both sources, deduped and sorted by name.
+*
+* Disk entries win a name collision. An extension pointing at a plugin the
+* user also installed on disk is the same plugin; the disk copy is the one
+* with a stable path and a scope the user chose, so it's the one worth
+* showing.
+*/
+function buildPluginList(opts) {
+	const byName = /* @__PURE__ */ new Map();
+	for (const discovered of opts.discovered ?? []) byName.set(discovered.name, pluginEntryFromDisk(discovered));
+	for (const record of opts.fromExtensions ?? []) if (!byName.has(record.name)) byName.set(record.name, pluginEntryFromExtension(record));
+	return [...byName.values()].sort((a, b) => a.name.localeCompare(b.name));
+}
+/**
+* One-line origin label for the detail row, e.g. `project: .agents/plugins/x`
+* or `via extension: my-toolkit`. `compact` shortens the directory (the
+* caller passes its `compactPath` so this module stays renderer-agnostic).
+*/
+function pluginOriginLabel(origin, compact = (p) => p) {
+	return origin.kind === "disk" ? `${origin.scope}: ${compact(origin.dir)}` : `via extension: ${origin.extensionName}`;
+}
+/**
+* Short component summary for the detail row, e.g. `3 skills, 1 server`.
+* Empty string when the plugin contributes nothing, so the caller can drop
+* the segment rather than print a bare `0 skills`.
+*
+* Counts what the PACKAGE ships, which is not always what ends up live: a
+* server whose name collides with one in `mcps.json` (or in a plugin merged
+* earlier) is dropped by `dedupMcpServers` at agent build, and a skill whose
+* name collides is shadowed by `resolveSkills`. Neither is knowable here —
+* this module only sees the plugin. The MCPs and Skills tabs are the authority
+* on what is actually loaded; collisions are reported at the merge, via
+* `name-collision-shadowed` for skills and a debug log for servers.
+*/
+function pluginComponentSummary(entry) {
+	const parts = [];
+	const skills = entry.contributions.skills.length;
+	const servers = entry.contributions.mcpServers.length;
+	if (skills > 0) parts.push(`${skills} skill${skills === 1 ? "" : "s"}`);
+	if (servers > 0) parts.push(`${servers} server${servers === 1 ? "" : "s"}`);
+	return parts.join(", ");
+}
+/**
+* Whether an expanded row would have anything to show.
+*
+* Drives the disclosure chevron: a plugin that ships nothing must not offer an
+* expansion that opens to an empty box. A REJECTED plugin never expands either
+* — its components were never discovered, so there is nothing to list beyond
+* the failure its detail line already names.
+*/
+function pluginHasContents(entry) {
+	return entry.ok && (entry.contributions.skills.length > 0 || entry.contributions.mcpServers.length > 0);
+}
+/**
+* Why a rejected plugin failed, for the detail row. Uses the first error
+* diagnostic's code — the message itself is often long, and the code is the
+* part a user can search for.
+*/
+function pluginRejectionReason(entry) {
+	if (entry.ok) return void 0;
+	const first = entry.diagnostics.find((d) => d.severity === "error");
+	return first ? `rejected: ${first.code}` : "rejected";
+}
+/**
+* Kind badge label for an Extensions-tab row, rendered as a filled pill at the
+* END of the title line.
+*
+* It started as a fixed-width LEADING column, which pushed every name right by
+* its width — pure waste on a list that is overwhelmingly extensions, and it
+* broke the left alignment names had before plugins shared the tab. Trailing
+* keeps names flush and still answers "what is this row" without leaving the
+* line.
+*
+* The inner spaces are the pill's padding: a background color butted straight
+* against the glyphs reads as a highlight artifact rather than a badge.
+*/
+const KIND_BADGE = {
+	ext: " ext ",
+	plugin: " plugin "
+};
+/**
+* Paint for the two kind pills, following the same shape as the theme's chip
+* colors (saturated `bg`, pre-paired legible `fg`).
+*
+* Derived from `ThemeColors` / `ThemeSurfaces` members that EVERY theme must
+* define rather than added as `surfaces.chips` entries. Two reasons: the chip
+* map is keyed by completion-provider id, so settings row kinds don't belong in
+* it; and a third-party theme that never opts in would fall back to
+* `chips.default` for both kinds, collapsing the distinction this badge exists
+* to draw.
+*
+* The hierarchy is deliberate. Extensions get the neutral `border` tier because
+* they're the majority — a saturated pill on nearly every row is noise. Plugins
+* get the `model` accent so they stand out of that field. `modal` as the plugin
+* foreground is what keeps this theme-safe: it's the panel the badge sits on,
+* so it contrasts against a saturated accent on dark AND light themes, which is
+* the same trick every shipped theme's chip map uses (`fg: base` / `fg: panel`
+* / `fg: butter`).
+*/
+function kindBadgeStyle(kind, colors, surfaces) {
+	return kind === "plugin" ? {
+		bg: colors.model,
+		fg: surfaces.modal
+	} : {
+		bg: colors.border,
+		fg: colors.dim
+	};
+}
+/**
+* Detail line for an Agent Plugin row: what it is, where it came from, and what
+* it contributes.
+*
+* A rejected plugin leads with its failure code instead of its description — a
+* plugin that didn't load has nothing useful to say about itself, and the code
+* is what the user can search for.
+*
+* `compact` shortens the directory (callers pass `displayPath`), keeping this
+* module free of path-presentation policy.
+*/
+function pluginDetailLine(entry, compact = (p) => p) {
+	const parts = [];
+	const rejected = pluginRejectionReason(entry);
+	if (rejected) parts.push(rejected);
+	else if (entry.description) parts.push(entry.description);
+	parts.push(`[${pluginOriginLabel(entry.origin, compact)}]`);
+	const summary = pluginComponentSummary(entry);
+	if (summary) parts.push(summary);
+	return parts.join(" · ");
+}
+//#endregion
 //#region src/tui/extension-rows.ts
 function buildVisibleExtensionRows(opts) {
 	const { errored, toggleable, configItemsByExt, expanded, queryActive, matchExtension, matchConfigItem } = opts;
+	const plugins = opts.plugins ?? [];
+	const matchPlugin = opts.matchPlugin ?? (() => true);
 	const out = [];
 	for (const ext of errored) {
 		if (queryActive && !matchExtension(ext)) continue;
@@ -13351,10 +13739,39 @@ function buildVisibleExtensionRows(opts) {
 			ext
 		});
 	}
-	for (const ext of toggleable) {
+	for (const plugin of plugins) {
+		if (plugin.ok) continue;
+		if (queryActive && !matchPlugin(plugin)) continue;
+		out.push({
+			kind: "plugin",
+			plugin,
+			hasContents: false,
+			expanded: false
+		});
+	}
+	const body = [...toggleable.map((ext) => ({
+		name: ext.name,
+		ext
+	})), ...plugins.filter((p) => p.ok).map((plugin) => ({
+		name: plugin.name,
+		plugin
+	}))].sort((a, b) => a.name.localeCompare(b.name));
+	for (const item of body) {
+		if ("plugin" in item) {
+			if (queryActive && !matchPlugin(item.plugin)) continue;
+			const hasContents = pluginHasContents(item.plugin);
+			out.push({
+				kind: "plugin",
+				plugin: item.plugin,
+				hasContents,
+				expanded: hasContents && (queryActive ? true : expanded.has(item.plugin.name))
+			});
+			continue;
+		}
+		const ext = item.ext;
 		const items = Object.values(configItemsByExt[ext.name] ?? {});
 		const headerMatches = !queryActive || matchExtension(ext);
-		const matchingItems = queryActive ? items.filter((item) => matchConfigItem(ext.name, item)) : items;
+		const matchingItems = queryActive ? items.filter((configItem) => matchConfigItem(ext.name, configItem)) : items;
 		if (queryActive && !headerMatches && matchingItems.length === 0) continue;
 		const hasConfig = items.length > 0;
 		const isExpanded = hasConfig && (queryActive ? true : expanded.has(ext.name));
@@ -13366,10 +13783,10 @@ function buildVisibleExtensionRows(opts) {
 		});
 		if (!isExpanded) continue;
 		const rows = queryActive && !headerMatches ? matchingItems : items;
-		for (const item of rows) out.push({
+		for (const configItem of rows) out.push({
 			kind: "config",
 			extName: ext.name,
-			item
+			item: configItem
 		});
 	}
 	return out;
@@ -13383,6 +13800,7 @@ function parentExtensionName(row) {
 	if (!row) return void 0;
 	if (row.kind === "extension") return row.ext.name;
 	if (row.kind === "config") return row.extName;
+	if (row.kind === "plugin") return row.hasContents ? row.plugin.name : void 0;
 }
 /**
 * Index of the `extension` header row for the given name. `-1` when absent.
@@ -14190,7 +14608,7 @@ const TAB_LABELS = {
 	authentication: "Authentication",
 	skills: "Skills",
 	mcps: "MCP servers",
-	extensions: "Extensions",
+	extensions: "Extensions & Plugins",
 	logs: "Logs"
 };
 function isCategoryTab(id) {
@@ -14224,7 +14642,7 @@ function truncateToCols(s, maxCols) {
 	if (maxCols === 1) return "…";
 	return `${clean.slice(0, maxCols - 1)}…`;
 }
-function SettingsModal({ skillsCatalog: skillsCatalogProp, mcpsCatalog: mcpsCatalogProp, mcpsErrors: mcpsErrorsProp, keybindings, keybindingsPath, extensionKeybindings, extensionThemes: extensionThemesProp, extensionsCatalog: extensionsCatalogProp, extensionsInactive: extensionsInactiveProp, extensionConfigCategories: extensionConfigCategoriesProp, extensionConfigItems: extensionConfigItemsProp, modelCatalog, logs, authentication, actions, version } = {}) {
+function SettingsModal({ skillsCatalog: skillsCatalogProp, mcpsCatalog: mcpsCatalogProp, mcpsErrors: mcpsErrorsProp, keybindings, keybindingsPath, extensionKeybindings, extensionThemes: extensionThemesProp, extensionsCatalog: extensionsCatalogProp, extensionsInactive: extensionsInactiveProp, pluginsCatalog, pluginsFromExtensions, extensionContributedSkills, extensionConfigCategories: extensionConfigCategoriesProp, extensionConfigItems: extensionConfigItemsProp, modelCatalog, logs, authentication, actions, version } = {}) {
 	const COLOR = useColors();
 	const SURFACE = useSurfaces();
 	const { settings, toggle: toggleBoolean, setSetting } = useSettings();
@@ -14236,12 +14654,45 @@ function SettingsModal({ skillsCatalog: skillsCatalogProp, mcpsCatalog: mcpsCata
 	const { width: termWidth } = useTerminalDimensions();
 	const contentCols = Math.max(40, termWidth - 2 - 4 - 2 - 1);
 	const discovery = useDiscoveryOptional();
-	const skillsCatalog = discovery?.skillsCatalog ?? skillsCatalogProp ?? [];
+	const [extSnapshot, setExtSnapshot] = useState(null);
+	const diskSkillsCatalog = discovery?.skillsCatalog ?? skillsCatalogProp ?? [];
+	/**
+	* Plugins from the discovery CONTEXT, falling back to the open-time prop.
+	*
+	* `modal.open(<SettingsModal …/>)` builds this element once inside a key
+	* handler, so every prop is frozen at open time. Anything that has to react
+	* while the modal is open must come from context (live) or from a
+	* ref-backed getter (`getExtensionsSnapshot`) — the same two rails
+	* `skillsCatalog` / `mcpsCatalog` already ride.
+	*/
+	const livePluginsCatalog = discovery?.pluginsCatalog ?? pluginsCatalog ?? [];
+	/**
+	* Skills contributed by disk plugins, derived HERE rather than passed in.
+	*
+	* Both inputs are live — the discovery context and `useSettings()` — so
+	* toggling a plugin updates the Skills tab list and its count in the same
+	* frame. As a prop this was computed in `AppShell` and captured at open
+	* time, so a toggle changed the checkbox and nothing else.
+	*/
+	const pluginContributedSkills = useMemo(() => buildPluginContributions({
+		discovered: livePluginsCatalog,
+		...settings.enabledPlugins !== void 0 ? { enabled: settings.enabledPlugins } : {}
+	}).skills, [livePluginsCatalog, settings.enabledPlugins]);
+	const skillsCatalog = useMemo(() => mergeSkillCatalog({
+		disk: diskSkillsCatalog,
+		plugin: pluginContributedSkills,
+		extension: extSnapshot?.skills ?? extensionContributedSkills ?? []
+	}), [
+		diskSkillsCatalog,
+		pluginContributedSkills,
+		extSnapshot,
+		extensionContributedSkills
+	]);
 	const mcpsCatalog = discovery?.mcpsCatalog ?? mcpsCatalogProp ?? [];
 	const mcpsErrors = discovery?.mcpsErrors ?? mcpsErrorsProp;
 	const mcpToolsByServer = discovery?.mcpToolsByServer ?? EMPTY_TOOLS;
 	const skillsToggle = useEnabledToggleSet({
-		catalog: skillsCatalog,
+		catalog: diskSkillsCatalog,
 		keyOf: (s) => s.name,
 		settingKey: "enabledSkills"
 	});
@@ -14250,11 +14701,29 @@ function SettingsModal({ skillsCatalog: skillsCatalogProp, mcpsCatalog: mcpsCata
 		keyOf: (m) => m.config.name,
 		settingKey: "enabledMcps"
 	});
-	const [extSnapshot, setExtSnapshot] = useState(null);
 	const refreshExtensionRows = useCallback(() => {
 		const snap = actions?.getExtensionsSnapshot?.();
 		if (snap) setExtSnapshot(snap);
 	}, [actions]);
+	/**
+	* Re-pull the registry snapshot whenever a toggle changes what it would
+	* contain.
+	*
+	* The snapshot is a closure over refs on the `AppShell` side, so calling it
+	* again reads current state — which is the only way registry-derived data
+	* can react while this element's props stay frozen at open time. Without
+	* this, disabling an extension or an extension-loaded plugin flipped its
+	* checkbox and left its skills in the Skills tab.
+	*
+	* Cheap: reading a few refs and setting state that mostly compares equal.
+	*/
+	useEffect(() => {
+		refreshExtensionRows();
+	}, [
+		refreshExtensionRows,
+		settings.enabledExtensions,
+		settings.enabledPlugins
+	]);
 	const extensionsInactiveAll = extSnapshot?.inactive ?? extensionsInactiveProp ?? [];
 	const extensionsPartition = useMemo(() => partitionExtensionCatalog(extSnapshot?.catalog ?? extensionsCatalogProp ?? [], extensionsInactiveAll), [
 		extSnapshot,
@@ -14269,6 +14738,20 @@ function SettingsModal({ skillsCatalog: skillsCatalogProp, mcpsCatalog: mcpsCata
 		settingKey: "enabledExtensions",
 		gcKeys: extensionsPartition.allNames
 	});
+	const pluginList = useMemo(() => buildPluginList({
+		discovered: livePluginsCatalog,
+		fromExtensions: extSnapshot?.plugins ?? pluginsFromExtensions ?? []
+	}), [
+		livePluginsCatalog,
+		extSnapshot,
+		pluginsFromExtensions
+	]);
+	const pluginsToggle = useEnabledToggleSet({
+		catalog: useMemo(() => pluginList.filter((p) => p.ok), [pluginList]),
+		keyOf: (p) => p.name,
+		settingKey: "enabledPlugins",
+		gcKeys: pluginList.map((p) => p.name)
+	});
 	const extensionConfigCategories = extSnapshot?.configCategories ?? extensionConfigCategoriesProp ?? EMPTY_CONFIG_CATEGORIES;
 	const extensionConfigItems = extSnapshot?.configItems ?? extensionConfigItemsProp ?? EMPTY_CONFIG_ITEMS;
 	const configInputRef = useRef(null);
@@ -14716,14 +15199,17 @@ function SettingsModal({ skillsCatalog: skillsCatalogProp, mcpsCatalog: mcpsCata
 		expanded: expandedExtensions,
 		queryActive,
 		matchExtension: (ext) => matchesTerms(extensionCorpus(ext), queryTerms),
-		matchConfigItem: (extName, item) => matchesTerms(extensionConfigItemCorpus(extName, item), queryTerms)
+		matchConfigItem: (extName, item) => matchesTerms(extensionConfigItemCorpus(extName, item), queryTerms),
+		plugins: pluginList,
+		matchPlugin: (plugin) => matchesTerms(pluginCorpus(plugin), queryTerms)
 	}), [
 		extensionsErrored,
 		extensionsCatalog,
 		extensionConfigItems,
 		expandedExtensions,
 		queryActive,
-		queryTerms
+		queryTerms,
+		pluginList
 	]);
 	const mcpVisibleRows = useMemo(() => buildVisibleMcpRows(filteredMcps, expandedMcps, mcpToolsByServer), [
 		filteredMcps,
@@ -14898,6 +15384,7 @@ function SettingsModal({ skillsCatalog: skillsCatalogProp, mcpsCatalog: mcpsCata
 		const row = extensionVisibleRows[cursor];
 		if (!row) return void 0;
 		if (row.kind === "extension" || row.kind === "errored") return row.ext;
+		if (row.kind === "plugin") return void 0;
 		return extensionsCatalog.find((e) => e.name === row.extName) ?? extensionsErrored.find((e) => e.name === row.extName);
 	}, [
 		activeTab,
@@ -14956,14 +15443,16 @@ function SettingsModal({ skillsCatalog: skillsCatalogProp, mcpsCatalog: mcpsCata
 		}
 		if (activeTab === "skills") {
 			const s = filteredSkills[index];
-			if (s) skillsToggle.toggle(s.name);
+			if (s && !skillOriginBadge(s)) skillsToggle.toggle(s.name);
 			return;
 		}
 		if (activeTab === "extensions") {
 			const row = extensionVisibleRows[index];
 			if (!row) return;
 			if (row.kind === "extension") extensionsToggle.toggle(row.ext.name);
-			else if (row.kind === "config") activateConfigRow(row.extName, row.item);
+			else if (row.kind === "plugin") {
+				if (row.plugin.ok) pluginsToggle.toggle(row.plugin.name);
+			} else if (row.kind === "config") activateConfigRow(row.extName, row.item);
 			return;
 		}
 		if (activeTab === "mcps") {
@@ -14995,6 +15484,7 @@ function SettingsModal({ skillsCatalog: skillsCatalogProp, mcpsCatalog: mcpsCata
 		skillsToggle,
 		extensionVisibleRows,
 		extensionsToggle,
+		pluginsToggle,
 		activateConfigRow,
 		mcpVisibleRows,
 		mcpsToggle,
@@ -15055,6 +15545,7 @@ function SettingsModal({ skillsCatalog: skillsCatalogProp, mcpsCatalog: mcpsCata
 				return;
 			}
 			if (row?.kind === "config" && row.item.type === "boolean") return;
+			if (row?.kind === "plugin") return;
 			activateRowAt(index);
 			return;
 		}
@@ -15341,6 +15832,10 @@ function SettingsModal({ skillsCatalog: skillsCatalogProp, mcpsCatalog: mcpsCata
 				actions.onRefreshSkills();
 				return;
 			}
+			if (activeTab === "extensions" && actions?.onRefreshPlugins) {
+				actions.onRefreshPlugins();
+				return;
+			}
 			if (activeTab === "mcps") {
 				if (actions?.onRefreshMcps) actions.onRefreshMcps();
 				fireMcpToolsRefresh();
@@ -15366,8 +15861,8 @@ function SettingsModal({ skillsCatalog: skillsCatalogProp, mcpsCatalog: mcpsCata
 			total: mcpsCatalog.length
 		},
 		extensions: {
-			current: extensionVisibleRows.filter((r) => r.kind === "extension" || r.kind === "errored").length,
-			total: extensionsCatalog.length + extensionsErrored.length
+			current: extensionVisibleRows.filter((r) => r.kind === "extension" || r.kind === "errored" || r.kind === "plugin").length,
+			total: extensionsCatalog.length + extensionsErrored.length + pluginList.length
 		}
 	};
 	const editingInputItem = editingInputKey ? SETTINGS_INPUTS.find((inp) => inp.key === editingInputKey) ?? null : null;
@@ -15452,9 +15947,10 @@ function SettingsModal({ skillsCatalog: skillsCatalogProp, mcpsCatalog: mcpsCata
 						onRowClick: clickRowAt,
 						rows: extensionVisibleRows,
 						enabledSet: extensionsToggle.enabledSet,
+						pluginEnabledSet: pluginsToggle.enabledSet,
 						extensionConfig: settings.extensionConfig,
 						categories: extensionConfigCategories,
-						totalCount: extensionsCatalog.length + extensionsErrored.length,
+						totalCount: extensionsCatalog.length + extensionsErrored.length + pluginList.length,
 						cursor,
 						highlightBg: SURFACE.selection,
 						query,
@@ -15609,6 +16105,7 @@ function SettingsModal({ skillsCatalog: skillsCatalogProp, mcpsCatalog: mcpsCata
 					focusedMcpStatus,
 					canRefreshSkills: !!actions?.onRefreshSkills,
 					canRefreshMcps: !!actions?.onRefreshMcps,
+					canRefreshPlugins: !!actions?.onRefreshPlugins,
 					canEditExtension: !!actions?.onEditExtension,
 					canCreateExtension: !!actions?.onCreateExtension,
 					canUpdateExtension: !!actions?.onUpdateExtension,
@@ -15782,57 +16279,89 @@ function GeneralList({ items, cursor, highlightBg, query, contentCols, editingKe
 	});
 }
 const EXTENSION_CONFIG_INDENT = 3;
-function ExtensionsList({ rows, enabledSet, extensionConfig, categories, totalCount, cursor, highlightBg, query, contentCols, editing, inputRef, onCommitEdit, modelCatalog, onApplyModelEdit, onCancelEdit, actionStatus, actionProbes, onRowClick }) {
+function ExtensionsList({ rows, enabledSet, pluginEnabledSet, extensionConfig, categories, totalCount, cursor, highlightBg, query, contentCols, editing, inputRef, onCommitEdit, modelCatalog, onApplyModelEdit, onCancelEdit, actionStatus, actionProbes, onRowClick }) {
 	const COLOR = useColors();
+	const SURFACE = useSurfaces();
+	const extBadge = kindBadgeStyle("ext", COLOR, SURFACE);
+	const pluginBadge = kindBadgeStyle("plugin", COLOR, SURFACE);
 	const home = homedir();
 	if (totalCount === 0) return /* @__PURE__ */ jsxs("box", {
 		style: { flexDirection: "column" },
-		children: [/* @__PURE__ */ jsx$1("text", {
-			fg: COLOR.dim,
-			children: "No extensions discovered."
-		}), /* @__PURE__ */ jsxs("text", {
-			fg: COLOR.mute,
-			children: [
-				"Drop an",
-				/* @__PURE__ */ jsx$1("span", {
-					fg: COLOR.model,
-					children: " index.ts "
-				}),
-				"into",
-				/* @__PURE__ */ jsx$1("span", {
-					fg: COLOR.model,
-					children: " .zidane/extensions/<name>/ "
-				}),
-				"or",
-				/* @__PURE__ */ jsx$1("span", {
-					fg: COLOR.model,
-					children: " .agents/extensions/<name>/ "
-				}),
-				"(project or",
-				/* @__PURE__ */ jsx$1("span", {
-					fg: COLOR.model,
-					children: " ~/"
-				}),
-				"). Author with",
-				/* @__PURE__ */ jsx$1("span", {
-					fg: COLOR.model,
-					children: " defineExtension({ name, setup }) "
-				}),
-				"from",
-				/* @__PURE__ */ jsx$1("span", {
-					fg: COLOR.model,
-					children: " zidane "
-				}),
-				"— see",
-				/* @__PURE__ */ jsx$1("span", {
-					fg: COLOR.model,
-					children: " docs/EXTENSIONS.md "
-				}),
-				"."
-			]
-		})]
+		children: [
+			/* @__PURE__ */ jsx$1("text", {
+				fg: COLOR.dim,
+				children: "No extensions or plugins discovered."
+			}),
+			/* @__PURE__ */ jsxs("text", {
+				fg: COLOR.mute,
+				children: [
+					"Drop an",
+					/* @__PURE__ */ jsx$1("span", {
+						fg: COLOR.model,
+						children: " index.ts "
+					}),
+					"into",
+					/* @__PURE__ */ jsx$1("span", {
+						fg: COLOR.model,
+						children: " .zidane/extensions/<name>/ "
+					}),
+					"or",
+					/* @__PURE__ */ jsx$1("span", {
+						fg: COLOR.model,
+						children: " .agents/extensions/<name>/ "
+					}),
+					"(project or",
+					/* @__PURE__ */ jsx$1("span", {
+						fg: COLOR.model,
+						children: " ~/"
+					}),
+					"). Author with",
+					/* @__PURE__ */ jsx$1("span", {
+						fg: COLOR.model,
+						children: " defineExtension({ name, setup }) "
+					}),
+					"from",
+					/* @__PURE__ */ jsx$1("span", {
+						fg: COLOR.model,
+						children: " zidane "
+					}),
+					"— see",
+					/* @__PURE__ */ jsx$1("span", {
+						fg: COLOR.model,
+						children: " docs/EXTENSIONS.md "
+					}),
+					"."
+				]
+			}),
+			/* @__PURE__ */ jsxs("text", {
+				fg: COLOR.mute,
+				children: [
+					"For an Agent Plugin, drop a package with a",
+					/* @__PURE__ */ jsx$1("span", {
+						fg: COLOR.model,
+						children: " plugin.json "
+					}),
+					"into",
+					/* @__PURE__ */ jsx$1("span", {
+						fg: COLOR.model,
+						children: " .agents/plugins/<name>/ "
+					}),
+					"(project or",
+					/* @__PURE__ */ jsx$1("span", {
+						fg: COLOR.model,
+						children: " ~/"
+					}),
+					") — see",
+					/* @__PURE__ */ jsx$1("span", {
+						fg: COLOR.model,
+						children: " docs/PLUGINS.md "
+					}),
+					"."
+				]
+			})
+		]
 	});
-	if (rows.length === 0) return /* @__PURE__ */ jsx$1(EmptyRow, { label: `no extensions match "${query}"` });
+	if (rows.length === 0) return /* @__PURE__ */ jsx$1(EmptyRow, { label: `no extensions or plugins match "${query}"` });
 	const descCols = Math.max(0, contentCols - 1 - 1 - 6);
 	const groups = [];
 	for (let i = 0; i < rows.length; i++) {
@@ -15845,6 +16374,16 @@ function ExtensionsList({ rows, enabledSet, extensionConfig, categories, totalCo
 			});
 			continue;
 		}
+		if (row.kind === "plugin") {
+			groups.push({
+				kind: "plugin",
+				plugin: row.plugin,
+				hasContents: row.hasContents,
+				expanded: row.expanded,
+				index: i
+			});
+			continue;
+		}
 		if (row.kind === "extension") {
 			groups.push({
 				kind: "extension",
@@ -15893,6 +16432,12 @@ function ExtensionsList({ rows, enabledSet, extensionConfig, categories, totalCo
 								fg: focused ? COLOR.brand : COLOR.dim,
 								children: group.ext.name
 							}),
+							/* @__PURE__ */ jsx$1("span", { children: "  " }),
+							/* @__PURE__ */ jsx$1("span", {
+								fg: extBadge.fg,
+								bg: extBadge.bg,
+								children: KIND_BADGE.ext
+							}),
 							/* @__PURE__ */ jsx$1("span", {
 								fg: COLOR.mute,
 								children: `  ${where}`
@@ -15911,6 +16456,108 @@ function ExtensionsList({ rows, enabledSet, extensionConfig, categories, totalCo
 					})]
 				}, `err:${group.ext.name}`);
 			}
+			if (group.kind === "plugin") {
+				const focused = group.index === cursor;
+				const bg = focused ? highlightBg : void 0;
+				const entry = group.plugin;
+				const rejected = pluginRejectionReason(entry);
+				const enabled = pluginEnabledSet.has(entry.name);
+				const detail = truncateToCols(pluginDetailLine(entry, (p) => displayPath$1(p, home)), descCols);
+				return /* @__PURE__ */ jsxs("box", {
+					id: anchorIdFor(group.index),
+					style: {
+						flexDirection: "column",
+						flexShrink: 0
+					},
+					children: [
+						/* @__PURE__ */ jsxs("text", {
+							wrapMode: "none",
+							bg,
+							onMouseDown: onRowClick && ((event) => {
+								event.stopPropagation();
+								event.preventDefault();
+								onRowClick(group.index, inCheckboxZone(event, 4) ? "checkbox" : "row");
+							}),
+							children: [
+								/* @__PURE__ */ jsx$1("span", {
+									fg: focused ? COLOR.brand : COLOR.mute,
+									children: focused ? "▶ " : "  "
+								}),
+								rejected ? /* @__PURE__ */ jsx$1("span", {
+									fg: COLOR.error,
+									children: "✗ "
+								}) : group.hasContents ? /* @__PURE__ */ jsx$1("span", {
+									fg: COLOR.mute,
+									children: group.expanded ? "▾ " : "▸ "
+								}) : /* @__PURE__ */ jsx$1("span", {
+									fg: COLOR.mute,
+									children: "  "
+								}),
+								rejected ? /* @__PURE__ */ jsx$1("span", {
+									fg: COLOR.mute,
+									children: "    "
+								}) : /* @__PURE__ */ jsx$1("span", {
+									fg: enabled ? COLOR.accent : COLOR.mute,
+									children: enabled ? "[✓] " : "[ ] "
+								}),
+								/* @__PURE__ */ jsx$1("span", {
+									fg: focused ? COLOR.brand : COLOR.dim,
+									children: entry.name
+								}),
+								entry.version && /* @__PURE__ */ jsx$1("span", {
+									fg: COLOR.mute,
+									children: ` v${entry.version}`
+								}),
+								/* @__PURE__ */ jsx$1("span", { children: "  " }),
+								/* @__PURE__ */ jsx$1("span", {
+									fg: pluginBadge.fg,
+									bg: pluginBadge.bg,
+									children: KIND_BADGE.plugin
+								})
+							]
+						}),
+						detail && /* @__PURE__ */ jsx$1("text", {
+							wrapMode: "none",
+							fg: rejected ? COLOR.error : COLOR.mute,
+							children: `${COL_TITLE}${detail}`
+						}),
+						group.expanded && entry.contributions.skills.map((skill) => /* @__PURE__ */ jsxs("text", {
+							wrapMode: "none",
+							children: [
+								/* @__PURE__ */ jsx$1("span", {
+									fg: COLOR.mute,
+									children: `${COL_TITLE}  skill   `
+								}),
+								/* @__PURE__ */ jsx$1("span", {
+									fg: COLOR.dim,
+									children: skill.name
+								}),
+								skill.description && /* @__PURE__ */ jsxs("span", {
+									fg: COLOR.mute,
+									children: ["  ", truncateToCols(skill.description, Math.max(0, descCols - skill.name.length - 12))]
+								})
+							]
+						}, `skill:${skill.name}`)),
+						group.expanded && entry.contributions.mcpServers.map((server) => /* @__PURE__ */ jsxs("text", {
+							wrapMode: "none",
+							children: [
+								/* @__PURE__ */ jsx$1("span", {
+									fg: COLOR.mute,
+									children: `${COL_TITLE}  server  `
+								}),
+								/* @__PURE__ */ jsx$1("span", {
+									fg: COLOR.dim,
+									children: server.name
+								}),
+								/* @__PURE__ */ jsx$1("span", {
+									fg: COLOR.mute,
+									children: `  ${server.transport}`
+								})
+							]
+						}, `server:${server.name}`))
+					]
+				}, `plugin:${entry.name}`);
+			}
 			const focused = group.index === cursor;
 			const bg = focused ? highlightBg : void 0;
 			const enabled = enabledSet.has(group.ext.name);
@@ -16029,6 +16676,12 @@ function ExtensionsList({ rows, enabledSet, extensionConfig, categories, totalCo
 							group.ext.definition?.version && /* @__PURE__ */ jsx$1("span", {
 								fg: COLOR.mute,
 								children: ` v${group.ext.definition.version}`
+							}),
+							/* @__PURE__ */ jsx$1("span", { children: "  " }),
+							/* @__PURE__ */ jsx$1("span", {
+								fg: extBadge.fg,
+								bg: extBadge.bg,
+								children: KIND_BADGE.ext
 							})
 						]
 					}),
@@ -16272,6 +16925,7 @@ function ConfigModelPickerRow({ id, label, description, catalog, multi, initial,
 }
 function SkillsList({ items, enabledSet, totalCount, cursor, highlightBg, query, contentCols, onRowClick }) {
 	const COLOR = useColors();
+	const contributedBadge = kindBadgeStyle("plugin", COLOR, useSurfaces());
 	if (totalCount === 0) return /* @__PURE__ */ jsxs("box", {
 		style: { flexDirection: "column" },
 		children: [/* @__PURE__ */ jsx$1("text", {
@@ -16314,6 +16968,7 @@ function SkillsList({ items, enabledSet, totalCount, cursor, highlightBg, query,
 			const enabled = enabledSet.has(entry.name);
 			const description = truncateToCols(entry.description ?? "", descCols);
 			const origin = skillOriginLabel(entry);
+			const badge = skillOriginBadge(entry);
 			return /* @__PURE__ */ jsxs("box", {
 				onMouseDown: onRowClick && ((event) => {
 					event.stopPropagation();
@@ -16333,14 +16988,17 @@ function SkillsList({ items, enabledSet, totalCount, cursor, highlightBg, query,
 					onMouseDown: onRowClick && ((event) => {
 						event.stopPropagation();
 						event.preventDefault();
-						onRowClick(i, inCheckboxZone(event, 2) ? "checkbox" : "row");
+						onRowClick(i, !badge && inCheckboxZone(event, 2) ? "checkbox" : "row");
 					}),
 					children: [
 						/* @__PURE__ */ jsx$1("span", {
 							fg: focused ? COLOR.brand : COLOR.mute,
 							children: focused ? "▶ " : "  "
 						}),
-						/* @__PURE__ */ jsx$1("span", {
+						badge ? /* @__PURE__ */ jsx$1("span", {
+							fg: COLOR.mute,
+							children: "    "
+						}) : /* @__PURE__ */ jsx$1("span", {
 							fg: enabled ? COLOR.accent : COLOR.mute,
 							children: enabled ? "[✓] " : "[ ] "
 						}),
@@ -16348,7 +17006,11 @@ function SkillsList({ items, enabledSet, totalCount, cursor, highlightBg, query,
 							fg: focused ? COLOR.brand : COLOR.dim,
 							children: entry.name
 						}),
-						origin && /* @__PURE__ */ jsxs("span", {
+						badge ? /* @__PURE__ */ jsxs(Fragment, { children: [/* @__PURE__ */ jsx$1("span", { children: "  " }), /* @__PURE__ */ jsx$1("span", {
+							fg: contributedBadge.fg,
+							bg: contributedBadge.bg,
+							children: ` ${badge} `
+						})] }) : origin && /* @__PURE__ */ jsxs("span", {
 							fg: COLOR.mute,
 							children: [" · ", origin]
 						})
@@ -17051,13 +17713,13 @@ function renderMcpErrors(errors, home, warnColor, dimColor) {
 		}, err.path))
 	});
 }
-function Hints({ activeTab, authorizing = false, focusedMcp, focusedMcpRow, focusedMcpStatus, canRefreshSkills, canRefreshMcps, canEditExtension, canCreateExtension, canUpdateExtension, canRemoveExtension, canInstallExtension, canInstallSkill, canEditSkill, canAddMcp, canRemoveSkill, canRemoveMcp, focusedExtensionExpandable, focusedSecretClearable = false }) {
+function Hints({ activeTab, authorizing = false, focusedMcp, focusedMcpRow, focusedMcpStatus, canRefreshSkills, canRefreshMcps, canRefreshPlugins, canEditExtension, canCreateExtension, canUpdateExtension, canRemoveExtension, canInstallExtension, canInstallSkill, canEditSkill, canAddMcp, canRemoveSkill, canRemoveMcp, focusedExtensionExpandable, focusedSecretClearable = false }) {
 	const COLOR = useColors();
 	const onServerRow = focusedMcpRow?.kind === "server";
 	const showLogin = activeTab === "mcps" && onServerRow && !!focusedMcp && !!focusedMcpStatus && canLogin$1(focusedMcp, focusedMcpStatus);
 	const showLogout = activeTab === "mcps" && onServerRow && !!focusedMcpStatus && canLogout$1(focusedMcpStatus);
 	const showCancel = activeTab === "mcps" && authorizing;
-	const showRefresh = activeTab === "skills" && canRefreshSkills || activeTab === "mcps" && canRefreshMcps;
+	const showRefresh = activeTab === "skills" && canRefreshSkills || activeTab === "mcps" && canRefreshMcps || activeTab === "extensions" && canRefreshPlugins;
 	return /* @__PURE__ */ jsx$1(HintRow, { hints: [
 		{
 			key: "←→",
@@ -17183,6 +17845,21 @@ function extensionCorpus(e) {
 	].join(" ").toLowerCase();
 }
 /**
+* Search corpus for an Agent Plugin row. Includes the literal word `plugin`
+* and the origin, so typing `plugin` narrows to plugins and typing an
+* extension's name surfaces the plugins it loaded.
+*/
+function pluginCorpus(p) {
+	return [
+		"plugin",
+		p.name,
+		p.version ?? "",
+		p.description ?? "",
+		p.origin.kind === "disk" ? p.origin.scope : p.origin.extensionName,
+		p.origin.dir
+	].join(" ").toLowerCase();
+}
+/**
 * What a config row shows at rest. Secrets are masked (last 4 kept so the user
 * can tell WHICH token is stored), unset model rows read `(unset)`.
 *
@@ -18134,7 +18811,7 @@ const SESSION_SEARCH_INDEX_CACHE_MAX_BYTES = 64 * 1024 * 1024;
 */
 /** How long the `⚡ cache break` footer toast stays visible after a break. */
 const CACHE_BREAK_CHIP_MS = 8e3;
-const debugLog = process.env.ZIDANE_DEBUG ? (label, err) => console.error(`[zidane/tui] ${label}:`, err) : () => {};
+const debugLog = createDebugLog("tui");
 /**
 * Launch the user's preferred editor on `path`. Tries `$EDITOR` /
 * `$VISUAL` first (the standard *nix convention for "open this
@@ -18220,21 +18897,6 @@ function reduceEditsByOutcomes(edits, outcomes) {
 	}
 	return out;
 }
-/**
-* Dedup an MCP-server list by `name`. First entry wins — used at
-* agent build to give project-level `mcps.json` precedence over any
-* extension-contributed servers that happen to share a name.
-*/
-function dedupMcpServers(servers) {
-	const seen = /* @__PURE__ */ new Set();
-	const out = [];
-	for (const server of servers) {
-		if (seen.has(server.name)) continue;
-		seen.add(server.name);
-		out.push(server);
-	}
-	return out;
-}
 const ExtensionRegistryContext = createContext(null);
 function useExtensionRegistryState() {
 	const ctx = useContext(ExtensionRegistryContext);
@@ -18496,7 +19158,7 @@ function AppShell() {
 	const sessionSafelistRef = useRef(/* @__PURE__ */ new Set());
 	const streamRef = useRef(null);
 	const pendingAnnotationsRef = useRef(/* @__PURE__ */ new Map());
-	const { skillsCatalog, mcpsCatalog, filesCatalog, ensureFiles: ensureFilesCatalog, ensureSkills: ensureSkillsCatalog, refreshSkills: onRefreshSkills, refreshMcps: onRefreshMcps } = useDiscovery();
+	const { skillsCatalog, pluginsCatalog, mcpsCatalog, filesCatalog, ensureFiles: ensureFilesCatalog, ensureSkills: ensureSkillsCatalog, refreshSkills: onRefreshSkills, refreshMcps: onRefreshMcps, refreshPlugins: onRefreshPlugins } = useDiscovery();
 	const mcpCredentialStore = useMemo(() => createFileMcpCredentialStore(dataDir), [dataDir]);
 	const dispatchAuth = useMcpAuthDispatch();
 	const dispatchAuthRef = useRef(dispatchAuth);
@@ -18505,8 +19167,38 @@ function AppShell() {
 	const onLoginMcpRef = useRef(null);
 	const skillsCatalogRef = useRef(skillsCatalog);
 	skillsCatalogRef.current = skillsCatalog;
+	const pluginsCatalogRef = useRef(pluginsCatalog);
+	pluginsCatalogRef.current = pluginsCatalog;
 	const enabledSkillsRef = useRef(settings.enabledSkills);
 	enabledSkillsRef.current = settings.enabledSkills;
+	const enabledPluginsRef = useRef(settings.enabledPlugins);
+	enabledPluginsRef.current = settings.enabledPlugins;
+	/**
+	* Registry with the user's toggles applied, for surfaces that must reflect
+	* them: disabling an extension or a plugin re-runs this memo and its
+	* contributions disappear in the same frame the agent is rebuilt.
+	*
+	* Deliberately NOT used for the Extensions & Plugins tab's own rows — those
+	* come from the RAW registry, because a disabled extension or plugin must
+	* stay listed or its toggle becomes unreachable.
+	*/
+	const liveRegistryForSettings = useMemo(() => filterRegistryPlugins(filterExtensionRegistry(extensionRegistry, settings.enabledExtensions), settings.enabledPlugins, new Set(pluginsCatalog.map((p) => p.name))), [
+		extensionRegistry,
+		settings.enabledExtensions,
+		settings.enabledPlugins,
+		pluginsCatalog
+	]);
+	/**
+	* Ref mirror of the above, read by `getExtensionsSnapshot`.
+	*
+	* The settings modal is built once inside a key handler
+	* (`modal.open(<SettingsModal …/>)`), so its props are frozen at open time.
+	* A getter closing over a REF is how the modal pulls current state anyway —
+	* this puts the filtered registry on that same rail, so a plugin toggled off
+	* while settings is open drops out of the Skills tab.
+	*/
+	const liveRegistryForSettingsRef = useRef(liveRegistryForSettings);
+	liveRegistryForSettingsRef.current = liveRegistryForSettings;
 	const importForeignConfigsRef = useRef(settings.importForeignConfigs);
 	importForeignConfigsRef.current = settings.importForeignConfigs;
 	const importRulerConfigsRef = useRef(settings.importRulerConfigs);
@@ -18517,14 +19209,36 @@ function AppShell() {
 	enabledMcpsRef.current = settings.enabledMcps;
 	const disabledMcpToolsRef = useRef(settings.disabledMcpTools);
 	disabledMcpToolsRef.current = settings.disabledMcpTools;
+	/**
+	* Fingerprint of everything that feeds the agent's MCP + plugin runtime.
+	* A change schedules a rebuild (see the effect keyed on this below).
+	*
+	* Plugin state belongs here even though the name says "mcp": plugin
+	* contributions are SNAPSHOTTED into the agent at build time (unlike
+	* skills, which pass `scan` paths the agent resolves itself). The plugin
+	* walk is async and nothing orders it before the first build, so without
+	* the catalog in this key whether a cold boot picked up plugins would be
+	* timing-dependent — and a late-landing catalog would have no recovery
+	* path. `enabledPlugins` is here for the same reason a toggle of
+	* `enabledMcps` is: it changes which servers should be connected.
+	*/
 	const mcpRuntimeKey = useMemo(() => JSON.stringify({
 		catalog: mcpsCatalog.map(({ config }) => config),
 		enabled: settings.enabledMcps ?? null,
-		disabledTools: settings.disabledMcpTools ?? null
+		disabledTools: settings.disabledMcpTools ?? null,
+		plugins: pluginsCatalog.map(({ name, plugin }) => ({
+			name,
+			ok: plugin.ok,
+			skills: plugin.skills,
+			servers: plugin.mcpServers
+		})),
+		enabledPlugins: settings.enabledPlugins ?? null
 	}), [
 		mcpsCatalog,
 		settings.enabledMcps,
-		settings.disabledMcpTools
+		settings.disabledMcpTools,
+		pluginsCatalog,
+		settings.enabledPlugins
 	]);
 	const filesCatalogRef = useRef(filesCatalog);
 	filesCatalogRef.current = filesCatalog;
@@ -19441,18 +20155,26 @@ function AppShell() {
 			foreignAgents: importForeignConfigsRef.current === true,
 			ruler: importRulerConfigsRef.current !== false
 		});
-		const liveExtensionRegistry = filterExtensionRegistry(extensionRegistry, enabledExtensionsRef.current);
+		const liveExtensionRegistry = filterRegistryPlugins(filterExtensionRegistry(extensionRegistry, enabledExtensionsRef.current), enabledPluginsRef.current, new Set(pluginsCatalogRef.current.map((p) => p.name)));
+		const pluginContributions = buildPluginContributions({
+			discovered: pluginsCatalogRef.current,
+			...enabledPluginsRef.current !== void 0 ? { enabled: enabledPluginsRef.current } : {}
+		});
 		const extensionSkillNames = liveExtensionRegistry.skills.map((s) => s.name);
 		const userEnabledSkills = enabledSkillsRef.current;
 		const skillsConfig = buildSkillsConfig({
 			scan: skillsScan,
-			enabled: userEnabledSkills === void 0 ? void 0 : Array.from(/* @__PURE__ */ new Set([...userEnabledSkills, ...extensionSkillNames]))
+			enabled: userEnabledSkills === void 0 ? void 0 : Array.from(/* @__PURE__ */ new Set([
+				...userEnabledSkills,
+				...extensionSkillNames,
+				...pluginContributions.skills.map((s) => s.name)
+			]))
 		});
-		const projectMcps = buildMcpServers({
+		const projectMcps = [...buildMcpServers({
 			discovered: mcpsCatalogRef.current,
 			enabled: enabledMcpsRef.current,
 			...disabledMcpToolsRef.current ? { disabledTools: disabledMcpToolsRef.current } : {}
-		});
+		}), ...pluginContributions.mcpServers];
 		const allowInteraction = allowInteractionRef.current !== false;
 		const interactionTools = allowInteraction ? createInteractionTools({ requestInteraction: makeRequestInteraction(interactions) }) : {};
 		const actualCwd = cwdRef.current;
@@ -19504,14 +20226,18 @@ function AppShell() {
 			...skillsConfig,
 			...composedPreset.skills ?? {}
 		};
-		const withExtensionSkill = !!session.metadata["zidane.extensionEdit"] || extensionDirForCwd(actualCwd) !== null ? withZidaneExtensionSkill(mergedSkills, { cwd: actualCwd }) : mergedSkills;
+		const withPluginSkills = pluginContributions.skills.length > 0 ? {
+			...mergedSkills,
+			catalog: [...pluginContributions.skills, ...mergedSkills.catalog ?? []]
+		} : mergedSkills;
+		const withExtensionSkill = !!session.metadata["zidane.extensionEdit"] || extensionDirForCwd(actualCwd) !== null ? withZidaneExtensionSkill(withPluginSkills, { cwd: actualCwd }) : withPluginSkills;
 		const skillEditMarker = readSkillEditMarker(session.metadata[SKILL_EDIT_METADATA_KEY]);
 		const skills = skillEditMarker ? withZidaneSkillEditSkill(withExtensionSkill, skillEditMarker, { cwd: actualCwd }) : withExtensionSkill;
-		const mergedMcpServers = dedupMcpServers([
+		const mergedMcpServers = dedupMcpServersByName([
 			...projectMcps,
 			...launch?.mcp ?? [],
 			...composedPreset.mcpServers ?? []
-		]);
+		], (names) => debugLog("mcp name collision — later configs dropped (first wins)", names));
 		const mergedTools = {
 			...interactionTools,
 			chatTurnsRead: chatTurnsReadTool,
@@ -22950,6 +23676,9 @@ function AppShell() {
 				} } : {},
 				extensionsCatalog: extensionRegistry.loaded,
 				extensionsInactive: extensionRegistry.inactive,
+				pluginsCatalog,
+				pluginsFromExtensions: extensionRegistry.plugins,
+				extensionContributedSkills: liveRegistryForSettings.skills,
 				authentication: {
 					currentProviderLabel: picked?.provider.label,
 					currentProviderKey: picked?.provider.key,
@@ -22964,6 +23693,7 @@ function AppShell() {
 					onCancelLoginMcp,
 					onRefreshSkills,
 					onRefreshMcps,
+					onRefreshPlugins,
 					onRefreshMcpTools,
 					onEditExtension,
 					onEditSkill,
@@ -22975,7 +23705,9 @@ function AppShell() {
 						catalog: extensionRegistryLiveRef.current.loaded,
 						inactive: extensionRegistryLiveRef.current.inactive,
 						configCategories: extensionRegistryLiveRef.current.configCategories,
-						configItems: extensionRegistryLiveRef.current.configItems
+						configItems: extensionRegistryLiveRef.current.configItems,
+						plugins: extensionRegistryLiveRef.current.plugins,
+						skills: liveRegistryForSettingsRef.current.skills
 					}),
 					onInstallSkill,
 					onAddMcp,
@@ -24888,6 +25620,7 @@ async function runTui(options = {}) {
 	});
 	const prefix = options.prefix ?? process.env.ZIDANE_PREFIX ?? ".zidane";
 	const extensionScanPaths = options.extensionScanPaths ?? parseExtensionScanPathEnv();
+	const pluginScanPaths = options.pluginScanPaths ?? parsePluginScanPathEnv();
 	const explicitStorageDir = options.storageDir ?? process.env.ZIDANE_STORAGE_DIR;
 	const paths = resolveStoragePaths({
 		prefix,
@@ -24923,6 +25656,7 @@ async function runTui(options = {}) {
 	const config = resolveConfig({
 		...options,
 		extensionScanPaths,
+		pluginScanPaths,
 		extensionRegistry,
 		trustProjectExtensions,
 		...options.launch && !options.preset && !options.agents ? { preset: basic_default } : {},