claude-roi 0.2.0 → 0.2.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "claude-roi",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "description": "Correlate Claude Code token usage with git output to measure AI coding agent ROI",
   "type": "module",
   "bin": {

package/src/claude-parser.js

@@ -360,8 +360,8 @@ function mergeSubagentIntoSession(parent, sub) {
   parent.cost.cacheCreationCost += sub.cost.cacheCreationCost;
   parent.cost.totalCost += sub.cost.totalCost;
 
-  parent.assistantMessageCount += sub.assistantMessageCount;
-  parent.userMessageCount += sub.userMessageCount;
+  // Message counts intentionally NOT merged — we only report
+  // the main-conversation messages, not internal subagent chatter.
 
   // Merge model breakdown
   for (const [model, data] of Object.entries(sub.modelBreakdown)) {
@@ -457,10 +457,28 @@ export async function parseAllProjects(claudeDir, days, projectFilter) {
     }
   }
 
+  // Deduplicate sessions by sessionId (same session can appear in
+  // multiple project dirs, e.g. main repo vs worktree paths)
+  const seen = new Map();
+  for (const s of sessions) {
+    const id = s.sessionId;
+    if (!seen.has(id)) {
+      seen.set(id, s);
+    } else {
+      const existing = seen.get(id);
+      const existingMsgs = existing.userMessageCount + existing.assistantMessageCount;
+      const newMsgs = s.userMessageCount + s.assistantMessageCount;
+      if (newMsgs > existingMsgs) {
+        seen.set(id, s);
+      }
+    }
+  }
+  const deduped = Array.from(seen.values());
+
   // Sort by start time descending
-  sessions.sort((a, b) => new Date(b.startTime).getTime() - new Date(a.startTime).getTime());
+  deduped.sort((a, b) => new Date(b.startTime).getTime() - new Date(a.startTime).getTime());
 
-  return { sessions, fileIndex };
+  return { sessions: deduped, fileIndex };
 }
 
 export { calculateCost, getModelFamily, PRICING };

package/src/correlator.js

@@ -1,5 +1,19 @@
 const FALLBACK_BUFFER_MS = 2 * 60 * 60 * 1000; // 2 hours for time-only fallback
 
+function computeOverlappingLines(commits, sessionFiles) {
+  let linesAdded = 0;
+  let linesDeleted = 0;
+  for (const c of commits) {
+    for (const f of c.files) {
+      if (sessionFiles.has(f.path)) {
+        linesAdded += f.added;
+        linesDeleted += f.deleted;
+      }
+    }
+  }
+  return { linesAdded, linesDeleted };
+}
+
 /**
  * Correlate sessions to commits using file-based matching.
  *
@@ -55,10 +69,19 @@ export function correlateSessions(sessions, commitsByRepo) {
       claimedCommits.add(c.hash);
     }
 
-    const linesAdded = matched.reduce((s, c) => s + c.totalAdded, 0);
-    const linesDeleted = matched.reduce((s, c) => s + c.totalDeleted, 0);
+    let linesAdded, linesDeleted;
+    if (sessionFiles.size > 0) {
+      // Only count lines from files Claude actually edited
+      ({ linesAdded, linesDeleted } = computeOverlappingLines(matched, sessionFiles));
+    } else {
+      // Fallback (chat-only): count all lines in matched commits
+      linesAdded = matched.reduce((s, c) => s + c.totalAdded, 0);
+      linesDeleted = matched.reduce((s, c) => s + c.totalDeleted, 0);
+    }
     const netLines = linesAdded - linesDeleted;
-    const filesChanged = new Set(matched.flatMap(c => c.files.map(f => f.path))).size;
+    const filesChanged = sessionFiles.size > 0
+      ? new Set(matched.flatMap(c => c.files.filter(f => sessionFiles.has(f.path)).map(f => f.path))).size
+      : new Set(matched.flatMap(c => c.files.map(f => f.path))).size;
     const commitsOnMain = matched.filter(c => c.onMain).length;
 
     const messageCount = session.userMessageCount + session.assistantMessageCount;

package/src/metrics.js

@@ -406,6 +406,9 @@ export function computeMetrics(correlatedSessions, organicCommits, commitsByRepo
   // ---- Model breakdown ----
   const modelBreakdown = {};
   for (const session of correlatedSessions) {
+    const sessionTotalTokens = Object.values(session.modelBreakdown)
+      .reduce((s, d) => s + d.tokens, 0);
+
     for (const [model, data] of Object.entries(session.modelBreakdown)) {
       const family = getModelFamily(model) || 'unknown';
       if (!modelBreakdown[family]) {
@@ -413,16 +416,15 @@ export function computeMetrics(correlatedSessions, organicCommits, commitsByRepo
       }
       modelBreakdown[family].cost += data.cost;
       modelBreakdown[family].tokens += data.tokens;
+
+      // Distribute sessions and commits proportionally by token share
+      const share = sessionTotalTokens > 0 ? data.tokens / sessionTotalTokens : 0;
+      modelBreakdown[family].sessions += share;
+      modelBreakdown[family].commits += session.commitCount * share;
     }
-    // Count sessions/commits per primary model
-    const primaryFamily = getModelFamily(session.model) || 'unknown';
-    if (!modelBreakdown[primaryFamily]) {
-      modelBreakdown[primaryFamily] = { cost: 0, tokens: 0, sessions: 0, commits: 0, avgCostPerCommit: null };
-    }
-    modelBreakdown[primaryFamily].sessions++;
-    modelBreakdown[primaryFamily].commits += session.commitCount;
   }
   for (const data of Object.values(modelBreakdown)) {
+    data.sessions = Math.round(data.sessions);
     data.avgCostPerCommit = data.commits > 0 ? data.cost / data.commits : null;
     data.tokensPerCommit = data.commits > 0 ? Math.round(data.tokens / data.commits) : null;
   }