@ravshansbox/pi-next-issue 1.0.12 → 1.0.14

package/README.md

@@ -22,11 +22,11 @@ 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.
-3. The implementer agent does the work. The extension commits it, with the subject from a `commit:` line in the reply of the agent, and pushes.
+3. The implementer agent does the work. The extension commits it, with the subject from a `commit:` line in the reply of the agent, and pushes. When a resumed issue already has a commit ahead of the base, the extension keeps it and skips the implementer.
 4. Open a pull request that closes the issue.
 5. Wait for the checks. On a red build, the fixer agent gets the failed logs, up to `maxCiFixes` times.
 6. The reviewer agent judges the diff and gives a verdict with `blocking` and `minor` findings, which goes on the pull request. Any change the reviewer makes is thrown away.

package/package.json

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

package/src/git.ts

@@ -77,6 +77,16 @@ export async function commit(cwd: string, message: string): Promise<boolean> {
   return true;
 }
 
+export async function ahead(
+  cwd: string,
+  remote: string,
+  base: string,
+): Promise<string | undefined> {
+  const range = `${remote}/${base}..HEAD`;
+  const subjects = await must('git', ['log', '--reverse', '--format=%s', range], { cwd });
+  return subjects.split('\n')[0] || undefined;
+}
+
 export async function push(cwd: string, remote: string, branch: string): Promise<void> {
   await must('git', ['push', '-u', remote, `HEAD:refs/heads/${branch}`], { cwd });
 }

package/src/ports.ts

@@ -20,6 +20,7 @@ export async function createPorts(root: string, config: Config): Promise<Ports>
     commentOnIssue: (issue, body) => github.commentOnIssue(repo, issue, body),
     worktree: (issue, branch) => git.worktree(root, config.remote, base, issue, branch),
     commit: (cwd, message) => git.commit(cwd, message),
+    ahead: (cwd) => git.ahead(cwd, config.remote, base),
     push: (cwd, branch) => git.push(cwd, config.remote, branch),
     discard: (cwd, branch) => git.discard(cwd, config.remote, branch),
     diff: (cwd) => git.diff(cwd, config.remote, base),

package/src/runner.ts

@@ -45,6 +45,7 @@ export type Ports = {
   commentOnIssue(issue: number, body: string): Promise<void>;
   worktree(issue: number, branch: string): Promise<string>;
   commit(cwd: string, message: string): Promise<boolean>;
+  ahead(cwd: string): Promise<string | undefined>;
   push(cwd: string, branch: string): Promise<void>;
   discard(cwd: string, branch: string): Promise<void>;
   diff(cwd: string): Promise<string>;
@@ -99,6 +100,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 +142,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;
@@ -237,6 +243,11 @@ export class Runner {
       switch (state.phase) {
         case 'implement': {
           this.stage('implement');
+          const kept = saved === undefined ? undefined : await ports.ahead(cwd);
+          if (kept !== undefined) {
+            await save({ phase: 'publish', title: kept });
+            break;
+          }
           const reply = await this.agent('work', cwd, implementPrompt(issue, comments));
           const title = parseCommitSubject(reply, `feat: ${issue.title}`);
           if (!(await ports.commit(cwd, title))) {