dsh-plugin-usage 0.2.2 → 0.4.0

package/lib/host/query.js

@@ -5,6 +5,7 @@
  * by-model table and model candidate list) are owned here.
  */
 import { dayKey, DAY_MS, bucketKeyFor, stepMs, alignFloor, stepDayKey, MAX_BUCKETS, } from './time.js';
+import { currencyOf } from './settings.js';
 function emptyBucket(key) {
     return {
         key,
@@ -52,7 +53,7 @@ export function query(state, args) {
     const dailyMap = new Map();
     const modelMap = new Map();
     const total = emptyBucket('total');
-    const seenModels = new Map(); // composite key -> {provider, model} (first composite wins)
+    const seenModels = new Map(); // composite key -> {key, provider, model} (first composite wins)
     let unpricedCalls = 0;
     // Range-anchored day-step grid: blocks start at the range's first day.
     const dayAnchor = Number.isFinite(from) ? alignFloor(from, 'day') : null;
@@ -60,14 +61,17 @@ export function query(state, args) {
     for (const r of state.index ? state.index.recordsInRange(from, to) : state.records) {
         if (r.time < from || r.time > to)
             continue;
+        // Candidate list first, selection filter second: the dropdown must offer
+        // every model that has data in the range, not only the ones already ticked
+        // (ticking one used to collapse the list to that single entry).
+        const modelKey = compositeModelKey(r);
+        if (!seenModels.has(modelKey))
+            seenModels.set(modelKey, { key: modelKey, provider: r.provider, model: r.model });
         if (!modelMatches(r))
             continue;
         const cost = state.prices.costOf(r);
         if (r.totalTokens > 0 && !state.prices.hasPrice(r))
             unpricedCalls += 1;
-        const modelKey = compositeModelKey(r);
-        if (!seenModels.has(modelKey))
-            seenModels.set(modelKey, { provider: r.provider, model: r.model });
         const dk = useStepGrid ? stepDayKey(r, dayAnchor, stepDays) : bucketKeyFor(r.time, granularity, stepDays);
         let db = dailyMap.get(dk);
         if (db === undefined) {
@@ -145,12 +149,28 @@ export function query(state, args) {
             heatmap.push(hmMap.get(k) || emptyBucket(k));
         }
     }
+    // Display currency: the price table is denominated in USD and stays as it is
+    // (it is shared, polled, and never mutated per request). Conversion happens
+    // here, once, at the output boundary — including the heatmap and the totals,
+    // so no two views of the same data disagree. Six decimals keep float tails
+    // out of the sums.
+    const money = currencyOf(args.currency, state.prices.currency);
+    const toDisplay = (v) => (money.perUsd === 1 ? v : Math.round(v * money.perUsd * 1e6) / 1e6);
+    for (const b of daily)
+        b.cost = toDisplay(b.cost);
+    for (const b of byModel)
+        b.cost = toDisplay(b.cost);
+    total.cost = toDisplay(total.cost);
+    if (heatmap !== null)
+        for (const b of heatmap)
+            b.cost = toDisplay(b.cost);
     return {
         daily,
         byModel,
         total,
         models,
         unpricedCalls,
+        currency: { code: money.code, symbol: money.symbol },
         ...heatmap === null ? {} : { heatmap },
         backfill: { status: state.backfill.status, total: state.backfill.total, done: state.backfill.done },
     };

package/lib/host/settings.js

@@ -12,6 +12,45 @@
  * The store below stays the in-memory view the aggregation code reads.
  */
 export const DEFAULT_CURRENCY = '¥';
+/**
+ * Currency the price table is denominated in.
+ *
+ * DEFAULT_PRICES carries DeepSeek's USD list price per 1M tokens (0.27 input /
+ * 1.10 output / 0.07 cache-read for `deepseek-chat`, which is exactly 2 / 8 /
+ * 0.5 CNY at the fixed 7:1). The table is never rewritten at runtime: a display
+ * switch converts on the way out, so a query can never pollute the next one.
+ */
+export const PRICE_UNIT_CURRENCY = 'USD';
+/** Display currencies; `perUsd` is how many units of it one USD buys. */
+export const CURRENCIES = {
+    USD: { code: 'USD', symbol: '$', perUsd: 1 },
+    CNY: { code: 'CNY', symbol: '¥', perUsd: 7 },
+};
+function currencyCodeOf(value) {
+    const raw = typeof value === 'string' ? value.trim().toUpperCase() : '';
+    if (raw === 'USD' || raw === '$' || raw === 'US$')
+        return 'USD';
+    if (raw === 'CNY' || raw === '¥' || raw === 'RMB' || raw === 'CN¥')
+        return 'CNY';
+    return '';
+}
+/**
+ * Resolve a configured currency (ISO code or the bare symbol the store has
+ * always held) to a CURRENCIES entry. Unknown values fall back to `fallback`,
+ * then to the default display currency — never throw on user input.
+ *
+ * @param {unknown} value
+ * @param {unknown} [fallback]
+ */
+export function currencyOf(value, fallback) {
+    const hit = CURRENCIES[currencyCodeOf(value)];
+    if (hit)
+        return hit;
+    const fb = CURRENCIES[currencyCodeOf(fallback)];
+    if (fb)
+        return fb;
+    return CURRENCIES[currencyCodeOf(DEFAULT_CURRENCY)] || CURRENCIES.CNY;
+}
 export const DEFAULT_PRICES = {
     'deepseek-chat': { inputPerM: 0.27, outputPerM: 1.1, cacheReadPerM: 0.07, cacheWritePerM: 0.27 },
     'deepseek-v3': { inputPerM: 0.27, outputPerM: 1.1, cacheReadPerM: 0.07, cacheWritePerM: 0.27 },

package/locale/en.json

@@ -0,0 +1,6 @@
+{
+  "meta": {
+    "title": "Usage Statistics",
+    "description": "Token, call and reference-cost statistics by day and by model, with model filters and a yearly heatmap."
+  }
+}

package/locale/zh.json

@@ -0,0 +1,6 @@
+{
+  "meta": {
+    "title": "用量统计",
+    "description": "按天、按模型查看 Token、调用次数与参考成本，支持模型筛选与年度热力图。"
+  }
+}

package/package.json

@@ -1,13 +1,14 @@
 {
   "name": "dsh-plugin-usage",
   "description": "Token usage statistics for DeepSeek Harness — daily/custom-range views, model filters, call counts and cost, inspired by CC Switch statistics.",
-  "version": "0.2.2",
+  "version": "0.4.0",
   "license": "MIT",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/bennett-dsh/dsh-plugin-usage.git"
   },
   "type": "module",
+  "icon": "./icon.svg",
   "main": "lib/host/index.js",
   "exports": {
     ".": {
@@ -17,11 +18,14 @@
       "default": "./lib/client/index.js"
     },
     "./cordis.patch.yml": "./cordis.patch.yml",
-    "./package.json": "./package.json"
+    "./package.json": "./package.json",
+    "./locale/*.json": "./locale/*.json"
   },
   "files": [
     "lib",
     "cordis.patch.yml",
+    "icon.svg",
+    "locale",
     "image.png",
     "image-1.png"
   ],
@@ -47,7 +51,8 @@
       "inject": [
         "@deepseek-ai/dsh-client-runtime",
         "@deepseek-ai/dsh-client-ui-settings",
-        "@deepseek-ai/dsh-client-locale"
+        "@deepseek-ai/dsh-client-locale",
+        "@deepseek-ai/dsh-client-ui-conversation"
       ],
       "platform": "web"
     }