@vzlentin/harness 0.2.0 → 0.2.2

package/README.md

@@ -24,11 +24,6 @@ pi install "$(realpath "$(npm root -g)/@vzlentin/harness/pi")"
 
 When you install with `--prefix`, give the same `--prefix` to `npm root -g`.
 
-### Move from 0.1.0
-
-0.1.0 had the extension in the separate Pi package `@vzlentin/pi-subagent`. Update as below: the setup removes that
-package from Pi (`pi remove npm:@vzlentin/pi-subagent`), since it conflicts with the new extension.
-
 ### Update and remove
 
 ```sh

package/dist/setup.d.ts

@@ -1,9 +1,8 @@
 /**
- * Registers `<packageDir>/pi` in Pi when `packageDir` is a top-level global npm install. First it runs `pi remove` for
- * each Pi package of the `retiredPiPackages` field of the package's `package.json` that Pi's settings list. It writes
- * its messages to stderr, and it does not throw for a Pi failure: it writes a warning with the command to run.
- * It writes the stamp that `setupOnce` reads unless a `pi` command failed, so the next run tries again. Without `pi`
- * on PATH it writes the stamp, so a user without Pi gets the hint once per version.
+ * Registers `<packageDir>/pi` in Pi when `packageDir` is a top-level global npm install. It writes its messages to
+ * stderr, and it does not throw for a Pi failure: it writes a warning with the command to run. It writes the stamp
+ * that `setupOnce` reads unless `pi` failed, so the next run tries again. Without `pi` on PATH it writes the stamp, so
+ * a user without Pi gets the hint once per version.
  */
 export declare function setup(packageDir: string): void;
 /**

package/dist/setup.js

@@ -6,23 +6,21 @@ import { spawnSync } from "node:child_process";
 import { createHash } from "node:crypto";
 import { existsSync, mkdirSync, readFileSync, realpathSync, writeFileSync } from "node:fs";
 import { homedir } from "node:os";
-import { basename, delimiter, dirname, join, sep } from "node:path";
+import { basename, delimiter, dirname, join, resolve, sep } from "node:path";
+import { fileURLToPath } from "node:url";
 import { Type } from "typebox";
 import { Value } from "typebox/value";
-const PackageJson = Type.Object({
-    name: Type.String(),
-    version: Type.String(),
-    retiredPiPackages: Type.Optional(Type.Array(Type.String())),
-});
+const PackageJson = Type.Object({ name: Type.String(), version: Type.String() });
 const PiSettings = Type.Object({
     packages: Type.Optional(Type.Array(Type.Union([Type.String(), Type.Object({ source: Type.String() })]))),
 });
+/** The prefixes of the Pi package sources that are not local paths, as Pi reads them. */
+const REMOTE = ["npm:", "git:", "github:", "http:", "https:", "ssh:", "builtin:"];
 /**
- * Registers `<packageDir>/pi` in Pi when `packageDir` is a top-level global npm install. First it runs `pi remove` for
- * each Pi package of the `retiredPiPackages` field of the package's `package.json` that Pi's settings list. It writes
- * its messages to stderr, and it does not throw for a Pi failure: it writes a warning with the command to run.
- * It writes the stamp that `setupOnce` reads unless a `pi` command failed, so the next run tries again. Without `pi`
- * on PATH it writes the stamp, so a user without Pi gets the hint once per version.
+ * Registers `<packageDir>/pi` in Pi when `packageDir` is a top-level global npm install. It writes its messages to
+ * stderr, and it does not throw for a Pi failure: it writes a warning with the command to run. It writes the stamp
+ * that `setupOnce` reads unless `pi` failed, so the next run tries again. Without `pi` on PATH it writes the stamp, so
+ * a user without Pi gets the hint once per version.
  */
 export function setup(packageDir) {
     const installed = readInstalled(packageDir);
@@ -76,20 +74,16 @@ function writeStamp(installed) {
     mkdirSync(dirname(path), { recursive: true });
     writeFileSync(path, `${installed.dir}\n${installed.json.version}\n`);
 }
-/** False when a `pi` command failed. */
+/**
+ * False when `pi install` failed. It runs no `pi` when Pi already lists the extension, as `pi install` would write the
+ * entry again in its own form, relative to the agent directory.
+ */
 function registerExtension({ dir, json }) {
     const label = basename(json.name);
     const extension = join(dir, "pi");
-    const later = `To add the Pi extension of ${label}, run: pi install ${extension}`;
-    const listed = piPackages();
-    for (const retired of json.retiredPiPackages ?? []) {
-        for (const source of listed.filter((item) => item === retired || item.startsWith(`${retired}@`))) {
-            process.stderr.write(`${label}: removing ${source} from Pi, which ${json.name} replaces\n`);
-            if (!runPi(label, ["remove", source], `To remove it, run: pi remove ${source}`))
-                return false;
-        }
-    }
-    return runPi(label, ["install", extension], later);
+    if (piLists(extension))
+        return true;
+    return runPi(label, ["install", extension], `To add the Pi extension of ${label}, run: pi install ${extension}`);
 }
 /** Runs `pi`, with a warning when it is missing or fails. False when it failed; true when it worked or is missing. */
 function runPi(label, args, later) {
@@ -109,25 +103,43 @@ function runPi(label, args, later) {
     }
     return true;
 }
-/** The `PATH` without the `node_modules/.bin` folders that npm adds: pi-coding-agent there has its own `pi`. */
-function userPath() {
-    return (process.env.PATH ?? "")
-        .split(delimiter)
-        .filter((entry) => !entry.endsWith(join("node_modules", ".bin")))
-        .join(delimiter);
-}
-/** The sources of the packages in Pi's global settings, or none when the file is missing or not valid. */
-function piPackages() {
+/**
+ * Whether the `packages` of Pi's global settings list the folder `extension` as a local path, absolute or relative to
+ * the agent directory, with `~` or as a `file:` URL, as Pi resolves them.
+ */
+function piLists(extension) {
     const env = process.env.PI_CODING_AGENT_DIR;
-    const agentDir = env ? env.replace(/^~(?=$|\/)/, homedir()) : join(homedir(), ".pi", "agent");
+    const agentDir = env ? expandHome(env) : join(homedir(), ".pi", "agent");
     let settings;
     try {
         settings = JSON.parse(readFileSync(join(agentDir, "settings.json"), "utf8"));
     }
     catch {
-        return [];
+        return false;
     }
     if (!Value.Check(PiSettings, settings))
-        return [];
-    return (settings.packages ?? []).map((item) => (Value.Check(Type.String(), item) ? item : item.source));
+        return false;
+    return (settings.packages ?? []).some((item) => {
+        const source = (Value.Check(Type.String(), item) ? item : item.source).trim();
+        if (REMOTE.some((prefix) => source.startsWith(prefix)))
+            return false;
+        const path = source.startsWith("file://") ? fileURLToPath(source) : resolve(agentDir, expandHome(source));
+        try {
+            return realpathSync(path) === extension;
+        }
+        catch {
+            return false;
+        }
+    });
+}
+/** `path` with a leading `~` replaced by the home directory. */
+function expandHome(path) {
+    return path === "~" || path.startsWith("~/") ? join(homedir(), path.slice(1)) : path;
+}
+/** The `PATH` without the `node_modules/.bin` folders that npm adds: pi-coding-agent there has its own `pi`. */
+function userPath() {
+    return (process.env.PATH ?? "")
+        .split(delimiter)
+        .filter((entry) => !entry.endsWith(join("node_modules", ".bin")))
+        .join(delimiter);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@vzlentin/harness",
-	"version": "0.2.0",
+	"version": "0.2.2",
 	"description": "A durable agent harness on Pi, starting with observable, persistent subagents",
 	"repository": {
 		"type": "git",
@@ -49,9 +49,6 @@
 		"typescript": "7.0.2",
 		"vitest": "5.0.3"
 	},
-	"retiredPiPackages": [
-		"npm:@vzlentin/pi-subagent"
-	],
 	"publishConfig": {
 		"access": "public"
 	}