evrex-mcp 0.8.2 → 0.9.1

package/dist/capture.js

@@ -432,7 +432,7 @@ var PARSER_VERSION;
 var init_incremental = __esm({
   "../../packages/ingest-core/src/incremental.ts"() {
     "use strict";
-    PARSER_VERSION = 7;
+    PARSER_VERSION = 9;
   }
 });
 
@@ -777,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) ?? [];
@@ -801,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);
@@ -821,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}`);
@@ -832,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") {
@@ -914,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);
@@ -934,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 {
@@ -966,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);
@@ -975,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;
@@ -995,13 +1034,21 @@ 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);
@@ -1109,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";
@@ -1121,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;
@@ -2702,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(
@@ -2736,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;
@@ -3386,6 +3434,186 @@ var init_client = __esm({
   }
 });
 
+// src/credential-store.ts
+var credential_store_exports = {};
+__export(credential_store_exports, {
+  CredentialStore: () => CredentialStore,
+  NoKeychainError: () => NoKeychainError,
+  systemRunner: () => systemRunner
+});
+import { spawn } from "node:child_process";
+var SERVICE, ACCOUNT, systemRunner, NoKeychainError, CredentialStore, WINDOWS_PATH, WINDOWS_STORE, WINDOWS_RETRIEVE, WINDOWS_REMOVE;
+var init_credential_store = __esm({
+  "src/credential-store.ts"() {
+    "use strict";
+    SERVICE = "evrex-capture";
+    ACCOUNT = "evrex";
+    systemRunner = {
+      platform: process.platform,
+      run(command, args, stdin) {
+        return new Promise((resolve) => {
+          const child = spawn(command, args, { stdio: ["pipe", "pipe", "pipe"] });
+          let stdout = "";
+          let stderr = "";
+          child.stdout.on("data", (d) => stdout += d.toString());
+          child.stderr.on("data", (d) => stderr += d.toString());
+          child.on("error", () => resolve({ code: 127, stdout: "", stderr: "" }));
+          child.on("close", (code) => resolve({ code: code ?? 1, stdout, stderr }));
+          if (stdin !== void 0) child.stdin.write(stdin);
+          child.stdin.end();
+        });
+      }
+    };
+    NoKeychainError = class extends Error {
+      constructor(platform) {
+        super(
+          `evrex could not find a credential store on this machine (${platform}).
+  macOS   needs \`security\`, which ships with the system.
+  Linux   needs \`secret-tool\` \u2014 install libsecret-tools (Debian/Ubuntu)
+          or libsecret (Fedora/Arch), and make sure a keyring daemon is running.
+  Windows needs PowerShell.
+evrex will not fall back to writing the credential in a plain file.`
+        );
+        this.name = "NoKeychainError";
+      }
+    };
+    CredentialStore = class {
+      constructor(runner = systemRunner) {
+        this.runner = runner;
+      }
+      async available() {
+        switch (this.runner.platform) {
+          case "darwin":
+            return (await this.runner.run("security", ["help"])).code !== 127;
+          case "win32":
+            return (await this.runner.run("powershell", ["-Command", "$PSVersionTable.PSVersion.Major"])).code !== 127;
+          default:
+            return (await this.runner.run("secret-tool", ["--version"])).code !== 127;
+        }
+      }
+      /**
+       * Replaces any existing credential rather than adding a second one. A
+       * machine that re-enrols after expiry must end up with exactly one entry, or
+       * the next read is a coin flip between the live credential and a dead one.
+       */
+      async store(secret) {
+        if (!await this.available()) throw new NoKeychainError(this.runner.platform);
+        switch (this.runner.platform) {
+          case "darwin": {
+            if (/["\\\r\n]/.test(secret)) {
+              throw new Error("Keychain write refused: the credential has a character `security -i` cannot carry.");
+            }
+            const result = await this.runner.run(
+              "security",
+              ["-i"],
+              `add-generic-password -a "${ACCOUNT}" -s "${SERVICE}" -U -w "${secret}"
+`
+            );
+            if (result.code !== 0) throw new Error(`Keychain write failed: ${result.stderr.trim()}`);
+            return;
+          }
+          case "win32": {
+            const result = await this.runner.run(
+              "powershell",
+              ["-NoProfile", "-Command", WINDOWS_STORE],
+              secret
+            );
+            if (result.code !== 0) throw new Error(`DPAPI write failed: ${result.stderr.trim()}`);
+            return;
+          }
+          default: {
+            const result = await this.runner.run(
+              "secret-tool",
+              ["store", "--label=evrex capture credential", "service", SERVICE, "account", ACCOUNT],
+              secret
+            );
+            if (result.code !== 0) throw new Error(`secret-tool write failed: ${result.stderr.trim()}`);
+            return;
+          }
+        }
+      }
+      /** Null when there is nothing stored, which is the normal pre-enrolment state. */
+      async retrieve() {
+        if (!await this.available()) throw new NoKeychainError(this.runner.platform);
+        switch (this.runner.platform) {
+          case "darwin": {
+            const r = await this.runner.run("security", [
+              "find-generic-password",
+              "-a",
+              ACCOUNT,
+              "-s",
+              SERVICE,
+              "-w"
+            ]);
+            return r.code === 0 ? r.stdout.trim() || null : null;
+          }
+          case "win32": {
+            const r = await this.runner.run("powershell", ["-NoProfile", "-Command", WINDOWS_RETRIEVE]);
+            return r.code === 0 ? r.stdout.trim() || null : null;
+          }
+          default: {
+            const r = await this.runner.run("secret-tool", [
+              "lookup",
+              "service",
+              SERVICE,
+              "account",
+              ACCOUNT
+            ]);
+            return r.code === 0 ? r.stdout.trim() || null : null;
+          }
+        }
+      }
+      /** Idempotent: removing a credential that is not there is not an error. */
+      async remove() {
+        if (!await this.available()) return;
+        switch (this.runner.platform) {
+          case "darwin":
+            await this.runner.run("security", [
+              "delete-generic-password",
+              "-a",
+              ACCOUNT,
+              "-s",
+              SERVICE
+            ]);
+            return;
+          case "win32":
+            await this.runner.run("powershell", ["-NoProfile", "-Command", WINDOWS_REMOVE]);
+            return;
+          default:
+            await this.runner.run("secret-tool", [
+              "clear",
+              "service",
+              SERVICE,
+              "account",
+              ACCOUNT
+            ]);
+            return;
+        }
+      }
+    };
+    WINDOWS_PATH = "$env:APPDATA\\evrex\\capture.cred";
+    WINDOWS_STORE = `
+$ErrorActionPreference = 'Stop'
+$p = "${WINDOWS_PATH}"
+New-Item -ItemType Directory -Force -Path (Split-Path $p) | Out-Null
+$secret = [Console]::In.ReadToEnd().Trim()
+ConvertTo-SecureString $secret -AsPlainText -Force | ConvertFrom-SecureString | Set-Content -Path $p
+`.trim();
+    WINDOWS_RETRIEVE = `
+$ErrorActionPreference = 'Stop'
+$p = "${WINDOWS_PATH}"
+if (-not (Test-Path $p)) { exit 1 }
+$sec = Get-Content $p | ConvertTo-SecureString
+[Runtime.InteropServices.Marshal]::PtrToStringAuto(
+  [Runtime.InteropServices.Marshal]::SecureStringToBSTR($sec))
+`.trim();
+    WINDOWS_REMOVE = `
+$p = "${WINDOWS_PATH}"
+if (Test-Path $p) { Remove-Item $p -Force }
+`.trim();
+  }
+});
+
 // src/capture.ts
 init_src();
 import { statSync as statSync5 } from "node:fs";
@@ -3619,6 +3847,11 @@ async function handleCursorEvent(event, name, deps) {
   writeState(path, state);
   return { event: name, turnsSent, archived: false, spoolDrained: drained.sent };
 }
+async function captureToken(env, retrieve) {
+  const explicit = env.EVREX_TOKEN ?? env.EVREX_API_TOKEN;
+  if (explicit) return explicit;
+  return retrieve().catch(() => null);
+}
 async function main() {
   const raw = await withDeadline(readStdin(), DEADLINE_MS);
   if (!raw) return;
@@ -3629,17 +3862,23 @@ async function main() {
     return;
   }
   const { evrexApi: evrexApi2 } = await Promise.resolve().then(() => (init_client(), client_exports));
+  let token;
+  const credential = () => token ??= captureToken(process.env, async () => {
+    const { CredentialStore: CredentialStore2 } = await Promise.resolve().then(() => (init_credential_store(), credential_store_exports));
+    return new CredentialStore2().retrieve();
+  });
   const deps = {
     now: () => /* @__PURE__ */ new Date(),
     home: homedir7(),
     machine: hostname(),
     post: async (path, body) => {
       try {
+        const bearer = await credential();
         const res = await fetch(`${evrexApi2.baseUrl}${path}`, {
           method: "POST",
           headers: {
             "content-type": "application/json",
-            ...process.env.EVREX_TOKEN ? { authorization: `Bearer ${process.env.EVREX_TOKEN}` } : {}
+            ...bearer ? { authorization: `Bearer ${bearer}` } : {}
           },
           body: JSON.stringify(body)
         });
@@ -3656,6 +3895,7 @@ main().then(
   () => process.exit(0)
 );
 export {
+  captureToken,
   drainSpool,
   handleEvent,
   parseTranscript,

package/dist/continuity.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
 // src/continuity.ts
-import { execFileSync } from "node:child_process";
+import { execFileSync as execFileSync2 } from "node:child_process";
 import { closeSync, openSync, readSync, statSync } from "node:fs";
 import { pathToFileURL } from "node:url";
 
@@ -62,6 +62,7 @@ var evrexApi = {
 };
 
 // src/hook-runtime.ts
+import { execFileSync } from "node:child_process";
 function readStdin() {
   return new Promise((resolve) => {
     let raw = "";
@@ -87,7 +88,34 @@ function repoMatchForCwd(repos, cwd) {
       }
     }
   }
-  return best;
+  if (best) return best;
+  const hop = worktreeHop(cwd);
+  if (!hop) return null;
+  for (const repo of repos) {
+    for (const path of repo.localPaths ?? []) {
+      if (!path) continue;
+      if (hop.main === path || hop.main.startsWith(`${path}/`)) {
+        return { id: repo.id, root: hop.top };
+      }
+    }
+  }
+  return null;
+}
+function worktreeHop(cwd) {
+  try {
+    const raw = execFileSync(
+      "git",
+      ["-C", cwd, "rev-parse", "--git-common-dir", "--show-toplevel"],
+      { stdio: ["ignore", "pipe", "ignore"], timeout: 1500 }
+    ).toString("utf-8").trim().split("\n");
+    const [gitDir, top] = [raw[0] ?? "", raw[1] ?? ""];
+    if (!gitDir.startsWith("/") || !gitDir.endsWith("/.git") || !top) return null;
+    const main2 = gitDir.slice(0, -"/.git".length);
+    if (!main2 || main2 === top) return null;
+    return { main: main2, top };
+  } catch {
+    return null;
+  }
 }
 function repoForCwd(repos, cwd) {
   return repoMatchForCwd(repos, cwd)?.id ?? null;
@@ -258,7 +286,7 @@ function ago(iso, now = /* @__PURE__ */ new Date()) {
 }
 function currentBranch(cwd) {
   try {
-    const out = execFileSync("git", ["rev-parse", "--abbrev-ref", "HEAD"], {
+    const out = execFileSync2("git", ["rev-parse", "--abbrev-ref", "HEAD"], {
       cwd,
       stdio: ["ignore", "pipe", "ignore"],
       timeout: 1e3

package/dist/hook.js

@@ -86,7 +86,34 @@ function repoMatchForCwd(repos, cwd) {
       }
     }
   }
-  return best;
+  if (best) return best;
+  const hop = worktreeHop(cwd);
+  if (!hop) return null;
+  for (const repo of repos) {
+    for (const path of repo.localPaths ?? []) {
+      if (!path) continue;
+      if (hop.main === path || hop.main.startsWith(`${path}/`)) {
+        return { id: repo.id, root: hop.top };
+      }
+    }
+  }
+  return null;
+}
+function worktreeHop(cwd) {
+  try {
+    const raw = execFileSync(
+      "git",
+      ["-C", cwd, "rev-parse", "--git-common-dir", "--show-toplevel"],
+      { stdio: ["ignore", "pipe", "ignore"], timeout: 1500 }
+    ).toString("utf-8").trim().split("\n");
+    const [gitDir, top] = [raw[0] ?? "", raw[1] ?? ""];
+    if (!gitDir.startsWith("/") || !gitDir.endsWith("/.git") || !top) return null;
+    const main2 = gitDir.slice(0, -"/.git".length);
+    if (!main2 || main2 === top) return null;
+    return { main: main2, top };
+  } catch {
+    return null;
+  }
 }
 function repoForCwd(repos, cwd) {
   return repoMatchForCwd(repos, cwd)?.id ?? null;

package/dist/import.js

@@ -432,7 +432,7 @@ var PARSER_VERSION;
 var init_incremental = __esm({
   "../../packages/ingest-core/src/incremental.ts"() {
     "use strict";
-    PARSER_VERSION = 7;
+    PARSER_VERSION = 9;
   }
 });
 
@@ -777,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) ?? [];
@@ -801,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);
@@ -821,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}`);
@@ -832,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") {
@@ -914,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);
@@ -934,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 {
@@ -966,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);
@@ -975,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;
@@ -995,13 +1034,21 @@ 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);
@@ -1109,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";
@@ -1121,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;
@@ -2702,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(
@@ -2736,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;
@@ -3452,11 +3500,13 @@ evrex will not fall back to writing the credential in a plain file.`
         if (!await this.available()) throw new NoKeychainError(this.runner.platform);
         switch (this.runner.platform) {
           case "darwin": {
+            if (/["\\\r\n]/.test(secret)) {
+              throw new Error("Keychain write refused: the credential has a character `security -i` cannot carry.");
+            }
             const result = await this.runner.run(
               "security",
-              ["add-generic-password", "-a", ACCOUNT, "-s", SERVICE, "-U", "-w"],
-              `${secret}
-${secret}
+              ["-i"],
+              `add-generic-password -a "${ACCOUNT}" -s "${SERVICE}" -U -w "${secret}"
 `
             );
             if (result.code !== 0) throw new Error(`Keychain write failed: ${result.stderr.trim()}`);

package/dist/index.js

@@ -141,11 +141,13 @@ evrex will not fall back to writing the credential in a plain file.`
         if (!await this.available()) throw new NoKeychainError(this.runner.platform);
         switch (this.runner.platform) {
           case "darwin": {
+            if (/["\\\r\n]/.test(secret)) {
+              throw new Error("Keychain write refused: the credential has a character `security -i` cannot carry.");
+            }
             const result = await this.runner.run(
               "security",
-              ["add-generic-password", "-a", ACCOUNT, "-s", SERVICE, "-U", "-w"],
-              `${secret}
-${secret}
+              ["-i"],
+              `add-generic-password -a "${ACCOUNT}" -s "${SERVICE}" -U -w "${secret}"
 `
             );
             if (result.code !== 0) throw new Error(`Keychain write failed: ${result.stderr.trim()}`);
@@ -354,6 +356,17 @@ import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
 import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
 import { z } from "zod";
 
+// src/subcommands.ts
+var SUBCOMMANDS = {
+  "evrex-hook": "hook.js",
+  "evrex-capture": "capture.js",
+  "evrex-import": "import.js",
+  "evrex-tickets": "tickets.js",
+  "evrex-pretool": "pretool.js",
+  "evrex-continuity": "continuity.js",
+  "evrex-account": "account.js"
+};
+
 // src/tools.ts
 init_client();
 import { execFileSync as execFileSync2 } from "node:child_process";
@@ -453,7 +466,7 @@ var EXTRACTION_SYSTEM_PROMPT = [
 // ../../packages/llm-core/src/synthesis.ts
 var MIN_SENTENCES = 1;
 var MAX_SENTENCES = 4;
-var SYNTHESIS_SYSTEM_PROMPT = `You answer questions about why code changed, using ONLY the evidence provided below. Never state a claim that is not directly supported by the evidence text. Respond with a JSON object: {"sentences": string[], "sentenceEvidence": number[][], "noRecordedReasoning": boolean}. Write 2-4 sentences when the evidence supports an answer; each sentence's entry in "sentenceEvidence" lists only the evidence indices (0-based) that directly support it. If the evidence is too thin or unrelated to actually answer the question, set "noRecordedReasoning": true and return empty arrays for "sentences" and "sentenceEvidence" \u2014 do not speculate or hedge.`;
+var SYNTHESIS_SYSTEM_PROMPT = `You answer questions about why code changed, using ONLY the evidence provided below. The evidence spans the project's whole history and the system it describes keeps changing: when items disagree, the most recently dated evidence describes the CURRENT state \u2014 answer as of the newest evidence, frame older accounts as how it used to work, and never present a superseded design as current. Never state a claim that is not directly supported by the evidence text. Respond with a JSON object: {"sentences": string[], "sentenceEvidence": number[][], "noRecordedReasoning": boolean}. Write 2-4 sentences when the evidence supports an answer; each sentence's entry in "sentenceEvidence" lists only the evidence indices (0-based) that directly support it. If the evidence is too thin or unrelated to actually answer the question, set "noRecordedReasoning": true and return empty arrays for "sentences" and "sentenceEvidence" \u2014 do not speculate or hedge.`;
 var SYNTHESIS_SCHEMA = {
   type: "object",
   additionalProperties: false,
@@ -469,7 +482,7 @@ var SYNTHESIS_SCHEMA = {
 };
 function buildSynthesisPrompt(question, evidence) {
   const list = evidence.map(
-    (e, i) => `[${i}] (${e.kind}, confidence ${(e.confidence ?? 1).toFixed(2)}): ${e.excerpt}`
+    (e, i) => `[${i}] (${e.kind}${e.at ? `, ${e.at.slice(0, 10)}` : ""}, confidence ${(e.confidence ?? 1).toFixed(2)}): ${e.excerpt}`
   ).join("\n");
   return `Question: ${question}
 
@@ -544,7 +557,7 @@ ${CORPUS}
 You are given the question and a numbered list of candidate results that lexical retrieval fetched. Order the candidate ids best-first by how much each would actually help ANSWER the question:
 - Recorded reasoning outranks mechanical record: a decision, a rejected approach with its reason, a constraint, or an explanation beats a log line or a file listing that merely shares words with the question.
 - A candidate about the question's subject beats one that only quotes its vocabulary; watch for results that repeat the question's words while being about something else entirely.
-- Prefer the origin of an idea over a later mention of it; among near-duplicates prefer the more complete one; use the date only to break ties.
+- Match recency to the question's intent: for "why does X exist / why was this decided", the origin of the idea is the answer; for "how does X work / what is the current pipeline", the system has usually changed since its founding \u2014 prefer the most recent account of the mechanism and treat older ones as history. Among near-duplicates prefer the more complete one.
 
 Respond with JSON only: {"ranked": ["id", ...]} \u2014 every listed id at most once, ids from the list only, best first. Include every id you consider relevant; omit only what would waste the reader's attention.`;
 
@@ -1658,6 +1671,28 @@ function proceduresBlock(procedures) {
   return "PROCEDURES (how this was done here, as steps that worked once \u2014 check they still apply before following them):\n" + procedures.slice(0, MAX_ITEMS).map((p) => `- ${p.title}
 ${p.steps.slice(0, 12).map((step, i) => `    ${i + 1}. ${step}`).join("\n")}`).join("\n");
 }
+function subagentsBlock(subagents) {
+  const budget = MAX_ITEMS * 2;
+  const lines = [];
+  let printed = 0;
+  let total = 0;
+  for (const s of subagents) {
+    const items = [
+      ...s.rejected.map((r) => `  - rejected: ${r.title} \u2014 ${r.reason}`),
+      ...s.constraints.map((c) => `  - constraint [${c.source}]: ${c.text}`)
+    ];
+    total += items.length;
+    const shown = items.slice(0, budget - printed);
+    if (shown.length === 0) continue;
+    const what = [s.agentType, s.description].filter(Boolean).join(": ");
+    lines.push(`- session:${s.id}${what ? ` (${what})` : ""}`, ...shown);
+    printed += shown.length;
+  }
+  if (lines.length === 0) return "";
+  if (total > printed) lines.push(`  \u2026 ${total - printed} more in their own records (expand the sub-agent handles).`);
+  return `FROM SUB-AGENTS (what the agents this session ran ruled out and were bound by):
+${lines.join("\n")}`;
+}
 async function evrexExpand(handles) {
   if (handles.length === 0) return "No handles given. Pass ids from evrex_search, e.g. commit:069a0b5.";
   const parts = [];
@@ -1711,6 +1746,8 @@ Open in Evrex: evrex://open?handle=commit:${id}`);
     }
     const procedures = proceduresBlock(session.procedures ?? []);
     if (procedures) block.push(procedures);
+    const fromSubagents = subagentsBlock(session.subagents ?? []);
+    if (fromSubagents) block.push(fromSubagents);
     parts.push(block.join("\n"));
   }
   parts.push(
@@ -1829,6 +1866,8 @@ ${truncate(commit.body, MAX_EXCERPT)}` : ""}`
           "CONSTRAINTS:\n" + session.constraints.slice(0, MAX_ITEMS).map((c) => `- [${c.source}] ${c.text}`).join("\n")
         );
       }
+      const fromSubagents = subagentsBlock(session.subagents ?? []);
+      if (fromSubagents) parts.push(fromSubagents);
       parts.push(`OUTCOME: ${truncate(session.outcome, MAX_EXCERPT)}`);
     }
   } else if (!commit.agentTrailers?.length) {
@@ -1985,10 +2024,22 @@ async function runEnrolment() {
   });
   process.exit(result.ok ? 0 : 1);
 }
+async function runSubcommand(file) {
+  const { spawnSync } = await import("node:child_process");
+  const { fileURLToPath } = await import("node:url");
+  const result = spawnSync(
+    process.execPath,
+    [fileURLToPath(new URL(`./${file}`, import.meta.url)), ...process.argv.slice(3)],
+    { stdio: "inherit" }
+  );
+  process.exit(result.status ?? 1);
+}
 async function main() {
   if (process.argv[2] === "enrol" || process.argv[2] === "enroll") {
     await runEnrolment();
   }
+  const subcommand = SUBCOMMANDS[process.argv[2] ?? ""];
+  if (subcommand) await runSubcommand(subcommand);
   assertConfigured();
   const transport = new StdioServerTransport();
   await server.connect(transport);

package/dist/pretool.js

@@ -86,7 +86,34 @@ function repoMatchForCwd(repos, cwd) {
       }
     }
   }
-  return best;
+  if (best) return best;
+  const hop = worktreeHop(cwd);
+  if (!hop) return null;
+  for (const repo of repos) {
+    for (const path of repo.localPaths ?? []) {
+      if (!path) continue;
+      if (hop.main === path || hop.main.startsWith(`${path}/`)) {
+        return { id: repo.id, root: hop.top };
+      }
+    }
+  }
+  return null;
+}
+function worktreeHop(cwd) {
+  try {
+    const raw = execFileSync(
+      "git",
+      ["-C", cwd, "rev-parse", "--git-common-dir", "--show-toplevel"],
+      { stdio: ["ignore", "pipe", "ignore"], timeout: 1500 }
+    ).toString("utf-8").trim().split("\n");
+    const [gitDir, top] = [raw[0] ?? "", raw[1] ?? ""];
+    if (!gitDir.startsWith("/") || !gitDir.endsWith("/.git") || !top) return null;
+    const main2 = gitDir.slice(0, -"/.git".length);
+    if (!main2 || main2 === top) return null;
+    return { main: main2, top };
+  } catch {
+    return null;
+  }
 }
 function toRepoRelative(filePath, root) {
   if (!root || !filePath.startsWith("/")) return filePath;

package/dist/tickets.js

@@ -141,11 +141,13 @@ evrex will not fall back to writing the credential in a plain file.`
         if (!await this.available()) throw new NoKeychainError(this.runner.platform);
         switch (this.runner.platform) {
           case "darwin": {
+            if (/["\\\r\n]/.test(secret)) {
+              throw new Error("Keychain write refused: the credential has a character `security -i` cannot carry.");
+            }
             const result = await this.runner.run(
               "security",
-              ["add-generic-password", "-a", ACCOUNT, "-s", SERVICE, "-U", "-w"],
-              `${secret}
-${secret}
+              ["-i"],
+              `add-generic-password -a "${ACCOUNT}" -s "${SERVICE}" -U -w "${secret}"
 `
             );
             if (result.code !== 0) throw new Error(`Keychain write failed: ${result.stderr.trim()}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "evrex-mcp",
-  "version": "0.8.2",
+  "version": "0.9.1",
   "description": "MCP server that gives coding agents the recorded reasoning behind a repo: prior decisions, hard constraints, and approaches already rejected.",
   "keywords": [
     "mcp",
@@ -36,28 +36,27 @@
   "engines": {
     "node": ">=20"
   },
-  "scripts": {
-    "build": "tsc -p tsconfig.json",
-    "bundle": "node scripts/bundle.mjs",
-    "dev": "tsc -p tsconfig.json --watch",
-    "lint": "eslint .",
-    "check-types": "tsc --noEmit",
-    "test": "tsc -p tsconfig.json && node --test dist/*.test.js",
-    "prepack": "pnpm run bundle"
-  },
   "dependencies": {
     "@anthropic-ai/sdk": "^0.72.0",
     "@modelcontextprotocol/sdk": "^1.20.1",
     "zod": "^3.24.1"
   },
   "devDependencies": {
-    "@repo/eslint-config": "workspace:*",
-    "@repo/ingest-core": "workspace:*",
-    "@repo/llm-core": "workspace:*",
-    "@repo/typescript-config": "workspace:*",
     "@types/node": "^24.0.0",
     "esbuild": "^0.25.12",
     "eslint": "^9.39.1",
-    "typescript": "^5.9.2"
+    "typescript": "^5.9.2",
+    "@repo/eslint-config": "0.0.0",
+    "@repo/ingest-core": "0.0.0",
+    "@repo/llm-core": "0.0.0",
+    "@repo/typescript-config": "0.0.0"
+  },
+  "scripts": {
+    "build": "tsc -p tsconfig.json",
+    "bundle": "node scripts/bundle.mjs",
+    "dev": "tsc -p tsconfig.json --watch",
+    "lint": "eslint .",
+    "check-types": "tsc --noEmit",
+    "test": "tsc -p tsconfig.json && node --test dist/*.test.js"
   }
-}
+}