ai-heatmap 1.17.7 → 1.17.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ai-heatmap",
-  "version": "1.17.7",
+  "version": "1.17.9",
   "description": "AI usage cost heatmap powered by ccusage + react-activity-calendar",
   "type": "module",
   "bin": {

package/scripts/generate.mjs

@@ -59,14 +59,46 @@ if (!mergeOnly) {
   if (untilFlag) cmd += ` ${untilFlag}`;
 
   console.log(`Running: ${cmd}`);
-  const raw = execSync(cmd, { encoding: "utf-8", timeout: 300000 });
+  let raw;
+  try {
+    raw = execSync(cmd, { encoding: "utf-8", timeout: 300000 });
+  } catch (err) {
+    if (err.code === "ETIMEDOUT" || err.signal === "SIGTERM") {
+      console.error("\nError: ccusage timed out after 5 minutes.");
+      console.error("This may be caused by a slow network or npm registry issue.");
+      console.error("Try running manually: npx clear-npx-cache && npx --yes ccusage@latest daily --json");
+    } else {
+      console.error("\nError running ccusage:", err.message);
+      if (err.stderr) console.error(err.stderr);
+    }
+    process.exit(1);
+  }
   const { daily } = JSON.parse(raw);
 
-  const costs = daily.map((d) => d.totalCost);
-  const maxCost = Math.max(...costs);
+  // Build a map of existing data, merging duplicate dates by summing
+  const dataMap = new Map();
+  for (const d of daily) {
+    if (!dataMap.has(d.date)) {
+      dataMap.set(d.date, { ...d });
+    } else {
+      const existing = dataMap.get(d.date);
+      existing.totalCost = (existing.totalCost ?? 0) + (d.totalCost ?? 0);
+      existing.inputTokens = (existing.inputTokens ?? 0) + (d.inputTokens ?? 0);
+      existing.outputTokens = (existing.outputTokens ?? 0) + (d.outputTokens ?? 0);
+      existing.totalTokens = (existing.totalTokens ?? 0) + (d.totalTokens ?? 0);
+      existing.cacheReadTokens = (existing.cacheReadTokens ?? 0) + (d.cacheReadTokens ?? 0);
+      existing.cacheCreationTokens = (existing.cacheCreationTokens ?? 0) + (d.cacheCreationTokens ?? 0);
+      existing.modelsUsed = [...new Set([...(existing.modelsUsed ?? []), ...(d.modelsUsed ?? [])])];
+      const bdMap = new Map((existing.modelBreakdowns ?? []).map((m) => [m.modelName, m.cost ?? 0]));
+      for (const mb of (d.modelBreakdowns ?? [])) {
+        bdMap.set(mb.modelName, (bdMap.get(mb.modelName) ?? 0) + (mb.cost ?? 0));
+      }
+      existing.modelBreakdowns = [...bdMap.entries()].map(([modelName, cost]) => ({ modelName, cost }));
+    }
+  }
 
-  // Build a map of existing data
-  const dataMap = new Map(daily.map((d) => [d.date, d]));
+  const costs = [...dataMap.values()].map((d) => d.totalCost);
+  const maxCost = Math.max(...costs);
 
   // Fill 365 days (from today back 364 days)
   const today = new Date();