next-issue 0.16.0 → 0.17.1

package/README.md

@@ -58,8 +58,10 @@ For each open issue, oldest first:
    round gets no review. Thus `maxReviewRounds` of `1` never fixes a minor
    finding.
 10. No open finding means approval: mark the pull request ready for review and
-    set `status:done`. The merge stays with you. The worktree, the local branch
-    and the state file go away. The remote branch stays. A problem that the
+    set `status:done`. The merge stays with you, unless you pass `--merge`:
+    then the harness squash-merges the pull request and deletes the remote
+    branch. The worktree, the local branch and the state file go away. Without
+    `--merge`, the remote branch stays. A problem that the
     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
@@ -91,9 +93,14 @@ when:
    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;
+- with `--merge`, the merge of an approved pull request fails, for example
+   because branch protection asks for a human approval;
 - 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.
+- a step of the run fails with an error. A `gh` call that is safe to repeat,
+   such as a read or a label edit, is tried up to three times first when the
+   network fails. A `gh pr create` or `gh pr comment` is tried once, so a lost
+   reply never makes a duplicate.
 
 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
@@ -335,6 +342,7 @@ that a label still holds back stays as it was.
 | `--once` | Stop after the first handled issue |
 | `--max <n>` | Handle at most n issues |
 | `--agent <a>` | Run the agents with `claude` or `pi`, whatever the config file says |
+| `--merge` | Squash-merge the pull request after the approval, and delete the remote branch |
 | `--reset` | Drop the saved budgets and findings, and keep the rest of the state |
 | `--json` | Print the machine summary instead of the text one |
 | `--verbose` | Show every command and all agent output |

package/dist/args.mjs

@@ -6,6 +6,7 @@ export const USAGE = `next-issue [command] [options]
   --once       stop after the first handled issue
   --max <n>    handle at most n issues
   --agent <a>  run the agents with claude or pi
+  --merge      squash-merge the pull request after the approval
   --reset      drop the saved budgets and findings first
   --json       print the machine summary instead of the text one
   --force      replace an existing config file, with init
@@ -21,6 +22,7 @@ export function parseArgs(argv) {
         json: false,
         reset: false,
         force: false,
+        merge: false,
         level: "normal",
     };
     for (let index = 0; index < argv.length; index += 1) {
@@ -40,6 +42,9 @@ export function parseArgs(argv) {
         else if (arg === "--help") {
             args.help = true;
         }
+        else if (arg === "--merge") {
+            args.merge = true;
+        }
         else if (arg === "--reset") {
             args.reset = true;
         }

package/dist/cli.mjs

@@ -62,7 +62,7 @@ async function init(root, force) {
 }
 async function handle(args, config, repo, recorder) {
     const base = await defaultBranch(repo);
-    const context = { repo, config, base, reset: args.reset, recorder, ports: PORTS };
+    const context = { repo, config, base, reset: args.reset, merge: args.merge, recorder, ports: PORTS };
     recorder.event("run.start", {
         version: await packageVersion(),
         repo: `${repo.owner}/${repo.name}`,

package/dist/github.mjs

@@ -1,16 +1,34 @@
 import { must, run } from "./exec.mjs";
 const CHECK_PENDING_CODE = 8;
 const READ_TRIES = 3;
+const NETWORK_TRIES = 3;
+const NETWORK_FAULT = /unexpected EOF|connection reset|connection refused|i\/o timeout|TLS handshake timeout|HTTP 50[234]/i;
 const KNOWN_LABELS = new Map();
 const NO_CHECKS = /no checks reported/i;
 function slug(repo) {
     return `${repo.owner}/${repo.name}`;
 }
-async function gh(repo, args, input) {
+async function repeatable(args, options) {
+    for (let attempt = 1;; attempt += 1) {
+        try {
+            return await must("gh", args, options);
+        }
+        catch (error) {
+            if (attempt >= NETWORK_TRIES || !(error instanceof Error) || !NETWORK_FAULT.test(error.message)) {
+                throw error;
+            }
+            await new Promise((resolve) => setTimeout(resolve, attempt * 1000));
+        }
+    }
+}
+async function gh(repo, args) {
+    return repeatable([...args, "--repo", slug(repo)], { cwd: repo.root });
+}
+async function ghOnce(repo, args, input) {
     return must("gh", [...args, "--repo", slug(repo)], { cwd: repo.root, input });
 }
 export async function defaultBranch(repo) {
-    const raw = await must("gh", ["repo", "view", slug(repo), "--json", "defaultBranchRef"], {
+    const raw = await repeatable(["repo", "view", slug(repo), "--json", "defaultBranchRef"], {
         cwd: repo.root,
     });
     return JSON.parse(raw).defaultBranchRef.name;
@@ -45,7 +63,7 @@ export async function issueComments(repo, issue) {
     return parsed.comments.map((comment) => `@${comment.author.login}: ${comment.body}`);
 }
 export async function openBlockers(repo, issue) {
-    const raw = await must("gh", [
+    const raw = await repeatable([
         "api",
         "--paginate",
         `repos/${slug(repo)}/issues/${issue}/dependencies/blocked_by`,
@@ -100,7 +118,7 @@ export async function findPr(repo, branch) {
     return parsed[0]?.number;
 }
 export async function createPr(repo, branch, base, title, body, draft) {
-    const created = await gh(repo, [
+    const created = await ghOnce(repo, [
         "pr",
         "create",
         "--head",
@@ -240,6 +258,10 @@ export async function markPrReady(repo, pr) {
     });
     return result.code === 0;
 }
+export async function mergePr(repo, pr) {
+    const result = await run("gh", ["pr", "merge", String(pr), "--squash", "--delete-branch", "--repo", slug(repo)], { cwd: repo.root });
+    return result.code === 0;
+}
 export async function commentOnPr(repo, pr, body) {
-    await gh(repo, ["pr", "comment", String(pr), "--body-file", "-"], body);
+    await ghOnce(repo, ["pr", "comment", String(pr), "--body-file", "-"], body);
 }

package/dist/pipeline.mjs

@@ -2,7 +2,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, isDirty, push, removeWorktree, revision, worktreePath, } from "./git.mjs";
-import { commentOnPr, createPr, failedCheckLogs, findPr, issueComments, markPrReady, openBlockers, setLabel, waitForChecks, } from "./github.mjs";
+import { commentOnPr, createPr, failedCheckLogs, findPr, issueComments, markPrReady, mergePr, openBlockers, setLabel, waitForChecks, } from "./github.mjs";
 import { message } from "./observe.mjs";
 import { capDiff, fixPrompt, implementPrompt, parseCommitSubject, parseUnrelated, reviewPrompt, } from "./prompts.mjs";
 import { detectSetupCommand } from "./setup.mjs";
@@ -23,6 +23,7 @@ export const PORTS = {
     isDirty,
     issueComments,
     markPrReady,
+    mergePr,
     openBlockers,
     push,
     removeWorktree,
@@ -288,6 +289,10 @@ async function reviewRound(job) {
         if (config.draftPullRequest && !(await ports.markPrReady(repo, pr))) {
             log.event("pull-request.undraft.fail", { pr }, "quiet");
         }
+        if (context.merge && !(await ports.mergePr(repo, pr))) {
+            await escalate(job, "The merge of the pull request failed.");
+            return { done: true, report: await finish(job, "needs-human", "merge failed") };
+        }
         await setStatus(context, issue.number, pr, config.labels.done);
         return { done: true, report: await finish(job, "done") };
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "next-issue",
-  "version": "0.16.0",
+  "version": "0.17.1",
   "description": "Autonomous issue harness driven by the Claude Agent SDK",
   "keywords": [
     "github",
@@ -37,10 +37,10 @@
     "prepublishOnly": "npm run typecheck && npm test"
   },
   "devDependencies": {
-    "@types/node": "^26.6.5",
+    "@types/node": "^26.6.6",
     "typescript": "^7.0.2"
   },
   "dependencies": {
-    "@anthropic-ai/claude-agent-sdk": "^0.3.310"
+    "@anthropic-ai/claude-agent-sdk": "^0.3.316"
   }
 }