claude-stats 0.2.2 → 0.2.3

package/dist/index.js

@@ -507,6 +507,9 @@ async function forceRefreshUsageLimits() {
 var CLAUDE_DIR = path2.join(os3.homedir(), ".claude");
 var STATS_FILE = path2.join(CLAUDE_DIR, "stats-cache.json");
 var PROJECTS_DIR = path2.join(CLAUDE_DIR, "projects");
+var allTimeStatsCache = null;
+var allTimeStatsCacheTime = 0;
+var ALL_TIME_CACHE_DURATION = 6e4;
 var cachedAccountId = null;
 function getAccountId() {
   if (cachedAccountId) return cachedAccountId;
@@ -803,25 +806,28 @@ function getLocalDateString(date) {
   const day = String(date.getDate()).padStart(2, "0");
   return `${year}-${month}-${day}`;
 }
-function getTodayUsageFromSessions() {
-  const now = /* @__PURE__ */ new Date();
-  const today = getLocalDateString(now);
-  const todayStart = new Date(now);
-  todayStart.setHours(0, 0, 0, 0);
-  const todayStartTs = todayStart.getTime();
-  const modelTokens = {};
-  let messages = 0;
-  let sessions = 0;
+function calculateAllTimeStats() {
+  if (allTimeStatsCache && Date.now() - allTimeStatsCacheTime < ALL_TIME_CACHE_DURATION) {
+    return allTimeStatsCache;
+  }
   const seen = /* @__PURE__ */ new Set();
+  const modelTokens = {};
+  const dailyTokens = {};
+  const dailyMessages = {};
+  const dailySessions = {};
+  let totalMessages = 0;
+  let firstSessionDate = null;
+  const allSessionIds = /* @__PURE__ */ new Set();
   if (!fs2.existsSync(PROJECTS_DIR)) {
     return {
-      date: today,
-      tokens: 0,
-      cost: 0,
-      messages: 0,
-      sessions: 0,
-      models: [],
-      model_breakdown: {}
+      totalCost: 0,
+      totalTokens: 0,
+      totalMessages: 0,
+      totalSessions: 0,
+      modelUsage: {},
+      modelCosts: {},
+      dailyUsage: [],
+      firstSessionDate: null
     };
   }
   const projectDirs = fs2.readdirSync(PROJECTS_DIR);
@@ -831,36 +837,51 @@ function getTodayUsageFromSessions() {
     const sessionFiles = fs2.readdirSync(projectPath).filter((f) => f.endsWith(".jsonl"));
     for (const sessionFile of sessionFiles) {
       const sessionPath = path2.join(projectPath, sessionFile);
-      const stat = fs2.statSync(sessionPath);
-      if (stat.mtimeMs < todayStartTs) continue;
-      sessions++;
+      const sessionId = path2.basename(sessionFile, ".jsonl");
+      allSessionIds.add(sessionId);
       try {
         const content = fs2.readFileSync(sessionPath, "utf-8");
         for (const line of content.trim().split("\n")) {
           try {
             const msg = JSON.parse(line);
+            if (msg.type !== "assistant") continue;
+            const hash = getDedupeHash(msg);
+            if (hash) {
+              if (seen.has(hash)) continue;
+              seen.add(hash);
+            }
             const ts = msg.timestamp || "";
             if (!ts) continue;
             const msgDate = new Date(ts);
-            const msgLocalDate = getLocalDateString(msgDate);
-            if (msgLocalDate !== today) continue;
-            if (msg.type === "assistant") {
-              const hash = getDedupeHash(msg);
-              if (hash) {
-                if (seen.has(hash)) continue;
-                seen.add(hash);
-              }
-              messages++;
-              const usage = msg.message?.usage || {};
-              const model = msg.message?.model || "unknown";
-              if (!modelTokens[model]) {
-                modelTokens[model] = { input: 0, output: 0, cache_read: 0, cache_write: 0 };
-              }
-              modelTokens[model].input += usage.input_tokens || 0;
-              modelTokens[model].output += usage.output_tokens || 0;
-              modelTokens[model].cache_read += usage.cache_read_input_tokens || 0;
-              modelTokens[model].cache_write += usage.cache_creation_input_tokens || 0;
+            const dateStr = getLocalDateString(msgDate);
+            if (!firstSessionDate || dateStr < firstSessionDate) {
+              firstSessionDate = dateStr;
+            }
+            totalMessages++;
+            const usage = msg.message?.usage || {};
+            const model = msg.message?.model || "unknown";
+            if (!modelTokens[model]) {
+              modelTokens[model] = { input: 0, output: 0, cache_read: 0, cache_write: 0 };
+            }
+            modelTokens[model].input += usage.input_tokens || 0;
+            modelTokens[model].output += usage.output_tokens || 0;
+            modelTokens[model].cache_read += usage.cache_read_input_tokens || 0;
+            modelTokens[model].cache_write += usage.cache_creation_input_tokens || 0;
+            if (!dailyTokens[dateStr]) {
+              dailyTokens[dateStr] = {};
+            }
+            if (!dailyTokens[dateStr][model]) {
+              dailyTokens[dateStr][model] = { input: 0, output: 0, cache_read: 0, cache_write: 0 };
             }
+            dailyTokens[dateStr][model].input += usage.input_tokens || 0;
+            dailyTokens[dateStr][model].output += usage.output_tokens || 0;
+            dailyTokens[dateStr][model].cache_read += usage.cache_read_input_tokens || 0;
+            dailyTokens[dateStr][model].cache_write += usage.cache_creation_input_tokens || 0;
+            dailyMessages[dateStr] = (dailyMessages[dateStr] || 0) + 1;
+            if (!dailySessions[dateStr]) {
+              dailySessions[dateStr] = /* @__PURE__ */ new Set();
+            }
+            dailySessions[dateStr].add(sessionId);
           } catch {
             continue;
           }
@@ -870,59 +891,57 @@ function getTodayUsageFromSessions() {
       }
     }
   }
-  let allTokens = 0;
+  const modelUsage = {};
+  const modelCosts = {};
   let totalCost = 0;
-  const modelBreakdown = {};
+  let totalTokens = 0;
   for (const [model, tokens] of Object.entries(modelTokens)) {
-    const modelTotal = tokens.input + tokens.output + tokens.cache_read + tokens.cache_write;
-    allTokens += modelTotal;
-    const pricing = import_shared.MODEL_PRICING[model] || import_shared.DEFAULT_PRICING;
-    const cost = tokens.input / 1e6 * pricing.input + tokens.output / 1e6 * pricing.output + tokens.cache_read / 1e6 * pricing.cache_read + tokens.cache_write / 1e6 * pricing.cache_write;
-    totalCost += cost;
-    modelBreakdown[model] = {
+    modelUsage[model] = {
       inputTokens: tokens.input,
       outputTokens: tokens.output,
       cacheReadInputTokens: tokens.cache_read,
-      cacheCreationInputTokens: tokens.cache_write,
-      cost: Math.round(cost * 1e4) / 1e4
+      cacheCreationInputTokens: tokens.cache_write
     };
+    const cost = (0, import_shared.calculateCost)(model, modelUsage[model]);
+    modelCosts[model] = cost;
+    totalCost += cost;
+    totalTokens += tokens.input + tokens.output + tokens.cache_read + tokens.cache_write;
   }
-  return {
-    date: today,
-    tokens: allTokens,
-    cost: Math.round(totalCost * 1e4) / 1e4,
-    messages,
-    sessions,
-    models: Object.keys(modelTokens),
-    model_breakdown: modelBreakdown
-  };
-}
-function getDailyUsage(stats) {
-  const dailyTokens = stats.dailyModelTokens || [];
-  const dailyActivity = {};
-  for (const d of stats.dailyActivity || []) {
-    dailyActivity[d.date] = d;
-  }
-  const result = [];
-  for (const day of dailyTokens.slice(-14)) {
-    const date = day.date;
-    const tokensByModel = day.tokensByModel || {};
-    const totalTokens = Object.values(tokensByModel).reduce((sum, t) => sum + t, 0);
+  const dailyUsage = [];
+  const dates = Object.keys(dailyTokens).sort();
+  for (const date of dates) {
+    const dayModels = dailyTokens[date];
+    let dayTokens = 0;
     let dayCost = 0;
-    for (const [model, tokens] of Object.entries(tokensByModel)) {
+    const models = [];
+    for (const [model, tokens] of Object.entries(dayModels)) {
+      models.push(model);
+      const modelTotal = tokens.input + tokens.output + tokens.cache_read + tokens.cache_write;
+      dayTokens += modelTotal;
       const pricing = import_shared.MODEL_PRICING[model] || import_shared.DEFAULT_PRICING;
-      dayCost += tokens / 1e6 * pricing.input;
+      dayCost += tokens.input / 1e6 * pricing.input + tokens.output / 1e6 * pricing.output + tokens.cache_read / 1e6 * pricing.cache_read + tokens.cache_write / 1e6 * pricing.cache_write;
     }
-    const activity = dailyActivity[date] || { messageCount: 0, sessionCount: 0 };
-    result.push({
+    dailyUsage.push({
       date,
-      tokens: totalTokens,
+      tokens: dayTokens,
       cost: Math.round(dayCost * 1e4) / 1e4,
-      messages: activity.messageCount,
-      sessions: activity.sessionCount,
-      models: Object.keys(tokensByModel)
+      messages: dailyMessages[date] || 0,
+      sessions: dailySessions[date]?.size || 0,
+      models
     });
   }
+  const result = {
+    totalCost: Math.round(totalCost * 100) / 100,
+    totalTokens,
+    totalMessages,
+    totalSessions: allSessionIds.size,
+    modelUsage,
+    modelCosts,
+    dailyUsage,
+    firstSessionDate
+  };
+  allTimeStatsCache = result;
+  allTimeStatsCacheTime = Date.now();
   return result;
 }
 function getSessions() {
@@ -991,57 +1010,41 @@ function collectData() {
   const stats = getStats();
   const processes = getCliProcesses();
   const { active: activeSessions, recent: recentSessions } = getSessions();
-  const todayUsage = getTodayUsageFromSessions();
-  const modelUsage = { ...stats.modelUsage };
-  const todayBreakdown = todayUsage.model_breakdown;
-  for (const [model, todayData] of Object.entries(todayBreakdown)) {
-    if (modelUsage[model]) {
-      modelUsage[model] = {
-        inputTokens: (modelUsage[model].inputTokens || 0) + (todayData.inputTokens || 0),
-        outputTokens: (modelUsage[model].outputTokens || 0) + (todayData.outputTokens || 0),
-        cacheReadInputTokens: (modelUsage[model].cacheReadInputTokens || 0) + (todayData.cacheReadInputTokens || 0),
-        cacheCreationInputTokens: (modelUsage[model].cacheCreationInputTokens || 0) + (todayData.cacheCreationInputTokens || 0)
-      };
-    } else {
-      modelUsage[model] = {
-        inputTokens: todayData.inputTokens,
-        outputTokens: todayData.outputTokens,
-        cacheReadInputTokens: todayData.cacheReadInputTokens,
-        cacheCreationInputTokens: todayData.cacheCreationInputTokens
-      };
-    }
-  }
-  const modelCosts = {};
-  let totalCost = 0;
-  let totalTokens = 0;
-  for (const [model, usage] of Object.entries(modelUsage)) {
-    const cost = (0, import_shared.calculateCost)(model, usage);
-    modelCosts[model] = cost;
-    totalCost += cost;
-    totalTokens += (usage.inputTokens || 0) + (usage.outputTokens || 0) + (usage.cacheReadInputTokens || 0) + (usage.cacheCreationInputTokens || 0);
-  }
-  const dailyUsage = getDailyUsage(stats);
-  if (todayUsage.tokens > 0) {
-    dailyUsage.push({
-      date: todayUsage.date,
-      tokens: todayUsage.tokens,
-      cost: todayUsage.cost,
-      messages: todayUsage.messages,
-      sessions: todayUsage.sessions,
-      models: todayUsage.models
-    });
-  }
+  const allTimeStats = calculateAllTimeStats();
+  const today = getLocalDateString(/* @__PURE__ */ new Date());
+  const todayFromAllTime = allTimeStats.dailyUsage.find((d) => d.date === today);
+  const todayUsage = todayFromAllTime ? {
+    date: today,
+    tokens: todayFromAllTime.tokens,
+    cost: todayFromAllTime.cost,
+    messages: todayFromAllTime.messages,
+    sessions: todayFromAllTime.sessions,
+    models: todayFromAllTime.models,
+    model_breakdown: {}
+    // Not used in summary display
+  } : {
+    date: today,
+    tokens: 0,
+    cost: 0,
+    messages: 0,
+    sessions: 0,
+    models: [],
+    model_breakdown: {}
+  };
   const activeSessionsCost = activeSessions.reduce((sum, s) => sum + (s.cost || 0), 0);
   const activeSessionsTokens = activeSessions.reduce((sum, s) => {
     if (!s.tokens) return sum;
     return sum + s.tokens.input_tokens + s.tokens.output_tokens + s.tokens.cache_read + s.tokens.cache_write;
   }, 0);
-  const totalSessionsCount = (stats.totalSessions || 0) + todayUsage.sessions;
-  const totalMessagesCount = (stats.totalMessages || 0) + todayUsage.messages;
+  const totalCost = allTimeStats.totalCost;
+  const totalTokens = allTimeStats.totalTokens;
+  const totalMessagesCount = allTimeStats.totalMessages;
+  const totalSessionsCount = allTimeStats.totalSessions;
   const avgCostPerMessage = totalMessagesCount > 0 ? totalCost / totalMessagesCount : 0;
   const avgCostPerSession = totalSessionsCount > 0 ? totalCost / totalSessionsCount : 0;
+  const dailyUsage = allTimeStats.dailyUsage;
   let daysActive = dailyUsage.length || 1;
-  const firstSessionDate = stats.firstSessionDate;
+  const firstSessionDate = allTimeStats.firstSessionDate;
   if (firstSessionDate) {
     try {
       const firstDt = new Date(firstSessionDate);
@@ -1051,11 +1054,10 @@ function collectData() {
   }
   const dailyAvgCost = daysActive > 0 ? totalCost / daysActive : 0;
   const last7Days = dailyUsage.slice(-7);
-  let weeklyCost = last7Days.reduce((sum, d) => sum + (d.cost || 0), 0);
-  weeklyCost += todayUsage.cost;
+  const weeklyCost = last7Days.reduce((sum, d) => sum + (d.cost || 0), 0);
   const currentHour = (/* @__PURE__ */ new Date()).getHours();
   const hoursElapsed = Math.max(currentHour, 1);
-  const todayHourlyRate = hoursElapsed > 0 ? todayUsage.cost / hoursElapsed : 0;
+  const todayHourlyRate = todayUsage.cost > 0 ? todayUsage.cost / hoursElapsed : 0;
   const hourCounts = stats.hourCounts || {};
   const summary = {
     is_running: activeSessions.length > 0,
@@ -1079,11 +1081,11 @@ function collectData() {
   };
   return {
     stats,
-    model_usage: modelUsage,
+    model_usage: allTimeStats.modelUsage,
     processes,
     active_sessions: activeSessions,
     recent_sessions: recentSessions,
-    model_costs: modelCosts,
+    model_costs: allTimeStats.modelCosts,
     daily_usage: dailyUsage,
     today_usage: todayUsage,
     hour_counts: hourCounts,
@@ -1242,7 +1244,7 @@ function setupDaemonCleanup() {
 // src/index.ts
 var DEFAULT_SERVER = "https://cm.cban.top";
 var program = new import_commander.Command();
-program.name("claude-stats").description("Monitor and stream Claude Code usage statistics").version("0.2.2");
+program.name("claude-stats").description("Monitor and stream Claude Code usage statistics").version("0.2.3");
 function promptForInput(question, hidden = false) {
   return new Promise((resolve) => {
     const rl = readline.createInterface({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "claude-stats",
-  "version": "0.2.2",
+  "version": "0.2.3",
   "description": "Monitor and stream Claude Code usage statistics to a remote dashboard",
   "keywords": [
     "claude",