tokentracker-cli 0.47.3 → 0.49.0

package/src/lib/local-api.js

@@ -122,7 +122,9 @@ function readProjectQueueData(projectQueuePath) {
     try {
       const row = JSON.parse(line);
       const key = `${row.project_key || ""}|${row.source || ""}|${row.hour_start || ""}`;
-      seen.set(key, row);
+      // Same legacy-row corrections as the main queue (codex inclusive-input,
+      // cursor billable=0) so both read paths report identical numbers.
+      seen.set(key, normalizeQueueRow(row));
     } catch {
       // skip malformed
     }
@@ -472,7 +474,7 @@ function aggregateHourlyByDay(rows, dayKey, timeZoneContext) {
     }
     const bucket = byHour.get(hourKey);
     bucket.total_tokens += row.total_tokens || 0;
-    bucket.billable_total_tokens += row.total_tokens || 0;
+    bucket.billable_total_tokens += row.billable_total_tokens ?? row.total_tokens ?? 0;
     bucket.input_tokens += row.input_tokens || 0;
     bucket.output_tokens += row.output_tokens || 0;
     bucket.cached_input_tokens += row.cached_input_tokens || 0;
@@ -2133,4 +2135,11 @@ module.exports = {
   getModelPricing,
   computeRowCost,
   ensurePricingLoaded,
+  // Shared legacy-row correction so every queue reader (main queue, project
+  // queue, wrapped aggregator) reports the same numbers for the same data.
+  normalizeQueueRow,
+  // Machine-stable identity (config.json machineId) — shared with
+  // `tracker device-login` so the CLI device-flow anchors its cloud device
+  // to the machine, not the hostname.
+  getOrCreateMachineId,
 };

package/src/lib/pricing/curated-overrides.json

@@ -2,7 +2,7 @@
   "_meta": {
     "note": "Curated price overrides. Always wins over LiteLLM. Two reasons to live here: (1) self-defined alias names that LiteLLM will never carry (kiro-*, hy3-*, composer-*, kimi-for-coding, free-tier OpenRouter routes); (2) prices we want to pin even if LiteLLM has the model (e.g. cache_write fields LiteLLM often omits). Units: USD per million tokens. Edit this file to override pricing without redeploying.",
     "units": "usd_per_million_tokens",
-    "deepseek_v4_pro_discount_expiry": "2026-05-31T15:59:00Z — DeepSeek v4-pro is currently at a 75% promotional discount. After expiry the prices revert to 4x: input $1.74/M, output $3.48/M, cache_read $0.0145/M, cache_write $1.74/M. Update this file before the cutover."
+    "deepseek_v4_pro_pricing_note": "The 2026-05-31 promotional-expiry warning is obsolete: api-docs.deepseek.com/quick_start/pricing verified on 2026-06-10 still lists input $0.435/M, output $0.87/M, cache_read $0.003625/M as the official v4-pro rates (the discount became the list price). Do NOT 'restore' the old 4x rates; re-verify against the official page before any change."
   },
   "exact": {
     "claude-fable-5":   { "input": 10,   "output": 50,   "cache_read": 1,     "cache_write": 12.5, "note": "Fable 5 — Anthropic's top tier above Opus. Not yet in LiteLLM. $10/$50 per MTok; cache_read 0.1x, cache_write 1.25x. Remove once LiteLLM carries it." },
@@ -63,6 +63,7 @@
     { "match": "minimax-m2.7",           "ref": "MiniMax-M2.7" },
     { "match": "deepseek-v4-flash",      "ref": "deepseek-v4-flash" },
     { "match": "deepseek-v4-pro",        "ref": "deepseek-v4-pro" },
+    { "match": "kimi-k2.6",              "ref": "kimi-k2.6" },
     { "match": "kimi",                   "ref": "kimi-k2.5" },
     { "match": "glm-4.5-airx",           "ref": "glm-4.5-airx" },
     { "match": "glm-4.5-air",            "ref": "glm-4.5-air" },