opencode-token-tracker 1.5.0 → 1.5.1

package/README.md

@@ -300,9 +300,10 @@ All prices are in **USD per 1 million tokens**:
 Pricing is resolved in this order (first match wins):
 
 1. **Provider-level** - Override all models for a provider
-2. **User model config** - Custom model pricing in config file
-3. **Built-in pricing** - Default pricing table
-4. **Fallback** - $1/M input, $4/M output
+2. **Provider-specific model config** - Custom pricing for the same model under different providers
+3. **User model config** - Generic custom model pricing in config file
+4. **Built-in pricing** - Default pricing table
+5. **Fallback** - $1/M input, $4/M output
 
 #### Example: Free providers
 
@@ -330,6 +331,23 @@ Override or add pricing for specific models (prices in USD per 1M tokens):
 }
 ```
 
+#### Example: Same model, different provider pricing
+
+If the same model has different prices under different providers, nest provider names under the model key:
+
+```json
+{
+  "models": {
+    "deepseek/deepseek-v4-flash": {
+      "openrouter": { "input": 0.14, "output": 0.28, "cacheRead": 0.0028 },
+      "siliconflow": { "input": 0.2, "output": 0.4 }
+    }
+  }
+}
+```
+
+You can still mix this with the original flat model pricing format.
+
 ### Toast Settings
 
 | Option | Type | Default | Description |

package/README.zh-CN.md

@@ -285,9 +285,10 @@ token 记录保存在：
 定价解析顺序（命中即止）：
 
 1. **Provider 覆盖** — 为某个 provider 的所有模型统一设置
-2. **用户 model 配置** — 为特定模型自定义定价
-3. **内置定价** — 默认定价表
-4. **默认回退** — $1/M input，$4/M output
+2. **按 provider 的 model 配置** — 同一模型在不同 provider 下使用不同定价
+3. **用户 model 配置** — 为特定模型自定义通用定价
+4. **内置定价** — 默认定价表
+5. **默认回退** — $1/M input，$4/M output
 
 #### 示例：免费 provider
 
@@ -315,6 +316,23 @@ token 记录保存在：
 }
 ```
 
+#### 示例：同一模型在不同 provider 下使用不同价格
+
+如果同一个模型在不同 provider 下价格不同，可以在模型名下继续按 provider 配置：
+
+```json
+{
+  "models": {
+    "deepseek/deepseek-v4-flash": {
+      "openrouter": { "input": 0.14, "output": 0.28, "cacheRead": 0.0028 },
+      "siliconflow": { "input": 0.2, "output": 0.4 }
+    }
+  }
+}
+```
+
+这种写法可以和原来的扁平 `models` 配置同时使用。
+
 ### 预算设置
 
 | 选项 | 类型 | 默认值 | 说明 |

package/dist/bin/opencode-tokens.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { BUILTIN_PRICING, DEFAULT_CONFIG, formatCost, formatTokens, getStartOfDay, getStartOfWeek, getStartOfMonth, validateConfig } from "../lib/shared.js";
+import { BUILTIN_PRICING, DEFAULT_CONFIG, findModelConfigPricing, formatCost, formatTokens, getStartOfDay, getStartOfWeek, getStartOfMonth, validateConfig } from "../lib/shared.js";
 import { readFileSync, existsSync, writeFileSync } from "fs";
 import { join } from "path";
 import { homedir } from "os";
@@ -292,7 +292,7 @@ function cmdModels() {
         if (config.providers?.[provider]) {
             status = "provider cfg";
         }
-        else if (config.models?.[model]) {
+        else if (findModelConfigPricing(config.models, model, provider)) {
             status = "model cfg";
         }
         else if (!BUILTIN_PRICING[model]) {

package/dist/index.js

@@ -1,4 +1,4 @@
-import { BUILTIN_PRICING, DEFAULT_CONFIG, formatCost, formatTokens, getStartOfDay, getStartOfWeek, getStartOfMonth, validateConfig } from "./lib/shared.js";
+import { BUILTIN_PRICING, DEFAULT_CONFIG, findModelConfigPricing, formatCost, formatTokens, getStartOfDay, getStartOfWeek, getStartOfMonth, validateConfig } from "./lib/shared.js";
 import { appendFileSync, existsSync, mkdirSync, readFileSync } from "fs";
 import { join } from "path";
 import { homedir } from "os";
@@ -36,27 +36,22 @@ function getModelPricing(model, provider) {
         return config.providers[provider];
     }
     // 2. Check user-defined model pricing
-    if (config.models[model]) {
-        return config.models[model];
+    const configuredPricing = findModelConfigPricing(config.models, model, provider);
+    if (configuredPricing) {
+        return configuredPricing;
     }
     // 3. Check built-in exact match
     if (BUILTIN_PRICING[model]) {
         return BUILTIN_PRICING[model];
     }
-    // 4. Try partial match in user config
+    // 4. Try partial match in built-in pricing
     const modelLower = model.toLowerCase();
-    for (const [key, pricing] of Object.entries(config.models)) {
-        if (modelLower.includes(key.toLowerCase())) {
-            return pricing;
-        }
-    }
-    // 5. Try partial match in built-in pricing
     for (const [key, pricing] of Object.entries(BUILTIN_PRICING)) {
         if (key !== "_default" && modelLower.includes(key.toLowerCase())) {
             return pricing;
         }
     }
-    // 6. Fallback to default
+    // 5. Fallback to default
     return BUILTIN_PRICING["_default"];
 }
 function calculateCost(model, provider, input, output, cacheRead = 0, cacheWrite = 0) {

package/dist/lib/shared.d.ts

@@ -4,6 +4,9 @@ export interface ModelPricing {
     cacheRead?: number;
     cacheWrite?: number;
 }
+export interface ProviderModelPricingMap {
+    [provider: string]: ModelPricing;
+}
 export declare const BUILTIN_PRICING: Record<string, ModelPricing>;
 export declare function formatCost(cost: number): string;
 /**
@@ -28,7 +31,7 @@ export interface BudgetConfig {
 }
 export interface TrackerConfig {
     providers: Record<string, ModelPricing>;
-    models: Record<string, ModelPricing>;
+    models: Record<string, ModelPricing | ProviderModelPricingMap>;
     toast: ToastConfig;
     budget: BudgetConfig;
 }
@@ -42,3 +45,4 @@ export interface ConfigValidationResult {
  * Invalid fields are silently corrected to defaults with warnings.
  */
 export declare function validateConfig(raw: unknown): ConfigValidationResult;
+export declare function findModelConfigPricing(models: TrackerConfig["models"], model: string, provider: string): ModelPricing | undefined;

package/dist/lib/shared.js

@@ -139,7 +139,7 @@ export function validateConfig(raw) {
     }
     const obj = raw;
     const providers = validatePricingMap(obj["providers"], "providers", warnings);
-    const models = validatePricingMap(obj["models"], "models", warnings);
+    const models = validatePricingMap(obj["models"], "models", warnings, true);
     const toast = validateToast(obj["toast"], warnings);
     const budget = validateBudget(obj["budget"], warnings);
     return {
@@ -150,7 +150,7 @@ export function validateConfig(raw) {
 function isFiniteNumber(v) {
     return typeof v === "number" && Number.isFinite(v);
 }
-function validatePricingMap(raw, section, warnings) {
+function validatePricingMap(raw, section, warnings, allowProviderModels = false) {
     if (raw === undefined || raw === null)
         return {};
     if (typeof raw !== "object" || Array.isArray(raw)) {
@@ -164,39 +164,117 @@ function validatePricingMap(raw, section, warnings) {
             warnings.push(`${section}.${key} should be a pricing object, ignoring`);
             continue;
         }
-        const p = value;
-        if (!isFiniteNumber(p["input"]) || p["input"] < 0) {
-            warnings.push(`${section}.${key}.input should be a non-negative number, ignoring entry`);
+        const entryPath = `${section}.${key}`;
+        const parsedPricing = validatePricingObject(value, entryPath, warnings);
+        if (parsedPricing) {
+            result[key] = parsedPricing;
             continue;
         }
-        if (!isFiniteNumber(p["output"]) || p["output"] < 0) {
-            warnings.push(`${section}.${key}.output should be a non-negative number, ignoring entry`);
+        if (!allowProviderModels) {
+            warnings.push(`${entryPath} should be a pricing object, ignoring`);
             continue;
         }
-        const pricing = {
-            input: p["input"],
-            output: p["output"],
-        };
-        if (p["cacheRead"] !== undefined) {
-            if (isFiniteNumber(p["cacheRead"]) && p["cacheRead"] >= 0) {
-                pricing.cacheRead = p["cacheRead"];
-            }
-            else {
-                warnings.push(`${section}.${key}.cacheRead should be a non-negative number, ignoring field`);
-            }
+        const providerPricing = validateNestedPricingMap(value, entryPath, warnings);
+        if (Object.keys(providerPricing).length > 0) {
+            result[key] = providerPricing;
         }
-        if (p["cacheWrite"] !== undefined) {
-            if (isFiniteNumber(p["cacheWrite"]) && p["cacheWrite"] >= 0) {
-                pricing.cacheWrite = p["cacheWrite"];
-            }
-            else {
-                warnings.push(`${section}.${key}.cacheWrite should be a non-negative number, ignoring field`);
-            }
+        else {
+            warnings.push(`${entryPath} should define at least one valid provider pricing, ignoring entry`);
+        }
+    }
+    return result;
+}
+function validateNestedPricingMap(raw, path, warnings) {
+    const result = {};
+    for (const [provider, value] of Object.entries(raw)) {
+        if (value === null || typeof value !== "object" || Array.isArray(value)) {
+            warnings.push(`${path}.${provider} should be a pricing object, ignoring`);
+            continue;
+        }
+        const pricing = validatePricingObject(value, `${path}.${provider}`, warnings);
+        if (pricing) {
+            result[provider] = pricing;
         }
-        result[key] = pricing;
     }
     return result;
 }
+function validatePricingObject(raw, path, warnings) {
+    if (!hasFlatPricingStructure(raw)) {
+        return undefined;
+    }
+    if (!isFiniteNumber(raw["input"]) || raw["input"] < 0) {
+        warnings.push(`${path}.input should be a non-negative number, ignoring entry`);
+        return undefined;
+    }
+    if (!isFiniteNumber(raw["output"]) || raw["output"] < 0) {
+        warnings.push(`${path}.output should be a non-negative number, ignoring entry`);
+        return undefined;
+    }
+    const pricing = {
+        input: raw["input"],
+        output: raw["output"],
+    };
+    if (raw["cacheRead"] !== undefined) {
+        if (isFiniteNumber(raw["cacheRead"]) && raw["cacheRead"] >= 0) {
+            pricing.cacheRead = raw["cacheRead"];
+        }
+        else {
+            warnings.push(`${path}.cacheRead should be a non-negative number, ignoring field`);
+        }
+    }
+    if (raw["cacheWrite"] !== undefined) {
+        if (isFiniteNumber(raw["cacheWrite"]) && raw["cacheWrite"] >= 0) {
+            pricing.cacheWrite = raw["cacheWrite"];
+        }
+        else {
+            warnings.push(`${path}.cacheWrite should be a non-negative number, ignoring field`);
+        }
+    }
+    return pricing;
+}
+function hasFlatPricingStructure(raw) {
+    const hasPricingField = "input" in raw || "output" in raw || "cacheRead" in raw || "cacheWrite" in raw;
+    if (!hasPricingField) {
+        return false;
+    }
+    return !isPlainObject(raw["input"])
+        && !isPlainObject(raw["output"])
+        && !isPlainObject(raw["cacheRead"])
+        && !isPlainObject(raw["cacheWrite"]);
+}
+function isPlainObject(value) {
+    return value !== null && typeof value === "object" && !Array.isArray(value);
+}
+function isDirectModelPricing(value) {
+    return hasFlatPricingStructure(value)
+        && isFiniteNumber(value.input)
+        && isFiniteNumber(value.output)
+        && (value.cacheRead === undefined || isFiniteNumber(value.cacheRead))
+        && (value.cacheWrite === undefined || isFiniteNumber(value.cacheWrite));
+}
+function resolveModelConfigEntry(entry, provider) {
+    if (!entry)
+        return undefined;
+    if (isDirectModelPricing(entry))
+        return entry;
+    return entry[provider];
+}
+export function findModelConfigPricing(models, model, provider) {
+    const exactMatch = resolveModelConfigEntry(models[model], provider);
+    if (exactMatch) {
+        return exactMatch;
+    }
+    const modelLower = model.toLowerCase();
+    for (const [key, entry] of Object.entries(models)) {
+        if (modelLower.includes(key.toLowerCase())) {
+            const partialMatch = resolveModelConfigEntry(entry, provider);
+            if (partialMatch) {
+                return partialMatch;
+            }
+        }
+    }
+    return undefined;
+}
 function validateToast(raw, warnings) {
     const defaults = DEFAULT_CONFIG.toast;
     if (raw === undefined || raw === null)

package/dist/test/shared.test.js

@@ -1,6 +1,6 @@
 import { describe, it } from "node:test";
 import { strict as assert } from "node:assert";
-import { BUILTIN_PRICING, DEFAULT_CONFIG, formatCost, formatTokens, getStartOfDay, getStartOfWeek, getStartOfMonth, validateConfig, } from "../lib/shared.js";
+import { BUILTIN_PRICING, DEFAULT_CONFIG, findModelConfigPricing, formatCost, formatTokens, getStartOfDay, getStartOfWeek, getStartOfMonth, validateConfig, } from "../lib/shared.js";
 // ============================================================================
 // formatCost
 // ============================================================================
@@ -197,6 +197,21 @@ describe("validateConfig", () => {
         assert.equal(result.config.budget.daily, 10);
         assert.equal(result.config.budget.warnAt, 0.9);
     });
+    it("should accept provider-specific model pricing", () => {
+        const result = validateConfig({
+            models: {
+                "deepseek/deepseek-v4-flash": {
+                    "openrouter": { input: 0.14, output: 0.28, cacheRead: 0.0028 },
+                    "siliconflow": { input: 0.2, output: 0.4 },
+                },
+            },
+        });
+        assert.equal(result.warnings.length, 0);
+        assert.deepEqual(result.config.models["deepseek/deepseek-v4-flash"], {
+            "openrouter": { input: 0.14, output: 0.28, cacheRead: 0.0028 },
+            "siliconflow": { input: 0.2, output: 0.4 },
+        });
+    });
     it("should warn and ignore non-object providers/models", () => {
         const result = validateConfig({ providers: "invalid", models: 123 });
         assert.deepEqual(result.config.providers, {});
@@ -236,6 +251,35 @@ describe("validateConfig", () => {
         assert.ok(result.warnings.some(w => w.includes("cacheRead")));
         assert.ok(result.warnings.some(w => w.includes("cacheWrite")));
     });
+    it("should warn and skip invalid provider-specific model pricing entries", () => {
+        const result = validateConfig({
+            models: {
+                "deepseek/deepseek-v4-flash": {
+                    "openrouter": { input: 0.14, output: 0.28 },
+                    "bad-provider": { input: "free", output: 0.28 },
+                },
+            },
+        });
+        assert.deepEqual(result.config.models["deepseek/deepseek-v4-flash"], {
+            "openrouter": { input: 0.14, output: 0.28 },
+        });
+        assert.ok(result.warnings.some(w => w.includes("bad-provider.input")));
+    });
+    it("should allow provider-specific model pricing even when provider name matches pricing fields", () => {
+        const result = validateConfig({
+            models: {
+                "field-named-provider-model": {
+                    "input": { input: 0.14, output: 0.28 },
+                    "output": { input: 0.2, output: 0.4 },
+                },
+            },
+        });
+        assert.equal(result.warnings.length, 0);
+        assert.deepEqual(result.config.models["field-named-provider-model"], {
+            "input": { input: 0.14, output: 0.28 },
+            "output": { input: 0.2, output: 0.4 },
+        });
+    });
     it("should warn and use default toast for invalid toast fields", () => {
         const result = validateConfig({
             toast: { enabled: "yes", duration: -100, showOnIdle: 1 },
@@ -283,3 +327,52 @@ describe("validateConfig", () => {
         assert.ok(result.warnings.length >= 3);
     });
 });
+describe("findModelConfigPricing", () => {
+    it("should prefer provider-specific model pricing when available", () => {
+        const result = validateConfig({
+            models: {
+                "deepseek/deepseek-v4-flash": {
+                    "openrouter": { input: 0.14, output: 0.28 },
+                },
+            },
+        });
+        assert.deepEqual(findModelConfigPricing(result.config.models, "deepseek/deepseek-v4-flash", "openrouter"), { input: 0.14, output: 0.28 });
+        assert.equal(findModelConfigPricing(result.config.models, "deepseek/deepseek-v4-flash", "siliconflow"), undefined);
+    });
+    it("should support partial model matches for provider-specific pricing", () => {
+        const result = validateConfig({
+            models: {
+                "deepseek-v4-flash": {
+                    "openrouter": { input: 0.14, output: 0.28 },
+                },
+            },
+        });
+        assert.deepEqual(findModelConfigPricing(result.config.models, "deepseek/deepseek-v4-flash", "openrouter"), { input: 0.14, output: 0.28 });
+    });
+    it("should resolve provider-specific model pricing for providers named like pricing fields", () => {
+        const result = validateConfig({
+            models: {
+                "field-named-provider-model": {
+                    "input": { input: 0.14, output: 0.28 },
+                },
+            },
+        });
+        assert.deepEqual(findModelConfigPricing(result.config.models, "field-named-provider-model", "input"), { input: 0.14, output: 0.28 });
+    });
+    it("should keep supporting direct model pricing", () => {
+        const result = validateConfig({
+            models: {
+                "my-model": { input: 1, output: 2, cacheRead: 0.1 },
+            },
+        });
+        assert.deepEqual(findModelConfigPricing(result.config.models, "my-model", "any-provider"), { input: 1, output: 2, cacheRead: 0.1 });
+    });
+    it("should support partial model matches for direct model pricing", () => {
+        const result = validateConfig({
+            models: {
+                "my-model": { input: 1, output: 2 },
+            },
+        });
+        assert.deepEqual(findModelConfigPricing(result.config.models, "prefix/my-model", "any-provider"), { input: 1, output: 2 });
+    });
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "opencode-token-tracker",
-  "version": "1.5.0",
+  "version": "1.5.1",
   "description": "Real-time token usage and cost tracking plugin for OpenCode with Toast notifications and CLI stats",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",