dsh-skill-picker 0.5.12 → 0.5.15

package/lib/client.js

@@ -25762,6 +25762,187 @@ function pinyin(word, options) {
   return middlewareType(list, options, word);
 }
 
+// src/client/session-view.js
+function sessionIdOf(props) {
+  return props?.sessionId ?? props?.session?.sessionId;
+}
+function selectWorkspaceCwd(sessionId) {
+  return (state) => {
+    const cwd = sessionId === void 0 ? void 0 : state?.byId?.[sessionId]?.cwd;
+    return typeof cwd === "string" ? cwd : "";
+  };
+}
+function useWorkspaceCwd(props) {
+  const useSessions = props?.useSessions;
+  const cwd = typeof useSessions === "function" ? useSessions(selectWorkspaceCwd(sessionIdOf(props))) : void 0;
+  return typeof cwd === "string" ? cwd : "";
+}
+
+// src/client/slash-source.js
+var WRAPPED = "__dshSkillPickerWrappedCandidates";
+var SKILL_SOURCE = { trigger: "/", name: "skill" };
+function isSkillSourceWrapped(source) {
+  return source !== null && typeof source === "object" && source[WRAPPED] === true;
+}
+var enhancementMode;
+function slashEnhancementMode() {
+  return enhancementMode;
+}
+function isSkillSource(source) {
+  return source !== null && typeof source === "object" && source.trigger === SKILL_SOURCE.trigger && source.name === SKILL_SOURCE.name;
+}
+function registryCandidates(service) {
+  const lists = [];
+  const push = (value) => {
+    if (Array.isArray(value) && value.length > 0) lists.push(value);
+  };
+  try {
+    push(service.live?.sources);
+  } catch {
+  }
+  try {
+    if (typeof service.sources === "function") push(service.sources(SKILL_SOURCE.trigger));
+  } catch {
+  }
+  try {
+    if (typeof service.all === "function") push(service.all());
+  } catch {
+  }
+  try {
+    push(service.sources);
+  } catch {
+  }
+  try {
+    if (typeof service.roster?.sources === "function") push(service.roster.sources(SKILL_SOURCE.trigger));
+  } catch {
+  }
+  try {
+    if (typeof service.roster?.all === "function") push(service.roster.all());
+  } catch {
+  }
+  return lists;
+}
+function findSkillSource(service) {
+  if (service === null || service === void 0) return void 0;
+  for (const list of registryCandidates(service)) {
+    const found = list.find(isSkillSource);
+    if (found !== void 0) return found;
+  }
+  return void 0;
+}
+function wrapSkillSource(source, hooks = {}) {
+  const { rank, order, onPick } = hooks;
+  if (source === null || typeof source !== "object") return void 0;
+  if (isSkillSourceWrapped(source)) return void 0;
+  if (Object.isFrozen(source)) return void 0;
+  const original = {
+    candidates: source.candidates,
+    order: source.order,
+    hadOrder: Object.hasOwn(source, "order"),
+    onPick: source.onPick,
+    hadOnPick: Object.hasOwn(source, "onPick")
+  };
+  const taken = [];
+  const wrappedCandidates = typeof rank === "function" && typeof original.candidates === "function" ? async function candidates(projection, args) {
+    const options = args ?? {};
+    const everything = await original.candidates.call(this, projection, { ...options, query: "" });
+    const query = String(options.query ?? "").trim();
+    if (query === "" || !Array.isArray(everything)) return everything;
+    try {
+      return rank(everything, query);
+    } catch {
+      return everything;
+    }
+  } : void 0;
+  const wrappedPick = typeof onPick === "function" && typeof original.onPick === "function" ? function onPickWrapped(args) {
+    try {
+      const name = args?.candidate?.name;
+      if (typeof name === "string") onPick(name);
+    } catch {
+    }
+    return original.onPick.call(this, args);
+  } : void 0;
+  try {
+    Object.defineProperty(source, WRAPPED, { value: true, enumerable: false, configurable: true });
+    if (wrappedCandidates !== void 0) {
+      source.candidates = wrappedCandidates;
+      taken.push("candidates");
+    }
+    if (typeof order === "number" && source.order !== order) {
+      source.order = order;
+      taken.push("order");
+    }
+    if (wrappedPick !== void 0) {
+      source.onPick = wrappedPick;
+      taken.push("onPick");
+    }
+  } catch {
+    try {
+      delete source[WRAPPED];
+    } catch {
+    }
+    return void 0;
+  }
+  if (taken.length === 0) {
+    try {
+      delete source[WRAPPED];
+    } catch {
+    }
+    return void 0;
+  }
+  enhancementMode = "runtime";
+  return () => {
+    try {
+      if (taken.includes("candidates")) source.candidates = original.candidates;
+      if (taken.includes("order")) {
+        if (original.hadOrder) source.order = original.order;
+        else delete source.order;
+      }
+      if (taken.includes("onPick")) {
+        if (original.hadOnPick) source.onPick = original.onPick;
+        else delete source.onPick;
+      }
+      delete source[WRAPPED];
+      enhancementMode = void 0;
+    } catch {
+    }
+  };
+}
+function installSlashFuzzy(inputTriggers, hooks = {}, options = {}) {
+  const maxAttempts = options.attempts ?? 40;
+  const intervalMs = options.intervalMs ?? 250;
+  let restore;
+  let timer;
+  let attempts = 0;
+  let stopped = false;
+  const attempt = () => {
+    if (stopped || restore !== void 0) return;
+    try {
+      const source = findSkillSource(inputTriggers);
+      if (source === void 0) {
+        if (attempts++ < maxAttempts) {
+          timer = setTimeout(attempt, intervalMs);
+        } else {
+          console.warn(`[dsh-skill-picker] / takeover: the official "skill" trigger source was not found after ${maxAttempts} attempts \u2014 the / menu keeps the official matcher. See https://github.com/a735624258/dsh-skill-picker/issues/14`);
+        }
+        return;
+      }
+      restore = wrapSkillSource(source, hooks) ?? (() => {
+      });
+    } catch {
+      restore = () => {
+      };
+    }
+  };
+  attempt();
+  return () => {
+    stopped = true;
+    if (timer !== void 0) clearTimeout(timer);
+    restore?.();
+    restore = void 0;
+  };
+}
+
 // src/client/index.jsx
 var import_jsx_runtime = require("react/jsx-runtime");
 var inject = ["slots", "connection", "sessions", "inputTriggers"];
@@ -25866,6 +26047,25 @@ function matchRank(skill, q) {
   if (py.includes(q)) return 3;
   return 4;
 }
+function rankPickerItems(items, query) {
+  const ordered = groupByPinned(
+    Array.isArray(items) ? items : [],
+    loadUsage(),
+    loadPinned()
+  ).flatMap((group) => group.items);
+  const q = String(query ?? "").trim().toLowerCase();
+  if (q === "") return ordered;
+  const order = new Map(ordered.map((skill, index) => [skill.name, index]));
+  const targets = ordered.map((s) => ({
+    s,
+    search: `${s.name} ${s.description ?? ""} ${skillPinyinText(s.name, s.description ?? "")}`
+  }));
+  return fuzzysort_default.go(q, targets, {
+    key: "search",
+    limit: 30,
+    threshold: -1e4
+  }).filter((r) => r.score > 0).map((r) => r.obj.s).filter((s) => matchRank(s, q) < 4).sort((a, b) => matchRank(a, q) - matchRank(b, q) || (order.get(a.name) ?? 0) - (order.get(b.name) ?? 0));
+}
 var buttonStyle = {
   display: "inline-flex",
   alignItems: "center",
@@ -26011,9 +26211,10 @@ function SkillPickerButton(props) {
   }
   const load = (0, import_react.useCallback)(async () => {
     if (skills !== void 0 || error !== void 0) return;
+    const sessionId = sessionIdOf(props);
     try {
-      if (typeof props.listSkills === "function" && props.session?.sessionId !== void 0) {
-        const listed = await props.listSkills(props.session.sessionId);
+      if (typeof props.listSkills === "function" && sessionId !== void 0) {
+        const listed = await props.listSkills(sessionId);
         setSkills(Array.isArray(listed) ? listed : []);
         setSource("official");
         return;
@@ -26031,7 +26232,7 @@ function SkillPickerButton(props) {
     } catch (cause) {
       setError(String(cause?.message ?? cause));
     }
-  }, [skills, error, props.listSkills, props.session, props.cwd]);
+  }, [skills, error, props.listSkills, props.sessionId, props.session, props.cwd]);
   const toggle = () => {
     if (!open) {
       setUsage(loadUsage());
@@ -26221,7 +26422,15 @@ function SkillPickerButton(props) {
             ] }, group.title);
           });
         })() }),
-        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" }) })
+        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" }) }),
+        slashEnhancementMode() === "runtime" && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
+          "div",
+          {
+            style: sourceBadgeStyle,
+            title: "`/` \u83DC\u5355\u7684\u6A21\u7CCA+\u62FC\u97F3\u641C\u7D22\u7531\u672C\u63D2\u4EF6\u5728\u8FD0\u884C\u65F6\u63A5\u7BA1\u5B98\u65B9\u6280\u80FD\u6E90\uFF08\u4E0D\u4F9D\u8D56\u6539\u5199\u4EFB\u4F55\u6587\u4EF6\uFF0Cissue #14\uFF09",
+            children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { style: sourceBadgeTextStyle, children: "/ \u589E\u5F3A\uFF1A\u8FD0\u884C\u65F6\u63A5\u7BA1" })
+          }
+        )
       ] })
     ] })
   ] });
@@ -26240,21 +26449,28 @@ function apply(ctx) {
     const raw = result.value?.skills ?? [];
     return raw.filter(isUserFacingSkill).map((skill) => ({ name: skill.name, description: skill.description ?? "" }));
   };
-  let currentCwd = "";
-  const syncCwd = () => {
+  let legacyCwd = "";
+  const syncLegacyCwd = () => {
     try {
       const snapshot2 = ctx.sessions.list.getSnapshot();
       const sessionId = snapshot2.current;
       const cwd = sessionId === void 0 ? void 0 : snapshot2.byId[sessionId]?.cwd;
-      currentCwd = typeof cwd === "string" ? cwd : "";
+      legacyCwd = typeof cwd === "string" ? cwd : "";
     } catch {
-      currentCwd = "";
+      legacyCwd = "";
     }
   };
-  syncCwd();
-  const unsubscribe = ctx.sessions.list.subscribe(syncCwd);
+  syncLegacyCwd();
+  const unsubscribeLegacyCwd = ctx.sessions.list.subscribe(syncLegacyCwd);
   ctx.effect(() => {
-    const PickerWithCwd = (props) => import_react.default.createElement(SkillPickerButton, { ...props, cwd: currentCwd, listSkills });
+    const PickerWithCwd = (props) => {
+      const cwd = useWorkspaceCwd(props);
+      return import_react.default.createElement(SkillPickerButton, {
+        ...props,
+        cwd: cwd === "" ? legacyCwd : cwd,
+        listSkills
+      });
+    };
     const dispose = ctx.slots.inject(
       "conversation.input.right",
       () => ctx.slots.register(
@@ -26264,43 +26480,43 @@ function apply(ctx) {
     );
     return () => {
       dispose();
-      unsubscribe();
+      unsubscribeLegacyCwd();
     };
   }, "dsh-skill-picker: composer input slot");
+  const trackPick = (name) => {
+    const usage = loadUsage();
+    const nextUsage = { ...usage, [name]: { count: (usage[name]?.count ?? 0) + 1, lastUsed: Date.now() } };
+    saveUsage(nextUsage);
+    try {
+      window.dispatchEvent(new CustomEvent("dsh-skill-picker:usage-updated"));
+    } catch {
+    }
+  };
   ctx.effect(() => {
     const fuzzyMatch = (skills, query = "") => {
       const visible = (Array.isArray(skills) ? skills : []).filter(isUserFacingSkill);
-      const ordered = groupByPinned(visible, loadUsage(), loadPinned()).flatMap((group) => group.items);
-      const q = String(query).trim().toLowerCase();
-      if (q === "") return ordered;
-      const rankByName = new Map(ordered.map((skill, index) => [skill.name, index]));
-      const targets = ordered.map((s) => ({
-        s,
-        search: `${s.name} ${s.description ?? ""} ${skillPinyinText(s.name, s.description ?? "")}`
-      }));
-      const results = fuzzysort_default.go(q, targets, {
-        key: "search",
-        limit: 30,
-        threshold: -1e4
-      });
-      return results.filter((r) => r.score > 0).map((r) => r.obj.s).filter((s) => matchRank(s, q) < 4).sort((a, b) => matchRank(a, q) - matchRank(b, q) || (rankByName.get(a.name) ?? 0) - (rankByName.get(b.name) ?? 0));
+      return rankPickerItems(visible, query);
     };
     window.__dshSkillPickerFuzzy = fuzzyMatch;
-    const trackPick = (name) => {
-      const usage = loadUsage();
-      const nextUsage = { ...usage, [name]: { count: (usage[name]?.count ?? 0) + 1, lastUsed: Date.now() } };
-      saveUsage(nextUsage);
-      try {
-        window.dispatchEvent(new CustomEvent("dsh-skill-picker:usage-updated"));
-      } catch {
-      }
-    };
     window.__dshSkillPickerTrack = trackPick;
     return () => {
       if (window.__dshSkillPickerFuzzy === fuzzyMatch) delete window.__dshSkillPickerFuzzy;
       if (window.__dshSkillPickerTrack === trackPick) delete window.__dshSkillPickerTrack;
     };
   }, "dsh-skill-picker: fuzzy matcher for official / source");
+  ctx.effect(() => {
+    const inputTriggers = ctx.inputTriggers ?? ctx.get?.("inputTriggers");
+    if (inputTriggers === void 0) return () => {
+    };
+    return installSlashFuzzy(inputTriggers, {
+      // Rank the official display items ({name, description}) by the same rule
+      // the bolt panel uses, so the two lists agree on order as well as match.
+      rank: (items, query) => rankPickerItems(items, query),
+      // `order: 2` (official) → `-1`: the skill group sorts above commands.
+      order: -1,
+      onPick: trackPick
+    });
+  }, "dsh-skill-picker: runtime takeover of the official / skill source");
 }
 return module.exports; } });
 //# sourceMappingURL=client.js.map