dsh-skill-hub 0.3.19 → 0.3.21

package/src/protocol/config.ts

@@ -89,29 +89,30 @@ export const HUB_CONFIG_DEFAULTS = {
 } as const
 
 /**
- * Resolve the effective hub config: saved sidecar overrides win over the
- * cordis composition entry (the web card owns runtime config), missing
- * booleans fall back to HUB_CONFIG_DEFAULTS, and dot colors pass through
- * (saved first, then base) only when set. Numeric stats knobs are clamped to
- * their sane ranges (window ≥ 0, scan interval ≥ 1 minute).
+ * Fill a raw settings value into the effective hub config: schema defaults for
+ * anything missing, and the numeric stats knobs clamped to sane ranges
+ * (window ≥ 0, scan interval ≥ 1 minute).
+ *
+ * There is deliberately no "saved sidecar layer" parameter. Until dsh 0.1.7 the
+ * hub kept its own runtime overrides in the sidecar and merged them here; the
+ * settings namespace is now the only user layer (`updateConfig` writes through
+ * `ctx.settings.mutate`), so a merge against a sidecar layer could never
+ * observe anything but `{}` — see the git history of `resolveHubConfig`.
  */
-export function resolveHubConfig(saved: Partial<HubConfig>, base: Partial<HubConfig> = {}): HubConfig {
-  const dotModelColor = saved.dotModelColor !== undefined ? saved.dotModelColor : base.dotModelColor
-  const dotUserColor = saved.dotUserColor !== undefined ? saved.dotUserColor : base.dotUserColor
-  const githubToken = saved.githubToken !== undefined ? saved.githubToken : base.githubToken
-  const windowDays = clampNumber(saved.statsWindowDays ?? base.statsWindowDays, 0) ?? HUB_CONFIG_DEFAULTS.statsWindowDays
-  const scanMinutes = clampNumber(saved.statsScanMinutes ?? base.statsScanMinutes, 1) ?? HUB_CONFIG_DEFAULTS.statsScanMinutes
+export function resolveHubConfig(base: Partial<HubConfig> = {}): HubConfig {
+  const windowDays = clampNumber(base.statsWindowDays, 0) ?? HUB_CONFIG_DEFAULTS.statsWindowDays
+  const scanMinutes = clampNumber(base.statsScanMinutes, 1) ?? HUB_CONFIG_DEFAULTS.statsScanMinutes
   return {
-    enabled: saved.enabled ?? base.enabled ?? HUB_CONFIG_DEFAULTS.enabled,
-    announceToAgent: saved.announceToAgent ?? base.announceToAgent ?? HUB_CONFIG_DEFAULTS.announceToAgent,
-    showUseCount: saved.showUseCount ?? base.showUseCount ?? HUB_CONFIG_DEFAULTS.showUseCount,
-    showUseTime: saved.showUseTime ?? base.showUseTime ?? HUB_CONFIG_DEFAULTS.showUseTime,
-    showGroupSummary: saved.showGroupSummary ?? base.showGroupSummary ?? HUB_CONFIG_DEFAULTS.showGroupSummary,
+    enabled: base.enabled ?? HUB_CONFIG_DEFAULTS.enabled,
+    announceToAgent: base.announceToAgent ?? HUB_CONFIG_DEFAULTS.announceToAgent,
+    showUseCount: base.showUseCount ?? HUB_CONFIG_DEFAULTS.showUseCount,
+    showUseTime: base.showUseTime ?? HUB_CONFIG_DEFAULTS.showUseTime,
+    showGroupSummary: base.showGroupSummary ?? HUB_CONFIG_DEFAULTS.showGroupSummary,
     statsWindowDays: windowDays,
     statsScanMinutes: scanMinutes,
-    ...(dotModelColor !== undefined ? { dotModelColor } : {}),
-    ...(dotUserColor !== undefined ? { dotUserColor } : {}),
-    ...(githubToken !== undefined ? { githubToken } : {}),
+    ...(base.dotModelColor !== undefined ? { dotModelColor: base.dotModelColor } : {}),
+    ...(base.dotUserColor !== undefined ? { dotUserColor: base.dotUserColor } : {}),
+    ...(base.githubToken !== undefined ? { githubToken: base.githubToken } : {}),
   }
 }
 
@@ -148,7 +149,13 @@ export interface ConfigResponse {
   githubTokenSet: boolean
 }
 
-/** POST /api/skill-hub/config — a partial patch; omitted fields keep their values. */
+/**
+ * POST /api/skill-hub/config — a partial patch; omitted fields keep their values.
+ *
+ * Only the fields the handler actually parses belong here: the stats knobs are
+ * owned by the settings namespace (`statsWindowDays` / `statsScanMinutes` are
+ * still part of {@link HubSettingsValue}), not by this route.
+ */
 export interface ConfigRequest {
   /** Set the field; null clears the saved override so it re-inherits the default. */
   enabled?: boolean | null
@@ -164,10 +171,6 @@ export interface ConfigRequest {
   dotModelColor?: string | null
   /** Set the dot color; null clears the saved override so it re-inherits the default. */
   dotUserColor?: string | null
-  /** 统计滚动窗口天数（0 = 全部历史）；null 清除覆盖回默认。 */
-  statsWindowDays?: number | null
-  /** 自动统计扫描间隔（分钟）；null 清除覆盖回默认。 */
-  statsScanMinutes?: number | null
   /** Set the GitHub token; null/empty clears it back to anonymous. */
   githubToken?: string | null
 }

package/src/protocol/market.ts

@@ -27,6 +27,18 @@ export interface MarketSourceResponse {
   repos: MarketSourceRecord[]
 }
 
+/**
+ * POST /api/skill-hub/market/source — same list, plus the slug the host
+ * resolved from the input. Clients must scan *this* slug rather than assume
+ * the acted-on source sits at some position in `repos`: re-adding a repo the
+ * user already tracks only updates its `ref` in place and never reorders the
+ * list.
+ */
+export interface MarketSourceAddResponse extends MarketSourceResponse {
+  /** Normalized `owner/repo` the host recorded for the submitted input. */
+  repo: string
+}
+
 /** POST /api/skill-hub/market/source/ref — pin a market source to an explicit ref. */
 export interface MarketSourceRefRequest {
   repo: string

package/src/protocol/sources.ts

@@ -138,6 +138,11 @@ export interface SourceTrashClearResponse {
   deleted: string[]
   /** 未能删除的技能（保留在回收站中）。 */
   failed: Array<{ name: string; error: string }>
+  /**
+   * `.trash` 里没有对应记录的残留目录（同名技能先后两次入站时，旧记录被覆盖，
+   * 目录却留了下来）。清空回收站时一并回收，这里上报它们的路径；没有则省略。
+   */
+  orphans?: string[]
 }
 
 /** 项目级技能来源（它们有 workspace 归属，不属于「个人」组）。 */

package/src/protocol.ts

@@ -36,6 +36,7 @@ export type {
   MarketSourceRecord,
   MarketSourcesResponse,
   MarketSourceRequest,
+  MarketSourceAddResponse,
   MarketSourceResponse,
   MarketSourceRefRequest,
   MarketSourceVersionsResponse,

package/src/reconcile.test.ts

@@ -2,7 +2,7 @@ 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 { pruneStaleDisabledSkills, reconcileDisabledSkills } from './reconcile.ts'
 import { SkillHubStore, statePath } from './store.ts'
 
 describe('reconcileDisabledSkills', () => {
@@ -73,4 +73,77 @@ describe('reconcileDisabledSkills', () => {
     expect(await reconcileDisabledSkills(store, home)).toEqual([])
     expect(await store.listDisabled()).toHaveLength(1)
   })
+
+  it('reconciles a root-level SKILL.md.disabled (a flat skill literally named SKILL)', async () => {
+    // scanRoot 会把根级 SKILL.md 文件当一个扁平技能，它的禁用对应物就不能被漏掉。
+    await writeFile(join(home, 'skills', 'SKILL.md.disabled'), '---\nname: root-flat\ndescription: Root flat\n---', 'utf8')
+    const added = await reconcileDisabledSkills(store, home)
+    expect(added.map((entry) => entry.name)).toEqual(['root-flat'])
+    expect((await store.getDisabled('root-flat'))?.path).toBe(join(home, 'skills', 'SKILL.md.disabled'))
+  })
+})
+
+describe('pruneStaleDisabledSkills', () => {
+  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-prune-'))
+    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('drops a record whose file is gone and frees the name', async () => {
+    await store.addDisabled({ name: 'ghost', description: 'x', path: join(home, 'skills', 'ghost', 'SKILL.md.disabled'), root: 'user-dsh', disabledAt: 1 })
+    const result = await pruneStaleDisabledSkills(store, home)
+    expect(result).toEqual({ repaired: [], removed: ['ghost'] })
+    expect(await store.listDisabled()).toEqual([])
+  })
+
+  it('repoints a record to the surviving flat placeholder instead of dropping it', async () => {
+    // 记录指目录形态，磁盘上只剩扁平形态（导入让位过一次的典型残留）。
+    await writeFile(join(home, 'skills', 'code-review.md.disabled'), '---\nname: code-review\ndescription: stub\n---', 'utf8')
+    await store.addDisabled({ name: 'code-review', description: 'stub', path: join(home, 'skills', 'code-review', 'SKILL.md.disabled'), root: 'user-dsh', disabledAt: 1 })
+    const result = await pruneStaleDisabledSkills(store, home)
+    expect(result.removed).toEqual([])
+    expect(result.repaired.map((entry) => entry.path)).toEqual([join(home, 'skills', 'code-review.md.disabled')])
+    expect((await store.getDisabled('code-review'))?.path).toBe(join(home, 'skills', 'code-review.md.disabled'))
+  })
+
+  it('repoints to the bundle placeholder when that is the surviving form', async () => {
+    await mkdir(join(home, 'skills', 'paused'))
+    await writeFile(join(home, 'skills', 'paused', 'SKILL.md.disabled'), '---\nname: paused\ndescription: b\n---', 'utf8')
+    await store.addDisabled({ name: 'paused', description: 'b', path: join(home, 'skills', 'paused.md.disabled'), root: 'user-dsh', disabledAt: 1 })
+    const result = await pruneStaleDisabledSkills(store, home)
+    expect(result.repaired.map((entry) => entry.path)).toEqual([join(home, 'skills', 'paused', 'SKILL.md.disabled')])
+  })
+
+  it('leaves records whose file still exists alone, and is idempotent', async () => {
+    await writeFile(join(home, 'skills', 'alive.md.disabled'), '---\nname: alive\ndescription: x\n---', 'utf8')
+    await store.addDisabled({ name: 'alive', description: 'x', path: join(home, 'skills', 'alive.md.disabled'), root: 'user-dsh', disabledAt: 1 })
+    expect(await pruneStaleDisabledSkills(store, home)).toEqual({ repaired: [], removed: [] })
+    expect(await pruneStaleDisabledSkills(store, home)).toEqual({ repaired: [], removed: [] })
+    expect(await store.listDisabled()).toHaveLength(1)
+  })
+
+  it('prunes records from the other writable root too', async () => {
+    await store.addDisabled({ name: 'agent-ghost', description: 'x', path: join(agentsHome, 'skills', 'agent-ghost', 'SKILL.md.disabled'), root: 'user-agents', disabledAt: 1 })
+    await writeFile(join(agentsHome, 'skills', 'agent-ghost.md.disabled'), '---\nname: agent-ghost\ndescription: x\n---', 'utf8')
+    const result = await pruneStaleDisabledSkills(store, home)
+    expect(result.repaired.map((entry) => entry.path)).toEqual([join(agentsHome, 'skills', 'agent-ghost.md.disabled')])
+  })
 })

package/src/reconcile.ts

@@ -12,7 +12,7 @@
 
 import { readFile, stat } from 'node:fs/promises'
 import type { DisabledSkill } from './protocol.ts'
-import { parseFrontmatter, rootPath, scanDisabledRoot, WRITABLE_ROOTS } from './skillfs.ts'
+import { disabledOccupancyIn, parseFrontmatter, rootPath, scanDisabledRoot, WRITABLE_ROOTS } from './skillfs.ts'
 import { dshHome } from './store.ts'
 
 /** Narrow store view used by the reconcile (SkillHubStore satisfies it). */
@@ -21,6 +21,11 @@ export interface DisabledReconcileStore {
   addDisabled(entry: DisabledSkill): Promise<void>
 }
 
+/** Narrow store view used by the reverse reconcile (adds record removal). */
+export interface DisabledPruneStore extends DisabledReconcileStore {
+  removeDisabled(name: string): 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
@@ -60,3 +65,47 @@ export async function reconcileDisabledSkills(store: DisabledReconcileStore, hom
   }
   return added
 }
+
+/** 反向对账的结果：修好路径的记录 + 被清掉的死记录。 */
+export interface DisabledPruneResult {
+  /** 记录还在、但 path 指向的文件已不在：已改指向现存的 `.disabled` 文件。 */
+  repaired: DisabledSkill[]
+  /** 文件与禁用占位都已不存在：记录已删除，名字被释放。 */
+  removed: string[]
+}
+
+/**
+ * 反向对账：`reconcileDisabledSkills` 只处理「磁盘有 `.disabled`、sidecar 没记录」。
+ * 反方向（sidecar 有记录、磁盘上那个文件已经不在了）以前永不清理，于是留下一条
+ * 干掉不掉的记录：`/toggle` 启用会 rename 失败，`/create` 被 409 挡住，`/skill/delete`
+ * 也 rename 失败 —— 名字被永久锁死（issue #16 类，实测 G5）。
+ *
+ * 两种处理，都不动启用态技能：
+ * - 名字在该 root 下仍有 `.disabled` 占位（目录包或扁平形态）→ 把记录指向真实文件；
+ * - 一个都没有 → 删记录，把名字还给用户。
+ *
+ * 只处理合法可写 root 的记录；root 值异常（历史损坏数据）时原样保留，不擅自删。
+ */
+export async function pruneStaleDisabledSkills(store: DisabledPruneStore, home = dshHome()): Promise<DisabledPruneResult> {
+  const result: DisabledPruneResult = { repaired: [], removed: [] }
+  for (const record of await store.listDisabled()) {
+    let exists = false
+    try {
+      exists = (await stat(record.path)).isFile()
+    } catch {
+      exists = false
+    }
+    if (exists) continue
+    if (!WRITABLE_ROOTS.includes(record.root)) continue
+    const occupancy = await disabledOccupancyIn(rootPath(record.root, home), record.name)
+    if (occupancy === undefined) {
+      await store.removeDisabled(record.name)
+      result.removed.push(record.name)
+      continue
+    }
+    const repaired: DisabledSkill = { ...record, path: occupancy }
+    await store.addDisabled(repaired)
+    result.repaired.push(repaired)
+  }
+  return result
+}

package/src/repo/github-client.ts

@@ -66,21 +66,34 @@ function etagCacheSet(url: string, etag: string, json: unknown): void {
   }
   etagCache.set(url, { etag, json })
 }
+
+/**
+ * When the response shows an exhausted GitHub rate limit, the instant it
+ * resets; otherwise undefined. Shared by the repo fetch layer and the plugin's
+ * own update check so both agree on what counts as a rate-limit rejection
+ * (403/429 + `x-ratelimit-remaining: 0` + a parseable `x-ratelimit-reset`)
+ * instead of each re-deriving it from the headers.
+ */
+export function rateLimitResetAt(response: Response): Date | undefined {
+  if (response.status !== 403 && response.status !== 429) return undefined
+  if (response.headers.get('x-ratelimit-remaining') !== '0') return undefined
+  const reset = response.headers.get('x-ratelimit-reset')
+  if (reset === null) return undefined
+  const at = new Date(Number(reset) * 1000)
+  return Number.isNaN(at.getTime()) ? undefined : at
+}
+
 /**
  * Build a RepoFetchError; when the response shows an exhausted rate limit,
  * report the reset time instead of a bare HTTP status.
  */
 export function fetchError(context: string, response: Response, fallbackStatus = 502): RepoFetchError {
-  const remaining = response.headers.get('x-ratelimit-remaining')
-  const reset = response.headers.get('x-ratelimit-reset')
-  if (response.status === 403 || response.status === 429) {
-    if (remaining === '0' && reset !== null) {
-      const at = new Date(Number(reset) * 1000)
-      return new RepoFetchError(
-        'github rate limit reached (anonymous quota exhausted); retry after ' + at.toLocaleTimeString() + ' or set GITHUB_TOKEN',
-        403,
-      )
-    }
+  const resetAt = rateLimitResetAt(response)
+  if (resetAt !== undefined) {
+    return new RepoFetchError(
+      'github rate limit reached (anonymous quota exhausted); retry after ' + resetAt.toLocaleTimeString() + ' or set GITHUB_TOKEN',
+      403,
+    )
   }
   return new RepoFetchError(context + ' (HTTP ' + response.status + ')', response.status === 404 ? 404 : fallbackStatus)
 }
@@ -111,10 +124,9 @@ export async function fetchJson(url: string, fetchImpl: typeof fetch, context: s
 }
 
 /**
- * Load repo metadata and the recursive git tree at the given ref. The meta
- * request always resolves the default branch (used when ref is absent); the
- * tree is fetched at `ref ?? default_branch` so an explicit branch/tag scans
- * the exact same content a later download would fetch.
+ * Load one JSON document from the GitHub API, reusing an ETag when the URL was
+ * fetched before. `fetchImpl`/`context` exist so callers can stub the transport
+ * and shape the error text; the payload is whatever the endpoint returned.
  */
 export async function fetchJsonCached(url: string, fetchImpl: typeof fetch, context: string): Promise<{ json: unknown; response: Response }> {
   const cached = etagCache.get(url)

package/src/repo.test.ts

@@ -2,7 +2,7 @@ import { describe, expect, it } from 'vitest'
 import { mkdtemp, readFile, rm } from 'node:fs/promises'
 import { tmpdir } from 'node:os'
 import { join } from 'node:path'
-import { NO_COMPRESSION, apiHeaders, collectRepoSkillFiles, diffRemoteSkills, discoverRepoEntries, downloadGitHubFile, downloadRepoSkill, getLatestReleaseTag, getRepoStats, listRepoBranches, normalizeRepoInput, originForRoot, relativeToSkillDir, repoSkillEntry, repoSlug, skillDirOf, skillFileAt, skillManifest } from './repo.ts'
+import { NO_COMPRESSION, apiHeaders, collectRepoSkillFiles, diffRemoteSkills, discoverRepoEntries, downloadGitHubFile, downloadRepoSkill, getLatestReleaseTag, getRepoStats, listRepoBranches, normalizeRepoInput, originForRoot, rateLimitResetAt, relativeToSkillDir, repoSkillEntry, repoSlug, skillDirOf, skillFileAt, skillManifest } from './repo.ts'
 import type { RepoTreeItem } from './repo.ts'
 import type { RepoSkillEntry } from './protocol.ts'
 
@@ -449,3 +449,22 @@ describe('GitHub 请求头', () => {
     expect(apiHeaders().accept).toBe('application/vnd.github+json')
   })
 })
+
+describe('rateLimitResetAt', () => {
+  const response = (status: number, headers: Record<string, string>): Response => new Response('', { status, headers })
+  const exhausted = { 'x-ratelimit-remaining': '0', 'x-ratelimit-reset': '1700000000' }
+
+  it('reports the reset instant for an exhausted 403 or 429', () => {
+    expect(rateLimitResetAt(response(403, exhausted))?.getTime()).toBe(1700000000 * 1000)
+    expect(rateLimitResetAt(response(429, exhausted))?.getTime()).toBe(1700000000 * 1000)
+  })
+
+  it('is undefined for anything that is not an exhausted rate limit', () => {
+    expect(rateLimitResetAt(response(500, exhausted))).toBeUndefined()
+    expect(rateLimitResetAt(response(404, exhausted))).toBeUndefined()
+    expect(rateLimitResetAt(response(403, { 'x-ratelimit-remaining': '57', 'x-ratelimit-reset': '1700000000' }))).toBeUndefined()
+    expect(rateLimitResetAt(response(403, { 'x-ratelimit-remaining': '0' }))).toBeUndefined()
+    // 头部存在但不是数字：宁可退回普通 HTTP 文案，也不要报 "Invalid Date"。
+    expect(rateLimitResetAt(response(403, { 'x-ratelimit-remaining': '0', 'x-ratelimit-reset': 'nope' }))).toBeUndefined()
+  })
+})

package/src/repo.ts

@@ -14,7 +14,7 @@
  */
 
 // 后向兼容：老 `from './repo.ts'` 写法继续可用，新代码可直引 github-client。
-export { NO_COMPRESSION, RepoFetchError, apiHeaders, fetchError, fetchJson, fetchJsonCached, githubAuthHeaders, isAbortError, setGithubToken } from './repo/github-client.ts'
+export { NO_COMPRESSION, RepoFetchError, apiHeaders, fetchError, fetchJson, fetchJsonCached, githubAuthHeaders, isAbortError, rateLimitResetAt, setGithubToken } from './repo/github-client.ts'
 
 export type { RepoRef, RepoTreeItem, RepoFile } from './repo/types.ts'
 

package/src/routes/catalog-data.ts

@@ -199,10 +199,13 @@ export async function buildCatalog(deps: SkillHubRouteDeps, cwd?: string): Promi
     if (iface !== undefined) applyInterface(row, iface)
     return row
   })
-  const diagnostics = [
-    ...(await scanDiagnostics('user-dsh', home)),
-    ...(await scanDiagnostics('user-agents', home)),
-  ]
+  // 两个 root 的诊断扫描互不依赖：面板每 5 秒轮询一次 /catalog，串行会让响应
+  // 随技能数量线性变慢。扫描内部的逐条读盘也已是并发的（见 scanDiagnostics）。
+  const [userDshDiagnostics, userAgentsDiagnostics] = await Promise.all([
+    scanDiagnostics('user-dsh', home),
+    scanDiagnostics('user-agents', home),
+  ])
+  const diagnostics = [...userDshDiagnostics, ...userAgentsDiagnostics]
   return {
     ok: true,
     pluginVersion: CURRENT_VERSION,

package/src/routes/catalog.ts

@@ -3,8 +3,8 @@
  * create / stats。从 routes.ts 原样搬出，handler 逻辑不变。
  */
 
-import { mkdir, readFile, rename, stat } from 'node:fs/promises'
-import { basename, dirname, join } from 'node:path'
+import { readFile, stat } from 'node:fs/promises'
+import { dirname } from 'node:path'
 import type { SkillDefinition } from '@deepseek-ai/dsh-skill'
 import { isSkillName } from '@deepseek-ai/dsh-skill'
 import {
@@ -18,7 +18,7 @@ import {
   type ToggleResponse,
   type WritableRoot,
 } from '../protocol.ts'
-import { createSkill, disableSkill, enableSkill, parseFrontmatter, readSkillInterface, rootOfPath, rootPath, trashSkill } from '../skillfs.ts'
+import { createSkill, disableSkill, disabledOccupancyIn, enableSkill, occupancyOf, parseFrontmatter, readSkillInterface, rootOfPath, rootPath, trashSkill } from '../skillfs.ts'
 import { errorText } from '../error-text.ts'
 import {
   applyInterface,
@@ -146,23 +146,27 @@ export function catalogRoutes(deps: SkillHubRouteDeps): RouteSpec[] {
         // 已禁用的技能不在 registry 中，resolve 会 404，这里单独处理：允许整组删除未开启的技能
         let trashResult: { path: string; source: string } | null = null
         if (!resolved.ok) {
-          const disabled = await deps.store.getDisabled(name)
-          if (disabled !== undefined) {
-            // sidecar 里的路径可能是外部写入/损坏的：移动前必须确认它落在
-            // 可写根内（正常路径由 disableSkill 保证，这里只拦异常数据）。
-            if (rootOfPath(disabled.path, homeOf(deps)) === undefined) {
-              writeError(res, 409, 'disabled skill path is outside the hub writable roots')
-              return
-            }
-            // 禁用态：SKILL.md.disabled 或 *.md.disabled，直接将其所在技能整体移入回收站
-            const isBundleDisabled = disabled.path.endsWith('SKILL.md.disabled')
-            const sourceToTrash = isBundleDisabled ? dirname(disabled.path) : disabled.path
-            const trashDir = join(dirname(sourceToTrash), '.trash')
-            await mkdir(trashDir, { recursive: true })
-            const target = join(trashDir, basename(sourceToTrash) + '-' + Date.now())
-            await rename(sourceToTrash, target)
-            trashResult = { path: target, source: sourceToTrash }
-          } else {
+        const disabled = await deps.store.getDisabled(name)
+        if (disabled !== undefined) {
+          // sidecar 里的路径可能是外部写入/损坏的：移动前必须确认它落在
+          // 可写根内（正常路径由 disableSkill 保证，这里只拦异常数据）。
+          if (rootOfPath(disabled.path, homeOf(deps)) === undefined) {
+            writeError(res, 409, 'disabled skill path is outside the hub writable roots')
+            return
+          }
+          // 记录还在、文件已经不在（手工删了 / 从备份恢复过 sidecar）：这条记录
+          // 只是残留，清掉即算删除完成，否则它会永久占住这个名字。
+          if (!await pathExists(disabled.path)) {
+            await deps.store.removeDisabled(name)
+            await deps.store.removeSkillFromTags(name)
+            deps.invalidate?.()
+            writeJson(res, 200, { ok: true, name, path: disabled.path } satisfies SkillDeleteResponse)
+            return
+          }
+          // 禁用态：SKILL.md.disabled 或 *.md.disabled，直接将其所在技能整体移入回收站
+          // （trashSkill 认两种发现文件名，目录包按整目录搬）。
+          trashResult = await trashSkill(disabled.path)
+        } else {
             writeError(res, resolved.status, resolved.error); return
           }
         }
@@ -201,13 +205,28 @@ export function catalogRoutes(deps: SkillHubRouteDeps): RouteSpec[] {
         if (body.enabled === true) {
           const record = await deps.store.getDisabled(name)
           if (record === undefined) { writeError(res, 404, 'skill is not hub-disabled: ' + name); return }
+          // 记录里的路径可能已经失效（文件被手工删/搬走）。先在同 root 下找现存的
+          // 禁用占位：找得到就把记录指向它，找不到说明这条记录是残留 —— 清掉并把
+          // 名字还给用户，而不是让「启用」永远失败把名字锁死。
+          let disabledPath = record.path
+          if (!await pathExists(disabledPath)) {
+            // root 从记录路径反推，不直接信 sidecar 里的 root 字段（可能是损坏数据）。
+            const root = rootOfPath(disabledPath, homeOf(deps))
+            const occupancy = root === undefined ? undefined : await disabledOccupancyIn(rootPath(root, homeOf(deps)), name)
+            if (occupancy === undefined) {              await deps.store.removeDisabled(name)
+              deps.invalidate?.()
+              writeError(res, 409, 'disabled record was stale (its file no longer exists); the record has been removed — retry now')
+              return
+            }
+            disabledPath = occupancy
+          }
           try {
-            await enableSkill(record.path)
+            await enableSkill(disabledPath)
           } catch (error) {
             // The renamed file may have vanished (external cleanup); report
             // precisely instead of a generic 500, like toggle-batch does.
             if ((error as NodeJS.ErrnoException).code === 'ENOENT') {
-              writeError(res, 409, 'disabled skill file is missing on disk: ' + record.path)
+              writeError(res, 409, 'disabled skill file is missing on disk: ' + disabledPath)
               return
             }
             throw error
@@ -280,12 +299,16 @@ export function catalogRoutes(deps: SkillHubRouteDeps): RouteSpec[] {
         const existing = await deps.skills.get(name)
         if (existing !== undefined) { writeError(res, 409, 'skill name already exists: ' + name); return }
         if (await deps.store.getDisabled(name) !== undefined) { writeError(res, 409, 'skill name is disabled: re-enable it from the disabled list first'); return }
-        // A directory may exist without producing a registry entry (invalid
-        // frontmatter — exactly what the diagnostics section reports).
-        // Refuse to overwrite it instead of silently truncating its SKILL.md.
-        const target = join(rootPath(root, homeOf(deps)), name)
-        if (await pathExists(target)) {
-          writeError(res, 409, 'skill directory already exists on disk: ' + name + ' (check the discovery diagnostics)')
+        // 建档前先看磁盘：三种占位都会让新目录与旧文件并存成同名两形态 ——
+        // 已启用的发现文件（frontmatter 坏了因此注册表看不见）、已禁用的占位
+        // （目录包或扁平）、以及没有 SKILL.md 的空壳目录（正是发现诊断在报的东西）。
+        const occupancy = await occupancyOf(rootPath(root, homeOf(deps)), name)
+        if (occupancy.enabled.length > 0) {
+          writeError(res, 409, 'a skill file already occupies this name on disk: ' + name + ' (check the discovery diagnostics)')
+          return
+        }
+        if (occupancy.disabled.length > 0 || occupancy.bareDir !== undefined) {
+          writeError(res, 409, 'name is occupied by a disabled placeholder or an empty directory on disk: ' + name + ' (check the discovery diagnostics)')
           return
         }
         const path = await createSkill(root, name, readString(body, 'description'), homeOf(deps))

package/src/routes/deps.ts

@@ -43,10 +43,15 @@ export interface SkillHubRouteDeps {
 
 /** The resolved hub config a route sees (the shared resolver fills defaults). */
 export function configOf(deps: SkillHubRouteDeps): HubConfig {
-  return resolveHubConfig({}, deps.config?.() ?? {})
+  return resolveHubConfig(deps.config?.() ?? {})
 }
 
-/** The raw saved config layer a route reports (empty when the owner omits it). */
+/**
+ * The raw saved config layer as persisted in the sidecar, reported for display
+ * only. Since dsh 0.1.7 the settings namespace is the one user layer, so this
+ * is legacy data: nothing writes it any more and the effective config above
+ * never merges it.
+ */
 export function savedOf(deps: SkillHubRouteDeps): Partial<HubConfig> {
   return deps.saved?.() ?? {}
 }

package/src/routes/market.ts

@@ -7,6 +7,7 @@
 import {
   SKILL_HUB_API,
   type MarketCheckResponse,
+  type MarketSourceAddResponse,
   type MarketSourceResponse,
   type MarketSourcesResponse,
   type MarketSourceVersionsResponse,
@@ -60,6 +61,13 @@ export function marketRoutes(deps: SkillHubRouteDeps): RouteSpec[] {
       }
       try {
         const latestTag = await getLatestReleaseTag(source.repo)
+        // Book the attempt as soon as the GitHub call has been spent, before
+        // the unpinned branch below can `continue`: otherwise an unpinned
+        // source never records a timestamp and the 5-minute throttle promised
+        // above never applies to it (every check re-hits /releases/latest).
+        // A call that throws is deliberately not booked, so a failing repo is
+        // retried on the next check — same as the source check in sources.ts.
+        lastMarketCheck.set(source.repo, now)
         if (source.ref === undefined) {
           // Not pinned yet: report the latest release so the UI can
           // suggest pinning, but never claim an update.
@@ -67,7 +75,6 @@ export function marketRoutes(deps: SkillHubRouteDeps): RouteSpec[] {
           continue
         }
         const latest = await getLatestCommit(source.repo, source.ref)
-        lastMarketCheck.set(source.repo, now)
         const commitMoved = source.commitSha !== undefined && latest.commitSha !== source.commitSha
         const newRelease = latestTag !== undefined && latestTag !== source.ref
         results.push({ ...base, updateAvailable: commitMoved || newRelease, commitSha: latest.commitSha, ...(newRelease ? { latestTag } : {}) })
@@ -99,7 +106,11 @@ export function marketRoutes(deps: SkillHubRouteDeps): RouteSpec[] {
         // An explicit @ref pins the source immediately (e.g. repo@v1.2.3);
         // otherwise the first scan resolves latest-release / branch choice.
         const ref = parsed.ref
-        writeJson(res, 200, { ok: true, repos: await deps.store.addMarketSource(repoSlug(parsed), ref) } satisfies MarketSourceResponse)
+        const slug = repoSlug(parsed)
+        // Return the normalized slug explicitly: the client scans it right
+        // away, and `repos` order carries no "this one" signal (re-adding an
+        // existing repo only rewrites its ref in place).
+        writeJson(res, 200, { ok: true, repo: slug, repos: await deps.store.addMarketSource(slug, ref) } satisfies MarketSourceAddResponse)
       },
     },
     {