next-issue 2.4.8 → 2.4.9

package/README.md

@@ -125,6 +125,8 @@ pull request yet, when:
   ping-pong between the fixer and the reviewer, or a finding that the fixer
   disputed and the reviewer holds to. The person then decides;
 - the reviewer gives no verdict, or the checks do not finish in time;
+- someone pushes to the pull request while the harness waits for the checks,
+  so the pull request no longer shows the commit that the harness pushed;
 - with `--merge`, the merge of an approved pull request fails, for example
   because branch protection asks for a human approval;
 - with `--merge`, a queued merge does not finish in `checkTimeoutMinutes`, or

package/dist/git.mjs

@@ -160,6 +160,10 @@ export async function resetToBase(cwd, base, remote) {
 export async function revision(cwd) {
     return must('git', ['rev-parse', 'HEAD'], { cwd });
 }
+export async function isAncestor(cwd, ancestor, descendant) {
+    const result = await run('git', ['merge-base', '--is-ancestor', ancestor, descendant], { cwd });
+    return result.code === 0;
+}
 export async function deleteBranch(repo, branch) {
     const result = await run('git', ['branch', '-D', branch], { cwd: repo.root });
     return result.code === 0;

package/dist/github.mjs

@@ -1,4 +1,5 @@
 import { must, run } from './exec.mjs';
+import { isAncestor } from './git.mjs';
 const CHECK_PENDING_CODE = 8;
 const READ_TRIES = 3;
 const NETWORK_TRIES = 3;
@@ -214,6 +215,9 @@ export async function pollChecks(probe, options, clock = REAL_CLOCK) {
             return 'timeout';
         }
         const state = await read(probe, options.head, rest(), () => (shown ??= clock.now()));
+        if (state === 'behind' && shown !== undefined) {
+            return 'moved';
+        }
         if (state instanceof Error) {
             failures += 1;
             if (failures >= READ_TRIES) {
@@ -234,14 +238,21 @@ export async function pollChecks(probe, options, clock = REAL_CLOCK) {
 }
 async function read(probe, head, timeoutMs, shown) {
     try {
-        if (head !== undefined && (await probe.head()) !== head) {
-            return 'behind';
+        if (head !== undefined) {
+            const current = await probe.head();
+            if (current !== head) {
+                return (await probe.lags(current)) ? 'behind' : 'moved';
+            }
         }
         shown();
         if ((await probe.list()) === 'none') {
             return 'none';
         }
-        return await probe.watch(timeoutMs);
+        const state = await probe.watch(timeoutMs);
+        if (head !== undefined && (await probe.head()) !== head) {
+            return 'moved';
+        }
+        return state;
     }
     catch (error) {
         return error instanceof Error ? error : new Error(String(error));
@@ -250,6 +261,9 @@ async function read(probe, head, timeoutMs, shown) {
 export function waitForChecks(repo, pr, options) {
     return pollChecks({
         head: () => prHead(repo, pr),
+        lags: (head) => options.head === undefined
+            ? Promise.resolve(true)
+            : isAncestor(repo.root, head, options.head),
         list: async () => ((await readChecks(repo, pr)) === 'none' ? 'none' : 'some'),
         watch: (timeoutMs) => watchOnce(repo, pr, options.intervalSeconds, timeoutMs, options.show),
     }, options);
@@ -287,6 +301,7 @@ function baseState(runs) {
 export function waitForBaseChecks(repo, sha, options) {
     return pollChecks({
         head: async () => sha,
+        lags: async () => true,
         list: async () => ((await baseRuns(repo, sha)).length === 0 ? 'none' : 'some'),
         watch: async () => baseState(await baseRuns(repo, sha)),
     }, options);

package/dist/pipeline.mjs

@@ -302,6 +302,10 @@ async function checkGate(job) {
         await escalate(job, 'The pull request conflicts with its base, so no checks ran.');
         return { done: true, report: await finish(job, 'needs-human', 'merge conflict') };
     }
+    if (checks === 'moved') {
+        await escalate(job, 'Someone pushed to the pull request while the harness waited for the checks.');
+        return { done: true, report: await finish(job, 'needs-human', 'pull request moved') };
+    }
     if (checks !== 'fail') {
         return { done: false, fixed: false };
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "next-issue",
-  "version": "2.4.8",
+  "version": "2.4.9",
   "description": "Autonomous issue harness driven by the pi SDK",
   "keywords": [
     "github",