evrex-mcp 0.8.1 → 0.9.0

package/dist/import.js

@@ -184,14 +184,34 @@ function commitMeta(repoPath, sha) {
     sha
   ]).trim();
   const parts = line.split(FIELD_SEP);
-  const message = git(repoPath, ["show", "-s", "--format=%B", sha]).replace(/\n+$/, "");
+  const body = git(repoPath, ["show", "-s", "--notes", `--format=%B${FIELD_SEP}%N`, sha]);
+  const sep2 = body.indexOf(FIELD_SEP);
+  let message = (sep2 === -1 ? body : body.slice(0, sep2)).replace(/\n+$/, "");
+  const note = sep2 === -1 ? "" : body.slice(sep2 + FIELD_SEP.length);
+  const noted = /^Evrex-Session:\s*(\S+)\s*$/m.exec(note);
+  if (noted && !/^Evrex-Session:/m.test(message)) {
+    message = `${message}
+
+${noted[0].trim()}`;
+  }
   return {
     sha: parts[0] ?? sha,
     author: parts[1] ?? "",
     authorEmail: parts[2] ?? "",
     ts: parts[3] ?? (/* @__PURE__ */ new Date()).toISOString(),
     parents: (parts[4] ?? "").split(" ").filter(Boolean),
-    message
+    message,
+    // The note's session, exposed on its own as well as folded above. When
+    // the message ALREADY carries a trailer, the fold declines (never rewrite
+    // what was stamped at commit time) — but the parse must still prefer the
+    // note: it exists only because an operator pressed "verify" on a commit
+    // whose message trailer names a session no ingest can resolve. Commit
+    // 843dabb3 is the standing example — its at-commit-time trailer names a
+    // session with no transcript anywhere, so the folding guard alone left it
+    // permanently un-verifiable: every promote re-ingested the dangling id,
+    // bestLink demoted it below the resolvable match, and the button offered
+    // the same commit again.
+    notedSession: noted?.[1] ?? null
   };
 }
 function parseTrailers(repoPath, message) {
@@ -312,6 +332,9 @@ function commitFiles(repoPath, sha) {
 }
 function parseGitLog(repoPath, repoId, known) {
   const shas = listShas(repoPath).filter((sha) => !known?.has(sha));
+  return parseCommitsBySha(repoPath, shas, repoId);
+}
+function parseCommitsBySha(repoPath, shas, repoId) {
   const id = repoId ?? deriveRepoId(repoPath);
   return shas.map((sha) => {
     const meta = commitMeta(repoPath, sha);
@@ -326,7 +349,9 @@ function parseGitLog(repoPath, repoId, known) {
       message: meta.message,
       parents: meta.parents,
       branch: commitBranch(repoPath, sha),
-      evrexSessionTrailer: trailerValue(trailers, EVREX_SESSION_TRAILER_KEY),
+      // A note is the operator's explicit later correction, so where both
+      // exist it names the session — see commitMeta's notedSession.
+      evrexSessionTrailer: meta.notedSession ?? trailerValue(trailers, EVREX_SESSION_TRAILER_KEY),
       origin: originOf(trailers),
       agentTrailers: agentTrailersOf(trailers),
       statedInsights: statedInsightsOf(trailers),
@@ -407,7 +432,7 @@ var PARSER_VERSION;
 var init_incremental = __esm({
   "../../packages/ingest-core/src/incremental.ts"() {
     "use strict";
-    PARSER_VERSION = 4;
+    PARSER_VERSION = 9;
   }
 });
 
@@ -522,11 +547,54 @@ var init_redact = __esm({
 
 // ../../packages/ingest-core/src/subject-linking.ts
 function matchCommitToSession(commit, sessions) {
+  const saw = sessions.filter(
+    (s) => (s.committedShas ?? []).some(
+      (short) => short.length >= 7 && commit.sha.startsWith(short)
+    )
+  );
+  if (saw.length > 0) {
+    const oneLineage2 = saw.every((s) => s.startedAt === saw[0].startedAt);
+    if (!oneLineage2) {
+      return { sha: commit.sha, sessionId: null, reason: "ambiguous" };
+    }
+    const original2 = [...saw].sort((a, b) => a.endedAt - b.endedAt)[0];
+    return {
+      sha: commit.sha,
+      sessionId: original2.sessionId,
+      evidence: "saw-the-sha",
+      confidence: SHA_CONFIDENCE
+    };
+  }
   const subject = commit.subject.trim();
+  const prMatch = /\(#(\d+)\)$/.exec(subject) ?? /^Merge pull request #(\d+)\b/.exec(subject);
+  if (prMatch) {
+    const pr = Number(prMatch[1]);
+    const mergedIt = sessions.filter(
+      (s) => (s.mergedPrNumbers ?? []).includes(pr)
+    );
+    if (mergedIt.length > 0) {
+      const oneLineage2 = mergedIt.every(
+        (s) => s.startedAt === mergedIt[0].startedAt
+      );
+      if (!oneLineage2) {
+        return { sha: commit.sha, sessionId: null, reason: "ambiguous" };
+      }
+      const original2 = [...mergedIt].sort((a, b) => a.endedAt - b.endedAt)[0];
+      return {
+        sha: commit.sha,
+        sessionId: original2.sessionId,
+        evidence: "merged-the-pr",
+        confidence: SHA_CONFIDENCE
+      };
+    }
+  }
   if (subject.length === 0) {
     return { sha: commit.sha, sessionId: null, reason: "absent" };
   }
-  const ran = sessions.filter((s) => s.committedSubjects.includes(subject));
+  const unsquashed = subject.replace(/\s+\(#\d+\)$/, "");
+  const ran = sessions.filter(
+    (s) => s.committedSubjects.includes(subject) || unsquashed !== subject && s.committedSubjects.includes(unsquashed)
+  );
   if (ran.length === 0) {
     return { sha: commit.sha, sessionId: null, reason: "absent" };
   }
@@ -580,15 +648,61 @@ function committedSubjects(command) {
     if (inline) {
       const subject = inline[2].split("\n")[0].trim();
       if (subject) out.push(subject);
+      continue;
+    }
+    const marginal = /^[^\n]*?-am\s*(['"])([\s\S]*?)\1/.exec(rest) ?? /^[^\n]*?--message[= ]\s*(['"])([\s\S]*?)\1/.exec(rest) ?? /^[^\n]*?-m(['"])([\s\S]*?)\1/.exec(rest);
+    if (marginal) {
+      const subject = marginal[2].split("\n")[0].trim();
+      if (subject) out.push(subject);
+      continue;
+    }
+    const fromFile = /^[^\n]*?(?:-F|--file)[= ]\s*(\S+)/.exec(rest);
+    if (fromFile) {
+      const file = fromFile[1].replace(/^["']|["']$/g, "");
+      const escaped = file.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+      const wrote = new RegExp(
+        `(?:cat\\s*>>?|tee\\s+(?:-a\\s+)?)\\s*["']?${escaped}["']?[^\\n]*<<-?\\s*(['"]?)(\\w+)\\1[^\\n]*\\r?\\n([^\\n]*)`
+      ).exec(command.slice(0, found.index));
+      if (wrote) {
+        const subject = wrote[3].trim();
+        if (subject) out.push(subject);
+      }
     }
   }
   return out;
 }
-var INFERRED_CONFIDENCE;
+function mergeResponseShas(output) {
+  const out = /* @__PURE__ */ new Set();
+  const line = /"sha"\s*:\s*"([0-9a-f]{40})"/g;
+  for (let m = line.exec(output); m !== null; m = line.exec(output)) {
+    out.add(m[1]);
+  }
+  return [...out];
+}
+function commitShaOutputs(output) {
+  const out = /* @__PURE__ */ new Set();
+  const line = /\[[\w./+-]+ (?:\(root-commit\) )?([0-9a-f]{7,12})\]/g;
+  for (let m = line.exec(output); m !== null; m = line.exec(output)) {
+    out.add(m[1]);
+  }
+  return [...out];
+}
+function mergedPrFromCommand(command) {
+  const api = /\/pulls\/(\d+)\/merge\b/.exec(command);
+  if (api) return Number(api[1]);
+  const gh = /\bgh\s+pr\s+merge\s+(?:.*?\/pull\/(\d+)\b|(\d+)\b)/.exec(command);
+  if (gh) return Number(gh[1] ?? gh[2]);
+  return null;
+}
+function mergeSucceeded(output) {
+  return /"merged"\s*:\s*true/.test(output) || /(Squashed and |Rebased and )?[Mm]erged pull request #\d+/.test(output);
+}
+var INFERRED_CONFIDENCE, SHA_CONFIDENCE;
 var init_subject_linking = __esm({
   "../../packages/ingest-core/src/subject-linking.ts"() {
     "use strict";
     INFERRED_CONFIDENCE = 0.9;
+    SHA_CONFIDENCE = 0.95;
   }
 });
 
@@ -663,14 +777,30 @@ function findSessionFiles(repoPath) {
 function editFromXcodeInput(input) {
   const filePath = input.filePath;
   if (typeof filePath !== "string" || !filePath) return null;
-  const oldLines = typeof input.oldString === "string" ? input.oldString.split("\n") : [];
-  const newLines = typeof input.newString === "string" ? input.newString.split("\n") : [];
+  return editFromStrings(filePath, textOf(input.oldString), textOf(input.newString));
+}
+function textOf(value) {
+  return typeof value === "string" ? value : "";
+}
+function editFromStrings(path, before, after) {
+  const oldLines = before ? before.split("\n") : [];
+  const newLines = after ? after.split("\n") : [];
   const oldSet = new Set(oldLines);
   const newSet = new Set(newLines);
   const added = meaningfulLines(newLines.filter((l) => !oldSet.has(l)));
   const removed = meaningfulLines(oldLines.filter((l) => !newSet.has(l)));
   if (added.length === 0 && removed.length === 0) return null;
-  return { path: filePath, added, removed };
+  return { path, added, removed };
+}
+function editFromClaudeInput(name, input) {
+  const path = input.file_path;
+  if (typeof path !== "string" || !path) return null;
+  if (name === "Write") return editFromStrings(path, "", textOf(input.content));
+  if (name === "Edit") return editFromStrings(path, textOf(input.old_string), textOf(input.new_string));
+  if (name !== "MultiEdit" || !Array.isArray(input.edits)) return null;
+  const parts = input.edits.map((e) => editFromStrings(path, textOf(e?.old_string), textOf(e?.new_string))).filter((e) => e !== null);
+  if (parts.length === 0) return null;
+  return { path, added: parts.flatMap((p) => p.added), removed: parts.flatMap((p) => p.removed) };
 }
 function extractPathsFromText(text) {
   const matches = text.match(PATH_TOKEN_RE) ?? [];
@@ -687,6 +817,7 @@ function extractFromAssistantContent(content) {
   const textParts = [];
   const filesTouched = [];
   const editedLines = [];
+  const inputEdits = /* @__PURE__ */ new Map();
   for (const block of content) {
     if (block.type === "text" && block.text) {
       textParts.push(block.text);
@@ -707,6 +838,10 @@ function extractFromAssistantContent(content) {
       } else if (FILE_PATH_TOOLS.has(name) && typeof input.file_path === "string") {
         textParts.push(`[tool_call: ${name}] ${input.file_path}`);
         filesTouched.push({ path: input.file_path, source: "tool_path", tool: name });
+        if (CLAUDE_EDIT_TOOLS.has(name) && block.id) {
+          const edit = editFromClaudeInput(name, input);
+          if (edit) inputEdits.set(block.id, edit);
+        }
       } else if (name === "Bash" && typeof input.command === "string") {
         const desc = typeof input.description === "string" ? input.description : input.command;
         textParts.push(`[tool_call: Bash] ${desc}`);
@@ -718,7 +853,7 @@ function extractFromAssistantContent(content) {
       }
     }
   }
-  return { text: textParts.join("\n"), filesTouched, editedLines };
+  return { text: textParts.join("\n"), filesTouched, editedLines, inputEdits };
 }
 function extractFromUserContent(content) {
   if (typeof content === "string") {
@@ -800,14 +935,23 @@ function readSubagentMeta(transcriptPath) {
   const metaPath = transcriptPath.replace(/\.jsonl$/, ".meta.json");
   try {
     const raw = JSON.parse(readFileSync(metaPath, "utf-8"));
+    const text = (key) => typeof raw[key] === "string" && raw[key] ? raw[key] : null;
     return {
-      agentType: typeof raw.agentType === "string" ? raw.agentType : null,
-      description: typeof raw.description === "string" ? raw.description : null
+      agentType: text("agentType"),
+      description: text("description"),
+      parentAgentId: text("parentAgentId"),
+      // The upload's DTO takes an integer >= 0; one malformed sidecar must not
+      // 400 the whole batch it travels in.
+      spawnDepth: Number.isInteger(raw.spawnDepth) && raw.spawnDepth >= 0 ? raw.spawnDepth : null,
+      toolUseId: text("toolUseId")
     };
   } catch {
     return null;
   }
 }
+function subagentSessionId(rootSessionId, agentId) {
+  return deriveUuid(`evrex-subagent\0${rootSessionId}\0${agentId}`);
+}
 function parseSessionFile(filePath, repoPath, repoId = deriveRepoId(repoPath), agentKind = "claude-code") {
   const { text: raw, capped } = readTranscript(filePath);
   const lines = raw.split("\n").filter((l) => l.trim().length > 0);
@@ -820,6 +964,7 @@ function parseSessionFile(filePath, repoPath, repoId = deriveRepoId(repoPath), a
   let branch = null;
   let agentId = null;
   const seenIds = /* @__PURE__ */ new Set();
+  const callEdits = /* @__PURE__ */ new Map();
   for (const line of lines) {
     let record;
     try {
@@ -852,6 +997,7 @@ function parseSessionFile(filePath, repoPath, repoId = deriveRepoId(repoPath), a
         text = extracted.text;
         filesTouched = extracted.filesTouched;
         editedLines = extracted.editedLines;
+        for (const [toolUseId, edit] of extracted.inputEdits) callEdits.set(toolUseId, edit);
       }
     } else {
       const extracted = extractFromUserContent(record.message?.content);
@@ -861,6 +1007,13 @@ function parseSessionFile(filePath, repoPath, repoId = deriveRepoId(repoPath), a
       isToolError = extracted.isToolError ?? false;
       const edited = extractEditedLines(record.toolUseResult);
       if (edited) editedLines = [edited];
+      const content = record.message?.content;
+      for (const block of Array.isArray(content) ? content : []) {
+        if (block.type !== "tool_result" || !block.tool_use_id) continue;
+        const fromCall = callEdits.get(block.tool_use_id);
+        callEdits.delete(block.tool_use_id);
+        if (fromCall && !edited && block.is_error !== true) editedLines.push(fromCall);
+      }
     }
     const redacted = redactSecrets(text);
     totalRedactions += redacted.count;
@@ -881,15 +1034,24 @@ function parseSessionFile(filePath, repoPath, repoId = deriveRepoId(repoPath), a
     });
   }
   if (!sessionId || turns.length === 0) return null;
-  const parentSessionId = agentId ? sessionId : null;
-  if (agentId) {
-    sessionId = deriveUuid(`evrex-subagent\0${parentSessionId}\0${agentId}`);
+  const rootSessionId = agentId ? sessionId : null;
+  const meta = agentId ? readSubagentMeta(filePath) : null;
+  const parentSessionId = agentId && rootSessionId ? meta?.parentAgentId ? subagentSessionId(rootSessionId, meta.parentAgentId) : rootSessionId : null;
+  if (agentId && rootSessionId) {
+    sessionId = subagentSessionId(rootSessionId, agentId);
     for (const t of turns) t.sessionId = sessionId;
   }
-  const meta = agentId ? readSubagentMeta(filePath) : null;
-  const subagent = agentId ? { agentId, agentType: meta?.agentType ?? null, description: meta?.description ?? null } : null;
+  const subagent = agentId ? {
+    agentId,
+    agentType: meta?.agentType ?? null,
+    description: meta?.description ?? null,
+    rootSessionId,
+    spawnDepth: meta?.spawnDepth ?? null,
+    toolUseId: meta?.toolUseId ?? null
+  } : null;
   if (agentId && !aiTitle && meta?.description) aiTitle = meta.description;
   const sortedTs = turns.map((t) => t.ts).sort();
+  const commitEvidence = collectCommitEvidence(lines);
   const rawContent = capped ? "" : lines.map((line) => {
     try {
       return JSON.stringify(redactJsonValue(JSON.parse(line)).value);
@@ -913,7 +1075,9 @@ function parseSessionFile(filePath, repoPath, repoId = deriveRepoId(repoPath), a
     // filled in by the caller — see getGitUserName in git-history.ts
     sourceFile: filePath,
     redactionCount: totalRedactions,
-    committedSubjects: collectCommittedSubjects(lines),
+    committedSubjects: commitEvidence.subjects,
+    committedShas: commitEvidence.shas,
+    mergedPrNumbers: commitEvidence.prNumbers,
     branch,
     parentSessionId,
     subagent,
@@ -922,10 +1086,14 @@ function parseSessionFile(filePath, repoPath, repoId = deriveRepoId(repoPath), a
     turns
   };
 }
-function collectCommittedSubjects(lines) {
+function collectCommitEvidence(lines) {
   const subjects = /* @__PURE__ */ new Set();
+  const shas = /* @__PURE__ */ new Set();
+  const prNumbers = /* @__PURE__ */ new Set();
+  const commitCallIds = /* @__PURE__ */ new Set();
+  const mergeCallIds = /* @__PURE__ */ new Map();
   for (const line of lines) {
-    if (!line.includes("git commit")) continue;
+    if (!line.includes("git commit") && !line.includes("/merge") && !line.includes("tool_use_id")) continue;
     let record;
     try {
       record = JSON.parse(line);
@@ -935,13 +1103,40 @@ function collectCommittedSubjects(lines) {
     const content = record?.message?.content;
     if (!Array.isArray(content)) continue;
     for (const block of content) {
-      if (block?.type !== "tool_use") continue;
-      const command = block?.input?.command;
-      if (typeof command !== "string") continue;
-      for (const subject of committedSubjects(command)) subjects.add(subject);
+      if (block?.type === "tool_use") {
+        const command = block?.input?.command;
+        if (typeof command !== "string") continue;
+        const found = committedSubjects(command);
+        for (const subject of found) subjects.add(subject);
+        if (/\bgit\s+(?:-C\s+\S+\s+)?commit\b/.test(command) && typeof block?.id === "string") {
+          commitCallIds.add(block.id);
+        }
+        if ((/\/pulls\/\d+\/merge\b/.test(command) || /\bgh\s+pr\s+merge\b/.test(command)) && typeof block?.id === "string") {
+          mergeCallIds.set(block.id, mergedPrFromCommand(command));
+        }
+        continue;
+      }
+      if (block?.type === "tool_result" && mergeCallIds.has(block?.tool_use_id)) {
+        const raw = block?.content;
+        const text = typeof raw === "string" ? raw : Array.isArray(raw) ? raw.map(
+          (x) => typeof x?.text === "string" ? x.text : ""
+        ).join(" ") : "";
+        for (const sha of mergeResponseShas(text)) shas.add(sha);
+        if (mergeSucceeded(text)) {
+          const pr = mergeCallIds.get(block?.tool_use_id);
+          if (typeof pr === "number") prNumbers.add(pr);
+        }
+      }
+      if (block?.type === "tool_result" && commitCallIds.has(block?.tool_use_id)) {
+        const raw = block?.content;
+        const text = typeof raw === "string" ? raw : Array.isArray(raw) ? raw.map(
+          (x) => typeof x?.text === "string" ? x.text : ""
+        ).join(" ") : "";
+        for (const sha of commitShaOutputs(text)) shas.add(sha);
+      }
     }
   }
-  return [...subjects];
+  return { subjects: [...subjects], shas: [...shas], prNumbers: [...prNumbers] };
 }
 function parseAllSessions(repoPath, repoId, cursors = {}) {
   const id = repoId ?? deriveRepoId(repoPath);
@@ -961,7 +1156,7 @@ function parseAllSessions(repoPath, repoId, cursors = {}) {
   }
   return { sessions, cursors: next, skipped };
 }
-var MIN_MEANINGFUL_LINE_LENGTH, MAX_TURN_TEXT_LENGTH, FILE_PATH_TOOLS, XCODE_EDIT_TOOL, XCODE_PATH_TOOLS, PATH_TOKEN_RE, SYNTHETIC_CONTENT_RE, MAX_TRANSCRIPT_BYTES;
+var MIN_MEANINGFUL_LINE_LENGTH, MAX_TURN_TEXT_LENGTH, FILE_PATH_TOOLS, XCODE_EDIT_TOOL, XCODE_PATH_TOOLS, CLAUDE_EDIT_TOOLS, PATH_TOKEN_RE, SYNTHETIC_CONTENT_RE, MAX_TRANSCRIPT_BYTES;
 var init_claude_sessions = __esm({
   "../../packages/ingest-core/src/claude-sessions.ts"() {
     "use strict";
@@ -973,9 +1168,10 @@ var init_claude_sessions = __esm({
     init_types();
     MIN_MEANINGFUL_LINE_LENGTH = 6;
     MAX_TURN_TEXT_LENGTH = 4e3;
-    FILE_PATH_TOOLS = /* @__PURE__ */ new Set(["Read", "Edit", "Write", "NotebookEdit"]);
+    FILE_PATH_TOOLS = /* @__PURE__ */ new Set(["Read", "Edit", "Write", "MultiEdit", "NotebookEdit"]);
     XCODE_EDIT_TOOL = /XcodeUpdate$/;
     XCODE_PATH_TOOLS = /Xcode(Read|Grep|Glob|RefreshCodeIssuesInFile)$/;
+    CLAUDE_EDIT_TOOLS = /* @__PURE__ */ new Set(["Edit", "Write", "MultiEdit"]);
     PATH_TOKEN_RE = /(?:[.~]?\/)?(?:[\w-]+\/)+[\w.-]+/g;
     SYNTHETIC_CONTENT_RE = /^\s*(<task-notification>|<system-reminder>|\[SYSTEM NOTIFICATION)/;
     MAX_TRANSCRIPT_BYTES = 256 * 1024 * 1024;
@@ -1907,16 +2103,58 @@ function addUsage(into, next) {
     model: into.model ?? next.model
   };
 }
-function committedSubjectsFromToolCalls(lines) {
+function commitEvidenceFromToolCalls(lines) {
   const subjects = /* @__PURE__ */ new Set();
+  const shas = /* @__PURE__ */ new Set();
+  const prNumbers = /* @__PURE__ */ new Set();
+  const commitCallIds = /* @__PURE__ */ new Set();
+  const mergeCallIds = /* @__PURE__ */ new Map();
   for (const line of lines) {
     if (line.type !== "response_item") continue;
-    if (payloadType(line) !== "custom_tool_call") continue;
-    const input = asString(line.payload?.input);
-    if (!input) continue;
-    for (const subject of committedSubjects(input)) subjects.add(subject);
+    const kind = payloadType(line);
+    if (kind === "custom_tool_call") {
+      const input = asString(line.payload?.input);
+      if (!input) continue;
+      const cmd = execCmdFrom(input) ?? input;
+      const callId = asString(line.payload?.call_id);
+      for (const subject of committedSubjects(cmd)) subjects.add(subject);
+      if (/\bgit\s+(?:-C\s+\S+\s+)?commit\b/.test(cmd) && callId) {
+        commitCallIds.add(callId);
+      }
+      if ((/\/pulls\/\d+\/merge\b/.test(cmd) || /\bgh\s+pr\s+merge\b/.test(cmd)) && callId) {
+        mergeCallIds.set(callId, mergedPrFromCommand(cmd));
+      }
+      continue;
+    }
+    if (kind === "custom_tool_call_output") {
+      const callId = asString(line.payload?.call_id);
+      if (!callId) continue;
+      const raw = line.payload?.output;
+      const text = Array.isArray(raw) ? raw.map(
+        (x) => typeof x?.text === "string" ? x.text : ""
+      ).join(" ") : asString(raw) ?? "";
+      if (commitCallIds.has(callId)) {
+        for (const sha of commitShaOutputs(text)) shas.add(sha);
+      }
+      if (mergeCallIds.has(callId)) {
+        for (const sha of mergeResponseShas(text)) shas.add(sha);
+        if (mergeSucceeded(text)) {
+          const pr = mergeCallIds.get(callId);
+          if (typeof pr === "number") prNumbers.add(pr);
+        }
+      }
+    }
+  }
+  return { subjects: [...subjects], shas: [...shas], prNumbers: [...prNumbers] };
+}
+function execCmdFrom(input) {
+  const m = /cmd\s*:\s*"((?:[^"\\]|\\.)*)"/.exec(input);
+  if (!m) return null;
+  try {
+    return JSON.parse(`"${m[1]}"`);
+  } catch {
+    return null;
   }
-  return [...subjects];
 }
 function filesFromToolCalls(lines) {
   const byPath = /* @__PURE__ */ new Map();
@@ -1975,20 +2213,28 @@ function parseCodexSessionFile(filePath, repoPath, repoId) {
   const { content: rawContent, count: rawRedactions } = redactRollout(raw);
   redactionCount += rawRedactions;
   const firstUser = events.find((e) => e.role === "user");
+  const codexCommitEvidence = commitEvidenceFromToolCalls(lines);
   return {
     id: sessionId,
     agentKind: "codex",
     branch: null,
     parentSessionId: null,
     subagent: null,
-    // Codex records the remote itself, so identity survives a moved or deleted
-    // checkout. Falls back to the caller's derivation when it is absent.
-    repoId: repoIdFromMeta(meta) ?? repoId,
+    // The caller's derivation first: it reads the checkout's remote NOW,
+    // which is the identity every other ingest path agrees on. The remote
+    // recorded in session_meta is a historical fact — after the repo's
+    // GitHub transfer, month-old rollouts kept re-minting the dead
+    // jeffcheema id on every re-index, resurrecting a "third evrex-app"
+    // as fast as migrations folded it. Meta only serves a rollout whose
+    // checkout is gone, where a stale identity beats none.
+    repoId: repoId.startsWith("path:") ? repoIdFromMeta(meta) ?? repoId : repoId,
     cwd,
     startedAt: asString(meta.timestamp) ?? events[0]?.ts ?? null,
     endedAt: events[events.length - 1]?.ts ?? null,
     turnCount: turns.length,
-    committedSubjects: committedSubjectsFromToolCalls(lines),
+    committedSubjects: codexCommitEvidence.subjects,
+    committedShas: codexCommitEvidence.shas,
+    mergedPrNumbers: codexCommitEvidence.prNumbers,
     aiTitle: firstUser ? firstUser.text.slice(0, 120).trim() : null,
     author: null,
     sourceFile: filePath,
@@ -2504,7 +2750,7 @@ var init_trace_target = __esm({
 
 // ../../packages/ingest-core/src/gemini-sessions.ts
 import { readFileSync as readFileSync4 } from "node:fs";
-function textOf(content) {
+function textOf2(content) {
   if (typeof content === "string") return content;
   if (!Array.isArray(content)) return "";
   return content.map(
@@ -2538,7 +2784,7 @@ function parseGeminiSessionFile(filePath, repoPath, repoId) {
   messages.forEach((record, index) => {
     const role = record.type === "user" ? "user" : record.type === "gemini" || record.type === "model" ? "assistant" : null;
     if (!role) return;
-    const text = textOf(record.content ?? record.displayContent);
+    const text = textOf2(record.content ?? record.displayContent);
     if (!text.trim()) return;
     const { text: safe, count } = redactSecrets(text);
     redactionCount += count;
@@ -2962,6 +3208,7 @@ __export(src_exports, {
   changedSessions: () => changedSessions,
   codexSessionsDir: () => codexSessionsDir,
   collectRepoData: () => collectRepoData,
+  commitShaOutputs: () => commitShaOutputs,
   commitsOlderThan: () => commitsOlderThan,
   committedSubjects: () => committedSubjects,
   copilotSessionsDir: () => copilotSessionsDir,
@@ -2996,6 +3243,9 @@ __export(src_exports, {
   loadComposers: () => loadComposers,
   matchCommitToSession: () => matchCommitToSession,
   measureLineSurvival: () => measureLineSurvival,
+  mergeResponseShas: () => mergeResponseShas,
+  mergeSucceeded: () => mergeSucceeded,
+  mergedPrFromCommand: () => mergedPrFromCommand,
   normalizeRepoRemote: () => normalizeRepoRemote,
   opencodeDbPath: () => opencodeDbPath,
   originOf: () => originOf,
@@ -3005,6 +3255,7 @@ __export(src_exports, {
   parseAllOpenCodeSessions: () => parseAllOpenCodeSessions,
   parseAllSessions: () => parseAllSessions,
   parseCodexSessionFile: () => parseCodexSessionFile,
+  parseCommitsBySha: () => parseCommitsBySha,
   parseCopilotSessionDir: () => parseCopilotSessionDir,
   parseCopilotWorkspace: () => parseCopilotWorkspace,
   parseCursorComposer: () => parseCursorComposer,
@@ -3171,7 +3422,7 @@ var init_client = __esm({
       // Evidence-only retrieval (BM25 + embedding), no LLM synthesis call — see
       // apps/backend/src/query/query.service.ts#search. Used by evrex_search,
       // which wants ranked hits fast, not a synthesized paragraph.
-      search: (repoPath, text, filePaths) => post("/search", { repoPath, text, filePaths }),
+      search: (repoPath, text, filePaths, boost) => post("/search", { repoPath, text, filePaths, boost }),
       // Everything that happened in a repo, newest first, bounded by days — the
       // same query the desktop Timeline screen makes. Sessions and commits
       // interleaved, each with the handle evrex_expand takes.