dsh-skill-picker 0.3.2 → 0.3.4

package/README.md

@@ -102,6 +102,8 @@ DSH 的 [dsh-tool-skill](https://github.com/deepseek-ai/deepseek-harness) 在 `a
 
 ## 更新日志
 
+- **v0.3.4**：适配 DSH 0.1.2-alpha.5 —— 技能列表改用官方 `remote.skills` RPC（alpha.5 将 rc.x 的 `connection.api.skills` 改名），`/` 补全与 ⚡ 面板统一「官方 RPC → host 扫描兜底」；`dsh.client.inject` 声明 `dsh-client-ui-input-trigger`（alpha.5 装载器只给声明了提供者的插件暴露 `inputTriggers` 服务）。修复 alpha.5 下 `/` 模糊/拼音搜索失效（实测 `/jiyi` → backup-memory）
+- **v0.3.3**：兜底扫描对齐官方全部技能根——补扫 user-agents 层（`~/.agents/skills`，含 `DSH_AGENTS_HOME`），扫描顺序与官方 rank 一致（项目级优先于用户级）；走兜底时 ⚡ 面板显示「本地扫描」来源徽标便于排障（对应 issue #5）
 - **v0.3.2**：安装文档修正——实测三种安装方式并补网络特例（HTTPS 受限改 SSH、npm 新版本 24h 内被 minimumReleaseAge 门禁挡旧版的规避方法）
 - **v0.3.1**：README 顶部新增一键快速安装命令（`dsh plugin --profile web add dsh-skill-picker`）与 npm 版本/许可徽章
 - **v0.3.0**：拼音搜索——`/` 补全与 ⚡ 面板的搜索目标加入技能名/描述的拼音全拼（带空格+连打）与首字母索引，中文技能可拼音直搜（如 `ji yi` →「备份记忆」）
@@ -112,8 +114,9 @@ DSH 的 [dsh-tool-skill](https://github.com/deepseek-ai/deepseek-harness) 在 `a
 
 ## 兼容性与注意事项
 
-- **技能来源**：**优先走官方宿主 skills API**（`connection.api.skills.list`——与 DSH 内置 `/` 补全**完全同一个数据源**，会话作用域，自动覆盖用户级 `~/.dsh/skills`、项目级 `<workspace>/.dsh/skills`、`<workspace>/.agents/skills` 等全部官方目录）；官方 API 不可用时**自动回退**到内置扫描（用户级 + 项目级目录）。两条路都支持 `DSH_HOME` 环境变量。
-- **暂不扫描**：`~/.agents/skills` 与自定义技能目录（`customSkillDirs` 配置）——需要的话欢迎 PR。
+- **技能来源**：**优先走官方宿主 skills API**（`connection.api.skills.list`——与 DSH 内置 `/` 补全**完全同一个数据源**，会话作用域，自动覆盖全部官方目录）；官方 API 不可用时**自动回退**到内置扫描。两条路都支持 `DSH_HOME` 环境变量。
+- **兜底扫描范围**：与官方 `dsh-skill-filesystem` provider 的默认根完全同源——项目级 `<workspace>/.dsh/skills`、`<workspace>/.agents/skills`，用户级 `~/.dsh/skills`、`~/.agents/skills`（`$DSH_AGENTS_HOME` 可覆盖），同名时按官方 rank 项目级优先。走兜底时 ⚡ 面板底部显示「本地扫描」徽标。
+- **暂不支持**：自定义技能目录（官方 `customSkillDirs` 配置）——需要的话欢迎 PR。
 - **失败保护**：client 端用 `ctx.slots.inject`（等 `conversation.input.right` 插槽声明存在才注册，插槽缺失时静默跳过，不会拖垮启动）；host 端路由 try/catch，扫描目录不存在时返回空列表而非报错。
 - **依赖版本**：按 DSH `0.1.0-rc.6` API 编写（cordis 4 / web profile 标准装配）。如遇 DSH 大版本更新导致 API 变化，插件会以启动日志的插件错误提示为准，卸载 `dsh plugin --profile web remove dsh-skill-picker` 即可回退。
 

package/lib/client.js

@@ -25900,6 +25900,23 @@ var statusStyle = {
   color: "var(--dsw-alias-label-tertiary, #8a94a6)",
   fontSize: "13px"
 };
+var sourceBadgeStyle = {
+  display: "inline-flex",
+  alignItems: "center",
+  alignSelf: "flex-start",
+  margin: "0 8px 8px",
+  padding: "2px 8px",
+  border: "1px solid rgba(255, 193, 7, 0.35)",
+  borderRadius: "999px",
+  background: "rgba(255, 193, 7, 0.1)",
+  color: "#d9a520",
+  fontSize: "11px",
+  lineHeight: "16px",
+  flex: "none"
+};
+var sourceBadgeTextStyle = {
+  fontFamily: "var(--ds-font-family-code, ui-monospace, monospace)"
+};
 function BoltIcon() {
   return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("svg", { viewBox: "0 0 24 24", width: "16", height: "16", "aria-hidden": "true", style: { display: "block" }, children: [
     /* @__PURE__ */ (0, import_jsx_runtime.jsx)("defs", { children: /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("linearGradient", { id: "dsh-sp-bolt-grad", x1: "0", y1: "0", x2: "0", y2: "1", children: [
@@ -25922,6 +25939,7 @@ function SkillPickerButton(props) {
   const [open, setOpen] = (0, import_react.useState)(false);
   const [skills, setSkills] = (0, import_react.useState)(void 0);
   const [error, setError] = (0, import_react.useState)(void 0);
+  const [source, setSource] = (0, import_react.useState)(void 0);
   const [query, setQuery] = (0, import_react.useState)("");
   const [usage, setUsage] = (0, import_react.useState)(() => loadUsage());
   const [active, setActive] = (0, import_react.useState)(0);
@@ -25933,6 +25951,7 @@ function SkillPickerButton(props) {
       if (typeof props.listSkills === "function" && props.session?.sessionId !== void 0) {
         const listed = await props.listSkills(props.session.sessionId);
         setSkills(Array.isArray(listed) ? listed : []);
+        setSource("official");
         return;
       }
     } catch (cause) {
@@ -25944,6 +25963,7 @@ function SkillPickerButton(props) {
       const json = await res.json();
       if (!json.ok) throw new Error(json.error || "bad response");
       setSkills(Array.isArray(json.skills) ? json.skills : []);
+      setSource("host");
     } catch (cause) {
       setError(String(cause?.message ?? cause));
     }
@@ -26047,40 +26067,46 @@ function SkillPickerButton(props) {
           autoFocus: true
         }
       ),
-      error !== void 0 ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { style: statusStyle, children: `\u52A0\u8F7D\u5931\u8D25\uFF1A${error}` }) : skills === void 0 ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { style: statusStyle, children: "\u52A0\u8F7D\u4E2D\u2026" }) : /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { style: listStyle, children: filtered.length === 0 ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { style: statusStyle, children: "\u6CA1\u6709\u5339\u914D\u7684\u6280\u80FD" }) : filtered.map((skill, index) => /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(
-        "button",
-        {
-          type: "button",
-          ref: (el) => {
-            itemRefs.current[index] = el;
-          },
-          onClick: () => pick(skill.name),
-          onMouseEnter: (event) => {
-            setActive(index);
-            event.currentTarget.style.background = "var(--dsw-alias-interactive-bg-hover, rgba(128,128,128,0.12))";
-          },
-          onMouseLeave: (event) => {
-            event.currentTarget.style.background = "transparent";
+      error !== void 0 ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { style: statusStyle, children: `\u52A0\u8F7D\u5931\u8D25\uFF1A${error}` }) : skills === void 0 ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { style: statusStyle, children: "\u52A0\u8F7D\u4E2D\u2026" }) : /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_jsx_runtime.Fragment, { children: [
+        /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { style: listStyle, children: filtered.length === 0 ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { style: statusStyle, children: "\u6CA1\u6709\u5339\u914D\u7684\u6280\u80FD" }) : filtered.map((skill, index) => /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(
+          "button",
+          {
+            type: "button",
+            ref: (el) => {
+              itemRefs.current[index] = el;
+            },
+            onClick: () => pick(skill.name),
+            onMouseEnter: (event) => {
+              setActive(index);
+              event.currentTarget.style.background = "var(--dsw-alias-interactive-bg-hover, rgba(128,128,128,0.12))";
+            },
+            onMouseLeave: (event) => {
+              event.currentTarget.style.background = "transparent";
+            },
+            style: {
+              ...itemStyle,
+              ...index === active ? { background: "var(--dsw-alias-interactive-bg-hover, rgba(128,128,128,0.12))" } : {}
+            },
+            children: [
+              /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { style: nameStyle, children: `/${skill.name}` }),
+              /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { style: descStyle, children: skill.description ?? "" })
+            ]
           },
-          style: {
-            ...itemStyle,
-            ...index === active ? { background: "var(--dsw-alias-interactive-bg-hover, rgba(128,128,128,0.12))" } : {}
-          },
-          children: [
-            /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { style: nameStyle, children: `/${skill.name}` }),
-            /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { style: descStyle, children: skill.description ?? "" })
-          ]
-        },
-        skill.name
-      )) })
+          skill.name
+        )) }),
+        source === "host" && /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { style: sourceBadgeStyle, title: "\u5B98\u65B9\u6280\u80FD API \u4E0D\u53EF\u7528\uFF0C\u5217\u8868\u6765\u81EA\u672C\u5730\u76EE\u5F55\u626B\u63CF\uFF08\u4E0E\u5B98\u65B9 / \u8865\u5168\u540C\u6E90\uFF09", children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { style: sourceBadgeTextStyle, children: "\u672C\u5730\u626B\u63CF" }) })
+      ] })
     ] })
   ] });
 }
 function apply(ctx) {
+  const inputTriggers = typeof ctx.get === "function" ? ctx.get("inputTriggers") : ctx.inputTriggers;
   const listSkills = async (sessionId) => {
-    const skills = ctx.connection?.api?.skills;
+    const remoteSkills = ctx.remote?.skills;
+    const connectionSkills = ctx.connection?.api?.skills;
+    const skills = remoteSkills ?? connectionSkills;
     if (skills === void 0 || typeof skills.list !== "function") {
-      throw new Error("connection.api.skills unavailable");
+      throw new Error("skills RPC unavailable (remote.skills / connection.api.skills)");
     }
     const controller = new AbortController();
     const { result } = await skills.list({ sessionId }, controller.signal);
@@ -26099,6 +26125,24 @@ function apply(ctx) {
       currentCwd = "";
     }
   };
+  const fetchHostSkills = async () => {
+    const cwd = typeof currentCwd === "string" && currentCwd !== "" ? `?cwd=${encodeURIComponent(currentCwd)}` : "";
+    const res = await fetch(`/dsh-skill-picker/skills${cwd}`, { headers: { accept: "application/json" } });
+    const json = await res.json();
+    if (!json.ok) throw new Error(json.error || "bad response");
+    return Array.isArray(json.skills) ? json.skills : [];
+  };
+  const resolveSkills = async (sessionId) => {
+    try {
+      return await listSkills(sessionId);
+    } catch {
+      try {
+        return await fetchHostSkills();
+      } catch {
+        return [];
+      }
+    }
+  };
   syncCwd();
   const unsubscribe = ctx.sessions.list.subscribe(syncCwd);
   ctx.effect(() => {
@@ -26129,7 +26173,7 @@ function apply(ctx) {
     };
     const refreshNames = async (sessionId) => {
       try {
-        const skills = await listSkills(sessionId);
+        const skills = await resolveSkills(sessionId);
         namesCache.set(sessionId, (Array.isArray(skills) ? skills : []).map((s) => s.name));
         notifyLexicon(sessionId);
       } catch {
@@ -26140,7 +26184,7 @@ function apply(ctx) {
       name: "skill-fuzzy",
       order: -10,
       async candidates(session, { query, signal }) {
-        const skills = await listSkills(session.sessionId);
+        const skills = await resolveSkills(session.sessionId);
         if (signal.aborted) return [];
         namesCache.set(session.sessionId, skills.map((s) => s.name));
         notifyLexicon(session.sessionId);
@@ -26190,7 +26234,11 @@ function apply(ctx) {
         return { text: `/${candidate.name} ` };
       }
     };
-    const unregister = ctx.inputTriggers.registerSource(source);
+    if (inputTriggers === void 0 || typeof inputTriggers.registerSource !== "function") {
+      console.warn("[dsh-skill-picker] inputTriggers service unavailable; fuzzy / completion disabled (\u26A1 panel still works)");
+      return;
+    }
+    const unregister = inputTriggers.registerSource(source);
     return () => {
       unregister();
       namesCache.clear();