claude-scope 0.8.34 → 0.8.36

package/dist/claude-scope.cjs

@@ -2414,12 +2414,12 @@ var init_widget_types = __esm({
 });
 
 // src/providers/usage-parser.ts
-var import_node_fs, import_node_readline, UsageParser;
+var import_fs, import_readline, UsageParser;
 var init_usage_parser = __esm({
   "src/providers/usage-parser.ts"() {
     "use strict";
-    import_node_fs = require("node:fs");
-    import_node_readline = require("node:readline");
+    import_fs = require("fs");
+    import_readline = require("readline");
     UsageParser = class {
       /**
        * Parse the last assistant message with usage data from transcript
@@ -2429,30 +2429,55 @@ var init_usage_parser = __esm({
        * @returns ContextUsage or null if not found
        */
       async parseLastUsage(transcriptPath) {
-        if (!(0, import_node_fs.existsSync)(transcriptPath)) {
+        if (!(0, import_fs.existsSync)(transcriptPath)) {
           return null;
         }
         try {
           const lines = await this.readAllLines(transcriptPath);
-          for (let i = lines.length - 1; i >= 0; i--) {
-            const usage = this.parseLineForUsage(lines[i]);
-            if (usage) {
-              return usage;
+          let mostRecentUsage = null;
+          let mostRecentTimestamp = null;
+          let hasAnyTimestamp = false;
+          for (const line of lines) {
+            const entry = this.parseLineForUsage(line);
+            if (entry) {
+              const entryTime = this.parseTimestamp(line);
+              if (entryTime) {
+                hasAnyTimestamp = true;
+                if (!mostRecentTimestamp || entryTime > mostRecentTimestamp) {
+                  mostRecentUsage = entry;
+                  mostRecentTimestamp = entryTime;
+                }
+              } else if (!hasAnyTimestamp) {
+                mostRecentUsage = entry;
+              }
             }
           }
-          return null;
+          return mostRecentUsage;
         } catch {
           return null;
         }
       }
+      /**
+       * Parse timestamp from a transcript line
+       */
+      parseTimestamp(line) {
+        try {
+          const entry = JSON.parse(line);
+          if (entry.timestamp) {
+            return new Date(entry.timestamp);
+          }
+        } catch {
+        }
+        return null;
+      }
       /**
        * Read all lines from transcript file
        */
       async readAllLines(transcriptPath) {
         const lines = [];
         try {
-          const fileStream = (0, import_node_fs.createReadStream)(transcriptPath, { encoding: "utf-8" });
-          const rl = (0, import_node_readline.createInterface)({
+          const fileStream = (0, import_fs.createReadStream)(transcriptPath, { encoding: "utf-8" });
+          const rl = (0, import_readline.createInterface)({
             input: fileStream,
             crlfDelay: Infinity
           });
@@ -2466,6 +2491,92 @@ var init_usage_parser = __esm({
         }
         return lines;
       }
+      /**
+       * Parse cumulative cache tokens from all assistant messages in transcript
+       *
+       * Handles two transcript formats:
+       * 1. Per-message format: cache_read varies per message (e.g., 2048, 4096) → sum all
+       * 2. Cumulative format: cache_read is already cumulative (e.g., 165376) → use last
+       *
+       * @param transcriptPath - Path to the JSONL transcript file
+       * @returns Object with cumulative cacheRead and cacheCreation, or null if not found
+       */
+      async parseCumulativeCache(transcriptPath) {
+        if (!(0, import_fs.existsSync)(transcriptPath)) {
+          return null;
+        }
+        try {
+          const lines = await this.readAllLines(transcriptPath);
+          const cacheEntries = [];
+          for (const line of lines) {
+            const entry = this.parseLineForCache(line);
+            if (entry) {
+              const timestamp = this.parseTimestamp(line);
+              cacheEntries.push({
+                cacheRead: entry.cacheRead,
+                cacheCreation: entry.cacheCreation,
+                timestamp: timestamp?.toISOString() || ""
+              });
+            }
+          }
+          if (cacheEntries.length === 0) {
+            return null;
+          }
+          let isCumulativeFormat = false;
+          if (cacheEntries.length > 1) {
+            let nonDecreasingCount = 0;
+            for (let i = 1; i < cacheEntries.length; i++) {
+              if (cacheEntries[i].cacheRead >= cacheEntries[i - 1].cacheRead) {
+                nonDecreasingCount++;
+              }
+            }
+            isCumulativeFormat = nonDecreasingCount / (cacheEntries.length - 1) >= 0.8;
+          }
+          let cumulativeCacheRead;
+          let cumulativeCacheCreation;
+          if (isCumulativeFormat) {
+            const lastEntry = cacheEntries[cacheEntries.length - 1];
+            cumulativeCacheRead = lastEntry.cacheRead;
+            cumulativeCacheCreation = lastEntry.cacheCreation;
+          } else {
+            cumulativeCacheRead = cacheEntries.reduce((sum, e) => sum + e.cacheRead, 0);
+            cumulativeCacheCreation = cacheEntries.reduce((sum, e) => sum + e.cacheCreation, 0);
+          }
+          if (cumulativeCacheRead === 0 && cumulativeCacheCreation === 0) {
+            return null;
+          }
+          return {
+            cacheRead: cumulativeCacheRead,
+            cacheCreation: cumulativeCacheCreation
+          };
+        } catch {
+          return null;
+        }
+      }
+      /**
+       * Parse a single transcript line for cache data
+       * Returns null if line is not an assistant message with usage
+       */
+      parseLineForCache(line) {
+        try {
+          const entry = JSON.parse(line);
+          if (entry.type !== "assistant") {
+            return null;
+          }
+          const usage = entry.message?.usage;
+          if (!usage) {
+            return null;
+          }
+          const cacheRead = usage.cache_read_input_tokens ?? 0;
+          const cacheCreation = usage.cache_creation_input_tokens ?? 0;
+          if (cacheRead === 0 && cacheCreation === 0) {
+            return null;
+          }
+          return { cacheRead, cacheCreation };
+        } catch {
+          return null;
+        }
+      }
       /**
        * Parse a single transcript line for usage data
        * Returns null if line is not an assistant message with usage
@@ -2480,14 +2591,15 @@ var init_usage_parser = __esm({
           if (!usage) {
             return null;
           }
-          if (typeof usage.input_tokens !== "number" || typeof usage.output_tokens !== "number" || typeof usage.cache_read_input_tokens !== "number") {
+          if (typeof usage.input_tokens !== "number" || typeof usage.output_tokens !== "number") {
             return null;
           }
           return {
             input_tokens: usage.input_tokens,
             output_tokens: usage.output_tokens,
             cache_creation_input_tokens: usage.cache_creation_input_tokens ?? 0,
-            cache_read_input_tokens: usage.cache_read_input_tokens
+            cache_read_input_tokens: usage.cache_read_input_tokens ?? 0
+            // Default to 0 if missing
           };
         } catch {
           return null;
@@ -2498,11 +2610,11 @@ var init_usage_parser = __esm({
 });
 
 // src/storage/cache-manager.ts
-var import_node_fs2, import_node_os2, import_node_path2, DEFAULT_CACHE_PATH, DEFAULT_EXPIRY_MS, CacheManager;
+var import_node_fs, import_node_os2, import_node_path2, DEFAULT_CACHE_PATH, DEFAULT_EXPIRY_MS, CacheManager;
 var init_cache_manager = __esm({
   "src/storage/cache-manager.ts"() {
     "use strict";
-    import_node_fs2 = require("node:fs");
+    import_node_fs = require("node:fs");
     import_node_os2 = require("node:os");
     import_node_path2 = require("node:path");
     DEFAULT_CACHE_PATH = `${(0, import_node_os2.homedir)()}/.config/claude-scope/cache.json`;
@@ -2575,11 +2687,11 @@ var init_cache_manager = __esm({
        * Load cache from file
        */
       loadCache() {
-        if (!(0, import_node_fs2.existsSync)(this.cachePath)) {
+        if (!(0, import_node_fs.existsSync)(this.cachePath)) {
           return { sessions: {}, version: 1 };
         }
         try {
-          const content = (0, import_node_fs2.readFileSync)(this.cachePath, "utf-8");
+          const content = (0, import_node_fs.readFileSync)(this.cachePath, "utf-8");
           return JSON.parse(content);
         } catch {
           return { sessions: {}, version: 1 };
@@ -2590,7 +2702,7 @@ var init_cache_manager = __esm({
        */
       saveCache(cache) {
         try {
-          (0, import_node_fs2.writeFileSync)(this.cachePath, JSON.stringify(cache, null, 2), "utf-8");
+          (0, import_node_fs.writeFileSync)(this.cachePath, JSON.stringify(cache, null, 2), "utf-8");
         } catch {
         }
       }
@@ -2600,8 +2712,8 @@ var init_cache_manager = __esm({
       ensureCacheDir() {
         try {
           const dir = (0, import_node_path2.dirname)(this.cachePath);
-          if (!(0, import_node_fs2.existsSync)(dir)) {
-            (0, import_node_fs2.mkdirSync)(dir, { recursive: true });
+          if (!(0, import_node_fs.existsSync)(dir)) {
+            (0, import_node_fs.mkdirSync)(dir, { recursive: true });
           }
         } catch {
         }
@@ -2773,6 +2885,8 @@ var init_cache_metrics_widget = __esm({
       lastSessionId;
       cachedUsage;
       // Cache parsed usage within render cycle
+      cachedCumulativeCache;
+      // Cumulative cache for session
       constructor(theme) {
         super();
         this.theme = theme ?? DEFAULT_THEME;
@@ -2794,9 +2908,14 @@ var init_cache_metrics_widget = __esm({
       /**
        * Calculate cache metrics from context usage data
        * Returns zero metrics if no usage data is available (widget should always be visible)
+       *
+       * @param usage - Current usage data (for total tokens calculation)
+       * @param cumulativeCache - Cumulative cache data for the session (optional)
        */
-      calculateMetrics(usage) {
-        if (!usage) {
+      calculateMetrics(usage, cumulativeCache) {
+        const cacheRead = cumulativeCache?.cacheRead ?? usage?.cache_read_input_tokens ?? 0;
+        const cacheWrite = cumulativeCache?.cacheCreation ?? usage?.cache_creation_input_tokens ?? 0;
+        if (!usage && !cumulativeCache) {
           return {
             cacheRead: 0,
             cacheWrite: 0,
@@ -2805,10 +2924,8 @@ var init_cache_metrics_widget = __esm({
             savings: 0
           };
         }
-        const cacheRead = usage.cache_read_input_tokens ?? 0;
-        const cacheWrite = usage.cache_creation_input_tokens ?? 0;
-        const inputTokens = usage.input_tokens ?? 0;
-        const outputTokens = usage.output_tokens ?? 0;
+        const inputTokens = usage?.input_tokens ?? 0;
+        const outputTokens = usage?.output_tokens ?? 0;
         const totalInputTokens = cacheRead + cacheWrite + inputTokens;
         const totalTokens = totalInputTokens + outputTokens;
         const hitRate = totalInputTokens > 0 ? Math.min(100, Math.round(cacheRead / totalInputTokens * 100)) : 0;
@@ -2845,18 +2962,21 @@ var init_cache_metrics_widget = __esm({
             });
           }
         }
-        if (!usage) {
+        const hasRealUsage = usage && ((usage.input_tokens ?? 0) > 0 || (usage.output_tokens ?? 0) > 0 || (usage.cache_read_input_tokens ?? 0) > 0 || (usage.cache_creation_input_tokens ?? 0) > 0);
+        if (!usage || !hasRealUsage) {
           this.cachedUsage = await this.usageParser.parseLastUsage(data.transcript_path);
         } else {
           this.cachedUsage = void 0;
         }
+        this.cachedCumulativeCache = await this.usageParser.parseCumulativeCache(data.transcript_path);
       }
       /**
        * Render the cache metrics display
        */
       renderWithData(data, _context) {
         let usage = data.context_window?.current_usage;
-        if (!usage && this.cachedUsage) {
+        const hasRealUsage = usage && ((usage.input_tokens ?? 0) > 0 || (usage.output_tokens ?? 0) > 0 || (usage.cache_read_input_tokens ?? 0) > 0 || (usage.cache_creation_input_tokens ?? 0) > 0);
+        if ((!usage || !hasRealUsage) && this.cachedUsage) {
           usage = this.cachedUsage;
         }
         if (!usage) {
@@ -2865,7 +2985,8 @@ var init_cache_metrics_widget = __esm({
             usage = cached.usage;
           }
         }
-        const metrics = this.calculateMetrics(usage);
+        const cumulativeCacheToUse = this.cachedCumulativeCache;
+        const metrics = this.calculateMetrics(usage, cumulativeCacheToUse);
         if (!metrics) {
           return null;
         }
@@ -3416,7 +3537,8 @@ var init_context_widget = __esm({
             });
           }
         }
-        if (!current_usage) {
+        const hasRealUsage = current_usage && ((current_usage.input_tokens ?? 0) > 0 || (current_usage.output_tokens ?? 0) > 0 || (current_usage.cache_read_input_tokens ?? 0) > 0 || (current_usage.cache_creation_input_tokens ?? 0) > 0);
+        if (!current_usage || !hasRealUsage) {
           this.cachedUsage = await this.usageParser.parseLastUsage(data.transcript_path);
         } else {
           this.cachedUsage = void 0;
@@ -3425,7 +3547,8 @@ var init_context_widget = __esm({
       renderWithData(data, _context) {
         const { current_usage, context_window_size } = data.context_window;
         let usage = current_usage;
-        if (!usage && this.cachedUsage) {
+        const hasRealUsage = usage && ((usage.input_tokens ?? 0) > 0 || (usage.output_tokens ?? 0) > 0 || (usage.cache_read_input_tokens ?? 0) > 0 || (usage.cache_creation_input_tokens ?? 0) > 0);
+        if ((!usage || !hasRealUsage) && this.cachedUsage) {
           usage = this.cachedUsage;
         }
         if (!usage) {
@@ -26259,8 +26382,8 @@ init_renderer();
 init_widget_registry();
 
 // src/providers/transcript-provider.ts
-var import_node_fs3 = require("node:fs");
-var import_node_readline2 = require("node:readline");
+var import_node_fs2 = require("node:fs");
+var import_node_readline = require("node:readline");
 var TranscriptProvider = class {
   MAX_TOOLS = 20;
   /**
@@ -26269,13 +26392,13 @@ var TranscriptProvider = class {
    * @returns Array of tool entries, limited to last 20
    */
   async parseTools(transcriptPath) {
-    if (!(0, import_node_fs3.existsSync)(transcriptPath)) {
+    if (!(0, import_node_fs2.existsSync)(transcriptPath)) {
       return [];
     }
     const toolMap = /* @__PURE__ */ new Map();
     try {
-      const fileStream = (0, import_node_fs3.createReadStream)(transcriptPath, { encoding: "utf-8" });
-      const rl = (0, import_node_readline2.createInterface)({
+      const fileStream = (0, import_node_fs2.createReadStream)(transcriptPath, { encoding: "utf-8" });
+      const rl = (0, import_node_readline.createInterface)({
         input: fileStream,
         crlfDelay: Infinity
       });
@@ -26554,13 +26677,13 @@ async function routeCommand(command) {
 }
 
 // src/config/config-loader.ts
-var import_node_fs5 = require("node:fs");
+var import_node_fs4 = require("node:fs");
 var import_promises2 = require("node:fs/promises");
 var import_node_os4 = require("node:os");
 var import_node_path4 = require("node:path");
 
 // src/config/default-config-generator.ts
-var import_node_fs4 = require("node:fs");
+var import_node_fs3 = require("node:fs");
 var import_node_os3 = require("node:os");
 var import_node_path3 = require("node:path");
 function getDefaultConfigPath() {
@@ -26568,15 +26691,15 @@ function getDefaultConfigPath() {
 }
 async function ensureDefaultConfig() {
   const configPath = getDefaultConfigPath();
-  if ((0, import_node_fs4.existsSync)(configPath)) {
+  if ((0, import_node_fs3.existsSync)(configPath)) {
     return;
   }
   const configDir = (0, import_node_path3.join)((0, import_node_os3.homedir)(), ".claude-scope");
-  if (!(0, import_node_fs4.existsSync)(configDir)) {
-    (0, import_node_fs4.mkdirSync)(configDir, { recursive: true });
+  if (!(0, import_node_fs3.existsSync)(configDir)) {
+    (0, import_node_fs3.mkdirSync)(configDir, { recursive: true });
   }
   const defaultConfig = generateRichLayout("balanced", "dracula");
-  (0, import_node_fs4.writeFileSync)(configPath, JSON.stringify(defaultConfig, null, 2), "utf-8");
+  (0, import_node_fs3.writeFileSync)(configPath, JSON.stringify(defaultConfig, null, 2), "utf-8");
 }
 
 // src/config/config-loader.ts
@@ -26589,7 +26712,7 @@ function getConfigPath() {
 async function loadWidgetConfig() {
   const configPath = getConfigPath();
   await ensureDefaultConfig();
-  if (!(0, import_node_fs5.existsSync)(configPath)) {
+  if (!(0, import_node_fs4.existsSync)(configPath)) {
     return null;
   }
   try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "claude-scope",
-  "version": "0.8.34",
+  "version": "0.8.36",
   "description": "Claude Code plugin for session status and analytics",
   "license": "MIT",
   "type": "module",