getaimeter 0.11.0 → 0.11.2

package/config.js

@@ -68,13 +68,12 @@ function getWatchPaths() {
   }
   if (fs.existsSync(desktopSessions)) paths.push(desktopSessions);
 
-  // 3. OpenAI Codex CLI sessions
-  const codexSessions = path.join(os.homedir(), '.codex', 'sessions');
-  if (fs.existsSync(codexSessions)) paths.push(codexSessions);
-
-  // Also watch ~/.codex/history.jsonl directly (Codex writes a single file)
-  const codexHistory = path.join(os.homedir(), '.codex');
-  if (fs.existsSync(codexHistory) && !paths.includes(codexHistory)) paths.push(codexHistory);
+  // 3. OpenAI Codex CLI — watch the root ~/.codex dir so findJsonlFiles recurses
+  //    into both sessions/ (per-session UUIDs) and history.jsonl (single flat file).
+  //    Previously both ~/.codex and ~/.codex/sessions were added separately, causing
+  //    the same files to be discovered twice per poll cycle.
+  const codexDir = path.join(os.homedir(), '.codex');
+  if (fs.existsSync(codexDir)) paths.push(codexDir);
 
   // 4. GitHub Copilot CLI sessions
   const copilotSessions = path.join(os.homedir(), '.copilot', 'session-state');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "getaimeter",
-  "version": "0.11.0",
+  "version": "0.11.2",
   "description": "Track AI coding costs across Claude, Cursor, Codex, Copilot, and Gemini. MCP server, billing blocks, optimization recommendations.",
   "bin": {
     "aimeter": "cli.js",

package/watcher.js

@@ -162,6 +162,17 @@ function getConversationMeta(filePath) {
   // Conversation ID = file basename without extension
   let conversationId = path.basename(filePath, '.jsonl');
 
+  // Copilot stores sessions as <session-UUID>/events.jsonl — all files are named
+  // "events.jsonl", so the basename is always "events" which collides across sessions.
+  // Use the parent directory UUID as the conversation ID instead.
+  if (conversationId === 'events') {
+    const parentDir = path.basename(path.dirname(filePath));
+    // Only override if parent looks like a UUID (avoids false positives)
+    if (/^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i.test(parentDir)) {
+      conversationId = parentDir;
+    }
+  }
+
   // For subagent files, use the parent session UUID as conversation ID
   const subagentMatch = normalized.match(/\/([^/]+)\/subagents\//);
   if (subagentMatch) {