tokentracker-cli 0.5.71 → 0.5.73

package/src/lib/local-api.js

@@ -63,6 +63,14 @@ const MODEL_PRICING = {
   "kimi-for-coding": { input: 0.6, output: 2, cache_read: 0.15 },
   "kimi-k2.5": { input: 0.6, output: 2, cache_read: 0.15 },
   "kimi-k2.5-free": { input: 0, output: 0, cache_read: 0 },
+  // ── AWS Kiro (Kiro IDE + Kiro CLI — both route through Bedrock, most
+  //    commonly claude-sonnet-4; rates mirror the sonnet-4 table below so
+  //    costs stay consistent with the real underlying model when a Bedrock
+  //    model_id isn't exposed). Mirrored byte-for-byte in
+  //    dashboard/edge-patches/tokentracker-leaderboard-refresh.ts for
+  //    leaderboard estimated_cost_usd. ──
+  "kiro-agent": { input: 3, output: 15, cache_read: 0.3, cache_write: 3.75 },
+  "kiro-cli-agent": { input: 3, output: 15, cache_read: 0.3, cache_write: 3.75 },
   // ── Misc / Free ──
   "glm-4.7-free": { input: 0, output: 0, cache_read: 0 },
   "nemotron-3-super-free": { input: 0, output: 0, cache_read: 0 },
@@ -90,6 +98,7 @@ function getModelPricing(model) {
   if (lower.includes("gemini-3")) return MODEL_PRICING["gemini-3-flash-preview"];
   if (lower.includes("gemini-2.5")) return MODEL_PRICING["gemini-2.5-pro"];
   if (lower.includes("kimi")) return MODEL_PRICING["kimi-k2.5"];
+  if (lower.includes("kiro")) return MODEL_PRICING["kiro-cli-agent"];
   if (lower.includes("composer")) return MODEL_PRICING["composer-1"];
   if (lower === "auto") return MODEL_PRICING["composer-1"];
   return ZERO_PRICING;
@@ -116,30 +125,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 +743,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 +763,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 +792,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 +810,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 +820,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 +866,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 +927,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 +1022,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 });
@@ -958,4 +1070,11 @@ function createLocalApiHandler({ queuePath }) {
   };
 }
 
-module.exports = { createLocalApiHandler, resolveQueuePath };
+module.exports = {
+  createLocalApiHandler,
+  resolveQueuePath,
+  // Exported for cross-consumer tests (pricing + native contract lock).
+  MODEL_PRICING,
+  getModelPricing,
+  computeRowCost,
+};