getaimeter 0.3.5 → 0.5.0

package/config.js

@@ -68,6 +68,26 @@ function getWatchPaths() {
   }
   if (fs.existsSync(desktopSessions)) paths.push(desktopSessions);
 
+  // 3. OpenAI Codex CLI sessions
+  const codexSessions = path.join(os.homedir(), '.codex', 'sessions');
+  if (fs.existsSync(codexSessions)) paths.push(codexSessions);
+
+  // Also watch ~/.codex/history.jsonl directly (Codex writes a single file)
+  const codexHistory = path.join(os.homedir(), '.codex');
+  if (fs.existsSync(codexHistory) && !paths.includes(codexHistory)) paths.push(codexHistory);
+
+  // 4. GitHub Copilot CLI sessions
+  const copilotSessions = path.join(os.homedir(), '.copilot', 'session-state');
+  if (fs.existsSync(copilotSessions)) paths.push(copilotSessions);
+
+  // 5. Gemini CLI sessions
+  const geminiDir = path.join(os.homedir(), '.gemini', 'tmp');
+  if (fs.existsSync(geminiDir)) {
+    // Gemini stores sessions under ~/.gemini/tmp/<project_hash>/chats/
+    // Watch the entire tmp dir and findJsonlFiles will recurse into it
+    paths.push(geminiDir);
+  }
+
   return paths;
 }
 

package/log-viewer.ps1

@@ -0,0 +1,63 @@
+param(
+    [string]$LogPath
+)
+
+Add-Type -AssemblyName System.Windows.Forms
+Add-Type -AssemblyName System.Drawing
+
+$form = New-Object System.Windows.Forms.Form
+$form.Text = 'AIMeter — Live Logs'
+$form.Size = New-Object System.Drawing.Size(860, 520)
+$form.BackColor = [System.Drawing.Color]::FromArgb(15, 15, 15)
+$form.StartPosition = 'CenterScreen'
+$form.ShowInTaskbar = $true
+$form.Add_Shown({ $form.Activate() })
+
+$rtb = New-Object System.Windows.Forms.RichTextBox
+$rtb.Dock = 'Fill'
+$rtb.BackColor = [System.Drawing.Color]::FromArgb(15, 15, 15)
+$rtb.ForeColor = [System.Drawing.Color]::FromArgb(200, 200, 200)
+$rtb.Font = New-Object System.Drawing.Font('Consolas', 9)
+$rtb.ReadOnly = $true
+$rtb.ScrollBars = 'Vertical'
+$rtb.WordWrap = $false
+$form.Controls.Add($rtb)
+
+# Seed with last 200 lines
+$script:fileSize = 0
+if (Test-Path $LogPath) {
+    $all = Get-Content $LogPath -Raw -ErrorAction SilentlyContinue
+    if ($all) {
+        $lines = $all -split "`n"
+        $seed  = ($lines | Select-Object -Last 200) -join "`n"
+        $rtb.Text = $seed.TrimEnd() + "`n"
+        $rtb.SelectionStart = $rtb.Text.Length
+        $rtb.ScrollToCaret()
+    }
+    $script:fileSize = (Get-Item $LogPath).Length
+}
+
+# Poll for new bytes every 500 ms
+$timer = New-Object System.Windows.Forms.Timer
+$timer.Interval = 500
+$timer.Add_Tick({
+    if (-not (Test-Path $LogPath)) { return }
+    $newSize = (Get-Item $LogPath).Length
+    if ($newSize -le $script:fileSize) { return }
+    try {
+        $fs  = [System.IO.File]::Open($LogPath, 'Open', 'Read', 'ReadWrite')
+        $null = $fs.Seek($script:fileSize, 'Begin')
+        $buf = New-Object byte[] ($newSize - $script:fileSize)
+        $null = $fs.Read($buf, 0, $buf.Length)
+        $fs.Close()
+        $chunk = [System.Text.Encoding]::UTF8.GetString($buf)
+        $rtb.AppendText($chunk)
+        $rtb.SelectionStart = $rtb.Text.Length
+        $rtb.ScrollToCaret()
+        $script:fileSize = $newSize
+    } catch {}
+})
+$timer.Start()
+
+$form.Add_FormClosed({ $timer.Stop(); $timer.Dispose() })
+[System.Windows.Forms.Application]::Run($form)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "getaimeter",
-  "version": "0.3.5",
+  "version": "0.5.0",
   "description": "Track your Claude AI usage across CLI, VS Code, and Desktop App. One command to start.",
   "bin": {
     "aimeter": "cli.js"
@@ -31,6 +31,7 @@
     "service.js",
     "tray.js",
     "tray.ps1",
+    "log-viewer.ps1",
     "tray-launcher.vbs",
     "icon.ico",
     "update-check.js",

package/tray.ps1

@@ -42,77 +42,14 @@ $dashboard = $menu.Items.Add("Open Dashboard")
 $dashboard.Add_Click({ Start-Process "https://getaimeter.com/dashboard" })
 
 $logs = $menu.Items.Add("View Logs")
+$viewerScript = Join-Path (Split-Path $MyInvocation.MyCommand.Path) 'log-viewer.ps1'
 $logs.Add_Click({
-    # Build a self-contained live-tail window in a separate runspace so it
-    # doesn't block the tray message loop.
-    $rs = [System.Management.Automation.Runspaces.RunspaceFactory]::CreateRunspace()
-    $rs.ApartmentState = 'STA'
-    $rs.ThreadOptions  = 'ReuseThread'
-    $rs.Open()
-    $rs.SessionStateProxy.SetVariable('LogPath', $LogPath)
-
-    $ps = [System.Management.Automation.PowerShell]::Create()
-    $ps.Runspace = $rs
-    $null = $ps.AddScript({
-        Add-Type -AssemblyName System.Windows.Forms
-        Add-Type -AssemblyName System.Drawing
-
-        $form = New-Object System.Windows.Forms.Form
-        $form.Text = 'AIMeter — Live Logs'
-        $form.Size = New-Object System.Drawing.Size(860, 520)
-        $form.BackColor = [System.Drawing.Color]::FromArgb(15, 15, 15)
-        $form.StartPosition = 'CenterScreen'
-
-        $rtb = New-Object System.Windows.Forms.RichTextBox
-        $rtb.Dock = 'Fill'
-        $rtb.BackColor = [System.Drawing.Color]::FromArgb(15, 15, 15)
-        $rtb.ForeColor = [System.Drawing.Color]::FromArgb(200, 200, 200)
-        $rtb.Font = New-Object System.Drawing.Font('Consolas', 9)
-        $rtb.ReadOnly = $true
-        $rtb.ScrollBars = 'Vertical'
-        $rtb.WordWrap = $false
-        $form.Controls.Add($rtb)
-
-        # Seed with last 200 lines
-        $fileSize = 0
-        if (Test-Path $LogPath) {
-            $all = Get-Content $LogPath -Raw -ErrorAction SilentlyContinue
-            if ($all) {
-                $lines = $all -split "`n"
-                $seed  = ($lines | Select-Object -Last 200) -join "`n"
-                $rtb.Text = $seed.TrimEnd() + "`n"
-                $rtb.SelectionStart = $rtb.Text.Length
-                $rtb.ScrollToCaret()
-            }
-            $fileSize = (Get-Item $LogPath).Length
-        }
-
-        # Poll for new bytes every 500 ms
-        $timer = New-Object System.Windows.Forms.Timer
-        $timer.Interval = 500
-        $timer.Add_Tick({
-            if (-not (Test-Path $LogPath)) { return }
-            $newSize = (Get-Item $LogPath).Length
-            if ($newSize -le $fileSize) { return }
-            try {
-                $fs  = [System.IO.File]::Open($LogPath, 'Open', 'Read', 'ReadWrite')
-                $null = $fs.Seek($fileSize, 'Begin')
-                $buf = New-Object byte[] ($newSize - $fileSize)
-                $null = $fs.Read($buf, 0, $buf.Length)
-                $fs.Close()
-                $chunk = [System.Text.Encoding]::UTF8.GetString($buf)
-                $rtb.AppendText($chunk)
-                $rtb.SelectionStart = $rtb.Text.Length
-                $rtb.ScrollToCaret()
-                $fileSize = $newSize
-            } catch {}
-        })
-        $timer.Start()
-
-        $form.Add_FormClosed({ $timer.Stop(); $timer.Dispose() })
-        [System.Windows.Forms.Application]::Run($form)
-    })
-    $null = $ps.BeginInvoke()
+    # Launch log viewer as a separate process so it doesn't block the tray
+    # Launch via wscript to avoid any console window flash
+    $vbsCmd = "CreateObject(""WScript.Shell"").Run ""powershell -NoProfile -ExecutionPolicy Bypass -STA -WindowStyle Hidden -File """"$viewerScript"""" -LogPath """"$LogPath"""""", 0, False"
+    $tempVbs = [System.IO.Path]::Combine([System.IO.Path]::GetTempPath(), 'aimeter-logviewer.vbs')
+    [System.IO.File]::WriteAllText($tempVbs, $vbsCmd)
+    Start-Process 'wscript' -ArgumentList @($tempVbs) -WindowStyle Hidden
 })
 
 $menu.Items.Add("-")

package/watcher.js

@@ -34,6 +34,9 @@ function logError(...args) {
 // Cache detected sources per file to avoid re-reading headers
 const _sourceCache = new Map();
 
+// Track cumulative token counts per file for Codex CLI (which reports cumulative, not delta)
+const _codexCumulative = {};
+
 function detectSource(filePath) {
   if (_sourceCache.has(filePath)) return _sourceCache.get(filePath);
 
@@ -62,6 +65,19 @@ function detectSource(filePath) {
     }
   }
 
+  if (normalized.includes('.copilot/') || normalized.includes('/copilot/')) {
+    _sourceCache.set(filePath, 'copilot_cli');
+    return 'copilot_cli';
+  }
+  if (normalized.includes('.gemini/') || normalized.includes('/gemini/')) {
+    _sourceCache.set(filePath, 'gemini_cli');
+    return 'gemini_cli';
+  }
+  if (normalized.includes('.codex/') || normalized.includes('/codex/')) {
+    _sourceCache.set(filePath, 'codex_cli');
+    return 'codex_cli';
+  }
+
   // Read first 10KB of the file to find entrypoint or IDE markers
   let source = 'cli'; // default
   try {
@@ -137,7 +153,93 @@ function extractNewUsage(filePath) {
       msgId = msg.id; // progress fires multiple times; dedup by message ID
     }
 
-    if (!msg) continue;
+    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;
+        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;
+
+        _codexCumulative[prevKey] = {
+          input: p.input_tokens || 0,
+          output: p.output_tokens || 0,
+          reasoning: p.reasoning_tokens || 0,
+          cached: p.cached_input_tokens || 0,
+        };
+
+        // 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 hash = crypto.createHash('md5').update(hashKey).digest('hex');
+        if (isDuplicate(hash)) continue;
+
+        usageEvents.push({
+          provider:         'openai',
+          model:            codexModel,
+          source:           'codex_cli',
+          inputTokens:      deltaInput,
+          outputTokens:     deltaOutput,
+          thinkingTokens:   deltaReasoning,
+          cacheReadTokens:  0,
+          cacheWriteTokens: 0,
+        });
+        continue;
+      }
+
+      // ── Copilot CLI format ────────────────────────────────────────
+      // Copilot events: { type: "token_usage", input_tokens, output_tokens, reasoning_tokens, model }
+      if (obj.type === 'token_usage' && (obj.input_tokens !== undefined || obj.output_tokens !== undefined)) {
+        const copilotModel = obj.model || 'copilot';
+        const hashKey = `${filePath}:${lineOffset}:copilot:${obj.input_tokens || 0}:${obj.output_tokens || 0}`;
+        const hash = crypto.createHash('md5').update(hashKey).digest('hex');
+        if (isDuplicate(hash)) continue;
+
+        usageEvents.push({
+          provider:         'github',
+          model:            copilotModel,
+          source:           'copilot_cli',
+          inputTokens:      obj.input_tokens || 0,
+          outputTokens:     obj.output_tokens || 0,
+          thinkingTokens:   obj.reasoning_tokens || 0,
+          cacheReadTokens:  0,
+          cacheWriteTokens: 0,
+        });
+        continue;
+      }
+
+      // ── Gemini CLI format ─────────────────────────────────────────
+      // Gemini events may contain usageMetadata: { promptTokenCount, candidatesTokenCount, totalTokenCount }
+      if (obj.usageMetadata && (obj.usageMetadata.promptTokenCount || obj.usageMetadata.candidatesTokenCount)) {
+        const um = obj.usageMetadata;
+        const geminiModel = obj.modelVersion || obj.model || 'gemini';
+        const hashKey = `${filePath}:${lineOffset}:gemini:${um.promptTokenCount || 0}:${um.candidatesTokenCount || 0}`;
+        const hash = crypto.createHash('md5').update(hashKey).digest('hex');
+        if (isDuplicate(hash)) continue;
+
+        usageEvents.push({
+          provider:         'google',
+          model:            geminiModel,
+          source:           'gemini_cli',
+          inputTokens:      um.promptTokenCount || 0,
+          outputTokens:     um.candidatesTokenCount || 0,
+          thinkingTokens:   um.thoughtsTokenCount || 0,
+          cacheReadTokens:  um.cachedContentTokenCount || 0,
+          cacheWriteTokens: 0,
+        });
+        continue;
+      }
+
+      continue;
+    }
 
     // Skip synthetic/internal messages
     if (msg.model === '<synthetic>') continue;
@@ -169,11 +271,13 @@ function extractNewUsage(filePath) {
     pendingThinkingChars = 0; // Reset for next turn
 
     // Build dedup hash.
-    // For progress entries, use the message ID so the same message fired multiple
-    // times (streaming chunks) counts only once. For assistant entries, use the
-    // line offset as before.
-    const hashKey = msgId
-      ? `${filePath}:msgid:${msgId}`
+    // For entries with a message ID (progress or assistant), use ONLY the message
+    // ID so the same call is counted once even if it appears in both the parent
+    // session file (as progress) and the subagent file (as assistant).
+    // For entries without an ID, fall back to file+offset.
+    const effectiveId = msgId || msg.id;
+    const hashKey = effectiveId
+      ? `msgid:${effectiveId}`
       : `${filePath}:${lineOffset}:${model}:${u.input_tokens || 0}:${u.output_tokens || 0}`;
     const hash = crypto.createHash('md5').update(hashKey).digest('hex');