getaimeter 0.1.1 → 0.1.3

package/package.json

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

package/watcher.js

@@ -72,9 +72,11 @@ function extractNewUsage(filePath) {
   if (lastOffset > 0 && lines.length > 0) lines.shift();
 
   const usageEvents = [];
+  let lineOffset = lastOffset;
 
   for (const line of lines) {
     const trimmed = line.trim();
+    lineOffset += Buffer.byteLength(line + '\n', 'utf8');
     if (!trimmed) continue;
 
     let obj;
@@ -85,9 +87,9 @@ function extractNewUsage(filePath) {
     const u = obj.message.usage;
     const model = obj.message.model || 'unknown';
 
-    // Build dedup hash
+    // Build dedup hash — include line offset for uniqueness
     const hash = crypto.createHash('md5')
-      .update(`${filePath}:${model}:${u.input_tokens || 0}:${u.output_tokens || 0}:${currentSize}`)
+      .update(`${filePath}:${lineOffset}:${model}:${u.input_tokens || 0}:${u.output_tokens || 0}`)
       .digest('hex');
 
     if (isDuplicate(hash)) continue;
@@ -141,12 +143,15 @@ function handleFileChange(filePath) {
   // Only care about .jsonl files
   if (!filePath.endsWith('.jsonl')) return;
 
-  // Debounce: wait 500ms after last change before processing
-  const existing = _debounceTimers.get(filePath);
+  // Normalize path for consistent debounce key (Windows fires with mixed separators/casing)
+  const normalizedKey = path.resolve(filePath).toLowerCase();
+
+  // Debounce: wait 1000ms after last change before processing
+  const existing = _debounceTimers.get(normalizedKey);
   if (existing) clearTimeout(existing);
 
-  _debounceTimers.set(filePath, setTimeout(async () => {
-    _debounceTimers.delete(filePath);
+  _debounceTimers.set(normalizedKey, setTimeout(async () => {
+    _debounceTimers.delete(normalizedKey);
     try {
       const events = extractNewUsage(filePath);
       if (events.length > 0) {
@@ -235,7 +240,7 @@ function startWatching() {
   }
   saveState();
 
-  // Set up fs.watch on each path
+  // Set up fs.watch on each path (works well on macOS/Linux)
   const watchers = [];
   for (const watchPath of watchPaths) {
     try {
@@ -250,18 +255,38 @@ function startWatching() {
       });
 
       watchers.push(w);
-      log('Watching:', watchPath);
+      log('Watching (fs.watch):', watchPath);
     } catch (err) {
       logError(`Could not watch ${watchPath}:`, err.message);
     }
   }
 
+  // Polling fallback — fs.watch is unreliable on Windows for deeply nested dirs.
+  // Every 5 seconds, scan all known JSONL files for size changes.
+  const POLL_INTERVAL = 5_000;
+  const pollInterval = setInterval(() => {
+    for (const watchPath of watchPaths) {
+      const files = findJsonlFiles(watchPath);
+      for (const file of files) {
+        try {
+          const currentSize = fs.statSync(file).size;
+          const lastOffset  = getOffset(file);
+          if (currentSize > lastOffset) {
+            handleFileChange(file);
+          }
+        } catch {}
+      }
+    }
+  }, POLL_INTERVAL);
+  log(`Polling every ${POLL_INTERVAL / 1000}s as fallback`);
+
   // Periodic state save
   const saveInterval = setInterval(() => saveState(), 30_000);
 
   // Return cleanup
   return () => {
     clearInterval(saveInterval);
+    clearInterval(pollInterval);
     for (const w of watchers) w.close();
     for (const t of _debounceTimers.values()) clearTimeout(t);
     saveState();