ai-lens 0.8.61 → 0.8.62

package/.commithash

@@ -1 +1 @@
-a877b83
+ee4f839

package/client/capture.js

@@ -494,14 +494,68 @@ function extractFilePath(toolInput) {
 }
 
 /**
- * Walk up from a path to find the nearest .git directory.
- * Returns the git root (parent of .git) or null.
+ * Given a directory that contains a `.git` entry, return the real repo root.
+ * If `.git` is a directory, the input is already the repo root. If `.git` is
+ * a FILE (git worktree — contains "gitdir: <path-to-main>/.git/worktrees/<n>")
+ * we follow the pointer up to the main `.git` directory and return its parent
+ * so worktree sessions attribute to the main repo rather than a per-branch
+ * pseudo-project (e.g. `agent-a8d9bb19`, `ANL-689`).
+ *
+ * Submodules also use a `.git` file, but its gitdir points under
+ * `<super>/.git/modules/<name>`. We intentionally skip those so edits inside
+ * a submodule keep attributing to the submodule, not the super-project —
+ * that's outside the scope of ANL-729.
+ *
+ * Never returns a path "outside" the filesystem; on any parse failure falls
+ * back to the original dir.
+ */
+function resolveWorktreeToMainRepo(dir) {
+  try {
+    const gitEntry = join(dir, '.git');
+    const st = statSync(gitEntry);
+    if (st.isDirectory()) return dir;
+    if (!st.isFile()) return dir;
+
+    const contents = readFileSync(gitEntry, 'utf-8');
+    const match = contents.match(/^\s*gitdir:\s*(.+?)\s*$/m);
+    if (!match) return dir;
+
+    let gitdir = match[1];
+    // Resolve relative pointers against the worktree dir. POSIX-only check
+    // (`startsWith('/')`) — AI Lens runs on macOS/Linux dev machines, Windows
+    // isn't a supported client target.
+    if (!gitdir.startsWith('/')) gitdir = join(dir, gitdir);
+
+    // Only real worktrees: `<main>/.git/worktrees/<name>`. Submodules
+    // (`<super>/.git/modules/<name>`) are left alone on purpose.
+    if (!gitdir.includes('/.git/worktrees/')) return dir;
+
+    // Walk up until we hit the directory literally named `.git`; its parent
+    // is the main repo. Depth is bounded: gitdir is `<main>/.git/worktrees/<n>`
+    // so the `.git` segment is at most 2 levels up — 4 gives a safety margin.
+    let cur = gitdir;
+    for (let i = 0; i < 4; i++) {
+      const parent = dirname(cur);
+      if (parent === cur) break;
+      if (cur.endsWith('/.git')) return parent;
+      cur = parent;
+    }
+    return dir;
+  } catch {
+    return dir;
+  }
+}
+
+/**
+ * Walk up from a path to find the nearest .git entry.
+ * Returns the repo root (parent of a `.git` directory, or the main repo root
+ * when `.git` is a worktree-pointer file) or null.
  */
 function findGitRoot(filePath) {
   let dir = dirname(filePath);
   while (dir && dir !== '/' && dir.length > 1) {
     try {
-      if (existsSync(join(dir, '.git'))) return dir;
+      if (existsSync(join(dir, '.git'))) return resolveWorktreeToMainRepo(dir);
     } catch {}
     const parent = dirname(dir);
     if (parent === dir) break;
@@ -510,6 +564,22 @@ function findGitRoot(filePath) {
   return null;
 }
 
+/**
+ * If `dir` is a git worktree checkout, return the main repo root; otherwise
+ * return `dir` unchanged. Used at session intake where we have a launcher cwd
+ * (SessionStart / workspace_roots) and want to avoid attributing the session
+ * to a worktree branch name.
+ */
+function canonicalizeProjectPath(dir) {
+  if (!dir || typeof dir !== 'string') return dir;
+  try {
+    if (existsSync(join(dir, '.git'))) {
+      return resolveWorktreeToMainRepo(dir);
+    }
+  } catch {}
+  return dir;
+}
+
 /**
  * Refine project_path using file paths from tool events.
  * Picks the deepest (most specific) git root — correct for nested repos
@@ -617,8 +687,9 @@ function normalizeClaudeCode(event) {
   let type = CLAUDE_CODE_TYPE_MAP[hookType] || hookType;
   const timestamp = new Date().toISOString();
 
-  // Extract project path from cwd (SessionStart) or cache
-  let projectPath = event.cwd || null;
+  // Extract project path from cwd (SessionStart) or cache. Canonicalize
+  // worktree checkouts to the main repo root (ANL-599 follow-up).
+  let projectPath = event.cwd ? canonicalizeProjectPath(event.cwd) : null;
   if (projectPath && sessionId) {
     cacheSessionPath(sessionId, projectPath);
   } else if (sessionId) {
@@ -826,6 +897,8 @@ function normalizeCursor(event) {
   const type = CURSOR_TYPE_MAP[hookName] || hookName;
   const timestamp = new Date().toISOString();
   let projectPath = pickWorkspaceRoot(event.workspace_roots);
+  // Canonicalize worktree checkouts to main repo root (ANL-599 follow-up).
+  if (projectPath) projectPath = canonicalizeProjectPath(projectPath);
   // Guard: null sessionId would cache/lookup under key "null", contaminating unrelated sessions
   if (projectPath && sessionId) {
     cacheSessionPath(sessionId, projectPath);

package/client/codex.js

@@ -1,4 +1,4 @@
-import { existsSync, realpathSync } from 'node:fs';
+import { existsSync, realpathSync, statSync, readFileSync } from 'node:fs';
 import { randomUUID } from 'node:crypto';
 import { dirname, join } from 'node:path';
 import { toNumberOrNull } from './token-usage.js';
@@ -139,13 +139,59 @@ function extractFilePath(input) {
   return null;
 }
 
+// Mirrors `resolveWorktreeToMainRepo` in capture.js (ANL-729). If this
+// changes in one place, change it in the other — we keep the copy inline
+// instead of a shared module to avoid cross-file churn in this pipeline.
+function resolveWorktreeToMainRepo(dir) {
+  try {
+    const gitEntry = join(dir, '.git');
+    const st = statSync(gitEntry);
+    if (st.isDirectory()) return dir;
+    if (!st.isFile()) return dir;
+
+    const contents = readFileSync(gitEntry, 'utf-8');
+    const match = contents.match(/^\s*gitdir:\s*(.+?)\s*$/m);
+    if (!match) return dir;
+
+    let gitdir = match[1];
+    // POSIX-only (`startsWith('/')`) — AI Lens clients are macOS/Linux.
+    if (!gitdir.startsWith('/')) gitdir = join(dir, gitdir);
+
+    // Only real worktrees (`<main>/.git/worktrees/<name>`). Submodules
+    // (`<super>/.git/modules/<name>`) are left alone.
+    if (!gitdir.includes('/.git/worktrees/')) return dir;
+
+    // `.git` segment sits 2 levels above the gitdir; 4 is a safety margin.
+    let cur = gitdir;
+    for (let i = 0; i < 4; i++) {
+      const parent = dirname(cur);
+      if (parent === cur) break;
+      if (cur.endsWith('/.git')) return parent;
+      cur = parent;
+    }
+    return dir;
+  } catch {
+    return dir;
+  }
+}
+
+function canonicalizeProjectPath(dir) {
+  if (!dir || typeof dir !== 'string') return dir;
+  try {
+    if (existsSync(join(dir, '.git'))) {
+      return resolveWorktreeToMainRepo(dir);
+    }
+  } catch {}
+  return dir;
+}
+
 function findGitRoot(filePath) {
   if (!filePath || typeof filePath !== 'string' || !filePath.startsWith('/')) return null;
 
   let dir = filePath;
   while (dir && dir !== '/' && dir.length > 1) {
     try {
-      if (existsSync(join(dir, '.git'))) return dir;
+      if (existsSync(join(dir, '.git'))) return resolveWorktreeToMainRepo(dir);
     } catch {}
 
     const parent = dirname(dir);
@@ -327,7 +373,7 @@ export function normalizeCodexSessionEntries(record, state, streamKey = 'default
 
     stream.sessionId = logicalSessionId;
     stream.rawSessionId = sessionId;
-    stream.projectPath = cwd;
+    stream.projectPath = canonicalizeProjectPath(cwd);
     stream.hasActivity = false;
     stream.model = null;
     events.push(buildUnifiedEvent(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ai-lens",
-  "version": "0.8.61",
+  "version": "0.8.62",
   "type": "module",
   "description": "Centralized session analytics for AI coding tools",
   "bin": {
@@ -14,7 +14,9 @@
     "README.md"
   ],
   "scripts": {
-    "prepare": "git rev-parse --short HEAD > .commithash 2>/dev/null || true",
+    "prepare": "git rev-parse --short HEAD > .commithash 2>/dev/null || true; git config core.hooksPath .githooks 2>/dev/null || true",
+    "version": "node scripts/check-changelog.js && git add CHANGELOG.md",
+    "release": "./scripts/release-cli.sh",
     "init": "node bin/ai-lens.js init",
     "remove": "node bin/ai-lens.js remove",
     "status": "node bin/ai-lens.js status",