next-issue 2.4.7 → 2.4.9

package/README.md

@@ -100,7 +100,8 @@ and exits with code 1. For each issue:
 ## Stops for a loop
 
 The harness hands the issue to a person, with the `status:needs-human` label,
-when:
+and comments the reason on the pull request, or on the issue when there is no
+pull request yet, when:
 
 - the check budget or the review budget runs out;
 - a fixer round adds no commit and gives no reason, so there is no progress;
@@ -124,6 +125,8 @@ 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
@@ -135,8 +138,8 @@ when:
 - the setup command fails, or does not finish in `setupTimeoutMinutes`;
 - a step of the run fails with an error. A `gh` call that is safe to repeat,
   such as a read or a label edit, is tried up to three times first when the
-  network fails. A `gh pr create` or `gh pr comment` is tried once, so a lost
-  reply never makes a duplicate.
+  network fails. A `gh pr create`, `gh pr comment` or `gh issue comment` is
+  tried once, so a lost reply never makes a duplicate.
 
 The fixer sees the findings of all earlier rounds, not only the last one, with
 its own disputes next to them. From round two, the reviewer judges only the

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);
@@ -363,6 +378,9 @@ export async function mergeCommit(repo, pr, options, clock = REAL_CLOCK) {
 export async function reopenIssue(repo, issue) {
     await gh(repo, ['issue', 'reopen', String(issue)]);
 }
+export async function commentOnIssue(repo, issue, body) {
+    await ghOnce(repo, ['issue', 'comment', String(issue), '--body-file', '-'], body);
+}
 export async function commentOnPr(repo, pr, body) {
     await ghOnce(repo, ['pr', 'comment', String(pr), '--body-file', '-'], body);
 }

package/dist/pipeline.mjs

@@ -2,7 +2,7 @@ import { CODING, REVIEWING, runAgent } from './agents.mjs';
 import { managedLabels } from './config.mjs';
 import { run } from './exec.mjs';
 import { addWorktree, branchName, commitAll, deleteBranch, diff, discardChanges, disputeBranches, findWorktree, HookError, isDirty, push, removeWorktree, resetToBase, revision, setAside, } from './git.mjs';
-import { commentOnPr, createPr, failedBaseLogs, failedCheckLogs, findPr, issueComments, markPrReady, mergeCommit, mergePr, openBlockers, openIssues, prConflicts, prMerged, reopenIssue, setLabel, viewIssue, waitForBaseChecks, waitForChecks, } from './github.mjs';
+import { commentOnIssue, commentOnPr, createPr, failedBaseLogs, failedCheckLogs, findPr, issueComments, markPrReady, mergeCommit, mergePr, openBlockers, openIssues, prConflicts, prMerged, reopenIssue, setLabel, viewIssue, waitForBaseChecks, waitForChecks, } from './github.mjs';
 import { message } from './observe.mjs';
 import { capDiff, fixPrompt, hookPrompt, implementPrompt, parseCommitSubject, parseUnrelated, reviewPrompt, } from './prompts.mjs';
 import { detectSetupCommand } from './setup.mjs';
@@ -10,6 +10,7 @@ import { dropState, readState, resetState, savedIssues, writeState, } from './st
 import { blockingFindings, fingerprint, formatFindings, formatVerdict, openFindings, readVerdict, VERDICT_SCHEMA, } from './verdict.mjs';
 export const PORTS = {
     addWorktree,
+    commentOnIssue,
     commentOnPr,
     commitAll,
     createPr,
@@ -301,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 };
     }
@@ -616,8 +621,12 @@ async function handOver(context, log, issue, state, reason) {
     log.event('hand-over', { reason }, 'quiet');
     await writeState(context.repo, state);
     await setStatus(context, issue, state.pr, context.config.labels.needsHuman);
-    if (state.pr !== undefined) {
-        await context.ports.commentOnPr(context.repo, state.pr, `next-issue needs help: ${reason}`);
+    const body = `next-issue needs help: ${reason}`;
+    if (state.pr === undefined) {
+        await context.ports.commentOnIssue(context.repo, issue, body);
+    }
+    else {
+        await context.ports.commentOnPr(context.repo, state.pr, body);
     }
 }
 async function setStatus(context, issue, pr, label) {

package/package.json

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