dsh-skill-hub 0.3.23 → 0.3.25

package/lib/index.js

@@ -5126,7 +5126,34 @@ function apply(ctx, config) {
 		}
 		return current();
 	};
+	/**
+	* Whether this plugin's fiber is still mounted.
+	*
+	* Async work started from `apply()` — the stats wiring and the persistence
+	* probe — can settle after the fiber unloaded: a config rewrite reloads the
+	* plugin, and disable/enable tears it down. Service reads on an inactive
+	* context throw instead of returning undefined, so every continuation
+	* re-checks this before touching `ctx` (issue #19: a cold-start abort with
+	* `cannot get required service "systemPrompt" in inactive context`).
+	*
+	* The generation counters cannot cover this: they only invalidate a build
+	* superseded by a *newer* build, and teardown does not bump them.
+	*/
+	const mounted = () => {
+		const fiber = ctx.fiber;
+		return fiber === void 0 || fiber.uid !== null;
+	};
+	/** Logger for continuations that may outlive the fiber (#19). */
+	const logInfo = (message) => {
+		if (mounted()) ctx.logger.info(message);
+	};
+	const logWarn = (message, error) => {
+		if (!mounted()) return;
+		if (error === void 0) ctx.logger.warn(message);
+		else ctx.logger.warn(message, error);
+	};
 	const sync = () => {
+		if (!mounted()) return;
 		if (disposeSection !== void 0) {
 			disposeSection();
 			disposeSection = void 0;
@@ -5178,32 +5205,33 @@ function apply(ctx, config) {
 		const agentsHome = process.env.DSH_AGENTS_HOME ?? join(homedir(), ".agents");
 		for (const root of [join(home, "skills"), join(agentsHome, "skills")]) try {
 			const c = await cleanupLeftoverImportDirs(root);
-			if (c > 0) ctx.logger.info(`[dsh-skill-hub] startup cleaned ${c} leftover import temp dir(s) in ${root}`);
+			if (c > 0) logInfo(`[dsh-skill-hub] startup cleaned ${c} leftover import temp dir(s) in ${root}`);
 		} catch (error) {
-			ctx.logger.warn("[dsh-skill-hub] startup cleanup failed", error);
+			logWarn("[dsh-skill-hub] startup cleanup failed", error);
 		}
 		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(", ")}`);
+			if (reconciled.length > 0) logInfo(`[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);
+			logWarn("[dsh-skill-hub] startup disabled-skill reconcile failed", error);
 		}
 		try {
 			const pruned = await pruneStaleDisabledSkills(store, home);
-			if (pruned.repaired.length > 0 || pruned.removed.length > 0) ctx.logger.info(`[dsh-skill-hub] startup pruned disabled records: repaired ${pruned.repaired.length} (${pruned.repaired.map((entry) => entry.name).join(", ") || "-"}), removed ${pruned.removed.length} (${pruned.removed.join(", ") || "-"})`);
+			if (pruned.repaired.length > 0 || pruned.removed.length > 0) logInfo(`[dsh-skill-hub] startup pruned disabled records: repaired ${pruned.repaired.length} (${pruned.repaired.map((entry) => entry.name).join(", ") || "-"}), removed ${pruned.removed.length} (${pruned.removed.join(", ") || "-"})`);
 		} catch (error) {
-			ctx.logger.warn("[dsh-skill-hub] startup disabled-record prune failed", error);
+			logWarn("[dsh-skill-hub] startup disabled-record prune failed", error);
 		}
 	})();
 	(async () => {
 		try {
 			const legacy = await store.getConfig();
+			if (!mounted()) return;
 			if (Object.keys(legacy).length > 0 && Object.keys(saved()).length === 0) {
 				const settings = settingsOf();
 				if (settings !== void 0) await settings.update(ENTRY_ID, legacy);
 			}
 		} catch (error) {
-			ctx.logger.warn("[dsh-skill-hub] sidecar config migration into the settings namespace failed", error);
+			logWarn("[dsh-skill-hub] sidecar config migration into the settings namespace failed", error);
 		}
 	})();
 	let statsQuery;
@@ -5216,7 +5244,7 @@ function apply(ctx, config) {
 		const cold = statsPersistence;
 		(async () => {
 			const checkpoint = await store.getSkillStatsState().catch(() => void 0);
-			if (generation !== statsGeneration) return;
+			if (generation !== statsGeneration || !mounted()) return;
 			const scanMinutes = () => {
 				const value = current().statsScanMinutes;
 				return typeof value === "number" && value >= 1 ? Math.floor(value) : HUB_CONFIG_DEFAULTS.statsScanMinutes;
@@ -5247,11 +5275,11 @@ function apply(ctx, config) {
 				},
 				onCheckpoint: (next) => {
 					store.saveSkillStatsState(next).catch((error) => {
-						ctx.logger.warn("[dsh-skill-hub] persisting skill-stats checkpoint failed", error);
+						if (mounted()) ctx.logger.warn("[dsh-skill-hub] persisting skill-stats checkpoint failed", error);
 					});
 				}
 			});
-			if (generation !== statsGeneration) return;
+			if (generation !== statsGeneration || !mounted()) return;
 			ctx.logger.info(`[dsh-skill-hub] stats seam: ${cold === void 0 ? "session-query (fallback)" : "session-persistence (cold)"}`);
 			stats = reader;
 			sync();
@@ -5265,15 +5293,16 @@ function apply(ctx, config) {
 				const raw = pctx.sessionPersistence;
 				const seam = asPersistenceSeam(raw);
 				if (seam === void 0) {
-					ctx.logger.warn("[dsh-skill-hub] sessionPersistence shape mismatch, staying on query fallback");
+					if (mounted()) ctx.logger.warn("[dsh-skill-hub] sessionPersistence shape mismatch, staying on query fallback");
 					return;
 				}
 				try {
 					await seam.list();
 				} catch (error) {
-					ctx.logger.warn("[dsh-skill-hub] persistence seam probe failed, staying on query fallback", error);
+					if (mounted()) ctx.logger.warn("[dsh-skill-hub] persistence seam probe failed, staying on query fallback", error);
 					return;
 				}
+				if (!mounted()) return;
 				statsPersistence = seam;
 				wireStats();
 			})();

package/lib/types/client/api.d.ts

@@ -7,6 +7,28 @@ import { type CatalogResponse, type ConfigResponse, type CreateRequest, type Cre
 export declare class SkillHubApiError extends Error {
     constructor(message: string);
 }
+/**
+ * Resolve one route path against the page's base.
+ *
+ * Every route in this family is registered on the server as a root-absolute
+ * path (`/api/skill-hub/...`), which is right there but wrong in a browser
+ * behind a reverse proxy that owns a path prefix: the page loads from
+ * `https://host/app/dsh/` while a root-absolute URL drops the prefix entirely,
+ * so the gateway answers 404 HTML and `readJson` reports "invalid JSON
+ * response" (issue #18). Resolving against `document.baseURI` is the host's own
+ * convention — `dsh-client-connection` opens its browser carrier with
+ * `new URL(path.slice(1), document.baseURI)` — so a root deployment resolves to
+ * exactly the same absolute path while a prefixed one keeps its prefix, and the
+ * gateway strips it before forwarding: the server still receives
+ * `/api/skill-hub/*`.
+ *
+ * `SKILL_HUB_API_ROOT` must stay absolute (the same constant registers the
+ * routes on the server), which is why the prefix is applied here at the single
+ * outbound boundary rather than in the constants.
+ * @param path - one route path, root-absolute unless it is already a full URL.
+ * @returns the URL to fetch.
+ */
+export declare function resolveApiUrl(path: string): string;
 /** The browser half's only data entry point. */
 export declare class SkillHubApi {
     /** One GET round trip (query already encoded by the caller). */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-skill-hub",
-  "version": "0.3.23",
+  "version": "0.3.25",
   "description": "In-GUI skill hub for DeepSeek Harness (dsh): browse the full local skill catalog from the official ctx.skills registry (every root + third-party providers), toggle skills on/off, inspect bodies, surface frontmatter diagnostics, and scaffold new skills — plus a codex-style skill market (built-in catalog, upstream update checks, one-click update-all) with tracked source sync. The full manager beyond the read-only dsh-skill-manager browser.",
   "type": "module",
   "engines": {

package/src/client/api.test.ts

@@ -0,0 +1,51 @@
+/**
+ * Root-absolute route paths must resolve against the page's base, not the site
+ * root: behind a reverse proxy that owns a path prefix (`https://host/app/dsh/`)
+ * a root-absolute URL loses the prefix and the gateway answers 404 HTML — the
+ * `HTTP 404: invalid JSON response` banner in issue #18.
+ */
+
+import { afterEach, describe, expect, it, vi } from 'vitest'
+import { SkillHubApi, resolveApiUrl } from './api.ts'
+
+describe('resolveApiUrl (issue #18)', () => {
+  afterEach(() => { vi.unstubAllGlobals() })
+
+  it('resolves to the site root for a plain deployment', () => {
+    vi.stubGlobal('document', { baseURI: 'http://127.0.0.1:3080/' })
+    expect(resolveApiUrl('/api/skill-hub/catalog')).toBe('http://127.0.0.1:3080/api/skill-hub/catalog')
+  })
+
+  it('keeps a reverse proxy path prefix', () => {
+    vi.stubGlobal('document', { baseURI: 'https://host.example.com/app/dsh/' })
+    expect(resolveApiUrl('/api/skill-hub/catalog')).toBe('https://host.example.com/app/dsh/api/skill-hub/catalog')
+  })
+
+  it('passes full URLs through and tolerates a missing document (SSR/tests)', () => {
+    expect(resolveApiUrl('https://cdn.example.com/x.json')).toBe('https://cdn.example.com/x.json')
+    expect(resolveApiUrl('/api/skill-hub/catalog')).toBe('/api/skill-hub/catalog')
+  })
+})
+
+describe('SkillHubApi outbound boundary (issue #18)', () => {
+  afterEach(() => { vi.unstubAllGlobals() })
+
+  it('sends every request through the resolved URL, prefix included', async () => {
+    vi.stubGlobal('document', { baseURI: 'https://host.example.com/app/dsh/' })
+    const seen: string[] = []
+    vi.stubGlobal('fetch', async (url: string) => {
+      seen.push(String(url))
+      return new Response(JSON.stringify({ ok: true, skills: [], disabled: [], diagnostics: [] }), {
+        status: 200,
+        headers: { 'content-type': 'application/json' },
+      })
+    })
+
+    const api = new SkillHubApi()
+    await api.catalog()
+
+    // One outbound path for the whole family: the prefix is applied once, here.
+    expect(seen).toHaveLength(1)
+    expect(seen[0]).toBe('https://host.example.com/app/dsh/api/skill-hub/catalog')
+  })
+})

package/src/client/api.ts

@@ -83,6 +83,37 @@ async function readJson<T>(response: Response): Promise<T> {
   return body as T
 }
 
+/**
+ * Resolve one route path against the page's base.
+ *
+ * Every route in this family is registered on the server as a root-absolute
+ * path (`/api/skill-hub/...`), which is right there but wrong in a browser
+ * behind a reverse proxy that owns a path prefix: the page loads from
+ * `https://host/app/dsh/` while a root-absolute URL drops the prefix entirely,
+ * so the gateway answers 404 HTML and `readJson` reports "invalid JSON
+ * response" (issue #18). Resolving against `document.baseURI` is the host's own
+ * convention — `dsh-client-connection` opens its browser carrier with
+ * `new URL(path.slice(1), document.baseURI)` — so a root deployment resolves to
+ * exactly the same absolute path while a prefixed one keeps its prefix, and the
+ * gateway strips it before forwarding: the server still receives
+ * `/api/skill-hub/*`.
+ *
+ * `SKILL_HUB_API_ROOT` must stay absolute (the same constant registers the
+ * routes on the server), which is why the prefix is applied here at the single
+ * outbound boundary rather than in the constants.
+ * @param path - one route path, root-absolute unless it is already a full URL.
+ * @returns the URL to fetch.
+ */
+export function resolveApiUrl(path: string): string {
+  if (!path.startsWith('/')) return path
+  if (typeof document === 'undefined') return path
+  try {
+    return new URL(path.slice(1), document.baseURI).href
+  } catch {
+    return path
+  }
+}
+
 /**
  * Fetch with a hard timeout: a hung connection (proxy, stalled keep-alive,
  * host wedged) must never leave the panel stuck on "loading" forever — it
@@ -92,7 +123,7 @@ async function fetchWithTimeout(input: RequestInfo | URL, init?: RequestInit, ms
   const controller = new AbortController()
   const timer = setTimeout(() => controller.abort(), ms)
   try {
-    return await fetch(input, { ...init, signal: controller.signal })
+    return await fetch(typeof input === 'string' ? resolveApiUrl(input) : input, { ...init, signal: controller.signal })
   } finally {
     clearTimeout(timer)
   }

package/src/index.ts

@@ -221,7 +221,40 @@ export function apply(ctx: Context, config?: Config): void {
   // (including the config route) stays mounted even with the master switch
   // off so the settings card can always read and re-enable the hub; the
   // business routes answer 503 while disabled.
+  /**
+   * Whether this plugin's fiber is still mounted.
+   *
+   * Async work started from `apply()` — the stats wiring and the persistence
+   * probe — can settle after the fiber unloaded: a config rewrite reloads the
+   * plugin, and disable/enable tears it down. Service reads on an inactive
+   * context throw instead of returning undefined, so every continuation
+   * re-checks this before touching `ctx` (issue #19: a cold-start abort with
+   * `cannot get required service "systemPrompt" in inactive context`).
+   *
+   * The generation counters cannot cover this: they only invalidate a build
+   * superseded by a *newer* build, and teardown does not bump them.
+   */
+  const mounted = (): boolean => {
+    // `fiber` has always been public on a Cordis context, but stay tolerant of
+    // a host whose Cordis predates it: absent means "we cannot tell", and the
+    // pre-#19 behaviour is the safer answer there.
+    const fiber = (ctx as { fiber?: { uid: number | null } }).fiber
+    return fiber === undefined || fiber.uid !== null
+  }
+
+  /** Logger for continuations that may outlive the fiber (#19). */
+  const logInfo = (message: string): void => {
+    if (mounted()) ctx.logger.info(message)
+  }
+  const logWarn = (message: string, error?: unknown): void => {
+    if (!mounted()) return
+    if (error === undefined) ctx.logger.warn(message)
+    else ctx.logger.warn(message, error)
+  }
+
   const sync = (): void => {
+    // A late stats continuation may still reach here after teardown (#19).
+    if (!mounted()) return
     if (disposeSection !== undefined) {
       disposeSection()
       disposeSection = undefined
@@ -304,9 +337,9 @@ export function apply(ctx: Context, config?: Config): void {
     for (const root of [join(home, 'skills'), join(agentsHome, 'skills')]) {
       try {
         const c = await cleanupLeftoverImportDirs(root)
-        if (c > 0) ctx.logger.info(`[dsh-skill-hub] startup cleaned ${c} leftover import temp dir(s) in ${root}`)
+        if (c > 0) logInfo(`[dsh-skill-hub] startup cleaned ${c} leftover import temp dir(s) in ${root}`)
       } catch (error) {
-        ctx.logger.warn('[dsh-skill-hub] startup cleanup failed', error)
+        logWarn('[dsh-skill-hub] startup cleanup failed', error)
       }
     }
     // 对账：磁盘上已有 .disabled、sidecar 却无记录（状态文件被恢复/手改、旧版本
@@ -314,32 +347,34 @@ export function apply(ctx: Context, config?: Config): void {
     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(', ')}`)
+        logInfo(`[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)
+      logWarn('[dsh-skill-hub] startup disabled-skill reconcile failed', error)
     }
     // 反向对账：记录还在、文件已不在 → 修路径或删记录。不做这一步，那条记录会
     // 把名字永久锁死（启用/新建/删除三条路都失败）。
     try {
       const pruned = await pruneStaleDisabledSkills(store, home)
       if (pruned.repaired.length > 0 || pruned.removed.length > 0) {
-        ctx.logger.info(`[dsh-skill-hub] startup pruned disabled records: repaired ${pruned.repaired.length} (${pruned.repaired.map((entry) => entry.name).join(', ') || '-'}), removed ${pruned.removed.length} (${pruned.removed.join(', ') || '-'})`)
+        logInfo(`[dsh-skill-hub] startup pruned disabled records: repaired ${pruned.repaired.length} (${pruned.repaired.map((entry) => entry.name).join(', ') || '-'}), removed ${pruned.removed.length} (${pruned.removed.join(', ') || '-'})`)
       }
     } catch (error) {
-      ctx.logger.warn('[dsh-skill-hub] startup disabled-record prune failed', error)
+      logWarn('[dsh-skill-hub] startup disabled-record prune failed', error)
     }
   })()
 
   void (async () => {
     try {
       const legacy = await store.getConfig()
+      // The read is awaited; the plugin may have unloaded meanwhile (#19).
+      if (!mounted()) return
       if (Object.keys(legacy).length > 0 && Object.keys(saved()).length === 0) {
         const settings = settingsOf()
         if (settings !== undefined) await settings.update(ENTRY_ID, legacy as Record<string, unknown>)
       }
     } catch (error) {
-      ctx.logger.warn('[dsh-skill-hub] sidecar config migration into the settings namespace failed', error)
+      logWarn('[dsh-skill-hub] sidecar config migration into the settings namespace failed', error)
     }
   })()
 
@@ -375,7 +410,7 @@ export function apply(ctx: Context, config?: Config): void {
       // 重启后面板秒出旧数、后台重扫。扫描间隔与滚动窗口都从设置命名空间
       // 实时读取——卡片里改完即生效，无需重启。
       const checkpoint = await store.getSkillStatsState().catch(() => undefined)
-      if (generation !== statsGeneration) return
+      if (generation !== statsGeneration || !mounted()) return
       const scanMinutes = (): number => {
         const value = current().statsScanMinutes
         return typeof value === 'number' && value >= 1 ? Math.floor(value) : HUB_CONFIG_DEFAULTS.statsScanMinutes
@@ -407,11 +442,11 @@ export function apply(ctx: Context, config?: Config): void {
         }),
         onCheckpoint: (next) => {
           void store.saveSkillStatsState(next).catch((error) => {
-            ctx.logger.warn('[dsh-skill-hub] persisting skill-stats checkpoint failed', error)
+            if (mounted()) ctx.logger.warn('[dsh-skill-hub] persisting skill-stats checkpoint failed', error)
           })
         },
       })
-      if (generation !== statsGeneration) return
+      if (generation !== statsGeneration || !mounted()) return
       ctx.logger.info(`[dsh-skill-hub] stats seam: ${cold === undefined ? 'session-query (fallback)' : 'session-persistence (cold)'}`)
       stats = reader
       sync()
@@ -427,15 +462,17 @@ export function apply(ctx: Context, config?: Config): void {
         const raw = (pctx as unknown as { sessionPersistence?: unknown }).sessionPersistence
         const seam = asPersistenceSeam(raw)
         if (seam === undefined) {
-          ctx.logger.warn('[dsh-skill-hub] sessionPersistence shape mismatch, staying on query fallback')
+          if (mounted()) ctx.logger.warn('[dsh-skill-hub] sessionPersistence shape mismatch, staying on query fallback')
           return
         }
         try {
           await seam.list() // probe: headers only, must succeed before trusting the cold path
         } catch (error) {
-          ctx.logger.warn('[dsh-skill-hub] persistence seam probe failed, staying on query fallback', error)
+          if (mounted()) ctx.logger.warn('[dsh-skill-hub] persistence seam probe failed, staying on query fallback', error)
           return
         }
+        // The probe is awaited, so the plugin may have unloaded meanwhile (#19).
+        if (!mounted()) return
         statsPersistence = seam
         wireStats()
       })()

package/src/lifecycle.test.ts

@@ -0,0 +1,101 @@
+/**
+ * Plugin lifecycle: asynchronous work started from `apply()` must not touch the
+ * context after the fiber unloaded. Issue #19 was a cold-start abort —
+ * `cannot get required service "systemPrompt" in inactive context` — when the
+ * stats wiring settled after a config-driven reload had torn the plugin down.
+ */
+
+import { mkdtemp, rm } from 'node:fs/promises'
+import { tmpdir } from 'node:os'
+import { join } from 'node:path'
+import { afterEach, beforeEach, describe, expect, it } from 'vitest'
+import { apply } from './index.ts'
+
+/** Minimal context double: records what the plugin registers, exposes a controllable fiber. */
+function fakeHost() {
+  const sections: string[] = []
+  const routes: string[] = []
+  const injected: Array<(context: unknown) => void> = []
+  const fiber: { uid: number | null } = { uid: 1 }
+  const context = {
+    fiber,
+    logger: { info: () => {}, warn: () => {} },
+    /** No optional services (settings) and no Connection: every optional path degrades. */
+    get: () => undefined,
+    skills: {
+      registerProvider: () => () => {},
+      snapshot: async () => ({ skills: [], complete: true }),
+      get: async () => undefined,
+    },
+    systemPrompt: {
+      section: (spec: { name: string }) => {
+        sections.push(spec.name)
+        return () => {}
+      },
+    },
+    webServer: {
+      register: (route: { path: string }) => {
+        routes.push(route.path)
+        return () => {}
+      },
+    },
+    effect: (body: () => unknown) => {
+      const produced = body()
+      return () => {
+        if (typeof produced === 'function') (produced as () => void)()
+      }
+    },
+    inject: (_names: unknown, run: (child: unknown) => void) => { injected.push(run) },
+  }
+  return { context, sections, routes, fiber, injected }
+}
+
+/** The session-query seam the stats wiring accepts. */
+const queryStub = {
+  listSessions: async () => [],
+  readSession: async () => ({ events: [] }),
+}
+
+describe('plugin lifecycle (issue #19)', () => {
+  let home: string
+  const originalHome = process.env.DSH_HOME
+
+  beforeEach(async () => {
+    home = await mkdtemp(join(tmpdir(), 'dsh-skill-hub-lifecycle-'))
+    process.env.DSH_HOME = home
+  })
+
+  afterEach(async () => {
+    if (originalHome === undefined) delete process.env.DSH_HOME
+    else process.env.DSH_HOME = originalHome
+    await rm(home, { recursive: true, force: true })
+  })
+
+  it('mounts the announced section and route family once for an active fiber', () => {
+    const host = fakeHost()
+    apply(host.context as never, undefined)
+    expect(host.sections).toEqual(['plugin:dsh-skill-hub'])
+    expect(host.routes).toContain('/api/skill-hub/catalog')
+  })
+
+  it('drops a late stats continuation instead of syncing on an inactive context', async () => {
+    const host = fakeHost()
+    apply(host.context as never, undefined)
+    const beforeUnload = host.sections.length
+
+    // The session-query service arrives: wireStats() starts an async build that
+    // first awaits the persisted scan checkpoint. The nested persistence probe
+    // is left unmounted (the child `inject` never calls back).
+    expect(host.injected).toHaveLength(1)
+    host.injected[0]!({ sessionQuery: queryStub, inject: () => {} })
+
+    // A config rewrite (or disable) unloads the fiber while that await is in
+    // flight — the exact window issue #19 aborted on.
+    host.fiber.uid = null
+    await new Promise((resolve) => setTimeout(resolve, 100))
+
+    // Without the guard the continuation called sync(), which re-registered the
+    // announcement on the dead context (and threw on a real host).
+    expect(host.sections).toHaveLength(beforeUnload)
+  })
+})