next-issue 0.13.0 → 0.14.0

package/README.md

@@ -60,7 +60,12 @@ For each open issue, oldest first:
     reviewer leaves out of the findings thus gets an approval: only the findings
     count.
 11. With an open finding, run the fixer agent and go to step 6 again. The
-    budget is `maxReviewRounds`.
+    budget is `maxReviewRounds`. A fixer that holds every finding to be wrong
+    changes nothing and gives its reason instead. The reason goes on the pull
+    request and into the next round, where it answers every finding of its own
+    round, so the reviewer withdraws them all or repeats them all. With only
+    some findings wrong, the fixer fixes the correct ones, and the next round
+    holds the rest.
 
 ## Stops for a loop
 
@@ -68,20 +73,35 @@ The harness hands the issue to a person, with the `status:needs-human` label,
 when:
 
 - the check budget or the review budget runs out;
-- a fixer round adds no commit, so there is no progress;
+- a fixer round adds no commit and gives no reason, so there is no progress;
 - 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;
+- 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;
 - the reviewer repeats a finding set from an earlier round, which shows a
-   ping-pong between the fixer and the reviewer;
+   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;
 - an agent does not finish in `agentTimeoutMinutes`;
 - the setup command fails, or does not finish in `setupTimeoutMinutes`;
 - a step of the run fails with an error.
 
-The fixer sees the findings of all earlier rounds, not only the last one. From
-round two, the reviewer judges only the earlier findings and any regression.
+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
+earlier findings and any regression.
+
+Each agent that writes to the pull request names itself in the first line of the
+comment: `### Review: approved`, `### Review: changes requested` and
+`### Fixer: no change`. The account is the same for all of them, so the heading,
+not the author, tells them apart. The agents read the comments of the issue, not
+of the pull request, so a comment of an agent never returns to a prompt: the
+dispute of the fixer reaches the reviewer through the state file.
 
 ## Stop after the current issue
 

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, hasWorktree, push, removeWorktree, revision, worktreePath, } from "./git.mjs";
+import { addWorktree, branchName, commitAll, deleteBranch, diff, discardChanges, hasWorktree, isDirty, push, removeWorktree, revision, worktreePath, } from "./git.mjs";
 import { commentOnPr, createPr, failedCheckLogs, findPr, issueComments, markPrReady, setLabel, waitForChecks, } from "./github.mjs";
 import { message } from "./observe.mjs";
 import { capDiff, fixPrompt, implementPrompt, parseCommitSubject, parseUnrelated, reviewPrompt, } from "./prompts.mjs";
@@ -20,6 +20,7 @@ export const PORTS = {
     failedCheckLogs,
     findPr,
     hasWorktree,
+    isDirty,
     issueComments,
     markPrReady,
     push,
@@ -280,8 +281,18 @@ async function reviewRound(job) {
     await writeState(repo, state);
     const fix = await fixRound(job, "The reviewer requested changes.", formatFindings(open), earlier, "review");
     if (!fix.committed) {
-        await escalate(job, "The fixer added no commit for the review findings.");
-        return { done: true, report: await finish(job, "needs-human", "no fix commit") };
+        const note = fix.unrelated;
+        if (note === undefined) {
+            await escalate(job, "The fixer added no commit for the review findings.");
+            return { done: true, report: await finish(job, "needs-human", "no fix commit") };
+        }
+        if (fix.stray === true) {
+            await escalate(job, `The fixer disputed the findings and left a change behind: ${note}`);
+            return { done: true, report: await finish(job, "needs-human", "dispute with changes") };
+        }
+        state.reviewLog.at(-1).dispute = note;
+        await writeState(repo, state);
+        await ports.commentOnPr(repo, pr, `### Fixer: no change\n\n${note}`);
     }
     return { done: false };
 }
@@ -322,8 +333,9 @@ async function fixRound(job, reason, detail, earlier, kind) {
     }));
     const unrelated = parseUnrelated(result.text);
     if (unrelated !== undefined) {
-        log.event("fix.unrelated", { reason, note: unrelated }, "quiet");
-        return { committed: false, unrelated };
+        const stray = (await ports.revision(worktree)) !== before || (await ports.isDirty(worktree));
+        log.event("fix.unrelated", { reason, note: unrelated, stray }, "quiet");
+        return { committed: false, unrelated, stray };
     }
     const subject = parseCommitSubject(result.text, `fix: address feedback on issue #${issue.number}`);
     if (!(await commitWork(job, before, subject))) {
@@ -370,5 +382,10 @@ async function setStatus(context, issue, pr, label) {
     }
 }
 function history(rounds) {
-    return rounds.map((round) => `Round ${round.round}:\n${round.findings}`);
+    return rounds.map((round) => {
+        const head = `Round ${round.round}:\n${round.findings}`;
+        return round.dispute === undefined
+            ? head
+            : `${head}\nThe fixer disputed every finding of this round: ${round.dispute}`;
+    });
 }

package/dist/prompts.mjs

@@ -33,6 +33,8 @@ export function reviewPrompt(issue, comments, diff, earlier) {
             "This is a later round. Judge two things only:",
             "whether the earlier findings below are now fixed, and whether the new commits broke something.",
             "Do not raise a new point of taste. Do not repeat a finding that is fixed.",
+            "A `The fixer disputed every finding of this round` line answers all of the findings of that round, not one of them.",
+            "Withdraw every finding of that round if the dispute is correct. Repeat them all if the dispute is wrong.",
             `## Earlier findings\n${earlier.join("\n")}`,
         ].join("\n");
     return [
@@ -56,6 +58,12 @@ const UNRELATED_RULE = [
     "Establish that before you fix anything. If the failure is not yours, change nothing and end your final message with one line in the form `unrelated: <one sentence on what fails and why it is not this change>`.",
     "A person then reads it. Do not weaken, skip or re-record a test to make the checks pass.",
 ].join("\n");
+const DISPUTE_RULE = [
+    "A finding can be wrong: it can miss a convention of this repository, ask for work that the issue does not want, or describe behaviour that the code does not have.",
+    "Establish that before you change anything. If every finding is wrong, change nothing and end your final message with one line in the form `unrelated: <one sentence on why the findings are wrong>`.",
+    "If only some of the findings are wrong, fix the correct ones and change nothing for the wrong ones. Write no `unrelated` line in that round. The next round holds only the findings that are left, and you can dispute them there.",
+    "The reviewer reads that line in the next round. Do not make a change that you hold to be wrong only to end the round.",
+].join("\n");
 export function fixPrompt(issue, reason, detail, earlier, kind) {
     return [
         `You are the fixer. Correct the work for issue #${issue.number}: ${issue.title}.`,
@@ -70,7 +78,7 @@ export function fixPrompt(issue, reason, detail, earlier, kind) {
             : "",
         "## Rules",
         "Fix the cause, not the symptom. Keep the change minimal.",
-        kind === "checks" ? UNRELATED_RULE : "",
+        kind === "checks" ? UNRELATED_RULE : DISPUTE_RULE,
         COMMIT_RULES,
     ]
         .filter((part) => part.length > 0)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "next-issue",
-  "version": "0.13.0",
+  "version": "0.14.0",
   "description": "Autonomous issue harness driven by the Claude Agent SDK",
   "keywords": [
     "github",