claude-scope 0.8.33 → 0.8.35

package/dist/claude-scope.cjs

@@ -2413,6 +2413,173 @@ var init_widget_types = __esm({
   }
 });
 
+// src/providers/usage-parser.ts
+var import_fs, import_readline, UsageParser;
+var init_usage_parser = __esm({
+  "src/providers/usage-parser.ts"() {
+    "use strict";
+    import_fs = require("fs");
+    import_readline = require("readline");
+    UsageParser = class {
+      /**
+       * Parse the last assistant message with usage data from transcript
+       * Reads file in reverse to find the most recent data quickly
+       *
+       * @param transcriptPath - Path to the JSONL transcript file
+       * @returns ContextUsage or null if not found
+       */
+      async parseLastUsage(transcriptPath) {
+        if (!(0, import_fs.existsSync)(transcriptPath)) {
+          return null;
+        }
+        try {
+          const lines = await this.readAllLines(transcriptPath);
+          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 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_fs.createReadStream)(transcriptPath, { encoding: "utf-8" });
+          const rl = (0, import_readline.createInterface)({
+            input: fileStream,
+            crlfDelay: Infinity
+          });
+          for await (const line of rl) {
+            if (line.trim()) {
+              lines.push(line);
+            }
+          }
+        } catch {
+          return [];
+        }
+        return lines;
+      }
+      /**
+       * Parse cumulative cache tokens from all assistant messages in transcript
+       * Sums ALL cache_read and cache_creation tokens across the entire session
+       *
+       * @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);
+          let cumulativeCacheRead = 0;
+          let cumulativeCacheCreation = 0;
+          for (const line of lines) {
+            const entry = this.parseLineForCache(line);
+            if (entry) {
+              cumulativeCacheRead += entry.cacheRead;
+              cumulativeCacheCreation += entry.cacheCreation;
+            }
+          }
+          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
+       */
+      parseLineForUsage(line) {
+        try {
+          const entry = JSON.parse(line);
+          if (entry.type !== "assistant") {
+            return null;
+          }
+          const usage = entry.message?.usage;
+          if (!usage) {
+            return null;
+          }
+          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 ?? 0
+            // Default to 0 if missing
+          };
+        } catch {
+          return null;
+        }
+      }
+    };
+  }
+});
+
 // src/storage/cache-manager.ts
 var import_node_fs, import_node_os2, import_node_path2, DEFAULT_CACHE_PATH, DEFAULT_EXPIRY_MS, CacheManager;
 var init_cache_manager = __esm({
@@ -2665,6 +2832,7 @@ var init_cache_metrics_widget = __esm({
   "src/widgets/cache-metrics/cache-metrics-widget.ts"() {
     "use strict";
     init_widget_types();
+    init_usage_parser();
     init_cache_manager();
     init_theme();
     init_stdin_data_widget();
@@ -2684,11 +2852,17 @@ var init_cache_metrics_widget = __esm({
       style = "balanced";
       renderData;
       cacheManager;
+      usageParser;
       lastSessionId;
+      cachedUsage;
+      // Cache parsed usage within render cycle
+      cachedCumulativeCache;
+      // Cumulative cache for session
       constructor(theme) {
         super();
         this.theme = theme ?? DEFAULT_THEME;
         this.cacheManager = new CacheManager();
+        this.usageParser = new UsageParser();
       }
       /**
        * Set display style
@@ -2705,16 +2879,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(data) {
-        let usage = data.context_window?.current_usage;
-        if (!usage) {
-          const cached = this.cacheManager.getCachedUsage(data.session_id);
-          if (cached) {
-            usage = cached.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,
@@ -2723,10 +2895,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;
@@ -2763,16 +2933,35 @@ var init_cache_metrics_widget = __esm({
             });
           }
         }
-        const metrics = this.calculateMetrics(data);
-        this.renderData = metrics ?? void 0;
+        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) {
-        if (!this.renderData) {
+      renderWithData(data, _context) {
+        let usage = data.context_window?.current_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) {
+          usage = this.cachedUsage;
+        }
+        if (!usage) {
+          const cached = this.cacheManager.getCachedUsage(data.session_id);
+          if (cached) {
+            usage = cached.usage;
+          }
+        }
+        const cumulativeCacheToUse = this.cachedCumulativeCache;
+        const metrics = this.calculateMetrics(usage, cumulativeCacheToUse);
+        if (!metrics) {
           return null;
         }
+        this.renderData = metrics;
         const styleFn = cacheMetricsStyles[this.style] ?? cacheMetricsStyles.balanced;
         if (!styleFn) {
           return null;
@@ -3259,6 +3448,7 @@ var init_context_widget = __esm({
   "src/widgets/context-widget.ts"() {
     "use strict";
     init_widget_types();
+    init_usage_parser();
     init_cache_manager();
     init_theme();
     init_styles4();
@@ -3277,11 +3467,15 @@ var init_context_widget = __esm({
       _lineOverride;
       styleFn = contextStyles.balanced;
       cacheManager;
+      usageParser;
       lastSessionId;
+      cachedUsage;
+      // Cache parsed usage within render cycle
       constructor(colors2) {
         super();
         this.colors = colors2 ?? DEFAULT_THEME;
         this.cacheManager = new CacheManager();
+        this.usageParser = new UsageParser();
       }
       setStyle(style = "balanced") {
         const fn = contextStyles[style];
@@ -3314,10 +3508,20 @@ var init_context_widget = __esm({
             });
           }
         }
+        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;
+        }
       }
       renderWithData(data, _context) {
         const { current_usage, context_window_size } = data.context_window;
         let usage = current_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) {
+          usage = this.cachedUsage;
+        }
         if (!usage) {
           const cached = this.cacheManager.getCachedUsage(data.session_id);
           if (cached) {

package/package.json

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