next-issue 0.19.0 → 0.20.0

package/README.md

@@ -33,7 +33,9 @@ For each open issue, oldest first:
    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.
-4. Let the implementer agent do the work, then commit and push.
+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. The budget is `maxCommitFixes`.
 5. Open a draft pull request that closes the issue.
 6. Wait for the checks, once the pull request shows the pushed commit. A
    pending state waits again, up to `checkTimeoutMinutes`. A read that fails
@@ -238,6 +240,7 @@ does not know all stop the run, so a typo cannot pass without a word.
   "remote": "origin",
   "issueLimit": 100,
   "maxCiFixes": 5,
+  "maxCommitFixes": 10,
   "maxReviewRounds": 5,
   "checkIntervalSeconds": 15,
   "checkGraceSeconds": 60,
@@ -271,6 +274,7 @@ does not know all stop the run, so a typo cannot pass without a word.
 | `remote` | `origin` | The git remote for the repository and the branches |
 | `issueLimit` | `100` | The maximum number of open issues to read |
 | `maxCiFixes` | `5` | The budget for check fixes per issue |
+| `maxCommitFixes` | `10` | The budget for fixes of a commit that a git hook stopped, per issue |
 | `maxReviewRounds` | `5` | The budget for review rounds per issue |
 | `checkIntervalSeconds` | `15` | The time between two check states |
 | `checkGraceSeconds` | `60` | The time to wait for the first check to show |

package/dist/config.mjs

@@ -7,6 +7,7 @@ const DEFAULTS = {
     remote: "origin",
     issueLimit: 100,
     maxCiFixes: 5,
+    maxCommitFixes: 10,
     maxReviewRounds: 5,
     checkIntervalSeconds: 15,
     checkGraceSeconds: 60,
@@ -35,6 +36,7 @@ const FIELDS = [...Object.keys(DEFAULTS), "setupCommand"];
 const WHOLE_FIELDS = [
     ["issueLimit", 1],
     ["maxCiFixes", 0],
+    ["maxCommitFixes", 0],
     ["maxReviewRounds", 1],
     ["checkIntervalSeconds", 1],
     ["checkGraceSeconds", 0],

package/dist/pipeline.mjs

@@ -4,7 +4,7 @@ import { run } from "./exec.mjs";
 import { addWorktree, branchName, commitAll, deleteBranch, diff, discardChanges, hasWorktree, isDirty, push, removeWorktree, resetToBase, revision, worktreePath, } from "./git.mjs";
 import { commentOnPr, createPr, failedBaseLogs, failedCheckLogs, findPr, issueComments, markPrReady, mergeCommit, mergePr, openBlockers, reopenIssue, setLabel, waitForBaseChecks, waitForChecks, } from "./github.mjs";
 import { message } from "./observe.mjs";
-import { capDiff, fixPrompt, implementPrompt, parseCommitSubject, parseUnrelated, reviewPrompt, } from "./prompts.mjs";
+import { capDiff, fixPrompt, hookPrompt, implementPrompt, parseCommitSubject, parseUnrelated, reviewPrompt, } from "./prompts.mjs";
 import { detectSetupCommand } from "./setup.mjs";
 import { dropState, readState, resetState, writeState, } from "./state.mjs";
 import { blockingFindings, fingerprint, formatFindings, formatVerdict, openFindings, readVerdict, VERDICT_SCHEMA, } from "./verdict.mjs";
@@ -166,7 +166,7 @@ async function work(context, issue, log, state) {
             timeoutMs: config.agentTimeoutMinutes * 60_000,
         }));
         const subject = parseCommitSubject(result.text, `fix: resolve issue #${issue.number}`);
-        if (!(await commitWork(job, before, subject))) {
+        if (!(await commitWork(job, before, subject, "implementer"))) {
             await escalate(job, "The implementer produced no change.");
             return finish(job, "needs-human", "no implementation commit");
         }
@@ -450,19 +450,43 @@ async function fixRound(job, reason, detail, earlier, kind) {
         return { committed: false, unrelated, stray };
     }
     const subject = parseCommitSubject(result.text, `fix: address feedback on issue #${issue.number}`);
-    if (!(await commitWork(job, before, subject))) {
+    if (!(await commitWork(job, before, subject, "fixer"))) {
         log.event("commit.empty", { reason }, "quiet");
         return { committed: false };
     }
     await ports.push(worktree, context.config.remote, branch);
     return { committed: true };
 }
-async function commitWork(job, before, subject) {
-    const { context, issue, log, worktree } = job;
-    if (await context.ports.commitAll(worktree, `${subject}\n\nRefs #${issue.number}`)) {
-        log.event("commit", { subject });
+async function commitWork(job, before, subject, role) {
+    const { context, issue, log, state, worktree, comments } = job;
+    const { repo, config, ports } = context;
+    for (;;) {
+        try {
+            if (await ports.commitAll(worktree, `${subject}\n\nRefs #${issue.number}`)) {
+                log.event("commit", { subject });
+            }
+            return (await ports.revision(worktree)) !== before;
+        }
+        catch (error) {
+            const used = state.commitFixes ?? 0;
+            if (used >= config.maxCommitFixes) {
+                throw error;
+            }
+            state.commitFixes = used + 1;
+            await writeState(repo, state);
+            const output = message(error).slice(-config.logMaxChars);
+            log.event("commit.fail", { role, output }, "quiet");
+            await log.step("commit-fix", { role }, () => ports.runAgent(log, {
+                name: role,
+                cwd: worktree,
+                prompt: hookPrompt(issue, comments, role, output),
+                profile: CODING,
+                model: config.models[role],
+                agent: config.agent,
+                timeoutMs: config.agentTimeoutMinutes * 60_000,
+            }));
+        }
     }
-    return (await context.ports.revision(worktree)) !== before;
 }
 async function cleanUp(context, log, issue) {
     const path = worktreePath(context.repo, issue);

package/dist/prompts.mjs

@@ -21,6 +21,16 @@ export function implementPrompt(issue, comments) {
         COMMIT_RULES,
     ].join("\n\n");
 }
+export function hookPrompt(issue, comments, role, output) {
+    return [
+        `You are the ${role}. The harness could not commit your work for the issue below, because a git hook failed.`,
+        issueBlock(issue, comments),
+        `## Hook output\n${output}`,
+        "## Rules",
+        "Fix what the hook reports and keep the rest of the work in this worktree. Do not skip or weaken the hook.",
+        COMMIT_RULES,
+    ].join("\n\n");
+}
 export function capDiff(diff, maxChars) {
     return diff.length <= maxChars
         ? diff

package/dist/state.mjs

@@ -16,7 +16,7 @@ export async function readState(repo, issue) {
     }
 }
 export function resetState(state) {
-    return { ...state, ciFixes: 0, reviewRounds: 0, reviewLog: [] };
+    return { ...state, ciFixes: 0, commitFixes: 0, reviewRounds: 0, reviewLog: [] };
 }
 export async function writeState(repo, state) {
     await mkdir(dir(repo), { recursive: true });

package/package.json

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