aicp-tracker 1.3.3 → 1.3.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aicp-tracker",
-  "version": "1.3.3",
+  "version": "1.3.4",
   "description": "AI Code Pulse — Claude Code usage tracker for JIRA cost attribution",
   "main": "src/daemon.js",
   "bin": {

package/src/log-parser.js

@@ -12,6 +12,17 @@ function extractTasksFromBranch(branch) {
 }
 
 function sumUsage(entries) {
+  // Claude Code writes multiple JSONL lines per message.id (streaming snapshots).
+  // All snapshots for the same message.id have identical token counts, so we count
+  // only the LAST occurrence of each message.id to avoid double-counting.
+  // The last occurrence also has the most complete content (all tool calls present).
+  const lastIdxByMsgId = new Map();
+  for (let i = 0; i < entries.length; i++) {
+    const msgId = entries[i].message?.id;
+    if (msgId && entries[i].message?.usage) lastIdxByMsgId.set(msgId, i);
+  }
+  const countIdxSet = new Set(lastIdxByMsgId.values());
+
   let input = 0, cc = 0, cr = 0, out = 0;
   let ephUser = 0, ephAsst = 0, ephTool = 0;
   let webSearch = 0, webFetch = 0;
@@ -19,8 +30,14 @@ function sumUsage(entries) {
   const models = new Set();
   const uuids = [];
 
-  for (const e of entries) {
-    const u = e.message?.usage || {};
+  for (let i = 0; i < entries.length; i++) {
+    const e = entries[i];
+    const u = e.message?.usage;
+    if (!u) continue;
+    // Skip all but the last snapshot for each message.id
+    const msgId = e.message?.id;
+    if (msgId && !countIdxSet.has(i)) continue;
+
     input    += u.input_tokens                     || 0;
     cc       += u.cache_creation_input_tokens      || 0;
     cr       += u.cache_read_input_tokens          || 0;
@@ -227,10 +244,10 @@ function parseNewLines(filePath) {
   fs.closeSync(fd);
   state.setOffset(filePath, offset + read);
 
-  // Parse entries; deduplicate by message.id only for entries that carry usage data
-  // (non-usage entries like tool-call lines must all be kept to avoid losing file paths)
+  // Keep ALL entries — deduplication by message.id happens inside sumUsage.
+  // We must retain every line here because later snapshots of the same message.id
+  // contain the Edit/Write tool calls that earlier snapshots lack.
   const entries = [];
-  const seenUsageMsgIds = new Set();
 
   for (const raw of buf.slice(0, read).toString('utf8').split('\n')) {
     const line = raw.trim();
@@ -238,12 +255,6 @@ function parseNewLines(filePath) {
     let entry;
     try { entry = JSON.parse(line); } catch { continue; }
     if (!entry.uuid) continue;
-
-    const msgId = entry.message?.id;
-    if (msgId && entry.message?.usage) {
-      if (seenUsageMsgIds.has(msgId)) continue;
-      seenUsageMsgIds.add(msgId);
-    }
     entries.push(entry);
   }
 
@@ -270,11 +281,11 @@ function parseNewLines(filePath) {
     if (entry.promptId) {
       currentPromptId = entry.promptId;
       latestPromptId  = entry.promptId;
-      ensureGroup(currentPromptId, entry);
-    } else if (currentPromptId) {
-      ensureGroup(currentPromptId, entry);
-      groupAllEntries.get(currentPromptId).push(entry);
+    } else if (!currentPromptId) {
+      continue;
     }
+    ensureGroup(currentPromptId, entry);
+    groupAllEntries.get(currentPromptId).push(entry);
   }
 
   if (latestPromptId) state.setLastPromptId(filePath, latestPromptId);