@goodandready/dsh-model-sync 0.5.2 → 0.5.4

package/lib/http.js

@@ -240,6 +240,12 @@ export function normalizeSelectionRequest(body) {
 }
 
 export function registerHttpApi(ctx, synchronizer, { getSchedulerStatus = () => null } = {}) {
+  if (typeof ctx?.webServer?.register !== 'function') {
+    if (typeof ctx?.logger?.warn === 'function') {
+      ctx.logger.warn('[dsh-model-sync] webServer service unavailable, HTTP API skipped')
+    }
+    return []
+  }
   const makeHandler = (route) => async (req, res) => {
     if (!trusted(req, { requireLoopback: req.method === 'POST' })) return json(res, 403, { error: { code: 'forbidden', message: 'dsh-model-sync: cross-origin or non-loopback request rejected' } })
     if (route === 'status') {

package/lib/index.js

@@ -6,31 +6,31 @@ import { registerHttpApi } from './http.js'
 import { registerPluginUpdater } from './updater.js'
 
 export const name = '@goodandready/dsh-model-sync'
-export const inject = ['llm', 'settings', 'webServer', 'credentials']
+export const inject = ['llm', 'webServer', 'credentials']
 
 const NS = 'dsh-model-sync'
 
 export const Config = Schema.object({
-  enabled: Schema.boolean().default(true),
-  intervalMinutes: Schema.number().default(60),
-  scheduleEnabled: Schema.boolean().default(false),
-  jitterMinutes: Schema.number().default(0),
-  ttlMinutes: Schema.number().default(0),
-  autoApply: Schema.boolean().default(false),
-  requestTimeoutMs: Schema.number().default(15000),
-  retryAttempts: Schema.number().default(3),
-  retryBaseDelayMs: Schema.number().default(250),
-  retryMaxDelayMs: Schema.number().default(4000),
-  concurrency: Schema.number().default(4),
-  circuitBreakerFailures: Schema.number().default(3),
-  circuitBreakerCooldownMinutes: Schema.number().default(5),
-  historyLimit: Schema.number().default(50),
-  notificationLimit: Schema.number().default(50),
-  diffWebhookUrl: Schema.string().default(),
-  diffWebhookSecret: Schema.string().default(),
-  notifyOnModelAdded: Schema.boolean().default(true),
-  notifyOnModelDeprecated: Schema.boolean().default(true),
-  notifyOnPriceChanged: Schema.boolean().default(true),
+  enabled: Schema.boolean().default(true).volatile(),
+  intervalMinutes: Schema.number().default(60).volatile(),
+  scheduleEnabled: Schema.boolean().default(false).volatile(),
+  jitterMinutes: Schema.number().default(0).volatile(),
+  ttlMinutes: Schema.number().default(0).volatile(),
+  autoApply: Schema.boolean().default(false).volatile(),
+  requestTimeoutMs: Schema.number().default(15000).volatile(),
+  retryAttempts: Schema.number().default(3).volatile(),
+  retryBaseDelayMs: Schema.number().default(250).volatile(),
+  retryMaxDelayMs: Schema.number().default(4000).volatile(),
+  concurrency: Schema.number().default(4).volatile(),
+  circuitBreakerFailures: Schema.number().default(3).volatile(),
+  circuitBreakerCooldownMinutes: Schema.number().default(5).volatile(),
+  historyLimit: Schema.number().default(50).volatile(),
+  notificationLimit: Schema.number().default(50).volatile(),
+  diffWebhookUrl: Schema.string().default().volatile(),
+  diffWebhookSecret: Schema.string().default().volatile(),
+  notifyOnModelAdded: Schema.boolean().default(true).volatile(),
+  notifyOnModelDeprecated: Schema.boolean().default(true).volatile(),
+  notifyOnPriceChanged: Schema.boolean().default(true).volatile(),
   notifications: Schema.array(Schema.object({
     id: Schema.string().required(),
     fingerprint: Schema.string().required(),
@@ -44,9 +44,9 @@ export const Config = Schema.object({
     message: Schema.string().required(),
     providers: Schema.array(Schema.object({}).loose()).default([]),
   }).loose()).default([]),
-  staleGraceRuns: Schema.number().default(2),
-  lifecycleRetentionRuns: Schema.number().default(20),
-  lifecycleRevision: Schema.number().default(0),
+  staleGraceRuns: Schema.number().default(2).volatile(),
+  lifecycleRetentionRuns: Schema.number().default(20).volatile(),
+  lifecycleRevision: Schema.number().default(0).volatile(),
   modelLifecycle: Schema.dict(Schema.dict(Schema.object({
     status: Schema.string().required(),
     consecutiveMissing: Schema.number().default(0),
@@ -79,7 +79,7 @@ export const Config = Schema.object({
     strategy: Schema.string(),
     updatedAt: Schema.number().default(0),
   }).loose()).default({}),
-  modelSelections: Schema.dict(Schema.array(Schema.string())).default({}),
+  modelSelections: Schema.dict(Schema.array(Schema.string())).default({}).volatile(),
   adapterRegistry: Schema.dict(Schema.object({
     enabled: Schema.boolean().default(true),
     endpoint: Schema.string().default(''),
@@ -110,12 +110,46 @@ export const Config = Schema.object({
   }).loose())).default({}),
 })
 
+// DSH serves a namespace's settings form from the volatile fields of its profile
+// entry schema, and a volatile field holds a Volatile box rather than its value.
+// Unwrap before any caller reads one, and read lazily: the Loader mutates the
+// boxes in place and re-announces them with loader/volatile-update.
+export function plainConfig(value) {
+  if (value === null || typeof value !== 'object') return value
+  if (Array.isArray(value)) return value.map(plainConfig)
+  if (typeof value.get === 'function') return plainConfig(value.get())
+  return Object.fromEntries(Object.entries(value).map(([k, v]) => [k, plainConfig(v)]))
+}
+
 export function apply(ctx, config) {
-  const baseConfig = structuredClone(config || {})
-  const resolveConfig = (value) => Config(structuredClone(value || {}))
+  const baseConfig = structuredClone(plainConfig(config || {}))
+  const resolveConfig = (value) => plainConfig(Config(plainConfig(value) || {}))
   let liveConfig = resolveConfig(baseConfig)
   let reconfigure = () => {}
-  let saveConfigImpl
+  let saveConfigImpl = async (patch) => {
+    const plainPatch = plainConfig(patch)
+    let settings
+    try {
+      settings = (typeof ctx.get === 'function' ? ctx.get('settings') : null) ?? ctx.settings
+    } catch (err) {
+      if (typeof ctx.logger?.debug === 'function') {
+        ctx.logger.debug('[dsh-model-sync] settings service read failed:', err)
+      }
+    }
+    if (settings && typeof settings.update === 'function') {
+      try {
+        await settings.update(NS, plainPatch)
+      } catch (err) {
+        if (typeof ctx.logger?.warn === 'function') {
+          ctx.logger.warn('[dsh-model-sync] settings.update failed:', err)
+        }
+      }
+    }
+    liveConfig = resolveConfig({ ...liveConfig, ...plainPatch })
+    reconfigure()
+    return liveConfig
+  }
+
   // ctx.inject starts a child fiber; keep a stable function reference for the
   // synchronizer while that fiber connects to the Settings service.
   const saveConfig = async (patch) => {
@@ -125,50 +159,23 @@ export function apply(ctx, config) {
     return saveConfigImpl(patch)
   }
 
-  let settingsScope
-  const bindSettings = (settings, ownerCtx) => {
-    if (settingsScope || !settings?.register) return false
-    const scope = settings.register(NS, Config, { base: baseConfig })
-    settingsScope = scope
-    liveConfig = resolveConfig(scope.get() || baseConfig)
-    const stop = scope.watch((next) => {
-      liveConfig = resolveConfig(next || baseConfig)
-      reconfigure()
-    })
-    let saveQueue = Promise.resolve()
-    saveConfigImpl = (patch) => {
-      const nextTask = saveQueue.then(async () => {
-        const result = await scope.update(patch)
-        liveConfig = resolveConfig(scope.get() || baseConfig)
-        return result
-      })
-      saveQueue = nextTask.catch(() => {})
-      return nextTask
-    }
-    ownerCtx.effect(() => () => {
-      settingsScope = undefined
-      saveConfigImpl = undefined
-      stop()
-    }, 'dsh-model-sync: settings')
-    return true
-  }
-
-  let settings
-  try { settings = ctx.get('settings') } catch (e) {
-    if (typeof ctx.logger?.debug === 'function') ctx.logger.debug('[dsh-model-sync] settings service not immediately available:', e)
-  }
-  if (!bindSettings(settings, ctx)) {
-    ctx.inject(['settings'], (sctx) => {
-      bindSettings((typeof sctx.get === 'function' ? sctx.get('settings') : null) ?? sctx.settings, sctx)
-    })
-  }
-
-
   const service = createProviderService(ctx)
   const synchronizer = createModelSynchronizer(ctx, { getConfig: () => liveConfig, saveConfig })
   const scheduler = createSyncScheduler(synchronizer, { getConfig: () => liveConfig })
   reconfigure = () => scheduler.reconfigure()
   scheduler.start()
+
+  if (typeof ctx.on === 'function') {
+    ctx.on('loader/volatile-update', () => {
+      liveConfig = resolveConfig(config)
+      reconfigure()
+    })
+  }
+
+  // settings.register was removed before 0.1.7-rc.2. The host hands the profile entry
+  // config to apply() directly, and liveConfig above is derived from it; the
+  // Loader mutates the boxes in place and re-announces them with
+  // loader/volatile-update.
   ctx.effect(() => () => scheduler.stop(), 'dsh-model-sync: scheduler cleanup')
   ctx.effect(() => {
     const registrations = registerHttpApi(ctx, synchronizer, { getSchedulerStatus: () => scheduler.status() })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@goodandready/dsh-model-sync",
-  "version": "0.5.2",
+  "version": "0.5.4",
   "description": "Automatic model catalog synchronization for API-key DeepSeek Harness providers.",
   "keywords": [
     "deepseek-harness",
@@ -53,7 +53,7 @@
   "license": "MIT",
   "peerDependencies": {
     "@deepseek-ai/cordis": "^4.0.1",
-    "@deepseek-ai/schemastery": "^3.18.1",
+    "@deepseek-ai/schemastery": "^3.18.4",
     "@deepseek-ai/dsh-llm": "^0.1.7-rc.2 || ^0.2.0-rc.1"
   }
 }