dsh-skill-hub 0.3.6 → 0.3.7

package/src/routes.ts

@@ -29,6 +29,7 @@ import {
   getLatestReleaseTag,
   isAbortError,
   listRepoBranches,
+  listRepoReleases,
   loadRepoTree,
   loadRepoTreeAt,
   normalizeRepoInput,
@@ -60,6 +61,7 @@ import {
   type MarketSourceRequest,
   type MarketSourceResponse,
   type MarketSourcesResponse,
+  type MarketSourceVersionsResponse,
   type MarketSyncResponse,
   type SourceCheckRequest,
   type SourceCheckResponse,
@@ -88,6 +90,8 @@ import {
   type SourceGroupReorderResponse,
   type TagSaveRequest,
   type TagSaveResponse,
+  type DiagnosticFixRequest,
+  type DiagnosticFixResponse,
   type ToggleBatchRequest,
   type ToggleBatchResponse,
   type ToggleRequest,
@@ -97,7 +101,7 @@ import {
   isProjectSource,
   resolveHubConfig,
 } from './protocol.ts'
-import { clearTrash, createSkill, disableSkill, enableSkill, restoreSkill, rootOfPath, rootPath, scanDiagnostics, trashSkill } from './skillfs.ts'
+import { clearTrash, createSkill, disableSkill, enableSkill, fixDiagnosticFile, parseFrontmatter, readSkillInterface, restoreSkill, rootOfPath, rootPath, scanDiagnostics, trashSkill } from './skillfs.ts'
 import { checkLatestRelease, CURRENT_VERSION } from './update.ts'
 import { dshHome, StoreError, type SkillHubStore } from './store.ts'
 import type { SkillStatsReader } from './stats.ts'
@@ -365,20 +369,49 @@ async function buildCatalog(deps: SkillHubRouteDeps, cwd?: string): Promise<Cata
     workspaces = await workspaceEntries(home)
     if (workspaces.length === 0) workspaces = [{ path: '', title: '' }]
   }
-  const byName = new Map<string, { skill: SkillSummary; workspace?: string; workspaceTitle?: string }>()
+  // Project skills with same name but different workspace are distinct entries (grouped by workspace in SourcesView), so key includes workspace for project sources.
+  const byKey = new Map<string, { skill: SkillSummary; workspace?: string; workspaceTitle?: string }>()
+  // Distinct identities per logical key: the same skill reappearing across
+  // workspace snapshots (same source+provider) is one skill, not a duplicate.
+  // Only different source/provider identities sharing a name are ambiguous.
+  const identitiesByKey = new Map<string, Set<string>>()
   let complete = true
   for (const ws of workspaces) {
     const lookup = ws.path !== '' ? { cwd: ws.path } : undefined
     const snapshot = await deps.skills.snapshot(lookup)
     if (!snapshot.complete) complete = false
     for (const skill of snapshot.skills) {
-      if (byName.has(skill.name)) continue
-      byName.set(skill.name, {
+      const logicalKey = isProjectSource(skill.source) && ws.path !== '' ? `${skill.name}\0${ws.path}\0${skill.source}` : skill.name
+      let identities = identitiesByKey.get(logicalKey)
+      if (identities === undefined) {
+        identities = new Set()
+        identitiesByKey.set(logicalKey, identities)
+      }
+      identities.add(skill.source + '\0' + skill.provider)
+      if (byKey.has(logicalKey)) continue
+      byKey.set(logicalKey, {
         skill,
         ...(isProjectSource(skill.source) && ws.path !== '' ? { workspace: ws.path, workspaceTitle: ws.title } : {}),
       })
     }
   }
+  const disabled = await deps.store.listDisabled()
+  const byName = byKey
+  // A hub-disabled record whose name is also enabled elsewhere hides one
+  // identity behind the toggle; flag it as well.
+  for (const d of disabled) {
+    let identities = identitiesByKey.get(d.name)
+    if (identities === undefined) {
+      identities = new Set()
+      identitiesByKey.set(d.name, identities)
+    }
+    identities.add('hub-disabled\0' + d.root)
+  }
+  const duplicateNames = [...identitiesByKey.entries()]
+    .filter(([, identities]) => identities.size > 1)
+    .map(([key]) => key.split('\0')[0])
+    .filter((name, idx, arr) => arr.indexOf(name) === idx)
+    .sort((a, b) => a.localeCompare(b))
   // 添加/更新时间 = 用户级技能文件的创建/修改时间（排序与详情展示用）。
   // snapshot 只给 SkillSummary（无 path），所以按可写根推断路径；非用户级
   // 来源没有稳定路径，省略字段，客户端排序会把它放到末尾。
@@ -387,7 +420,7 @@ async function buildCatalog(deps: SkillHubRouteDeps, cwd?: string): Promise<Cata
   const timesByName = new Map<string, { addedAt: number; updatedAt: number }>()
   await Promise.all([...byName.values()].map(async ({ skill }) => {
     if (!isWritableSource(skill.source)) return
-    const base = rootPath(skill.source, home)
+    const base = rootPath(skill.source as WritableRoot, home)
     for (const candidate of [join(base, skill.name, 'SKILL.md'), join(base, skill.name), join(base, skill.name + '.md')]) {
       try {
         const times = await stat(candidate)
@@ -398,6 +431,29 @@ async function buildCatalog(deps: SkillHubRouteDeps, cwd?: string): Promise<Cata
       }
     }
   }))
+  // UI metadata from agents/openai.yaml (codex SkillInterface) — best-effort, no error if missing.
+  const interfaceByName = new Map<string, { displayName?: string; shortDescription?: string; brandColor?: string; iconSmall?: string; iconLarge?: string; defaultPrompt?: string }>()
+  await Promise.all([...byName.values()].map(async ({ skill, workspace }) => {
+    const candidates: string[] = []
+    if (isWritableSource(skill.source as WritableRoot)) {
+      candidates.push(join(rootPath(skill.source as WritableRoot, home), skill.name))
+    } else if (isProjectSource(skill.source) && workspace !== undefined) {
+      candidates.push(join(workspace, skill.source === 'project-dsh' ? '.dsh/skills' : '.agents/skills', skill.name))
+    } else if (isProjectSource(skill.source)) {
+      for (const ws of workspaces) if (ws.path !== '') candidates.push(join(ws.path, skill.source === 'project-dsh' ? '.dsh/skills' : '.agents/skills', skill.name))
+    }
+    for (const dir of candidates) {
+      try {
+        const iface = await readSkillInterface(dir)
+        if (iface !== undefined) {
+          interfaceByName.set(skill.name, iface)
+          return
+        }
+      } catch {
+        // ignore
+      }
+    }
+  }))
   const skills: CatalogSkill[] = [...byName.values()].map(({ skill, workspace, workspaceTitle }) => {
     const row: CatalogSkill = {
       name: skill.name,
@@ -417,14 +473,30 @@ async function buildCatalog(deps: SkillHubRouteDeps, cwd?: string): Promise<Cata
       row.addedAt = times.addedAt
       row.updatedAt = times.updatedAt
     }
+    const iface = interfaceByName.get(skill.name)
+    if (iface !== undefined) {
+      if (iface.displayName !== undefined) row.displayName = iface.displayName
+      if (iface.shortDescription !== undefined) row.shortDescription = iface.shortDescription
+      if (iface.brandColor !== undefined) row.brandColor = iface.brandColor
+      if (iface.iconSmall !== undefined) row.iconSmall = iface.iconSmall
+      if (iface.iconLarge !== undefined) row.iconLarge = iface.iconLarge
+      if (iface.defaultPrompt !== undefined) row.defaultPrompt = iface.defaultPrompt
+    }
     return row
   })
-  const disabled = await deps.store.listDisabled()
   const diagnostics = [
     ...(await scanDiagnostics('user-dsh', home)),
     ...(await scanDiagnostics('user-agents', home)),
   ]
-  return { ok: true, pluginVersion: CURRENT_VERSION, complete, skills, disabled, diagnostics }
+  return {
+    ok: true,
+    pluginVersion: CURRENT_VERSION,
+    complete,
+    skills,
+    disabled,
+    diagnostics,
+    ...(duplicateNames.length > 0 ? { duplicateNames } : {}),
+  }
 }
 
 /** Map a loaded definition onto the wire shape. */
@@ -590,7 +662,41 @@ export function makeRoutes(deps: SkillHubRouteDeps): WebRoute[] {
           }
           if (skill === undefined) skill = await deps.skills.get(name)
         }
-        if (skill === undefined) { writeError(res, 404, 'skill not found: ' + name); return }
+        if (skill === undefined) {
+          // Hub-disabled skills live outside registry discovery (renamed to .disabled);
+          // serve their detail straight from the sidecar record + file.
+          const record = await deps.store.getDisabled(name)
+          if (record !== undefined) {
+            try {
+              const text = await readFile(record.path, 'utf8')
+              const parsed = parseFrontmatter(text)
+              if (!('error' in parsed)) {
+                const disabledDetail: SkillDetail = {
+                  name: record.name,
+                  description: parsed.value.description,
+                  ...(parsed.value.whenToUse !== undefined ? { whenToUse: parsed.value.whenToUse } : {}),
+                  invocation: { ...parsed.value.invocation },
+                  provider: 'skill-hub (disabled)',
+                  path: record.path,
+                  content: parsed.value.content,
+                }
+                try {
+                  const times = await stat(record.path)
+                  disabledDetail.addedAt = times.birthtimeMs
+                  disabledDetail.updatedAt = times.mtimeMs
+                } catch {
+                  // ignore
+                }
+                writeJson(res, 200, { ok: true, skill: disabledDetail } satisfies SkillDetailResponse)
+                return
+              }
+            } catch {
+              // fall through to 404 below
+            }
+          }
+          writeError(res, 404, 'skill not found: ' + name)
+          return
+        }
         const detail = toDetail(skill)
         if (skill.path !== undefined) {
           try {
@@ -600,6 +706,24 @@ export function makeRoutes(deps: SkillHubRouteDeps): WebRoute[] {
           } catch {
             // 文件不可读时省略时间字段，详情页不显示这两行。
           }
+          // UI metadata from agents/openai.yaml beside the skill directory (codex).
+          try {
+            const rb = skill.resourceBase as { kind?: string; path?: string } | undefined
+            const dir = rb?.kind === 'directory' && typeof rb.path === 'string' ? rb.path : (skill.path.endsWith('SKILL.md') ? dirname(skill.path) : undefined)
+            if (dir !== undefined) {
+              const iface = await readSkillInterface(dir)
+              if (iface !== undefined) {
+                if (iface.displayName !== undefined) detail.displayName = iface.displayName
+                if (iface.shortDescription !== undefined) detail.shortDescription = iface.shortDescription
+                if (iface.brandColor !== undefined) detail.brandColor = iface.brandColor
+                if (iface.iconSmall !== undefined) detail.iconSmall = iface.iconSmall
+                if (iface.iconLarge !== undefined) detail.iconLarge = iface.iconLarge
+                if (iface.defaultPrompt !== undefined) detail.defaultPrompt = iface.defaultPrompt
+              }
+            }
+          } catch {
+            // best-effort
+          }
         }
         writeJson(res, 200, { ok: true, skill: detail } satisfies SkillDetailResponse)
       },
@@ -882,6 +1006,28 @@ export function makeRoutes(deps: SkillHubRouteDeps): WebRoute[] {
         writeJson(res, 200, { ok: true, repos: await deps.store.listMarketSources() } satisfies MarketSourceResponse)
       },
     }),
+    // -------------------------------------------- market/source/versions
+    // Version picker data: release tags + branch names for one market source.
+    route({
+      path: SKILL_HUB_API.marketSourceVersions,
+      methods: ['GET'],
+      handler: async ({ res, url }) => {
+        const input = queryParam(url, 'repo') ?? ''
+        const parsed = normalizeRepoInput(input)
+        if (parsed === null) { writeError(res, 400, 'repo must be owner/repo or a github.com URL'); return }
+        const repo = repoSlug(parsed)
+        const source = await deps.store.getMarketSource(repo)
+        if (source === undefined) { writeError(res, 404, 'market source not found: ' + repo); return }
+        const [releases, branches] = await Promise.all([listRepoReleases(repo), listRepoBranches(repo)])
+        writeJson(res, 200, {
+          ok: true,
+          repo,
+          ...(source.ref !== undefined && source.ref !== '' ? { current: source.ref } : {}),
+          releases,
+          branches,
+        } satisfies MarketSourceVersionsResponse)
+      },
+    }),
     // ------------------------------------------------------- market/check
     // Update check over every market source: compares the pinned ref's
     // commit against the recorded baseline and surfaces newer releases.
@@ -986,6 +1132,12 @@ export function makeRoutes(deps: SkillHubRouteDeps): WebRoute[] {
           const releaseTag = await getLatestReleaseTag(repo)
           if (releaseTag !== undefined) {
             ref = releaseTag
+            // Auto-pin an existing but unpinned market source to the resolved
+            // release, so the row shows the tracked version from the first scan.
+            const existing = await deps.store.getMarketSource(repo)
+            if (existing !== undefined && (existing.ref === undefined || existing.ref === '')) {
+              await deps.store.setMarketSourceRef(repo, releaseTag)
+            }
           } else {
             const branches = await listRepoBranches(repo)
             if (branches.length === 0) { writeError(res, 404, 'repo has no branches to scan'); return }
@@ -993,10 +1145,10 @@ export function makeRoutes(deps: SkillHubRouteDeps): WebRoute[] {
             return
           }
         }
-        const { ref: resolvedRef, tree } = await loadRepoTree(repo, ref)
+        const { ref: resolvedRef, tree, truncated } = await loadRepoTree(repo, ref)
         const existing = await knownSkillNames(deps)
         const entries = discoverRepoEntries(tree, repo, existing)
-        writeJson(res, 200, { ok: true, repo, ref: resolvedRef, entries } satisfies RepoDiscoverResponse)
+        writeJson(res, 200, { ok: true, repo, ref: resolvedRef, entries, ...(truncated ? { truncated: true } : {}) } satisfies RepoDiscoverResponse)
       },
     }),
     // ----------------------------------------------------------- repo/import  B方案 Job
@@ -1018,6 +1170,7 @@ export function makeRoutes(deps: SkillHubRouteDeps): WebRoute[] {
         const { ref: resolvedRef, tree } = await loadRepoTree(repo, ref)
         const existing = await knownSkillNames(deps)
         const entries = discoverRepoEntries(tree, repo, existing)
+        // truncated tree is still usable for the selected paths the user already picked from the prior discover response
         const byPath = new Map(entries.map((entry) => [entry.path, entry]))
         const selected = paths.map((path) => byPath.get(path)).filter((entry): entry is NonNullable<typeof entry> => entry !== undefined)
         if (selected.length === 0) { writeError(res, 400, 'no matching skills for selected paths'); return }
@@ -1546,5 +1699,23 @@ export function makeRoutes(deps: SkillHubRouteDeps): WebRoute[] {
         writeJson(res, 200, { ok: true, deleted, failed } satisfies SourceTrashClearResponse)
       },
     }),
+    // -------------------------------------------------------- diagnostic fix
+    route({
+      path: SKILL_HUB_API.diagnosticFix,
+      methods: ['POST'],
+      jsonBody: true,
+      handler: async ({ res, body }) => {
+        const request = body as unknown as DiagnosticFixRequest
+        const rawPath = typeof request.path === 'string' ? request.path.trim() : ''
+        if (rawPath === '') { writeError(res, 400, 'path is required'); return }
+        try {
+          await fixDiagnosticFile(rawPath, homeOf(deps))
+          deps.invalidate?.()
+          writeJson(res, 200, { ok: true, path: rawPath } satisfies DiagnosticFixResponse)
+        } catch (error) {
+          writeRouteError(res, error)
+        }
+      },
+    }),
   ]
 }

package/src/skillfs.ts

@@ -171,10 +171,21 @@ export function parseFrontmatter(text: string): { value: FrontmatterValue } | {
   const match = /^---\s*\r?\n([\s\S]*?)\r?\n---\s*(?:\r?\n([\s\S]*))?$/.exec(text)
   if (match === null) return { error: 'missing YAML frontmatter (--- block)' }
   let data: unknown
+  let rawFrontmatter = match[1]
   try {
-    data = load(match[1])
+    data = load(rawFrontmatter)
   } catch (error) {
-    return { error: 'invalid YAML frontmatter: ' + (error instanceof Error ? error.message : String(error)) }
+    const repaired = repairFrontmatterScalarFields(rawFrontmatter)
+    if (repaired !== null) {
+      try {
+        data = load(repaired)
+        rawFrontmatter = repaired
+      } catch {
+        return { error: 'invalid YAML frontmatter: ' + (error instanceof Error ? error.message : String(error)) }
+      }
+    } else {
+      return { error: 'invalid YAML frontmatter: ' + (error instanceof Error ? error.message : String(error)) }
+    }
   }
   if (typeof data !== 'object' || data === null || Array.isArray(data)) {
     return { error: 'frontmatter must be a YAML mapping' }
@@ -200,6 +211,125 @@ export function parseFrontmatter(text: string): { value: FrontmatterValue } | {
   return { value: { name, description, ...(whenToUse !== undefined ? { whenToUse } : {}), invocation, content: (match[2] ?? '').trim() } }
 }
 
+/**
+ * Repair bare scalar fields that contain an unquoted colon (e.g. `description: Build for AWS: ECS`)
+ * or an invalid flow-like scalar (`@`, `` ` ``, `[`, `{`). Mirrors codex `repair_frontmatter_scalar_fields`:
+ * line-oriented, only touches lines where quoting makes the YAML valid, and preserves block scalars.
+ * Returns the repaired frontmatter string when at least one line was quoted, otherwise null.
+ */
+function repairFrontmatterScalarFields(frontmatter: string): string | null {
+  let changed = false
+  let blockScalarIndent: number | null = null
+  const repairedLines: string[] = []
+  for (const line of frontmatter.split('\n')) {
+    const indent = line.search(/[^ ]/)
+    const effectiveIndent = indent === -1 ? line.length : indent
+    if (blockScalarIndent !== null) {
+      if (line.trim() === '' || effectiveIndent > blockScalarIndent) {
+        repairedLines.push(line)
+        continue
+      }
+      blockScalarIndent = null
+    }
+    const colonIndex = line.indexOf(':')
+    if (colonIndex === -1) {
+      repairedLines.push(line)
+      continue
+    }
+    const key = line.slice(0, colonIndex)
+    const value = line.slice(colonIndex + 1)
+    if (key.trim() === '' || value.length === 0 || !/^\s/.test(value)) {
+      repairedLines.push(line)
+      continue
+    }
+    const trimmedStart = value.trimStart()
+    const leadingWhitespace = value.slice(0, value.length - trimmedStart.length)
+    let scalar = trimmedStart
+    let comment = ''
+    // Split trailing `# comment` only when `#` is preceded by whitespace and
+    // followed by whitespace/end (YAML comment rule). This preserves `#1` as content.
+    for (let idx = 0; idx < trimmedStart.length; idx += 1) {
+      if (trimmedStart[idx] === '#') {
+        const prev = idx === 0 ? ' ' : trimmedStart[idx - 1]
+        const next = idx + 1 < trimmedStart.length ? trimmedStart[idx + 1] : ' '
+        if (/\s/.test(prev) && /\s/.test(next)) {
+          const commentStart = trimmedStart.slice(0, idx).trimEnd().length
+          scalar = trimmedStart.slice(0, commentStart)
+          comment = trimmedStart.slice(commentStart)
+          break
+        }
+      }
+    }
+    scalar = scalar.trimEnd()
+    if (scalar === '') {
+      repairedLines.push(line)
+      continue
+    }
+    const firstChar = scalar[0]
+    if (firstChar === '|' || firstChar === '>') {
+      blockScalarIndent = effectiveIndent
+      repairedLines.push(line)
+      continue
+    }
+    if (firstChar === "'" || firstChar === '"') {
+      repairedLines.push(line)
+      continue
+    }
+    let hasColonSeparator = false
+    for (let i = 0; i < scalar.length - 1; i += 1) {
+      if (scalar[i] === ':' && /\s/.test(scalar[i + 1])) {
+        hasColonSeparator = true
+        break
+      }
+    }
+    let invalidFlowLike = false
+    if ((firstChar === '[' || firstChar === '{' || firstChar === '@' || firstChar === '`')) {
+      try {
+        load(scalar)
+      } catch {
+        invalidFlowLike = true
+      }
+    }
+    if (!hasColonSeparator && !invalidFlowLike) {
+      repairedLines.push(line)
+      continue
+    }
+    const quotedScalar = "'" + scalar.replace(/'/g, "''") + "'"
+    repairedLines.push(key + ':' + leadingWhitespace + quotedScalar + comment)
+    changed = true
+  }
+  return changed ? repairedLines.join('\n') : null
+}
+
+/** Try to repair a SKILL.md's frontmatter in place (unquoted colon etc.). Returns the new file text or null when not fixable. */
+export function repairFrontmatterFileText(text: string): string | null {
+  const match = /^---\s*\r?\n([\s\S]*?)\r?\n---\s*(?:\r?\n([\s\S]*))?$/.exec(text)
+  if (match === null) return null
+  const repaired = repairFrontmatterScalarFields(match[1])
+  if (repaired === null) return null
+  try {
+    load(repaired)
+  } catch {
+    return null
+  }
+  const body = match[2] ?? ''
+  return '---\n' + repaired + '\n---' + (body !== '' ? '\n' + body : '')
+}
+
+/** Repair one file on disk when its frontmatter is auto-fixable. Returns the new text. */
+export async function fixDiagnosticFile(path: string, home = dshHome()): Promise<string> {
+  const root = rootOfPath(path, home)
+  if (root === undefined) throw new TypeError('not a hub writable skill path: ' + path)
+  const text = await readFile(path, 'utf8')
+  const repairedText = repairFrontmatterFileText(text)
+  if (repairedText === null) throw new TypeError('diagnostic is not auto-fixable: ' + path)
+  // Validate the repaired text parses as a legal skill (prevents writing a still-broken file).
+  const parsed = parseFrontmatter(repairedText)
+  if ('error' in parsed) throw new TypeError('repaired frontmatter still invalid: ' + parsed.error)
+  await writeFile(path, repairedText, 'utf8')
+  return path
+}
+
 /** Official boolean grammar: true/false, 1/0, and the common string spellings. */
 function frontmatterBoolean(data: Record<string, unknown>, key: string): boolean | undefined {
   if (!Object.hasOwn(data, key)) return undefined
@@ -262,6 +392,55 @@ export function listSkillEntries(root: WritableRoot, home = dshHome()): Promise<
   return scanRoot(rootPath(root, home))
 }
 
+/** Read UI metadata from `agents/openai.yaml` beside a directory skill (mirrors codex SkillInterface). */
+export async function readSkillInterface(directory: string): Promise<{ displayName?: string; shortDescription?: string; brandColor?: string; iconSmall?: string; iconLarge?: string; defaultPrompt?: string } | undefined> {
+  const yamlPath = join(directory, 'agents', 'openai.yaml')
+  let text: string
+  try {
+    text = await readFile(yamlPath, 'utf8')
+  } catch {
+    return undefined
+  }
+  let data: unknown
+  try {
+    data = load(text)
+  } catch {
+    return undefined
+  }
+  if (typeof data !== 'object' || data === null || Array.isArray(data)) return undefined
+  const record = data as Record<string, unknown>
+  const iface = (record.interface ?? record) as Record<string, unknown>
+  // codex stores interface under top-level `interface` key, but some templates put display_name at top level; support both.
+  const ifaceObj = typeof record.interface === 'object' && record.interface !== null && !Array.isArray(record.interface) ? record.interface as Record<string, unknown> : iface
+  const cleanStr = (value: unknown, maxLen: number): string | undefined => {
+    if (typeof value !== 'string') return undefined
+    const cleaned = value.split(/\s+/).join(' ').trim()
+    if (cleaned === '' || cleaned.length > maxLen) return undefined
+    return cleaned
+  }
+  const hexColor = (value: unknown): string | undefined => {
+    if (typeof value !== 'string') return undefined
+    const trimmed = value.trim()
+    return /^#[0-9a-fA-F]{6}$/.test(trimmed) ? trimmed : undefined
+  }
+  const iconPath = (value: unknown): string | undefined => {
+    if (typeof value !== 'string' || value.trim() === '') return undefined
+    const trimmed = value.trim().replace(/\\/g, '/')
+    if (trimmed.startsWith('/') || trimmed.includes('..')) return undefined
+    if (!trimmed.startsWith('assets/')) return undefined
+    return trimmed
+  }
+  const displayName = cleanStr(ifaceObj.display_name, 64)
+  const shortDescription = cleanStr(ifaceObj.short_description, 1024)
+  const brandColor = hexColor(ifaceObj.brand_color)
+  const defaultPrompt = cleanStr(ifaceObj.default_prompt, 1024)
+  const iconSmall = iconPath(ifaceObj.icon_small)
+  const iconLarge = iconPath(ifaceObj.icon_large)
+  const hasAny = displayName !== undefined || shortDescription !== undefined || brandColor !== undefined || iconSmall !== undefined || iconLarge !== undefined || defaultPrompt !== undefined
+  if (!hasAny) return undefined
+  return { ...(displayName !== undefined ? { displayName } : {}), ...(shortDescription !== undefined ? { shortDescription } : {}), ...(brandColor !== undefined ? { brandColor } : {}), ...(iconSmall !== undefined ? { iconSmall } : {}), ...(iconLarge !== undefined ? { iconLarge } : {}), ...(defaultPrompt !== undefined ? { defaultPrompt } : {}) }
+}
+
 /**
  * Walk up from cwd (max 32 levels) for a project marker (.dsh or .git);
  * falls back to cwd itself. The provider roots project skills here.
@@ -298,9 +477,15 @@ export async function scanDiagnostics(root: WritableRoot, home = dshHome()): Pro
     }
     const parsed = parseFrontmatter(text)
     if ('error' in parsed) {
-      diagnostics.push({ path: entry.path, root, reason: parsed.error })
+      const fixable = repairFrontmatterFileText(text) !== null
+      diagnostics.push({ path: entry.path, root, reason: parsed.error, ...(fixable ? { fixable: true } : {}) })
       continue
     }
+    // File was auto-repaired in memory (e.g. unquoted `:`); surface a fixable hint so the user can persist it.
+    const repaired = repairFrontmatterFileText(text)
+    if (repaired !== null) {
+      diagnostics.push({ path: entry.path, root, reason: 'frontmatter contains unquoted colon/bracket (auto-repaired in memory; click Fix to persist)', fixable: true })
+    }
     const { value } = parsed
     // The provider registers a skill by its discovery path (directory name or
     // flat file name), so a frontmatter name that diverges from the path makes