dsh-skill-hub 0.2.0 → 0.2.2

package/src/routes.ts

@@ -12,7 +12,7 @@
  * JSON body) exactly once, so a new route cannot forget them.
  */
 
-import { mkdir, rename, rm, stat, writeFile } from 'node:fs/promises'
+import { mkdir, readFile, rename, rm, stat, writeFile } from 'node:fs/promises'
 import { basename, dirname, join } from 'node:path'
 import type { IncomingMessage, ServerResponse } from 'node:http'
 import type { WebRoute } from '@deepseek-ai/dsh-host-webserver'
@@ -293,18 +293,85 @@ async function knownSkillNames(deps: SkillHubRouteDeps): Promise<Set<string>> {
   return names
 }
 
-/** Build the full catalog response (shared by catalog/toggle/create handlers). */
+/** 已知工作区条目（dsh 的 workspace.json 表）。 */
+interface WorkspaceEntry {
+  path: string
+  title: string
+}
+
+/**
+ * 读取 dsh 的已知工作区清单（~/.dsh/storages/workspace.json 的
+ * tables.workspaces 表）。面板默认视图据此合并所有工作区的项目技能；
+ * 文件缺失/损坏时返回空清单（回退为仅用户级视图）。
+ */
+async function workspaceEntries(home: string): Promise<WorkspaceEntry[]> {
+  try {
+    const raw = await readFile(join(home, 'storages', 'workspace.json'), 'utf8')
+    const parsed: unknown = JSON.parse(raw)
+    const tables = typeof parsed === 'object' && parsed !== null
+      ? (parsed as Record<string, unknown>).tables as Record<string, unknown> | undefined
+      : undefined
+    const workspaces = tables !== undefined && typeof tables === 'object'
+      ? (tables as Record<string, unknown>).workspaces as Record<string, unknown> | undefined
+      : undefined
+    const entries: WorkspaceEntry[] = []
+    if (workspaces !== undefined && typeof workspaces === 'object') {
+      for (const record of Object.values(workspaces)) {
+        const entry = record as { path?: unknown; title?: unknown } | null
+        if (entry !== null && typeof entry === 'object' && typeof entry.path === 'string' && entry.path !== '') {
+          entries.push({
+            path: entry.path,
+            title: typeof entry.title === 'string' && entry.title !== '' ? entry.title : entry.path,
+          })
+        }
+      }
+    }
+    return entries
+  } catch {
+    return []
+  }
+}
+
+/** 项目技能来源（workspace 字段只对它们设置）。 */
+function isProjectSource(source: string): boolean {
+  return source === 'project-dsh' || source === 'project-agents'
+}
+
+/**
+ * Build the full catalog response (shared by catalog/toggle/create handlers).
+ * 显式 cwd 只看该工作区；否则合并所有已知工作区（workspace.json）的项目技能
+ * + 用户级技能，同名技能先到先得；没有任何工作区时回退为仅用户级视图。
+ */
 async function buildCatalog(deps: SkillHubRouteDeps, cwd?: string): Promise<CatalogResponse> {
-  const lookup = cwd !== undefined ? { cwd } : undefined
-  const snapshot = await deps.skills.snapshot(lookup)
   const home = homeOf(deps)
+  let workspaces: WorkspaceEntry[]
+  if (cwd !== undefined && cwd !== '') {
+    workspaces = [{ path: cwd, title: cwd }]
+  } else {
+    workspaces = await workspaceEntries(home)
+    if (workspaces.length === 0) workspaces = [{ path: '', title: '' }]
+  }
+  const byName = new Map<string, { skill: SkillSummary; workspace?: string; workspaceTitle?: 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, {
+        skill,
+        ...(isProjectSource(skill.source) && ws.path !== '' ? { workspace: ws.path, workspaceTitle: ws.title } : {}),
+      })
+    }
+  }
   // 添加/更新时间 = 用户级技能文件的创建/修改时间（排序与详情展示用）。
   // snapshot 只给 SkillSummary（无 path），所以按可写根推断路径；非用户级
   // 来源没有稳定路径，省略字段，客户端排序会把它放到末尾。
   // 全部技能并发收集（面板每 5 秒轮询一次，逐个串行 stat 会让响应随技能
   // 数量线性变慢）。
   const timesByName = new Map<string, { addedAt: number; updatedAt: number }>()
-  await Promise.all(snapshot.skills.map(async (skill) => {
+  await Promise.all([...byName.values()].map(async ({ skill }) => {
     if (!isWritableSource(skill.source)) return
     const base = rootPath(skill.source, home)
     for (const candidate of [join(base, skill.name, 'SKILL.md'), join(base, skill.name), join(base, skill.name + '.md')]) {
@@ -317,7 +384,7 @@ async function buildCatalog(deps: SkillHubRouteDeps, cwd?: string): Promise<Cata
       }
     }
   }))
-  const skills: CatalogSkill[] = snapshot.skills.map((skill) => {
+  const skills: CatalogSkill[] = [...byName.values()].map(({ skill, workspace, workspaceTitle }) => {
     const row: CatalogSkill = {
       name: skill.name,
       description: skill.description,
@@ -328,6 +395,8 @@ async function buildCatalog(deps: SkillHubRouteDeps, cwd?: string): Promise<Cata
       },
       provider: skill.provider,
       writable: isWritableSource(skill.source),
+      source: skill.source,
+      ...(workspace !== undefined ? { workspace, workspaceTitle: workspaceTitle ?? workspace } : {}),
     }
     const times = timesByName.get(skill.name)
     if (times !== undefined) {
@@ -341,7 +410,7 @@ async function buildCatalog(deps: SkillHubRouteDeps, cwd?: string): Promise<Cata
     ...(await scanDiagnostics('user-dsh', home)),
     ...(await scanDiagnostics('user-agents', home)),
   ]
-  return { ok: true, complete: snapshot.complete, skills, disabled, diagnostics }
+  return { ok: true, complete, skills, disabled, diagnostics }
 }
 
 /** Map a loaded definition onto the wire shape. */
@@ -460,7 +529,18 @@ export function makeRoutes(deps: SkillHubRouteDeps): WebRoute[] {
         const name = queryParam(url, 'name')
         if (name === undefined || name === '') { writeError(res, 400, 'name query parameter is required'); return }
         const cwd = queryParam(url, 'cwd')
-        const skill = await deps.skills.get(name, cwd !== undefined ? { cwd } : undefined)
+        // 显式 cwd 只看该工作区；否则按已知工作区逐个查找（与目录默认视图
+        // 一致），最后回退用户级根，保证默认视图里可见的项目技能能打开详情。
+        let skill: SkillDefinition | undefined
+        if (cwd !== undefined && cwd !== '') {
+          skill = await deps.skills.get(name, { cwd })
+        } else {
+          for (const ws of await workspaceEntries(homeOf(deps))) {
+            skill = await deps.skills.get(name, { cwd: ws.path })
+            if (skill !== undefined) break
+          }
+          if (skill === undefined) skill = await deps.skills.get(name)
+        }
         if (skill === undefined) { writeError(res, 404, 'skill not found: ' + name); return }
         const detail = toDetail(skill)
         if (skill.path !== undefined) {
@@ -683,7 +763,7 @@ export function makeRoutes(deps: SkillHubRouteDeps): WebRoute[] {
       },
     }),
     // --------------------------------------------------------------- market
-    // Codex-style market sources: the user adds repo slugs; each source can
+    // Market sources: the user adds repo slugs; each source can
     // be scanned through /repo and imported through /repo/import.
     route({
       path: SKILL_HUB_API.market,
@@ -926,7 +1006,7 @@ export function makeRoutes(deps: SkillHubRouteDeps): WebRoute[] {
       },
     }),
     // -------------------------------------------------------------- update
-    // 自身更新检查：查询 GitHub latest release（语义同 cc-switch 的检查更新）。
+    // 自身更新检查：查询 GitHub latest release。
     route({
       path: SKILL_HUB_API.update,
       methods: ['GET'],

package/src/skillfs.ts

@@ -267,7 +267,7 @@ export async function findProjectRoot(cwd: string): Promise<string> {
 
 /**
  * Scan one writable root for files the provider ignores, so the GUI can
- * show why a skill never appears (the zcode-style diagnostics lesson: a
+ * show why a skill never appears — a
  * missing frontmatter must be visible, not silent). .disabled files belong
  * to the hub and are skipped.
  */

package/src/update.ts

@@ -1,5 +1,5 @@
 /**
- * Self-update check for dsh-skill-hub, mirroring cc-switch's behavior:
+ * Self-update check for dsh-skill-hub
  * query GitHub's latest release and compare it to the installed version.
  *
  * This stays dependency-free: Node's global fetch is used and the version

package/lib/types/client/api-config-scope.d.ts

@@ -1,48 +0,0 @@
-/**
- * ApiConfigScope — a FormScope-compatible view over the hub's own config
- * route (/api/skill-hub/config). The host's settings service refuses to
- * expose third-party namespaces to the web client (dsh-host-apiproxy's
- * allowlist), so the settings card talks to this plugin-owned route instead
- * of the settings transport.
- *
- * The scope mirrors the settings-scope contract the vendored CardForm
- * consumes: `value` is the effective config, `base` the built-in defaults,
- * and `user` the raw saved overrides (a field's presence there marks it
- * overridden). Writes go straight through saveConfig and re-seed the
- * snapshot from the route's response, so the card's save-verification
- * (user layer equals the written value) sees the persisted state.
- */
-import type { SkillHubApi } from './api.ts';
-import type { FormScope } from './settings-form.ts';
-/** Model-invocable dot color default. Single source for the TS side; the
- *  panel's CSS mirrors it via --hub-model (panel.module.css). */
-export declare const DEFAULT_DOT_MODEL_COLOR = "#2f81f7";
-/** User-invocable dot color default. Single source for the TS side; the
- *  panel's CSS mirrors it via --hub-user (panel.module.css). */
-export declare const DEFAULT_DOT_USER_COLOR = "#3fb950";
-/** FormScope-compatible reactive config handle (see module doc). */
-export declare class ApiConfigScope implements FormScope {
-    private readonly api;
-    private status;
-    private value;
-    private saved;
-    private readonly listeners;
-    /** @param api - the browser-half API client (shared with the skill panel). */
-    constructor(api: SkillHubApi);
-    private load;
-    subscribe(listener: () => void): () => void;
-    getSnapshot(): {
-        status: string;
-        writable: boolean;
-        value?: Record<string, unknown>;
-        base?: unknown;
-        user?: unknown;
-    };
-    /** Write one field through the config route and adopt the persisted state. */
-    set(field: string, value: unknown): Promise<void>;
-    /** Clear one field's override so it re-inherits the default. */
-    unset(field: string): Promise<void>;
-    /** Persist a patch, then re-seed from the route's fresh response. */
-    private apply;
-    private publish;
-}

package/src/client/api-config-scope.test.ts

@@ -1,79 +0,0 @@
-import { describe, expect, it } from 'vitest'
-import type { ConfigRequest, ConfigResponse, HubConfig } from '../protocol.ts'
-import type { SkillHubApi } from './api.ts'
-import { ApiConfigScope } from './api-config-scope.ts'
-
-function deferredReady(scope: ApiConfigScope): Promise<void> {
-  return new Promise((resolve) => setTimeout(resolve, 0))
-}
-
-describe('ApiConfigScope', () => {
-  it('persists the panel display toggles (showUseCount etc.)', async () => {
-    const saved: Partial<HubConfig> = {}
-    const writes: ConfigRequest[] = []
-    const api = {
-      config: async (): Promise<ConfigResponse> => ({
-        ok: true,
-        config: {
-          enabled: true,
-          announceToAgent: true,
-          showUseCount: true,
-          showUseTime: true,
-          showGroupSummary: true,
-        },
-        saved,
-      }),
-      saveConfig: async (patch: ConfigRequest): Promise<ConfigResponse> => {
-        writes.push(patch)
-        for (const [key, value] of Object.entries(patch)) {
-          if (value === null) delete saved[key as keyof HubConfig]
-          else saved[key as keyof HubConfig] = value as never
-        }
-        return {
-          ok: true,
-          config: {
-            enabled: true,
-            announceToAgent: true,
-            showUseCount: saved.showUseCount !== false,
-            showUseTime: saved.showUseTime !== false,
-            showGroupSummary: saved.showGroupSummary !== false,
-          },
-          saved,
-        }
-      },
-    } as unknown as SkillHubApi
-
-    const scope = new ApiConfigScope(api)
-    await deferredReady(scope)
-
-    await scope.set('showUseCount', false)
-    expect(writes).toContainEqual({ showUseCount: false })
-    expect(scope.getSnapshot().value).toMatchObject({ showUseCount: false })
-    expect(scope.getSnapshot().user).toMatchObject({ showUseCount: false })
-
-    await scope.unset('showUseCount')
-    expect(writes).toContainEqual({ showUseCount: null })
-    expect(scope.getSnapshot().user).not.toHaveProperty('showUseCount')
-    expect(scope.getSnapshot().value).toMatchObject({ showUseCount: true })
-  })
-
-  it('ignores unknown fields', async () => {
-    const writes: ConfigRequest[] = []
-    const api = {
-      config: async (): Promise<ConfigResponse> => ({
-        ok: true,
-        config: { enabled: true, announceToAgent: true },
-        saved: {},
-      }),
-      saveConfig: async (patch: ConfigRequest): Promise<ConfigResponse> => {
-        writes.push(patch)
-        return { ok: true, config: { enabled: true, announceToAgent: true }, saved: {} }
-      },
-    } as unknown as SkillHubApi
-
-    const scope = new ApiConfigScope(api)
-    await deferredReady(scope)
-    await scope.set('not-a-field', true)
-    expect(writes).toHaveLength(0)
-  })
-})

package/src/client/api-config-scope.ts

@@ -1,119 +0,0 @@
-/**
- * ApiConfigScope — a FormScope-compatible view over the hub's own config
- * route (/api/skill-hub/config). The host's settings service refuses to
- * expose third-party namespaces to the web client (dsh-host-apiproxy's
- * allowlist), so the settings card talks to this plugin-owned route instead
- * of the settings transport.
- *
- * The scope mirrors the settings-scope contract the vendored CardForm
- * consumes: `value` is the effective config, `base` the built-in defaults,
- * and `user` the raw saved overrides (a field's presence there marks it
- * overridden). Writes go straight through saveConfig and re-seed the
- * snapshot from the route's response, so the card's save-verification
- * (user layer equals the written value) sees the persisted state.
- */
-
-import type { HubConfig } from '../protocol.ts'
-import type { SkillHubApi } from './api.ts'
-import type { FormScope } from './settings-form.ts'
-
-/** Model-invocable dot color default. Single source for the TS side; the
- *  panel's CSS mirrors it via --hub-model (panel.module.css). */
-export const DEFAULT_DOT_MODEL_COLOR = '#2f81f7'
-/** User-invocable dot color default. Single source for the TS side; the
- *  panel's CSS mirrors it via --hub-user (panel.module.css). */
-export const DEFAULT_DOT_USER_COLOR = '#3fb950'
-
-/** Built-in defaults every field inherits until the user overrides it. */
-const DEFAULTS: HubConfig = {
-  enabled: true,
-  announceToAgent: true,
-  showUseCount: true,
-  showUseTime: true,
-  showGroupSummary: true,
-}
-
-/** Boolean config fields (color fields are strings). */
-const BOOLEAN_FIELDS = new Set<keyof HubConfig>([
-  'enabled', 'announceToAgent', 'showUseCount', 'showUseTime', 'showGroupSummary',
-])
-
-/** Config fields the card edits (used to guard set/unset field names). */
-const FIELDS = new Set<keyof HubConfig>([
-  'enabled', 'announceToAgent', 'dotModelColor', 'dotUserColor',
-  'showUseCount', 'showUseTime', 'showGroupSummary',
-])
-
-/** FormScope-compatible reactive config handle (see module doc). */
-export class ApiConfigScope implements FormScope {
-  private status: 'loading' | 'ready' | 'unavailable' = 'loading'
-  private value: HubConfig = { ...DEFAULTS }
-  private saved: Partial<HubConfig> = {}
-  private readonly listeners = new Set<() => void>()
-
-  /** @param api - the browser-half API client (shared with the skill panel). */
-  constructor(private readonly api: SkillHubApi) {
-    void this.load()
-  }
-
-  private async load(): Promise<void> {
-    try {
-      const response = await this.api.config()
-      this.value = response.config
-      this.saved = { ...response.saved }
-      this.status = 'ready'
-    } catch {
-      // The route is missing or unreachable (e.g. host half not yet updated):
-      // the card shows its not-exposed state instead of breaking the GUI.
-      this.status = 'unavailable'
-    }
-    this.publish()
-  }
-
-  subscribe(listener: () => void): () => void {
-    this.listeners.add(listener)
-    return () => { this.listeners.delete(listener) }
-  }
-
-  getSnapshot(): { status: string; writable: boolean; value?: Record<string, unknown>; base?: unknown; user?: unknown } {
-    return {
-      status: this.status,
-      writable: true,
-      value: { ...this.value } as unknown as Record<string, unknown>,
-      base: { ...DEFAULTS },
-      user: { ...this.saved },
-    }
-  }
-
-  /** Write one field through the config route and adopt the persisted state. */
-  async set(field: string, value: unknown): Promise<void> {
-    if (!FIELDS.has(field as keyof HubConfig)) return
-    const patch = BOOLEAN_FIELDS.has(field as keyof HubConfig)
-      ? { [field]: Boolean(value) }
-      : { [field]: typeof value === 'string' ? value : undefined }
-    await this.apply(patch as Partial<HubConfig>)
-  }
-
-  /** Clear one field's override so it re-inherits the default. */
-  async unset(field: string): Promise<void> {
-    if (!FIELDS.has(field as keyof HubConfig)) return
-    await this.apply({ [field]: undefined } as Partial<HubConfig>)
-  }
-
-  /** Persist a patch, then re-seed from the route's fresh response. */
-  private async apply(patch: Partial<HubConfig>): Promise<void> {
-    // null on the wire clears a saved override (see ConfigRequest).
-    const request: Record<string, boolean | string | null> = {}
-    for (const [key, value] of Object.entries(patch)) {
-      request[key] = value === undefined ? null : value
-    }
-    const response = await this.api.saveConfig(request as never)
-    this.value = response.config
-    this.saved = { ...response.saved }
-    this.publish()
-  }
-
-  private publish(): void {
-    for (const listener of this.listeners) listener()
-  }
-}