next-issue 2.3.2 → 2.4.1

package/README.md

@@ -284,7 +284,7 @@ does not know all stop the run, so a typo cannot pass without a word.
 | Field | Default | Effect |
 | --- | --- | --- |
 | `remote` | `origin` | The git remote for the repository and the branches |
-| `issueLimit` | `100` | The maximum number of open issues to read |
+| `issueLimit` | `100` | The maximum number of open issues to read. With `labels.ready` set, only issues with the ready, in-progress or in-review label count |
 | `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 |
@@ -357,6 +357,7 @@ that a label still holds back stays as it was.
 | --- | --- |
 | `init` | Write the config file with the defaults |
 | `serve` | Run the worker that pi extensions talk to, see [Worker](#worker) |
+| `stop` | Stop the worker, see [Worker](#worker) |
 | `--force` | Replace an existing config file, with `init` |
 | `--once` | Stop after the first handled issue |
 | `--max <n>` | Handle at most n issues |
@@ -423,7 +424,10 @@ to it. The worker:
 - stops every agent and command and exits on `SIGTERM` or `SIGINT`, and
   removes its socket and lock files.
 
-Stop it by hand with `kill $(cat ~/.pi/agent/next-issue.lock)`.
+Stop it with `next-issue stop`. This sends `SIGTERM` to the process in the
+lock file, so the worker stops at once and a run that is going resumes from
+its saved state next time. When no worker is running, the command says so and
+exits with 0.
 
 ## Development
 

package/dist/args.mjs

@@ -3,6 +3,7 @@ export const USAGE = `next-issue [command] [options]
 
   init         write ${CONFIG_FILE} with the defaults
   serve        run the worker that pi extensions talk to
+  stop         stop the worker
 
   --once       stop after the first handled issue
   --max <n>    handle at most n issues
@@ -30,7 +31,7 @@ export function parseArgs(argv) {
     for (let index = 0; index < argv.length; index += 1) {
         const arg = argv[index];
         if (index === 0 && !arg.startsWith("-")) {
-            if (arg !== "init" && arg !== "serve") {
+            if (arg !== "init" && arg !== "serve" && arg !== "stop") {
                 throw new Error(`Unknown command: ${arg}`);
             }
             args.command = arg;

package/dist/cli.mjs

@@ -5,7 +5,7 @@ import { ensureIgnored, repoRoot, WORKTREE_DIR } from "./git.mjs";
 import { listenForInterrupts } from "./interrupt.mjs";
 import { message } from "./observe.mjs";
 import { runRepo } from "./run.mjs";
-import { serve } from "./serve.mjs";
+import { serve, socketPaths, stopWorker } from "./serve.mjs";
 import { STATE_DIR } from "./state.mjs";
 import { formatSummary } from "./summary.mjs";
 function write(stream, text) {
@@ -22,6 +22,11 @@ async function main() {
     if (args.command === "serve") {
         return serve();
     }
+    if (args.command === "stop") {
+        const pid = await stopWorker(socketPaths().lockPath);
+        await write(process.stdout, pid === undefined ? "next-issue: no worker is running\n" : `next-issue: stopped the worker with process id ${pid}\n`);
+        return 0;
+    }
     const root = await repoRoot(process.cwd());
     if (args.command === "init") {
         return init(root, args.force);

package/dist/github.mjs

@@ -44,14 +44,15 @@ function toIssue(item) {
         labels: item.labels.map((label) => label.name),
     };
 }
-export async function openIssues(repo, limit) {
+export async function openIssues(repo, limit, labels) {
+    const filter = labels.length === 0 ? "" : ` label:${labels.map((label) => `"${label}"`).join(",")}`;
     const raw = await gh(repo, [
         "issue",
         "list",
         "--state",
         "open",
         "--search",
-        "sort:created-asc",
+        `sort:created-asc${filter}`,
         "--limit",
         String(limit),
         "--json",
@@ -61,8 +62,9 @@ export async function openIssues(repo, limit) {
     return parsed.map(toIssue).sort((a, b) => a.createdAt.localeCompare(b.createdAt));
 }
 export async function viewIssue(repo, issue) {
-    const raw = await gh(repo, ["issue", "view", String(issue), "--json", ISSUE_FIELDS]);
-    return toIssue(JSON.parse(raw));
+    const raw = await gh(repo, ["issue", "view", String(issue), "--json", `${ISSUE_FIELDS},state`]);
+    const parsed = JSON.parse(raw);
+    return { ...toIssue(parsed), open: parsed.state === "OPEN" };
 }
 export async function issueComments(repo, issue) {
     const raw = await gh(repo, ["issue", "view", String(issue), "--json", "comments"]);

package/dist/pipeline.mjs

@@ -60,15 +60,21 @@ export function skipReason(issue, config, resuming) {
 }
 export async function pendingIssues(context) {
     const { repo, config, ports } = context;
-    const issues = await ports.openIssues(repo, config.issueLimit);
+    const { ready, inProgress, inReview } = config.labels;
+    const labels = ready.length === 0 ? [] : [ready, inProgress, inReview];
+    const issues = await ports.openIssues(repo, config.issueLimit, labels);
     const listed = new Set(issues.map((issue) => issue.number));
     for (const number of await savedIssues(repo)) {
         if (listed.has(number)) {
             continue;
         }
         const saved = await readState(repo, number).catch(() => undefined);
-        if (saved?.pr !== undefined && (await ports.prMerged(repo, saved.pr))) {
-            issues.push(await ports.viewIssue(repo, number));
+        if (saved === undefined) {
+            continue;
+        }
+        const { open, ...issue } = await ports.viewIssue(repo, number);
+        if (open || (saved.pr !== undefined && (await ports.prMerged(repo, saved.pr)))) {
+            issues.push(issue);
         }
     }
     return issues.sort((a, b) => a.createdAt.localeCompare(b.createdAt));

package/dist/serve.mjs

@@ -36,6 +36,17 @@ function alive(pid) {
         return error.code === "EPERM";
     }
 }
+async function holder(lockPath) {
+    const pid = Number((await readFile(lockPath, "utf8").catch(() => "")).trim());
+    return pid > 0 && alive(pid) ? pid : undefined;
+}
+export async function stopWorker(lockPath) {
+    const pid = await holder(lockPath);
+    if (pid !== undefined) {
+        process.kill(pid, "SIGTERM");
+    }
+    return pid;
+}
 async function lock(path) {
     for (let attempt = 0; attempt < 2; attempt += 1) {
         try {
@@ -46,8 +57,7 @@ async function lock(path) {
             if (error.code !== "EEXIST") {
                 throw error;
             }
-            const pid = Number((await readFile(path, "utf8").catch(() => "")).trim());
-            if (pid > 0 && alive(pid)) {
+            if ((await holder(path)) !== undefined) {
                 return false;
             }
             await rm(path, { force: true });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "next-issue",
-  "version": "2.3.2",
+  "version": "2.4.1",
   "description": "Autonomous issue harness driven by the pi SDK",
   "keywords": [
     "github",