dsh-skill-hub 0.2.5 → 0.3.0

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

@@ -5,7 +5,7 @@
  * Registered into the official `settings.plugin.item` slot keyed by that
  * namespace, so the plugin shows up in Settings → 插件 on dsh rc.7+.
  */
-import type { ReactElement } from 'react';
+import { type ReactElement } from 'react';
 import type { SnapshotStore } from '@deepseek-ai/dsh-client-runtime/client';
 import type { InjectFace, PropsLocale, PropsRuntime } from '@deepseek-ai/dsh-client-ui-slots';
 import { type CardShell, type FieldState, type FormScope } from './settings-form.ts';

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

@@ -2,7 +2,7 @@
  * Browser-side API client for the /api/skill-hub route family. The only
  * data access path the panel uses — plain fetch, same origin.
  */
-import { type CatalogResponse, type ConfigRequest, type ConfigResponse, type CreateRequest, type CreateResponse, type MarketCheckResponse, type MarketSourcesResponse, type MarketSyncResponse, type RepoDiscoverResponse, type RepoImportResponse, type SkillDetail, type SkillDeleteResponse, type SourceCheckResponse, type SourceDeleteResponse, type SourceRestoreResponse, type SourceTrashClearResponse, type SourcesResponse, type SourceSyncResponse, type StatsResponse, type ToggleBatchResponse, type UpdateCheckResponse } from '../protocol.ts';
+import { type CatalogResponse, type CollectionGroup, type ConfigRequest, type ConfigResponse, type CreateRequest, type CreateResponse, type MarketCheckResponse, type MarketSourcesResponse, type MarketSyncResponse, type RepoDiscoverResponse, type RepoImportCancelResponse, type RepoImportProgressResponse, type RepoImportResponse, type SkillDetail, type SkillDeleteResponse, type SkillTag, type SourceCheckResponse, type SourceDeleteResponse, type SourceRestoreResponse, type SourceTrashClearResponse, type SourcesResponse, type SourceSyncResponse, type StatsResponse, type ToggleBatchResponse, type UpdateCheckResponse } from '../protocol.ts';
 /** Error carrying the route's JSON error message. */
 export declare class SkillHubApiError extends Error {
     constructor(message: string);
@@ -41,8 +41,12 @@ export declare class SkillHubApi {
     updateCheck(): Promise<UpdateCheckResponse>;
     /** Discover importable skills in a GitHub repo. */
     repoDiscover(repo: string): Promise<RepoDiscoverResponse>;
-    /** Install selected repo skills into the user-dsh root (records the source). */
+    /** Install selected repo skills into the user-dsh root (records the source). Returns jobId for polling. */
     repoImport(repo: string, paths: string[], ref?: string): Promise<RepoImportResponse>;
+    /** Poll import job progress (B方案轮询) */
+    repoImportProgress(jobId: string): Promise<RepoImportProgressResponse>;
+    /** Cancel a running import job (选项2：唯有取消才停) */
+    repoImportCancel(jobId: string): Promise<RepoImportCancelResponse>;
     /** Read the hub's runtime config (effective values + saved overrides). */
     config(): Promise<ConfigResponse>;
     /** Patch the hub's runtime config (null clears a saved override). */
@@ -55,6 +59,12 @@ export declare class SkillHubApi {
     deleteTag(id: string): Promise<import('../protocol.ts').SkillTag[]>;
     /** 直接设置某 tag 的完整成员列表；返回全部 tag。 */
     setTagMembers(id: string, skillNames: string[]): Promise<import('../protocol.ts').SkillTag[]>;
+    /** 拖拽重排场景分组 */
+    reorderTags(orderedIds: string[]): Promise<SkillTag[]>;
+    /** 拖拽重排来源集合 */
+    reorderCollections(orderedNames: string[]): Promise<CollectionGroup[]>;
+    /** 拖拽重排来源顶层分组（project / collections / personal） */
+    reorderSourceGroups(orderedKeys: string[]): Promise<string[]>;
     /** 来源列表 + 派生 origin 映射 + 集合组 + 回收站。 */
     sources(): Promise<SourcesResponse>;
     /** 检查指定（或全部）来源的上游更新。 */

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

@@ -52,6 +52,11 @@ export declare const zh: {
     readonly 'market.scan': "扫描";
     readonly 'market.scanning': "扫描中…";
     readonly 'market.check': "检查";
+    readonly 'market.checkUpdate': "检查更新";
+    readonly 'market.checking': "检查中…";
+    readonly 'market.upToDate': "已是最新";
+    readonly 'market.update': "更新";
+    readonly 'market.updateCount': "更新 {count} 个";
     readonly 'market.sync': "同步";
     readonly 'market.syncing': "同步中…";
     readonly 'market.updated': "有更新";
@@ -75,8 +80,12 @@ export declare const zh: {
     readonly 'repo.imported': "导入成功 {count} 个";
     readonly 'repo.skippedExisting': "跳过已存在 {count} 个";
     readonly 'repo.failed': "失败 {count} 个";
+    readonly 'repo.cancel': "取消";
+    readonly 'repo.cancelled': "已取消 · 已导入 {imported}/{total} 已保留，临时文件已清理";
+    readonly 'repo.importingCurrent': "正在导入: {name} ({done}/{total})";
     readonly 'repo.root.skills': "技能 skills";
     readonly 'repo.root.designTemplates': "模板 design-templates";
+    readonly 'repo.root.generic': "{root}";
     readonly 'update.check': "检查更新";
     readonly 'update.checking': "检查中…";
     readonly 'update.upToDate': "已是最新版本 v{version}";
@@ -163,6 +172,10 @@ export declare const zh: {
     readonly 'source.followDelete': "跟进删除";
     readonly 'source.deleteConfirmTitle': "跟进上游删除？";
     readonly 'source.deleteConfirmText': "以下技能已从上游仓库移除，本地目录将移入回收站（可恢复）：";
+    readonly 'source.deleteGroup': "删除整组";
+    readonly 'source.deleteGroupHint': "删除该分组下的全部 {count} 个技能";
+    readonly 'source.deleteGroupTitle': "删除整组？";
+    readonly 'source.deleteGroupText': "将把分组“{name}”下的全部 {count} 个技能移入回收站（可恢复），只读技能会跳过：";
     readonly 'source.trash': "回收站";
     readonly 'source.restore': "恢复";
     readonly 'source.clearTrash': "清空回收站";
@@ -180,7 +193,7 @@ export declare const zh: {
     readonly 'form.success': "已创建：";
     readonly 'form.error': "创建失败：";
     readonly 'err.dismiss': "知道了";
-    readonly 'settings.title': "Skill Hub";
+    readonly 'settings.title': "技能中枢";
     readonly 'settings.description': "管理 dsh 本地技能目录：浏览、分组、来源同步与新建。";
     readonly 'settings.enabled': "启用插件";
     readonly 'settings.enabledHint': "关闭后技能中枢的路由、入口与公告全部下线。";

package/lib/types/client/panel/ScenesView.d.ts

@@ -4,7 +4,7 @@
  * enable/disable units (e.g. a Godot scene vs a Java scene); upstream repos
  * are managed in the sources tab.
  */
-import type { JSX } from 'react';
+import { type JSX } from 'react';
 import type { SkillHubState } from './useSkillHub.ts';
 export declare function ScenesView(props: {
     hub: SkillHubState;

package/lib/types/client/panel/SourcesView.d.ts

@@ -5,7 +5,7 @@
  * follow-delete actions and the tri-state switch, plus the uncategorized
  * "personal" card (project skills never count as personal).
  */
-import type { JSX } from 'react';
+import { type JSX } from 'react';
 import type { SkillHubState } from './useSkillHub.ts';
 export declare function SourcesView(props: {
     hub: SkillHubState;

package/lib/types/client/panel/useSkillHub.d.ts

@@ -6,7 +6,7 @@
  * and tag-editor views without violating the rules of hooks.
  */
 import { type FormEvent } from 'react';
-import type { CatalogResponse, CatalogSkill, DisabledSkill, GroupsResponse, HubConfig, MarketSourceRecord, RepoDiscoverResponse, RepoImportResponse, SkillDetail, SkillTag, SourceCheckResult, SourcesResponse, UpdateCheckResponse, WritableRoot } from '../../protocol.ts';
+import type { CatalogResponse, CatalogSkill, DisabledSkill, GroupsResponse, HubConfig, MarketSourceRecord, RepoDiscoverResponse, RepoImportProgressResponse, SkillDetail, SkillTag, SourceCheckResult, SourcesResponse, UpdateCheckResponse, WritableRoot } from '../../protocol.ts';
 import type { SkillHubApi } from '../api.ts';
 import { type SortKey, type GroupSwitchState } from '../grouping.ts';
 import type { BranchChoiceState, ConfirmDialogState, ConflictDialogState, MarketSyncDialogState } from './dialogs.tsx';
@@ -51,7 +51,8 @@ export declare function useSkillHub(api: SkillHubApi): {
     scanningRepo: string | null;
     repoSelected: ReadonlySet<string>;
     repoImporting: boolean;
-    repoResult: RepoImportResponse | null;
+    repoResult: RepoImportProgressResponse | null;
+    importJobId: string | null;
     search: string;
     workspace: string;
     detail: SkillDetail | null;
@@ -100,6 +101,10 @@ export declare function useSkillHub(api: SkillHubApi): {
     conflictDialog: ConflictDialogState | null;
     confirmDialog: ConfirmDialogState | null;
     deleteSkillDialog: string | null;
+    deleteGroupDialog: {
+        name: string;
+        skillNames: string[];
+    } | null;
     confirmClearTrash: boolean;
     updateAllDialog: boolean;
     editingTag: SkillTag | null;
@@ -111,6 +116,7 @@ export declare function useSkillHub(api: SkillHubApi): {
     collapsedGroups: ReadonlySet<string>;
     subdividedProjects: ReadonlySet<string>;
     showLegend: boolean;
+    editMode: boolean;
     actionNames: Set<string>;
     viewNames: Set<string>;
     normalized: string;
@@ -142,6 +148,10 @@ export declare function useSkillHub(api: SkillHubApi): {
     setConflictDialog: import("react").Dispatch<import("react").SetStateAction<ConflictDialogState | null>>;
     setConfirmDialog: import("react").Dispatch<import("react").SetStateAction<ConfirmDialogState | null>>;
     setDeleteSkillDialog: import("react").Dispatch<import("react").SetStateAction<string | null>>;
+    setDeleteGroupDialog: import("react").Dispatch<import("react").SetStateAction<{
+        name: string;
+        skillNames: string[];
+    } | null>>;
     setConfirmClearTrash: import("react").Dispatch<import("react").SetStateAction<boolean>>;
     setUpdateAllDialog: import("react").Dispatch<import("react").SetStateAction<boolean>>;
     setEditingTag: import("react").Dispatch<import("react").SetStateAction<SkillTag | null>>;
@@ -150,6 +160,7 @@ export declare function useSkillHub(api: SkillHubApi): {
     setNewTagName: import("react").Dispatch<import("react").SetStateAction<string>>;
     setEditSearch: import("react").Dispatch<import("react").SetStateAction<string>>;
     setShowLegend: import("react").Dispatch<import("react").SetStateAction<boolean>>;
+    setEditMode: import("react").Dispatch<import("react").SetStateAction<boolean>>;
     toggleGroupCollapse: (key: string) => void;
     toggleSubdivide: (key: string) => void;
     checkUpdate: () => Promise<void>;
@@ -168,9 +179,14 @@ export declare function useSkillHub(api: SkillHubApi): {
     clearTrash: () => Promise<void>;
     requestDeleteSkill: (name: string) => void;
     runDeleteSkill: () => Promise<void>;
+    requestDeleteGroup: (name: string, skillNames: string[]) => void;
+    runDeleteGroup: () => Promise<void>;
     createTag: (event: FormEvent) => Promise<void>;
     deleteTag: (id: string) => Promise<void>;
     saveTag: (id: string, name: string, memberNames: string[] | null) => Promise<void>;
+    reorderTags: (orderedIds: string[]) => Promise<void>;
+    reorderCollections: (orderedNames: string[]) => Promise<void>;
+    reorderSourceGroups: (orderedKeys: string[]) => Promise<void>;
     addSource: (input: string) => Promise<void>;
     addMarketSource: () => Promise<void>;
     removeMarketSource: (repo: string) => Promise<void>;
@@ -178,6 +194,8 @@ export declare function useSkillHub(api: SkillHubApi): {
     confirmBranchChoice: () => Promise<void>;
     toggleRepoSelected: (path: string, checked: boolean) => void;
     importRepo: () => Promise<void>;
+    cancelImport: () => Promise<void>;
+    clearScan: () => void;
     checkMarket: () => Promise<void>;
     syncMarketSource: (repo: string) => Promise<void>;
     confirmMarketSync: () => Promise<void>;

package/lib/types/client/settings-card.d.ts

@@ -16,6 +16,8 @@ export interface PluginSettingsCardProps {
     titleKey: HubKey;
     /** Locale key of the card description. */
     descriptionKey: HubKey;
+    /** 插件自身版本（可选）：显示在标题旁的小徽标；缺省不渲染。 */
+    version?: string;
     /** The form shell state. */
     state: CardShell;
     onSave: () => void;

package/lib/types/protocol.d.ts

@@ -22,11 +22,16 @@ export declare const SKILL_HUB_API: {
     readonly marketSync: "/api/skill-hub/market/source/sync";
     readonly repo: "/api/skill-hub/repo";
     readonly repoImport: "/api/skill-hub/repo/import";
+    readonly repoImportProgress: "/api/skill-hub/repo/import/progress";
+    readonly repoImportCancel: "/api/skill-hub/repo/import/cancel";
     readonly update: "/api/skill-hub/update";
     readonly groups: "/api/skill-hub/groups";
     readonly tag: "/api/skill-hub/tag";
     readonly tagDelete: "/api/skill-hub/tag/delete";
     readonly tagMembers: "/api/skill-hub/tag/members";
+    readonly tagReorder: "/api/skill-hub/tag/reorder";
+    readonly collectionReorder: "/api/skill-hub/collections/reorder";
+    readonly sourceGroupReorder: "/api/skill-hub/source-groups/reorder";
     readonly sources: "/api/skill-hub/sources";
     readonly sourceCheck: "/api/skill-hub/sources/check";
     readonly sourceSync: "/api/skill-hub/sources/sync";
@@ -278,6 +283,8 @@ export declare const HEX_COLOR_RE: RegExp;
 /** GET /api/skill-hub/config */
 export interface ConfigResponse {
     ok: true;
+    /** 已安装插件自身的版本号（package.json version），设置卡标题旁显示。 */
+    pluginVersion: string;
     /** Effective configuration (saved overrides merged over the defaults). */
     config: HubConfig;
     /** Raw user overrides persisted in the sidecar (absent fields inherit defaults). */
@@ -363,7 +370,7 @@ export interface MarketSyncResponse {
     /** Local skills tracked from this repo (candidates for a batch update). */
     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;
@@ -382,8 +389,8 @@ export interface RepoSkillEntry {
     /** Whether a same-named skill already exists locally. */
     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 {
     ok: true;
@@ -406,8 +413,56 @@ export interface RepoImportRequest {
     /** The ref the discovery ran against; the import must use the same one. */
     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;
@@ -458,12 +513,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）。 */
 export interface TagSaveRequest {
@@ -498,6 +557,36 @@ export interface TagMembersResponse {
     ok: true;
     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。 */

package/lib/types/repo.d.ts

@@ -2,12 +2,12 @@
  * GitHub repository skill discovery/import helpers.
  *
  * Kept dependency-free and mostly pure so the root/origin rules are easy to
- * test. The two supported roots mirror the repositories we care about:
- * `skills/**` (standard skill bundles) and `design-templates/**` (template
- * skill bundles in nexu-io/open-design).
+ * test. Roots are auto-derived: any top-level directory that contains a
+ * `**\/SKILL.md` (e.g. `skills/**`, `design-templates/**`, `templates/**`,
+ * `workflows/**`) is treated as a skill root. No hard-coded allowlist.
  */
 import type { RepoRoot, RepoSkillEntry } from './protocol.ts';
-/** Supported skill roots in a GitHub repo. */
+/** Preferred display order for known roots; unknown roots sort alphabetically after these. */
 export declare const REPO_ROOTS: readonly RepoRoot[];
 /** Parsed GitHub repository reference. */
 export interface RepoRef {
@@ -61,27 +61,34 @@ export declare function loadRepoTree(repo: string, ref?: string, fetchImpl?: typ
 /** Collect every file inside a skill directory, including SKILL.md itself. */
 export declare function collectRepoSkillFiles(tree: readonly RepoTreeItem[], dir: string): RepoFile[];
 /** Compute an origin collection name. Multiple roots split by root, one root keeps the repo slug. */
-export declare function originForRoot(repo: string, rootsPresent: ReadonlySet<RepoRoot>, root: RepoRoot): string;
-/** Discover importable skills from a repo tree. Invalid names are ignored. */
+export declare function originForRoot(repo: string, rootsPresent: ReadonlySet<string>, root: string): string;
+/** Discover importable skills from a repo tree. Invalid names are ignored. Roots are auto-derived from the top-level directory of each SKILL.md. */
 export declare function discoverRepoEntries(tree: readonly RepoTreeItem[], repo: string, existingNames?: ReadonlySet<string>): RepoSkillEntry[];
 /** Run an async worker over items with a bounded concurrency. */
 export declare function mapConcurrent<T, R>(items: readonly T[], limit: number, worker: (item: T, index: number) => Promise<R>): Promise<R[]>;
+/** Whether an error is an abort (AbortError / signal). */
+export declare function isAbortError(error: unknown): boolean;
 /**
  * Download one GitHub file as a buffer. Tries raw.githubusercontent.com
  * first (no API quota); on any failure falls back to the api.github.com
  * contents endpoint with the raw media type (rate-limited, but reachable
  * from networks that block the raw host).
  */
-export declare function downloadGitHubFile(repo: string, ref: string, path: string, fetchImpl?: typeof fetch): Promise<Buffer>;
+export declare function downloadGitHubFile(repo: string, ref: string, path: string, fetchImpl?: typeof fetch, signal?: AbortSignal): Promise<Buffer>;
 /**
  * Download a full skill directory into a temporary dir, validate SKILL.md,
  * then atomically rename it into place. The target root is created when missing.
  * Callers pass a target root and a skill entry plus its collected files.
  */
-export declare function downloadRepoSkill(repo: string, ref: string, entry: RepoSkillEntry, files: readonly RepoFile[], targetRoot: string, fetchImpl?: typeof fetch): Promise<{
+export declare function downloadRepoSkill(repo: string, ref: string, entry: RepoSkillEntry, files: readonly RepoFile[], targetRoot: string, fetchImpl?: typeof fetch, signal?: AbortSignal, onProgress?: (bytes: number, file: string) => void): Promise<{
     targetDir: string;
     skillPath: string;
 }>;
+/**
+ * 启动时扫描并清理残留的 `.*.import-*` 临时目录（Issue #3 第4点）。
+ * 越积越多的点前缀目录不会显示为 skill，但会占空间，尽早回收。
+ */
+export declare function cleanupLeftoverImportDirs(targetRoot: string): Promise<number>;
 /**
  * The latest non-prerelease release tag of a repo, or undefined when the
  * repo has no releases (GitHub's /releases/latest skips prereleases/drafts).
@@ -113,7 +120,7 @@ export declare function skillManifest(tree: readonly RepoTreeItem[], dir: string
  * resilient to incomplete manifests and upstream moves.
  */
 export declare function skillDirOf(source: {
-    root: RepoRoot;
+    root: string;
     manifest?: Record<string, number>;
 }, name: string, treePaths?: readonly string[]): string;
 /**
@@ -122,7 +129,7 @@ export declare function skillDirOf(source: {
  * differs, or no baseline exists — treated as changed). Pure over the tree.
  */
 export declare function diffRemoteSkills(tree: readonly RepoTreeItem[], source: {
-    root: RepoRoot;
+    root: string;
     skills: readonly string[];
     manifest?: Record<string, number>;
 }): {
@@ -130,4 +137,4 @@ export declare function diffRemoteSkills(tree: readonly RepoTreeItem[], source:
     deleted: string[];
 };
 /** Minimal RepoSkillEntry for a tracked skill name (sync re-downloads by name). */
-export declare function repoSkillEntry(name: string, root: RepoRoot, repo: string): RepoSkillEntry;
+export declare function repoSkillEntry(name: string, root: string, repo: string): RepoSkillEntry;

package/lib/types/store.d.ts

@@ -11,7 +11,7 @@
  * State file: $DSH_HOME/dsh-skill-hub.json — a small JSON document written
  * atomically (tmp file + rename).
  */
-import type { DisabledSkill, HubConfig, MarketSourceRecord, RepoRoot, SkillStatsCheckpoint, SkillTag, SourceRecord, TrashEntry } from './protocol.ts';
+import type { DisabledSkill, HubConfig, MarketSourceRecord, SkillStatsCheckpoint, SkillTag, SourceRecord, TrashEntry } from './protocol.ts';
 /** 默认场景名（系统预置的兜底场景，新技能自动归入）。 */
 export declare const DEFAULT_SCENE_NAME = "\u901A\u7528";
 /** Resolve the DSH home directory (the filesystem provider's user-dsh root base). */
@@ -40,6 +40,8 @@ export declare class SkillHubStore {
     private marketSources;
     private trashByName;
     private skillStats;
+    private collectionOrder;
+    private sourceGroupOrder;
     private loaded;
     /** Serializes persist runs: concurrent mutators must not let an earlier
      *  snapshot overwrite a later one (rename is atomic, ordering is not). */
@@ -89,6 +91,16 @@ export declare class SkillHubStore {
     setTagMembers(id: string, skillNames: readonly string[]): Promise<SkillTag | undefined>;
     /** Remove one skill from every tag group (used when the skill is deleted). */
     removeSkillFromTags(name: string): Promise<void>;
+    /** Reorder tag groups by orderedIds (drag-and-drop). */
+    reorderTags(orderedIds: string[]): Promise<SkillTag[]>;
+    /** Collection order for 来源分组拖拽 */
+    getCollectionOrder(): Promise<string[]>;
+    /** Reorder collections by orderedNames (drag-and-drop). */
+    reorderCollections(orderedNames: string[]): Promise<string[]>;
+    /** Source top-level group order for 来源分组（project / col:xxx / personal） */
+    getSourceGroupOrder(): Promise<string[]>;
+    /** Reorder source top-level groups by orderedKeys */
+    reorderSourceGroups(orderedKeys: string[]): Promise<string[]>;
     /** All source records, sorted by repo. */
     listSources(): Promise<SourceRecord[]>;
     /** One source record by repo (undefined when absent). */
@@ -101,7 +113,7 @@ export declare class SkillHubStore {
      * Upsert one skill into a source record. When the repo has no record yet a
      * new one is created (root + commit snapshot from the caller).
      */
-    addSourceSkill(repo: string, root: RepoRoot, commitSha: string, ref: string | undefined, skillName: string): Promise<void>;
+    addSourceSkill(repo: string, root: string, commitSha: string, ref: string | undefined, skillName: string): Promise<void>;
     /** Replace a source's skill list (used after sync/confirm-delete). */
     setSourceSkills(repo: string, skills: readonly string[]): Promise<SourceRecord | undefined>;
     /** Remove one skill from every source record (used when the skill is deleted). */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-skill-hub",
-  "version": "0.2.5",
+  "version": "0.3.0",
   "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/SkillHubSettingsCard.tsx

@@ -6,9 +6,10 @@
  * namespace, so the plugin shows up in Settings → 插件 on dsh rc.7+.
  */
 
-import type { ReactElement } from 'react'
+import { useEffect, useState, type ReactElement } from 'react'
 import type { SnapshotStore } from '@deepseek-ai/dsh-client-runtime/client'
 import type { InjectFace, PropsLocale, PropsRuntime } from '@deepseek-ai/dsh-client-ui-slots'
+import { SkillHubApi } from './api.ts'
 import { ColorField, NumberField, PluginSettingsCard, SwitchField } from './settings-card.tsx'
 import { booleanField, CardForm, colorField, numberField, type CardShell, type FieldState, type FormScope } from './settings-form.ts'
 // Single source for the TS-side dot defaults (the panel CSS mirrors these).
@@ -91,6 +92,15 @@ export class SkillHubSettingsCardController {
 export function SkillHubSettingsCard(props: SkillHubSettingsCardProps): ReactElement {
   const { t } = props
   const state = props.useSkillHubSettingsCard((snapshot) => snapshot)
+  // 插件自身版本：挂载时从 config 路由取一次（与面板标题徽标同源），失败静默不显示。
+  const [version, setVersion] = useState<string | undefined>(undefined)
+  useEffect(() => {
+    let cancelled = false
+    void new SkillHubApi().config()
+      .then((res) => { if (!cancelled && res.ok) setVersion(res.pluginVersion) })
+      .catch(() => { /* 版本徽标是装饰性的，失败不提示 */ })
+    return () => { cancelled = true }
+  }, [])
   const disabled = !state.writable
   const fieldProps = {
     overriddenLabel: t('settings.overridden'),
@@ -102,6 +112,7 @@ export function SkillHubSettingsCard(props: SkillHubSettingsCardProps): ReactEle
       t={t}
       titleKey='settings.title'
       descriptionKey='settings.description'
+      version={version}
       state={state}
       onSave={props.save}
       onDiscard={props.discard}

package/src/client/api.ts

@@ -5,10 +5,15 @@
 import {
   SKILL_HUB_API,
   type CatalogResponse,
+  type CollectionGroup,
   type ConfigRequest,
   type ConfigResponse,
   type CreateRequest,
   type CreateResponse,
+  type CollectionReorderRequest,
+  type CollectionReorderResponse,
+  type SourceGroupReorderRequest,
+  type SourceGroupReorderResponse,
   type MarketCheckResponse,
   type MarketSourceRefRequest,
   type MarketSourceRequest,
@@ -16,12 +21,15 @@ import {
   type MarketSourcesResponse,
   type MarketSyncResponse,
   type RepoDiscoverResponse,
+  type RepoImportCancelResponse,
+  type RepoImportProgressResponse,
   type RepoImportRequest,
   type RepoImportResponse,
   type SkillDetail,
   type SkillDetailResponse,
   type SkillDeleteRequest,
   type SkillDeleteResponse,
+  type SkillTag,
   type SourceCheckRequest,
   type SourceCheckResponse,
   type SourceDeleteRequest,
@@ -33,6 +41,8 @@ import {
   type SourceSyncRequest,
   type SourceSyncResponse,
   type StatsResponse,
+  type TagReorderRequest,
+  type TagReorderResponse,
   type ToggleBatchRequest,
   type ToggleBatchResponse,
   type UpdateCheckResponse,
@@ -206,7 +216,7 @@ export class SkillHubApi {
     return readJson<RepoDiscoverResponse>(response)
   }
 
-  /** Install selected repo skills into the user-dsh root (records the source). */
+  /** Install selected repo skills into the user-dsh root (records the source). Returns jobId for polling. */
   async repoImport(repo: string, paths: string[], ref?: string): Promise<RepoImportResponse> {
     const payload: RepoImportRequest = { repo, paths, ...(ref !== undefined && ref !== '' ? { ref } : {}) }
     const response = await fetchWithTimeout(SKILL_HUB_API.repoImport, {
@@ -217,6 +227,23 @@ export class SkillHubApi {
     return readJson<RepoImportResponse>(response)
   }
 
+  /** Poll import job progress (B方案轮询) */
+  async repoImportProgress(jobId: string): Promise<RepoImportProgressResponse> {
+    const url = SKILL_HUB_API.repoImportProgress + '?jobId=' + encodeURIComponent(jobId)
+    const response = await fetchWithTimeout(url)
+    return readJson<RepoImportProgressResponse>(response)
+  }
+
+  /** Cancel a running import job (选项2：唯有取消才停) */
+  async repoImportCancel(jobId: string): Promise<RepoImportCancelResponse> {
+    const response = await fetchWithTimeout(SKILL_HUB_API.repoImportCancel, {
+      method: 'POST',
+      headers: { 'content-type': 'application/json' },
+      body: JSON.stringify({ jobId }),
+    })
+    return readJson<RepoImportCancelResponse>(response)
+  }
+
   /** Read the hub's runtime config (effective values + saved overrides). */
   async config(): Promise<ConfigResponse> {
     const response = await fetchWithTimeout(SKILL_HUB_API.config)
@@ -272,6 +299,39 @@ export class SkillHubApi {
     return body.tags
   }
 
+  /** 拖拽重排场景分组 */
+  async reorderTags(orderedIds: string[]): Promise<SkillTag[]> {
+    const response = await fetchWithTimeout(SKILL_HUB_API.tagReorder, {
+      method: 'POST',
+      headers: { 'content-type': 'application/json' },
+      body: JSON.stringify({ orderedIds } satisfies TagReorderRequest),
+    })
+    const body = await readJson<TagReorderResponse>(response)
+    return body.tags
+  }
+
+  /** 拖拽重排来源集合 */
+  async reorderCollections(orderedNames: string[]): Promise<CollectionGroup[]> {
+    const response = await fetchWithTimeout(SKILL_HUB_API.collectionReorder, {
+      method: 'POST',
+      headers: { 'content-type': 'application/json' },
+      body: JSON.stringify({ orderedNames } satisfies CollectionReorderRequest),
+    })
+    const body = await readJson<CollectionReorderResponse>(response)
+    return body.collections
+  }
+
+  /** 拖拽重排来源顶层分组（project / collections / personal） */
+  async reorderSourceGroups(orderedKeys: string[]): Promise<string[]> {
+    const response = await fetchWithTimeout(SKILL_HUB_API.sourceGroupReorder, {
+      method: 'POST',
+      headers: { 'content-type': 'application/json' },
+      body: JSON.stringify({ orderedKeys } satisfies SourceGroupReorderRequest),
+    })
+    const body = await readJson<SourceGroupReorderResponse>(response)
+    return body.order
+  }
+
   /** 来源列表 + 派生 origin 映射 + 集合组 + 回收站。 */
   async sources(): Promise<SourcesResponse> {
     const response = await fetchWithTimeout(SKILL_HUB_API.sources)