hillclimb 0.4.1 → 0.4.3

package/dist/cli.js

@@ -11150,7 +11150,13 @@ async function eventContext(tool, payload) {
     conversationId: stringOrNull(payload.conversation_id),
     turnId,
     eventNonce,
-    ...await transcriptFingerprint(payload)
+    // Only per-turn stop events need the transcript to disambiguate (they
+    // often lack a turn id); sessionEnd is keyed by sessionId. Folding it in
+    // for sessionEnd would diverge the agent/git eventIds whenever the two
+    // hooks send different payloads — e.g. the opencode plugin passes
+    // transcript_path to the upload spawn but not the git-traces spawn,
+    // causing a 60s orphan wait and a duplicate debug-log upload.
+    ...eventKind === "stop" ? await transcriptFingerprint(payload) : {}
   };
   const eventId = crypto.createHash("sha256").update(JSON.stringify(fingerprint)).digest("hex").slice(0, 32);
   return {
@@ -13619,8 +13625,9 @@ function captureSnapshotSha(repoRoot) {
   }
   return git(repoRoot, ["rev-parse", "HEAD"]);
 }
-function recordOmittedSnapshotFile(omittedFiles, file) {
+function recordOmittedSnapshotFile(omittedFiles, file, options = {}) {
   omittedFiles?.push(file);
+  if (options.log === false) return;
   const action = file.tracked ? "omitting tracked" : "skipping untracked";
   appendLog(
     "warn",
@@ -13643,7 +13650,7 @@ function parseLsTreeLongZ(output) {
   }
   return entries;
 }
-function listOversizedTreeFiles(repoRoot, treeSha, omittedFiles) {
+function listOversizedTreeFiles(repoRoot, treeSha, options = {}) {
   const output = gitBuffer(repoRoot, ["ls-tree", "-r", "-l", "-z", treeSha]);
   const oversized = [];
   for (const entry of parseLsTreeLongZ(output)) {
@@ -13656,7 +13663,9 @@ function listOversizedTreeFiles(repoRoot, treeSha, omittedFiles) {
       gitObjectSha: entry.sha
     };
     oversized.push(file);
-    recordOmittedSnapshotFile(omittedFiles, file);
+    recordOmittedSnapshotFile(options.omittedFiles, file, {
+      log: options.log
+    });
   }
   return oversized;
 }
@@ -13667,6 +13676,29 @@ function removePathsFromIndex(repoRoot, env, paths) {
     env
   });
 }
+function filterOversizedFilesFromTree(repoRoot, treeSha, options = {}) {
+  const oversizedFiles = listOversizedTreeFiles(repoRoot, treeSha, options);
+  if (oversizedFiles.length === 0) return treeSha;
+  const tmpIndex = path14.join(
+    os6.tmpdir(),
+    `hillclimb-filter-${Date.now()}-${process.pid}`
+  );
+  const env = { ...process.env, GIT_INDEX_FILE: tmpIndex };
+  try {
+    gitWithEnv(repoRoot, ["read-tree", treeSha], env);
+    removePathsFromIndex(
+      repoRoot,
+      env,
+      oversizedFiles.map((file) => file.path)
+    );
+    return gitWithEnv(repoRoot, ["write-tree"], env);
+  } finally {
+    try {
+      fs11.unlinkSync(tmpIndex);
+    } catch {
+    }
+  }
+}
 function buildUntrackedTree(repoRoot, omittedFiles) {
   const list = git(repoRoot, [
     "ls-files",
@@ -13714,46 +13746,40 @@ function buildUntrackedTree(repoRoot, omittedFiles) {
 }
 function buildSnapshotTree(repoRoot, stashSha, options = {}) {
   const trackedTree = git(repoRoot, ["rev-parse", `${stashSha}^{tree}`]);
-  const oversizedTracked = listOversizedTreeFiles(
+  const filteredTrackedTree = filterOversizedFilesFromTree(
     repoRoot,
     trackedTree,
-    options.omittedFiles
+    {
+      omittedFiles: options.omittedFiles
+    }
   );
   const untrackedTree = buildUntrackedTree(repoRoot, options.omittedFiles);
-  if (oversizedTracked.length === 0 && (!untrackedTree || untrackedTree === EMPTY_TREE_SHA)) {
-    return trackedTree;
-  }
+  if (!untrackedTree || untrackedTree === EMPTY_TREE_SHA)
+    return filteredTrackedTree;
   const tmpIndex = path14.join(
     os6.tmpdir(),
     `hillclimb-index-${Date.now()}-${process.pid}`
   );
   const env = { ...process.env, GIT_INDEX_FILE: tmpIndex };
   try {
-    gitWithEnv(repoRoot, ["read-tree", trackedTree], env);
-    removePathsFromIndex(
+    gitWithEnv(repoRoot, ["read-tree", filteredTrackedTree], env);
+    const untrackedList = gitBuffer(
       repoRoot,
-      env,
-      oversizedTracked.map((file) => file.path)
-    );
-    if (untrackedTree && untrackedTree !== EMPTY_TREE_SHA) {
-      const untrackedList = gitBuffer(
-        repoRoot,
-        ["ls-tree", "-r", untrackedTree],
-        {
-          env
-        }
-      ).toString("utf-8");
-      const indexInfo = untrackedList.split("\n").filter(Boolean).map((line) => {
-        const [meta, filePath] = line.split("	");
-        const [mode, , sha] = meta.split(/\s+/);
-        return `${mode} ${sha}	${filePath}`;
-      }).join("\n");
-      if (indexInfo) {
-        gitBuffer(repoRoot, ["update-index", "--index-info"], {
-          input: indexInfo,
-          env
-        });
+      ["ls-tree", "-r", untrackedTree],
+      {
+        env
       }
+    ).toString("utf-8");
+    const indexInfo = untrackedList.split("\n").filter(Boolean).map((line) => {
+      const [meta, filePath] = line.split("	");
+      const [mode, , sha] = meta.split(/\s+/);
+      return `${mode} ${sha}	${filePath}`;
+    }).join("\n");
+    if (indexInfo) {
+      gitBuffer(repoRoot, ["update-index", "--index-info"], {
+        input: indexInfo,
+        env
+      });
     }
     return gitWithEnv(repoRoot, ["write-tree"], env);
   } finally {
@@ -13789,11 +13815,22 @@ function createBundleFromTree(repoRoot, treeSha, sessionId, label) {
 }
 function createTreeDiffPatchGz(repoRoot, fromTreeSha, toTreeSha) {
   if (fromTreeSha === toTreeSha) return null;
+  const filteredFromTreeSha = filterOversizedFilesFromTree(
+    repoRoot,
+    fromTreeSha,
+    {
+      log: false
+    }
+  );
+  const filteredToTreeSha = filterOversizedFilesFromTree(repoRoot, toTreeSha, {
+    log: false
+  });
+  if (filteredFromTreeSha === filteredToTreeSha) return null;
   const diff = gitBuffer(repoRoot, [
     "diff",
     "--binary",
-    fromTreeSha,
-    toTreeSha
+    filteredFromTreeSha,
+    filteredToTreeSha
   ]);
   if (diff.length === 0) return null;
   return Buffer.from(gzipSync(diff));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hillclimb",
-  "version": "0.4.1",
+  "version": "0.4.3",
   "description": "Extract and export AI coding tool logs grouped by repo",
   "license": "MIT",
   "type": "module",