getaimeter 0.2.1 → 0.3.0

package/cli.js

@@ -5,6 +5,7 @@ const { getApiKey, saveApiKey, getWatchPaths, AIMETER_DIR } = require('./config'
 const { startWatching }   = require('./watcher');
 const { install, uninstall, isInstalled, startNow, stopNow } = require('./service');
 const { checkForUpdate, getCurrentVersion } = require('./update-check');
+const { startTray, stopTray } = require('./tray');
 
 const command = process.argv[2] || 'help';
 
@@ -187,8 +188,18 @@ function runWatch() {
 
   const cleanup = startWatching();
 
+  // Launch system tray icon (non-blocking, fails silently if systray2 not available)
+  const showTray = !process.argv.includes('--no-tray');
+  if (showTray) {
+    startTray(() => {
+      cleanup();
+      try { fs.unlinkSync(lockFile); } catch {}
+    }).catch(() => {}); // ignore tray errors
+  }
+
   const cleanupAll = () => {
     cleanup();
+    stopTray();
     try { fs.unlinkSync(lockFile); } catch {}
     process.exit(0);
   };
@@ -196,6 +207,7 @@ function runWatch() {
   process.on('SIGINT',  cleanupAll);
   process.on('SIGTERM', cleanupAll);
   process.on('exit', () => {
+    stopTray();
     try { fs.unlinkSync(lockFile); } catch {}
   });
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "getaimeter",
-  "version": "0.2.1",
+  "version": "0.3.0",
   "description": "Track your Claude AI usage across CLI, VS Code, and Desktop App. One command to start.",
   "bin": {
     "aimeter": "cli.js"
@@ -29,6 +29,10 @@
     "config.js",
     "state.js",
     "service.js",
+    "tray.js",
+    "tray.ps1",
+    "tray-launcher.vbs",
+    "icon.ico",
     "update-check.js",
     "README.md"
   ],
@@ -39,7 +43,5 @@
   "homepage": "https://getaimeter.com",
   "author": "Alejandro Ceja",
   "preferGlobal": true,
-  "dependencies": {
-    "systray2": "^2.1.4"
-  }
+  "dependencies": {}
 }

package/tray-launcher.vbs

@@ -0,0 +1,2 @@
+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

package/tray.js

@@ -0,0 +1,38 @@
+'use strict';
+
+const path = require('path');
+const { execFile } = require('child_process');
+const { getApiKey, AIMETER_DIR } = require('./config');
+
+let trayPid = null;
+
+async function startTray(onStop) {
+  if (process.platform !== 'win32') return null;
+
+  const vbsPath = path.join(__dirname, 'tray-launcher.vbs');
+  const apiKey = getApiKey();
+  const maskedKey = apiKey ? `${apiKey.slice(0, 8)}...${apiKey.slice(-4)}` : 'not set';
+  const logPath = path.join(AIMETER_DIR, 'watcher.log');
+
+  return new Promise((resolve) => {
+    // Use cscript to launch VBS which launches PowerShell hidden with -STA
+    execFile('cscript', [
+      '//Nologo',
+      vbsPath,
+      maskedKey,
+      logPath,
+      String(process.pid),
+    ], { windowsHide: true }, (err) => {
+      if (err) resolve(null);
+    });
+
+    // VBS returns immediately, give PS time to start
+    setTimeout(() => resolve(true), 3000);
+  });
+}
+
+function stopTray() {
+  // The tray PS1 watches parent PID and self-terminates
+}
+
+module.exports = { startTray, stopTray };

package/tray.ps1

@@ -0,0 +1,79 @@
+param(
+    [string]$IconPath,
+    [string]$MaskedKey,
+    [string]$LogPath,
+    [int]$ParentPid
+)
+
+Add-Type -AssemblyName System.Windows.Forms
+Add-Type -AssemblyName System.Drawing
+
+# 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 - Tracking AI usage"
+$tray.Visible = $true
+
+# Context menu
+$menu = New-Object System.Windows.Forms.ContextMenuStrip
+
+$header = $menu.Items.Add("AIMeter Watcher")
+$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")
+$logs.Add_Click({ Start-Process notepad $LogPath })
+
+$menu.Items.Add("-")
+
+$stop = $menu.Items.Add("Stop Watcher")
+$stop.Add_Click({
+    $tray.Visible = $false
+    $tray.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()
+            [System.Windows.Forms.Application]::Exit()
+        }
+    }
+})
+$timer.Start()
+
+# Run message loop
+[System.Windows.Forms.Application]::Run()

package/watcher.js

@@ -43,6 +43,25 @@ function detectSource(filePath) {
     return 'desktop_app';
   }
 
+  // For subagent files (e.g. .../ceeb9217.../subagents/agent-xxx.jsonl),
+  // inherit the parent session's source. Parent JSONL is at the grandparent dir level.
+  if (normalized.includes('/subagents/')) {
+    // Extract session UUID dir: .../projects/PROJECT/SESSION_UUID/subagents/...
+    const match = normalized.match(/(.+)\/([^/]+)\/subagents\//);
+    if (match) {
+      const projectDir = match[1]; // .../projects/PROJECT
+      const sessionUuid = match[2]; // SESSION_UUID
+      const parentFile = path.join(projectDir.replace(/\//g, path.sep), sessionUuid + '.jsonl');
+      try {
+        if (fs.existsSync(parentFile)) {
+          const parentSource = detectSource(parentFile);
+          _sourceCache.set(filePath, parentSource);
+          return parentSource;
+        }
+      } catch {}
+    }
+  }
+
   // Read first 10KB of the file to find entrypoint or IDE markers
   let source = 'cli'; // default
   try {