@ravshansbox/pi-next-issue 2.5.7 → 2.5.8

package/README.md

@@ -18,7 +18,7 @@ The footer shows the issue, the stage, the number of tool calls and the time spe
 
 ## Worker
 
-The extension does no work itself. On `/next-issue` 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@latest serve`, 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` 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`.
 
 - Every pi on the machine shares the one worker, and every pi in a repository shows the run of that repository, whoever started it.
 - Opening pi does not start a worker. It only shows a run when a worker is going.

package/index.ts

@@ -79,7 +79,7 @@ const fromMachine: Options = {
     return new WorkerClient({
       socketPath: join(agentDir, 'next-issue.sock'),
       version: packageVersion(),
-      spawnWorker: () => spawnWorker(agentDir),
+      spawnWorker: (version) => spawnWorker(agentDir, version),
     });
   },
   root: repoRoot,

package/package.json

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

package/src/worker.ts

@@ -36,7 +36,7 @@ export type WorkerEvent =
 export type WorkerOptions = {
   socketPath: string;
   version: string;
-  spawnWorker: () => void;
+  spawnWorker: (version: string) => void;
   startTimeoutMs?: number;
   reconnectMs?: number;
 };
@@ -46,21 +46,51 @@ const RECONNECT_MS = 5_000;
 const POLL_MS = 200;
 
 export function isNewer(candidate: string, current: string): boolean {
-  const left = candidate.split('.').map(Number);
-  const right = current.split('.').map(Number);
+  const [leftCore = '', ...leftRest] = candidate.replace(/\+.*$/, '').split('-');
+  const [rightCore = '', ...rightRest] = current.replace(/\+.*$/, '').split('-');
+  const left = leftCore.split('.').map(Number);
+  const right = rightCore.split('.').map(Number);
   for (let index = 0; index < Math.max(left.length, right.length); index += 1) {
     const difference = (left[index] ?? 0) - (right[index] ?? 0);
     if (difference !== 0) {
       return difference > 0;
     }
   }
+  const leftPrerelease = leftRest.length > 0 ? leftRest.join('-').split('.') : [];
+  const rightPrerelease = rightRest.length > 0 ? rightRest.join('-').split('.') : [];
+  if (leftPrerelease.length === 0 || rightPrerelease.length === 0) {
+    return leftPrerelease.length === 0 && rightPrerelease.length > 0;
+  }
+  for (let index = 0; index < Math.max(leftPrerelease.length, rightPrerelease.length); index += 1) {
+    const leftPart = leftPrerelease[index];
+    const rightPart = rightPrerelease[index];
+    if (leftPart === undefined || rightPart === undefined) {
+      return rightPart === undefined;
+    }
+    if (leftPart === rightPart) {
+      continue;
+    }
+    const leftNumeric = /^\d+$/.test(leftPart);
+    const rightNumeric = /^\d+$/.test(rightPart);
+    if (leftNumeric && rightNumeric) {
+      return Number(leftPart) > Number(rightPart);
+    }
+    if (leftNumeric || rightNumeric) {
+      return rightNumeric;
+    }
+    return leftPart > rightPart;
+  }
   return false;
 }
 
-export function spawnWorker(agentDir: string): void {
+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');
   try {
-    const child = spawn('npx', ['-y', 'next-issue@latest', 'serve'], {
+    const child = spawn('npx', workerArgs(version), {
       detached: true,
       stdio: ['ignore', log, log],
     });
@@ -143,7 +173,7 @@ export class WorkerClient {
       await this.open();
       return;
     } catch {
-      this.options.spawnWorker();
+      this.options.spawnWorker(this.options.version);
     }
     const deadline = Date.now() + (this.options.startTimeoutMs ?? START_TIMEOUT_MS);
     for (;;) {