next-issue 2.4.5 → 2.4.7

package/README.md

@@ -30,9 +30,12 @@ and exits with code 1. For each issue:
    state keeps the branch name that the state holds, and a worktree that
    holds that branch already stays in use. A branch that exists on the
    remote is the start, and a local branch that fell behind the remote is
-   fast-forwarded. A fast-forward of the base that is not safe leaves the
-   local base branch as it is and writes a `base.behind` event. A new branch
-   then starts from the remote base.
+   fast-forwarded. An issue with no saved state does not reuse a local
+   `<n>` branch: it resets that branch, and any worktree that holds it, to
+   the remote branch, or to the remote base when there is none. A
+   fast-forward of the base that is not safe leaves the local base branch as
+   it is and writes a `base.behind` event. A new branch then starts from the
+   remote base.
 4. Let the implementer agent do the work, then commit and push. When a git
    hook stops a commit, the agent that made the change gets the hook output,
    fixes it, and the harness commits again. A `commit:` line in the reply of
@@ -48,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/git.mjs

@@ -29,7 +29,7 @@ export const WORKTREE_DIR = '.worktrees';
 export function worktreePath(repo, issue) {
     return join(repo.root, WORKTREE_DIR, String(issue));
 }
-export async function addWorktree(repo, issue, branch, base, remote) {
+export async function addWorktree(repo, issue, branch, base, remote, start) {
     const upstream = `${remote}/${branch}`;
     await must('git', ['fetch', remote], { cwd: repo.root });
     const baseUpdated = await updateBase(repo, base, remote);
@@ -37,12 +37,16 @@ export async function addWorktree(repo, issue, branch, base, remote) {
     const pushed = await hasBranch(repo, upstream, '--remotes');
     const existing = await findWorktree(repo, branch);
     const path = existing ?? worktreePath(repo, issue);
+    const target = pushed ? upstream : `${remote}/${base}`;
     if (existing === undefined) {
-        const args = (await hasBranch(repo, branch))
+        const args = !start && (await hasBranch(repo, branch))
             ? ['worktree', 'add', path, branch]
-            : ['worktree', 'add', '-b', branch, path, pushed ? upstream : `${remote}/${base}`];
+            : ['worktree', 'add', '-B', branch, path, target];
         await must('git', args, { cwd: repo.root });
     }
+    else if (start) {
+        await discardChanges(path, target);
+    }
     if (pushed) {
         await run('git', ['merge', '--ff-only', upstream], { cwd: path });
     }

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,
@@ -132,7 +133,7 @@ export async function processIssue(context, issue) {
     };
     const state = saved === undefined ? fresh : context.reset ? resetState(saved) : saved;
     try {
-        const report = await work(context, issue, log, state);
+        const report = await work(context, issue, log, state, saved === undefined);
         log.event('issue.end', { outcome: report.outcome, reason: report.reason, ms: report.ms }, 'quiet');
         return report;
     }
@@ -159,7 +160,7 @@ export async function processIssue(context, issue) {
 function skipped(issue) {
     return { issue: issue.number, outcome: 'skipped', ciFixes: 0, reviewRounds: 0, ms: 0 };
 }
-async function work(context, issue, log, state) {
+async function work(context, issue, log, state, start) {
     const started = Date.now();
     const { repo, config, ports } = context;
     const branch = state.branch;
@@ -168,7 +169,7 @@ async function work(context, issue, log, state) {
         await writeState(repo, state);
     });
     const comments = await log.step('comments', {}, () => ports.issueComments(repo, issue.number));
-    const added = await log.step('worktree', { branch }, () => ports.addWorktree(repo, issue.number, branch, context.base, config.remote));
+    const added = await log.step('worktree', { branch }, () => ports.addWorktree(repo, issue.number, branch, context.base, config.remote, start));
     const worktree = added.path;
     if (!added.baseUpdated) {
         log.event('base.behind', { base: context.base }, 'quiet');
@@ -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.5",
+  "version": "2.4.7",
   "description": "Autonomous issue harness driven by the pi SDK",
   "keywords": [
     "github",