next-issue 2.4.4 → 2.4.6

package/README.md

@@ -30,14 +30,18 @@ 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
    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 = [
@@ -28,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);
@@ -36,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 });
     }
@@ -97,14 +102,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';
@@ -132,7 +132,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 +159,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 +168,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');
@@ -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.6",
   "description": "Autonomous issue harness driven by the pi SDK",
   "keywords": [
     "github",