dsh-skill-hub 0.3.6 → 0.3.7

package/src/client/locales.ts

@@ -65,12 +65,22 @@ export const zh = {
   'market.branchTitle': '选择分支',
   'market.branchHint': '该仓库没有正式发布，选择要跟踪的分支（默认为 main）：',
   'market.branchConfirm': '确定',
+  'market.versionTitle': '切换跟踪版本',
+  'market.versionText': '选择 {repo} 要跟踪的版本，切换后建议重新扫描并同步已装技能',
+  'market.versionCurrent': '当前 {ref}',
+  'market.versionReleases': '发布版',
+  'market.versionBranches': '分支',
+  'market.versionCustom': '自定义（tag / 分支 / commit）',
+  'market.versionConfirm': '切换到 {ref}',
+  'market.versionHint': '点击切换跟踪版本',
+  'market.unpinned': '未定版',
   'market.syncTitle': '同步本地技能',
   'market.syncText': '市场源已对齐到 {ref}，要同步更新以下本地技能吗？',
   'market.syncNone': '该来源还没有导入本地技能。',
   'market.syncCancel': '跳过',
   'market.removeHint': '移除源不影响已安装的技能。',
   'repo.ready': '发现 {count} 个可导入技能',
+  'repo.truncated': '⚠ 仓库过大，仅展示部分技能（GitHub 截断），可缩小仓库或指定子目录',
   'repo.empty': '没有找到可导入技能。',
   'repo.selectAll': '全选',
   'repo.clearAll': '清空',
@@ -143,6 +153,26 @@ export const zh = {
   'row.enable': '启用',
   'row.delete': '移入回收站',
   'row.open': '查看 {name} 详情（回车）',
+  'row.duplicate': '重名',
+  'row.duplicateHint': '同名技能存在多个来源，当前显示为优先级最高的版本',
+  'row.copy': '复制',
+  'row.copyMention': '复制 $mention',
+  'row.copied': '已复制',
+  'row.copyPath': '复制路径',
+  'detail.copyMention': '复制 $mention',
+  'detail.copyPath': '复制路径',
+  'detail.copied': '已复制',
+  'diag.fix': '修复',
+  'diag.fixing': '修复中…',
+  'diag.fixed': '已修复',
+  'diag.fixConfirm': '用自动修复重写以下文件的 frontmatter？建议先备份：{path}',
+  'filter.invocation': '调用',
+  'filter.invocationAll': '全部调用',
+  'filter.modelOnly': '模型可调',
+  'filter.userOnly': '用户可调',
+  'filter.showing': '显示 {shown}/{total}（已启用）{filtered}',
+  'filter.filteredSuffix': ' · 已筛选',
+  'filter.shortened': '短描述 {count} 条，悬浮看全文',
   'delete.confirmTitle': '移入回收站？',
   'delete.confirmText': '确定把「{name}」移入回收站吗？可随时恢复。',
   'delete.confirm': '移入回收站',
@@ -291,12 +321,22 @@ export const en: Record<HubKey, string> = {
   'market.branchTitle': 'Choose a branch',
   'market.branchHint': 'This repo has no releases. Pick a branch to track (main by default):',
   'market.branchConfirm': 'Confirm',
+  'market.versionTitle': 'Switch tracked version',
+  'market.versionText': 'Pick the version for {repo} to track; rescan and sync installed skills afterwards',
+  'market.versionCurrent': 'current {ref}',
+  'market.versionReleases': 'Releases',
+  'market.versionBranches': 'Branches',
+  'market.versionCustom': 'Custom (tag / branch / commit)',
+  'market.versionConfirm': 'Switch to {ref}',
+  'market.versionHint': 'Click to switch the tracked version',
+  'market.unpinned': 'unpinned',
   'market.syncTitle': 'Update local skills',
   'market.syncText': 'Market source aligned to {ref}. Update these local skills?',
   'market.syncNone': 'No local skills tracked from this repo yet.',
   'market.syncCancel': 'Skip',
   'market.removeHint': 'Removing a source does not affect installed skills.',
   'repo.ready': '{count} importable skills found',
+  'repo.truncated': '⚠ Repo too large, only partial skills shown (GitHub truncated)',
   'repo.empty': 'No importable skills found.',
   'repo.selectAll': 'Select all',
   'repo.clearAll': 'Clear',
@@ -369,6 +409,26 @@ export const en: Record<HubKey, string> = {
   'row.enable': 'Enable',
   'row.delete': 'Move to trash',
   'row.open': 'View {name} details (Enter)',
+  'row.duplicate': 'duplicate',
+  'row.duplicateHint': 'Multiple sources provide this name; the highest-priority one is shown',
+  'row.copy': 'Copy',
+  'row.copyMention': 'Copy $mention',
+  'row.copied': 'Copied',
+  'row.copyPath': 'Copy path',
+  'detail.copyMention': 'Copy $mention',
+  'detail.copyPath': 'Copy path',
+  'detail.copied': 'Copied',
+  'diag.fix': 'Fix',
+  'diag.fixing': 'Fixing…',
+  'diag.fixed': 'Fixed',
+  'diag.fixConfirm': 'Rewrite the frontmatter of this file with the auto-fix? Back it up first: {path}',
+  'filter.invocation': 'Invocation',
+  'filter.invocationAll': 'All',
+  'filter.modelOnly': 'Model',
+  'filter.userOnly': 'User',
+  'filter.showing': 'Showing {shown}/{total} (enabled){filtered}',
+  'filter.filteredSuffix': ' · filtered',
+  'filter.shortened': '{count} short descriptions, hover for full text',
   'delete.confirmTitle': 'Move to trash?',
   'delete.confirmText': 'Move "{name}" to trash? It can be restored anytime.',
   'delete.confirm': 'Move to trash',

package/src/client/panel/DisabledRow.tsx

@@ -4,7 +4,7 @@
  * disabled section.
  */
 
-import type { JSX } from 'react'
+import type { JSX, KeyboardEvent } from 'react'
 import type { DisabledSkill, WritableRoot } from '../../protocol.ts'
 import { tt } from '../helpers.ts'
 import type { HubKey } from '../locales.ts'
@@ -15,18 +15,33 @@ function disabledSourceLabel(root: WritableRoot): string {
   return tt(('badge.source.' + root) as HubKey)
 }
 
-export function DisabledRow(props: { record: DisabledSkill; busy: boolean; onEnable: () => void }): JSX.Element {
-  const { record, busy, onEnable } = props
+export function DisabledRow(props: { record: DisabledSkill; busy: boolean; onEnable: () => void; duplicate?: boolean; onOpen?: () => void }): JSX.Element {
+  const { record, busy, onEnable, duplicate, onOpen } = props
+  /** 键盘打开详情：Enter 或空格。仅当焦点在行本身（而非行内开关）时生效。 */
+  const onKeyDown = (event: KeyboardEvent<HTMLDivElement>): void => {
+    if (onOpen === undefined || event.target !== event.currentTarget) return
+    if (event.key === 'Enter' || event.key === ' ') {
+      event.preventDefault()
+      onOpen()
+    }
+  }
   return (
-    <div className={css.row + ' ' + css.rowStatic}>
+    <div
+      className={css.row + (onOpen === undefined ? ' ' + css.rowStatic : '')}
+      role={onOpen === undefined ? undefined : 'button'}
+      tabIndex={onOpen === undefined ? undefined : 0}
+      aria-label={onOpen === undefined ? undefined : tt('row.open', { name: record.name })}
+      onClick={onOpen}
+      onKeyDown={onKeyDown}
+    >
       <div className={css.rowMain}>
-        <div className={css.rowName}>{record.name}</div>
-        <div className={css.rowDesc}>{record.description}</div>
+        <div className={css.rowName}>{record.name}{duplicate === true ? <span className={css.badge + ' ' + css.statusError} style={{ marginLeft: 6 }} title={tt('row.duplicateHint')}>{tt('row.duplicate')}</span> : null}</div>
+        <div className={css.rowDesc} title={record.description}>{record.description}</div>
       </div>
       <span className={css.badges}>
         <span className={css.badge + ' ' + css.badgeSource}>{disabledSourceLabel(record.root)}</span>
       </span>
-      <button type='button' role='switch' aria-checked={false} aria-label={tt('row.enable')} className={css.switch} disabled={busy} onClick={onEnable}><span className={css.switchThumb} /></button>
+      <button type='button' role='switch' aria-checked={false} aria-label={tt('row.enable')} className={css.switch} disabled={busy} onClick={(event) => { event.stopPropagation(); onEnable() }}><span className={css.switchThumb} /></button>
     </div>
   )
 }

package/src/client/panel/MarketView.tsx

@@ -78,7 +78,13 @@ export function MarketView(props: { hub: SkillHubState }): JSX.Element {
         <div className={css.rowMain}>
           <div className={css.rowName}>
             <a className={css.sourceLink} href={'https://github.com/' + record.repo} target='_blank' rel='noreferrer'>{record.repo}</a>
-            {record.ref !== undefined ? <span className={css.badge + ' ' + css.badgeSource}>{record.ref}</span> : null}
+            <button
+              type='button'
+              className={css.badge + ' ' + css.badgeSource}
+              style={{ cursor:'pointer', fontFamily:'inherit' }}
+              title={tt('market.versionHint')}
+              onClick={() => { void hub.openVersionDialog(record.repo) }}
+            >{record.ref ?? tt('market.unpinned')}</button>
             {installedCount > 0 ? <span className={css.badge + ' ' + css.badgeCount}>{tt('market.installed', { count: installedCount })}</span> : null}
             {hasSkillUpdate
               ? <span className={css.badge + ' ' + css.statusUpdated}>{tt('market.updatable', { count: skillCheck!.updated.length })}</span>
@@ -214,6 +220,7 @@ export function MarketView(props: { hub: SkillHubState }): JSX.Element {
         return (
           <>
             <p className={css.hintLine + ' ' + css.hintInline}>{tt('repo.ready', { count: entries.length })} · {repoDiscoverState.data.ref !== null ? `ref ${repoDiscoverState.data.ref}` : ''}</p>
+            {repoDiscoverState.data.truncated === true ? <div className={css.errorBanner} style={{ background:'rgba(210,153,34,0.08)', color:'#d29922', borderLeft:'3px solid #d29922' }}>{tt('repo.truncated')}</div> : null}
             {entries.length === 0 ? <div className={css.empty}>{tt('repo.empty')}</div> : (
               <>
                 {/* 搜索 + 过滤 + 统计 — 精简 */}

package/src/client/panel/ScenesView.tsx

@@ -88,7 +88,7 @@ export function ScenesView(props: { hub: SkillHubState }): JSX.Element {
               <>
                 {skills.map((skill) => <SkillRow key={skill.name} skill={skill} hub={hub} />)}
                 {disabledMembers.map((record) => (
-                  <DisabledRow key={record.name} record={record} busy={busyNames.has(record.name)} onEnable={() => { void enableDisabled(record) }} />
+                  <DisabledRow key={record.name} record={record} busy={busyNames.has(record.name)} duplicate={hub.catalog?.duplicateNames?.includes(record.name) === true} onEnable={() => { void enableDisabled(record) }} onOpen={() => { void hub.openDetail(record.name) }} />
                 ))}
               </>
             ) : null}

package/src/client/panel/SkillDetailView.tsx

@@ -5,9 +5,9 @@
  * panel stays the single owner of state.
  */
 
-import type { JSX } from 'react'
+import { useEffect, useRef, useState, type JSX } from 'react'
 import type { GroupsResponse, HubConfig, SkillDetail, SourceCheckResult, SourcesResponse } from '../../protocol.ts'
-import { tt } from '../helpers.ts'
+import { copyTextToClipboard, isDisplayNameDistinct, tt } from '../helpers.ts'
 import css from './panel.module.css'
 import { dotStyle, formatDateTime, shortSha } from './format.ts'
 import { SourceStatusBadge } from './SourceStatusBadge.tsx'
@@ -23,6 +23,10 @@ export interface SkillDetailViewProps {
   checkingSource: string | null
   syncingSource: string | null
   loading: boolean
+  /** Whether the skill is currently hub-disabled (served from the .disabled file). */
+  disabled?: boolean
+  /** Re-enable a hub-disabled skill. */
+  onEnable?: () => void
   onBack: () => void
   /** Check one source repo for upstream updates. */
   onCheck: (repo: string) => void
@@ -33,22 +37,38 @@ export interface SkillDetailViewProps {
 }
 
 export function SkillDetailView(props: SkillDetailViewProps): JSX.Element {
-  const { detail, hubConfig, uses, groupsState, sourcesState, sourceCheck, checkingSource, syncingSource, loading, onBack, onCheck, onSync, onFollowDelete } = props
+  const { detail, hubConfig, uses, groupsState, sourcesState, sourceCheck, checkingSource, syncingSource, loading, disabled, onEnable, onBack, onCheck, onSync, onFollowDelete } = props
   const detailSource = sourcesState?.sources.find((source) => source.skills.includes(detail.name))
   const detailCheck = detailSource !== undefined ? sourceCheck[detailSource.repo] : undefined
+  const [copied, setCopied] = useState<string | null>(null)
+  const copyTimer = useRef<number | undefined>(undefined)
+  useEffect(() => () => { window.clearTimeout(copyTimer.current) }, [])
+  const copyText = (text: string, key: string): void => {
+    void copyTextToClipboard(text).then((ok) => {
+      if (!ok) return
+      setCopied(key)
+      window.clearTimeout(copyTimer.current)
+      copyTimer.current = window.setTimeout(() => { setCopied(null) }, 1200)
+    })
+  }
   return (
     <div className={css.panel}>
       <div className={css.detailHead}>
         <button type='button' className={css.back} onClick={onBack}>{tt('detail.back')}</button>
-        <span className={css.detailName}>
+        <span className={css.detailName} style={{ display:'inline-flex', alignItems:'center', gap:6, flexWrap:'wrap' }}>
           {detail.name}
-          {/* 单一状态圆点：模型可调 → 蓝；否则用户可调 → 绿。与聊天 / 菜单同规则。 */}
+          {isDisplayNameDistinct(detail.name, detail.displayName) ? <span className={css.displayName} style={{ fontSize:13, marginLeft:0 }}>{detail.displayName}</span> : null}
           {detail.invocation.modelInvocable
             ? <span className={css.dot + ' ' + css.dotModel} style={dotStyle(hubConfig?.dotModelColor)} title={tt('legend.model')} />
             : detail.invocation.userInvocable
               ? <span className={css.dot + ' ' + css.dotUser} style={dotStyle(hubConfig?.dotUserColor)} title={tt('legend.user')} />
               : null}
         </span>
+        <span className={css.actions} style={{ marginLeft: 'auto', gap: 6 }}>
+          {disabled === true && onEnable !== undefined ? <button type='button' className={css.opBtn} role='switch' aria-checked={false} aria-label={tt('row.enable')} onClick={onEnable}>{tt('row.enable')}</button> : null}
+          <button type='button' className={css.opBtn} onClick={() => { copyText('$' + detail.name, 'mention') }}>{copied === 'mention' ? tt('detail.copied') : tt('detail.copyMention')}</button>
+          {detail.path !== undefined ? <button type='button' className={css.opBtn} onClick={() => { const path = detail.path; if (path !== undefined) copyText(path, 'path') }}>{copied === 'path' ? tt('detail.copied') : tt('detail.copyPath')}</button> : null}
+        </span>
       </div>
       <div className={css.detailMeta}>
         <div className={css.detailMetaLine}>{tt('detail.provider')}: {detail.provider}</div>
@@ -81,12 +101,16 @@ export function SkillDetailView(props: SkillDetailViewProps): JSX.Element {
             <button type='button' className={css.opBtn} disabled={checkingSource !== null} onClick={() => { onCheck(detailSource.repo) }}>
               {checkingSource === detailSource.repo ? tt('source.checking') : tt('source.check')}
             </button>
-            <button type='button' className={css.opBtn} disabled={syncingSource !== null} onClick={() => { onSync(detailSource.repo, [detail.name]) }}>
-              {syncingSource === detailSource.repo ? tt('source.syncing') : tt('source.sync')}
-            </button>
-            {detailCheck?.deleted.includes(detail.name) === true
-              ? <button type='button' className={css.opBtn + ' ' + css.opDanger} onClick={() => { onFollowDelete(detailSource.repo, [detail.name]) }}>{tt('source.followDelete')}</button>
-              : null}
+            {disabled !== true ? (
+              <>
+                <button type='button' className={css.opBtn} disabled={syncingSource !== null} onClick={() => { onSync(detailSource.repo, [detail.name]) }}>
+                  {syncingSource === detailSource.repo ? tt('source.syncing') : tt('source.sync')}
+                </button>
+                {detailCheck?.deleted.includes(detail.name) === true
+                  ? <button type='button' className={css.opBtn + ' ' + css.opDanger} onClick={() => { onFollowDelete(detailSource.repo, [detail.name]) }}>{tt('source.followDelete')}</button>
+                  : null}
+              </>
+            ) : null}
           </div>
         </div>
       ) : (

package/src/client/panel/SkillHubPanel.tsx

@@ -24,7 +24,7 @@ import { TagEditorView } from './TagEditorView.tsx'
 import { SourcesView } from './SourcesView.tsx'
 import { ScenesView } from './ScenesView.tsx'
 import { MarketView } from './MarketView.tsx'
-import { BranchChoiceDialog, ConfirmDialog, ConflictDialog, MarketSyncDialog } from './dialogs.tsx'
+import { BranchChoiceDialog, ConfirmDialog, ConflictDialog, MarketSyncDialog, VersionChoiceDialog } from './dialogs.tsx'
 import { useSkillHub } from './useSkillHub.ts'
 import css from './panel.module.css'
 
@@ -51,10 +51,12 @@ export function SkillHubPanel(props: SkillHubPanelProps): React.JSX.Element {
     checkUpdate, loadMarket, checkSources, requestSync, requestDelete, restoreTrash, clearTrash, runDeleteSkill, runDeleteGroup,
     runConfirmed, resolveConflict, confirmBranchChoice, confirmMarketSync, create, saveTag, deleteTag, enableDisabled,
   } = hub
+  const { shortenedCount, fixingPaths, clearListFilters } = hub
 
   // -------------------------------------------------------------- detail
 
   if (detail !== null) {
+    const disabledRecord = catalog?.disabled.find((record) => record.name === detail.name)
     return (
       <SkillDetailView
         detail={detail}
@@ -66,6 +68,8 @@ export function SkillHubPanel(props: SkillHubPanelProps): React.JSX.Element {
         checkingSource={checkingSource}
         syncingSource={syncingSource}
         loading={detailLoading}
+        disabled={disabledRecord !== undefined}
+        onEnable={disabledRecord !== undefined ? () => { void enableDisabled(disabledRecord).then(() => { setDetail(null) }) } : undefined}
         onBack={() => { setDetail(null) }}
         onCheck={(repo) => { void checkSources(repo) }}
         onSync={requestSync}
@@ -126,6 +130,7 @@ export function SkillHubPanel(props: SkillHubPanelProps): React.JSX.Element {
             </span>
           : null}
         {catalog !== null && !catalog.complete ? <span className={css.hint}>{tt('panel.incomplete')}</span> : null}
+        {catalog !== null && (catalog.duplicateNames?.length ?? 0) > 0 ? <button type='button' className={css.opBtn} title={tt('row.duplicateHint')} onClick={() => { clearListFilters() }}>⚠ {tt('row.duplicate')}×{(catalog.duplicateNames ?? []).length}</button> : null}
         <span className={css.actions}>
           <button type='button' className={css.button} disabled={updateState.status === 'checking'} title={updateTitle} onClick={() => { void checkUpdate() }}>{updateState.status === 'checking' ? tt('update.checking') : tt('update.check')}</button>
           {updateState.status === 'ready' && updateState.data.updateAvailable && updateState.data.url !== null
@@ -234,9 +239,20 @@ export function SkillHubPanel(props: SkillHubPanelProps): React.JSX.Element {
               <option value='added'>{tt('sort.added')}</option>
               <option value='uses'>{tt('sort.uses')}</option>
             </select>
+            <select className={css.select} value={hub.invocationFilter} onChange={(event) => { hub.setInvocationFilter(event.target.value as 'all' | 'model' | 'user') }}>
+              <option value='all'>{tt('filter.invocationAll')}</option>
+              <option value='model'>{tt('filter.modelOnly')}</option>
+              <option value='user'>{tt('filter.userOnly')}</option>
+            </select>
             <input className={css.search} value={search} onChange={(event) => { setSearch(event.target.value) }} placeholder={tt('panel.search')} />
             <button type='button' className={css.button + (editMode ? ' ' + css.primary : '')} style={{ marginLeft:'auto' }} onClick={() => setEditMode((v) => !v)}>{editMode ? '完成' : '编辑'}</button>
           </div>
+          {catalog !== null && (filtered.length !== catalog.skills.length || hub.invocationFilter !== 'all' || sourceFilter !== 'all') ? (
+            <div className={css.hintLine} style={{ margin: '2px 2px 0', display:'flex', gap:8, flexWrap:'wrap' }}>
+              <span>{tt('filter.showing', { shown: filtered.length, total: catalog.skills.length, filtered: hub.invocationFilter !== 'all' || sourceFilter !== 'all' ? tt('filter.filteredSuffix') : '' })}</span>
+              {shortenedCount > 0 ? <span title={tt('filter.shortened', { count: shortenedCount })}>{tt('filter.shortened', { count: shortenedCount })}</span> : null}
+            </div>
+          ) : null}
 
           {filtered.length === 0 && search.trim() !== '' ? <div className={css.empty}>{tt('panel.empty')}</div> : null}
           {filtered.length === 0 && search.trim() === '' && catalog.skills.length === 0 && catalog.disabled.length === 0 && catalog.diagnostics.length === 0
@@ -267,9 +283,20 @@ export function SkillHubPanel(props: SkillHubPanelProps): React.JSX.Element {
             <section className={css.section}>
               <div className={css.sectionTitle}>{tt('panel.diagnostics')}</div>
               {catalog.diagnostics.map((entry) => (
-                <div key={entry.path} className={css.diagRow}>
-                  <div className={css.diagPath}>{entry.path}</div>
-                  <div className={css.diagReason}>{entry.reason}</div>
+                <div key={entry.path} className={css.diagRow} style={{ display:'flex', alignItems:'flex-start', gap:10 }}>
+                  <div style={{ flex:1, minWidth:0 }}>
+                    <div className={css.diagPath}>{entry.path}</div>
+                    <div className={css.diagReason}>{entry.reason}</div>
+                  </div>
+                  {entry.fixable === true ? (
+                    <button
+                      type='button'
+                      className={css.opBtn}
+                      disabled={fixingPaths.has(entry.path)}
+                      onClick={() => { void hub.fixDiagnostic(entry.path) }}
+                      style={{ flex:'none', alignSelf:'center' }}
+                    >{fixingPaths.has(entry.path) ? tt('diag.fixing') : tt('diag.fix')}</button>
+                  ) : null}
                 </div>
               ))}
             </section>
@@ -310,6 +337,17 @@ export function SkillHubPanel(props: SkillHubPanelProps): React.JSX.Element {
         />
       ) : null}
 
+      {hub.versionDialog !== null ? (
+        <VersionChoiceDialog
+          choice={hub.versionDialog}
+          busy={hub.versionBusy}
+          onSelect={(selected) => { hub.setVersionDialog({ ...hub.versionDialog!, selected }) }}
+          onCustom={(custom) => { hub.setVersionDialog({ ...hub.versionDialog!, custom }) }}
+          onCancel={() => { hub.setVersionDialog(null) }}
+          onConfirm={() => { void hub.confirmVersionDialog() }}
+        />
+      ) : null}
+
       {marketSyncDialog !== null ? (
         <MarketSyncDialog
           dialog={marketSyncDialog}

package/src/client/panel/SkillRow.tsx

@@ -6,7 +6,7 @@
 import type { JSX, KeyboardEvent } from 'react'
 import type { CatalogSkill } from '../../protocol.ts'
 import { IconTrashOutline16 } from '../icons.tsx'
-import { tt } from '../helpers.ts'
+import { isDisplayNameDistinct, tt } from '../helpers.ts'
 import { dotStyle, relativeTimeText } from './format.ts'
 import type { SkillHubState } from './useSkillHub.ts'
 import css from './panel.module.css'
@@ -16,6 +16,7 @@ export function SkillRow(props: { skill: CatalogSkill; hub: SkillHubState }): JS
   const stat = hub.uses.get(skill.name)
   const count = stat?.count ?? 0
   const lastUsed = stat?.lastUsed
+  const isDuplicate = hub.catalog?.duplicateNames?.includes(skill.name) === true
   /** 单一状态圆点：模型可调 → 蓝；否则用户可调 → 绿。与聊天 / 菜单同规则。 */
   const dot = skill.invocation.modelInvocable
     ? <span className={css.dot + ' ' + css.dotModel} style={dotStyle(hub.hubConfig?.dotModelColor)} title={tt('legend.model')} />
@@ -42,11 +43,13 @@ export function SkillRow(props: { skill: CatalogSkill; hub: SkillHubState }): JS
       <div className={css.rowMain}>
         <div className={css.rowName}>
           <span className={css.rowNameText}>{skill.name}</span>
+          {isDisplayNameDistinct(skill.name, skill.displayName) ? <span className={css.displayName} title={skill.displayName}>{skill.displayName}</span> : null}
           {count > 0 && hub.hubConfig?.showUseCount !== false ? <span className={css.useCount}>{count}</span> : null}
           {dot}
+          {isDuplicate ? <span className={css.badge + ' ' + css.statusError} title={tt('row.duplicateHint')}>{tt('row.duplicate')}</span> : null}
           {lastUsed !== undefined && hub.hubConfig?.showUseTime !== false ? <span className={css.useTime}>{relativeTimeText(lastUsed)}</span> : null}
         </div>
-        <div className={css.rowDesc}>{skill.description}</div>
+        <div className={css.rowDesc} title={skill.description}>{skill.shortDescription ?? skill.description}</div>
       </div>
       {skill.writable
         ? <>

package/src/client/panel/SourcesView.tsx

@@ -61,21 +61,6 @@ export function SourcesView(props: { hub: SkillHubState }): JSX.Element {
     next.splice(to, 0, moved)
     void hub.reorderSourceGroups(next)
   }
-  // 兼容旧逻辑：若用户拖的是 collection 且未使用顶层排序，回退到 collectionReorder（保留旧数据兼容）
-  const handleCollectionDropLegacy = (targetName: string): void => {
-    // 仅当顶层排序未启用时（storedTopOrder 为空）才用旧接口
-    if ((groupsState?.sourceGroupOrder?.length ?? 0) > 0) { handleTopDrop('col:' + targetName); return }
-    const dragCol = topDragKey !== null && topDragKey.startsWith('col:') ? topDragKey.slice(4) : null
-    if (dragCol === null || dragCol === targetName || groupsState === null) return
-    const names = groupsState.collections.map((c) => c.name)
-    const from = names.indexOf(dragCol)
-    const to = names.indexOf(targetName)
-    if (from === -1 || to === -1) return
-    const next = [...names]
-    const [moved] = next.splice(from, 1)
-    next.splice(to, 0, moved)
-    void hub.reorderCollections(next)
-  }
 
   // 空状态：没有任何分组时提示
   const isEmptyTop = !hasProject && collections.length === 0 && !hasPersonal
@@ -230,7 +215,7 @@ export function SourcesView(props: { hub: SkillHubState }): JSX.Element {
               <>
                 {skills.map((skill) => <SkillRow key={skill.name} skill={skill} hub={hub} />)}
                 {disabledMembers.map((record) => (
-                  <DisabledRow key={record.name} record={record} busy={busyNames.has(record.name)} onEnable={() => { void enableDisabled(record) }} />
+                  <DisabledRow key={record.name} record={record} busy={busyNames.has(record.name)} duplicate={catalog?.duplicateNames?.includes(record.name) === true} onEnable={() => { void enableDisabled(record) }} onOpen={() => { void hub.openDetail(record.name) }} />
                 ))}
               </>
             ) : null}
@@ -272,7 +257,7 @@ export function SourcesView(props: { hub: SkillHubState }): JSX.Element {
               {!collapsed ? (
                 <>
                   {uncategorized.map((skill) => <SkillRow key={skill.name} skill={skill} hub={hub} />)}
-                  {personalDisabled.map((record) => (<DisabledRow key={record.name} record={record} busy={busyNames.has(record.name)} onEnable={() => { void enableDisabled(record) }} />))}
+                  {personalDisabled.map((record) => (<DisabledRow key={record.name} record={record} busy={busyNames.has(record.name)} duplicate={catalog?.duplicateNames?.includes(record.name) === true} onEnable={() => { void enableDisabled(record) }} onOpen={() => { void hub.openDetail(record.name) }} />))}
                 </>
               ) : null}
             </section>

package/src/client/panel/dialogs.tsx

@@ -35,6 +35,17 @@ export interface BranchChoiceState {
   selected: string
 }
 
+/** Version picker for a market source: releases + branches + custom ref. */
+export interface VersionChoiceState {
+  repo: string
+  current?: string
+  releases: string[]
+  branches: string[]
+  selected: string
+  custom: string
+  loading: boolean
+}
+
 /** Post-sync skill update dialog: which tracked skills to refresh. */
 export interface MarketSyncDialogState {
   repo: string
@@ -148,6 +159,56 @@ export function BranchChoiceDialog(props: {
   )
 }
 
+/** Version picker: switch a market source's tracked ref (release / branch / custom). */
+export function VersionChoiceDialog(props: {
+  choice: VersionChoiceState
+  busy: boolean
+  onSelect: (ref: string) => void
+  onCustom: (custom: string) => void
+  onCancel: () => void
+  onConfirm: () => void
+}): JSX.Element {
+  const { choice, busy, onSelect, onCustom, onCancel, onConfirm } = props
+  const effective = choice.custom.trim() !== '' ? choice.custom.trim() : choice.selected
+  return (
+    <DialogShell onClose={onCancel}>
+      <h3 className={css.dialogTitle}>{tt('market.versionTitle')}</h3>
+      <p className={css.dialogText}>{tt('market.versionText', { repo: choice.repo })}{choice.current !== undefined ? ` (${tt('market.versionCurrent', { ref: choice.current })})` : ''}</p>
+      {choice.loading ? <p className={css.dialogText}>{tt('market.scanning')}</p> : (
+        <>
+          {choice.releases.length > 0 ? (
+            <>
+              <p className={css.dialogText} style={{ marginBottom: 4 }}>{tt('market.versionReleases')}</p>
+              <select className={css.select + ' ' + css.dialogSelect} value={choice.releases.includes(choice.selected) ? choice.selected : choice.releases[0]}
+                onChange={(event) => { onSelect(event.target.value); onCustom('') }}>
+                {choice.releases.map((tag) => <option key={tag} value={tag}>{tag}</option>)}
+              </select>
+            </>
+          ) : null}
+          {choice.branches.length > 0 ? (
+            <>
+              <p className={css.dialogText} style={{ marginBottom: 4 }}>{tt('market.versionBranches')}</p>
+              <select className={css.select + ' ' + css.dialogSelect} value={choice.branches.includes(choice.selected) ? choice.selected : choice.branches[0]}
+                onChange={(event) => { onSelect(event.target.value); onCustom('') }}>
+                {choice.branches.map((branch) => <option key={branch} value={branch}>{branch}</option>)}
+              </select>
+            </>
+          ) : null}
+          <p className={css.dialogText} style={{ marginBottom: 4 }}>{tt('market.versionCustom')}</p>
+          <input className={css.input + ' ' + css.dialogSelect} value={choice.custom}
+            onChange={(event) => { onCustom(event.target.value) }} placeholder='v1.2.3 / main / abc1234' />
+        </>
+      )}
+      <div className={css.dialogActions}>
+        <button type='button' className={css.button} onClick={onCancel}>{tt('form.cancel')}</button>
+        <button type='button' className={css.button + ' ' + css.primary} disabled={busy || choice.loading || effective === ''} onClick={onConfirm}>
+          {busy ? tt('source.syncing') : tt('market.versionConfirm', { ref: effective })}
+        </button>
+      </div>
+    </DialogShell>
+  )
+}
+
 /** Post-sync selection: which tracked skills to batch-update to the new version. */
 export function MarketSyncDialog(props: {
   dialog: MarketSyncDialogState

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

@@ -44,15 +44,9 @@
 .rowNameText { font-weight: 600; }
 .rowDesc { font-size: 12.5px; opacity: .52; margin-top: 1px; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; }
 
-/* Quiet inline metadata (e.g. invocation count) — no chips. */
-.rowMeta { font-size: 11.5px; opacity: .45; flex: none; white-space: nowrap; }
-
 /* No badge chips on list rows; keep only for the detail head. */
 .badges { display: flex; gap: 6px; align-items: center; flex: none; }
 .badge { font-size: 10.5px; padding: 1px 7px; border-radius: 999px; border: 0.5px solid rgba(128,128,128,.3); opacity: .8; white-space: nowrap; }
-.badgeModel { color: var(--hub-model); border-color: currentColor; }
-.badgeUser { color: var(--hub-user); border-color: currentColor; }
-.badgeUses { color: #d29922; border-color: currentColor; }
 .badgeReadonly { opacity: .5; }
 
 /* iOS-style switch (kept, already matches the system look). */
@@ -102,6 +96,7 @@
 .dot { display: inline-block; width: 7px; height: 7px; border-radius: 50%; margin-left: 5px; vertical-align: middle; }
 .dotModel { background: var(--hub-model); }
 .dotUser { background: var(--hub-user); }
+.displayName { font-size: 11px; opacity: .55; margin-left: 6px; font-weight: 400; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; max-width: 160px; min-width: 0; flex-shrink: 1; }
 .legend { display: flex; align-items: center; gap: 12px; font-size: 11.5px; opacity: .55; flex-wrap: wrap; padding: 2px 2px 0; }
 .legendItem { display: inline-flex; align-items: center; gap: 4px; }
 .legendItem .dot { margin-left: 0; }
@@ -110,7 +105,6 @@
 /* Chips become quiet text pills (no colored borders). */
 .badgeSource { background: rgba(128,128,128,.1); border: none; opacity: .72; }
 .badgeCount { background: rgba(128,128,128,.1); border: none; opacity: .72; }
-.badgeDisabled { background: rgba(128,128,128,.1); border: none; opacity: .58; }
 
 /* Collapsible drawer headers (groups view). */
 .disclosure { flex: 1; min-width: 0; display: flex; align-items: center; gap: 7px; padding: 2px 0; border: none; background: none; color: inherit; cursor: pointer; text-align: left; min-height: 24px; }
@@ -210,7 +204,6 @@
 .rowMuted { cursor: default; opacity: .55; }
 .actionsPadded { padding: 8px 12px; }
 .actionsTop { margin-top: 8px; }
-.actionsBottom { margin-bottom: 8px; }
 /* Group-header last-used time: inline after the count chip (overrides useTime's right-align). */
 .groupTime { margin-left: 6px; }
 .sectionHeadRow { display: flex; align-items: center; gap: 8px; }