next-issue 2.4.3 → 2.4.5

package/README.md

@@ -37,7 +37,8 @@ and exits with code 1. For each issue:
    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
    the agent replaces the subject, so a hook that rejects the subject can pass.
-   The budget is `maxCommitFixes`.
+   The budget is `maxCommitFixes`. Any other git failure in the commit stops
+   the run with an error.
 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.
@@ -100,13 +101,19 @@ when:
 - the fixer reports that the checks fail for a reason the change did not cause,
   such as a test already broken on the base branch or one that fails only under
   load. It changes nothing and the reason reaches the pull request, rather than
-  the fixer spending its whole budget on a failure it cannot fix;
+  the fixer spending its whole budget on a failure it cannot fix. A commit it
+  makes anyway moves aside, as for a dispute of the findings;
 - a fixer disputes the findings and leaves a change behind, either in the
   worktree or in a commit of its own. A dispute carries a reason, not a diff,
   so the harness throws none of it away: an unclean worktree stays on the
-  disk, and a commit of the fixer stays on the local branch. Neither is
-  pushed, so the pull request shows no such change. It holds the reason of the
-  dispute, and the change is on the machine that ran the harness;
+  disk, and a commit of the fixer moves to a new local
+  `<n>-dispute-<commit>` branch, so the `<n>` branch keeps only what the pull
+  request holds. The worktree drops the change of that commit, unless the fixer
+  edited the worktree after the commit: then the worktree keeps both and stays
+  on the disk. Neither is pushed, so the pull request shows no such change. It
+  holds the reason of the dispute, and the change is on the machine that ran
+  the harness. The `<n>-dispute-<commit>` branches go away with the `<n>`
+  branch when the issue is done;
 - the reviewer repeats a finding set from an earlier round, which shows a
   ping-pong between the fixer and the reviewer, or a finding that the fixer
   disputed and the reviewer holds to. The person then decides;

package/dist/git.mjs

@@ -1,4 +1,5 @@
-import { appendFile, readFile } from 'node:fs/promises';
+import { appendFile, mkdtemp, readFile, rm, writeFile } from 'node:fs/promises';
+import { tmpdir } from 'node:os';
 import { join } from 'node:path';
 import { must, run } from './exec.mjs';
 const REMOTE_PATTERNS = [
@@ -97,14 +98,34 @@ export async function isDirty(cwd) {
 export async function diff(cwd, base, remote) {
     return must('git', ['diff', `${remote}/${base}...HEAD`], { cwd });
 }
+export class HookError extends Error {
+}
 export async function commitAll(cwd, message) {
     if (!(await isDirty(cwd))) {
         return false;
     }
     await must('git', ['add', '-A'], { cwd });
-    await must('git', ['commit', '-m', message], { cwd });
+    const folder = await mkdtemp(join(tmpdir(), 'next-issue-message-'));
+    const file = join(folder, 'COMMIT_EDITMSG');
+    try {
+        await writeFile(file, `${message}\n`);
+        await runHook(cwd, 'pre-commit');
+        await runHook(cwd, 'commit-msg', file);
+        await must('git', ['commit', '--no-verify', '-F', file], { cwd });
+    }
+    finally {
+        await rm(folder, { recursive: true, force: true });
+    }
     return true;
 }
+async function runHook(cwd, name, ...args) {
+    try {
+        await must('git', ['hook', 'run', '--ignore-missing', name, '--', ...args], { cwd });
+    }
+    catch (error) {
+        throw new HookError(error instanceof Error ? error.message : String(error));
+    }
+}
 export async function discardChanges(cwd, target) {
     if (!(await isDirty(cwd)) && (await revision(cwd)) === target) {
         return false;
@@ -113,6 +134,18 @@ export async function discardChanges(cwd, target) {
     await must('git', ['clean', '-fd'], { cwd });
     return true;
 }
+export async function setAside(cwd, target, branch) {
+    await must('git', ['branch', branch], { cwd });
+    if (await isDirty(cwd)) {
+        await must('git', ['reset', '--soft', target], { cwd });
+        return;
+    }
+    await discardChanges(cwd, target);
+}
+export async function disputeBranches(repo, branch) {
+    const list = await must('git', ['for-each-ref', '--format=%(refname:short)', `refs/heads/${branch}-dispute-*`], { cwd: repo.root });
+    return list.split('\n').filter((line) => line.length > 0);
+}
 export async function push(cwd, remote, branch, force = false) {
     await must('git', ['push', '-u', ...(force ? ['--force'] : []), remote, branch], { cwd });
 }

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, findWorktree, isDirty, push, removeWorktree, resetToBase, revision, } from './git.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 { message } from './observe.mjs';
 import { capDiff, fixPrompt, hookPrompt, implementPrompt, parseCommitSubject, parseUnrelated, reviewPrompt, } from './prompts.mjs';
@@ -17,6 +17,7 @@ export const PORTS = {
     detectSetupCommand,
     diff,
     discardChanges,
+    disputeBranches,
     failedBaseLogs,
     failedCheckLogs,
     findPr,
@@ -36,6 +37,7 @@ export const PORTS = {
     revision,
     runAgent,
     runSetup: async (command, cwd, timeoutMs) => run('bash', ['-lc', command], { cwd, timeoutMs }),
+    setAside,
     setLabel,
     viewIssue,
     waitForBaseChecks,
@@ -501,8 +503,10 @@ async function finish(job, outcome, reason) {
     const { repo, ports } = context;
     await cleanUp(context, log, branch);
     if (outcome === 'done') {
-        if (!(await ports.deleteBranch(repo, branch))) {
-            log.event('branch.kept', { branch }, 'quiet');
+        for (const name of [branch, ...(await ports.disputeBranches(repo, branch))]) {
+            if (!(await ports.deleteBranch(repo, name))) {
+                log.event('branch.kept', { branch: name }, 'quiet');
+            }
         }
         await dropState(repo, issue.number);
     }
@@ -531,7 +535,14 @@ async function fixRound(job, reason, detail, earlier, kind, force = false, from)
     }));
     const unrelated = parseUnrelated(result.text);
     if (unrelated !== undefined) {
-        const stray = (await ports.revision(worktree)) !== before || (await ports.isDirty(worktree));
+        const disputed = await ports.revision(worktree);
+        const moved = disputed !== before;
+        if (moved) {
+            const aside = `${branch}-dispute-${disputed.slice(0, 7)}`;
+            await ports.setAside(worktree, before, aside);
+            log.event('fix.aside', { branch: aside }, 'quiet');
+        }
+        const stray = moved || (await ports.isDirty(worktree));
         log.event('fix.unrelated', { reason, note: unrelated, stray }, 'quiet');
         return { committed: false, unrelated, stray };
     }
@@ -559,7 +570,7 @@ async function commitWork(job, before, subject, role) {
         }
         catch (error) {
             const used = state.commitFixes ?? 0;
-            if (used >= config.maxCommitFixes) {
+            if (!(error instanceof HookError) || used >= config.maxCommitFixes) {
                 throw error;
             }
             state.commitFixes = used + 1;

package/package.json

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