@goodandready/dsh-cost-meter 0.8.17 → 0.8.19

package/lib/client.js

@@ -961,6 +961,28 @@ window.__ModuleLoader__.load({
       return usd
     }
 
+    function cacheSavingsBySlots(slots, schedule) {
+      let savedUsd = 0
+      let missedUsd = 0
+      let readTokens = 0
+      for (const key of Object.keys(slots || {})) {
+        const minute = (Number(key) * 30 + 15) % 1440
+        const rates = ratesAt(schedule, minute)
+        const u = slots[key] || {}
+        const cRead = Number(u.cacheReadTokens) || 0
+        if (cRead > 0 && rates && rates.input > rates.cacheHit) {
+          readTokens += cRead
+          const missed = (cRead / 1e6) * (rates.input || 0)
+          const hit = (cRead / 1e6) * (rates.cacheHit || 0)
+          savedUsd += Math.max(0, missed - hit)
+          missedUsd += missed
+        }
+      }
+      const percent = missedUsd > 0 ? Math.round((savedUsd / missedUsd) * 100) : 0
+      return { savedUsd, missedUsd, readTokens, percent }
+    }
+
+
     function spendUsd(usage, rates) {
       const u = usage || {}
       const perMillion =
@@ -1193,17 +1215,36 @@ window.__ModuleLoader__.load({
         .join(', ')
       const nowLocal = hhmmInZone(minute, zone, now)
 
-      // Calculate cache savings amount
+      // Calculate cache savings amount across all used models (#92)
       let cacheSavedAmount = 0
       let cacheSavedPercent = 0
-      if (hasUsage && usage && Number(usage.cacheReadTokens) > 0 && active.input > active.cacheHit) {
-        const tokensRead = Number(usage.cacheReadTokens)
-        const missedCost = (tokensRead / 1e6) * active.input
-        const hitCost = (tokensRead / 1e6) * active.cacheHit
-        cacheSavedAmount = Math.max(0, (missedCost - hitCost) * fx)
-        cacheSavedPercent = missedCost > 0 ? Math.round(((missedCost - hitCost) / missedCost) * 100) : 0
+      if (hasUsage) {
+        if (perModel.length > 0) {
+          let totalSavedUsd = 0
+          let totalMissedUsd = 0
+          for (const m of perModel) {
+            const own = schedules[m.key]
+            const sched = own && own.schedule ? own.schedule : schedule
+            if (sched) {
+              const res = cacheSavingsBySlots(m.slots || (m.usage ? { 0: m.usage } : {}), sched)
+              totalSavedUsd += res.savedUsd
+              totalMissedUsd += res.missedUsd
+            }
+          }
+          if (totalSavedUsd > 0) {
+            cacheSavedAmount = totalSavedUsd * fx
+            cacheSavedPercent = totalMissedUsd > 0 ? Math.round((totalSavedUsd / totalMissedUsd) * 100) : 0
+          }
+        } else if (usage && Number(usage.cacheReadTokens) > 0 && active.input > active.cacheHit) {
+          const tokensRead = Number(usage.cacheReadTokens)
+          const missedCost = (tokensRead / 1e6) * active.input
+          const hitCost = (tokensRead / 1e6) * active.cacheHit
+          cacheSavedAmount = Math.max(0, (missedCost - hitCost) * fx)
+          cacheSavedPercent = missedCost > 0 ? Math.round(((missedCost - hitCost) / missedCost) * 100) : 0
+        }
       }
 
+
       // Copy summary report to clipboard
       const copyReport = () => {
         const lines = [
@@ -1255,9 +1296,11 @@ window.__ModuleLoader__.load({
           key: 'chip', type: 'button',
           className: 'dcm-chip',
           onClick: () => setOpen((v) => !v),
-          title: budgetExceeded
+          title: (budgetExceeded
             ? t('budget.exceeded', { limit: money(budgetThreshold * fx, currency) })
-            : (flat ? 'Flat tariff' : cheapNow ? t('offpeak') : t('peak')),
+            : (flat ? 'Flat tariff' : cheapNow ? t('offpeak') : t('peak'))) +
+            (cacheSavedAmount > 0 ? ' · ' + t('savings.cache_saved', { amount: money(cacheSavedAmount, currency), percent: cacheSavedPercent }) : ''),
+
         }, [
           h('span', { key: 'dot', className: dotClass }),
           h('span', { key: 'sum' }, hasUsage ? '≈ ' + money(total, currency) : '—'),
@@ -1480,8 +1523,12 @@ window.__ModuleLoader__.load({
       minutesUntilChange,
       extremes,
       ratesAt,
+      spendBySlots,
+      cacheSavingsBySlots,
       fetchWithTimeout,
     }
+
     return module.exports
   },
 })
+

package/lib/fx.js

@@ -0,0 +1,130 @@
+// dsh-cost-meter — Live Foreign Exchange (FX) rate provider.
+import { mkdirSync, readFileSync, writeFileSync } from 'node:fs'
+import { homedir } from 'node:os'
+import { dirname, join } from 'node:path'
+
+const CBR_URL = 'https://www.cbr-xml-daily.ru/daily_json.js'
+const OPEN_ER_URL = 'https://open.er-api.com/v6/latest/USD'
+const FX_CACHE_FILE = join(process.env.DSH_HOME || join(homedir(), '.dsh'), 'storages', 'dsh-cost-meter-fx.json')
+const FX_TTL_MS = 12 * 3600_000 // 12 hours
+
+let inMemoryCache = {
+  fetchedAt: 0,
+  rates: { RUB: 80, EUR: 0.92, CNY: 7.15 },
+}
+
+// Load disk cache synchronously on module load
+try {
+  const cached = JSON.parse(readFileSync(FX_CACHE_FILE, 'utf8'))
+  if (cached && typeof cached === 'object' && cached.rates) {
+    inMemoryCache = {
+      fetchedAt: Number(cached.fetchedAt) || 0,
+      rates: { ...inMemoryCache.rates, ...cached.rates },
+    }
+  }
+} catch {
+  // safe fallback to defaults on fresh install or read-only filesystem
+}
+
+export function normalizeCurrencyCode(symbolOrCode) {
+  const str = String(symbolOrCode || '').trim().toUpperCase()
+  if (str === '₽' || str === 'RUB' || str === 'РУБ') return 'RUB'
+  if (str === '€' || str === 'EUR') return 'EUR'
+  if (str === '¥' || str === 'CNY' || str === 'RMB') return 'CNY'
+  if (str === '$' || str === 'USD') return 'USD'
+  return str
+}
+
+export function parseCbrRates(body) {
+  if (!body || !body.Valute || typeof body.Valute !== 'object') return null
+  const usd = Number(body.Valute.USD && body.Valute.USD.Value)
+  const eur = Number(body.Valute.EUR && body.Valute.EUR.Value)
+  const cny = Number(body.Valute.CNY && body.Valute.CNY.Value)
+  if (!usd || usd <= 0) return null
+
+  const rates = { RUB: Math.round(usd * 1000) / 1000 }
+  if (eur > 0) rates.EUR = Math.round((usd / eur) * 10000) / 10000
+  if (cny > 0) rates.CNY = Math.round((usd / cny) * 1000) / 1000
+  return rates
+}
+
+export function parseOpenErRates(body) {
+  if (!body || !body.rates || typeof body.rates !== 'object') return null
+  const r = body.rates
+  const rates = {}
+  if (Number(r.RUB) > 0) rates.RUB = Math.round(Number(r.RUB) * 1000) / 1000
+  if (Number(r.EUR) > 0) rates.EUR = Math.round(Number(r.EUR) * 10000) / 10000
+  if (Number(r.CNY) > 0) rates.CNY = Math.round(Number(r.CNY) * 1000) / 1000
+  return Object.keys(rates).length ? rates : null
+}
+
+export async function fetchLiveRates(signal) {
+  // 1. Primary: CBR daily JSON
+  try {
+    const cbrSignal = signal ? AbortSignal.any([signal, AbortSignal.timeout(5000)]) : AbortSignal.timeout(5000)
+    const res = await fetch(CBR_URL, { signal: cbrSignal, headers: { accept: 'application/json' } })
+    if (res.ok) {
+      const parsed = parseCbrRates(await res.json())
+      if (parsed) return parsed
+    }
+  } catch {
+    // fallback to secondary
+  }
+
+  // 2. Secondary: Open Exchange Rates API (open.er-api.com)
+  try {
+    const fallbackSignal = signal ? AbortSignal.any([signal, AbortSignal.timeout(5000)]) : AbortSignal.timeout(5000)
+    const res = await fetch(OPEN_ER_URL, { signal: fallbackSignal, headers: { accept: 'application/json' } })
+    if (res.ok) {
+      const parsed = parseOpenErRates(await res.json())
+      if (parsed) return parsed
+    }
+  } catch {
+    // fail-safe
+  }
+
+  return null
+}
+
+export async function refreshFxRates(signal, force = false) {
+  const age = Date.now() - inMemoryCache.fetchedAt
+  if (!force && inMemoryCache.fetchedAt > 0 && age < FX_TTL_MS) {
+    return inMemoryCache.rates
+  }
+  const fresh = await fetchLiveRates(signal)
+  if (fresh) {
+    inMemoryCache = {
+      fetchedAt: Date.now(),
+      rates: { ...inMemoryCache.rates, ...fresh },
+    }
+    try {
+      mkdirSync(dirname(FX_CACHE_FILE), { recursive: true })
+      writeFileSync(FX_CACHE_FILE, JSON.stringify(inMemoryCache))
+    } catch {
+      // transient or read-only filesystem
+    }
+  }
+  return inMemoryCache.rates
+}
+
+export function getFxRate(currencySymbolOrCode, manualRate, autoFx = true) {
+  const code = normalizeCurrencyCode(currencySymbolOrCode)
+  if (code === 'USD') return 1
+
+  const fallback = Number(manualRate) > 0 ? Number(manualRate) : 1
+  if (autoFx === false) return fallback
+
+  const live = inMemoryCache.rates[code]
+  if (live && Number(live) > 0) {
+    return Number(live)
+  }
+  return fallback
+}
+
+export function getCachedFxState() {
+  return {
+    fetchedAt: inMemoryCache.fetchedAt,
+    rates: { ...inMemoryCache.rates },
+  }
+}
+

package/lib/index.js

@@ -29,9 +29,12 @@ try {
 
 export * from './tariff.js'
 export * from './projection.js'
+export * from './fx.js'
 export { STATE_PATH, REFRESH_PATH } from './routes.js'
 import { indexCatalog, resolveTariff, matchModel, unwrapVolatile } from './tariff.js'
 import { usageByModelProjection } from './projection.js'
+import { getFxRate, refreshFxRates } from './fx.js'
+
 
 export const name = '@goodandready/dsh-cost-meter'
 export const inject = ['webServer', 'settings', 'sessionProjections']
@@ -112,10 +115,13 @@ export function isTrustedCaller(request, ctx = null) {
 
 export function normalizeConfig(raw) {
   const u = unwrapVolatile(raw) || {}
+  const currency = typeof u.currency === 'string' && u.currency ? u.currency : '$'
+  const autoFx = u.autoFxRate !== false
   return {
     ...u,
-    currency: typeof u.currency === 'string' && u.currency ? u.currency : '$',
-    usdRate: Number(u.usdRate) > 0 ? Number(u.usdRate) : 1,
+    currency,
+    autoFxRate: autoFx,
+    usdRate: getFxRate(currency, u.usdRate, autoFx),
     displayTimeZone: typeof u.displayTimeZone === 'string' && u.displayTimeZone ? u.displayTimeZone : 'Europe/Moscow',
     budgetThreshold: Number(u.budgetThreshold) || 0,
     useOpenRouter: u.useOpenRouter !== false,
@@ -141,6 +147,7 @@ const PriceRow = z.object({
 
 export const Config = z.object({
   currency: z.string().description('Currency symbol shown in the widget.').default('$').volatile(),
+  autoFxRate: z.boolean().description('Automatically fetch daily exchange rates for non-USD currencies.').default(true).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').volatile(),
   budgetThreshold: z.number().description('Optional session budget threshold in USD. 0 disables threshold warnings.').default(0).volatile(),
@@ -153,6 +160,7 @@ export const Config = z.object({
   manualOffPeakMultiplier: z.number().description('Multiplier outside the manual peak windows.').default(1).volatile(),
 })
 
+
 // Per-model usage projection is defined in and exported from ./projection.js
 
 /** The agent's default route, read off settings descriptors when available. */
@@ -181,12 +189,14 @@ export function splitRoute(key) {
 }
 
 export function apply(ctx, config) {
+  void refreshFxRates()
   let current = normalizeConfig(config)
   let catalog = { index: { byId: {}, byLowerId: {}, bySuffix: {} }, fetchedAt: 0, error: null }
 
   // Server-side cache for resolved tariffs: key -> { schedule, source, matchedId }
   const resolveCache = new Map()
 
+
   function getCachedTariff(cfg, route) {
     if (!route) return resolveTariff(cfg, catalog.index, route)
     const cacheKey = (route.provider || '') + '/' + (route.model || '')
@@ -287,3 +297,4 @@ export function apply(ctx, config) {
   })
 }
 
+

package/lib/tariff.js

@@ -252,3 +252,25 @@ export function resolveTariff(rawCfg, index, route) {
   }
   return { schedule: null, source: 'none', matchedId: null }
 }
+
+/**
+ * Calculate saved cost from prompt cache hits vs regular input price (#92).
+ * Returns { savedUsd, readTokens, percent }
+ */
+export function calculateCacheSavings(usage, rates) {
+  const u = usage || {}
+  const r = rates || {}
+  const readTokens = Number(u.cacheReadTokens) || 0
+  const inputRate = Number(r.input) || 0
+  const cacheHitRate = Number(r.cacheHit) || 0
+  if (readTokens <= 0 || inputRate <= cacheHitRate) {
+    return { savedUsd: 0, readTokens: 0, percent: 0 }
+  }
+  const missedUsd = (readTokens / 1e6) * inputRate
+  const hitUsd = (readTokens / 1e6) * cacheHitRate
+  const savedUsd = Math.max(0, missedUsd - hitUsd)
+  const percent = missedUsd > 0 ? Math.round((savedUsd / missedUsd) * 100) : 0
+  return { savedUsd, readTokens, percent }
+}
+
+

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@goodandready/dsh-cost-meter",
-  "version": "0.8.17",
+  "version": "0.8.19",
   "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",