@michengai/dsh-skills-manager 0.1.38 → 0.1.40

package/CHANGELOG.md

@@ -6,6 +6,12 @@ The five most recent published versions are listed below.
 
 ## Unreleased
 
+## 0.1.40 - 2026-09-05
+
+- 修复禁用的外部同名技能遮蔽已启用 DSH 技能的问题，统一管理页与运行时的赢家选择。
+- 冲突时为用户和项目级原生赢家提供作用域候选，保留禁用阻断、工作区隔离及来源文件不变性。
+- 显式声明作用域注册表回归所需的开发依赖，确保 CI 干净安装可执行完整检查。
+
 ## 0.1.38 - 2026-09-03
 
 - Added Cursor as a read-only, locally toggleable Skill source at `%USERPROFILE%\.cursor\skills`, with `DSH_CURSOR_HOME` override and state-file migration.

package/CHANGELOG.zh-CN.md

@@ -6,6 +6,12 @@
 
 ## 未发布
 
+## 0.1.40 - 2026-09-05
+
+- 修复禁用的外部同名技能遮蔽已启用 DSH 技能的问题，统一管理页与运行时的赢家选择。
+- 冲突时为用户和项目级原生赢家提供作用域候选，保留禁用阻断、工作区隔离及来源文件不变性。
+- 显式声明作用域注册表回归所需的开发依赖，确保 CI 干净安装可执行完整检查。
+
 ## 0.1.38 - 2026-09-03
 
 - 新增 Cursor 用户级只读技能来源，默认读取 `%USERPROFILE%\.cursor\skills`，支持 `DSH_CURSOR_HOME` 覆盖，并兼容迁移既有状态文件。

package/lib/core.js

@@ -1382,52 +1382,35 @@ async function listProviderCandidates(options = {}) {
   const candidates = [];
   const user = userRoots();
   const userScans = await scanDeduplicatedUserRoots(user);
-  for (const root of user) {
-    const scanned = userScans.get(root.key);
-    for (const entry of scanned.entries) {
-      if (!entry.loadable) continue;
-      const policy = effectiveSkillPolicy(policyResult, root, entry);
-      const needsOverlay = root.key !== "dsh" || policy.override !== void 0 || !entry.invocationPolicyValid || policyResult.writable === false;
-      if (!needsOverlay) continue;
-      candidates.push({
-        name: entry.declaredName,
-        description: entry.description,
-        invocation: { modelInvocable: policy.modelInvocable, userInvocable: policy.userInvocable },
-        provider: "dsh-skills-manager-external",
-        source: root.key === "dsh" ? "user-dsh" : `agent-${root.key}`,
-        rank: root.key === "dsh" ? USER_DSH_POLICY_RANK : entry.providerRank ?? root.rank,
-        locator: { rootKey: root.key, entryName: entry.name, path: entry.docPath, realEntryPath: entry.realEntryPath, realDocPath: entry.realDocPath },
-        resourceBase: { kind: "directory", path: entry.kind === "bundle" ? entry.realEntryPath : root.path },
-        path: entry.docPath,
-        metadata: { dshSkillsManager: { root: root.key, readOnly: !root.mutable, sourceReadOnly: !root.mutable, policyOnly: root.key === "dsh" } }
-      });
-    }
-  }
+  const items = user.flatMap((root) => userScans.get(root.key).entries.map((entry) => ({ root, entry })));
   const cwd = options && typeof options.cwd === "string" ? options.cwd : void 0;
   if (cwd) {
     const roots = await projectRoots([cwd]);
     for (const root of roots) {
       const scanned = await scanEntries(root.path);
-      for (const entry of scanned.entries) {
-        if (!entry.loadable) continue;
-        const policy = effectiveSkillPolicy(policyResult, root, entry);
-        const needsOverlay = policy.override !== void 0 || !entry.invocationPolicyValid || policyResult.writable === false;
-        if (!needsOverlay) continue;
-        candidates.push({
-          name: entry.declaredName,
-          description: entry.description,
-          invocation: { modelInvocable: policy.modelInvocable, userInvocable: policy.userInvocable },
-          provider: "dsh-skills-manager-external",
-          source: root.kind,
-          rank: root.rank - 1,
-          locator: { rootKey: root.key, entryName: entry.name, path: entry.docPath, realEntryPath: entry.realEntryPath, realDocPath: entry.realDocPath },
-          resourceBase: { kind: "directory", path: entry.kind === "bundle" ? entry.realEntryPath : root.path },
-          path: entry.docPath,
-          metadata: { dshSkillsManager: { root: root.key, readOnly: !root.mutable, sourceReadOnly: !root.mutable, policyOnly: true } }
-        });
-      }
+      for (const entry of scanned.entries) items.push({ root, entry });
     }
   }
+  for (const group of groupLoadableSkillsByName(items).values()) {
+    const { root, entry } = group[0];
+    const project = root.scope === "project";
+    const policyOnly = project || root.key === "dsh";
+    const policy = effectiveSkillPolicy(policyResult, root, entry);
+    const needsOverlay = !policyOnly || group.length > 1 || policy.override !== void 0 || !entry.invocationPolicyValid || policyResult.writable === false;
+    if (!needsOverlay) continue;
+    candidates.push({
+      name: entry.declaredName,
+      description: entry.description,
+      invocation: { modelInvocable: policy.modelInvocable, userInvocable: policy.userInvocable },
+      provider: "dsh-skills-manager-external",
+      source: project ? root.kind : root.key === "dsh" ? "user-dsh" : `agent-${root.key}`,
+      rank: project ? root.rank - 1 : root.key === "dsh" ? USER_DSH_POLICY_RANK : entry.providerRank ?? root.rank,
+      locator: { rootKey: root.key, entryName: entry.name, path: entry.docPath, realEntryPath: entry.realEntryPath, realDocPath: entry.realDocPath },
+      resourceBase: { kind: "directory", path: entry.kind === "bundle" ? entry.realEntryPath : root.path },
+      path: entry.docPath,
+      metadata: { dshSkillsManager: { root: root.key, readOnly: !root.mutable, sourceReadOnly: !root.mutable, policyOnly } }
+    });
+  }
   return candidates;
 }
 async function getProviderSkill(candidate, options = {}) {
@@ -1464,18 +1447,24 @@ async function getProviderSkill(candidate, options = {}) {
 function canonicalSkillName(item) {
   return item.entry.declaredName || item.entry.name;
 }
-function markWinners(items, options = {}) {
-  const winners = /* @__PURE__ */ new Map();
+function groupLoadableSkillsByName(items) {
+  const groups = /* @__PURE__ */ new Map();
   for (const item of [...items].sort((a, b) => a.root.rank - b.root.rank)) {
-    const canonicalName = canonicalSkillName(item);
     if (!item.entry.loadable) continue;
-    if (!winners.has(canonicalName)) {
-      winners.set(canonicalName, item);
-    } else if (options.markShadowed !== false) {
-      item.view.shadowedBy = { root: winners.get(canonicalName).root.key, name: winners.get(canonicalName).entry.name };
-    }
+    const name = canonicalSkillName(item);
+    const group = groups.get(name) || [];
+    group.push(item);
+    groups.set(name, group);
   }
-  for (const [canonicalName, winner] of winners) {
+  return groups;
+}
+function markWinners(items, options = {}) {
+  const winners = /* @__PURE__ */ new Map();
+  for (const [canonicalName, [winner, ...shadowed]] of groupLoadableSkillsByName(items)) {
+    winners.set(canonicalName, winner);
+    if (options.markShadowed !== false) {
+      for (const item of shadowed) item.view.shadowedBy = { root: winner.root.key, name: winner.entry.name };
+    }
     if (options.markWinner !== false) winner.view.winner = true;
     winner.view.enabled = winner.policy.enabled;
     winner.view.canonicalName = canonicalName;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@michengai/dsh-skills-manager",
-  "version": "0.1.38",
+  "version": "0.1.40",
   "description": "NPM-installable DSH Web plugin for safely loading and managing skills across DSH and common local Agents.",
   "license": "Apache-2.0",
   "repository": {
@@ -64,11 +64,13 @@
     "react": "^18.2.0"
   },
   "devDependencies": {
+    "@deepseek-ai/cordis": "4.0.2",
     "@deepseek-ai/dsh-client-locale": "0.1.2-rc.1",
     "@deepseek-ai/dsh-client-ui-primitives": "0.1.2-rc.1",
     "@deepseek-ai/dsh-client-ui-slots": "0.1.2-rc.1",
     "@deepseek-ai/dsh-host-webserver": "0.1.2-rc.1",
     "@deepseek-ai/dsh-session": "0.1.2-rc.1",
+    "@deepseek-ai/dsh-scope": "0.1.2-rc.1",
     "@deepseek-ai/dsh-skill": "0.1.2-rc.1",
     "@deepseek-ai/dsh-tools": "0.1.2-rc.1",
     "@deepseek-ai/dsh-web-app": "0.1.2-rc.1",