fix: graceful search fallbacks

Author: harlan-zw

src/commands/search-interactive.ts

@@ -2,7 +2,7 @@ import type { SearchFilter, SearchSnippet } from '../retriv/index.ts'
 import { createLogUpdate } from 'log-update'
 import { formatCompactSnippet, highlightTerms, sanitizeMarkdown } from '../core/index.ts'
 import { closePool, openPool, searchPooled } from '../retriv/index.ts'
-import { findPackageDbs, parseFilterPrefix } from './search.ts'
+import { findPackageDbs, listLockPackages, parseFilterPrefix } from './search.ts'
 
 const FILTER_CYCLE = [undefined, 'docs', 'issues', 'releases'] as const
 type FilterLabel = typeof FILTER_CYCLE[number]
@@ -30,9 +30,16 @@ const SPINNER_FRAMES = ['◐', '◓', '◑', '◒']
 export async function interactiveSearch(packageFilter?: string): Promise<void> {
   const dbs = findPackageDbs(packageFilter)
   if (dbs.length === 0) {
-    const msg = packageFilter
-      ? `No docs indexed for "${packageFilter}". Run \`skilld add ${packageFilter}\` first.`
-      : 'No docs indexed yet. Run `skilld add <package>` first.'
+    let msg: string
+    if (packageFilter) {
+      const available = listLockPackages()
+      msg = available.length > 0
+        ? `No docs indexed for "${packageFilter}". Available: ${available.join(', ')}`
+        : `No docs indexed for "${packageFilter}". Run \`skilld add ${packageFilter}\` first.`
+    }
+    else {
+      msg = 'No docs indexed yet. Run `skilld add <package>` first.'
+    }
     process.stderr.write(`\x1B[33m${msg}\x1B[0m\n`)
     return
   }

src/commands/search.ts

@@ -14,47 +14,59 @@ import { searchSnippets } from '../retriv/index.ts'
 /** Collect search.db paths for packages installed in the current project (from skilld-lock.yaml) */
 export function findPackageDbs(packageFilter?: string): string[] {
   const cwd = process.cwd()
+  const lock = readProjectLock(cwd)
+  if (!lock)
+    return []
+  return filterLockDbs(lock, packageFilter)
+}
 
-  // Try shared dir first
+/** Read the project's skilld-lock.yaml (shared dir or agent skills dir) */
+function readProjectLock(cwd: string): ReturnType<typeof readLock> {
   const shared = getSharedSkillsDir(cwd)
   if (shared) {
     const lock = readLock(shared)
     if (lock)
-      return filterLockDbs(lock, packageFilter)
+      return lock
   }
-
   const agent = detectTargetAgent()
   if (!agent)
-    return []
+    return null
+  return readLock(`${cwd}/${agents[agent].skillsDir}`)
+}
 
-  const skillsDir = `${cwd}/${agents[agent].skillsDir}`
-  const lock = readLock(skillsDir)
+/** List installed package names from the project lockfile */
+export function listLockPackages(cwd: string = process.cwd()): string[] {
+  const lock = readProjectLock(cwd)
   if (!lock)
     return []
-
-  return filterLockDbs(lock, packageFilter)
+  return [...new Set(Object.values(lock.skills).map(s => s.packageName).filter(Boolean) as string[])]
 }
 
 function filterLockDbs(lock: ReturnType<typeof readLock>, packageFilter?: string): string[] {
   if (!lock)
     return []
-  const normalize = (s: string) => s.toLowerCase().replace(/[-_@/]/g, '')
+  const tokenize = (s: string) => s.toLowerCase().replace(/@/g, '').split(/[-_/]+/).filter(Boolean)
 
   return Object.values(lock.skills)
     .filter((info) => {
       if (!info.packageName || !info.version)
         return false
       if (!packageFilter)
         return true
-      const f = normalize(packageFilter)
-      return normalize(info.packageName).includes(f) || normalize(info.packageName) === f
+      // All tokens from filter must appear in package name tokens
+      const filterTokens = tokenize(packageFilter)
+      const nameTokens = tokenize(info.packageName)
+      return filterTokens.every(ft => nameTokens.some(nt => nt.includes(ft) || ft.includes(nt)))
     })
     .map((info) => {
       const exact = getPackageDbPath(info.packageName!, info.version!)
       if (existsSync(exact))
         return exact
       // Fallback: find any cached version's search.db for this package
-      return findAnyPackageDb(info.packageName!)
+      const fallback = findAnyPackageDb(info.packageName!)
+      if (fallback)
+        p.log.warn(`Using cached search index for ${info.packageName} (v${info.version} not indexed). Run \`skilld update ${info.packageName}\` to re-index.`)
+      return fallback
     })
     .filter((db): db is string => !!db)
 }
@@ -112,10 +124,16 @@ export async function searchCommand(rawQuery: string, packageFilter?: string): P
   const dbs = findPackageDbs(packageFilter)
 
   if (dbs.length === 0) {
-    if (packageFilter)
-      p.log.warn(`No docs indexed for "${packageFilter}". Run \`skilld add ${packageFilter}\` first.`)
-    else
+    if (packageFilter) {
+      const available = listLockPackages()
+      if (available.length > 0)
+        p.log.warn(`No docs indexed for "${packageFilter}". Available: ${available.join(', ')}`)
+      else
+        p.log.warn(`No docs indexed for "${packageFilter}". Run \`skilld add ${packageFilter}\` first.`)
+    }
+    else {
       p.log.warn('No docs indexed yet. Run `skilld add <package>` first.')
+    }
     return
   }