getaimeter 0.3.2 → 0.3.4

package/README.md

@@ -74,7 +74,7 @@ It **never** sends your prompts, responses, code, or file contents.
 ## Links
 
 - **Dashboard**: [getaimeter.com](https://getaimeter.com)
-- **Issues**: [github.com/AlejoCJaworworski/aimeter](https://github.com/AlejoCJaworworski/aimeter)
+- **Issues**: [github.com/Khavel/AIMeter](https://github.com/Khavel/AIMeter/issues)
 
 ## License
 

package/cli.js

@@ -335,11 +335,11 @@ function runLogs() {
   const tail = allLines.slice(-lines).join('\n');
   console.log(tail);
 
-  // Follow mode
+  // Follow mode — poll every second (fs.watch is unreliable on Windows)
   console.log('\n--- Watching for new entries (Ctrl+C to stop) ---\n');
 
   let fileSize = fs.statSync(logFile).size;
-  fs.watch(logFile, () => {
+  setInterval(() => {
     try {
       const newSize = fs.statSync(logFile).size;
       if (newSize > fileSize) {
@@ -351,7 +351,7 @@ function runLogs() {
         fileSize = newSize;
       }
     } catch {}
-  });
+  }, 1000);
 }
 
 // ---------------------------------------------------------------------------

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "getaimeter",
-  "version": "0.3.2",
+  "version": "0.3.4",
   "description": "Track your Claude AI usage across CLI, VS Code, and Desktop App. One command to start.",
   "bin": {
     "aimeter": "cli.js"
@@ -38,7 +38,7 @@
   ],
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/AlejoCJaworworski/aimeter.git"
+    "url": "git+https://github.com/Khavel/AIMeter.git"
   },
   "homepage": "https://getaimeter.com",
   "author": "Alejandro Ceja",

package/watcher.js

@@ -120,27 +120,46 @@ function extractNewUsage(filePath) {
     let obj;
     try { obj = JSON.parse(trimmed); } catch { continue; }
 
-    if (obj.type !== 'assistant' || !obj.message || !obj.message.usage) continue;
+    // Normalize entry: support both direct assistant messages and progress-wrapped
+    // sub-agent messages (where haiku calls appear as type="progress" with the
+    // real message at obj.data.message.message).
+    let msg = null;
+    let msgId = null; // truthy only for progress entries (used for dedup)
+
+    if (obj.type === 'assistant' && obj.message && obj.message.usage) {
+      msg = obj.message;
+    } else if (
+      obj.type === 'progress' &&
+      obj.data && obj.data.message && obj.data.message.message &&
+      obj.data.message.message.usage
+    ) {
+      msg   = obj.data.message.message;
+      msgId = msg.id; // progress fires multiple times; dedup by message ID
+    }
+
+    if (!msg) continue;
 
     // Skip synthetic/internal messages
-    if (obj.message.model === '<synthetic>') continue;
+    if (msg.model === '<synthetic>') continue;
 
-    // Skip internal Claude Code background calls (compaction, routing, etc.)
-    const model = obj.message.model || '';
-    if (model.includes('haiku')) continue;
+    const model = msg.model || '';
 
-    // Check for thinking content blocks (appear in streaming progress messages)
-    const contentBlocks = obj.message.content || [];
+    // Check content blocks for thinking tokens and completion status
+    const contentBlocks = msg.content || [];
+    const hasTextContent = contentBlocks.some(b => b.type === 'text' || b.type === 'tool_use');
     for (const block of contentBlocks) {
       if (block.type === 'thinking' && block.thinking) {
         pendingThinkingChars = Math.max(pendingThinkingChars, block.thinking.length);
       }
     }
 
-    // Skip streaming progress messages (stop_reason: null/undefined/missing = not yet complete)
-    if (!obj.message.stop_reason) continue;
+    // Skip streaming in-progress messages:
+    // Null stop_reason with ONLY thinking content = streaming reasoning still in progress.
+    // Null stop_reason WITH text/tool_use content = complete response (e.g., haiku sub-agent
+    // calls that never receive a stop_reason in the JSONL but are finished).
+    if (!msg.stop_reason && !hasTextContent) continue;
 
-    const u = obj.message.usage;
+    const u = msg.usage;
 
     // Estimate thinking tokens: ~4 chars per token (conservative estimate)
     // The API doesn't separate thinking_tokens in the JSONL usage field
@@ -149,10 +168,14 @@ function extractNewUsage(filePath) {
       : 0;
     pendingThinkingChars = 0; // Reset for next turn
 
-    // Build dedup hash — include line offset for uniqueness
-    const hash = crypto.createHash('md5')
-      .update(`${filePath}:${lineOffset}:${model}:${u.input_tokens || 0}:${u.output_tokens || 0}`)
-      .digest('hex');
+    // Build dedup hash.
+    // For progress entries, use the message ID so the same message fired multiple
+    // times (streaming chunks) counts only once. For assistant entries, use the
+    // line offset as before.
+    const hashKey = msgId
+      ? `${filePath}:msgid:${msgId}`
+      : `${filePath}:${lineOffset}:${model}:${u.input_tokens || 0}:${u.output_tokens || 0}`;
+    const hash = crypto.createHash('md5').update(hashKey).digest('hex');
 
     if (isDuplicate(hash)) continue;
 
@@ -178,6 +201,10 @@ function extractNewUsage(filePath) {
 // Report usage events to backend
 // ---------------------------------------------------------------------------
 
+async function sleep(ms) {
+  return new Promise(r => setTimeout(r, ms));
+}
+
 async function reportEvents(events) {
   const apiKey = getApiKey();
   if (!apiKey) {
@@ -186,11 +213,21 @@ async function reportEvents(events) {
   }
 
   for (const evt of events) {
-    const result = await postUsage(apiKey, evt);
-    if (result.ok) {
-      log(`Reported: ${evt.source} ${evt.model} in=${evt.inputTokens} out=${evt.outputTokens} cache_r=${evt.cacheReadTokens}`);
-    } else {
-      logError(`Failed to report: HTTP ${result.status} ${result.error || ''}`);
+    let attempt = 0;
+    while (attempt < 4) {
+      const result = await postUsage(apiKey, evt);
+      if (result.ok) {
+        log(`Reported: ${evt.source} ${evt.model} in=${evt.inputTokens} out=${evt.outputTokens} cache_r=${evt.cacheReadTokens}`);
+        break;
+      } else if (result.status === 429) {
+        attempt++;
+        const wait = attempt * 15_000; // 15s, 30s, 45s
+        logError(`Rate limited (429). Retry ${attempt}/3 in ${wait / 1000}s...`);
+        await sleep(wait);
+      } else {
+        logError(`Failed to report: HTTP ${result.status} ${result.error || ''}`);
+        break;
+      }
     }
   }
 }