dsh-skill-hub 0.3.2 → 0.3.4

package/lib/index.js

@@ -93,6 +93,10 @@ function clampNumber(value, min) {
 }
 /** HEX color validation shared by host routes and the settings card. */
 const HEX_COLOR_RE = /^#[0-9a-f]{6}$/i;
+/** 项目级技能来源（它们有 workspace 归属，不属于「个人」组）。 */
+function isProjectSource(source) {
+	return source === "project-dsh" || source === "project-agents";
+}
 //#endregion
 //#region src/store.ts
 /**
@@ -2022,10 +2026,6 @@ async function workspaceEntries(home) {
 		return [];
 	}
 }
-/** 项目技能来源（workspace 字段只对它们设置）。 */
-function isProjectSource(source) {
-	return source === "project-dsh" || source === "project-agents";
-}
 /**
 * Build the full catalog response (shared by catalog/toggle/create handlers).
 * 显式 cwd 只看该工作区；否则合并所有已知工作区（workspace.json）的项目技能

package/lib/types/client/grouping.d.ts

@@ -13,6 +13,8 @@
  * GUI resolves with a dialog; the helpers below compute both sides.
  */
 import type { CatalogSkill, CollectionGroup, SkillTag } from '../protocol.ts';
+import { isProjectSource } from '../protocol.ts';
+export { isProjectSource };
 /** Grouped switch state derived from member enablement. */
 export type GroupSwitchState = 'on' | 'off' | 'mixed';
 /** The derived switch view of one group. */
@@ -40,8 +42,6 @@ export declare function conflictsOnClose(members: readonly string[], enabledName
 }>): string[];
 /** Origin-repo filter value: skills with no source record (private skills). */
 export declare const PRIVATE_SOURCE = "private";
-/** 项目级技能来源（它们有 workspace 归属，不属于「个人」组）。 */
-export declare function isProjectSource(source: string): boolean;
 /**
  * Apply the origin filter ('all' or a specific origin repo; skills without a
  * source record count as PRIVATE_SOURCE). The origins map is the store's

package/lib/types/protocol.d.ts

@@ -722,3 +722,5 @@ export interface SourceTrashClearResponse {
         error: string;
     }>;
 }
+/** 项目级技能来源（它们有 workspace 归属，不属于「个人」组）。 */
+export declare function isProjectSource(source: string): boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-skill-hub",
-  "version": "0.3.2",
+  "version": "0.3.4",
   "description": "In-GUI skill hub for DeepSeek Harness (dsh): browse the full local skill catalog from the official ctx.skills registry (every root + third-party providers), toggle skills on/off, inspect bodies, surface frontmatter diagnostics, and scaffold new skills — plus a codex-style skill market (built-in catalog, upstream update checks, one-click update-all) with tracked source sync. The full manager beyond the read-only dsh-skill-manager browser.",
   "type": "module",
   "engines": {

package/src/client/grouping.ts

@@ -14,6 +14,9 @@
  */
 
 import type { CatalogSkill, CollectionGroup, SkillTag } from '../protocol.ts'
+import { isProjectSource } from '../protocol.ts'
+
+export { isProjectSource }
 
 /** Grouped switch state derived from member enablement. */
 export type GroupSwitchState = 'on' | 'off' | 'mixed'
@@ -69,11 +72,6 @@ export function conflictsOnClose(
 /** Origin-repo filter value: skills with no source record (private skills). */
 export const PRIVATE_SOURCE = 'private'
 
-/** 项目级技能来源（它们有 workspace 归属，不属于「个人」组）。 */
-export function isProjectSource(source: string): boolean {
-  return source === 'project-dsh' || source === 'project-agents'
-}
-
 /**
  * Apply the origin filter ('all' or a specific origin repo; skills without a
  * source record count as PRIVATE_SOURCE). The origins map is the store's

package/src/client/panel/MarketView.tsx

@@ -181,7 +181,6 @@ export function MarketView(props: { hub: SkillHubState }): JSX.Element {
         <section className={css.section} style={{ borderLeft: '3px solid var(--hub-model, #2f81f7)', background: 'rgba(47,129,247,0.04)' }}>
           <div className={css.sectionTitle + ' ' + css.sectionHeadRow} style={{ margin: '10px 14px 6px' }}>
             <span className={css.sectionTitleFill} style={{ display:'flex', alignItems:'center', gap:6 }}>
-              <span style={{ width:7, height:7, borderRadius:'50%', background:'var(--hub-model, #2f81f7)', display:'inline-block' }} />
               扫描结果
               <span style={{ fontWeight:400, opacity:.75 }}>
                 — {repoDiscoverState.status === 'ready' ? repoDiscoverState.data.repo : repoDiscoverState.status === 'error' ? (scanningRepo ?? '') : (scanningRepo ?? '')}

package/src/client/panel/SourcesView.tsx

@@ -16,89 +16,6 @@ import { GroupSummary } from './GroupSummary.tsx'
 import type { SkillHubState } from './useSkillHub.ts'
 import css from './panel.module.css'
 
-/** 项目级三级树：项目级 → 具体工作区（可折叠、可细分）→ .dsh/.agents。 */
-function ProjectTree(props: { hub: SkillHubState }): JSX.Element | null {
-  const { hub } = props
-  const { sorted, sourceFilter, origins, collapsedGroups, subdividedProjects, toggleGroupCollapse, toggleSubdivide } = hub
-  const projectSkills = filterBySource(sorted, sourceFilter, origins).filter((skill) => isProjectSource(skill.source))
-  if (projectSkills.length === 0) return null
-  // workspace 缺失（过渡态）时按 source 降级分组，避免空标题。
-  const byProject = new Map<string, { title: string; skills: typeof projectSkills }>()
-  for (const skill of projectSkills) {
-    const key = skill.workspace ?? skill.source
-    const entry = byProject.get(key)
-    if (entry === undefined) {
-      byProject.set(key, {
-        title: skill.workspaceTitle ?? skill.workspace ?? tt('groups.project'),
-        skills: [skill],
-      })
-    } else {
-      entry.skills.push(skill)
-    }
-  }
-  const topCollapsed = collapsedGroups.has('project')
-  return (
-    <section className={css.section}>
-      <div className={css.groupHead}>
-        <button type='button' className={css.disclosure} aria-expanded={!topCollapsed} onClick={() => { toggleGroupCollapse('project') }}>
-          <span className={css.chevron + (topCollapsed ? ' ' + css.chevronCollapsed : '')} />
-          <span className={css.groupTitle}>
-            {tt('groups.project')} · {byProject.size}
-          </span>
-        </button>
-      </div>
-      {!topCollapsed ? [...byProject.entries()].map(([key, proj]) => {
-        const projKey = 'project:' + key
-        const projCollapsed = collapsedGroups.has(projKey)
-        const subdivided = subdividedProjects.has(key)
-        return (
-          <div key={projKey} className={css.projectNest}>
-            <div className={css.groupHead}>
-              <button type='button' className={css.disclosure} aria-expanded={!projCollapsed} onClick={() => { toggleGroupCollapse(projKey) }}>
-                <span className={css.chevron + (projCollapsed ? ' ' + css.chevronCollapsed : '')} />
-                <span className={css.groupTitle}>
-                  {proj.title} · {proj.skills.length}
-                  <GroupSummary members={proj.skills.map((skill) => skill.name)} hub={hub} />
-                </span>
-              </button>
-              <span className={css.groupOps}>
-                <button type='button' className={css.opBtn} onClick={(event) => { event.stopPropagation(); toggleSubdivide(key) }}>
-                  {subdivided ? tt('groups.merge') : tt('groups.subdivide')}
-                </button>
-              </span>
-            </div>
-            {!projCollapsed ? (
-              subdivided ? (
-                <div className={css.projectNest}>
-                  {(['project-dsh', 'project-agents'] as const).map((source) => {
-                    const list = proj.skills.filter((skill) => skill.source === source)
-                    if (list.length === 0) return null
-                    const srcKey = projKey + ':' + source
-                    const srcCollapsed = collapsedGroups.has(srcKey)
-                    return (
-                      <div key={srcKey} className={css.projectNest}>
-                        <div className={css.groupHead}>
-                          <button type='button' className={css.disclosure} aria-expanded={!srcCollapsed} onClick={() => { toggleGroupCollapse(srcKey) }}>
-                            <span className={css.chevron + (srcCollapsed ? ' ' + css.chevronCollapsed : '')} />
-                            <span className={css.groupTitle}>
-                              {tt(('badge.source.' + source) as 'badge.source.project-dsh' | 'badge.source.project-agents')} · {list.length}
-                            </span>
-                          </button>
-                        </div>
-                        {!srcCollapsed ? list.map((skill) => <SkillRow key={skill.name} skill={skill} hub={hub} />) : null}
-                      </div>
-                    )
-                  })}
-                </div>
-              ) : proj.skills.map((skill) => <SkillRow key={skill.name} skill={skill} hub={hub} />)
-            ) : null}
-          </div>
-        )
-      }) : null}
-    </section>
-  )
-}
-
 export function SourcesView(props: { hub: SkillHubState }): JSX.Element {
   const { hub } = props
   const { catalog, groupsState, skillView, sourceFilter, origins, sorted, normalized, collapsedGroups, viewNames, sourceCheck, actionNames, checkingSource, syncingSource, batchBusy, busyNames, toggleGroupCollapse, checkSources, requestSync, requestDelete, requestDeleteGroup, toggleGroup, enableDisabled } = hub

package/src/client/panel/panel.module.css

@@ -24,7 +24,7 @@
 .sectionTitle { font-size: 13px; font-weight: 700; margin: 14px 16px 2px; }
 .groupHead { display: flex; align-items: center; gap: 8px; padding: 10px 14px; min-height: 44px; box-sizing: border-box; }
 .groupTitle { font-size: 13px; font-weight: 600; opacity: .92; flex: 1; min-width: 0; display: inline-flex; align-items: center; gap: 6px; line-height: 1; }
-.groupOps { flex: none; display: inline-flex; gap: 6px; align-items: center; }
+.groupOps { flex: none; display: inline-flex; gap: 6px; align-items: center; flex-wrap: wrap; }
 
 /* Small neutral pill buttons (group-level actions). */
 .opBtn { font-size: 11px; padding: 3px 11px; border-radius: 999px; border: none; background: rgba(128,128,128,.13); color: inherit; cursor: pointer; transition: background .15s ease; }
@@ -147,9 +147,6 @@
 /* Group title inner summary (count + last used) sits inline after the name. */
 .groupTitleInner { display: inline-flex; align-items: baseline; }
 
-/* Group ops row wraps on narrow widths; keep controls compact. */
-.groupOps { flex: none; display: inline-flex; gap: 6px; align-items: center; flex-wrap: wrap; }
-
 /* Source link inside group titles / rows. */
 .sourceLink { color: inherit; font-weight: 600; text-decoration: none; border-bottom: 1px dotted currentColor; opacity: .9; }
 .sourceLink:hover { opacity: 1; }

package/src/client/slash-dots.tsx

@@ -127,36 +127,45 @@ function dotIcon(color: string): InputTriggerCandidate['icon'] {
 function injectDotsViaDOM(modelByName: Map<string, boolean>, modelColor: string, userColor: string): void {
   if (typeof document === 'undefined' || typeof requestAnimationFrame === 'undefined') return
   const run = (): void => {
-    const options = document.querySelectorAll('[role="option"]')
+    // 仅处理斜杠菜单：通过 MenuView 的哈希类 `_3e4SsG_menu` 定位，避免误伤
+    // 面板内市场扫描/分组等其它 `[role="option"]` 列表
+    const menu = document.querySelector('[class*="_3e4SsG_menu"]') as HTMLElement | null
+    const listbox = menu?.querySelector('[role="listbox"]') ?? document.querySelector('[role="listbox"]')
+    // 若菜单未打开则不注入
+    if (listbox === null) return
+    const scope: ParentNode = listbox
+    const options = scope.querySelectorAll('[role="option"]')
     for (const opt of options) {
-      // 已注入则跳过（由 data 属性标记）
       if (opt.querySelector('[data-skill-dot]') !== null) continue
-      // 技能名在 .itemName 中，取文本匹配 catalog
       const nameEl = opt.querySelector('[class*="itemName"]') as HTMLElement | null
       if (nameEl === null) continue
       const name = (nameEl.textContent ?? '').trim()
       if (name.length === 0) continue
-      if (!modelByName.has(name) && nameEl.textContent !== name) continue // 保守：仅处理已知名
+      // 仅对技能生效：非技能候选（/command、@file 等）不在 catalog，不注点
+      if (!modelByName.has(name)) continue
       const color = (modelByName.get(name) ?? true) ? modelColor : userColor
+      // 复刻旧版 icon 槽：16×16 容器居中 6px 点，与升级前 `dotIcon` 在 `itemIcon` 内的效果一致
+      const wrapper = document.createElement('span')
+      wrapper.setAttribute('data-skill-dot', '')
+      wrapper.setAttribute('aria-hidden', 'true')
+      wrapper.style.width = '16px'
+      wrapper.style.height = '16px'
+      wrapper.style.display = 'inline-flex'
+      wrapper.style.justifyContent = 'center'
+      wrapper.style.alignItems = 'center'
+      wrapper.style.flex = 'none'
       const dot = document.createElement('span')
-      dot.setAttribute('data-skill-dot', '')
-      dot.setAttribute('aria-hidden', 'true')
       dot.style.display = 'inline-block'
       dot.style.width = '6px'
       dot.style.height = '6px'
       dot.style.borderRadius = '3px'
       dot.style.background = color
       dot.style.flex = 'none'
-      // 插在名称前；若存在 icon 槽则插在其后，兼容旧版结构
-      const iconEl = opt.querySelector('[class*="itemIcon"]')
-      if (iconEl !== null && iconEl.nextSibling !== null) {
-        iconEl.parentElement?.insertBefore(dot, iconEl.nextSibling)
-      } else {
-        nameEl.parentElement?.insertBefore(dot, nameEl)
-      }
+      wrapper.appendChild(dot)
+      // 新版无 icon 槽，直接插在名称前，与旧版 `itemIcon` 位置一致
+      nameEl.parentElement?.insertBefore(wrapper, nameEl)
     }
   }
-  // 菜单由 React 异步渲染，需等下一帧
   requestAnimationFrame(() => setTimeout(run, 0))
 }
 

package/src/protocol.ts

@@ -775,3 +775,8 @@ export interface SourceTrashClearResponse {
   /** 未能删除的技能（保留在回收站中）。 */
   failed: Array<{ name: string; error: string }>
 }
+
+/** 项目级技能来源（它们有 workspace 归属，不属于「个人」组）。 */
+export function isProjectSource(source: string): boolean {
+  return source === 'project-dsh' || source === 'project-agents'
+}

package/src/routes.ts

@@ -94,6 +94,7 @@ import {
   type ToggleResponse,
   type WritableRoot,
   HEX_COLOR_RE,
+  isProjectSource,
   resolveHubConfig,
 } from './protocol.ts'
 import { clearTrash, createSkill, disableSkill, enableSkill, restoreSkill, rootOfPath, rootPath, scanDiagnostics, trashSkill } from './skillfs.ts'
@@ -350,11 +351,6 @@ async function workspaceEntries(home: string): Promise<WorkspaceEntry[]> {
   }
 }
 
-/** 项目技能来源（workspace 字段只对它们设置）。 */
-function isProjectSource(source: string): boolean {
-  return source === 'project-dsh' || source === 'project-agents'
-}
-
 /**
  * Build the full catalog response (shared by catalog/toggle/create handlers).
  * 显式 cwd 只看该工作区；否则合并所有已知工作区（workspace.json）的项目技能