@goodandready/dsh-cost-meter 0.8.17 → 0.8.18

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/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.18",
   "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",