dsh-skill-picker 0.5.13 → 0.5.18

package/lib/client.js

@@ -25778,6 +25778,236 @@ function useWorkspaceCwd(props) {
   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;
+var takenOverSource;
+var pendingSessionId;
+var itemCache = /* @__PURE__ */ new Map();
+function noteDiag(patch) {
+  try {
+    const key = "dsh-skill-picker:diag";
+    const previous = JSON.parse(localStorage.getItem(key) ?? "{}");
+    localStorage.setItem(key, JSON.stringify({ ...previous, ...patch, at: (/* @__PURE__ */ new Date()).toISOString() }));
+  } catch {
+  }
+}
+function refreshCache(cacheKey, originalCandidates, self, projection, options) {
+  try {
+    const signal = typeof AbortController === "function" ? new AbortController().signal : void 0;
+    Promise.resolve().then(() => originalCandidates.call(self, projection, { ...options, query: "", signal })).then((items) => {
+      if (Array.isArray(items)) itemCache.set(cacheKey, items.slice());
+    }).catch(() => {
+    });
+  } catch {
+  }
+}
+function slashEnhancementMode() {
+  return enhancementMode;
+}
+function warmSlashSkill(sessionId) {
+  if (typeof sessionId !== "string" || sessionId === "") return;
+  if (primeNow(sessionId)) pendingSessionId = void 0;
+  else pendingSessionId = sessionId;
+}
+function primeNow(sessionId) {
+  const source = takenOverSource;
+  if (source === null || source === void 0) return false;
+  if (itemCache.has(sessionId)) return true;
+  try {
+    const signal = typeof AbortController === "function" ? new AbortController().signal : void 0;
+    Promise.resolve(source.candidates({ sessionId }, { query: "", signal })).catch(() => {
+    });
+  } catch {
+  }
+  return true;
+}
+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 query = String(options.query ?? "").trim();
+    const sessionId = projection?.sessionId;
+    const cacheKey = typeof sessionId === "string" ? sessionId : void 0;
+    const cached = cacheKey === void 0 ? void 0 : itemCache.get(cacheKey);
+    if (cached !== void 0) {
+      noteDiag({ mode: "runtime", servedFromCache: true, sessionId: cacheKey, query });
+      refreshCache(cacheKey, original.candidates, this, projection, options);
+      if (query === "") return cached;
+      try {
+        return rank(cached, query);
+      } catch {
+        return cached;
+      }
+    }
+    const everything = await original.candidates.call(this, projection, { ...options, query: "" });
+    if (cacheKey !== void 0 && Array.isArray(everything)) {
+      itemCache.set(cacheKey, everything.slice());
+      noteDiag({ mode: "runtime", servedFromCache: false, sessionId: cacheKey, primed: true, count: everything.length });
+    }
+    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";
+  takenOverSource = source;
+  noteDiag({ mode: "runtime", installed: true, took: taken.join("+") });
+  if (pendingSessionId !== void 0) {
+    const sessionId = pendingSessionId;
+    pendingSessionId = void 0;
+    primeNow(sessionId);
+  }
+  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;
+      if (takenOverSource === source) takenOverSource = void 0;
+      pendingSessionId = 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 {
+          noteDiag({ mode: "none", gaveUp: true, attempts: maxAttempts });
+          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"];
@@ -25882,6 +26112,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",
@@ -26015,6 +26264,10 @@ function SkillPickerButton(props) {
     window.addEventListener("dsh-skill-picker:usage-updated", onUsageUpdated);
     return () => window.removeEventListener("dsh-skill-picker:usage-updated", onUsageUpdated);
   }, []);
+  const activeSessionId = sessionIdOf(props);
+  (0, import_react.useEffect)(() => {
+    if (activeSessionId !== void 0) warmSlashSkill(activeSessionId);
+  }, [activeSessionId]);
   const draftRef = (0, import_react.useRef)("");
   if (typeof props.useInput === "function") {
     try {
@@ -26238,7 +26491,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" })
+          }
+        )
       ] })
     ] })
   ] });
@@ -26291,40 +26552,40 @@ function apply(ctx) {
       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