pinomad 0.5.0 → 0.7.0

package/dist/{chunk-m4q9wafw.js → chunk-sj7rnvh4.js}

@@ -1,6 +1,7 @@
 import {
   HOST_STREAM_NAMES,
   INVALID_FRAME_CLOSE_CODE,
+  MAX_ATTACHMENTS_PER_MESSAGE,
   PROTOCOL,
   UNAUTHORIZED_CLOSE_CODE,
   checkoutOf,
@@ -11,7 +12,7 @@ import {
   hostSupportsCall,
   hostSupportsFeature,
   organize
-} from "./chunk-hsp12cjt.js";
+} from "./chunk-e4ahjbmz.js";
 
 // packages/protocol/src/remote-durable.ts
 import { applyImmutable } from "@earendil-works/chord/delta";
@@ -59,6 +60,13 @@ class ProtocolMismatchError extends Error {
     this.direction = direction;
   }
 }
+function needsImageRefs(images) {
+  return images.some((image) => {
+    const data = "data" in image ? image.data : "";
+    const ref = "ref" in image ? image.ref : "";
+    return data === "" && ref !== "";
+  });
+}
 
 class RemoteClient {
   ready;
@@ -79,6 +87,7 @@ class RemoteClient {
   #nextCall = 1;
   #nextNotice = 1;
   #hostMinor = 0;
+  #helloReceived = false;
   #helloModels = [];
   #helloDefaults = {};
   #hostVersion;
@@ -98,6 +107,7 @@ class RemoteClient {
     this.#open();
   }
   #open() {
+    this.#helloReceived = false;
     const connection = this.#transport.open({
       message: (data) => {
         if (this.#connection === connection)
@@ -173,6 +183,7 @@ class RemoteClient {
         }
         const hostMinor = announced !== null && typeof announced === "object" && typeof announced.minor === "number" ? announced.minor : 0;
         this.#hostMinor = hostMinor;
+        this.#helloReceived = true;
         this.#attempt = 0;
         this.#docs = frame.docs;
         this.#toolPresentations = frame.toolPresentations;
@@ -197,7 +208,7 @@ class RemoteClient {
           for (const stream of this.#conversationStreams(this.#side))
             this.#wanted.add(stream);
         for (const stream of this.#wanted)
-          this.#send({ type: "subscribe", stream });
+          this.#subscribe(stream);
         if (this.#state !== undefined) {
           this.#update({
             session: frame.session,
@@ -286,7 +297,8 @@ class RemoteClient {
     const shown = Promise.all([...missing, ...stale].map((stream) => this.#snapshot(stream)));
     for (const stream of missing) {
       this.#wanted.add(stream);
-      this.#send({ type: "subscribe", stream });
+      if (this.#helloReceived)
+        this.#subscribe(stream);
     }
     await shown;
   }
@@ -301,6 +313,10 @@ class RemoteClient {
       this.#send({ type: "unsubscribe", stream });
     }
   }
+  #subscribe(stream) {
+    const refs = stream.startsWith("conversation:") && hostSupportsFeature(this.#hostMinor, "imageRefs");
+    this.#send({ type: "subscribe", stream, ...refs ? { images: "ref" } : {} });
+  }
   #host(name) {
     return this.#values.get(name);
   }
@@ -380,6 +396,9 @@ class RemoteClient {
         listener();
     });
   }
+  #boundSkills(skills) {
+    return skills === undefined || !hostSupportsFeature(this.#hostMinor, "boundSkills") ? {} : { skills };
+  }
   #notice(level, message) {
     if (this.#state === undefined)
       return;
@@ -440,6 +459,16 @@ class RemoteClient {
         if (images.length > 0 && !hostSupportsFeature(this.#hostMinor, "images")) {
           throw new Error("The host is too old for images (needs protocol 5.5); run `pinomad upgrade` on the host");
         }
+        if (needsImageRefs(images) && !hostSupportsFeature(this.#hostMinor, "imageRefs")) {
+          throw new Error("The host is too old for image refs (needs protocol 5.15); run `pinomad upgrade` on the host");
+        }
+        const attachments = options?.attachments ?? [];
+        if (attachments.length > MAX_ATTACHMENTS_PER_MESSAGE) {
+          throw new Error(`At most ${MAX_ATTACHMENTS_PER_MESSAGE} attachments per message`);
+        }
+        if (attachments.length > 0 && !hostSupportsFeature(this.#hostMinor, "attachments")) {
+          throw new Error("The host is too old for attachments (needs protocol 5.19); run `pinomad upgrade` on the host");
+        }
         if (options?.agent !== undefined && !hostSupportsFeature(this.#hostMinor, "agentConversations")) {
           throw new Error("The host is too old for named agents (needs protocol 5.10); run `pinomad upgrade` on the host");
         }
@@ -451,7 +480,9 @@ class RemoteClient {
           ...options?.model === undefined ? {} : { model: options.model },
           ...options?.thinkingLevel === undefined ? {} : { thinkingLevel: options.thinkingLevel },
           ...options?.agent === undefined ? {} : { agent: options.agent },
-          ...images.length === 0 ? {} : { images }
+          ...images.length === 0 ? {} : { images },
+          ...this.#boundSkills(options?.skills),
+          ...attachments.length === 0 ? {} : { attachments }
         });
         await this.#switch(conversationId2);
       }),
@@ -467,15 +498,37 @@ class RemoteClient {
         if (images.length > 0 && !hostSupportsFeature(this.#hostMinor, "images")) {
           throw new Error("The host is too old for images (needs protocol 5.5); run `pinomad upgrade` on the host");
         }
+        if (needsImageRefs(images) && !hostSupportsFeature(this.#hostMinor, "imageRefs")) {
+          throw new Error("The host is too old for image refs (needs protocol 5.15); run `pinomad upgrade` on the host");
+        }
+        const attachments = options?.attachments ?? [];
+        if (attachments.length > MAX_ATTACHMENTS_PER_MESSAGE) {
+          throw new Error(`At most ${MAX_ATTACHMENTS_PER_MESSAGE} attachments per message`);
+        }
+        if (attachments.length > 0 && !hostSupportsFeature(this.#hostMinor, "attachments")) {
+          throw new Error("The host is too old for attachments (needs protocol 5.19); run `pinomad upgrade` on the host");
+        }
         return this.#call("submit", {
           conversationId: options?.target ?? conversationId(),
           text,
           whenBusy,
           requestId: options?.requestId ?? newRequestId(),
-          ...images.length === 0 ? {} : { images }
+          ...images.length === 0 ? {} : { images },
+          ...this.#boundSkills(options?.skills),
+          ...attachments.length === 0 ? {} : { attachments }
         });
       }),
       compact: (instructions) => this.#command(() => this.#call("compact", { conversationId: conversationId(), ...instructions === undefined ? {} : { instructions } })),
+      runCommand: (name, args, target) => this.#command(() => {
+        if (!hostSupportsCall(this.#hostMinor, "runCommand")) {
+          throw new Error("The host is too old for this (needs protocol 5.17); run `pinomad upgrade` on the host");
+        }
+        return this.#call("runCommand", {
+          conversationId: target ?? conversationId(),
+          name,
+          ...args === undefined ? {} : { args }
+        });
+      }),
       abort: (target) => {
         const targetConversation = target ?? this.#current;
         if (targetConversation === undefined) {
@@ -484,8 +537,34 @@ class RemoteClient {
         }
         return this.#call("abort", { conversationId: targetConversation }).then(() => {}, (error) => this.#notice("error", error instanceof Error ? error.message : String(error)));
       },
+      withdrawQueued: (submissionId, target) => this.#request(async () => {
+        if (!hostSupportsCall(this.#hostMinor, "withdrawQueued")) {
+          throw new Error("The host is too old for this (needs protocol 5.14); run `pinomad upgrade` on the host");
+        }
+        const { outcome } = await this.#call("withdrawQueued", {
+          conversationId: target ?? conversationId(),
+          submissionId
+        });
+        return outcome;
+      }),
+      steerQueued: (submissionId, target) => this.#request(async () => {
+        if (!hostSupportsCall(this.#hostMinor, "steerQueued")) {
+          throw new Error("The host is too old for this (needs protocol 5.14); run `pinomad upgrade` on the host");
+        }
+        const { outcome } = await this.#call("steerQueued", {
+          conversationId: target ?? conversationId(),
+          submissionId
+        });
+        return outcome;
+      }),
       setThinkingLevel: (level) => this.#command(() => this.#call("setThinkingLevel", { conversationId: conversationId(), level })),
       setModel: (model) => this.#command(() => this.#call("setModel", { conversationId: conversationId(), model })),
+      setAgent: (agent) => this.#command(() => {
+        if (!hostSupportsCall(this.#hostMinor, "setAgent")) {
+          throw new Error("The host is too old for this (needs protocol 5.18); run `pinomad upgrade` on the host");
+        }
+        return this.#call("setAgent", { conversationId: conversationId(), agent });
+      }),
       toggleTasks: () => this.#command(async () => {
         if (this.#wanted.delete("tasks")) {
           this.#send({ type: "unsubscribe", stream: "tasks" });
@@ -520,6 +599,36 @@ class RemoteClient {
         }
         return this.#call("listFiles", { scope, query });
       },
+      beginAttachment: (name, size) => {
+        if (!hostSupportsCall(this.#hostMinor, "beginAttachment")) {
+          return Promise.reject(new Error("The host is too old for attachments (needs protocol 5.19); run `pinomad upgrade` on the host"));
+        }
+        return this.#call("beginAttachment", { name, size }).then(({ attachmentId }) => attachmentId);
+      },
+      appendAttachment: (attachmentId, offset, data) => {
+        if (!hostSupportsCall(this.#hostMinor, "appendAttachment")) {
+          return Promise.reject(new Error("The host is too old for attachments (needs protocol 5.19); run `pinomad upgrade` on the host"));
+        }
+        return this.#call("appendAttachment", { attachmentId, offset, data });
+      },
+      image: (ref) => {
+        if (!hostSupportsCall(this.#hostMinor, "image")) {
+          return Promise.reject(new Error("The host is too old for this (needs protocol 5.15); run `pinomad upgrade` on the host"));
+        }
+        return this.#call("image", { ref });
+      },
+      listSkills: (scope) => {
+        if (!hostSupportsCall(this.#hostMinor, "listSkills")) {
+          return Promise.reject(new Error("The host is too old for this (needs protocol 5.13); run `pinomad upgrade` on the host"));
+        }
+        return this.#call("listSkills", { scope });
+      },
+      listCommands: (id) => {
+        if (!hostSupportsCall(this.#hostMinor, "listCommands")) {
+          return Promise.reject(new Error("The host is too old for this (needs protocol 5.17); run `pinomad upgrade` on the host"));
+        }
+        return this.#call("listCommands", { conversationId: id });
+      },
       createPairing: () => this.#request(() => this.#call("createPairing", {})),
       revokeDevice: (publicKey) => this.#command(() => this.#call("revokeDevice", { publicKey })),
       logout: (providerId) => this.#command(() => {
@@ -535,6 +644,9 @@ class RemoteClient {
         if (patch.acceptAccountDevices !== undefined && !hostSupportsFeature(this.#hostMinor, "acceptAccountDevices")) {
           throw new Error("The host is too old for this (needs protocol 5.8); run `pinomad upgrade` on the host");
         }
+        if (patch.hostName !== undefined && !hostSupportsFeature(this.#hostMinor, "hostName")) {
+          throw new Error("The host is too old for this (needs protocol 5.12); run `pinomad upgrade` on the host");
+        }
         return this.#call("updateSettings", { patch });
       }),
       createAgent: (role) => this.#request(async () => {
@@ -604,4 +716,4 @@ class RemoteClient {
   }
 }
 
-export { connectRemoteDurable };
+export { connectRemoteDurable, ProtocolMismatchError };

package/dist/chunk-sz3rzk55.js

@@ -0,0 +1,79 @@
+#!/usr/bin/env node
+import {
+  restartService,
+  serviceManager
+} from "./chunk-12kaxggg.js";
+import"./chunk-kzbzacz9.js";
+import {
+  globalPrefixOf,
+  packageDir,
+  packagedVersion
+} from "./chunk-rtwxjb90.js";
+import"./chunk-sj7rnvh4.js";
+import"./chunk-e4ahjbmz.js";
+import"./chunk-znhn8af7.js";
+import {
+  hostAddressOptions
+} from "./chunk-ngf1zatm.js";
+import"./chunk-df32avw6.js";
+
+// apps/host/src/cli/upgrade.ts
+import { execFile, spawn } from "node:child_process";
+import { fileURLToPath } from "node:url";
+import { parseArgs, promisify } from "node:util";
+var exec = promisify(execFile);
+var repoRoot = fileURLToPath(new URL("../../../../", import.meta.url));
+var step = (command, args) => new Promise((resolve) => {
+  spawn(command, [...args], { cwd: repoRoot, stdio: "inherit" }).once("exit", (code) => resolve(code ?? 1));
+});
+var serviceInstalled = () => Promise.resolve().then(() => serviceManager().state()).then((state) => state.installed, () => false);
+async function main(argv, deps = {}) {
+  const { values } = parseArgs({
+    args: [...argv],
+    options: { force: { type: "boolean", default: false }, ...hostAddressOptions }
+  });
+  const run = deps.run ?? ((command, args) => exec(command, args, { cwd: repoRoot }));
+  const runStep = deps.step ?? step;
+  const restart = deps.restart ?? restartService;
+  if (packagedVersion === undefined) {
+    const { stdout } = await run("git", ["status", "--porcelain"]);
+    if (stdout.trim() !== "") {
+      console.error("upgrade: the checkout has uncommitted changes; commit or stash them first");
+      process.exitCode = 1;
+      return;
+    }
+    for (const [command, args] of [
+      ["git", ["pull", "--ff-only"]],
+      ["bun", ["install"]],
+      ["bun", ["run", "build"]]
+    ]) {
+      const code = await runStep(command, args);
+      if (code !== 0) {
+        process.exitCode = code;
+        return;
+      }
+    }
+  } else {
+    const prefix = globalPrefixOf(packageDir);
+    if (prefix === undefined) {
+      console.error(`upgrade: pinomad isn't a global npm install (${packageDir}); upgrade it the way it was installed`);
+      process.exitCode = 1;
+      return;
+    }
+    const code = await runStep("npm", ["install", "-g", "--prefix", prefix, "pinomad@latest"]);
+    if (code !== 0) {
+      process.exitCode = code;
+      return;
+    }
+  }
+  if (!await (deps.serviceInstalled ?? serviceInstalled)()) {
+    console.log("service not installed; upgrade done, nothing restarted");
+    process.exitCode = 0;
+    return;
+  }
+  (deps.exit ?? process.exit)(await restart({ force: values.force, argv: argv.filter((arg) => arg !== "--force") }));
+}
+if (false) {}
+export {
+  main
+};

package/dist/{chunk-26d04z02.js → chunk-ywmm63ks.js}

@@ -7,7 +7,7 @@ import {
   signRelayChallenge,
   signRelayChallengeV2,
   toBase64Url
-} from "./chunk-kmbh44dt.js";
+} from "./chunk-7qb9tq54.js";
 
 // apps/host/src/cli/server-ops.ts
 import { WebSocket } from "ws";
@@ -18,7 +18,10 @@ async function probeAccounts(origin, fetchImpl = fallbackFetch) {
   const timeout = new AbortController;
   const timer = setTimeout(() => timeout.abort(), 5000);
   try {
-    const response = await fetchImpl(`${origin.replace(/\/+$/, "")}/api/me`, { signal: timeout.signal });
+    const response = await fetchImpl(`${origin.replace(/\/+$/, "")}/api/me`, {
+      signal: timeout.signal,
+      redirect: "manual"
+    });
     if (response.status === 401)
       return "enabled";
     if (response.status === 200) {
@@ -46,7 +49,8 @@ function isSecureServerOrigin(origin) {
     return false;
   }
   const host = url.hostname;
-  const loopback = host === "localhost" || host.endsWith(".localhost") || host.startsWith("127.") || host === "::1" || host === "[::1]";
+  const ipv4Loopback = /^127(?:\.\d{1,3}){3}$/.test(host);
+  const loopback = host === "localhost" || host.endsWith(".localhost") || ipv4Loopback || host === "::1" || host === "[::1]";
   return url.protocol === "https:" || url.protocol === "http:" && loopback;
 }
 

package/dist/chunk-znhn8af7.js

@@ -0,0 +1,33 @@
+// packages/protocol/src/settings.ts
+var HOST_SETTING_KEY_SET = {
+  defaultModel: true,
+  defaultThinkingLevel: true,
+  steeringMode: true,
+  followUpMode: true,
+  acceptAccountDevices: true,
+  hostName: true
+};
+var HOST_SETTING_KEYS = Object.keys(HOST_SETTING_KEY_SET);
+var THINKING_LEVEL_KEYS = { off: true, minimal: true, low: true, medium: true, high: true, xhigh: true, max: true };
+var THINKING_LEVELS = Object.keys(THINKING_LEVEL_KEYS);
+var isThinkingLevel = (value) => typeof value === "string" && Object.prototype.hasOwnProperty.call(THINKING_LEVEL_KEYS, value);
+var isQueueMode = (value) => value === "all" || value === "one-at-a-time";
+var HOST_NAME_FALLBACK = "pinomad";
+var HOST_NAME_MAX_UNITS = 64;
+var isHostNameControl = (code) => code < 32 || code >= 127 && code <= 159;
+function cleanHostName(name) {
+  let cleaned = name;
+  for (;; ) {
+    const local = cleaned.endsWith(".local") ? cleaned.slice(0, -".local".length) : cleaned;
+    const next = [...local.trim()].filter((c) => !isHostNameControl(c.codePointAt(0))).join("").slice(0, HOST_NAME_MAX_UNITS);
+    if (next === cleaned)
+      return next;
+    cleaned = next;
+  }
+}
+function normalizeHostName(name) {
+  const cleaned = cleanHostName(name);
+  return cleaned === "" ? HOST_NAME_FALLBACK : cleaned;
+}
+
+export { HOST_SETTING_KEYS, THINKING_LEVELS, isThinkingLevel, isQueueMode, HOST_NAME_MAX_UNITS, cleanHostName, normalizeHostName };

package/dist/pinomad.js

@@ -1,28 +1,35 @@
 #!/usr/bin/env node
+import {
+  isParseArgsError,
+  reportParseArgsError
+} from "./chunk-kzbzacz9.js";
 import {
   packagedVersion
-} from "./chunk-1d9sppj0.js";
+} from "./chunk-rtwxjb90.js";
 import {
   __require
 } from "./chunk-df32avw6.js";
 
 // apps/cli/src/pinomad.ts
 var COMMANDS = {
-  host: () => import("./chunk-d4wdt5qs.js"),
-  server: () => import("./chunk-4by4x5c4.js"),
-  relay: () => import("./chunk-4by4x5c4.js"),
-  service: () => import("./chunk-5ng86fmy.js"),
-  upgrade: () => import("./chunk-crv3dqzp.js"),
-  link: () => import("./chunk-gqr7ahv4.js"),
-  pair: () => import("./chunk-zttf1hvh.js"),
-  join: () => import("./chunk-9d59jjmt.js"),
-  leave: () => import("./chunk-f0v3sht0.js")
+  host: () => import("./chunk-1nyzr0mg.js"),
+  server: () => import("./chunk-6ysezfy5.js"),
+  relay: () => import("./chunk-6ysezfy5.js"),
+  service: () => import("./chunk-1t58fh0k.js"),
+  upgrade: () => import("./chunk-sz3rzk55.js"),
+  link: () => import("./chunk-8yme2wep.js"),
+  pair: () => import("./chunk-m4c5gvce.js"),
+  join: () => import("./chunk-fbkd73zr.js"),
+  leave: () => import("./chunk-07769pqx.js")
 };
 var USAGE = `pinomad — PiNomad host, server, and utilities
 
 usage: pinomad <command> [args…]
 
-  host [host args…]                    run the host in the foreground
+  host [--data-dir DIR] [--port 7420] [--project DIR]…   run the host in the foreground
+  host --remote-port PORT [--public-url URL]   remote access, LAN (ADR-0008)
+  host --relay URL   remote access via relay (ADR-0015)
+  host --faux "answer" [--faux-tps 40]   no real model, for tests
   server --public-origin O [--data-dir D] [--trust-proxy]   run the server
   server passwd [--data-dir D] [--user U]   change the account password (stdin)
   relay …                              old name of server
@@ -34,6 +41,13 @@ usage: pinomad <command> [args…]
   leave [--data-dir D]                 leave the server account
   --version, -v                        print the version
 `;
+function usageFor(command) {
+  const rows = USAGE.split(`
+`).filter((line) => line.startsWith(`  ${command} `));
+  return `usage: pinomad ${command} [args…]
+${rows.join(`
+`)}`;
+}
 async function main(argv) {
   const [command, ...rest] = argv;
   if (command === "--version" || command === "-v") {
@@ -51,7 +65,17 @@ async function main(argv) {
     process.exitCode = 1;
     return;
   }
-  await (await load()).main(rest);
+  if (rest.includes("--help") || rest.includes("-h")) {
+    console.log(usageFor(command));
+    return;
+  }
+  try {
+    await (await load()).main(rest);
+  } catch (error) {
+    if (!isParseArgsError(error))
+      throw error;
+    reportParseArgsError(`pinomad ${command}`, error);
+  }
 }
 if (__require.main == __require.module)
   await main(process.argv.slice(2));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pinomad",
-  "version": "0.5.0",
+  "version": "0.7.0",
   "description": "PiNomad — self-hosted coding agent: host, relay, and web client in one package",
   "license": "Apache-2.0",
   "type": "module",