hillclimb 0.8.9 → 0.8.10

package/dist/main.js

@@ -14711,9 +14711,11 @@ function createGitError(args, err, timeoutMs = GIT_COMMAND_TIMEOUT_MS) {
   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 wrapped = new Error(message);
   wrapped.isGitTimeout = isTimeout;
-  wrapped.gitExitStatus = failure.status;
+  wrapped.gitExitStatus = failure.code || failure.signal ? void 0 : failure.status;
   const stderr = outputToString(failure.stderr);
   wrapped.gitStderr = stderr ? truncateOutput(stderr) : void 0;
+  const stdout = outputToString(failure.stdout);
+  wrapped.gitStdout = stdout ? truncateOutput(stdout) : void 0;
   wrapped.isGitMissingObject = !isTimeout && failure.code !== "ENOBUFS" && matchesMissingObject(stderr);
   return wrapped;
 }
@@ -14752,6 +14754,19 @@ function isGitRepo(dir) {
     return false;
   }
 }
+function stashRetryReason(failure) {
+  const status = failure.gitExitStatus;
+  if (status !== 1 && status !== 128) return null;
+  if (/Unable to create [^\n]*index\.lock[^\n]*: File exists/.test(
+    failure.gitStderr ?? ""
+  )) {
+    return "index-lock-contention";
+  }
+  if (status === 1 && !failure.gitStderr && !failure.gitStdout) {
+    return "empty-stash-failure";
+  }
+  return null;
+}
 function captureWorkingCommitSha(repoRoot) {
   for (let attempt = 1; ; attempt++) {
     let sha;
@@ -14778,11 +14793,11 @@ function captureWorkingCommitSha(repoRoot) {
         const tree = git(repoRoot, ["write-tree"]);
         return git(repoRoot, ["commit-tree", tree, "-m", "empty baseline"]);
       }
-      if (failure.gitExitStatus !== 1 || !/Unable to create [^\n]*index\.lock[^\n]*: File exists/.test(stderr) || attempt >= 5)
-        throw err;
+      const retryReason = stashRetryReason(failure);
+      if (!retryReason || attempt >= 5) throw err;
       appendLog(
         "warn",
-        `git-traces: retrying stash create after index lock contention (repo=${repoRoot}, attempt=${attempt}, maxAttempts=5): ${failure.message}`
+        `git-traces: retrying stash create after ${retryReason === "index-lock-contention" ? "index lock contention" : "empty Git failure (possible index contention)"} (repo=${repoRoot}, attempt=${attempt}, maxAttempts=5, reason=${retryReason}): ${failure.message}`
       );
       Atomics.wait(new Int32Array(new SharedArrayBuffer(4)), 0, 0, 250);
       continue;

package/package.json

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