dsh-skill-hub 0.3.11 → 0.3.13

package/lib/index.js

@@ -108,10 +108,45 @@ function isProjectSource(source) {
 * 错误文案收敛：宿主各处把 unknown 异常转成一行可读文字。原先这条表达式
 * 在宿主侧内联了 22 次（`error instanceof Error ? error.message : String(error)`），
 * 现在统一走这里。浏览器半有自己的 `helpers.errorMessage`，两半互不引用。
+*
+* Error 的 `cause` 链（undici 的 `fetch failed`、AggregateError 的多地址
+* 失败、TLS 证书错误等）以括号附录带出，避免只剩笼统的顶层 message。
 */
-/** 从 unknown 异常取出可读文案；非 Error 值用 String 兜底。 */
+/** cause 链最大展开深度，防自引用/超深链。 */
+const MAX_CAUSE_DEPTH = 4;
+/** 合成一条 cause 细节；code 已在 message 里则不重复。 */
+function causeDetail(message, code) {
+	const text = message.trim();
+	if (code === "") return text;
+	if (text === "") return "[" + code + "]";
+	return text.includes(code) ? text : text + " [" + code + "]";
+}
+/** 深度受限地收集 cause 链细节（AggregateError 展开其 errors）。 */
+function collectCauseDetails(cause, depth, seen, out) {
+	if (depth > MAX_CAUSE_DEPTH || cause === null || cause === void 0 || seen.has(cause)) return;
+	seen.add(cause);
+	if (cause instanceof Error) {
+		const errors = cause.errors;
+		if (Array.isArray(errors)) for (const item of errors) collectCauseDetails(item, depth + 1, seen, out);
+		const rawCode = cause.code;
+		const code = typeof rawCode === "string" ? rawCode : "";
+		const detail = causeDetail(cause.message, code);
+		if (detail !== "") out.push(detail);
+		collectCauseDetails(cause.cause, depth + 1, seen, out);
+		return;
+	}
+	const detail = causeDetail(String(cause), "");
+	if (detail !== "") out.push(detail);
+}
+/** 从 unknown 异常取出可读文案；非 Error 值用 String 兜底，cause 附在括号里。 */
 function errorText(error) {
-	return error instanceof Error ? error.message : String(error);
+	if (!(error instanceof Error)) return String(error);
+	const details = [];
+	collectCauseDetails(error.cause, 1, /* @__PURE__ */ new Set(), details);
+	for (let index = details.length - 1; index >= 0; index -= 1) if (details[index] === error.message || details.indexOf(details[index]) !== index) details.splice(index, 1);
+	if (details.length === 0) return error.message;
+	const suffix = details.join("; ");
+	return error.message === "" ? suffix : error.message + " (" + suffix + ")";
 }
 //#endregion
 //#region src/store/paths.ts
@@ -1088,6 +1123,39 @@ async function scanRoot(base) {
 function listSkillEntries(root, home = dshHome()) {
 	return scanRoot(rootPath(root, home));
 }
+/**
+* Scan one skills root for hub-disabled discovery files: directory bundles
+* renamed to SKILL.md.disabled and flat <name>.md.disabled files. Used by
+* the startup reconcile to rebuild sidecar records that were lost, which
+* would otherwise leave the skill invisible in every view.
+*/
+async function scanDisabledRoot(base) {
+	const paths = [];
+	let names;
+	try {
+		names = await readdir(base);
+	} catch (error) {
+		if (error.code === "ENOENT") return paths;
+		throw error;
+	}
+	for (const name of names) {
+		if (name.startsWith(".")) continue;
+		const absolute = join(base, name);
+		let stats;
+		try {
+			stats = await stat(absolute);
+		} catch {
+			continue;
+		}
+		if (stats.isDirectory()) {
+			const candidate = join(absolute, "SKILL.md.disabled");
+			try {
+				if ((await stat(candidate)).isFile()) paths.push(candidate);
+			} catch {}
+		} else if (name.endsWith(".md.disabled") && name !== "SKILL.md.disabled") paths.push(absolute);
+	}
+	return paths.sort((a, b) => a < b ? -1 : a > b ? 1 : 0);
+}
 /** Read UI metadata from `agents/openai.yaml` beside a directory skill (mirrors codex SkillInterface). */
 async function readSkillInterface(directory) {
 	const yamlPath = join(directory, "agents", "openai.yaml");
@@ -4366,6 +4434,62 @@ function createSkillStatsReader(query, ttlMs = 3e5, options = {}) {
 	return reader;
 }
 //#endregion
+//#region src/reconcile.ts
+/**
+* Sidecar reconcile for hub-disabled skills.
+*
+* The catalog merges two sources: enabled skills come from the provider
+* (SKILL.md discovery), disabled skills come from the sidecar's `disabled`
+* records. The two can drift — a sidecar restored from a backup, a hand
+* edit, or an older build can leave a `SKILL.md.disabled` file on disk with
+* no record, which makes the skill invisible in every view (it is neither
+* enabled nor disabled) and leaves its origin collection rendering as an
+* empty shell. This walk rebuilds the missing records from disk at startup.
+*/
+/**
+* Add sidecar disabled records for every `.disabled` discovery file that has
+* none yet. Existing records (matched by path or by name) win, so this never
+* rewrites user data; unreadable or invalid files are skipped (they surface
+* in the diagnostics scan instead). Returns the records added.
+*/
+async function reconcileDisabledSkills(store, home = dshHome()) {
+	const known = await store.listDisabled();
+	const knownNames = new Set(known.map((entry) => entry.name));
+	const knownPaths = new Set(known.map((entry) => entry.path));
+	const added = [];
+	for (const root of WRITABLE_ROOTS) for (const path of await scanDisabledRoot(rootPath(root, home))) {
+		if (knownPaths.has(path)) continue;
+		let text;
+		try {
+			text = await readFile(path, "utf8");
+		} catch {
+			continue;
+		}
+		const parsed = parseFrontmatter(text);
+		if ("error" in parsed) continue;
+		const { name, description } = parsed.value;
+		if (knownNames.has(name)) continue;
+		let disabledAt = 0;
+		try {
+			disabledAt = (await stat(path)).mtimeMs;
+		} catch {
+			continue;
+		}
+		const record = {
+			name,
+			description,
+			path,
+			root,
+			disabledAt
+		};
+		await store.addDisabled(record);
+		knownNames.add(name);
+		knownPaths.add(path);
+		added.push(record);
+	}
+	return added;
+}
+//#endregion
 //#region src/index.ts
 /** Stable cordis plugin name (matches cordis.patch.yml insert id). */
 const name = "skill-hub";
@@ -4492,6 +4616,12 @@ function apply(ctx, config) {
 		} catch (error) {
 			ctx.logger.warn("[dsh-skill-hub] startup cleanup failed", error);
 		}
+		try {
+			const reconciled = await reconcileDisabledSkills(store, home);
+			if (reconciled.length > 0) ctx.logger.info(`[dsh-skill-hub] startup reconciled ${reconciled.length} disabled skill record(s): ${reconciled.map((entry) => entry.name).join(", ")}`);
+		} catch (error) {
+			ctx.logger.warn("[dsh-skill-hub] startup disabled-skill reconcile failed", error);
+		}
 	})();
 	(async () => {
 		try {

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

@@ -12,7 +12,7 @@
  * Closing a group whose member is enabled in another group is a conflict the
  * GUI resolves with a dialog; the helpers below compute both sides.
  */
-import type { CatalogSkill, CollectionGroup, SkillTag } from '../protocol.ts';
+import type { CatalogSkill, CollectionGroup, DisabledSkill, SkillTag } from '../protocol.ts';
 import { isProjectSource } from '../protocol.ts';
 export { isProjectSource };
 /** Grouped switch state derived from member enablement. */
@@ -50,6 +50,23 @@ export declare const PRIVATE_SOURCE = "private";
  * 项目级技能（有 workspace 归属）永远不算「个人」。
  */
 export declare function filterBySource(skills: readonly CatalogSkill[], source: string, origins: Readonly<Record<string, string>>): CatalogSkill[];
+/** One origin collection with the members visible under the current filters. */
+export interface VisibleCollection {
+    collection: CollectionGroup;
+    /** Enabled, currently visible members. */
+    skills: CatalogSkill[];
+    /** Disabled records passing the current name/description filter. */
+    disabledMembers: DisabledSkill[];
+}
+/**
+ * Match origin collections against the currently visible enabled skills and
+ * disabled records, dropping collections with no visible member. Without
+ * this, a stale origin (skill deleted on disk, or a `.disabled` file whose
+ * sidecar record was lost) renders a group header with zero rows — an empty
+ * shell the sources tab otherwise never shows (project/personal groups
+ * already disappear when they have nothing to display).
+ */
+export declare function visibleCollections(collections: readonly CollectionGroup[], visibleSkills: readonly CatalogSkill[], disabledRecords: readonly DisabledSkill[], normalized: string, sourceFilter: string, origins: Readonly<Record<string, string>>): VisibleCollection[];
 /** Catalog sort keys offered by the filter bar. */
 export type SortKey = 'name' | 'added' | 'uses';
 /**

package/lib/types/error-text.d.ts

@@ -2,6 +2,9 @@
  * 错误文案收敛：宿主各处把 unknown 异常转成一行可读文字。原先这条表达式
  * 在宿主侧内联了 22 次（`error instanceof Error ? error.message : String(error)`），
  * 现在统一走这里。浏览器半有自己的 `helpers.errorMessage`，两半互不引用。
+ *
+ * Error 的 `cause` 链（undici 的 `fetch failed`、AggregateError 的多地址
+ * 失败、TLS 证书错误等）以括号附录带出，避免只剩笼统的顶层 message。
  */
-/** 从 unknown 异常取出可读文案；非 Error 值用 String 兜底。 */
+/** 从 unknown 异常取出可读文案；非 Error 值用 String 兜底，cause 附在括号里。 */
 export declare function errorText(error: unknown): string;

package/lib/types/reconcile.d.ts

@@ -0,0 +1,24 @@
+/**
+ * Sidecar reconcile for hub-disabled skills.
+ *
+ * The catalog merges two sources: enabled skills come from the provider
+ * (SKILL.md discovery), disabled skills come from the sidecar's `disabled`
+ * records. The two can drift — a sidecar restored from a backup, a hand
+ * edit, or an older build can leave a `SKILL.md.disabled` file on disk with
+ * no record, which makes the skill invisible in every view (it is neither
+ * enabled nor disabled) and leaves its origin collection rendering as an
+ * empty shell. This walk rebuilds the missing records from disk at startup.
+ */
+import type { DisabledSkill } from './protocol.ts';
+/** Narrow store view used by the reconcile (SkillHubStore satisfies it). */
+export interface DisabledReconcileStore {
+    listDisabled(): Promise<DisabledSkill[]>;
+    addDisabled(entry: DisabledSkill): Promise<void>;
+}
+/**
+ * Add sidecar disabled records for every `.disabled` discovery file that has
+ * none yet. Existing records (matched by path or by name) win, so this never
+ * rewrites user data; unreadable or invalid files are skipped (they surface
+ * in the diagnostics scan instead). Returns the records added.
+ */
+export declare function reconcileDisabledSkills(store: DisabledReconcileStore, home?: string): Promise<DisabledSkill[]>;

package/lib/types/skillfs/scan.d.ts

@@ -15,6 +15,13 @@ export interface SkillEntry {
 export declare function scanRoot(base: string): Promise<SkillEntry[]>;
 /** Scan one writable root. */
 export declare function listSkillEntries(root: WritableRoot, home?: string): Promise<SkillEntry[]>;
+/**
+ * Scan one skills root for hub-disabled discovery files: directory bundles
+ * renamed to SKILL.md.disabled and flat <name>.md.disabled files. Used by
+ * the startup reconcile to rebuild sidecar records that were lost, which
+ * would otherwise leave the skill invisible in every view.
+ */
+export declare function scanDisabledRoot(base: string): Promise<string[]>;
 /** UI metadata from `agents/openai.yaml` beside a directory skill (mirrors codex SkillInterface). */
 export interface SkillInterface {
     displayName?: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-skill-hub",
-  "version": "0.3.11",
+  "version": "0.3.13",
   "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": {
@@ -69,7 +69,11 @@
         "0.1.2-alpha.5",
         "0.1.2-rc.1",
         "0.1.3-alpha.2",
-        "0.1.5-alpha.1"
+        "0.1.5-alpha.1",
+        "0.1.5-alpha.2",
+        "0.1.5-rc.1",
+        "0.1.5-rc.2",
+        "0.1.6-alpha.1"
       ]
     },
     "capability": {
@@ -91,19 +95,19 @@
   },
   "peerDependencies": {
     "@deepseek-ai/cordis": "^4.0.1 || ^4.0.2",
-    "@deepseek-ai/dsh-client-connection": ">=0.1.0-rc.7 <0.2.0-0 || >=0.1.1-rc.2 <0.2.0-0 || >=0.1.2-alpha.2 <0.2.0-0 || >=0.1.2-alpha.3 <0.2.0-0 || >=0.1.2-alpha.4 <0.2.0-0 || >=0.1.2-alpha.5 <0.2.0-0 || >=0.1.2-rc.1 <0.2.0-0 || >=0.1.3-alpha.2 <0.2.0-0 || >=0.1.5-alpha.1 <0.2.0-0",
-    "@deepseek-ai/dsh-client-locale": ">=0.1.0-rc.7 <0.2.0-0 || >=0.1.1-rc.2 <0.2.0-0 || >=0.1.2-alpha.2 <0.2.0-0 || >=0.1.2-alpha.3 <0.2.0-0 || >=0.1.2-alpha.4 <0.2.0-0 || >=0.1.2-alpha.5 <0.2.0-0 || >=0.1.2-rc.1 <0.2.0-0 || >=0.1.3-alpha.2 <0.2.0-0 || >=0.1.5-alpha.1 <0.2.0-0",
-    "@deepseek-ai/dsh-client-runtime": ">=0.1.0-rc.7 <0.2.0-0 || >=0.1.1-rc.2 <0.2.0-0 || >=0.1.2-alpha.3 <0.2.0-0 || >=0.1.2-alpha.4 <0.2.0-0 || >=0.1.2-alpha.5 <0.2.0-0 || >=0.1.3-alpha.2 <0.2.0-0 || >=0.1.5-alpha.1 <0.2.0-0",
-    "@deepseek-ai/dsh-client-store": ">=0.1.2-alpha.2 <0.2.0-0 || >=0.1.2-alpha.3 <0.2.0-0 || >=0.1.2-alpha.4 <0.2.0-0 || >=0.1.2-alpha.5 <0.2.0-0 || >=0.1.2-rc.1 <0.2.0-0 || >=0.1.3-alpha.2 <0.2.0-0 || >=0.1.5-alpha.1 <0.2.0-0",
-    "@deepseek-ai/dsh-client-ui-input-trigger": ">=0.1.0-rc.7 <0.2.0-0 || >=0.1.1-rc.2 <0.2.0-0 || >=0.1.2-alpha.2 <0.2.0-0 || >=0.1.2-alpha.3 <0.2.0-0 || >=0.1.2-alpha.4 <0.2.0-0 || >=0.1.2-alpha.5 <0.2.0-0 || >=0.1.2-rc.1 <0.2.0-0 || >=0.1.3-alpha.2 <0.2.0-0 || >=0.1.5-alpha.1 <0.2.0-0",
-    "@deepseek-ai/dsh-client-ui-settings": ">=0.1.0-rc.7 <0.2.0-0 || >=0.1.1-rc.2 <0.2.0-0 || >=0.1.2-alpha.2 <0.2.0-0 || >=0.1.2-alpha.3 <0.2.0-0 || >=0.1.2-alpha.4 <0.2.0-0 || >=0.1.2-alpha.5 <0.2.0-0 || >=0.1.2-rc.1 <0.2.0-0 || >=0.1.3-alpha.2 <0.2.0-0 || >=0.1.5-alpha.1 <0.2.0-0",
-    "@deepseek-ai/dsh-client-ui-slots": ">=0.1.0-rc.7 <0.2.0-0 || >=0.1.1-rc.2 <0.2.0-0 || >=0.1.2-alpha.2 <0.2.0-0 || >=0.1.2-alpha.3 <0.2.0-0 || >=0.1.2-alpha.4 <0.2.0-0 || >=0.1.2-alpha.5 <0.2.0-0 || >=0.1.2-rc.1 <0.2.0-0 || >=0.1.3-alpha.2 <0.2.0-0 || >=0.1.5-alpha.1 <0.2.0-0",
-    "@deepseek-ai/dsh-host-webserver": ">=0.1.0-rc.7 <0.2.0-0 || >=0.1.1-rc.2 <0.2.0-0 || >=0.1.2-alpha.2 <0.2.0-0 || >=0.1.2-alpha.3 <0.2.0-0 || >=0.1.2-alpha.4 <0.2.0-0 || >=0.1.2-alpha.5 <0.2.0-0 || >=0.1.2-rc.1 <0.2.0-0 || >=0.1.3-alpha.2 <0.2.0-0 || >=0.1.5-alpha.1 <0.2.0-0",
-    "@deepseek-ai/dsh-session": ">=0.1.0-rc.7 <0.2.0-0 || >=0.1.1-rc.2 <0.2.0-0 || >=0.1.2-alpha.2 <0.2.0-0 || >=0.1.2-alpha.3 <0.2.0-0 || >=0.1.2-alpha.4 <0.2.0-0 || >=0.1.2-alpha.5 <0.2.0-0 || >=0.1.2-rc.1 <0.2.0-0 || >=0.1.3-alpha.2 <0.2.0-0 || >=0.1.5-alpha.1 <0.2.0-0",
-    "@deepseek-ai/dsh-session-query": ">=0.1.0-rc.7 <0.2.0-0 || >=0.1.1-rc.2 <0.2.0-0 || >=0.1.2-alpha.2 <0.2.0-0 || >=0.1.2-alpha.3 <0.2.0-0 || >=0.1.2-alpha.4 <0.2.0-0 || >=0.1.2-alpha.5 <0.2.0-0 || >=0.1.2-rc.1 <0.2.0-0 || >=0.1.3-alpha.2 <0.2.0-0 || >=0.1.5-alpha.1 <0.2.0-0",
-    "@deepseek-ai/dsh-settings": ">=0.1.0-rc.7 <0.2.0-0 || >=0.1.1-rc.2 <0.2.0-0 || >=0.1.2-alpha.2 <0.2.0-0 || >=0.1.2-alpha.3 <0.2.0-0 || >=0.1.2-alpha.4 <0.2.0-0 || >=0.1.2-alpha.5 <0.2.0-0 || >=0.1.2-rc.1 <0.2.0-0 || >=0.1.3-alpha.2 <0.2.0-0 || >=0.1.5-alpha.1 <0.2.0-0",
-    "@deepseek-ai/dsh-skill": ">=0.1.0-rc.7 <0.2.0-0 || >=0.1.1-rc.2 <0.2.0-0 || >=0.1.2-alpha.2 <0.2.0-0 || >=0.1.2-alpha.3 <0.2.0-0 || >=0.1.2-alpha.4 <0.2.0-0 || >=0.1.2-alpha.5 <0.2.0-0 || >=0.1.2-rc.1 <0.2.0-0 || >=0.1.3-alpha.2 <0.2.0-0 || >=0.1.5-alpha.1 <0.2.0-0",
-    "@deepseek-ai/dsh-system-prompt": ">=0.1.0-rc.7 <0.2.0-0 || >=0.1.1-rc.2 <0.2.0-0 || >=0.1.2-alpha.2 <0.2.0-0 || >=0.1.2-alpha.3 <0.2.0-0 || >=0.1.2-alpha.4 <0.2.0-0 || >=0.1.2-alpha.5 <0.2.0-0 || >=0.1.2-rc.1 <0.2.0-0 || >=0.1.3-alpha.2 <0.2.0-0 || >=0.1.5-alpha.1 <0.2.0-0",
+    "@deepseek-ai/dsh-client-connection": ">=0.1.0-rc.7 <0.2.0-0 || >=0.1.1-rc.2 <0.2.0-0 || >=0.1.2-alpha.2 <0.2.0-0 || >=0.1.2-alpha.3 <0.2.0-0 || >=0.1.2-alpha.4 <0.2.0-0 || >=0.1.2-alpha.5 <0.2.0-0 || >=0.1.2-rc.1 <0.2.0-0 || >=0.1.3-alpha.2 <0.2.0-0 || >=0.1.5-alpha.1 <0.2.0-0 || >=0.1.5-alpha.2 <0.2.0-0 || >=0.1.5-rc.1 <0.2.0-0 || >=0.1.5-rc.2 <0.2.0-0 || >=0.1.6-alpha.1 <0.2.0-0",
+    "@deepseek-ai/dsh-client-locale": ">=0.1.0-rc.7 <0.2.0-0 || >=0.1.1-rc.2 <0.2.0-0 || >=0.1.2-alpha.2 <0.2.0-0 || >=0.1.2-alpha.3 <0.2.0-0 || >=0.1.2-alpha.4 <0.2.0-0 || >=0.1.2-alpha.5 <0.2.0-0 || >=0.1.2-rc.1 <0.2.0-0 || >=0.1.3-alpha.2 <0.2.0-0 || >=0.1.5-alpha.1 <0.2.0-0 || >=0.1.5-alpha.2 <0.2.0-0 || >=0.1.5-rc.1 <0.2.0-0 || >=0.1.5-rc.2 <0.2.0-0 || >=0.1.6-alpha.1 <0.2.0-0",
+    "@deepseek-ai/dsh-client-runtime": ">=0.1.0-rc.7 <0.2.0-0 || >=0.1.1-rc.2 <0.2.0-0 || >=0.1.2-alpha.3 <0.2.0-0 || >=0.1.2-alpha.4 <0.2.0-0 || >=0.1.2-alpha.5 <0.2.0-0 || >=0.1.3-alpha.2 <0.2.0-0 || >=0.1.5-alpha.1 <0.2.0-0 || >=0.1.5-alpha.2 <0.2.0-0 || >=0.1.5-rc.1 <0.2.0-0 || >=0.1.5-rc.2 <0.2.0-0 || >=0.1.6-alpha.1 <0.2.0-0",
+    "@deepseek-ai/dsh-client-store": ">=0.1.2-alpha.2 <0.2.0-0 || >=0.1.2-alpha.3 <0.2.0-0 || >=0.1.2-alpha.4 <0.2.0-0 || >=0.1.2-alpha.5 <0.2.0-0 || >=0.1.2-rc.1 <0.2.0-0 || >=0.1.3-alpha.2 <0.2.0-0 || >=0.1.5-alpha.1 <0.2.0-0 || >=0.1.5-alpha.2 <0.2.0-0 || >=0.1.5-rc.1 <0.2.0-0 || >=0.1.5-rc.2 <0.2.0-0 || >=0.1.6-alpha.1 <0.2.0-0",
+    "@deepseek-ai/dsh-client-ui-input-trigger": ">=0.1.0-rc.7 <0.2.0-0 || >=0.1.1-rc.2 <0.2.0-0 || >=0.1.2-alpha.2 <0.2.0-0 || >=0.1.2-alpha.3 <0.2.0-0 || >=0.1.2-alpha.4 <0.2.0-0 || >=0.1.2-alpha.5 <0.2.0-0 || >=0.1.2-rc.1 <0.2.0-0 || >=0.1.3-alpha.2 <0.2.0-0 || >=0.1.5-alpha.1 <0.2.0-0 || >=0.1.5-alpha.2 <0.2.0-0 || >=0.1.5-rc.1 <0.2.0-0 || >=0.1.5-rc.2 <0.2.0-0 || >=0.1.6-alpha.1 <0.2.0-0",
+    "@deepseek-ai/dsh-client-ui-settings": ">=0.1.0-rc.7 <0.2.0-0 || >=0.1.1-rc.2 <0.2.0-0 || >=0.1.2-alpha.2 <0.2.0-0 || >=0.1.2-alpha.3 <0.2.0-0 || >=0.1.2-alpha.4 <0.2.0-0 || >=0.1.2-alpha.5 <0.2.0-0 || >=0.1.2-rc.1 <0.2.0-0 || >=0.1.3-alpha.2 <0.2.0-0 || >=0.1.5-alpha.1 <0.2.0-0 || >=0.1.5-alpha.2 <0.2.0-0 || >=0.1.5-rc.1 <0.2.0-0 || >=0.1.5-rc.2 <0.2.0-0 || >=0.1.6-alpha.1 <0.2.0-0",
+    "@deepseek-ai/dsh-client-ui-slots": ">=0.1.0-rc.7 <0.2.0-0 || >=0.1.1-rc.2 <0.2.0-0 || >=0.1.2-alpha.2 <0.2.0-0 || >=0.1.2-alpha.3 <0.2.0-0 || >=0.1.2-alpha.4 <0.2.0-0 || >=0.1.2-alpha.5 <0.2.0-0 || >=0.1.2-rc.1 <0.2.0-0 || >=0.1.3-alpha.2 <0.2.0-0 || >=0.1.5-alpha.1 <0.2.0-0 || >=0.1.5-alpha.2 <0.2.0-0 || >=0.1.5-rc.1 <0.2.0-0 || >=0.1.5-rc.2 <0.2.0-0 || >=0.1.6-alpha.1 <0.2.0-0",
+    "@deepseek-ai/dsh-host-webserver": ">=0.1.0-rc.7 <0.2.0-0 || >=0.1.1-rc.2 <0.2.0-0 || >=0.1.2-alpha.2 <0.2.0-0 || >=0.1.2-alpha.3 <0.2.0-0 || >=0.1.2-alpha.4 <0.2.0-0 || >=0.1.2-alpha.5 <0.2.0-0 || >=0.1.2-rc.1 <0.2.0-0 || >=0.1.3-alpha.2 <0.2.0-0 || >=0.1.5-alpha.1 <0.2.0-0 || >=0.1.5-alpha.2 <0.2.0-0 || >=0.1.5-rc.1 <0.2.0-0 || >=0.1.5-rc.2 <0.2.0-0 || >=0.1.6-alpha.1 <0.2.0-0",
+    "@deepseek-ai/dsh-session": ">=0.1.0-rc.7 <0.2.0-0 || >=0.1.1-rc.2 <0.2.0-0 || >=0.1.2-alpha.2 <0.2.0-0 || >=0.1.2-alpha.3 <0.2.0-0 || >=0.1.2-alpha.4 <0.2.0-0 || >=0.1.2-alpha.5 <0.2.0-0 || >=0.1.2-rc.1 <0.2.0-0 || >=0.1.3-alpha.2 <0.2.0-0 || >=0.1.5-alpha.1 <0.2.0-0 || >=0.1.5-alpha.2 <0.2.0-0 || >=0.1.5-rc.1 <0.2.0-0 || >=0.1.5-rc.2 <0.2.0-0 || >=0.1.6-alpha.1 <0.2.0-0",
+    "@deepseek-ai/dsh-session-query": ">=0.1.0-rc.7 <0.2.0-0 || >=0.1.1-rc.2 <0.2.0-0 || >=0.1.2-alpha.2 <0.2.0-0 || >=0.1.2-alpha.3 <0.2.0-0 || >=0.1.2-alpha.4 <0.2.0-0 || >=0.1.2-alpha.5 <0.2.0-0 || >=0.1.2-rc.1 <0.2.0-0 || >=0.1.3-alpha.2 <0.2.0-0 || >=0.1.5-alpha.1 <0.2.0-0 || >=0.1.5-alpha.2 <0.2.0-0 || >=0.1.5-rc.1 <0.2.0-0 || >=0.1.5-rc.2 <0.2.0-0 || >=0.1.6-alpha.1 <0.2.0-0",
+    "@deepseek-ai/dsh-settings": ">=0.1.0-rc.7 <0.2.0-0 || >=0.1.1-rc.2 <0.2.0-0 || >=0.1.2-alpha.2 <0.2.0-0 || >=0.1.2-alpha.3 <0.2.0-0 || >=0.1.2-alpha.4 <0.2.0-0 || >=0.1.2-alpha.5 <0.2.0-0 || >=0.1.2-rc.1 <0.2.0-0 || >=0.1.3-alpha.2 <0.2.0-0 || >=0.1.5-alpha.1 <0.2.0-0 || >=0.1.5-alpha.2 <0.2.0-0 || >=0.1.5-rc.1 <0.2.0-0 || >=0.1.5-rc.2 <0.2.0-0 || >=0.1.6-alpha.1 <0.2.0-0",
+    "@deepseek-ai/dsh-skill": ">=0.1.0-rc.7 <0.2.0-0 || >=0.1.1-rc.2 <0.2.0-0 || >=0.1.2-alpha.2 <0.2.0-0 || >=0.1.2-alpha.3 <0.2.0-0 || >=0.1.2-alpha.4 <0.2.0-0 || >=0.1.2-alpha.5 <0.2.0-0 || >=0.1.2-rc.1 <0.2.0-0 || >=0.1.3-alpha.2 <0.2.0-0 || >=0.1.5-alpha.1 <0.2.0-0 || >=0.1.5-alpha.2 <0.2.0-0 || >=0.1.5-rc.1 <0.2.0-0 || >=0.1.5-rc.2 <0.2.0-0 || >=0.1.6-alpha.1 <0.2.0-0",
+    "@deepseek-ai/dsh-system-prompt": ">=0.1.0-rc.7 <0.2.0-0 || >=0.1.1-rc.2 <0.2.0-0 || >=0.1.2-alpha.2 <0.2.0-0 || >=0.1.2-alpha.3 <0.2.0-0 || >=0.1.2-alpha.4 <0.2.0-0 || >=0.1.2-alpha.5 <0.2.0-0 || >=0.1.2-rc.1 <0.2.0-0 || >=0.1.3-alpha.2 <0.2.0-0 || >=0.1.5-alpha.1 <0.2.0-0 || >=0.1.5-alpha.2 <0.2.0-0 || >=0.1.5-rc.1 <0.2.0-0 || >=0.1.5-rc.2 <0.2.0-0 || >=0.1.6-alpha.1 <0.2.0-0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   },
@@ -117,30 +121,32 @@
   },
   "devDependencies": {
     "@deepseek-ai/cordis": "^4.0.2",
-    "@deepseek-ai/dsh-client-connection": "^0.1.5-alpha.1",
-    "@deepseek-ai/dsh-client-locale": "^0.1.5-alpha.1",
-    "@deepseek-ai/dsh-client-store": "^0.1.5-alpha.1",
-    "@deepseek-ai/dsh-client-ui-input-trigger": "^0.1.5-alpha.1",
-    "@deepseek-ai/dsh-client-ui-settings": "^0.1.5-alpha.1",
-    "@deepseek-ai/dsh-client-ui-settings-plugins": "^0.1.5-alpha.1",
-    "@deepseek-ai/dsh-client-ui-slots": "^0.1.5-alpha.1",
-    "@deepseek-ai/dsh-host-webserver": "^0.1.5-alpha.1",
-    "@deepseek-ai/dsh-session": "^0.1.5-alpha.1",
-    "@deepseek-ai/dsh-session-query": "^0.1.5-alpha.1",
-    "@deepseek-ai/dsh-settings": "^0.1.5-alpha.1",
-    "@deepseek-ai/dsh-skill": "^0.1.5-alpha.1",
-    "@deepseek-ai/dsh-system-prompt": "^0.1.5-alpha.1",
+    "@deepseek-ai/dsh-client-connection": "^0.1.6-alpha.1",
+    "@deepseek-ai/dsh-client-locale": "^0.1.6-alpha.1",
+    "@deepseek-ai/dsh-client-store": "^0.1.6-alpha.1",
+    "@deepseek-ai/dsh-client-ui-input-trigger": "^0.1.6-alpha.1",
+    "@deepseek-ai/dsh-client-ui-settings": "^0.1.6-alpha.1",
+    "@deepseek-ai/dsh-client-ui-settings-plugins": "^0.1.6-alpha.1",
+    "@deepseek-ai/dsh-client-ui-slots": "^0.1.6-alpha.1",
+    "@deepseek-ai/dsh-host-webserver": "^0.1.6-alpha.1",
+    "@deepseek-ai/dsh-session": "^0.1.6-alpha.1",
+    "@deepseek-ai/dsh-session-query": "^0.1.6-alpha.1",
+    "@deepseek-ai/dsh-settings": "^0.1.6-alpha.1",
+    "@deepseek-ai/dsh-skill": "^0.1.6-alpha.1",
+    "@deepseek-ai/dsh-system-prompt": "^0.1.6-alpha.1",
     "@types/js-yaml": "^4.0.9",
     "@types/node": "^22.20.0",
     "@types/react": "~18.3.1",
     "@types/react-dom": "^18.3.5",
+    "immer": "^10.2.0",
     "lightningcss": "1.32.0",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
     "schemastery": "^3.18.0",
     "tsdown": "0.22.2",
     "typescript": "~5.7.2",
-    "vitest": "^3.0.0"
+    "vitest": "^3.0.0",
+    "zustand": "~4.4.7"
   },
   "files": [
     "lib/**/*.js",

package/src/client/grouping.test.ts

@@ -1,6 +1,6 @@
 import { describe, expect, it } from 'vitest'
-import type { CatalogSkill, SkillTag } from '../protocol.ts'
-import { conflictsOnClose, filterBySource, formatRelativeTime, groupNamesOf, groupSwitchView, PRIVATE_SOURCE, sortSkills } from './grouping.ts'
+import type { CatalogSkill, CollectionGroup, DisabledSkill, SkillTag } from '../protocol.ts'
+import { conflictsOnClose, filterBySource, formatRelativeTime, groupNamesOf, groupSwitchView, PRIVATE_SOURCE, sortSkills, visibleCollections } from './grouping.ts'
 
 function skill(name: string, writable = true): CatalogSkill {
   return {
@@ -75,6 +75,39 @@ describe('filterBySource', () => {
   })
 })
 
+describe('visibleCollections', () => {
+  const collections: CollectionGroup[] = [
+    { name: 'repo/x', skillNames: ['enabled-one', 'disabled-one'] },
+    { name: 'repo/ghost', skillNames: ['gone'] },
+  ]
+  const disabledOne: DisabledSkill = { name: 'disabled-one', description: 'Paused skill', path: '/x/disabled-one/SKILL.md.disabled', root: 'user-dsh', disabledAt: 1 }
+  const origins = { 'enabled-one': 'repo/x', 'disabled-one': 'repo/x' }
+
+  it('keeps collections with visible members and drops empty shells', () => {
+    const visible = visibleCollections(collections, [skill('enabled-one')], [disabledOne], '', 'all', origins)
+    expect(visible.map((entry) => entry.collection.name)).toEqual(['repo/x'])
+    expect(visible[0].skills.map((s) => s.name)).toEqual(['enabled-one'])
+    expect(visible[0].disabledMembers.map((d) => d.name)).toEqual(['disabled-one'])
+  })
+
+  it('drops a collection when neither side passes the search filter', () => {
+    expect(visibleCollections(collections, [], [disabledOne], 'no-match', 'all', origins)).toEqual([])
+    expect(visibleCollections(collections, [], [disabledOne], 'paused', 'all', origins).map((e) => e.collection.name)).toEqual(['repo/x'])
+  })
+
+  it('applies the source filter to disabled-only collections', () => {
+    expect(visibleCollections(collections, [], [disabledOne], '', 'repo/other', origins)).toEqual([])
+    expect(visibleCollections(collections, [], [disabledOne], '', 'private', origins)).toEqual([])
+    expect(visibleCollections(collections, [], [disabledOne], '', 'repo/x', origins).map((e) => e.collection.name)).toEqual(['repo/x'])
+  })
+
+  it('treats a disabled record with no origin as private', () => {
+    const privateRecord = { ...disabledOne, name: 'private-one' }
+    const privateCollection: CollectionGroup = { name: 'repo/y', skillNames: ['private-one'] }
+    expect(visibleCollections([privateCollection], [], [privateRecord], '', PRIVATE_SOURCE, {}).map((e) => e.collection.name)).toEqual(['repo/y'])
+  })
+})
+
 describe('sortSkills', () => {
   it('sorts by name ascending', () => {
     const skills = [skill('zeta'), skill('alpha'), skill('beta')]

package/src/client/grouping.ts

@@ -13,7 +13,7 @@
  * GUI resolves with a dialog; the helpers below compute both sides.
  */
 
-import type { CatalogSkill, CollectionGroup, SkillTag } from '../protocol.ts'
+import type { CatalogSkill, CollectionGroup, DisabledSkill, SkillTag } from '../protocol.ts'
 import { isProjectSource } from '../protocol.ts'
 
 export { isProjectSource }
@@ -87,6 +87,43 @@ export function filterBySource(skills: readonly CatalogSkill[], source: string,
   })
 }
 
+/** One origin collection with the members visible under the current filters. */
+export interface VisibleCollection {
+  collection: CollectionGroup
+  /** Enabled, currently visible members. */
+  skills: CatalogSkill[]
+  /** Disabled records passing the current name/description filter. */
+  disabledMembers: DisabledSkill[]
+}
+
+/**
+ * Match origin collections against the currently visible enabled skills and
+ * disabled records, dropping collections with no visible member. Without
+ * this, a stale origin (skill deleted on disk, or a `.disabled` file whose
+ * sidecar record was lost) renders a group header with zero rows — an empty
+ * shell the sources tab otherwise never shows (project/personal groups
+ * already disappear when they have nothing to display).
+ */
+export function visibleCollections(
+  collections: readonly CollectionGroup[],
+  visibleSkills: readonly CatalogSkill[],
+  disabledRecords: readonly DisabledSkill[],
+  normalized: string,
+  sourceFilter: string,
+  origins: Readonly<Record<string, string>>,
+): VisibleCollection[] {
+  const visible: VisibleCollection[] = []
+  for (const collection of collections) {
+    const skills = visibleSkills.filter((skill) => collection.skillNames.includes(skill.name))
+    const disabledMembers = disabledRecords.filter((record) =>
+      collection.skillNames.includes(record.name)
+      && (normalized.length === 0 || record.name.toLocaleLowerCase().includes(normalized) || record.description.toLocaleLowerCase().includes(normalized))
+      && (sourceFilter === 'all' || (origins[record.name] ?? PRIVATE_SOURCE) === sourceFilter))
+    if (skills.length > 0 || disabledMembers.length > 0) visible.push({ collection, skills, disabledMembers })
+  }
+  return visible
+}
+
 /** Catalog sort keys offered by the filter bar. */
 export type SortKey = 'name' | 'added' | 'uses'
 

package/src/client/panel/PanelDialogs.tsx

@@ -101,8 +101,14 @@ export function PanelDialogs(props: PanelDialogsProps): JSX.Element {
         <VersionChoiceDialog
           choice={versionDialog}
           busy={versionBusy}
-          onSelect={(selected) => { setVersionDialog({ ...versionDialog, selected }) }}
-          onCustom={(custom) => { setVersionDialog({ ...versionDialog, custom }) }}
+          // Keep the selected ref and custom override in one functional
+          // update, so a ref selection cannot be lost to a stale snapshot.
+          onSelect={(selected) => {
+            setVersionDialog((previous) => previous === null ? previous : { ...previous, selected, custom: '' })
+          }}
+          onCustom={(custom) => {
+            setVersionDialog((previous) => previous === null ? previous : { ...previous, custom })
+          }}
           onCancel={() => { setVersionDialog(null) }}
           onConfirm={() => { void confirmVersionDialog() }}
         />

package/src/client/panel/SourcesView.tsx

@@ -8,7 +8,7 @@
 
 import { useMemo, useState, type JSX } from 'react'
 import { tt } from '../helpers.ts'
-import { filterBySource, groupSwitchView, isProjectSource, PRIVATE_SOURCE } from '../grouping.ts'
+import { filterBySource, groupSwitchView, isProjectSource, PRIVATE_SOURCE, visibleCollections } from '../grouping.ts'
 import { SkillRow } from './SkillRow.tsx'
 import { DisabledRow } from './DisabledRow.tsx'
 import { GroupSummary } from './GroupSummary.tsx'
@@ -28,10 +28,14 @@ export function SourcesView(props: { hub: SkillHubState }): JSX.Element {
   const duplicateNames = useMemo(() => new Set(catalog?.duplicateNames ?? []), [catalog])
 
   // ----- 顶层分组统一拖拽（project / col:xxx / personal 全部可拖） -----
-  const projectSkillsAll = filterBySource(sorted, sourceFilter, origins).filter((skill) => isProjectSource(skill.source))
+  const sourceFiltered = filterBySource(sorted, sourceFilter, origins)
+  const projectSkillsAll = sourceFiltered.filter((skill) => isProjectSource(skill.source))
   const hasProject = projectSkillsAll.length > 0
-  const collections = groupsState?.collections ?? []
-  const uncategorized = filterBySource(sorted, sourceFilter, origins).filter((skill) => origins[skill.name] === undefined && !isProjectSource(skill.source))
+  // 无可见成员的来源组不渲染：来源记录指向的技能可能已被删除，或禁用记录
+  // 丢失导致技能既非启用也非禁用，留下一个组头有数字、展开 0 行的空壳。
+  const visible = visibleCollections(groupsState?.collections ?? [], sourceFiltered, catalog?.disabled ?? [], normalized, sourceFilter, origins)
+  const collections = visible.map((entry) => entry.collection)
+  const uncategorized = sourceFiltered.filter((skill) => origins[skill.name] === undefined && !isProjectSource(skill.source))
   const personalDisabled = (catalog?.disabled ?? []).filter((record) => origins[record.name] === undefined)
     .filter((record) => normalized.length === 0 || record.name.toLocaleLowerCase().includes(normalized) || record.description.toLocaleLowerCase().includes(normalized))
     .filter((record) => sourceFilter === 'all' || sourceFilter === PRIVATE_SOURCE)
@@ -79,7 +83,7 @@ export function SourcesView(props: { hub: SkillHubState }): JSX.Element {
   const rowProps = { uses: hub.uses, hubConfig: hub.hubConfig, busyNames, editMode: hub.editMode, tagBusy: hub.tagBusy, duplicateNames, toggle: hub.toggle, openDetail: hub.openDetail, requestDeleteSkill: hub.requestDeleteSkill }
 
   if (skillView === 'flat') {
-    return <>{filterBySource(sorted, sourceFilter, origins).map((skill) => <SkillRow key={skill.name} skill={skill} {...rowProps} />)}</>
+    return <>{sourceFiltered.map((skill) => <SkillRow key={skill.name} skill={skill} {...rowProps} />)}</>
   }
 
   // 空状态：没有任何分组时提示
@@ -117,13 +121,9 @@ export function SourcesView(props: { hub: SkillHubState }): JSX.Element {
         // Collection 卡片（可拖，归属顶层排序）
         if (topKey.startsWith('col:')) {
           const colName = topKey.slice(4)
-          const collection = collections.find((c) => c.name === colName)
-          if (collection === undefined) return null
-          const skills = filterBySource(sorted, sourceFilter, origins).filter((skill) => collection.skillNames.includes(skill.name))
-          const disabledMembers = (catalog?.disabled ?? []).filter((record) =>
-            collection.skillNames.includes(record.name)
-            && (normalized.length === 0 || record.name.toLocaleLowerCase().includes(normalized) || record.description.toLocaleLowerCase().includes(normalized))
-            && (sourceFilter === 'all' || (origins[record.name] ?? PRIVATE_SOURCE) === sourceFilter))
+          const entry = visible.find((item) => item.collection.name === colName)
+          if (entry === undefined) return null
+          const { collection, skills, disabledMembers } = entry
           const collapsed = collapsedGroups.has('col:' + collection.name)
           const view = groupSwitchView(collection.skillNames, viewNames)
           const check = sourceCheck[collection.name]

package/src/client/panel/dialogs.tsx

@@ -5,7 +5,7 @@
  * the same role/aria shell; the panel owns all dialog state.
  */
 
-import { useEffect, type JSX, type ReactNode } from 'react'
+import { useEffect, useState, type JSX, type ReactNode } from 'react'
 import type { CollectionGroup, SkillTag } from '../../protocol.ts'
 import { tt } from '../helpers.ts'
 import { groupNamesOf } from '../grouping.ts'
@@ -170,29 +170,56 @@ export function VersionChoiceDialog(props: {
 }): JSX.Element {
   const { choice, busy, onSelect, onCustom, onCancel, onConfirm } = props
   const effective = choice.custom.trim() !== '' ? choice.custom.trim() : choice.selected
+  type RefGroup = 'releases' | 'branches'
+  const branchOptions = choice.branches.filter((branch) => !choice.releases.includes(branch))
+  const [refGroup, setRefGroup] = useState<RefGroup>(
+    choice.releases.includes(choice.selected) || choice.branches.length === 0 ? 'releases' : 'branches',
+  )
+  // The dialog starts in a loading state and receives the release/branch
+  // lists in a later render. Align the group once that data arrives, without
+  // resetting it after the user selects another ref.
+  useEffect(() => {
+    if (choice.loading) return
+    if (choice.releases.includes(choice.selected)) setRefGroup('releases')
+    else if (branchOptions.includes(choice.selected)) setRefGroup('branches')
+  }, [choice.loading, choice.repo])
+  const activeRefs = refGroup === 'releases' ? choice.releases : branchOptions
+  const listedRefs = [...choice.releases, ...branchOptions]
+  const currentUnlistedRef = choice.selected !== '' && !listedRefs.includes(choice.selected) ? choice.selected : undefined
+  const selectRefs = currentUnlistedRef !== undefined ? [currentUnlistedRef, ...activeRefs] : activeRefs
+  const selectValue = selectRefs.includes(choice.selected) ? choice.selected : selectRefs[0] ?? ''
+  const selectGroup = (next: RefGroup): void => {
+    setRefGroup(next)
+    const nextRefs = next === 'releases' ? choice.releases : branchOptions
+    if (nextRefs.length > 0 && !nextRefs.includes(choice.selected)) onSelect(nextRefs[0])
+  }
   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>
-            </>
+          <div className={css.segmented} role='group' aria-label={tt('market.versionTitle')} style={{ marginBottom: 8 }}>
+            <button
+              type='button'
+              className={css.segBtn + (refGroup === 'releases' ? ' ' + css.segBtnActive : '')}
+              disabled={choice.releases.length === 0}
+              aria-pressed={refGroup === 'releases'}
+              onClick={() => { selectGroup('releases') }}
+            >{tt('market.versionReleases')}</button>
+            <button
+              type='button'
+              className={css.segBtn + (refGroup === 'branches' ? ' ' + css.segBtnActive : '')}
+              disabled={branchOptions.length === 0}
+              aria-pressed={refGroup === 'branches'}
+              onClick={() => { selectGroup('branches') }}
+            >{tt('market.versionBranches')}</button>
+          </div>
+          {selectValue !== '' ? (
+            <select className={css.select + ' ' + css.dialogSelect} value={selectValue}
+              onChange={(event) => { onSelect(event.target.value) }}>
+              {selectRefs.map((ref) => <option key={ref} value={ref}>{ref}</option>)}
+            </select>
           ) : null}
           <p className={css.dialogText} style={{ marginBottom: 4 }}>{tt('market.versionCustom')}</p>
           <input className={css.input + ' ' + css.dialogSelect} value={choice.custom}