@goodandready/dsh-model-sync 0.5.8 → 0.5.9

package/lib/adapter-registry.js

@@ -97,14 +97,32 @@ function mappedRows(provider, rows, descriptor) {
 }
 
 function parseRows(provider, payload, descriptor) {
+  if (payload && (payload.error || payload.errors)) {
+    const message = typeof payload.error === 'string'
+      ? payload.error
+      : payload.error?.message || (Array.isArray(payload.errors) ? payload.errors.map(e => e?.message || e).join(', ') : 'endpoint returned error payload')
+    const err = new Error(`endpoint returned error payload: ${message}`)
+    err.adapterCode = 'schema'
+    throw err
+  }
   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 || []
+    if (!Array.isArray(included)) {
+      const err = new Error('model catalog response does not contain plan features')
+      err.adapterCode = 'schema'
+      throw err
+    }
     return parseClinePassModels(included)
   }
   if (parserKind === 'google') {
-    const rows = Array.isArray(payload?.models) ? payload.models : []
+    const rows = payload?.models
+    if (!Array.isArray(rows)) {
+      const err = new Error('model catalog response does not contain models array')
+      err.adapterCode = 'schema'
+      throw err
+    }
     return normalizeModels(provider, rows.map((row) => ({
       ...row,
       id: String(row.name ?? '').replace(/^models\//, ''),
@@ -113,8 +131,13 @@ function parseRows(provider, payload, descriptor) {
       maxTokens: row.outputTokenLimit,
     })))
   }
-  const rows = pathValue(payload, descriptor.modelsPath) ?? payload?.data ?? payload?.models ?? payload?.availableModels
-  return normalizeModels(provider, Array.isArray(rows) ? mappedRows(provider, rows, descriptor) : [])
+  const rows = pathValue(payload, descriptor.modelsPath) ?? (Array.isArray(payload) ? payload : (payload?.data ?? payload?.models ?? payload?.availableModels))
+  if (!Array.isArray(rows)) {
+    const err = new Error('model catalog response does not contain models array')
+    err.adapterCode = 'schema'
+    throw err
+  }
+  return normalizeModels(provider, mappedRows(provider, rows, descriptor))
 }
 
 function privateHttpHost(hostname) {

package/lib/generic-adapter.js

@@ -75,8 +75,21 @@ async function readBody(response) {
 }
 
 function rowsFrom(payload) {
-  const rows = payload?.data ?? payload?.models ?? payload?.availableModels
-  return Array.isArray(rows) ? rows : []
+  if (payload && (payload.error || payload.errors)) {
+    const message = typeof payload.error === 'string'
+      ? payload.error
+      : payload.error?.message || (Array.isArray(payload.errors) ? payload.errors.map(e => e?.message || e).join(', ') : 'endpoint returned error payload')
+    const err = new Error(`endpoint returned error payload: ${message}`)
+    err.adapterCode = 'schema'
+    throw err
+  }
+  const rows = Array.isArray(payload) ? payload : (payload?.data ?? payload?.models ?? payload?.availableModels)
+  if (!Array.isArray(rows)) {
+    const err = new Error('model catalog response does not contain models array')
+    err.adapterCode = 'schema'
+    throw err
+  }
+  return rows
 }
 
 export function canUseGenericAdapter(profile) {

package/lib/history.js

@@ -27,6 +27,11 @@ function cloneModel(provider, model) {
   if (normalized.pricing) compact.pricing = normalized.pricing
   if (normalized.contextWindow !== undefined) compact.contextWindow = normalized.contextWindow
   if (normalized.maxTokens !== undefined) compact.maxTokens = normalized.maxTokens
+  if (normalized.input !== undefined) compact.input = normalized.input
+  if (normalized.compat !== undefined) compact.compat = normalized.compat
+  if (normalized.tags !== undefined) compact.tags = normalized.tags
+  if (normalized.aliases !== undefined && normalized.aliases.length > 0) compact.aliases = normalized.aliases
+  if (normalized.lifecycle !== undefined) compact.lifecycle = normalized.lifecycle
   return compact
 }
 

package/lib/index.js

@@ -44,7 +44,7 @@ export const Config = Schema.object({
     title: Schema.string().required(),
     message: Schema.string().required(),
     providers: Schema.array(Schema.object({}).loose()).default([]),
-  }).loose()).default([]),
+  }).loose()).default([]).volatile(),
   staleGraceRuns: Schema.number().default(2).volatile(),
   lifecycleRetentionRuns: Schema.number().default(20).volatile(),
   lifecycleRevision: Schema.number().default(0).volatile(),
@@ -54,14 +54,14 @@ export const Config = Schema.object({
     firstMissingAt: Schema.number().default(0),
     lastSeenAt: Schema.number().default(0),
     lastObservedRun: Schema.number().default(0),
-  }).loose())).default({}),
+  }).loose())).default({}).volatile(),
   history: Schema.array(Schema.object({
     id: Schema.string().required(),
     version: Schema.number().required(),
     startedAt: Schema.number().required(),
     finishedAt: Schema.number().required(),
     providers: Schema.array(Schema.object({}).loose()).default([]),
-  }).loose()).default([]),
+  }).loose()).default([]).volatile(),
   providers: Schema.array(Schema.object({
     provider: Schema.string().required(),
     enabled: Schema.boolean().default(true),
@@ -69,7 +69,7 @@ export const Config = Schema.object({
     jitterMinutes: Schema.number().default(0),
     ttlMinutes: Schema.number().default(0),
     autoApply: Schema.boolean().default(false),
-  })).default([]),
+  })).default([]).volatile(),
   aliases: Schema.dict(Schema.object({
     provider: Schema.string(),
     model: Schema.string(),
@@ -79,7 +79,7 @@ export const Config = Schema.object({
     })),
     strategy: Schema.string(),
     updatedAt: Schema.number().default(0),
-  }).loose()).default({}),
+  }).loose()).default({}).volatile(),
   modelSelections: Schema.dict(Schema.array(Schema.string())).default({}).volatile(),
   adapterRegistry: Schema.dict(Schema.object({
     enabled: Schema.boolean().default(true),
@@ -90,7 +90,7 @@ export const Config = Schema.object({
     fields: Schema.any().default({}),
     capabilityMap: Schema.any().default({}),
     headers: Schema.dict(Schema.string()).default({}),
-  }).loose()).default({}),
+  }).loose()).default({}).volatile(),
   modelPolicies: Schema.dict(Schema.object({
     include: Schema.array(Schema.string()).default([]),
     exclude: Schema.array(Schema.string()).default([]),
@@ -100,7 +100,7 @@ export const Config = Schema.object({
     maxPricePerMillion: Schema.number(),
     enableContextFilter: Schema.boolean().default(false),
     minContextTokens: Schema.number(),
-  }).loose()).default({}),
+  }).loose()).default({}).volatile(),
   // Full catalogs are cached separately from the allowlist applied to DSH.
   // This keeps the model picker useful after a restart without widening the
   // active llm-pi-ai catalog.
@@ -108,7 +108,7 @@ export const Config = Schema.object({
     provider: Schema.string().required(),
     id: Schema.string().required(),
     name: Schema.string().required(),
-  }).loose())).default({}),
+  }).loose())).default({}).volatile(),
 })
 
 // DSH serves a namespace's settings form from the volatile fields of its profile
@@ -123,6 +123,7 @@ export function plainConfig(value) {
 }
 
 export function apply(ctx, config) {
+  let liveConfig = undefined
   const baseConfig = structuredClone(plainConfig(config || {}))
   const resolveConfig = (value) => {
     try {
@@ -134,7 +135,7 @@ export function apply(ctx, config) {
       return liveConfig ?? baseConfig
     }
   }
-  let liveConfig = resolveConfig(baseConfig)
+  liveConfig = resolveConfig(baseConfig)
   let reconfigure = () => {}
   let saveConfigImpl = async (patch) => {
     const plainPatch = plainConfig(patch)
@@ -146,14 +147,16 @@ export function apply(ctx, config) {
         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)
-        }
+    if (!settings || typeof settings.update !== 'function') {
+      throw Object.assign(new Error('dsh-model-sync settings are not writable'), { code: 'CONFIG_UNAVAILABLE' })
+    }
+    try {
+      await settings.update(NS, plainPatch)
+    } catch (err) {
+      if (typeof ctx.logger?.warn === 'function') {
+        ctx.logger.warn('[dsh-model-sync] settings.update failed:', err)
       }
+      throw err
     }
     liveConfig = resolveConfig({ ...liveConfig, ...plainPatch })
     reconfigure()

package/lib/models.js

@@ -273,6 +273,7 @@ function normalizePricing(row) {
   }
   if (typeof source.currency === 'string' && source.currency.trim()) pricing.currency = source.currency.trim()
   if (typeof source.unit === 'string' && source.unit.trim()) pricing.unit = source.unit.trim()
+  if (typeof source.source === 'string' && source.source.trim()) pricing.source = source.source.trim()
   return pricing
 }
 

package/lib/synchronizer.js

@@ -159,12 +159,18 @@ export function createModelSynchronizer(ctx, { getConfig = () => ({}), saveConfi
       recordCredentialOutcome(row.provider, { status: 'ok', retries })
       if (result && result.notModified) {
         const config = getConfig() ?? {}
-        const cached = normalizeModels(row.provider, config.modelCatalogs?.[row.provider] ?? row.models ?? [])
+        const existing = providerHttpMeta.get(row.provider)
+        if (existing && (result.etag || result.lastModified)) {
+          if (result.etag) existing.etag = result.etag
+          if (result.lastModified) existing.lastModified = result.lastModified
+        }
+        const memoryModels = existing?.models
+        const cached = normalizeModels(row.provider, memoryModels ?? config.modelCatalogs?.[row.provider] ?? row.models ?? [])
         return { provider: row.provider, status: 'ok', models: cached, retries, notModified: true }
       }
       const models = Array.isArray(result) ? result : []
       if (result?.__httpMeta) {
-        providerHttpMeta.set(row.provider, result.__httpMeta)
+        providerHttpMeta.set(row.provider, { ...result.__httpMeta, models })
       }
       return { provider: row.provider, status: 'ok', models, retries }
     } catch (error) {
@@ -332,7 +338,10 @@ export function createModelSynchronizer(ctx, { getConfig = () => ({}), saveConfi
         const advertised = selectedModels.length
           ? policyModels.filter((model) => selectedModels.includes(model.id))
           : policyModels
-        const explicitRemoveIds = new Set(lifecycle.removedIds)
+        const policyExcludedIds = current
+          .filter((model) => !filterModels([model], policy).length || (selectedModels.length && !selectedModels.includes(model.id)))
+          .map((model) => model.id)
+        const explicitRemoveIds = new Set([...lifecycle.removedIds, ...policyExcludedIds])
         const reconciliation = reconcileModels(row.provider, current, advertised, { removeMissing: false, removeIds: explicitRemoveIds })
         results.push({
           ...discovered,

package/package.json

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