@goodandready/dsh-cost-meter 0.8.24 → 0.8.25

package/lib/client.js

@@ -909,7 +909,7 @@ window.__ModuleLoader__.load({
                       ),
                       React.createElement('div', { className: 'dcm-stat-box' },
                         React.createElement('span', { className: 'dcm-stat-val', style: { fontSize: 12 } },
-                          diagState && diagState.route ? (diagState.route.provider + '/' + diagState.route.model) : 'default'
+                          diagState && diagState.route ? (diagState.route.model || diagState.route.provider) : 'default'
                         ),
                         React.createElement('span', { className: 'dcm-stat-lbl' }, t('diag.route')),
                       ),
@@ -1184,6 +1184,7 @@ window.__ModuleLoader__.load({
       const useProjection = props.useProjection
       const usage = useProjection ? useProjection('tokenUsage') : undefined
       const byModel = useProjection ? useProjection('costByModel') : undefined
+      const modelSelection = useProjection ? useProjection('modelSelection') : undefined
       const [state, setState] = React.useState(null)
       const [open, setOpen] = React.useState(false)
       const [now, setNow] = React.useState(() => new Date())
@@ -1212,11 +1213,39 @@ window.__ModuleLoader__.load({
           m.usage.cacheReadTokens || m.usage.cacheWriteTokens)
       const usedKeys = used.map((m) => m.provider + '/' + m.model).sort().join(',')
 
+      // Determine active model from session modelSelection, committed route, or used models
+      const activeSelection = modelSelection?.next || modelSelection?.lastUsed
+      const activeModelName = activeSelection?.model
+        || byModel?.route?.model
+        || (used.length > 0 ? used[used.length - 1].model : undefined)
+        || (state?.route?.model)
+        || ''
+
+      const activeProvider = activeSelection?.provider
+        || byModel?.route?.provider
+        || (used.length > 0 ? used[used.length - 1].provider : undefined)
+        || (state?.route?.provider)
+        || ''
+
+      const activeRouteKey = activeModelName
+        ? (activeProvider ? activeProvider + '/' + activeModelName : activeModelName)
+        : ''
+
       const reqSeq = React.useRef(0)
 
-      const load = React.useCallback((keys, signal) => {
+      const load = React.useCallback((keys, currentRoute, signal) => {
         const seq = ++reqSeq.current
-        const query = keys ? '?models=' + encodeURIComponent(keys) : ''
+        const params = new URLSearchParams()
+        if (currentRoute) {
+          params.set('currentRoute', currentRoute)
+          params.append('route', currentRoute)
+        }
+        if (keys) {
+          params.set('models', keys)
+          keys.split(',').forEach((k) => { if (k) params.append('route', k) })
+        }
+        const qs = params.toString()
+        const query = qs ? '?' + qs : ''
         fetchWithTimeout(STATE_PATH + query, { signal, headers: { accept: 'application/json' } })
           .then((r) => (r.ok ? r.json() : null))
           .then((data) => {
@@ -1227,15 +1256,15 @@ window.__ModuleLoader__.load({
 
       React.useEffect(() => {
         const controller = new AbortController()
-        load(usedKeys, controller.signal)
+        load(usedKeys, activeRouteKey, controller.signal)
         return () => controller.abort()
-      }, [load, usedKeys])
+      }, [load, usedKeys, activeRouteKey])
       React.useEffect(() => {
         if (!open) return
         const controller = new AbortController()
-        load(usedKeys, controller.signal)
+        load(usedKeys, activeRouteKey, controller.signal)
         return () => controller.abort()
-      }, [open, load, usedKeys])
+      }, [open, load, usedKeys, activeRouteKey])
       React.useEffect(() => {
         const id = setInterval(() => setNow(new Date()), 15000)
         return () => clearInterval(id)
@@ -1255,7 +1284,10 @@ window.__ModuleLoader__.load({
       const fx = stored.usdRate !== undefined && !isNaN(Number(stored.usdRate)) ? Number(stored.usdRate) : (Number(state.usdRate) || 1)
       const budgetThreshold = stored.budgetThreshold !== undefined ? Number(stored.budgetThreshold) : (Number(state.budgetThreshold) || 0)
       const displayMode = stored.displayMode !== undefined ? stored.displayMode : (state.displayMode || 'auto')
-      const schedule = state.schedule
+      const schedules = state.schedules || {}
+      const schedule = (activeRouteKey && schedules[activeRouteKey])
+        || (activeModelName && schedules[activeModelName])
+        || state.schedule
       const hasUsage = usage !== undefined && usage !== null
       const minute = now.getUTCHours() * 60 + now.getUTCMinutes()
 
@@ -1271,7 +1303,7 @@ window.__ModuleLoader__.load({
           ]),
           open ? h('div', { key: 'panel', className: 'dcm-panel' }, [
             h('div', { key: 't', className: 'dcm-panel-title' },
-              state.route ? state.route.provider + ' / ' + state.route.model : t('routeUnknown')),
+              activeModelName || (state.route ? state.route.model : t('routeUnknown'))),
             h('div', { key: 'n', className: 'dcm-panel-note' },
               state.catalogError
                 ? t('catalogUnavailable') + state.catalogError
@@ -1286,11 +1318,10 @@ window.__ModuleLoader__.load({
       const leftMinutes = minutesUntilChange(schedule, minute)
       const left = clock(leftMinutes)
 
-      const schedules = state.schedules || {}
       const perModel = used.map((m) => {
         const key = m.provider + '/' + m.model
-        const own = schedules[key]
-        const ownSchedule = own && own.schedule
+        const own = schedules[key] || schedules[m.model]
+        const ownSchedule = own && (own.schedule || own)
         return {
           key,
           model: m.model,
@@ -1361,8 +1392,8 @@ window.__ModuleLoader__.load({
           let totalSavedUsd = 0
           let totalMissedUsd = 0
           for (const m of perModel) {
-            const own = schedules[m.key]
-            const sched = own && own.schedule ? own.schedule : schedule
+            const own = schedules[m.key] || schedules[m.model]
+            const sched = own && (own.schedule || own) ? (own.schedule || own) : schedule
             if (sched) {
               const res = cacheSavingsBySlots(m.slots || (m.usage ? { 0: m.usage } : {}), sched)
               totalSavedUsd += res.savedUsd
@@ -1386,7 +1417,7 @@ window.__ModuleLoader__.load({
       // Copy summary report to clipboard
       const copyReport = () => {
         const lines = [
-          '=== ' + (state.route ? state.route.model : 'Cost Meter Report') + ' ===',
+          '=== ' + (activeModelName || (state.route ? state.route.model : 'Cost Meter Report')) + ' ===',
           t('tokens.session_total') + ' ' + (hasUsage ? money(total, currency) : '—') + (budgetThreshold > 0 ? ' (limit: ' + money(budgetThreshold * fx, currency) + ')' : ''),
           'Tier: ' + (flat ? 'Flat' : (cheapNow ? t('offpeak') : t('peak'))),
           'Rates (1M): input ' + rate(active.input) + ', output ' + rate(active.output) + ', cache ' + rate(active.cacheHit),
@@ -1424,7 +1455,7 @@ window.__ModuleLoader__.load({
       // Display models with collapse support if > 3 models
       const visibleModels = (perModel.length
         ? perModel
-        : (state.route ? [{ key: state.route.provider + '/' + state.route.model, model: state.route.model, known: Boolean(schedule), cost: 0 }] : [])
+        : (activeModelName ? [{ key: activeRouteKey || activeModelName, model: activeModelName, known: Boolean(schedule), cost: 0 }] : [])
       )
       const shouldCollapse = visibleModels.length > 3 && !showAllModels
       const renderedModels = shouldCollapse ? visibleModels.slice(0, 3) : visibleModels
@@ -1447,7 +1478,7 @@ window.__ModuleLoader__.load({
 
         open ? h('div', { key: 'panel', className: 'dcm-panel' }, [
           h('div', { key: 'title', className: 'dcm-panel-title' }, [
-            h('span', { key: 'model-name' }, state.route ? state.route.model : 'model'),
+            h('span', { key: 'model-name' }, activeModelName || (state.route ? state.route.model : 'model')),
             flat ? null : h('span', { key: 'tier', style: { fontSize: 11.5, opacity: 0.85 } }, cheapNow ? t('offpeak') : t('peak')),
           ]),
 

package/lib/projection.js

@@ -86,6 +86,10 @@ export function slotOf(timeMs) {
 export const modelSlotsSchema = zod.record(zod.string(), bucketSchema)
 
 export const costByModelViewSchema = zod.object({
+  route: zod.object({
+    provider: zod.string(),
+    model: zod.string(),
+  }).nullable().optional(),
   models: zod.array(zod.object({
     provider: zod.string(),
     model: zod.string(),
@@ -194,6 +198,7 @@ export const usageByModelProjection = {
   wire: {
     viewSchema: costByModelViewSchema,
     view: (state) => ({
+      ...(state.route ? { route: state.route } : {}),
       models: Object.keys(state.byKey).map((key) => {
         const slash = key.indexOf('/')
         return {

package/lib/routes.js

@@ -80,18 +80,27 @@ export function registerRoutes(ctx, options) {
             void refresh()
           }
 
-          const route = defaultRoute(ctx) ?? null
+          const url = new URL(req.url, 'http://localhost')
+          const currentQueryRoute = url.searchParams.get('currentRoute') || url.searchParams.get('model')
+          const parsedCurrent = currentQueryRoute ? splitRoute(currentQueryRoute) : null
+          const route = parsedCurrent ?? (defaultRoute(ctx) ?? null)
           const own = getCachedTariff(cfg, route)
 
           // Also resolve tariffs for any session routes requested in query params
           const schedules = {}
-          const url = new URL(req.url, 'http://localhost')
-          const extraRoutes = url.searchParams.getAll('route')
+          const extraRoutes = [
+            ...url.searchParams.getAll('route'),
+            ...url.searchParams.getAll('models').flatMap((m) => m.split(',')),
+          ]
           for (const key of extraRoutes) {
+            if (!key) continue
             const parsed = splitRoute(key)
             if (parsed) {
               const res = getCachedTariff(cfg, parsed)
-              if (res && res.schedule) schedules[key] = res.schedule
+              if (res && res.schedule) {
+                schedules[key] = res.schedule
+                if (parsed.model) schedules[parsed.model] = res.schedule
+              }
             }
           }
 

package/lib/tariff.js

@@ -139,8 +139,16 @@ export function matchModel(index, route, modelMap) {
   if (byLowerId[lower]) return byLowerId[lower]
   if (byLowerId[key.toLowerCase()]) return byLowerId[key.toLowerCase()]
   const bySuffix = index.bySuffix || {}
-  const list = bySuffix[lower]
-  if (!list || !list.length) return undefined
+  let list = bySuffix[lower]
+  if (!list || !list.length) {
+    // Prefix fallback for short names like "beam" -> "beam-1.0-501b-a23b"
+    const prefixKey = Object.keys(bySuffix).find((k) => k.startsWith(lower + '-') || k.startsWith(lower + '.'))
+    if (prefixKey && bySuffix[prefixKey]?.length) {
+      list = bySuffix[prefixKey]
+    } else {
+      return undefined
+    }
+  }
   if (list.length === 1) return list[0]
 
   // Multiple catalog entries share the same model suffix: disambiguate by provider
@@ -155,8 +163,8 @@ export function matchModel(index, route, modelMap) {
     })
     if (matched) return matched
   }
-  // Ambiguous suffix with no provider match: do not guess arbitrarily
-  return undefined
+  // When provider does not match or is absent, fall back to the first catalog candidate for this model
+  return list[0]
 }
 
 /** Build lookup tables once per fetch; the raw catalog is ~700 KB. */
@@ -273,4 +281,4 @@ export function calculateCacheSavings(usage, rates) {
   return { savedUsd, readTokens, percent }
 }
 
-
+

package/package.json

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