dsh-armory 2.2.0 → 2.3.0

package/lib/index.js

@@ -15,6 +15,7 @@ import { allMcpEntries, entriesForName, projectToolSchema, revisionOf, toolInven
 // 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";
@@ -961,7 +962,64 @@ async function buildToolTailorReport(ctx, payload) {
 		}
 	}
 	const schemas = [...ctx.tools.schemas()].map(projectToolSchema);
-	return scanSessionLedger({ days, mcpServerNames, schemas, disabledServers });
+	const report = await scanSessionLedger({ days, mcpServerNames, schemas, disabledServers });
+	return attachRegisteredSkills(ctx, report);
+}
+
+/**
+ * §6.4 技能账本的第二半：把「注册表里存在」与「日志里真的被调用过」合起来。
+ *
+ * 只看日志能回答「谁被用了」，但回答不了最要紧的那一问——**注册了却一次没被用过的是哪些**。
+ * 那一问的答案正是「该不该留」的依据（本机实测 32 个技能里 21 个一次没调用过），而这批名字
+ * 只能来自 `ctx.skills` 注册表。scope 解析复用看板那条 `withSkillScope`（默认预设代言），
+ * 免得这里另写一套、漏掉预设层的发现范围。
+ *
+ * 注册表缺席时（老宿主 / 预设层没挂 skill-filesystem）**不伪造 0**：把
+ * `skillsRegistryAvailable` 置 false、`skillNeverUsedCount` 置 null，界面据此只说
+ * 「日志里出现过的技能」，而不是暗示「其余技能都没被用过」——后者会是一句假话。
+ */
+async function attachRegisteredSkills(ctx, report) {
+	const observed = Array.isArray(report?.skills) ? report.skills : [];
+	let registered = [];
+	try {
+		const listed = await withSkillScope(ctx, {}, async (registry, options) => {
+			if (typeof registry.list !== "function") return undefined;
+			return registry.list(options);
+		});
+		if (Array.isArray(listed)) {
+			registered = listed.filter((skill) => typeof skill?.name === "string" && skill.name !== "");
+		}
+	} catch {
+		// 注册表读不了不挡工具账本：技能那一节退化为「只有日志里出现过的」。
+	}
+	const available = registered.length > 0;
+	const registeredNames = new Set(registered.map((skill) => skill.name));
+	const observedNames = new Set(observed.map((skill) => skill.name));
+	const merged = available
+		? [
+				...observed.map((skill) => ({ ...skill, registered: registeredNames.has(skill.name) })),
+				...registered
+					.filter((skill) => !observedNames.has(skill.name))
+					.map((skill) => ({
+						name: skill.name,
+						calls: 0,
+						errors: 0,
+						errorRate: 0,
+						firstUsedMs: null,
+						lastUsedMs: null,
+						registered: true,
+					})),
+			].sort((a, b) => (b.calls - a.calls) || String(a.name).localeCompare(String(b.name)))
+		: observed.map((skill) => ({ ...skill, registered: null }));
+	return {
+		...report,
+		skills: merged,
+		skillsRegistryAvailable: available,
+		skillRegisteredCount: available ? registered.length : null,
+		// 「一次没被调用」只在注册表可用时才有意义（否则分母本身是未知的）。
+		skillNeverUsedCount: available ? merged.filter((skill) => skill.calls === 0).length : null,
+		skillCount: merged.length,
+	};
 }
 
 // 全局 MCP 列表核心（list / getWorkspaceView 共用）。
@@ -1565,7 +1623,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 注册表，本插件只做投影与只读定位，

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.2.0";
+const PLUGIN_VERSION = "2.3.0";
 const USER_AGENT = `dsh-armory/${PLUGIN_VERSION} (+mcp-oauth)`;
 const NET_TIMEOUT_MS = 15_000;
 /** 授权流程整体存活时间：超过就判过期，避免会话表无限增长。 */

package/lib/tool-ledger.js

@@ -29,6 +29,8 @@ import { setImmediate } from "node:timers";
 
 const SESSIONS_DIR_SEGMENTS = [".dsh", "sessions"];
 const MCP_PREFIX = "mcp__";
+/** §6.4 宿主里「参数带名字」的内置工具：技能调用都从这里走。 */
+const SKILL_TOOL_NAME = "skill";
 /** 每处理这么多文件让出一次事件循环，避免大库扫描把宿主卡住。 */
 const YIELD_EVERY = 16;
 
@@ -60,6 +62,14 @@ const TEXT_CACHE_MAX_ENTRIES = 32;
  */
 const WIRE_TAX_MAX_KEYS = 64;
 
+/**
+ * §6.4 `callId → 技能名` 的映射上限。它只在「等结果回来把错误算到技能头上」这一件事上用，
+ * 而工具账本本来就为每个工具记着 `seenCallIds`，这里只是同一件事的技能版本。上限的作用与
+ * WIRE_TAX_MAX_KEYS 同理：日志长度不可控时不能让它无界增长；超出后停止登记新映射，
+ * 已登记的照常配对，未配对的错误数最多偏少（不会偏多）。
+ */
+const SKILL_CALL_MAP_MAX = 20_000;
+
 
 /** 把字节数格式化成 MB 文案，只用于诊断信息。 */
 function formatMB(bytes) {
@@ -235,6 +245,33 @@ function emptyToolRecord() {
 	return { calls: 0, results: 0, errors: 0, seenCallIds: new Set(), firstUsedMs: null, lastUsedMs: null };
 }
 
+/** §6.4 技能维度的调用账目：`skill` 工具每调一次，参数里就写着一个技能名。 */
+function emptySkillRecord() {
+	return { calls: 0, errors: 0, seenResultIds: new Set(), firstUsedMs: null, lastUsedMs: null };
+}
+
+/**
+ * 从 `skill` 工具的调用参数里取技能名。
+ * 参数是**字符串化的 JSON**（`{"name":"grill"}`），解不出来就不是一次可归属的调用：
+ * 这类情况必须单独计数（`skillCallsUnparsed`）而不是静默丢弃，否则界面上会表现为
+ * 「skill 有 N 次调用、但按技能的表是空的」这种自相矛盾的读数。
+ * @param {unknown} rawArguments
+ * @returns {string|null}
+ */
+function skillNameOf(rawArguments) {
+	if (typeof rawArguments !== "string") return null;
+	let parsed;
+	try {
+		parsed = JSON.parse(rawArguments);
+	} catch {
+		return null;
+	}
+	const name = parsed?.name;
+	if (typeof name !== "string") return null;
+	const trimmed = name.trim();
+	return trimmed === "" ? null : trimmed;
+}
+
 /**
  * 按前缀归属把工具名分类到 MCP 服务器。与 mcp-registry.js 的 toolInventory 同一判定：
  * `mcp__<server>__<tool>`；服务器名自身可能含下划线，取**最长**匹配的归属，匹配到多个
@@ -295,6 +332,13 @@ export async function scanSessionLedger({ days, mcpServerNames, schemas, disable
 	// 桶只存「窗口内的相对天序号」（0 = 最早一天，windowDays-1 = 今天），
 	// 由界面负责渲染；返回绝对日期反而让前端多一次时区换算的机会出错。
 	const dayBuckets = new Array(windowDays).fill(0);
+	// §6.4 技能维度：`skill` 工具是宿主里唯一「参数里带名字」的内置工具，所以同一个 callId
+	// 既属于工具 `skill`，也属于某个具体技能。两本账各记各的，互不覆盖——工具表看「skill 被
+	// 调了 59 次」，技能表看「grill 12 次、剩下 20 个一次没有」，两者回答的是不同的问题。
+	const skillUsage = new Map(); // skillName -> record
+	const skillCallOwner = new Map(); // callId -> skillName（只为把错误算到技能头上）
+	let totalSkillCalls = 0;
+	let skillCallsUnparsed = 0;
 	// §6.1 真实下发税的按天采样。`dayTaxKeys` 每个日桶只存**当天最后一次**请求的指纹（数字与
 	// 短串，不持有工具数组引用 —— 365 个日桶各留一份 234 项清单会常驻几十 MB，宿主主进程里不
 	// 可接受）；`wireTaxByKey` 存每个不同清单的税，只在指纹首次出现时算一次，上限 WIRE_TAX_MAX_KEYS
@@ -416,10 +460,42 @@ export async function scanSessionLedger({ days, mcpServerNames, schemas, disable
 							if (record.firstUsedMs === null || time < record.firstUsedMs) record.firstUsedMs = time;
 							if (record.lastUsedMs === null || time > record.lastUsedMs) record.lastUsedMs = time;
 						}
+						// §6.4 同一件事的技能版本：`skill` 的参数里带着技能名，按名字再记一笔。
+						// 解不出名字的调用单独计数，界面据此说明「有一部分调用无法归属」，
+						// 而不是让技能表的合计悄悄小于工具表里的 skill 调用数。
+						if (name === SKILL_TOOL_NAME) {
+							const skillName = skillNameOf(event.data?.arguments);
+							if (skillName === null) {
+								skillCallsUnparsed += 1;
+							} else {
+								let skillRecord = skillUsage.get(skillName);
+								if (!skillRecord) {
+									skillRecord = emptySkillRecord();
+									skillUsage.set(skillName, skillRecord);
+								}
+								skillRecord.calls += 1;
+								totalSkillCalls += 1;
+								if (callId && skillCallOwner.size < SKILL_CALL_MAP_MAX) skillCallOwner.set(callId, skillName);
+								if (time !== null) {
+									if (skillRecord.firstUsedMs === null || time < skillRecord.firstUsedMs) skillRecord.firstUsedMs = time;
+									if (skillRecord.lastUsedMs === null || time > skillRecord.lastUsedMs) skillRecord.lastUsedMs = time;
+								}
+							}
+						}
 					} else if (event.type === "tool/result") {
 						const message = event.data?.message;
 						const callId = typeof message?.toolCallId === "string" ? message.toolCallId : null;
 						if (!callId) continue;
+						// §6.4 技能错误先归账：结果事件只带 callId，工具那本账要靠遍历
+						// usage 反查，技能这本账直接查映射，成本更低且不受「调用在窗口外」影响。
+						const skillOwner = skillCallOwner.get(callId);
+						if (skillOwner !== undefined) {
+							const skillRecord = skillUsage.get(skillOwner);
+							if (skillRecord && !skillRecord.seenResultIds.has(callId)) {
+								skillRecord.seenResultIds.add(callId);
+								if (message.isError === true) skillRecord.errors += 1;
+							}
+						}
 						// 与 call 配对：同一 callId 的后续 result（重试/续写）不再重复计。
 						let owner = null;
 						for (const record of usage.values()) {
@@ -604,6 +680,23 @@ export async function scanSessionLedger({ days, mcpServerNames, schemas, disable
 		// 没有真实下发记录时为 null —— 界面必须把「不知道」和「差 0」分开呈现。
 		wireTaxDivergenceTokens: wireTaxLatest === null ? null : taxTotalTokens - wireTaxLatest.tokens,
 		tools,
+		// §6.4 技能维度账目。工具表回答「skill 这个工具被调了几次」，这里回答「哪些技能真的
+		// 被用过、各用了几次」——两者的合计**不要求相等**：参数解不出名字的调用单独进
+		// skillCallsUnparsed，让差异自己显形，而不是被悄悄吞掉。
+		// 排序与工具表同口径：调用多的在前，同调用数按名字排，保证两次扫描的先后一致。
+		skills: [...skillUsage]
+			.map(([name, record]) => ({
+				name,
+				calls: record.calls,
+				errors: record.errors,
+				errorRate: record.calls > 0 ? record.errors / record.calls : 0,
+				firstUsedMs: record.firstUsedMs,
+				lastUsedMs: record.lastUsedMs,
+			}))
+			.sort((a, b) => (b.calls - a.calls) || String(a.name).localeCompare(String(b.name))),
+		skillCalls: totalSkillCalls,
+		skillCallsUnparsed,
+		skillCount: skillUsage.size,
 	};
 }