@morehao/dsh-skills-console 0.3.7 → 0.4.0

package/cordis.patch.yml

@@ -1,7 +1,8 @@
 # dsh-skills-console bundle patch
 #
 # 一个 Host half（lib/index.js）加一个 Web Client half（client.js）：
-# Host 负责 canonical 扫描 / 软链 / CLI 调用 / 订阅与更新事务，Client 在设置页渲染「技能」分区。
+# Host 负责清单扫描 / native installer 安装更新删除 / 软链 / 订阅与更新事务；
+# Client 在设置页渲染「技能控制台」（已安装 / 订阅两个 tab，可切到侧栏独立面板）。
 - insert:
     - id: dsh-skills-console
       name: '@morehao/dsh-skills-console'

package/lib/agent-table.json

@@ -1,331 +1,400 @@
 {
   "source": "skills CLI agents table",
+  "upstream": {
+    "name": "skills",
+    "version": "1.7.4",
+    "from": "dist/cli.mjs"
+  },
   "entries": [
     {
       "key": "adal",
       "name": "AdaL",
-      "dir": ".adal/skills"
+      "dir": ".adal/skills",
+      "universal": false
     },
     {
       "key": "aider-desk",
       "name": "AiderDesk",
-      "dir": ".aider-desk/skills"
+      "dir": ".aider-desk/skills",
+      "universal": false
     },
     {
       "key": "amp",
       "name": "Amp",
       "dir": "agents/skills",
-      "base": "config"
+      "base": "config",
+      "universal": true
     },
     {
       "key": "antigravity",
       "name": "Antigravity",
-      "dir": ".gemini/antigravity/skills"
+      "dir": ".gemini/antigravity/skills",
+      "universal": true
     },
     {
       "key": "antigravity-cli",
       "name": "Antigravity CLI",
-      "dir": ".gemini/antigravity-cli/skills"
+      "dir": ".gemini/antigravity-cli/skills",
+      "universal": true
     },
     {
       "key": "astrbot",
       "name": "AstrBot",
-      "dir": ".astrbot/data/skills"
+      "dir": ".astrbot/data/skills",
+      "universal": false
     },
     {
       "key": "augment",
       "name": "Augment",
-      "dir": ".augment/skills"
+      "dir": ".augment/skills",
+      "universal": false
     },
     {
       "key": "autohand-code",
       "name": "Autohand Code CLI",
-      "dir": ".autohand/skills"
+      "dir": ".autohand/skills",
+      "universal": false
     },
     {
       "key": "bob",
       "name": "IBM Bob",
-      "dir": ".bob/skills"
+      "dir": ".bob/skills",
+      "universal": false
     },
     {
       "key": "claude-code",
       "name": "Claude Code",
-      "dir": ".claude/skills"
+      "dir": ".claude/skills",
+      "universal": false
     },
     {
       "key": "codearts-agent",
       "name": "CodeArts Agent",
-      "dir": ".codeartsdoer/skills"
+      "dir": ".codeartsdoer/skills",
+      "universal": false
     },
     {
       "key": "codebuddy",
       "name": "CodeBuddy",
-      "dir": ".codebuddy/skills"
+      "dir": ".codebuddy/skills",
+      "universal": false
     },
     {
       "key": "codemaker",
       "name": "Codemaker",
-      "dir": ".codemaker/skills"
+      "dir": ".codemaker/skills",
+      "universal": false
     },
     {
       "key": "codestudio",
       "name": "Code Studio",
-      "dir": ".codestudio/skills"
+      "dir": ".codestudio/skills",
+      "universal": false
     },
     {
       "key": "command-code",
       "name": "Command Code",
-      "dir": ".commandcode/skills"
+      "dir": ".commandcode/skills",
+      "universal": false
     },
     {
       "key": "continue",
       "name": "Continue",
-      "dir": ".continue/skills"
+      "dir": ".continue/skills",
+      "universal": false
     },
     {
       "key": "cortex",
       "name": "Cortex Code",
-      "dir": ".snowflake/cortex/skills"
+      "dir": ".snowflake/cortex/skills",
+      "universal": false
     },
     {
       "key": "crush",
       "name": "Crush",
       "dir": "crush/skills",
-      "base": "config"
+      "base": "config",
+      "universal": false
     },
     {
       "key": "cursor",
       "name": "Cursor",
-      "dir": ".cursor/skills"
+      "dir": ".cursor/skills",
+      "universal": true
     },
     {
       "key": "deepagents",
       "name": "Deep Agents",
-      "dir": ".deepagents/agent/skills"
+      "dir": ".deepagents/agent/skills",
+      "universal": true
     },
     {
       "key": "devin",
       "name": "Devin for Terminal",
       "dir": "devin/skills",
-      "base": "config"
+      "base": "config",
+      "universal": false
     },
     {
       "key": "droid",
       "name": "Droid",
-      "dir": ".factory/skills"
+      "dir": ".factory/skills",
+      "universal": true
     },
     {
       "key": "firebender",
       "name": "Firebender",
-      "dir": ".firebender/skills"
+      "dir": ".firebender/skills",
+      "universal": true
     },
     {
       "key": "forgecode",
       "name": "ForgeCode",
-      "dir": ".forge/skills"
+      "dir": ".forge/skills",
+      "universal": false
     },
     {
       "key": "gemini-cli",
       "name": "Gemini CLI",
-      "dir": ".gemini/skills"
+      "dir": ".gemini/skills",
+      "universal": true
     },
     {
       "key": "github-copilot",
       "name": "GitHub Copilot",
-      "dir": ".copilot/skills"
+      "dir": ".copilot/skills",
+      "universal": true
     },
     {
       "key": "goose",
       "name": "Goose",
       "dir": "goose/skills",
-      "base": "config"
+      "base": "config",
+      "universal": false
     },
     {
       "key": "grok",
       "name": "Grok Build",
-      "dir": ".grok/skills"
+      "dir": ".grok/skills",
+      "universal": false
     },
     {
       "key": "hermes-agent",
       "name": "Hermes Agent",
-      "dir": ".hermes/skills"
+      "dir": ".hermes/skills",
+      "universal": false
     },
     {
       "key": "iflow-cli",
       "name": "iFlow CLI",
-      "dir": ".iflow/skills"
+      "dir": ".iflow/skills",
+      "universal": false
     },
     {
       "key": "inference-sh",
       "name": "inference.sh",
-      "dir": ".inferencesh/skills"
+      "dir": ".inferencesh/skills",
+      "universal": false
     },
     {
       "key": "jazz",
       "name": "Jazz",
-      "dir": ".jazz/skills"
+      "dir": ".jazz/skills",
+      "universal": false
     },
     {
       "key": "junie",
       "name": "Junie",
-      "dir": ".junie/skills"
+      "dir": ".junie/skills",
+      "universal": false
     },
     {
       "key": "kilo",
       "name": "Kilo Code",
-      "dir": ".kilo/skills"
+      "dir": ".kilo/skills",
+      "universal": true
     },
     {
       "key": "kimchi",
       "name": "Kimchi",
       "dir": "kimchi/harness/skills",
-      "base": "config"
+      "base": "config",
+      "universal": false
     },
     {
       "key": "kiro-cli",
       "name": "Kiro CLI",
-      "dir": ".kiro/skills"
+      "dir": ".kiro/skills",
+      "universal": false
     },
     {
       "key": "kode",
       "name": "Kode",
-      "dir": ".kode/skills"
+      "dir": ".kode/skills",
+      "universal": false
     },
     {
       "key": "lingma",
       "name": "Lingma",
-      "dir": ".lingma/skills"
+      "dir": ".lingma/skills",
+      "universal": false
     },
     {
       "key": "mcpjam",
       "name": "MCPJam",
-      "dir": ".mcpjam/skills"
+      "dir": ".mcpjam/skills",
+      "universal": false
     },
     {
       "key": "minimax-code",
       "name": "MiniMax Code",
-      "dir": ".minimax/skills"
+      "dir": ".minimax/skills",
+      "universal": false
     },
     {
       "key": "mistral-vibe",
       "name": "Mistral Vibe",
-      "dir": ".vibe/skills"
+      "dir": ".vibe/skills",
+      "universal": false
     },
     {
       "key": "moxby",
       "name": "Moxby",
-      "dir": ".moxby/skills"
+      "dir": ".moxby/skills",
+      "universal": false
     },
     {
       "key": "mux",
       "name": "Mux",
-      "dir": ".mux/skills"
+      "dir": ".mux/skills",
+      "universal": false
     },
     {
       "key": "neovate",
       "name": "Neovate",
-      "dir": ".neovate/skills"
+      "dir": ".neovate/skills",
+      "universal": false
     },
     {
       "key": "ona",
       "name": "Ona",
-      "dir": ".ona/skills"
+      "dir": ".ona/skills",
+      "universal": false
     },
     {
       "key": "openclaw",
       "name": "OpenClaw",
-      "dir": ".openclaw/skills"
+      "dir": ".openclaw/skills",
+      "universal": false
     },
     {
       "key": "opencode",
       "name": "OpenCode",
       "dir": "opencode/skills",
-      "base": "config"
+      "base": "config",
+      "universal": true
     },
     {
       "key": "openhands",
       "name": "OpenHands",
-      "dir": ".openhands/skills"
+      "dir": ".openhands/skills",
+      "universal": false
     },
     {
       "key": "pochi",
       "name": "Pochi",
-      "dir": ".pochi/skills"
+      "dir": ".pochi/skills",
+      "universal": false
     },
     {
       "key": "posit-assistant",
       "name": "Posit Assistant",
-      "dir": ".posit/assistant/skills"
+      "dir": ".posit/assistant/skills",
+      "universal": false
     },
     {
       "key": "qoder",
       "name": "Qoder",
-      "dir": ".qoder/skills"
+      "dir": ".qoder/skills",
+      "universal": false
     },
     {
       "key": "qoder-cn",
       "name": "Qoder CN",
-      "dir": ".qoder-cn/skills"
+      "dir": ".qoder-cn/skills",
+      "universal": false
     },
     {
       "key": "qwen-code",
       "name": "Qwen Code",
-      "dir": ".qwen/skills"
+      "dir": ".qwen/skills",
+      "universal": false
     },
     {
       "key": "reasonix",
       "name": "Reasonix",
-      "dir": ".reasonix/skills"
+      "dir": ".reasonix/skills",
+      "universal": false
     },
     {
       "key": "roo",
       "name": "Roo Code",
-      "dir": ".roo/skills"
+      "dir": ".roo/skills",
+      "universal": false
     },
     {
       "key": "rovodev",
       "name": "Rovo Dev",
-      "dir": ".rovodev/skills"
+      "dir": ".rovodev/skills",
+      "universal": false
     },
     {
       "key": "tabnine-cli",
       "name": "Tabnine CLI",
-      "dir": ".tabnine/agent/skills"
+      "dir": ".tabnine/agent/skills",
+      "universal": false
     },
     {
       "key": "terramind",
       "name": "Terramind",
-      "dir": ".terramind/skills"
+      "dir": ".terramind/skills",
+      "universal": false
     },
     {
       "key": "tinycloud",
       "name": "Tinycloud",
-      "dir": ".tinycloud/skills"
+      "dir": ".tinycloud/skills",
+      "universal": false
     },
     {
       "key": "trae",
       "name": "Trae",
-      "dir": ".trae/skills"
+      "dir": ".trae/skills",
+      "universal": false
     },
     {
       "key": "trae-cn",
       "name": "Trae CN",
-      "dir": ".trae-cn/skills"
+      "dir": ".trae-cn/skills",
+      "universal": false
     },
     {
       "key": "windsurf",
       "name": "Windsurf",
-      "dir": ".codeium/windsurf/skills"
+      "dir": ".codeium/windsurf/skills",
+      "universal": false
     },
     {
       "key": "zcode",
       "name": "ZCode",
-      "dir": ".zcode/skills"
+      "dir": ".zcode/skills",
+      "universal": false
     },
     {
       "key": "zencoder",
       "name": "Zencoder",
-      "dir": ".zencoder/skills"
+      "dir": ".zencoder/skills",
+      "universal": false
     }
   ]
 }

package/lib/core/agents.js

@@ -2,6 +2,7 @@ import fs from 'node:fs';
 import path from 'node:path';
 import { fileURLToPath } from 'node:url';
 import { projectSkillsDir } from './paths.js';
+import { dshScanRootPaths } from './roots.js';
 
 const here = path.dirname(fileURLToPath(import.meta.url));
 const table = JSON.parse(fs.readFileSync(path.join(here, '..', 'agent-table.json'), 'utf8'));
@@ -9,6 +10,32 @@ const table = JSON.parse(fs.readFileSync(path.join(here, '..', 'agent-table.json
 /** CLI agent 表里拥有独立目录的条目（`.agents/skills` 型的 universal 条目已排除，见 F23）。 */
 export const CLI_AGENT_DIRS = table.entries;
 
+/**
+ * 该 agent 是否**也**读 `~/.agents/skills`（共享根）。
+ *
+ * `'yes'` 表示「不必导出也看得见」；`'no'` 表示确实只读自己的目录；
+ * `'unknown'` 表示没验证过。表里的条目都是「有私有目录」的，所以默认 `unknown` ——
+ * 有私有目录**不等于**不读共享根：OpenCode / Cursor 都有私有目录，却也都读
+ * `~/.agents/skills`，这正是 v1 判断错的地方。要改某一行，先给出可复现的依据。
+ */
+export const SHARED_HOME_VERIFIED = Object.freeze({
+  // 权威来源是 `lib/agent-table.json` 的 `universal` 位（由 `npm run sync:agents`
+  // 从上游 skills CLI 的 `skillsDir === '.agents/skills'` 生成），这张表只放
+  // 表里没有、或需要人工推翻上游判断的条目。加条目时写清依据与日期。
+});
+
+const TABLE_BY_KEY = new Map(CLI_AGENT_DIRS.map((entry) => [entry.key, entry]));
+
+export function sharedHomeOf(key, entry = {}) {
+  if (entry.sharedHome === 'yes' || entry.sharedHome === 'no') return entry.sharedHome;
+  // 上游把「自己也读 `.agents/skills`」的 agent 标成 universal：安装只进 canonical，
+  // 不给它们建链。这一位就是「需不需要导出」的答案；调用方没带 entry 时回表里查。
+  const source = typeof entry.universal === 'boolean' ? entry : TABLE_BY_KEY.get(key) || entry;
+  if (source.universal === true) return 'yes';
+  if (source.universal === false) return 'no';
+  return SHARED_HOME_VERIFIED[key] || 'unknown';
+}
+
 export class UnknownTargetError extends Error {
   constructor(target) {
     super(`unknown target: ${target}`);
@@ -18,10 +45,42 @@ export class UnknownTargetError extends Error {
 }
 
 /**
- * 目标注册表：`dsh-global` / `dsh-project:<abs>` / `agent:<key>` / `custom:<id>`。
+ * 目标注册表：`dsh-global` / `project:<abs>` / `agent:<key>` / `custom:<id>`。
  * 发现只做 `lstat` 探测根目录是否存在，不递归；不接受调用方传路径（防穿越）。
  */
 export function createRegistry({ paths, getState, existsSync = fs.existsSync }) {
+  // 用户级 DSH 扫描根（项目级按 projectRoot 现算）。导出资格的唯一判据从这里派生，
+  // 不再靠 `kind === 'dsh'` 之类的身份判断。
+  const userScanRoots = new Set(dshScanRootPaths(paths));
+
+  /**
+   * 这个目录能不能作为导出目标？不能时给出原因（与 `exportSkills` 的 skip reason 同名）。
+   *
+   * - `shared-home`：目标就是 canonical 自己（多一层防御，表里已排除 universal 条目）；
+   * - `dsh-native-root`：目标是 DSH 的扫描根。往这里建链是把可见性伪装成链接，
+   *   而扫描根里本来就有真身（direct 模式）；导出在这里没有意义；
+   * - `shared-root`：该 Agent 自己也读 `~/.agents/skills`，装好就看得见。
+   */
+  function exportBlockedFor(dir, { sharedHome = 'unknown', projectRoot = null } = {}) {
+    const resolved = path.resolve(dir);
+    if (resolved === path.resolve(paths.userAgentsSkills)) return 'shared-home';
+    const scanRoots = projectRoot
+      ? new Set(dshScanRootPaths(paths, { projectRoot }))
+      : userScanRoots;
+    if (scanRoots.has(resolved)) return 'dsh-native-root';
+    if (sharedHome === 'yes') return 'shared-root';
+    return null;
+  }
+
+  /** 给条目补上导出资格：`exportable` 给 UI/筛选直接用，`exportBlocked` 给导出器当原因。 */
+  function withExport(entry, { projectRoot = null } = {}) {
+    const exportBlocked = exportBlockedFor(entry.dir, {
+      sharedHome: entry.sharedHome ?? 'unknown',
+      projectRoot,
+    });
+    return { ...entry, exportBlocked, exportable: exportBlocked === null };
+  }
+
   function customEntries() {
     const state = typeof getState === 'function' ? getState() : getState;
     return (state?.agents?.custom || []).filter((item) => item && item.id && item.dir);
@@ -35,8 +94,9 @@ export function createRegistry({ paths, getState, existsSync = fs.existsSync })
         key: 'dsh-global',
         label: 'dsh（全局）',
         dir: paths.dshGlobalSkills,
-        required: true,
-        note: '原生 user-dsh 根（rank 400），装完必建',
+        // DSH 在 direct 模式下必然读共享根（canonical 就是 rank 500）；canonical 被挪走时
+        // 这一位退回 unknown —— 那种情况本插件不提供可见性兜底（见 /diagnostics 的 warning）。
+        sharedHome: paths.canonicalScanned ? 'yes' : 'unknown',
       },
       ...CLI_AGENT_DIRS.map((entry) => ({
         target: `agent:${entry.key}`,
@@ -44,7 +104,7 @@ export function createRegistry({ paths, getState, existsSync = fs.existsSync })
         key: entry.key,
         label: entry.name,
         dir: path.join(entry.base === 'config' ? paths.configHome : paths.home, entry.dir),
-        required: false,
+        sharedHome: sharedHomeOf(entry.key, entry),
       })),
       ...customEntries().map((entry) => ({
         target: `custom:${entry.id}`,
@@ -52,20 +112,19 @@ export function createRegistry({ paths, getState, existsSync = fs.existsSync })
         key: entry.id,
         label: entry.label || entry.id,
         dir: entry.dir,
-        required: false,
+        sharedHome: 'unknown',
       })),
     ];
   }
 
   function projectEntry(projectRoot) {
-    return {
+    return withExport({
       target: `project:${projectRoot}`,
       kind: 'project',
       key: projectRoot,
       label: path.basename(projectRoot) || projectRoot,
       dir: projectSkillsDir(projectRoot),
-      required: false,
-    };
+    }, { projectRoot });
   }
 
   return {
@@ -80,6 +139,7 @@ export function createRegistry({ paths, getState, existsSync = fs.existsSync })
           seen.add(key);
           return true;
         })
+        .map((entry) => withExport(entry))
         .map((entry) => ({ ...entry, exists: existsSync(entry.dir) }));
     },
 
@@ -92,7 +152,6 @@ export function createRegistry({ paths, getState, existsSync = fs.existsSync })
       const entry = projectEntry(projectRoot);
       return { ...entry, exists: existsSync(entry.dir) };
     },
-
     resolve(target) {
       if (!target || typeof target !== 'string') throw new UnknownTargetError(target);
       if (target === 'dsh-global') return withExists(this.all().find((e) => e.target === 'dsh-global'));