@ravshansbox/pi-next-issue 2.11.0 → 2.13.0

package/README.md

@@ -17,6 +17,18 @@ Run this in pi, inside a git repository:
 
 The footer shows the issue, the stage, the number of tool calls and the time spent on the issue, for example `next-issue #12 · review 1 · 37 tools · 4m12s`. After a run ends, it keeps the last summary. In the terminal, it uses the dim colour of the theme, like the rest of the footer. A note appears when an issue is done, needs a human or fails while pi is open. Pi does not repeat the notes of a run that ended before it opened.
 
+## Answer questions
+
+When an issue waits for a person, with the `needsHuman` label of the [config](../next-issue/README.md), the footer shows the count, for example `2 questions waiting`, and a note appears once for each new question. Neither interrupts what you do. Pi asks the worker for the list when it connects and every minute, and the worker also sends it after each issue of a run. A question answered on GitHub or in another pi leaves the count with the next list.
+
+Run `/next-issue answer` to go through the waiting questions one at a time. Each shows the issue, the title and the reason of the hand-over. Choose:
+
+- **Retry**: takes the `needsHuman` label off the issue and its pull request, so the next run resumes it.
+- **Retry with guidance**: asks for text, posts it as a comment where the worker reads it, on the pull request of the issue or on the issue when it has none, then takes the `needsHuman` label off.
+- **Give up**: takes the `needsHuman` label off the issue and its pull request and adds the `skip` label.
+
+Press Escape, or leave the guidance empty, to stop. Pi reads the list again before each question, so it skips a question answered elsewhere in the meantime. The worker sends the repository, the pull request and the label names with each question, from `next-issue.config.json` and its `remote`. Pi uses `gh` for the comment and the labels.
+
 ## Create an issue
 
 The package ships the `create-issue` skill. Ask pi to write an issue, or run `/skill:create-issue <problem>`. Pi then:

package/index.ts

@@ -1,3 +1,4 @@
+import { randomUUID } from 'node:crypto';
 import { readFileSync } from 'node:fs';
 import { join } from 'node:path';
 import {
@@ -6,16 +7,37 @@ import {
   getAgentDir,
 } from '@earendil-works/pi-coding-agent';
 import { Type } from 'typebox';
+import { must, type RunOptions } from './src/exec.ts';
 import { repoRoot } from './src/git.ts';
-import { type Progress, spawnWorker, WorkerClient, type WorkerEvent } from './src/worker.ts';
+import {
+  type Progress,
+  type Question,
+  spawnWorker,
+  WorkerClient,
+  type WorkerEvent,
+} from './src/worker.ts';
 
 export type Options = {
   client: () => WorkerClient;
   root: (cwd: string) => Promise<string>;
+  gh: (args: string[], options: RunOptions) => Promise<string>;
 };
 
 const KEY = Symbol.for('pi-next-issue');
 const STATUS_KEY = 'next-issue';
+const QUESTIONS_KEY = 'next-issue-questions';
+const QUESTIONS_MS = 60_000;
+const RETRY = 'Retry';
+const GUIDE = 'Retry with guidance';
+const GIVE_UP = 'Give up';
+
+export function formatQuestions(count: number): string {
+  return `${count} ${count === 1 ? 'question' : 'questions'} waiting`;
+}
+
+function errorText(error: unknown): string {
+  return error instanceof Error ? error.message : String(error);
+}
 
 function shared(create: () => WorkerClient): WorkerClient {
   const store = globalThis as Record<symbol, WorkerClient | undefined>;
@@ -84,6 +106,7 @@ const fromMachine: Options = {
     });
   },
   root: repoRoot,
+  gh: (args, options) => must('gh', args, options),
 };
 
 export function createExtension(options: Options) {
@@ -92,6 +115,8 @@ export function createExtension(options: Options) {
     let coloured = false;
     let root: string | undefined;
     let timer: ReturnType<typeof setInterval> | undefined;
+    let poll: ReturnType<typeof setInterval> | undefined;
+    let waiting: number[] | undefined;
     let unsubscribe: (() => void) | undefined;
     let handled = 0;
     let status: Progress['status'] | undefined;
@@ -109,6 +134,34 @@ export function createExtension(options: Options) {
       ui.setStatus(STATUS_KEY, dim(formatStatus(progress, Date.now())));
     };
 
+    const paintQuestions = () => {
+      if (ui === undefined || waiting === undefined) {
+        return;
+      }
+      const text = formatQuestions(waiting.length);
+      ui.setStatus(
+        QUESTIONS_KEY,
+        waiting.length === 0 ? undefined : coloured ? ui.theme.fg('dim', text) : text,
+      );
+    };
+
+    const onQuestions = (questions: Question[]) => {
+      const known = waiting;
+      waiting = questions.map((question) => question.issue);
+      for (const question of questions) {
+        if (known !== undefined && !known.includes(question.issue)) {
+          ui?.notify(`next-issue: #${question.issue} has a question: ${question.title}`, 'warning');
+        }
+      }
+      paintQuestions();
+    };
+
+    const askQuestions = () => {
+      if (root !== undefined) {
+        shared(options.client).send({ type: 'questions', root });
+      }
+    };
+
     const onProgress = (progress: Progress | undefined) => {
       if (progress === undefined) {
         return;
@@ -143,8 +196,11 @@ export function createExtension(options: Options) {
         handled = progress?.handled.length ?? 0;
         status = progress?.status;
         render();
+        askQuestions();
       } else if (event.type === 'runs') {
         onProgress(root === undefined ? undefined : event.runs[root]);
+      } else if (event.type === 'questions' && event.root === root) {
+        onQuestions(event.questions);
       } else if (event.type === 'error' && event.root === root) {
         ui?.notify(`next-issue cannot start: ${event.message}`, 'error');
       }
@@ -155,9 +211,17 @@ export function createExtension(options: Options) {
       const progress = current();
       handled = progress?.handled.length ?? 0;
       status = progress?.status;
+      waiting =
+        root === undefined
+          ? undefined
+          : shared(options.client).questions[root]?.map((question) => question.issue);
       baseline = !shared(options.client).connected;
       unsubscribe = shared(options.client).subscribe(onEvent);
       render();
+      paintQuestions();
+      if (!baseline) {
+        askQuestions();
+      }
     };
 
     const show = (ctx: ExtensionContext) => {
@@ -165,6 +229,8 @@ export function createExtension(options: Options) {
       coloured = ctx.mode === 'tui';
       timer ??= setInterval(render, 1000);
       timer.unref?.();
+      poll ??= setInterval(askQuestions, QUESTIONS_MS);
+      poll.unref?.();
     };
 
     pi.on('session_start', async (_event, ctx) => {
@@ -187,6 +253,10 @@ export function createExtension(options: Options) {
         clearInterval(timer);
         timer = undefined;
       }
+      if (poll !== undefined) {
+        clearInterval(poll);
+        poll = undefined;
+      }
       ui = undefined;
     });
 
@@ -262,9 +332,92 @@ export function createExtension(options: Options) {
       },
     });
 
+    const fresh = (client: WorkerClient, root: string) =>
+      new Promise<Question[]>((resolve, reject) => {
+        const id = randomUUID();
+        const stop = client.subscribe((event) => {
+          if (event.type === 'questions' && event.root === root && event.id === id) {
+            stop();
+            resolve(event.questions);
+          } else if (event.type === 'questions-error' && event.root === root && event.id === id) {
+            stop();
+            reject(new Error(event.message));
+          } else if (event.type === 'closed') {
+            stop();
+            reject(new Error('the worker closed the connection'));
+          }
+        });
+        client.send({ type: 'questions', root, id });
+      });
+
+    const reply = async (root: string, question: Question, choice: string, guidance: string) => {
+      const threads: Array<[string, number]> = [['issue', question.issue]];
+      if (question.pr !== undefined) {
+        threads.push(['pr', question.pr]);
+      }
+      const repo = ['--repo', question.repo];
+      if (choice === GUIDE) {
+        const [kind, number] = threads.at(-1)!;
+        await options.gh([kind, 'comment', String(number), ...repo, '--body-file', '-'], {
+          cwd: root,
+          input: guidance,
+        });
+      }
+      const labels = ['--remove-label', question.labels.needsHuman];
+      if (choice === GIVE_UP) {
+        labels.push('--add-label', question.labels.skip);
+      }
+      for (const [kind, number] of threads) {
+        await options.gh([kind, 'edit', String(number), ...repo, ...labels], { cwd: root });
+      }
+    };
+
+    const answer = async (ctx: ExtensionContext) => {
+      const { client, root } = await connect(ctx);
+      const passed = new Set<number>();
+      for (;;) {
+        const question = (await fresh(client, root)).find((item) => !passed.has(item.issue));
+        if (question === undefined) {
+          if (passed.size === 0) {
+            ctx.ui.notify('next-issue: no questions waiting', 'info');
+          }
+          return;
+        }
+        passed.add(question.issue);
+        const choice = await ctx.ui.select(
+          `#${question.issue} ${question.title}\n\n${question.reason || 'No reason given.'}`,
+          [RETRY, GUIDE, GIVE_UP],
+        );
+        if (choice === undefined) {
+          return;
+        }
+        let guidance = '';
+        if (choice === GUIDE) {
+          guidance = (await ctx.ui.editor(`Guidance for #${question.issue}`))?.trim() ?? '';
+          if (guidance === '') {
+            return;
+          }
+        }
+        await reply(root, question, choice, guidance);
+        ctx.ui.notify(
+          `next-issue: #${question.issue} ${choice === GIVE_UP ? 'given up' : 'will be retried'}`,
+          'info',
+        );
+      }
+    };
+
     pi.registerCommand('next-issue', {
-      description: 'Start or stop working through the GitHub issues of this repository',
-      handler: async (_args, ctx) => {
+      description:
+        'Start or stop working through the GitHub issues of this repository, or answer the waiting questions with "answer"',
+      handler: async (args, ctx) => {
+        if (args.trim() === 'answer') {
+          try {
+            await answer(ctx);
+          } catch (error) {
+            ctx.ui.notify(`next-issue cannot answer: ${errorText(error)}`, 'error');
+          }
+          return;
+        }
         try {
           const { client, root, progress } = await connect(ctx);
           if (going(progress)) {
@@ -273,10 +426,7 @@ export function createExtension(options: Options) {
             client.send({ type: 'start', root, merge: true });
           }
         } catch (error) {
-          ctx.ui.notify(
-            `next-issue cannot start: ${error instanceof Error ? error.message : String(error)}`,
-            'error',
-          );
+          ctx.ui.notify(`next-issue cannot start: ${errorText(error)}`, 'error');
         }
       },
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ravshansbox/pi-next-issue",
-  "version": "2.11.0",
+  "version": "2.13.0",
   "description": "Pi extension that works through GitHub issues with the next-issue worker",
   "license": "MIT",
   "type": "module",

package/src/worker.ts

@@ -19,23 +19,33 @@ export type Progress = {
   error?: string;
 };
 
-export type Question = { issue: number; title: string; reason: string; url: string };
+export type Question = {
+  issue: number;
+  title: string;
+  reason: string;
+  url: string;
+  repo: string;
+  pr?: number;
+  labels: { needsHuman: string; skip: string };
+};
 
 export type ClientMessage =
   | { type: 'hello'; version: string }
   | { type: 'start'; root: string; merge: boolean }
   | { type: 'stop'; root: string }
-  | { type: 'questions'; root: string };
+  | { type: 'questions'; root: string; id?: string };
 
 export type WorkerMessage =
   | { type: 'hello'; version: string }
   | { type: 'runs'; runs: Record<string, Progress> }
-  | { type: 'questions'; root: string; questions: Question[] }
-  | { type: 'questions-error'; root: string; message: string }
+  | { type: 'questions'; root: string; questions: Question[]; id?: string }
+  | { type: 'questions-error'; root: string; message: string; id?: string }
   | { type: 'error'; root: string; message: string };
 
 export type WorkerEvent =
   | { type: 'runs'; runs: Record<string, Progress> }
+  | { type: 'questions'; root: string; questions: Question[]; id?: string }
+  | { type: 'questions-error'; root: string; message: string; id?: string }
   | { type: 'error'; root: string; message: string }
   | { type: 'closed' };
 
@@ -113,6 +123,7 @@ function delay(ms: number): Promise<void> {
 
 export class WorkerClient {
   runs: Record<string, Progress> = {};
+  questions: Record<string, Question[]> = {};
   private socket: WebSocket | undefined;
   private workerVersion: string | undefined;
   private connecting: Promise<void> | undefined;
@@ -222,7 +233,10 @@ export class WorkerClient {
             hello = true;
             resolve();
           }
-        } else if (message.type === 'error') {
+        } else if (message.type === 'questions') {
+          this.questions[message.root] = message.questions;
+          this.emit(message);
+        } else if (message.type === 'error' || message.type === 'questions-error') {
           this.emit(message);
         }
       });