@ravshansbox/pi-next-issue 2.19.0 → 2.20.0

package/README.md

@@ -47,12 +47,13 @@ Pi does not implement the issue in that session. The worker does the work. The b
 
 ## Worker
 
-The extension does no work itself. On `/next-issue` or `next_issue_start` it connects to the `next-issue` worker on the socket file `~/.pi/agent/next-issue.sock`. When no worker answers, it starts one with `npx -y next-issue@<version> serve`, where `<version>` is the version of the extension, or `latest` when the extension runs from a source checkout with version `0.0.0`, in the background, and writes the output of the worker to `~/.pi/agent/next-issue-worker.log`.
+The extension does no work itself. On `/next-issue` or `next_issue_start` it connects to the `next-issue` worker of the repository on the socket file `.next-issue/worker.sock` in the repository. When no worker answers, it starts one in the repository with `npx -y next-issue@<version> serve`, where `<version>` is the version of the extension, or `latest` when the extension runs from a source checkout with version `0.0.0`, in the background, and writes the output of the worker to `.next-issue/worker.log` in the repository. When the path of the socket file is too long for the system, the extension says so and starts nothing.
 
-- Every pi on the machine shares the one worker, and every pi in a repository shows the run of that repository, whoever started it.
+- Each repository has its own worker. Every pi in a repository shares the worker of that repository and shows its run, whoever started it. A run, restart or upgrade in one repository never affects another.
 - Opening pi does not start a worker. It only shows a run when a worker is going.
 - The run does not belong to pi: it goes on after `/new`, `/resume`, a fork, a reload or quitting pi.
-- The worker stays when every pi is closed. Stop it with `npx next-issue stop`.
-- When the extension is newer than the worker, the worker closes once no run is going, and the extension starts the newer worker.
+- The worker exits when no run is going and no pi is connected. Stop it at once with `npx next-issue stop` in the repository.
+- 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.

package/index.ts

@@ -1,11 +1,7 @@
 import { randomUUID } from 'node:crypto';
 import { readFileSync } from 'node:fs';
 import { join } from 'node:path';
-import {
-  type ExtensionAPI,
-  type ExtensionContext,
-  getAgentDir,
-} from '@earendil-works/pi-coding-agent';
+import type { ExtensionAPI, ExtensionContext } from '@earendil-works/pi-coding-agent';
 import { Type } from 'typebox';
 import { must, type RunOptions } from './src/exec.ts';
 import { repoRoot } from './src/git.ts';
@@ -15,10 +11,11 @@ import {
   spawnWorker,
   WorkerClient,
   type WorkerEvent,
+  workerPaths,
 } from './src/worker.ts';
 
 export type Options = {
-  client: () => WorkerClient;
+  client: (root: string) => WorkerClient;
   root: (cwd: string) => Promise<string>;
   gh: (args: string[], options: RunOptions) => Promise<string>;
 };
@@ -39,10 +36,15 @@ 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>;
-  store[KEY] ??= create();
-  return store[KEY];
+function shared(create: (root: string) => WorkerClient, root: string): WorkerClient {
+  const store = globalThis as Record<symbol, Map<string, WorkerClient> | undefined>;
+  const clients = (store[KEY] ??= new Map());
+  let client = clients.get(root);
+  if (client === undefined) {
+    client = create(root);
+    clients.set(root, client);
+  }
+  return client;
 }
 
 function duration(ms: number): string {
@@ -103,14 +105,12 @@ function packageVersion(): string {
 }
 
 const fromMachine: Options = {
-  client: () => {
-    const agentDir = getAgentDir();
-    return new WorkerClient({
-      socketPath: join(agentDir, 'next-issue.sock'),
+  client: (root) =>
+    new WorkerClient({
+      socketPath: workerPaths(root).socketPath,
       version: packageVersion(),
-      spawnWorker: (version) => spawnWorker(agentDir, version),
-    });
-  },
+      spawnWorker: (version) => spawnWorker(root, version),
+    }),
   root: repoRoot,
   gh: (args, options) => must('gh', args, options),
 };
@@ -129,7 +129,7 @@ export function createExtension(options: Options) {
     let baseline = false;
 
     const current = (): Progress | undefined =>
-      root === undefined ? undefined : shared(options.client).runs[root];
+      root === undefined ? undefined : shared(options.client, root).runs[root];
 
     const render = () => {
       const progress = current();
@@ -164,7 +164,7 @@ export function createExtension(options: Options) {
 
     const askQuestions = () => {
       if (root !== undefined) {
-        shared(options.client).send({ type: 'questions', root });
+        shared(options.client, root).send({ type: 'questions', root });
       }
     };
 
@@ -214,15 +214,16 @@ export function createExtension(options: Options) {
 
     const follow = () => {
       unsubscribe?.();
+      if (root === undefined) {
+        return;
+      }
+      const client = shared(options.client, root);
       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);
+      waiting = client.questions[root]?.map((question) => question.issue);
+      baseline = !client.connected;
+      unsubscribe = client.subscribe(onEvent);
       render();
       paintQuestions();
       if (!baseline) {
@@ -249,7 +250,7 @@ export function createExtension(options: Options) {
         return;
       }
       follow();
-      await shared(options.client).attach();
+      await shared(options.client, root).attach();
     });
 
     pi.on('session_shutdown', async () => {
@@ -272,7 +273,7 @@ export function createExtension(options: Options) {
         show(ctx);
         follow();
       }
-      const client = shared(options.client);
+      const client = shared(options.client, root);
       await client.ensure();
       return { client, root, progress: client.runs[root] };
     };
@@ -352,7 +353,7 @@ export function createExtension(options: Options) {
       parameters: Type.Object({}),
       async execute(_toolCallId, _params, _signal, _onUpdate, ctx) {
         const root = await options.root(ctx.cwd);
-        const client = shared(options.client);
+        const client = shared(options.client, root);
         await client.attach();
         if (!client.connected) {
           return report('no worker is running', root);

package/package.json

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

package/src/worker.ts

@@ -1,6 +1,6 @@
 import { spawn } from 'node:child_process';
-import { closeSync, openSync } from 'node:fs';
-import { join } from 'node:path';
+import { closeSync, mkdirSync, openSync } from 'node:fs';
+import { dirname, join } from 'node:path';
 import WebSocket from 'ws';
 
 export type RunStatus = 'running' | 'stopping' | 'finished' | 'stopped' | 'failed';
@@ -108,10 +108,30 @@ export function workerArgs(version: string): string[] {
   return ['-y', `next-issue@${version === '0.0.0' ? 'latest' : version}`, 'serve'];
 }
 
-export function spawnWorker(agentDir: string, version: string): void {
-  const log = openSync(join(agentDir, 'next-issue-worker.log'), 'a');
+export function workerPaths(root: string): { socketPath: string; logPath: string } {
+  return {
+    socketPath: join(root, '.next-issue', 'worker.sock'),
+    logPath: join(root, '.next-issue', 'worker.log'),
+  };
+}
+
+export function checkSocketPath(path: string, platform = process.platform): void {
+  const size = platform === 'linux' ? 108 : 104;
+  const length = Buffer.byteLength(path);
+  if (length >= size) {
+    throw new Error(
+      `the socket path ${path} is too long for this system: ${length} bytes, at most ${size - 1}`,
+    );
+  }
+}
+
+export function spawnWorker(root: string, version: string): void {
+  const { logPath } = workerPaths(root);
+  mkdirSync(dirname(logPath), { recursive: true });
+  const log = openSync(logPath, 'a');
   try {
     const child = spawn('npx', workerArgs(version), {
+      cwd: root,
       detached: true,
       stdio: ['ignore', log, log],
     });
@@ -191,6 +211,7 @@ export class WorkerClient {
   }
 
   private async start(): Promise<void> {
+    checkSocketPath(this.options.socketPath);
     try {
       await this.open();
       return;