codiedev 0.9.6 → 0.9.7-beta.0

package/dist/hook.js

@@ -252,6 +252,10 @@ async function main() {
             ? { messageCount: 0, toolCallCount: 0 }
             : (0, utils_1.parseClaudeCodeStats)(transcriptContent);
     const transcriptBase64 = Buffer.from(transcriptContent, "utf8").toString("base64");
+    // Session→merge join keys: the branch + HEAD sha the work happened on. Matched
+    // server-side against a merged MR/PR's source_branch / commits for AI attribution.
+    const branch = (0, utils_1.getGitBranch)(workspaceRoot);
+    const headSha = (0, utils_1.getGitHeadSha)(workspaceRoot);
     const payload = (0, utils_1.buildCapturePayload)({
         sessionId: session_id,
         transcriptBase64,
@@ -262,6 +266,8 @@ async function main() {
         toolCallCount: stats.toolCallCount,
         capturedAt: Date.now(),
         source: mode,
+        branch,
+        headSha,
     });
     // Fire the upload from a fully detached child and exit immediately. Awaiting
     // it inline let Claude Code's SessionEnd shutdown window elapse and kill the

package/dist/utils.d.ts

@@ -27,6 +27,8 @@ export declare function matchRepo(remoteUrl: string, repos: Array<{
     url: string;
     fullName: string;
 } | null;
+export declare function getGitBranch(cwd: string): string | null;
+export declare function getGitHeadSha(cwd: string): string | null;
 export interface CapturePayloadInput {
     sessionId?: string;
     transcriptBase64: string;
@@ -37,6 +39,8 @@ export interface CapturePayloadInput {
     toolCallCount: number;
     capturedAt: number;
     source: string;
+    branch?: string | null;
+    headSha?: string | null;
 }
 export declare function buildCapturePayload(input: CapturePayloadInput): Record<string, unknown>;
 export declare function hashToken(token: string): string;

package/dist/utils.js

@@ -40,6 +40,8 @@ exports.readGitRemoteFromConfig = readGitRemoteFromConfig;
 exports.getGitRemoteUrl = getGitRemoteUrl;
 exports.normalizeRepoUrl = normalizeRepoUrl;
 exports.matchRepo = matchRepo;
+exports.getGitBranch = getGitBranch;
+exports.getGitHeadSha = getGitHeadSha;
 exports.buildCapturePayload = buildCapturePayload;
 exports.hashToken = hashToken;
 exports.claudeCodeInstalled = claudeCodeInstalled;
@@ -247,12 +249,101 @@ function matchRepo(remoteUrl, repos) {
     }
     return null;
 }
+// Current branch via direct .git/HEAD read (no git binary required, same
+// robustness as getGitRemoteUrl). Returns null on detached HEAD or when
+// unresolvable. This is the session→merge join key: a captured session's
+// branch is matched against a merged MR/PR's source_branch.
+function getGitBranch(cwd) {
+    const gitDir = resolveGitDir(cwd);
+    if (gitDir) {
+        try {
+            const head = fs.readFileSync(path.join(gitDir, "HEAD"), "utf8").trim();
+            const m = head.match(/^ref:\s*refs\/heads\/(.+)$/);
+            if (m)
+                return m[1].trim();
+            // raw sha => detached HEAD, no branch
+        }
+        catch {
+            // fall through to git
+        }
+    }
+    try {
+        const b = (0, child_process_1.execSync)("git rev-parse --abbrev-ref HEAD", {
+            cwd,
+            stdio: ["pipe", "pipe", "pipe"],
+        })
+            .toString()
+            .trim();
+        return b && b !== "HEAD" ? b : null;
+    }
+    catch {
+        return null;
+    }
+}
+// Current commit SHA (HEAD), direct-read first then git fallback. Exact join
+// key — survives branch renames that branch-matching would miss.
+function getGitHeadSha(cwd) {
+    const gitDir = resolveGitDir(cwd);
+    if (gitDir) {
+        try {
+            const head = fs.readFileSync(path.join(gitDir, "HEAD"), "utf8").trim();
+            if (/^[0-9a-f]{40}$/i.test(head))
+                return head.toLowerCase();
+            const m = head.match(/^ref:\s*(.+)$/);
+            if (m) {
+                const ref = m[1].trim();
+                for (const cfg of gitConfigCandidates(gitDir)) {
+                    const baseDir = path.dirname(cfg);
+                    try {
+                        const sha = fs.readFileSync(path.join(baseDir, ref), "utf8").trim();
+                        if (/^[0-9a-f]{40}$/i.test(sha))
+                            return sha.toLowerCase();
+                    }
+                    catch {
+                        /* try packed-refs */
+                    }
+                    try {
+                        const packed = fs.readFileSync(path.join(baseDir, "packed-refs"), "utf8");
+                        const line = packed
+                            .split("\n")
+                            .find((l) => l.endsWith(" " + ref));
+                        if (line) {
+                            const sha = line.split(" ")[0].trim();
+                            if (/^[0-9a-f]{40}$/i.test(sha))
+                                return sha.toLowerCase();
+                        }
+                    }
+                    catch {
+                        /* ignore */
+                    }
+                }
+            }
+        }
+        catch {
+            // fall through to git
+        }
+    }
+    try {
+        const sha = (0, child_process_1.execSync)("git rev-parse HEAD", {
+            cwd,
+            stdio: ["pipe", "pipe", "pipe"],
+        })
+            .toString()
+            .trim();
+        return /^[0-9a-f]{40}$/i.test(sha) ? sha.toLowerCase() : null;
+    }
+    catch {
+        return null;
+    }
+}
 function buildCapturePayload(input) {
     return {
         sessionId: input.sessionId,
         repoUrl: input.remoteUrl ?? "",
         repoId: input.matchedRepoId,
         companyId: input.companyId,
+        branch: input.branch ?? "",
+        headSha: input.headSha ?? "",
         transcript: input.transcriptBase64,
         messageCount: input.messageCount,
         toolCallCount: input.toolCallCount,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "codiedev",
-  "version": "0.9.6",
+  "version": "0.9.7-beta.0",
   "description": "Connect Claude Code, Codex, Cursor, or VS Code Copilot to Codiedev for org-wide session capture and artifact collaboration",
   "bin": {
     "codiedev": "dist/cli.js",