dsh-skill-hub 0.2.6 → 0.3.1

package/src/client/panel/useSkillHub.ts

@@ -6,7 +6,7 @@
  * and tag-editor views without violating the rules of hooks.
  */
 
-import { useCallback, useEffect, useMemo, useState, type FormEvent } from 'react'
+import { useCallback, useEffect, useMemo, useRef, useState, type FormEvent } from 'react'
 import type {
   CatalogResponse,
   CatalogSkill,
@@ -16,6 +16,7 @@ import type {
   MarketCheckResponse,
   MarketSourceRecord,
   RepoDiscoverResponse,
+  RepoImportProgressResponse,
   RepoImportResponse,
   SkillDetail,
   SkillTag,
@@ -96,7 +97,9 @@ export function useSkillHub(api: SkillHubApi) {
   const [scanningRepo, setScanningRepo] = useState<string | null>(null)
   const [repoSelected, setRepoSelected] = useState<ReadonlySet<string>>(new Set())
   const [repoImporting, setRepoImporting] = useState(false)
-  const [repoResult, setRepoResult] = useState<RepoImportResponse | null>(null)
+  const [repoResult, setRepoResult] = useState<RepoImportProgressResponse | null>(null)
+  const [importJobId, setImportJobId] = useState<string | null>(null)
+  const pollAbortRef = useRef<AbortController | null>(null)
   const [search, setSearch] = useState('')
   /** 工作区（项目）路径；空 = 只看用户级技能。 */
   const [workspace, setWorkspace] = useState('')
@@ -132,6 +135,7 @@ export function useSkillHub(api: SkillHubApi) {
   const [conflictDialog, setConflictDialog] = useState<ConflictDialogState | null>(null)
   const [confirmDialog, setConfirmDialog] = useState<ConfirmDialogState | null>(null)
   const [deleteSkillDialog, setDeleteSkillDialog] = useState<string | null>(null)
+  const [deleteGroupDialog, setDeleteGroupDialog] = useState<{ name: string; skillNames: string[] } | null>(null)
   const [confirmClearTrash, setConfirmClearTrash] = useState(false)
   /** 「全部更新」确认对话框（市场 tab）。 */
   const [updateAllDialog, setUpdateAllDialog] = useState(false)
@@ -146,6 +150,7 @@ export function useSkillHub(api: SkillHubApi) {
   /** 项目级三级树里已细分（按 .dsh/.agents）的项目键。 */
   const [subdividedProjects, setSubdividedProjects] = useState<ReadonlySet<string>>(new Set())
   const [showLegend, setShowLegend] = useState(false)
+  const [editMode, setEditMode] = useState(false)
 
   const toggleGroupCollapse = useCallback((key: string): void => {
     setCollapsedGroups((previous) => {
@@ -483,7 +488,37 @@ export function useSkillHub(api: SkillHubApi) {
     }
   }, [api, deleteSkillDialog, load, loadGroups, loadSources])
 
-  // ----------------------------------------------------------- tag editing
+  /** 打开整组删除确认（来源分组一键删除）。 */
+  const requestDeleteGroup = useCallback((name: string, skillNames: string[]): void => {
+    setDeleteGroupDialog({ name, skillNames })
+  }, [])
+
+  /** 执行整组删除（逐个移入回收站，跳过只读）。 */
+  const runDeleteGroup = useCallback(async (): Promise<void> => {
+    const dialog = deleteGroupDialog
+    if (dialog === null) return
+    setDeleteGroupDialog(null)
+    setTagBusy(true)
+    setLoadError(null)
+    const failures: string[] = []
+    let done = 0
+    for (const name of dialog.skillNames) {
+      try {
+        await api.deleteSkill(name)
+        done += 1
+      } catch (error) {
+        // 只读/不存在的跳过并记录
+        failures.push(name + ': ' + errorMessage(error))
+      }
+    }
+    await Promise.all([load(), loadGroups(), loadSources()])
+    setTagBusy(false)
+    if (failures.length > 0) {
+      setLoadError(`删除整组 "${dialog.name}"：成功 ${done} 个，失败 ${failures.length} 个：` + failures.join('; '))
+    } else if (done > 0) {
+      setSuccessBanner(`已删除整组 "${dialog.name}"：${done} 个技能已移入回收站`)
+    }
+  }, [api, deleteGroupDialog, load, loadGroups, loadSources])
 
   /** 新建一个空 tag 分组。 */
   const createTag = useCallback(async (event: FormEvent): Promise<void> => {
@@ -535,6 +570,91 @@ export function useSkillHub(api: SkillHubApi) {
     }
   }, [api, applyTags])
 
+  /** 拖拽重排场景分组 */
+  const reorderTags = useCallback(async (orderedIds: string[]): Promise<void> => {
+    setTagBusy(true)
+    setLoadError(null)
+    try {
+      const tags = await api.reorderTags(orderedIds)
+      applyTags(tags)
+    } catch (error) {
+      const msg = errorMessage(error)
+      if (msg.includes('404') || msg.toLowerCase().includes('not found')) {
+        // 旧宿主无此路由：本地重排
+        const byId = new Map(groupsState?.tags.map((t) => [t.id, t] as const) ?? [])
+        const reordered = orderedIds.map((id) => byId.get(id)).filter((t): t is NonNullable<typeof t> => t !== undefined)
+        if (reordered.length === orderedIds.length) {
+          applyTags(reordered as typeof groupsState extends { tags: infer T } ? T : never)
+          setSuccessBanner('已临时调整顺序（本地生效，重启宿主后持久化）')
+        } else {
+          setLoadError(msg)
+        }
+      } else {
+        setLoadError(msg)
+      }
+    } finally {
+      setTagBusy(false)
+    }
+  }, [api, applyTags, groupsState])
+
+  /** 拖拽重排来源集合 */
+  const reorderCollections = useCallback(async (orderedNames: string[]): Promise<void> => {
+    setTagBusy(true)
+    setLoadError(null)
+    try {
+      const collections = await api.reorderCollections(orderedNames)
+      setGroupsState((prev) => prev === null ? prev : { ...prev, collections })
+      void loadGroups()
+    } catch (error) {
+      const msg = errorMessage(error)
+      // 404 说明宿主仍在跑旧版（需重启后才有新路由），降级为本地即时生效
+      if (msg.includes('404') || msg.toLowerCase().includes('not found')) {
+        setGroupsState((prev) => {
+          if (prev === null) return prev
+          const map = new Map(prev.collections.map((c) => [c.name, c] as const))
+          const reordered = orderedNames.map((n) => map.get(n)).filter((c): c is NonNullable<typeof c> => c !== undefined)
+          // 补上未在 orderedNames 中的集合（新出现的）
+          for (const c of prev.collections) if (!reordered.some((r) => r.name === c.name)) reordered.push(c)
+          return { ...prev, collections: reordered }
+        })
+        setSuccessBanner('已临时调整顺序（本地生效，重启宿主后持久化）')
+      } else {
+        setLoadError(msg)
+      }
+    } finally {
+      setTagBusy(false)
+    }
+  }, [api, loadGroups])
+
+  /** 拖拽重排来源顶层分组（project / col:xxx / personal 全量可拖） */
+  const reorderSourceGroups = useCallback(async (orderedKeys: string[]): Promise<void> => {
+    setTagBusy(true)
+    setLoadError(null)
+    try {
+      await api.reorderSourceGroups(orderedKeys)
+      await loadGroups()
+    } catch (error) {
+      const msg = errorMessage(error)
+      if (msg.includes('404') || msg.toLowerCase().includes('not found')) {
+        // 旧宿主无此路由：本地重排顶层顺序，提示重启后持久化
+        setGroupsState((prev) => {
+          if (prev === null) return prev
+          // 本地重排 collections 以匹配 topOrderedKeys 中的 col:xxx 顺序
+          const colOrder = orderedKeys.filter((k) => k.startsWith('col:')).map((k) => k.slice(4))
+          const map = new Map(prev.collections.map((c) => [c.name, c] as const))
+          const reordered = colOrder.map((n) => map.get(n)).filter((c): c is NonNullable<typeof c> => c !== undefined)
+          for (const c of prev.collections) if (!reordered.some((r) => r.name === c.name)) reordered.push(c)
+          return { ...prev, collections: reordered, sourceGroupOrder: orderedKeys }
+        })
+        setSuccessBanner('已临时调整顺序（本地生效，重启宿主后持久化）')
+      } else {
+        setLoadError(msg)
+      }
+    } finally {
+      setTagBusy(false)
+    }
+  }, [api, loadGroups])
+
   // -------------------------------------------------------------- market
 
   /** 添加一个市场源（内置市场目录与手动输入共用），并立即扫描它。 */
@@ -635,23 +755,110 @@ export function useSkillHub(api: SkillHubApi) {
     })
   }, [])
 
-  /** Import every checked, non-existing repo skill, then refresh the hub. */
+  /** Import every checked, non-existing repo skill (B方案：job+轮询+进度). */
   const importRepo = useCallback(async (): Promise<void> => {
     if (repoDiscoverState.status !== 'ready') return
     setRepoImporting(true)
     setRepoResult(null)
+    setImportJobId(null)
     setLoadError(null)
+    let finalProgress: RepoImportProgressResponse | null = null
     try {
-      const result = await api.repoImport(repoDiscoverState.data.repo, [...repoSelected], repoDiscoverState.data.ref ?? undefined)
-      setRepoResult(result)
+      const created = await api.repoImport(repoDiscoverState.data.repo, [...repoSelected], repoDiscoverState.data.ref ?? undefined)
+      setImportJobId(created.jobId)
+      // 初始占位，让进度卡片立刻出现（带真实 totalBytes）
+      setRepoResult({ ok: true, jobId: created.jobId, status: 'running', total: created.total, done: 0, totalBytes: created.totalBytes, downloadedBytes: 0, imported: [], skipped: [], failed: [] })
+      // 轮询直到 done/cancelled/error（800ms 起步 + 退避，避免 276 技能 900 次请求）
+      pollAbortRef.current?.abort()
+      pollAbortRef.current = new AbortController()
+      const signal = pollAbortRef.current.signal
+      let attempt = 0
+      for (;;) {
+        if (signal.aborted) break
+        const delay = Math.min(2000, 800 + attempt * 200)
+        await new Promise((r) => setTimeout(r, delay))
+        if (signal.aborted) break
+        try {
+          const progress = await api.repoImportProgress(created.jobId)
+          setRepoResult(progress)
+          finalProgress = progress
+          if (progress.status !== 'running') {
+            break
+          }
+          attempt = 0
+        } catch (pollError) {
+          // 轮询失败退避重试
+          const msg = errorMessage(pollError)
+          if (msg.includes('not found')) break
+          attempt += 1
+          if (attempt > 8) break
+        }
+      }
       await Promise.all([load(), loadMarket(), loadGroups(), loadSources()])
     } catch (error) {
       setLoadError(errorMessage(error))
     } finally {
+      // 导入完成后把已导入/已跳过的项从勾选中移除，并把扫描快照里的 existing 置为 true，避免“仍可勾选已导入”的错觉
+      if (finalProgress !== null && (finalProgress.imported.length > 0 || finalProgress.skipped.length > 0)) {
+        const doneNames = new Set([...finalProgress.imported.map((r) => r.name), ...finalProgress.skipped.map((r) => r.name)])
+        const donePaths = new Set(
+          repoDiscoverState.data.entries.filter((e) => doneNames.has(e.name)).map((e) => e.path),
+        )
+        setRepoSelected((prev) => {
+          const next = new Set(prev)
+          for (const p of donePaths) next.delete(p)
+          return next
+        })
+        setRepoDiscoverState((prev) => {
+          if (prev.status !== 'ready') return prev
+          return {
+            ...prev,
+            data: {
+              ...prev.data,
+              entries: prev.data.entries.map((e) => doneNames.has(e.name) ? { ...e, existing: true } : e),
+            },
+          }
+        })
+      }
       setRepoImporting(false)
     }
   }, [api, repoDiscoverState, repoSelected, load, loadMarket, loadGroups, loadSources])
 
+  // 卸载时中断轮询，避免泄露
+  useEffect(() => {
+    return () => { pollAbortRef.current?.abort() }
+  }, [])
+
+  /** 取消正在进行的导入（选项2：唯有取消才停） */
+  const cancelImport = useCallback(async (): Promise<void> => {
+    if (importJobId === null) return
+    pollAbortRef.current?.abort()
+    try {
+      const res = await api.repoImportCancel(importJobId)
+      // 立刻刷新一次进度
+      try {
+        const progress = await api.repoImportProgress(importJobId)
+        setRepoResult(progress)
+      } catch {
+        setRepoResult((prev) => prev !== null ? { ...prev, status: res.status as 'cancelled' } : prev)
+      }
+    } catch (error) {
+      setLoadError(errorMessage(error))
+    } finally {
+      setRepoImporting(false)
+    }
+  }, [api, importJobId])
+
+  /** 清空扫描结果（关闭归属卡片） */
+  const clearScan = useCallback((): void => {
+    setRepoDiscoverState({ status: 'idle' })
+    setScanningRepo(null)
+    setRepoResult(null)
+    setRepoSelected(new Set())
+    setImportJobId(null)
+    pollAbortRef.current?.abort()
+  }, [])
+
   /** 检查所有市场源的上游更新（服务端节流）。 */
   const checkMarket = useCallback(async (): Promise<void> => {
     try {
@@ -790,22 +997,22 @@ export function useSkillHub(api: SkillHubApi) {
 
   return {
     // state
-    catalog, loading, loadError, successBanner, updateState, repoDiscoverState, scanningRepo, repoSelected, repoImporting, repoResult,
+    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,
     marketSyncDialog, syncingMarket, syncBusy, newSourceName, groupsState, sourcesState, sourceCheck, checkingSource, syncingSource,
-    conflictDialog, confirmDialog, deleteSkillDialog, confirmClearTrash, updateAllDialog, editingTag, editName, membersDraft, newTagName, tagBusy,
-    editSearch, collapsedGroups, subdividedProjects, showLegend,
+    conflictDialog, confirmDialog, deleteSkillDialog, deleteGroupDialog, confirmClearTrash, updateAllDialog, editingTag, editName, membersDraft, newTagName, tagBusy,
+    editSearch, collapsedGroups, subdividedProjects, showLegend, editMode,
     // derived
     actionNames, viewNames, normalized, origins, sourceOptions, filtered, sorted,
     // actions + setters
     setLoadError, setSuccessBanner, setSearch, setWorkspace, setDetail, setShowForm, setFormName, setFormDesc, setFormRoot, setFormMessage,
     setRepoSelected, setTab, setSkillView,
     setSourceFilter, setSortKey, setBranchChoice, setMarketSyncDialog, setNewSourceName, setConflictDialog, setConfirmDialog,
-    setDeleteSkillDialog, setConfirmClearTrash, setUpdateAllDialog, setEditingTag, setEditName, setMembersDraft, setNewTagName, setEditSearch, setShowLegend,
+    setDeleteSkillDialog, setDeleteGroupDialog, setConfirmClearTrash, setUpdateAllDialog, setEditingTag, setEditName, setMembersDraft, setNewTagName, setEditSearch, setShowLegend, setEditMode,
     toggleGroupCollapse, toggleSubdivide, checkUpdate, loadMarket, openDetail, toggle, enableDisabled, batchToggleNames, toggleGroup, resolveConflict,
-    runConfirmed, checkSources, requestSync, requestDelete, restoreTrash, clearTrash, requestDeleteSkill, runDeleteSkill, createTag,
-    deleteTag, saveTag, addSource, addMarketSource, removeMarketSource, scanRepo, confirmBranchChoice, toggleRepoSelected, importRepo,
+    runConfirmed, checkSources, requestSync, requestDelete, restoreTrash, clearTrash, 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-form.ts

@@ -9,7 +9,8 @@
  * land keeps its drafts, so the user can correct them instead of retyping.
  */
 
-import { createSnapshotStore, type SettingsScope } from '@deepseek-ai/dsh-client-runtime/client'
+import { createSnapshotStore } from '@deepseek-ai/dsh-client-store'
+import type { SettingsScope } from '@deepseek-ai/dsh-client-ui-settings/client'
 
 /** One staged field: its draft text plus the clear/reset marker. */
 interface StagedEdit {

package/src/client/slash-dots.test.ts

@@ -6,7 +6,7 @@
  */
 
 import { beforeEach, describe, expect, it } from 'vitest'
-import type { SettingsScope } from '@deepseek-ai/dsh-client-runtime/client'
+import type { SettingsScope } from '@deepseek-ai/dsh-client-ui-settings/client'
 import type { InputTriggerCandidate, InputTriggerServiceContract, InputTriggerSource } from '@deepseek-ai/dsh-client-ui-input-trigger/client'
 import type { HubSettingsValue } from '../protocol.ts'
 import type { SkillHubApi } from './api.ts'
@@ -39,7 +39,8 @@ function scopeWith(value: HubSettingsValue): SettingsScope<HubSettingsValue> {
     subscribe: () => () => {},
     set: async () => {},
     unset: async () => {},
-  } as SettingsScope<HubSettingsValue>
+    mutate: async () => {},
+  } as unknown as SettingsScope<HubSettingsValue>
 }
 
 /** Fake hub api whose catalog lists the given skills. */
@@ -84,7 +85,7 @@ describe('findSkillSource', () => {
 })
 
 describe('wrapSkillSource', () => {
-  it('adds a model-colored dot to model-callable skills and a user-colored dot to user-only ones', async () => {
+  it('adds a model-colored dot to model-callable skills and a user-colored dot to user-only ones (old host, no drilled)', async () => {
     const source = skillSource(async () => [
       { name: 'code-review', description: 'review code' },
       { name: 'personal-note', description: 'only me' },
@@ -98,7 +99,8 @@ describe('wrapSkillSource', () => {
 
     const restore = wrapSkillSource(source, api, scope)
     try {
-      const rows = await source.candidates({ sessionId: 's1' as never }, { query: '', position: 'leading', signal: new AbortController().signal })
+      // Old host: CandidateRequest 无 drilled 字段，注入彩色点
+      const rows = await source.candidates({ sessionId: 's1' as never }, { query: '', position: 'leading', signal: new AbortController().signal } as unknown as import('@deepseek-ai/dsh-client-ui-input-trigger/client').CandidateRequest)
 
       expect(rows).toHaveLength(3)
       // Model-callable → model color.
@@ -115,14 +117,14 @@ describe('wrapSkillSource', () => {
     }
   })
 
-  it('falls back to the default colors when settings omit them and catalog fails', async () => {
+  it('falls back to the default colors when settings omit them and catalog fails (old host)', async () => {
     const source = skillSource(async () => [{ name: 'lonely', description: '' }])
     const api = { catalog: async () => { throw new Error('route down') } } as unknown as SkillHubApi
     const scope = scopeWith({ enabled: true, announceToAgent: true, showUseCount: true, showUseTime: true, showGroupSummary: true })
 
     const restore = wrapSkillSource(source, api, scope)
     try {
-      const rows = await source.candidates({ sessionId: 's1' as never }, { query: '', position: 'leading', signal: new AbortController().signal })
+      const rows = await source.candidates({ sessionId: 's1' as never }, { query: '', position: 'leading', signal: new AbortController().signal } as unknown as import('@deepseek-ai/dsh-client-ui-input-trigger/client').CandidateRequest)
       // Catalog failed → unknown name → model default dot still renders.
       expect(rows[0].icon).toBeDefined()
       expect((rows[0].icon as unknown as { props: { style: { background: string } } }).props.style.background).toBe('#2f81f7')
@@ -131,6 +133,22 @@ describe('wrapSkillSource', () => {
     }
   })
 
+  it('skips dot injection on new host (alpha.2, drilled present) for ReferenceIcon compat', async () => {
+    const source = skillSource(async () => [{ name: 'code-review', description: 'review code' }])
+    const api = apiWith([{ name: 'code-review', modelInvocable: true }])
+    const scope = scopeWith({ enabled: true, announceToAgent: true, showUseCount: true, showUseTime: true, showGroupSummary: true, dotModelColor: '#112233', dotUserColor: '#445566' })
+
+    const restore = wrapSkillSource(source, api, scope)
+    try {
+      const rows = await source.candidates({ sessionId: 's1' as never }, { query: '', position: 'leading', drilled: false, signal: new AbortController().signal })
+      expect(rows).toHaveLength(1)
+      expect(rows[0].icon).toBeUndefined()
+      expect(rows[0].name).toBe('code-review')
+    } finally {
+      restore()
+    }
+  })
+
   it('restores the original candidates on dispose', async () => {
     const originalCandidates = async (): Promise<InputTriggerCandidate[]> => [{ name: 'plain', description: '' }]
     const source = skillSource(originalCandidates)

package/src/client/slash-dots.tsx

@@ -18,9 +18,12 @@
  * / `sessionOf` — the lookup below is defensive: it never throws).
  */
 
-import type { ClientContext, SettingsScope } from '@deepseek-ai/dsh-client-runtime/client'
+import type { Context as ClientContext } from '@deepseek-ai/cordis'
+import type { SettingsScope } from '@deepseek-ai/dsh-client-ui-settings/client'
 // Type-only: pulls the Context merge for ctx.inputTriggers.
 import type {} from '@deepseek-ai/dsh-client-ui-input-trigger/client'
+// Type-only: pulls the connection/reset event.
+import type {} from '@deepseek-ai/dsh-client-connection/client'
 import type { InputTriggerCandidate, InputTriggerServiceContract, InputTriggerSource } from '@deepseek-ai/dsh-client-ui-input-trigger/client'
 import { createElement } from 'react'
 import type { HubSettingsValue } from '../protocol.ts'
@@ -121,6 +124,12 @@ export function wrapSkillSource(source: InputTriggerSource, api: SkillHubApi, sc
   source.candidates = async (session, req) => {
     const items = await original(session, req)
     if (req.signal.aborted) return items
+    // Dual-compat: 0.1.2-alpha.2 的 MenuView 将 icon 收窄为 'file'|'folder'|'session'
+    // 并通过 ReferenceIcon 渲染，旧版的自定义 ReactElement 点已无法展示。
+    // 以 `drilled` 是否存在探测新版（alpha.2 必有，rc 无），新版直接透传不注入
+    // icon，旧版保持彩色点，避免新版传入非法 icon 导致渲染异常。
+    const isNewHost = req !== null && typeof req === 'object' && 'drilled' in (req as unknown as Record<string, unknown>)
+    if (isNewHost) return items
     const modelByName = await modelInvocableMap(api)
     if (req.signal.aborted) return items
     const snapshot = scope.getSnapshot()

package/src/index.ts

@@ -9,7 +9,7 @@
 
 import type { Context } from '@deepseek-ai/cordis'
 import type { SkillProviderControl } from '@deepseek-ai/dsh-skill'
-import { settingsNamespace } from '@deepseek-ai/dsh-settings'
+import type { SettingsNamespace } from '@deepseek-ai/dsh-settings'
 import z from 'schemastery'
 import type {} from '@deepseek-ai/dsh-host-webserver'
 import type {} from '@deepseek-ai/dsh-skill'
@@ -21,6 +21,10 @@ import { SkillHubProvider } from './provider.ts'
 import { makeRoutes } from './routes.ts'
 import { createSkillStatsReader, type SkillStatsReader } from './stats.ts'
 import { SkillHubStore } from './store.ts'
+import { cleanupLeftoverImportDirs } from './repo.ts'
+import { dshHome } from './store.ts'
+import { join } from 'node:path'
+import { homedir } from 'node:os'
 
 /** Stable cordis plugin name (matches cordis.patch.yml insert id). */
 export const name = 'skill-hub'
@@ -63,7 +67,7 @@ export const Config: z<Config> = z.object({
  * page edit this namespace through the official settings transport, and the
  * plugin consumes the same resolved value — one source of truth.
  */
-export const CONFIG_NAMESPACE = settingsNamespace('dsh-skill-hub')
+export const CONFIG_NAMESPACE = 'dsh-skill-hub' as SettingsNamespace
 
 /** Schema of the hub's settings namespace: the card's fields (booleans + optional dot colors). */
 export const HubSettingsSchema: z<HubSettingsValue> = z.object({
@@ -213,6 +217,20 @@ export function apply(ctx: Context, config?: Config): void {
   // build seeds the settings namespace from the saved sidecar config when the
   // namespace has no user section yet. Later edits live only in the settings
   // document; the sidecar keeps its (now-stale) copy untouched.
+  // Startup: 清理 Issue #3 遗留的 .*.import-* 临时目录（尽早回收，不阻塞）
+  void (async () => {
+    const home = dshHome()
+    const agentsHome = process.env.DSH_AGENTS_HOME ?? join(homedir(), '.agents')
+    for (const root of [join(home, 'skills'), join(agentsHome, 'skills')]) {
+      try {
+        const c = await cleanupLeftoverImportDirs(root)
+        if (c > 0) ctx.logger.info(`[dsh-skill-hub] startup cleaned ${c} leftover import temp dir(s) in ${root}`)
+      } catch (error) {
+        ctx.logger.warn('[dsh-skill-hub] startup cleanup failed', error)
+      }
+    }
+  })()
+
   void (async () => {
     const legacy = await store.getConfig()
     if (Object.keys(legacy).length > 0 && Object.keys(saved()).length === 0) {

package/src/protocol.ts

@@ -23,11 +23,16 @@ export const SKILL_HUB_API = {
   marketSync: '/api/skill-hub/market/source/sync',
   repo: '/api/skill-hub/repo',
   repoImport: '/api/skill-hub/repo/import',
+  repoImportProgress: '/api/skill-hub/repo/import/progress',
+  repoImportCancel: '/api/skill-hub/repo/import/cancel',
   update: '/api/skill-hub/update',
   groups: '/api/skill-hub/groups',
   tag: '/api/skill-hub/tag',
   tagDelete: '/api/skill-hub/tag/delete',
   tagMembers: '/api/skill-hub/tag/members',
+  tagReorder: '/api/skill-hub/tag/reorder',
+  collectionReorder: '/api/skill-hub/collections/reorder',
+  sourceGroupReorder: '/api/skill-hub/source-groups/reorder',
   sources: '/api/skill-hub/sources',
   sourceCheck: '/api/skill-hub/sources/check',
   sourceSync: '/api/skill-hub/sources/sync',
@@ -414,7 +419,7 @@ export interface MarketSyncResponse {
   skills: string[]
 }
 
-/** A skill discovered in a GitHub repo under skills/ or design-templates/. */
+/** A skill discovered in a GitHub repo under any top-level root (e.g. skills/, templates/). */
 export interface RepoSkillEntry {
   /** Kebab-case skill name (directory basename). */
   name: string
@@ -434,8 +439,8 @@ export interface RepoSkillEntry {
   existing: boolean
 }
 
-/** Supported skill roots in a GitHub repo. */
-export type RepoRoot = 'skills' | 'design-templates'
+/** Skill root in a GitHub repo: the top-level directory that contains skills (e.g. skills, design-templates, templates). Auto-derived from SKILL.md locations, not hard-coded. */
+export type RepoRoot = string
 
 /** GET /api/skill-hub/repo — discover importable skills in a GitHub repo. */
 export interface RepoDiscoverResponse {
@@ -461,8 +466,49 @@ export interface RepoImportRequest {
   ref?: string
 }
 
-/** POST /api/skill-hub/repo/import */
+/** POST /api/skill-hub/repo/import — now creates an async job (B方案) */
 export interface RepoImportResponse {
+  ok: true
+  jobId: string
+  total: number
+  totalBytes: number
+}
+
+/** GET /api/skill-hub/repo/import/progress?jobId=xxx */
+export interface RepoImportProgressResponse {
+  ok: true
+  jobId: string
+  status: 'running' | 'done' | 'cancelled' | 'error'
+  total: number
+  done: number
+  /** 当前正在下载的 skill 名，done < total 时有效 */
+  current?: string
+  /** 当前正在下载的文件路径（相对 skill dir） */
+  currentFile?: string
+  /** 字节级进度 */
+  totalBytes: number
+  downloadedBytes: number
+  /** 下载速度 bytes/sec，running 时有效 */
+  bytesPerSecond?: number
+  imported: Array<{ name: string; origin: string; path: string }>
+  skipped: Array<{ name: string; reason: 'exists' }>
+  failed: Array<{ name: string; error: string }>
+  /** error 状态时的原因 */
+  error?: string
+}
+
+/** POST /api/skill-hub/repo/import/cancel */
+export interface RepoImportCancelRequest {
+  jobId: string
+}
+export interface RepoImportCancelResponse {
+  ok: true
+  jobId: string
+  status: 'cancelled' | 'done'
+}
+
+/** @deprecated 旧同步响应，保留供类型兼容，实际已由 Progress 代替 */
+export interface RepoImportLegacyResponse {
   ok: true
   imported: Array<{ name: string; origin: string; path: string }>
   skipped: Array<{ name: string; reason: 'exists' }>
@@ -507,12 +553,16 @@ export interface CollectionGroup {
 /** GET /api/skill-hub/groups */
 export interface GroupsResponse {
   ok: true
-  /** 用户自定义 tag 分组（按创建顺序）。 */
+  /** 用户自定义 tag 分组（按拖拽顺序）。 */
   tags: SkillTag[]
-  /** 系统集合组（按 origin 聚合，名称排序）。 */
+  /** 系统集合组（按拖拽顺序，兜底按名称）。 */
   collections: CollectionGroup[]
   /** skillName → 集合名 的完整映射。 */
   origins: Record<string, string>
+  /** 来源分组整体顺序（project / col:xxx / uncategorized-source），用于 SourcesView 顶层排序 */
+  sourceGroupOrder?: string[]
+  /** 兼容旧 collectionOrder 字段 */
+  collectionOrder?: string[]
 }
 
 /** POST /api/skill-hub/tag — 新建（缺省 id）或重命名（带 id）。 */
@@ -554,6 +604,39 @@ export interface TagMembersResponse {
   tags: SkillTag[]
 }
 
+/** POST /api/skill-hub/tag/reorder — 拖拽重排场景分组 */
+export interface TagReorderRequest {
+  /** 按新顺序排列的 tag id 列表（需包含全部 id） */
+  orderedIds: string[]
+}
+/** POST /api/skill-hub/tag/reorder */
+export interface TagReorderResponse {
+  ok: true
+  tags: SkillTag[]
+}
+
+/** POST /api/skill-hub/collections/reorder — 拖拽重排来源集合 */
+export interface CollectionReorderRequest {
+  /** 按新顺序排列的集合名列表（需包含全部 name） */
+  orderedNames: string[]
+}
+/** POST /api/skill-hub/collections/reorder */
+export interface CollectionReorderResponse {
+  ok: true
+  collections: CollectionGroup[]
+  order: string[]
+}
+
+/** POST /api/skill-hub/source-groups/reorder — 拖拽重排来源顶层分组（project / collections / personal） */
+export interface SourceGroupReorderRequest {
+  /** 按新顺序排列的顶层分组 key 列表（project / col:xxx / uncategorized-source） */
+  orderedKeys: string[]
+}
+export interface SourceGroupReorderResponse {
+  ok: true
+  order: string[]
+}
+
 /** 来源跟踪记录：一组来自同一上游仓库根目录的技能。 */
 export interface SourceRecord {
   /** GitHub owner/repo。 */