@goodandready/dsh-model-sync 0.5.3 → 0.5.5

package/lib/adapter-registry.js

@@ -12,7 +12,7 @@ const PROVIDER_ADAPTERS = Object.freeze({
   clinebot: {
     endpoint: 'https://api.cline.bot/api/v1/users/me/plan',
     auth: 'bearer',
-    parser: 'clinebot-plan',
+    parse: 'clinebot-plan',
     defaultModels: [
       'cline-pass/deepseek-v4-flash',
       'cline-pass/deepseek-v4-pro',
@@ -99,12 +99,13 @@ function mappedRows(provider, rows, descriptor) {
 }
 
 function parseRows(provider, payload, descriptor) {
-  if (descriptor.parse === 'clinebot-plan') {
+  const parserKind = descriptor.parse || descriptor.parser
+  if (parserKind === 'clinebot-plan') {
     const plan = payload?.data?.plan || payload?.data || payload?.plan || payload
     const included = plan?.features?.included || plan?.includedModels || []
     return parseClinePassModels(included)
   }
-  if (descriptor.parse === 'google') {
+  if (parserKind === 'google') {
     const rows = Array.isArray(payload?.models) ? payload.models : []
     return normalizeModels(provider, rows.map((row) => ({
       ...row,
@@ -224,9 +225,6 @@ async function fetchSpecific(profile, descriptor, options) {
       return rows
     }
   } catch (error) {
-    if (descriptor.defaultModels && Array.isArray(descriptor.defaultModels) && descriptor.defaultModels.length > 0) {
-      return normalizeModels(profile.provider, descriptor.defaultModels.map((id) => ({ id })))
-    }
     throw error
   }
   if (descriptor.defaultModels && Array.isArray(descriptor.defaultModels) && descriptor.defaultModels.length > 0) {

package/lib/client.js

@@ -785,6 +785,20 @@ window.__ModuleLoader__.load({
           .finally(() => setBusy(false))
       }
 
+      const resolveSmartAlias = (aliasName) => {
+        setResolvingKey(aliasName)
+        fetch(`${API}/aliases/resolve?alias=${encodeURIComponent(aliasName)}`)
+          .then(async (r) => {
+            const res = await r.json()
+            if (!r.ok) throw new Error(res.error?.message ?? `HTTP ${r.status}`)
+            setResolvedAliases((prev) => ({ ...prev, [aliasName]: res }))
+          })
+          .catch((e) => {
+            setResolvedAliases((prev) => ({ ...prev, [aliasName]: { error: String(e?.message ?? e) } }))
+          })
+          .finally(() => setResolvingKey(''))
+      }
+
       const load = () => {
         if (typeof document !== 'undefined' && document.hidden) return
         setError('')

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

@@ -122,11 +122,43 @@ export function plainConfig(value) {
 }
 
 export function apply(ctx, config) {
-  const baseConfig = structuredClone(config || {})
-  const resolveConfig = (value) => Config(structuredClone(value || {}))
+  const baseConfig = structuredClone(plainConfig(config || {}))
+  const resolveConfig = (value) => {
+    try {
+      return plainConfig(Config(plainConfig(value) || {}))
+    } catch (err) {
+      if (typeof ctx?.logger?.warn === "function") {
+        ctx.logger.warn("[dsh-model-sync] invalid config payload, fallback to current config:", err?.message || err)
+      }
+      return liveConfig ?? baseConfig
+    }
+  }
   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) => {
@@ -136,6 +168,23 @@ export function apply(ctx, config) {
     return saveConfigImpl(patch)
   }
 
+  const service = createProviderService(ctx)
+  const synchronizer = createModelSynchronizer(ctx, { getConfig: () => liveConfig, saveConfig })
+  const scheduler = createSyncScheduler(synchronizer, { getConfig: () => liveConfig })
+  reconfigure = () => scheduler.reconfigure()
+  scheduler.start()
+
+  ctx.effect(() => {
+    if (typeof ctx.on !== 'function') return () => {}
+    const dispose = ctx.on('loader/volatile-update', () => {
+      liveConfig = resolveConfig(config)
+      reconfigure()
+    })
+    return () => {
+      if (typeof dispose === 'function') dispose()
+    }
+  }, 'dsh-model-sync: volatile-update listener')
+
   // 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
@@ -153,7 +202,6 @@ export function apply(ctx, config) {
     manifestUrl: new URL('../package.json', import.meta.url),
   }), 'dsh-model-sync: plugin updater')
   ctx.effect(() => {
-    if (!liveConfig.enabled) return () => {}
     ctx.provide('modelSync', service)
     ctx.provide('modelSyncRunner', synchronizer)
     return () => {}

package/lib/inventory.js

@@ -1,4 +1,5 @@
 import { normalizeModels } from './models.js'
+import { sectionOf } from './synchronizer-helpers.js'
 
 export const API_KEY_PROVIDER_IDS = Object.freeze([
   'anthropic',
@@ -42,7 +43,7 @@ const API_KEY_PROVIDER_SET = new Set(API_KEY_PROVIDER_IDS)
 
 function settingsProfiles(settings) {
   try {
-    return settings?.get('llm-pi-ai')?.providers ?? {}
+    return sectionOf(settings, 'llm-pi-ai')?.providers ?? {}
   } catch {
     return {}
   }
@@ -66,7 +67,7 @@ export function listApiKeyProviders(llm, settings) {
   for (const entry of directory) {
     let profile = profiles[entry.provider]
     if (!profile && (entry.provider === 'commandcode' || entry.settingsNs === 'llm-commandcode')) {
-      const cc = settings?.get?.('llm-commandcode')
+      const cc = sectionOf(settings, 'llm-commandcode')
       profile = {
         apiKeyEnv: cc?.apiKeyEnv ?? 'COMMANDCODE_API_KEY',
         credentialRef: cc?.apiKeyEnv ?? 'COMMANDCODE_API_KEY',

package/lib/synchronizer-helpers.js

@@ -55,12 +55,23 @@ export function descriptorOf(settings, ns) {
   catch { return undefined }
 }
 
+export function sectionOf(settings, ns) {
+  try {
+    const desc = descriptorOf(settings, ns)
+    if (desc && desc.value !== undefined) return desc.value
+    if (typeof settings?.get === 'function') return settings.get(ns)
+    return undefined
+  } catch {
+    return undefined
+  }
+}
+
 export function profileOf(settings, provider) {
   try {
-    const piai = settings?.get(PIAI_NS)?.providers?.[provider]
+    const piai = sectionOf(settings, PIAI_NS)?.providers?.[provider]
     if (piai) return piai
     if (provider === 'commandcode') {
-      const cc = settings?.get?.('llm-commandcode')
+      const cc = sectionOf(settings, 'llm-commandcode')
       return {
         apiKeyEnv: cc?.apiKeyEnv ?? 'COMMANDCODE_API_KEY',
         credentialRef: cc?.apiKeyEnv ?? 'COMMANDCODE_API_KEY',
@@ -97,7 +108,7 @@ export function adapterErrorType(error) {
 export async function replaceWithRetry(settings, ns, patchFn, attempts = 3) {
   let lastError
   for (let i = 0; i < attempts; i++) {
-    const section = settings?.get?.(ns)
+    const section = sectionOf(settings, ns)
     const descriptor = descriptorOf(settings, ns)
     if (!section || !descriptor || typeof settings.replace !== 'function') {
       throw Object.assign(new Error(`${ns} settings are not writable`), { code: 'SETTINGS_UNAVAILABLE' })
@@ -120,7 +131,7 @@ export async function replaceWithRetry(settings, ns, patchFn, attempts = 3) {
 
 export function rotationRefs(settings, provider) {
   try {
-    const rows = settings?.get?.('dsh-key-rotation')?.providers
+    const rows = sectionOf(settings, 'dsh-key-rotation')?.providers
     if (!Array.isArray(rows)) return []
     return rows.filter((row) => row?.provider === provider).flatMap((row) => Array.isArray(row.keys) ? row.keys : [])
   } catch {
@@ -149,7 +160,7 @@ export async function performHistoryRollback({ ctx, config, providers = [], hist
   if (!snapshot || !Array.isArray(snapshot.before)) throw Object.assign(new Error(`history snapshot not found: ${provider}`), { code: 'HISTORY_NOT_FOUND' })
   if (!providers.some((row) => row.provider === provider && row.configured)) throw Object.assign(new Error(`provider is not configured: ${provider}`), { code: 'PROVIDER_NOT_CONFIGURED' })
   const settings = settingsOf(ctx)
-  const section = settings?.get?.(PIAI_NS)
+  const section = sectionOf(settings, PIAI_NS)
   const descriptor = descriptorOf(settings, PIAI_NS)
   if (!section || !descriptor || typeof settings.replace !== 'function') {
     throw Object.assign(new Error('llm-pi-ai settings are not writable'), { code: 'SETTINGS_UNAVAILABLE' })

package/lib/synchronizer.js

@@ -18,6 +18,7 @@ import {
   settingsOf,
   llmOf,
   descriptorOf,
+  sectionOf,
   profileOf,
   errorMessage,
   diagnosticMessage,
@@ -488,7 +489,7 @@ export function createModelSynchronizer(ctx, { getConfig = () => ({}), saveConfi
     if (typeof saveConfig !== 'function') throw Object.assign(new Error('dsh-model-sync settings are not writable'), { code: 'CONFIG_UNAVAILABLE' })
 
     const settings = settingsOf(ctx)
-    const section = settings?.get?.(PIAI_NS)
+    const section = sectionOf(settings, PIAI_NS)
     const descriptor = descriptorOf(settings, PIAI_NS)
     const current = normalizeModels(provider, profileOf(settings, provider).models ?? row.models)
     const nextModels = selectedModels.length

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@goodandready/dsh-model-sync",
-  "version": "0.5.3",
+  "version": "0.5.5",
   "description": "Automatic model catalog synchronization for API-key DeepSeek Harness providers.",
   "keywords": [
     "deepseek-harness",