dsh-skill-hub 0.3.12 → 0.3.14

package/CONTRIBUTING.md

@@ -39,7 +39,7 @@ src/client/locales/     dictionaries by view (common/skills/market/sources/detai
 ```bash
 npm install
 npm run typecheck   # tsc --noEmit
-npm test            # vitest (217 tests across 13 suites)
+npm test            # vitest (233 tests across 14 suites)
 npm run build       # tsc declarations + tsdown bundles (lib/index.js + lib/client.js)
 ```
 
@@ -68,10 +68,12 @@ npm run build       # tsc declarations + tsdown bundles (lib/index.js + lib/clie
 ```bash
 # after a change:
 npm run build
-cp lib/index.js lib/client.js ~/.dsh/profiles/web/node_modules/dsh-skill-hub/lib/
 # restart the dsh web process, then verify Settings → 技能 and Settings → 插件 → Skill Hub
 ```
 
+When the web profile installs this repo as a link (`"dsh-skill-hub": "link:/path/to/repo"`, the
+usual local-dev setup), `lib/` is picked up on the next `dsh web` restart — no copy step needed.
+
 ## Issues
 
 - **Bugs**: include the dsh version, Node version, the plugin version, and the exact steps.

package/README.md

@@ -24,7 +24,7 @@ dsh plugin --profile web add dsh-skill-hub
 # restart dsh web → Settings → 技能 → Market → scan → import
 ```
 
-Requires `Node ^22.19 || >=24` + dsh web (`0.1.5-rc.2`, `0.1.x` forward compatible).
+Requires `Node ^22.19 || >=24` + dsh web `>=0.1.6-alpha.2 <0.2`.
 
 ## Features
 
@@ -115,6 +115,7 @@ npm run build      # tsc + tsdown → lib/index.js + lib/client.js
 
 - `duplicate loader entry id: skill-hub` — remove the duplicate install (keep one `dsh plugin add` method).
 - Skill missing — check the diagnostics section (frontmatter / name mismatch / short description).
+- Empty source group — its skills were deleted, or their disabled records were lost (sidecar restored/hand-edited). Startup reconciles `.disabled` files on disk; source groups with no visible member are no longer rendered.
 - Dots missing in `/` menu — dsh internals changed; catalog still works.
 
 ## Community

package/README.zh.md

@@ -24,7 +24,7 @@ dsh plugin --profile web add dsh-skill-hub
 # 重启 dsh web → 设置 → 技能 → 市场 → 扫描 → 导入
 ```
 
-要求 `Node ^22.19 || >=24` + dsh web（`0.1.5-rc.2`，兼容后续 `0.1.x`）。
+要求 `Node ^22.19 || >=24` + dsh web `>=0.1.6-alpha.2 <0.2`。
 
 ## 功能
 
@@ -115,6 +115,7 @@ npm run build      # tsc + tsdown → lib/index.js + lib/client.js
 
 - `duplicate loader entry id: skill-hub` — 删掉重复安装（只留一种 `dsh plugin add`）。
 - 技能不出现 — 看诊断区（缺 frontmatter / 名称不一致 / 描述过短）。
+- 来源组空壳 — 组内技能已被删除、或禁用记录丢失（状态文件被恢复/手改）。启动时自动对账磁盘上的 `.disabled` 文件补记录；无可见成员的来源组不再渲染。
 - `/` 菜单圆点消失 — dsh 内部触发源变更，目录功能不受影响。
 
 ## 社区

package/lib/client.js

@@ -959,6 +959,27 @@ window.__ModuleLoader__.load({
 			});
 		}
 		/**
+		* 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).
+		*/
+		function visibleCollections(collections, visibleSkills, disabledRecords, normalized, sourceFilter, origins) {
+			const visible = [];
+			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") === sourceFilter));
+				if (skills.length > 0 || disabledMembers.length > 0) visible.push({
+					collection,
+					skills,
+					disabledMembers
+				});
+			}
+			return visible;
+		}
+		/**
 		* Sort a skill list in place-safe copy order: name ascending, added
 		* descending (newest first, unknown addedAt last), or uses descending
 		* (most-called first). Unknown values always trail.
@@ -1143,36 +1164,11 @@ window.__ModuleLoader__.load({
 			}
 		}
 		/**
-		* One menu-row dot element. Inline span so it needs no CSS module; the
-		* candidate menu centers it inside its 16×16 leading icon slot.
-		* @param color - the dot's background color.
-		* @returns a React node (memory-only, never crosses the Host boundary).
-		*/
-		function dotIcon(color) {
-			return (0, react.createElement)("span", {
-				"aria-hidden": true,
-				style: {
-					display: "inline-block",
-					width: 6,
-					height: 6,
-					borderRadius: 3,
-					background: color,
-					flex: "none"
-				}
-			});
-		}
-		/**
-		* Wrap the core skill source so every menu row carries the invocation dot.
-		* Exported for unit tests; production wiring goes through setupSkillSlashDots.
-		* @param source - the registered `/skill` source.
-		* @param api - hub browser API for the modelInvocable lookup.
-		* @param scope - hub settings scope for the dot colors.
-		* @returns a disposer restoring the original candidates.
-		*/
-		/**
-		* DOM 兜底：在 alpha.2 新版 MenuView（icon 仅枚举）下通过直接操作
-		* 已渲染的 `[role="option"]` 列表注入彩色点，绕过 `icon` 限制。
-		* 旧版仍走 `icon` 注入，此处仅为新版。
+		* 通过直接操作已渲染的 `[role="option"]` 列表注入彩色点，
+		* 绕过 MenuView 对 `icon` 的枚举限制。
+		* @param modelByName - 技能名 → 模型可调用性；不在表内的候选不注点。
+		* @param modelColor - 模型可调用技能的点色。
+		* @param userColor - 仅用户可调用技能的点色。
 		*/
 		function injectDotsViaDOM(modelByName, modelColor, userColor) {
 			if (typeof document === "undefined" || typeof requestAnimationFrame === "undefined") return;
@@ -1210,25 +1206,24 @@ window.__ModuleLoader__.load({
 			};
 			requestAnimationFrame(() => setTimeout(run, 0));
 		}
+		/**
+		* Wrap the core skill source so every menu row carries the invocation dot.
+		* Exported for unit tests; production wiring goes through setupSkillSlashDots.
+		* @param source - the registered `/skill` source.
+		* @param api - hub browser API for the modelInvocable lookup.
+		* @param scope - hub settings scope for the dot colors.
+		* @returns a disposer restoring the original candidates.
+		*/
 		function wrapSkillSource(source, api, scope) {
 			const original = source.candidates;
 			source.candidates = async (session, req) => {
 				const items = await original(session, req);
 				if (req.signal.aborted) return items;
-				const isNewHost = req !== null && typeof req === "object" && "drilled" in req;
 				const modelByName = await modelInvocableMap(api);
 				if (req.signal.aborted) return items;
 				const snapshot = scope.getSnapshot();
-				const modelColor = snapshot.value?.dotModelColor ?? "#2f81f7";
-				const userColor = snapshot.value?.dotUserColor ?? "#3fb950";
-				if (isNewHost) {
-					injectDotsViaDOM(modelByName, modelColor, userColor);
-					return items;
-				}
-				return items.map((item) => ({
-					...item,
-					icon: dotIcon(modelByName.get(item.name) ?? true ? modelColor : userColor)
-				}));
+				injectDotsViaDOM(modelByName, snapshot.value?.dotModelColor ?? "#2f81f7", snapshot.value?.dotUserColor ?? "#3fb950");
+				return items;
 			};
 			return () => {
 				source.candidates = original;
@@ -2564,8 +2559,10 @@ window.__ModuleLoader__.load({
 		* The dsh-skill-hub plugin settings card: bridges the hub's settings
 		* namespace (bound through the official settings transport) onto the
 		* family-style staged card form (enabled master switch + agent announcement).
-		* Registered into the official `settings.plugin.item` slot keyed by that
-		* namespace, so the plugin shows up in Settings → 插件 on dsh rc.7+.
+		* Registered into `plugins.bundle.config` under the bundle's package name, so
+		* the Plugins manager renders it on dsh-skill-hub's own page. That slot is
+		* dispatched with `view: 'page'` only, so the card always renders its full
+		* form (no `summary` one-liner variant).
 		*/
 		/** Bridges the hub's config scope onto the card's staged form. */
 		var SkillHubSettingsCardController = class {
@@ -3833,10 +3830,12 @@ window.__ModuleLoader__.load({
 			const [topOverKey, setTopOverKey] = (0, react.useState)(null);
 			/** 重复技能名集合：整表只建一次，行内用 has 取代逐行线性 includes。 */
 			const duplicateNames = (0, react.useMemo)(() => new Set(catalog?.duplicateNames ?? []), [catalog]);
-			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] === void 0 && !isProjectSource(skill.source));
+			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] === void 0 && !isProjectSource(skill.source));
 			const personalDisabled = (catalog?.disabled ?? []).filter((record) => origins[record.name] === void 0).filter((record) => normalized.length === 0 || record.name.toLocaleLowerCase().includes(normalized) || record.description.toLocaleLowerCase().includes(normalized)).filter((record) => sourceFilter === "all" || sourceFilter === "private");
 			const allPersonalNames = [...uncategorized.map((s) => s.name), ...personalDisabled.map((r) => r.name)];
 			const hasPersonal = allPersonalNames.length > 0;
@@ -3895,7 +3894,7 @@ window.__ModuleLoader__.load({
 				openDetail: hub.openDetail,
 				requestDeleteSkill: hub.requestDeleteSkill
 			};
-			if (skillView === "flat") return /* @__PURE__ */ (0, react_jsx_runtime.jsx)(react_jsx_runtime.Fragment, { children: filterBySource(sorted, sourceFilter, origins).map((skill) => /* @__PURE__ */ (0, react_jsx_runtime.jsx)(SkillRow, {
+			if (skillView === "flat") return /* @__PURE__ */ (0, react_jsx_runtime.jsx)(react_jsx_runtime.Fragment, { children: sourceFiltered.map((skill) => /* @__PURE__ */ (0, react_jsx_runtime.jsx)(SkillRow, {
 				skill,
 				...rowProps
 			}, skill.name)) });
@@ -3933,10 +3932,9 @@ window.__ModuleLoader__.load({
 					}, "project");
 					if (topKey.startsWith("col:")) {
 						const colName = topKey.slice(4);
-						const collection = collections.find((c) => c.name === colName);
-						if (collection === void 0) 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") === sourceFilter));
+						const entry = visible.find((item) => item.collection.name === colName);
+						if (entry === void 0) 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];
@@ -4407,6 +4405,23 @@ window.__ModuleLoader__.load({
 		function VersionChoiceDialog(props) {
 			const { choice, busy, onSelect, onCustom, onCancel, onConfirm } = props;
 			const effective = choice.custom.trim() !== "" ? choice.custom.trim() : choice.selected;
+			const branchOptions = choice.branches.filter((branch) => !choice.releases.includes(branch));
+			const [refGroup, setRefGroup] = (0, react.useState)(choice.releases.includes(choice.selected) || choice.branches.length === 0 ? "releases" : "branches");
+			(0, react.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 : void 0;
+			const selectRefs = currentUnlistedRef !== void 0 ? [currentUnlistedRef, ...activeRefs] : activeRefs;
+			const selectValue = selectRefs.includes(choice.selected) ? choice.selected : selectRefs[0] ?? "";
+			const selectGroup = (next) => {
+				setRefGroup(next);
+				const nextRefs = next === "releases" ? choice.releases : branchOptions;
+				if (nextRefs.length > 0 && !nextRefs.includes(choice.selected)) onSelect(nextRefs[0]);
+			};
 			return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(DialogShell, {
 				onClose: onCancel,
 				children: [
@@ -4422,38 +4437,42 @@ window.__ModuleLoader__.load({
 						className: panel_module_css_default.dialogText,
 						children: tt("market.scanning")
 					}) : /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [
-						choice.releases.length > 0 ? /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
-							className: panel_module_css_default.dialogText,
-							style: { marginBottom: 4 },
-							children: tt("market.versionReleases")
-						}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("select", {
-							className: panel_module_css_default.select + " " + panel_module_css_default.dialogSelect,
-							value: choice.releases.includes(choice.selected) ? choice.selected : choice.releases[0],
-							onChange: (event) => {
-								onSelect(event.target.value);
-								onCustom("");
-							},
-							children: choice.releases.map((tag) => /* @__PURE__ */ (0, react_jsx_runtime.jsx)("option", {
-								value: tag,
-								children: tag
-							}, tag))
-						})] }) : null,
-						choice.branches.length > 0 ? /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
-							className: panel_module_css_default.dialogText,
-							style: { marginBottom: 4 },
-							children: tt("market.versionBranches")
-						}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("select", {
+						/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+							className: panel_module_css_default.segmented,
+							role: "group",
+							"aria-label": tt("market.versionTitle"),
+							style: { marginBottom: 8 },
+							children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
+								type: "button",
+								className: panel_module_css_default.segBtn + (refGroup === "releases" ? " " + panel_module_css_default.segBtnActive : ""),
+								disabled: choice.releases.length === 0,
+								"aria-pressed": refGroup === "releases",
+								onClick: () => {
+									selectGroup("releases");
+								},
+								children: tt("market.versionReleases")
+							}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
+								type: "button",
+								className: panel_module_css_default.segBtn + (refGroup === "branches" ? " " + panel_module_css_default.segBtnActive : ""),
+								disabled: branchOptions.length === 0,
+								"aria-pressed": refGroup === "branches",
+								onClick: () => {
+									selectGroup("branches");
+								},
+								children: tt("market.versionBranches")
+							})]
+						}),
+						selectValue !== "" ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("select", {
 							className: panel_module_css_default.select + " " + panel_module_css_default.dialogSelect,
-							value: choice.branches.includes(choice.selected) ? choice.selected : choice.branches[0],
+							value: selectValue,
 							onChange: (event) => {
 								onSelect(event.target.value);
-								onCustom("");
 							},
-							children: choice.branches.map((branch) => /* @__PURE__ */ (0, react_jsx_runtime.jsx)("option", {
-								value: branch,
-								children: branch
-							}, branch))
-						})] }) : null,
+							children: selectRefs.map((ref) => /* @__PURE__ */ (0, react_jsx_runtime.jsx)("option", {
+								value: ref,
+								children: ref
+							}, ref))
+						}) : null,
 						/* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
 							className: panel_module_css_default.dialogText,
 							style: { marginBottom: 4 },
@@ -5322,14 +5341,15 @@ window.__ModuleLoader__.load({
 					choice: versionDialog,
 					busy: versionBusy,
 					onSelect: (selected) => {
-						setVersionDialog({
-							...versionDialog,
-							selected
+						setVersionDialog((previous) => previous === null ? previous : {
+							...previous,
+							selected,
+							custom: ""
 						});
 					},
 					onCustom: (custom) => {
-						setVersionDialog({
-							...versionDialog,
+						setVersionDialog((previous) => previous === null ? previous : {
+							...previous,
 							custom
 						});
 					},
@@ -7570,12 +7590,12 @@ window.__ModuleLoader__.load({
 			const scope = ctx.settingsScope.bind({ namespace: NS });
 			const settingsCard = new SkillHubSettingsCardController(scope);
 			ctx.effect(() => setupSkillSlashDots(ctx, api, scope), "dsh-skill-hub: slash dots");
-			ctx.effect(() => ctx.slots.inject("settings.plugin.item", () => ctx.slots.register({
-				name: "settings.plugin.item",
-				key: NS,
+			ctx.effect(() => ctx.slots.inject("plugins.bundle.config", () => ctx.slots.register({
+				name: "plugins.bundle.config",
+				key: "dsh-skill-hub",
 				locale: NS,
 				inject: () => settingsCard.inject()
-			}, SkillHubSettingsCard)), "dsh-skill-hub: settings card");
+			}, SkillHubSettingsCard)), "dsh-skill-hub: plugin config");
 			ctx.effect(() => ctx.slots.inject("settings.section", () => ctx.slots.register({
 				name: "settings.section",
 				id: "skill-hub",