getaimeter 0.7.9 → 0.8.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "getaimeter",
-  "version": "0.7.9",
+  "version": "0.8.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.ps1

@@ -55,10 +55,15 @@ $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({
-    $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
+    # 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("-")

package/watcher.js

@@ -67,8 +67,28 @@ function detectSource(filePath) {
   }
 
   if (normalized.includes('.copilot/') || normalized.includes('/copilot/')) {
-    _sourceCache.set(filePath, 'copilot_cli');
-    return 'copilot_cli';
+    // Check session.start or vscode.metadata.json to detect CLI vs VS Code
+    let copilotSource = 'copilot_cli';
+    try {
+      // Check for vscode.metadata.json alongside events.jsonl
+      const dir = path.dirname(filePath);
+      if (fs.existsSync(path.join(dir, 'vscode.metadata.json'))) {
+        copilotSource = 'copilot_vscode';
+      } else {
+        // Read first line for session.start producer field
+        const fd = fs.openSync(filePath, 'r');
+        const buf = Buffer.alloc(Math.min(1024, fs.fstatSync(fd).size));
+        fs.readSync(fd, buf, 0, buf.length, 0);
+        fs.closeSync(fd);
+        const firstLine = buf.toString('utf8').split('\n')[0];
+        const meta = JSON.parse(firstLine);
+        if (meta.type === 'session.start' && meta.data?.producer === 'copilot-agent') {
+          copilotSource = 'copilot_vscode'; // VS Code agent sessions have "copilot-agent" producer
+        }
+      }
+    } catch {}
+    _sourceCache.set(filePath, copilotSource);
+    return copilotSource;
   }
   if (normalized.includes('.gemini/') || normalized.includes('/gemini/')) {
     _sourceCache.set(filePath, 'gemini_cli');
@@ -236,8 +256,7 @@ function extractNewUsage(filePath) {
         continue;
       }
 
-      // ── Copilot CLI format ────────────────────────────────────────
-      // Copilot events: { type: "token_usage", input_tokens, output_tokens, reasoning_tokens, model }
+      // ── 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';
         const hashKey = `${filePath}:${lineOffset}:copilot:${obj.input_tokens || 0}:${obj.output_tokens || 0}`;
@@ -247,7 +266,7 @@ function extractNewUsage(filePath) {
         usageEvents.push({
           provider:         'github',
           model:            copilotModel,
-          source:           'copilot_cli',
+          source:           detectSource(filePath),
           inputTokens:      obj.input_tokens || 0,
           outputTokens:     obj.output_tokens || 0,
           thinkingTokens:   obj.reasoning_tokens || 0,
@@ -257,6 +276,38 @@ function extractNewUsage(filePath) {
         continue;
       }
 
+      // GitHub Copilot agent: session.shutdown has per-model usage in data.modelMetrics
+      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 hashKey = `${filePath}:copilot-shutdown:${model}:${inputTokens}:${outputTokens}`;
+          const hash = crypto.createHash('md5').update(hashKey).digest('hex');
+          if (isDuplicate(hash)) continue;
+
+          // Determine provider from model name
+          let provider = 'github';
+          if (model.includes('claude') || model.includes('anthropic')) provider = 'anthropic';
+          else if (model.includes('gpt') || model.includes('o3') || model.includes('o4')) provider = 'openai';
+          else if (model.includes('gemini')) provider = 'google';
+
+          usageEvents.push({
+            provider,
+            model,
+            source:           detectSource(filePath),
+            inputTokens,
+            outputTokens,
+            thinkingTokens:   0,
+            cacheReadTokens:  u.cacheReadTokens || 0,
+            cacheWriteTokens: u.cacheWriteTokens || 0,
+          });
+        }
+        continue;
+      }
+
       // ── Gemini CLI format ─────────────────────────────────────────
       // Gemini events may contain usageMetadata: { promptTokenCount, candidatesTokenCount, totalTokenCount }
       if (obj.usageMetadata && (obj.usageMetadata.promptTokenCount || obj.usageMetadata.candidatesTokenCount)) {