@daweifu/capability-menu 0.1.3 → 0.1.5

package/lib/client.js

@@ -3,9 +3,97 @@ var module = { exports: {} };
 var exports = module.exports;
 
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+//#region \0rolldown/runtime.js
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __copyProps = (to, from, except, desc) => {
+	if (from && typeof from === "object" || typeof from === "function") for (var keys = __getOwnPropNames(from), i = 0, n = keys.length, key; i < n; i++) {
+		key = keys[i];
+		if (!__hasOwnProp.call(to, key) && key !== except) __defProp(to, key, {
+			get: ((k) => from[k]).bind(null, key),
+			enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
+		});
+	}
+	return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule || !__hasOwnProp.call(mod, "default") ? __defProp(target, "default", {
+	value: mod,
+	enumerable: true
+}) : target, mod));
+//#endregion
 let react = require("react");
 let _deepseek_ai_dsh_client_ui_primitives = require("@deepseek-ai/dsh-client-ui-primitives");
+_deepseek_ai_dsh_client_ui_primitives = __toESM(_deepseek_ai_dsh_client_ui_primitives, 1);
 let react_jsx_runtime = require("react/jsx-runtime");
+//#region src/client/settings-nav-icon.ts
+/** Replace the settings shell's fallback gear with dsh's shared list glyph. */
+const NAV_ICON_MARKER = "data-capability-menu-nav-icon";
+const NAV_ROW_SELECTOR = "[role=\"dialog\"] nav button";
+const NAV_ICON_SIZE = 16;
+/** The geometry of dsh-client-ui-primitives' IconFlatListOutlineMedium. */
+function flatListMaskUrl() {
+	return `data:image/svg+xml,${encodeURIComponent("<svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 16 16\" fill=\"none\" stroke=\"#000\" stroke-linecap=\"round\" stroke-width=\"1.3\"><path d=\"M6 3.5h7.5M6 8h7.5M6 12.5h7.5\"/><path d=\"M2.6 3.5h.01M2.6 8h.01M2.6 12.5h.01\"/></svg>")}`;
+}
+function navIconCss(maskUrl) {
+	return [
+		`[${NAV_ICON_MARKER}] > svg { display: none; }`,
+		`[${NAV_ICON_MARKER}]::before {`,
+		"  content: \"\";",
+		"  flex: none;",
+		`  width: ${NAV_ICON_SIZE}px;`,
+		`  height: ${NAV_ICON_SIZE}px;`,
+		"  background-color: currentColor;",
+		`  -webkit-mask: url("${maskUrl}") center / ${NAV_ICON_SIZE}px ${NAV_ICON_SIZE}px no-repeat;`,
+		`  mask: url("${maskUrl}") center / ${NAV_ICON_SIZE}px ${NAV_ICON_SIZE}px no-repeat;`,
+		"}"
+	].join("\n");
+}
+/**
+* The current settings.section slot has no icon option. Match this plugin's
+* localized nav label and replace only its fallback gear, as dsh-market does.
+*/
+function installSettingsNavIcon(ctx, resolveLabel) {
+	if (typeof document === "undefined") return;
+	ctx.effect(() => {
+		const style = document.createElement("style");
+		style.dataset.plugin = "capability-menu";
+		style.dataset.pluginCss = "capability-menu/settings-nav-icon";
+		style.textContent = navIconCss(flatListMaskUrl());
+		document.head.appendChild(style);
+		let disposed = false;
+		let scheduled = false;
+		const sync = () => {
+			scheduled = false;
+			if (disposed) return;
+			const wanted = resolveLabel().trim();
+			for (const row of document.querySelectorAll(NAV_ROW_SELECTOR)) if (wanted.length > 0 && row.textContent?.trim() === wanted) row.setAttribute(NAV_ICON_MARKER, "");
+			else row.removeAttribute(NAV_ICON_MARKER);
+		};
+		const schedule = () => {
+			if (scheduled || disposed) return;
+			scheduled = true;
+			queueMicrotask(sync);
+		};
+		sync();
+		const observer = new MutationObserver(schedule);
+		observer.observe(document.body, {
+			childList: true,
+			subtree: true,
+			characterData: true
+		});
+		return () => {
+			disposed = true;
+			observer.disconnect();
+			for (const row of document.querySelectorAll(`[${NAV_ICON_MARKER}]`)) row.removeAttribute(NAV_ICON_MARKER);
+			style.remove();
+		};
+	}, "capability-menu: settings nav icon");
+}
+//#endregion
 //#region node_modules/.pnpm/zod@4.5.2/node_modules/zod/v4/core/util.js
 function getEnumValues(entries) {
 	const numericValues = Object.values(entries).filter((v) => typeof v === "number");
@@ -5190,6 +5278,18 @@ function superRefine(fn, params) {
 * namespace and exports a `TYPERT_REMOTE` contribution that the browser
 * plugin mounts via `ctx.remote.$mount(...)`.
 */
+/**
+* Bridge Typert's codec field rename across DSH 0.1 and 0.2. Older remotes
+* read `schema`; the 0.2 protocol lazily calls `create()`.
+*/
+function strictCodec(typeSymbol, schema) {
+	return {
+		mode: "strict",
+		typeSymbol,
+		schema,
+		create: () => schema
+	};
+}
 const stringRecord$schema = record(string(), string());
 const mcpLocation$schema = object({
 	id: string().readonly(),
@@ -5240,6 +5340,7 @@ const capabilityRow$schema = object({
 	name: string().readonly(),
 	server: string().optional().readonly(),
 	source: string().optional().readonly(),
+	preset: string().optional().readonly(),
 	class: union([
 		literal("resident"),
 		literal("on-demand"),
@@ -5273,7 +5374,8 @@ const toolDetail$schema = object({
 		provider: string().readonly(),
 		serverName: string().optional().readonly(),
 		path: string().optional().readonly(),
-		source: string().optional().readonly()
+		source: string().optional().readonly(),
+		preset: string().optional().readonly()
 	}).readonly(),
 	tags: array(string()).readonly(),
 	stats: object({
@@ -5294,11 +5396,7 @@ const TYPERT_REMOTE = {
 			method: "getConfig",
 			invocation: { kind: "direct" },
 			parameters: [],
-			result: {
-				mode: "strict",
-				typeSymbol: "Record<string, unknown>",
-				schema: record(string(), unknown())
-			},
+			result: strictCodec("Record<string, unknown>", record(string(), unknown())),
 			sourceLocation: {
 				file: "src/server/remote.ts",
 				line: 61,
@@ -5315,17 +5413,9 @@ const TYPERT_REMOTE = {
 				name: "partial",
 				wire: "partial",
 				source: "json",
-				codec: {
-					mode: "strict",
-					typeSymbol: "Record<string, unknown>",
-					schema: record(string(), unknown())
-				}
+				codec: strictCodec("Record<string, unknown>", record(string(), unknown()))
 			}],
-			result: {
-				mode: "strict",
-				typeSymbol: "void",
-				schema: _undefined()
-			},
+			result: strictCodec("void", _undefined()),
 			sourceLocation: {
 				file: "src/server/remote.ts",
 				line: 67,
@@ -5339,11 +5429,7 @@ const TYPERT_REMOTE = {
 			method: "classifyAll",
 			invocation: { kind: "direct" },
 			parameters: [],
-			result: {
-				mode: "strict",
-				typeSymbol: "@daweifu/capability-menu#CapabilityRow",
-				schema: array(capabilityRow$schema)
-			},
+			result: strictCodec("@daweifu/capability-menu#CapabilityRow", array(capabilityRow$schema)),
 			sourceLocation: {
 				file: "src/server/remote.ts",
 				line: 73,
@@ -5357,11 +5443,7 @@ const TYPERT_REMOTE = {
 			method: "refresh",
 			invocation: { kind: "direct" },
 			parameters: [],
-			result: {
-				mode: "strict",
-				typeSymbol: "void",
-				schema: _undefined()
-			},
+			result: strictCodec("void", _undefined()),
 			sourceLocation: {
 				file: "src/server/remote.ts",
 				line: 84,
@@ -5378,27 +5460,15 @@ const TYPERT_REMOTE = {
 				name: "id",
 				wire: "id",
 				source: "json",
-				codec: {
-					mode: "strict",
-					typeSymbol: "string",
-					schema: string()
-				}
+				codec: strictCodec("string", string())
 			}, {
 				name: "relPath",
 				wire: "relPath",
 				source: "json",
 				acceptsUndefined: true,
-				codec: {
-					mode: "strict",
-					typeSymbol: "string",
-					schema: string().optional()
-				}
+				codec: strictCodec("string", string().optional())
 			}],
-			result: {
-				mode: "strict",
-				typeSymbol: "@daweifu/capability-menu#SkillFileEntry[]",
-				schema: array(skillFileEntry$schema).optional()
-			},
+			result: strictCodec("@daweifu/capability-menu#SkillFileEntry[]", array(skillFileEntry$schema).optional()),
 			sourceLocation: {
 				file: "src/server/remote.ts",
 				line: 85,
@@ -5415,26 +5485,14 @@ const TYPERT_REMOTE = {
 				name: "id",
 				wire: "id",
 				source: "json",
-				codec: {
-					mode: "strict",
-					typeSymbol: "string",
-					schema: string()
-				}
+				codec: strictCodec("string", string())
 			}, {
 				name: "relPath",
 				wire: "relPath",
 				source: "json",
-				codec: {
-					mode: "strict",
-					typeSymbol: "string",
-					schema: string()
-				}
+				codec: strictCodec("string", string())
 			}],
-			result: {
-				mode: "strict",
-				typeSymbol: "string",
-				schema: string().optional()
-			},
+			result: strictCodec("string", string().optional()),
 			sourceLocation: {
 				file: "src/server/remote.ts",
 				line: 91,
@@ -5451,17 +5509,9 @@ const TYPERT_REMOTE = {
 				name: "id",
 				wire: "id",
 				source: "json",
-				codec: {
-					mode: "strict",
-					typeSymbol: "string",
-					schema: string()
-				}
+				codec: strictCodec("string", string())
 			}],
-			result: {
-				mode: "strict",
-				typeSymbol: "@daweifu/capability-menu#ToolDetail",
-				schema: toolDetail$schema.optional()
-			},
+			result: strictCodec("@daweifu/capability-menu#ToolDetail", toolDetail$schema.optional()),
 			sourceLocation: {
 				file: "src/server/remote.ts",
 				line: 79,
@@ -5475,11 +5525,7 @@ const TYPERT_REMOTE = {
 			method: "getCatalogDocs",
 			invocation: { kind: "direct" },
 			parameters: [],
-			result: {
-				mode: "strict",
-				typeSymbol: "@daweifu/capability-menu#CatalogDocs",
-				schema: catalogDocs$schema
-			},
+			result: strictCodec("@daweifu/capability-menu#CatalogDocs", catalogDocs$schema),
 			sourceLocation: {
 				file: "src/server/remote.ts",
 				line: 104,
@@ -5493,11 +5539,7 @@ const TYPERT_REMOTE = {
 			method: "listLocations",
 			invocation: { kind: "direct" },
 			parameters: [],
-			result: {
-				mode: "strict",
-				typeSymbol: "@daweifu/capability-menu#McpLocation[]",
-				schema: array(mcpLocation$schema)
-			},
+			result: strictCodec("@daweifu/capability-menu#McpLocation[]", array(mcpLocation$schema)),
 			sourceLocation: {
 				file: "src/server/remote.ts",
 				line: 193,
@@ -5514,17 +5556,9 @@ const TYPERT_REMOTE = {
 				name: "input",
 				wire: "input",
 				source: "json",
-				codec: {
-					mode: "strict",
-					typeSymbol: "@daweifu/capability-menu#McpInput",
-					schema: mcpInput$schema
-				}
+				codec: strictCodec("@daweifu/capability-menu#McpInput", mcpInput$schema)
 			}],
-			result: {
-				mode: "strict",
-				typeSymbol: "string",
-				schema: string()
-			},
+			result: strictCodec("string", string()),
 			sourceLocation: {
 				file: "src/server/remote.ts",
 				line: 199,
@@ -5541,17 +5575,9 @@ const TYPERT_REMOTE = {
 				name: "id",
 				wire: "id",
 				source: "json",
-				codec: {
-					mode: "strict",
-					typeSymbol: "string",
-					schema: string()
-				}
+				codec: strictCodec("string", string())
 			}],
-			result: {
-				mode: "strict",
-				typeSymbol: "boolean",
-				schema: boolean()
-			},
+			result: strictCodec("boolean", boolean()),
 			sourceLocation: {
 				file: "src/server/remote.ts",
 				line: 205,
@@ -5568,26 +5594,14 @@ const TYPERT_REMOTE = {
 				name: "id",
 				wire: "id",
 				source: "json",
-				codec: {
-					mode: "strict",
-					typeSymbol: "string",
-					schema: string()
-				}
+				codec: strictCodec("string", string())
 			}, {
 				name: "input",
 				wire: "input",
 				source: "json",
-				codec: {
-					mode: "strict",
-					typeSymbol: "@daweifu/capability-menu#McpUpdateInput",
-					schema: mcpUpdateInput$schema
-				}
+				codec: strictCodec("@daweifu/capability-menu#McpUpdateInput", mcpUpdateInput$schema)
 			}],
-			result: {
-				mode: "strict",
-				typeSymbol: "boolean",
-				schema: boolean()
-			},
+			result: strictCodec("boolean", boolean()),
 			sourceLocation: {
 				file: "src/server/remote.ts",
 				line: 211,
@@ -5601,11 +5615,7 @@ const TYPERT_REMOTE = {
 			method: "listSkillLocations",
 			invocation: { kind: "direct" },
 			parameters: [],
-			result: {
-				mode: "strict",
-				typeSymbol: "@daweifu/capability-menu#SkillLocation[]",
-				schema: array(skillLocation$schema)
-			},
+			result: strictCodec("@daweifu/capability-menu#SkillLocation[]", array(skillLocation$schema)),
 			sourceLocation: {
 				file: "src/server/remote.ts",
 				line: 229,
@@ -5622,33 +5632,46 @@ const TYPERT_REMOTE = {
 				name: "dir",
 				wire: "dir",
 				source: "json",
-				codec: {
-					mode: "strict",
-					typeSymbol: "string",
-					schema: string()
-				}
+				codec: strictCodec("string", string())
 			}, {
 				name: "projectPath",
 				wire: "projectPath",
 				source: "json",
 				acceptsUndefined: true,
-				codec: {
-					mode: "strict",
-					typeSymbol: "string",
-					schema: string().optional()
-				}
+				codec: strictCodec("string", string().optional())
 			}],
-			result: {
-				mode: "strict",
-				typeSymbol: "string",
-				schema: string()
-			},
+			result: strictCodec("string", string()),
 			sourceLocation: {
 				file: "src/server/remote.ts",
 				line: 252,
 				column: 3
 			}
 		},
+		{
+			id: "@daweifu/capability-menu#capabilityPolicy/importSkillFromGitHub",
+			service: "capabilityPolicy",
+			namespace: "capabilityPolicy",
+			method: "importSkillFromGitHub",
+			invocation: { kind: "direct" },
+			parameters: [{
+				name: "url",
+				wire: "url",
+				source: "json",
+				codec: strictCodec("string", string())
+			}, {
+				name: "projectPath",
+				wire: "projectPath",
+				source: "json",
+				acceptsUndefined: true,
+				codec: strictCodec("string", string().optional())
+			}],
+			result: strictCodec("string", string()),
+			sourceLocation: {
+				file: "src/server/remote.ts",
+				line: 263,
+				column: 3
+			}
+		},
 		{
 			id: "@daweifu/capability-menu#capabilityPolicy/removeSkillLocation",
 			service: "capabilityPolicy",
@@ -5659,27 +5682,15 @@ const TYPERT_REMOTE = {
 				name: "name",
 				wire: "name",
 				source: "json",
-				codec: {
-					mode: "strict",
-					typeSymbol: "string",
-					schema: string()
-				}
+				codec: strictCodec("string", string())
 			}, {
 				name: "entryDir",
 				wire: "entryDir",
 				source: "json",
 				acceptsUndefined: true,
-				codec: {
-					mode: "strict",
-					typeSymbol: "string",
-					schema: string().optional()
-				}
+				codec: strictCodec("string", string().optional())
 			}],
-			result: {
-				mode: "strict",
-				typeSymbol: "boolean",
-				schema: boolean()
-			},
+			result: strictCodec("boolean", boolean()),
 			sourceLocation: {
 				file: "src/server/remote.ts",
 				line: 258,
@@ -5696,17 +5707,9 @@ const TYPERT_REMOTE = {
 				name: "name",
 				wire: "name",
 				source: "json",
-				codec: {
-					mode: "strict",
-					typeSymbol: "string",
-					schema: string()
-				}
+				codec: strictCodec("string", string())
 			}],
-			result: {
-				mode: "strict",
-				typeSymbol: "string",
-				schema: string()
-			},
+			result: strictCodec("string", string()),
 			sourceLocation: {
 				file: "src/server/remote.ts",
 				line: 259,
@@ -5724,44 +5727,42 @@ const TYPERT_REMOTE = {
 					name: "name",
 					wire: "name",
 					source: "json",
-					codec: {
-						mode: "strict",
-						typeSymbol: "string",
-						schema: string()
-					}
+					codec: strictCodec("string", string())
 				},
 				{
 					name: "dir",
 					wire: "dir",
 					source: "json",
-					codec: {
-						mode: "strict",
-						typeSymbol: "string",
-						schema: string()
-					}
+					codec: strictCodec("string", string())
 				},
 				{
 					name: "entryDir",
 					wire: "entryDir",
 					source: "json",
 					acceptsUndefined: true,
-					codec: {
-						mode: "strict",
-						typeSymbol: "string",
-						schema: string().optional()
-					}
+					codec: strictCodec("string", string().optional())
 				}
 			],
-			result: {
-				mode: "strict",
-				typeSymbol: "boolean",
-				schema: boolean()
-			},
+			result: strictCodec("boolean", boolean()),
 			sourceLocation: {
 				file: "src/server/remote.ts",
 				line: 264,
 				column: 3
 			}
+		},
+		{
+			id: "@daweifu/capability-menu#capabilityPolicy/catalogVersion",
+			service: "capabilityPolicy",
+			namespace: "capabilityPolicy",
+			method: "catalogVersion",
+			invocation: { kind: "direct" },
+			parameters: [],
+			result: strictCodec("number", number()),
+			sourceLocation: {
+				file: "src/server/remote.ts",
+				line: 317,
+				column: 3
+			}
 		}
 	]
 };
@@ -5796,15 +5797,52 @@ function unwrapMessage(result) {
 * still followed by an authoritative one.
 */
 let lastSnapshot;
+/** Short grace period for host tools that register just after the section mounts. */
+const EMPTY_SNAPSHOT_RETRY_DELAYS = [
+	250,
+	500,
+	1e3,
+	1500
+];
 /** The previously loaded snapshot, when this page session has one. */
 function cachedSnapshot() {
 	return lastSnapshot;
 }
-/** Load the classification list from the remote, remembering it for remounts. */
-async function loadSnapshot(remote) {
-	lastSnapshot = { rows: unwrap(await remote.classifyAll(), "capabilityPolicy.classifyAll") };
+/** Read one authoritative classification list without changing the view cache. */
+async function readSnapshot(remote) {
+	return { rows: unwrap(await remote.classifyAll(), "capabilityPolicy.classifyAll") };
+}
+/** Remember a snapshot after its contents are ready to replace the current view. */
+function rememberSnapshot(snapshot) {
+	lastSnapshot = snapshot;
 	return lastSnapshot;
 }
+/**
+* Load the classification list, retrying an empty result briefly because
+* built-in tools can register just after the settings section mounts.
+* Non-empty results remain authoritative and return immediately.
+*/
+async function loadSnapshot(remote, retryDelays = EMPTY_SNAPSHOT_RETRY_DELAYS) {
+	let snapshot = await readSnapshot(remote);
+	for (const delayMs of retryDelays) {
+		if (snapshot.rows.length > 0) break;
+		await new Promise((resolve) => setTimeout(resolve, delayMs));
+		snapshot = await readSnapshot(remote);
+	}
+	return rememberSnapshot(snapshot);
+}
+/** Wait briefly for an MCP's tools to enter the host catalog after registration. */
+async function waitForMcpTools(remote, serverName, retryDelays) {
+	const prefix = `mcp__${serverName}__`;
+	const hasServerTools = (snapshot) => snapshot.rows.some((row) => row.kind === "tool" && row.id.startsWith(prefix));
+	let snapshot = await readSnapshot(remote);
+	if (hasServerTools(snapshot)) return snapshot;
+	for (const delayMs of retryDelays) {
+		await new Promise((resolve) => setTimeout(resolve, delayMs));
+		snapshot = await readSnapshot(remote);
+		if (hasServerTools(snapshot)) return snapshot;
+	}
+}
 //#endregion
 //#region src/client/LocationModal.tsx
 /**
@@ -5850,6 +5888,11 @@ textarea.lm-input{resize:vertical;font-family:var(--dsw-font-markdown-code-block
    annotates and takes the caption colour so it does not read as another label. */
 .lm-hint{grid-column:2;margin:0;font-size:11px;line-height:16px;color:var(--dsw-alias-label-caption)}
 .lm-error{margin:0;font-size:12px;color:#b3261e;word-break:break-word}
+.lm-progress{display:flex;align-items:center;gap:8px;margin:0;font-size:12px;line-height:20px;color:var(--dsw-alias-label-secondary)}
+.lm-spinner{width:12px;height:12px;flex:none;border:2px solid var(--dsw-alias-border-l2);border-top-color:var(--dsw-alias-state-business-primary);border-radius:50%;animation:lm-spin .8s linear infinite}
+@keyframes lm-spin{to{transform:rotate(360deg)}}
+@media(prefers-reduced-motion:reduce){.lm-spinner{animation-duration:2s}}
+.mc-tab:disabled,.mc-preview-close:disabled{cursor:default;opacity:.6}
 .lm-actions{display:flex;gap:8px;justify-content:flex-end;padding:4px 0 0}
 /* Removal is irreversible, so it takes over the action row for one confirmation
    step: the message states the consequence, then the buttons act. */
@@ -5889,8 +5932,9 @@ function LocationModal(props) {
 	const { remote, t, defaultKind = "mcp", editMcp, editSkill, onClose, onChanged } = props;
 	const editing = editMcp !== void 0 || editSkill !== void 0;
 	const [subTab, setSubTab] = (0, react.useState)(editSkill !== void 0 ? "skill" : editMcp !== void 0 ? "mcp" : defaultKind);
-	const [error, setError] = (0, react.useState)(null);
+	const [errors, setErrors] = (0, react.useState)({});
 	const [busy, setBusy] = (0, react.useState)(false);
+	const [progressMessage, setProgressMessage] = (0, react.useState)(null);
 	/**
 	* Which action is waiting for confirmation, if any. Two need one: 移除, and
 	* 保存 on an entry that is a real directory — repointing unlinks the entry
@@ -5928,31 +5972,49 @@ function LocationModal(props) {
 		t
 	]);
 	/** Run a mutation; on success close and ask the parent to re-pull. */
-	const submit = (0, react.useCallback)(async (action, noticeFor) => {
+	const submit = (0, react.useCallback)(async (action, noticeFor, progress, registeredMcp) => {
 		if (busy) return;
 		setBusy(true);
+		setProgressMessage(progress ?? null);
+		setErrors((prev) => {
+			const next = { ...prev };
+			delete next[subTab];
+			return next;
+		});
 		try {
 			const changed = await action();
 			if (changed === false) throw new Error(t("entryNotFound"));
-			setError(null);
-			onChanged(noticeFor?.(changed));
+			setErrors((prev) => {
+				const next = { ...prev };
+				delete next[subTab];
+				return next;
+			});
+			onChanged(noticeFor?.(changed), registeredMcp);
 			onClose();
 		} catch (e) {
-			setError(String(e));
+			setErrors((prev) => ({
+				...prev,
+				[subTab]: String(e)
+			}));
 		} finally {
 			setBusy(false);
+			setProgressMessage(null);
 		}
 	}, [
 		busy,
 		onChanged,
 		onClose,
+		subTab,
 		t
 	]);
 	const submitMcp = (0, react.useCallback)(() => {
 		const trimmedTimeout = timeoutSec.trim();
 		const timeoutMs = trimmedTimeout.length === 0 ? void 0 : Math.round(Number(trimmedTimeout) * 1e3);
 		if (timeoutMs !== void 0 && !Number.isFinite(timeoutMs)) {
-			setError(t("timeoutInvalid"));
+			setErrors((prev) => ({
+				...prev,
+				mcp: t("timeoutInvalid")
+			}));
 			return;
 		}
 		const parsedEnv = fromLines(env);
@@ -5973,7 +6035,7 @@ function LocationModal(props) {
 		submit(async () => editMcp !== void 0 ? unwrapMessage(await remote.updateLocation(editMcp.id, common)) : unwrapMessage(await remote.addLocation({
 			serverName: serverName.trim(),
 			...common
-		})));
+		})), void 0, void 0, editMcp?.serverName ?? serverName.trim());
 	}, [
 		submit,
 		remote,
@@ -5990,8 +6052,13 @@ function LocationModal(props) {
 		t
 	]);
 	const submitSkill = (0, react.useCallback)(() => {
+		const source = skillDir.trim();
 		const asked = skillRoot === "project" ? projectPath.trim() : void 0;
-		submit(async () => editSkill !== void 0 ? unwrapMessage(await remote.updateSkillLocation(editSkill.name, skillDir.trim(), editSkill.entryDir)) : unwrapMessage(await remote.addSkillLocation(skillDir.trim(), asked)), (result) => editSkill !== void 0 ? t("skillRepointed", { dir: skillDir.trim() }) : t("skillRegisteredAt", { path: String(result) }));
+		submit(async () => {
+			if (editSkill !== void 0) return unwrapMessage(await remote.updateSkillLocation(editSkill.name, source, editSkill.entryDir));
+			if (/^https?:\/\//i.test(source)) return unwrapMessage(await remote.importSkillFromGitHub(source, asked));
+			return unwrapMessage(await remote.addSkillLocation(source, asked));
+		}, (result) => editSkill !== void 0 ? t("skillRepointed", { dir: source }) : t("skillRegisteredAt", { path: String(result) }), editSkill === void 0 && /^https:\/\//i.test(source) ? t("githubImporting") : void 0);
 	}, [
 		submit,
 		remote,
@@ -6067,7 +6134,7 @@ function LocationModal(props) {
 				if (needsSaveConfirm) setConfirm("save");
 				else onSubmit();
 			},
-			children: editing ? t("save") : t("register")
+			children: progressMessage !== null ? t("importing") : editing ? t("save") : t("register")
 		}), editing && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
 			type: "button",
 			className: "lm-btn lm-btn--danger",
@@ -6078,7 +6145,7 @@ function LocationModal(props) {
 	});
 	return /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
 		className: "mc-preview-mask",
-		onClick: onClose,
+		onClick: busy ? void 0 : onClose,
 		children: /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 			className: "mc-preview",
 			onClick: (e) => e.stopPropagation(),
@@ -6091,6 +6158,7 @@ function LocationModal(props) {
 					}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
 						type: "button",
 						className: "mc-preview-close",
+						disabled: busy,
 						onClick: onClose,
 						children: t("previewClose")
 					})]
@@ -6107,6 +6175,7 @@ function LocationModal(props) {
 							className: "mc-tab",
 							"aria-selected": subTab === "mcp",
 							"data-active": subTab === "mcp" ? "true" : void 0,
+							disabled: busy,
 							onClick: () => setSubTab("mcp"),
 							children: t("mcpServers")
 						}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
@@ -6115,6 +6184,7 @@ function LocationModal(props) {
 							className: "mc-tab",
 							"aria-selected": subTab === "skill",
 							"data-active": subTab === "skill" ? "true" : void 0,
+							disabled: busy,
 							onClick: () => setSubTab("skill"),
 							children: t("skillDirs")
 						})]
@@ -6122,222 +6192,234 @@ function LocationModal(props) {
 				}),
 				/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 					className: "lm-body",
-					children: [error !== null && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
-						className: "lm-error",
-						children: error
-					}), subTab === "mcp" ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
-						className: "lm-block",
-						children: /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
-							className: "lm-form",
-							children: [
-								/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
-									className: "lm-field",
-									children: [
-										/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
-											className: "lm-label",
-											children: t("transport")
-										}),
-										/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("select", {
-											className: "lm-input",
-											value: transport,
-											onChange: (e) => setTransport(e.target.value === "stdio" ? "stdio" : "streamable-http"),
-											children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("option", {
-												value: "stdio",
-												children: t("transportStdio")
-											}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("option", {
-												value: "streamable-http",
-												children: t("transportHttp")
+					children: [
+						errors[subTab] !== void 0 && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
+							className: "lm-error",
+							children: errors[subTab]
+						}),
+						progressMessage !== null && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("p", {
+							className: "lm-progress",
+							role: "status",
+							"aria-live": "polite",
+							children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+								className: "lm-spinner",
+								"aria-hidden": "true"
+							}), progressMessage]
+						}),
+						subTab === "mcp" ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
+							className: "lm-block",
+							children: /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+								className: "lm-form",
+								children: [
+									/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+										className: "lm-field",
+										children: [
+											/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+												className: "lm-label",
+												children: t("transport")
+											}),
+											/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("select", {
+												className: "lm-input",
+												value: transport,
+												onChange: (e) => setTransport(e.target.value === "stdio" ? "stdio" : "streamable-http"),
+												children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("option", {
+													value: "stdio",
+													children: t("transportStdio")
+												}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("option", {
+													value: "streamable-http",
+													children: t("transportHttp")
+												})]
+											}),
+											/* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
+												className: "lm-hint",
+												children: transport === "stdio" ? t("transportHintStdio") : t("transportHintHttp")
+											})
+										]
+									}),
+									/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+										className: "lm-field",
+										children: [
+											/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+												className: "lm-label",
+												children: t("serverName")
+											}),
+											/* @__PURE__ */ (0, react_jsx_runtime.jsx)("input", {
+												className: "lm-input",
+												value: serverName,
+												disabled: editMcp !== void 0,
+												onChange: (e) => setServerName(e.target.value)
+											}),
+											/* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
+												className: "lm-hint",
+												children: t("serverNameImmutable")
+											})
+										]
+									}),
+									transport === "stdio" ? /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [
+										/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+											className: "lm-field",
+											children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+												className: "lm-label",
+												children: t("command")
+											}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("input", {
+												className: "lm-input",
+												value: command,
+												onChange: (e) => setCommand(e.target.value)
 											})]
 										}),
-										/* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
-											className: "lm-hint",
-											children: transport === "stdio" ? t("transportHintStdio") : t("transportHintHttp")
-										})
-									]
-								}),
-								/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
-									className: "lm-field",
-									children: [
-										/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
-											className: "lm-label",
-											children: t("serverName")
+										/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+											className: "lm-field",
+											children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+												className: "lm-label",
+												children: t("args")
+											}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("input", {
+												className: "lm-input",
+												value: args,
+												onChange: (e) => setArgs(e.target.value)
+											})]
 										}),
-										/* @__PURE__ */ (0, react_jsx_runtime.jsx)("input", {
-											className: "lm-input",
-											value: serverName,
-											disabled: editMcp !== void 0,
-											onChange: (e) => setServerName(e.target.value)
+										/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+											className: "lm-field",
+											children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+												className: "lm-label",
+												children: t("cwd")
+											}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("input", {
+												className: "lm-input",
+												value: cwd,
+												onChange: (e) => setCwd(e.target.value)
+											})]
 										}),
-										editMcp !== void 0 && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
-											className: "lm-hint",
-											children: t("serverNameImmutable")
+										/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+											className: "lm-field",
+											children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+												className: "lm-label",
+												children: t("env")
+											}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("textarea", {
+												className: "lm-input",
+												rows: 3,
+												value: env,
+												onChange: (e) => setEnv(e.target.value)
+											})]
 										})
-									]
-								}),
-								transport === "stdio" ? /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [
-									/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+									] }) : /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 										className: "lm-field",
 										children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
 											className: "lm-label",
-											children: t("command")
+											children: t("url")
 										}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("input", {
 											className: "lm-input",
-											value: command,
-											onChange: (e) => setCommand(e.target.value)
+											value: url,
+											onChange: (e) => setUrl(e.target.value)
 										})]
-									}),
+									}), /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+										className: "lm-field",
+										children: [
+											/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+												className: "lm-label",
+												children: t("headers")
+											}),
+											/* @__PURE__ */ (0, react_jsx_runtime.jsx)("textarea", {
+												className: "lm-input",
+												rows: 4,
+												value: headers,
+												onChange: (e) => setHeaders(e.target.value)
+											}),
+											/* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
+												className: "lm-hint",
+												children: t("headersHint")
+											})
+										]
+									})] }),
 									/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 										className: "lm-field",
 										children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
 											className: "lm-label",
-											children: t("args")
+											children: t("timeout")
 										}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("input", {
 											className: "lm-input",
-											value: args,
-											onChange: (e) => setArgs(e.target.value)
+											value: timeoutSec,
+											placeholder: "60",
+											onChange: (e) => setTimeoutSec(e.target.value)
 										})]
 									}),
+									renderActions(() => void submitMcp())
+								]
+							})
+						}) : /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
+							className: "lm-block",
+							children: /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+								className: "lm-form",
+								children: [
 									/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 										className: "lm-field",
-										children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
-											className: "lm-label",
-											children: t("cwd")
-										}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("input", {
-											className: "lm-input",
-											value: cwd,
-											onChange: (e) => setCwd(e.target.value)
-										})]
+										children: [
+											/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+												className: "lm-label",
+												children: t("skillRoot")
+											}),
+											editSkill !== void 0 ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("input", {
+												className: "lm-input",
+												value: t(editSkill.root === "project" ? "skillRootProject" : "skillRootUser"),
+												disabled: true
+											}) : /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("select", {
+												className: "lm-input",
+												value: skillRoot,
+												onChange: (e) => setSkillRoot(e.target.value === "project" ? "project" : "user"),
+												children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("option", {
+													value: "user",
+													children: t("skillRootUser")
+												}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("option", {
+													value: "project",
+													children: t("skillRootProject")
+												})]
+											}),
+											/* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
+												className: "lm-hint",
+												children: skillRoot === "project" || editSkill?.root === "project" ? t("skillRootHintProject") : t("skillRootHintUser")
+											})
+										]
 									}),
 									/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 										className: "lm-field",
-										children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
-											className: "lm-label",
-											children: t("env")
-										}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("textarea", {
-											className: "lm-input",
-											rows: 3,
-											value: env,
-											onChange: (e) => setEnv(e.target.value)
-										})]
-									})
-								] }) : /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
-									className: "lm-field",
-									children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
-										className: "lm-label",
-										children: t("url")
-									}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("input", {
-										className: "lm-input",
-										value: url,
-										onChange: (e) => setUrl(e.target.value)
-									})]
-								}), /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
-									className: "lm-field",
-									children: [
-										/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
-											className: "lm-label",
-											children: t("headers")
-										}),
-										/* @__PURE__ */ (0, react_jsx_runtime.jsx)("textarea", {
-											className: "lm-input",
-											rows: 4,
-											value: headers,
-											onChange: (e) => setHeaders(e.target.value)
-										}),
-										/* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
-											className: "lm-hint",
-											children: t("headersHint")
-										})
-									]
-								})] }),
-								/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
-									className: "lm-field",
-									children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
-										className: "lm-label",
-										children: t("timeout")
-									}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("input", {
-										className: "lm-input",
-										value: timeoutSec,
-										placeholder: "60",
-										onChange: (e) => setTimeoutSec(e.target.value)
-									})]
-								}),
-								renderActions(() => void submitMcp())
-							]
-						})
-					}) : /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
-						className: "lm-block",
-						children: /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
-							className: "lm-form",
-							children: [
-								/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
-									className: "lm-field",
-									children: [
-										/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
-											className: "lm-label",
-											children: t("skillRoot")
-										}),
-										editSkill !== void 0 ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("input", {
-											className: "lm-input",
-											value: t(editSkill.root === "project" ? "skillRootProject" : "skillRootUser"),
-											disabled: true
-										}) : /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("select", {
-											className: "lm-input",
-											value: skillRoot,
-											onChange: (e) => setSkillRoot(e.target.value === "project" ? "project" : "user"),
-											children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("option", {
-												value: "user",
-												children: t("skillRootUser")
-											}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("option", {
-												value: "project",
-												children: t("skillRootProject")
-											})]
-										}),
-										/* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
-											className: "lm-hint",
-											children: skillRoot === "project" || editSkill?.root === "project" ? t("skillRootHintProject") : t("skillRootHintUser")
-										})
-									]
-								}),
-								/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
-									className: "lm-field",
-									children: [
-										/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
-											className: "lm-label",
-											children: t("skillDirPath")
-										}),
-										/* @__PURE__ */ (0, react_jsx_runtime.jsx)("input", {
-											className: "lm-input",
-											value: skillDir,
-											onChange: (e) => setSkillDir(e.target.value)
-										}),
-										/* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
-											className: "lm-hint",
-											children: t("skillDirHint")
-										})
-									]
-								}),
-								editSkill === void 0 && skillRoot === "project" && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
-									className: "lm-field",
-									children: [
-										/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
-											className: "lm-label",
-											children: t("skillProjectPath")
-										}),
-										/* @__PURE__ */ (0, react_jsx_runtime.jsx)("input", {
-											className: "lm-input",
-											value: projectPath,
-											onChange: (e) => setProjectPath(e.target.value)
-										}),
-										/* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
-											className: "lm-hint",
-											children: t("skillProjectPathHint")
-										})
-									]
-								}),
-								renderActions(() => void submitSkill())
-							]
+										children: [
+											/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+												className: "lm-label",
+												children: t("skillDirPath")
+											}),
+											/* @__PURE__ */ (0, react_jsx_runtime.jsx)("input", {
+												className: "lm-input",
+												value: skillDir,
+												onChange: (e) => setSkillDir(e.target.value)
+											}),
+											/* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
+												className: "lm-hint",
+												children: t("skillDirHint")
+											})
+										]
+									}),
+									editSkill === void 0 && skillRoot === "project" && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+										className: "lm-field",
+										children: [
+											/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+												className: "lm-label",
+												children: t("skillProjectPath")
+											}),
+											/* @__PURE__ */ (0, react_jsx_runtime.jsx)("input", {
+												className: "lm-input",
+												value: projectPath,
+												onChange: (e) => setProjectPath(e.target.value)
+											}),
+											/* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
+												className: "lm-hint",
+												children: t("skillProjectPathHint")
+											})
+										]
+									}),
+									renderActions(() => void submitSkill())
+								]
+							})
 						})
-					})]
+					]
 				})
 			]
 		})
@@ -6361,6 +6443,210 @@ const PROJECT_SKILL_SOURCES = /* @__PURE__ */ new Set(["project-dsh", "project-a
 */
 const ADOPTABLE_SKILL_SOURCES = /* @__PURE__ */ new Set(["user-agents", "custom"]);
 //#endregion
+//#region src/client/skillGroups.ts
+/**
+* What the capability list decides about *which* rows it shows, kept out of
+* `CapabilitySection.tsx` as pure functions.
+*
+* The split is deliberate: the grouping rules are where this plugin got its one
+* real mis-grouping (preset skills filed under 全局技能), and they are also the
+* only part of the client a test can reach — this repo has no DOM harness, so
+* anything that lives inside the component can only be checked by hand.
+*/
+/** Group tools by server name; skills stay flat (no server), both name-sorted. */
+function groupRows(rows) {
+	const byServer = /* @__PURE__ */ new Map();
+	const skills = [];
+	for (const row of rows) {
+		if (row.kind === "skill") {
+			skills.push(row);
+			continue;
+		}
+		const server = row.server ?? "built-in";
+		const list = byServer.get(server);
+		if (list === void 0) byServer.set(server, [row]);
+		else list.push(row);
+	}
+	return {
+		servers: [...byServer.entries()].map(([server, tools]) => ({
+			server,
+			tools: [...tools].sort((a, b) => a.name.localeCompare(b.name))
+		})).sort((a, b) => a.server.localeCompare(b.server)),
+		skills: [...skills].sort((a, b) => a.name.localeCompare(b.name))
+	};
+}
+/**
+* Compile the box. A `/…/` wrapper is optional — it is stripped when present, so
+* both `cordis|ptc` and `/cordis|ptc/` are read as patterns — and it keeps the
+* common case of pasting a slash-delimited pattern from working.
+*/
+function compileNameFilter(input) {
+	const raw = input.trim();
+	const needle = raw.toLowerCase();
+	if (raw === "") return {
+		needle,
+		regex: false,
+		test: () => true
+	};
+	const pattern = raw.length > 1 && raw.startsWith("/") && raw.endsWith("/") ? raw.slice(1, -1) : raw;
+	try {
+		const compiled = new RegExp(pattern, "i");
+		return {
+			needle,
+			regex: true,
+			test: (values) => values.some((v) => v !== void 0 && compiled.test(v))
+		};
+	} catch {
+		return {
+			needle,
+			regex: false,
+			test: (values) => values.some((v) => v !== void 0 && v.toLowerCase().includes(needle))
+		};
+	}
+}
+/**
+* Everything a row is matched against: its own name, plus the dimensions that
+* name the group it sits in — the MCP server (or the label the built-in group is
+* drawn with), the skill's source root, and the preset that ships it.
+*
+* Group headings are labels rather than row fields, which is exactly why typing
+* 系统 used to find nothing: the server id is `built-in`, and 系统内置 is only how
+* that id is painted. Both spellings are searchable now.
+*/
+function searchableText(row, labels = {}) {
+	const values = [row.name];
+	if (row.server !== void 0) {
+		values.push(row.server);
+		if (row.server === "built-in") values.push(labels.builtIn);
+	}
+	if (row.source !== void 0) values.push(row.source, labels.source?.(row.source));
+	values.push(row.preset);
+	return values.filter((v) => v !== void 0 && v !== "");
+}
+/**
+* Narrow a list by the filter. Applied *before* grouping so a server header's
+* own counts describe the rows actually listed under it.
+*/
+function filterRows(rows, filter, labels = {}) {
+	if (filter.needle === "") return [...rows];
+	return rows.filter((row) => filter.test(searchableText(row, labels)));
+}
+/**
+* Split skill rows across the three sub-tabs.
+*
+* Preset skills are split off by their `preset` field and never by `source`: a
+* preset's own `skill-filesystem` labels its skills `custom`, exactly like a
+* user-configured `customSkillDirs` entry, so a source-based rule drags both
+* into 全局技能 — filing a preset asset as global is precisely the mis-grouping
+* this split exists to fix. Rows keep the order they arrive in, so callers that
+* pass name-sorted rows get name-sorted groups.
+*/
+function splitSkillGroups(skills) {
+	const presetSkills = [];
+	const projectSkills = [];
+	const globalSkills = [];
+	const presetGroups = [];
+	for (const skill of skills) {
+		const preset = skill.preset;
+		if (preset !== void 0) {
+			presetSkills.push(skill);
+			const group = presetGroups.find(([id]) => id === preset);
+			if (group === void 0) presetGroups.push([preset, [skill]]);
+			else group[1].push(skill);
+			continue;
+		}
+		if (PROJECT_SKILL_SOURCES.has(skill.source ?? "")) projectSkills.push(skill);
+		else globalSkills.push(skill);
+	}
+	presetGroups.sort(([a], [b]) => a.localeCompare(b));
+	return {
+		presetSkills,
+		presetGroups,
+		projectSkills,
+		globalSkills
+	};
+}
+/** Rows in one tier. Counts the *displayed* rows, not the whole catalog. */
+function countByClass(rows, cls) {
+	return rows.reduce((n, row) => row.class === cls ? n + 1 : n, 0);
+}
+//#endregion
+//#region src/client/revalidate.ts
+/**
+* When to re-read the catalog, and how often to look — the decisions behind the
+* management page keeping itself fresh, kept as pure functions.
+*
+* Wiring lives in `CapabilitySection.tsx` (timers, the `visibilitychange`
+* listener, the two subscriptions); everything that could be got wrong lives
+* here, where a test can reach it. This repo has no DOM harness.
+*/
+/**
+* How often a visible, idle page asks the host for its catalog version.
+*
+* This is the resolution of the one case nothing on the wire announces — a file
+* dropped into an already-registered skill directory — so it doubles as "how
+* long will I stare at a stale list after an agent changes something next to
+* me". 5s keeps that from being annoying; the cost is one tiny request per tick,
+* and only while this settings page is on screen.
+*/
+const POLL_INTERVAL_MS = 5e3;
+/** Ceiling for the failure backoff, so a long outage does not spin. */
+const POLL_BACKOFF_MAX_MS = 6e4;
+/**
+* How long one version sample may take before it is treated as a failure.
+*
+* Without this, a request that neither resolves nor rejects would end the poll
+* for good: the next tick is only scheduled after the current one settles, and
+* nothing else restarts the effect while the page stays visible and idle.
+*/
+const POLL_SAMPLE_TIMEOUT_MS = 15e3;
+/**
+* Delay before the next version poll.
+*
+* `failures` is the run of consecutive failures ending at this decision: 0
+* means the last sample succeeded and the plain interval applies, otherwise the
+* delay doubles until it hits the ceiling. This is what turns "the carrier
+* died" from a hot loop into a slow retry that heals itself when it comes back.
+*/
+function pollDelayMs(failures) {
+	if (!Number.isFinite(failures) || failures <= 0) return POLL_INTERVAL_MS;
+	return Math.min(POLL_INTERVAL_MS * 2 ** failures, POLL_BACKOFF_MAX_MS);
+}
+/**
+* Whether a version sample means the catalog moved under the page.
+*
+* Deliberately `!==` rather than `>`: the counter is in-process, so it restarts
+* from zero when the plugin reloads, and a plain "greater than" test would sit
+* there believing a fresh host was the same host. `undefined` (nothing sampled
+* yet) only records — the page has just read the snapshot, and re-reading it
+* because it has no baseline would be busywork.
+*/
+function versionChanged(seen, current) {
+	return seen !== void 0 && seen !== current;
+}
+/**
+* The value of `work`, or a rejection if it has not settled within `ms`.
+*
+* Used so a carrier that accepts a request and then goes quiet degrades into
+* the same retry path as a carrier that refuses one.
+*/
+function withDeadline(work, ms) {
+	return new Promise((resolve, reject) => {
+		const timer = setTimeout(() => reject(/* @__PURE__ */ new Error(`timed out after ${ms}ms`)), ms);
+		work.then((value) => {
+			clearTimeout(timer);
+			resolve(value);
+		}, (error) => {
+			clearTimeout(timer);
+			reject(error);
+		});
+	});
+}
+/** Whether a signal may act now, or has to be parked until the page is idle. */
+function canRevalidate(gate) {
+	return gate.visible && gate.ready && !gate.busy && !gate.rebuilding;
+}
+//#endregion
 //#region src/client/CapabilitySection.tsx
 /**
 * ⚠️ VERIFIED AGAINST REAL rc.8 CLIENT API.
@@ -6382,6 +6668,8 @@ const ADOPTABLE_SKILL_SOURCES = /* @__PURE__ */ new Set(["user-agents", "custom"
 *                       with flat skill rows carrying the same clickable class
 *                       chip plus a directory tree / file preview
 */
+const chevronIcons = _deepseek_ai_dsh_client_ui_primitives;
+const IconTriangleRightFill = chevronIcons.IconTriangleRightFillMedium ?? chevronIcons.IconTriangleRightFill14;
 const CLASS_KEYS = [
 	"resident",
 	"on-demand",
@@ -6404,14 +6692,25 @@ const CSS_ID = "capability-menu-section-css";
 const CSS = `
 .mc-section{display:flex;flex-direction:column;gap:12px;color:var(--dsw-alias-label-primary)}
 .mc-heading{margin:0;font-size:18px;font-weight:600}
+.mc-heading-row{display:flex;align-items:baseline;gap:8px;min-width:0;flex-wrap:wrap}
+.mc-heading-meta{display:flex;align-items:baseline;gap:8px;min-width:0}
+.mc-feedback-link{margin-left:auto;flex:none;color:var(--dsw-alias-label-secondary);font-size:12px;line-height:20px;white-space:nowrap;text-decoration:none}
+.mc-feedback-link:hover,.mc-feedback-link:focus-visible{color:#527a9c;text-decoration:underline;text-underline-offset:3px}
+.mc-feedback-link:focus-visible{outline:2px solid #527a9c;outline-offset:2px;border-radius:2px}
+body[data-ds-dark-theme] .mc-feedback-link:hover,body[data-ds-dark-theme] .mc-feedback-link:focus-visible{color:#96b6d1}
+body[data-ds-dark-theme] .mc-feedback-link:focus-visible{outline-color:#96b6d1}
+.mc-package-name{color:var(--dsw-alias-label-tertiary);font-size:12px;line-height:20px}
 .mc-desc{margin:0;color:var(--dsw-alias-label-tertiary);font-size:13px}
 /* 说明行右侧放只读文档入口：把它从头部的计数行挪出来，计数多（Tools 常驻 ·
    167）时那一行不再因此折行。 */
 .mc-desc-row{display:flex;align-items:center;justify-content:space-between;gap:12px}
 .mc-desc-row .mc-desc{flex:1 1 auto;min-width:0}
+.mc-version{flex:none;color:var(--dsw-alias-label-tertiary);font-size:12px;line-height:20px;white-space:nowrap}
 .mc-summary{display:flex;gap:12px;flex-wrap:wrap;justify-content:flex-end;align-items:center;padding-bottom:8px}
 .mc-catalog-btn{border:1px solid var(--dsw-alias-border-l2);border-radius:6px;background:var(--dsw-alias-bg-layer-1);color:var(--dsw-alias-label-secondary);font:inherit;font-size:12px;line-height:20px;padding:0 10px;cursor:pointer;white-space:nowrap}
 .mc-catalog-btn:hover{border-color:var(--dsw-alias-border-l3);background:var(--dsw-alias-interactive-bg-hover)}
+/* 忙碌态靠变淡表示，而不是换文案：换文案会改按钮宽度，把这行挤到第二行。 */
+.mc-catalog-btn:disabled{cursor:default;opacity:.6}
 .mc-catalog-tabs{padding:8px 16px 0}
 .mc-catalog-path{padding:8px 16px 0;margin:0;font-size:12px;line-height:18px;color:var(--dsw-alias-label-tertiary);word-break:break-all}
 .mc-chip{display:inline-flex;align-items:center;gap:6px;font-size:12px;line-height:20px;white-space:nowrap}
@@ -6435,6 +6734,15 @@ body[data-ds-dark-theme] .mc-chip--resident{color:#96b6d1}
 body[data-ds-dark-theme] .mc-chip--on-demand{color:#d4b26b}
 body[data-ds-dark-theme] .mc-chip--disabled{color:#b8abad}
 .mc-tabs{border-bottom:1px solid var(--dsw-alias-border-l2);display:flex;align-items:flex-end;justify-content:space-between;gap:22px}
+/* 名字过滤框：两个 tab 共用一条，宽度占满，与下方列表左对齐。
+   它属于上面的主 tab 栏，不属于下面的列表，所以两侧都把 .mc-section 的 12px
+   栏距收掉一部分：下划线—6px—输入框—8px—全局/项目 子页签文字（后者里的 4px
+   是子页签自己的 padding-top）。改之前是 12+12=24px 和 12+4=16px，读起来像
+   两个不相干的块。 */
+.mc-filter{display:flex;padding-top:0;margin-top:-6px;margin-bottom:-8px}
+.mc-filter input{box-sizing:border-box;width:100%;min-width:0;padding:6px 10px;border:1px solid var(--dsw-alias-border-l2);border-radius:6px;background:var(--dsw-alias-bg-layer-1);color:inherit;font:inherit;font-size:13px;line-height:18px}
+.mc-filter input:hover{border-color:var(--dsw-alias-border-l3)}
+.mc-filter input:focus-visible{outline:2px solid var(--dsw-alias-state-business-primary);outline-offset:1px;border-color:transparent}
 /* Skills sub-tab bar (全局技能/项目技能): same underline chrome, no right-side summary. */
 .mc-subtabs{border-bottom:1px solid var(--dsw-alias-border-l2);display:flex;align-items:flex-end;gap:22px}
 .mc-tab-group{display:flex;align-items:flex-end;gap:22px}
@@ -6442,13 +6750,17 @@ body[data-ds-dark-theme] .mc-chip--disabled{color:#b8abad}
 .mc-tab:hover,.mc-tab[data-active=true]{color:var(--dsw-alias-label-primary)}
 .mc-tab[data-active=true]:after,.mc-tab:focus-visible:after{background:var(--dsw-alias-label-primary);content:"";border-radius:2px 2px 0 0;height:2px;position:absolute;bottom:-1px;left:0;right:0}
 .mc-tab:focus-visible{outline:2px solid var(--dsw-alias-state-business-primary);outline-offset:2px;color:var(--dsw-alias-label-primary);border-radius:2px}
-.mc-panel{min-width:0;padding-top:12px}
-/* Skills panel: its first row is the 全局技能/项目技能 sub-tab bar, which sits
-   directly under the main tab bar. It is a second level of the same control, so
-   the two bars have to read as one stack: no panel padding at all, and the
-   sub-tabs keep a token top padding instead of the 7px they share with the
-   primary tabs. Together the label sits ~13px under the main label rather than
-   ~20px, with the main bar's rule between them. */
+/* 面板的第一行必须和另一个 tab 的第一行从过滤框下沿出发走同样远，否则切 tab 时
+   首行会跳一下。这里留 4px，加上 .mc-section 的 4px 栏距（过滤框那侧被 -8px 收
+   掉后剩 4px）= 8px，正好是 Skills 面板子页签文字的位置（4px 栏距 + 子页签自己
+   的 4px padding-top）。原来这里是 12px，Tools 的首个分组因此落在过滤框下 16px
+   处，比「全局技能」那行低一半。 */
+.mc-panel{min-width:0;padding-top:4px}
+/* Skills panel: its first row is the 全局技能/项目技能 sub-tab bar, and that bar
+   belongs to the header stack above it (rule → name filter → sub-tabs) rather
+   than to the list below. So the panel adds no padding of its own, and the
+   sub-tab labels keep a 4px top padding instead of the 7px they share with the
+   primary tabs. */
 .mc-panel--tight{padding-top:0}
 .mc-panel--tight .mc-subtabs .mc-tab{padding-top:4px}
 .mc-panel-inner{display:flex;flex-direction:column;gap:14px}
@@ -6490,7 +6802,7 @@ body[data-ds-dark-theme] .mc-count--disabled{color:#b8abad}
 .mc-error p{margin:0}
 .mc-error p.mc-error-hint{margin-top:8px;color:var(--dsw-alias-label-secondary);font-size:12px;line-height:18px}
 .mc-error-actions{display:flex;justify-content:flex-end;margin-top:10px}
-.mc-notice{padding:10px 12px;border:1px solid var(--dsw-alias-border-l2);border-radius:8px;color:var(--dsw-alias-label-secondary);font-size:13px}
+.mc-notice{display:flex;align-items:center;justify-content:space-between;gap:12px;padding:10px 12px;border:1px solid var(--dsw-alias-border-l2);border-radius:8px;color:var(--dsw-alias-label-secondary);font-size:13px}
 .mc-skill{border:1px solid var(--dsw-alias-border-l2);border-radius:8px;overflow:hidden;background:var(--dsw-alias-bg-layer-1)}
 .mc-skill-row{box-sizing:border-box;display:flex;align-items:center;gap:10px;width:100%;min-width:0;padding:10px 12px;background:0 0;border:0;color:inherit;font:inherit;text-align:left;cursor:pointer}
 .mc-skill-row:hover{background:var(--dsw-alias-interactive-bg-hover)}
@@ -6508,6 +6820,9 @@ body[data-ds-dark-theme] .mc-count--disabled{color:#b8abad}
 .mc-confirm-path{font-family:var(--dsw-font-markdown-code-block-font-family);word-break:break-all}
 .mc-confirm-actions{display:flex;justify-content:flex-end;gap:8px}
 .mc-skill-body{border-top:1px solid var(--dsw-alias-border-l1);padding:8px 12px 12px}
+/* 预设技能组：预设 id 是页签之下的分组小标题，不是新一级页签。 */
+.mc-skill-group{display:flex;flex-direction:column;gap:8px;min-width:0}
+.mc-skill-group-title{font-size:12px;line-height:18px;font-weight:600;color:var(--dsw-alias-label-secondary);padding:0 2px}
 .mc-tree{display:flex;flex-direction:column;gap:2px;font-size:13px;line-height:20px}
 .mc-tree-row{display:flex;align-items:center;gap:8px;padding:3px 4px;border-radius:6px;cursor:pointer;min-width:0}
 .mc-tree-row:hover{background:var(--dsw-alias-interactive-bg-hover)}
@@ -6521,7 +6836,13 @@ body[data-ds-dark-theme] .mc-count--disabled{color:#b8abad}
 .mc-preview-title{font-size:13px;line-height:20px;font-weight:600;min-width:0;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;flex:1}
 .mc-preview-close{flex:none;padding:2px 8px;border:1px solid var(--dsw-alias-border-l2);border-radius:6px;background:var(--dsw-alias-bg-layer-1);color:var(--dsw-alias-label-secondary);font:inherit;font-size:12px;cursor:pointer}
 .mc-preview-close:hover{background:var(--dsw-alias-interactive-bg-hover)}
-.mc-preview-body{overflow:auto;flex:1 1 auto;min-height:0;padding:14px 16px;font-family:var(--dsw-font-markdown-code-block-font-family);font-size:12px;line-height:20px;white-space:pre-wrap;word-break:break-all;color:var(--dsw-alias-label-primary)}
+.mc-preview-body{overflow:auto;flex:1 1 auto;min-height:0;padding:14px 16px;color:var(--dsw-alias-label-primary)}
+.mc-preview-body>pre,.mc-preview-plain{margin:0;font-family:var(--dsw-font-markdown-code-block-font-family);font-size:12px;line-height:20px;white-space:pre-wrap;overflow-wrap:anywhere}
+.mc-tool-description{padding-bottom:12px;margin-bottom:12px;border-bottom:1px solid var(--dsw-alias-border-l1)}
+.mc-frontmatter{width:100%;margin:0 0 20px;border-collapse:collapse;table-layout:fixed;font-size:13px;line-height:20px}
+.mc-frontmatter th,.mc-frontmatter td{padding:8px 10px;border-bottom:1px solid var(--dsw-alias-border-l1);vertical-align:top;text-align:left}
+.mc-frontmatter th{width:130px;font-weight:500;color:var(--dsw-alias-label-secondary)}
+.mc-frontmatter td{color:var(--dsw-alias-label-primary);overflow-wrap:anywhere;white-space:pre-wrap}
 .mc-preview-hint{padding:16px;text-align:center;font-size:13px;color:var(--dsw-alias-label-tertiary)}
 `;
 if (typeof document !== "undefined" && document.querySelector(`style[data-css-id="${CSS_ID}"]`) === null) {
@@ -6530,6 +6851,78 @@ if (typeof document !== "undefined" && document.querySelector(`style[data-css-id
 	tag.textContent = CSS;
 	document.head.appendChild(tag);
 }
+/** Reuse dsh's safe Markdown renderer in tool descriptions and skill files. */
+function MarkdownPreview(props) {
+	const { text, t } = props;
+	return /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.MarkdownText, {
+		text,
+		labels: {
+			code: {
+				copyLabel: t("markdownCopy"),
+				copiedLabel: t("markdownCopied"),
+				toolbarLabels: {
+					codeLabel: t("markdownCode"),
+					wrapLabel: t("markdownWrap"),
+					unwrapLabel: t("markdownUnwrap")
+				}
+			},
+			footnotes: t("markdownFootnotes")
+		}
+	});
+}
+/** Parse the simple property lines shown by GitHub above a Markdown document. */
+function parseFrontmatterProperties(source) {
+	const properties = [];
+	for (const line of source.split(/\r?\n/)) {
+		const field = /^([A-Za-z0-9_.-]+):(?:[ \t]*(.*))?$/.exec(line);
+		if (field !== null) {
+			properties.push({
+				name: field[1],
+				value: field[2] ?? ""
+			});
+			continue;
+		}
+		const continuation = /^\s+(.+)$/.exec(line);
+		if (continuation !== null && properties.length > 0) {
+			const last = properties[properties.length - 1];
+			last.value = last.value.length === 0 ? continuation[1] : `${last.value}\n${continuation[1]}`;
+		}
+	}
+	return properties.map((property) => ({
+		...property,
+		value: property.value.trimEnd()
+	}));
+}
+/** Split YAML properties from the Markdown body. */
+function splitMarkdownFrontmatter(text) {
+	const match = /^---[ \t]*\r?\n([\s\S]*?)\r?\n---[ \t]*(?:\r?\n|$)/.exec(text);
+	if (match === null) return { body: text };
+	return {
+		frontmatter: parseFrontmatterProperties(match[1] ?? ""),
+		body: text.slice(match[0].length)
+	};
+}
+function MarkdownFilePreview(props) {
+	const { frontmatter, body } = splitMarkdownFrontmatter(props.text);
+	return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [frontmatter !== void 0 && frontmatter.length > 0 && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("table", {
+		className: "mc-frontmatter",
+		children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)("tbody", { children: frontmatter.map((property) => /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("tr", { children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("th", {
+			scope: "row",
+			children: property.name
+		}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("td", { children: property.value })] }, property.name)) })
+	}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)(MarkdownPreview, {
+		text: body,
+		t: props.t
+	})] });
+}
+/**
+* Which build of the plugin is on screen. Several rounds of "is my profile
+* running the version I just installed?" had to be answered by grepping
+* `node_modules`, because the panel said nothing about itself. The value is
+* inlined by `tsdown` (see `src/client/env.d.ts`).
+*/
+const PLUGIN_VERSION = "0.1.5";
+const PLUGIN_TITLE = `capability-menu v${PLUGIN_VERSION}`;
 /**
 * dsh's skill source labels, shown on rows this plugin cannot edit — so "why is
 * there no 编辑 button" has a visible answer. Labels that name one directory are
@@ -6555,32 +6948,22 @@ function sourceLabel(source, t) {
 	const key = SOURCE_LABEL_KEYS[source];
 	return key === void 0 ? source : t(key);
 }
-function groupRows(rows) {
-	const byServer = /* @__PURE__ */ new Map();
-	const skills = [];
-	for (const row of rows) {
-		if (row.kind === "skill") {
-			skills.push(row);
-			continue;
-		}
-		const server = row.server ?? "built-in";
-		const list = byServer.get(server);
-		if (list === void 0) byServer.set(server, [row]);
-		else list.push(row);
-	}
-	return {
-		servers: [...byServer.entries()].map(([server, tools]) => ({
-			server,
-			tools: [...tools].sort((a, b) => a.name.localeCompare(b.name))
-		})).sort((a, b) => a.server.localeCompare(b.server)),
-		skills: [...skills].sort((a, b) => a.name.localeCompare(b.name))
-	};
-}
-function countByClass(rows, cls) {
-	return rows.reduce((n, row) => row.class === cls ? n + 1 : n, 0);
+/**
+* Whether the document is visible. A hidden settings tab does no polling and
+* takes no re-reads; coming back is itself a revalidation trigger.
+*/
+function useDocumentVisible() {
+	const [visible, setVisible] = (0, react.useState)(true);
+	(0, react.useEffect)(() => {
+		const update = () => setVisible(document.visibilityState !== "hidden");
+		update();
+		document.addEventListener("visibilitychange", update);
+		return () => document.removeEventListener("visibilitychange", update);
+	}, []);
+	return visible;
 }
 function CapabilitySection(props) {
-	const { remote, t, mountError } = props;
+	const { remote, t, mountError, subscribeSignals } = props;
 	const [state, setState] = (0, react.useState)(() => {
 		const cached = cachedSnapshot();
 		return cached === void 0 ? { status: "loading" } : {
@@ -6590,6 +6973,8 @@ function CapabilitySection(props) {
 	});
 	const [busy, setBusy] = (0, react.useState)(false);
 	const [notice, setNotice] = (0, react.useState)(null);
+	const [retryMcp, setRetryMcp] = (0, react.useState)(null);
+	const queuedMcpRefresh = (0, react.useRef)(null);
 	const [openServers, setOpenServers] = (0, react.useState)(/* @__PURE__ */ new Set());
 	const [activeTab, setActiveTab] = (0, react.useState)("tools");
 	const reload = (0, react.useCallback)(async () => {
@@ -6625,6 +7010,7 @@ function CapabilitySection(props) {
 	const refreshCatalog = (0, react.useCallback)(async () => {
 		if (refreshing) return;
 		setRefreshing(true);
+		setRetryMcp(null);
 		try {
 			if (remote !== void 0) unwrap(await remote.refresh(), "capabilityPolicy.refresh");
 			await reload();
@@ -6641,6 +7027,61 @@ function CapabilitySection(props) {
 		reload,
 		t
 	]);
+	/**
+	* A new MCP row is persisted before dsh applies it and registers its tools.
+	* Wait for that asynchronous host reload instead of taking one snapshot too
+	* early and requiring the operator to leave and reopen this settings page.
+	*/
+	const refreshRegisteredMcp = (0, react.useCallback)(async (serverName) => {
+		if (refreshing) {
+			queuedMcpRefresh.current = serverName;
+			return;
+		}
+		if (remote === void 0) return;
+		setRefreshing(true);
+		setRetryMcp(null);
+		try {
+			unwrap(await remote.refresh(), "capabilityPolicy.refresh");
+			const snapshot = await waitForMcpTools(remote, serverName, [
+				250,
+				500,
+				750,
+				1e3,
+				1e3,
+				1e3,
+				1e3,
+				1e3,
+				1e3
+			]);
+			if (snapshot !== void 0) {
+				setState({
+					status: "ready",
+					snapshot: rememberSnapshot(snapshot)
+				});
+				setNotice(null);
+				setRetryMcp(null);
+			} else {
+				setNotice(t("mcpToolsPending", { name: serverName }));
+				setRetryMcp(serverName);
+			}
+		} catch (e) {
+			console.error("[capability-menu] MCP refresh failed:", e);
+			setNotice(t("refreshFailed"));
+			setRetryMcp(serverName);
+		} finally {
+			setRefreshing(false);
+		}
+	}, [
+		refreshing,
+		remote,
+		t
+	]);
+	(0, react.useEffect)(() => {
+		if (refreshing || queuedMcpRefresh.current === null) return;
+		const serverName = queuedMcpRefresh.current;
+		queuedMcpRefresh.current = null;
+		refreshRegisteredMcp(serverName);
+	}, [refreshing, refreshRegisteredMcp]);
 	const toggleServer = (0, react.useCallback)((server) => {
 		setOpenServers((prev) => {
 			const next = new Set(prev);
@@ -6649,6 +7090,84 @@ function CapabilitySection(props) {
 			return next;
 		});
 	}, []);
+	const visible = useDocumentVisible();
+	const [pendingSignal, setPendingSignal] = (0, react.useState)(false);
+	const seenVersion = (0, react.useRef)(void 0);
+	const pollFailures = (0, react.useRef)(0);
+	const gate = (0, react.useRef)({
+		visible: true,
+		ready: false,
+		busy: false,
+		rebuilding: false
+	});
+	(0, react.useEffect)(() => {
+		gate.current = {
+			visible,
+			ready: state.status === "ready",
+			busy,
+			rebuilding: refreshing
+		};
+	});
+	/**
+	* A signal that the host catalog may have moved. Runs now when the page is
+	* idle; otherwise parks until it is, so a signal that lands mid-click is
+	* never dropped (and never repaints the row under the cursor).
+	*/
+	const onExternalSignal = (0, react.useCallback)(() => {
+		if (canRevalidate(gate.current)) refreshCatalog();
+		else setPendingSignal(true);
+	}, [refreshCatalog]);
+	(0, react.useEffect)(() => {
+		return subscribeSignals?.(onExternalSignal);
+	}, [subscribeSignals, onExternalSignal]);
+	(0, react.useEffect)(() => {
+		if (!pendingSignal) return;
+		if (!canRevalidate({
+			visible,
+			ready: state.status === "ready",
+			busy,
+			rebuilding: refreshing
+		})) return;
+		setPendingSignal(false);
+		refreshCatalog();
+	}, [
+		pendingSignal,
+		visible,
+		state.status,
+		busy,
+		refreshing,
+		refreshCatalog
+	]);
+	(0, react.useEffect)(() => {
+		if (!visible || state.status !== "ready" || busy || refreshing) return;
+		let stopped = false;
+		let timer;
+		const tick = async () => {
+			try {
+				const version = unwrap(await withDeadline(remote.catalogVersion(), POLL_SAMPLE_TIMEOUT_MS), "capabilityPolicy.catalogVersion");
+				pollFailures.current = 0;
+				if (versionChanged(seenVersion.current, version)) {
+					seenVersion.current = version;
+					await reload();
+				}
+			} catch {
+				pollFailures.current += 1;
+			}
+			if (!stopped) timer = setTimeout(() => void tick(), pollDelayMs(pollFailures.current));
+		};
+		timer = setTimeout(() => void tick(), 0);
+		return () => {
+			stopped = true;
+			if (timer !== void 0) clearTimeout(timer);
+		};
+	}, [
+		visible,
+		state.status,
+		busy,
+		refreshing,
+		remote,
+		reload
+	]);
 	/** Move one or more capability ids to the next class in the click cycle. */
 	const cycleClass = (0, react.useCallback)(async (ids, kind) => {
 		if (ids.length === 0 || busy) return;
@@ -6729,9 +7248,15 @@ function CapabilitySection(props) {
 					})
 				]
 			}),
-			notice !== null && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
+			notice !== null && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 				className: "mc-notice",
-				children: notice
+				children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", { children: notice }), retryMcp !== null && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
+					type: "button",
+					className: "mc-catalog-btn",
+					disabled: refreshing,
+					onClick: () => void refreshRegisteredMcp(retryMcp),
+					children: t("retry")
+				})]
 			}),
 			state.status === "ready" && /* @__PURE__ */ (0, react_jsx_runtime.jsx)(ReadyBody, {
 				remote,
@@ -6744,19 +7269,26 @@ function CapabilitySection(props) {
 				onToggleServer: toggleServer,
 				onCycle: cycleClass,
 				onRefresh: () => void refreshCatalog(),
-				refreshing,
+				onRefreshMcp: (serverName) => void refreshRegisteredMcp(serverName),
 				onNotice: setNotice
 			})
 		]
 	});
 }
 function ReadyBody(props) {
-	const { remote, snapshot, openServers, busy, activeTab, t, onTabChange, onToggleServer, onCycle, onRefresh, refreshing, onNotice } = props;
-	const { servers, skills } = groupRows(snapshot.rows);
-	const projectSkills = skills.filter((skill) => PROJECT_SKILL_SOURCES.has(skill.source ?? ""));
-	const globalSkills = skills.filter((skill) => !PROJECT_SKILL_SOURCES.has(skill.source ?? ""));
+	const { remote, snapshot, openServers, busy, activeTab, t, onTabChange, onToggleServer, onCycle, onRefresh, onRefreshMcp, onNotice } = props;
+	/** Name filter, shared by both tabs: it narrows whichever list is shown. */
+	const [filter, setFilter] = (0, react.useState)("");
+	const nameFilter = compileNameFilter(filter);
+	const needle = nameFilter.needle;
+	const shownRows = filterRows(snapshot.rows, nameFilter, {
+		builtIn: t("builtInGroup"),
+		source: (source) => sourceLabel(source, t)
+	});
+	const { servers, skills } = groupRows(shownRows);
+	const { presetSkills, presetGroups, projectSkills, globalSkills } = splitSkillGroups(skills);
 	const [skillTab, setSkillTab] = (0, react.useState)("global");
-	const statRows = activeTab === "tools" ? snapshot.rows.filter((r) => r.kind === "tool") : skillTab === "project" ? projectSkills : globalSkills;
+	const statRows = activeTab === "tools" ? shownRows.filter((r) => r.kind === "tool") : skillTab === "project" ? projectSkills : skillTab === "preset" ? presetSkills : globalSkills;
 	const summary = CLASS_KEYS.map((cls) => ({
 		cls,
 		count: countByClass(statRows, cls)
@@ -6895,9 +7427,33 @@ function ReadyBody(props) {
 		}
 	}, [remote]);
 	return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [
-		/* @__PURE__ */ (0, react_jsx_runtime.jsx)("h2", {
-			className: "mc-heading",
-			children: t("title")
+		/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+			className: "mc-heading-row",
+			children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+				className: "mc-heading-meta",
+				children: [
+					/* @__PURE__ */ (0, react_jsx_runtime.jsx)("h2", {
+						className: "mc-heading",
+						children: t("title")
+					}),
+					/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+						className: "mc-package-name",
+						children: t("packageName")
+					}),
+					/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", {
+						className: "mc-version",
+						title: PLUGIN_TITLE,
+						children: ["v", PLUGIN_VERSION]
+					})
+				]
+			}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("a", {
+				className: "mc-feedback-link",
+				href: "https://github.com/PKUfudawei/dsh-capability-menu",
+				target: "_blank",
+				rel: "noopener noreferrer",
+				"aria-label": t("feedback"),
+				children: t("feedback")
+			})]
 		}),
 		/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 			className: "mc-desc-row",
@@ -6936,35 +7492,36 @@ function ReadyBody(props) {
 				})]
 			}), /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 				className: "mc-summary",
-				children: [
-					summary.map(({ cls, count }) => /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", {
-						className: `mc-chip mc-chip--${cls}`,
-						children: [
-							/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
-								className: `mc-dot mc-dot--${cls}`,
-								"aria-hidden": "true"
-							}),
-							t(CLASS_SHORT_KEYS[cls]),
-							" · ",
-							count
-						]
-					}, cls)),
-					/* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
-						type: "button",
-						className: "mc-catalog-btn",
-						onClick: () => onRefresh(),
-						disabled: refreshing,
-						children: refreshing ? t("refreshing") : t("refresh")
-					}),
-					/* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
-						type: "button",
-						className: "mc-catalog-btn",
-						onClick: () => setRegisterOpen(true),
-						children: t("registerCapability")
-					})
-				]
+				children: [summary.map(({ cls, count }) => /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", {
+					className: `mc-chip mc-chip--${cls}`,
+					children: [
+						/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+							className: `mc-dot mc-dot--${cls}`,
+							"aria-hidden": "true"
+						}),
+						t(CLASS_SHORT_KEYS[cls]),
+						" · ",
+						count
+					]
+				}, cls)), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
+					type: "button",
+					className: "mc-catalog-btn",
+					onClick: () => setRegisterOpen(true),
+					children: t("registerCapability")
+				})]
 			})]
 		}),
+		snapshot.rows.length > 0 && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
+			className: "mc-filter",
+			children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)("input", {
+				type: "search",
+				value: filter,
+				placeholder: t("filterByName"),
+				"aria-label": t("filterByName"),
+				title: t("filterHint"),
+				onChange: (e) => setFilter(e.target.value)
+			})
+		}),
 		/* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
 			role: "tabpanel",
 			hidden: activeTab !== "tools",
@@ -6973,7 +7530,7 @@ function ReadyBody(props) {
 				className: "mc-panel-inner",
 				children: servers.length === 0 ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
 					className: "mc-empty",
-					children: t("emptyTools")
+					children: needle === "" ? t("emptyTools") : t("filterNoMatch")
 				}) : /* @__PURE__ */ (0, react_jsx_runtime.jsx)(react_jsx_runtime.Fragment, { children: servers.map(({ server, tools }) => {
 					const open = openServers.has(server);
 					const counts = CLASS_KEYS.map((cls) => ({
@@ -6995,7 +7552,7 @@ function ReadyBody(props) {
 								}
 							},
 							children: [
-								/* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconTriangleRightFill14, {
+								/* @__PURE__ */ (0, react_jsx_runtime.jsx)(IconTriangleRightFill, {
 									size: 12,
 									className: `mc-chevron${open ? " mc-chevron--open" : ""}`
 								}),
@@ -7090,35 +7647,47 @@ function ReadyBody(props) {
 		/* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
 			role: "tabpanel",
 			hidden: activeTab !== "skills",
-			className: "mc-panel mc-panel--tight",
+			className: `mc-panel${skills.length > 0 ? " mc-panel--tight" : ""}`,
 			children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
 				className: "mc-panel-inner",
 				children: skills.length === 0 ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
 					className: "mc-empty",
-					children: t("emptySkills")
+					children: needle === "" ? t("emptySkills") : t("filterNoMatch")
 				}) : /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
 					className: "mc-subtabs",
 					children: /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 						className: "mc-tab-group",
 						role: "tablist",
 						"aria-label": t("skillsGroup"),
-						children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
-							type: "button",
-							role: "tab",
-							className: "mc-tab",
-							"aria-selected": skillTab === "global",
-							"data-active": skillTab === "global" ? "true" : void 0,
-							onClick: () => setSkillTab("global"),
-							children: t("globalSkills")
-						}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
-							type: "button",
-							role: "tab",
-							className: "mc-tab",
-							"aria-selected": skillTab === "project",
-							"data-active": skillTab === "project" ? "true" : void 0,
-							onClick: () => setSkillTab("project"),
-							children: t("projectSkills")
-						})]
+						children: [
+							/* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
+								type: "button",
+								role: "tab",
+								className: "mc-tab",
+								"aria-selected": skillTab === "global",
+								"data-active": skillTab === "global" ? "true" : void 0,
+								onClick: () => setSkillTab("global"),
+								children: t("globalSkills")
+							}),
+							/* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
+								type: "button",
+								role: "tab",
+								className: "mc-tab",
+								"aria-selected": skillTab === "project",
+								"data-active": skillTab === "project" ? "true" : void 0,
+								onClick: () => setSkillTab("project"),
+								children: t("projectSkills")
+							}),
+							/* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
+								type: "button",
+								role: "tab",
+								className: "mc-tab",
+								"aria-selected": skillTab === "preset",
+								"data-active": skillTab === "preset" ? "true" : void 0,
+								onClick: () => setSkillTab("preset"),
+								children: t("presetSkills")
+							})
+						]
 					})
 				}), skillTab === "global" ? globalSkills.length > 0 ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)(SkillList, {
 					skills: globalSkills,
@@ -7132,7 +7701,7 @@ function ReadyBody(props) {
 				}) : /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
 					className: "mc-empty",
 					children: t("emptyGlobalSkills")
-				}) : projectSkills.length > 0 ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)(SkillList, {
+				}) : skillTab === "project" ? projectSkills.length > 0 ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)(SkillList, {
 					skills: projectSkills,
 					remote,
 					busy,
@@ -7144,6 +7713,24 @@ function ReadyBody(props) {
 				}) : /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
 					className: "mc-empty",
 					children: t("emptyProjectSkills")
+				}) : presetGroups.length > 0 ? presetGroups.map(([preset, group]) => /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+					className: "mc-skill-group",
+					children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
+						className: "mc-skill-group-title",
+						children: preset
+					}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)(SkillList, {
+						skills: group,
+						remote,
+						busy,
+						t,
+						onCycle,
+						editableSkills,
+						onEditSkill: openSkillEdit,
+						onAdoptSkill: adoptSkill
+					})]
+				}, preset)) : /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
+					className: "mc-empty",
+					children: t("emptyPresetSkills")
 				})] })
 			})
 		}),
@@ -7174,16 +7761,24 @@ function ReadyBody(props) {
 						className: "mc-preview-hint",
 						children: toolDetail.message
 					}),
-					toolDetail.status === "ready" && toolDetail.detail !== void 0 && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("pre", {
+					toolDetail.status === "ready" && toolDetail.detail !== void 0 && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 						className: "mc-preview-body",
-						children: JSON.stringify({
-							type: "function",
-							function: {
-								name: toolDetail.detail.name,
-								description: toolDetail.detail.description,
-								parameters: toolDetail.detail.parameters
-							}
-						}, null, 2)
+						children: [toolDetail.detail.description.length > 0 && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
+							className: "mc-tool-description",
+							children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(MarkdownPreview, {
+								text: toolDetail.detail.description,
+								t
+							})
+						}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("pre", {
+							className: "mc-preview-plain",
+							children: JSON.stringify({
+								type: "function",
+								function: {
+									name: toolDetail.detail.name,
+									parameters: toolDetail.detail.parameters
+								}
+							}, null, 2)
+						})]
 					})
 				]
 			})
@@ -7199,8 +7794,9 @@ function ReadyBody(props) {
 				setEditMcp(void 0);
 				setEditSkill(void 0);
 			},
-			onChanged: (notice) => {
-				onRefresh();
+			onChanged: (notice, refreshMcpServer) => {
+				if (refreshMcpServer !== void 0) onRefreshMcp(refreshMcpServer);
+				else onRefresh();
 				if (notice !== void 0) onNotice(notice);
 			}
 		}),
@@ -7405,7 +8001,7 @@ function SkillList(props) {
 						}),
 						/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
 							className: "mc-tree-icon",
-							children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconTriangleRightFill14, {
+							children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(IconTriangleRightFill, {
 								size: 10,
 								className: `mc-chevron${open ? " mc-chevron--open" : ""}`
 							})
@@ -7469,7 +8065,7 @@ function SkillList(props) {
 						}
 					},
 					children: [
-						/* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconTriangleRightFill14, {
+						/* @__PURE__ */ (0, react_jsx_runtime.jsx)(IconTriangleRightFill, {
 							size: 12,
 							className: `mc-chevron${open ? " mc-chevron--open" : ""}`
 						}),
@@ -7498,7 +8094,11 @@ function SkillList(props) {
 										"aria-hidden": "true"
 									}), t(CLASS_SHORT_KEYS[skill.class])]
 								}),
-								!editableSkills.has(skill.id) && (ADOPTABLE_SKILL_SOURCES.has(skill.source ?? "") ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
+								!editableSkills.has(skill.id) && (skill.preset !== void 0 ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+									className: "mc-source",
+									title: t("skillFromPresetHint"),
+									children: t("skillFromPreset", { preset: skill.preset })
+								}) : ADOPTABLE_SKILL_SOURCES.has(skill.source ?? "") ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
 									type: "button",
 									className: "mc-count mc-count--action",
 									disabled: busy,
@@ -7597,9 +8197,15 @@ function SkillList(props) {
 						onClick: () => setPreview(null),
 						children: t("previewClose")
 					})]
-				}), preview.content !== void 0 ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("pre", {
+				}), preview.content !== void 0 ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
 					className: "mc-preview-body",
-					children: preview.content
+					children: /\.md$/i.test(preview.relPath) ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)(MarkdownFilePreview, {
+						text: preview.content,
+						t
+					}) : /* @__PURE__ */ (0, react_jsx_runtime.jsx)("pre", {
+						className: "mc-preview-plain",
+						children: preview.content
+					})
 				}) : /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
 					className: "mc-preview-hint",
 					children: preview.error ?? "…"
@@ -7626,6 +8232,8 @@ async function apply(ctx) {
 	const zh = {
 		nav: "能力菜单",
 		title: "能力菜单",
+		packageName: "capability-menu",
+		feedback: "反馈 ↗",
 		desc: "管理工具与技能的 常驻 / 按需 / 禁用 三档分类。",
 		resident: "Resident（常驻上下文）",
 		"on-demand": "On-demand（按需发现）",
@@ -7638,8 +8246,13 @@ async function apply(ctx) {
 		builtInGroup: "系统内置",
 		globalSkills: "全局技能",
 		projectSkills: "项目技能",
+		presetSkills: "预设技能",
 		emptyGlobalSkills: "暂无全局技能",
 		emptyProjectSkills: "暂无项目技能",
+		emptyPresetSkills: "暂无预设技能",
+		filterByName: "按名字、分组或正则过滤…",
+		filterHint: "忽略大小写。匹配工具/技能名、MCP server、技能来源标签与预设 id；也可以直接写正则，例如 cordis|ptc 或 /^mcp__dbx/。",
+		filterNoMatch: "没有匹配的能力（清空过滤框可恢复完整列表）",
 		emptyTools: "暂无工具",
 		emptySkills: "暂无 Skill",
 		toolCount: "{count} 个工具",
@@ -7649,11 +8262,16 @@ async function apply(ctx) {
 		cycleHint: "点击标签切换分类（按需 → 禁用 → 常驻）",
 		notPreviewable: "该文件不是可预览的文本文件",
 		previewClose: "关闭",
+		markdownCode: "代码",
+		markdownWrap: "自动换行",
+		markdownUnwrap: "不换行",
+		markdownCopy: "复制",
+		markdownCopied: "已复制",
+		markdownFootnotes: "脚注",
 		detailNotFound: "未找到该工具的详情",
 		cycleOverridden: "分类未生效：{count} 个能力被更高优先级规则覆盖（如通配规则），可移除对应通配规则后重试",
-		refresh: "刷新",
-		refreshing: "刷新中…",
 		refreshFailed: "刷新失败，请查看日志",
+		mcpToolsPending: "已注册「{name}」，但暂未加载出工具。请检查连接和认证后点刷新。",
 		retry: "重试",
 		carrierFailureHint: "请求未到达服务端：浏览器与 dsh 之间的连接已断开（Failed to fetch 属传输层失败，服务端方法未执行）。若刚重启过 dsh web，请先硬刷新页面（Ctrl/Cmd+Shift+R）再重试。",
 		registerCapability: "注册能力",
@@ -7687,20 +8305,24 @@ async function apply(ctx) {
 		skillAdopted: "已纳入管理：{path}",
 		skillSource: "来源：{source}",
 		skillSourceHint: "该技能由 dsh 从其它根发现，不在本插件管理的技能目录里，因此没有「编辑」。",
+		skillFromPreset: "来自预设 {preset}",
+		skillFromPresetHint: "该技能随 agent preset 分发，只对挂载了该预设的会话可见；不能纳入管理（那会把它软链进全局技能根，对所有会话生效）。",
+		githubImporting: "正在从 GitHub 获取并校验 Skill，完成后会自动注册…",
+		importing: "导入中…",
 		skillUnmanaged: "未纳入管理",
 		sourceCustom: "自定义技能目录",
 		sourceBundled: "随 dsh 预置",
 		adoptSkill: "纳入管理",
 		adoptSkillHint: "把它软链进 dsh 的技能根目录（默认 ~/.dsh/skills），内容不动；之后就能编辑与移除了。",
 		adoptSkillTitle: "纳入管理「{name}」？",
-		skillDirHint: "目录内需有 SKILL.md（按 dsh 的 skill 格式校验）。技能名以 SKILL.md 里声明的为准，目录名只决定注册后的软链名，两者不同也可以。",
+		skillDirHint: "支持本机目录或公开 GitHub HTTPS 技能链接。GitHub 导入会校验 SKILL.md，并只保留对应技能目录；运行 dsh 的机器需安装 Git。技能名取自 SKILL.md。",
 		serverName: "serverName",
-		serverNameImmutable: "serverName 不可修改：它构成工具名前缀 mcp__<serverName>__<tool>，并已被既有会话历史与权限规则引用；修改后这些记录将不再匹配。",
+		serverNameImmutable: "名称用于工具 ID 和权限规则，注册后不可更改。",
 		transport: "传输方式",
 		transportStdio: "stdio（本地子进程）",
 		transportHttp: "streamable-http（HTTP MCP 端点）",
 		transportHintStdio: "由客户端将该 MCP server 作为子进程启动，JSON-RPC 报文经标准输入 / 输出交换。",
-		transportHintHttp: "该 MCP server 作为独立进程运行，可服务多个客户端连接；客户端经单个支持 POST / GET 的 HTTP 端点（MCP endpoint）与其通信。",
+		transportHintHttp: "客户端通过支持 POST/GET 的 MCP 端点连接。",
 		command: "命令",
 		args: "参数（空格分隔）",
 		cwd: "工作目录",
@@ -7720,6 +8342,8 @@ async function apply(ctx) {
 	const en = {
 		nav: "Capability Management",
 		title: "Capability Management",
+		packageName: "capability-menu",
+		feedback: "Feedback ↗",
 		desc: "Manage the Resident / On-demand / Disabled classification of tools and skills.",
 		resident: "Resident",
 		"on-demand": "On-demand",
@@ -7732,8 +8356,13 @@ async function apply(ctx) {
 		builtInGroup: "System built-in",
 		globalSkills: "Global skills",
 		projectSkills: "Project skills",
+		presetSkills: "Preset skills",
 		emptyGlobalSkills: "No global skills",
 		emptyProjectSkills: "No project skills",
+		emptyPresetSkills: "No preset skills",
+		filterByName: "Filter by name, group, or regex…",
+		filterHint: "Case-insensitive. Matches tool/skill names, MCP servers, skill source labels and preset ids; a regular expression works too, e.g. cordis|ptc or /^mcp__dbx/.",
+		filterNoMatch: "No capability matches (clear the filter to see the full list)",
 		emptyTools: "No tools",
 		emptySkills: "No skills",
 		toolCount: "{count} tools",
@@ -7743,11 +8372,16 @@ async function apply(ctx) {
 		cycleHint: "Click a tag to cycle its classification (On-demand → Disabled → Resident)",
 		notPreviewable: "This file is not a previewable text file",
 		previewClose: "Close",
+		markdownCode: "Code",
+		markdownWrap: "Wrap",
+		markdownUnwrap: "Unwrap",
+		markdownCopy: "Copy",
+		markdownCopied: "Copied",
+		markdownFootnotes: "Footnotes",
 		detailNotFound: "Tool detail not found",
 		cycleOverridden: "Classification not applied: {count} capability(ies) overridden by a higher-priority rule (e.g. a wildcard). Remove the matching wildcard rule and retry.",
-		refresh: "Refresh",
-		refreshing: "Refreshing…",
 		refreshFailed: "Refresh failed; see the log",
+		mcpToolsPending: "\"{name}\" is registered, but its tools have not loaded yet. Check its connection and authentication, then refresh.",
 		retry: "Retry",
 		carrierFailureHint: "The request never reached the server: the browser connection to dsh is broken (\"Failed to fetch\" is a transport failure, so no server method ran). If dsh web was just restarted, hard-refresh the page (Ctrl/Cmd+Shift+R) and retry.",
 		registerCapability: "Register capability",
@@ -7781,20 +8415,24 @@ async function apply(ctx) {
 		skillAdopted: "Adopted: {path}",
 		skillSource: "Source: {source}",
 		skillSourceHint: "dsh found this skill in another root, not in a skill directory this plugin manages, so there is no Edit button.",
+		skillFromPreset: "From preset {preset}",
+		skillFromPresetHint: "This skill ships with an agent preset and is visible only to sessions that mount it. It cannot be adopted (adopting would link it into the global skill root, making it apply to every session).",
+		githubImporting: "Fetching and validating the Skill from GitHub… It will register automatically when complete.",
+		importing: "Importing…",
 		skillUnmanaged: "Not managed here",
 		sourceCustom: "custom skill dirs",
 		sourceBundled: "bundled with dsh",
 		adoptSkill: "Adopt",
 		adoptSkillHint: "Link it into dsh's skill root (default ~/.dsh/skills); the content is untouched, and it becomes editable and removable.",
 		adoptSkillTitle: "Adopt \"{name}\"?",
-		skillDirHint: "The directory must hold a SKILL.md in dsh's skill format. The skill name is the one declared in SKILL.md; the directory name only names the link this registers, so the two may differ.",
+		skillDirHint: "Enter a local directory or a public GitHub HTTPS skill URL. Imports validate SKILL.md and keep only the selected skill directory. Git must be installed on the machine running dsh. The skill name comes from SKILL.md.",
 		serverName: "serverName",
-		serverNameImmutable: "serverName is immutable: it forms the tool name prefix mcp__<serverName>__<tool> and is referenced by existing session history and permission rules, which stop matching once it changes.",
+		serverNameImmutable: "The name is locked after registration because tool IDs and permission rules use it.",
 		transport: "Transport",
 		transportStdio: "stdio (local subprocess)",
 		transportHttp: "streamable-http (HTTP MCP endpoint)",
 		transportHintStdio: "The client launches the MCP server as a subprocess and exchanges JSON-RPC messages over its standard input and output.",
-		transportHintHttp: "The server runs as an independent process that can handle multiple client connections; the client reaches it over a single HTTP endpoint (the MCP endpoint) supporting POST and GET.",
+		transportHintHttp: "Connect through the MCP endpoint URL (supports POST and GET).",
 		command: "Command",
 		args: "Args (space separated)",
 		cwd: "Working directory",
@@ -7824,6 +8462,7 @@ async function apply(ctx) {
 		console.error("[capability-menu] $mount failed:", error);
 	}
 	const t = ctx.locale.bind(NS);
+	installSettingsNavIcon(ctx, () => t("nav"));
 	const remote = () => {
 		try {
 			return ctx.get("remote.capabilityPolicy");
@@ -7832,10 +8471,44 @@ async function apply(ctx) {
 			return;
 		}
 	};
+	/**
+	* The two signals that say "the host catalog may have moved, and this page did
+	* not ask": a settings document edit, and a carrier reconnect.
+	*
+	* `settings/document-updated` is one of the events dsh forwards to browsers
+	* (so it arrives over the same validated channel as the remote calls) and it
+	* fires for external edits too — composition files are edited outside the
+	* browser, and nothing else on the wire announces that. `connection/reset` is
+	* the client's own reconnect signal rather than a forwarded one, which is why
+	* it is a plain local `ctx.on`; dsh's own settings sections listen to exactly
+	* this pair, including the first connection, which closes the window where a
+	* change lands between the initial read and the subscription.
+	*
+	* Neither subscription is fatal: the section falls back to its version poll.
+	*/
+	const subscribeSignals = (listener) => {
+		const disposers = [];
+		const forwarded = ctx.remote;
+		try {
+			if (typeof forwarded.$on !== "function") throw new Error("ctx.remote.$on is unavailable");
+			disposers.push(forwarded.$on("settings/document-updated", () => listener()));
+		} catch (error) {
+			console.error("[capability-menu] settings/document-updated subscription failed:", error);
+		}
+		try {
+			disposers.push(ctx.on("connection/reset", () => listener()));
+		} catch (error) {
+			console.error("[capability-menu] connection/reset subscription failed:", error);
+		}
+		return () => {
+			for (const dispose of disposers) dispose();
+		};
+	};
 	const injected = () => {
 		return {
 			remote: remote(),
 			t,
+			subscribeSignals,
 			...mountError !== void 0 ? { mountError } : {}
 		};
 	};