@shi-yangyang/dsh-token-dashboard 0.2.0 → 0.2.1

package/lib/shared/builtin-prices.js

@@ -87,11 +87,35 @@ for (const entry of BUILTIN_PRICES) {
     }
 }
 for (const entry of GENERATED_PRICES) {
-    for (const candidate of modelKeyCandidates(entry.id)) {
+    const candidates = modelKeyCandidates(entry.id);
+    // The hand-maintained official DeepSeek rates win for the whole family,
+    // including a vendor-prefixed exact id from the OpenRouter snapshot.
+    if (candidates.some(candidate => BUILTIN_BY_KEY.has(candidate)))
+        continue;
+    for (const candidate of candidates) {
         if (!BUILTIN_BY_KEY.has(candidate))
             BUILTIN_BY_KEY.set(candidate, entry.price);
     }
 }
+/** All built-in prices, including the hand-maintained DeepSeek families. */
+export function builtinPriceRows() {
+    const rows = BUILTIN_PRICES.map(entry => ({
+        key: entry.id,
+        provider: 'DeepSeek official',
+        model: entry.id,
+        price: entry.price,
+    }));
+    for (const entry of GENERATED_PRICES) {
+        const slash = entry.id.indexOf('/');
+        rows.push({
+            key: entry.id,
+            provider: slash === -1 ? 'OpenRouter' : entry.id.slice(0, slash).replace(/^~/, ''),
+            model: entry.id,
+            price: entry.price,
+        });
+    }
+    return rows.sort((left, right) => left.key.localeCompare(right.key));
+}
 /** Resolve a built-in list price by model id, ignoring provider/date variants. */
 export function builtinPriceFor(model) {
     for (const key of modelKeyCandidates(model)) {

package/lib/shared/pricing.d.ts

@@ -58,6 +58,8 @@ export declare function serializeOnlinePricing(state: OnlinePricingState): strin
 export declare function isPriceConfigured(price: ModelPrice | undefined): price is ModelPrice;
 /** Estimated cost for one model, or null when no usable price exists. */
 export declare function costOf(usage: Pick<TokenBuckets, 'uncachedInputTokens' | 'cacheReadTokens' | 'cacheWriteTokens' | 'outputTokens'>, price: ModelPrice | undefined): number | null;
+/** Resolve a price by exact model key, then by normalized model-name candidates. */
+export declare function priceForModel(table: PricingTable, key: string, model: string): ModelPrice | undefined;
 /** Build the per-model estimate and currency totals for the current range. */
 export declare function estimateCost(models: ModelUsage[], table: PricingTable): CostEstimate;
 /** Parse a persisted pricing table defensively; unknown or invalid rows are dropped. */

package/lib/shared/pricing.js

@@ -4,6 +4,7 @@
  * a rate. All amounts are labelled "Estimated Cost".
  */
 import { builtinPriceFor } from './builtin-prices.js';
+import { modelKeyCandidates } from './builtin-prices.js';
 /** Suggested currencies; the editor accepts any short code as well. */
 export const SUGGESTED_CURRENCIES = ['CNY', 'USD', 'EUR', 'JPY'];
 /** Resolve user overrides over online prices over built-in list prices. */
@@ -80,6 +81,18 @@ export function costOf(usage, price) {
         + usage.outputTokens * price.output) / 1_000_000;
     return Number.isFinite(amount) ? amount : null;
 }
+/** Resolve a price by exact model key, then by normalized model-name candidates. */
+export function priceForModel(table, key, model) {
+    const direct = table[key];
+    if (direct !== undefined)
+        return direct;
+    for (const candidate of modelKeyCandidates(model)) {
+        const price = table[candidate];
+        if (price !== undefined)
+            return price;
+    }
+    return undefined;
+}
 /** Build the per-model estimate and currency totals for the current range. */
 export function estimateCost(models, table) {
     const rows = [];
@@ -87,7 +100,7 @@ export function estimateCost(models, table) {
     let pricedModels = 0;
     let unpricedModels = 0;
     for (const model of models) {
-        const price = table[model.key];
+        const price = priceForModel(table, model.key, model.model);
         const configured = isPriceConfigured(price);
         const amount = configured ? costOf(model, price) : null;
         if (configured && amount !== null) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shi-yangyang/dsh-token-dashboard",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "description": "Global Token usage analytics for every DeepSeek Harness session: totals, trends, models, sessions, and optional cost estimates.",
   "keywords": [
     "deepseek",