@goodandready/dsh-subscriptions 0.6.33 → 0.6.35

package/lib/adapter-manager.js

@@ -4,7 +4,7 @@ import { normalizeSlots, vendorConfig } from './accounts.js'
 import { PROVIDERS, isProvider, oauthRef } from './refs.js'
 import { credentialRef } from '@deepseek-ai/dsh-credentials'
 import { getVendor } from './vendors/index.js'
-import { Config } from './config-schema.js'
+import { Config, plainConfig } from './config-schema.js'
 
 export function createAdapterManager({
   ctx,
@@ -187,7 +187,7 @@ export function createAdapterManager({
       }
       const currentSlots = Array.isArray(live().slots) ? live().slots : []
       const newSlots = [...currentSlots, ...additions]
-      const parsed = Config({ ...live(), slots: stripLegacySlots(newSlots) })
+      const parsed = plainConfig(Config({ ...live(), slots: stripLegacySlots(newSlots) }))
       await api.replace(parsed)
       syncCustomVendors()
       await syncAdapter()

package/lib/config-schema.js

@@ -16,68 +16,77 @@ export const Slot = z.object({
 
 export const defaultSlots = PROVIDERS.map((provider) => ({ provider, index: 1, label: '' }))
 
+// Unwrap Volatile boxes before any caller reads a value. A volatile field holds a box
+// rather than its value, and the Loader mutates those boxes in place.
+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 const Config = z.object({
-  cooldownMs: z.number().default(30 * 60 * 1000)
+  cooldownMs: z.number().volatile().default(30 * 60 * 1000)
     .description('After RATE_LIMIT/QUOTA/429, skip that account for this many milliseconds.'),
-  switchAtRemaining: z.number().default(0.01)
+  switchAtRemaining: z.number().volatile().default(0.01)
     .description('If remaining <= this (absolute or <1 fraction), treat as exhausted before request. 0 disables.'),
-  refreshAheadMs: z.number().default(5 * 60 * 1000)
+  refreshAheadMs: z.number().volatile().default(5 * 60 * 1000)
     .description('Background refresh when expiry within this many ms.'),
-  refreshRetryMs: z.number().default(10 * 60 * 1000)
+  refreshRetryMs: z.number().volatile().default(10 * 60 * 1000)
     .description('Do not retry background refresh more often than this after failure.'),
-  probeIntervalMin: z.number().default(15)
+  probeIntervalMin: z.number().volatile().default(15)
     .description('Background health-check interval in minutes. 0 disables.'),
-  notifyLimits: z.boolean().default(true)
+  notifyLimits: z.boolean().volatile().default(true)
     .description('Emit log notices when usage crosses 70/90/100% of a window.'),
-  expiryNotifyDays: z.number().default(7)
+  expiryNotifyDays: z.number().volatile().default(7)
     .description('#67 Warn in the header chip this many days before a subscription expiry (expiresAt). 0 disables.'),
-  privacyMask: z.boolean().default(false)
+  privacyMask: z.boolean().volatile().default(false)
     .description('#98 Hide personal data in the UI: emails show as j***n@example.com.'),
-  slots: z.array(Slot).default(defaultSlots)
+  slots: z.array(Slot).volatile().default(defaultSlots)
     .description('Account slots. Secrets are not stored here; only the credential ref names.'),
-  useWebCallback: z.boolean().default(false)
+  useWebCallback: z.boolean().volatile().default(false)
     .description('When on, redirect_uri is this Web UI origin + /dsh-subscriptions/oauth/callback. When off, the vendor CLI registered redirect is used and you paste the redirected URL.'),
-  autoLoopback: z.boolean().default(true)
+  autoLoopback: z.boolean().volatile().default(true)
     .description('#89 When on and the vendor redirect_uri is a loopback address (codex :1455, grok :56121), a temporary local server catches the OAuth callback automatically - no paste needed. Paste fallback stays available.'),
-  ollamaBaseUrl: z.string().default('http://127.0.0.1:11434')
+  ollamaBaseUrl: z.string().volatile().default('http://127.0.0.1:11434')
     .description('#91 Local Ollama base URL. Served as the ollama provider in the native model picker when reachable.'),
-  ollamaFallback: z.boolean().default(true)
+  ollamaFallback: z.boolean().volatile().default(true)
     .description('#91 When every account of a provider is exhausted, continue the chat on local Ollama instead of failing.'),
-  ollamaFallbackModel: z.string().default('')
+  ollamaFallbackModel: z.string().volatile().default('')
     .description('#91 Ollama model used for the fallback (for example qwen2.5-coder). Empty = first model from /api/tags.'),
-  hideDeprecatedModels: z.boolean().default(false)
+  hideDeprecatedModels: z.boolean().volatile().default(false)
     .description('#94 Hide test/preview/beta/legacy model ids from the native model picker.'),
-  codexClientId: z.string().default(''),
-  codexVerbosity: z.string().default('')
+  codexClientId: z.string().volatile().default(''),
+  codexVerbosity: z.string().volatile().default('')
     .description('#93 Response verbosity for Codex reasoning models: low, medium or high. Empty = protocol default.'),
-  codexFastMode: z.boolean().default(false)
+  codexFastMode: z.boolean().volatile().default(false)
     .description('#92 Fast Mode for Codex: sends service_tier priority (1.5x speed billing tier) with every request.'),
-  composerQuota: z.string().default('off')
+  composerQuota: z.string().volatile().default('off')
     .description('#84 Composer quota indicator mode: off, percent, bar or forecast (predictive runway from a sliding window).'),
-  codexRedirectUri: z.string().default(''),
-  codexBaseUrl: z.string().default(''),
-  codexClientVersion: z.string().default('')
+  codexRedirectUri: z.string().volatile().default(''),
+  codexBaseUrl: z.string().volatile().default(''),
+  codexClientVersion: z.string().volatile().default('')
     .description('Codex CLI identity version for /models catalog gating (e.g. 0.157.1). Empty uses the built-in default.'),
-  claudeClientId: z.string().default(''),
-  claudeRedirectUri: z.string().default(''),
-  grokClientId: z.string().default(''),
-  grokRedirectUri: z.string().default(''),
-  grokBaseUrl: z.string().default(''),
-  grokClientVersion: z.string().default('')
+  claudeClientId: z.string().volatile().default(''),
+  claudeRedirectUri: z.string().volatile().default(''),
+  grokClientId: z.string().volatile().default(''),
+  grokRedirectUri: z.string().volatile().default(''),
+  grokBaseUrl: z.string().volatile().default(''),
+  grokClientVersion: z.string().volatile().default('')
     .description('Grok CLI identity version header. Empty uses the built-in default.'),
-  antigravityClientId: z.string().default(''),
-  antigravityRedirectUri: z.string().default(''),
-  cascadingFallback: z.boolean().default(false)
+  antigravityClientId: z.string().volatile().default(''),
+  antigravityRedirectUri: z.string().volatile().default(''),
+  cascadingFallback: z.boolean().volatile().default(false)
     .description('#349 Opt-in cross-vendor fallback when all accounts of a provider are exhausted or rate limited.'),
-  cascadingChain: z.any().default({})
+  cascadingChain: z.any().volatile().default({})
     .description('#349 Custom cross-vendor fallback chains (e.g. { claude: ["copilot", "cursor"] }).'),
-  webhookUrl: z.string().default('')
+  webhookUrl: z.string().volatile().default('')
     .description('#351 External webhook URL to receive quota and session alerts (JSON POST).'),
-  alertThresholds: z.array(z.number()).default([80, 90, 95])
+  alertThresholds: z.array(z.number()).volatile().default([80, 90, 95])
     .description('#351 Quota usage percentage thresholds for firing alerts.'),
-  autoPacing: z.boolean().default(true)
+  autoPacing: z.boolean().volatile().default(true)
     .description('#352 Predictive burn-rate load balancing between accounts.'),
-  customVendors: z.array(z.any()).default([])
+  customVendors: z.array(z.any()).volatile().default([])
     .description('Declarative OpenAI-Responses-compatible providers. See README.'),
 })
 

package/lib/index.js

@@ -1,3 +1,5 @@
+import { plainConfig } from './config-schema.js'
+export { plainConfig } from './config-schema.js'
 import { readFileSync } from 'node:fs'
 import { bestEffort } from './utils.js'
 export { Config, publicConfig, Slot, defaultSlots } from './config-schema.js'
@@ -66,9 +68,14 @@ const OK_HTML = `<!doctype html>
 
 export function apply(ctx, rawConfig) {
   const logger = typeof ctx.logger === 'function' ? ctx.logger('subscriptions') : (ctx.logger || undefined)
-  let settingsApi
 
-  let cachedConfig = Config(rawConfig || {})
+  // rawConfig still holds Volatile boxes, so unwrap before validating.
+  const resolveEntry = () => {
+    // rawConfig still holds Volatile boxes, so unwrap before validating; Config then
+    // re-creates boxes for the volatile fields, so unwrap the result as well.
+    return plainConfig(Config(plainConfig(rawConfig || {})))
+  }
+  let cachedConfig = resolveEntry()
   const live = () => cachedConfig
 
   function syncCustomVendors() {
@@ -95,65 +102,93 @@ export function apply(ctx, rawConfig) {
 
   const syncSnapshot = (next) => {
     try {
-      const fresh = next !== undefined ? next : (typeof settingsApi?.get === 'function' ? settingsApi.get() : cachedConfig)
-      cachedConfig = Config(fresh || {})
+      const fresh = next !== undefined ? next : resolveEntry()
+      cachedConfig = fresh
       syncCustomVendors()
       syncAdapter().catch(() => {})
       syncOllama().catch(() => {})
     } catch { /* keep existing snapshot on error */ }
   }
 
-  if (typeof ctx.inject === 'function') {
-    ctx.inject(['settings'], (sctx) => {
-      const scope = sctx.settings.register(NS, Config, { base: rawConfig })
-      settingsApi = {
-        ...scope,
-        get: () => (typeof scope.get === 'function' ? scope.get() : cachedConfig),
-        async replace(next) {
-          syncSnapshot(next)
-          if (typeof scope.replace === 'function') {
-            return await scope.replace(next)
-          }
-        },
-      }
+  // settings.register was removed before DSH 0.1.7-rc.2, so the scope this plugin used
+  // to build from it never existed: getSettingsApi() returned null and writes only
+  // touched memory. Back it with the real settings service instead, whose
+  // describe()/update()/replace() are the contract both releases share.
+  let settingsSvc = null
 
-      if (typeof scope.get === 'function') {
-        syncSnapshot(scope.get())
-      }
+  const describeRow = () => {
+    if (typeof settingsSvc?.describe !== 'function') return null
+    try {
+      return settingsSvc.describe().find((r) => r && r.ns === NS) || null
+    } catch (err) {
+      if (logger && logger.warn) logger.warn('[dsh-subscriptions] describe failed: ' + String(err && err.message || err))
+      return null
+    }
+  }
 
-      if (typeof scope.watch === 'function') {
-        try {
-          const unwatch = scope.watch((next) => syncSnapshot(next))
-          if (typeof unwatch === 'function') {
-            sctx.effect(() => unwatch)
-          }
-        } catch { /* ignore watch error */ }
+  const settingsApi = {
+    get: () => live(),
+    replace: async (next) => {
+      const parsed = plainConfig(next)
+      cachedConfig = parsed
+      syncCustomVendors()
+      if (typeof settingsSvc?.update === 'function') {
+        await settingsSvc.update(NS, structuredClone(parsed), describeRow()?.revision)
+      } else if (typeof settingsSvc?.replace === 'function') {
+        await settingsSvc.replace(NS, structuredClone(parsed), describeRow()?.revision)
       }
+      return parsed
+    },
+  }
+  // Consumers (routes, adapter manager) call getSettingsApi().replace(config). The host
+  // service offers describe/update/replace with a revision, so adapt it here: the adapter
+  // keeps the cached snapshot current and persists through the real service.
+  const getSettingsApi = () => (settingsSvc ? settingsApi : null)
 
-      Promise.resolve().then(() => {
-        reconcileSlots().catch((err) => {
-          if (logger && logger.warn) logger.warn('[dsh-subscriptions] reconcileSlots initial error: ' + (err && err.message || err))
-        })
-      })
-
-      const onDocUpdated = (ns) => {
-        if (!ns || ns === NS) {
-          syncSnapshot()
-        }
+  ctx.inject(['settings'], (sctx) => {
+    try {
+      settingsSvc = sctx.settings || (typeof sctx.get === 'function' ? sctx.get('settings') : null) || null
+      if (!settingsSvc) return
+      const served = describeRow()
+      if (served && served.value) {
+        try { cachedConfig = plainConfig(Config(plainConfig(served.value))) } catch { /* keep current */ }
       }
-      if (typeof sctx.on === 'function') {
-        sctx.on('settings/document-updated', onDocUpdated)
-      } else if (typeof ctx.on === 'function') {
-        ctx.on('settings/document-updated', onDocUpdated)
+      if (typeof sctx.effect === 'function') {
+        sctx.effect(() => () => { settingsSvc = null })
       }
+    } catch (err) {
+      // The profile may be mounted without the settings service; the static config stays
+      // authoritative and the volatile-update handler below still applies later changes.
+      if (logger && logger.warn) logger.warn('[dsh-subscriptions] settings service unavailable: ' + String(err && err.message || err))
+    }
+  })
 
-      sctx.effect(() => () => {
-        settingsApi = undefined
-        cachedConfig = Config(rawConfig || {})
-        syncCustomVendors()
-      })
-    })
+  // The host announces configuration changes with settings/document-updated; the Loader
+  // also re-announces the volatile boxes in place. Refresh the cached snapshot on both.
+  const onSettingsChanged = () => {
+    try {
+      const row = describeRow()
+      if (row && row.value) cachedConfig = plainConfig(Config(plainConfig(row.value)))
+      else syncSnapshot()
+      reconcileSlots().catch(() => {})
+    } catch { /* keep existing snapshot on error */ }
   }
+  if (typeof ctx.on === 'function') {
+    ctx.effect(() => {
+      ctx.on('settings/document-updated', onSettingsChanged)
+      ctx.on('loader/volatile-update', onSettingsChanged)
+      return () => {
+        ctx.off?.('settings/document-updated', onSettingsChanged)
+        ctx.off?.('loader/volatile-update', onSettingsChanged)
+      }
+    }, 'dsh-subscriptions: settings change listener')
+  }
+
+  Promise.resolve().then(() => {
+    reconcileSlots().catch((err) => {
+      if (logger && logger.warn) logger.warn('[dsh-subscriptions] reconcileSlots initial error: ' + (err && err.message || err))
+    })
+  })
 
   const fetchForRef = (ref) => {
     const parsed = parseOauthRef(ref)
@@ -250,7 +285,7 @@ export function apply(ctx, rawConfig) {
     fetch,
     fetchForRef,
     recordHistory,
-    getSettingsApi: () => settingsApi,
+    getSettingsApi,
     syncCustomVendors,
     syncOllama,
     stripLegacySlots,
@@ -259,6 +294,7 @@ export function apply(ctx, rawConfig) {
   adapterManager.registerAdapterLifecycle()
 
   const subscriptions = createSubscriptionsService({
+    live,
     listAccounts: (provider) => store.listAccounts(provider),
     loadBlob: (ref) => store.loadBlob(ref),
     ensureFresh: (provider, blob, ref) => store.ensureFresh(provider, blob, ref),
@@ -437,7 +473,7 @@ export function apply(ctx, rawConfig) {
     NS,
     live,
     accountsView,
-    getSettingsApi: () => settingsApi,
+    getSettingsApi,
     syncCustomVendors,
     syncAdapter,
     stripLegacySlots,

package/lib/routes/accounts.js

@@ -1,6 +1,6 @@
 import { exportVault, importVault } from '../vault.js'
 import { normalizeSlots } from '../accounts.js'
-import { Config, publicConfig } from '../config-schema.js'
+import { Config, plainConfig, publicConfig } from '../config-schema.js'
 import { decryptWithPassphrase, encryptWithPassphrase } from '../crypto.js'
 import { isTrustedSettingsRequest, queryOf, readBody, safeJsonHandler, writeJson } from '../http.js'
 import { discoverLocalCliSessions, loadLocalCliBlob } from '../import-auth.js'
@@ -159,7 +159,7 @@ export function registerAccountsRoutes(ctx, state) {
             index: idx,
             label: blob.email || '',
           }])
-          const parsed = Config({ ...live(), slots: stripLegacySlots(nextSlots) })
+          const parsed = plainConfig(Config({ ...live(), slots: stripLegacySlots(nextSlots) }))
           await getSettingsApi().replace(parsed)
           syncCustomVendors()
         }
@@ -424,7 +424,7 @@ export function registerAccountsRoutes(ctx, state) {
             curSlots.push(s)
           }
         }
-        parsed = Config({ ...live(), slots: stripLegacySlots(curSlots) })
+        parsed = plainConfig(Config({ ...live(), slots: stripLegacySlots(curSlots) }))
       }
       let blobCount = 0
       for (const [ref, blob] of Object.entries(result.blobs)) {

package/lib/routes/status.js

@@ -1,6 +1,6 @@
 import { getRecentAlerts, clearAlerts } from '../alerts.js'
 import { normalizeSlots, vendorConfig } from '../accounts.js'
-import { Config, publicConfig } from '../config-schema.js'
+import { Config, plainConfig, publicConfig } from '../config-schema.js'
 import { isTrustedSettingsRequest, queryOf, readBody, safeJsonHandler, writeJson } from '../http.js'
 import { quotaSnapshot } from '../ratelimit.js'
 import { PROVIDERS, displayName, droppedCredentialRefs, isProvider, oauthRef } from '../refs.js'
@@ -80,7 +80,7 @@ export function registerStatusRoutes(ctx, state) {
       if (payload && typeof payload.config === 'object') payload = payload.config
       try {
         if (Array.isArray(payload.slots)) payload.slots = stripLegacySlots(payload.slots)
-        const parsed = Config(payload)
+        const parsed = plainConfig(Config(payload))
         const dropped = droppedCredentialRefs(live().slots, parsed.slots)
         await getSettingsApi().replace(parsed)
         currentRevision++

package/lib/subscriptions.js

@@ -58,6 +58,9 @@ function headersFor(provider, blob, cfg) {
 
 export function createSubscriptionsService(deps) {
   return {
+    // The resolved config snapshot. Cached: identical between loader/volatile-update
+    // events, which is the guarantee issue #367 calls for.
+    live: () => deps.live(),
     async available(provider) {
       if (provider) {
         if (!isProvider(provider)) return false

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@goodandready/dsh-subscriptions",
-  "version": "0.6.33",
+  "version": "0.6.35",
   "description": "Use ChatGPT Codex, Claude, Grok, Antigravity, Kimi, GLM, Cursor, Kiro, Copilot, Qwen, ERNIE, Spark, JetBrains, Perplexity, Replit, and Cody subscriptions as DeepSeek Harness LLM providers via OAuth.",
   "license": "MIT",
   "type": "module",
@@ -54,11 +54,11 @@
   },
   "peerDependencies": {
     "@deepseek-ai/cordis": "^4.0.1",
-    "@deepseek-ai/dsh-credentials": "^0.1.0-rc.6",
-    "@deepseek-ai/dsh-host-webserver": "^0.1.0-rc.6",
-    "@deepseek-ai/dsh-llm": "^0.1.0-rc.6",
-    "@deepseek-ai/dsh-settings": "^0.1.0-rc.6",
-    "@deepseek-ai/schemastery": "^3.18.1"
+    "@deepseek-ai/dsh-credentials": "^0.1.7-rc.2 || ^0.2.0-rc.1",
+    "@deepseek-ai/dsh-host-webserver": "^0.1.7-rc.2 || ^0.2.0-rc.1",
+    "@deepseek-ai/dsh-llm": "^0.1.7-rc.2 || ^0.2.0-rc.1",
+    "@deepseek-ai/dsh-settings": "^0.1.7-rc.2 || ^0.2.0-rc.1",
+    "@deepseek-ai/schemastery": "^3.18.4"
   },
   "publishConfig": {
     "access": "public"