opencode-token-tracker 1.5.5 → 1.5.7

package/dist/bin/opencode-tokens.js

@@ -325,17 +325,29 @@ function cmdModels() {
     console.log(`  ${padRight("Model", modelWidth)}  ${padRight("Provider", providerWidth)}  ${padLeft("Msgs", countWidth)}  ${padRight("Pricing", statusWidth)}`);
     console.log(`  ${"-".repeat(modelWidth)}  ${"-".repeat(providerWidth)}  ${"-".repeat(countWidth)}  ${"-".repeat(statusWidth)}`);
     for (const { model, provider, count } of sorted) {
-        let status = "built-in";
+        let status;
+        // Mirror the runtime pricing resolution order (getModelPricing in index.ts)
         if (config.providers?.[provider]) {
             status = "provider cfg";
         }
-        else if (findModelConfigPricing(config.models, model, provider)) {
+        else if (findModelConfigPricing(config.models, model, provider, false)) {
             status = "model cfg";
         }
-        else if (!BUILTIN_PRICING[model]) {
-            // Check partial match
-            const hasMatch = Object.keys(BUILTIN_PRICING).some(k => k !== "_default" && model.toLowerCase().includes(k.toLowerCase()));
-            status = hasMatch ? "built-in" : "default";
+        else if (BUILTIN_PRICING[model]) {
+            status = "built-in";
+        }
+        else {
+            const modelLower = model.toLowerCase();
+            const hasBuiltinPartial = Object.keys(BUILTIN_PRICING).some(k => k !== "_default" && modelLower.includes(k.toLowerCase()));
+            if (hasBuiltinPartial) {
+                status = "built-in";
+            }
+            else if (findModelConfigPricing(config.models, model, provider, true)) {
+                status = "model cfg";
+            }
+            else {
+                status = "default";
+            }
         }
         console.log(`  ${padRight(model, modelWidth)}  ${padRight(provider, providerWidth)}  ${padLeft(count.toString(), countWidth)}  ${padRight(status, statusWidth)}`);
     }

package/dist/index.js

@@ -1,5 +1,6 @@
 import { BUILTIN_PRICING, DEFAULT_CONFIG, findModelConfigPricing, formatCost, formatTokens, getStartOfDay, getStartOfWeek, getStartOfMonth, validateConfig } from "./lib/shared.js";
-import { appendFileSync, existsSync, mkdirSync, readFileSync, statSync } from "fs";
+import { appendFileSync, existsSync, mkdirSync, readFileSync, statSync, openSync, readSync, closeSync } from "fs";
+import { open } from "fs/promises";
 import { join } from "path";
 import { homedir } from "os";
 const CONFIG_DIR = join(homedir(), ".config", "opencode");
@@ -57,8 +58,8 @@ function getModelPricing(model, provider) {
     if (config.providers[provider]) {
         return config.providers[provider];
     }
-    // 2. Check user-defined model pricing
-    const configuredPricing = findModelConfigPricing(config.models, model, provider);
+    // 2. Check user-defined model pricing (exact match only)
+    const configuredPricing = findModelConfigPricing(config.models, model, provider, false);
     if (configuredPricing) {
         return configuredPricing;
     }
@@ -68,12 +69,17 @@ function getModelPricing(model, provider) {
     }
     // 4. Try partial match in built-in pricing
     const modelLower = model.toLowerCase();
-    for (const [key, pricing] of Object.entries(BUILTIN_PRICING)) {
+    for (const [key, pricing] of Object.entries(BUILTIN_PRICING).sort(([a], [b]) => b.length - a.length)) {
         if (key !== "_default" && modelLower.includes(key.toLowerCase())) {
             return pricing;
         }
     }
-    // 5. Fallback to default
+    // 5. Try partial match in user config
+    const partialUserPricing = findModelConfigPricing(config.models, model, provider, true);
+    if (partialUserPricing) {
+        return partialUserPricing;
+    }
+    // 6. Fallback to default
     return BUILTIN_PRICING["_default"];
 }
 export function getProviderFamily(model, provider) {
@@ -191,29 +197,74 @@ const budgetTracker = {
 function loadCostsSince(since) {
     if (!existsSync(LOG_FILE))
         return 0;
+    let total = 0;
+    let fd = null;
     try {
-        const content = readFileSync(LOG_FILE, "utf-8");
-        const lines = content.trim().split("\n").filter(Boolean);
-        let total = 0;
-        for (const line of lines) {
+        fd = openSync(LOG_FILE, "r");
+        const stat = statSync(LOG_FILE);
+        const fileSize = stat.size;
+        const CHUNK_SIZE = 64 * 1024; // 64KB chunks
+        const buffer = Buffer.alloc(CHUNK_SIZE);
+        let filePos = fileSize;
+        let leftover = "";
+        let shouldStop = false;
+        while (filePos > 0 && !shouldStop) {
+            const readLength = Math.min(CHUNK_SIZE, filePos);
+            filePos -= readLength;
+            readSync(fd, buffer, 0, readLength, filePos);
+            const chunkStr = buffer.toString("utf8", 0, readLength) + leftover;
+            const lines = chunkStr.split("\n");
+            // The leftmost line could be cut off, save it for the next chunk read to the left
+            leftover = lines[0];
+            // Iterate lines in reverse order (from end to start)
+            for (let i = lines.length - 1; i >= 1; i--) {
+                const line = lines[i].trim();
+                if (!line)
+                    continue;
+                try {
+                    const entry = JSON.parse(line);
+                    if (entry.type !== "tokens" || !entry.cost)
+                        continue;
+                    if (entry._ts < since) {
+                        shouldStop = true;
+                        break;
+                    }
+                    total += entry.cost;
+                }
+                catch {
+                    // Skip malformed lines
+                }
+            }
+        }
+        // Include the very first line at the top
+        if (!shouldStop && leftover.trim()) {
             try {
-                const entry = JSON.parse(line);
-                if (entry.type === "tokens" && entry._ts >= since && entry.cost) {
+                const entry = JSON.parse(leftover.trim());
+                if (entry.type === "tokens" && entry.cost && entry._ts >= since) {
                     total += entry.cost;
                 }
             }
             catch { }
         }
-        return total;
     }
     catch {
-        return 0;
+        // 异常路径下放弃部分累加结果，与 1.5.5 之前的语义保持一致，避免下游基于偏小值做预算判断
+        total = 0;
+    }
+    finally {
+        if (fd !== null) {
+            try {
+                closeSync(fd);
+            }
+            catch { }
+        }
     }
+    return total;
 }
 /**
  * Initialize budgetTracker from JSONL file (called once at plugin init).
  */
-function initBudgetTracker() {
+async function initBudgetTracker() {
     const now = new Date();
     budgetTracker.dayStart = getStartOfDay(now);
     budgetTracker.weekStart = getStartOfWeek(now);
@@ -225,28 +276,69 @@ function initBudgetTracker() {
         return;
     }
     // Load once using the earliest period boundary
-    const earliest = Math.min(budgetTracker.dayStart, budgetTracker.weekStart, budgetTracker.monthStart);
+    const earliest = Math.min(budget.daily ? budgetTracker.dayStart : Infinity, budget.weekly ? budgetTracker.weekStart : Infinity, budget.monthly ? budgetTracker.monthStart : Infinity);
     if (!existsSync(LOG_FILE)) {
         budgetTracker.initialized = true;
         return;
     }
+    let fileHandle = null;
     try {
-        const content = readFileSync(LOG_FILE, "utf-8");
-        const lines = content.trim().split("\n").filter(Boolean);
+        const stat = statSync(LOG_FILE);
+        const fileSize = stat.size;
+        fileHandle = await open(LOG_FILE, "r");
+        const CHUNK_SIZE = 64 * 1024; // 64KB chunks
+        const buffer = Buffer.alloc(CHUNK_SIZE);
+        let filePos = fileSize;
+        let leftover = "";
+        let shouldStop = false;
         let daily = 0;
         let weekly = 0;
         let monthly = 0;
-        for (const line of lines) {
-            try {
-                const entry = JSON.parse(line);
-                if (entry.type !== "tokens" || !entry.cost || entry._ts < earliest)
+        while (filePos > 0 && !shouldStop) {
+            const readLength = Math.min(CHUNK_SIZE, filePos);
+            filePos -= readLength;
+            const { bytesRead } = await fileHandle.read(buffer, 0, readLength, filePos);
+            const chunkStr = buffer.toString("utf8", 0, bytesRead) + leftover;
+            const lines = chunkStr.split("\n");
+            // The leftmost line could be cut off, save it for the next chunk read to the left
+            leftover = lines[0];
+            // Iterate lines in reverse order (from end to start)
+            for (let i = lines.length - 1; i >= 1; i--) {
+                const line = lines[i].trim();
+                if (!line)
                     continue;
-                if (entry._ts >= budgetTracker.dayStart)
-                    daily += entry.cost;
-                if (entry._ts >= budgetTracker.weekStart)
-                    weekly += entry.cost;
-                if (entry._ts >= budgetTracker.monthStart)
-                    monthly += entry.cost;
+                try {
+                    const entry = JSON.parse(line);
+                    if (entry.type !== "tokens" || !entry.cost)
+                        continue;
+                    if (entry._ts < earliest) {
+                        shouldStop = true;
+                        break;
+                    }
+                    if (entry._ts >= budgetTracker.dayStart)
+                        daily += entry.cost;
+                    if (entry._ts >= budgetTracker.weekStart)
+                        weekly += entry.cost;
+                    if (entry._ts >= budgetTracker.monthStart)
+                        monthly += entry.cost;
+                }
+                catch {
+                    // Skip malformed lines
+                }
+            }
+        }
+        // Include the very first line at the top
+        if (!shouldStop && leftover.trim()) {
+            try {
+                const entry = JSON.parse(leftover.trim());
+                if (entry.type === "tokens" && entry.cost && entry._ts >= earliest) {
+                    if (entry._ts >= budgetTracker.dayStart)
+                        daily += entry.cost;
+                    if (entry._ts >= budgetTracker.weekStart)
+                        weekly += entry.cost;
+                    if (entry._ts >= budgetTracker.monthStart)
+                        monthly += entry.cost;
+                }
             }
             catch { }
         }
@@ -254,7 +346,17 @@ function initBudgetTracker() {
         budgetTracker.weeklySpent = weekly;
         budgetTracker.monthlySpent = monthly;
     }
-    catch { }
+    catch (err) {
+        // Keep budgetTracker at 0 on error
+    }
+    finally {
+        if (fileHandle) {
+            try {
+                await fileHandle.close();
+            }
+            catch { }
+        }
+    }
     budgetTracker.initialized = true;
 }
 /**
@@ -342,8 +444,10 @@ export const TokenTrackerPlugin = async ({ directory, client }) => {
             lastConfigMtime = statSync(CONFIG_FILE).mtimeMs;
         }
         // Initialize in-memory budget tracker (reads JSONL once)
-        initBudgetTracker();
-        logJson({ type: "init", directory, configLoaded: existsSync(CONFIG_FILE) });
+        await initBudgetTracker();
+        // 不再写 type:"init" 标记：OpenCode 会在多个子进程（LSP、工具 runner 等）独立加载
+        // plugin，每次启动会向 JSONL 写多份重复的 init 行，污染日志且无计费价值。
+        // 跨进程去重的根因修复留待后续版本。
         // Show config validation warnings via Toast
         if (configWarnings.length > 0) {
             try {
@@ -368,6 +472,14 @@ export const TokenTrackerPlugin = async ({ directory, client }) => {
                         const info = props?.info;
                         if (!info?.tokens)
                             return;
+                        // 流式中间态保护：仅在消息真正完结时记账，避免对同一条消息重复计费。
+                        // 完结信号优先用 time.completed；实证发现 provider 的 finish reason
+                        // 会在 time.completed 之前一帧出现且此时 tokens 已完整，因此把 finish
+                        // 也作为有效的完结信号，避免极端断流时漏掉最后一帧。
+                        // 通过 modelID 识别 AI 生成消息（user 消息无此字段），不再硬编码 role。
+                        if (info.modelID && !info.time?.completed && !info.finish) {
+                            return;
+                        }
                         const messageId = info.id;
                         const sessionId = info.sessionID;
                         if (!messageId || !sessionId)
@@ -377,10 +489,10 @@ export const TokenTrackerPlugin = async ({ directory, client }) => {
                         const reasoning = info.tokens.reasoning ?? 0;
                         const cacheRead = info.tokens.cache?.read ?? 0;
                         const cacheWrite = info.tokens.cache?.write ?? 0;
-                        const hasTokens = input > 0 || output > 0;
+                        const hasTokens = input > 0 || output > 0 || cacheRead > 0 || cacheWrite > 0;
                         if (!hasTokens)
                             return;
-                        const dedupeKey = `${messageId}-${input}-${output}`;
+                        const dedupeKey = `${messageId}-${input}-${output}-${cacheRead}-${cacheWrite}`;
                         if (isDuplicate(dedupeKey))
                             return;
                         const model = info.model?.modelID ?? info.modelID ?? "unknown";

package/dist/lib/shared.d.ts

@@ -45,4 +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;
+export declare function findModelConfigPricing(models: TrackerConfig["models"], model: string, provider: string, partial?: boolean): ModelPricing | undefined;

package/dist/lib/shared.js

@@ -174,6 +174,12 @@ function validatePricingMap(raw, section, warnings, allowProviderModels = false)
             warnings.push(`${entryPath} should be a pricing object, ignoring`);
             continue;
         }
+        // If the structure looks like flat pricing (has pricing field keys),
+        // don't fall through to nested provider pricing — validatePricingObject
+        // already issued the relevant warning for malformed flat pricing.
+        if (hasFlatPricingStructure(value)) {
+            continue;
+        }
         const providerPricing = validateNestedPricingMap(value, entryPath, warnings);
         if (Object.keys(providerPricing).length > 0) {
             result[key] = providerPricing;
@@ -246,11 +252,7 @@ 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));
+    return hasFlatPricingStructure(value);
 }
 function resolveModelConfigEntry(entry, provider) {
     if (!entry)
@@ -259,13 +261,17 @@ function resolveModelConfigEntry(entry, provider) {
         return entry;
     return entry[provider];
 }
-export function findModelConfigPricing(models, model, provider) {
+export function findModelConfigPricing(models, model, provider, partial = true) {
     const exactMatch = resolveModelConfigEntry(models[model], provider);
     if (exactMatch) {
         return exactMatch;
     }
+    if (!partial)
+        return undefined;
     const modelLower = model.toLowerCase();
-    for (const [key, entry] of Object.entries(models)) {
+    // Sort by key length descending so longer (more specific) keys are checked first
+    const sorted = Object.entries(models).sort(([a], [b]) => b.length - a.length);
+    for (const [key, entry] of sorted) {
         if (modelLower.includes(key.toLowerCase())) {
             const partialMatch = resolveModelConfigEntry(entry, provider);
             if (partialMatch) {

package/dist/test/shared.test.js

@@ -237,6 +237,16 @@ describe("validateConfig", () => {
         assert.equal(result.config.models["not-object"], undefined);
         assert.ok(result.warnings.length >= 4);
     });
+    it("should produce one clear warning for malformed flat pricing (not nested fallthrough noise)", () => {
+        const result = validateConfig({
+            models: {
+                "my-model": { input: "free", output: 2 },
+            },
+        });
+        assert.equal(result.config.models["my-model"], undefined);
+        assert.equal(result.warnings.length, 1);
+        assert.ok(result.warnings[0].includes("input should be a non-negative number"));
+    });
     it("should warn and ignore invalid cacheRead/cacheWrite but keep entry", () => {
         const result = validateConfig({
             models: {
@@ -376,6 +386,40 @@ describe("findModelConfigPricing", () => {
         });
         assert.deepEqual(findModelConfigPricing(result.config.models, "prefix/my-model", "any-provider"), { input: 1, output: 2 });
     });
+    it("should prefer longer key over shorter key in partial matches (longest-first)", () => {
+        const result = validateConfig({
+            models: {
+                "gpt-4.1": { input: 3, output: 12 },
+                "gpt-4.1-mini": { input: 0.8, output: 3.2 },
+            },
+        });
+        assert.deepEqual(findModelConfigPricing(result.config.models, "gpt-4.1-mini-2025", "openai"), { input: 0.8, output: 3.2 });
+    });
+    it("should prefer longer key regardless of insertion order (longest-first)", () => {
+        const result = validateConfig({
+            models: {
+                "gpt-4.1-mini": { input: 0.8, output: 3.2 },
+                "gpt-4.1": { input: 3, output: 12 },
+            },
+        });
+        assert.deepEqual(findModelConfigPricing(result.config.models, "gpt-4.1-mini-2025", "openai"), { input: 0.8, output: 3.2 });
+    });
+    it("should not match partial keys when partial=false (exact-only mode)", () => {
+        const result = validateConfig({
+            models: {
+                "claude": { input: 0, output: 0 },
+            },
+        });
+        assert.equal(findModelConfigPricing(result.config.models, "claude-opus-4.6", "anthropic", false), undefined);
+    });
+    it("should match partial keys when partial=true (backward compatible)", () => {
+        const result = validateConfig({
+            models: {
+                "claude": { input: 0, output: 0 },
+            },
+        });
+        assert.deepEqual(findModelConfigPricing(result.config.models, "claude-opus-4.6", "anthropic", true), { input: 0, output: 0 });
+    });
 });
 // ============================================================================
 // getProviderFamily
@@ -455,3 +499,38 @@ describe("calculateCost", () => {
         assert.ok(Math.abs(costFallback - 4.91) < 0.0001, `expected 4.91, got ${costFallback}`);
     });
 });
+// ============================================================================
+// calculateCost partial match — longest-key-first regression
+// ============================================================================
+describe("calculateCost partial match (longest-key-first)", () => {
+    it("should match gpt-4o-mini over gpt-4o for variant model name", () => {
+        // gpt-4o-mini-2024-07-18 should match gpt-4o-mini ($0.15/$0.6), not gpt-4o ($2.5/$10)
+        const cost = calculateCost("gpt-4o-mini-2024-07-18", "openai", 1_000_000, 1_000_000);
+        // Expected: input 0.15 + output 0.6 = 0.75 (no cache in this test)
+        assert.ok(Math.abs(cost - 0.75) < 0.001, `expected 0.75, got ${cost}`);
+    });
+    it("should match o3-mini over o3 for variant model name", () => {
+        // o3-mini-high should match o3-mini ($1.1/$4.4), not o3 ($10/$40)
+        const cost = calculateCost("o3-mini-high", "openai", 1_000_000, 1_000_000);
+        // Expected: input 1.1 + output 4.4 = 5.5
+        assert.ok(Math.abs(cost - 5.5) < 0.001, `expected 5.5, got ${cost}`);
+    });
+    it("should match gemini-2.5-flash-lite over gemini-2.5-flash for variant model name", () => {
+        // gemini-2.5-flash-lite-preview should match gemini-2.5-flash-lite ($0.1/$0.4), not gemini-2.5-flash ($0.3/$2.5)
+        const cost = calculateCost("gemini-2.5-flash-lite-preview", "google", 1_000_000, 1_000_000);
+        // Expected: input 0.1 + output 0.4 = 0.5
+        assert.ok(Math.abs(cost - 0.5) < 0.001, `expected 0.5, got ${cost}`);
+    });
+    it("should match gpt-5.2-pro over gpt-5.2 for variant model name", () => {
+        // gpt-5.2-pro-2025 should match gpt-5.2-pro ($21/$168), not gpt-5.2 ($1.75/$14)
+        const cost = calculateCost("gpt-5.2-pro-2025", "openai", 1_000_000, 1_000_000);
+        // Expected: input 21 + output 168 = 189
+        assert.ok(Math.abs(cost - 189) < 0.01, `expected 189, got ${cost}`);
+    });
+    it("should match o1-mini over o1 for variant model name", () => {
+        // o1-mini-high should match o1-mini ($1.1/$4.4), not o1 ($15/$60)
+        const cost = calculateCost("o1-mini-high", "openai", 1_000_000, 1_000_000);
+        // Expected: input 1.1 + output 4.4 = 5.5
+        assert.ok(Math.abs(cost - 5.5) < 0.001, `expected 5.5, got ${cost}`);
+    });
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "opencode-token-tracker",
-  "version": "1.5.5",
+  "version": "1.5.7",
   "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",