next-issue 0.15.0 → 0.17.0

package/README.md

@@ -22,8 +22,10 @@ For each open issue, oldest first:
 1. Claim the issue only when it holds the `status:todo` label and holds no
    `status:in-progress` or `status:in-review` label. A `status:done`,
    `status:needs-human` or `status:blocked` label always stops the claim, a
-   resume too. An issue with saved state under `.next-issue/` resumes instead,
-   whatever its other labels.
+   resume too. An issue that GitHub lists as blocked by an open issue waits,
+   because its blocker closes only when the pull request of the blocker merges.
+   An issue with saved state under `.next-issue/` resumes instead, whatever its
+   other labels and blockers.
 2. Add `status:in-progress` to the issue.
 3. Fetch the remote, fast-forward the local copy of the default branch when
    that is safe, then add a git worktree at `../<repo>-issue-<n>` on the
@@ -56,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
@@ -89,6 +93,8 @@ 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.
@@ -264,8 +270,8 @@ does not know all stop the run, so a typo cannot pass without a word.
 An empty `labels.ready` turns the ready requirement off. The harness then
 claims every open issue that no other label holds back.
 
-The log gives the reason for a skipped issue as `stop-label`, `not-ready` or
-`in-flight`.
+The log gives the reason for a skipped issue as `stop-label`, `not-ready`,
+`in-flight` or `blocked`, the last one with the open blockers.
 
 A role set to `null`, or with no entry in `models`, uses the default model of
 the agent.
@@ -333,6 +339,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

@@ -44,6 +44,19 @@ export async function issueComments(repo, issue) {
     const parsed = JSON.parse(raw);
     return parsed.comments.map((comment) => `@${comment.author.login}: ${comment.body}`);
 }
+export async function openBlockers(repo, issue) {
+    const raw = await must("gh", [
+        "api",
+        "--paginate",
+        `repos/${slug(repo)}/issues/${issue}/dependencies/blocked_by`,
+        "--jq",
+        '.[] | select(.state == "open") | (.repository_url | split("/") | .[-2:] | join("/")) + "#" + (.number | tostring)',
+    ], { cwd: repo.root });
+    return raw
+        .split("\n")
+        .filter((line) => line.length > 0)
+        .map((ref) => (ref.startsWith(`${slug(repo)}#`) ? ref.slice(slug(repo).length) : ref));
+}
 async function labelsOf(repo, kind, number) {
     const raw = await gh(repo, [kind, "view", String(number), "--json", "labels"]);
     const parsed = JSON.parse(raw);
@@ -227,6 +240,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);
 }

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, 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,8 @@ export const PORTS = {
     isDirty,
     issueComments,
     markPrReady,
+    mergePr,
+    openBlockers,
     push,
     removeWorktree,
     revision,
@@ -55,7 +57,21 @@ export async function processIssue(context, issue) {
     const skip = skipReason(issue, context.config, saved !== undefined);
     if (skip !== undefined) {
         log.event("issue.skip", { title: issue.title, reason: skip });
-        return { issue: issue.number, outcome: "skipped", ciFixes: 0, reviewRounds: 0, ms: 0 };
+        return skipped(issue);
+    }
+    if (saved === undefined) {
+        let blockers;
+        try {
+            blockers = await context.ports.openBlockers(context.repo, issue.number);
+        }
+        catch (error) {
+            log.event("issue.error", { error: message(error), ms: Date.now() - started }, "quiet");
+            return { ...skipped(issue), outcome: "error", reason: message(error), ms: Date.now() - started };
+        }
+        if (blockers.length > 0) {
+            log.event("issue.skip", { title: issue.title, reason: "blocked", blockers });
+            return skipped(issue);
+        }
     }
     log.event("issue.start", { title: issue.title, createdAt: issue.createdAt }, "quiet");
     const fresh = {
@@ -92,6 +108,9 @@ 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) {
     const started = Date.now();
     const { repo, config, ports } = context;
@@ -270,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.15.0",
+  "version": "0.17.0",
   "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"
   }
 }