getaimeter 0.6.4 → 0.7.1

package/package.json

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

package/tray-launcher.vbs

@@ -1,2 +1,4 @@
 Set objShell = CreateObject("WScript.Shell")
-objShell.Run "powershell -NoProfile -ExecutionPolicy Bypass -STA -File """ & Replace(WScript.ScriptFullName, "tray-launcher.vbs", "tray.ps1") & """ -IconPath """ & Replace(WScript.ScriptFullName, "tray-launcher.vbs", "icon.ico") & """ -MaskedKey """ & WScript.Arguments(0) & """ -LogPath """ & WScript.Arguments(1) & """ -ParentPid " & WScript.Arguments(2), 0, False
+Dim sVersion
+If WScript.Arguments.Count > 3 Then sVersion = WScript.Arguments(3) Else sVersion = "unknown"
+objShell.Run "powershell -NoProfile -ExecutionPolicy Bypass -STA -File """ & Replace(WScript.ScriptFullName, "tray-launcher.vbs", "tray.ps1") & """ -IconPath """ & Replace(WScript.ScriptFullName, "tray-launcher.vbs", "icon.ico") & """ -MaskedKey """ & WScript.Arguments(0) & """ -LogPath """ & WScript.Arguments(1) & """ -ParentPid " & WScript.Arguments(2) & " -Version """ & sVersion & """", 0, False

package/tray.js

@@ -13,6 +13,7 @@ async function startTray(onStop) {
   const apiKey = getApiKey();
   const maskedKey = apiKey ? `${apiKey.slice(0, 8)}...${apiKey.slice(-4)}` : 'not set';
   const logPath = path.join(AIMETER_DIR, 'watcher.log');
+  const version = require('./package.json').version;
 
   return new Promise((resolve) => {
     // Use cscript to launch VBS which launches PowerShell hidden with -STA
@@ -22,6 +23,7 @@ async function startTray(onStop) {
       maskedKey,
       logPath,
       String(process.pid),
+      version,
     ], { windowsHide: true }, (err) => {
       if (err) resolve(null);
     });

package/tray.ps1

@@ -2,12 +2,23 @@ param(
     [string]$IconPath,
     [string]$MaskedKey,
     [string]$LogPath,
-    [int]$ParentPid
+    [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
 
@@ -21,13 +32,13 @@ if ($IconPath -and (Test-Path $IconPath)) {
     $tray.Icon = [System.Drawing.SystemIcons]::Application
 }
 
-$tray.Text = "AIMeter - Tracking AI usage"
+$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")
+$header = $menu.Items.Add("AIMeter Watcher v$Version")
 $header.Enabled = $false
 $header.Font = New-Object System.Drawing.Font($header.Font, [System.Drawing.FontStyle]::Bold)
 
@@ -44,8 +55,6 @@ $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 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)
@@ -54,10 +63,78 @@ $logs.Add_Click({
 
 $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")
+$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
+            )
+        }
+    } 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
+})
+$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 {}
     }
@@ -77,11 +154,16 @@ $timer.Add_Tick({
             # 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

@@ -310,8 +310,9 @@ function extractNewUsage(filePath) {
 // Cursor IDE — extract usage from SQLite state.vscdb
 // ---------------------------------------------------------------------------
 
-// Track last-seen composerData keys to detect new conversations
-const _cursorSeenKeys = new Set();
+// Track last-seen bubble counts per conversation to detect new messages
+// Map<composerId, { aiCount, aiTextLen, userTextLen }>
+const _cursorConvState = new Map();
 let _cursorSqliteAvailable = null; // null = unchecked, true/false after first check
 
 // Locate sqlite3 binary — may be in PATH or in the WinGet install location
@@ -413,7 +414,6 @@ function extractCursorUsage(dbPath) {
       const parts = line.split('|');
       if (parts.length < 4) continue;
       const [key, composerId, modelName, createdAt] = parts;
-      if (_cursorSeenKeys.has(key)) continue;
       conversations.push({ key, composerId, modelName: modelName || 'default', createdAt: parseInt(createdAt) || 0 });
     }
 
@@ -422,7 +422,8 @@ function extractCursorUsage(dbPath) {
       return [];
     }
 
-    // Step 2: For new conversations, count AI response bubbles and measure text
+    // Step 2: For each conversation, check if bubble count increased since last check.
+    // Report only the DELTA (new messages since last poll).
     for (const conv of conversations) {
       try {
         // Count AI responses (type=2) and sum their text lengths
@@ -430,19 +431,11 @@ function extractCursorUsage(dbPath) {
           `SELECT count(*), sum(length(json_extract(value, '$.text'))) FROM cursorDiskKV WHERE key LIKE 'bubbleId:${conv.composerId}:%' AND json_extract(value, '$.type') = 2`
         );
 
-        if (!bubbleRaw || !bubbleRaw.trim()) {
-          _cursorSeenKeys.add(conv.key);
-          continue;
-        }
+        if (!bubbleRaw || !bubbleRaw.trim()) continue;
 
         const [countStr, textLenStr] = bubbleRaw.trim().split('|');
-        const responseCount = parseInt(countStr) || 0;
-        const totalTextLen = parseInt(textLenStr) || 0;
-
-        if (responseCount === 0) {
-          _cursorSeenKeys.add(conv.key);
-          continue;
-        }
+        const aiCount = parseInt(countStr) || 0;
+        const aiTextLen = parseInt(textLenStr) || 0;
 
         // Also count user messages for input estimation
         const userRaw = runSqlite(dbPath,
@@ -450,21 +443,31 @@ function extractCursorUsage(dbPath) {
         );
         const userTextLen = parseInt((userRaw || '').trim()) || 0;
 
-        // Estimate tokens: ~4 chars per token
-        const estimatedInputTokens = Math.ceil(userTextLen / 4);
-        const estimatedOutputTokens = Math.ceil(totalTextLen / 4);
+        // Get previous state for this conversation
+        const prev = _cursorConvState.get(conv.composerId) || { aiCount: 0, aiTextLen: 0, userTextLen: 0 };
 
-        if (estimatedInputTokens === 0 && estimatedOutputTokens === 0) {
-          _cursorSeenKeys.add(conv.key);
-          continue;
+        // Check if anything changed
+        if (aiCount <= prev.aiCount && aiTextLen <= prev.aiTextLen && userTextLen <= prev.userTextLen) {
+          continue; // No new messages
         }
 
-        const hashKey = `cursor:${conv.composerId}:${responseCount}:${totalTextLen}`;
+        // Calculate delta (new tokens since last check)
+        const deltaAiTextLen = Math.max(0, aiTextLen - prev.aiTextLen);
+        const deltaUserTextLen = Math.max(0, userTextLen - prev.userTextLen);
+
+        // Update stored state
+        _cursorConvState.set(conv.composerId, { aiCount, aiTextLen, userTextLen });
+
+        // Estimate tokens: ~4 chars per token
+        const estimatedInputTokens = Math.ceil(deltaUserTextLen / 4);
+        const estimatedOutputTokens = Math.ceil(deltaAiTextLen / 4);
+
+        if (estimatedInputTokens === 0 && estimatedOutputTokens === 0) continue;
+
+        // Dedup by exact delta values
+        const hashKey = `cursor:${conv.composerId}:${aiCount}:${aiTextLen}:${userTextLen}`;
         const hash = crypto.createHash('md5').update(hashKey).digest('hex');
-        if (isDuplicate(hash)) {
-          _cursorSeenKeys.add(conv.key);
-          continue;
-        }
+        if (isDuplicate(hash)) continue;
 
         // Determine provider from model name
         let provider = 'openai';
@@ -487,8 +490,6 @@ function extractCursorUsage(dbPath) {
           cacheWriteTokens: 0,
         });
       } catch {}
-
-      _cursorSeenKeys.add(conv.key);
     }
   } catch (err) {
     if (!err.message.includes('database is locked')) {
@@ -654,20 +655,22 @@ function startWatching() {
   const cursorDbs = findCursorDbs(watchPaths);
   if (cursorDbs.length > 0) {
     log('Cursor databases found:', cursorDbs.join(', '));
-    // Always pre-populate _cursorSeenKeys on startup so we don't re-report
-    // historical conversations. On first run, also set the mtime offset.
+    // Pre-populate _cursorConvState on startup so we only report new messages.
+    // On first run, set the mtime offset and discard results.
+    // On subsequent runs, report any new data as catch-up.
     for (const dbPath of cursorDbs) {
       try {
         if (isFirstRun) {
-          const mtime = fs.statSync(dbPath).mtimeMs;
+          // Set WAL mtime so first poll doesn't re-process
+          const walPath = dbPath + '-wal';
+          const mtime = fs.existsSync(walPath) ? fs.statSync(walPath).mtimeMs : fs.statSync(dbPath).mtimeMs;
           setOffset(dbPath + ':mtime', mtime);
         }
-        // Dry-run extraction to populate _cursorSeenKeys (discard results)
+        // Extract to populate _cursorConvState with current bubble counts
         const existing = extractCursorUsage(dbPath);
         if (isFirstRun && existing.length > 0) {
-          log(`Cursor: marked ${existing.length} existing conversations as read`);
+          log(`Cursor: marked ${_cursorConvState.size} conversations as read (${existing.length} events skipped)`);
         } else if (existing.length > 0) {
-          // Not first run but has new data since last mtime — report it
           reportEvents(existing);
           log(`Cursor: catch-up reported ${existing.length} events`);
         }