dsh-skill-hub 0.3.11 → 0.3.13

package/src/error-text.test.ts

@@ -16,4 +16,49 @@ describe('errorText', () => {
   it('uses an empty message when the Error has none', () => {
     expect(errorText(new Error(''))).toBe('')
   })
+
+  it('appends a cause message to a fetch failure', () => {
+    const error = new TypeError('fetch failed', { cause: new Error('getaddrinfo ENOTFOUND api.github.com') })
+    expect(errorText(error)).toBe('fetch failed (getaddrinfo ENOTFOUND api.github.com)')
+  })
+
+  it('appends an error code when the cause message does not contain it', () => {
+    const cause = Object.assign(new Error('Connect Timeout Error'), { code: 'UND_ERR_CONNECT_TIMEOUT' })
+    expect(errorText(new TypeError('fetch failed', { cause }))).toBe('fetch failed (Connect Timeout Error [UND_ERR_CONNECT_TIMEOUT])')
+  })
+
+  it('does not duplicate a code already present in the cause message', () => {
+    const cause = Object.assign(new Error('getaddrinfo ENOTFOUND api.github.com'), { code: 'ENOTFOUND' })
+    expect(errorText(new TypeError('fetch failed', { cause }))).toBe('fetch failed (getaddrinfo ENOTFOUND api.github.com)')
+  })
+
+  it('walks nested cause chains', () => {
+    const inner = new Error('inner reason')
+    const outer = new Error('outer', { cause: inner })
+    expect(errorText(new TypeError('fetch failed', { cause: outer }))).toBe('fetch failed (outer; inner reason)')
+  })
+
+  it('expands an AggregateError cause', () => {
+    const cause = new AggregateError([
+      new Error('connect ECONNREFUSED 127.0.0.1:443'),
+      new Error('connect ECONNREFUSED [::1]:443'),
+    ])
+    expect(errorText(new TypeError('fetch failed', { cause }))).toBe('fetch failed (connect ECONNREFUSED 127.0.0.1:443; connect ECONNREFUSED [::1]:443)')
+  })
+
+  it('stops at self-referencing cause chains', () => {
+    const error = new Error('fetch failed')
+    error.cause = error
+    expect(errorText(error)).toBe('fetch failed')
+  })
+
+  it('stringifies non-Error causes', () => {
+    const error = new Error('fetch failed')
+    error.cause = 'socket closed'
+    expect(errorText(error)).toBe('fetch failed (socket closed)')
+  })
+
+  it('returns the cause detail alone when the top message is empty', () => {
+    expect(errorText(new Error('', { cause: new Error('boom') }))).toBe('boom')
+  })
 })

package/src/error-text.ts

@@ -2,9 +2,51 @@
  * 错误文案收敛：宿主各处把 unknown 异常转成一行可读文字。原先这条表达式
  * 在宿主侧内联了 22 次（`error instanceof Error ? error.message : String(error)`），
  * 现在统一走这里。浏览器半有自己的 `helpers.errorMessage`，两半互不引用。
+ *
+ * Error 的 `cause` 链（undici 的 `fetch failed`、AggregateError 的多地址
+ * 失败、TLS 证书错误等）以括号附录带出，避免只剩笼统的顶层 message。
  */
 
-/** 从 unknown 异常取出可读文案；非 Error 值用 String 兜底。 */
+/** cause 链最大展开深度，防自引用/超深链。 */
+const MAX_CAUSE_DEPTH = 4
+
+/** 合成一条 cause 细节；code 已在 message 里则不重复。 */
+function causeDetail(message: string, code: string): string {
+  const text = message.trim()
+  if (code === '') return text
+  if (text === '') return '[' + code + ']'
+  return text.includes(code) ? text : text + ' [' + code + ']'
+}
+
+/** 深度受限地收集 cause 链细节（AggregateError 展开其 errors）。 */
+function collectCauseDetails(cause: unknown, depth: number, seen: Set<unknown>, out: string[]): void {
+  if (depth > MAX_CAUSE_DEPTH || cause === null || cause === undefined || seen.has(cause)) return
+  seen.add(cause)
+  if (cause instanceof Error) {
+    const errors = (cause as { errors?: unknown }).errors
+    if (Array.isArray(errors)) {
+      for (const item of errors) collectCauseDetails(item, depth + 1, seen, out)
+    }
+    const rawCode: unknown = (cause as { code?: unknown }).code
+    const code = typeof rawCode === 'string' ? rawCode : ''
+    const detail = causeDetail(cause.message, code)
+    if (detail !== '') out.push(detail)
+    collectCauseDetails(cause.cause, depth + 1, seen, out)
+    return
+  }
+  const detail = causeDetail(String(cause), '')
+  if (detail !== '') out.push(detail)
+}
+
+/** 从 unknown 异常取出可读文案；非 Error 值用 String 兜底，cause 附在括号里。 */
 export function errorText(error: unknown): string {
-  return error instanceof Error ? error.message : String(error)
+  if (!(error instanceof Error)) return String(error)
+  const details: string[] = []
+  collectCauseDetails(error.cause, 1, new Set(), details)
+  for (let index = details.length - 1; index >= 0; index -= 1) {
+    if (details[index] === error.message || details.indexOf(details[index]) !== index) details.splice(index, 1)
+  }
+  if (details.length === 0) return error.message
+  const suffix = details.join('; ')
+  return error.message === '' ? suffix : error.message + ' (' + suffix + ')'
 }

package/src/index.ts

@@ -21,6 +21,7 @@ import { SkillHubProvider } from './provider.ts'
 import { makeRoutes } from './routes.ts'
 import { createSkillStatsReader, asPersistenceSeam, type SessionPersistenceLike, type SessionQueryLike, type SkillStatsReader } from './stats.ts'
 import { SkillHubStore } from './store.ts'
+import { reconcileDisabledSkills } from './reconcile.ts'
 import { cleanupLeftoverImportDirs, setGithubToken } from './repo.ts'
 import { dshHome } from './store.ts'
 import { join } from 'node:path'
@@ -234,6 +235,16 @@ export function apply(ctx: Context, config?: Config): void {
         ctx.logger.warn('[dsh-skill-hub] startup cleanup failed', error)
       }
     }
+    // 对账：磁盘上已有 .disabled、sidecar 却无记录（状态文件被恢复/手改、旧版本
+    // 遗留）时补记录，否则这些技能在面板里既不算启用也不算禁用，来源组空壳。
+    try {
+      const reconciled = await reconcileDisabledSkills(store, home)
+      if (reconciled.length > 0) {
+        ctx.logger.info(`[dsh-skill-hub] startup reconciled ${reconciled.length} disabled skill record(s): ${reconciled.map((entry) => entry.name).join(', ')}`)
+      }
+    } catch (error) {
+      ctx.logger.warn('[dsh-skill-hub] startup disabled-skill reconcile failed', error)
+    }
   })()
 
   void (async () => {

package/src/reconcile.test.ts

@@ -0,0 +1,76 @@
+import { mkdir, mkdtemp, rm, writeFile } from 'node:fs/promises'
+import { tmpdir } from 'node:os'
+import { join } from 'node:path'
+import { afterEach, beforeEach, describe, expect, it } from 'vitest'
+import { reconcileDisabledSkills } from './reconcile.ts'
+import { SkillHubStore, statePath } from './store.ts'
+
+describe('reconcileDisabledSkills', () => {
+  let dir: string
+  let home: string
+  let agentsHome: string
+  let previousAgentsHome: string | undefined
+  let store: SkillHubStore
+
+  beforeEach(async () => {
+    dir = await mkdtemp(join(tmpdir(), 'dsh-skill-hub-reconcile-'))
+    home = join(dir, 'home')
+    agentsHome = join(dir, 'agents')
+    await mkdir(join(home, 'skills'), { recursive: true })
+    await mkdir(join(agentsHome, 'skills'), { recursive: true })
+    previousAgentsHome = process.env.DSH_AGENTS_HOME
+    process.env.DSH_AGENTS_HOME = agentsHome
+    store = new SkillHubStore(statePath(home))
+  })
+
+  afterEach(async () => {
+    if (previousAgentsHome === undefined) delete process.env.DSH_AGENTS_HOME
+    else process.env.DSH_AGENTS_HOME = previousAgentsHome
+    await rm(dir, { recursive: true, force: true })
+  })
+
+  it('rebuilds a missing record for a disabled directory bundle', async () => {
+    await mkdir(join(home, 'skills', 'paused-skill'))
+    await writeFile(
+      join(home, 'skills', 'paused-skill', 'SKILL.md.disabled'),
+      '---\nname: paused-skill\ndescription: Paused bundle\n---\n\nBody',
+      'utf8',
+    )
+    const added = await reconcileDisabledSkills(store, home)
+    expect(added).toHaveLength(1)
+    expect(await store.getDisabled('paused-skill')).toMatchObject({
+      name: 'paused-skill',
+      description: 'Paused bundle',
+      path: join(home, 'skills', 'paused-skill', 'SKILL.md.disabled'),
+      root: 'user-dsh',
+    })
+  })
+
+  it('rebuilds records for flat files in both user roots', async () => {
+    await writeFile(join(home, 'skills', 'flat-skill.md.disabled'), '---\nname: flat-skill\ndescription: Flat one\n---', 'utf8')
+    await writeFile(join(agentsHome, 'skills', 'agent-skill.md.disabled'), '---\nname: agent-skill\ndescription: Agent one\n---', 'utf8')
+    const added = await reconcileDisabledSkills(store, home)
+    expect(added.map((entry) => entry.name).sort()).toEqual(['agent-skill', 'flat-skill'])
+    expect((await store.getDisabled('agent-skill'))?.root).toBe('user-agents')
+    expect((await store.getDisabled('flat-skill'))?.root).toBe('user-dsh')
+  })
+
+  it('keeps existing records untouched and skips invalid disabled files', async () => {
+    const recordPath = join(home, 'skills', 'known-skill', 'SKILL.md.disabled')
+    await mkdir(join(home, 'skills', 'known-skill'))
+    await writeFile(recordPath, '---\nname: known-skill\ndescription: Fresh text\n---', 'utf8')
+    await store.addDisabled({ name: 'known-skill', description: 'Original', path: recordPath, root: 'user-dsh', disabledAt: 1 })
+    await writeFile(join(home, 'skills', 'broken.md.disabled'), '# no frontmatter', 'utf8')
+
+    expect(await reconcileDisabledSkills(store, home)).toEqual([])
+    expect((await store.getDisabled('known-skill'))?.description).toBe('Original')
+    expect(await store.getDisabled('broken')).toBeUndefined()
+  })
+
+  it('is idempotent across runs', async () => {
+    await writeFile(join(home, 'skills', 'flat-skill.md.disabled'), '---\nname: flat-skill\ndescription: Flat one\n---', 'utf8')
+    expect(await reconcileDisabledSkills(store, home)).toHaveLength(1)
+    expect(await reconcileDisabledSkills(store, home)).toEqual([])
+    expect(await store.listDisabled()).toHaveLength(1)
+  })
+})

package/src/reconcile.ts

@@ -0,0 +1,62 @@
+/**
+ * Sidecar reconcile for hub-disabled skills.
+ *
+ * The catalog merges two sources: enabled skills come from the provider
+ * (SKILL.md discovery), disabled skills come from the sidecar's `disabled`
+ * records. The two can drift — a sidecar restored from a backup, a hand
+ * edit, or an older build can leave a `SKILL.md.disabled` file on disk with
+ * no record, which makes the skill invisible in every view (it is neither
+ * enabled nor disabled) and leaves its origin collection rendering as an
+ * empty shell. This walk rebuilds the missing records from disk at startup.
+ */
+
+import { readFile, stat } from 'node:fs/promises'
+import type { DisabledSkill } from './protocol.ts'
+import { parseFrontmatter, rootPath, scanDisabledRoot, WRITABLE_ROOTS } from './skillfs.ts'
+import { dshHome } from './store.ts'
+
+/** Narrow store view used by the reconcile (SkillHubStore satisfies it). */
+export interface DisabledReconcileStore {
+  listDisabled(): Promise<DisabledSkill[]>
+  addDisabled(entry: DisabledSkill): Promise<void>
+}
+
+/**
+ * Add sidecar disabled records for every `.disabled` discovery file that has
+ * none yet. Existing records (matched by path or by name) win, so this never
+ * rewrites user data; unreadable or invalid files are skipped (they surface
+ * in the diagnostics scan instead). Returns the records added.
+ */
+export async function reconcileDisabledSkills(store: DisabledReconcileStore, home = dshHome()): Promise<DisabledSkill[]> {
+  const known = await store.listDisabled()
+  const knownNames = new Set(known.map((entry) => entry.name))
+  const knownPaths = new Set(known.map((entry) => entry.path))
+  const added: DisabledSkill[] = []
+  for (const root of WRITABLE_ROOTS) {
+    for (const path of await scanDisabledRoot(rootPath(root, home))) {
+      if (knownPaths.has(path)) continue
+      let text: string
+      try {
+        text = await readFile(path, 'utf8')
+      } catch {
+        continue
+      }
+      const parsed = parseFrontmatter(text)
+      if ('error' in parsed) continue
+      const { name, description } = parsed.value
+      if (knownNames.has(name)) continue
+      let disabledAt = 0
+      try {
+        disabledAt = (await stat(path)).mtimeMs
+      } catch {
+        continue // 扫描途中被删除
+      }
+      const record: DisabledSkill = { name, description, path, root, disabledAt }
+      await store.addDisabled(record)
+      knownNames.add(name)
+      knownPaths.add(path)
+      added.push(record)
+    }
+  }
+  return added
+}

package/src/skillfs/scan.ts

@@ -53,6 +53,44 @@ export function listSkillEntries(root: WritableRoot, home = dshHome()): Promise<
   return scanRoot(rootPath(root, home))
 }
 
+/**
+ * Scan one skills root for hub-disabled discovery files: directory bundles
+ * renamed to SKILL.md.disabled and flat <name>.md.disabled files. Used by
+ * the startup reconcile to rebuild sidecar records that were lost, which
+ * would otherwise leave the skill invisible in every view.
+ */
+export async function scanDisabledRoot(base: string): Promise<string[]> {
+  const paths: string[] = []
+  let names: string[]
+  try {
+    names = await readdir(base)
+  } catch (error) {
+    if ((error as NodeJS.ErrnoException).code === 'ENOENT') return paths
+    throw error
+  }
+  for (const name of names) {
+    if (name.startsWith('.')) continue
+    const absolute = join(base, name)
+    let stats
+    try {
+      stats = await stat(absolute)
+    } catch {
+      continue
+    }
+    if (stats.isDirectory()) {
+      const candidate = join(absolute, 'SKILL.md.disabled')
+      try {
+        if ((await stat(candidate)).isFile()) paths.push(candidate)
+      } catch {
+        // 目录里没有禁用的发现文件，跳过
+      }
+    } else if (name.endsWith('.md.disabled') && name !== 'SKILL.md.disabled') {
+      paths.push(absolute)
+    }
+  }
+  return paths.sort((a, b) => (a < b ? -1 : a > b ? 1 : 0))
+}
+
 /** UI metadata from `agents/openai.yaml` beside a directory skill (mirrors codex SkillInterface). */
 export interface SkillInterface {
   displayName?: string