dsh-skill-picker 0.3.2 → 0.3.4

package/lib/index.js

@@ -9,6 +9,10 @@ function userSkillsDir() {
   const home = process.env.DSH_HOME ?? path.join(os.homedir(), ".dsh");
   return path.join(home, "skills");
 }
+function userAgentsSkillsDir() {
+  const agentsHome = process.env.DSH_AGENTS_HOME ?? path.join(os.homedir(), ".agents");
+  return path.join(agentsHome, "skills");
+}
 function parseFrontmatter(content) {
   const match = content.match(/^---\r?\n([\s\S]*?)\r?\n---/);
   if (!match) return {};
@@ -47,10 +51,11 @@ async function scanSkillsDirInto(map, dir) {
 }
 async function scanSkills(cwd) {
   const map = /* @__PURE__ */ new Map();
+  await scanSkillsDirInto(map, userAgentsSkillsDir());
   await scanSkillsDirInto(map, userSkillsDir());
   if (typeof cwd === "string" && cwd !== "") {
-    await scanSkillsDirInto(map, path.join(cwd, ".dsh", "skills"));
     await scanSkillsDirInto(map, path.join(cwd, ".agents", "skills"));
+    await scanSkillsDirInto(map, path.join(cwd, ".dsh", "skills"));
   }
   return [...map.values()].sort((a, b) => a.name.localeCompare(b.name));
 }

package/lib/index.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../src/index.js"],
-  "sourcesContent": ["/**\n * dsh-skill-picker \u2014 host half: exposes the installed-skill catalog to the\n * browser half through a small JSON route (`/dsh-skill-picker/skills`) and\n * announces the picker to every agent through the system-prompt section\n * mechanism.\n *\n * The catalog is scanned directly from the DSH user skills directory\n * (`$DSH_HOME/skills`, default `~/.dsh/skills`) by reading each skill's\n * `SKILL.md` frontmatter. Why not `ctx.skills`? The filesystem skill provider\n * is mounted in agent scope (the standard preset's standing mount), so a\n * host-context `ctx.skills.snapshot({})` sees only the global layer \u2014 which\n * is empty for user skills. Scanning the same roots the provider uses keeps\n * the picker's list in sync with what agents actually load.\n *\n * The browser half (exports \"./client\") is served by client-modules from the\n * same package's dsh.client declaration.\n *\n * @module dsh-skill-picker\n */\n\nimport { readFile, readdir } from 'node:fs/promises'\nimport os from 'node:os'\nimport path from 'node:path'\n\n/** Required services: the route registry and the prompt band. */\nexport const inject = ['webServer', 'systemPrompt']\n\n/** Order of the announcement section within the tool-guidance band. */\nconst SECTION_ORDER = 215\n\n/** Model-facing announcement: picker presence and the user-visible gesture. */\nexport const SKILL_PICKER_GUIDANCE =\n  '\u672C\u673A\u5DF2\u5B89\u88C5 dsh-skill-picker \u63D2\u4EF6\uFF08Web GUI \u7684\u6280\u80FD\u9009\u62E9\u5668\uFF09\uFF1A\u8F93\u5165\u6846\u65C1\u6709\u6280\u80FD\u6309\u94AE\uFF0C\u7528\u6237\u70B9\u9009\u6280\u80FD\u540E\u4F1A\u628A `/\u6280\u80FD\u540D`\uFF08\u5982 /duo-xuan-pi-gai\uFF09\u63D2\u5165\u53D1\u9001\u6846\u5E76\u968F\u6D88\u606F\u53D1\u51FA\u3002DSH \u5B98\u65B9\u673A\u5236\u4F1A\u628A\u7528\u6237\u6D88\u606F\u91CC\u7684 `/\u6280\u80FD\u540D` \u624B\u52BF\u5F53\u4F5C\u6280\u80FD\u76F4\u63A5\u8C03\u7528\u5E76\u81EA\u52A8\u52A0\u8F7D\u6280\u80FD\u5185\u5BB9\u2014\u2014\u4F60\u7167\u5E38\u6309\u52A0\u8F7D\u540E\u7684\u6280\u80FD\u6307\u4EE4\u6267\u884C\u5373\u53EF\uFF0C\u65E0\u9700\u989D\u5916\u64CD\u4F5C\u3002\u7528\u6237\u8BF4\u300C\u6280\u80FD\u9009\u62E9\u5668 / \u9009\u4E2A\u6280\u80FD / \u6280\u80FD\u5217\u8868\u300D\u65F6\u5373\u6307\u672C\u63D2\u4EF6\u3002'\n\n/** Resolve the user skills directory, mirroring the official provider's default. */\nfunction userSkillsDir() {\n  const home = process.env.DSH_HOME ?? path.join(os.homedir(), '.dsh')\n  return path.join(home, 'skills')\n}\n\n/** Parse a SKILL.md frontmatter block into a key/value map (flat YAML subset). */\nfunction parseFrontmatter(content) {\n  const match = content.match(/^---\\r?\\n([\\s\\S]*?)\\r?\\n---/)\n  if (!match) return {}\n  const out = {}\n  for (const line of match[1].split(/\\r?\\n/)) {\n    const kv = line.match(/^([A-Za-z0-9_-]+):\\s*(.*)$/)\n    if (!kv) continue\n    const value = kv[2].trim().replace(/^[\"']|[\"']$/g, '')\n    if (value !== '') out[kv[1]] = value\n  }\n  return out\n}\n\n/** Scan one skill directory into the map; never throws (missing dir is a no-op). */\nasync function scanSkillsDirInto(map, dir) {\n  let entries\n  try {\n    entries = await readdir(dir, { withFileTypes: true })\n  } catch {\n    return\n  }\n  for (const entry of entries) {\n    if (!entry.isDirectory()) continue\n    const skillDir = path.join(dir, entry.name)\n    let content\n    try {\n      content = await readFile(path.join(skillDir, 'SKILL.md'), 'utf8')\n    } catch {\n      continue\n    }\n    const meta = parseFrontmatter(content)\n    // Later writes win, so project-level skills override same-named user skills.\n    map.set(meta.name ?? entry.name, {\n      name: meta.name ?? entry.name,\n      description: meta.description ?? '',\n      path: skillDir,\n    })\n  }\n}\n\n/**\n * Scan user-level plus (when a workspace cwd is known) project-level skill\n * directories, mirroring the official provider's roots. Never throws (a\n * missing user dir yields []).\n * @param cwd - the active session's workspace root (undefined = user level only).\n */\nasync function scanSkills(cwd) {\n  const map = new Map()\n  await scanSkillsDirInto(map, userSkillsDir())\n  if (typeof cwd === 'string' && cwd !== '') {\n    await scanSkillsDirInto(map, path.join(cwd, '.dsh', 'skills'))\n    await scanSkillsDirInto(map, path.join(cwd, '.agents', 'skills'))\n  }\n  return [...map.values()].sort((a, b) => a.name.localeCompare(b.name))\n}\n\n/**\n * Mount the skills route and the prompt section.\n * @param ctx - context carrying webServer and systemPrompt.\n */\nexport function apply(ctx) {\n  ctx.effect(() => {\n    const handler = async (req, res) => {\n      try {\n        // cwd query carries the active session's workspace root from the client.\n        const cwd = req.url !== undefined ? new URL(req.url, 'http://dsh').searchParams.get('cwd') ?? undefined : undefined\n        const skills = await scanSkills(cwd)\n        res.writeHead(200, { 'content-type': 'application/json; charset=utf-8' })\n        res.end(JSON.stringify({ ok: true, complete: true, skills }))\n      } catch (error) {\n        res.writeHead(500, { 'content-type': 'application/json; charset=utf-8' })\n        res.end(JSON.stringify({ ok: false, error: String(error?.message ?? error) }))\n      }\n    }\n    return ctx.webServer.register({ kind: 'prefix', path: '/dsh-skill-picker', handler })\n  }, 'dsh-skill-picker: routes')\n\n  ctx.effect(() => ctx.systemPrompt.section({\n    name: 'plugin:skill-picker',\n    order: SECTION_ORDER,\n    text: SKILL_PICKER_GUIDANCE,\n  }), 'dsh-skill-picker: prompt section')\n}\n"],
-  "mappings": "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",
+  "sourcesContent": ["/**\n * dsh-skill-picker \u2014 host half: exposes the installed-skill catalog to the\n * browser half through a small JSON route (`/dsh-skill-picker/skills`) and\n * announces the picker to every agent through the system-prompt section\n * mechanism.\n *\n * The catalog is scanned directly from the DSH user skills directory\n * (`$DSH_HOME/skills`, default `~/.dsh/skills`) by reading each skill's\n * `SKILL.md` frontmatter. Why not `ctx.skills`? The filesystem skill provider\n * is mounted in agent scope (the standard preset's standing mount), so a\n * host-context `ctx.skills.snapshot({})` sees only the global layer \u2014 which\n * is empty for user skills. Scanning the same roots the provider uses keeps\n * the picker's list in sync with what agents actually load.\n *\n * The browser half (exports \"./client\") is served by client-modules from the\n * same package's dsh.client declaration.\n *\n * @module dsh-skill-picker\n */\n\nimport { readFile, readdir } from 'node:fs/promises'\nimport os from 'node:os'\nimport path from 'node:path'\n\n/** Required services: the route registry and the prompt band. */\nexport const inject = ['webServer', 'systemPrompt']\n\n/** Order of the announcement section within the tool-guidance band. */\nconst SECTION_ORDER = 215\n\n/** Model-facing announcement: picker presence and the user-visible gesture. */\nexport const SKILL_PICKER_GUIDANCE =\n  '\u672C\u673A\u5DF2\u5B89\u88C5 dsh-skill-picker \u63D2\u4EF6\uFF08Web GUI \u7684\u6280\u80FD\u9009\u62E9\u5668\uFF09\uFF1A\u8F93\u5165\u6846\u65C1\u6709\u6280\u80FD\u6309\u94AE\uFF0C\u7528\u6237\u70B9\u9009\u6280\u80FD\u540E\u4F1A\u628A `/\u6280\u80FD\u540D`\uFF08\u5982 /duo-xuan-pi-gai\uFF09\u63D2\u5165\u53D1\u9001\u6846\u5E76\u968F\u6D88\u606F\u53D1\u51FA\u3002DSH \u5B98\u65B9\u673A\u5236\u4F1A\u628A\u7528\u6237\u6D88\u606F\u91CC\u7684 `/\u6280\u80FD\u540D` \u624B\u52BF\u5F53\u4F5C\u6280\u80FD\u76F4\u63A5\u8C03\u7528\u5E76\u81EA\u52A8\u52A0\u8F7D\u6280\u80FD\u5185\u5BB9\u2014\u2014\u4F60\u7167\u5E38\u6309\u52A0\u8F7D\u540E\u7684\u6280\u80FD\u6307\u4EE4\u6267\u884C\u5373\u53EF\uFF0C\u65E0\u9700\u989D\u5916\u64CD\u4F5C\u3002\u7528\u6237\u8BF4\u300C\u6280\u80FD\u9009\u62E9\u5668 / \u9009\u4E2A\u6280\u80FD / \u6280\u80FD\u5217\u8868\u300D\u65F6\u5373\u6307\u672C\u63D2\u4EF6\u3002'\n\n/** Resolve the user skills directory, mirroring the official provider's default. */\nfunction userSkillsDir() {\n  const home = process.env.DSH_HOME ?? path.join(os.homedir(), '.dsh')\n  return path.join(home, 'skills')\n}\n\n/**\n * Resolve the user agents-home skills directory, mirroring the official\n * provider's default (`$DSH_AGENTS_HOME` > `~/.agents`). This is the\n * cross-tool `.agents` convention; the official `dsh-skill-filesystem` scans\n * it as its `user-agents` root (rank 500), so the fallback must too \u2014 else\n * the picker's list silently misses skills that DSH's own `/` completion\n * shows (issue #5).\n */\nfunction userAgentsSkillsDir() {\n  const agentsHome = process.env.DSH_AGENTS_HOME ?? path.join(os.homedir(), '.agents')\n  return path.join(agentsHome, 'skills')\n}\n\n/** Parse a SKILL.md frontmatter block into a key/value map (flat YAML subset). */\nfunction parseFrontmatter(content) {\n  const match = content.match(/^---\\r?\\n([\\s\\S]*?)\\r?\\n---/)\n  if (!match) return {}\n  const out = {}\n  for (const line of match[1].split(/\\r?\\n/)) {\n    const kv = line.match(/^([A-Za-z0-9_-]+):\\s*(.*)$/)\n    if (!kv) continue\n    const value = kv[2].trim().replace(/^[\"']|[\"']$/g, '')\n    if (value !== '') out[kv[1]] = value\n  }\n  return out\n}\n\n/** Scan one skill directory into the map; never throws (missing dir is a no-op). */\nasync function scanSkillsDirInto(map, dir) {\n  let entries\n  try {\n    entries = await readdir(dir, { withFileTypes: true })\n  } catch {\n    return\n  }\n  for (const entry of entries) {\n    if (!entry.isDirectory()) continue\n    const skillDir = path.join(dir, entry.name)\n    let content\n    try {\n      content = await readFile(path.join(skillDir, 'SKILL.md'), 'utf8')\n    } catch {\n      continue\n    }\n    const meta = parseFrontmatter(content)\n    // Later writes win, so project-level skills override same-named user skills.\n    map.set(meta.name ?? entry.name, {\n      name: meta.name ?? entry.name,\n      description: meta.description ?? '',\n      path: skillDir,\n    })\n  }\n}\n\n/**\n * Scan the same roots the official `dsh-skill-filesystem` provider uses, so\n * the fallback route stays in sync with what agents actually load:\n * project `.dsh/skills` (rank 100) > project `.agents/skills` (200) >\n * user `~/.dsh/skills` (400) > user `~/.agents/skills` (500). Scanned\n * low-priority first, so later writes (higher priority) win in the map.\n * Never throws (a missing dir yields []).\n * @param cwd - the active session's workspace root (undefined = user level only).\n */\nasync function scanSkills(cwd) {\n  const map = new Map()\n  await scanSkillsDirInto(map, userAgentsSkillsDir())\n  await scanSkillsDirInto(map, userSkillsDir())\n  if (typeof cwd === 'string' && cwd !== '') {\n    await scanSkillsDirInto(map, path.join(cwd, '.agents', 'skills'))\n    await scanSkillsDirInto(map, path.join(cwd, '.dsh', 'skills'))\n  }\n  return [...map.values()].sort((a, b) => a.name.localeCompare(b.name))\n}\n\n/**\n * Mount the skills route and the prompt section.\n * @param ctx - context carrying webServer and systemPrompt.\n */\nexport function apply(ctx) {\n  ctx.effect(() => {\n    const handler = async (req, res) => {\n      try {\n        // cwd query carries the active session's workspace root from the client.\n        const cwd = req.url !== undefined ? new URL(req.url, 'http://dsh').searchParams.get('cwd') ?? undefined : undefined\n        const skills = await scanSkills(cwd)\n        res.writeHead(200, { 'content-type': 'application/json; charset=utf-8' })\n        res.end(JSON.stringify({ ok: true, complete: true, skills }))\n      } catch (error) {\n        res.writeHead(500, { 'content-type': 'application/json; charset=utf-8' })\n        res.end(JSON.stringify({ ok: false, error: String(error?.message ?? error) }))\n      }\n    }\n    return ctx.webServer.register({ kind: 'prefix', path: '/dsh-skill-picker', handler })\n  }, 'dsh-skill-picker: routes')\n\n  ctx.effect(() => ctx.systemPrompt.section({\n    name: 'plugin:skill-picker',\n    order: SECTION_ORDER,\n    text: SKILL_PICKER_GUIDANCE,\n  }), 'dsh-skill-picker: prompt section')\n}\n"],
+  "mappings": "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",
   "names": []
 }

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.2",
+  "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

@@ -188,6 +188,26 @@ const statusStyle = {
   fontSize: '13px',
 }
 
+/** Lightweight source badge shown only when the list came from the host scan fallback (official API unavailable). */
+const 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',
+}
+
+const sourceBadgeTextStyle = {
+  fontFamily: 'var(--ds-font-family-code, ui-monospace, monospace)',
+}
+
 /** The picker's bolt glyph: DeepSeek palette gradient + slim stroke. */
 function BoltIcon() {
   return (
@@ -218,6 +238,7 @@ function SkillPickerButton(props) {
   const [open, setOpen] = useState(false)
   const [skills, setSkills] = useState(undefined)
   const [error, setError] = useState(undefined)
+  const [source, setSource] = useState(undefined)
   const [query, setQuery] = useState('')
   const [usage, setUsage] = useState(() => loadUsage())
   const [active, setActive] = useState(0)
@@ -232,18 +253,20 @@ function SkillPickerButton(props) {
       if (typeof props.listSkills === 'function' && props.session?.sessionId !== undefined) {
         const listed = await props.listSkills(props.session.sessionId)
         setSkills(Array.isArray(listed) ? listed : [])
+        setSource('official')
         return
       }
     } catch (cause) {
       console.warn('[dsh-skill-picker] official skills API failed, falling back to host route:', cause)
     }
-    // Fallback path: the host's own scan route (user + project level dirs).
+    // Fallback path: the host's own scan route (official provider roots).
     try {
       const cwd = typeof props.cwd === 'string' && props.cwd !== '' ? `?cwd=${encodeURIComponent(props.cwd)}` : ''
       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')
       setSkills(Array.isArray(json.skills) ? json.skills : [])
+      setSource('host')
     } catch (cause) {
       setError(String(cause?.message ?? cause))
     }
@@ -374,38 +397,45 @@ function SkillPickerButton(props) {
           ) : skills === undefined ? (
             <div style={statusStyle}>加载中…</div>
           ) : (
-            <div style={listStyle}>
-              {filtered.length === 0 ? (
-                <div style={statusStyle}>没有匹配的技能</div>
-              ) : (
-                filtered.map((skill, index) => (
-                  <button
-                    key={skill.name}
-                    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))' }
-                        : {}),
-                    }}
-                  >
-                    <span style={nameStyle}>{`/${skill.name}`}</span>
-                    <span style={descStyle}>{skill.description ?? ''}</span>
-                  </button>
-                ))
+            <>
+              <div style={listStyle}>
+                {filtered.length === 0 ? (
+                  <div style={statusStyle}>没有匹配的技能</div>
+                ) : (
+                  filtered.map((skill, index) => (
+                    <button
+                      key={skill.name}
+                      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))' }
+                          : {}),
+                      }}
+                    >
+                      <span style={nameStyle}>{`/${skill.name}`}</span>
+                      <span style={descStyle}>{skill.description ?? ''}</span>
+                    </button>
+                  ))
+                )}
+              </div>
+              {source === 'host' && (
+                <div style={sourceBadgeStyle} title="官方技能 API 不可用，列表来自本地目录扫描（与官方 / 补全同源）">
+                  <span style={sourceBadgeTextStyle}>本地扫描</span>
+                </div>
               )}
-            </div>
+            </>
           )}
         </div>
       )}
@@ -415,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)
@@ -441,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(() => {
@@ -477,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 {
@@ -490,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)
@@ -551,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()

package/src/index.js

@@ -38,6 +38,19 @@ function userSkillsDir() {
   return path.join(home, 'skills')
 }
 
+/**
+ * Resolve the user agents-home skills directory, mirroring the official
+ * provider's default (`$DSH_AGENTS_HOME` > `~/.agents`). This is the
+ * cross-tool `.agents` convention; the official `dsh-skill-filesystem` scans
+ * it as its `user-agents` root (rank 500), so the fallback must too — else
+ * the picker's list silently misses skills that DSH's own `/` completion
+ * shows (issue #5).
+ */
+function userAgentsSkillsDir() {
+  const agentsHome = process.env.DSH_AGENTS_HOME ?? path.join(os.homedir(), '.agents')
+  return path.join(agentsHome, 'skills')
+}
+
 /** Parse a SKILL.md frontmatter block into a key/value map (flat YAML subset). */
 function parseFrontmatter(content) {
   const match = content.match(/^---\r?\n([\s\S]*?)\r?\n---/)
@@ -80,17 +93,21 @@ async function scanSkillsDirInto(map, dir) {
 }
 
 /**
- * Scan user-level plus (when a workspace cwd is known) project-level skill
- * directories, mirroring the official provider's roots. Never throws (a
- * missing user dir yields []).
+ * Scan the same roots the official `dsh-skill-filesystem` provider uses, so
+ * the fallback route stays in sync with what agents actually load:
+ * project `.dsh/skills` (rank 100) > project `.agents/skills` (200) >
+ * user `~/.dsh/skills` (400) > user `~/.agents/skills` (500). Scanned
+ * low-priority first, so later writes (higher priority) win in the map.
+ * Never throws (a missing dir yields []).
  * @param cwd - the active session's workspace root (undefined = user level only).
  */
 async function scanSkills(cwd) {
   const map = new Map()
+  await scanSkillsDirInto(map, userAgentsSkillsDir())
   await scanSkillsDirInto(map, userSkillsDir())
   if (typeof cwd === 'string' && cwd !== '') {
-    await scanSkillsDirInto(map, path.join(cwd, '.dsh', 'skills'))
     await scanSkillsDirInto(map, path.join(cwd, '.agents', 'skills'))
+    await scanSkillsDirInto(map, path.join(cwd, '.dsh', 'skills'))
   }
   return [...map.values()].sort((a, b) => a.name.localeCompare(b.name))
 }