@xxxyz/dsh-mcp-manager 2.1.5 → 2.2.1

package/README.md

@@ -16,12 +16,12 @@
 [![Node](https://img.shields.io/badge/node-%3E%3D18-339933?logo=node.js)](package.json)
 [![GitHub](https://img.shields.io/badge/GitHub-xxxyz%2FDeepSeekHarness--MCP--Manager-181717?logo=github)](https://github.com/xxxyz/DeepSeekHarness-MCP-Manager)
 [![dsh.market](https://img.shields.io/badge/dsh.market-%E2%9C%93-3fb950)](https://dsh.market)
-[![awesome-dsh-plugin](https://img.shields.io/badge/awesome--dsh--plugin-%E5%BE%85%E5%90%88%E5%B9%B6-ffd93d)](https://github.com/awesome-dsh-plugin/awesome-dsh-plugin/pull/2078)
+[![awesome-dsh-plugin](https://img.shields.io/badge/awesome--dsh--plugin-%E5%B7%B2%E6%94%B6%E5%BD%95-3fb950)](https://awesome-dsh-plugin.com)
 
 </div>
 
 <div align="center">
-  🛒 已收录于 <a href="https://dsh.market"><b>dsh.market</b></a> · 已提交 <a href="https://awesome-dsh-plugin.com"><b>awesome-dsh-plugin.com</b></a> 官方列表收录（<a href="https://github.com/awesome-dsh-plugin/awesome-dsh-plugin/pull/2078"><b>PR #2078</b></a> 待合并）
+  🛒 已收录于 <a href="https://dsh.market"><b>dsh.market</b></a> 与 <a href="https://awesome-dsh-plugin.com"><b>awesome-dsh-plugin.com</b></a> 官方插件列表（<a href="https://github.com/awesome-dsh-plugin/awesome-dsh-plugin/pull/2078"><b>PR #2078</b></a> 已合并）
 </div>
 
 <div align="center">
@@ -115,8 +115,8 @@ dsh plugin --profile web remove @xxxyz/dsh-mcp-manager
 
 打开 **设置 → Skills 管理**：
 
-- **浏览 / 搜索**：列出 DSH 全部技能，按来源分组（项目级 / 运行时 / 自定义 / 用户级 / 内置 / 插件自带），组内按 provider 折叠；搜索框实时过滤。
-- **启用 / 停用**：一键切换任意技能的启用状态——通过 rank-0 override provider（`dsh-mcp-manager-override`）实现，任何来源层级（含项目级）都能禁用。
+- **浏览 / 搜索**：列出 DSH 全部技能，按来源分组（项目级 / 运行时 / 自定义 / 用户级 / 内置 / 插件自带），组内按 provider 折叠；搜索框实时过滤。`~/.dsh/skills/` 下的用户级技能（2.2.0+）同样可见——即使官方 scoped 层不向无 scope 查询暴露它们。
+- **启用 / 停用**：一键切换任意技能的启用状态——通过 rank-0 override provider（`dsh-mcp-manager-override`）实现，任何来源层级（含项目级与用户级文件系统技能）都能禁用。
 - **持久化**：停用状态写入 `<profileDir>/dsh-skill-manager.json`，重启后保留；改动经 HMR 即时生效。
 
 ## ⚙️ 配置

package/README_EN.md

@@ -17,12 +17,12 @@
 [![Node](https://img.shields.io/badge/node-%3E%3D18-339933?logo=node.js)](package.json)
 [![GitHub](https://img.shields.io/badge/GitHub-xxxyz%2FDeepSeekHarness--MCP--Manager-181717?logo=github)](https://github.com/xxxyz/DeepSeekHarness-MCP-Manager)
 [![dsh.market](https://img.shields.io/badge/dsh.market-%E2%9C%93-3fb950)](https://dsh.market)
-[![awesome-dsh-plugin](https://img.shields.io/badge/awesome--dsh--plugin-pending-ffd93d)](https://github.com/awesome-dsh-plugin/awesome-dsh-plugin/pull/2078)
+[![awesome-dsh-plugin](https://img.shields.io/badge/awesome--dsh--plugin-listed-3fb950)](https://awesome-dsh-plugin.com)
 
 </div>
 
 <div align="center">
-  🛒 Listed on <a href="https://dsh.market"><b>dsh.market</b></a> · submitted to <a href="https://awesome-dsh-plugin.com"><b>awesome-dsh-plugin.com</b></a> (<a href="https://github.com/awesome-dsh-plugin/awesome-dsh-plugin/pull/2078"><b>PR #2078</b></a> pending merge)
+  🛒 Listed on <a href="https://dsh.market"><b>dsh.market</b></a> and the <a href="https://awesome-dsh-plugin.com"><b>awesome-dsh-plugin.com</b></a> official plugin list (<a href="https://github.com/awesome-dsh-plugin/awesome-dsh-plugin/pull/2078"><b>PR #2078</b></a> merged)
 </div>
 
 <div align="center">
@@ -116,8 +116,8 @@ Open **Settings → MCP 管理**:
 
 Open **Settings → Skills 管理**:
 
-- **Browse / Search**: lists every DSH skill grouped by source (project / runtime / custom / user / built-in / plugin-bundled), collapsed per provider; the search box filters live.
-- **Enable / Disable**: toggle any skill in one click — implemented with a rank-0 override provider (`dsh-mcp-manager-override`), so every source level (including project-level) can be disabled.
+- **Browse / Search**: lists every DSH skill grouped by source (project / runtime / custom / user / built-in / plugin-bundled), collapsed per provider; the search box filters live. User-level skills under `~/.dsh/skills/` (2.2.0+) are listed too — even though the official scoped layer never exposes them to scope-less queries.
+- **Enable / Disable**: toggle any skill in one click — implemented with a rank-0 override provider (`dsh-mcp-manager-override`), so every source level (including project-level and user-level filesystem skills) can be disabled.
 - **Persistence**: disabled state is written to `<profileDir>/dsh-skill-manager.json`, survives restarts, and applies live via HMR.
 
 ## ⚙️ Configuration

package/lib/index.js

@@ -115,21 +115,210 @@ export default {
             for (const name of await readState()) {
                 if (overrideSkills.has(name))
                     continue;
+                // Migrate pre-fix state entries: user-level skills are file-driven now
+                // (the scoped layer ignores global overrides), so rewrite the SKILL.md
+                // frontmatter and drop the stale state entry instead of creating an
+                // override that cannot shadow them.
+                const userDef = await findUserSkill(name);
+                if (userDef) {
+                    await editUserSkillInvocation(name, false);
+                    changed = true;
+                    continue;
+                }
                 const def = await ctx.skills.get(name);
                 if (!def)
                     continue;
                 overrideSkills.set(name, { ...def, provider: OVERRIDE_PROVIDER, invocation: { modelInvocable: false, userInvocable: false } });
                 changed = true;
             }
-            if (changed && skillProviderControl)
-                skillProviderControl.invalidate();
+            if (changed) {
+                await saveState([...overrideSkills.keys()]);
+                if (skillProviderControl)
+                    skillProviderControl.invalidate();
+            }
         }
         ;
         ctx.on('skills/change', () => { void ensureRestored(); });
+        // User-level skills (~/.dsh/skills/*/SKILL.md) are discovered by
+        // dsh-skill-filesystem in the agent-preset SCOPED layer, which a scope-less
+        // ctx.skills.snapshot({}) (global layer only) never reaches — so the
+        // management page would silently hide them. Scan the directory ourselves
+        // and merge into skill-list. Toggling still goes through the rank-0
+        // override above: it shadows by NAME, so it works across layers — but
+        // ctx.skills.get(name) is also scope-less, hence the scan fallback when
+        // synthesizing the override definition. DSH_MCP_MANAGER_SKILLS_DIR
+        // overrides the directory (used by tests).
+        function userSkillsDir(home, sep) {
+            const env = process.env.DSH_MCP_MANAGER_SKILLS_DIR;
+            return env && env.trim() ? env.trim() : home + sep + 'skills';
+        }
+        // Minimal SKILL.md frontmatter reader that MIRRORS the official
+        // dsh-skill-filesystem parse rules (so this page never lists a skill the
+        // / menu would reject):
+        //   * `name` and `description` are REQUIRED (non-empty) — no dir-name fallback
+        //   * legacy camelCase keys (`userInvocable` / `modelInvocable`) are REJECTED
+        //   * booleans accept true/1/yes/on vs false/0/no/off (case-insensitive);
+        //     any other value invalidates the whole entry
+        // Returns null for anything the official provider would skip.
+        function parseFrontmatterBoolean(val) {
+            const v = val.toLowerCase();
+            if (v === 'true' || v === '1' || v === 'yes' || v === 'on')
+                return true;
+            if (v === 'false' || v === '0' || v === 'no' || v === 'off')
+                return false;
+            return undefined;
+        }
+        function parseSkillFile(raw) {
+            const m = /^---\r?\n([\s\S]*?)\r?\n---/.exec(raw);
+            if (!m)
+                return null;
+            const fields = new Map();
+            for (const line of m[1].split(/\r?\n/)) {
+                const kv = /^([A-Za-z][\w-]*):\s*(.*)$/.exec(line.trim());
+                if (!kv)
+                    continue;
+                fields.set(kv[1], kv[2].trim().replace(/^['"]|['"]$/g, ''));
+            }
+            if (fields.has('userInvocable') || fields.has('modelInvocable'))
+                return null;
+            const name = fields.get('name');
+            const description = fields.get('description');
+            if (!name || description === undefined || description === '')
+                return null;
+            const fm = { name, description };
+            const wtu = fields.get('whenToUse') ?? fields.get('when-to-use');
+            if (wtu)
+                fm.whenToUse = wtu;
+            const ui = fields.get('user-invocable');
+            if (ui !== undefined) {
+                const b = parseFrontmatterBoolean(ui);
+                if (b === undefined)
+                    return null;
+                fm.userInvocable = b;
+            }
+            const dmi = fields.get('disable-model-invocation');
+            if (dmi !== undefined) {
+                const b = parseFrontmatterBoolean(dmi);
+                if (b === undefined)
+                    return null;
+                fm.disableModelInvocation = b;
+            }
+            const content = raw.slice(m[0].length).replace(/^\r?\n+/, '');
+            return { fm, content };
+        }
+        async function scanUserSkills() {
+            let dir;
+            let sep;
+            try {
+                const p = await ensurePaths();
+                sep = p.home.indexOf('\\') >= 0 ? '\\' : '/';
+                dir = userSkillsDir(p.home, sep);
+            }
+            catch (e) {
+                return [];
+            }
+            let entries = [];
+            try {
+                entries = await fs.listDir(await fs.resolve(dir));
+            }
+            catch (e) {
+                return [];
+            }
+            const rows = [];
+            const seen = new Set();
+            for (const ent of entries) {
+                const nm = String(ent.name || '');
+                if (!nm || nm === '.system')
+                    continue;
+                // Official parity (dsh-skill-filesystem discoverRoot): a directory entry
+                // points at `<dir>/SKILL.md`; a flat `*.md` file in the root is itself a
+                // skill. We cannot stat entry types through the fs service, so try the
+                // directory form first and fall back to the flat form for `.md` names.
+                let path = dir + sep + nm + sep + 'SKILL.md';
+                let directory = dir + sep + nm;
+                let raw = '';
+                try {
+                    raw = await fs.readText(await fs.resolve(path));
+                }
+                catch (e) {
+                    if (!nm.endsWith('.md'))
+                        continue;
+                    path = dir + sep + nm;
+                    directory = dir;
+                    try {
+                        raw = await fs.readText(await fs.resolve(path));
+                    }
+                    catch (e2) {
+                        continue;
+                    }
+                }
+                const parsed = parseSkillFile(raw);
+                if (!parsed) {
+                    console.warn(`[dsh-mcp-manager] user skill ${path} ignored: missing/invalid frontmatter (name+description required, kebab-case name, official boolean grammar)`);
+                    continue;
+                }
+                const { fm, content } = parsed;
+                if (!SKILL_NAME_RE.test(fm.name))
+                    continue;
+                if (seen.has(fm.name))
+                    continue;
+                seen.add(fm.name);
+                rows.push({
+                    name: fm.name,
+                    description: fm.description,
+                    ...(fm.whenToUse !== undefined ? { whenToUse: fm.whenToUse } : {}),
+                    invocation: { modelInvocable: fm.disableModelInvocation !== true, userInvocable: fm.userInvocable !== false },
+                    source: 'user-dsh',
+                    provider: 'filesystem',
+                    resourceBase: { kind: 'directory', path: directory },
+                    path,
+                    content,
+                });
+            }
+            return rows;
+        }
+        async function findUserSkill(name) {
+            return (await scanUserSkills()).find((s) => s.name === name);
+        }
         async function skillList() {
             await ensureRestored();
             const snap = await ctx.skills.snapshot({});
-            return { ok: true, skills: snap.skills, complete: snap.complete !== false };
+            const seen = new Set(snap.skills.map((s) => s.name));
+            const extra = (await scanUserSkills()).filter((s) => !seen.has(s.name));
+            const skills = snap.skills.concat(extra).sort((a, b) => (a.name < b.name ? -1 : a.name > b.name ? 1 : 0));
+            return { ok: true, skills, complete: snap.complete !== false };
+        }
+        // Toggle a USER-LEVEL filesystem skill by editing its SKILL.md frontmatter.
+        // This is the only mechanism that works: the rank-0 override provider lives
+        // in the global layer, but ctx.skills reads merge the viewing scope's chain
+        // and the scoped layer's filesystem entry WINS the duplicate name outright
+        // (collectFresh does `merged.set(name, entry)` per layer, last wins) — so an
+        // override can never hide a user skill from the / menu. Editing the source
+        // file makes the real dsh-skill-filesystem provider (which hot-reloads via
+        // its watcher) return the disabled invocation on every scope.
+        async function editUserSkillInvocation(name, enabled) {
+            const def = await findUserSkill(name);
+            if (!def || !def.path)
+                return { ok: false, error: '技能不存在: ' + name };
+            const raw = await fs.readText(await fs.resolve(def.path)).catch(() => '');
+            if (!raw)
+                return { ok: false, error: '无法读取技能文件: ' + def.path };
+            // Strip any existing invocation flags from the frontmatter block, then
+            // re-append the ones matching the requested state. Everything else —
+            // body content and other frontmatter keys — is preserved verbatim.
+            const fmMatch = /^---\r?\n([\s\S]*?)\r?\n---/.exec(raw);
+            if (!fmMatch)
+                return { ok: false, error: '技能文件缺少 frontmatter: ' + def.path };
+            const fmLines = fmMatch[1].split(/\r?\n/);
+            const rest = raw.slice(fmMatch[0].length);
+            const stripped = fmLines.filter((line) => !/^(user-invocable|disable-model-invocation):/i.test(line.trim()));
+            if (!enabled) {
+                stripped.push('user-invocable: false');
+                stripped.push('disable-model-invocation: true');
+            }
+            const next = '---\n' + stripped.join('\n') + '\n---' + rest;
+            await fs.writeText(await fs.resolve(def.path), next);
+            return { ok: true };
         }
         async function skillToggle(args) {
             const name = String(args.name || '').trim();
@@ -140,6 +329,18 @@ export default {
             await ensureRestored();
             const enabled = args.enabled !== false;
             return withWriteLock(async () => {
+                // User-level skills bypass the override provider entirely — editing the
+                // SKILL.md frontmatter is what makes the real provider (and thus the
+                // / menu) see the change.
+                const userDef = await findUserSkill(name);
+                if (userDef) {
+                    // Also drop a stale override row if one was created pre-fix.
+                    if (overrideSkills.delete(name)) {
+                        await saveState([...overrideSkills.keys()]);
+                        skillProviderControl?.invalidate();
+                    }
+                    return editUserSkillInvocation(name, enabled);
+                }
                 if (enabled) {
                     if (overrideSkills.delete(name)) {
                         await saveState([...overrideSkills.keys()]);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xxxyz/dsh-mcp-manager",
-  "version": "2.1.5",
+  "version": "2.2.1",
   "description": "DSH-standard MCP manager plugin: Settings UI + HTTP API + model-facing mcp_manager_* tools. Install with one command: dsh plugin --profile web add @xxxyz/dsh-mcp-manager@latest",
   "type": "module",
   "main": "lib/index.js",