dsh-desktop-enhance 0.3.5 → 0.3.7

package/lib/client.js

@@ -1857,9 +1857,29 @@ window.__ModuleLoader__.load({
 				const items = buckets.get(scope) ?? [];
 				if (items.length === 0) continue;
 				items.sort((a, b) => compareCodeUnits(a.name, b.name));
+				const subBuckets = new Map();
+				for (const item of items) {
+					const label = item.sourceBadge !== "" ? item.sourceBadge : scope;
+					const list = subBuckets.get(label);
+					if (list !== void 0) list.push(item);
+					else subBuckets.set(label, [item]);
+				}
+				const subgroups = [...subBuckets.keys()].sort(compareCodeUnits).map((label) => {
+					const subItems = subBuckets.get(label) ?? [];
+					const subDisabled = subItems.reduce((sum, item) => sum + (item.disabled ? 1 : 0), 0);
+					return {
+						key: `${scope}:${label}`,
+						scope,
+						label,
+						items: subItems,
+						total: subItems.length,
+						disabled: subDisabled
+					};
+				});
 				const disabledCount = items.reduce((sum, item) => sum + (item.disabled ? 1 : 0), 0);
 				groups.push({
 					scope,
+					subgroups,
 					items,
 					total: items.length,
 					disabled: disabledCount
@@ -2563,9 +2583,7 @@ window.__ModuleLoader__.load({
 					disabledCount: node.disabled,
 					controlDisabled: disabled,
 					depth,
-					onToggleOpen: () => {
-						setCollapsedNodes((curr) => curr.includes(node.prefix) ? curr.filter((p) => p !== node.prefix) : [...curr, node.prefix]);
-					},
+					onToggleOpen: () => setCollapsedNodes((curr) => toggleKeyInList(curr, node.prefix)),
 					onBatchToggle: () => commitSet(toggleNodeInSet(disabledSet, node))
 				}), isOpen ? h("div", {
 					key: "children",
@@ -2612,9 +2630,7 @@ window.__ModuleLoader__.load({
 						disabledCount: group.disabled,
 						controlDisabled: disabled,
 						depth: 0,
-						onToggleOpen: () => {
-							setCollapsedNodes((curr) => curr.includes(scopeKey) ? curr.filter((p) => p !== scopeKey) : [...curr, scopeKey]);
-						},
+						onToggleOpen: () => setCollapsedNodes((curr) => toggleKeyInList(curr, scopeKey)),
 						onBatchToggle: () => commitSet(toggleToolScopeGroupInSet(disabledSet, group))
 					}), isOpen ? h("div", {
 						key: "children",
@@ -2623,11 +2639,17 @@ window.__ModuleLoader__.load({
 				})
 			});
 		}
+		function toggleKeyInList(list, nodeKey) {
+			return list.includes(nodeKey) ? list.filter((item) => item !== nodeKey) : [...list, nodeKey];
+		}
 		function DefaultSkillsManager({ t, disabledRaw, disabled, onSave }) {
 			const [catalog, setCatalog] = React.useState(null);
 			const [open, setOpen] = React.useState(false);
 			const [query, setQuery] = React.useState("");
-			const [collapsedScopes, setCollapsedScopes] = React.useState([]);
+			const [collapsedNodes, setCollapsedNodes] = React.useState([]);
+			const toggleNodeCollapse = (nodeKey) => {
+				setCollapsedNodes((curr) => toggleKeyInList(curr, nodeKey));
+			};
 			React.useEffect(() => {
 				if (typeof globalThis.fetch !== "function") return void 0;
 				let live = true;
@@ -2682,7 +2704,7 @@ window.__ModuleLoader__.load({
 				onEnableAll: () => commitSet(new Set()),
 				onRefresh: refreshCatalog,
 				treeElements: groups.map((group) => {
-					const isOpen = query.trim() !== "" || !collapsedScopes.includes(group.scope);
+					const isOpen = query.trim() !== "" || !collapsedNodes.includes(group.scope);
 					return h("div", {
 						key: `group:${group.scope}`,
 						className: "de-defaults-group",
@@ -2697,51 +2719,72 @@ window.__ModuleLoader__.load({
 						total: group.total,
 						disabledCount: group.disabled,
 						controlDisabled: disabled,
-						onToggleOpen: () => {
-							setCollapsedScopes((curr) => curr.includes(group.scope) ? curr.filter((s) => s !== group.scope) : [...curr, group.scope]);
-						},
+						onToggleOpen: () => toggleNodeCollapse(group.scope),
 						onBatchToggle: () => commitSet(toggleSkillGroupInSet(disabledSet, group))
 					}), isOpen ? h("div", {
-						key: "items",
+						key: "subgroups",
 						className: "de-defaults-group-children"
-					}, group.items.map((item) => h("div", {
-						key: `skill:${item.name}`,
-						className: "de-defaults-leaf",
-						"data-default-skill-leaf": item.name,
-						"data-skill-scope": item.scope,
-						"data-disabled": item.disabled ? "true" : "false",
-						style: { paddingLeft: "24px" }
-					}, [h("div", {
-						key: "info",
-						className: "de-defaults-leaf-info"
-					}, [h("div", {
-						key: "head",
-						className: "de-defaults-leaf-head"
-					}, [
-						h("span", {
-							key: "name",
-							className: "de-defaults-leaf-name"
-						}, item.name),
-						h("span", {
-							key: "badge",
-							className: "de-defaults-source-badge",
-							"data-skill-scope": item.scope
-						}, item.sourceBadge),
-						!item.modelInvocable ? h("span", {
-							key: "user-only",
-							className: "de-defaults-source-badge"
-						}, t("settings.skills.userOnly")) : null
-					]), item.description !== "" ? h("div", {
-						key: "desc",
-						className: "de-defaults-leaf-desc"
-					}, item.description) : null]), renderDefaultLeafControls({
-						t,
-						itemDisabled: item.disabled,
-						toggleAttr: "data-default-skill-toggle",
-						itemName: item.name,
-						controlDisabled: disabled,
-						onToggle: () => commitSet(toggleToolInSet(disabledSet, item.name, !item.disabled))
-					})]))) : null]);
+					}, group.subgroups.map((subgroup) => {
+						const subOpen = query.trim() !== "" || !collapsedNodes.includes(subgroup.key);
+						return h("div", {
+							key: `subgroup:${subgroup.key}`,
+							className: "de-defaults-group",
+							"data-default-skill-subgroup": subgroup.key
+						}, [renderDefaultGroupHeader({
+							t,
+							headerAttr: "data-default-skill-subgroup-header",
+							batchAttr: "data-default-skill-subgroup-batch",
+							groupKey: subgroup.key,
+							label: subgroup.label,
+							isOpen: subOpen,
+							total: subgroup.total,
+							disabledCount: subgroup.disabled,
+							controlDisabled: disabled,
+							depth: 1,
+							onToggleOpen: () => toggleNodeCollapse(subgroup.key),
+							onBatchToggle: () => commitSet(toggleSkillGroupInSet(disabledSet, subgroup))
+						}), subOpen ? h("div", {
+							key: "items",
+							className: "de-defaults-group-children"
+						}, subgroup.items.map((item) => h("div", {
+							key: `skill:${item.name}`,
+							className: "de-defaults-leaf",
+							"data-default-skill-leaf": item.name,
+							"data-skill-scope": item.scope,
+							"data-disabled": item.disabled ? "true" : "false",
+							style: { paddingLeft: "40px" }
+						}, [h("div", {
+							key: "info",
+							className: "de-defaults-leaf-info"
+						}, [h("div", {
+							key: "head",
+							className: "de-defaults-leaf-head"
+						}, [
+							h("span", {
+								key: "name",
+								className: "de-defaults-leaf-name"
+							}, item.name),
+							h("span", {
+								key: "badge",
+								className: "de-defaults-source-badge",
+								"data-skill-scope": item.scope
+							}, item.sourceBadge),
+							!item.modelInvocable ? h("span", {
+								key: "user-only",
+								className: "de-defaults-source-badge"
+							}, t("settings.skills.userOnly")) : null
+						]), item.description !== "" ? h("div", {
+							key: "desc",
+							className: "de-defaults-leaf-desc"
+						}, item.description) : null]), renderDefaultLeafControls({
+							t,
+							itemDisabled: item.disabled,
+							toggleAttr: "data-default-skill-toggle",
+							itemName: item.name,
+							controlDisabled: disabled,
+							onToggle: () => commitSet(toggleToolInSet(disabledSet, item.name, !item.disabled))
+						})]))) : null]);
+					})) : null]);
 				})
 			});
 		}
@@ -4160,7 +4203,7 @@ window.__ModuleLoader__.load({
 			return scopeGroups.map(buildScopeGroupDom);
 		}
 		function buildSkillGroupDomNodes(opts) {
-			const { t, skillsCatalog, disabledSet, searchQuery, expandedSkillScopes, includeProject, writable, onToggleScopeExpand, onCommitSet, onPreviewSkill } = opts;
+			const { t, skillsCatalog, disabledSet, searchQuery, collapsedSkillNodes, includeProject, writable, onToggleSkillNode, onCommitSet, onPreviewSkill } = opts;
 			const groups = buildSkillScopeGroups(skillsCatalog, disabledSet, searchQuery, { includeProject });
 			if (groups.length === 0) {
 				const empty = globalThis.document.createElement("div");
@@ -4170,111 +4213,119 @@ window.__ModuleLoader__.load({
 				return [empty];
 			}
 			const buildGroupDom = (group) => {
-				const isOpen = searchQuery.trim() !== "" || expandedSkillScopes.has(group.scope);
+				const isOpen = searchQuery.trim() !== "" || !collapsedSkillNodes.has(group.scope);
 				const groupEl = globalThis.document.createElement("div");
 				groupEl.setAttribute("data-tools-node", group.scope);
 				groupEl.setAttribute("data-skills-group", group.scope);
-				const head = globalThis.document.createElement("div");
-				head.setAttribute("data-tools-node-header", group.scope);
-				head.setAttribute("data-skills-group-header", group.scope);
-				const title = globalThis.document.createElement("span");
-				title.setAttribute("data-tools-node-title", "");
-				const arrow = globalThis.document.createElement("span");
-				arrow.setAttribute("data-session-info-arrow", "");
-				arrow.textContent = isOpen ? "▾" : "▸";
-				const label = globalThis.document.createElement("span");
-				label.textContent = t(`settings.skills.scope.${group.scope}`);
-				title.appendChild(arrow);
-				title.appendChild(label);
-				head.appendChild(title);
-				const ctrls = globalThis.document.createElement("div");
-				ctrls.setAttribute("data-tools-controls", "");
-				const enabledInGroup = group.total - group.disabled;
-				const pill = globalThis.document.createElement("span");
-				pill.setAttribute("data-tools-pill", "");
-				pill.setAttribute("data-disabled", enabledInGroup === 0 ? "true" : "false");
-				pill.textContent = enabledInGroup === 0 ? t("settings.tools.allDisabled") : `${String(enabledInGroup)}/${String(group.total)}`;
-				ctrls.appendChild(pill);
-				const batchBtn = globalThis.document.createElement("button");
-				batchBtn.setAttribute("type", "button");
-				batchBtn.setAttribute("data-tools-btn", "");
-				batchBtn.setAttribute("data-skills-batch", group.scope);
-				batchBtn.textContent = enabledInGroup > 0 ? t("settings.tools.disableAll") : t("settings.tools.enableAll");
-				if (!writable) batchBtn.setAttribute("disabled", "");
-				batchBtn.addEventListener("click", (e) => {
-					e?.stopPropagation?.();
-					onCommitSet(toggleSkillGroupInSet(disabledSet, group));
-				});
-				ctrls.appendChild(batchBtn);
-				head.appendChild(ctrls);
-				head.addEventListener("click", () => {
-					onToggleScopeExpand(group.scope);
-				});
-				groupEl.appendChild(head);
-				if (isOpen) for (const item of group.items) {
-					const row = globalThis.document.createElement("div");
-					row.setAttribute("data-tools-leaf", item.name);
-					row.setAttribute("data-skills-leaf", item.name);
-					row.setAttribute("data-skill-scope", item.scope);
-					row.setAttribute("data-disabled", item.disabled ? "true" : "false");
-					row.setAttribute("style", "padding-left: 26px;");
-					const info = globalThis.document.createElement("div");
-					info.setAttribute("data-tools-leaf-info", "");
-					const nameRow = globalThis.document.createElement("div");
-					nameRow.setAttribute("data-skills-leaf-header", "");
-					const nameEl = globalThis.document.createElement("span");
-					nameEl.setAttribute("data-tools-leaf-name", "");
-					nameEl.setAttribute("data-skills-leaf-name", "");
-					nameEl.textContent = item.name;
-					nameRow.appendChild(nameEl);
-					const sourceBadge = globalThis.document.createElement("span");
-					sourceBadge.setAttribute("data-skills-source-badge", item.scope);
-					sourceBadge.textContent = item.sourceBadge;
-					nameRow.appendChild(sourceBadge);
-					if (!item.modelInvocable) {
-						const userOnly = globalThis.document.createElement("span");
-						userOnly.setAttribute("data-skills-user-only", "");
-						userOnly.textContent = t("settings.skills.userOnly");
-						nameRow.appendChild(userOnly);
-					}
-					if (onPreviewSkill !== void 0) {
-						const previewBtn = globalThis.document.createElement("button");
-						previewBtn.setAttribute("type", "button");
-						previewBtn.setAttribute("data-skills-preview", item.name);
-						previewBtn.textContent = t("settings.skills.preview");
-						previewBtn.addEventListener("click", (e) => {
-							e?.stopPropagation?.();
-							onPreviewSkill(item.name);
+				groupEl.appendChild(buildCollapsibleGroupHeaderDom({
+					t,
+					headerAttr: "data-tools-node-header",
+					headerValue: group.scope,
+					extraHeaderAttr: {
+						name: "data-skills-group-header",
+						value: group.scope
+					},
+					batchAttr: "data-skills-batch",
+					batchValue: group.scope,
+					labelText: t(`settings.skills.scope.${group.scope}`),
+					isOpen,
+					total: group.total,
+					disabledCount: group.disabled,
+					writable,
+					depth: 0,
+					onToggleOpen: () => onToggleSkillNode(group.scope),
+					onBatchToggle: () => onCommitSet(toggleSkillGroupInSet(disabledSet, group))
+				}));
+				if (isOpen) for (const subgroup of group.subgroups) {
+					const subOpen = searchQuery.trim() !== "" || !collapsedSkillNodes.has(subgroup.key);
+					const subEl = globalThis.document.createElement("div");
+					subEl.setAttribute("data-tools-node", subgroup.key);
+					subEl.setAttribute("data-skills-subgroup", subgroup.key);
+					subEl.appendChild(buildCollapsibleGroupHeaderDom({
+						t,
+						headerAttr: "data-tools-node-header",
+						headerValue: subgroup.key,
+						extraHeaderAttr: {
+							name: "data-skills-subgroup-header",
+							value: subgroup.key
+						},
+						batchAttr: "data-skills-subgroup-batch",
+						batchValue: subgroup.key,
+						labelText: subgroup.label,
+						isOpen: subOpen,
+						total: subgroup.total,
+						disabledCount: subgroup.disabled,
+						writable,
+						depth: 1,
+						onToggleOpen: () => onToggleSkillNode(subgroup.key),
+						onBatchToggle: () => onCommitSet(toggleSkillGroupInSet(disabledSet, subgroup))
+					}));
+					if (subOpen) for (const item of subgroup.items) {
+						const row = globalThis.document.createElement("div");
+						row.setAttribute("data-tools-leaf", item.name);
+						row.setAttribute("data-skills-leaf", item.name);
+						row.setAttribute("data-skill-scope", item.scope);
+						row.setAttribute("data-disabled", item.disabled ? "true" : "false");
+						row.setAttribute("style", "padding-left: 44px;");
+						const info = globalThis.document.createElement("div");
+						info.setAttribute("data-tools-leaf-info", "");
+						const nameRow = globalThis.document.createElement("div");
+						nameRow.setAttribute("data-skills-leaf-header", "");
+						const nameEl = globalThis.document.createElement("span");
+						nameEl.setAttribute("data-tools-leaf-name", "");
+						nameEl.setAttribute("data-skills-leaf-name", "");
+						nameEl.textContent = item.name;
+						nameRow.appendChild(nameEl);
+						const sourceBadge = globalThis.document.createElement("span");
+						sourceBadge.setAttribute("data-skills-source-badge", item.scope);
+						sourceBadge.textContent = item.sourceBadge;
+						nameRow.appendChild(sourceBadge);
+						if (!item.modelInvocable) {
+							const userOnly = globalThis.document.createElement("span");
+							userOnly.setAttribute("data-skills-user-only", "");
+							userOnly.textContent = t("settings.skills.userOnly");
+							nameRow.appendChild(userOnly);
+						}
+						if (onPreviewSkill !== void 0) {
+							const previewBtn = globalThis.document.createElement("button");
+							previewBtn.setAttribute("type", "button");
+							previewBtn.setAttribute("data-skills-preview", item.name);
+							previewBtn.textContent = t("settings.skills.preview");
+							previewBtn.addEventListener("click", (e) => {
+								e?.stopPropagation?.();
+								onPreviewSkill(item.name);
+							});
+							nameRow.appendChild(previewBtn);
+						}
+						info.appendChild(nameRow);
+						if (item.description !== "") {
+							const descEl = globalThis.document.createElement("div");
+							descEl.setAttribute("data-tools-leaf-desc", "");
+							descEl.textContent = item.description;
+							info.appendChild(descEl);
+						}
+						row.appendChild(info);
+						const itemCtrls = globalThis.document.createElement("div");
+						itemCtrls.setAttribute("data-tools-controls", "");
+						const itemPill = globalThis.document.createElement("span");
+						itemPill.setAttribute("data-tools-pill", "");
+						itemPill.setAttribute("data-disabled", item.disabled ? "true" : "false");
+						itemPill.textContent = item.disabled ? t("settings.tools.disabled") : t("settings.tools.enabled");
+						itemCtrls.appendChild(itemPill);
+						const toggleBtn = globalThis.document.createElement("button");
+						toggleBtn.setAttribute("type", "button");
+						toggleBtn.setAttribute("data-tools-btn", "");
+						toggleBtn.setAttribute("data-skills-toggle", item.name);
+						toggleBtn.textContent = item.disabled ? t("settings.tools.enable") : t("settings.tools.disable");
+						if (!writable) toggleBtn.setAttribute("disabled", "");
+						toggleBtn.addEventListener("click", () => {
+							onCommitSet(toggleToolInSet(disabledSet, item.name, !item.disabled));
 						});
-						nameRow.appendChild(previewBtn);
-					}
-					info.appendChild(nameRow);
-					if (item.description !== "") {
-						const descEl = globalThis.document.createElement("div");
-						descEl.setAttribute("data-tools-leaf-desc", "");
-						descEl.textContent = item.description;
-						info.appendChild(descEl);
+						itemCtrls.appendChild(toggleBtn);
+						row.appendChild(itemCtrls);
+						subEl.appendChild(row);
 					}
-					row.appendChild(info);
-					const itemCtrls = globalThis.document.createElement("div");
-					itemCtrls.setAttribute("data-tools-controls", "");
-					const itemPill = globalThis.document.createElement("span");
-					itemPill.setAttribute("data-tools-pill", "");
-					itemPill.setAttribute("data-disabled", item.disabled ? "true" : "false");
-					itemPill.textContent = item.disabled ? t("settings.tools.disabled") : t("settings.tools.enabled");
-					itemCtrls.appendChild(itemPill);
-					const toggleBtn = globalThis.document.createElement("button");
-					toggleBtn.setAttribute("type", "button");
-					toggleBtn.setAttribute("data-tools-btn", "");
-					toggleBtn.setAttribute("data-skills-toggle", item.name);
-					toggleBtn.textContent = item.disabled ? t("settings.tools.enable") : t("settings.tools.disable");
-					if (!writable) toggleBtn.setAttribute("disabled", "");
-					toggleBtn.addEventListener("click", () => {
-						onCommitSet(toggleToolInSet(disabledSet, item.name, !item.disabled));
-					});
-					itemCtrls.appendChild(toggleBtn);
-					row.appendChild(itemCtrls);
-					groupEl.appendChild(row);
+					groupEl.appendChild(subEl);
 				}
 				return groupEl;
 			};
@@ -4418,7 +4469,7 @@ window.__ModuleLoader__.load({
 			});
 		}
 		function syncSkillsPopover(props) {
-			const { root, t, skillsCatalog, disabledSet, disabledInCatalog, customized = false, searchQuery, expandedSkillScopes, writable, compact = false, onSearchChange, onToggleScopeExpand, onCommitSet, onResetOverride, onRefreshCatalog, onPreviewSkill, onClose } = props;
+			const { root, t, skillsCatalog, disabledSet, disabledInCatalog, customized = false, searchQuery, collapsedSkillNodes, writable, compact = false, onSearchChange, onToggleSkillNode, onCommitSet, onResetOverride, onRefreshCatalog, onPreviewSkill, onClose } = props;
 			return syncAnchoredPopoverShell({
 				root,
 				popoverAttr: SKILLS_POPOVER_ATTR,
@@ -4444,10 +4495,10 @@ window.__ModuleLoader__.load({
 					skillsCatalog,
 					disabledSet,
 					searchQuery,
-					expandedSkillScopes,
+					collapsedSkillNodes,
 					includeProject: true,
 					writable,
-					onToggleScopeExpand,
+					onToggleSkillNode,
 					onCommitSet,
 					onPreviewSkill
 				})
@@ -4529,7 +4580,7 @@ window.__ModuleLoader__.load({
 				skillsDisabledCanonical: state.skillsDisabledCanonical,
 				skillsCustomized: state.skillsCustomized,
 				skillsSearchQuery: state.skillsSearchQuery,
-				expandedSkills: [...state.expandedSkillScopes].sort(),
+				collapsedSkills: [...state.collapsedSkillNodes].sort(),
 				activePopover: state.activePopover
 			});
 		}
@@ -4644,7 +4695,7 @@ window.__ModuleLoader__.load({
 			let skillsCatalogAttemptedFor = null;
 			let skillsLoading = false;
 			let skillsSearchQuery = "";
-			const expandedSkillScopes = new Set(SKILL_SCOPE_ORDER);
+			const collapsedSkillNodes = new Set();
 			function removeToolsPopover() {
 				if (mountedToolsPopover !== null) {
 					mountedToolsPopover.remove();
@@ -4790,7 +4841,7 @@ window.__ModuleLoader__.load({
 					skillsDisabledCanonical,
 					skillsCustomized,
 					skillsSearchQuery,
-					expandedSkillScopes,
+					collapsedSkillNodes,
 					activePopover
 				});
 				let panel = root.querySelector(`[${SESSION_INFO_ATTR}]`);
@@ -4997,7 +5048,7 @@ window.__ModuleLoader__.load({
 						disabledInCatalog: disabledSkillsInCatalog,
 						customized: skillsCustomized,
 						searchQuery: skillsSearchQuery,
-						expandedSkillScopes,
+						collapsedSkillNodes,
 						writable: skillsWritable,
 						compact,
 						onSearchChange: (nextQuery) => {
@@ -5005,9 +5056,9 @@ window.__ModuleLoader__.load({
 							lastSignature = "";
 							paint(root, sessionId);
 						},
-						onToggleScopeExpand: (scope) => {
-							if (expandedSkillScopes.has(scope)) expandedSkillScopes.delete(scope);
-							else expandedSkillScopes.add(scope);
+						onToggleSkillNode: (key) => {
+							if (collapsedSkillNodes.has(key)) collapsedSkillNodes.delete(key);
+							else collapsedSkillNodes.add(key);
 							lastSignature = "";
 							paint(root, sessionId);
 						},

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-desktop-enhance",
-  "version": "0.3.5",
+  "version": "0.3.7",
   "description": "DSH Desktop 界面增强：页内查找（Cmd+F）、轮次编号、上下文压缩行常显、建议、每步耗时、会话信息、工具管理、Skill 管理。",