dsh-armory 2.1.0 → 2.2.1

package/lib/index.js

@@ -12,7 +12,10 @@ import { admitImportedServers } from "./import-admission.js";
 import { collectImportLocations, missingEnvNames, resolveImportLocation } from "./mcp-import-sources.js";
 import { deriveMcpPhase, formatMcpLog, sanitizeMcpLog } from "./mcp-observability.js";
 import { allMcpEntries, entriesForName, projectToolSchema, revisionOf, toolInventory } from "./mcp-registry.js";
+// Skill 看板的卸载落盘点：来源白名单 + 根目录包含性 + 符号链接/根目录校验（lib/skill-remove.js）。
+import { removeSkillFromDisk } from "./skill-remove.js";
 import { WHATS_NEW } from "./whats-new.js";
+import { attachWhatsNewEnglish } from "./whats-new-en.js";
 import { probeMcpServersAuthorization, wbConnectorCatalog, wbConnectorCachedCount, wbConnectorPreview, wbSkillCatalog, wbSkillDetail, wbSkillInstall, wbSkillInstalled, wbSkillUninstall } from "./wb-market.js";
 // T03：多市场注册表（R4）与 codebuddy 插件市场（R5）的宿主侧数据层。
 import { readRegistry, upsertMarketplace } from "./wb-registry.js";
@@ -20,6 +23,8 @@ import { wbPluginCatalog, wbPluginDetail, wbPluginUpdateCheck } from "./wb-plugi
 // T06/Awesome：DSH 社区插件市场（awesome-dsh-plugins）的宿主侧数据层。
 import { wbAwesomeCatalog, wbAwesomeDetail, wbAwesomeReadme, wbAwesomeUpdateCheck } from "./wb-awesome-market.js";
 import { readState as readInstallState, record as recordInstallState, forget as forgetInstallState } from "./wb-install-state.js";
+// 自定义套件（Skill 看板）：读 / 整集合覆盖保存，数据层 lib/suites-registry.js。
+import { readSuites as readSkillSuites, saveSuites as writeSkillSuites } from "./suites-registry.js";
 import { applyTokens } from "./wb-auth-rules.js";
 import {
 	authorizationOverview as oauthOverview,
@@ -33,8 +38,8 @@ import {
 } from "./mcp-oauth.js";
 import { hasTeamBridge, installExpertSkills, listExpertRecent, listExpertSkills, prepareExpertPersona, readExpertPresets, recordExpertRecent, removeExpertPreset, uninstallExpertSkills, uninstallTeamMemberPersonas, wbExpertCatalog, wbExpertDetail, writeExpertPreset } from "./expert-market.js";
 import { attachPersona, detachPersona, listPersonas, reconcilePersonas } from "./session-persona.js";
-// OPT-19：clearTextCache 一并引入——toolTailor 的可选动作要回收解压文本缓存。
-import { clearTextCache, scanSessionLedger } from "./tool-ledger.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";
 
@@ -1310,12 +1315,12 @@ let McpManagerGateway = (() => {
 		async toolTailor(payload) {
 			// 只读账本：扫描本机会话日志 + 当前注册表 Schema，见 tool-ledger.js。
 			// days 由调用方传（7/30/90），缺省 30，服务端钳到 [1,365]。
-			// OPT-19：可选清空动作——payload.action === 'clearTextCache' 时先回收解压文本缓存
-			// 再出报告。透传性已核实（typert.js:35 payloadParam 的 schema 是 $any =
-			// z.unknown()，strict 只约束「必须有值」不做键剥离），额外键 action 能从客户端
-			// 原样到达这里，无需新增 RPC 契约。先清后扫：报告里的 textCache 快照直接呈现
-			// 清空后的状态，面板能立即看到「占用已归零」，不必再刷一次。
-			if (payload?.action === "clearTextCache") clearTextCache();
+			// 「清空解压文本缓存」这个可选动作已删（2026-10-23）：它曾声称「先清后扫，面板立即
+			// 看到占用归零」，实测恰好相反 —— 快照取在扫描之后，同一发调用里日志被重新解压回填，
+			// 前后都是 32 条 / 65.8 MB；而 clearTextCache() 的返回值（clearedBytes）压根没进报告
+			// （textCacheStats() 没这个键），面板只能恒显示「正在清空缓存…」。既然既不回收也不修
+			// 任何事，就不再留这条 RPC 分支。tool-ledger.js 仍导出 clearTextCache 原语：它是将来
+			// 真要改缓存策略（槽位按文件数自适应、或只缓存最近若干会话）时的落点，只是现在无人调用。
 			return buildToolTailorReport(this.ctx, payload || {});
 		}
 		async listWorkspaces() {
@@ -1561,7 +1566,9 @@ let McpManagerGateway = (() => {
 	async whatsNew() {
 		// 只回数据，不在宿主判定「该不该弹」：「上次看到的版本」是每台浏览器自己的事实
 		// （localStorage），宿主没有这个视角；判定在客户端（whatsNewFor）。
-		return { current: pluginVersion(), entries: WHATS_NEW };
+		// P1：中英字段一起送（text + textEn / where + whereEn），客户端按 locale 选择。
+		// 宿主不读 locale，因为它也可能是老版本、没有 locale 服务；选择只发生在浏览器侧。
+		return { current: pluginVersion(), entries: attachWhatsNewEnglish(WHATS_NEW) };
 	}
 	// ── Skill 看板 ────────────────────────────────────────────────────
 	// 数据真源是 @deepseek-ai/dsh-skill 的 ctx.skills 注册表，本插件只做投影与只读定位，
@@ -1618,6 +1625,41 @@ let McpManagerGateway = (() => {
 		else spawn(process.platform === "darwin" ? "open" : "xdg-open", [path], { detached: true, stdio: "ignore" }).unref();
 		return { note: "已交给系统打开" };
 	}
+	// 卸载一条已安装 skill：永久删除用户级/项目级 skills 根目录内的条目。
+	// 只信注册表给的 source/path（客户端传的路径不参与判断）；bundled / runtime / custom
+	// 由数据层拒绝并给出原因。删除后宿主注册表可能缓存了目录扫描结果——调用方
+	// （SkillBoard）先本地收敛列表再 listSkills 刷新，不把「没立刻消失」当成失败。
+	async removeSkill(payload) {
+		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 removeSkillFromDisk(skill, { cwd: options.cwd, home: homedir() });
+		});
+		if (result === undefined) throw new Error("宿主没有挂载 skill 注册表（@deepseek-ai/dsh-skill），无法卸载");
+		return { note: `已卸载 ${name}（${result.kind === "symlink" ? "符号链接" : "目录"}：${result.path}）` };
+	}
+	// ── 自定义套件（Skill 看板）─────────────────────────────────────────
+	// 数据层在 lib/suites-registry.js（~/.dsh/armory/suites.json）；这里只做 RPC 转发。
+	//   listSkillSuites —— 永不抛错：文件缺失 / JSON 损坏 / 结构不对都回落空集合，
+	//     坏文件不该让整个 Skill 看板打不开。
+	//   saveSkillSuites —— 整集合覆盖（UI 的「保存」一次提交右侧全部套件）。
+	//     payload 形状不合格一律**抛错**，绝不回落成空数组：那等于把用户攒的套件全删了。
+	//     脏数据（无名 / 空成员 / id 重复 / 超上限）由数据层拒绝且不写盘，错误原样冒到面板。
+	// 不加 Remote 装饰器：与 listSkills / expertAttach 同一形态——strict 声明即可达，
+	// 装饰器只是 SRC fallback 的 marker（方向说明见 test/contract-consistency.mjs 顶部）。
+	async listSkillSuites() {
+		return readSkillSuites();
+	}
+	async saveSkillSuites(payload) {
+		const suites = Array.isArray(payload)
+			? payload
+			: (payload && typeof payload === "object" && Array.isArray(payload.suites) ? payload.suites : null);
+		if (suites === null) throw new Error("缺少套件集合：payload.suites 必须是数组");
+		return writeSkillSuites(suites);
+	}
 	// ── WorkBuddy 市场直连（连接器 MCP + SkillHub 技能）─────────────────
 	// 数据与安装逻辑都在 lib/wb-market.js；这里只做 RPC 转发与作用域相关的写盘收尾。
 	// 连接器安装复用 applyManagedImport / applyWorkspaceImport：准入、同名跳过、entry id

package/lib/mcp-catalog-en.js

@@ -0,0 +1,244 @@
+// en-US overlay for the generated built-in MCP catalog (lib/mcp-catalog.js).
+//
+// Why this file exists: `mcp-catalog.js` is generated from the upstream verified
+// list (see its header) and is not a UI string table, so its Chinese `summary`,
+// `access`, `authNote`, and category labels cannot go through client `t()`
+// (the i18n dictionary is checked bidirectionally against client.js literals and
+// would report every catalog key as an orphan). The host instead ships both
+// languages with the `builtins` RPC, and the client selects by locale.
+//
+// Maintenance: when a catalog entry is added/removed upstream, the parity test
+// (`test/mcp-catalog-i18n.mjs`) fails until this overlay is updated. Keep the
+// English fields free of CJK so an English panel never leaks Chinese here.
+// Proper nouns (Exa, GitHub, ClickHouse, ...) stay as-is.
+export const CATEGORY_LABELS_EN = {
+  search: 'Search',
+  dev: 'Developer Tools',
+  security: 'Security & Reverse Engineering',
+  data: 'Databases & Data',
+  ai: 'AI & Knowledge',
+  browser: 'Browser Automation',
+  cloud: 'Cloud & Infrastructure',
+  productivity: 'Productivity',
+  files: 'Files & Local',
+  comms: 'Communication',
+};
+
+// Only display labels containing Chinese need an override; ASCII brand names are
+// already language-neutral. `localizeBuiltinItem` falls back to `label`.
+export const CATALOG_LABELS_EN = {
+  'deepwiki-fetch': 'DeepWiki (local fetch)',
+};
+
+export const MCP_CATALOG_EN = {
+  exa: {
+    summary: 'Web search and content reading',
+    access: 'Usable without a key (rate-limited); add x-api-key to headers to raise the quota',
+    authNote: 'The keyless signal is an empty x-api-key header (rate limit measured in testing); set EXA_API_KEY for a higher quota',
+  },
+  tavily: {
+    summary: 'AI-optimized search and web extraction',
+    access: 'Free keyless mode has rate limits (responses are identical with a key); the official free key gives 1,000 credits/month, no credit card required',
+  },
+  firecrawl: {
+    summary: 'Web scraping, search, and document parsing',
+    access: 'Usable without a key (daily limit); set an API key for a higher quota. For sites requiring browser login, use /v2/mcp-oauth',
+    authNote: 'Sends an empty Bearer token in keyless mode; set FIRECRAWL_API_KEY for keyed mode',
+  },
+  'brave-search': {
+    summary: 'Independent web and local search index',
+    access: 'Requires your own Brave Search API key (free tier available; paid beyond it)',
+    authNote: 'BRAVE_API_KEY is required; there is no keyless path',
+  },
+  perplexity: {
+    summary: 'Real-time web search and deep research',
+    access: 'Requires a paid Perplexity API key (Bearer); no free quota',
+    authNote: 'PERPLEXITY_API_KEY is required (Bearer); no free quota',
+  },
+  'google-maps': {
+    summary: 'Google Maps platform developer documentation search',
+    access: 'Free during the experimental phase, no authentication required (testing returned 2 documentation-search tools from tools/list)',
+  },
+  fetch: {
+    summary: 'Fetch web pages and convert them to LLM-friendly text',
+    access: 'Open source and free; no key required',
+  },
+  github: {
+    summary: 'Repositories, issues, pull requests, and code search',
+    access: 'Requires a GitHub account with OAuth authorization; a PAT also works. Available features depend on your plan',
+    authNote: 'Skip OAuth: configure GITHUB_PERSONAL_ACCESS_TOKEN (a PAT) and connect directly with Bearer',
+  },
+  gitlab: {
+    summary: 'Projects, issues, and merge request access',
+    access: 'Available on Free and higher plans; OAuth dynamic registration, including self-hosted instances | WARNING: static token auth is not officially confirmed (official MCP docs only describe OAuth/DCR; issue 586184 requests PAT support and was answered as not on the near-term roadmap), so authorization may fail in DSH',
+    authNote: 'Only OAuth dynamic registration is supported; static tokens are not officially supported, so this host will stall during authorization and stay disconnected after installation',
+  },
+  sentry: {
+    summary: 'Error search, performance analysis, and issue triage',
+    access: 'Requires Sentry account OAuth authorization (free-tier accounts work)',
+    authNote: 'Official docs only mention OAuth; if you issue SENTRY_AUTH_TOKEN in Sentry settings, Bearer may work (not guaranteed by the docs)',
+  },
+  git: {
+    summary: 'Read and write local Git repositories',
+    access: 'Open source and free; operates only on local repositories',
+  },
+  serena: {
+    summary: 'Symbol-level code search and refactoring',
+    access: 'Open source and free (MIT), runs locally; install first with uv tool install -p 3.13 serena-agent',
+  },
+  everything: {
+    summary: 'Official reference implementation for connectivity checks',
+    access: 'Open source and free; intended for demos and testing',
+  },
+  'fast-context': {
+    summary: 'Windsurf-powered semantic code search',
+    access: 'Open source and free; if Windsurf is installed its key is picked up automatically, otherwise set WINDSURF_API_KEY',
+    authNote: 'Key is picked up automatically when Windsurf is installed; otherwise set WINDSURF_API_KEY',
+  },
+  jshook: {
+    summary: 'JS analysis and security research: hooks, CDP debugging, deobfuscation',
+    access: 'Open source and free (AGPL-3.0), runs locally; requires Node 22.12+. Tool profiles are controlled by MCP_TOOL_PROFILE (search ~3K tokens / workflow / full ~40K+); the default profile is sufficient',
+  },
+  'ida-pro': {
+    summary: 'Drive IDA Pro for reverse engineering',
+    access: 'Requires IDA Pro installed locally; the service is fetched on demand, no prior pip install needed',
+  },
+  'frida-mcp': {
+    summary: 'Frida dynamic instrumentation: hook functions and trace calls',
+    access: 'Open source and free (MIT), runs locally; requires Frida and the target on this machine. Tested with uvx startup and a successful initialize/tools/list handshake; enumerate_processes returned local processes',
+  },
+  dbx: {
+    summary: 'Multi-database queries (Postgres / MySQL / SQLite, etc.)',
+    access: 'Open source and free; native local binary. Data sources are configured in the DBX app',
+  },
+  postgres: {
+    summary: 'Postgres queries, indexes, and health analysis',
+    access: 'Open source and free; requires your own database connection string (DATABASE_URI)',
+    authNote: 'Set DATABASE_URI (the database connection string, including the password)',
+  },
+  sqlite: {
+    summary: 'Local SQLite queries and data analysis',
+    access: 'Open source and free; operates only on local .db files. Note: the official project is archived and receives maintenance fixes only',
+  },
+  redis: {
+    summary: 'Redis key-value, vector, and stream operations',
+    access: 'Open source and free (MIT); requires your own Redis instance',
+    authNote: 'Set REDIS_HOST / REDIS_PORT; include the password if the instance requires one',
+  },
+  clickhouse: {
+    summary: 'ClickHouse queries and schema exploration',
+    access: 'Open source and free, read-only by default; requires your own ClickHouse connection details',
+    authNote: 'Set CLICKHOUSE_HOST / PORT / USER and CLICKHOUSE_PASSWORD',
+  },
+  mongodb: {
+    summary: 'MongoDB and Atlas data access',
+    access: 'Open source and free (Apache-2.0); requires your own connection string',
+    authNote: 'Set MDB_MCP_CONNECTION_STRING (a connection string including the password)',
+  },
+  supabase: {
+    summary: 'Supabase project and database management',
+    access: 'Requires Supabase account OAuth authorization; parameters such as ?read_only=true can restrict permissions',
+    authNote: 'Official docs specify OAuth; if you have SUPABASE_ACCESS_TOKEN, Bearer may work (not guaranteed by the docs)',
+  },
+  neon: {
+    summary: 'Neon project management and queries',
+    access: 'Requires Neon account OAuth or an API key; optional read-only mode and single-project scoping',
+    authNote: 'Official recommendation is OAuth; set NEON_API_KEY as a Bearer token to connect directly',
+  },
+  'deepwiki-fetch': {
+    summary: 'Fetch DeepWiki pages and convert them to Markdown',
+    access: 'Completely free, no authentication; fetches locally and overlaps with the official remote version, so pick one as needed',
+  },
+  memory: {
+    summary: 'Persistent memory backed by a knowledge graph',
+    access: 'Open source and free; data is stored in local files',
+  },
+  'sequential-thinking': {
+    summary: 'Step-by-step reasoning and dynamic problem decomposition',
+    access: 'Open source and free; no key required',
+  },
+  context7: {
+    summary: 'Real-time documentation for the latest library versions',
+    access: 'Usable without a key; a free API key is available on the website to raise the rate limit',
+  },
+  deepwiki: {
+    summary: 'Repository documentation and Q&A',
+    access: 'Completely free, no authentication; accesses public repositories only',
+  },
+  huggingface: {
+    summary: 'Model, dataset, and Spaces search',
+    access: 'Basic tools work without a key; sign in to use your configured personal Apps and tools',
+  },
+  arxiv: {
+    summary: 'Paper search and full-text access',
+    access: 'Open source and free; no key required',
+  },
+  'chrome-devtools': {
+    summary: 'Drive a real Chrome instance for debugging and performance analysis',
+    access: 'Open source and free, runs locally; requires Chrome installed',
+  },
+  playwright: {
+    summary: 'Browser automation based on accessibility snapshots',
+    access: 'Open source and free (Apache-2.0), runs locally; requires Node.js 18+',
+  },
+  'cloudflare-api': {
+    summary: 'Call the full Cloudflare API',
+    access: 'Requires Cloudflare account OAuth authorization; an API token can also be used as a Bearer token',
+    authNote: 'Official recommendation is OAuth; set CLOUDFLARE_API_TOKEN as a Bearer token to connect directly',
+  },
+  'cloudflare-docs': {
+    summary: 'Semantic search over official Cloudflare documentation',
+    access: 'Usable without a key; no account required',
+  },
+  aws: {
+    summary: 'Access AWS services through mcp-proxy-for-aws',
+    access: 'Open source and free; credentials come from the local AWS configuration (~/.aws) and Bedrock access is required',
+    authNote: 'Credentials come from local ~/.aws, so no key is needed here; the account must have Bedrock access',
+  },
+  kubernetes: {
+    summary: 'Cluster resources, pods, and Helm management',
+    access: 'Open source and free (Apache-2.0); uses the local kubeconfig',
+    authNote: 'Uses local kubeconfig credentials, so no key is needed here; the cluster must be reachable',
+  },
+  docker: {
+    summary: 'Run MCP servers uniformly in isolated containers',
+    access: 'Open source and free (MIT); requires Docker Desktop or the docker CLI plugin',
+  },
+  netlify: {
+    summary: 'Site builds, deployments, and the Netlify CLI',
+    access: 'Requires Netlify account OAuth authorization | WARNING: static token auth is not officially confirmed (NETLIFY_PERSONAL_ACCESS_TOKEN in the official docs is an environment variable for the local stdio package; the remote endpoint only documents OAuth), so authorization may fail in DSH',
+    authNote: 'The remote endpoint only documents OAuth; static tokens are not officially confirmed, so this host will stall during authorization and stay disconnected after installation',
+  },
+  linear: {
+    summary: 'Issue, project, and comment management',
+    access: 'Requires Linear account OAuth; read-only access is available at https://mcp.linear.app/mcp/readonly',
+    authNote: 'Official docs specify OAuth; LINEAR_API_KEY as a Bearer token is not documented, so it will most likely fail to connect after installation',
+  },
+  atlassian: {
+    summary: 'Jira and Confluence read/write',
+    access: 'Free tier available (no credit card); requires Atlassian account OAuth authorization',
+    authNote: 'Official docs specify OAuth; ATLASSIAN_API_TOKEN as a Bearer token is not documented, so it will most likely fail to connect after installation',
+  },
+  airtable: {
+    summary: 'Read and write Airtable bases and records',
+    access: 'Available on all plans (including free); requires Airtable OAuth authorization',
+    authNote: 'Official docs specify OAuth; AIRTABLE_TOKEN as a Bearer token is not documented, so it will most likely fail to connect after installation',
+  },
+  'microsoft-learn': {
+    summary: 'Search official Microsoft documentation and code samples',
+    access: 'Completely free; no authentication or account required',
+  },
+  time: {
+    summary: 'Time queries and timezone conversion',
+    access: 'Open source and free; purely local computation',
+  },
+  filesystem: {
+    summary: 'File read/write within allowed directories',
+    access: 'Open source and free; can access only directories explicitly allowed on the command line',
+  },
+  slack: {
+    summary: 'Search messages, send messages, and manage canvases',
+    access: 'Create your own Slack app and complete one OAuth flow to obtain an xoxp- user token, then configure it here; the token can be reused long-term',
+    authNote: 'Create a Slack app and complete one OAuth flow to obtain an xoxp- user token; set SLACK_USER_TOKEN to reuse it long-term',
+  },
+};

package/lib/mcp-config.js

@@ -1,6 +1,7 @@
 import { parseDocument, Scalar, YAMLMap, YAMLSeq, isMap, isSeq } from 'yaml'
 import { isSafeExpression, makeEnvExpression, makeExpression } from './env-expression.js'
 import { MCP_CATALOG, CATEGORY_ORDER, CATEGORY_LABELS, catalogById } from './mcp-catalog.js'
+import { MCP_CATALOG_EN, CATEGORY_LABELS_EN, CATALOG_LABELS_EN } from './mcp-catalog-en.js'
 
 export const MCP_PLUGIN_NAME = '@deepseek-ai/dsh-mcp-client'
 const JS_TAG = 'tag:yaml.org,2002:js'
@@ -21,15 +22,24 @@ const UNSUPPORTED_TEMPLATE = '不支持的变量表达式（只允许 ${VAR}、$
 // `name`（写进配置的 serverName）取 id，是刻意的：id 一旦发布就不能改，而 serverName
 // 决定工具名 `mcp__<serverName>__<tool>`，让两者同源就不会出现「目录改名导致老配置变孤儿」。
 export const BUILTIN_MCP_SERVERS = MCP_CATALOG.map((entry) => {
+  // P1：英文覆盖与生成目录分开维护（lib/mcp-catalog-en.js）。生成器没有随本仓库
+  // 分发，直接改 mcp-catalog.js 会在下次生成时被冲掉；覆盖表缺失时逐字段回落中文。
+  const en = MCP_CATALOG_EN[entry.id] || {}
   const server = {
     id: entry.id,
     label: entry.label,
+    labelEn: CATALOG_LABELS_EN[entry.id] || entry.label,
     summary: entry.summary,
+    summaryEn: en.summary || entry.summary,
     access: entry.access,
+    accessEn: en.access || entry.access,
     // OPT-24：`auth` 是给面板判断「当前宿主装不装得上」的展示元数据，不是配置字段——
     // `builtinSpec()` 只挑 MANAGED_CONFIG_FIELDS、`makeEntry()` 只挑固定字段表，两者都
     // 不会带它，所以它和 authNote 落不进用户配置文件，mcp-client 收不到不认识的键。
     auth: entry.auth,
+    // authNoteEn 与 authNote 同生同灭：`none` 条目没有说明，补空串会让面板分不清
+    // 「没有说明」和「说明是空的」。
+    ...(entry.authNote !== undefined ? { authNoteEn: en.authNote || entry.authNote } : {}),
     name: entry.id,
     transport: entry.transport,
   }
@@ -554,13 +564,17 @@ export function builtinMcpCatalog(effectiveServers) {
     return {
       id: builtin.id,
       label: builtin.label,
+      labelEn: builtin.labelEn || builtin.label,
       summary: builtin.summary,
+      summaryEn: builtin.summaryEn || builtin.summary,
       access: builtin.access,
+      accessEn: builtin.accessEn || builtin.access,
       // OPT-24：`auth` 走 builtin（BUILTIN_MCP_SERVERS 已投影），面板据此降级提示
       // oauth 条目；`authNote` 只在存在时挂键——`none` 条目根本没有这个字段，补成空串
       // 会让面板分不清「没有说明」和「说明是空的」。
       auth: builtin.auth,
       ...(builtin.authNote !== undefined ? { authNote: builtin.authNote } : {}),
+      ...(builtin.authNoteEn !== undefined ? { authNoteEn: builtin.authNoteEn } : {}),
       name: builtin.name,
       transport: builtin.transport,
       configuration: builtinSpec(builtin),
@@ -569,6 +583,7 @@ export function builtinMcpCatalog(effectiveServers) {
       // —— 市场展示字段（bundle 侧读不到常量，只能这里带过去）——
       category: source.category,
       categoryLabel: MCP_CATEGORY_LABELS[source.category],
+      categoryLabelEn: CATEGORY_LABELS_EN[source.category] || MCP_CATEGORY_LABELS[source.category],
       vendor: source.vendor,
       homepage: source.homepage,
       envKeys: source.envKeys || [],

package/lib/mcp-oauth.js

@@ -29,7 +29,7 @@ import { homedir } from "node:os";
 import { join } from "node:path";
 
 /** 插件版本：DCR 的 clientInfo 与 UA 共用一处，避免两边各自漂移。 */
-const PLUGIN_VERSION = "2.1.0";
+const PLUGIN_VERSION = "2.2.1";
 const USER_AGENT = `dsh-armory/${PLUGIN_VERSION} (+mcp-oauth)`;
 const NET_TIMEOUT_MS = 15_000;
 /** 授权流程整体存活时间：超过就判过期，避免会话表无限增长。 */

package/lib/skill-remove.js

@@ -0,0 +1,125 @@
+// 已安装 skill 的卸载数据层（Skill 看板「卸载」的唯一落盘点）。
+//
+// 为什么不让客户端传路径直接删：path 来自 listSkills 的回包，但 RPC 入参是浏览器可写的。
+// 这里只认「宿主注册表给这条 skill 的真实 source + path」，并且把删除范围钉死在四类
+// skills 根目录里——用户级 ~/.agents/skills、~/.dsh/skills，项目级 <cwd>/.agents/skills、
+// <cwd>/.dsh/skills。随 DSH 分发（bundled）、运行时注册（runtime）、自定义目录（custom）
+// 一律拒绝：前两者不该由用户面板删，后者没有可信的根目录可用来做包含性校验。
+//
+// 安全闸门（按顺序，任一不过即抛错，绝不"尽力而为"地删）：
+//   1. source 在白名单内，且能推导出绝对根目录（项目级必须有 cwd）；
+//   2. path 是绝对路径，且 resolve 后严格位于根目录内（≠ 根自身，`..` 穿越不过）；
+//      宿主注册表返回的 path 通常指向 `<skill>/SKILL.md`，先归一化到其父目录再校验，
+//      否则会把 SKILL.md 当成「不是目录」误拒（GUI 验证抓到的真实形态）；
+//   3. 父目录的 realpath 必须仍在根目录 realpath 内（防祖先符号链接把写入面带到别处）；
+//   4. 目标是符号链接 → 只 unlink 链接本身，**绝不**触碰链接指向的目录；
+//   5. 目标是目录 → 其 realpath 仍在根内，且目录里确实有 SKILL.md（文件），才递归删除。
+//
+// 删除是**永久删除**（不进回收站）：UI 侧有二次确认，并明示不可撤销。这与用户对删除的
+// 偏好一致；不做「移到 .trash」这类软删除——那会让看板显示已卸载、磁盘却仍在。
+//
+// 纯数据层：零网络、零宿主依赖；home / cwd 可注入，测试用 mkdtemp 隔离。
+import { lstat, realpath, rm, stat, unlink } from "node:fs/promises";
+import { homedir } from "node:os";
+import { basename, dirname, isAbsolute, join, relative, resolve } from "node:path";
+
+/** 可卸载来源：值与宿主注册表的 skill.source 一致，客户端 SKILL_REMOVABLE_SOURCES 必须同步。 */
+export const REMOVABLE_SKILL_SOURCES = ["user-agents", "user-dsh", "project-agents", "project-dsh"];
+
+/**
+ * 来源 → skills 根目录。project-* 需要 cwd；拿不到时返回 null（拒绝，而不是猜一个目录）。
+ * 只写「从哪来」，不校验存在性——存在性在删除流程里按目标路径判断。
+ */
+export function skillRootFor(source, options = {}) {
+	const home = options.home || homedir();
+	const cwd = options.cwd;
+	switch (source) {
+		case "user-agents": return join(home, ".agents", "skills");
+		case "user-dsh": return join(home, ".dsh", "skills");
+		case "project-agents": return cwd ? join(cwd, ".agents", "skills") : null;
+		case "project-dsh": return cwd ? join(cwd, ".dsh", "skills") : null;
+		default: return null;
+	}
+}
+
+/** 严格包含：child 在 parent 之内且不等于 parent。 */
+function isInside(parent, child) {
+	const rel = relative(parent, child);
+	return rel !== "" && !rel.startsWith("..") && !isAbsolute(rel);
+}
+
+/** 包含或相等：符号链接项只做父目录校验，父目录可以就是根。 */
+function isInsideOrEqual(parent, child) {
+	const rel = relative(parent, child);
+	return rel === "" || (!rel.startsWith("..") && !isAbsolute(rel));
+}
+
+function describeSource(source) {
+	return source ? `「${source}」` : "未知来源";
+}
+
+/**
+ * 从磁盘永久删除一条已发现的 skill。
+ *
+ * @param {{ name?: string, source?: string, path?: string }} skill 宿主注册表返回的条目（path 可为目录或目录内的 SKILL.md）
+ * @param {{ cwd?: string, home?: string }} [options]
+ * @returns {Promise<{ path: string, kind: "symlink" | "dir" }>}
+ */
+export async function removeSkillFromDisk(skill, options = {}) {
+	const source = typeof skill?.source === "string" ? skill.source : "";
+	const root = skillRootFor(source, options);
+	if (!root) {
+		if (source === "project-agents" || source === "project-dsh") {
+			throw new Error(`卸载项目级 skill 需要当前项目路径（来源：${describeSource(source)}）`);
+		}
+		throw new Error(`这个 skill 来自${describeSource(source)}，不在可卸载范围内（只支持用户级/项目级的 .dsh/skills 与 .agents/skills）`);
+	}
+	if (!isAbsolute(root)) throw new Error("拒绝卸载：无法确定 skills 根目录的绝对路径");
+	const raw = typeof skill?.path === "string" ? skill.path.trim() : "";
+	if (!raw) throw new Error("这个 skill 没有可卸载的磁盘路径（运行时注册的 skill 不落盘）");
+	if (!isAbsolute(raw)) throw new Error("拒绝卸载：skill 路径不是绝对路径");
+
+	const rawAbs = resolve(raw);
+	// 注册表把 skill.path 指向清单文件（<skill>/SKILL.md），删除目标是它所在的目录。
+	// 若直接拿清单路径去删，只会得到「该路径不是目录」——真实 GUI 首跑就撞上了。
+	const target = basename(rawAbs).toLowerCase() === "skill.md" ? dirname(rawAbs) : rawAbs;
+	const rootAbs = resolve(root);
+	if (!isInside(rootAbs, target)) {
+		throw new Error(`拒绝卸载：skill 路径不在预期的 skills 根目录内（${rootAbs}）`);
+	}
+
+	let info;
+	try {
+		info = await lstat(target);
+	} catch (error) {
+		if (error?.code === "ENOENT") throw new Error("这个 skill 已经不在磁盘上了（可能刚被移动或删除）");
+		throw error;
+	}
+
+	// 父目录的 realpath 校验：防「根内路径 → 祖先符号链接实际指向根外」。根目录本身是
+	// 符号链接（例如 ~/.agents → 别处）是允许的，所以比的是 realpath 后的根。
+	const rootReal = await realpath(rootAbs);
+	const parentReal = await realpath(dirname(target));
+	if (!isInsideOrEqual(rootReal, parentReal)) {
+		throw new Error("拒绝卸载：skill 路径经符号链接指向了 skills 根目录之外");
+	}
+
+	if (info.isSymbolicLink()) {
+		// 只删链接本身。链接可能指向任意位置（例如 tabbit 这种外部安装的 skill），
+		// rm/lstat 都不会跟随，但我们仍显式只用 unlink，语义一目了然。
+		await unlink(target);
+		return { path: target, kind: "symlink" };
+	}
+	if (!info.isDirectory()) throw new Error("拒绝卸载：该路径不是目录（也不是符号链接）");
+
+	const targetReal = await realpath(target);
+	if (!isInside(rootReal, targetReal)) {
+		throw new Error("拒绝卸载：skill 目录经符号链接指向了 skills 根目录之外");
+	}
+	const manifest = await stat(join(target, "SKILL.md")).catch(() => null);
+	if (!manifest || !manifest.isFile()) {
+		throw new Error("拒绝卸载：目录里没有 SKILL.md，看起来不是 skill 目录");
+	}
+	await rm(target, { recursive: true, force: false });
+	return { path: target, kind: "dir" };
+}