dsh-desktop-enhance 0.3.10 → 0.3.12

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
@@ -1787,6 +1787,7 @@ window.__ModuleLoader__.load({
1787
1787
  sourceBadge: provider || source || "plugin"
1788
1788
  };
1789
1789
  }
1790
+ const rememberedSkills = new Map();
1790
1791
  function normalizeSkillCatalogItems(list, options) {
1791
1792
  const includeProject = options?.includeProject ?? true;
1792
1793
  const byName = new Map();
@@ -1805,7 +1806,7 @@ window.__ModuleLoader__.load({
1805
1806
  const modelInvocable = typeof row.modelInvocable === "boolean" ? row.modelInvocable : typeof invocation?.modelInvocable === "boolean" ? invocation.modelInvocable : true;
1806
1807
  const userInvocable = typeof row.userInvocable === "boolean" ? row.userInvocable : typeof invocation?.userInvocable === "boolean" ? invocation.userInvocable : true;
1807
1808
  const whenToUse = typeof row.whenToUse === "string" && row.whenToUse.trim() !== "" ? row.whenToUse.trim() : void 0;
1808
- byName.set(name, {
1809
+ const entry = {
1809
1810
  name,
1810
1811
  description,
1811
1812
  source,
@@ -1816,7 +1817,9 @@ window.__ModuleLoader__.load({
1816
1817
  ...whenToUse === void 0 ? {} : { whenToUse },
1817
1818
  modelInvocable,
1818
1819
  userInvocable
1819
- });
1820
+ };
1821
+ rememberedSkills.set(name, entry);
1822
+ byName.set(name, entry);
1820
1823
  }
1821
1824
  return [...byName.values()].sort((a, b) => compareCodeUnits(a.name, b.name));
1822
1825
  }
@@ -1835,12 +1838,44 @@ window.__ModuleLoader__.load({
1835
1838
  available: true
1836
1839
  };
1837
1840
  }
1841
+ function mergeMissingDisabledSkills(skills, disabled, options) {
1842
+ if (disabled.size === 0) return skills;
1843
+ const includeProject = options?.includeProject ?? true;
1844
+ const seen = new Set();
1845
+ for (const skill of skills) seen.add(skill.name);
1846
+ const missing = [];
1847
+ for (const rawName of disabled) {
1848
+ const name = typeof rawName === "string" ? rawName.trim() : "";
1849
+ if (name === "" || seen.has(name)) continue;
1850
+ seen.add(name);
1851
+ const remembered = rememberedSkills.get(name);
1852
+ if (remembered !== void 0) {
1853
+ if (!includeProject && remembered.scope === "project") continue;
1854
+ missing.push(remembered);
1855
+ continue;
1856
+ }
1857
+ const isOffice = name === "office" || name.startsWith("office-");
1858
+ missing.push({
1859
+ name,
1860
+ description: "",
1861
+ source: isOffice ? "bundled" : "user-agents",
1862
+ provider: isOffice ? "dsh-office" : "filesystem",
1863
+ scope: isOffice ? "plugin" : "global",
1864
+ sourceBadge: isOffice ? "dsh-office" : "~/.agents/skills",
1865
+ modelInvocable: true,
1866
+ userInvocable: true
1867
+ });
1868
+ }
1869
+ if (missing.length === 0) return skills;
1870
+ return [...skills, ...missing].sort((a, b) => compareCodeUnits(a.name, b.name));
1871
+ }
1838
1872
  function buildSkillScopeGroups(skills, disabled, query = "", options) {
1839
1873
  const includeProject = options?.includeProject ?? true;
1840
1874
  const needle = typeof query === "string" ? query.trim().toLowerCase() : "";
1875
+ const completeSkills = mergeMissingDisabledSkills(skills, disabled, { includeProject });
1841
1876
  const buckets = new Map();
1842
1877
  for (const scope of SKILL_SCOPE_ORDER) buckets.set(scope, []);
1843
- for (const skill of skills) {
1878
+ for (const skill of completeSkills) {
1844
1879
  if (!includeProject && skill.scope === "project") continue;
1845
1880
  if (needle !== "") {
1846
1881
  if (!(skill.name.toLowerCase().includes(needle) || skill.description.toLowerCase().includes(needle) || skill.sourceBadge.toLowerCase().includes(needle) || skill.provider.toLowerCase().includes(needle))) continue;
@@ -2666,7 +2701,7 @@ window.__ModuleLoader__.load({
2666
2701
  };
2667
2702
  }, []);
2668
2703
  const disabledSet = parseDisabledTools(disabledRaw);
2669
- const skills = catalog?.available ? catalog.skills : [];
2704
+ const skills = catalog?.available ? mergeMissingDisabledSkills(catalog.skills, disabledSet, { includeProject: false }) : [];
2670
2705
  const disabledInCatalog = skills.filter((skill) => disabledSet.has(skill.name));
2671
2706
  const enabledCount = skills.length - disabledInCatalog.length;
2672
2707
  const displayDisabledNames = skills.length > 0 ? disabledInCatalog.map((skill) => skill.name) : [...disabledSet];
@@ -4815,8 +4850,9 @@ window.__ModuleLoader__.load({
4815
4850
  const skillsDisabledSet = skillsEnabled ? skillsChannel.effectiveSet(sessionId) : new Set();
4816
4851
  const skillsDisabledCanonical = skillsEnabled ? formatDisabledTools(skillsDisabledSet) : "";
4817
4852
  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;
4853
+ const effectiveSkillsCatalog = skillsEnabled ? mergeMissingDisabledSkills(skillsCatalog, skillsDisabledSet) : skillsCatalog;
4854
+ const disabledSkillsInCatalog = skillsEnabled ? effectiveSkillsCatalog.filter((skill) => skillsDisabledSet.has(skill.name)) : [];
4855
+ const enabledSkillsCount = skillsEnabled ? effectiveSkillsCatalog.length - disabledSkillsInCatalog.length : 0;
4820
4856
  const clientProjection = currentClientProjection();
4821
4857
  const sections = buildSessionInfoSections(mergeSkillProjections(hostProjection, clientProjection), t);
4822
4858
  const totalItems = sections.reduce((sum, sec) => sum + sec.items.length, 0);
@@ -4836,7 +4872,7 @@ window.__ModuleLoader__.load({
4836
4872
  expandedToolNodes,
4837
4873
  skillsEnabled,
4838
4874
  skillsWritable,
4839
- skillsCount: skillsCatalog.length,
4875
+ skillsCount: effectiveSkillsCatalog.length,
4840
4876
  skillsDisabledCanonical,
4841
4877
  skillsCustomized,
4842
4878
  skillsSearchQuery,
@@ -4870,7 +4906,7 @@ window.__ModuleLoader__.load({
4870
4906
  const titleText = globalThis.document.createElement("span");
4871
4907
  if (minimized) {
4872
4908
  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)}`;
4909
+ 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
4910
  return `${sec.shortLabel} ${String(sec.items.length)}`;
4875
4911
  });
4876
4912
  if (toolsEnabled && toolsCatalog.length > 0) parts.push(`${t("sessionInfo.tools.short")} ${String(enabledToolsCount)}/${String(toolsCatalog.length)}`);
@@ -4969,7 +5005,7 @@ window.__ModuleLoader__.load({
4969
5005
  if (sec.id === "skills" && skillsEnabled) secEl.appendChild(buildSkillsSummaryControls({
4970
5006
  t,
4971
5007
  enabledSkillsCount,
4972
- totalSkillsCount: skillsCatalog.length,
5008
+ totalSkillsCount: effectiveSkillsCatalog.length,
4973
5009
  disabledInCatalog: disabledSkillsInCatalog,
4974
5010
  customized: skillsCustomized,
4975
5011
  popoverOpen: activePopover === "skills",
@@ -5042,7 +5078,7 @@ window.__ModuleLoader__.load({
5042
5078
  mountedSkillsPopover = syncSkillsPopover({
5043
5079
  root,
5044
5080
  t,
5045
- skillsCatalog,
5081
+ skillsCatalog: effectiveSkillsCatalog,
5046
5082
  disabledSet: skillsDisabledSet,
5047
5083
  disabledInCatalog: disabledSkillsInCatalog,
5048
5084
  customized: skillsCustomized,
package/lib/index.js CHANGED
@@ -1632,6 +1632,7 @@ function classifySkillScope(rawSource, rawProvider, rawPath) {
1632
1632
  sourceBadge: provider || source || "plugin"
1633
1633
  };
1634
1634
  }
1635
+ const rememberedSkills = new Map();
1635
1636
  function normalizeSkillCatalogItems(list, options) {
1636
1637
  const includeProject = options?.includeProject ?? true;
1637
1638
  const byName = new Map();
@@ -1650,7 +1651,7 @@ function normalizeSkillCatalogItems(list, options) {
1650
1651
  const modelInvocable = typeof row.modelInvocable === "boolean" ? row.modelInvocable : typeof invocation?.modelInvocable === "boolean" ? invocation.modelInvocable : true;
1651
1652
  const userInvocable = typeof row.userInvocable === "boolean" ? row.userInvocable : typeof invocation?.userInvocable === "boolean" ? invocation.userInvocable : true;
1652
1653
  const whenToUse = typeof row.whenToUse === "string" && row.whenToUse.trim() !== "" ? row.whenToUse.trim() : void 0;
1653
- byName.set(name, {
1654
+ const entry = {
1654
1655
  name,
1655
1656
  description,
1656
1657
  source,
@@ -1661,7 +1662,9 @@ function normalizeSkillCatalogItems(list, options) {
1661
1662
  ...whenToUse === void 0 ? {} : { whenToUse },
1662
1663
  modelInvocable,
1663
1664
  userInvocable
1664
- });
1665
+ };
1666
+ rememberedSkills.set(name, entry);
1667
+ byName.set(name, entry);
1665
1668
  }
1666
1669
  return [...byName.values()].sort((a, b) => compareCodeUnits(a.name, b.name));
1667
1670
  }
@@ -1811,10 +1814,15 @@ function installSkillsPolicy(ctx, readState) {
1811
1814
  const origList = typeof skillsService.list === "function" ? skillsService.list.bind(skillsService) : void 0;
1812
1815
  const origSnapshot = typeof skillsService.snapshot === "function" ? skillsService.snapshot.bind(skillsService) : void 0;
1813
1816
  const origGet = typeof skillsService.get === "function" ? skillsService.get.bind(skillsService) : void 0;
1817
+ const unfilteredList = origSnapshot !== void 0 ? async (options) => {
1818
+ const snap = await origSnapshot(options);
1819
+ return Array.isArray(snap?.skills) ? snap.skills : [];
1820
+ } : origList;
1821
+ if (unfilteredList !== void 0) rawSkillListMap.set(skillsService, unfilteredList);
1814
1822
  if (origList !== void 0) {
1815
- rawSkillListMap.set(skillsService, origList);
1823
+ const baseList = unfilteredList ?? origList;
1816
1824
  skillsService.list = async (options) => {
1817
- const items = await origList(options);
1825
+ const items = await baseList(options);
1818
1826
  const { enabled, disabled } = readState(resolveSessionIdFromScope(options?.scope, targetCtx));
1819
1827
  return filterSkillsList(items, enabled, disabled);
1820
1828
  };
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.12",
4
4
  "description": "DSH Desktop 界面增强:页内查找(Cmd+F)、轮次编号、上下文压缩行常显、建议、每步耗时、会话信息、工具管理、Skill 管理。",
5
5
 
6
6