getaimeter 0.7.3 → 0.7.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "getaimeter",
-  "version": "0.7.3",
+  "version": "0.7.5",
   "description": "Track AI coding costs across Claude, Cursor, Codex, and Gemini. Optimization recommendations that cut costs by 30%.",
   "bin": {
     "aimeter": "cli.js"

package/tray.ps1

@@ -78,40 +78,63 @@ $aboutItem.Add_Click({
 $helpMenu.DropDownItems.Add($aboutItem) | Out-Null
 
 $checkUpdateItem = New-Object System.Windows.Forms.ToolStripMenuItem("Check for Updates")
+$script:updateJob = $null
 $checkUpdateItem.Add_Click({
     $checkUpdateItem.Text = "Checking..."
     $checkUpdateItem.Enabled = $false
-    try {
-        $response = Invoke-RestMethod -Uri "https://registry.npmjs.org/getaimeter/latest" -TimeoutSec 5
-        $latest = $response.version
-        if ($latest -and $latest -ne $Version) {
-            $result = [System.Windows.Forms.MessageBox]::Show(
-                "Update available: v$Version -> v$latest`n`nRun this command to update:`nnpm install -g getaimeter@latest`n`nThen restart the watcher.`n`nOpen terminal to update now?",
-                "Update Available",
-                [System.Windows.Forms.MessageBoxButtons]::YesNo,
-                [System.Windows.Forms.MessageBoxIcon]::Information
-            )
-            if ($result -eq [System.Windows.Forms.DialogResult]::Yes) {
-                Start-Process "cmd.exe" -ArgumentList "/k npm install -g getaimeter@latest && echo. && echo Update complete. Restart the watcher with: aimeter stop && aimeter start"
-            }
-        } else {
-            [System.Windows.Forms.MessageBox]::Show(
-                "You are running the latest version (v$Version).",
-                "No Updates",
-                [System.Windows.Forms.MessageBoxButtons]::OK,
-                [System.Windows.Forms.MessageBoxIcon]::Information
-            )
+
+    # Run HTTP request in a background job to avoid freezing the UI
+    $script:updateJob = Start-Job -ScriptBlock {
+        try {
+            $r = Invoke-RestMethod -Uri "https://registry.npmjs.org/getaimeter/latest" -TimeoutSec 10
+            return $r.version
+        } catch {
+            return "ERROR"
         }
-    } catch {
-        [System.Windows.Forms.MessageBox]::Show(
-            "Could not check for updates. Please check your internet connection.",
-            "Update Check Failed",
-            [System.Windows.Forms.MessageBoxButtons]::OK,
-            [System.Windows.Forms.MessageBoxIcon]::Warning
-        )
     }
-    $checkUpdateItem.Text = "Check for Updates"
-    $checkUpdateItem.Enabled = $true
+
+    # Timer polls for job completion (every 500ms)
+    $updateTimer = New-Object System.Windows.Forms.Timer
+    $updateTimer.Interval = 500
+    $updateTimer.Add_Tick({
+        if ($script:updateJob.State -eq "Completed") {
+            $updateTimer.Stop()
+            $updateTimer.Dispose()
+            $latest = Receive-Job $script:updateJob
+            Remove-Job $script:updateJob
+            $script:updateJob = $null
+
+            $checkUpdateItem.Text = "Check for Updates"
+            $checkUpdateItem.Enabled = $true
+
+            if ($latest -eq "ERROR") {
+                [System.Windows.Forms.MessageBox]::Show(
+                    "Could not check for updates. Please check your internet connection.",
+                    "Update Check Failed",
+                    [System.Windows.Forms.MessageBoxButtons]::OK,
+                    [System.Windows.Forms.MessageBoxIcon]::Warning
+                ) | Out-Null
+            } elseif ($latest -and $latest -ne $Version) {
+                $result = [System.Windows.Forms.MessageBox]::Show(
+                    "Update available: v$Version -> v$latest`n`nClick Yes to open a terminal and run the update command.",
+                    "Update Available",
+                    [System.Windows.Forms.MessageBoxButtons]::YesNo,
+                    [System.Windows.Forms.MessageBoxIcon]::Information
+                )
+                if ($result -eq [System.Windows.Forms.DialogResult]::Yes) {
+                    Start-Process "cmd.exe" -ArgumentList "/k echo Updating AIMeter... && npm install -g getaimeter@latest && echo. && echo Done! Now restart: aimeter stop ^&^& aimeter start"
+                }
+            } else {
+                [System.Windows.Forms.MessageBox]::Show(
+                    "You are running the latest version (v$Version).",
+                    "No Updates",
+                    [System.Windows.Forms.MessageBoxButtons]::OK,
+                    [System.Windows.Forms.MessageBoxIcon]::Information
+                ) | Out-Null
+            }
+        }
+    })
+    $updateTimer.Start()
 })
 $helpMenu.DropDownItems.Add($checkUpdateItem) | Out-Null
 

package/watcher.js

@@ -159,31 +159,51 @@ function extractNewUsage(filePath) {
     }
 
     if (!msg) {
-      // ── Codex CLI format ──────────────────────────────────────────
-      // Codex events have { type: "event", payload: { type: "token_count", ... } }
-      // with cumulative input_tokens, output_tokens, reasoning_tokens, cached_input_tokens
-      if (obj.type === 'event' && obj.payload?.type === 'token_count') {
-        const p = obj.payload;
+      // ── Codex CLI format (old: type="event", new: type="event_msg") ──
+      // Old format: { type: "event", payload: { type: "token_count", input_tokens, ... } }
+      // New format: { type: "event_msg", payload: { type: "token_count", info: { total_token_usage: { input_tokens, ... } } } }
+      if ((obj.type === 'event' || obj.type === 'event_msg') && obj.payload?.type === 'token_count') {
+        // Extract token counts — handle both old (flat) and new (nested) format
+        let inputTokens, outputTokens, reasoningTokens, cachedTokens;
+
+        if (obj.payload.info?.total_token_usage) {
+          // New format (2026+): cumulative totals in info.total_token_usage
+          const t = obj.payload.info.total_token_usage;
+          inputTokens = t.input_tokens || 0;
+          outputTokens = t.output_tokens || 0;
+          reasoningTokens = t.reasoning_output_tokens || t.reasoning_tokens || 0;
+          cachedTokens = t.cached_input_tokens || 0;
+        } else {
+          // Old format: flat fields on payload
+          inputTokens = obj.payload.input_tokens || 0;
+          outputTokens = obj.payload.output_tokens || 0;
+          reasoningTokens = obj.payload.reasoning_tokens || 0;
+          cachedTokens = obj.payload.cached_input_tokens || 0;
+        }
+
+        // Skip events with no token info (e.g. rate limit only events)
+        if (inputTokens === 0 && outputTokens === 0) continue;
+
         const codexModel = obj.turn_context?.model || 'codex';
+
         // Token counts are cumulative per session; we store deltas
-        // Use a per-file tracker for the previous cumulative values
         const prevKey = filePath;
         const prev = _codexCumulative[prevKey] || { input: 0, output: 0, reasoning: 0, cached: 0 };
-        const deltaInput = (p.input_tokens || 0) - prev.input;
-        const deltaOutput = (p.output_tokens || 0) - prev.output;
-        const deltaReasoning = (p.reasoning_tokens || 0) - prev.reasoning;
+        const deltaInput = inputTokens - prev.input;
+        const deltaOutput = outputTokens - prev.output;
+        const deltaReasoning = reasoningTokens - prev.reasoning;
 
         _codexCumulative[prevKey] = {
-          input: p.input_tokens || 0,
-          output: p.output_tokens || 0,
-          reasoning: p.reasoning_tokens || 0,
-          cached: p.cached_input_tokens || 0,
+          input: inputTokens,
+          output: outputTokens,
+          reasoning: reasoningTokens,
+          cached: cachedTokens,
         };
 
         // Skip if no new tokens (duplicate or first read)
         if (deltaInput <= 0 && deltaOutput <= 0) continue;
 
-        const hashKey = `${filePath}:${lineOffset}:codex:${p.input_tokens}:${p.output_tokens}`;
+        const hashKey = `${filePath}:${lineOffset}:codex:${inputTokens}:${outputTokens}`;
         const hash = crypto.createHash('md5').update(hashKey).digest('hex');
         if (isDuplicate(hash)) continue;
 
@@ -194,7 +214,7 @@ function extractNewUsage(filePath) {
           inputTokens:      deltaInput,
           outputTokens:     deltaOutput,
           thinkingTokens:   deltaReasoning,
-          cacheReadTokens:  0,
+          cacheReadTokens:  cachedTokens,
           cacheWriteTokens: 0,
         });
         continue;