tokentracker-cli 0.5.70 → 0.5.72

package/dashboard/dist/assets/{use-limits-display-prefs-CJuYd6SN.js → use-limits-display-prefs-CSj55sfK.js}

@@ -1 +1 @@
-import{r as a}from"./main-Vhl9rhYB.js";const d=["claude","codex","cursor","gemini","kiro","copilot","antigravity"],v={claude:"Claude",codex:"Codex",cursor:"Cursor",gemini:"Gemini",kiro:"Kiro",copilot:"GitHub Copilot",antigravity:"Antigravity"},k={claude:"/brand-logos/claude-code.svg",codex:"/brand-logos/codex.svg",cursor:"/brand-logos/cursor.svg",gemini:"/brand-logos/gemini.svg",kiro:"/brand-logos/kiro.svg",copilot:"/brand-logos/copilot.svg",antigravity:"/brand-logos/antigravity.svg"},l="tt.limits.providerOrder",g="tt.limits.providerVisibility";function y(){if(typeof window>"u")return[...d];try{const r=window.localStorage.getItem(l);if(!r)return[...d];const s=JSON.parse(r);if(!Array.isArray(s))return[...d];const n=s.filter(c=>d.includes(c));for(const c of d)n.includes(c)||n.push(c);return n}catch{return[...d]}}function m(){const r=Object.fromEntries(d.map(s=>[s,!0]));if(typeof window>"u")return r;try{const s=window.localStorage.getItem(g);if(!s)return r;const n=JSON.parse(s);if(!n||typeof n!="object")return r;const c={...r};for(const u of d)typeof n[u]=="boolean"&&(c[u]=n[u]);return c}catch{return r}}function C(){const[r,s]=a.useState(y),[n,c]=a.useState(m);a.useEffect(()=>{if(!(typeof window>"u"))try{window.localStorage.setItem(l,JSON.stringify(r))}catch{}},[r]),a.useEffect(()=>{if(!(typeof window>"u"))try{window.localStorage.setItem(g,JSON.stringify(n))}catch{}},[n]),a.useEffect(()=>{if(typeof window>"u")return;const o=t=>{t.key===l&&s(y()),t.key===g&&c(m())};return window.addEventListener("storage",o),()=>window.removeEventListener("storage",o)},[]);const u=a.useCallback(o=>{c(t=>({...t,[o]:!t[o]}))},[]),b=a.useCallback(o=>{s(t=>{const e=t.indexOf(o);if(e<=0)return t;const i=[...t];return[i[e-1],i[e]]=[i[e],i[e-1]],i})},[]),p=a.useCallback(o=>{s(t=>{const e=t.indexOf(o);if(e<0||e>=t.length-1)return t;const i=[...t];return[i[e],i[e+1]]=[i[e+1],i[e]],i})},[]),O=a.useCallback((o,t)=>{o!==t&&s(e=>{const i=e.indexOf(o),w=e.indexOf(t);if(i<0||w<0)return e;const f=[...e],[E]=f.splice(i,1);return f.splice(w,0,E),f})},[]),x=a.useCallback(()=>{s([...d]),c(Object.fromEntries(d.map(o=>[o,!0])))},[]),I=a.useMemo(()=>r.filter(o=>n[o]!==!1),[r,n]);return{order:r,visibility:n,visibleOrdered:I,toggle:u,moveUp:b,moveDown:p,moveToward:O,reset:x}}export{k as L,v as a,C as u};
+import{r as a}from"./main-D1VdJk4V.js";const d=["claude","codex","cursor","gemini","kiro","copilot","antigravity"],v={claude:"Claude",codex:"Codex",cursor:"Cursor",gemini:"Gemini",kiro:"Kiro",copilot:"GitHub Copilot",antigravity:"Antigravity"},k={claude:"/brand-logos/claude-code.svg",codex:"/brand-logos/codex.svg",cursor:"/brand-logos/cursor.svg",gemini:"/brand-logos/gemini.svg",kiro:"/brand-logos/kiro.svg",copilot:"/brand-logos/copilot.svg",antigravity:"/brand-logos/antigravity.svg"},l="tt.limits.providerOrder",g="tt.limits.providerVisibility";function y(){if(typeof window>"u")return[...d];try{const r=window.localStorage.getItem(l);if(!r)return[...d];const s=JSON.parse(r);if(!Array.isArray(s))return[...d];const n=s.filter(c=>d.includes(c));for(const c of d)n.includes(c)||n.push(c);return n}catch{return[...d]}}function m(){const r=Object.fromEntries(d.map(s=>[s,!0]));if(typeof window>"u")return r;try{const s=window.localStorage.getItem(g);if(!s)return r;const n=JSON.parse(s);if(!n||typeof n!="object")return r;const c={...r};for(const u of d)typeof n[u]=="boolean"&&(c[u]=n[u]);return c}catch{return r}}function C(){const[r,s]=a.useState(y),[n,c]=a.useState(m);a.useEffect(()=>{if(!(typeof window>"u"))try{window.localStorage.setItem(l,JSON.stringify(r))}catch{}},[r]),a.useEffect(()=>{if(!(typeof window>"u"))try{window.localStorage.setItem(g,JSON.stringify(n))}catch{}},[n]),a.useEffect(()=>{if(typeof window>"u")return;const o=t=>{t.key===l&&s(y()),t.key===g&&c(m())};return window.addEventListener("storage",o),()=>window.removeEventListener("storage",o)},[]);const u=a.useCallback(o=>{c(t=>({...t,[o]:!t[o]}))},[]),b=a.useCallback(o=>{s(t=>{const e=t.indexOf(o);if(e<=0)return t;const i=[...t];return[i[e-1],i[e]]=[i[e],i[e-1]],i})},[]),p=a.useCallback(o=>{s(t=>{const e=t.indexOf(o);if(e<0||e>=t.length-1)return t;const i=[...t];return[i[e],i[e+1]]=[i[e+1],i[e]],i})},[]),O=a.useCallback((o,t)=>{o!==t&&s(e=>{const i=e.indexOf(o),w=e.indexOf(t);if(i<0||w<0)return e;const f=[...e],[E]=f.splice(i,1);return f.splice(w,0,E),f})},[]),x=a.useCallback(()=>{s([...d]),c(Object.fromEntries(d.map(o=>[o,!0])))},[]),I=a.useMemo(()=>r.filter(o=>n[o]!==!1),[r,n]);return{order:r,visibility:n,visibleOrdered:I,toggle:u,moveUp:b,moveDown:p,moveToward:O,reset:x}}export{k as L,v as a,C as u};

package/dashboard/dist/assets/{use-usage-limits-BEbR2ySJ.js → use-usage-limits-BuWINUAm.js}

@@ -1 +1 @@
-import{r,aM as l}from"./main-Vhl9rhYB.js";function y(i){const[o,a]=r.useState(null),[u,s]=r.useState(null),[c,f]=r.useState(!0),n=!!i?.initialRefresh,g=r.useCallback(async()=>{try{const e=await l({refresh:!0});a(e&&typeof e=="object"?e:null),s(null)}catch(e){s(e?.message||String(e))}},[]);return r.useEffect(()=>{let e=!1;return(async()=>{try{const t=await l(n?{refresh:!0}:{});if(e)return;a(t&&typeof t=="object"?t:null),s(null)}catch(t){if(e)return;s(t?.message||String(t))}finally{e||f(!1)}})(),()=>{e=!0}},[n]),{data:o,error:u,isLoading:c,refresh:g}}export{y as u};
+import{r,aM as l}from"./main-D1VdJk4V.js";function y(i){const[o,a]=r.useState(null),[u,s]=r.useState(null),[c,f]=r.useState(!0),n=!!i?.initialRefresh,g=r.useCallback(async()=>{try{const e=await l({refresh:!0});a(e&&typeof e=="object"?e:null),s(null)}catch(e){s(e?.message||String(e))}},[]);return r.useEffect(()=>{let e=!1;return(async()=>{try{const t=await l(n?{refresh:!0}:{});if(e)return;a(t&&typeof t=="object"?t:null),s(null)}catch(t){if(e)return;s(t?.message||String(t))}finally{e||f(!1)}})(),()=>{e=!0}},[n]),{data:o,error:u,isLoading:c,refresh:g}}export{y as u};

package/dashboard/dist/brand-logos/kimi.svg

@@ -0,0 +1 @@
+<svg fill="currentColor" fill-rule="evenodd" height="1em" style="flex:none;line-height:1" viewBox="0 0 24 24" width="1em" xmlns="http://www.w3.org/2000/svg"><title>Kimi</title><path d="M21.846 0a1.923 1.923 0 110 3.846H20.15a.226.226 0 01-.227-.226V1.923C19.923.861 20.784 0 21.846 0z"></path><path d="M11.065 11.199l7.257-7.2c.137-.136.06-.41-.116-.41H14.3a.164.164 0 00-.117.051l-7.82 7.756c-.122.12-.302.013-.302-.179V3.82c0-.127-.083-.23-.185-.23H3.186c-.103 0-.186.103-.186.23V19.77c0 .128.083.23.186.23h2.69c.103 0 .186-.102.186-.23v-3.25c0-.069.025-.135.069-.178l2.424-2.406a.158.158 0 01.205-.023l6.484 4.772a7.677 7.677 0 003.453 1.283c.108.012.2-.095.2-.23v-3.06c0-.117-.07-.212-.164-.227a5.028 5.028 0 01-2.027-.807l-5.613-4.064c-.117-.078-.132-.279-.028-.381z"></path></svg>

package/dashboard/dist/index.html

@@ -135,7 +135,7 @@
         ]
       }
     </script>
-    <script type="module" crossorigin src="/assets/main-Vhl9rhYB.js"></script>
+    <script type="module" crossorigin src="/assets/main-D1VdJk4V.js"></script>
     <link rel="stylesheet" crossorigin href="/assets/main-CNzfq4Ln.css">
   </head>
   <body>

package/dashboard/dist/share.html

@@ -51,7 +51,7 @@
         "description": "Shareable Token Tracker dashboard snapshot."
       }
     </script>
-    <script type="module" crossorigin src="/assets/main-Vhl9rhYB.js"></script>
+    <script type="module" crossorigin src="/assets/main-D1VdJk4V.js"></script>
     <link rel="stylesheet" crossorigin href="/assets/main-CNzfq4Ln.css">
   </head>
   <body>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tokentracker-cli",
-  "version": "0.5.70",
+  "version": "0.5.72",
   "description": "Token usage tracker for AI agent CLIs (Claude Code, Codex, Cursor, Kiro, Gemini, OpenCode, OpenClaw, Hermes, GitHub Copilot)",
   "main": "src/cli.js",
   "bin": {

package/src/commands/init.js

@@ -404,6 +404,17 @@ async function applyIntegrationSetup({ home, trackerDir, notifyPath, notifyOrigi
     summary.push({ label: "Cursor", status: "skipped", detail: "Not installed" });
   }
 
+  // Kimi: passive reader — no hook installation needed.
+  // TokenTracker reads ~/.kimi/sessions/**/wire.jsonl directly.
+  {
+    const kimiHome = process.env.KIMI_HOME || path.join(home, ".kimi");
+    const kimiSessions = path.join(kimiHome, "sessions");
+    const fssync = require("node:fs");
+    if (fssync.existsSync(kimiSessions)) {
+      summary.push({ label: "Kimi Code", status: "detected", detail: "Passive reader (no hook needed)" });
+    }
+  }
+
   const openclawBefore = await probeOpenclawSessionPluginState({
     home,
     trackerDir,

package/src/commands/status.js

@@ -1,6 +1,7 @@
 const os = require("node:os");
 const path = require("node:path");
 const fs = require("node:fs/promises");
+const fssync = require("node:fs");
 
 const { readJson } = require("../lib/fs");
 const { readCodexNotify, readEveryCodeNotify } = require("../lib/codex-config");
@@ -19,6 +20,7 @@ const { collectTrackerDiagnostics } = require("../lib/diagnostics");
 const { probeOpenclawHookState } = require("../lib/openclaw-hook");
 const { probeOpenclawSessionPluginState } = require("../lib/openclaw-session-plugin");
 const { resolveTrackerPaths } = require("../lib/tracker-paths");
+const { resolveKimiWireFiles } = require("../lib/rollout");
 
 async function cmdStatus(argv = []) {
   const opts = parseArgs(argv);
@@ -112,6 +114,10 @@ async function cmdStatus(argv = []) {
   const subscriptionLines =
     subscriptions.length > 0 ? subscriptions.map(formatSubscriptionLine) : [];
 
+  const kimiWireFiles = resolveKimiWireFiles(process.env);
+  const kimiHome = process.env.KIMI_HOME || path.join(home, ".kimi");
+  const kimiInstalled = fssync.existsSync(path.join(kimiHome, "sessions"));
+
   const copilotToken = readCopilotOauthToken({ home });
   const copilotOtel = describeCopilotOtelStatus({ home, env: process.env });
   const copilotLines = formatCopilotLines({ token: copilotToken, otel: copilotOtel });
@@ -138,6 +144,9 @@ async function cmdStatus(argv = []) {
       `- Opencode plugin: ${opencodePluginConfigured ? "set" : "unset"}`,
       `- OpenClaw session plugin: ${openclawSessionPluginState?.configured ? "set" : "unset"}`,
       `- OpenClaw hook (legacy): ${openclawHookState?.configured ? "set" : "unset"}`,
+      kimiInstalled
+        ? `- Kimi Code: passive reader (${kimiWireFiles.length} wire.jsonl file${kimiWireFiles.length !== 1 ? "s" : ""} found)`
+        : null,
       ...copilotLines,
       ...subscriptionLines,
       "",

package/src/commands/sync.js

@@ -25,11 +25,16 @@ const {
   parseKiroIncremental,
   parseHermesIncremental,
   parseCopilotIncremental,
+  resolveKimiWireFiles,
+  parseKimiIncremental,
 } = require("../lib/rollout");
 const { createProgress, renderBar, formatNumber, formatBytes } = require("../lib/progress");
 const {
   normalizeState: normalizeUploadState,
   decideAutoUpload,
+  recordUploadFailure,
+  recordUploadSuccess,
+  parseRetryAfterMs,
 } = require("../lib/upload-throttle");
 const {
   isCursorInstalled,
@@ -354,6 +359,28 @@ async function cmdSync(argv) {
       });
     }
 
+    // ── Kimi (passive wire.jsonl reader) ──
+    let kimiResult = { recordsProcessed: 0, eventsAggregated: 0, bucketsQueued: 0 };
+    const kimiWireFiles = resolveKimiWireFiles(process.env);
+    if (kimiWireFiles.length > 0) {
+      if (progress?.enabled) {
+        progress.start(`Parsing Kimi Code ${renderBar(0)} | buckets 0`);
+      }
+      kimiResult = await parseKimiIncremental({
+        wireFiles: kimiWireFiles,
+        cursors,
+        queuePath,
+        env: process.env,
+        onProgress: (p) => {
+          if (!progress?.enabled) return;
+          const pct = p.total > 0 ? p.index / p.total : 1;
+          progress.update(
+            `Parsing Kimi Code ${renderBar(pct)} ${formatNumber(p.index)}/${formatNumber(p.total)} files | buckets ${formatNumber(p.bucketsQueued)}`,
+          );
+        },
+      });
+    }
+
     // ── GitHub Copilot CLI (OTEL JSONL files) ──
     let copilotResult = { recordsProcessed: 0, eventsAggregated: 0, bucketsQueued: 0 };
     const copilotPaths = resolveCopilotOtelPaths(process.env);
@@ -412,7 +439,24 @@ async function cmdSync(argv) {
           maxBatches: opts.drain ? 100 : 5,
           batchSize: 200,
         });
+        // Record success so the exponential backoff step resets — otherwise
+        // a single past failure keeps us pessimistically throttled forever.
+        uploadThrottleState = recordUploadSuccess({
+          nowMs: Date.now(),
+          state: uploadThrottleState,
+        });
+        await writeJson(uploadThrottlePath, uploadThrottleState);
       } catch (e) {
+        // Persist a backoff on 429 / 5xx so the next auto-sync waits instead
+        // of retrying immediately and making the rate-limit worse. The
+        // throttle module already parses Retry-After when we surface it on
+        // the error object (drainQueueToCloud stamps err.status + err.retryAfterMs).
+        uploadThrottleState = recordUploadFailure({
+          nowMs: Date.now(),
+          state: uploadThrottleState,
+          error: e,
+        });
+        await writeJson(uploadThrottlePath, uploadThrottleState);
         if (!opts.auto) {
           process.stderr.write(`Upload error: ${e?.message || e}\n`);
         }
@@ -453,6 +497,7 @@ async function cmdSync(argv) {
         cursorResult.recordsProcessed +
         kiroResult.recordsProcessed +
         hermesResult.recordsProcessed +
+        kimiResult.recordsProcessed +
         copilotResult.recordsProcessed;
       const totalBuckets =
         parseResult.bucketsQueued +
@@ -463,6 +508,7 @@ async function cmdSync(argv) {
         cursorResult.bucketsQueued +
         kiroResult.bucketsQueued +
         hermesResult.bucketsQueued +
+        kimiResult.bucketsQueued +
         copilotResult.bucketsQueued;
       process.stdout.write(
         [
@@ -822,7 +868,12 @@ async function drainQueueToCloud({ baseUrl, deviceToken, queuePath, queueStatePa
     let data = {};
     try { data = JSON.parse(rawText); } catch { data = {}; }
     if (!res.ok) {
-      throw new Error(`HTTP ${res.status}: ${rawText.substring(0, 500)}`);
+      const err = new Error(`HTTP ${res.status}: ${rawText.substring(0, 500)}`);
+      err.status = res.status;
+      const retryAfter = res.headers?.get?.("Retry-After") ?? null;
+      const retryAfterMs = parseRetryAfterMs(retryAfter);
+      if (retryAfterMs !== null) err.retryAfterMs = retryAfterMs;
+      throw err;
     }
 
     inserted += Number(data?.inserted || 0);

package/src/lib/local-api.js

@@ -116,30 +116,90 @@ function resolveQueuePath() {
   return path.join(home, ".tokentracker", "tracker", "queue.jsonl");
 }
 
-function readQueueData(queuePath) {
+function readProjectQueueData(projectQueuePath) {
+  let raw;
   try {
-    const raw = fs.readFileSync(queuePath, "utf8");
-    const lines = raw.split("\n").filter((l) => l.trim());
-    const parsed = lines.map((l) => JSON.parse(l));
-    // Deduplicate: each sync appends cumulative totals per bucket, so for
-    // each (source, model, hour_start) keep only the latest (last) entry.
-    const seen = new Map();
-    for (const row of parsed) {
-      const key = `${row.source || ""}|${row.model || ""}|${row.hour_start || ""}`;
+    raw = fs.readFileSync(projectQueuePath, "utf8");
+  } catch (e) {
+    if (e?.code !== "ENOENT") {
+      console.error("[LocalAPI] readProjectQueueData: failed to read:", e?.message || e);
+    }
+    return [];
+  }
+  const lines = raw.split("\n").filter((l) => l.trim());
+  const seen = new Map();
+  for (const line of lines) {
+    try {
+      const row = JSON.parse(line);
+      const key = `${row.project_key || ""}|${row.source || ""}|${row.hour_start || ""}`;
       seen.set(key, row);
+    } catch {
+      // skip malformed
+    }
+  }
+  return Array.from(seen.values());
+}
+
+function readQueueData(queuePath) {
+  let raw;
+  try {
+    raw = fs.readFileSync(queuePath, "utf8");
+  } catch (e) {
+    // ENOENT is legitimate (never synced yet); anything else is a signal we
+    // don't want to hide behind an empty array forever — the dashboard would
+    // otherwise render "0 tokens" with no clue the queue was unreadable.
+    if (e?.code !== "ENOENT") {
+      console.error("[LocalAPI] readQueueData: failed to read queue:", e?.message || e);
     }
-    return Array.from(seen.values());
-  } catch (_e) {
     return [];
   }
+  const lines = raw.split("\n").filter((l) => l.trim());
+  // Parse row-by-row so a single corrupted line (partial write, disk-full
+  // truncation, …) does not wipe out every other row with it.
+  const parsed = [];
+  let malformed = 0;
+  for (const line of lines) {
+    try {
+      parsed.push(JSON.parse(line));
+    } catch {
+      malformed += 1;
+    }
+  }
+  if (malformed > 0) {
+    console.error(
+      `[LocalAPI] readQueueData: skipped ${malformed}/${lines.length} malformed line(s) in ${queuePath}`,
+    );
+  }
+  // Deduplicate: each sync appends cumulative totals per bucket, so for
+  // each (source, model, hour_start) keep only the latest (last) entry.
+  const seen = new Map();
+  for (const row of parsed) {
+    const key = `${row.source || ""}|${row.model || ""}|${row.hour_start || ""}`;
+    seen.set(key, row);
+  }
+  return Array.from(seen.values());
 }
 
-function aggregateByDay(rows) {
+function rowDayKey(row, timeZoneContext) {
+  const hs = row.hour_start;
+  if (!hs) return "";
+  if (
+    timeZoneContext &&
+    (timeZoneContext.timeZone || Number.isFinite(timeZoneContext.offsetMinutes))
+  ) {
+    const parts = getZonedParts(new Date(hs), timeZoneContext);
+    const key = formatPartsDayKey(parts);
+    if (key) return key;
+  }
+  return hs.slice(0, 10);
+}
+
+function aggregateByDay(rows, timeZoneContext = null) {
   const byDay = new Map();
   for (const row of rows) {
-    const hs = row.hour_start;
-    if (!hs) continue;
-    const day = hs.slice(0, 10);
+    if (!row.hour_start) continue;
+    const day = rowDayKey(row, timeZoneContext);
+    if (!day) continue;
     if (!byDay.has(day)) {
       byDay.set(day, {
         day,
@@ -674,8 +734,9 @@ function createLocalApiHandler({ queuePath }) {
     if (p === "/functions/tokentracker-usage-summary") {
       const from = url.searchParams.get("from") || "";
       const to = url.searchParams.get("to") || "";
+      const timeZoneContext = getTimeZoneContext(url);
       const rows = readQueueData(qp);
-      const daily = aggregateByDay(rows).filter((d) => d.day >= from && d.day <= to);
+      const daily = aggregateByDay(rows, timeZoneContext).filter((d) => d.day >= from && d.day <= to);
       const totals = daily.reduce(
         (acc, r) => {
           acc.total_tokens += r.total_tokens;
@@ -693,16 +754,19 @@ function createLocalApiHandler({ queuePath }) {
       );
       const totalCost = totals.total_cost_usd;
 
-      const today = new Date();
-      const todayStr = today.toISOString().slice(0, 10);
-      const allDaily = aggregateByDay(rows);
+      const todayParts = getZonedParts(new Date(), timeZoneContext);
+      const todayStr = formatPartsDayKey(todayParts) || new Date().toISOString().slice(0, 10);
+      const allDaily = aggregateByDay(rows, timeZoneContext);
 
+      const shiftDay = (dayStr, delta) => {
+        const d = new Date(`${dayStr}T00:00:00Z`);
+        d.setUTCDate(d.getUTCDate() + delta);
+        return d.toISOString().slice(0, 10);
+      };
       const collectDays = (n) => {
         const out = [];
         for (let i = n - 1; i >= 0; i--) {
-          const d = new Date(today);
-          d.setUTCDate(d.getUTCDate() - i);
-          const ds = d.toISOString().slice(0, 10);
+          const ds = shiftDay(todayStr, -i);
           const dd = allDaily.find((x) => x.day === ds);
           if (dd) out.push(dd);
         }
@@ -719,17 +783,15 @@ function createLocalApiHandler({ queuePath }) {
       const l30 = collectDays(30);
       const l7t = sumDays(l7);
       const l30t = sumDays(l30);
-      const l7from = new Date(today);
-      l7from.setUTCDate(l7from.getUTCDate() - 6);
-      const l30from = new Date(today);
-      l30from.setUTCDate(l30from.getUTCDate() - 29);
+      const l7fromStr = shiftDay(todayStr, -6);
+      const l30fromStr = shiftDay(todayStr, -29);
 
       json(res, {
         from, to, days: daily.length,
         totals: { ...totals, total_cost_usd: totalCost.toFixed(6) },
         rolling: {
-          last_7d: { from: l7from.toISOString().slice(0, 10), to: todayStr, active_days: l7.length, totals: l7t },
-          last_30d: { from: l30from.toISOString().slice(0, 10), to: todayStr, active_days: l30.length, totals: l30t, avg_per_active_day: l30.length > 0 ? Math.round(l30t.billable_total_tokens / l30.length) : 0 },
+          last_7d: { from: l7fromStr, to: todayStr, active_days: l7.length, totals: l7t },
+          last_30d: { from: l30fromStr, to: todayStr, active_days: l30.length, totals: l30t, avg_per_active_day: l30.length > 0 ? Math.round(l30t.billable_total_tokens / l30.length) : 0 },
         },
       });
       return true;
@@ -739,8 +801,9 @@ function createLocalApiHandler({ queuePath }) {
     if (p === "/functions/tokentracker-usage-daily") {
       const from = url.searchParams.get("from") || "";
       const to = url.searchParams.get("to") || "";
+      const timeZoneContext = getTimeZoneContext(url);
       const rows = readQueueData(qp);
-      const daily = aggregateByDay(rows).filter((d) => d.day >= from && d.day <= to);
+      const daily = aggregateByDay(rows, timeZoneContext).filter((d) => d.day >= from && d.day <= to);
       json(res, { from, to, data: daily });
       return true;
     }
@@ -748,10 +811,12 @@ function createLocalApiHandler({ queuePath }) {
     // --- usage-heatmap ---
     if (p === "/functions/tokentracker-usage-heatmap") {
       const weeks = parseInt(url.searchParams.get("weeks") || "52", 10);
+      const timeZoneContext = getTimeZoneContext(url);
       const rows = readQueueData(qp);
-      const daily = aggregateByDay(rows);
-      const today = new Date();
-      const end = new Date(Date.UTC(today.getUTCFullYear(), today.getUTCMonth(), today.getUTCDate()));
+      const daily = aggregateByDay(rows, timeZoneContext);
+      const todayParts = getZonedParts(new Date(), timeZoneContext);
+      const todayStr = formatPartsDayKey(todayParts) || new Date().toISOString().slice(0, 10);
+      const end = new Date(`${todayStr}T00:00:00Z`);
       const start = new Date(end);
       start.setUTCDate(start.getUTCDate() - weeks * 7 + 1);
       const from = start.toISOString().slice(0, 10);
@@ -792,9 +857,10 @@ function createLocalApiHandler({ queuePath }) {
     if (p === "/functions/tokentracker-usage-model-breakdown") {
       const from = url.searchParams.get("from") || "";
       const to = url.searchParams.get("to") || "";
+      const timeZoneContext = getTimeZoneContext(url);
       const rows = readQueueData(qp).filter((r) => {
         if (!r.hour_start) return false;
-        const d = r.hour_start.slice(0, 10);
+        const d = rowDayKey(r, timeZoneContext);
         return d >= from && d <= to;
       });
 
@@ -852,35 +918,71 @@ function createLocalApiHandler({ queuePath }) {
 
     // --- project-usage-summary ---
     if (p === "/functions/tokentracker-project-usage-summary") {
-      const projectMap = new Map();
-      scanCodexProjects(projectMap);
-      scanClaudeProjects(projectMap);
-
-      const rows = readQueueData(qp);
-      const totalTokens = rows.reduce((s, r) => s + (r.total_tokens || 0), 0);
-      const entries = [];
+      // Use the per-project bucket log that rollout.js emits — it already
+      // carries the actual tokens attributed to each (project_key, source,
+      // hour_start). Falling back to "session-file count × total tokens"
+      // (the old behavior) produced pure fiction: every short-and-hot
+      // project got the same weight as every long-and-cold one.
+      const projectQueuePath = path.join(
+        path.dirname(qp),
+        "project.queue.jsonl",
+      );
+      const projectRows = readProjectQueueData(projectQueuePath);
+
+      const byProject = new Map();
+      for (const row of projectRows) {
+        const key = row.project_key || "unknown";
+        if (!byProject.has(key)) {
+          byProject.set(key, {
+            project_key: key,
+            project_ref: row.project_ref || key,
+            total_tokens: 0,
+            billable_total_tokens: 0,
+          });
+        }
+        const agg = byProject.get(key);
+        agg.total_tokens += Number(row.total_tokens || 0);
+        agg.billable_total_tokens += Number(row.total_tokens || 0);
+        if (!agg.project_ref && row.project_ref) agg.project_ref = row.project_ref;
+      }
 
-      if (projectMap.size === 0) {
+      // If no project-attributed rows exist yet (user hasn't synced project
+      // attribution, or never used a project-capable CLI), fall back to
+      // per-source aggregation over the main queue so the panel isn't
+      // totally empty. This path used to also exist for the non-empty case
+      // and produce wrong numbers; keep it only as the empty fallback.
+      let entries;
+      if (byProject.size === 0) {
+        const rows = readQueueData(qp);
         const bySrc = new Map();
         for (const row of rows) {
           const src = row.source || "unknown";
-          if (!bySrc.has(src)) bySrc.set(src, { project_key: src, project_ref: `https://${src}.ai`, total_tokens: 0, billable_total_tokens: 0 });
+          if (!bySrc.has(src)) {
+            bySrc.set(src, {
+              project_key: src,
+              project_ref: `https://${src}.ai`,
+              total_tokens: 0,
+              billable_total_tokens: 0,
+            });
+          }
           bySrc.get(src).total_tokens += row.total_tokens || 0;
           bySrc.get(src).billable_total_tokens += row.total_tokens || 0;
         }
-        entries.push(
-          ...Array.from(bySrc.values())
-            .sort((a, b) => b.billable_total_tokens - a.billable_total_tokens)
-            .map((e) => ({ ...e, total_tokens: String(e.total_tokens), billable_total_tokens: String(e.billable_total_tokens) })),
-        );
+        entries = Array.from(bySrc.values())
+          .sort((a, b) => b.billable_total_tokens - a.billable_total_tokens)
+          .map((e) => ({
+            ...e,
+            total_tokens: String(e.total_tokens),
+            billable_total_tokens: String(e.billable_total_tokens),
+          }));
       } else {
-        const totalCount = Array.from(projectMap.values()).reduce((s, p) => s + p.count, 0);
-        for (const [, proj] of projectMap) {
-          const ratio = totalCount > 0 ? proj.count / totalCount : 1 / projectMap.size;
-          const tokens = Math.floor(totalTokens * ratio);
-          entries.push({ project_key: proj.project_key, project_ref: proj.project_ref, total_tokens: String(tokens), billable_total_tokens: String(tokens) });
-        }
-        entries.sort((a, b) => Number(b.billable_total_tokens) - Number(a.billable_total_tokens));
+        entries = Array.from(byProject.values())
+          .sort((a, b) => b.billable_total_tokens - a.billable_total_tokens)
+          .map((e) => ({
+            ...e,
+            total_tokens: String(e.total_tokens),
+            billable_total_tokens: String(e.billable_total_tokens),
+          }));
       }
 
       json(res, { generated_at: new Date().toISOString(), entries });
@@ -911,12 +1013,13 @@ function createLocalApiHandler({ queuePath }) {
     if (p === "/functions/tokentracker-usage-monthly") {
       const from = url.searchParams.get("from") || "";
       const to = url.searchParams.get("to") || "";
+      const timeZoneContext = getTimeZoneContext(url);
       const rows = readQueueData(qp);
       const byMonth = new Map();
       for (const row of rows) {
         if (!row.hour_start) continue;
-        const day = row.hour_start.slice(0, 10);
-        if (day < from || day > to) continue;
+        const day = rowDayKey(row, timeZoneContext);
+        if (!day || day < from || day > to) continue;
         const month = day.slice(0, 7);
         if (!byMonth.has(month))
           byMonth.set(month, { month, total_tokens: 0, billable_total_tokens: 0, input_tokens: 0, output_tokens: 0, cached_input_tokens: 0, cache_creation_input_tokens: 0, reasoning_output_tokens: 0, conversation_count: 0 });