claude-roi 0.2.0 → 0.2.2

package/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2026 Akshat Sahu
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/README.md

@@ -151,36 +151,7 @@ Codelens-AI/
 
 ## Contributing
 
-Contributions welcome! Here's how to get started:
-
-```bash
-# 1. Fork the repo on GitHub
-
-# 2. Clone your fork
-git clone https://github.com/YOUR_USERNAME/Codelens-AI.git
-cd Codelens-AI
-
-# 3. Install dependencies
-npm install
-
-# 4. Run in dev mode (no auto-open browser)
-node src/index.js --no-open
-
-# 5. Make your changes and test
-node src/index.js --json | head -30   # verify JSON output
-node src/index.js --no-open           # test dashboard at localhost:3457
-
-# 6. Submit a pull request
-```
-
-### Ideas for contributions
-
-- Support for other AI coding tools (Copilot, Cursor, etc.)
-- Git blame-based line survival tracking (more accurate than the 24h heuristic)
-- Export dashboard as PDF/PNG
-- Historical trend tracking across multiple runs
-- Team/multi-user support
-- Custom pricing configuration via CLI flag or config file
+Contributions are welcome! Please see [CONTRIBUTING.md](CONTRIBUTING.md) for development setup, guidelines, and ideas for contributions.
 
 ## Privacy
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "claude-roi",
-  "version": "0.2.0",
+  "version": "0.2.2",
   "description": "Correlate Claude Code token usage with git output to measure AI coding agent ROI",
   "type": "module",
   "bin": {
@@ -9,7 +9,8 @@
   "main": "./src/index.js",
   "scripts": {
     "start": "node src/index.js",
-    "dev": "node src/index.js --no-open"
+    "dev": "node src/index.js --no-open",
+    "test": "npx playwright test"
   },
   "keywords": [
     "claude",
@@ -21,17 +22,26 @@
     "git",
     "dashboard"
   ],
+  "author": "Akshat Sahu",
   "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/Akshat2634/Codelens-AI.git"
+  },
+  "bugs": {
+    "url": "https://github.com/Akshat2634/Codelens-AI/issues"
+  },
+  "homepage": "https://github.com/Akshat2634/Codelens-AI#readme",
   "engines": {
     "node": ">=18.0.0"
   },
   "dependencies": {
     "commander": "^13.0.0",
     "express": "^5.0.0",
-    "open": "^10.0.0",
-    "playwright": "^1.58.2"
+    "open": "^10.0.0"
   },
   "devDependencies": {
-    "@playwright/test": "^1.56.1"
+    "@playwright/test": "^1.56.1",
+    "playwright": "^1.58.2"
   }
 }

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,70 +1,125 @@
 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 };
+}
+
+/**
+ * Compute the temporal distance between a commit and a session.
+ * Returns the minimum absolute distance from the commit to the session's
+ * time range (0 if the commit falls within the session window).
+ */
+function temporalDistance(commitMs, sessionStartMs, sessionEndMs) {
+  if (commitMs >= sessionStartMs && commitMs <= sessionEndMs) return 0;
+  return Math.min(
+    Math.abs(commitMs - sessionStartMs),
+    Math.abs(commitMs - sessionEndMs)
+  );
+}
+
 /**
  * Correlate sessions to commits using file-based matching.
  *
+ * Uses a two-pass "nearest session wins" approach:
+ *   1. For each commit, find all candidate sessions (file overlap + time window)
+ *      and assign it to the temporally closest one.
+ *   2. Build correlated results from those assignments.
+ *
  * Primary: match commits whose changed files overlap with session.filesWritten.
- *   Time constraint: commit is on the same calendar day or the next day.
+ *   Time constraint: commit is within [sessionStart, sessionEnd + 2 hours].
  * Fallback: for sessions with no filesWritten (chat-only), use time window
  *   [sessionStart, sessionEnd + 2 hours].
  */
 export function correlateSessions(sessions, commitsByRepo) {
-  const result = [];
-  const claimedCommits = new Set();
+  // Phase 1: Build candidate map — for each commit, find the best session
+  // commitHash -> { session, hasFileOverlap }
+  const commitAssignment = new Map();
 
-  // Sort sessions by end time so earlier sessions claim commits first
-  const sorted = [...sessions].sort(
-    (a, b) => new Date(a.endTime).getTime() - new Date(b.endTime).getTime()
-  );
-
-  for (const session of sorted) {
+  for (const session of sessions) {
     const repoAnalysis = commitsByRepo[session.repoPath];
     const repoCommits = repoAnalysis?.commits || [];
 
-    const sessionStart = new Date(session.startTime).getTime();
-    const sessionEnd = new Date(session.endTime).getTime();
+    const sessionStartMs = new Date(session.startTime).getTime();
+    const sessionEndMs = new Date(session.endTime).getTime();
     const sessionFiles = new Set(session.filesWritten || []);
+    const windowEnd = sessionEndMs + FALLBACK_BUFFER_MS;
 
-    let matched;
+    for (const commit of repoCommits) {
+      // Time constraint: commit must fall within [sessionStart, sessionEnd + 2h]
+      if (commit.timestampMs < sessionStartMs || commit.timestampMs > windowEnd) continue;
 
-    if (sessionFiles.size > 0) {
-      // PRIMARY: File-based correlation
-      // Time window: same calendar day as session, or next calendar day
-      const sessionDay = new Date(session.startTime);
-      const dayStart = new Date(sessionDay.getFullYear(), sessionDay.getMonth(), sessionDay.getDate()).getTime();
-      const dayEnd = dayStart + 2 * 24 * 60 * 60 * 1000; // end of next calendar day
-
-      matched = repoCommits.filter(c => {
-        if (claimedCommits.has(c.hash)) return false;
-        if (c.timestampMs < dayStart || c.timestampMs >= dayEnd) return false;
-        // Check file overlap: any commit file matches a session file
-        return c.files.some(f => sessionFiles.has(f.path));
-      });
-    } else {
-      // FALLBACK: Time-based for chat-only sessions (no files written)
-      const windowEnd = sessionEnd + FALLBACK_BUFFER_MS;
-      matched = repoCommits.filter(c =>
-        c.timestampMs >= sessionStart &&
-        c.timestampMs <= windowEnd &&
-        !claimedCommits.has(c.hash)
-      );
+      const hasFileOverlap = sessionFiles.size > 0 &&
+        commit.files.some(f => sessionFiles.has(f.path));
+      const isChatOnly = sessionFiles.size === 0;
+
+      // Must have file overlap, or be a chat-only session (time-based fallback)
+      if (!hasFileOverlap && !isChatOnly) continue;
+
+      const distance = temporalDistance(commit.timestampMs, sessionStartMs, sessionEndMs);
+      const existing = commitAssignment.get(commit.hash);
+
+      if (!existing) {
+        commitAssignment.set(commit.hash, { session, hasFileOverlap, distance });
+      } else {
+        // Prefer file-based match over time-only match
+        if (hasFileOverlap && !existing.hasFileOverlap) {
+          commitAssignment.set(commit.hash, { session, hasFileOverlap, distance });
+        } else if (hasFileOverlap === existing.hasFileOverlap && distance < existing.distance) {
+          // Same match type — prefer temporally closer session
+          commitAssignment.set(commit.hash, { session, hasFileOverlap, distance });
+        }
+      }
     }
+  }
 
-    // Claim matched commits
-    for (const c of matched) {
-      claimedCommits.add(c.hash);
+  // Phase 2: Group commits by assigned session
+  const sessionCommits = new Map(); // sessionId -> commit[]
+  for (const [hash, { session }] of commitAssignment) {
+    if (!sessionCommits.has(session.sessionId)) {
+      sessionCommits.set(session.sessionId, []);
+    }
+    // Find the actual commit object from the repo
+    const repoAnalysis = commitsByRepo[session.repoPath];
+    const commit = repoAnalysis?.commits?.find(c => c.hash === hash);
+    if (commit) {
+      sessionCommits.get(session.sessionId).push(commit);
     }
+  }
 
-    const linesAdded = matched.reduce((s, c) => s + c.totalAdded, 0);
-    const linesDeleted = matched.reduce((s, c) => s + c.totalDeleted, 0);
+  // Phase 3: Build correlated results
+  const claimedCommits = new Set(commitAssignment.keys());
+  const result = [];
+
+  for (const session of sessions) {
+    const sessionFiles = new Set(session.filesWritten || []);
+    const matched = sessionCommits.get(session.sessionId) || [];
+
+    let linesAdded, linesDeleted;
+    if (sessionFiles.size > 0) {
+      ({ linesAdded, linesDeleted } = computeOverlappingLines(matched, sessionFiles));
+    } else {
+      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;
     const isOrphaned = messageCount > 10 && matched.length === 0;
 
-    // Calculate which session files were committed vs not
     const committedFiles = new Set(matched.flatMap(c => c.files.map(f => f.path)));
     const uncommittedFiles = [...sessionFiles].filter(f => !committedFiles.has(f));
 
@@ -96,7 +151,7 @@ export function correlateSessions(sessions, commitsByRepo) {
     }
   }
 
-  // Re-sort result by start time descending (most recent first for display)
+  // Sort result by start time descending (most recent first for display)
   result.sort((a, b) => new Date(b.startTime).getTime() - new Date(a.startTime).getTime());
 
   return { correlatedSessions: result, organicCommits };

package/src/index.js

@@ -9,8 +9,11 @@ import { correlateSessions } from './correlator.js';
 import { computeMetrics } from './metrics.js';
 import { loadCache, saveCache, deleteCache, getStaleFiles } from './cache.js';
 import { createServer } from './server.js';
+import { readFileSync } from 'node:fs';
 
-const VERSION = '0.1.1';
+const { version: VERSION } = JSON.parse(
+  readFileSync(new URL('../package.json', import.meta.url), 'utf8')
+);
 
 async function main() {
   const program = new Command();

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;
   }

package/playwright.config.js

@@ -1,9 +0,0 @@
-import { defineConfig } from '@playwright/test';
-
-export default defineConfig({
-  testDir: './tests',
-  timeout: 30000,
-  use: {
-    baseURL: 'http://localhost:3457',
-  },
-});