next-issue 2.4.4 → 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.

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;

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, disputeBranches, findWorktree, isDirty, push, removeWorktree, resetToBase, revision, setAside, } 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';
@@ -570,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.4",
+  "version": "2.4.5",
   "description": "Autonomous issue harness driven by the pi SDK",
   "keywords": [
     "github",