@goodandready/dsh-cost-meter 0.8.12 → 0.8.14

package/lib/index.js

@@ -19,6 +19,18 @@ import { mkdirSync, readFileSync, writeFileSync } from 'node:fs'
 import { homedir } from 'node:os'
 import { dirname, join } from 'node:path'
 import z from '@deepseek-ai/schemastery'
+
+// Ensure .volatile() helper exists on Schemastery schema prototype for DSH 0.2
+try {
+  const schemaProto = Object.getPrototypeOf(z.boolean())
+  if (schemaProto && typeof schemaProto.volatile !== 'function') {
+    schemaProto.volatile = function () {
+      return typeof this.extra === 'function' ? this.extra('volatile', true) : this
+    }
+  }
+} catch {
+  // safe fallback
+}
 import { z as zod } from 'zod'
 
 export * from './tariff.js'
@@ -97,41 +109,49 @@ const PriceRow = z.object({
 })
 
 export const Config = z.object({
-  currency: z.string().description('Currency symbol shown in the widget.').default('$'),
-  usdRate: z.number().description('Units of `currency` per USD. 1 keeps everything in USD.').default(1),
+  currency: z.string().description('Currency symbol shown in the widget.').default('$').volatile(),
+  usdRate: z.number().description('Units of `currency` per USD. 1 keeps everything in USD.').default(1).volatile(),
   displayTimeZone: z
     .string()
     .description('IANA zone the widget shows tariff hours in.')
-    .default('Europe/Moscow'),
+    .default('Europe/Moscow')
+    .volatile(),
   budgetThreshold: z
     .number()
     .description('Optional session budget threshold in USD. 0 disables threshold warnings.')
-    .default(0),
+    .default(0)
+    .volatile(),
   deepseekPeakPrices: z
     .dict(PriceRow)
     .description('Override the built-in DeepSeek peak rates, by model id.')
-    .default({}),
+    .default({})
+    .volatile(),
   useOpenRouter: z
     .boolean()
     .description('Pull rates and discount windows from the public OpenRouter catalog.')
-    .default(true),
-  refreshHours: z.number().description('How often to refetch the catalog.').default(24),
+    .default(true)
+    .volatile(),
+  refreshHours: z.number().description('How often to refetch the catalog.').default(24).volatile(),
   modelMap: z
     .dict(z.string())
     .description('Route override: "provider/model" -> OpenRouter model id.')
-    .default({}),
+    .default({})
+    .volatile(),
   prices: z
     .dict(PriceRow)
     .description('Manual rates by "provider/model" (or "*"). Win over the catalog.')
-    .default({}),
+    .default({})
+    .volatile(),
   manualPeakWindowsUtc: z
     .array(z.string())
     .description('Peak windows HH:MM-HH:MM UTC, used only with manual prices.')
-    .default([]),
+    .default([])
+    .volatile(),
   manualOffPeakMultiplier: z
     .number()
     .description('Multiplier outside the manual peak windows.')
-    .default(1),
+    .default(1)
+    .volatile(),
 })
 
 // ---------------------------------------------------------------------------
@@ -360,32 +380,33 @@ export function apply(ctx, config) {
     }
   }
 
-  // Live config reaction from GUI / settings service
-  ctx.on('settings/updated', (ns, next) => {
-    if (ns === NS && next) {
-      current = { ...config, ...next }
-      clearResolveCache()
-    }
-  })
-
-  ctx.on('settings/document-updated', (ns) => {
-    if (!ns || ns === NS) {
-      clearResolveCache()
-    }
-  })
-
+  // Live config reaction from GUI / settings service (DSH 0.2+)
   ctx.inject(['settings'], (sctx) => {
-    if (typeof sctx.settings?.describe === 'function') {
+    const svc = sctx.settings
+    if (typeof svc?.describe !== 'function') return
+    const readRow = () => {
       try {
-        const desc = sctx.settings.describe(NS)
-        if (desc?.value && typeof desc.value === 'object') {
-          current = { ...config, ...desc.value }
-          clearResolveCache()
-        }
+        const rows = svc.describe({ redactSecrets: true })
+        if (Array.isArray(rows)) return rows.find((r) => r?.ns === NS)
+        if (rows && typeof rows === 'object' && rows.ns === NS) return rows
+        return undefined
       } catch {
-        /* namespace might not have descriptor yet */
+        return undefined
       }
     }
+    const row = readRow()
+    if (row?.value && typeof row.value === 'object') {
+      current = { ...config, ...row.value }
+      clearResolveCache()
+    }
+    ctx.on('settings/document-updated', (ns) => {
+      if (ns && ns !== NS) return
+      const fresh = readRow()
+      if (fresh?.value && typeof fresh.value === 'object') {
+        current = { ...config, ...fresh.value }
+      }
+      clearResolveCache()
+    })
   })
 
   // Hook the session projection so the widget can show spend breakdown.

package/lib/tariff.js

@@ -30,9 +30,24 @@ export const VENDOR_ALIASES = {
   'meta': 'meta-llama',
 }
 
+/** Recursively unwrap cosmokit / Schemastery Volatile<T> reference objects into plain values. */
+export function unwrapVolatile(value) {
+  if (value && typeof value.get === 'function') {
+    return unwrapVolatile(value.get())
+  }
+  if (!value || typeof value !== 'object') return value
+  if (Array.isArray(value)) return value.map(unwrapVolatile)
+  const out = {}
+  for (const [k, v] of Object.entries(value)) {
+    out[k] = unwrapVolatile(v)
+  }
+  return out
+}
+
 /** OpenRouter prices are USD per token; the widget speaks per 1M tokens. */
 export function perMillion(value) {
-  const n = Number(value)
+  const unwrapped = value && typeof value.get === 'function' ? value.get() : value
+  const n = Number(unwrapped)
   return Number.isFinite(n) ? n * 1e6 : 0
 }
 
@@ -61,8 +76,9 @@ export function parseWindow(spec) {
 }
 
 export function overrideBucket(overrideVal, baseVal) {
-  if (overrideVal !== undefined && overrideVal !== null && overrideVal !== '') {
-    const n = Number(overrideVal)
+  const val = overrideVal && typeof overrideVal.get === 'function' ? overrideVal.get() : overrideVal
+  if (val !== undefined && val !== null && val !== '') {
+    const n = Number(val)
     if (Number.isFinite(n)) return n * 1e6
   }
   return baseVal
@@ -165,8 +181,9 @@ export function indexCatalog(models) {
  * Resolve one route's tariff: manual config wins, then DeepSeek's own table,
  * then the OpenRouter catalog.
  */
-export function resolveTariff(cfg, index, route) {
+export function resolveTariff(rawCfg, index, route) {
   if (!route) return { schedule: null, source: 'none', matchedId: null }
+  const cfg = unwrapVolatile(rawCfg) || {}
   const key = route.provider ? route.provider + '/' + route.model : route.model
   const prices = cfg.prices || {}
   const manual = prices[key] || prices[route.model] || prices['*']
@@ -180,7 +197,8 @@ export function resolveTariff(cfg, index, route) {
     }
     const factor = Number(cfg.manualOffPeakMultiplier) || 1
     const windows = []
-    for (const spec of cfg.manualPeakWindowsUtc || []) {
+    const peakWindows = Array.isArray(cfg.manualPeakWindowsUtc) ? cfg.manualPeakWindowsUtc : []
+    for (const spec of peakWindows) {
       const parsed = parseWindow(spec)
       if (parsed) windows.push({ start: parsed.start, end: parsed.end, rates: base })
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@goodandready/dsh-cost-meter",
-  "version": "0.8.12",
+  "version": "0.8.14",
   "description": "DeepSeek Harness plugin: a session cost chip in the conversation header - live token usage by bucket, peak/off-peak tariff, and a countdown to the next tariff switch.",
   "type": "module",
   "main": "lib/index.js",