dsh-skill-picker 0.3.3 → 0.3.4

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "dsh-skill-picker",
   "description": "DSH Web GUI skill picker: a button beside the composer opens a searchable list of installed skills; picking one inserts the official `/skill-name` gesture into the input box, so the skill loads with your message (WorkBuddy-style skill invocation for DeepSeek Harness).",
-  "version": "0.3.3",
+  "version": "0.3.4",
   "type": "module",
   "main": "lib/index.js",
   "exports": {
@@ -23,7 +23,8 @@
     "client": {
       "inject": [
         "@deepseek-ai/dsh-client-runtime",
-        "@deepseek-ai/dsh-client-locale"
+        "@deepseek-ai/dsh-client-locale",
+        "@deepseek-ai/dsh-client-ui-input-trigger"
       ],
       "platform": "web"
     },

package/src/client/index.jsx

@@ -445,12 +445,21 @@ function SkillPickerButton(props) {
 
 /** Apply the browser half: register the picker into the composer tool row. */
 export function apply(ctx) {
-  // Primary skill source: the official host skills API (the exact RPC ui-skill
-  // feeds DSH's own `/` completion with — session-scoped, all skill layers).
+  // Resolve the trigger pipeline service at apply scope (not inside an effect),
+  // exactly like the official ui-skill plugin does — in DSH 0.1.2-alpha.x the
+  // service lives in @deepseek-ai/dsh-client-ui-input-trigger and is only
+  // reachable from the plugin root context.
+  const inputTriggers = (typeof ctx.get === 'function' ? ctx.get('inputTriggers') : ctx.inputTriggers)
+
+  // Primary skill source: the official host skills API. In DSH 0.1.2-alpha.x
+  // the RPC moved from `connection.api.skills` (rc.x) to `remote.skills`
+  // (used by the official ui-skill plugin); try both before falling back.
   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 === undefined || 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)
@@ -471,6 +480,29 @@ export function apply(ctx) {
       currentCwd = ''
     }
   }
+
+  // Host-route fallback: same scan the ⚡ panel uses (official provider roots).
+  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 : []
+  }
+
+  // Resolve skills by official RPC first, then the host scan route; never
+  // throws (returns [] when both fail) so `/` completion degrades gracefully.
+  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(() => {
@@ -507,7 +539,7 @@ export 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 {
@@ -520,7 +552,7 @@ export 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)
@@ -581,7 +613,13 @@ export function apply(ctx) {
         return { text: `/${candidate.name} ` }
       },
     }
-    const unregister = ctx.inputTriggers.registerSource(source)
+    // inputTriggers is resolved at apply scope (see top of apply); fail loudly
+    // instead of silently dropping the fuzzy `/` source.
+    if (inputTriggers === undefined || typeof inputTriggers.registerSource !== 'function') {
+      console.warn('[dsh-skill-picker] inputTriggers service unavailable; fuzzy / completion disabled (⚡ panel still works)')
+      return
+    }
+    const unregister = inputTriggers.registerSource(source)
     return () => {
       unregister()
       namesCache.clear()