dsh-armory 2.4.2 → 2.4.4

package/lib/index.js

@@ -5,7 +5,7 @@ import { homedir } from "node:os";
 import { Remote, TypertRemoteService } from "@deepseek-ai/dsh-typert-protocol";
 import { interpolate } from "@deepseek-ai/cordis-plugin-loader";
 import { withFileLock, writeFileAtomic } from "@deepseek-ai/dsh-atomic-write";
-import { basename, dirname, join } from "node:path";
+import { basename, dirname, isAbsolute, join } from "node:path";
 import { fileURLToPath } from "node:url";
 import { normalizeMcpImport, readManagedMcpServers, setManagedMcpDisabled, updateManagedMcpPatch } from "./mcp-config.js";
 import { admitImportedServers } from "./import-admission.js";
@@ -14,15 +14,22 @@ import { deriveMcpPhase, formatMcpLog, sanitizeMcpLog } from "./mcp-observabilit
 import { allMcpEntries, entriesForName, projectToolSchema, revisionOf, toolInventory } from "./mcp-registry.js";
 // Skill 看板的卸载落盘点：来源白名单 + 根目录包含性 + 符号链接/根目录校验（lib/skill-remove.js）。
 import { removeSkillFromDisk } from "./skill-remove.js";
+// 工具裁缝技能账本的禁用/释放落盘点：写 SKILL.md frontmatter 的 disable-model-invocation
+// 标志（宿主 dsh-skill-filesystem 官方键），安全闸门与 skill-remove 同一套（lib/skill-disable.js）。
+import { setSkillModelInvocationOnDisk } from "./skill-disable.js";
 // Skill 看板的安装时间 + 市场原名投影（名字自建映射，lib/skill-dir-times.js）。
 import { skillInstallInfo } from "./skill-dir-times.js";
+// 系统级打开（issue #7）：headless 主机没有 xdg-open，spawn 的 ENOENT 必须有监听者，
+// 否则异步 error 事件会带走整个宿主进程（lib/system-open.js）。
+import { isAllowedExternalUrl, openSystemUrl, revealSystemPath } from "./system-open.js";
 import { WHATS_NEW } from "./whats-new.js";
 import { attachWhatsNewEnglish } from "./whats-new-en.js";
-import { probeMcpServersAuthorization, wbConnectorCatalog, wbConnectorCachedCount, wbConnectorIcon, wbConnectorPreview, wbSkillCatalog, wbSkillDetail, wbSkillInstall, wbSkillInstalled, wbSkillUninstall } from "./wb-market.js";
 // T03/R4：多市场注册表（连接器源）的宿主侧数据层。
 import { readRegistry, upsertMarketplace } from "./wb-registry.js";
 // T06/Awesome：DSH 社区插件市场（awesome-dsh-plugins）的宿主侧数据层。
 import { wbAwesomeCatalog, wbAwesomeDetail, wbAwesomeReadme, wbAwesomeUpdateCheck } from "./wb-awesome-market.js";
+// 社区 MCP：官方 MCP Registry（registry.modelcontextprotocol.io）只读取数，数据层在 lib/mcp-community.js。
+import { wbMcpCommunityList } from "./mcp-community.js";
 // 社区元信息（维护者 / 最近提交 / issue / star）：打开详情时按需查，6 小时缓存。
 import { wbRepoMeta } from "./community-meta.js";
 // npm 近 30 天下载量：插件卡片底栏的「↓N」，目录里没有这个字段，只能去 npm 统计接口取。
@@ -45,13 +52,34 @@ import {
 	saveManualToken as oauthSaveManualToken,
 	submitCallback as oauthSubmitCallback,
 } from "./mcp-oauth.js";
-import { hasTeamBridge, installExpertSkills, listExpertRecent, listExpertSkills, prepareExpertPersona, readExpertDisplayNames, readExpertPresets, recordExpertRecent, removeExpertPreset, uninstallExpertSkills, uninstallTeamMemberPersonas, wbExpertCatalog, wbExpertDetail, writeExpertPreset } from "./expert-market.js";
-import { attachPersona, detachPersona, listPersonas, reconcilePersonas } from "./session-persona.js";
+import { attachPersona, detachPersona, installPersonaRuntime, listPersonas, reconcilePersonas } from "./session-persona.js";
 // clearTextCache 的 import 已随 toolTailor 的「清空缓存」动作一起删掉（见下方 toolTailor 注释）。
 import { scanSessionLedger } from "./tool-ledger.js";
 import { evaluateEnvExpression, jsExpressionToTemplate } from "./workspace-config.js";
 import { canonicalWorkspacePath, installAgentRuntime, listWorkspaceRecords, liveWorkspaceAgentCount, projectConnectionsView, readWorkspaceConfigCached, reconcileWorkspaceConnections, reconcileWorkspaceRestricts, reconnectWorkspaceServer, withWorkspaceWrite, workspaceConnectionStatus, workspaceMountErrorsView, workspaceRestrictErrorView, workspaceScopeErrorsView, workspaceToolSchemas, writeWorkspaceConfigFile } from "./workspace-runtime.js";
 
+// ── P0-1：市场数据模块按需加载 ──────────────────────────────────────────
+// wb-market（连接器 ZIP + SkillHub）与 expert-market（专家目录）合计约 68ms 的冷导入，
+// 面板一次都没打开时纯属宿主启动成本。两者只被市场 / 专家相关 RPC 用到，因此改为
+// 首次调用时才 import。缓存的是 Promise 本身：并发首次调用共享同一次解析，不会重复加载；
+// 解析失败时清掉缓存，下次调用可重试（不会永久卡在 rejected Promise 上）。
+let marketModule = null;
+let expertModule = null;
+const loadMarket = () => {
+	marketModule ??= import("./wb-market.js").catch((error) => {
+		marketModule = null;
+		throw error;
+	});
+	return marketModule;
+};
+const loadExpert = () => {
+	expertModule ??= import("./expert-market.js").catch((error) => {
+		expertModule = null;
+		throw error;
+	});
+	return expertModule;
+};
+
 var __runInitializers = function(thisArg, initializers, value) {
 	var useValue = arguments.length > 2;
 	for (var i = 0; i < initializers.length; i++) value = useValue ? initializers[i].call(thisArg, value) : initializers[i].call(thisArg);
@@ -180,7 +208,8 @@ async function injectStoredOAuthTokens(mcpServers) {
 
 /** 解析某连接器里某 server 的授权靶点（url + 现有 headers）。 */
 async function resolveOAuthTarget(connectorId, serverName) {
-	const preview = await wbConnectorPreview(connectorId);
+	const marketApi = await loadMarket();
+	const preview = await marketApi.wbConnectorPreview(connectorId);
 	const servers = preview?.mcpServers && typeof preview.mcpServers === "object" ? preview.mcpServers : {};
 	const name = String(serverName || "").trim() || Object.keys(servers)[0] || "";
 	const rawServer = servers[name];
@@ -215,6 +244,9 @@ function resolveShellService(ctx) {
 async function openExternalUrl(ctx, url) {
 	const target = String(url || "").trim();
 	if (!target) return { opened: false, reason: "empty-url" };
+	// 协议白名单在交给宿主 shell 之前先过一遍：Electron 的 openExternal 同样能打开
+	// file: / 本地可执行文件，不能因为「宿主有 shell」就跳过校验。
+	if (!isAllowedExternalUrl(target)) return { opened: false, reason: "blocked-url" };
 	const shell = resolveShellService(ctx);
 	if (shell && typeof shell.openExternal === "function") {
 		try {
@@ -225,17 +257,10 @@ async function openExternalUrl(ctx, url) {
 		}
 	}
 	try {
-		const { spawn } = await import("node:child_process");
-		if (process.platform === "win32") {
-			// 绝不能用 `cmd /c start "$url"`：Node 只在参数含空格时才给参数加引号，而 URL 不含空格，
-			// cmd 于是把 URL 里的 & 当成命令分隔符，授权地址被截断成 `?response_type=code`，
-			// 服务器随后回 `invalid_request: client_id is required`。
-			// rundll32 走 ShellExecute 且参数直传，不经 cmd 解析。
-			spawn("rundll32", ["url.dll,FileProtocolHandler", target], { detached: true, stdio: "ignore" }).unref();
-		} else {
-			spawn(process.platform === "darwin" ? "open" : "xdg-open", [target], { detached: true, stdio: "ignore" }).unref();
-		}
-		return { opened: true, via: "spawn" };
+		const opened = await openSystemUrl(target, { logger: ctx?.logger });
+		if (opened.ok) return { opened: true, via: "spawn" };
+		// headless 主机没有桌面打开器：如实告诉面板，让它把授权链接交给用户手动打开。
+		return { opened: false, reason: opened.reason || "system-opener-unavailable" };
 	} catch (error) {
 		return { opened: false, reason: String(error?.message || error) };
 	}
@@ -600,6 +625,11 @@ async function checkForUpdate(now = Date.now(), force = false) {
   return result;
 }
 
+// 凭据类失败（401/403 / 令牌解析失败 / OAuth 报错）与「进程起不来、网络不通」要分开说：
+// 前者重连多少次都不会恢复，面板应显示「需授权」并把用户送去授权的入口。这条正则只用于
+// 展示态的细分，不参与任何控制流；匹配不到就保持原本的「连接失败」。
+const AUTH_FAILURE_RE = /(401|403|unauthori[sz]ed|forbidden|invalid[ _-]?token|access token|token parse|oauth|bearer|鉴权|认证|授权)/i;
+
 function summarize(entry, inventory, managed, conflict = false, lastLog = null) {
 	const live = entry.options.config;
 	const raw = managed || live;
@@ -617,6 +647,8 @@ function summarize(entry, inventory, managed, conflict = false, lastLog = null)
 	row.lastError = row.status !== "failed" ? null : lastLog && (lastLog.type === "error" || lastLog.type === "warn")
 		? sanitizeMcpLog(lastLog.text)
 		: "MCP 未注册任何工具：连接失败或 tools/list 同步失败";
+	// 401/403 这类失败重连不会恢复：面板据此把「连接失败」细分成「需授权」。
+	row.authRequired = row.status === "failed" && AUTH_FAILURE_RE.test(`${row.lastError || ""} ${lastLog?.text || ""}`);
 	return row;
 }
 // 项目 MCP 的行状态：与全局 summarize() 走**同一套规则、同一个判定函数**（deriveMcpPhase），
@@ -668,6 +700,8 @@ function summarizeWorkspaceRow(ctx, wsPath, server, mountError) {
 			row.lastError = row.lastError ? `${notice}；${row.lastError}` : notice;
 		}
 	}
+	row.authRequired = row.status === "failed" && !row.mountFailed && !row.scopeFailed
+		&& AUTH_FAILURE_RE.test(`${row.lastError || ""} ${lastLog?.text || ""}`);
 	return row;
 }
 // Fingerprint the exact redacted wire projection. Keeping a manual field list here
@@ -973,8 +1007,36 @@ function workspaceServerView(server) {
 //   2) 项目 MCP 服务器名与禁用状态（各工作区 .dsh/mcp.json，只读）；
 //   3) 当前注册表里的全部工具 Schema（ctx.tools.schemas()，全局 + 项目 + 内置）。
 // 只读操作：不写任何配置、不碰会话目录。禁用/启用动作复用下方既有的 disable/enable。
+// P2-1：账本缓存。30 天口径在本机实测 1.7s（6542 条事件），而看板每次挂载、每次切
+// 天数都会重扫一遍；5 分钟内同 days 直接回上次结果。并发首次调用共享同一条扫描
+// （看板与 toolTailor 页可能同时挂载），避免同一份日志被解两遍。
+// days 在这里收敛到 [1,365]：缓存键就是 days，不能让 0 / 负数 / 超大值各自成键。
+const TAILOR_CACHE_TTL = 5 * 60 * 1000;
+const tailorCache = new Map(); // days -> { at, report }
+const tailorInFlight = new Map(); // days -> Promise<report>
 async function buildToolTailorReport(ctx, payload) {
-	const days = Math.trunc(Number(payload?.days) || 30);
+	const days = Math.min(365, Math.max(1, Math.trunc(Number(payload?.days) || 30)));
+	const refresh = payload?.refresh === true;
+	if (!refresh) {
+		const hit = tailorCache.get(days);
+		if (hit && Date.now() - hit.at < TAILOR_CACHE_TTL) return hit.report;
+		const pending = tailorInFlight.get(days);
+		if (pending) return pending;
+	}
+	const task = scanToolTailor(ctx, days)
+		.then((report) => {
+			tailorCache.set(days, { at: Date.now(), report });
+			return report;
+		})
+		.finally(() => {
+			if (tailorInFlight.get(days) === task) tailorInFlight.delete(days);
+		});
+	tailorInFlight.set(days, task);
+	return task;
+}
+
+/** 真正干活的那次扫描（缓存旁路 / 未命中时调用）。 */
+async function scanToolTailor(ctx, days) {
 	const mcpServerNames = [];
 	const disabledServers = new Set();
 	for (const entry of allMcpEntries(ctx)) {
@@ -1030,9 +1092,21 @@ async function attachRegisteredSkills(ctx, report) {
 	const available = registered.length > 0;
 	const registeredNames = new Set(registered.map((skill) => skill.name));
 	const observedNames = new Set(observed.map((skill) => skill.name));
+	// 禁用/释放按钮需要的三个判定字段跟着注册表行走：path/source 决定「能不能写」
+	// （白名单口径见 lib/skill-disable.js），disabled 直接读宿主解析出的 invocation 位。
+	// 未注册的行（注册表缺席 / 已卸载技能的历史调用）不带这些字段——客户端不给它出按钮。
+	const control = (skill) => {
+		if (!skill) return {};
+		return {
+			disabled: skill.invocation?.modelInvocable === false,
+			...(typeof skill.path === "string" && skill.path ? { path: skill.path } : {}),
+			...(typeof skill.source === "string" && skill.source ? { source: skill.source } : {}),
+		};
+	};
+	const registeredByName = new Map(registered.map((skill) => [skill.name, skill]));
 	const merged = available
 		? [
-				...observed.map((skill) => ({ ...skill, registered: registeredNames.has(skill.name) })),
+				...observed.map((skill) => ({ ...skill, registered: registeredNames.has(skill.name), ...control(registeredByName.get(skill.name)) })),
 				...registered
 					.filter((skill) => !observedNames.has(skill.name))
 					.map((skill) => ({
@@ -1043,6 +1117,7 @@ async function attachRegisteredSkills(ctx, report) {
 						firstUsedMs: null,
 						lastUsedMs: null,
 						registered: true,
+						...control(skill),
 					})),
 			].sort((a, b) => (b.calls - a.calls) || String(a.name).localeCompare(String(b.name)))
 		: observed.map((skill) => ({ ...skill, registered: null }));
@@ -1178,10 +1253,11 @@ async function collectLoadoutItems(ctx) {
 	// 3) 专家：profile 补丁里的召唤预设 + 目录缓存补展示名 / 更新时间。
 	try {
 		const patch = await readPatch(ctx);
-		const presets = readExpertPresets(patch.content);
+		const expertApi = await loadExpert();
+		const presets = expertApi.readExpertPresets(patch.content);
 		let experts = [];
 		try {
-			const catalog = await wbExpertCatalog();
+			const catalog = await expertApi.wbExpertCatalog();
 			experts = Array.isArray(catalog?.experts) ? catalog.experts : [];
 		} catch {
 			// 目录拉不到就退回 plugin id 作名称。
@@ -1224,7 +1300,7 @@ async function collectLoadoutItems(ctx) {
 let McpManagerGateway = (() => {
 	let _classSuper = TypertRemoteService;
 	let _instanceExtraInitializers = [];
-	let _list_decorators, _status_decorators, _enable_decorators, _disable_decorators, _reconnect_decorators, _tools_decorators, _add_decorators, _update_decorators, _remove_decorators, _reveal_decorators, _previewImport_decorators, _importJson_decorators, _listWorkspaces_decorators, _getWorkspaceView_decorators, _addWorkspaceServer_decorators, _updateWorkspaceServer_decorators, _removeWorkspaceServer_decorators, _setWorkspaceExclude_decorators, _previewWorkspaceImport_decorators, _importWorkspaceJson_decorators, _revealWorkspaceServer_decorators, _projectConnections_decorators, _reconnectWorkspaceServer_decorators, _updateHint_decorators, _whatsNew_decorators, _scanImportSources_decorators, _previewImportSource_decorators, _importSource_decorators, _toolTailor_decorators, _wbConnectorCatalog_decorators, _wbConnectorCachedCount_decorators, _wbConnectorIcon_decorators, _wbConnectorPreview_decorators, _wbConnectorInstall_decorators, _wbOAuthBegin_decorators, _wbOAuthPoll_decorators, _wbOAuthCancel_decorators, _wbOAuthToken_decorators, _wbOAuthOverview_decorators, _wbOAuthOpen_decorators, _wbSkillCatalog_decorators, _wbSkillDetail_decorators, _wbSkillInstall_decorators, _wbSkillUninstall_decorators, _wbSkillInstalled_decorators, _wbMarketRegistry_decorators, _wbMarketRegistryUpsert_decorators, _wbInstallState_decorators, _wbInstallStateRecord_decorators, _wbInstallStateForget_decorators, _wbAwesomeCatalog_decorators, _wbAwesomeDetail_decorators, _wbAwesomeReadme_decorators, _wbAwesomeUpdateCheck_decorators, _wbRepoMeta_decorators, _wbNpmDownloads_decorators, _wbLoadoutExport_decorators, _wbLoadoutDiff_decorators;
+	let _list_decorators, _status_decorators, _enable_decorators, _disable_decorators, _reconnect_decorators, _tools_decorators, _add_decorators, _update_decorators, _remove_decorators, _reveal_decorators, _previewImport_decorators, _importJson_decorators, _listWorkspaces_decorators, _getWorkspaceView_decorators, _addWorkspaceServer_decorators, _updateWorkspaceServer_decorators, _removeWorkspaceServer_decorators, _setWorkspaceExclude_decorators, _previewWorkspaceImport_decorators, _importWorkspaceJson_decorators, _revealWorkspaceServer_decorators, _projectConnections_decorators, _reconnectWorkspaceServer_decorators, _updateHint_decorators, _whatsNew_decorators, _scanImportSources_decorators, _previewImportSource_decorators, _importSource_decorators, _toolTailor_decorators, _wbConnectorCatalog_decorators, _wbConnectorCachedCount_decorators, _wbConnectorIcon_decorators, _wbConnectorPreview_decorators, _wbConnectorInstall_decorators, _wbOAuthBegin_decorators, _wbOAuthPoll_decorators, _wbOAuthCancel_decorators, _wbOAuthToken_decorators, _wbOAuthOverview_decorators, _wbOAuthRefresh_decorators, _wbOAuthOpen_decorators, _wbSkillCatalog_decorators, _wbSkillDetail_decorators, _wbSkillInstall_decorators, _wbSkillUninstall_decorators, _wbSkillInstalled_decorators, _wbMarketRegistry_decorators, _wbMarketRegistryUpsert_decorators, _wbInstallState_decorators, _wbInstallStateRecord_decorators, _wbInstallStateForget_decorators, _wbAwesomeCatalog_decorators, _wbAwesomeDetail_decorators, _wbAwesomeReadme_decorators, _wbAwesomeUpdateCheck_decorators, _wbRepoMeta_decorators, _wbNpmDownloads_decorators, _wbLoadoutExport_decorators, _wbLoadoutDiff_decorators;
 	return class McpManagerGateway extends _classSuper {
 		static {
 			const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(_classSuper[Symbol.metadata] ?? null) : void 0;
@@ -1306,6 +1382,8 @@ let McpManagerGateway = (() => {
 			__esDecorate(this, null, _wbOAuthToken_decorators, { kind: "method", name: "wbOAuthToken", static: false, private: false, access: { has: (obj) => "wbOAuthToken" in obj, get: (obj) => obj.wbOAuthToken }, metadata: _metadata }, null, _instanceExtraInitializers);
 			_wbOAuthOverview_decorators = [Remote("wbOAuthOverview")];
 			__esDecorate(this, null, _wbOAuthOverview_decorators, { kind: "method", name: "wbOAuthOverview", static: false, private: false, access: { has: (obj) => "wbOAuthOverview" in obj, get: (obj) => obj.wbOAuthOverview }, metadata: _metadata }, null, _instanceExtraInitializers);
+			_wbOAuthRefresh_decorators = [Remote("wbOAuthRefresh")];
+			__esDecorate(this, null, _wbOAuthRefresh_decorators, { kind: "method", name: "wbOAuthRefresh", static: false, private: false, access: { has: (obj) => "wbOAuthRefresh" in obj, get: (obj) => obj.wbOAuthRefresh }, metadata: _metadata }, null, _instanceExtraInitializers);
 			_wbOAuthOpen_decorators = [Remote("wbOAuthOpen")];
 			__esDecorate(this, null, _wbOAuthOpen_decorators, { kind: "method", name: "wbOAuthOpen", static: false, private: false, access: { has: (obj) => "wbOAuthOpen" in obj, get: (obj) => obj.wbOAuthOpen }, metadata: _metadata }, null, _instanceExtraInitializers);
 			_wbSkillCatalog_decorators = [Remote("wbSkillCatalog")];
@@ -1354,6 +1432,13 @@ let McpManagerGateway = (() => {
 			super(ctx, "mcpManager");
 			ensureLogCapture(ctx);
 			installAgentRuntime(ctx);
+			// 会话级专家「记住选择」：agent 重建（切会话/重启/压缩）后自动补回人设。
+			// 与项目 MCP 的安装完全独立；失败只能降级（不会自动恢复），不能拖垮插件装配。
+			try {
+				installPersonaRuntime(ctx);
+			} catch (error) {
+				ctx.logger?.warn?.(`armory: 会话专家运行时安装失败：${error?.message || error}`);
+			}
 			__runInitializers(this, _instanceExtraInitializers);
 		}
 		async list() {
@@ -1521,6 +1606,7 @@ let McpManagerGateway = (() => {
 		async toolTailor(payload) {
 			// 只读账本：扫描本机会话日志 + 当前注册表 Schema，见 tool-ledger.js。
 			// days 由调用方传（7/30/90），缺省 30，服务端钳到 [1,365]。
+			// 5 分钟缓存命中直接回上次报告；用户点「重扫」时传 refresh:true 强制重算。
 			// 「清空解压文本缓存」这个可选动作已删（2026-10-23）：它曾声称「先清后扫，面板立即
 			// 看到占用归零」，实测恰好相反 —— 快照取在扫描之后，同一发调用里日志被重新解压回填，
 			// 前后都是 32 条 / 65.8 MB；而 clearTextCache() 的返回值（clearedBytes）压根没进报告
@@ -1791,15 +1877,40 @@ let McpManagerGateway = (() => {
 		return { skill: result };
 	}
 	async revealSkill(payload) {
-		const path = String(payload?.path || "");
-		if (!path) throw new Error("该 skill 没有可打开的文件路径（运行时注册的 skill 不在磁盘上）");
+		// 路径只信宿主 skill 注册表的解析结果，不信客户端传来的 payload.path：
+		// 否则面板能借「打开目录」把任意路径交给 explorer / open 定位。
+		const name = String(payload?.name || "").trim();
+		if (!name) throw new Error("缺少 skill 名称");
+		const resolved = await withSkillScope(this.ctx, payload, async (registry, options) => {
+			if (typeof registry.get !== "function") throw new Error("宿主没有挂载 skill 注册表（@deepseek-ai/dsh-skill），无法定位 skill");
+			const skill = await registry.get(name, options);
+			if (!skill) throw new Error("没有找到这个 skill（可能刚被移动或删除）：" + name);
+			return String(skill.path || "");
+		});
+		if (resolved === undefined) throw new Error("宿主没有挂载 skill 注册表（@deepseek-ai/dsh-skill），无法定位 skill");
+		const path = String(resolved);
+		if (!path || path.includes("\0") || !isAbsolute(path)) throw new Error("该 skill 没有可打开的文件路径（运行时注册的 skill 不在磁盘上）");
 		const shell = typeof this.ctx.get === "function" ? this.ctx.get("shell") : undefined;
-		if (shell && typeof shell.showItemInFolder === "function") { shell.showItemInFolder(path); return { note: "已在资源管理器中定位" }; }
-		if (shell && typeof shell.openExternal === "function") { shell.openExternal(path); return { note: "已交给宿主打开" }; }
-		const { spawn } = await import("node:child_process");
-		if (process.platform === "win32") spawn("explorer", ["/select,", path], { detached: true, stdio: "ignore" }).unref();
-		else spawn(process.platform === "darwin" ? "open" : "xdg-open", [path], { detached: true, stdio: "ignore" }).unref();
-		return { note: "已交给系统打开" };
+		if (shell && typeof shell.showItemInFolder === "function") {
+			try {
+				await shell.showItemInFolder(path);
+				return { note: "已在资源管理器中定位" };
+			} catch {
+				/* 宿主定位失败时落到系统兜底 */
+			}
+		}
+		if (shell && typeof shell.openExternal === "function") {
+			try {
+				await shell.openExternal(path);
+				return { note: "已交给宿主打开" };
+			} catch {
+				/* 宿主打开失败时落到系统兜底 */
+			}
+		}
+		const opened = await revealSystemPath(path, { logger: this.ctx?.logger });
+		if (opened.ok) return { note: "已交给系统打开" };
+		// headless 主机没有桌面文件管理器：不能谎报「已打开」，把真实路径交回去。
+		return { note: `没有可用的系统打开器（${opened.reason}），路径：${path}`, path, opened: false };
 	}
 	// 卸载一条已安装 skill：永久删除用户级/项目级 skills 根目录内的条目。
 	// 只信注册表给的 source/path（客户端传的路径不参与判断）；bundled / runtime / custom
@@ -1817,6 +1928,36 @@ let McpManagerGateway = (() => {
 		if (result === undefined) throw new Error("宿主没有挂载 skill 注册表（@deepseek-ai/dsh-skill），无法卸载");
 		return { note: `已卸载 ${name}（${result.kind === "symlink" ? "符号链接" : "目录"}：${result.path}）` };
 	}
+	// 禁用 / 释放一条 skill（工具裁缝技能账本的行内按钮）：写 SKILL.md frontmatter 的
+	// disable-model-invocation 标志——宿主 skill-filesystem 官方支持的「模型侧禁用」键，
+	// 根目录监听器会自动刷新模型目录（无需重启）。禁用后技能不再进模型目录、不再缴
+	// 上下文税；输入框手动 /引用 不受影响。写盘规则与安全闸门全在 lib/skill-disable.js
+	// （来源白名单 / 根目录包含性 / realpath 防链接出根），与 removeSkill 同一套纪律。
+	async disableSkill(payload) {
+		return this.setSkillDisabled(payload, true);
+	}
+	async enableSkill(payload) {
+		return this.setSkillDisabled(payload, false);
+	}
+	async setSkillDisabled(payload, disabled) {
+		const name = String(payload?.name || "").trim();
+		if (!name) throw new Error("缺少 skill 名称");
+		const result = await withSkillScope(this.ctx, payload, async (registry, options) => {
+			if (typeof registry.get !== "function") throw new Error("宿主没有挂载 skill 注册表（@deepseek-ai/dsh-skill），无法修改");
+			const skill = await registry.get(name, options);
+			if (!skill) throw new Error("没有找到这个 skill（可能刚被移动或删除）：" + name);
+			return setSkillModelInvocationOnDisk(skill, { disabled, cwd: options.cwd, home: homedir() });
+		});
+		if (result === undefined) throw new Error("宿主没有挂载 skill 注册表（@deepseek-ai/dsh-skill），无法修改");
+		// 幂等重放（changed=false）也照常报成功：按钮态以注册表实况为准，重放只是补一次确认。
+		return {
+			note: disabled
+				? `已禁用 ${name}（模型不再加载，手动引用不受影响）`
+				: `已释放 ${name}（模型可重新调用）`,
+			path: result.path,
+			changed: result.changed,
+		};
+	}
 	// 安装时间 + 市场原名（按 skill 名字索引）：宿主自扫标准技能根目录、读 SKILL.md
 	// 头部 name 建立映射——不依赖 listSkills 行里的 path（注册表可能整列不给）。
 	// 永不抛错——时间与原名是辅助信息，单个目录读失败只是没有该条目，不该拖垮看板。
@@ -1847,18 +1988,22 @@ let McpManagerGateway = (() => {
 	// 连接器安装复用 applyManagedImport / applyWorkspaceImport：准入、同名跳过、entry id
 	// 预留、项目对齐全部与粘贴导入同一条链路，市场只是多了一个「JSON 从哪来」的来源。
 	async wbConnectorCatalog() {
-		return wbConnectorCatalog();
+		const marketApi = await loadMarket();
+		return marketApi.wbConnectorCatalog();
 	}
 	// 顶栏「市场」chip 的常驻计数：只读磁盘缓存，绝不联网（无缓存返回 null）。
 	async wbConnectorCachedCount() {
-		return wbConnectorCachedCount();
+		const marketApi = await loadMarket();
+		return marketApi.wbConnectorCachedCount();
 	}
 	async wbConnectorPreview(payload) {
-		return wbConnectorPreview(payload?.connectorId);
+		const marketApi = await loadMarket();
+		return marketApi.wbConnectorPreview(payload?.connectorId);
 	}
 	// 某条连接器的图标（data URL）。市场卡片进视口才调，payload 形状同 wbConnectorPreview。
 	async wbConnectorIcon(payload) {
-		return wbConnectorIcon(payload?.connectorId);
+		const marketApi = await loadMarket();
+		return marketApi.wbConnectorIcon(payload?.connectorId);
 	}
 	async wbConnectorInstall(payload) {
 		const connectorId = String(payload?.connectorId || "").trim();
@@ -1866,17 +2011,35 @@ let McpManagerGateway = (() => {
 		const mode = payload?.mode === "replace" ? "replace" : "merge";
 		const wsPath = payload?.wsPath ? canonicalWorkspacePath(String(payload.wsPath)) : "";
 		const tokens = payload?.tokens && typeof payload.tokens === "object" ? payload.tokens : {};
-		const preview = await wbConnectorPreview(connectorId);
+		const marketApi = await loadMarket();
+		const preview = await marketApi.wbConnectorPreview(connectorId);
 		// T04/R7：把面板收集到的 token 填进 ${...} 占位符。只填用户明确提供的槽位，
 		// 未填的保持原样并把槽位名回传面板（missingSlots）——绝不代填、绝不猜值。
 		const { mcpServers, missingSlots } = applyTokens(preview.mcpServers, tokens);
 		// R8：先把已授权的 OAuth token 注进 headers 再探测——否则授权过的连接器每次重装
 		// 都会被判成「需要授权」，用户得反复点授权。
 		const authorized = await injectStoredOAuthTokens(mcpServers);
+		// 本机固定依赖预检：本地客户端型连接器（如 nvapp-windows-local）写死一个本机可执行文件。
+		// 缺这个文件时写进配置只会让宿主重连 10 次后注销工具（issue #3），所以安装前直接拦住，
+		// 并把「缺哪个路径 / 平台是否支持」作为结构化字段回传面板做本地化提示。
+		const localDeps = await marketApi.connectorLocalDeps(authorized);
+		const localMissing = localDeps.filter((dep) => dep.status === "missing").map((dep) => dep.path);
+		const localUnsupported = localDeps.filter((dep) => dep.status === "platform").map((dep) => dep.path);
+		if (localMissing.length || localUnsupported.length) {
+			return {
+				ok: false,
+				connectorId,
+				missingSlots,
+				localDeps,
+				localMissing,
+				localUnsupported,
+				error: `本机缺少连接器依赖：${[...localMissing, ...localUnsupported].join("、")}`,
+			};
+		}
 		// 装前 401 探测：索引 auth_mode 会漏标鉴权（tec-do 裸 URL 装完必 401）。断言从
 		// 「任一不就整体中止」改为「回传需授权清单」：面板据此弹浏览器授权页，授权完成
 		// 后重装即可，绝不再抛「DSH 无法自动注入」把用户挡在门外。
-		const probe = await probeMcpServersAuthorization(authorized);
+		const probe = await marketApi.probeMcpServersAuthorization(authorized);
 		if (probe?.needsAuth?.length) {
 			return {
 				ok: false,
@@ -1890,8 +2053,27 @@ let McpManagerGateway = (() => {
 		const result = wsPath
 			? await applyWorkspaceImport(this.ctx, wsPath, admittedImport(json), mode)
 			: await applyManagedImport(this.ctx, admittedImport(json), mode);
-		// T04/R8：装成功后登记本地状态（供「已安装」全量筛选与来源锁）。登记失败只记
-		// 日志、绝不影响安装结果——状态文件坏了不该让用户白装一次。
+		// T04/R8：只有**真的写进了 server** 才登记「已安装」。同名条目被其他配置层占用时，
+		// applyManagedImport 会跳过它并返回空 added/updated——早前这里无条件登记，于是一条
+		// 根本没落盘的连接器也带着「已安装」徽标（用户报的「显示装好了却用不了」就是这个
+		// 徽标在说谎）。跳过 ≠ 装好：这里如实回失败，并把跳过原因带回面板。
+		const wrote = (Array.isArray(result?.added) ? result.added.length : 0)
+			+ (Array.isArray(result?.updated) ? result.updated.length : 0);
+		if (!wrote) {
+			const skipped = Array.isArray(result?.warnings) ? result.warnings.filter(Boolean) : [];
+			return {
+				ok: false,
+				connectorId,
+				missingSlots,
+				localDeps,
+				wrote: 0,
+				skipped,
+				error: skipped.length
+					? `没有写入任何 MCP 配置：${skipped.join("；")}`
+					: "没有写入任何 MCP 配置：目标作用域里没有可写入的 server",
+			};
+		}
+		// 登记失败只记日志、绝不影响安装结果——状态文件坏了不该让用户白装一次。
 		try {
 			await recordInstallState({
 				kind: "connector",
@@ -1904,7 +2086,7 @@ let McpManagerGateway = (() => {
 		} catch (error) {
 			this.ctx.logger?.warn?.(`wb-market: 连接器 ${connectorId} 安装状态登记失败（不影响安装结果）：${error?.message || error}`);
 		}
-		return { ...result, missingSlots };
+		return { ...result, missingSlots, localDeps, wrote };
 	}
 	// ── R8：连接器 MCP 的浏览器授权（RFC 9728 / 8414 / 7591 / 7636）──────────
 	// 面板只负责展示与点击：安装前探测到 401 → 这里拿到 authorizeUrl 交给系统浏览器，
@@ -1986,20 +2168,68 @@ let McpManagerGateway = (() => {
 		const overview = await oauthOverview(target.url).catch(() => null);
 		return { ok: true, connectorId, serverName: target.serverName, ...(overview || {}) };
 	}
+	// R8/P0：强制刷新已存的 OAuth token（有 refresh_token 才刷得动）。面板的「刷新授权」
+	// 走这里，再调用一次 wbConnectorInstall 把新凭据写回 headers——mcp-client 只在建立连接时
+	// 快照 headers，光刷令牌库不改配置等于没刷。
+	// 刷不动（没有 refresh_token / 已被服务端撤销）时回 needsAuth:true，让面板回到浏览器授权，
+	// 而不是给一条「刷新失败」的死胡同。
+	async wbOAuthRefresh(payload) {
+		const connectorId = String(payload?.connectorId || "").trim();
+		if (!connectorId) throw new Error("缺少 connectorId");
+		const target = await resolveOAuthTarget(connectorId, payload?.serverName);
+		const before = await oauthOverview(target.url).catch(() => null);
+		if (!before?.authorized) {
+			return {
+				ok: false,
+				connectorId,
+				serverName: target.serverName,
+				authorized: false,
+				needsAuth: true,
+				error: "该连接器还没有授权记录，请先完成授权",
+			};
+		}
+		const ensured = await oauthEnsureToken(target.url, { force: true })
+			.catch((error) => ({ ok: false, error: error?.message || String(error) }));
+		const after = await oauthOverview(target.url).catch(() => null);
+		if (!ensured?.ok) {
+			return {
+				ok: false,
+				connectorId,
+				serverName: target.serverName,
+				authorized: Boolean(after?.authorized),
+				needsAuth: true,
+				refreshable: Boolean(after?.refreshable),
+				expiresAt: after?.expiresAt || "",
+				error: ensured?.error || "刷新授权失败",
+			};
+		}
+		return {
+			ok: true,
+			connectorId,
+			serverName: target.serverName,
+			authorized: true,
+			refreshed: ensured.refreshed === true,
+			expiresAt: after?.expiresAt || "",
+			refreshable: Boolean(after?.refreshable),
+		};
+	}
 	async wbOAuthOpen(payload) {
 		const opened = await openExternalUrl(this.ctx, payload?.url);
 		return { ok: opened.opened === true, ...opened };
 	}
 	async wbSkillCatalog(payload) {
-		return wbSkillCatalog(payload || {});
+		const marketApi = await loadMarket();
+		return marketApi.wbSkillCatalog(payload || {});
 	}
 	async wbSkillDetail(payload) {
-		return wbSkillDetail(payload || {});
+		const marketApi = await loadMarket();
+		return marketApi.wbSkillDetail(payload || {});
 	}
 	async wbSkillInstall(payload) {
+		const marketApi = await loadMarket();
 		// 安装进度经 ctx.logger 落到宿主日志（Remote 单次调用没有流式回传通道，面板按
 		// 阶段提示「正在下载与校验」，完成后一次拿到结果与 note）。
-		const result = await wbSkillInstall(payload || {}, {
+		const result = await marketApi.wbSkillInstall(payload || {}, {
 			onProgress: (progress) => this.ctx.logger?.debug?.(`wb-market: ${progress.phase} ${progress.index}/${progress.total}`),
 		});
 		// T04/R8：装成功后登记本地状态。key 取不到就跳过（record 对空 key 会抛错）。
@@ -2021,10 +2251,12 @@ let McpManagerGateway = (() => {
 		return result;
 	}
 	async wbSkillUninstall(payload) {
-		return wbSkillUninstall(payload || {});
+		const marketApi = await loadMarket();
+		return marketApi.wbSkillUninstall(payload || {});
 	}
 	async wbSkillInstalled() {
-		return wbSkillInstalled();
+		const marketApi = await loadMarket();
+		return marketApi.wbSkillInstalled();
 	}
 	// ── T03/R4：多市场注册表 ────────────────────────────────────────────
 	// 数据层在 lib/wb-registry.js（T01）；这里只做 RPC 转发。读 = 合并投影（内置默认
@@ -2068,6 +2300,12 @@ let McpManagerGateway = (() => {
 	async wbAwesomeUpdateCheck() {
 		return wbAwesomeUpdateCheck();
 	}
+	// ── 社区 MCP（官方 MCP Registry v0，只读）──────────────────────────
+	// 数据层在 lib/mcp-community.js；这里只做 RPC 转发。只 GET：不写盘、不执行命令、
+	// 不落任何凭据。payload {search, cursor, limit, takenNames}，形状由数据层校验。
+	async wbMcpCommunityList(payload) {
+		return wbMcpCommunityList(payload || {});
+	}
 	// ── 社区元信息：仓库「人味」信号（维护者 / 最近提交 / issue / star）────────
 	// 详情弹层按需调用，只读公开接口，6 小时缓存；不接收也不保存任何凭据。
 	async wbRepoMeta(payload) {
@@ -2109,19 +2347,26 @@ let McpManagerGateway = (() => {
 		const plugin = String(payload?.plugin || "").trim();
 		if (!sessionId) throw new Error("缺少 sessionId");
 		if (!plugin) throw new Error("缺少 plugin");
-		const detail = await wbExpertDetail({ plugin });
+		const expertApi = await loadExpert();
+		const detail = await expertApi.wbExpertDetail({ plugin });
 		// 团队型：成员人设先落盘，主理人人设末尾追加 DSH 桥接段（与召唤预设同一套）。
-		const prepared = await prepareExpertPersona(detail, {
+		const prepared = await expertApi.prepareExpertPersona(detail, {
 			onLog: (message) => this.ctx.logger?.debug?.(`wb-expert: ${message}`),
 		});
 		const result = attachPersona(this.ctx, sessionId, {
 			plugin,
 			name: detail.name,
 			personaText: prepared.personaText,
+		}, {
+			// 替身人设不写进 session-persona 的粘性选择：它只是原文缺失时的占位，
+			// 落盘后即使上游补回原文也会一直沿用。重启后重新召唤即可拿到最新正文。
+			persist: detail.personaSource !== "generated",
 		});
-		await recordExpertRecent("expert", { plugin, name: detail.name, profession: detail.profession, presetId: `session-${plugin}` }).catch(() => {});
+		await expertApi.recordExpertRecent("expert", { plugin, name: detail.name, profession: detail.profession, presetId: `session-${plugin}` }).catch(() => {});
 		return {
 			...result,
+			personaSource: detail.personaSource,
+			personaNotice: detail.personaNotice,
 			profession: detail.profession,
 			expertType: detail.expertType,
 			members: detail.members || [],
@@ -2138,31 +2383,34 @@ let McpManagerGateway = (() => {
 		return { sessions: listPersonas() };
 	}
 	async wbExpertCatalog() {
-		return wbExpertCatalog();
+		const expertApi = await loadExpert();
+		return expertApi.wbExpertCatalog();
 	}
 	async wbExpertDetail(payload) {
-		return wbExpertDetail(payload || {});
+		const expertApi = await loadExpert();
+		return expertApi.wbExpertDetail(payload || {});
 	}
 	async wbExpertSummon(payload) {
 		const plugin = String(payload?.plugin || "").trim();
 		if (!plugin) throw new Error("缺少 plugin");
+		const expertApi = await loadExpert();
 		// 详情即预览：召唤写盘前拉一次真实人设与技能清单，失败则整体不动。
-		const detail = await wbExpertDetail({ plugin });
+		const detail = await expertApi.wbExpertDetail({ plugin });
 		const withSkills = payload?.withSkills !== false && detail.skills.length > 0;
 		// 团队型：成员人设先落盘（人设不进 preset，避免每轮白付），主理人人设追加桥接段。
-		const prepared = await prepareExpertPersona(detail, {
+		const prepared = await expertApi.prepareExpertPersona(detail, {
 			onLog: (message) => this.ctx.logger?.debug?.(`wb-expert: ${message}`),
 		});
 		// 技能先落盘（失败只影响技能，不阻断召唤），预设行再走唯一写链（文件锁 + 版本校验 + 原子写）。
 		let skillResult = { installed: [], notes: [] };
 		if (withSkills) {
-			skillResult = await installExpertSkills(plugin, detail.skills.map((skill) => skill.name), {
+			skillResult = await expertApi.installExpertSkills(plugin, detail.skills.map((skill) => skill.name), {
 				onLog: (message) => this.ctx.logger?.debug?.(`wb-expert: ${message}`),
 			});
 		}
 		const result = await withPatchWrite(this.ctx, async () => {
 			const state = await managedState(this.ctx);
-			const written = writeExpertPreset(state.content, {
+			const written = expertApi.writeExpertPreset(state.content, {
 				plugin,
 				displayName: detail.name,
 				profession: detail.profession,
@@ -2174,11 +2422,11 @@ let McpManagerGateway = (() => {
 			return { mode: written.mode, presetId: written.presetId };
 		});
 		// 召唤成功即记入最近使用（送还由 listExpertRecent 对账剔除）。记录失败不阻断召唤。
-		await recordExpertRecent("expert", { plugin, name: detail.name, profession: detail.profession, presetId: result.presetId }).catch(() => {});
+		await expertApi.recordExpertRecent("expert", { plugin, name: detail.name, profession: detail.profession, presetId: result.presetId }).catch(() => {});
 		const teamMembers = prepared.memberResult?.installed || [];
 		// upsert 后核对人设正文是否真带桥接段（团队型）；不带则提示更新结果不完整。
 		// 正常路径 prepared.personaText 已拼桥接段，这个分支只在异常数据时触发。
-		const staleBridge = detail.expertType === "team" && !hasTeamBridge(prepared.personaText);
+		const staleBridge = detail.expertType === "team" && !expertApi.hasTeamBridge(prepared.personaText);
 		return {
 			presetId: result.presetId,
 			presetMode: result.mode,
@@ -2200,9 +2448,10 @@ let McpManagerGateway = (() => {
 	async wbExpertDismiss(payload) {
 		const plugin = String(payload?.plugin || "").trim();
 		if (!plugin) throw new Error("缺少 plugin");
+		const expertApi = await loadExpert();
 		const result = await withPatchWrite(this.ctx, async () => {
 			const state = await managedState(this.ctx);
-			const content = removeExpertPreset(state.content, plugin);
+			const content = expertApi.removeExpertPreset(state.content, plugin);
 			if (content === null) return { mode: "absent" };
 			await writePatch(state, content);
 			return { mode: "removed" };
@@ -2210,14 +2459,14 @@ let McpManagerGateway = (() => {
 		// 捆绑技能一并清掉（该 plugin 前缀下的全部目录；失败不回滚预设摘除——写是既成事实）。
 		let removedSkills = [];
 		try {
-			removedSkills = await uninstallExpertSkills(plugin);
+			removedSkills = await expertApi.uninstallExpertSkills(plugin);
 		} catch (error) {
 			this.ctx.logger?.warn?.(`wb-expert: 预设已摘除，但技能清理失败：${error?.message ?? error}`);
 		}
 		// 团队型：成员人设目录同样按 plugin 隔离，一并清除。
 		let removedTeam = null;
 		try {
-			removedTeam = await uninstallTeamMemberPersonas(plugin);
+			removedTeam = await expertApi.uninstallTeamMemberPersonas(plugin);
 		} catch (error) {
 			this.ctx.logger?.warn?.(`wb-expert: 预设已摘除，但成员人设清理失败：${error?.message ?? error}`);
 		}
@@ -2238,7 +2487,8 @@ let McpManagerGateway = (() => {
 		// 不存在的 TeamCreate/Agent（成员开不出来）。标记桥接判定放前端（需要市场目录的
 		// expertType），这里只把 personaText 原样带出去。
 		const patch = await readPatch(this.ctx);
-		const presets = readExpertPresets(patch.content);
+		const expertApi = await loadExpert();
+		const presets = expertApi.readExpertPresets(patch.content);
 		// patch 只记 plugin / presetId，中英显示名在专家目录缓存里。这里补上两个字段，
 		// 客户端按宿主语言挑：中文名给中文界面，英文名给英文界面。读缓存失败只回落
 		// plugin 名，不影响「已召唤 / 已装技能」本身的状态判断。
@@ -2247,7 +2497,7 @@ let McpManagerGateway = (() => {
 		// 所以目录没落盘 / 专家已下架时菜单仍能出「吴八哥」，而不是 senior-developer。
 		let displayNames = new Map();
 		try {
-			displayNames = await readExpertDisplayNames();
+			displayNames = await expertApi.readExpertDisplayNames();
 		} catch (error) {
 			this.ctx.logger?.warn?.(`wb-expert: 读取专家显示名失败：${error?.message ?? error}`);
 		}
@@ -2261,18 +2511,20 @@ let McpManagerGateway = (() => {
 					nameEn: info.nameEn || row.displayName || "",
 				};
 			}),
-			skills: await listExpertSkills(),
+			skills: await expertApi.listExpertSkills(),
 		};
 	}
 	// 最近使用记录（输入框召唤菜单的数据源）：召唤/送还时自动记录专家；技能与 MCP 由
 	// 客户端在用户从菜单里显式选用时上报（recordUse）。只存展示所需最小字段。
 	async wbExpertRecent() {
-		return listExpertRecent();
+		const expertApi = await loadExpert();
+		return expertApi.listExpertRecent();
 	}
 	async wbExpertRecordUse(payload) {
 		const kind = String(payload?.kind || "").trim();
 		const row = payload?.row && typeof payload.row === "object" ? payload.row : null;
-		return recordExpertRecent(kind, row);
+		const expertApi = await loadExpert();
+		return expertApi.recordExpertRecent(kind, row);
 	}
 	};
 })();