next-issue 2.4.8 → 2.4.10

package/README.md

@@ -41,7 +41,10 @@ and exits with code 1. For each issue:
    fixes it, and the harness commits again. A `commit:` line in the reply of
    the agent replaces the subject, so a hook that rejects the subject can pass.
    The budget is `maxCommitFixes`. Any other git failure in the commit stops
-   the run with an error.
+   the run with an error. An implementer that makes no change hands the issue
+   to a person, unless the branch is already ahead of the base, for example
+   after the state file was lost: the run then carries on with the commits on
+   the branch, and the newest of them gives the title of the pull request.
 5. Open a draft pull request that closes the issue. Its title is the subject
    of the commit that starts it, so a squash merge gives a conventional
    commit.
@@ -125,6 +128,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

@@ -157,9 +157,19 @@ export async function resetToBase(cwd, base, remote) {
     await must('git', ['fetch', remote, base], { cwd });
     await must('git', ['reset', '--hard', `${remote}/${base}`], { cwd });
 }
+export async function latestSubject(cwd, base, remote) {
+    const subject = await must('git', ['log', '-1', '--format=%s', `${remote}/${base}..HEAD`], {
+        cwd,
+    });
+    return subject === '' ? undefined : subject;
+}
 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

@@ -1,7 +1,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 { addWorktree, branchName, commitAll, deleteBranch, diff, discardChanges, disputeBranches, findWorktree, HookError, isDirty, latestSubject, push, removeWorktree, resetToBase, revision, setAside, } from './git.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';
@@ -25,6 +25,7 @@ export const PORTS = {
     findWorktree,
     isDirty,
     issueComments,
+    latestSubject,
     markPrReady,
     mergeCommit,
     mergePr,
@@ -211,8 +212,13 @@ async function work(context, issue, log, state, start) {
         }));
         const subject = parseCommitSubject(result.text, `fix: resolve issue #${issue.number}`);
         if (!(await commitWork(job, before, subject, 'implementer'))) {
-            await escalate(job, 'The implementer produced no change.');
-            return finish(job, 'needs-human', 'no implementation commit');
+            const earlier = await ports.latestSubject(worktree, context.base, config.remote);
+            if (earlier === undefined) {
+                await escalate(job, 'The implementer produced no change.');
+                return finish(job, 'needs-human', 'no implementation commit');
+            }
+            log.event('implement.earlier', { subject: earlier }, 'quiet');
+            state.title = earlier;
         }
         state.phase = 'implemented';
         await writeState(repo, state);
@@ -302,6 +308,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.10",
   "description": "Autonomous issue harness driven by the pi SDK",
   "keywords": [
     "github",