@ravshansbox/pi-next-issue 3.0.0 → 5.0.0

package/README.md

@@ -16,7 +16,7 @@ Run this in pi, inside a git repository:
 - The `next_issue_start` tool lets the model start a run. When no run is going, it starts a run like `/next-issue`. When a run is going, it starts nothing and reports the current run, which picks up new issues by itself. It never stops a run, and it does not ask for confirmation. Its result says whether it started a run.
 - The `next_issue_status` tool lets the model see the run of this repository. It returns the footer line, then one line per handled issue with its outcome, for example `#190 done`. When the worker has no run of this repository, it returns `no run of <root>`. When no worker is going, it returns `no worker is running` and does not start one. It reports no other repository.
 
-The footer shows each running issue with the number of open issues at the latest fetch, its stage, the number of tool calls and the time spent on it, for example `#12/7 · review 2/5 · 37 tools · 4m12s | #13/7 · implement · 5 tools · 40s`. The open count includes the running issues and open issues the run skips. It leaves out closed issues that the run resumes after a merge. A stage with a limited number of rounds shows the round and its limit: `review 2/5`, `review fix 2/5`, `checks fix 1/5` or `commit fix 1/10`. Other lines read, for example, `looking for issues`, `finished: 2 done` or `stopped: 1 done, 1 needs a human`. 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.
+The footer shows each running issue with the number of open issues at the latest fetch, its stage, the number of tool calls and the time spent on it, for example `#12/7 · review 2/5 · 37 tools · 4m12s | #13/7 · implement · 5 tools · 40s`. The open count includes the running issues and open issues the run skips. It leaves out closed issues that the run resumes after their change landed. A stage with a limited number of rounds shows the round and its limit: `review 2/5`, `review fix 2/5`, `checks fix 1/5` or `commit fix 1/10`. Other lines read, for example, `looking for issues`, `finished: 2 done` or `stopped: 1 done, 1 needs a human`. 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
 
@@ -24,11 +24,11 @@ When an issue waits for a person, with the `needsHuman` label of the [config](..
 
 Run `/next-issue answer` to go through the waiting questions one at a time. Pi suggests `answer` as you type after `/next-issue `. 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.
+- **Retry**: takes the `needsHuman` label off the issue, so the next run resumes it.
+- **Retry with guidance**: asks for text, posts it as a comment on the issue, where the worker reads it, then takes the `needsHuman` label off.
+- **Give up**: takes the `needsHuman` label off the issue 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.
+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 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
 
@@ -56,4 +56,4 @@ The extension does no work itself. On `/next-issue` or `next_issue_start` it con
 - Versions before one worker per repository ran one worker for the machine, which does not stop by itself and can keep claiming issues alongside the new worker. Stop it once after you upgrade, as the [`next-issue` README](../next-issue/README.md#worker) says.
 - When the extension is newer than the worker of a repository, that worker closes once no run is going, and the extension starts the newer worker. Workers of other repositories carry on.
 
-Each run asks the worker to merge the pull requests. [ADR 0002](https://github.com/ravshansbox/next-issue/blob/main/docs/adr/0002-merge-setting.md) compares where the merge setting could live. See the [`next-issue` README](../next-issue/README.md) for what a run does, its labels, its state and its config.
+Each run lands approved changes straight on the base branch, with no pull request, as [ADR 0003](https://github.com/ravshansbox/next-issue/blob/main/docs/adr/0003-land-without-pull-requests.md) records. See the [`next-issue` README](../next-issue/README.md) for what a run does, its labels, its state and its config.

package/package.json

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

package/src/answer.ts

@@ -12,11 +12,6 @@ const GIVE_UP = 'Give up';
 
 type Answer = { choice: string; guidance: string };
 
-function threadsOf(question: Question): Array<[string, number]> {
-  const issue: [string, number] = ['issue', question.issue];
-  return question.pr === undefined ? [issue] : [issue, ['pr', question.pr]];
-}
-
 function promptOf(question: Question): string {
   return `#${question.issue} ${question.title}\n\n${question.reason || 'No reason given.'}`;
 }
@@ -36,19 +31,15 @@ async function reply(
   question: Question,
   { choice, guidance }: Answer,
 ): Promise<void> {
-  const threads = threadsOf(question);
+  const issue = String(question.issue);
   const repo = ['--repo', question.repo];
   if (choice === GUIDE) {
-    const [kind, number] = threads.at(-1)!;
-    await gh([kind, 'comment', String(number), ...repo, '--body-file', '-'], {
+    await gh(['issue', 'comment', issue, ...repo, '--body-file', '-'], {
       cwd: root,
       input: guidance,
     });
   }
-  const labels = labelsOf(question, choice);
-  for (const [kind, number] of threads) {
-    await gh([kind, 'edit', String(number), ...repo, ...labels], { cwd: root });
-  }
+  await gh(['issue', 'edit', issue, ...repo, ...labelsOf(question, choice)], { cwd: root });
 }
 
 async function ask(ui: ExtensionContext['ui'], question: Question): Promise<Answer | undefined> {

package/src/protocol.ts

@@ -25,13 +25,12 @@ export type Question = {
   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: 'start'; root: string }
   | { type: 'stop'; root: string }
   | { type: 'questions'; root: string; id?: string };
 

package/src/run.ts

@@ -21,7 +21,7 @@ export async function statusOf(client: WorkerClient, root: string) {
 }
 
 function sendStart(client: WorkerClient, root: string): void {
-  client.send({ type: 'start', root, merge: true });
+  client.send({ type: 'start', root });
 }
 
 export async function startRun(