fix(open-pr): keep retry pushes on recorded commits

Author: vincentkoc

CHANGELOG.md

@@ -7,6 +7,8 @@
 - Added review prompt provenance and budget accounting for included files, omitted files, prompt bytes, and approximate tokens.
 - Hardened review ingestion so provider findings must cite included files with valid line ranges and matching evidence quotes.
 - Fixed `clawpatch open-pr` so repositories without default-branch metadata use a dedicated patch branch and let GitHub choose the PR base.
+- Fixed `clawpatch open-pr` retries to push the recorded patch commit instead of any later local branch tip.
+- Fixed `clawpatch ci --since` empty-review output so it reports `reviewed: 0`.
 - Fixed Express route mapping for aliased Router imports that follow block comment banners, thanks @rohitjavvadi.
 - Fixed Bun package-manager detection to recognize the text `bun.lock` lockfile, thanks @austinm911.
 

src/app.ts

@@ -257,7 +257,7 @@ export async function ciCommand(
   return {
     initialized,
     mapped: numberField(mapped, "features"),
-    reviewed: numberField(reviewed, "reviewed"),
+    reviewed: numberField(reviewed, "reviewed") ?? 0,
     findings: reviewFindings,
     reportFindings: report.findings ?? 0,
     report: report.output ?? null,
@@ -1117,6 +1117,7 @@ export async function openPrCommand(
     force,
   );
   let commitSha = patch.git.commitSha;
+  const hadRecordedCommit = commitSha !== null;
   if (commitSha === null) {
     if (git.currentBranch !== branch) {
       const switchArgs = (await localBranchExists(git.root, branch))
@@ -1160,7 +1161,11 @@ export async function openPrCommand(
       prUrl: patch.git.prUrl,
     });
   }
-  await checkedRun("git push", runCommandArgs("git", ["push", "-u", "origin", branch], git.root));
+  commitSha = assertDefined(commitSha, "missing patch commit");
+  const pushArgs = hadRecordedCommit
+    ? ["push", "origin", `${commitSha}:refs/heads/${branch}`]
+    : ["push", "-u", "origin", branch];
+  await checkedRun("git push", runCommandArgs("git", pushArgs, git.root));
   const ghArgs = prCreateArgs(base, branch, title, draft);
   const gh = await checkedRun("gh pr create", runCommandArgs(githubCli(), ghArgs, git.root, body));
   const prUrl = firstUrl(gh.stdout) ?? gh.stdout.trim();
@@ -1537,7 +1542,11 @@ function plannedPrCommands(
     }
     commands.push(`git commit -m ${shellArg(title)} -- ${shellPathspecArgs(commitFiles)}`);
   }
-  commands.push(`git push -u origin ${shellArg(branch)}`);
+  commands.push(
+    patch.git.commitSha === null
+      ? `git push -u origin ${shellArg(branch)}`
+      : `git push origin ${shellArg(`${patch.git.commitSha}:refs/heads/${branch}`)}`,
+  );
   commands.push(`gh ${prCreateArgs(base, branch, title, draft).map(shellArg).join(" ")}`);
   return commands;
 }

src/workflow.test.ts

@@ -517,6 +517,7 @@ describe("workflow", () => {
       const summary = await readFile(summaryPath, "utf8");
 
       expect(result).toMatchObject({
+        reviewed: 0,
         findings: 0,
         reportFindings: 1,
       });
@@ -3721,6 +3722,16 @@ describe("workflow", () => {
       );
       expect(afterFailure?.git.commitSha).toMatch(/^[a-f0-9]{40}$/u);
       expect(afterFailure?.git.branchName).toBe("clawpatch/pat_open_pr_retry");
+      const recordedCommit = afterFailure?.git.commitSha;
+      if (recordedCommit === null || recordedCommit === undefined) {
+        throw new Error("missing recorded patch commit");
+      }
+
+      await writeFixture(root, "src/unrelated.ts", "export const unrelated = true;\n");
+      await checkCommand(root, "git add src/unrelated.ts");
+      await checkCommand(root, 'git -c commit.gpgsign=false commit -q -m "unrelated"');
+      const advancedHead = (await runCommand("git rev-parse HEAD", root)).stdout.trim();
+      expect(advancedHead).not.toBe(recordedCommit);
 
       process.env["CLAWPATCH_GH"] = successGh;
       await expect(
@@ -3731,6 +3742,12 @@ describe("workflow", () => {
       ).resolves.toMatchObject({
         pr: "https://github.com/openclaw/clawpatch/pull/999",
       });
+      const remoteHead = (
+        await runCommand("git ls-remote --heads origin clawpatch/pat_open_pr_retry", root)
+      ).stdout
+        .trim()
+        .split(/\s+/u)[0];
+      expect(remoteHead).toBe(recordedCommit);
     } finally {
       if (previousGh === undefined) {
         delete process.env["CLAWPATCH_GH"];