npm - deepseek-harness-skill-mcp - Versions diffs - 0.1.0 → 0.1.2 - Mend

deepseek-harness-skill-mcp 0.1.0 → 0.1.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (9) hide show

package/README.md CHANGED Viewed

@@ -6,35 +6,30 @@
 ## 通过 dsh 安装
-需要已安装 DeepSeek Harness、Node.js 22.19+ 和 pnpm。把插件安装到 `web` profile：
+需要已安装 DeepSeek Harness、Node.js 22.19+ 和 pnpm。npm 包名在 registry 中全局唯一，不需要附加 GitHub 用户名或组织名。把插件安装到 `web` profile 并启动：
 ```sh
-dsh plugin --profile web add github:civilization-os/dsh-skill-mcp
-```
-Git 安装可以锁定到具体 commit，避免以后安装到未经确认的新版本：
-```sh
-dsh plugin --profile web add github:civilization-os/dsh-skill-mcp#<commit-sha>
+dsh plugin --profile web add deepseek-harness-skill-mcp
+dsh web
 ```
-也可以从 npm 安装正式版本：
+也可以直接从 GitHub 安装；此时包地址必须包含组织名：
 ```sh
-dsh plugin --profile web add deepseek-harness-skill-mcp
+dsh plugin --profile web add github:civilization-os/dsh-skill-mcp
 ```
-安装完成后重启 Web profile：
+Git 安装可以锁定到具体 commit，避免以后安装到未经确认的新版本：
 ```sh
-dsh --profile web
+dsh plugin --profile web add github:civilization-os/dsh-skill-mcp#<commit-sha>
 ```
 如果从 DeepSeek Harness 源码仓库运行 CLI，请把上面的 `dsh` 换成 `pnpm dsh`，并在 Harness 仓库根目录执行，例如：
 ```sh
 pnpm dsh plugin --profile web add github:civilization-os/dsh-skill-mcp
-pnpm dsh --profile web
+pnpm dsh web
 ```
 更新或卸载：
@@ -63,7 +58,8 @@ skills/
 Skill 页面支持：
 - 添加、启用和禁用多个 Skill 路径
-- 按路径或用户自定义分组展示
+- 用独立的来源、用户分组和状态条件筛选技能
+- 为单个 Skill 设置用户分组；分组保存在对应 `SKILL.md` 的 `metadata` 中
 - 搜索、数量统计、frontmatter 格式诊断和同名覆盖提示
 - 查看 `scripts`、`references`、`assets` 等资源文件
 - 控制模型自动选择和用户 `/name` 调用
@@ -138,7 +134,7 @@ pnpm run web
 ## 验证
-自动测试覆盖配置持久化、Skill 多路径与用户分组、并发 revision、Skill 创建与调用权限、MCP 工具发现和卸载、轮询状态以及中英文词典一致性。测试不需要模型 API key。
+自动测试覆盖配置持久化、Skill 多路径与单技能用户分组、并发 revision、Skill 创建与调用权限、MCP 工具发现和卸载、轮询状态以及中英文词典一致性。测试不需要模型 API key。
 ## 发布

package/lib/client.js CHANGED Viewed

@@ -97,7 +97,6 @@ var zh = {
   emptyMcpHint: "\u901A\u8FC7\u672C\u5730\u547D\u4EE4\u6216 HTTP \u5730\u5740\u8FDE\u63A5\u5916\u90E8\u5DE5\u5177\u3002",
   id: "\u6807\u8BC6",
   directory: "Skill \u8DEF\u5F84",
-  group: "\u7528\u6237\u5206\u7EC4\uFF08\u53EF\u9009\uFF09",
   transport: "\u914D\u7F6E\u7C7B\u578B",
   stdio: "stdio",
   http: "HTTP",
@@ -131,10 +130,17 @@ var zh = {
   stat_invalid: "\u914D\u7F6E\u5F02\u5E38",
   search: "\u641C\u7D22",
   searchPlaceholder: "\u641C\u7D22\u540D\u79F0\u3001\u63CF\u8FF0\u3001\u8DEF\u5F84\u6216\u5206\u7EC4\u2026",
-  sourceEmpty: "\u8FD9\u4E2A\u8DEF\u5F84\u4E0B\u8FD8\u6CA1\u6709\u53D1\u73B0 Skill\u3002",
-  groupView: "\u5206\u7EC4\u65B9\u5F0F",
-  groupByPath: "\u6309\u8DEF\u5F84",
-  groupByCustom: "\u6309\u7528\u6237\u5206\u7EC4",
+  skillSources: "\u6765\u6E90\u8DEF\u5F84",
+  skillLibrary: "\u6280\u80FD\u5217\u8868",
+  showingCount: "\u663E\u793A {visible} / {all}",
+  filterSource: "\u6765\u6E90",
+  filterAllSources: "\u5168\u90E8\u6765\u6E90",
+  filterGroup: "\u5206\u7EC4",
+  filterAllGroups: "\u5168\u90E8\u5206\u7EC4",
+  filterStatus: "\u72B6\u6001",
+  filterAllStatuses: "\u5168\u90E8\u72B6\u6001",
+  noFilterResults: "\u6CA1\u6709\u5339\u914D\u7684 Skill",
+  noFilterResultsHint: "\u5C1D\u8BD5\u8C03\u6574\u641C\u7D22\u8BCD\u6216\u7B5B\u9009\u6761\u4EF6\u3002",
   customGroup: "\u7528\u6237\u5206\u7EC4",
   ungrouped: "\u672A\u5206\u7EC4",
   groupPlaceholder: "\u4F8B\u5982\uFF1A\u5DE5\u4F5C\u3001\u4E2A\u4EBA\u3001\u5F00\u53D1",
@@ -189,7 +195,6 @@ var en = {
   emptyMcpHint: "Connect external tools with a local command or HTTP endpoint.",
   id: "Identifier",
   directory: "Skill path",
-  group: "User group (optional)",
   transport: "Type",
   stdio: "stdio",
   http: "HTTP",
@@ -223,10 +228,17 @@ var en = {
   stat_invalid: "Invalid",
   search: "Search",
   searchPlaceholder: "Search name, description, path or group\u2026",
-  sourceEmpty: "No Skills were found in this path.",
-  groupView: "Group view",
-  groupByPath: "By path",
-  groupByCustom: "By user group",
+  skillSources: "Source paths",
+  skillLibrary: "Skill library",
+  showingCount: "Showing {visible} / {all}",
+  filterSource: "Source",
+  filterAllSources: "All sources",
+  filterGroup: "Group",
+  filterAllGroups: "All groups",
+  filterStatus: "Status",
+  filterAllStatuses: "All statuses",
+  noFilterResults: "No matching Skills",
+  noFilterResultsHint: "Try another search or filter.",
   customGroup: "User group",
   ungrouped: "Ungrouped",
   groupPlaceholder: "For example: Work, Personal, Development",
@@ -266,7 +278,7 @@ var en = {
 };
 // src/client/styles.css
-var styles_default = ".dsh-ext{color:var(--dsw-alias-label-primary);max-width:840px;padding:4px 0 28px;font:inherit}\n.dsh-ext-heading,.dsh-ext-card>header{display:flex;justify-content:space-between;align-items:center;gap:16px}\n.dsh-ext h2{font-size:22px;letter-spacing:-.4px;margin:0 0 8px}.dsh-ext h3{font-size:15px;margin:0;display:flex;align-items:center;gap:8px}\n.dsh-ext p,.dsh-ext small{color:var(--dsw-alias-label-tertiary);font-size:13px;line-height:1.6}.dsh-ext-heading p{margin:0}\n.dsh-ext button{font:inherit;font-size:13px;cursor:pointer;border:1px solid var(--dsw-alias-border-l4);border-radius:9px;background:var(--dsw-alias-bg-layer-2);color:inherit;padding:8px 13px;white-space:nowrap}\n.dsh-ext button:hover{background:var(--dsw-alias-bg-layer-3)}.dsh-ext button:disabled{opacity:.5;cursor:default}\n.dsh-ext :is(button,input,select,textarea):focus-visible{outline:2px solid var(--dsw-alias-brand-primary);outline-offset:3px}\n.dsh-ext-card{border:1px solid var(--dsw-alias-border-l4);border-radius:16px;margin-top:20px;background:var(--dsw-alias-bg-layer-2);overflow:hidden}\n.dsh-ext-card>header{padding:18px 20px;border-bottom:1px solid var(--dsw-alias-border-l4)}.dsh-ext-count{font-size:11px;font-weight:400;color:var(--dsw-alias-label-tertiary)}\n.dsh-ext-empty{padding:32px 20px}.dsh-ext-empty strong{font-size:14px;font-weight:500}.dsh-ext-empty p{margin:6px 0 0}\n.dsh-ext ul{list-style:none;padding:0;margin:0}.dsh-ext li{display:flex;justify-content:space-between;align-items:center;gap:14px;padding:16px 20px;border-bottom:1px solid var(--dsw-alias-border-l4)}.dsh-ext li:last-child{border:0}\n.dsh-ext-details{display:flex;flex-direction:column;gap:5px;min-width:0}.dsh-ext-details strong{font-size:14px}.dsh-ext-details code{font-size:12px;color:var(--dsw-alias-label-secondary);overflow-wrap:anywhere}\n.dsh-ext-runtime{display:flex;align-items:center;flex-wrap:wrap;gap:7px;font-size:12px;color:var(--dsw-alias-label-tertiary)}\n.dsh-ext-status{width:7px;height:7px;border-radius:50%;background:#858585;box-shadow:0 0 0 3px color-mix(in srgb,#858585 16%,transparent)}\n.dsh-ext-status-available{background:#38a169;box-shadow:0 0 0 3px color-mix(in srgb,#38a169 18%,transparent)}.dsh-ext-status-waiting{background:#d69e2e;box-shadow:0 0 0 3px color-mix(in srgb,#d69e2e 18%,transparent)}\n.dsh-ext-runtime details{width:100%;margin-top:2px}.dsh-ext-runtime summary{width:max-content;cursor:pointer;color:var(--dsw-alias-label-secondary);user-select:none}.dsh-ext-runtime summary:hover{color:var(--dsw-alias-label-primary)}\n.dsh-ext-runtime .dsh-ext-tools{display:flex;flex-wrap:wrap;gap:6px;margin-top:8px}.dsh-ext-runtime .dsh-ext-tools li{display:block;border:0;padding:4px 8px;border-radius:6px;background:var(--dsw-alias-bg-layer-3)}\n.dsh-ext-form{padding:20px;border-top:1px solid var(--dsw-alias-border-l4)}.dsh-ext fieldset{border:0;padding:0;margin:0;display:grid;grid-template-columns:1fr 1fr;gap:16px}.dsh-ext label{display:flex;flex-direction:column;gap:7px;font-size:13px}\n.dsh-ext input,.dsh-ext select,.dsh-ext textarea{box-sizing:border-box;min-width:0;width:100%;font:inherit;color:inherit;background:var(--dsw-alias-bg-layer-1);border:1px solid var(--dsw-alias-border-l4);border-radius:8px;padding:10px}.dsh-ext textarea{resize:vertical}\n.dsh-ext-actions{display:flex;justify-content:flex-end;gap:8px;grid-column:1/-1}.dsh-ext fieldset>p{grid-column:1/-1;margin:0}.dsh-ext-notice{padding:12px 16px;border:1px solid var(--dsw-alias-border-l4);border-radius:10px}.dsh-ext-footnote{padding:0 4px}\n.dsh-ext-heading-actions{display:flex;gap:8px;align-items:center}.dsh-visually-hidden{position:absolute;width:1px;height:1px;padding:0;margin:-1px;overflow:hidden;clip:rect(0,0,0,0);white-space:nowrap;border:0}\n.dsh-skill-stats{display:grid;grid-template-columns:repeat(4,1fr);gap:10px;margin-top:20px}.dsh-skill-stats>div{display:flex;flex-direction:column;gap:4px;padding:14px 16px;border:1px solid var(--dsw-alias-border-l4);border-radius:12px;background:var(--dsw-alias-bg-layer-2)}.dsh-skill-stats strong{font-size:20px}.dsh-skill-stats span{font-size:12px;color:var(--dsw-alias-label-tertiary)}\n.dsh-skill-search{margin-top:14px}.dsh-skill-search input{padding-left:13px}.dsh-skill-manager>.dsh-ext-form{margin-top:14px;border:1px solid var(--dsw-alias-border-l4);border-radius:14px;background:var(--dsw-alias-bg-layer-2)}\n.dsh-skill-grouping{display:flex;align-items:center;justify-content:flex-end;gap:6px;margin-top:10px}.dsh-skill-grouping>span{margin-right:4px;font-size:12px;color:var(--dsw-alias-label-tertiary)}.dsh-skill-grouping button{padding:5px 10px}.dsh-skill-grouping button[aria-pressed=true]{border-color:var(--dsw-alias-brand-primary);background:color-mix(in srgb,var(--dsw-alias-brand-primary) 13%,transparent)}\n.dsh-skill-sources{display:flex;flex-direction:column;gap:14px;margin-top:14px}.dsh-skill-source{border:1px solid var(--dsw-alias-border-l4);border-radius:15px;background:var(--dsw-alias-bg-layer-2);overflow:hidden}.dsh-skill-source>header{display:flex;justify-content:space-between;align-items:center;gap:16px;padding:16px 18px;border-bottom:1px solid var(--dsw-alias-border-l4)}\n.dsh-skill-source-title{display:flex;align-items:flex-start;gap:11px;min-width:0}.dsh-skill-source-title>.dsh-ext-status{margin-top:6px;flex:0 0 auto}.dsh-skill-source-title h3{margin-bottom:5px;overflow-wrap:anywhere}.dsh-skill-source-title small{display:block;font-size:11px;color:var(--dsw-alias-label-tertiary);overflow-wrap:anywhere}\n.dsh-skill-group-editor{display:flex;align-items:flex-end;gap:8px;padding:10px 18px;border-bottom:1px solid var(--dsw-alias-border-l4);background:var(--dsw-alias-bg-layer-1)}.dsh-skill-group-editor label{flex:1}.dsh-skill-group-editor input{padding:7px 9px}.dsh-skill-group-editor button{padding:7px 10px}\n.dsh-skill-user-group{border:1px solid var(--dsw-alias-border-l4);border-radius:16px;background:var(--dsw-alias-bg-layer-2);overflow:hidden}.dsh-skill-user-group>header{padding:15px 18px;border-bottom:1px solid var(--dsw-alias-border-l4)}.dsh-skill-user-group>div{display:flex;flex-direction:column;gap:10px;padding:10px}.dsh-skill-source-nested{border-radius:11px;background:var(--dsw-alias-bg-layer-1)}\n.dsh-skill-row{display:block!important;padding:15px 18px!important}.dsh-skill-row-main{min-width:0}.dsh-skill-name{display:flex;align-items:center;gap:9px}.dsh-skill-name strong{font-size:14px}.dsh-skill-row-main>p{margin:6px 0 3px}.dsh-skill-row-main>code{font-size:11px;color:var(--dsw-alias-label-tertiary)}\n.dsh-skill-badge{font-size:11px;padding:2px 7px;border-radius:999px;background:var(--dsw-alias-bg-layer-3);color:var(--dsw-alias-label-secondary)}.dsh-skill-badge-invalid{color:#e98282}.dsh-skill-badge-shadowed{color:#a98af8}.dsh-ext-status-invalid{background:#e05252;box-shadow:0 0 0 3px color-mix(in srgb,#e05252 18%,transparent)}.dsh-ext-status-shadowed{background:#8b5cf6;box-shadow:0 0 0 3px color-mix(in srgb,#8b5cf6 18%,transparent)}.dsh-ext-status-manual{background:#d69e2e;box-shadow:0 0 0 3px color-mix(in srgb,#d69e2e 18%,transparent)}\n.dsh-skill-row details{margin-top:9px}.dsh-skill-row summary{width:max-content;cursor:pointer;font-size:12px;color:var(--dsw-alias-label-secondary)}.dsh-skill-detail{display:grid;grid-template-columns:1fr 1fr;gap:14px;margin-top:12px;padding:14px;border-radius:10px;background:var(--dsw-alias-bg-layer-1)}.dsh-skill-detail>p{grid-column:1/-1;margin:0}.dsh-skill-detail p strong,.dsh-skill-detail>div>strong{display:block;margin-bottom:5px;color:var(--dsw-alias-label-secondary);font-size:12px}\n.dsh-skill-invocation{display:flex;flex-direction:column;gap:7px}.dsh-skill-invocation label,.dsh-skill-create-flags label{display:flex;flex-direction:row;align-items:center;gap:5px}.dsh-ext input[type=checkbox]{width:auto;min-width:auto}.dsh-skill-detail ul,.dsh-skill-detail li{display:block!important;margin:0;padding:0!important;border:0!important}.dsh-skill-resources{display:flex!important;flex-wrap:wrap!important;gap:5px}.dsh-skill-resources li{padding:3px 6px!important;border-radius:5px!important;background:var(--dsw-alias-bg-layer-3)!important}\n.dsh-ext-span{grid-column:1/-1}.dsh-skill-create-flags{display:flex;flex-direction:column;gap:7px;font-size:13px}.dsh-skill-create-flags>span{margin-bottom:1px}.dsh-skill-source>.dsh-ext-notice{margin:12px 18px}.dsh-skill-source>.dsh-ext-empty{padding:18px}\n@media(max-width:600px){.dsh-ext fieldset,.dsh-skill-detail{grid-template-columns:1fr}.dsh-ext-heading{align-items:flex-start;flex-direction:column}.dsh-ext-heading-actions{flex-wrap:wrap}.dsh-ext-card>header{padding:14px}.dsh-ext li{padding:14px}.dsh-skill-stats{grid-template-columns:repeat(2,1fr)}.dsh-skill-grouping{justify-content:flex-start}.dsh-skill-group-editor{align-items:stretch;flex-direction:column}}\n";
+var styles_default = ".dsh-ext{color:var(--dsw-alias-label-primary);max-width:840px;padding:4px 0 28px;font:inherit}\n.dsh-ext-heading,.dsh-ext-card>header{display:flex;justify-content:space-between;align-items:center;gap:16px}\n.dsh-ext h2{font-size:22px;letter-spacing:-.4px;margin:0 0 8px}.dsh-ext h3{font-size:15px;margin:0;display:flex;align-items:center;gap:8px}\n.dsh-ext p,.dsh-ext small{color:var(--dsw-alias-label-tertiary);font-size:13px;line-height:1.6}.dsh-ext-heading p{margin:0}\n.dsh-ext button{font:inherit;font-size:13px;cursor:pointer;border:1px solid var(--dsw-alias-border-l4);border-radius:9px;background:var(--dsw-alias-bg-layer-2);color:inherit;padding:8px 13px;white-space:nowrap}\n.dsh-ext button:hover{background:var(--dsw-alias-bg-layer-3)}.dsh-ext button:disabled{opacity:.5;cursor:default}\n.dsh-ext :is(button,input,select,textarea):focus-visible{outline:2px solid var(--dsw-alias-brand-primary);outline-offset:3px}\n.dsh-ext-card{border:1px solid var(--dsw-alias-border-l4);border-radius:16px;margin-top:20px;background:var(--dsw-alias-bg-layer-2);overflow:hidden}\n.dsh-ext-card>header{padding:18px 20px;border-bottom:1px solid var(--dsw-alias-border-l4)}.dsh-ext-count{font-size:11px;font-weight:400;color:var(--dsw-alias-label-tertiary)}\n.dsh-ext-empty{padding:32px 20px}.dsh-ext-empty strong{font-size:14px;font-weight:500}.dsh-ext-empty p{margin:6px 0 0}\n.dsh-ext ul{list-style:none;padding:0;margin:0}.dsh-ext li{display:flex;justify-content:space-between;align-items:center;gap:14px;padding:16px 20px;border-bottom:1px solid var(--dsw-alias-border-l4)}.dsh-ext li:last-child{border:0}\n.dsh-ext-details{display:flex;flex-direction:column;gap:5px;min-width:0}.dsh-ext-details strong{font-size:14px}.dsh-ext-details code{font-size:12px;color:var(--dsw-alias-label-secondary);overflow-wrap:anywhere}\n.dsh-ext-runtime{display:flex;align-items:center;flex-wrap:wrap;gap:7px;font-size:12px;color:var(--dsw-alias-label-tertiary)}\n.dsh-ext-status{width:7px;height:7px;border-radius:50%;background:#858585;box-shadow:0 0 0 3px color-mix(in srgb,#858585 16%,transparent)}\n.dsh-ext-status-available{background:#38a169;box-shadow:0 0 0 3px color-mix(in srgb,#38a169 18%,transparent)}.dsh-ext-status-waiting{background:#d69e2e;box-shadow:0 0 0 3px color-mix(in srgb,#d69e2e 18%,transparent)}\n.dsh-ext-runtime details{width:100%;margin-top:2px}.dsh-ext-runtime summary{width:max-content;cursor:pointer;color:var(--dsw-alias-label-secondary);user-select:none}.dsh-ext-runtime summary:hover{color:var(--dsw-alias-label-primary)}\n.dsh-ext-runtime .dsh-ext-tools{display:flex;flex-wrap:wrap;gap:6px;margin-top:8px}.dsh-ext-runtime .dsh-ext-tools li{display:block;border:0;padding:4px 8px;border-radius:6px;background:var(--dsw-alias-bg-layer-3)}\n.dsh-ext-form{padding:20px;border-top:1px solid var(--dsw-alias-border-l4)}.dsh-ext fieldset{border:0;padding:0;margin:0;display:grid;grid-template-columns:1fr 1fr;gap:16px}.dsh-ext label{display:flex;flex-direction:column;gap:7px;font-size:13px}\n.dsh-ext input,.dsh-ext select,.dsh-ext textarea{box-sizing:border-box;min-width:0;width:100%;font:inherit;color:inherit;background:var(--dsw-alias-bg-layer-1);border:1px solid var(--dsw-alias-border-l4);border-radius:8px;padding:10px}.dsh-ext textarea{resize:vertical}\n.dsh-ext-actions{display:flex;justify-content:flex-end;gap:8px;grid-column:1/-1}.dsh-ext fieldset>p{grid-column:1/-1;margin:0}.dsh-ext-notice{padding:12px 16px;border:1px solid var(--dsw-alias-border-l4);border-radius:10px}.dsh-ext-footnote{padding:0 4px}\n.dsh-ext-heading-actions{display:flex;gap:8px;align-items:center}.dsh-visually-hidden{position:absolute;width:1px;height:1px;padding:0;margin:-1px;overflow:hidden;clip:rect(0,0,0,0);white-space:nowrap;border:0}\n.dsh-skill-stats{display:grid;grid-template-columns:repeat(4,1fr);gap:10px;margin-top:20px}.dsh-skill-stats>div{display:flex;flex-direction:column;gap:4px;padding:14px 16px;border:1px solid var(--dsw-alias-border-l4);border-radius:12px;background:var(--dsw-alias-bg-layer-2)}.dsh-skill-stats strong{font-size:20px}.dsh-skill-stats span{font-size:12px;color:var(--dsw-alias-label-tertiary)}\n.dsh-skill-search{margin-top:14px}.dsh-skill-search input{padding-left:13px}.dsh-skill-manager>.dsh-ext-form{margin-top:14px;border:1px solid var(--dsw-alias-border-l4);border-radius:14px;background:var(--dsw-alias-bg-layer-2)}\n.dsh-skill-filters{display:grid;grid-template-columns:repeat(3,1fr);gap:10px;margin-top:10px}.dsh-skill-filters label{gap:5px;font-size:11px;color:var(--dsw-alias-label-tertiary)}.dsh-skill-filters select{padding:8px 10px;color:var(--dsw-alias-label-primary)}\n.dsh-skill-source-manager{margin-top:14px}.dsh-skill-source-manager>summary{cursor:pointer;padding:14px 18px;font-size:14px;font-weight:600;user-select:none}.dsh-skill-source-manager[open]>summary{border-bottom:1px solid var(--dsw-alias-border-l4)}\n.dsh-skill-source-manager li{padding:11px 18px}.dsh-skill-source-title{display:flex;align-items:flex-start;gap:11px;min-width:0}.dsh-skill-source-title>.dsh-ext-status{margin-top:6px;flex:0 0 auto}.dsh-skill-source-title>div{display:flex;min-width:0;flex-direction:column;gap:3px}.dsh-skill-source-title code{font-size:11px;color:var(--dsw-alias-label-tertiary);overflow-wrap:anywhere}.dsh-skill-source-title small{font-size:11px;color:#e98282}\n.dsh-skill-library{margin-top:14px}.dsh-skill-group-editor{display:flex;align-items:flex-end;gap:8px}.dsh-skill-group-editor label{flex:1}.dsh-skill-group-editor input{padding:7px 9px}.dsh-skill-group-editor button{padding:7px 10px}\n.dsh-skill-row{display:block!important;padding:15px 18px!important}.dsh-skill-row-main{min-width:0}.dsh-skill-name{display:flex;align-items:center;gap:9px}.dsh-skill-name strong{font-size:14px}.dsh-skill-row-main>p{margin:6px 0 3px}.dsh-skill-row-main>code{font-size:11px;color:var(--dsw-alias-label-tertiary)}\n.dsh-skill-badge{font-size:11px;padding:2px 7px;border-radius:999px;background:var(--dsw-alias-bg-layer-3);color:var(--dsw-alias-label-secondary)}.dsh-skill-badge-group{color:var(--dsw-alias-brand-primary);background:color-mix(in srgb,var(--dsw-alias-brand-primary) 12%,transparent)}.dsh-skill-badge-invalid{color:#e98282}.dsh-skill-badge-shadowed{color:#a98af8}.dsh-ext-status-invalid{background:#e05252;box-shadow:0 0 0 3px color-mix(in srgb,#e05252 18%,transparent)}.dsh-ext-status-shadowed{background:#8b5cf6;box-shadow:0 0 0 3px color-mix(in srgb,#8b5cf6 18%,transparent)}.dsh-ext-status-manual{background:#d69e2e;box-shadow:0 0 0 3px color-mix(in srgb,#d69e2e 18%,transparent)}\n.dsh-skill-row details{margin-top:9px}.dsh-skill-row summary{width:max-content;cursor:pointer;font-size:12px;color:var(--dsw-alias-label-secondary)}.dsh-skill-detail{display:grid;grid-template-columns:1fr 1fr;gap:14px;margin-top:12px;padding:14px;border-radius:10px;background:var(--dsw-alias-bg-layer-1)}.dsh-skill-detail>p{grid-column:1/-1;margin:0}.dsh-skill-detail p strong,.dsh-skill-detail>div>strong{display:block;margin-bottom:5px;color:var(--dsw-alias-label-secondary);font-size:12px}\n.dsh-skill-invocation{display:flex;flex-direction:column;gap:7px}.dsh-skill-invocation label,.dsh-skill-create-flags label{display:flex;flex-direction:row;align-items:center;gap:5px}.dsh-ext input[type=checkbox]{width:auto;min-width:auto}.dsh-skill-detail ul,.dsh-skill-detail li{display:block!important;margin:0;padding:0!important;border:0!important}.dsh-skill-resources{display:flex!important;flex-wrap:wrap!important;gap:5px}.dsh-skill-resources li{padding:3px 6px!important;border-radius:5px!important;background:var(--dsw-alias-bg-layer-3)!important}\n.dsh-ext-span{grid-column:1/-1}.dsh-skill-create-flags{display:flex;flex-direction:column;gap:7px;font-size:13px}.dsh-skill-create-flags>span{margin-bottom:1px}.dsh-skill-source>.dsh-ext-notice{margin:12px 18px}.dsh-skill-source>.dsh-ext-empty{padding:18px}\n@media(max-width:600px){.dsh-ext fieldset,.dsh-skill-detail,.dsh-skill-filters{grid-template-columns:1fr}.dsh-ext-heading{align-items:flex-start;flex-direction:column}.dsh-ext-heading-actions{flex-wrap:wrap}.dsh-ext-card>header{padding:14px}.dsh-ext li{padding:14px}.dsh-skill-stats{grid-template-columns:repeat(2,1fr)}.dsh-skill-group-editor{align-items:stretch;flex-direction:column}}\n";
 // src/client/index.jsx
 var import_jsx_runtime = require("react/jsx-runtime");
@@ -303,13 +315,17 @@ function SkillSection({ t, useManager, request }) {
   const state = useManager((value) => value);
   const [form, setForm] = (0, import_react.useState)("");
   const [query, setQuery] = (0, import_react.useState)("");
-  const [groupBy, setGroupBy] = (0, import_react.useState)("path");
+  const [sourceFilter, setSourceFilter] = (0, import_react.useState)("all");
+  const [groupFilter, setGroupFilter] = (0, import_react.useState)("all");
+  const [statusFilter, setStatusFilter] = (0, import_react.useState)("all");
   const busy = state.loading || state.saving;
   const sources = state.sources ?? [];
   const skills = state.skills ?? [];
+  const groups = [...new Set(skills.map((skill) => skill.group).filter(Boolean))].sort((a, b) => a.localeCompare(b));
   const visible = skills.filter((skill) => {
     const source = sources.find((item) => item.id === skill.sourceId);
-    return `${skill.name} ${skill.description} ${source?.location ?? ""} ${source?.group ?? ""}`.toLowerCase().includes(query.toLowerCase());
+    const matchesQuery = `${skill.name} ${skill.description} ${source?.location ?? ""} ${skill.group ?? ""}`.toLowerCase().includes(query.toLowerCase());
+    return matchesQuery && (sourceFilter === "all" || skill.sourceId === sourceFilter) && (groupFilter === "all" || (groupFilter === "ungrouped" ? !skill.group : skill.group === groupFilter)) && (statusFilter === "all" || skillState(skill) === statusFilter);
   });
   const counts = {
     all: skills.length,
@@ -339,10 +355,33 @@ function SkillSection({ t, useManager, request }) {
       /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { className: "dsh-visually-hidden", children: t("search") }),
       /* @__PURE__ */ (0, import_jsx_runtime.jsx)("input", { type: "search", value: query, onChange: (event) => setQuery(event.target.value), placeholder: t("searchPlaceholder") })
     ] }),
-    /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "dsh-skill-grouping", role: "group", "aria-label": t("groupView"), children: [
-      /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { children: t("groupView") }),
-      /* @__PURE__ */ (0, import_jsx_runtime.jsx)("button", { type: "button", "aria-pressed": groupBy === "path", onClick: () => setGroupBy("path"), children: t("groupByPath") }),
-      /* @__PURE__ */ (0, import_jsx_runtime.jsx)("button", { type: "button", "aria-pressed": groupBy === "custom", onClick: () => setGroupBy("custom"), children: t("groupByCustom") })
+    /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "dsh-skill-filters", children: [
+      /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("label", { children: [
+        t("filterSource"),
+        /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("select", { value: sourceFilter, onChange: (event) => setSourceFilter(event.target.value), children: [
+          /* @__PURE__ */ (0, import_jsx_runtime.jsx)("option", { value: "all", children: t("filterAllSources") }),
+          sources.map((source) => /* @__PURE__ */ (0, import_jsx_runtime.jsx)("option", { value: source.id, children: source.id }, source.id))
+        ] })
+      ] }),
+      /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("label", { children: [
+        t("filterGroup"),
+        /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("select", { value: groupFilter, onChange: (event) => setGroupFilter(event.target.value), children: [
+          /* @__PURE__ */ (0, import_jsx_runtime.jsx)("option", { value: "all", children: t("filterAllGroups") }),
+          /* @__PURE__ */ (0, import_jsx_runtime.jsx)("option", { value: "ungrouped", children: t("ungrouped") }),
+          groups.map((group) => /* @__PURE__ */ (0, import_jsx_runtime.jsx)("option", { value: group, children: group }, group))
+        ] })
+      ] }),
+      /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("label", { children: [
+        t("filterStatus"),
+        /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("select", { value: statusFilter, onChange: (event) => setStatusFilter(event.target.value), children: [
+          /* @__PURE__ */ (0, import_jsx_runtime.jsx)("option", { value: "all", children: t("filterAllStatuses") }),
+          /* @__PURE__ */ (0, import_jsx_runtime.jsx)("option", { value: "available", children: t("stat_automatic") }),
+          /* @__PURE__ */ (0, import_jsx_runtime.jsx)("option", { value: "manual", children: t("stat_manual") }),
+          /* @__PURE__ */ (0, import_jsx_runtime.jsx)("option", { value: "disabled", children: t("disabled") }),
+          /* @__PURE__ */ (0, import_jsx_runtime.jsx)("option", { value: "invalid", children: t("stat_invalid") }),
+          /* @__PURE__ */ (0, import_jsx_runtime.jsx)("option", { value: "shadowed", children: t("skillStatusShadowed") })
+        ] })
+      ] })
     ] }),
     form === "source" && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(AddForm, { kind: "skill", t, busy, onCancel: () => setForm(""), onSave: async (args) => {
       if (await request("add-skill", args)) setForm("");
@@ -354,40 +393,50 @@ function SkillSection({ t, useManager, request }) {
       /* @__PURE__ */ (0, import_jsx_runtime.jsx)("strong", { children: t("emptySkills") }),
       /* @__PURE__ */ (0, import_jsx_runtime.jsx)("p", { children: t("emptySkillsHint") })
     ] }),
-    /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { className: "dsh-skill-sources", children: groupBy === "path" ? sources.map((source) => /* @__PURE__ */ (0, import_jsx_runtime.jsx)(SkillPath, { source, skills, visible, query, t, busy, request }, source.id)) : groupSources(sources.filter((source) => !query || visible.some((skill) => skill.sourceId === source.id))).map((group) => /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("section", { className: "dsh-skill-user-group", children: [
+    sources.length > 0 && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(SkillSources, { sources, skills, t, busy, request }),
+    sources.length > 0 && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("section", { className: "dsh-ext-card dsh-skill-library", children: [
       /* @__PURE__ */ (0, import_jsx_runtime.jsx)("header", { children: /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("h3", { children: [
-        group.name || t("ungrouped"),
+        t("skillLibrary"),
         " ",
-        /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { className: "dsh-ext-count", children: group.sources.reduce((total, source) => total + skills.filter((skill) => skill.sourceId === source.id).length, 0) })
+        /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { className: "dsh-ext-count", children: t("showingCount").replace("{visible}", visible.length).replace("{all}", skills.length) })
       ] }) }),
-      /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { children: group.sources.map((source) => /* @__PURE__ */ (0, import_jsx_runtime.jsx)(SkillPath, { source, skills, visible, query, t, busy, request, nested: true }, source.id)) })
-    ] }, group.name)) }),
+      visible.length === 0 ? /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "dsh-ext-empty", children: [
+        /* @__PURE__ */ (0, import_jsx_runtime.jsx)("strong", { children: t("noFilterResults") }),
+        /* @__PURE__ */ (0, import_jsx_runtime.jsx)("p", { children: t("noFilterResultsHint") })
+      ] }) : /* @__PURE__ */ (0, import_jsx_runtime.jsx)("ul", { children: visible.map((skill) => /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
+        SkillRow,
+        {
+          skill,
+          source: sources.find((item) => item.id === skill.sourceId),
+          groups,
+          t,
+          busy,
+          request
+        },
+        `${skill.sourceId}:${skill.relativePath}`
+      )) })
+    ] }),
     /* @__PURE__ */ (0, import_jsx_runtime.jsx)("p", { className: "dsh-ext-footnote", children: t("skillFootnote") })
   ] });
 }
-function groupSources(sources) {
-  const groups = /* @__PURE__ */ new Map();
-  for (const source of sources) {
-    const key = source.group || "";
-    if (!groups.has(key)) groups.set(key, []);
-    groups.get(key).push(source);
-  }
-  return [...groups].map(([name, entries]) => ({ name, sources: entries })).sort((a, b) => a.name.localeCompare(b.name));
-}
-function SkillPath({ source, skills, visible, query, t, busy, request, nested = false }) {
-  const rows = visible.filter((skill) => skill.sourceId === source.id);
-  if (query && rows.length === 0) return null;
-  return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("section", { className: `dsh-skill-source${nested ? " dsh-skill-source-nested" : ""}`, children: [
-    /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("header", { children: [
+function SkillSources({ sources, skills, t, busy, request }) {
+  return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("details", { className: "dsh-ext-card dsh-skill-source-manager", children: [
+    /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("summary", { children: [
+      t("skillSources"),
+      " ",
+      /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { className: "dsh-ext-count", children: sources.length })
+    ] }),
+    /* @__PURE__ */ (0, import_jsx_runtime.jsx)("ul", { children: sources.map((source) => /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("li", { children: [
       /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "dsh-skill-source-title", children: [
         /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { className: `dsh-ext-status ${source.enabled ? "dsh-ext-status-available" : ""}`, "aria-hidden": "true" }),
         /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { children: [
-          /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("h3", { children: [
-            source.location,
+          /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("strong", { children: [
+            source.id,
             " ",
             /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { className: "dsh-ext-count", children: skills.filter((skill) => skill.sourceId === source.id).length })
           ] }),
-          /* @__PURE__ */ (0, import_jsx_runtime.jsx)("small", { children: source.group ? `${t("customGroup")}: ${source.group}` : t("ungrouped") })
+          /* @__PURE__ */ (0, import_jsx_runtime.jsx)("code", { children: source.location }),
+          source.issue && /* @__PURE__ */ (0, import_jsx_runtime.jsx)("small", { children: t(`issue_${source.issue}`) })
         ] })
       ] }),
       /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
@@ -401,24 +450,7 @@ function SkillPath({ source, skills, visible, query, t, busy, request, nested =
           children: t(source.enabled ? "disable" : "enable")
         }
       )
-    ] }),
-    /* @__PURE__ */ (0, import_jsx_runtime.jsx)(GroupEditor, { source, t, busy, request }),
-    source.issue && /* @__PURE__ */ (0, import_jsx_runtime.jsx)("p", { className: "dsh-ext-notice", children: t(`issue_${source.issue}`) }),
-    rows.length === 0 ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { className: "dsh-ext-empty", children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)("p", { children: t("sourceEmpty") }) }) : /* @__PURE__ */ (0, import_jsx_runtime.jsx)("ul", { children: rows.map((skill) => /* @__PURE__ */ (0, import_jsx_runtime.jsx)(SkillRow, { skill, t, busy, request }, skill.relativePath)) })
-  ] });
-}
-function GroupEditor({ source, t, busy, request }) {
-  const [group, setGroup] = (0, import_react.useState)(source.group);
-  (0, import_react.useEffect)(() => setGroup(source.group), [source.group]);
-  return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("form", { className: "dsh-skill-group-editor", onSubmit: (event) => {
-    event.preventDefault();
-    void request("set-skill-group", { id: source.id, group });
-  }, children: [
-    /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("label", { children: [
-      t("customGroup"),
-      /* @__PURE__ */ (0, import_jsx_runtime.jsx)("input", { value: group, maxLength: 64, disabled: busy, onChange: (event) => setGroup(event.target.value), placeholder: t("groupPlaceholder") })
-    ] }),
-    /* @__PURE__ */ (0, import_jsx_runtime.jsx)("button", { type: "submit", disabled: busy || group.trim() === source.group, children: t("saveGroup") })
+    ] }, source.id)) })
   ] });
 }
 function McpSection({ t, useManager, request }) {
@@ -501,8 +533,11 @@ function PageState({ state, t }) {
     state.saved && /* @__PURE__ */ (0, import_jsx_runtime.jsx)("p", { className: "dsh-ext-notice", role: "status", children: t("saved") })
   ] });
 }
-function SkillRow({ skill, t, busy, request }) {
-  const state = !skill.valid ? "invalid" : !skill.sourceEnabled || !skill.modelInvocable && !skill.userInvocable ? "disabled" : skill.shadowed ? "shadowed" : !skill.modelInvocable ? "manual" : "available";
+function skillState(skill) {
+  return !skill.valid ? "invalid" : !skill.sourceEnabled || !skill.modelInvocable && !skill.userInvocable ? "disabled" : skill.shadowed ? "shadowed" : !skill.modelInvocable ? "manual" : "available";
+}
+function SkillRow({ skill, source, groups, t, busy, request }) {
+  const state = skillState(skill);
   const invocation = skill.modelInvocable && skill.userInvocable ? "both" : skill.modelInvocable ? "modelOnly" : skill.userInvocable ? "manualOnly" : "none";
   const statusLabel = !skill.valid ? "skillStatusInvalid" : !skill.sourceEnabled ? "skillStatusSourceDisabled" : skill.shadowed ? "skillStatusShadowed" : "";
   const update = (patch) => request("set-skill-invocation", {
@@ -519,10 +554,15 @@ function SkillRow({ skill, t, busy, request }) {
       /* @__PURE__ */ (0, import_jsx_runtime.jsx)("strong", { children: skill.name }),
       /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { className: "dsh-skill-badge", children: t(`format_${skill.format}`) }),
       /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { className: "dsh-skill-badge", children: t(`invocation_${invocation}`) }),
+      skill.group && /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { className: "dsh-skill-badge dsh-skill-badge-group", children: skill.group }),
       statusLabel && /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { className: `dsh-skill-badge dsh-skill-badge-${state}`, children: t(statusLabel) })
     ] }),
     /* @__PURE__ */ (0, import_jsx_runtime.jsx)("p", { children: skill.description || t("noDescription") }),
-    /* @__PURE__ */ (0, import_jsx_runtime.jsx)("code", { children: skill.relativePath }),
+    /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("code", { children: [
+      source?.id,
+      " \xB7 ",
+      skill.relativePath
+    ] }),
     /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("details", { children: [
       /* @__PURE__ */ (0, import_jsx_runtime.jsx)("summary", { children: t("details") }),
       /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "dsh-skill-detail", children: [
@@ -547,6 +587,7 @@ function SkillRow({ skill, t, busy, request }) {
             t("userInvocable")
           ] })
         ] }),
+        /* @__PURE__ */ (0, import_jsx_runtime.jsx)(SkillGroupEditor, { skill, groups, t, busy, request }),
         /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { children: [
           /* @__PURE__ */ (0, import_jsx_runtime.jsx)("strong", { children: t("resources") }),
           skill.resources.length ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)("ul", { className: "dsh-skill-resources", children: skill.resources.map((path) => /* @__PURE__ */ (0, import_jsx_runtime.jsx)("li", { children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)("code", { children: path }) }, path)) }) : /* @__PURE__ */ (0, import_jsx_runtime.jsx)("p", { children: t("noResources") })
@@ -555,6 +596,33 @@ function SkillRow({ skill, t, busy, request }) {
     ] })
   ] }) });
 }
+function SkillGroupEditor({ skill, groups, t, busy, request }) {
+  const currentGroup = skill.group ?? "";
+  const [group, setGroup] = (0, import_react.useState)(currentGroup);
+  const suggestions = (0, import_react.useId)();
+  (0, import_react.useEffect)(() => setGroup(currentGroup), [currentGroup]);
+  return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("form", { className: "dsh-skill-group-editor", onSubmit: (event) => {
+    event.preventDefault();
+    void request("set-skill-group", { sourceId: skill.sourceId, relativePath: skill.relativePath, skillRevision: skill.revision, group });
+  }, children: [
+    /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("label", { children: [
+      t("customGroup"),
+      /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
+        "input",
+        {
+          list: suggestions,
+          value: group,
+          maxLength: 64,
+          disabled: busy || !skill.valid,
+          onChange: (event) => setGroup(event.target.value),
+          placeholder: t("groupPlaceholder")
+        }
+      )
+    ] }),
+    /* @__PURE__ */ (0, import_jsx_runtime.jsx)("datalist", { id: suggestions, children: groups.map((name) => /* @__PURE__ */ (0, import_jsx_runtime.jsx)("option", { value: name }, name)) }),
+    /* @__PURE__ */ (0, import_jsx_runtime.jsx)("button", { type: "submit", disabled: busy || !skill.valid || group.trim() === currentGroup, children: t("saveGroup") })
+  ] });
+}
 function McpRuntime({ row, t }) {
   const tools = row.tools ?? [];
   const state = !row.enabled ? "disabled" : tools.length ? "available" : "waiting";
@@ -639,17 +707,13 @@ function AddForm({ kind, t, busy, onSave, onCancel }) {
   return /* @__PURE__ */ (0, import_jsx_runtime.jsx)("form", { className: "dsh-ext-form", onSubmit: (event) => {
     event.preventDefault();
     const data = Object.fromEntries(new FormData(event.currentTarget));
-    const args = kind === "skill" ? { directory: data.directory, group: data.group ?? "" } : {
+    const args = kind === "skill" ? { directory: data.directory } : {
       id: data.id,
       configuration: JSON.stringify(transport === "stdio" ? { transport, command: data.command, args: data.args.split(/\r?\n/).filter(Boolean), cwd: data.cwd } : { transport, url: data.url })
     };
     void onSave(args);
   }, children: /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("fieldset", { disabled: busy, children: [
-    kind === "skill" ? /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_jsx_runtime.Fragment, { children: [
-      field("directory"),
-      " ",
-      field("group", false)
-    ] }) : /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_jsx_runtime.Fragment, { children: [
+    kind === "skill" ? field("directory") : /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_jsx_runtime.Fragment, { children: [
       field("id"),
       /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("label", { htmlFor: `${prefix}-transport`, children: [
         t("transport"),

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "deepseek-harness-skill-mcp",
-  "version": "0.1.0",
+  "version": "0.1.2",
   "description": "Skill path and MCP server management for DeepSeek Harness Web",
   "license": "Apache-2.0",
   "repository": {

package/src/client/index.jsx CHANGED Viewed

@@ -35,13 +35,19 @@ export function SkillSection({ t, useManager, request }) {
   const state = useManager(value => value)
   const [form, setForm] = useState('')
   const [query, setQuery] = useState('')
-  const [groupBy, setGroupBy] = useState('path')
+  const [sourceFilter, setSourceFilter] = useState('all')
+  const [groupFilter, setGroupFilter] = useState('all')
+  const [statusFilter, setStatusFilter] = useState('all')
   const busy = state.loading || state.saving
   const sources = state.sources ?? []
   const skills = state.skills ?? []
+  const groups = [...new Set(skills.map(skill => skill.group).filter(Boolean))].sort((a, b) => a.localeCompare(b))
   const visible = skills.filter(skill => {
     const source = sources.find(item => item.id === skill.sourceId)
-    return `${skill.name} ${skill.description} ${source?.location ?? ''} ${source?.group ?? ''}`.toLowerCase().includes(query.toLowerCase())
+    const matchesQuery = `${skill.name} ${skill.description} ${source?.location ?? ''} ${skill.group ?? ''}`.toLowerCase().includes(query.toLowerCase())
+    return matchesQuery && (sourceFilter === 'all' || skill.sourceId === sourceFilter)
+      && (groupFilter === 'all' || (groupFilter === 'ungrouped' ? !skill.group : skill.group === groupFilter))
+      && (statusFilter === 'all' || skillState(skill) === statusFilter)
   })
   const counts = {
     all: skills.length,
@@ -61,9 +67,16 @@ export function SkillSection({ t, useManager, request }) {
     </div>
     <label className="dsh-skill-search"><span className="dsh-visually-hidden">{t('search')}</span>
       <input type="search" value={query} onChange={event => setQuery(event.target.value)} placeholder={t('searchPlaceholder')} /></label>
-    <div className="dsh-skill-grouping" role="group" aria-label={t('groupView')}>
-      <span>{t('groupView')}</span><button type="button" aria-pressed={groupBy === 'path'} onClick={() => setGroupBy('path')}>{t('groupByPath')}</button>
-      <button type="button" aria-pressed={groupBy === 'custom'} onClick={() => setGroupBy('custom')}>{t('groupByCustom')}</button>
+    <div className="dsh-skill-filters">
+      <label>{t('filterSource')}<select value={sourceFilter} onChange={event => setSourceFilter(event.target.value)}>
+        <option value="all">{t('filterAllSources')}</option>{sources.map(source => <option key={source.id} value={source.id}>{source.id}</option>)}</select></label>
+      <label>{t('filterGroup')}<select value={groupFilter} onChange={event => setGroupFilter(event.target.value)}>
+        <option value="all">{t('filterAllGroups')}</option><option value="ungrouped">{t('ungrouped')}</option>
+        {groups.map(group => <option key={group} value={group}>{group}</option>)}</select></label>
+      <label>{t('filterStatus')}<select value={statusFilter} onChange={event => setStatusFilter(event.target.value)}>
+        <option value="all">{t('filterAllStatuses')}</option><option value="available">{t('stat_automatic')}</option>
+        <option value="manual">{t('stat_manual')}</option><option value="disabled">{t('disabled')}</option>
+        <option value="invalid">{t('stat_invalid')}</option><option value="shadowed">{t('skillStatusShadowed')}</option></select></label>
     </div>
     {form === 'source' && <AddForm kind="skill" t={t} busy={busy} onCancel={() => setForm('')} onSave={async args => {
       if (await request('add-skill', args)) setForm('')
@@ -72,50 +85,24 @@ export function SkillSection({ t, useManager, request }) {
       if (await request('create-skill', args)) setForm('')
     }} />}
     {sources.length === 0 && <div className="dsh-ext-card dsh-ext-empty"><strong>{t('emptySkills')}</strong><p>{t('emptySkillsHint')}</p></div>}
-    <div className="dsh-skill-sources">{groupBy === 'path' ? sources.map(source => <SkillPath key={source.id} source={source} skills={skills} visible={visible} query={query} t={t} busy={busy} request={request} />)
-      : groupSources(sources.filter(source => !query || visible.some(skill => skill.sourceId === source.id))).map(group => <section className="dsh-skill-user-group" key={group.name}>
-        <header><h3>{group.name || t('ungrouped')} <span className="dsh-ext-count">{group.sources.reduce((total, source) => total + skills.filter(skill => skill.sourceId === source.id).length, 0)}</span></h3></header>
-        <div>{group.sources.map(source => <SkillPath key={source.id} source={source} skills={skills} visible={visible} query={query} t={t} busy={busy} request={request} nested />)}</div>
-      </section>)}</div>
+    {sources.length > 0 && <SkillSources sources={sources} skills={skills} t={t} busy={busy} request={request} />}
+    {sources.length > 0 && <section className="dsh-ext-card dsh-skill-library"><header><h3>{t('skillLibrary')} <span className="dsh-ext-count">{t('showingCount').replace('{visible}', visible.length).replace('{all}', skills.length)}</span></h3></header>
+      {visible.length === 0 ? <div className="dsh-ext-empty"><strong>{t('noFilterResults')}</strong><p>{t('noFilterResultsHint')}</p></div>
+        : <ul>{visible.map(skill => <SkillRow key={`${skill.sourceId}:${skill.relativePath}`} skill={skill}
+          source={sources.find(item => item.id === skill.sourceId)} groups={groups} t={t} busy={busy} request={request} />)}</ul>}
+    </section>}
     <p className="dsh-ext-footnote">{t('skillFootnote')}</p>
   </section>
 }
-function groupSources(sources) {
-  const groups = new Map()
-  for (const source of sources) {
-    const key = source.group || ''
-    if (!groups.has(key)) groups.set(key, [])
-    groups.get(key).push(source)
-  }
-  return [...groups].map(([name, entries]) => ({ name, sources: entries }))
-    .sort((a, b) => a.name.localeCompare(b.name))
-}
-function SkillPath({ source, skills, visible, query, t, busy, request, nested = false }) {
-  const rows = visible.filter(skill => skill.sourceId === source.id)
-  if (query && rows.length === 0) return null
-  return <section className={`dsh-skill-source${nested ? ' dsh-skill-source-nested' : ''}`}>
-    <header><div className="dsh-skill-source-title"><span className={`dsh-ext-status ${source.enabled ? 'dsh-ext-status-available' : ''}`} aria-hidden="true" />
-      <div><h3>{source.location} <span className="dsh-ext-count">{skills.filter(skill => skill.sourceId === source.id).length}</span></h3>
-        <small>{source.group ? `${t('customGroup')}: ${source.group}` : t('ungrouped')}</small></div></div>
+function SkillSources({ sources, skills, t, busy, request }) {
+  return <details className="dsh-ext-card dsh-skill-source-manager"><summary>{t('skillSources')} <span className="dsh-ext-count">{sources.length}</span></summary>
+    <ul>{sources.map(source => <li key={source.id}><div className="dsh-skill-source-title"><span className={`dsh-ext-status ${source.enabled ? 'dsh-ext-status-available' : ''}`} aria-hidden="true" />
+      <div><strong>{source.id} <span className="dsh-ext-count">{skills.filter(skill => skill.sourceId === source.id).length}</span></strong><code>{source.location}</code>
+        {source.issue && <small>{t(`issue_${source.issue}`)}</small>}</div></div>
       <button type="button" role="switch" aria-checked={source.enabled} disabled={busy}
-        onClick={() => request('enable', { id: source.id, enabled: !source.enabled })}>{t(source.enabled ? 'disable' : 'enable')}</button></header>
-    <GroupEditor source={source} t={t} busy={busy} request={request} />
-    {source.issue && <p className="dsh-ext-notice">{t(`issue_${source.issue}`)}</p>}
-    {rows.length === 0 ? <div className="dsh-ext-empty"><p>{t('sourceEmpty')}</p></div>
-      : <ul>{rows.map(skill => <SkillRow key={skill.relativePath} skill={skill} t={t} busy={busy} request={request} />)}</ul>}
-  </section>
-}
-function GroupEditor({ source, t, busy, request }) {
-  const [group, setGroup] = useState(source.group)
-  useEffect(() => setGroup(source.group), [source.group])
-  return <form className="dsh-skill-group-editor" onSubmit={event => {
-    event.preventDefault()
-    void request('set-skill-group', { id: source.id, group })
-  }}><label>{t('customGroup')}<input value={group} maxLength={64} disabled={busy} onChange={event => setGroup(event.target.value)} placeholder={t('groupPlaceholder')} /></label>
-    <button type="submit" disabled={busy || group.trim() === source.group}>{t('saveGroup')}</button></form>
+        onClick={() => request('enable', { id: source.id, enabled: !source.enabled })}>{t(source.enabled ? 'disable' : 'enable')}</button></li>)}</ul>
+  </details>
 }
 export function McpSection({ t, useManager, request }) {
@@ -169,9 +156,13 @@ function PageState({ state, t }) {
     {state.saved && <p className="dsh-ext-notice" role="status">{t('saved')}</p>}</>
 }
-function SkillRow({ skill, t, busy, request }) {
-  const state = !skill.valid ? 'invalid' : !skill.sourceEnabled || (!skill.modelInvocable && !skill.userInvocable)
+function skillState(skill) {
+  return !skill.valid ? 'invalid' : !skill.sourceEnabled || (!skill.modelInvocable && !skill.userInvocable)
     ? 'disabled' : skill.shadowed ? 'shadowed' : !skill.modelInvocable ? 'manual' : 'available'
+}
+function SkillRow({ skill, source, groups, t, busy, request }) {
+  const state = skillState(skill)
   const invocation = skill.modelInvocable && skill.userInvocable ? 'both'
     : skill.modelInvocable ? 'modelOnly' : skill.userInvocable ? 'manualOnly' : 'none'
   const statusLabel = !skill.valid ? 'skillStatusInvalid' : !skill.sourceEnabled ? 'skillStatusSourceDisabled'
@@ -183,14 +174,16 @@ function SkillRow({ skill, t, busy, request }) {
   return <li className="dsh-skill-row"><div className="dsh-skill-row-main">
     <div className="dsh-skill-name"><span className={`dsh-ext-status dsh-ext-status-${state}`} aria-hidden="true" /><strong>{skill.name}</strong>
       <span className="dsh-skill-badge">{t(`format_${skill.format}`)}</span><span className="dsh-skill-badge">{t(`invocation_${invocation}`)}</span>
+      {skill.group && <span className="dsh-skill-badge dsh-skill-badge-group">{skill.group}</span>}
       {statusLabel && <span className={`dsh-skill-badge dsh-skill-badge-${state}`}>{t(statusLabel)}</span>}</div>
-    <p>{skill.description || t('noDescription')}</p><code>{skill.relativePath}</code>
+    <p>{skill.description || t('noDescription')}</p><code>{source?.id} · {skill.relativePath}</code>
     <details><summary>{t('details')}</summary><div className="dsh-skill-detail">
       {skill.whenToUse && <p><strong>{t('whenToUse')}</strong>{skill.whenToUse}</p>}
       {skill.issues.length > 0 && <div><strong>{t('diagnostics')}</strong><ul>{skill.issues.map(issue => <li key={issue}>{t(`issue_${issue}`)}</li>)}</ul></div>}
       <div className="dsh-skill-invocation"><strong>{t('invocation')}</strong>
         <label><input type="checkbox" checked={skill.modelInvocable} disabled={busy || !skill.valid} onChange={event => update({ modelInvocable: event.target.checked })} /> {t('modelInvocable')}</label>
         <label><input type="checkbox" checked={skill.userInvocable} disabled={busy || !skill.valid} onChange={event => update({ userInvocable: event.target.checked })} /> {t('userInvocable')}</label></div>
+      <SkillGroupEditor skill={skill} groups={groups} t={t} busy={busy} request={request} />
       <div><strong>{t('resources')}</strong>{skill.resources.length
         ? <ul className="dsh-skill-resources">{skill.resources.map(path => <li key={path}><code>{path}</code></li>)}</ul>
         : <p>{t('noResources')}</p>}</div>
@@ -198,6 +191,20 @@ function SkillRow({ skill, t, busy, request }) {
   </div></li>
 }
+function SkillGroupEditor({ skill, groups, t, busy, request }) {
+  const currentGroup = skill.group ?? ''
+  const [group, setGroup] = useState(currentGroup)
+  const suggestions = useId()
+  useEffect(() => setGroup(currentGroup), [currentGroup])
+  return <form className="dsh-skill-group-editor" onSubmit={event => {
+    event.preventDefault()
+    void request('set-skill-group', { sourceId: skill.sourceId, relativePath: skill.relativePath, skillRevision: skill.revision, group })
+  }}><label>{t('customGroup')}<input list={suggestions} value={group} maxLength={64} disabled={busy || !skill.valid}
+    onChange={event => setGroup(event.target.value)} placeholder={t('groupPlaceholder')} /></label>
+    <datalist id={suggestions}>{groups.map(name => <option key={name} value={name} />)}</datalist>
+    <button type="submit" disabled={busy || !skill.valid || group.trim() === currentGroup}>{t('saveGroup')}</button></form>
+}
 function McpRuntime({ row, t }) {
   const tools = row.tools ?? []
   const state = !row.enabled ? 'disabled' : tools.length ? 'available' : 'waiting'
@@ -245,13 +252,13 @@ function AddForm({ kind, t, busy, onSave, onCancel }) {
   return <form className="dsh-ext-form" onSubmit={event => {
     event.preventDefault()
     const data = Object.fromEntries(new FormData(event.currentTarget))
-    const args = kind === 'skill' ? { directory: data.directory, group: data.group ?? '' } : {
+    const args = kind === 'skill' ? { directory: data.directory } : {
       id: data.id, configuration: JSON.stringify(transport === 'stdio'
         ? { transport, command: data.command, args: data.args.split(/\r?\n/).filter(Boolean), cwd: data.cwd }
         : { transport, url: data.url }),
     }
     void onSave(args)
-  }}><fieldset disabled={busy}>{kind === 'skill' ? <>{field('directory')} {field('group', false)}</> : <>{field('id')}
+  }}><fieldset disabled={busy}>{kind === 'skill' ? field('directory') : <>{field('id')}
       <label htmlFor={`${prefix}-transport`}>{t('transport')}<select id={`${prefix}-transport`} value={transport} onChange={event => setTransport(event.target.value)}>
         <option value="stdio">{t('stdio')}</option><option value="streamable-http">{t('http')}</option></select></label>
       {transport === 'stdio' ? <>{field('command')}{field('args', false, true)}{field('cwd', false)}</> : field('url')}

package/src/client/locales.js CHANGED Viewed

@@ -5,7 +5,7 @@ export const zh = {
   skills: 'Skill 路径', mcp: 'MCP 服务器', refresh: '刷新', add: '添加路径', addMcp: '添加服务器', newSkill: '新建 Skill',
   emptySkills: '还没有配置 Skill 路径', emptySkillsHint: '指定一个本地 skills 目录，目录下的各个子目录就是技能。',
   emptyMcp: '还没有添加 MCP 服务器', emptyMcpHint: '通过本地命令或 HTTP 地址连接外部工具。',
-  id: '标识', directory: 'Skill 路径', group: '用户分组（可选）', transport: '配置类型', stdio: 'stdio', http: 'HTTP',
+  id: '标识', directory: 'Skill 路径', transport: '配置类型', stdio: 'stdio', http: 'HTTP',
   command: '命令', args: '参数（每行一个）', cwd: '工作目录（可选）', url: '服务器地址',
   cancel: '取消', save: '添加', create: '创建', saving: '保存中…', loading: '加载中…',
   enabled: '配置已启用', disabled: '已禁用', enable: '启用', disable: '禁用',
@@ -17,8 +17,11 @@ export const zh = {
   tools: '工具列表', status_available: '工具可用', status_waiting: '等待发现工具', status_disabled: '已禁用',
   skillHint: '启用后由 Skill provider 扫描；每个配置项对应一个包含多个技能的目录。',
   stat_all: '全部技能', stat_automatic: '模型可用', stat_manual: '仅手动', stat_invalid: '配置异常',
-  search: '搜索', searchPlaceholder: '搜索名称、描述、路径或分组…', sourceEmpty: '这个路径下还没有发现 Skill。',
-  groupView: '分组方式', groupByPath: '按路径', groupByCustom: '按用户分组', customGroup: '用户分组', ungrouped: '未分组',
+  search: '搜索', searchPlaceholder: '搜索名称、描述、路径或分组…',
+  skillSources: '来源路径', skillLibrary: '技能列表', showingCount: '显示 {visible} / {all}',
+  filterSource: '来源', filterAllSources: '全部来源', filterGroup: '分组', filterAllGroups: '全部分组',
+  filterStatus: '状态', filterAllStatuses: '全部状态', noFilterResults: '没有匹配的 Skill', noFilterResultsHint: '尝试调整搜索词或筛选条件。',
+  customGroup: '用户分组', ungrouped: '未分组',
   groupPlaceholder: '例如：工作、个人、开发', saveGroup: '保存分组',
   noDescription: '没有可用的描述', details: '查看详情', whenToUse: '适用场景', diagnostics: '格式诊断',
   invocation: '调用权限', modelInvocable: '允许模型自动选择', userInvocable: '允许用户通过 /name 调用',
@@ -37,7 +40,7 @@ export const en = {
   skills: 'Skill paths', mcp: 'MCP servers', refresh: 'Refresh', add: 'Add path', addMcp: 'Add server', newSkill: 'New Skill',
   emptySkills: 'No Skill paths configured', emptySkillsHint: 'Choose a local skills directory whose children contain the individual skills.',
   emptyMcp: 'No MCP servers yet', emptyMcpHint: 'Connect external tools with a local command or HTTP endpoint.',
-  id: 'Identifier', directory: 'Skill path', group: 'User group (optional)', transport: 'Type', stdio: 'stdio', http: 'HTTP',
+  id: 'Identifier', directory: 'Skill path', transport: 'Type', stdio: 'stdio', http: 'HTTP',
   command: 'Command', args: 'Arguments (one per line)', cwd: 'Working directory (optional)', url: 'Server URL',
   cancel: 'Cancel', save: 'Add', create: 'Create', saving: 'Saving…', loading: 'Loading…',
   enabled: 'Configured enabled', disabled: 'Disabled', enable: 'Enable', disable: 'Disable',
@@ -49,8 +52,11 @@ export const en = {
   tools: 'Tools', status_available: 'Tools available', status_waiting: 'Waiting for tools', status_disabled: 'Disabled',
   skillHint: 'The Skill provider scans enabled paths; every configured path contains multiple skills.',
   stat_all: 'All skills', stat_automatic: 'Model enabled', stat_manual: 'Manual only', stat_invalid: 'Invalid',
-  search: 'Search', searchPlaceholder: 'Search name, description, path or group…', sourceEmpty: 'No Skills were found in this path.',
-  groupView: 'Group view', groupByPath: 'By path', groupByCustom: 'By user group', customGroup: 'User group', ungrouped: 'Ungrouped',
+  search: 'Search', searchPlaceholder: 'Search name, description, path or group…',
+  skillSources: 'Source paths', skillLibrary: 'Skill library', showingCount: 'Showing {visible} / {all}',
+  filterSource: 'Source', filterAllSources: 'All sources', filterGroup: 'Group', filterAllGroups: 'All groups',
+  filterStatus: 'Status', filterAllStatuses: 'All statuses', noFilterResults: 'No matching Skills', noFilterResultsHint: 'Try another search or filter.',
+  customGroup: 'User group', ungrouped: 'Ungrouped',
   groupPlaceholder: 'For example: Work, Personal, Development', saveGroup: 'Save group',
   noDescription: 'No usable description', details: 'View details', whenToUse: 'When to use', diagnostics: 'Diagnostics',
   invocation: 'Invocation', modelInvocable: 'Allow model selection', userInvocable: 'Allow user /name invocation',

package/src/client/styles.css CHANGED Viewed

@@ -21,14 +21,13 @@
 .dsh-ext-heading-actions{display:flex;gap:8px;align-items:center}.dsh-visually-hidden{position:absolute;width:1px;height:1px;padding:0;margin:-1px;overflow:hidden;clip:rect(0,0,0,0);white-space:nowrap;border:0}
 .dsh-skill-stats{display:grid;grid-template-columns:repeat(4,1fr);gap:10px;margin-top:20px}.dsh-skill-stats>div{display:flex;flex-direction:column;gap:4px;padding:14px 16px;border:1px solid var(--dsw-alias-border-l4);border-radius:12px;background:var(--dsw-alias-bg-layer-2)}.dsh-skill-stats strong{font-size:20px}.dsh-skill-stats span{font-size:12px;color:var(--dsw-alias-label-tertiary)}
 .dsh-skill-search{margin-top:14px}.dsh-skill-search input{padding-left:13px}.dsh-skill-manager>.dsh-ext-form{margin-top:14px;border:1px solid var(--dsw-alias-border-l4);border-radius:14px;background:var(--dsw-alias-bg-layer-2)}
-.dsh-skill-grouping{display:flex;align-items:center;justify-content:flex-end;gap:6px;margin-top:10px}.dsh-skill-grouping>span{margin-right:4px;font-size:12px;color:var(--dsw-alias-label-tertiary)}.dsh-skill-grouping button{padding:5px 10px}.dsh-skill-grouping button[aria-pressed=true]{border-color:var(--dsw-alias-brand-primary);background:color-mix(in srgb,var(--dsw-alias-brand-primary) 13%,transparent)}
-.dsh-skill-sources{display:flex;flex-direction:column;gap:14px;margin-top:14px}.dsh-skill-source{border:1px solid var(--dsw-alias-border-l4);border-radius:15px;background:var(--dsw-alias-bg-layer-2);overflow:hidden}.dsh-skill-source>header{display:flex;justify-content:space-between;align-items:center;gap:16px;padding:16px 18px;border-bottom:1px solid var(--dsw-alias-border-l4)}
-.dsh-skill-source-title{display:flex;align-items:flex-start;gap:11px;min-width:0}.dsh-skill-source-title>.dsh-ext-status{margin-top:6px;flex:0 0 auto}.dsh-skill-source-title h3{margin-bottom:5px;overflow-wrap:anywhere}.dsh-skill-source-title small{display:block;font-size:11px;color:var(--dsw-alias-label-tertiary);overflow-wrap:anywhere}
-.dsh-skill-group-editor{display:flex;align-items:flex-end;gap:8px;padding:10px 18px;border-bottom:1px solid var(--dsw-alias-border-l4);background:var(--dsw-alias-bg-layer-1)}.dsh-skill-group-editor label{flex:1}.dsh-skill-group-editor input{padding:7px 9px}.dsh-skill-group-editor button{padding:7px 10px}
-.dsh-skill-user-group{border:1px solid var(--dsw-alias-border-l4);border-radius:16px;background:var(--dsw-alias-bg-layer-2);overflow:hidden}.dsh-skill-user-group>header{padding:15px 18px;border-bottom:1px solid var(--dsw-alias-border-l4)}.dsh-skill-user-group>div{display:flex;flex-direction:column;gap:10px;padding:10px}.dsh-skill-source-nested{border-radius:11px;background:var(--dsw-alias-bg-layer-1)}
+.dsh-skill-filters{display:grid;grid-template-columns:repeat(3,1fr);gap:10px;margin-top:10px}.dsh-skill-filters label{gap:5px;font-size:11px;color:var(--dsw-alias-label-tertiary)}.dsh-skill-filters select{padding:8px 10px;color:var(--dsw-alias-label-primary)}
+.dsh-skill-source-manager{margin-top:14px}.dsh-skill-source-manager>summary{cursor:pointer;padding:14px 18px;font-size:14px;font-weight:600;user-select:none}.dsh-skill-source-manager[open]>summary{border-bottom:1px solid var(--dsw-alias-border-l4)}
+.dsh-skill-source-manager li{padding:11px 18px}.dsh-skill-source-title{display:flex;align-items:flex-start;gap:11px;min-width:0}.dsh-skill-source-title>.dsh-ext-status{margin-top:6px;flex:0 0 auto}.dsh-skill-source-title>div{display:flex;min-width:0;flex-direction:column;gap:3px}.dsh-skill-source-title code{font-size:11px;color:var(--dsw-alias-label-tertiary);overflow-wrap:anywhere}.dsh-skill-source-title small{font-size:11px;color:#e98282}
+.dsh-skill-library{margin-top:14px}.dsh-skill-group-editor{display:flex;align-items:flex-end;gap:8px}.dsh-skill-group-editor label{flex:1}.dsh-skill-group-editor input{padding:7px 9px}.dsh-skill-group-editor button{padding:7px 10px}
 .dsh-skill-row{display:block!important;padding:15px 18px!important}.dsh-skill-row-main{min-width:0}.dsh-skill-name{display:flex;align-items:center;gap:9px}.dsh-skill-name strong{font-size:14px}.dsh-skill-row-main>p{margin:6px 0 3px}.dsh-skill-row-main>code{font-size:11px;color:var(--dsw-alias-label-tertiary)}
-.dsh-skill-badge{font-size:11px;padding:2px 7px;border-radius:999px;background:var(--dsw-alias-bg-layer-3);color:var(--dsw-alias-label-secondary)}.dsh-skill-badge-invalid{color:#e98282}.dsh-skill-badge-shadowed{color:#a98af8}.dsh-ext-status-invalid{background:#e05252;box-shadow:0 0 0 3px color-mix(in srgb,#e05252 18%,transparent)}.dsh-ext-status-shadowed{background:#8b5cf6;box-shadow:0 0 0 3px color-mix(in srgb,#8b5cf6 18%,transparent)}.dsh-ext-status-manual{background:#d69e2e;box-shadow:0 0 0 3px color-mix(in srgb,#d69e2e 18%,transparent)}
+.dsh-skill-badge{font-size:11px;padding:2px 7px;border-radius:999px;background:var(--dsw-alias-bg-layer-3);color:var(--dsw-alias-label-secondary)}.dsh-skill-badge-group{color:var(--dsw-alias-brand-primary);background:color-mix(in srgb,var(--dsw-alias-brand-primary) 12%,transparent)}.dsh-skill-badge-invalid{color:#e98282}.dsh-skill-badge-shadowed{color:#a98af8}.dsh-ext-status-invalid{background:#e05252;box-shadow:0 0 0 3px color-mix(in srgb,#e05252 18%,transparent)}.dsh-ext-status-shadowed{background:#8b5cf6;box-shadow:0 0 0 3px color-mix(in srgb,#8b5cf6 18%,transparent)}.dsh-ext-status-manual{background:#d69e2e;box-shadow:0 0 0 3px color-mix(in srgb,#d69e2e 18%,transparent)}
 .dsh-skill-row details{margin-top:9px}.dsh-skill-row summary{width:max-content;cursor:pointer;font-size:12px;color:var(--dsw-alias-label-secondary)}.dsh-skill-detail{display:grid;grid-template-columns:1fr 1fr;gap:14px;margin-top:12px;padding:14px;border-radius:10px;background:var(--dsw-alias-bg-layer-1)}.dsh-skill-detail>p{grid-column:1/-1;margin:0}.dsh-skill-detail p strong,.dsh-skill-detail>div>strong{display:block;margin-bottom:5px;color:var(--dsw-alias-label-secondary);font-size:12px}
 .dsh-skill-invocation{display:flex;flex-direction:column;gap:7px}.dsh-skill-invocation label,.dsh-skill-create-flags label{display:flex;flex-direction:row;align-items:center;gap:5px}.dsh-ext input[type=checkbox]{width:auto;min-width:auto}.dsh-skill-detail ul,.dsh-skill-detail li{display:block!important;margin:0;padding:0!important;border:0!important}.dsh-skill-resources{display:flex!important;flex-wrap:wrap!important;gap:5px}.dsh-skill-resources li{padding:3px 6px!important;border-radius:5px!important;background:var(--dsw-alias-bg-layer-3)!important}
 .dsh-ext-span{grid-column:1/-1}.dsh-skill-create-flags{display:flex;flex-direction:column;gap:7px;font-size:13px}.dsh-skill-create-flags>span{margin-bottom:1px}.dsh-skill-source>.dsh-ext-notice{margin:12px 18px}.dsh-skill-source>.dsh-ext-empty{padding:18px}
-@media(max-width:600px){.dsh-ext fieldset,.dsh-skill-detail{grid-template-columns:1fr}.dsh-ext-heading{align-items:flex-start;flex-direction:column}.dsh-ext-heading-actions{flex-wrap:wrap}.dsh-ext-card>header{padding:14px}.dsh-ext li{padding:14px}.dsh-skill-stats{grid-template-columns:repeat(2,1fr)}.dsh-skill-grouping{justify-content:flex-start}.dsh-skill-group-editor{align-items:stretch;flex-direction:column}}
+@media(max-width:600px){.dsh-ext fieldset,.dsh-skill-detail,.dsh-skill-filters{grid-template-columns:1fr}.dsh-ext-heading{align-items:flex-start;flex-direction:column}.dsh-ext-heading-actions{flex-wrap:wrap}.dsh-ext-card>header{padding:14px}.dsh-ext li{padding:14px}.dsh-skill-stats{grid-template-columns:repeat(2,1fr)}.dsh-skill-group-editor{align-items:stretch;flex-direction:column}}

package/src/skills.js CHANGED Viewed

@@ -48,6 +48,8 @@ function parseFrontmatter(content) {
     whenToUse: typeof data.whenToUse === 'string' ? data.whenToUse.trim() : '',
     modelInvocable,
     userInvocable,
+    group: typeof data.metadata?.['dsh-skill-mcp/group'] === 'string'
+      ? data.metadata['dsh-skill-mcp/group'].trim().slice(0, 64) : '',
   }
 }
@@ -84,6 +86,7 @@ async function inspectSkill(source, path, format) {
       whenToUse: parsed.whenToUse,
       modelInvocable: parsed.modelInvocable,
       userInvocable: parsed.userInvocable,
+      group: parsed.group,
       valid: parsed.issues.length === 0,
       issues: parsed.issues,
       resources,
@@ -95,7 +98,7 @@ async function inspectSkill(source, path, format) {
     return {
       sourceId: source.id, sourceEnabled: source.enabled, relativePath, format,
       name: basename(path, extname(path)), description: '', whenToUse: '',
-      modelInvocable: false, userInvocable: false, valid: false, issues: [issue], resources: [], revision: '',
+      modelInvocable: false, userInvocable: false, group: '', valid: false, issues: [issue], resources: [], revision: '',
     }
   }
 }
@@ -104,7 +107,6 @@ async function inspectSkill(source, path, format) {
 export async function inspectSkills(rows) {
   const sources = rows.filter(row => !row.config.serverName).map(row => ({
     id: row.id, enabled: !row.disabled, location: row.config.customSkillDirs[0],
-    group: typeof row.config.extensionManagerGroup === 'string' ? row.config.extensionManagerGroup : '',
   }))
   const skills = []
   for (const source of sources) {
@@ -164,8 +166,7 @@ export async function createSkill(rows, input) {
   }
 }
-/** Update only invocation frontmatter after checking the exact inspected file revision. */
-export async function setSkillInvocation(rows, input) {
+async function updateSkillFrontmatter(rows, input, update) {
   const root = skillSource(rows, input.sourceId)
   const inventory = await inspectSkills(rows)
   const skill = inventory.skills.find(item => item.sourceId === input.sourceId && item.relativePath === input.relativePath)
@@ -177,11 +178,33 @@ export async function setSkillInvocation(rows, input) {
     throw Object.assign(new Error('Skill changed. Refresh before saving.'), { code: 'CONFLICT' })
   }
   const parsed = parseFrontmatter(content)
-  if (input.modelInvocable) delete parsed.data['disable-model-invocation']
-  else parsed.data['disable-model-invocation'] = true
-  if (input.userInvocable) delete parsed.data['user-invocable']
-  else parsed.data['user-invocable'] = false
+  update(parsed.data)
   const temporary = join(dirname(path), `.${basename(path)}.${randomUUID()}.tmp`)
   await writeFile(temporary, `---\n${stringify(parsed.data)}---\n${parsed.body}`)
   await rename(temporary, path)
 }
+/** Update only invocation frontmatter after checking the exact inspected file revision. */
+export async function setSkillInvocation(rows, input) {
+  await updateSkillFrontmatter(rows, input, data => {
+    if (input.modelInvocable) delete data['disable-model-invocation']
+    else data['disable-model-invocation'] = true
+    if (input.userInvocable) delete data['user-invocable']
+    else data['user-invocable'] = false
+  })
+}
+/** Store a user-defined group on one Skill without changing provider configuration. */
+export async function setSkillGroup(rows, input) {
+  await updateSkillFrontmatter(rows, input, data => {
+    const group = input.group.trim().slice(0, 64)
+    if (data.metadata !== undefined && (!data.metadata || typeof data.metadata !== 'object' || Array.isArray(data.metadata))) {
+      throw new Error('Skill metadata must be an object before assigning a group.')
+    }
+    const metadata = data.metadata ?? {}
+    if (group) metadata['dsh-skill-mcp/group'] = group
+    else delete metadata['dsh-skill-mcp/group']
+    if (Object.keys(metadata).length) data.metadata = metadata
+    else delete data.metadata
+  })
+}

package/src/store.js CHANGED Viewed

@@ -14,7 +14,6 @@ const managerModule = new URL('./index.js', import.meta.url).href
 const resolvedModules = Object.fromEntries(Object.entries(moduleNames).map(([kind, name]) => [kind, import.meta.resolve(name)]))
 const isModule = (value, kind) => [moduleNames[kind], resolvedModules[kind], new URL('../src/index.ts', resolvedModules[kind]).href, new URL('../lib/index.js', resolvedModules[kind]).href].includes(value)
 const idPattern = /^[A-Za-z0-9_-]{1,32}$/
-const groupField = 'extensionManagerGroup'
 const blockStart = '# dsh-skill-mcp:managed-start'
 const blockEnd = '# dsh-skill-mcp:managed-end'
@@ -154,7 +153,7 @@ export class ExtensionStore {
     } }, signal, expectedRevision)
   }
-  async addSkillPath(directory, group, signal, expectedRevision) {
+  async addSkillPath(directory, signal, expectedRevision) {
     const normalizedDirectory = normalizeWindowsPath(directory)
     if (!isAbsolute(normalizedDirectory) || !(await stat(normalizedDirectory)).isDirectory()) throw new Error('Skill root must be an existing absolute directory containing skill bundles.')
     return this.update(rows => {
@@ -164,24 +163,12 @@ export class ExtensionStore {
       const stem = basename(normalizedDirectory).replace(/[^A-Za-z0-9_-]+/g, '-').replace(/^-+|-+$/g, '').slice(0, 24) || 'skills'
       let id = stem
       for (let suffix = 2; rows.some(row => row.id === id); suffix++) id = `${stem.slice(0, 27)}-${suffix}`
-      const normalizedGroup = typeof group === 'string' ? group.trim().slice(0, 64) : ''
       rows.push({ id, name: moduleNames.skill, disabled: true, config: {
         providerName: `managed-${id}`, includeDefaultRoots: false, customSkillDirs: [normalizedDirectory],
-        ...(normalizedGroup ? { [groupField]: normalizedGroup } : {}),
       } })
     }, signal, expectedRevision)
   }
-  async setSkillGroup(id, group, signal, expectedRevision) {
-    return this.update(rows => {
-      const row = rows.find(row => row.id === id && !row.config.serverName)
-      if (!row) throw new Error('Unknown Skill path.')
-      const normalized = group.trim().slice(0, 64)
-      if (normalized) row.config[groupField] = normalized
-      else delete row.config[groupField]
-    }, signal, expectedRevision)
-  }
   async addMcp(id, input, signal, expectedRevision) {
     validateId(id)
     // Authentication values belong in the host credential setup, not tool arguments or logs.

package/src/web.js CHANGED Viewed

@@ -1,15 +1,15 @@
 /** Authenticated Connection channel for the independent extension settings page. */
 import Schema from '@deepseek-ai/schemastery'
 import { revisionOf } from './store.js'
-import { createSkill, inspectSkills, setSkillInvocation } from './skills.js'
+import { createSkill, inspectSkills, setSkillGroup, setSkillInvocation } from './skills.js'
 const text = Schema.string().required()
 const schemas = {
   list: Schema.object({}),
-  'add-skill': Schema.object({ directory: text, group: Schema.string().required(), revision: text }),
+  'add-skill': Schema.object({ directory: text, revision: text }),
   'add-mcp': Schema.object({ id: text, configuration: text, revision: text }),
   enable: Schema.object({ id: text, enabled: Schema.boolean().required(), revision: text }),
-  'set-skill-group': Schema.object({ id: text, group: Schema.string().required(), revision: text }),
+  'set-skill-group': Schema.object({ sourceId: text, relativePath: text, skillRevision: text, group: Schema.string().required(), revision: text }),
   'create-skill': Schema.object({
     sourceId: text, name: text, description: text, whenToUse: Schema.string().required(),
     modelInvocable: Schema.boolean().required(), userInvocable: Schema.boolean().required(),
@@ -50,21 +50,21 @@ export function createWebHandler(store, ctx) {
       if (!Object.hasOwn(schemas, endpoint)) throw new Error('Unknown operation.')
       const args = schemas[endpoint](payload)
       signal.throwIfAborted()
-      if (endpoint === 'add-skill') await store.addSkillPath(args.directory, args.group, signal, args.revision)
+      if (endpoint === 'add-skill') await store.addSkillPath(args.directory, signal, args.revision)
       if (endpoint === 'add-mcp') {
         const input = JSON.parse(args.configuration)
         if (!input || typeof input !== 'object' || Array.isArray(input)) throw new Error('Expected an MCP configuration object.')
         await store.addMcp(args.id, input, signal, args.revision)
       }
       if (endpoint === 'enable') await store.setEnabled(args.id, args.enabled, signal, args.revision)
-      if (endpoint === 'set-skill-group') await store.setSkillGroup(args.id, args.group, signal, args.revision)
-      if (endpoint === 'create-skill' || endpoint === 'set-skill-invocation') {
+      if (endpoint === 'create-skill' || endpoint === 'set-skill-invocation' || endpoint === 'set-skill-group') {
         const rows = await store.read()
         if (revisionOf(rows) !== args.revision) {
           throw Object.assign(new Error('Configuration changed. Refresh before saving.'), { code: 'CONFLICT' })
         }
         if (endpoint === 'create-skill') await createSkill(rows, args)
-        else await setSkillInvocation(rows, args)
+        else if (endpoint === 'set-skill-invocation') await setSkillInvocation(rows, args)
+        else await setSkillGroup(rows, args)
       }
       return { ok: true, value: await describeExtensions(store, ctx) }
     } catch (error) {