forgedock 1.24.4 → 1.24.5

package/bin/lean/lean.mjs

@@ -366,8 +366,23 @@ export async function runCore(o) {
         }
       }
     };
-    if (resumed) {
-      await io.git(["fetch", "origin", branch], { cwd });
+    if (resumed) { try { await io.git(["fetch", "origin", branch], { cwd }); } catch { /* remote branch may not exist (PR-less resume) */ } }
+    // #4118: a local lane branch with commits not yet pushed (e.g. a reviewed commit whose push failed) must never be reset.
+    // Reuse it when it is ahead of the base and contains everything the remote branch has.
+    let keepLocal = false;
+    try {
+      const ahead = Number(String(await io.git(["rev-list", "--count", `${base}..refs/heads/${branch}`], { cwd })).trim());
+      if (ahead > 0) {
+        let containsRemote = true;
+        if (resumed) { try { await io.git(["merge-base", "--is-ancestor", `origin/${branch}`, `refs/heads/${branch}`], { cwd }); } catch { containsRemote = false; } }
+        keepLocal = containsRemote;
+      }
+    } catch { /* no local branch */ }
+    if (keepLocal) {
+      await addWorktree(["worktree", "add", wt, branch]);
+      resumed = resumed ?? { pr: null, local: true };
+      ev({ event: "LOCAL_BRANCH_REUSED", branch });
+    } else if (resumed) {
       await addWorktree(["worktree", "add", "-B", branch, wt, `origin/${branch}`]);
     } else {
       await addWorktree(["worktree", "add", "-B", branch, wt, base]);

package/bin/lean/lean.test.mjs

@@ -1116,6 +1116,26 @@ describe("batch robustness (#4112-#4115)", () => {
     }
   });
 
+  it("#4118 GitHub's transient '[remote rejected] ... (failed)' and pack write errors are retried, then merge", async () => {
+    for (const msg of ["To github.com:o/r.git\n ! [remote rejected] feat/issue-7-lean -> feat/issue-7-lean (failed)",
+      "remote: error: unable to write file ./objects/pack/pack-1.pack: No such file or directory\n ! [remote rejected] x -> x (failed)"]) {
+      const w = world({ pushErrors: [msg] });
+      assert.equal((await run(w)).terminalReason, "merged", msg);
+      assert.equal(w.pushes, 2, msg);
+    }
+  });
+
+  it("#4118 a rerun reuses a local lane branch with unpushed commits instead of resetting it to the base", async () => {
+    const w = world();
+    const git0 = w.io.git;
+    w.io.git = async (a, o) => (a[0] === "rev-list" && a[1] === "--count" && String(a[2]).includes("refs/heads/feat/issue-7-lean")) ? "1\n" : git0(a, o);
+    await run(w);
+    const adds = w.calls.filter((c) => c[0] === "git" && c[1] === "worktree" && c[2] === "add");
+    assert.ok(adds.length >= 1);
+    assert.ok(adds.every((c) => !c.includes("-B")), JSON.stringify(adds));
+    assert.ok(w.calls.some((c) => c[0] === "git" && c[1] === "worktree" && c[2] === "add" && c.at(-1) === "feat/issue-7-lean"));
+  });
+
   it("#4114 gh writes (comment) retry on 5xx and secondary rate limits; non-transient errors do not", async () => {
     const w = world({ commentErrors: ["HTTP 502: Bad Gateway", "You have exceeded a secondary rate limit. Please wait a few minutes"] });
     assert.equal((await run(w)).terminalReason, "merged");

package/bin/lean/retry.mjs

@@ -2,8 +2,8 @@
 // SPDX-License-Identifier: AGPL-3.0-or-later
 /** Transient-failure retry for the core work-on's network writes (git push, gh writes, gh pr merge). */
 
-export const PUSH_TRANSIENT_RE = /remote unpack failed|index-pack failed|RPC failed|unexpected disconnect|early EOF|the remote end hung up|HTTP\/?\s?5\d\d|returned error: 5\d\d|\b50[0234]\b|internal server error|bad gateway|service unavailable|gateway time-?out|connection (?:reset|timed out|refused)|timed out|could not resolve host|broken pipe|ETIMEDOUT|ECONNRESET|temporarily unavailable/i;
-export const PUSH_PERMANENT_RE = /protected branch|GH006|GH013|repository rule violations|permission (?:denied|to .* denied)|denied to|\b403\b|authentication failed|not allowed|hook declined|pre-receive hook declined|\[remote rejected\]|\[rejected\]|non-fast-forward|fetch first/i;
+export const PUSH_TRANSIENT_RE = /remote unpack failed|index-pack failed|RPC failed|unexpected disconnect|early EOF|the remote end hung up|HTTP\/?\s?5\d\d|returned error: 5\d\d|\b50[0234]\b|internal server error|bad gateway|service unavailable|gateway time-?out|connection (?:reset|timed out|refused)|timed out|could not resolve host|broken pipe|ETIMEDOUT|ECONNRESET|temporarily unavailable|\[remote rejected\][^\n]*\(failed\)|unable to write file|unable to create temporary object|unpacker error|failed to write object/i;
+export const PUSH_PERMANENT_RE = /protected branch|GH006|GH013|repository rule violations|permission (?:denied|to .* denied)|denied to|\b403\b|authentication failed|not allowed|hook declined|pre-receive hook declined|\[rejected\]|non-fast-forward|fetch first/i;
 export const GH_TRANSIENT_RE = /HTTP 5\d\d|\b50[0234]\b|secondary rate limit|rate limit exceeded|abuse detection|something went wrong|internal server error|bad gateway|service unavailable|ETIMEDOUT|ECONNRESET|connection reset|timed out|\bEOF\b|temporarily unavailable/i;
 export const MERGE_TRANSIENT_RE = new RegExp(`${GH_TRANSIENT_RE.source}|base branch was modified|head branch was modified|mergeability.*unknown|try again`, "i");
 export const MERGE_CONFLICT_RE = /not mergeable|merge conflict|conflict/i;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "forgedock",
-  "version": "1.24.4",
+  "version": "1.24.5",
   "description": "Autonomous development pipeline for coding agents. GitHub as institutional memory, with native Claude Code and OpenCode entrypoints.",
   "bin": {
     "forgedock": "bin/forgedock.mjs"