getaimeter 0.1.5 → 0.1.7

package/cli.js

@@ -161,10 +161,43 @@ async function runSetup() {
 // ---------------------------------------------------------------------------
 
 function runWatch() {
+  const fs = require('fs');
+  const path = require('path');
+  const lockFile = path.join(AIMETER_DIR, 'watcher.lock');
+
+  // Check if another instance is already running
+  try {
+    if (fs.existsSync(lockFile)) {
+      const lockData = JSON.parse(fs.readFileSync(lockFile, 'utf8'));
+      // Check if the PID is still alive
+      try {
+        process.kill(lockData.pid, 0); // signal 0 = just check if alive
+        console.log(`Another watcher is already running (PID ${lockData.pid}). Use 'aimeter stop' first.`);
+        process.exitCode = 1;
+        return;
+      } catch {
+        // PID is dead — stale lock, remove it
+      }
+    }
+  } catch {}
+
+  // Write lock file
+  fs.mkdirSync(AIMETER_DIR, { recursive: true });
+  fs.writeFileSync(lockFile, JSON.stringify({ pid: process.pid, startedAt: new Date().toISOString() }));
+
   const cleanup = startWatching();
 
-  process.on('SIGINT',  () => { cleanup(); process.exit(0); });
-  process.on('SIGTERM', () => { cleanup(); process.exit(0); });
+  const cleanupAll = () => {
+    cleanup();
+    try { fs.unlinkSync(lockFile); } catch {}
+    process.exit(0);
+  };
+
+  process.on('SIGINT',  cleanupAll);
+  process.on('SIGTERM', cleanupAll);
+  process.on('exit', () => {
+    try { fs.unlinkSync(lockFile); } catch {}
+  });
 
   process.on('uncaughtException', (err) => {
     console.error('[aimeter] Uncaught:', err.message);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "getaimeter",
-  "version": "0.1.5",
+  "version": "0.1.7",
   "description": "Track your Claude AI usage across CLI, VS Code, and Desktop App. One command to start.",
   "bin": {
     "aimeter": "cli.js"

package/watcher.js

@@ -84,6 +84,10 @@ function extractNewUsage(filePath) {
 
     if (obj.type !== 'assistant' || !obj.message || !obj.message.usage) continue;
 
+    // Skip streaming progress messages (stop_reason: null = not yet complete)
+    // Only count final responses with a real stop_reason
+    if (obj.message.stop_reason === null || obj.message.stop_reason === undefined) continue;
+
     const u = obj.message.usage;
     const model = obj.message.model || 'unknown';