@goodandready/dsh-cost-meter 0.8.25 → 0.8.27

package/lib/index.js

@@ -30,11 +30,16 @@ try {
 export * from './tariff.js'
 export * from './projection.js'
 export * from './fx.js'
+export * from './alerts.js'
+export * from './commands.js'
+export * from './export.js'
 export { STATE_PATH, REFRESH_PATH } from './routes.js'
-import { indexCatalog, resolveTariff, matchModel, unwrapVolatile } from './tariff.js'
-import { usageByModelProjection } from './projection.js'
+import { indexCatalog, resolveTariff, matchModel, unwrapVolatile, calculateCacheSavings } from './tariff.js'
+import { usageByModelProjection, getLastTurns, resetLastTurns } from './projection.js'
 import { getFxRate, refreshFxRates } from './fx.js'
-
+import { registerSlashCommand } from './commands.js'
+import { calculateBurnRateAndProjection } from './analytics.js'
+import { ratesAt } from './alerts.js'
 
 export const name = '@goodandready/dsh-cost-meter'
 export const inject = ['webServer', 'settings', 'sessionProjections']
@@ -84,7 +89,6 @@ export function isTrustedCaller(request, ctx = null) {
         if (isLoopback(url.hostname) && loopback) return true
         return false
       }
-      // Non-http/https origin (e.g. dsh-app://app in DSH Desktop)
       if (loopback) return true
       return false
     } catch {
@@ -101,7 +105,6 @@ export function isTrustedCaller(request, ctx = null) {
         if (isLoopback(url.hostname) && loopback) return true
         return false
       }
-      // Non-http/https referer (e.g. dsh-app://app/ in DSH Desktop)
       if (loopback) return true
       return false
     } catch {
@@ -110,7 +113,6 @@ export function isTrustedCaller(request, ctx = null) {
   }
 
   if (loopback) return true
-
   return false
 }
 
@@ -126,6 +128,9 @@ export function normalizeConfig(raw) {
     displayTimeZone: typeof u.displayTimeZone === 'string' && u.displayTimeZone ? u.displayTimeZone : 'Europe/Moscow',
     budgetThreshold: Number(u.budgetThreshold) || 0,
     displayMode: (u.displayMode === 'compact' || u.displayMode === 'full') ? u.displayMode : 'auto',
+    alertBeforeSwitch: u.alertBeforeSwitch !== false,
+    alertLeadMinutes: Math.max(1, Math.min(30, Number(u.alertLeadMinutes) || 5)),
+    browserNotifications: Boolean(u.browserNotifications),
     useOpenRouter: u.useOpenRouter !== false,
     refreshHours: Number(u.refreshHours) || 24,
     deepseekPeakPrices: u.deepseekPeakPrices || {},
@@ -154,6 +159,9 @@ export const Config = z.object({
   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(),
   displayMode: z.union(['auto', 'full', 'compact']).description('Widget display mode: auto, full, or compact.').default('auto').volatile(),
+  alertBeforeSwitch: z.boolean().description('Pre-switch notification and visual alert before tariff change.').default(true).volatile(),
+  alertLeadMinutes: z.number().description('Minutes before tariff change to trigger pre-switch alert.').default(5).volatile(),
+  browserNotifications: z.boolean().description('Enable desktop browser notifications for tariff switches.').default(false).volatile(),
   deepseekPeakPrices: z.dict(PriceRow).description('Override the built-in DeepSeek peak rates, by model id.').default({}).volatile(),
   useOpenRouter: z.boolean().description('Pull rates and discount windows from the public OpenRouter catalog.').default(true).volatile(),
   refreshHours: z.number().description('How often to refetch the catalog.').default(24).volatile(),
@@ -163,9 +171,6 @@ 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. */
 function defaultRoute(ctx) {
   const settings = (ctx?.get && typeof ctx.get === 'function' ? ctx.get('settings') : null) || ctx?.settings
@@ -195,17 +200,13 @@ 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 || '')
     if (resolveCache.has(cacheKey)) return resolveCache.get(cacheKey)
     const res = resolveTariff(cfg, catalog.index, route)
-    // Limit cache size to prevent runaway memory
     if (resolveCache.size >= 500) resolveCache.clear()
     resolveCache.set(cacheKey, res)
     return res
@@ -215,15 +216,12 @@ export function apply(ctx, config) {
     resolveCache.clear()
   }
 
-  // Disk cache survives restarts, so a boot without network still prices.
   try {
     const cached = JSON.parse(readFileSync(CACHE_FILE, 'utf8'))
     if (cached && Array.isArray(cached.models)) {
       catalog = { index: indexCatalog(cached.models), fetchedAt: cached.fetchedAt || 0, error: null }
     }
-  } catch {
-    // absent or unreadable cache is normal on first run
-  }
+  } catch {}
 
   async function refresh(signal, force = false) {
     const cfg = current ?? config
@@ -244,9 +242,7 @@ export function apply(ctx, config) {
       try {
         mkdirSync(dirname(CACHE_FILE), { recursive: true })
         writeFileSync(CACHE_FILE, JSON.stringify({ fetchedAt: catalog.fetchedAt, models: slim }))
-      } catch {
-        // a read-only storages dir only costs us the restart-time cache
-      }
+      } catch {}
     } catch (error) {
       catalog = { ...catalog, error: String((error && error.message) || error) }
     }
@@ -287,6 +283,19 @@ export function apply(ctx, config) {
     eff(() => pctx.sessionProjections.register(usageByModelProjection))
   })
 
+  // Register slash command /cost and /cost-summary
+  registerSlashCommand(ctx, {
+    getCurrentConfig: () => (current ? normalizeConfig(current) : normalizeConfig(config)),
+    getCachedTariff,
+    getLastTurns,
+    resetLastTurns,
+    calculateBurnRateAndProjection,
+    calculateCacheSavings,
+    ratesAt,
+    splitRoute,
+    defaultRoute,
+  })
+
   // Register HTTP routes (refresh, state, update) via webServer service
   registerRoutes(ctx, {
     name,
@@ -299,5 +308,3 @@ export function apply(ctx, config) {
     getCatalog: () => catalog,
   })
 }
-
-

package/lib/projection.js

@@ -32,6 +32,8 @@ export const turnRecordSchema = zod.object({
   cacheWriteTokens: zod.number().nonnegative().optional(),
   costDeltaUsd: zod.number().nonnegative().optional(),
   timestamp: zod.number().nonnegative(),
+  durationMs: zod.number().nonnegative().optional(),
+  cacheHitRate: zod.number().min(0).max(100).optional(),
 }).passthrough()
 
 /** Pull the four buckets out of one provider usage record. */
@@ -152,7 +154,20 @@ export const usageByModelProjection = {
       ? event.time
       : (event.time instanceof Date && !Number.isNaN(event.time.getTime()) ? event.time.getTime() : Date.now())
 
+    const promptTokens = buckets.uncachedInputTokens + buckets.cacheReadTokens
+    const cacheHitRate = promptTokens > 0
+      ? Math.round((buckets.cacheReadTokens / promptTokens) * 100)
+      : 0
+
     const currentTurns = Array.isArray(state.turns) ? state.turns : []
+    let durationMs = 0
+    if (currentTurns.length > 0) {
+      const prevTs = currentTurns[currentTurns.length - 1].timestamp
+      if (timestamp > prevTs && timestamp - prevTs < 600000) {
+        durationMs = timestamp - prevTs
+      }
+    }
+
     const existingIndex = currentTurns.findIndex((t) => t.turn === turnNum && t.step === stepNum)
     let nextTurns
     if (existingIndex >= 0) {
@@ -167,6 +182,8 @@ export const usageByModelProjection = {
         cacheWriteTokens: buckets.cacheWriteTokens,
         costDeltaUsd: nextTurns[existingIndex].costDeltaUsd || 0,
         timestamp,
+        durationMs: nextTurns[existingIndex].durationMs || durationMs,
+        cacheHitRate,
       }
     } else {
       const newEntry = {
@@ -179,6 +196,8 @@ export const usageByModelProjection = {
         cacheWriteTokens: buckets.cacheWriteTokens,
         costDeltaUsd: 0,
         timestamp,
+        durationMs,
+        cacheHitRate,
       }
       nextTurns = [...currentTurns, newEntry].slice(-MAX_TURNS_HISTORY)
     }

package/lib/routes.js

@@ -3,6 +3,7 @@ import { createHash } from 'node:crypto'
 import { registerPluginUpdater } from './updater.js'
 import { getLastTurns } from './projection.js'
 import { calculateBurnRateAndProjection } from './analytics.js'
+import { getCachedFxState } from './fx.js'
 
 export const STATE_PATH = '/dsh-cost-meter/state'
 export const REFRESH_PATH = '/dsh-cost-meter/refresh'
@@ -107,9 +108,13 @@ export function registerRoutes(ctx, options) {
           const payloadObj = {
             currency: typeof cfg?.currency === 'string' && cfg.currency ? cfg.currency : '$',
             usdRate: Number(cfg?.usdRate) > 0 ? Number(cfg.usdRate) : 1,
+            fxRates: { USD: 1, ...(getCachedFxState().rates || {}) },
             displayTimeZone: typeof cfg?.displayTimeZone === 'string' && cfg.displayTimeZone ? cfg.displayTimeZone : 'Europe/Moscow',
             budgetThreshold: Number(cfg?.budgetThreshold) || 0,
             displayMode: cfg?.displayMode || 'auto',
+            alertBeforeSwitch: cfg?.alertBeforeSwitch !== false,
+            alertLeadMinutes: Number(cfg?.alertLeadMinutes) || 5,
+            browserNotifications: Boolean(cfg?.browserNotifications),
             route,
             source: own.source,
             matchedId: own.matchedId,

package/package.json

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