dsh-plugin-usage 0.2.0 → 0.2.2

package/lib/host/settings.js

@@ -1,10 +1,15 @@
 /**
  * Price table + cost computation.
  *
- * P0-1: createPriceStore() keeps the process-memory table. The optimization
- * adds a durable settings-namespace backend via `ctx.settings` (official
- * dsh-settings) with the in-memory store as fallback — implemented by the
- * settings workstream inside this file only.
+ * Persistence is the official plugin-config path: `index.js` exports a
+ * schemastery `Config`, so DSH materializes a form under the plugin entry's
+ * id (`usage`) in the Plugins settings tab and stores values in the profile
+ * patch. There is deliberately no private `settings.yaml` / settings-service
+ * registration here — DSH 0.2.x `ctx.settings` (SettingsForms) only offers
+ * `describe/update/replace/mutate/configure`, and hand-rolled namespaces are
+ * not reachable from the client config surface.
+ *
+ * The store below stays the in-memory view the aggregation code reads.
  */
 export const DEFAULT_CURRENCY = '¥';
 export const DEFAULT_PRICES = {
@@ -13,17 +18,42 @@ export const DEFAULT_PRICES = {
     'deepseek-v3.1': { inputPerM: 0.27, outputPerM: 1.1, cacheReadPerM: 0.07, cacheWritePerM: 0.27 },
     'deepseek-v4': { inputPerM: 0.27, outputPerM: 1.1, cacheReadPerM: 0.07, cacheWritePerM: 0.27 },
     'deepseek-v4-flash': { inputPerM: 0.14, outputPerM: 0.56, cacheReadPerM: 0.04, cacheWritePerM: 0.14 },
+    'deepseek-v4.1-flash': { inputPerM: 0.14, outputPerM: 0.56, cacheReadPerM: 0.04, cacheWritePerM: 0.14 },
+    'deepseek-v4.1-flash-1017': { inputPerM: 0.14, outputPerM: 0.56, cacheReadPerM: 0.04, cacheWritePerM: 0.14 },
+    // DSH's routed default model id (`magpie` provider) aliases the same route;
+    // without this entry every session bills as "unpriced" on a stock install.
+    'group/auto-deepseek-v4-1-flash': { inputPerM: 0.14, outputPerM: 0.56, cacheReadPerM: 0.04, cacheWritePerM: 0.14 },
     'deepseek-reasoner': { inputPerM: 0.55, outputPerM: 2.19, cacheReadPerM: 0.14, cacheWritePerM: 0.55 },
     'deepseek-r1': { inputPerM: 0.55, outputPerM: 2.19, cacheReadPerM: 0.14, cacheWritePerM: 0.55 },
 };
+/**
+ * Shallow-merge configured prices over the defaults.
+ *
+ * @param {unknown} incoming - configured per-model prices.
+ * @returns {Record<string, object>} complete price table.
+ */
+export function mergePrices(incoming) {
+    const merged = Object.assign({}, DEFAULT_PRICES);
+    if (incoming && typeof incoming === 'object' && !Array.isArray(incoming)) {
+        for (const [model, price] of Object.entries(incoming)) {
+            if (price && typeof price === 'object') {
+                merged[model] = {
+                    inputPerM: Number(price.inputPerM) || 0,
+                    outputPerM: Number(price.outputPerM) || 0,
+                    cacheReadPerM: Number(price.cacheReadPerM) || 0,
+                    cacheWritePerM: Number(price.cacheWritePerM) || 0,
+                };
+            }
+        }
+    }
+    return merged;
+}
 export function createPriceStore(defaultPrices, defaultCurrency) {
     const prices = Object.assign({}, defaultPrices);
     let currency = defaultCurrency || DEFAULT_CURRENCY;
     const store = {
         prices,
         get currency() { return currency; },
-        /** Write-through slot wired by initSettings(); null without a settings service. */
-        persist: null,
         /** Merge incoming per-model prices (each field coerced to a number). */
         setPrices(incoming) {
             if (!incoming || typeof incoming !== 'object')
@@ -38,15 +68,10 @@ export function createPriceStore(defaultPrices, defaultCurrency) {
                     };
                 }
             }
-            if (typeof store.persist === 'function')
-                store.persist({ prices: Object.assign({}, prices) });
         },
         setCurrency(v) {
-            if (typeof v === 'string' && v.length > 0) {
+            if (typeof v === 'string' && v.length > 0)
                 currency = v;
-                if (typeof store.persist === 'function')
-                    store.persist({ currency });
-            }
         },
         /** Look up a price by `provider/model` composite first, then bare model. */
         priceOf(r) {
@@ -73,90 +98,3 @@ export function createPriceStore(defaultPrices, defaultCurrency) {
     };
     return store;
 }
-const USAGE_PRICES_NS = 'usage.prices';
-/** JSON-schema-shaped descriptor for the usage.prices settings section. */
-const PRICE_SECTION_DESCRIPTOR = {
-    type: 'object',
-    properties: {
-        prices: {
-            type: 'object',
-            description: 'Per-model prices (cost per 1M tokens, in `currency`).',
-            additionalProperties: {
-                type: 'object',
-                properties: {
-                    inputPerM: { type: 'number' },
-                    outputPerM: { type: 'number' },
-                    cacheReadPerM: { type: 'number' },
-                    cacheWritePerM: { type: 'number' },
-                },
-                required: ['inputPerM', 'outputPerM', 'cacheReadPerM', 'cacheWritePerM'],
-            },
-        },
-        currency: { type: 'string' },
-    },
-    required: ['prices', 'currency'],
-};
-/** Apply a resolved settings section onto the in-memory price store. */
-function applySection(store, section) {
-    if (!section || typeof section !== 'object')
-        return;
-    if (typeof store.setPrices === 'function' && section.prices && typeof section.prices === 'object' && !Array.isArray(section.prices)) {
-        store.setPrices(section.prices);
-    }
-    if (typeof store.setCurrency === 'function' && typeof section.currency === 'string')
-        store.setCurrency(section.currency);
-}
-/**
- * P0-1: wire the price store to the official `ctx.settings` namespace
- * (durable, shown in the official Plugins config tab) when available.
- * Registers `usage.prices`, seeds the store from the resolved section, and
- * writes every setPrices/setCurrency mutation through. Falls back to the
- * in-memory store whenever the settings service is missing or unavailable.
- */
-export function initSettings(ctx, store) {
-    if (!ctx || typeof ctx.get !== 'function' || !store || typeof store !== 'object')
-        return;
-    let settings;
-    try {
-        settings = ctx.get('settings');
-    }
-    catch {
-        return;
-    }
-    if (!settings || typeof settings.register !== 'function')
-        return;
-    let scope;
-    try {
-        scope = settings.register(USAGE_PRICES_NS, PRICE_SECTION_DESCRIPTOR, { base: { prices: DEFAULT_PRICES, currency: DEFAULT_CURRENCY }, applies: 'live' });
-    }
-    catch {
-        return; // registration failed — keep the current in-memory behavior
-    }
-    store.persist = (patch) => {
-        try {
-            if (scope && typeof scope.update === 'function')
-                return scope.update(USAGE_PRICES_NS, patch);
-            if (settings && typeof settings.update === 'function')
-                return settings.update(USAGE_PRICES_NS, patch);
-        }
-        catch {
-            // Never throw when the settings scope is unavailable.
-        }
-    };
-    let section;
-    try {
-        if (scope && typeof scope.get === 'function')
-            section = scope.get();
-        else if (settings && typeof settings.get === 'function')
-            section = settings.get(USAGE_PRICES_NS);
-    }
-    catch {
-        section = undefined;
-    }
-    if (section && typeof section.then === 'function') {
-        section.then((resolved) => applySection(store, resolved)).catch(() => { });
-    }
-    else {
-        applySection(store, section);
-    }
-}

package/lib/host/state.js

@@ -1,11 +1,20 @@
 /**
  * Mutable runtime state capsule for the usage host half.
  *
- * - records: folded usage records, one per assistant/message with usage.
+ * - records: folded usage records, one per billed assistant settlement
+ *   (`assistant/message` or `assistant/attempt`) that reported usage.
  * - watermarks: sessionId -> last folded event seq.
+ * - revisions: sessionId -> last persisted revision folded (opaque equality
+ *   token from `sessionPersistence.list()`); lets the slow scan skip sessions
+ *   whose log did not change.
  * - backfill: progress counters surfaced through query results.
  * - prices: the price store from settings.js.
- * - dedup: (sessionId, turn, step) -> index in records; owned by fold.js.
+ * - lastSample: sessionId -> { turn, step, record } — the replacement slot the
+ *   official tokenUsage projection keeps, so a later sample for the same
+ *   (turn, step) replaces in place and `llm/retry-started` clears it.
+ * - route: sessionId -> { provider, model } from the latest request route,
+ *   used to attribute settlements that carry no `message.source`
+ *   (`assistant/attempt` never does).
  * - index: incremental aggregation index (aggregate.js), kept in sync by
  *   fold.js and consumed by query.js.
  */
@@ -13,9 +22,11 @@ export function createState(priceStore) {
     return {
         records: [],
         watermarks: new Map(),
+        revisions: new Map(),
         backfill: { status: 'idle', total: 0, done: 0 },
         prices: priceStore,
-        dedup: new Map(),
+        lastSample: new Map(),
+        route: new Map(),
         index: null, // wired by apply() after createUsageIndex(state)
     };
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "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.0",
+  "version": "0.2.2",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -21,7 +21,9 @@
   },
   "files": [
     "lib",
-    "cordis.patch.yml"
+    "cordis.patch.yml",
+    "image.png",
+    "image-1.png"
   ],
   "keywords": [
     "dsh",
@@ -32,7 +34,12 @@
     "statistics",
     "cost"
   ],
+  "engines": {
+    "node": ">=22",
+    "dsh": ">=0.2.0-rc.2 <0.3.0"
+  },
   "dsh": {
+    "manifestVersion": 1,
     "bundle": {
       "patch": "./cordis.patch.yml"
     },
@@ -45,12 +52,14 @@
       "platform": "web"
     }
   },
+  "dependencies": {
+    "@deepseek-ai/schemastery": "~3.18.5"
+  },
   "peerDependencies": {
-    "@deepseek-ai/cordis": "^4.0.1",
-    "react": "^18.2.0"
+    "@deepseek-ai/cordis": "~4.0.5"
   },
   "devDependencies": {
-    "@deepseek-ai/cordis": "^4.0.1",
+    "@deepseek-ai/cordis": "~4.0.5",
     "@types/react": "~18.3.1",
     "react": "^18.2.0",
     "typescript": "^5.5.0"
@@ -59,6 +68,6 @@
     "build": "tsc -p tsconfig.json && node scripts/build-client.js",
     "test": "node --test tests/*.test.js",
     "watch": "tsc -p tsconfig.json --watch",
-    "prepublishOnly": "npm run build"
+    "prepublishOnly": "npm run build && npm test"
   }
-}
+}