npm - getaimeter - Versions diffs - 0.10.0 → 0.11.1 - Mend

getaimeter 0.10.0 → 0.11.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (5) hide show

package/config.js CHANGED Viewed

@@ -68,13 +68,12 @@ 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);
+  // 3. OpenAI Codex CLI — watch the root ~/.codex dir so findJsonlFiles recurses
+  //    into both sessions/ (per-session UUIDs) and history.jsonl (single flat file).
+  //    Previously both ~/.codex and ~/.codex/sessions were added separately, causing
+  //    the same files to be discovered twice per poll cycle.
+  const codexDir = path.join(os.homedir(), '.codex');
+  if (fs.existsSync(codexDir)) paths.push(codexDir);
   // 4. GitHub Copilot CLI sessions
   const copilotSessions = path.join(os.homedir(), '.copilot', 'session-state');

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "getaimeter",
-  "version": "0.10.0",
+  "version": "0.11.1",
   "description": "Track AI coding costs across Claude, Cursor, Codex, Copilot, and Gemini. MCP server, billing blocks, optimization recommendations.",
   "bin": {
     "aimeter": "cli.js",

package/tray.ps1 CHANGED Viewed

@@ -1,208 +1,208 @@
-param(
-    [string]$IconPath,
-    [string]$MaskedKey,
-    [string]$LogPath,
-    [int]$ParentPid,
-    [string]$Version = "unknown"
-)
-Add-Type -AssemblyName System.Windows.Forms
-Add-Type -AssemblyName System.Drawing
-# ── Prevent duplicate tray instances ──────────────────────────────────────────
-$mutexName = "Global\AIMeterTray"
-$createdNew = $false
-$mutex = New-Object System.Threading.Mutex($true, $mutexName, [ref]$createdNew)
-if (-not $createdNew) {
-    # Another tray is already running — exit silently
-    $mutex.Dispose()
-    exit 0
-}
-# Create tray icon
-$tray = New-Object System.Windows.Forms.NotifyIcon
-if ($IconPath -and (Test-Path $IconPath)) {
-    try {
-        $tray.Icon = New-Object System.Drawing.Icon($IconPath)
-    } catch {
-        $tray.Icon = [System.Drawing.SystemIcons]::Application
-    }
-} else {
-    $tray.Icon = [System.Drawing.SystemIcons]::Application
-}
-$tray.Text = "AIMeter v$Version - Tracking AI usage"
-$tray.Visible = $true
-# Context menu
-$menu = New-Object System.Windows.Forms.ContextMenuStrip
-$header = $menu.Items.Add("AIMeter Watcher v$Version")
-$header.Enabled = $false
-$header.Font = New-Object System.Drawing.Font($header.Font, [System.Drawing.FontStyle]::Bold)
-$menu.Items.Add("-")
-$keyItem = $menu.Items.Add("Key: $MaskedKey")
-$keyItem.Enabled = $false
-$menu.Items.Add("-")
-$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({
-    # Launch log viewer directly via PowerShell — avoids VBS quoting issues with paths containing spaces
-    Start-Process "powershell" -ArgumentList @(
-        "-NoProfile",
-        "-ExecutionPolicy", "Bypass",
-        "-STA",
-        "-WindowStyle", "Hidden",
-        "-File", $viewerScript,
-        "-LogPath", $LogPath
-    ) -WindowStyle Hidden
-})
-$menu.Items.Add("-")
-# ── Help submenu ──────────────────────────────────────────────────────────────
-$helpMenu = New-Object System.Windows.Forms.ToolStripMenuItem("Help")
-$aboutItem = New-Object System.Windows.Forms.ToolStripMenuItem("About AIMeter")
-$aboutItem.Add_Click({
-    [System.Windows.Forms.MessageBox]::Show(
-        "AIMeter v$Version`n`nAI coding cost optimizer.`nTrack Claude, Cursor, Codex, and Gemini.`n`nhttps://getaimeter.com",
-        "About AIMeter",
-        [System.Windows.Forms.MessageBoxButtons]::OK,
-        [System.Windows.Forms.MessageBoxIcon]::Information
-    )
-})
-$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
-    # 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"
-        }
-    }
-    # 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) {
-                    # Update and auto-restart: stop watcher, update npm, restart watcher
-                    $nodePath = (Get-Command node -ErrorAction SilentlyContinue).Source
-                    $aimeter = (Get-Command aimeter -ErrorAction SilentlyContinue).Source
-                    Start-Process "cmd.exe" -ArgumentList "/k echo Updating AIMeter... && npm install -g getaimeter@latest && echo. && echo Reinstalling shortcuts... && aimeter install && echo. && echo Updated to latest version! This window can be closed. && echo."
-                    # Give the cmd window time to stop us, then exit this tray
-                    Start-Sleep -Seconds 3
-                    $tray.Visible = $false
-                    $tray.Dispose()
-                    $mutex.ReleaseMutex()
-                    $mutex.Dispose()
-                    [System.Windows.Forms.Application]::Exit()
-                }
-            } 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
-$helpMenu.DropDownItems.Add("-") | Out-Null
-$docsItem = New-Object System.Windows.Forms.ToolStripMenuItem("Documentation")
-$docsItem.Add_Click({ Start-Process "https://www.npmjs.com/package/getaimeter" })
-$helpMenu.DropDownItems.Add($docsItem) | Out-Null
-$websiteItem = New-Object System.Windows.Forms.ToolStripMenuItem("Website")
-$websiteItem.Add_Click({ Start-Process "https://getaimeter.com" })
-$helpMenu.DropDownItems.Add($websiteItem) | Out-Null
-$menu.Items.Add($helpMenu)
-$menu.Items.Add("-")
-$stop = $menu.Items.Add("Stop Watcher")
-$stop.Add_Click({
-    $tray.Visible = $false
-    $tray.Dispose()
-    $mutex.ReleaseMutex()
-    $mutex.Dispose()
-    if ($ParentPid -gt 0) {
-        try { Stop-Process -Id $ParentPid -Force -ErrorAction SilentlyContinue } catch {}
-    }
-    [System.Windows.Forms.Application]::Exit()
-})
-$tray.ContextMenuStrip = $menu
-# Timer to check if parent process is still alive
-$timer = New-Object System.Windows.Forms.Timer
-$timer.Interval = 5000
-$timer.Add_Tick({
-    if ($ParentPid -gt 0) {
-        try {
-            $p = Get-Process -Id $ParentPid -ErrorAction Stop
-        } catch {
-            # Parent died, clean up
-            $tray.Visible = $false
-            $tray.Dispose()
-            $mutex.ReleaseMutex()
-            $mutex.Dispose()
-            [System.Windows.Forms.Application]::Exit()
-        }
-    }
-})
-$timer.Start()
-# Double-click tray icon opens dashboard
-$tray.Add_DoubleClick({ Start-Process "https://getaimeter.com/dashboard" })
-# Run message loop
-[System.Windows.Forms.Application]::Run()
+param(
+    [string]$IconPath,
+    [string]$MaskedKey,
+    [string]$LogPath,
+    [int]$ParentPid,
+    [string]$Version = "unknown"
+)
+Add-Type -AssemblyName System.Windows.Forms
+Add-Type -AssemblyName System.Drawing
+# ── Prevent duplicate tray instances ──────────────────────────────────────────
+$mutexName = "Global\AIMeterTray"
+$createdNew = $false
+$mutex = New-Object System.Threading.Mutex($true, $mutexName, [ref]$createdNew)
+if (-not $createdNew) {
+    # Another tray is already running — exit silently
+    $mutex.Dispose()
+    exit 0
+}
+# Create tray icon
+$tray = New-Object System.Windows.Forms.NotifyIcon
+if ($IconPath -and (Test-Path $IconPath)) {
+    try {
+        $tray.Icon = New-Object System.Drawing.Icon($IconPath)
+    } catch {
+        $tray.Icon = [System.Drawing.SystemIcons]::Application
+    }
+} else {
+    $tray.Icon = [System.Drawing.SystemIcons]::Application
+}
+$tray.Text = "AIMeter v$Version - Tracking AI usage"
+$tray.Visible = $true
+# Context menu
+$menu = New-Object System.Windows.Forms.ContextMenuStrip
+$header = $menu.Items.Add("AIMeter Watcher v$Version")
+$header.Enabled = $false
+$header.Font = New-Object System.Drawing.Font($header.Font, [System.Drawing.FontStyle]::Bold)
+$menu.Items.Add("-")
+$keyItem = $menu.Items.Add("Key: $MaskedKey")
+$keyItem.Enabled = $false
+$menu.Items.Add("-")
+$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({
+    # Launch log viewer directly via PowerShell — avoids VBS quoting issues with paths containing spaces
+    Start-Process "powershell" -ArgumentList @(
+        "-NoProfile",
+        "-ExecutionPolicy", "Bypass",
+        "-STA",
+        "-WindowStyle", "Hidden",
+        "-File", $viewerScript,
+        "-LogPath", $LogPath
+    ) -WindowStyle Hidden
+})
+$menu.Items.Add("-")
+# ── Help submenu ──────────────────────────────────────────────────────────────
+$helpMenu = New-Object System.Windows.Forms.ToolStripMenuItem("Help")
+$aboutItem = New-Object System.Windows.Forms.ToolStripMenuItem("About AIMeter")
+$aboutItem.Add_Click({
+    [System.Windows.Forms.MessageBox]::Show(
+        "AIMeter v$Version`n`nAI coding cost optimizer.`nTrack Claude, Cursor, Codex, and Gemini.`n`nhttps://getaimeter.com",
+        "About AIMeter",
+        [System.Windows.Forms.MessageBoxButtons]::OK,
+        [System.Windows.Forms.MessageBoxIcon]::Information
+    )
+})
+$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
+    # 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"
+        }
+    }
+    # 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) {
+                    # Update and auto-restart: stop watcher, update npm, restart watcher
+                    $nodePath = (Get-Command node -ErrorAction SilentlyContinue).Source
+                    $aimeter = (Get-Command aimeter -ErrorAction SilentlyContinue).Source
+                    Start-Process "cmd.exe" -ArgumentList "/k echo Updating AIMeter... && npm install -g getaimeter@latest && echo. && echo Reinstalling shortcuts... && aimeter install && echo. && echo Updated to latest version! This window can be closed. && echo."
+                    # Give the cmd window time to stop us, then exit this tray
+                    Start-Sleep -Seconds 3
+                    $tray.Visible = $false
+                    $tray.Dispose()
+                    $mutex.ReleaseMutex()
+                    $mutex.Dispose()
+                    [System.Windows.Forms.Application]::Exit()
+                }
+            } 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
+$helpMenu.DropDownItems.Add("-") | Out-Null
+$docsItem = New-Object System.Windows.Forms.ToolStripMenuItem("Documentation")
+$docsItem.Add_Click({ Start-Process "https://www.npmjs.com/package/getaimeter" })
+$helpMenu.DropDownItems.Add($docsItem) | Out-Null
+$websiteItem = New-Object System.Windows.Forms.ToolStripMenuItem("Website")
+$websiteItem.Add_Click({ Start-Process "https://getaimeter.com" })
+$helpMenu.DropDownItems.Add($websiteItem) | Out-Null
+$menu.Items.Add($helpMenu)
+$menu.Items.Add("-")
+$stop = $menu.Items.Add("Stop Watcher")
+$stop.Add_Click({
+    $tray.Visible = $false
+    $tray.Dispose()
+    $mutex.ReleaseMutex()
+    $mutex.Dispose()
+    if ($ParentPid -gt 0) {
+        try { Stop-Process -Id $ParentPid -Force -ErrorAction SilentlyContinue } catch {}
+    }
+    [System.Windows.Forms.Application]::Exit()
+})
+$tray.ContextMenuStrip = $menu
+# Timer to check if parent process is still alive
+$timer = New-Object System.Windows.Forms.Timer
+$timer.Interval = 5000
+$timer.Add_Tick({
+    if ($ParentPid -gt 0) {
+        try {
+            $p = Get-Process -Id $ParentPid -ErrorAction Stop
+        } catch {
+            # Parent died, clean up
+            $tray.Visible = $false
+            $tray.Dispose()
+            $mutex.ReleaseMutex()
+            $mutex.Dispose()
+            [System.Windows.Forms.Application]::Exit()
+        }
+    }
+})
+$timer.Start()
+# Double-click tray icon opens dashboard
+$tray.Add_DoubleClick({ Start-Process "https://getaimeter.com/dashboard" })
+# Run message loop
+[System.Windows.Forms.Application]::Run()

package/watcher.js CHANGED Viewed

@@ -162,6 +162,17 @@ function getConversationMeta(filePath) {
   // Conversation ID = file basename without extension
   let conversationId = path.basename(filePath, '.jsonl');
+  // Copilot stores sessions as <session-UUID>/events.jsonl — all files are named
+  // "events.jsonl", so the basename is always "events" which collides across sessions.
+  // Use the parent directory UUID as the conversation ID instead.
+  if (conversationId === 'events') {
+    const parentDir = path.basename(path.dirname(filePath));
+    // Only override if parent looks like a UUID (avoids false positives)
+    if (/^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i.test(parentDir)) {
+      conversationId = parentDir;
+    }
+  }
   // For subagent files, use the parent session UUID as conversation ID
   const subagentMatch = normalized.match(/\/([^/]+)\/subagents\//);
   if (subagentMatch) {
@@ -332,6 +343,30 @@ function extractNewUsage(filePath) {
         continue;
       }
+      // ── Copilot VS Code agent: real-time per-turn output tracking ──
+      // assistant.message fires after every AI response with data.outputTokens.
+      // Input tokens are not available per-turn — they come from session.shutdown.
+      if (obj.type === 'assistant.message' && obj.data?.outputTokens > 0) {
+        const msgId = obj.data.messageId;
+        const hashKey = `${filePath}:copilot-msg:${msgId}`;
+        const hash = crypto.createHash('md5').update(hashKey).digest('hex');
+        if (isDuplicate(hash)) continue;
+        usageEvents.push({
+          provider:         'github',
+          model:            'copilot',
+          source:           detectSource(filePath),
+          inputTokens:      0,
+          outputTokens:     obj.data.outputTokens,
+          thinkingTokens:   0,
+          cacheReadTokens:  0,
+          cacheWriteTokens: 0,
+          conversationId:   convMeta.conversationId,
+          projectPath:      convMeta.projectPath,
+        });
+        continue;
+      }
       // ── Copilot format (old: token_usage, new: session.shutdown with modelMetrics) ──
       if (obj.type === 'token_usage' && (obj.input_tokens !== undefined || obj.output_tokens !== undefined)) {
         const copilotModel = obj.model || 'copilot';
@@ -354,15 +389,19 @@ function extractNewUsage(filePath) {
         continue;
       }
-      // GitHub Copilot agent: session.shutdown has per-model usage in data.modelMetrics
+      // GitHub Copilot agent: session.shutdown reports the per-model session totals.
+      // Output tokens were already reported turn-by-turn via assistant.message above,
+      // so here we only emit input tokens (+ cache) to avoid double-counting output.
       if (obj.type === 'session.shutdown' && obj.data?.modelMetrics) {
         for (const [model, metrics] of Object.entries(obj.data.modelMetrics)) {
           const u = metrics.usage || {};
-          const inputTokens = u.inputTokens || 0;
-          const outputTokens = u.outputTokens || 0;
-          if (inputTokens === 0 && outputTokens === 0) continue;
+          const inputTokens    = u.inputTokens    || 0;
+          const cacheReadTokens  = u.cacheReadTokens  || 0;
+          const cacheWriteTokens = u.cacheWriteTokens || 0;
+          // Skip if no input data (output was already handled per-turn)
+          if (inputTokens === 0 && cacheReadTokens === 0) continue;
-          const hashKey = `${filePath}:copilot-shutdown:${model}:${inputTokens}:${outputTokens}`;
+          const hashKey = `${filePath}:copilot-shutdown-input:${model}:${inputTokens}`;
           const hash = crypto.createHash('md5').update(hashKey).digest('hex');
           if (isDuplicate(hash)) continue;
@@ -377,10 +416,10 @@ function extractNewUsage(filePath) {
             model,
             source:           detectSource(filePath),
             inputTokens,
-            outputTokens,
+            outputTokens:     0, // already reported per assistant.message turn
             thinkingTokens:   0,
-            cacheReadTokens:  u.cacheReadTokens || 0,
-            cacheWriteTokens: u.cacheWriteTokens || 0,
+            cacheReadTokens,
+            cacheWriteTokens,
             conversationId:   convMeta.conversationId,
             projectPath:      convMeta.projectPath,
           });