@ravshansbox/pi-next-issue 1.0.11 → 1.0.13

package/README.md

@@ -22,7 +22,7 @@ The run does not belong to a session: it goes on after `/new`, `/resume`, a fork
 
 ## What it does
 
-Each loop fetches the 200 oldest open issues with the `status:todo` label and none of `status:in-progress`, `status:done`, `status:needs-human` or `status:blocked`, and the open issues with saved state that it can read. It takes the oldest one with saved state, else the oldest one with the `status:todo` label and none of `status:in-progress`, `status:done`, `status:needs-human` or `status:blocked`. The run ends when no such issue is left, or at the first error. For each issue:
+Each loop fetches the 200 oldest open issues with the `status:todo` label and none of `status:in-progress`, `status:done`, `status:needs-human` or `status:blocked`, and the open issues with saved state that it can read. It takes the oldest one with saved state and none of `status:done`, `status:needs-human` or `status:blocked`, else the oldest one with the `status:todo` label and none of `status:in-progress`, `status:done`, `status:needs-human` or `status:blocked`. The run ends when no such issue is left, or at the first error. For each issue:
 
 1. Swap `status:todo` for `status:in-progress`.
 2. Add a git worktree at `.worktrees/<n>` on the `<n>` branch, from the remote default branch.
@@ -39,7 +39,7 @@ The implementer and the reviewer read the issue title, the body and the comments
 
 Each agent is a pi session in the worktree. It uses the model and thinking level from your pi settings, and loads all of your extensions except this one.
 
-The state of each issue is saved in `.worktrees/<n>.json`. A run holds `.worktrees/run.lock`, which keeps the process id, so that only one pi at a time works on a repository. A second run fails at once. A lock whose process is no longer alive is taken over. If the operating system gives that process id to another process, the lock stays; remove `.worktrees/run.lock` by hand when no run is going. The extension adds `/.worktrees/` to `.git/info/exclude`.
+The state of each issue is saved in `.worktrees/<n>.json`. Each loop removes the saved state of an issue that is closed. A run holds `.worktrees/run.lock`, which keeps the process id, so that only one pi at a time works on a repository. A second run fails at once. A lock whose process is no longer alive is taken over. If the operating system gives that process id to another process, the lock stays; remove `.worktrees/run.lock` by hand when no run is going. The extension adds `/.worktrees/` to `.git/info/exclude`.
 
 ## Config
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ravshansbox/pi-next-issue",
-  "version": "1.0.11",
+  "version": "1.0.13",
   "description": "Pi extension that works through GitHub issues in the background",
   "license": "MIT",
   "type": "module",

package/src/github.ts

@@ -38,7 +38,10 @@ type RawIssue = {
 
 const ISSUE_FIELDS = 'number,title,body,labels,createdAt';
 
-export async function openIssues(repo: Repo, saved: number[]): Promise<Issue[]> {
+export async function openIssues(
+  repo: Repo,
+  saved: number[],
+): Promise<{ open: Issue[]; closed: number[] }> {
   const raw = await gh(repo, [
     'issue',
     'list',
@@ -55,6 +58,7 @@ export async function openIssues(repo: Repo, saved: number[]): Promise<Issue[]>
   ]);
   const listed = JSON.parse(raw) as RawIssue[];
   const known = new Set(listed.map((item) => item.number));
+  const closed: number[] = [];
   for (const number of saved.filter((item) => !known.has(item))) {
     const view = await run(
       'gh',
@@ -67,9 +71,11 @@ export async function openIssues(repo: Repo, saved: number[]): Promise<Issue[]>
     const item = JSON.parse(view.stdout) as RawIssue & { state: string };
     if (item.state === 'OPEN') {
       listed.push(item);
+    } else {
+      closed.push(number);
     }
   }
-  return listed
+  const open = listed
     .sort((a, b) => a.createdAt.localeCompare(b.createdAt))
     .map((item) => ({
       number: item.number,
@@ -77,6 +83,7 @@ export async function openIssues(repo: Repo, saved: number[]): Promise<Issue[]>
       body: item.body ?? '',
       labels: item.labels.map((label) => label.name),
     }));
+  return { open, closed };
 }
 
 export async function comments(repo: Repo, issue: number): Promise<string[]> {

package/src/ports.ts

@@ -10,7 +10,11 @@ export async function createPorts(root: string, config: Config): Promise<Ports>
   const base = await github.defaultBranch(repo);
   const timeoutMs = config.checkTimeoutMinutes * 60_000;
   return {
-    openIssues: async () => github.openIssues(repo, await state.savedIssues(root)),
+    openIssues: async () => {
+      const { open, closed } = await github.openIssues(repo, await state.savedIssues(root));
+      await Promise.all(closed.map((issue) => state.dropState(root, issue)));
+      return open;
+    },
     comments: (issue) => github.comments(repo, issue),
     setLabel: (issue, add, remove) => github.setLabel(repo, issue, add, remove),
     commentOnIssue: (issue, body) => github.commentOnIssue(repo, issue, body),

package/src/runner.ts

@@ -99,6 +99,10 @@ function ready(issue: Issue): boolean {
   );
 }
 
+function resumable(issue: Issue): boolean {
+  return !issue.labels.some((label) => label !== LABELS.inProgress && STOP_LABELS.includes(label));
+}
+
 export class Runner {
   progress: Progress = { status: 'idle', tools: 0, handled: [] };
   private readonly controller = new AbortController();
@@ -137,7 +141,8 @@ export class Runner {
         const saved = new Set(await this.ports.savedIssues());
         const fresh = issues.filter((item) => !seen.has(item.number));
         const next =
-          fresh.find((item) => saved.has(item.number)) ?? fresh.find((item) => ready(item));
+          fresh.find((item) => saved.has(item.number) && resumable(item)) ??
+          fresh.find((item) => ready(item));
         if (next === undefined) {
           this.update({ status: 'finished', stage: undefined, issue: undefined, title: undefined });
           return;