hillclimb 0.9.4 → 0.9.6

package/dist/main.js

@@ -13,8 +13,8 @@ import {
 } from "./chunk-UPXMA7RC.js";
 
 // src/main.ts
-import fs27 from "fs";
-import path26 from "path";
+import fs28 from "fs";
+import path27 from "path";
 import * as p6 from "@clack/prompts";
 
 // src/commands/init.ts
@@ -2714,9 +2714,9 @@ async function runStatus(args = []) {
 // src/commands/upload.ts
 import { spawn as spawn3 } from "child_process";
 import crypto8 from "crypto";
-import fs20 from "fs";
+import fs21 from "fs";
 import os10 from "os";
-import path19 from "path";
+import path20 from "path";
 
 // src/agent-pending.ts
 import crypto4 from "crypto";
@@ -15178,16 +15178,276 @@ async function recordDebugLogCompletion(args) {
 // src/git-traces/pending-captures.ts
 import { AsyncLocalStorage } from "async_hooks";
 import crypto7 from "crypto";
-import fs19 from "fs";
+import fs20 from "fs";
 import os9 from "os";
-import path18 from "path";
+import path19 from "path";
 
 // src/git-traces/git-ops.ts
-import { execFileSync as execFileSync2, spawn as spawn2, spawnSync } from "child_process";
-import fs17 from "fs";
+import { execFileSync as execFileSync2, spawn as spawn2, spawnSync as spawnSync2 } from "child_process";
+import fs18 from "fs";
 import os7 from "os";
-import path16 from "path";
+import path17 from "path";
 import { createGzip } from "zlib";
+
+// src/git-traces/object-store-probe.ts
+import { spawnSync } from "child_process";
+import fs17 from "fs";
+import path16 from "path";
+var probedRepos = /* @__PURE__ */ new Set();
+var SAMPLE_FANOUT_DIRS = 8;
+var SAMPLE_READS = 20;
+var SAMPLE_READ_BYTES = 4096;
+var MAX_NAMED_OBJECTS = 3;
+var MAX_LOCATE_BLOBS = 2e4;
+var MAX_STALLED_PATH_CHARS = 120;
+var OBJECT_SHA = /^[0-9a-f]{40}(?:[0-9a-f]{24})?$/;
+var gitLimits = {
+  versionMs: 2e3,
+  listMs: 1e4,
+  readMs: 15e3,
+  headMs: 5e3
+};
+function probeObjectStore(repoRoot, trigger, stderr, args = []) {
+  if (probedRepos.has(repoRoot)) return;
+  probedRepos.add(repoRoot);
+  const started = Date.now();
+  const fields = [`repo=${repoRoot}`, `trigger=${trigger}`];
+  try {
+    const objectsDir = resolveObjectsDir(repoRoot);
+    if (!objectsDir) {
+      fields.push("objectsDir=unresolved");
+      return;
+    }
+    fields.push(`objectsDir=${objectsDir}`);
+    if (typeof fs17.statfsSync === "function") {
+      const stats = fs17.statfsSync(objectsDir);
+      fields.push(
+        `fsType=${stats.type}`,
+        `freeBytes=${stats.bavail * stats.bsize}`
+      );
+    }
+    const { estimate, sample } = sampleLooseObjects(objectsDir);
+    fields.push(`looseEstimate=${estimate}`);
+    const packDir = path16.join(objectsDir, "pack");
+    const packFiles = fs17.existsSync(packDir) ? fs17.readdirSync(packDir) : [];
+    fields.push(
+      `packs=${packFiles.filter((name) => name.endsWith(".pack")).length}`,
+      `promisorPacks=${packFiles.filter((name) => name.endsWith(".promisor")).length}`,
+      `alternates=${fs17.existsSync(path16.join(objectsDir, "info", "alternates")) ? "yes" : "no"}`
+    );
+    fields.push(...timeSampleReads(sample));
+    const named = namedObjects(stderr);
+    for (const sha of named) {
+      const loose = path16.join(objectsDir, sha.slice(0, 2), sha.slice(2));
+      const stats = fs17.statSync(loose, { throwIfNoEntry: false });
+      fields.push(
+        stats ? `named=${sha.slice(0, 8)}(size=${stats.size},blocks=${stats.blocks})` : `named=${sha.slice(0, 8)}(no loose file)`
+      );
+    }
+    fields.push(...gitVersion(repoRoot));
+    locateGitRead(fields, repoRoot, objectsDir, failedTreeish(args), [
+      ...sample.map(sampleSha).filter((sha) => !!sha),
+      ...named
+    ]);
+  } catch (err) {
+    fields.push(
+      `probeError=${err instanceof Error ? err.message : String(err)}`
+    );
+  } finally {
+    fields.push(`probeMs=${Date.now() - started}`);
+    appendLog("info", `git-traces: object store probe (${fields.join(", ")})`);
+  }
+}
+function resolveObjectsDir(repoRoot) {
+  let gitDir = path16.join(repoRoot, ".git");
+  const stats = fs17.statSync(gitDir, { throwIfNoEntry: false });
+  if (!stats) return null;
+  if (stats.isFile()) {
+    const match = /^gitdir:\s*(.+)$/m.exec(fs17.readFileSync(gitDir, "utf-8"));
+    if (!match) return null;
+    gitDir = path16.resolve(repoRoot, match[1].trim());
+  }
+  const commonDir = path16.join(gitDir, "commondir");
+  if (fs17.existsSync(commonDir)) {
+    gitDir = path16.resolve(gitDir, fs17.readFileSync(commonDir, "utf-8").trim());
+  }
+  return path16.join(gitDir, "objects");
+}
+function sampleLooseObjects(objectsDir) {
+  const fanout = fs17.readdirSync(objectsDir).filter((name) => /^[0-9a-f]{2}$/.test(name)).sort().slice(0, SAMPLE_FANOUT_DIRS);
+  let counted = 0;
+  const sample = [];
+  for (const dir of fanout) {
+    const files = fs17.readdirSync(path16.join(objectsDir, dir));
+    counted += files.length;
+    for (const file of files) {
+      if (sample.length >= SAMPLE_READS) break;
+      sample.push(path16.join(objectsDir, dir, file));
+    }
+  }
+  return {
+    estimate: fanout.length ? Math.round(counted / fanout.length * 256) : 0,
+    sample
+  };
+}
+function timeSampleReads(sample) {
+  let dataless = 0;
+  let readErrors = 0;
+  let firstReadError;
+  let totalMs = 0;
+  let maxMs = 0;
+  const buffer = Buffer.alloc(SAMPLE_READ_BYTES);
+  for (const file of sample) {
+    const readStarted = performance.now();
+    try {
+      const stats = fs17.statSync(file);
+      if (!stats.isFile()) continue;
+      if (stats.size > 0 && stats.blocks === 0) dataless++;
+      const fd = fs17.openSync(file, "r");
+      try {
+        fs17.readSync(fd, buffer, 0, SAMPLE_READ_BYTES, 0);
+      } finally {
+        fs17.closeSync(fd);
+      }
+    } catch (err) {
+      readErrors++;
+      firstReadError ??= err instanceof Error ? err.message : String(err);
+    }
+    const elapsed = performance.now() - readStarted;
+    totalMs += elapsed;
+    maxMs = Math.max(maxMs, elapsed);
+  }
+  const fields = [
+    `sampled=${sample.length}`,
+    `dataless=${dataless}`,
+    `readMsMax=${maxMs.toFixed(1)}`,
+    `readMsTotal=${totalMs.toFixed(1)}`,
+    `readErrors=${readErrors}`
+  ];
+  if (firstReadError) fields.push(`firstReadError=${firstReadError}`);
+  return fields;
+}
+function namedObjects(stderr) {
+  const shas = new Set(stderr?.match(/\b[0-9a-f]{40}\b/g) ?? []);
+  return [...shas].slice(0, MAX_NAMED_OBJECTS);
+}
+function sampleSha(file) {
+  const sha = path16.basename(path16.dirname(file)) + path16.basename(file);
+  return OBJECT_SHA.test(sha) ? sha : null;
+}
+function failedTreeish(args) {
+  for (const arg of args.slice(1).reverse()) {
+    if (OBJECT_SHA.test(arg) || arg.startsWith("refs/")) return arg;
+  }
+  return null;
+}
+function probeGit(repoRoot, args, timeout, input) {
+  return spawnSync("git", args, {
+    cwd: repoRoot,
+    input,
+    timeout,
+    killSignal: "SIGKILL",
+    maxBuffer: 64 * 1024 * 1024,
+    windowsHide: true,
+    // Never prompt or lazily fetch from inside a diagnostic.
+    env: { ...process.env, GIT_TERMINAL_PROMPT: "0", GIT_NO_LAZY_FETCH: "1" }
+  });
+}
+function gitVersion(repoRoot) {
+  const started = performance.now();
+  const result = probeGit(repoRoot, ["--version"], gitLimits.versionMs);
+  const version2 = result.stdout?.toString().trim().replace(/^git version /, "");
+  return [
+    `gitVersion=${result.status === 0 && version2 ? version2 : `unavailable(${result.error ? result.error.code : result.status})`}`,
+    `gitSpawnMs=${(performance.now() - started).toFixed(0)}`
+  ];
+}
+function locateGitRead(fields, repoRoot, objectsDir, treeish, fallback) {
+  let targets = null;
+  if (treeish) {
+    const listed = probeGit(
+      repoRoot,
+      ["ls-tree", "-r", "-z", treeish],
+      gitLimits.listMs
+    );
+    if (listed.status === 0 && listed.stdout) {
+      targets = treeBlobs(listed.stdout.toString());
+      fields.push(
+        `gitReadTarget=tree:${OBJECT_SHA.test(treeish) ? treeish.slice(0, 8) : treeish}`,
+        `treeBlobs=${targets.length}`
+      );
+      targets = targets.slice(0, MAX_LOCATE_BLOBS);
+    } else {
+      fields.push("gitReadTarget=sample", `lsTreeError=${failureText(listed)}`);
+    }
+  } else {
+    fields.push("gitReadTarget=sample");
+  }
+  targets ??= [...new Set(fallback)].map((sha) => ({ sha }));
+  if (targets.length === 0) return;
+  const started = performance.now();
+  const read = probeGit(
+    repoRoot,
+    ["cat-file", "--batch-check=%(objectname) %(objecttype) %(objectsize)"],
+    gitLimits.readMs,
+    `${targets.map((target) => target.sha).join("\n")}
+`
+  );
+  const answered = (read.stdout?.toString() ?? "").split("\n").slice(0, -1);
+  fields.push(
+    `gitRead=${answered.length}/${targets.length}`,
+    `gitReadMs=${(performance.now() - started).toFixed(1)}`,
+    `gitMissing=${answered.filter((line) => line.endsWith(" missing")).length}`
+  );
+  const stalled = targets[answered.length];
+  if (!stalled) return;
+  fields.push(
+    read.error?.code === "ETIMEDOUT" ? `gitReadTimeout=${gitLimits.readMs}` : `gitReadError=${failureText(read)}`,
+    `gitStalledOn=${stalled.sha.slice(0, 8)}`
+  );
+  if (stalled.path)
+    fields.push(
+      `stalledPath=${JSON.stringify(stalled.path.slice(0, MAX_STALLED_PATH_CHARS))}`
+    );
+  const loose = path16.join(
+    objectsDir,
+    stalled.sha.slice(0, 2),
+    stalled.sha.slice(2)
+  );
+  const stats = fs17.statSync(loose, { throwIfNoEntry: false });
+  fields.push(
+    stats ? `stalledLoose=size=${stats.size},blocks=${stats.blocks}` : "stalledLoose=no"
+  );
+  if (stats && process.platform !== "win32") {
+    const headStarted = performance.now();
+    const head = spawnSync("head", ["-c", "4096", loose], {
+      timeout: gitLimits.headMs,
+      killSignal: "SIGKILL"
+    });
+    fields.push(
+      head.error?.code === "ETIMEDOUT" ? `headTimeout=${gitLimits.headMs}` : `headMs=${(performance.now() - headStarted).toFixed(0)}`
+    );
+  }
+}
+function treeBlobs(listing) {
+  const blobs = /* @__PURE__ */ new Map();
+  for (const entry of listing.split("\0")) {
+    const tab = entry.indexOf("	");
+    if (tab < 0) continue;
+    const [, type, sha] = entry.slice(0, tab).split(" ");
+    if (type === "blob" && sha && !blobs.has(sha))
+      blobs.set(sha, entry.slice(tab + 1));
+  }
+  return [...blobs].map(([sha, blobPath]) => ({ sha, path: blobPath }));
+}
+function failureText(result) {
+  const error = result.error;
+  if (error) return error.code ?? error.message;
+  const stderr = result.stderr?.toString().trim().split("\n")[0];
+  return stderr || `exit=${result.status}`;
+}
+
+// src/git-traces/git-ops.ts
 var DEFAULT_GIT_COMMAND_TIMEOUT_MS = 12e4;
 var DEFAULT_BUNDLE_TIMEOUT_MS = 3e5;
 var FULL_TREE_SCAN_TIMEOUT_MS = 3e5;
@@ -15378,15 +15638,15 @@ var EXCLUDED_SNAPSHOT_BASENAMES = /* @__PURE__ */ new Set([
 ]);
 var EMPTY_TREE_SHA = "4b825dc642cb6eb9a060e54bf8d69288fbee4904";
 function isExcludedSnapshotPath(filePath) {
-  if (EXCLUDED_SNAPSHOT_BASENAMES.has(path16.basename(filePath))) return true;
-  return EXCLUDED_SNAPSHOT_EXTENSIONS.has(path16.extname(filePath).toLowerCase());
+  if (EXCLUDED_SNAPSHOT_BASENAMES.has(path17.basename(filePath))) return true;
+  return EXCLUDED_SNAPSHOT_EXTENSIONS.has(path17.extname(filePath).toLowerCase());
 }
 function isBinaryBuffer(buffer) {
   return buffer.includes(0);
 }
 function readTreeBlobHead(repoRoot, sha) {
   try {
-    const { stdout } = spawnSync("git", ["cat-file", "blob", sha], {
+    const { stdout } = spawnSync2("git", ["cat-file", "blob", sha], {
       cwd: repoRoot,
       timeout: GIT_COMMAND_TIMEOUT_MS,
       maxBuffer: BINARY_SNIFF_BYTES,
@@ -15400,16 +15660,16 @@ function readTreeBlobHead(repoRoot, sha) {
 function readWorkingFileHead(absPath) {
   let fd = null;
   try {
-    fd = fs17.openSync(absPath, "r");
+    fd = fs18.openSync(absPath, "r");
     const buffer = Buffer.alloc(BINARY_SNIFF_BYTES);
-    const bytesRead = fs17.readSync(fd, buffer, 0, BINARY_SNIFF_BYTES, 0);
+    const bytesRead = fs18.readSync(fd, buffer, 0, BINARY_SNIFF_BYTES, 0);
     return buffer.subarray(0, bytesRead);
   } catch {
     return null;
   } finally {
     if (fd !== null) {
       try {
-        fs17.closeSync(fd);
+        fs18.closeSync(fd);
       } catch {
       }
     }
@@ -15462,11 +15722,19 @@ function formatGitFailure(command, failure, err) {
   }
   return `${command} failed${details.length ? ` (${details.join("; ")})` : ""}`;
 }
-function createGitError(args, err, timeoutMs = GIT_COMMAND_TIMEOUT_MS) {
+function formatGitTimeout(command, failure, timeoutMs, elapsedMs) {
+  const details = [];
+  if (elapsedMs !== void 0) details.push(`elapsed=${elapsedMs}ms`);
+  if (failure.signal) details.push(`signal=${failure.signal}`);
+  const stderr = outputToString(failure.stderr);
+  if (stderr) details.push(`stderr=${truncateOutput(stderr)}`);
+  return `${command} timed out after ${timeoutMs}ms${details.length ? ` (${details.join("; ")})` : ""}`;
+}
+function createGitError(args, err, timeoutMs = GIT_COMMAND_TIMEOUT_MS, elapsedMs) {
   const failure = err;
   const command = formatGitCommand(args);
   const isTimeout = failure.code === "ETIMEDOUT";
-  const message = isTimeout ? `${command} timed out after ${timeoutMs}ms` : failure.code === "ENOBUFS" ? `${command} output exceeded the ${formatSize(failure.maxBufferBytes ?? EXEC_OPTS.maxBuffer)} limit` : formatGitFailure(command, failure, err);
+  const message = isTimeout ? formatGitTimeout(command, failure, timeoutMs, elapsedMs) : failure.code === "ENOBUFS" ? `${command} output exceeded the ${formatSize(failure.maxBufferBytes ?? EXEC_OPTS.maxBuffer)} limit` : formatGitFailure(command, failure, err);
   const wrapped = new Error(message);
   wrapped.isGitTimeout = isTimeout;
   wrapped.gitExitStatus = failure.code || failure.signal ? void 0 : failure.status;
@@ -15498,6 +15766,8 @@ function isGitTimeoutError(err) {
 }
 function gitBuffer(repoRoot, args, options = {}) {
   const timeout = options.timeoutMs ?? EXEC_OPTS.timeout;
+  const detached = options.killProcessGroup && process.platform !== "win32";
+  const started = Date.now();
   try {
     return execFileSync2("git", args, {
       cwd: repoRoot,
@@ -15505,10 +15775,28 @@ function gitBuffer(repoRoot, args, options = {}) {
       ...options.input !== void 0 ? { input: options.input } : {},
       stdio: ["pipe", "pipe", "pipe"],
       ...EXEC_OPTS,
-      timeout
+      timeout,
+      // Not in the sync typings, but spawnSync honors it (setsid).
+      ...detached ? { detached: true } : {}
     });
   } catch (err) {
-    throw createGitError(args, err, timeout);
+    const pid = err.pid;
+    if (detached && pid) {
+      try {
+        process.kill(-pid, "SIGKILL");
+      } catch {
+      }
+    }
+    const wrapped = createGitError(args, err, timeout, Date.now() - started);
+    if (wrapped.isGitTimeout || wrapped.isGitMissingObject && !options.expectMissingObjects) {
+      probeObjectStore(
+        repoRoot,
+        wrapped.isGitTimeout ? "timeout" : "missing-object",
+        wrapped.gitStderr,
+        args
+      );
+    }
+    throw wrapped;
   }
 }
 function git(repoRoot, args) {
@@ -15546,23 +15834,23 @@ function withPrivateIndex(repoRoot, run) {
   let tmpDir = null;
   let copy = null;
   try {
-    const indexPath = path16.resolve(
+    const indexPath = path17.resolve(
       repoRoot,
       git(repoRoot, ["rev-parse", "--git-path", "index"])
     );
-    tmpDir = fs17.mkdtempSync(path16.join(os7.tmpdir(), "hillclimb-index-"));
-    copy = path16.join(tmpDir, "index");
-    const fd = fs17.openSync(indexPath, "r");
+    tmpDir = fs18.mkdtempSync(path17.join(os7.tmpdir(), "hillclimb-index-"));
+    copy = path17.join(tmpDir, "index");
+    const fd = fs18.openSync(indexPath, "r");
     let stat;
     let data;
     try {
-      stat = fs17.fstatSync(fd);
-      data = fs17.readFileSync(fd);
+      stat = fs18.fstatSync(fd);
+      data = fs18.readFileSync(fd);
     } finally {
-      fs17.closeSync(fd);
+      fs18.closeSync(fd);
     }
-    fs17.writeFileSync(copy, data);
-    fs17.utimesSync(copy, stat.atime, stat.mtime);
+    fs18.writeFileSync(copy, data);
+    fs18.utimesSync(copy, stat.atime, stat.mtime);
   } catch (err) {
     const missing = err.code === "ENOENT";
     appendLog(
@@ -15574,7 +15862,7 @@ function withPrivateIndex(repoRoot, run) {
   try {
     return run(copy ? privateIndexEnv(copy) : null);
   } finally {
-    if (tmpDir) fs17.rmSync(tmpDir, { recursive: true, force: true });
+    if (tmpDir) fs18.rmSync(tmpDir, { recursive: true, force: true });
   }
 }
 function privateIndexEnv(indexPath) {
@@ -15638,7 +15926,7 @@ function captureWorkingCommitShaOnIndex(repoRoot, indexEnv) {
 function hasUnbornHead(repoRoot) {
   const ref = git(repoRoot, ["symbolic-ref", "--quiet", "HEAD"]);
   const args = ["show-ref", "--verify", "--quiet", ref];
-  const result = spawnSync("git", args, { cwd: repoRoot, ...EXEC_OPTS });
+  const result = spawnSync2("git", args, { cwd: repoRoot, ...EXEC_OPTS });
   if (result.error) throw createGitError(args, result.error);
   return result.status === 1;
 }
@@ -15657,20 +15945,99 @@ function deleteRef(repoRoot, refName) {
 function captureSnapshotSha(repoRoot) {
   return captureWorkingCommitSha(repoRoot);
 }
-function snapshotBlobInventory(repoRoot, treeish) {
-  const blobs = /* @__PURE__ */ new Map();
+var OBJECT_SHA2 = /^[0-9a-f]{40}(?:[0-9a-f]{24})?$/;
+function gitExpectingMissing(repoRoot, args) {
+  return gitBuffer(repoRoot, args, { expectMissingObjects: true }).toString("utf-8").trim();
+}
+function commitTreeSha(repoRoot, commit) {
+  const tree = gitExpectingMissing(repoRoot, [
+    "rev-list",
+    "--no-walk",
+    "--format=%T",
+    commit,
+    "--"
+  ]).split("\n").at(-1);
+  return tree && OBJECT_SHA2.test(tree) ? tree : null;
+}
+function listUnsharedObjects(repoRoot, treeSha, baseTrees) {
+  const out = gitExpectingMissing(repoRoot, [
+    "rev-list",
+    "--objects",
+    treeSha,
+    ...baseTrees.map((base) => `^${base}`),
+    "--"
+  ]);
+  const shas = /* @__PURE__ */ new Set();
+  for (const line of out.split("\n")) {
+    const sha = line.split(" ", 1)[0];
+    if (OBJECT_SHA2.test(sha)) shas.add(sha);
+  }
+  return [...shas];
+}
+function walkBaseTree(repoRoot, tree) {
+  gitExpectingMissing(repoRoot, ["rev-list", "--objects", `^${tree}`, "--"]);
+}
+function blobSizeTotals(repoRoot, shas) {
+  const totals = { bytes: 0, blobs: 0, unreadable: 0 };
+  for (const object of batchCheckObjects(repoRoot, shas)) {
+    if (object.type === "missing") totals.unreadable++;
+    else if (object.type === "blob" && object.size !== null) {
+      totals.bytes += object.size;
+      totals.blobs++;
+    }
+  }
+  return totals;
+}
+var gitVersionCache;
+function gitVersion2(repoRoot) {
+  if (gitVersionCache !== void 0) return gitVersionCache;
+  try {
+    const match = /git version (\d+)\.(\d+)(?:\.(\d+))?/.exec(
+      git(repoRoot, ["--version"])
+    );
+    gitVersionCache = match ? [Number(match[1]), Number(match[2]), Number(match[3] ?? 0)] : null;
+  } catch {
+    gitVersionCache = null;
+  }
+  return gitVersionCache;
+}
+function gitExcludesNegativeTrees(repoRoot) {
+  const version2 = gitVersion2(repoRoot);
+  if (!version2) return true;
+  const [major, minor, patch] = version2;
+  return major > 1 || minor > 8 || minor === 8 && patch >= 5;
+}
+function treeBlobSizes(repoRoot, treeSha) {
+  const sizes = /* @__PURE__ */ new Map();
+  for (const entry of lsTreeEntries(repoRoot, ["-l"], treeSha)) {
+    if (entry.type === "blob" && !sizes.has(entry.sha))
+      sizes.set(
+        entry.sha,
+        /^\d+$/.test(entry.size) ? Number(entry.size) : null
+      );
+  }
+  return sizes;
+}
+function treeBlobShas(repoRoot, treeSha) {
+  const shas = /* @__PURE__ */ new Set();
+  for (const entry of lsTreeEntries(repoRoot, [], treeSha)) {
+    if (entry.type === "blob") shas.add(entry.sha);
+  }
+  return shas;
+}
+function lsTreeEntries(repoRoot, flags, treeSha) {
+  const entries = [];
   for (const entry of gitBuffer(repoRoot, [
     "ls-tree",
     "-r",
-    "-l",
+    ...flags,
     "-z",
-    treeish
+    treeSha
   ]).toString("utf-8").split("\0")) {
-    const [, type, sha, size] = entry.slice(0, entry.indexOf("	")).trim().split(/\s+/);
-    if (type === "blob" && sha && /^\d+$/.test(size ?? ""))
-      blobs.set(sha, Number(size));
+    const [, type, sha, size = ""] = entry.slice(0, entry.indexOf("	")).trim().split(/\s+/);
+    if (type && sha) entries.push({ type, sha, size });
   }
-  return blobs;
+  return entries;
 }
 function formatSize(bytes) {
   if (bytes < 1024 * 1024) return `${(bytes / 1024).toFixed(1)} KB`;
@@ -15742,20 +16109,28 @@ function parseDiffTreeRawZ(output) {
 }
 function lookupBlobSizes(repoRoot, shas) {
   const sizes = /* @__PURE__ */ new Map();
-  if (shas.length === 0) return sizes;
+  for (const object of batchCheckObjects(repoRoot, shas)) {
+    if (object.type === "blob" && object.size !== null)
+      sizes.set(object.sha, object.size);
+  }
+  return sizes;
+}
+function batchCheckObjects(repoRoot, shas) {
+  if (shas.length === 0) return [];
   const out = gitBuffer(
     repoRoot,
     ["cat-file", "--batch-check=%(objectname) %(objecttype) %(objectsize)"],
     { input: `${shas.join("\n")}
 ` }
   ).toString("utf-8");
+  const objects = [];
   for (const line of out.split("\n")) {
     const [sha, type, sizeRaw] = line.split(" ");
-    if (type !== "blob") continue;
+    if (!sha || !type) continue;
     const size = Number.parseInt(sizeRaw, 10);
-    if (Number.isFinite(size)) sizes.set(sha, size);
+    objects.push({ sha, type, size: Number.isFinite(size) ? size : null });
   }
-  return sizes;
+  return objects;
 }
 function sortOmittedByPath(files) {
   return [...files].sort(
@@ -15904,7 +16279,7 @@ function filterOmittedFilesFromTree(repoRoot, treeSha, options = {}) {
   options.omittedFiles?.push(...omittedFiles);
   return timeCaptureStage(repoRoot, "tracked-tree-filter", () => {
     if (omittedFiles.length === 0) return treeSha;
-    const tmpIndex = path16.join(
+    const tmpIndex = path17.join(
       os7.tmpdir(),
       `hillclimb-filter-${Date.now()}-${process.pid}`
     );
@@ -15919,7 +16294,7 @@ function filterOmittedFilesFromTree(repoRoot, treeSha, options = {}) {
       return gitWithEnv(repoRoot, ["write-tree"], env);
     } finally {
       try {
-        fs17.unlinkSync(tmpIndex);
+        fs18.unlinkSync(tmpIndex);
       } catch {
       }
     }
@@ -15944,8 +16319,8 @@ function buildUntrackedTree(repoRoot, options = {}, attempt = 1) {
       if (!relPath) continue;
       candidates++;
       try {
-        const absPath = path16.join(repoRoot, relPath);
-        const stat = fs17.lstatSync(absPath);
+        const absPath = path17.join(repoRoot, relPath);
+        const stat = fs18.lstatSync(absPath);
         const reason = classifyOmission(
           relPath,
           stat.size,
@@ -15976,11 +16351,11 @@ function buildUntrackedTree(repoRoot, options = {}, attempt = 1) {
     `git-traces: untracked inventory (repo=${repoRoot}, candidates=${candidates}, kept=${kept.length}, keptBytes=${keptBytes}, omitted=${omitted}, omittedBytes=${omittedBytes}, skipped=${skipped})`
   );
   if (kept.length === 0) return null;
-  const tmpDir = fs17.mkdtempSync(path16.join(os7.tmpdir(), "hillclimb-untracked-"));
+  const tmpDir = fs18.mkdtempSync(path17.join(os7.tmpdir(), "hillclimb-untracked-"));
   const env = {
     ...process.env,
     LC_ALL: "C",
-    GIT_INDEX_FILE: path16.join(tmpDir, "index")
+    GIT_INDEX_FILE: path17.join(tmpDir, "index")
   };
   try {
     timeCaptureStage(
@@ -16008,7 +16383,7 @@ function buildUntrackedTree(repoRoot, options = {}, attempt = 1) {
     return buildUntrackedTree(repoRoot, options, attempt + 1);
   } finally {
     try {
-      fs17.rmSync(tmpDir, { recursive: true, force: true });
+      fs18.rmSync(tmpDir, { recursive: true, force: true });
     } catch {
     }
   }
@@ -16054,10 +16429,10 @@ function buildSnapshotTree(repoRoot, stashSha, options = {}) {
           `git-traces: tree assembly reused (repo=${repoRoot})`
         );
         return previous.snapshotTreeSha;
-      } catch {
+      } catch (err) {
         appendLog(
           "info",
-          `git-traces: tree assembly cache unavailable; rebuilding (repo=${repoRoot})`
+          `git-traces: tree assembly cache unavailable; rebuilding (repo=${repoRoot}): ${err instanceof Error ? err.message : String(err)}`
         );
       }
     }
@@ -16079,7 +16454,7 @@ function mergeSnapshotTrees(repoRoot, filteredTrackedTree, untrackedTree) {
   if (!untrackedTree || untrackedTree === EMPTY_TREE_SHA)
     return filteredTrackedTree;
   if (filteredTrackedTree === EMPTY_TREE_SHA) return untrackedTree;
-  const tmpIndex = path16.join(
+  const tmpIndex = path17.join(
     os7.tmpdir(),
     `hillclimb-index-${Date.now()}-${process.pid}`
   );
@@ -16108,7 +16483,7 @@ function mergeSnapshotTrees(repoRoot, filteredTrackedTree, untrackedTree) {
     );
   } finally {
     try {
-      fs17.unlinkSync(tmpIndex);
+      fs18.unlinkSync(tmpIndex);
     } catch {
     }
   }
@@ -16123,18 +16498,19 @@ function createBundleFromTree(repoRoot, treeSha, sessionId, label) {
   pinRef(repoRoot, orphanRef, orphanCommit);
   let tmpDir;
   try {
-    tmpDir = fs17.mkdtempSync(
-      path16.join(os7.tmpdir(), `hillclimb-bundle-${process.pid}-`)
+    tmpDir = fs18.mkdtempSync(
+      path17.join(os7.tmpdir(), `hillclimb-bundle-${process.pid}-`)
     );
-    const tmpFile = path16.join(tmpDir, "baseline.bundle");
+    const tmpFile = path17.join(tmpDir, "baseline.bundle");
     timeCaptureStage(
       repoRoot,
       "bundle-create",
       () => gitBuffer(repoRoot, ["bundle", "create", tmpFile, orphanRef], {
-        timeoutMs: resolveGitCommandTimeoutMs(DEFAULT_BUNDLE_TIMEOUT_MS)
+        timeoutMs: resolveGitCommandTimeoutMs(DEFAULT_BUNDLE_TIMEOUT_MS),
+        killProcessGroup: true
       })
     );
-    const bundle = fs17.readFileSync(tmpFile);
+    const bundle = fs18.readFileSync(tmpFile);
     appendLog(
       "info",
       `git-traces: bundle inventory (repo=${repoRoot}, bytes=${bundle.length})`
@@ -16142,7 +16518,7 @@ function createBundleFromTree(repoRoot, treeSha, sessionId, label) {
     return bundle;
   } finally {
     try {
-      if (tmpDir) fs17.rmSync(tmpDir, { recursive: true, force: true });
+      if (tmpDir) fs18.rmSync(tmpDir, { recursive: true, force: true });
     } catch {
     }
     deleteRef(repoRoot, orphanRef);
@@ -16151,6 +16527,7 @@ function createBundleFromTree(repoRoot, treeSha, sessionId, label) {
 var MAX_PATCH_GZ_BYTES = 500 * 1024 * 1024;
 function gitGzipStream(repoRoot, args, maxGzBytes) {
   return new Promise((resolve, reject) => {
+    const started = Date.now();
     const child = spawn2("git", args, {
       cwd: repoRoot,
       stdio: ["ignore", "pipe", "pipe"],
@@ -16179,7 +16556,18 @@ function gitGzipStream(repoRoot, args, maxGzBytes) {
       settled = true;
       clearTimeout(timer);
       if (timedOut) {
-        reject(createGitError(args, { code: "ETIMEDOUT" }));
+        const wrapped = createGitError(
+          args,
+          {
+            code: "ETIMEDOUT",
+            signal: exitSignal,
+            stderr: Buffer.concat(stderrChunks)
+          },
+          GIT_COMMAND_TIMEOUT_MS,
+          Date.now() - started
+        );
+        probeObjectStore(repoRoot, "timeout", wrapped.gitStderr, args);
+        reject(wrapped);
       } else if (overflowed) {
         reject(
           createGitError(args, { code: "ENOBUFS", maxBufferBytes: maxGzBytes })
@@ -16441,9 +16829,9 @@ function parseCommitFiles(repoRoot, sha) {
         oldPath
       });
     } else {
-      const path27 = parts[parts.length - 1];
-      indexByPath.set(path27, files.length);
-      files.push({ path: path27, status, additions: 0, deletions: 0 });
+      const path28 = parts[parts.length - 1];
+      indexByPath.set(path28, files.length);
+      files.push({ path: path28, status, additions: 0, deletions: 0 });
     }
   }
   for (const line of numstat.split("\n")) {
@@ -16527,11 +16915,11 @@ function countScopedTurnTreeRefs(repoRoot, sessionId, epochPrefix3) {
 
 // src/git-traces/session-state.ts
 import crypto6 from "crypto";
-import fs18 from "fs";
+import fs19 from "fs";
 import os8 from "os";
-import path17 from "path";
+import path18 from "path";
 var CURRENT_SCHEMA_VERSION3 = 3;
-var DEFAULT_STATE_DIR2 = path17.join(os8.homedir(), ".hillclimb", "git-traces");
+var DEFAULT_STATE_DIR2 = path18.join(os8.homedir(), ".hillclimb", "git-traces");
 var LOCK_RETRIES2 = 120;
 var LOCK_RETRY_DELAY_MS2 = 500;
 var DEFAULT_LIVE_OWNER_MAX_WAIT_MS2 = 10 * 60 * 1e3;
@@ -16556,16 +16944,16 @@ function stateDir3() {
 }
 function stateFileForRepo(repoRoot, tool, sessionId) {
   const hash = crypto6.createHash("sha256").update(
-    sessionId ? `${path17.resolve(repoRoot)}\0${tool}\0${sessionId}` : `${path17.resolve(repoRoot)}\0${tool}`
+    sessionId ? `${path18.resolve(repoRoot)}\0${tool}\0${sessionId}` : `${path18.resolve(repoRoot)}\0${tool}`
   ).digest("hex").slice(0, 16);
-  return path17.join(stateDir3(), `${hash}.json`);
+  return path18.join(stateDir3(), `${hash}.json`);
 }
 function lockFileForRepo(repoRoot, tool, sessionId) {
   return `${stateFileForRepo(repoRoot, tool, sessionId)}.lock`;
 }
 async function readStateFile(file) {
   try {
-    const raw = await fs18.promises.readFile(file, "utf-8");
+    const raw = await fs19.promises.readFile(file, "utf-8");
     const parsed = JSON.parse(raw);
     if (parsed.schemaVersion !== CURRENT_SCHEMA_VERSION3) {
       return null;
@@ -16579,7 +16967,7 @@ async function readStoredStateFile(file) {
   const state = await readStateFile(file);
   if (!state) return null;
   try {
-    return { state, mtimeMs: (await fs18.promises.stat(file)).mtimeMs };
+    return { state, mtimeMs: (await fs19.promises.stat(file)).mtimeMs };
   } catch {
     return null;
   }
@@ -16587,26 +16975,26 @@ async function readStoredStateFile(file) {
 async function listScopedSessionStates(repoRoot, tool) {
   let entries;
   try {
-    entries = await fs18.promises.readdir(stateDir3(), { withFileTypes: true });
+    entries = await fs19.promises.readdir(stateDir3(), { withFileTypes: true });
   } catch {
     return [];
   }
   const states = [];
   for (const entry of entries) {
     if (!entry.isFile() || !entry.name.endsWith(".json")) continue;
-    const file = path17.join(stateDir3(), entry.name);
+    const file = path18.join(stateDir3(), entry.name);
     const state = await readStateFile(file);
     if (!state) continue;
     if (typeof state.repoRoot !== "string" || typeof state.sessionId !== "string") {
       continue;
     }
-    if (path17.resolve(state.repoRoot) !== path17.resolve(repoRoot)) continue;
-    if (path17.resolve(file) !== path17.resolve(stateFileForRepo(repoRoot, tool, state.sessionId))) {
+    if (path18.resolve(state.repoRoot) !== path18.resolve(repoRoot)) continue;
+    if (path18.resolve(file) !== path18.resolve(stateFileForRepo(repoRoot, tool, state.sessionId))) {
       continue;
     }
     let mtimeMs = 0;
     try {
-      mtimeMs = (await fs18.promises.stat(file)).mtimeMs;
+      mtimeMs = (await fs19.promises.stat(file)).mtimeMs;
     } catch {
       continue;
     }
@@ -16617,26 +17005,26 @@ async function listScopedSessionStates(repoRoot, tool) {
 async function listSessionStatesForSession(tool, sessionId) {
   let entries;
   try {
-    entries = await fs18.promises.readdir(stateDir3(), { withFileTypes: true });
+    entries = await fs19.promises.readdir(stateDir3(), { withFileTypes: true });
   } catch {
     return [];
   }
   const states = [];
   for (const entry of entries) {
     if (!entry.isFile() || !entry.name.endsWith(".json")) continue;
-    const file = path17.join(stateDir3(), entry.name);
+    const file = path18.join(stateDir3(), entry.name);
     const state = await readStateFile(file);
     if (!state) continue;
     if (typeof state.repoRoot !== "string" || typeof state.sessionId !== "string") {
       continue;
     }
     if (state.sessionId !== sessionId) continue;
-    if (path17.resolve(file) !== path17.resolve(stateFileForRepo(state.repoRoot, tool, sessionId))) {
+    if (path18.resolve(file) !== path18.resolve(stateFileForRepo(state.repoRoot, tool, sessionId))) {
       continue;
     }
     let mtimeMs = 0;
     try {
-      mtimeMs = (await fs18.promises.stat(file)).mtimeMs;
+      mtimeMs = (await fs19.promises.stat(file)).mtimeMs;
     } catch {
       continue;
     }
@@ -16685,17 +17073,17 @@ async function writeLegacySessionState(state, tool) {
   );
 }
 async function writeStateFile(file, state) {
-  await fs18.promises.mkdir(stateDir3(), { recursive: true, mode: 448 });
+  await fs19.promises.mkdir(stateDir3(), { recursive: true, mode: 448 });
   const tmp = `${file}.tmp`;
-  await fs18.promises.writeFile(tmp, JSON.stringify(state, null, 2), {
+  await fs19.promises.writeFile(tmp, JSON.stringify(state, null, 2), {
     mode: 384
   });
-  await fs18.promises.rename(tmp, file);
+  await fs19.promises.rename(tmp, file);
 }
 async function touchSessionState(repoRoot, tool, sessionId) {
   const now = /* @__PURE__ */ new Date();
   try {
-    await fs18.promises.utimes(
+    await fs19.promises.utimes(
       stateFileForRepo(repoRoot, tool, sessionId),
       now,
       now
@@ -16705,7 +17093,7 @@ async function touchSessionState(repoRoot, tool, sessionId) {
 }
 async function statSessionStateMtime(repoRoot, tool, sessionId) {
   try {
-    const stat = await fs18.promises.stat(
+    const stat = await fs19.promises.stat(
       stateFileForRepo(repoRoot, tool, sessionId)
     );
     return stat.mtimeMs;
@@ -16715,7 +17103,7 @@ async function statSessionStateMtime(repoRoot, tool, sessionId) {
 }
 async function deleteStateFile(file) {
   try {
-    await fs18.promises.unlink(file);
+    await fs19.promises.unlink(file);
   } catch {
   }
 }
@@ -16754,7 +17142,7 @@ async function acquireLock3(repoRoot, tool, sessionId, retries, delayMs, options
 }
 async function acquireLockWithoutTiming(repoRoot, tool, sessionId, retries, delayMs, options = {}) {
   const lockPath = lockFileForRepo(repoRoot, tool, sessionId);
-  await fs18.promises.mkdir(stateDir3(), { recursive: true, mode: 448 });
+  await fs19.promises.mkdir(stateDir3(), { recursive: true, mode: 448 });
   const bounded = retries !== void 0 || delayMs !== void 0;
   const attempts = retries ?? LOCK_RETRIES2;
   const delay = delayMs ?? LOCK_RETRY_DELAY_MS2;
@@ -16764,9 +17152,9 @@ async function acquireLockWithoutTiming(repoRoot, tool, sessionId, retries, dela
   let extensionLogged = false;
   for (let i = 0; ; i++) {
     try {
-      const fd = await fs18.promises.open(
+      const fd = await fs19.promises.open(
         lockPath,
-        fs18.constants.O_CREAT | fs18.constants.O_EXCL | fs18.constants.O_WRONLY
+        fs19.constants.O_CREAT | fs19.constants.O_EXCL | fs19.constants.O_WRONLY
       );
       await fd.write(String(process.pid));
       await fd.close();
@@ -16775,7 +17163,7 @@ async function acquireLockWithoutTiming(repoRoot, tool, sessionId, retries, dela
       if (err.code !== "EEXIST") throw err;
       let regularLockFile = false;
       try {
-        regularLockFile = (await fs18.promises.lstat(lockPath)).isFile();
+        regularLockFile = (await fs19.promises.lstat(lockPath)).isFile();
       } catch (statErr) {
         if (statErr.code === "ENOENT") {
           i--;
@@ -16837,21 +17225,21 @@ async function acquireLockWithoutTiming(repoRoot, tool, sessionId, retries, dela
 }
 async function releaseLock3(repoRoot, tool, sessionId) {
   try {
-    await fs18.promises.unlink(lockFileForRepo(repoRoot, tool, sessionId));
+    await fs19.promises.unlink(lockFileForRepo(repoRoot, tool, sessionId));
   } catch {
   }
 }
 async function sweepStaleLockFiles(ttlMs = STALE_LOCK_TTL_MS3, now = Date.now()) {
   let entries;
   try {
-    entries = await fs18.promises.readdir(stateDir3(), { withFileTypes: true });
+    entries = await fs19.promises.readdir(stateDir3(), { withFileTypes: true });
   } catch {
     return 0;
   }
   let removed = 0;
   for (const entry of entries) {
     if (!entry.isFile() || !entry.name.endsWith(".lock")) continue;
-    const file = path17.join(stateDir3(), entry.name);
+    const file = path18.join(stateDir3(), entry.name);
     if (await reapLockIfStale(file, {
       maxAgeMs: ttlMs,
       preserveLiveOwner: true,
@@ -16878,6 +17266,13 @@ function replayBackoffMs(attempts) {
     REPLAY_BACKOFF_MAX_MS
   );
 }
+function bundleBackoffRemainingMs(timeout, now) {
+  if (!timeout) return 0;
+  return Math.max(
+    0,
+    timeout.lastAttemptAt + replayBackoffMs(timeout.attempts) - now
+  );
+}
 function replayEligibility(oldestCapturedAt, replay, now) {
   if (now - oldestCapturedAt < STRANDED_MIN_AGE_MS)
     return { eligible: false, reason: "young" };
@@ -16906,12 +17301,12 @@ function withPendingCapture(record, work) {
   return activeCapture.run({ record, save: () => saveCapture(record) }, work);
 }
 function queueDirectory(repoRoot, tool, sessionId) {
-  const stateDir4 = process.env.HILLCLIMB_GIT_TRACES_STATE_DIR ?? path18.join(os9.homedir(), ".hillclimb", "git-traces");
-  const key = crypto7.createHash("sha256").update(`${path18.resolve(repoRoot)}\0${tool}\0${sessionId}`).digest("hex");
-  return path18.join(stateDir4, "pending-v1", key);
+  const stateDir4 = process.env.HILLCLIMB_GIT_TRACES_STATE_DIR ?? path19.join(os9.homedir(), ".hillclimb", "git-traces");
+  const key = crypto7.createHash("sha256").update(`${path19.resolve(repoRoot)}\0${tool}\0${sessionId}`).digest("hex");
+  return path19.join(stateDir4, "pending-v1", key);
 }
 function captureDirectory(record) {
-  return path18.join(
+  return path19.join(
     queueDirectory(record.repoRoot, record.tool, record.sessionId),
     record.id
   );
@@ -16919,20 +17314,20 @@ function captureDirectory(record) {
 function writeDurable(file, body) {
   const temporary = `${file}.${process.pid}.tmp`;
   try {
-    const descriptor = fs19.openSync(temporary, "w", 384);
+    const descriptor = fs20.openSync(temporary, "w", 384);
     try {
-      fs19.writeFileSync(descriptor, body);
-      fs19.fsyncSync(descriptor);
+      fs20.writeFileSync(descriptor, body);
+      fs20.fsyncSync(descriptor);
     } finally {
-      fs19.closeSync(descriptor);
+      fs20.closeSync(descriptor);
     }
-    fs19.renameSync(temporary, file);
+    fs20.renameSync(temporary, file);
     try {
-      const directory = fs19.openSync(path18.dirname(file), "r");
+      const directory = fs20.openSync(path19.dirname(file), "r");
       try {
-        fs19.fsyncSync(directory);
+        fs20.fsyncSync(directory);
       } finally {
-        fs19.closeSync(directory);
+        fs20.closeSync(directory);
       }
     } catch (err) {
       if (!["EINVAL", "ENOTSUP", "EBADF", "EPERM", "EISDIR"].includes(
@@ -16941,7 +17336,7 @@ function writeDurable(file, body) {
         throw err;
     }
   } finally {
-    if (fs19.existsSync(temporary)) fs19.unlinkSync(temporary);
+    if (fs20.existsSync(temporary)) fs20.unlinkSync(temporary);
   }
 }
 function saveCapture(record) {
@@ -16952,7 +17347,7 @@ function saveCapture(record) {
   let status = "failed";
   try {
     writeDurable(
-      path18.join(captureDirectory(record), "capture.json"),
+      path19.join(captureDirectory(record), "capture.json"),
       JSON.stringify(record)
     );
     status = "ok";
@@ -16964,7 +17359,7 @@ function listPendingCaptures2(repoRoot, tool, sessionId) {
   const directory = queueDirectory(repoRoot, tool, sessionId);
   let entries;
   try {
-    entries = fs19.readdirSync(directory, { withFileTypes: true });
+    entries = fs20.readdirSync(directory, { withFileTypes: true });
   } catch (err) {
     if (err.code === "ENOENT") return [];
     throw err;
@@ -16972,10 +17367,10 @@ function listPendingCaptures2(repoRoot, tool, sessionId) {
   const records = [];
   for (const entry of entries) {
     if (!entry.isDirectory() || !/^[0-9a-f-]{36}$/.test(entry.name)) continue;
-    const file = path18.join(directory, entry.name, "capture.json");
-    if (!fs19.existsSync(file)) continue;
+    const file = path19.join(directory, entry.name, "capture.json");
+    if (!fs20.existsSync(file)) continue;
     const record = JSON.parse(
-      fs19.readFileSync(file, "utf-8")
+      fs20.readFileSync(file, "utf-8")
     );
     if (record.version !== 1 || record.id !== entry.name || record.repoRoot !== repoRoot || record.tool !== tool || record.sessionId !== sessionId) {
       throw new Error(`Invalid pending Git capture: ${file}`);
@@ -16988,13 +17383,13 @@ function hasPendingCaptures(repoRoot, tool, sessionId) {
   return listPendingCaptures2(repoRoot, tool, sessionId).length > 0;
 }
 function listPendingQueues() {
-  const root = path18.join(
-    process.env.HILLCLIMB_GIT_TRACES_STATE_DIR ?? path18.join(os9.homedir(), ".hillclimb", "git-traces"),
+  const root = path19.join(
+    process.env.HILLCLIMB_GIT_TRACES_STATE_DIR ?? path19.join(os9.homedir(), ".hillclimb", "git-traces"),
     "pending-v1"
   );
   let queueDirs;
   try {
-    queueDirs = fs19.readdirSync(root, { withFileTypes: true });
+    queueDirs = fs20.readdirSync(root, { withFileTypes: true });
   } catch (err) {
     if (err.code === "ENOENT") return [];
     throw err;
@@ -17002,15 +17397,15 @@ function listPendingQueues() {
   const queues = [];
   for (const queueDir of queueDirs) {
     if (!queueDir.isDirectory()) continue;
-    const directory = path18.join(root, queueDir.name);
+    const directory = path19.join(root, queueDir.name);
     let identity = null;
     try {
-      for (const entry of fs19.readdirSync(directory, { withFileTypes: true })) {
+      for (const entry of fs20.readdirSync(directory, { withFileTypes: true })) {
         if (!entry.isDirectory()) continue;
-        const file = path18.join(directory, entry.name, "capture.json");
-        if (!fs19.existsSync(file)) continue;
+        const file = path19.join(directory, entry.name, "capture.json");
+        if (!fs20.existsSync(file)) continue;
         identity = JSON.parse(
-          fs19.readFileSync(file, "utf-8")
+          fs20.readFileSync(file, "utf-8")
         );
         break;
       }
@@ -17043,15 +17438,15 @@ function noteReplayFailure(record, error, now = Date.now()) {
 }
 function queueDiskBytes(directory) {
   let diskBytes = 0;
-  if (fs19.existsSync(directory)) {
-    for (const entry of fs19.readdirSync(directory, { withFileTypes: true })) {
+  if (fs20.existsSync(directory)) {
+    for (const entry of fs20.readdirSync(directory, { withFileTypes: true })) {
       if (!entry.isDirectory()) continue;
-      for (const file of fs19.readdirSync(path18.join(directory, entry.name), {
+      for (const file of fs20.readdirSync(path19.join(directory, entry.name), {
         withFileTypes: true
       })) {
         if (file.isFile())
-          diskBytes += fs19.statSync(
-            path18.join(directory, entry.name, file.name)
+          diskBytes += fs20.statSync(
+            path19.join(directory, entry.name, file.name)
           ).size;
       }
     }
@@ -17059,7 +17454,7 @@ function queueDiskBytes(directory) {
   return diskBytes;
 }
 function chargedBytes(record) {
-  return record.retainedBytes ?? record.treeBytes;
+  return record.retainedBytes ?? record.treeBytes ?? 0;
 }
 function pendingBytes(records) {
   const first = records[0];
@@ -17067,46 +17462,113 @@ function pendingBytes(records) {
   return queueDiskBytes(
     queueDirectory(first.repoRoot, first.tool, first.sessionId)
   ) + records.reduce(
-    (sum, record) => sum + chargedBytes(record) + (fs19.existsSync(path18.join(captureDirectory(record), "capture.json")) ? 0 : Buffer.byteLength(JSON.stringify(record))),
+    (sum, record) => sum + chargedBytes(record) + (fs20.existsSync(path19.join(captureDirectory(record), "capture.json")) ? 0 : Buffer.byteLength(JSON.stringify(record))),
     0
   );
 }
+function warnMissingBase(repoRoot, base) {
+  appendLog(
+    "warn",
+    `git-traces: capture base is missing for retention accounting; charging unshared content (repo=${repoRoot}, base=${base})`
+  );
+}
 function measureTreeRetention(repoRoot, treeSha, bases, context) {
   const finish = startCaptureStage("tree-inventory", context);
   let status = "failed";
   let details;
   try {
-    const blobs = snapshotBlobInventory(repoRoot, treeSha);
-    const shared = /* @__PURE__ */ new Set();
-    let basesRead = 0;
-    for (const base of new Set(
-      bases.filter((base2) => !!base2)
-    )) {
+    const trees = [
+      ...new Set(bases.trees.filter((base) => !!base))
+    ];
+    if (!trees.includes(treeSha) && bases.headSha) {
       try {
-        const baseBlobs = base === treeSha ? blobs : snapshotBlobInventory(repoRoot, base);
-        for (const sha of baseBlobs.keys()) shared.add(sha);
-        basesRead++;
+        const headTree = commitTreeSha(repoRoot, bases.headSha);
+        if (headTree && !trees.includes(headTree)) trees.push(headTree);
+        if (!headTree) warnMissingBase(repoRoot, bases.headSha);
       } catch (err) {
         if (!isMissingObjectError(err)) throw err;
-        appendLog(
-          "warn",
-          `git-traces: capture base is missing for retention accounting; charging unshared content (repo=${repoRoot}, base=${base})`
-        );
+        warnMissingBase(repoRoot, bases.headSha);
       }
     }
-    let treeBytes = 0;
-    let retainedBytes = 0;
-    for (const [sha, size] of blobs) {
-      treeBytes += size;
-      if (!shared.has(sha)) retainedBytes += size;
+    if (trees.includes(treeSha)) {
+      status = "ok";
+      details = "retainedBytes=0, sameAsBase=yes";
+      return 0;
+    }
+    let totals;
+    if (gitExcludesNegativeTrees(repoRoot)) {
+      const { objects, usable } = unsharedObjects(repoRoot, treeSha, trees);
+      totals = { ...blobSizeTotals(repoRoot, objects), used: usable };
+    } else {
+      totals = legacyRetention(repoRoot, treeSha, trees);
     }
+    const { used } = totals;
     status = "ok";
-    details = `treeBytes=${treeBytes}, treeFiles=${blobs.size}, retainedBytes=${retainedBytes}, bases=${basesRead}`;
-    return { treeBytes, treeFiles: blobs.size, retainedBytes };
+    details = `retainedBytes=${totals.bytes}, retainedBlobs=${totals.blobs}, bases=${used}`;
+    if (totals.unreadable > 0)
+      details += `, unreadableBlobs=${totals.unreadable}`;
+    if (used < trees.length) details += `, droppedBases=${trees.length - used}`;
+    return totals.bytes;
   } finally {
     finish(status, details);
   }
 }
+function legacyRetention(repoRoot, treeSha, bases) {
+  appendLog(
+    "info",
+    `git-traces: git before 1.8.5 ignores negative trees; measuring retention from ls-tree (repo=${repoRoot})`
+  );
+  const shared = /* @__PURE__ */ new Set();
+  let used = 0;
+  for (const base of bases) {
+    try {
+      for (const sha of treeBlobShas(repoRoot, base)) shared.add(sha);
+      used++;
+    } catch (err) {
+      if (!isMissingObjectError(err)) throw err;
+      warnMissingBase(repoRoot, base);
+    }
+  }
+  const totals = { bytes: 0, blobs: 0, unreadable: 0, used };
+  for (const [sha, size] of treeBlobSizes(repoRoot, treeSha)) {
+    if (shared.has(sha)) continue;
+    if (size === null) totals.unreadable++;
+    else {
+      totals.bytes += size;
+      totals.blobs++;
+    }
+  }
+  return totals;
+}
+function unsharedObjects(repoRoot, treeSha, bases) {
+  try {
+    return {
+      objects: listUnsharedObjects(repoRoot, treeSha, bases),
+      usable: bases.length
+    };
+  } catch (err) {
+    if (!isMissingObjectError(err) || bases.length === 0) throw err;
+    const usable = bases.filter((base) => {
+      try {
+        walkBaseTree(repoRoot, base);
+        return true;
+      } catch (baseErr) {
+        if (!isMissingObjectError(baseErr)) throw baseErr;
+        warnMissingBase(repoRoot, base);
+        return false;
+      }
+    });
+    if (usable.length === bases.length)
+      return {
+        objects: listUnsharedObjects(repoRoot, treeSha, bases),
+        usable: bases.length
+      };
+    return {
+      objects: listUnsharedObjects(repoRoot, treeSha, usable),
+      usable: usable.length
+    };
+  }
+}
 async function withCaptureQueueLock(repoRoot, tool, sessionId, work) {
   const lockTool = `${tool}:capture-queue-v1`;
   await acquireLock3(repoRoot, lockTool, sessionId);
@@ -17130,21 +17592,26 @@ function storePendingCapture(params) {
       params.tool,
       params.sessionId
     );
-    const retention = measureTreeRetention(
+    const retainedBytes = measureTreeRetention(
       params.repoRoot,
       input.treeSha,
-      [
-        existing.at(-1)?.treeSha,
-        params.seed.lastSnapshotTreeSha,
-        params.seed.baselineTreeSha,
-        input.headSha
-      ],
+      {
+        trees: [
+          existing.at(-1)?.treeSha,
+          params.seed.lastSnapshotTreeSha,
+          params.seed.baselineTreeSha
+        ],
+        headSha: input.headSha
+      },
       `repo=${params.repoRoot}, tool=${params.tool}, session=${params.sessionId}, recordedAt=${params.recordedAt}`
     );
     const record = {
       ...identity,
       ...input,
-      ...retention,
+      retainedBytes,
+      // 0.8.12 sums treeBytes with no fallback; a missing value would
+      // disable its byte limit for the whole queue.
+      treeBytes: retainedBytes,
       version: 1,
       id: crypto7.randomUUID(),
       sequence: Math.max(Date.now(), (existing.at(-1)?.sequence ?? 0) + 1),
@@ -17153,14 +17620,14 @@ function storePendingCapture(params) {
     const pendingBefore = queueDiskBytes(
       queueDirectory(params.repoRoot, params.tool, params.sessionId)
     ) + existing.reduce((sum, item) => sum + chargedBytes(item), 0);
-    const incomingBytes = retention.retainedBytes + Buffer.byteLength(JSON.stringify(record));
+    const incomingBytes = retainedBytes + Buffer.byteLength(JSON.stringify(record));
     if (existing.length >= MAX_CAPTURES || pendingBefore + incomingBytes > MAX_PENDING_BYTES2) {
       throw new PendingCaptureLimitError(
-        `Pending Git capture limit reached (count=${existing.length}, maxCount=${MAX_CAPTURES}, pendingBytes=${pendingBefore}, incomingBytes=${incomingBytes}, treeBytes=${retention.treeBytes}, maxBytes=${MAX_PENDING_BYTES2}); existing captures retained`
+        `Pending Git capture limit reached (count=${existing.length}, maxCount=${MAX_CAPTURES}, pendingBytes=${pendingBefore}, incomingBytes=${incomingBytes}, retainedBytes=${retainedBytes}, maxBytes=${MAX_PENDING_BYTES2}); existing captures retained`
       );
     }
     const directory = captureDirectory(record);
-    fs19.mkdirSync(directory, { recursive: true, mode: 448 });
+    fs20.mkdirSync(directory, { recursive: true, mode: 448 });
     const refRoot = `refs/hillclimb/pending-v1/${record.id}`;
     let published = false;
     try {
@@ -17198,12 +17665,12 @@ function storePendingCapture(params) {
       durableDetails = `capture=${record.id}, durableCapturedAt=${durableCapturedAt}`;
       appendLog(
         "info",
-        `git-traces: capture queued (repo=${record.repoRoot}, session=${record.sessionId}, capture=${record.id}, recordedAt=${record.recordedAt}, captureStartedAt=${record.captureStartedAt}, capturedAt=${record.capturedAt}, sourceCapturedAt=${record.capturedAt}, durableCapturedAt=${durableCapturedAt}, pending=${existing.length + 1}, oldestPendingAgeMs=${Date.now() - (existing[0]?.capturedAt ?? record.capturedAt)}, treeBytes=${record.treeBytes}, treeFiles=${record.treeFiles}, retainedBytes=${record.retainedBytes}, pendingBytes=${pendingBefore + incomingBytes})`
+        `git-traces: capture queued (repo=${record.repoRoot}, session=${record.sessionId}, capture=${record.id}, recordedAt=${record.recordedAt}, captureStartedAt=${record.captureStartedAt}, capturedAt=${record.capturedAt}, sourceCapturedAt=${record.capturedAt}, durableCapturedAt=${durableCapturedAt}, pending=${existing.length + 1}, oldestPendingAgeMs=${Date.now() - (existing[0]?.capturedAt ?? record.capturedAt)}, retainedBytes=${record.retainedBytes}, pendingBytes=${pendingBefore + incomingBytes})`
       );
       return record;
     } finally {
       if (!published) {
-        fs19.rmSync(directory, { recursive: true, force: true });
+        fs20.rmSync(directory, { recursive: true, force: true });
         for (const label of [
           "snapshot",
           "tree",
@@ -17234,7 +17701,7 @@ async function preparePendingUpload(context, contributionId, filename, buffer) {
       let status = "failed";
       try {
         if (saved) {
-          const bytes = fs19.readFileSync(path18.join(directory, saved.file));
+          const bytes = fs20.readFileSync(path19.join(directory, saved.file));
           if (bytes.length !== saved.bytes || crypto7.createHash("sha256").update(bytes).digest("hex") !== saved.sha256) {
             throw new Error(
               `Pending Git artifact is corrupt: ${saved.file}; capture retained`
@@ -17254,7 +17721,7 @@ async function preparePendingUpload(context, contributionId, filename, buffer) {
           );
         }
         const file = `${crypto7.createHash("sha256").update(key).digest("hex")}.artifact`;
-        writeDurable(path18.join(directory, file), buffer);
+        writeDurable(path19.join(directory, file), buffer);
         context.record.uploads[key] = {
           file,
           bytes: buffer.byteLength,
@@ -17264,7 +17731,7 @@ async function preparePendingUpload(context, contributionId, filename, buffer) {
           context.save();
         } catch (err) {
           delete context.record.uploads[key];
-          fs19.rmSync(path18.join(directory, file), { force: true });
+          fs20.rmSync(path19.join(directory, file), { force: true });
           throw err;
         }
         status = "ok";
@@ -17296,8 +17763,8 @@ function readPreparedCaptureArtifact(context, filename, input) {
       throw new Error(
         `Prepared Git artifact input changed: ${filename}; capture retained`
       );
-    const bytes = fs19.readFileSync(
-      path18.join(captureDirectory(context.record), saved.file)
+    const bytes = fs20.readFileSync(
+      path19.join(captureDirectory(context.record), saved.file)
     );
     if (bytes.length !== saved.bytes || crypto7.createHash("sha256").update(bytes).digest("hex") !== saved.sha256)
       throw new Error(
@@ -17316,7 +17783,7 @@ function completePendingCapture(record) {
 function removeCompletedCapture(record) {
   if (!record.completed)
     throw new Error("Cannot remove an unacknowledged Git capture");
-  fs19.rmSync(captureDirectory(record), { recursive: true, force: true });
+  fs20.rmSync(captureDirectory(record), { recursive: true, force: true });
   for (const label of ["snapshot", "tree", "head", "baseline", "previous"]) {
     deleteRef(
       record.repoRoot,
@@ -17389,7 +17856,7 @@ async function uploadArtifact(client, contributionId, filename, mimeType, buffer
 }
 
 // package.json
-var version = "0.9.4";
+var version = "0.9.6";
 
 // src/version.ts
 var CLI_VERSION = version;
@@ -17413,7 +17880,7 @@ function lineHasAssistant(line) {
   return line.includes('"type":"assistant"') || line.includes('"role":"assistant"') || line.includes('"type":"assistant.');
 }
 async function hasAssistantMessage(transcriptPath) {
-  const stream = fs20.createReadStream(transcriptPath, { encoding: "utf-8" });
+  const stream = fs21.createReadStream(transcriptPath, { encoding: "utf-8" });
   let buffer = "";
   try {
     for await (const chunk of stream) {
@@ -17500,7 +17967,7 @@ function resolveCursorTranscriptPath(payload) {
   const workspace = payload.workspace_roots?.[0];
   if (!id || !workspace) return void 0;
   const encoded = workspace.replace(/^\//, "").replace(/\//g, "-");
-  return path19.join(
+  return path20.join(
     os10.homedir(),
     ".cursor",
     "projects",
@@ -17556,14 +18023,14 @@ async function sweepClaudeSubagentTranscripts(payload) {
   const cwd = resolveHookCwd(payload);
   if (!parentSessionId || !cwd || !payload.transcript_path) return;
   try {
-    const directory = path19.join(
-      path19.dirname(path19.resolve(payload.transcript_path)),
+    const directory = path20.join(
+      path20.dirname(path20.resolve(payload.transcript_path)),
       parentSessionId,
       "subagents"
     );
     let names;
     try {
-      names = await fs20.promises.readdir(directory);
+      names = await fs21.promises.readdir(directory);
     } catch (err) {
       if (err.code === "ENOENT") return;
       throw err;
@@ -17572,12 +18039,12 @@ async function sweepClaudeSubagentTranscripts(payload) {
     for (const name of names) {
       const match = /^agent-([A-Za-z0-9_-]+)\.jsonl$/.exec(name);
       if (!match) continue;
-      const file = path19.join(directory, name);
+      const file = path20.join(directory, name);
       try {
         files.push({
           agentId: match[1],
           file,
-          modifiedMs: (await fs20.promises.stat(file)).mtimeMs
+          modifiedMs: (await fs21.promises.stat(file)).mtimeMs
         });
       } catch {
       }
@@ -17743,7 +18210,7 @@ async function sweepCodexForkTranscripts(payload) {
     const parent = await findProjectForCwd(cwd);
     if (!parent) return;
     const registeredRoots = Object.keys((await loadProjects()).projects).map(
-      (root) => path19.resolve(root)
+      (root) => path20.resolve(root)
     );
     const discovery = await discoverCodexForkThreads({
       parentThreadId: parentSessionId,
@@ -17884,9 +18351,9 @@ async function runUploadForSession(payload, options) {
     );
     return "skipped";
   }
-  const transcriptResolved = path19.resolve(transcriptPath);
+  const transcriptResolved = path20.resolve(transcriptPath);
   try {
-    const stat = await fs20.promises.stat(transcriptResolved);
+    const stat = await fs21.promises.stat(transcriptResolved);
     if (!stat.isFile()) {
       appendLog(
         "warn",
@@ -17942,7 +18409,7 @@ function makeTranscriptGroup(repoRoot, sourceTool, transcriptPath, content) {
   };
   return {
     repoPath: repoRoot,
-    label: path19.basename(repoRoot),
+    label: path20.basename(repoRoot),
     files: [sourceFile],
     sourceNames: [sourceTool],
     lastModified: /* @__PURE__ */ new Date()
@@ -17953,7 +18420,7 @@ async function buildRedactChain(repoRoot, capturedSecrets = []) {
     "secret-discovery",
     () => discoverEnvFiles(repoRoot)
   );
-  const envFilePaths = envFileNames.map((n) => path19.join(repoRoot, n));
+  const envFilePaths = envFileNames.map((n) => path20.join(repoRoot, n));
   const secretResult = await measureAgentStage(
     "secret-collection",
     () => collectSecrets(repoRoot, envFilePaths, [])
@@ -18607,7 +19074,7 @@ async function uploadSession(args) {
     try {
       raw = await measureAgentStage(
         "transcript-read",
-        () => captured ? Promise.resolve(captured.bytes) : fs20.promises.readFile(transcriptPath)
+        () => captured ? Promise.resolve(captured.bytes) : fs21.promises.readFile(transcriptPath)
       );
     } catch (err) {
       if (err.code === "ERR_FS_FILE_TOO_LARGE") {
@@ -18978,15 +19445,15 @@ import crypto9 from "crypto";
 
 // src/git-traces/handlers.ts
 import { execFileSync as execFileSync3 } from "child_process";
-import fs21 from "fs";
-import path20 from "path";
+import fs22 from "fs";
+import path21 from "path";
 var GIT_TRACES_SLUG = "git-traces";
 var MAX_FORK_SWEEP_THREADS2 = 8;
 var MAX_UPLOAD_BYTES = 500 * 1024 * 1024;
 var STALE_SCOPED_STATE_TTL_MS = 24 * 60 * 60 * 1e3;
 var REBASELINE_AFTER_DIFF_FAILURES = 2;
 async function withRepoCaptureLock(repoRoot, capture) {
-  const canonicalRoot = fs21.realpathSync(repoRoot);
+  const canonicalRoot = fs22.realpathSync(repoRoot);
   await acquireLock3(canonicalRoot, "snapshot-index-v1", null);
   try {
     return capture();
@@ -19044,7 +19511,7 @@ var PendingQueueConflictError = class extends Error {
 async function loadConfiguredRepos() {
   const file = await loadProjects();
   return Object.entries(file.projects).map(([repoRoot, config]) => ({
-    repoRoot: path20.resolve(repoRoot),
+    repoRoot: path21.resolve(repoRoot),
     config
   })).sort((a, b) => a.repoRoot.localeCompare(b.repoRoot));
 }
@@ -19062,12 +19529,12 @@ async function configuredReposFor(trigger) {
   return repos;
 }
 async function propagateCodexHooks(parentRoot, worktreeRoot) {
-  const source = path20.join(parentRoot, ".codex", "hooks.json");
-  const target = path20.join(worktreeRoot, ".codex", "hooks.json");
-  if (fs21.existsSync(target) || !fs21.existsSync(source)) return;
+  const source = path21.join(parentRoot, ".codex", "hooks.json");
+  const target = path21.join(worktreeRoot, ".codex", "hooks.json");
+  if (fs22.existsSync(target) || !fs22.existsSync(source)) return;
   try {
-    fs21.mkdirSync(path20.dirname(target), { recursive: true });
-    fs21.copyFileSync(source, target, fs21.constants.COPYFILE_EXCL);
+    fs22.mkdirSync(path21.dirname(target), { recursive: true });
+    fs22.copyFileSync(source, target, fs22.constants.COPYFILE_EXCL);
   } catch (err) {
     appendLog(
       "warn",
@@ -19089,7 +19556,7 @@ async function propagateCodexHooks(parentRoot, worktreeRoot) {
   }
 }
 function repoLabel(repoRoot) {
-  return path20.basename(repoRoot) || repoRoot;
+  return path21.basename(repoRoot) || repoRoot;
 }
 function resolveCwd2(payload) {
   return resolveHookCwd(payload);
@@ -19331,6 +19798,53 @@ function freezeEpochBaseline(params) {
     return null;
   }
 }
+function createBundleWithBackoff(pending, params) {
+  const { repoRoot, baselineTreeSha } = params;
+  const previous = pending?.record.bundleTimeout?.input === baselineTreeSha ? pending.record.bundleTimeout : void 0;
+  if (pending && previous) {
+    const retryInMs = bundleBackoffRemainingMs(previous, Date.now());
+    if (retryInMs > 0) {
+      appendLog(
+        "warn",
+        `git-traces: baseline bundle deferred after timeout (repo=${repoRoot}, session=${pending.record.sessionId}, capture=${pending.record.id}, attempts=${previous.attempts}, retryInMs=${retryInMs})`
+      );
+      return null;
+    }
+  }
+  try {
+    const bundle = createBundleFromTree(
+      repoRoot,
+      baselineTreeSha,
+      params.bundleKey,
+      params.label
+    );
+    if (pending?.record.bundleTimeout) {
+      delete pending.record.bundleTimeout;
+      saveBundleBackoff(pending);
+    }
+    return bundle;
+  } catch (err) {
+    if (pending && isGitTimeoutError(err)) {
+      pending.record.bundleTimeout = {
+        input: baselineTreeSha,
+        attempts: (previous?.attempts ?? 0) + 1,
+        lastAttemptAt: Date.now()
+      };
+      saveBundleBackoff(pending);
+    }
+    throw err;
+  }
+}
+function saveBundleBackoff(pending) {
+  try {
+    pending.save();
+  } catch (err) {
+    appendLog(
+      "warn",
+      `git-traces: could not save baseline bundle backoff (capture=${pending.record.id}): ${formatError(err)}`
+    );
+  }
+}
 function buildFrozenEpochBaselineArtifacts(params) {
   const { repoRoot, sessionId, epoch, baselineTreeSha, baselineMetadata } = params;
   const prefix = epochPrefix2(epoch);
@@ -19340,12 +19854,13 @@ function buildFrozenEpochBaselineArtifacts(params) {
       pending,
       `${prefix}-baseline.bundle`,
       baselineTreeSha
-    )) ?? createBundleFromTree(
+    )) ?? createBundleWithBackoff(pending, {
       repoRoot,
       baselineTreeSha,
-      `${sessionId}-${prefix}`,
-      `baseline ${prefix}`
-    );
+      bundleKey: `${sessionId}-${prefix}`,
+      label: `baseline ${prefix}`
+    });
+    if (!bundleBuffer) return null;
     const metadataBuffer = Buffer.from(
       JSON.stringify(baselineMetadata, null, 2)
     );
@@ -21250,6 +21765,10 @@ async function sweepStrandedCaptures(params) {
       tally[state.reason]++;
       continue;
     }
+    if (bundleBackoffRemainingMs(head.bundleTimeout, now) > 0) {
+      tally.backoff++;
+      continue;
+    }
     eligible.push({
       queue,
       oldestCapturedAt,
@@ -21306,7 +21825,7 @@ async function collectStopTargets(tool, sessionId, repos, repoByRoot) {
   let needsLineageCheck = false;
   const storedStates = await listSessionStatesForSession(tool, sessionId);
   for (const { state } of storedStates) {
-    const repo = repoByRoot.get(path20.resolve(state.repoRoot));
+    const repo = repoByRoot.get(path21.resolve(state.repoRoot));
     if (!repo) {
       missingConfig++;
       appendLog(
@@ -21338,7 +21857,7 @@ async function lateInitSkipReason(payload, tool) {
   const transcriptPath = payload.transcript_path;
   if (!transcriptPath) return tool === "codex" ? null : "no-transcript-path";
   try {
-    const stat = await fs21.promises.stat(path20.resolve(transcriptPath));
+    const stat = await fs22.promises.stat(path21.resolve(transcriptPath));
     return stat.isFile() ? null : "transcript-not-a-file";
   } catch {
     return "transcript-missing";
@@ -21547,9 +22066,9 @@ async function handleSessionEnd(payload, tool) {
   if (sessionId) {
     const states = await listSessionStatesForSession(tool, sessionId);
     for (const { state } of states) {
-      const repoRoot = path20.resolve(state.repoRoot);
+      const repoRoot = path21.resolve(state.repoRoot);
       repoRoots.add(repoRoot);
-      const canProcess = repoByRoot.has(repoRoot) || project && path20.resolve(project.repoRoot) === repoRoot;
+      const canProcess = repoByRoot.has(repoRoot) || project && path21.resolve(project.repoRoot) === repoRoot;
       if (canProcess && tool === "codex" && state.codexLineageChecked !== true) {
         needsLineageCheck = true;
       }
@@ -21586,7 +22105,7 @@ async function handleSessionEnd(payload, tool) {
   let rejected = 0;
   const finalCaptures = /* @__PURE__ */ new Map();
   for (const repoRoot of repoRoots) {
-    const repo = repoByRoot.get(path20.resolve(repoRoot)) ?? (project && path20.resolve(project.repoRoot) === path20.resolve(repoRoot) ? { repoRoot: project.repoRoot, config: project.config } : null);
+    const repo = repoByRoot.get(path21.resolve(repoRoot)) ?? (project && path21.resolve(project.repoRoot) === path21.resolve(repoRoot) ? { repoRoot: project.repoRoot, config: project.config } : null);
     if (repo)
       finalCaptures.set(
         repoRoot,
@@ -21594,7 +22113,7 @@ async function handleSessionEnd(payload, tool) {
       );
   }
   for (const repoRoot of repoRoots) {
-    const repo = repoByRoot.get(path20.resolve(repoRoot)) ?? (project && path20.resolve(project.repoRoot) === path20.resolve(repoRoot) ? { repoRoot: project.repoRoot, config: project.config } : null);
+    const repo = repoByRoot.get(path21.resolve(repoRoot)) ?? (project && path21.resolve(project.repoRoot) === path21.resolve(repoRoot) ? { repoRoot: project.repoRoot, config: project.config } : null);
     if (!repo) {
       skipped++;
       appendLog(
@@ -21973,15 +22492,15 @@ ${stack}` : ""}`
 }
 
 // src/outputs/zip.ts
-import fs23 from "fs";
-import path22 from "path";
+import fs24 from "fs";
+import path23 from "path";
 import archiver2 from "archiver";
 
 // src/outputs/downloads.ts
 import { execSync as execSync2 } from "child_process";
-import fs22 from "fs";
+import fs23 from "fs";
 import os11 from "os";
-import path21 from "path";
+import path22 from "path";
 function getDownloadsFolder() {
   const home = os11.homedir();
   if (process.platform === "linux") {
@@ -21990,12 +22509,12 @@ function getDownloadsFolder() {
         encoding: "utf-8",
         timeout: 3e3
       }).trim();
-      if (xdgDir && fs22.existsSync(xdgDir)) return xdgDir;
+      if (xdgDir && fs23.existsSync(xdgDir)) return xdgDir;
     } catch {
     }
   }
-  const downloads = path21.join(home, "Downloads");
-  if (fs22.existsSync(downloads)) return downloads;
+  const downloads = path22.join(home, "Downloads");
+  if (fs23.existsSync(downloads)) return downloads;
   return home;
 }
 
@@ -22004,11 +22523,11 @@ function sanitizeFilename(name) {
   return name.replace(/[^a-zA-Z0-9._-]/g, "_");
 }
 function getUniqueFilename(dir, base, ext) {
-  let candidate = path22.join(dir, `${base}${ext}`);
-  if (!fs23.existsSync(candidate)) return candidate;
+  let candidate = path23.join(dir, `${base}${ext}`);
+  if (!fs24.existsSync(candidate)) return candidate;
   let i = 1;
-  while (fs23.existsSync(candidate)) {
-    candidate = path22.join(dir, `${base}-${i}${ext}`);
+  while (fs24.existsSync(candidate)) {
+    candidate = path23.join(dir, `${base}-${i}${ext}`);
     i++;
   }
   return candidate;
@@ -22018,13 +22537,13 @@ var ZipOutput = class {
   label = "Save as .zip to Downloads";
   async emit(group, options) {
     const downloadsDir = getDownloadsFolder();
-    const repoName = sanitizeFilename(path22.basename(group.repoPath));
+    const repoName = sanitizeFilename(path23.basename(group.repoPath));
     const timeRange = options.timeRange;
     const rangePart = timeRange?.label ?? "all";
     const epochSeconds = Math.floor(Date.now() / 1e3);
     const baseName = `logs-${repoName}-${rangePart}-${epochSeconds}`;
     const outputPath = getUniqueFilename(downloadsDir, baseName, ".zip");
-    const output = fs23.createWriteStream(outputPath);
+    const output = fs24.createWriteStream(outputPath);
     const archive = archiver2("zip", { zlib: { level: 6 } });
     const done = new Promise((resolve, reject) => {
       output.on("close", resolve);
@@ -22218,15 +22737,15 @@ async function confirmExport(group, output) {
 }
 
 // src/sources/claude.ts
-import fs24 from "fs";
+import fs25 from "fs";
 import os12 from "os";
-import path23 from "path";
+import path24 from "path";
 import readline3 from "readline";
 var SKIP_DIRS = /* @__PURE__ */ new Set(["tool-results"]);
 async function resolveRepoPath(projectDir) {
-  const indexPath = path23.join(projectDir, "sessions-index.json");
+  const indexPath = path24.join(projectDir, "sessions-index.json");
   try {
-    const raw = await fs24.promises.readFile(indexPath, "utf-8");
+    const raw = await fs25.promises.readFile(indexPath, "utf-8");
     const data = JSON.parse(raw);
     if (data.originalPath && typeof data.originalPath === "string") {
       return data.originalPath;
@@ -22234,12 +22753,12 @@ async function resolveRepoPath(projectDir) {
   } catch {
   }
   const cwdCounts = /* @__PURE__ */ new Map();
-  const entries = await fs24.promises.readdir(projectDir, {
+  const entries = await fs25.promises.readdir(projectDir, {
     withFileTypes: true
   });
   for (const entry of entries) {
     if (!entry.isFile() || !entry.name.endsWith(".jsonl")) continue;
-    const cwd = await extractCwdFromJsonl(path23.join(projectDir, entry.name));
+    const cwd = await extractCwdFromJsonl(path24.join(projectDir, entry.name));
     if (cwd) {
       cwdCounts.set(cwd, (cwdCounts.get(cwd) ?? 0) + 1);
     }
@@ -22258,7 +22777,7 @@ async function resolveRepoPath(projectDir) {
   return null;
 }
 async function extractCwdFromJsonl(filePath) {
-  const stream = fs24.createReadStream(filePath, { encoding: "utf-8" });
+  const stream = fs25.createReadStream(filePath, { encoding: "utf-8" });
   const rl = readline3.createInterface({ input: stream, crlfDelay: Infinity });
   try {
     for await (const line of rl) {
@@ -22280,12 +22799,12 @@ async function extractCwdFromJsonl(filePath) {
 async function collectFiles(dir, baseDir, sourceName, repoPath, results) {
   let entries;
   try {
-    entries = await fs24.promises.readdir(dir, { withFileTypes: true });
+    entries = await fs25.promises.readdir(dir, { withFileTypes: true });
   } catch {
     return;
   }
   for (const entry of entries) {
-    const fullPath = path23.join(dir, entry.name);
+    const fullPath = path24.join(dir, entry.name);
     if (entry.isDirectory()) {
       if (SKIP_DIRS.has(entry.name)) continue;
       await collectFiles(fullPath, baseDir, sourceName, repoPath, results);
@@ -22307,19 +22826,19 @@ function fallbackDecode(encodedName) {
 var ClaudeSource = class {
   name = "claude";
   async scan() {
-    const baseDir = path23.join(os12.homedir(), ".claude", "projects");
+    const baseDir = path24.join(os12.homedir(), ".claude", "projects");
     try {
-      await fs24.promises.access(baseDir);
+      await fs25.promises.access(baseDir);
     } catch {
       return [];
     }
-    const projectDirs = await fs24.promises.readdir(baseDir, {
+    const projectDirs = await fs25.promises.readdir(baseDir, {
       withFileTypes: true
     });
     const dirEntries = projectDirs.filter((d) => d.isDirectory());
     const resultArrays = await Promise.all(
       dirEntries.map(async (dir) => {
-        const projectPath = path23.join(baseDir, dir.name);
+        const projectPath = path24.join(baseDir, dir.name);
         const repoPath = await resolveRepoPath(projectPath) ?? fallbackDecode(dir.name);
         const files = [];
         await collectFiles(
@@ -22337,12 +22856,12 @@ var ClaudeSource = class {
 };
 
 // src/sources/codex.ts
-import fs25 from "fs";
+import fs26 from "fs";
 import os13 from "os";
-import path24 from "path";
+import path25 from "path";
 import readline4 from "readline";
 async function parseSessionMeta2(filePath) {
-  const stream = fs25.createReadStream(filePath, { encoding: "utf-8" });
+  const stream = fs26.createReadStream(filePath, { encoding: "utf-8" });
   const rl = readline4.createInterface({ input: stream, crlfDelay: Infinity });
   try {
     for await (const line of rl) {
@@ -22367,12 +22886,12 @@ async function findJsonlFiles(dir) {
   async function walk(d) {
     let entries;
     try {
-      entries = await fs25.promises.readdir(d, { withFileTypes: true });
+      entries = await fs26.promises.readdir(d, { withFileTypes: true });
     } catch {
       return;
     }
     for (const entry of entries) {
-      const full = path24.join(d, entry.name);
+      const full = path25.join(d, entry.name);
       if (entry.isDirectory()) {
         await walk(full);
       } else if (entry.isFile() && entry.name.endsWith(".jsonl")) {
@@ -22386,11 +22905,11 @@ async function findJsonlFiles(dir) {
 async function loadHistory(historyPath) {
   const map = /* @__PURE__ */ new Map();
   try {
-    await fs25.promises.access(historyPath);
+    await fs26.promises.access(historyPath);
   } catch {
     return map;
   }
-  const stream = fs25.createReadStream(historyPath, { encoding: "utf-8" });
+  const stream = fs26.createReadStream(historyPath, { encoding: "utf-8" });
   const rl = readline4.createInterface({ input: stream, crlfDelay: Infinity });
   try {
     for await (const line of rl) {
@@ -22417,14 +22936,14 @@ async function loadHistory(historyPath) {
 var CodexSource = class {
   name = "codex";
   async scan() {
-    const codexDir = path24.join(os13.homedir(), ".codex");
-    const sessionsDir2 = path24.join(codexDir, "sessions");
+    const codexDir = path25.join(os13.homedir(), ".codex");
+    const sessionsDir2 = path25.join(codexDir, "sessions");
     try {
-      await fs25.promises.access(sessionsDir2);
+      await fs26.promises.access(sessionsDir2);
     } catch {
       return [];
     }
-    const historyPath = path24.join(codexDir, "history.jsonl");
+    const historyPath = path25.join(codexDir, "history.jsonl");
     const [jsonlFiles, historyMap] = await Promise.all([
       findJsonlFiles(sessionsDir2),
       loadHistory(historyPath)
@@ -22447,8 +22966,8 @@ var CodexSource = class {
       });
       const historyLines = historyMap.get(meta.sessionId);
       if (historyLines) {
-        const sessionDir = path24.relative(sessionsDir2, path24.dirname(filePath));
-        const historyAbsPath = path24.join(
+        const sessionDir = path25.relative(sessionsDir2, path25.dirname(filePath));
+        const historyAbsPath = path25.join(
           sessionsDir2,
           sessionDir,
           `history-${meta.sessionId}.jsonl`
@@ -22468,18 +22987,18 @@ var CodexSource = class {
 };
 
 // src/sources/copilotChat.ts
-import fs26 from "fs";
+import fs27 from "fs";
 import os14 from "os";
-import path25 from "path";
+import path26 from "path";
 import { fileURLToPath as fileURLToPath2 } from "url";
 function vsCodeUserDirs() {
   const home = os14.homedir();
   const dirs = [
-    path25.join(home, "Library", "Application Support", "Code", "User"),
-    path25.join(home, ".config", "Code", "User")
+    path26.join(home, "Library", "Application Support", "Code", "User"),
+    path26.join(home, ".config", "Code", "User")
   ];
   if (process.env.APPDATA) {
-    dirs.push(path25.join(process.env.APPDATA, "Code", "User"));
+    dirs.push(path26.join(process.env.APPDATA, "Code", "User"));
   }
   return dirs;
 }
@@ -22494,7 +23013,7 @@ function uriToFsPath(uri) {
 async function readWorkspaceFolder(workspaceJsonPath) {
   let raw;
   try {
-    raw = await fs26.promises.readFile(workspaceJsonPath, "utf-8");
+    raw = await fs27.promises.readFile(workspaceJsonPath, "utf-8");
   } catch {
     return null;
   }
@@ -22516,10 +23035,10 @@ var CopilotChatSource = class {
   async scan() {
     const results = [];
     for (const userDir of vsCodeUserDirs()) {
-      const workspaceStorage = path25.join(userDir, "workspaceStorage");
+      const workspaceStorage = path26.join(userDir, "workspaceStorage");
       let hashDirs;
       try {
-        hashDirs = await fs26.promises.readdir(workspaceStorage, {
+        hashDirs = await fs27.promises.readdir(workspaceStorage, {
           withFileTypes: true
         });
       } catch {
@@ -22527,22 +23046,22 @@ var CopilotChatSource = class {
       }
       for (const hash of hashDirs) {
         if (!hash.isDirectory()) continue;
-        const wsRoot = path25.join(workspaceStorage, hash.name);
-        const transcriptsDir = path25.join(
+        const wsRoot = path26.join(workspaceStorage, hash.name);
+        const transcriptsDir = path26.join(
           wsRoot,
           "GitHub.copilot-chat",
           "transcripts"
         );
         let transcriptEntries;
         try {
-          transcriptEntries = await fs26.promises.readdir(transcriptsDir, {
+          transcriptEntries = await fs27.promises.readdir(transcriptsDir, {
             withFileTypes: true
           });
         } catch {
           continue;
         }
         const repoPath = await readWorkspaceFolder(
-          path25.join(wsRoot, "workspace.json")
+          path26.join(wsRoot, "workspace.json")
         );
         if (!repoPath) continue;
         for (const entry of transcriptEntries) {
@@ -22550,7 +23069,7 @@ var CopilotChatSource = class {
           const sessionId = entry.name.slice(0, -".jsonl".length);
           results.push({
             sourceName: this.name,
-            absolutePath: path25.join(transcriptsDir, entry.name),
+            absolutePath: path26.join(transcriptsDir, entry.name),
             repoPath,
             metadata: { sessionId }
           });
@@ -22590,7 +23109,7 @@ function reportRedactionStats(noun, stats) {
 async function filterByTimeRange(group, range) {
   const results = await Promise.all(
     group.files.map(
-      (f) => fs27.promises.stat(f.absolutePath).then((s) => ({ file: f, stat: s })).catch(() => null)
+      (f) => fs28.promises.stat(f.absolutePath).then((s) => ({ file: f, stat: s })).catch(() => null)
     )
   );
   const filtered = [];
@@ -22617,10 +23136,10 @@ async function runInteractive() {
   s.start(`Scanning ${source.name} logs...`);
   const allFiles = await source.scan();
   const allGroups = await mergeByRepo(allFiles);
-  const repoRoot = path26.resolve(repo.root);
+  const repoRoot = path27.resolve(repo.root);
   const matching = allGroups.filter((g) => {
-    const resolved = path26.resolve(g.repoPath);
-    return resolved === repoRoot || resolved.startsWith(repoRoot + path26.sep);
+    const resolved = path27.resolve(g.repoPath);
+    return resolved === repoRoot || resolved.startsWith(repoRoot + path27.sep);
   });
   if (matching.length === 0) {
     s.stop(`No ${source.name} logs found for ${repo.name}.`);
@@ -22651,7 +23170,7 @@ async function runInteractive() {
     }
   }
   const envFileNames = await discoverEnvFiles(repoRoot);
-  const envFilePaths = envFileNames.map((n) => path26.join(repoRoot, n));
+  const envFilePaths = envFileNames.map((n) => path27.join(repoRoot, n));
   const additionalFiles = await promptSecretFiles(envFileNames);
   const secretResult = await collectSecrets(
     repoRoot,