dsh-skill-hub 0.3.6 → 0.3.7

package/src/client/panel/useSkillHub.ts

@@ -28,7 +28,7 @@ import type {
 import type { SkillHubApi } from '../api.ts'
 import { errorMessage, tt } from '../helpers.ts'
 import { conflictsOnClose, isProjectSource, PRIVATE_SOURCE, sortSkills, type SortKey, type GroupSwitchState } from '../grouping.ts'
-import type { BranchChoiceState, ConfirmDialogState, ConflictDialogState, MarketSyncDialogState } from './dialogs.tsx'
+import type { BranchChoiceState, ConfirmDialogState, ConflictDialogState, MarketSyncDialogState, VersionChoiceState } from './dialogs.tsx'
 
 /** Catalog poll interval while the panel is mounted (the provider watcher feeds this). */
 const POLL_MS = 5000
@@ -118,6 +118,7 @@ export function useSkillHub(api: SkillHubApi) {
   const [tab, setTab] = useState<'sources' | 'scenes' | 'market'>('sources')
   const [skillView, setSkillView] = useState<'flat' | 'groups'>('groups')
   const [sourceFilter, setSourceFilter] = useState('all')
+  const [invocationFilter, setInvocationFilter] = useState<'all' | 'model' | 'user'>('all')
   const [sortKey, setSortKey] = useState<SortKey>('name')
   const [marketState, setMarketState] = useState<MarketState>({ status: 'loading', repos: [] })
   const [marketCheck, setMarketCheck] = useState<Readonly<Record<string, MarketCheckResult>>>({})
@@ -145,8 +146,9 @@ export function useSkillHub(api: SkillHubApi) {
   const [newTagName, setNewTagName] = useState('')
   const [tagBusy, setTagBusy] = useState(false)
   const [editSearch, setEditSearch] = useState('')
-  /** 分组视图里收起的分组（key 为 tag:<id>、col:<name> 或 project 树键）。 */
+  /** 分组视图里收起的分组（key 为 tag:<id>、col:<name> 或 project 树键）。技能总数 >80 时首次加载自动折叠 personal。 */
   const [collapsedGroups, setCollapsedGroups] = useState<ReadonlySet<string>>(new Set())
+  const autoCollapsedPersonal = useRef(false)
   /** 项目级三级树里已细分（按 .dsh/.agents）的项目键。 */
   const [subdividedProjects, setSubdividedProjects] = useState<ReadonlySet<string>>(new Set())
   const [showLegend, setShowLegend] = useState(false)
@@ -174,6 +176,10 @@ export function useSkillHub(api: SkillHubApi) {
     try {
       const next = await api.catalog(workspace !== '' ? { cwd: workspace } : undefined)
       setCatalog(next)
+      if (!autoCollapsedPersonal.current && next.skills.length + next.disabled.length > 80) {
+        autoCollapsedPersonal.current = true
+        setCollapsedGroups((previous) => new Set(previous).add('uncategorized-source'))
+      }
       setLoadError(null)
     } catch (error) {
       setLoadError(errorMessage(error))
@@ -466,6 +472,27 @@ export function useSkillHub(api: SkillHubApi) {
     }
   }, [api, load, loadSources])
 
+  const [fixingPaths, setFixingPaths] = useState<ReadonlySet<string>>(new Set())
+  const fixDiagnostic = useCallback(async (path: string): Promise<void> => {
+    setFixingPaths((previous) => new Set(previous).add(path))
+    setLoadError(null)
+    try {
+      const confirmed = window.confirm(tt('diag.fixConfirm', { path }))
+      if (!confirmed) return
+      await api.fixDiagnostic(path)
+      await load()
+      setSuccessBanner(tt('diag.fixed'))
+    } catch (error) {
+      setLoadError(errorMessage(error))
+    } finally {
+      setFixingPaths((previous) => {
+        const next = new Set(previous)
+        next.delete(path)
+        return next
+      })
+    }
+  }, [api, load])
+
   /** 打开单个技能的删除确认（移入回收站，可恢复）。 */
   const requestDeleteSkill = useCallback((name: string): void => {
     setDeleteSkillDialog(name)
@@ -722,12 +749,14 @@ export function useSkillHub(api: SkillHubApi) {
         return
       }
       setRepoDiscoverState({ status: 'ready', data })
+      // The discover route may have auto-pinned the release; refresh the list so the ref badge shows.
+      void loadMarket()
     } catch (error) {
       setRepoDiscoverState({ status: 'error', message: errorMessage(error) })
     } finally {
       setScanningRepo(null)
     }
-  }, [api])
+  }, [api, loadMarket])
 
   /** 确认分支选择：持久化 ref 后重新扫描。 */
   const confirmBranchChoice = useCallback(async (): Promise<void> => {
@@ -745,6 +774,47 @@ export function useSkillHub(api: SkillHubApi) {
     }
   }, [api, branchChoice, scanRepo])
 
+  /** 版本对话框：打开时拉 releases + branches，确认后定版并重扫。 */
+  const [versionDialog, setVersionDialog] = useState<VersionChoiceState | null>(null)
+  const [versionBusy, setVersionBusy] = useState(false)
+  const openVersionDialog = useCallback(async (repo: string): Promise<void> => {
+    const current = marketState.repos.find((item) => item.repo === repo)?.ref
+    setVersionDialog({ repo, ...(current !== undefined ? { current } : {}), releases: [], branches: [], selected: current ?? '', custom: '', loading: true })
+    setLoadError(null)
+    try {
+      const data = await api.marketSourceVersions(repo)
+      setVersionDialog({
+        repo,
+        ...(data.current !== undefined ? { current: data.current } : {}),
+        releases: data.releases,
+        branches: data.branches,
+        selected: data.current ?? data.releases[0] ?? data.branches[0] ?? '',
+        custom: '',
+        loading: false,
+      })
+    } catch (error) {
+      setLoadError(errorMessage(error))
+      setVersionDialog(null)
+    }
+  }, [api, marketState])
+  const confirmVersionDialog = useCallback(async (): Promise<void> => {
+    if (versionDialog === null) return
+    const ref = versionDialog.custom.trim() !== '' ? versionDialog.custom.trim() : versionDialog.selected
+    if (ref === '') return
+    setVersionBusy(true)
+    setLoadError(null)
+    try {
+      await api.setMarketSourceRef(versionDialog.repo, ref)
+      setVersionDialog(null)
+      await loadMarket()
+      await scanRepo(versionDialog.repo)
+    } catch (error) {
+      setLoadError(errorMessage(error))
+    } finally {
+      setVersionBusy(false)
+    }
+  }, [api, versionDialog, loadMarket, scanRepo])
+
   /** Toggle one repo preview row. */
   const toggleRepoSelected = useCallback((path: string, checked: boolean): void => {
     setRepoSelected((previous) => {
@@ -989,29 +1059,44 @@ export function useSkillHub(api: SkillHubApi) {
     const hasPrivate = skills.some((skill) => origins[skill.name] === undefined && !isProjectSource(skill.source))
     return [...repos, ...(hasPrivate ? [PRIVATE_SOURCE] : [])]
   }, [catalog, origins])
-  const filtered = useMemo(() => (catalog?.skills ?? []).filter((skill) =>
-    normalized.length === 0 || skill.name.toLocaleLowerCase().includes(normalized) || skill.description.toLocaleLowerCase().includes(normalized),
-  ), [catalog, normalized])
+  const filtered = useMemo(() => (catalog?.skills ?? []).filter((skill) => {
+    if (invocationFilter === 'model' && !skill.invocation.modelInvocable) return false
+    if (invocationFilter === 'user' && !skill.invocation.userInvocable) return false
+    if (normalized.length === 0) return true
+    return skill.name.toLocaleLowerCase().includes(normalized)
+      || skill.description.toLocaleLowerCase().includes(normalized)
+      || skill.displayName?.toLocaleLowerCase().includes(normalized)
+      || skill.shortDescription?.toLocaleLowerCase().includes(normalized)
+  }), [catalog, normalized, invocationFilter])
+  /** Rows actually rendered with a shortened description (shortDescription in use). */
+  const shortenedCount = useMemo(() => filtered.filter((skill) => skill.shortDescription !== undefined).length, [filtered])
   /** 排序后的技能列表（所有视图共用；调用次数未知按 0 处理）。 */
   const sorted = useMemo(() => sortSkills(filtered, sortKey, (name) => uses.get(name)?.count), [filtered, sortKey, uses])
 
+  /** Clear the list filters (search + source + invocation) back to the full view. */
+  const clearListFilters = useCallback((): void => {
+    setSearch('')
+    setSourceFilter('all')
+    setInvocationFilter('all')
+  }, [])
+
   return {
     // state
     catalog, loading, loadError, successBanner, updateState, repoDiscoverState, scanningRepo, repoSelected, repoImporting, repoResult, importJobId,
     search, workspace, detail, detailLoading, busyNames, batchBusy, showForm, formName, formDesc, formRoot, formBusy, formMessage,
-    uses, hubConfig, tab, skillView, sourceFilter, sortKey, marketState, marketCheck, branchChoice, branchBusy,
+    uses, hubConfig, tab, skillView, sourceFilter, invocationFilter, sortKey, marketState, marketCheck, branchChoice, branchBusy,
     marketSyncDialog, syncingMarket, syncBusy, newSourceName, groupsState, sourcesState, sourceCheck, checkingSource, syncingSource,
     conflictDialog, confirmDialog, deleteSkillDialog, deleteGroupDialog, confirmClearTrash, updateAllDialog, editingTag, editName, membersDraft, newTagName, tagBusy,
-    editSearch, collapsedGroups, subdividedProjects, showLegend, editMode,
+    editSearch, collapsedGroups, subdividedProjects, showLegend, editMode, versionDialog, versionBusy,
     // derived
-    actionNames, viewNames, normalized, origins, sourceOptions, filtered, sorted,
+    actionNames, viewNames, normalized, origins, sourceOptions, filtered, sorted, shortenedCount,
     // actions + setters
     setLoadError, setSuccessBanner, setSearch, setWorkspace, setDetail, setShowForm, setFormName, setFormDesc, setFormRoot, setFormMessage,
     setRepoSelected, setTab, setSkillView,
-    setSourceFilter, setSortKey, setBranchChoice, setMarketSyncDialog, setNewSourceName, setConflictDialog, setConfirmDialog,
-    setDeleteSkillDialog, setDeleteGroupDialog, setConfirmClearTrash, setUpdateAllDialog, setEditingTag, setEditName, setMembersDraft, setNewTagName, setEditSearch, setShowLegend, setEditMode,
+    setSourceFilter, setInvocationFilter, setSortKey, setBranchChoice, setMarketSyncDialog, setNewSourceName, setConflictDialog, setConfirmDialog,
+    setDeleteSkillDialog, setDeleteGroupDialog, setConfirmClearTrash, setUpdateAllDialog, setEditingTag, setEditName, setMembersDraft, setNewTagName, setEditSearch, setShowLegend, setEditMode, setVersionDialog,
     toggleGroupCollapse, toggleSubdivide, checkUpdate, loadMarket, openDetail, toggle, enableDisabled, batchToggleNames, toggleGroup, resolveConflict,
-    runConfirmed, checkSources, requestSync, requestDelete, restoreTrash, clearTrash, requestDeleteSkill, runDeleteSkill, requestDeleteGroup, runDeleteGroup, createTag,
+    runConfirmed, checkSources, requestSync, requestDelete, restoreTrash, clearTrash, fixingPaths, fixDiagnostic, clearListFilters, openVersionDialog, confirmVersionDialog, requestDeleteSkill, runDeleteSkill, requestDeleteGroup, runDeleteGroup, createTag,
     deleteTag, saveTag, reorderTags, reorderCollections, reorderSourceGroups, addSource, addMarketSource, removeMarketSource, scanRepo, confirmBranchChoice, toggleRepoSelected, importRepo, cancelImport, clearScan,
     checkMarket, syncMarketSource, confirmMarketSync, updateAll, create,
   }

package/src/client/settings-card.tsx

@@ -89,48 +89,6 @@ export function PluginSettingsCard(props: PluginSettingsCardProps): ReactElement
   )
 }
 
-/** One staged boolean field: 继承 / 开 / 关. */
-export interface BooleanFieldProps {
-  id: string
-  label: string
-  hint: string
-  inheritLabel: string
-  onLabel: string
-  offLabel: string
-  overriddenLabel: string
-  resetLabel: string
-  disabled: boolean
-  text: string
-  overridden: boolean
-  onEdit: (text: string) => void
-  onReset: () => void
-}
-
-export function BooleanField(props: BooleanFieldProps): ReactElement {
-  return (
-    <div className={css.field}>
-      <div className={css.head}>
-        <label className={css.label} htmlFor={props.id}>{props.label}</label>
-        {props.overridden ? (
-          <span className={css.badges}>
-            <span className={css.badge}>{props.overriddenLabel}</span>
-            <button type='button' className={css.reset} disabled={props.disabled} onClick={props.onReset}>
-              {props.resetLabel}
-            </button>
-          </span>
-        ) : null}
-      </div>
-      <select id={props.id} className={css.input} value={props.text} disabled={props.disabled} onChange={(event) => { props.onEdit(event.target.value) }}>
-        <option value=''>{props.inheritLabel}</option>
-        <option value='true'>{props.onLabel}</option>
-        <option value='false'>{props.offLabel}</option>
-      </select>
-      <p className={css.hint}>{props.hint}</p>
-    </div>
-  )
-}
-
-
 /**
  * A compact sliding switch for the card's master enable/disable control.
  * An empty text value means the field inherits its default; the switch still

package/src/client/settings-form.ts

@@ -204,7 +204,7 @@ export class CardForm {
 
   private async store(field: string, value: unknown): Promise<boolean> {
     await this.scope.set(field, value)
-    return this.userLayer()?.[field] === value
+    return this.userRecord()?.[field] === value
   }
 
   private userRecord(): Record<string, unknown> | undefined {
@@ -233,10 +233,6 @@ export class CardForm {
     return typeof base === 'object' && base !== null ? (base as Record<string, unknown>)[field] : undefined
   }
 
-  private userLayer(): Record<string, unknown> | undefined {
-    return this.userRecord()
-  }
-
   private stored(field: string): boolean {
     const user = this.userRecord()
     return user !== undefined && Object.hasOwn(user, field)

package/src/protocol.ts

@@ -39,6 +39,8 @@ export const SKILL_HUB_API = {
   sourceDelete: '/api/skill-hub/sources/delete',
   sourceRestore: '/api/skill-hub/sources/restore',
   sourceTrashClear: '/api/skill-hub/sources/trash/clear',
+  diagnosticFix: '/api/skill-hub/diagnostic/fix',
+  marketSourceVersions: '/api/skill-hub/market/source/versions',
 } as const
 
 /** User-level roots the hub may write to (matches dsh-skill-filesystem ranks 400/500). */
@@ -71,6 +73,13 @@ export interface CatalogSkill {
   workspace?: string
   /** 工作区显示标题（来自 workspace.json；无则回退为路径）。 */
   workspaceTitle?: string
+  /** UI metadata from agents/openai.yaml (mirrors codex SkillInterface). */
+  displayName?: string
+  shortDescription?: string
+  brandColor?: string
+  iconSmall?: string
+  iconLarge?: string
+  defaultPrompt?: string
 }
 
 /** One disabled skill tracked by the hub sidecar (SKILL.md renamed away). */
@@ -88,6 +97,17 @@ export interface DiagnosticEntry {
   path: string
   root: string
   reason: string
+  /** Whether this diagnostic can be auto-fixed (e.g. unquoted colon). */
+  fixable?: boolean
+}
+
+/** POST /api/skill-hub/diagnostic/fix — repair a fixable diagnostic in place. */
+export interface DiagnosticFixRequest {
+  path: string
+}
+export interface DiagnosticFixResponse {
+  ok: true
+  path: string
 }
 
 /** GET /api/skill-hub/catalog */
@@ -103,6 +123,8 @@ export interface CatalogResponse {
   disabled: DisabledSkill[]
   /** Files in the writable roots the provider ignores, with reasons. */
   diagnostics: DiagnosticEntry[]
+  /** Skill names that appeared in multiple roots (first wins, others hidden). Mirrors codex name_counts. */
+  duplicateNames?: string[]
 }
 
 /** GET /api/skill-hub/skill */
@@ -120,6 +142,12 @@ export interface SkillDetail {
   updatedAt?: number
   /** Markdown instruction body. */
   content: string
+  displayName?: string
+  shortDescription?: string
+  brandColor?: string
+  iconSmall?: string
+  iconLarge?: string
+  defaultPrompt?: string
 }
 
 export interface SkillDetailResponse {
@@ -389,6 +417,18 @@ export interface MarketSourceRefRequest {
   ref: string
 }
 
+/** GET /api/skill-hub/market/source/versions?repo= — releases + branches for the version picker. */
+export interface MarketSourceVersionsResponse {
+  ok: true
+  repo: string
+  /** Currently pinned ref, when one is recorded. */
+  current?: string
+  /** Release tags, newest first (drafts excluded). */
+  releases: string[]
+  /** Branch names, default branch first. */
+  branches: string[]
+}
+
 /** GET /api/skill-hub/market/check — update check over market sources. */
 export interface MarketCheckResponse {
   ok: true
@@ -455,6 +495,8 @@ export interface RepoDiscoverResponse {
   /** Branch names to choose from when ref is null (default branch first). */
   branches?: string[]
   entries: RepoSkillEntry[]
+  /** GitHub truncated the tree; discovery is partial (mirrors codex walk_truncated). */
+  truncated?: boolean
 }
 
 /** POST /api/skill-hub/repo/import — install selected repo skills. */
@@ -507,14 +549,6 @@ export interface RepoImportCancelResponse {
   status: 'cancelled' | 'done'
 }
 
-/** @deprecated 旧同步响应，保留供类型兼容，实际已由 Progress 代替 */
-export interface RepoImportLegacyResponse {
-  ok: true
-  imported: Array<{ name: string; origin: string; path: string }>
-  skipped: Array<{ name: string; reason: 'exists' }>
-  failed: Array<{ name: string; error: string }>
-}
-
 /** GET /api/skill-hub/update — check the plugin's own latest GitHub release. */
 export interface UpdateCheckResponse {
   ok: true

package/src/repo.ts

@@ -67,6 +67,23 @@ export function githubAuthHeaders(): Record<string, string> {
   return githubToken === '' ? {} : { authorization: 'Bearer ' + githubToken }
 }
 
+/** ETag cache for GitHub API JSON (mirrors codex lib.rs marker+fingerprint). In-memory only, saves 304 for daily checks. */
+const etagCache = new Map<string, { etag: string; json: unknown }>()
+const ETAG_MAX = 200
+function etagCacheGet(url: string): { etag: string; json: unknown } | undefined {
+  return etagCache.get(url)
+}
+function etagCacheSet(url: string, etag: string, json: unknown): void {
+  if (etagCache.size >= ETAG_MAX) {
+    const first = etagCache.keys().next().value as string | undefined
+    if (first !== undefined) etagCache.delete(first)
+  }
+  etagCache.set(url, { etag, json })
+}
+export function clearEtagCache(): void {
+  etagCache.clear()
+}
+
 /**
  * Build a RepoFetchError; when the response shows an exhausted rate limit,
  * report the reset time instead of a bare HTTP status.
@@ -128,49 +145,50 @@ export function normalizeRepoInput(input: string): RepoRef | null {
  * tree is fetched at `ref ?? default_branch` so an explicit branch/tag scans
  * the exact same content a later download would fetch.
  */
-export async function loadRepoTree(repo: string, ref?: string, fetchImpl: typeof fetch = fetch): Promise<{ ref: string; tree: RepoTreeItem[] }> {
-  let metaResponse: Response
+async function fetchJsonCached(url: string, fetchImpl: typeof fetch, context: string): Promise<{ json: unknown; response: Response }> {
+  const cached = etagCacheGet(url)
+  const headers: Record<string, string> = { accept: 'application/vnd.github+json', ...githubAuthHeaders() }
+  if (cached !== undefined) headers['if-none-match'] = cached.etag
+  let response: Response
   try {
-    metaResponse = await fetchImpl(`https://api.github.com/repos/${repo}`, {
-      headers: { accept: 'application/vnd.github+json', ...githubAuthHeaders() },
-    })
+    response = await fetchImpl(url, { headers })
   } catch (error) {
-    throw new RepoFetchError('github request failed: ' + (error instanceof Error ? error.message : String(error)))
+    throw new RepoFetchError(context + ': ' + (error instanceof Error ? error.message : String(error)))
   }
-  if (!metaResponse.ok) throw fetchError('github repo not found or unavailable', metaResponse)
-
-  let meta: unknown
+  if (response.status === 304 && cached !== undefined) {
+    // Return cached JSON with a synthetic 200-like response for error mapping.
+    return { json: cached.json, response }
+  }
+  if (!response.ok) throw fetchError(context, response)
+  let json: unknown
   try {
-    meta = await metaResponse.json()
+    json = await response.json()
   } catch {
-    throw new RepoFetchError('invalid github repo response')
+    throw new RepoFetchError('invalid github response for ' + url)
   }
+  const etag = response.headers.get('etag')
+  if (etag !== null && etag !== '') etagCacheSet(url, etag, json)
+  return { json, response }
+}
+
+export async function loadRepoTree(repo: string, ref?: string, fetchImpl: typeof fetch = fetch): Promise<{ ref: string; tree: RepoTreeItem[]; truncated: boolean }> {
+  const metaUrl = `https://api.github.com/repos/${repo}`
+  const { json: metaJson } = await fetchJsonCached(metaUrl, fetchImpl, 'github repo not found or unavailable')
+  let meta: unknown = metaJson
   const record = typeof meta === 'object' && meta !== null ? meta as Record<string, unknown> : {}
   const defaultBranch = typeof record.default_branch === 'string' && record.default_branch !== '' ? record.default_branch : 'main'
   const treeRef = ref !== undefined && ref !== '' ? ref : defaultBranch
 
-  let treeResponse: Response
-  try {
-    treeResponse = await fetchImpl(`https://api.github.com/repos/${repo}/git/trees/${encodeURIComponent(treeRef)}?recursive=1`, {
-      headers: { accept: 'application/vnd.github+json', ...githubAuthHeaders() },
-    })
-  } catch (error) {
-    throw new RepoFetchError('github tree request failed: ' + (error instanceof Error ? error.message : String(error)))
-  }
-  if (!treeResponse.ok) throw fetchError('github tree not found', treeResponse)
-
-  let payload: unknown
-  try {
-    payload = await treeResponse.json()
-  } catch {
-    throw new RepoFetchError('invalid github tree response')
-  }
+  const treeUrl = `https://api.github.com/repos/${repo}/git/trees/${encodeURIComponent(treeRef)}?recursive=1`
+  const { json: payload } = await fetchJsonCached(treeUrl, fetchImpl, 'github tree not found')
   const treeRecord = typeof payload === 'object' && payload !== null ? payload as Record<string, unknown> : {}
-  if (treeRecord.truncated === true) throw new RepoFetchError('repo tree is too large to scan')
+  const truncated = treeRecord.truncated === true
   const tree = Array.isArray(treeRecord.tree) ? treeRecord.tree as RepoTreeItem[] : []
   // Report the ref the tree was actually fetched at: downloaders must use
   // this exact value so an explicit branch import never mixes trees.
-  return { ref: treeRef, tree }
+  // When truncated is true GitHub returned a partial tree; callers should
+  // surface a warning but still allow the partial discovery (mirrors codex walk_truncated).
+  return { ref: treeRef, tree, truncated }
 }
 
 /** Collect every file inside a skill directory, including SKILL.md itself. */
@@ -409,6 +427,30 @@ export async function getLatestReleaseTag(repo: string, fetchImpl: typeof fetch
   return typeof tag === 'string' && tag !== '' ? tag : undefined
 }
 
+/** Release tags of a repo, newest first (skips drafts, keeps prereleases). */
+export async function listRepoReleases(repo: string, fetchImpl: typeof fetch = fetch): Promise<string[]> {
+  let response: Response
+  try {
+    response = await fetchImpl(`https://api.github.com/repos/${repo}/releases?per_page=20`, {
+      headers: { accept: 'application/vnd.github+json', ...githubAuthHeaders() },
+    })
+  } catch (error) {
+    throw new RepoFetchError('github releases request failed: ' + (error instanceof Error ? error.message : String(error)))
+  }
+  if (!response.ok) throw fetchError('github releases lookup failed', response)
+  let payload: unknown
+  try {
+    payload = await response.json()
+  } catch {
+    throw new RepoFetchError('invalid github releases response')
+  }
+  if (!Array.isArray(payload)) return []
+  return payload
+    .filter((item): item is Record<string, unknown> => typeof item === 'object' && item !== null && (item as Record<string, unknown>).draft !== true)
+    .map((item) => item.tag_name)
+    .filter((tag): tag is string => typeof tag === 'string' && tag !== '')
+}
+
 /** Branch names of a repo, default branch first (one GitHub API request). */
 export async function listRepoBranches(repo: string, fetchImpl: typeof fetch = fetch): Promise<string[]> {
   let response: Response

package/src/routes.test.ts

@@ -178,6 +178,28 @@ describe('skill-hub routes', () => {
     expect(byName.get('shared-user')?.workspace).toBeUndefined()
   })
 
+  it('flags duplicate names only across distinct source/provider identities', async () => {
+    // 两个工作区快照返回同一个用户级技能：同一来源+提供者，不算重名。
+    await mkdir(join(home, 'storages'), { recursive: true })
+    await writeFile(join(home, 'storages', 'workspace.json'), JSON.stringify({
+      tables: { workspaces: { a: { title: 'Alpha', path: '/ws/a' }, b: { title: 'Beta', path: '/ws/b' } } },
+    }), 'utf8')
+    skills.snapshot = async () => ({
+      skills: [
+        summary({ name: 'shared-user', source: 'user-dsh', provider: 'skill-hub' }),
+        summary({ name: 'two-homes', source: 'custom', provider: 'openviking' }),
+        summary({ name: 'two-homes', source: 'user-dsh', provider: 'skill-hub' }),
+      ],
+      complete: true,
+    })
+    const res = new FakeResponse()
+    await routeFor(SKILL_HUB_API.catalog).handler(fakeReq('GET', SKILL_HUB_API.catalog), res as never)
+    expect(res.status).toBe(200)
+    const body = res.json() as CatalogResponse
+    // shared-user 在两个快照出现但身份一致 → 不标；two-homes 来源不同 → 标。
+    expect(body.duplicateNames ?? []).toEqual(['two-homes'])
+  })
+
   it('falls back across workspaces when fetching a project skill detail without cwd', async () => {
     await mkdir(join(home, 'storages'), { recursive: true })
     await writeFile(join(home, 'storages', 'workspace.json'), JSON.stringify({