dsh-desktop-enhance 0.3.10 → 0.3.11

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/lib/client.js CHANGED
@@ -1835,12 +1835,37 @@ window.__ModuleLoader__.load({
1835
1835
  available: true
1836
1836
  };
1837
1837
  }
1838
+ function mergeMissingDisabledSkills(skills, disabled) {
1839
+ if (disabled.size === 0) return skills;
1840
+ const seen = new Set();
1841
+ for (const skill of skills) seen.add(skill.name);
1842
+ const missing = [];
1843
+ for (const rawName of disabled) {
1844
+ const name = typeof rawName === "string" ? rawName.trim() : "";
1845
+ if (name === "" || seen.has(name)) continue;
1846
+ seen.add(name);
1847
+ const isOffice = name === "office" || name.startsWith("office-");
1848
+ missing.push({
1849
+ name,
1850
+ description: "",
1851
+ source: isOffice ? "bundled" : "user-dsh",
1852
+ provider: isOffice ? "dsh-office" : "filesystem",
1853
+ scope: isOffice ? "plugin" : "global",
1854
+ sourceBadge: isOffice ? "dsh-office" : "~/.dsh/skills",
1855
+ modelInvocable: true,
1856
+ userInvocable: true
1857
+ });
1858
+ }
1859
+ if (missing.length === 0) return skills;
1860
+ return [...skills, ...missing].sort((a, b) => compareCodeUnits(a.name, b.name));
1861
+ }
1838
1862
  function buildSkillScopeGroups(skills, disabled, query = "", options) {
1839
1863
  const includeProject = options?.includeProject ?? true;
1840
1864
  const needle = typeof query === "string" ? query.trim().toLowerCase() : "";
1865
+ const completeSkills = mergeMissingDisabledSkills(skills, disabled);
1841
1866
  const buckets = new Map();
1842
1867
  for (const scope of SKILL_SCOPE_ORDER) buckets.set(scope, []);
1843
- for (const skill of skills) {
1868
+ for (const skill of completeSkills) {
1844
1869
  if (!includeProject && skill.scope === "project") continue;
1845
1870
  if (needle !== "") {
1846
1871
  if (!(skill.name.toLowerCase().includes(needle) || skill.description.toLowerCase().includes(needle) || skill.sourceBadge.toLowerCase().includes(needle) || skill.provider.toLowerCase().includes(needle))) continue;
@@ -2666,7 +2691,7 @@ window.__ModuleLoader__.load({
2666
2691
  };
2667
2692
  }, []);
2668
2693
  const disabledSet = parseDisabledTools(disabledRaw);
2669
- const skills = catalog?.available ? catalog.skills : [];
2694
+ const skills = catalog?.available ? mergeMissingDisabledSkills(catalog.skills, disabledSet) : [];
2670
2695
  const disabledInCatalog = skills.filter((skill) => disabledSet.has(skill.name));
2671
2696
  const enabledCount = skills.length - disabledInCatalog.length;
2672
2697
  const displayDisabledNames = skills.length > 0 ? disabledInCatalog.map((skill) => skill.name) : [...disabledSet];
@@ -4815,8 +4840,9 @@ window.__ModuleLoader__.load({
4815
4840
  const skillsDisabledSet = skillsEnabled ? skillsChannel.effectiveSet(sessionId) : new Set();
4816
4841
  const skillsDisabledCanonical = skillsEnabled ? formatDisabledTools(skillsDisabledSet) : "";
4817
4842
  const skillsCustomized = skillsEnabled && skillsChannel.isCustomized(sessionId);
4818
- const disabledSkillsInCatalog = skillsEnabled ? skillsCatalog.filter((skill) => skillsDisabledSet.has(skill.name)) : [];
4819
- const enabledSkillsCount = skillsEnabled ? skillsCatalog.length - disabledSkillsInCatalog.length : 0;
4843
+ const effectiveSkillsCatalog = skillsEnabled ? mergeMissingDisabledSkills(skillsCatalog, skillsDisabledSet) : skillsCatalog;
4844
+ const disabledSkillsInCatalog = skillsEnabled ? effectiveSkillsCatalog.filter((skill) => skillsDisabledSet.has(skill.name)) : [];
4845
+ const enabledSkillsCount = skillsEnabled ? effectiveSkillsCatalog.length - disabledSkillsInCatalog.length : 0;
4820
4846
  const clientProjection = currentClientProjection();
4821
4847
  const sections = buildSessionInfoSections(mergeSkillProjections(hostProjection, clientProjection), t);
4822
4848
  const totalItems = sections.reduce((sum, sec) => sum + sec.items.length, 0);
@@ -4836,7 +4862,7 @@ window.__ModuleLoader__.load({
4836
4862
  expandedToolNodes,
4837
4863
  skillsEnabled,
4838
4864
  skillsWritable,
4839
- skillsCount: skillsCatalog.length,
4865
+ skillsCount: effectiveSkillsCatalog.length,
4840
4866
  skillsDisabledCanonical,
4841
4867
  skillsCustomized,
4842
4868
  skillsSearchQuery,
@@ -4870,7 +4896,7 @@ window.__ModuleLoader__.load({
4870
4896
  const titleText = globalThis.document.createElement("span");
4871
4897
  if (minimized) {
4872
4898
  const parts = sections.map((sec) => {
4873
- if (sec.id === "skills" && skillsEnabled && skillsCatalog.length > 0) return !compact || disabledSkillsInCatalog.length > 0 ? `${sec.shortLabel} ${String(sec.items.length)} (${String(enabledSkillsCount)}/${String(skillsCatalog.length)})` : `${sec.shortLabel} ${String(sec.items.length)}`;
4899
+ if (sec.id === "skills" && skillsEnabled && effectiveSkillsCatalog.length > 0) return !compact || disabledSkillsInCatalog.length > 0 ? `${sec.shortLabel} ${String(sec.items.length)} (${String(enabledSkillsCount)}/${String(effectiveSkillsCatalog.length)})` : `${sec.shortLabel} ${String(sec.items.length)}`;
4874
4900
  return `${sec.shortLabel} ${String(sec.items.length)}`;
4875
4901
  });
4876
4902
  if (toolsEnabled && toolsCatalog.length > 0) parts.push(`${t("sessionInfo.tools.short")} ${String(enabledToolsCount)}/${String(toolsCatalog.length)}`);
@@ -4969,7 +4995,7 @@ window.__ModuleLoader__.load({
4969
4995
  if (sec.id === "skills" && skillsEnabled) secEl.appendChild(buildSkillsSummaryControls({
4970
4996
  t,
4971
4997
  enabledSkillsCount,
4972
- totalSkillsCount: skillsCatalog.length,
4998
+ totalSkillsCount: effectiveSkillsCatalog.length,
4973
4999
  disabledInCatalog: disabledSkillsInCatalog,
4974
5000
  customized: skillsCustomized,
4975
5001
  popoverOpen: activePopover === "skills",
@@ -5042,7 +5068,7 @@ window.__ModuleLoader__.load({
5042
5068
  mountedSkillsPopover = syncSkillsPopover({
5043
5069
  root,
5044
5070
  t,
5045
- skillsCatalog,
5071
+ skillsCatalog: effectiveSkillsCatalog,
5046
5072
  disabledSet: skillsDisabledSet,
5047
5073
  disabledInCatalog: disabledSkillsInCatalog,
5048
5074
  customized: skillsCustomized,
package/lib/index.js CHANGED
@@ -1811,10 +1811,15 @@ function installSkillsPolicy(ctx, readState) {
1811
1811
  const origList = typeof skillsService.list === "function" ? skillsService.list.bind(skillsService) : void 0;
1812
1812
  const origSnapshot = typeof skillsService.snapshot === "function" ? skillsService.snapshot.bind(skillsService) : void 0;
1813
1813
  const origGet = typeof skillsService.get === "function" ? skillsService.get.bind(skillsService) : void 0;
1814
+ const unfilteredList = origSnapshot !== void 0 ? async (options) => {
1815
+ const snap = await origSnapshot(options);
1816
+ return Array.isArray(snap?.skills) ? snap.skills : [];
1817
+ } : origList;
1818
+ if (unfilteredList !== void 0) rawSkillListMap.set(skillsService, unfilteredList);
1814
1819
  if (origList !== void 0) {
1815
- rawSkillListMap.set(skillsService, origList);
1820
+ const baseList = unfilteredList ?? origList;
1816
1821
  skillsService.list = async (options) => {
1817
- const items = await origList(options);
1822
+ const items = await baseList(options);
1818
1823
  const { enabled, disabled } = readState(resolveSessionIdFromScope(options?.scope, targetCtx));
1819
1824
  return filterSkillsList(items, enabled, disabled);
1820
1825
  };
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "dsh-desktop-enhance",
3
- "version": "0.3.10",
3
+ "version": "0.3.11",
4
4
  "description": "DSH Desktop 界面增强:页内查找(Cmd+F)、轮次编号、上下文压缩行常显、建议、每步耗时、会话信息、工具管理、Skill 管理。",
5
5
 
6
6