@vzlentin/harness 0.2.1 → 0.2.3

package/README.md

@@ -57,6 +57,6 @@ XDG_STATE_HOME=/tmp/harness-dev node src/cli.ts list
 `node src/cli.ts` runs the CLI of this checkout. Give it its own `XDG_STATE_HOME`, so its hosts do not share sockets and
 stores with the hosts of the installed `harness`.
 
-The checkout runs from its TypeScript source. `npm publish` builds `dist/` first, and the package contains `dist/`,
-the Pi extension in `pi/` and its `postinstall` script. `npm run check` builds `dist/` too, before the type check. The extension imports `../dist/`, so to try the checkout's
+The checkout runs from its TypeScript source. The package contains `dist/`, the Pi extension in `pi/` and its
+`postinstall` script. Change `version` in `package.json` and push to `main`: CI publishes it. `npm run check` builds `dist/` too, before the type check. The extension imports `../dist/`, so to try the checkout's
 extension in Pi, run `npm run build`, then `pi install ./pi`, and build again after each change in `src/`.

package/dist/setup.js

@@ -6,10 +6,16 @@ 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() });
+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. 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
@@ -68,10 +74,15 @@ function writeStamp(installed) {
     mkdirSync(dirname(path), { recursive: true });
     writeFileSync(path, `${installed.dir}\n${installed.json.version}\n`);
 }
-/** False when `pi install` 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");
+    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. */
@@ -92,6 +103,39 @@ function runPi(label, args, later) {
     }
     return true;
 }
+/**
+ * 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 ? expandHome(env) : join(homedir(), ".pi", "agent");
+    let settings;
+    try {
+        settings = JSON.parse(readFileSync(join(agentDir, "settings.json"), "utf8"));
+    }
+    catch {
+        return false;
+    }
+    if (!Value.Check(PiSettings, settings))
+        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 ?? "")

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@vzlentin/harness",
-	"version": "0.2.1",
+	"version": "0.2.3",
 	"description": "A durable agent harness on Pi, starting with observable, persistent subagents",
 	"repository": {
 		"type": "git",