next-issue 2.4.6 → 2.4.7

package/README.md

@@ -51,7 +51,10 @@ and exits with code 1. For each issue:
    while no check failed counts as such a read, not as a red build. A repository that reports no
    check keeps asking for `checkGraceSeconds`, because a new pull request often
    shows no check yet, and only then goes straight to the review. The later
-   gates of the same issue ask once.
+   gates of the same issue ask once. GitHub runs no check on a pull request
+   that conflicts with its base, so no check and a conflict hand the issue to
+   a person. While GitHub still works out whether the pull request can merge,
+   the run asks again until `checkTimeoutMinutes`.
 7. On a red build, give the failed job logs to the fixer agent, then go to step
    6 again. The budget is `maxCiFixes`.
 8. Let the reviewer agent judge the diff, at most `diffMaxChars` of it. The

package/dist/github.mjs

@@ -330,6 +330,17 @@ export async function mergePr(repo, pr) {
     const result = await run('gh', ['pr', 'merge', String(pr), '--squash', '--delete-branch', '--repo', slug(repo)], { cwd: repo.root });
     return result.code === 0;
 }
+export async function prConflicts(repo, pr, options, clock = REAL_CLOCK) {
+    const deadline = clock.now() + options.timeoutMs;
+    for (;;) {
+        const mergeable = (await gh(repo, ['pr', 'view', String(pr), '--json', 'mergeable', '--jq', '.mergeable'])).trim();
+        const rest = deadline - clock.now();
+        if (mergeable !== 'UNKNOWN' || rest <= 0) {
+            return mergeable === 'CONFLICTING';
+        }
+        await clock.sleep(Math.min(options.intervalSeconds * 1000, rest));
+    }
+}
 export async function prMerged(repo, pr) {
     return ((await gh(repo, ['pr', 'view', String(pr), '--json', 'state', '--jq', '.state'])).trim() ===
         'MERGED');

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, prMerged, reopenIssue, setLabel, viewIssue, waitForBaseChecks, waitForChecks, } from './github.mjs';
+import { 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';
@@ -29,6 +29,7 @@ export const PORTS = {
     mergePr,
     openBlockers,
     openIssues,
+    prConflicts,
     prMerged,
     push,
     removeWorktree,
@@ -292,6 +293,14 @@ async function checkGate(job) {
         await escalate(job, 'The checks did not finish in time.');
         return { done: true, report: await finish(job, 'needs-human', 'checks timeout') };
     }
+    if (checks === 'none' &&
+        (await ports.prConflicts(repo, state.pr, {
+            intervalSeconds: config.checkIntervalSeconds,
+            timeoutMs: config.checkTimeoutMinutes * 60_000,
+        }))) {
+        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 !== 'fail') {
         return { done: false, fixed: false };
     }

package/package.json

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