vibestats 1.0.7 → 1.0.9

package/dist/index.js

@@ -365,6 +365,46 @@ function parseCodexJsonl() {
   }
   return entries;
 }
+function parseStatsCacheJson() {
+  const cachePath = join(getClaudeDir(), "stats-cache.json");
+  if (!existsSync(cachePath)) return [];
+  try {
+    const cache = JSON.parse(readFileSync(cachePath, "utf-8"));
+    const entries = [];
+    if (!cache.dailyModelTokens || !cache.modelUsage) return [];
+    for (const day of cache.dailyModelTokens) {
+      for (const [modelId, totalTokens] of Object.entries(day.tokensByModel)) {
+        const usage = cache.modelUsage[modelId];
+        if (!usage) continue;
+        const allTimeTotal = usage.inputTokens + usage.outputTokens + usage.cacheReadInputTokens + usage.cacheCreationInputTokens;
+        if (allTimeTotal === 0) continue;
+        const inputRatio = usage.inputTokens / allTimeTotal;
+        const outputRatio = usage.outputTokens / allTimeTotal;
+        const cacheReadRatio = usage.cacheReadInputTokens / allTimeTotal;
+        const cacheWriteRatio = usage.cacheCreationInputTokens / allTimeTotal;
+        const inputTokens = Math.round(totalTokens * inputRatio);
+        const outputTokens = Math.round(totalTokens * outputRatio);
+        const cacheReadTokens = Math.round(totalTokens * cacheReadRatio);
+        const cacheWriteTokens = Math.round(totalTokens * cacheWriteRatio);
+        const pricing = getModelPricing(modelId);
+        const cost = inputTokens * pricing.input / 1e6 + outputTokens * pricing.output / 1e6 + cacheWriteTokens * pricing.cacheWrite / 1e6 + cacheReadTokens * pricing.cacheRead / 1e6;
+        entries.push({
+          date: day.date,
+          model: getModelDisplayName(modelId),
+          inputTokens,
+          outputTokens,
+          cacheWriteTokens,
+          cacheReadTokens,
+          cost,
+          source: "claude"
+        });
+      }
+    }
+    return entries;
+  } catch {
+    return [];
+  }
+}
 function filterByDateRange(entries, since, until) {
   return entries.filter((e) => {
     if (since && e.date < since) return false;
@@ -495,7 +535,12 @@ function loadUsageStats(options) {
   const { aggregation, since, until, codexOnly, combined } = options;
   let entries = [];
   if (!codexOnly) {
-    entries = entries.concat(parseClaudeJsonl());
+    const jsonlEntries = parseClaudeJsonl();
+    const cacheEntries = parseStatsCacheJson();
+    const jsonlDates = new Set(jsonlEntries.map((e) => e.date));
+    const supplementalEntries = cacheEntries.filter((e) => !jsonlDates.has(e.date));
+    entries = entries.concat(jsonlEntries);
+    entries = entries.concat(supplementalEntries);
   }
   if (codexOnly || combined) {
     entries = entries.concat(parseCodexJsonl());
@@ -1447,21 +1492,49 @@ function getModelAbbrevFromDisplayName(displayName) {
   };
   return map[displayName] || displayName.slice(0, 5).toLowerCase();
 }
+function aggregateRowsToMonthly(rows) {
+  const monthMap = /* @__PURE__ */ new Map();
+  for (const row of rows) {
+    const month = row.key.slice(0, 7);
+    const existing = monthMap.get(month);
+    if (existing) {
+      existing.inputTokens += row.inputTokens;
+      existing.outputTokens += row.outputTokens;
+      existing.cacheWriteTokens += row.cacheWriteTokens;
+      existing.cacheReadTokens += row.cacheReadTokens;
+      existing.totalTokens += row.totalTokens;
+      existing.cost += row.cost;
+    } else {
+      monthMap.set(month, { ...row, key: month });
+    }
+  }
+  return Array.from(monthMap.values()).sort((a, b) => a.key.localeCompare(b.key));
+}
 function encodeUsageToUrl(stats, baseUrl = "https://vibestats.wolfai.dev") {
   const params = new URLSearchParams();
-  const aggMap = { daily: "d", monthly: "m", model: "mo", total: "t" };
-  params.set("agg", aggMap[stats.aggregation] || "d");
   if (stats.source !== "claude") {
     params.set("src", stats.source);
   }
   const formatDateCompact = (d) => d.replace(/-/g, "");
-  const limitedRows = stats.rows.slice(-31);
-  const startDate = limitedRows[0]?.key || stats.dateRange.start;
-  const endDate = limitedRows[limitedRows.length - 1]?.key || stats.dateRange.end;
+  const startMs = new Date(stats.dateRange.start).getTime();
+  const endMs = new Date(stats.dateRange.end).getTime();
+  const daySpan = Math.ceil((endMs - startMs) / (1e3 * 60 * 60 * 24));
+  const useMonthly = stats.aggregation === "daily" && daySpan > 31;
+  const aggMap = { daily: "d", monthly: "m", model: "mo", total: "t" };
+  const effectiveAgg = useMonthly ? "monthly" : stats.aggregation;
+  params.set("agg", aggMap[effectiveAgg] || "d");
+  let rowsToEncode;
+  if (useMonthly) {
+    rowsToEncode = aggregateRowsToMonthly(stats.rows);
+  } else {
+    rowsToEncode = stats.rows.slice(-31);
+  }
+  const startDate = useMonthly ? stats.dateRange.start : rowsToEncode[0]?.key || stats.dateRange.start;
+  const endDate = useMonthly ? stats.dateRange.end : rowsToEncode[rowsToEncode.length - 1]?.key || stats.dateRange.end;
   params.set("dr", `${formatDateCompact(startDate)}-${formatDateCompact(endDate)}`);
-  const rows = limitedRows.map((row) => {
+  const rows = rowsToEncode.map((row) => {
     let key = row.key;
-    if (stats.aggregation === "daily" && row.key.length === 10) {
+    if (effectiveAgg === "daily" && row.key.length === 10) {
       key = row.key.slice(5).replace("-", "");
     }
     return [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vibestats",
-  "version": "1.0.7",
+  "version": "1.0.9",
   "description": "AI coding stats - usage tracking and annual wrapped for Claude Code & Codex",
   "type": "module",
   "main": "./dist/index.js",