pinomad 0.11.0 → 0.12.0

package/README.md

@@ -17,7 +17,7 @@ A self-hosted coding agent built on [Pi Durable](https://www.npmjs.com/package/@
 ## Quick start
 
 1. **Create an account** at [app.pinomad.si](https://app.pinomad.si/) (sign-up is by invite).
-2. **Add your host.** On the machine that should run the agent (macOS or Linux), run the two lines below. `pinomad up` prints a code; enter it on the page it opens, signed in, to add the host to your account. It then runs as a service.
+2. **Add your host.** On the machine that should run the agent (macOS or Linux), run the two lines below. `pinomad up` opens a page in your browser; sign in and confirm to add the host to your account. It then runs as a service. Without a browser on that machine (over SSH, say), it prints a code to enter on any signed-in device instead.
 
    ```sh
    curl -fsSL https://pinomad.si/install.sh | sh

package/dist/{chunk-b457q0tm.js → chunk-41q0saz0.js}

@@ -1,23 +1,24 @@
 #!/usr/bin/env node
 import {
+  readRemovalNotice,
   readServerConfig
-} from "./chunk-etf7ef97.js";
+} from "./chunk-nq57fdnq.js";
 import {
   argValue,
   reachabilityLine,
   serviceManager,
   versionLine
-} from "./chunk-vvj9b1gc.js";
-import"./chunk-jt34g8st.js";
+} from "./chunk-t5abqsva.js";
+import"./chunk-np4jd070.js";
 import"./chunk-kzbzacz9.js";
-import"./chunk-xqycs43g.js";
+import"./chunk-47ff1d1t.js";
 import"./chunk-pqe7q1s7.js";
 import {
   DEFAULT_DATA_DIR
 } from "./chunk-ngf1zatm.js";
 import {
   commandHint
-} from "./chunk-sd5fkxjj.js";
+} from "./chunk-7wj0jh3t.js";
 import"./chunk-df32avw6.js";
 
 // apps/host/src/cli/status.ts
@@ -27,6 +28,7 @@ async function statusReport(args, deps) {
   const dataDir = resolve(args.dataDir);
   const manager = deps?.manager ?? serviceManager();
   const server = await readServerConfig(dataDir);
+  const removed = server === undefined ? await readRemovalNotice(dataDir) : undefined;
   const service = await manager.state();
   const spec = service.installed ? await manager.read() : undefined;
   const own = spec !== undefined && resolve(spec.dataDir) === dataDir;
@@ -34,6 +36,7 @@ async function statusReport(args, deps) {
   const port = own ? argValue(spec.hostArgs, "--port") : undefined;
   return {
     ...server === undefined ? {} : { server },
+    ...removed === undefined ? {} : { removed },
     ...lanPort === undefined ? {} : { lanPort },
     service,
     ...port === undefined ? {} : { port },
@@ -45,10 +48,10 @@ async function main(argv) {
   const dataDir = resolve(values["data-dir"] ?? DEFAULT_DATA_DIR);
   try {
     const report = await statusReport({ dataDir });
-    const { server } = report;
-    console.log(server === undefined ? `server: not joined (\`${commandHint("up")}\` to join)` : `server: ${server.username === undefined ? "joined" : server.username} at ${server.origin}`);
+    const { server, removed } = report;
+    console.log(server !== undefined ? `server: ${server.username === undefined ? "joined" : server.username} at ${server.origin}` : removed !== undefined ? `server: removed from ${removed.username === undefined ? "its account" : `${removed.username}'s account`} at ${removed.origin} (\`${commandHint("up")}\` to join again)` : `server: not joined (\`${commandHint("up")}\` to join)`);
     console.log(`LAN and tailnet: ${report.lanPort === undefined ? "off" : `port ${report.lanPort}`}`);
-    console.log(`service: ${report.service.installed ? report.service.detail : "not installed"}`);
+    console.log(`service: ${!report.service.installed ? "not installed" : report.service.stopped ? `stopped (\`${commandHint("service")} start\` to turn it back on)` : report.service.detail}`);
     if (report.otherDataDir !== undefined)
       console.log(`note: the installed service runs ${report.otherDataDir}, not ${dataDir}`);
     console.log(await versionLine());

package/dist/chunk-42nqtx5r.js

@@ -0,0 +1,22 @@
+#!/usr/bin/env node
+import {
+  joinServer,
+  main
+} from "./chunk-gg2dcqbg.js";
+import"./chunk-7mn38n4f.js";
+import"./chunk-nppgxh6c.js";
+import"./chunk-t91zt5f0.js";
+import"./chunk-nq57fdnq.js";
+import"./chunk-g3ahp7b9.js";
+import"./chunk-t5abqsva.js";
+import"./chunk-np4jd070.js";
+import"./chunk-kzbzacz9.js";
+import"./chunk-47ff1d1t.js";
+import"./chunk-pqe7q1s7.js";
+import"./chunk-ngf1zatm.js";
+import"./chunk-7wj0jh3t.js";
+import"./chunk-df32avw6.js";
+export {
+  main,
+  joinServer
+};

package/dist/{chunk-wb10efyq.js → chunk-445cevpm.js}

@@ -16,7 +16,7 @@ var NOT_BUILT = "Web client not built: run bun run build";
 var SECURITY_HEADERS = {
   "content-security-policy": [
     "default-src 'self'",
-    "script-src 'self'",
+    "script-src 'self' 'wasm-unsafe-eval'",
     "style-src 'self' 'unsafe-inline'",
     "img-src 'self' data:",
     "connect-src 'self' ws: wss:",

package/dist/{chunk-xqycs43g.js → chunk-47ff1d1t.js}

@@ -187,7 +187,7 @@ var conversationStream = (id) => `conversation:${id}`;
 var docStream = (kind, id) => `doc:${kind}:${id}`;
 var UNAUTHORIZED_CLOSE_CODE = 4401;
 var INVALID_FRAME_CLOSE_CODE = 4400;
-var PROTOCOL = { major: 5, minor: 25 };
+var PROTOCOL = { major: 5, minor: 27 };
 var CALL_SINCE = {
   addProject: 0,
   removeProject: 0,
@@ -229,7 +229,13 @@ var CALL_SINCE = {
   beginAttachment: 19,
   appendAttachment: 19,
   rtcOffer: 23,
-  ping: 23
+  ping: 23,
+  openTerminal: 27,
+  terminalInput: 27,
+  resizeTerminal: 27,
+  renameTerminal: 27,
+  restartTerminal: 27,
+  closeTerminal: 27
 };
 function hostSupportsCall(hostMinor, method) {
   return hostMinor >= CALL_SINCE[method];
@@ -246,7 +252,8 @@ var FEATURE_SINCE = {
   attachments: 19,
   imageVariants: 20,
   rtc: 23,
-  submitEntry: 25
+  submitEntry: 25,
+  terminals: 27
 };
 function hostSupportsFeature(hostMinor, feature) {
   return hostMinor >= FEATURE_SINCE[feature];
@@ -259,8 +266,16 @@ function parseClientFrame(value) {
     if (typeof stream !== "string")
       return { kind: "malformed" };
     if (isStreamName(stream)) {
-      const refs = value.type === "subscribe" && value.images === "ref";
-      return { kind: "frame", frame: refs ? { type: "subscribe", stream, images: "ref" } : { type: value.type, stream } };
+      if (value.type === "unsubscribe")
+        return { kind: "frame", frame: { type: "unsubscribe", stream } };
+      if (stream.startsWith("terminal:") && value.since !== undefined) {
+        const since = value.since;
+        if (typeof since !== "number" || !Number.isSafeInteger(since) || since < 0)
+          return { kind: "malformed" };
+        return { kind: "frame", frame: { type: "subscribe", stream, since } };
+      }
+      const refs = value.images === "ref";
+      return { kind: "frame", frame: refs ? { type: "subscribe", stream, images: "ref" } : { type: "subscribe", stream } };
     }
     const prefix = stream.slice(0, stream.indexOf(":") === -1 ? undefined : stream.indexOf(":"));
     if (STREAM_KINDS.has(prefix))
@@ -277,9 +292,9 @@ function parseClientFrame(value) {
     return { kind: "unsupportedCall", id, method };
   return validCallArgs(method, args) ? { kind: "frame", frame: { type: "call", id, method, args } } : { kind: "malformed" };
 }
-var STREAM_KINDS = new Set(["conversation", "doc", "tasks", ...HOST_STREAM_NAMES]);
+var STREAM_KINDS = new Set(["conversation", "doc", "tasks", "terminals", "terminal", ...HOST_STREAM_NAMES]);
 function isStreamName(stream) {
-  return stream === "tasks" || HOST_STREAM_NAMES.includes(stream) || /^(?:conversation:|doc:.+:)[1-9]\d*$/.test(stream);
+  return stream === "tasks" || HOST_STREAM_NAMES.includes(stream) || /^(?:conversation:|doc:.+:|terminals:)[1-9]\d*$/.test(stream) || /^terminal:[\w-]+$/.test(stream);
 }
 var isCallMethod = (method) => CALL_METHODS.includes(method);
 var CALL_METHODS = Object.keys(CALL_SINCE);
@@ -299,7 +314,20 @@ function validCallArgs(method, args) {
   const skills = () => args.skills === undefined || Array.isArray(args.skills) && args.skills.every(nonempty);
   const attachments = () => args.attachments === undefined || Array.isArray(args.attachments) && args.attachments.every(nonempty);
   const role = () => record(args.role) && typeof args.role.name === "string" && typeof args.role.description === "string" && typeof args.role.prompt === "string" && (args.role.model === undefined || typeof args.role.model === "string") && (args.role.thinkingLevel === undefined || typeof args.role.thinkingLevel === "string");
+  const terminalId = () => nonempty(args.terminalId);
+  const size = () => [args.cols, args.rows].every((n) => typeof n === "number" && Number.isSafeInteger(n) && n >= 1);
   switch (method) {
+    case "openTerminal":
+      return conversationId() && size();
+    case "terminalInput":
+      return terminalId() && typeof args.data === "string";
+    case "resizeTerminal":
+    case "restartTerminal":
+      return terminalId() && size();
+    case "renameTerminal":
+      return terminalId() && (args.name === null || typeof args.name === "string");
+    case "closeTerminal":
+      return terminalId();
     case "submit":
       return conversationId() && typeof args.text === "string" && (args.whenBusy === "steer" || args.whenBusy === "followUp") && nonempty(args.requestId) && images() && skills() && attachments();
     case "submission":

package/dist/{chunk-n1m1tjrk.js → chunk-5qf1grkk.js}

@@ -3,31 +3,32 @@ import {
   joinServer,
   openServiceSlot,
   writeService
-} from "./chunk-gtdpjqa3.js";
-import"./chunk-ncbqa8jk.js";
-import"./chunk-44pnts98.js";
+} from "./chunk-gg2dcqbg.js";
+import"./chunk-7mn38n4f.js";
+import"./chunk-nppgxh6c.js";
 import"./chunk-t91zt5f0.js";
 import {
   normalizeOrigin,
+  readRemovalNotice,
   readServerConfig
-} from "./chunk-etf7ef97.js";
-import"./chunk-y127fe1a.js";
+} from "./chunk-nq57fdnq.js";
+import"./chunk-g3ahp7b9.js";
 import {
   argValue,
   serviceManager,
   withoutArg,
   withoutRelayArgs
-} from "./chunk-vvj9b1gc.js";
-import"./chunk-jt34g8st.js";
+} from "./chunk-t5abqsva.js";
+import"./chunk-np4jd070.js";
 import"./chunk-kzbzacz9.js";
-import"./chunk-xqycs43g.js";
+import"./chunk-47ff1d1t.js";
 import"./chunk-pqe7q1s7.js";
 import {
   DEFAULT_DATA_DIR
 } from "./chunk-ngf1zatm.js";
 import {
   commandHint
-} from "./chunk-sd5fkxjj.js";
+} from "./chunk-7wj0jh3t.js";
 import"./chunk-df32avw6.js";
 
 // apps/host/src/cli/up.ts
@@ -44,6 +45,9 @@ function resolveReach(flags, current) {
     return { server: flags.server ?? current.server, lan: flags.lan ?? current.lan };
   return { server: flags.server ?? !flags.lan, lan: flags.lan ?? !flags.server };
 }
+var lastRemovedOrigin = async (dataDir) => (await readRemovalNotice(dataDir).catch(() => {
+  return;
+}))?.origin;
 async function currentReach(dataDir, deps) {
   const slot = await openServiceSlot(dataDir, deps?.manager ?? serviceManager());
   const config = await readServerConfig(dataDir);
@@ -73,7 +77,7 @@ async function upHost(args, deps) {
   const manager = deps?.manager ?? serviceManager();
   const slot = await openServiceSlot(dataDir, manager);
   const config = await readServerConfig(dataDir);
-  const origin = normalizeOrigin(args.origin ?? config?.origin ?? OFFICIAL_SERVER_ORIGIN);
+  const origin = normalizeOrigin(args.origin ?? config?.origin ?? await lastRemovedOrigin(dataDir) ?? OFFICIAL_SERVER_ORIGIN);
   if (reach.server && config !== undefined && normalizeOrigin(config.origin) !== origin) {
     throw new Error(`this host is joined to ${config.origin} — run \`${commandHint("leave")}\` first to join ${origin}, ` + `or leave out --origin to stay`);
   }
@@ -81,7 +85,7 @@ async function upHost(args, deps) {
   const lan = (hostArgs) => withLan(hostArgs, lanPort);
   const notes = [];
   if (reach.server && config === undefined) {
-    const joined = await joinServer({ origin, dataDir, editHostArgs: lan }, { ...deps, manager });
+    const joined = await joinServer({ origin, dataDir, code: args.code, editHostArgs: lan }, { ...deps, manager });
     return {
       joined: { origin: joined.origin, username: joined.username, fresh: true },
       ...lanPort === undefined ? {} : { lanPort },
@@ -145,6 +149,7 @@ async function main(argv, deps) {
       lan: { type: "boolean" },
       yes: { type: "boolean", short: "y" },
       origin: { type: "string" },
+      code: { type: "boolean" },
       "remote-port": { type: "string" },
       "data-dir": { type: "string" }
     }
@@ -152,7 +157,7 @@ async function main(argv, deps) {
   const log = deps?.log ?? ((line) => console.log(line));
   try {
     const dataDir = resolve(values["data-dir"] ?? DEFAULT_DATA_DIR);
-    const origin = normalizeOrigin(values.origin ?? (await readServerConfig(dataDir))?.origin ?? OFFICIAL_SERVER_ORIGIN);
+    const origin = normalizeOrigin(values.origin ?? (await readServerConfig(dataDir))?.origin ?? await lastRemovedOrigin(dataDir) ?? OFFICIAL_SERVER_ORIGIN);
     const current = await currentReach(dataDir, deps);
     let reach = resolveReach({ server: values.server, lan: values.lan }, current);
     if (reach === undefined) {
@@ -176,7 +181,8 @@ async function main(argv, deps) {
       dataDir,
       origin,
       reach,
-      ...values["remote-port"] === undefined ? {} : { remotePort: values["remote-port"] }
+      ...values["remote-port"] === undefined ? {} : { remotePort: values["remote-port"] },
+      ...values.code === true ? { code: true } : {}
     }, deps);
     if (outcome.joined !== undefined) {
       const who = outcome.joined.username ?? "an account";

package/dist/{chunk-ncbqa8jk.js → chunk-7mn38n4f.js}

@@ -6,7 +6,7 @@ import {
   relayWsBase,
   signRelayChallenge,
   signRelayChallengeV2
-} from "./chunk-y127fe1a.js";
+} from "./chunk-g3ahp7b9.js";
 import {
   toBase64Url
 } from "./chunk-pqe7q1s7.js";

package/dist/{chunk-sd5fkxjj.js → chunk-7wj0jh3t.js}

@@ -1,6 +1,6 @@
 // apps/host/src/distribution.ts
 import { fileURLToPath } from "node:url";
-var packagedVersion = "0.11.0";
+var packagedVersion = "0.12.0";
 var webRoot = fileURLToPath(new URL(packagedVersion === undefined ? "../../web/dist" : "../web/", import.meta.url));
 var hostEntry = packagedVersion === undefined ? { script: fileURLToPath(new URL("./main.ts", import.meta.url)), args: [] } : { script: fileURLToPath(new URL("./pinomad.js", import.meta.url)), args: ["host"] };
 var commandHint = (name) => packagedVersion === undefined ? `bun run ${name}` : `pinomad ${name}`;

package/dist/{chunk-4dcs8sbj.js → chunk-agq4tn9r.js}

@@ -3,32 +3,35 @@ import {
   assertSecureServerOrigin,
   probeServerAccounts,
   runServerOperation
-} from "./chunk-ncbqa8jk.js";
+} from "./chunk-7mn38n4f.js";
 import {
   loadHostKey,
   loadRelayKey
 } from "./chunk-t91zt5f0.js";
 import {
+  readRemovalNotice,
   readServerConfig,
   removeServerConfig
-} from "./chunk-etf7ef97.js";
+} from "./chunk-nq57fdnq.js";
 import {
   relayHostId
-} from "./chunk-y127fe1a.js";
+} from "./chunk-g3ahp7b9.js";
 import {
   argValue,
   restartService,
   serviceManager,
   withoutRelayArgs
-} from "./chunk-vvj9b1gc.js";
-import"./chunk-jt34g8st.js";
+} from "./chunk-t5abqsva.js";
+import"./chunk-np4jd070.js";
 import"./chunk-kzbzacz9.js";
-import"./chunk-xqycs43g.js";
+import"./chunk-47ff1d1t.js";
 import"./chunk-pqe7q1s7.js";
 import {
   DEFAULT_DATA_DIR
 } from "./chunk-ngf1zatm.js";
-import"./chunk-sd5fkxjj.js";
+import {
+  commandHint
+} from "./chunk-7wj0jh3t.js";
 import"./chunk-df32avw6.js";
 
 // apps/host/src/cli/leave.ts
@@ -39,8 +42,13 @@ var message = (error) => error instanceof Error ? error.message : String(error);
 async function leaveServer(args, deps) {
   const dataDir = resolve(args.dataDir);
   const config = await readServerConfig(dataDir);
-  if (config === undefined)
-    throw new Error(`not joined — no server.json in ${dataDir}`);
+  if (config === undefined) {
+    const removed = await readRemovalNotice(dataDir);
+    if (removed === undefined)
+      throw new Error(`not joined — no server.json in ${dataDir}`);
+    await removeServerConfig(dataDir);
+    return { origin: removed.origin, warnings: [], notes: ["the account had already removed this host"] };
+  }
   const origin = config.origin;
   const warnings = [];
   const notes = [];
@@ -78,7 +86,10 @@ async function leaveServer(args, deps) {
   await removeServerConfig(dataDir);
   const manager = deps?.manager ?? serviceManager();
   try {
-    const installed = await manager.state().then((state) => state.installed, () => false);
+    const state = await manager.state().catch(() => {
+      return;
+    });
+    const installed = state?.installed === true;
     const previous = installed ? await manager.read() : undefined;
     if (!installed) {
       notes.push("no service installed — restart any running host so it stops dialing the server");
@@ -87,19 +98,30 @@ async function leaveServer(args, deps) {
     } else {
       const stripped = previous === undefined ? undefined : { ...previous, hostArgs: withoutRelayArgs(previous.hostArgs) };
       const rewriting = stripped !== undefined && stripped.hostArgs.length !== previous.hostArgs.length;
-      const port = argValue(previous?.hostArgs ?? [], "--port");
-      const code = await restartService({
-        force: false,
-        argv: ["--data-dir", dataDir, ...port === undefined ? [] : ["--url", `ws://127.0.0.1:${port}`]],
-        manager,
-        ...rewriting ? {
-          restart: async () => {
+      if (state.stopped) {
+        if (rewriting) {
+          try {
             await manager.install(stripped);
+          } finally {
+            await manager.stop();
           }
-        } : {}
-      });
-      if (code !== 0)
-        warnings.push("the service restart did not finish — check `service status`");
+        }
+        notes.push(`the service is stopped and stays off until \`${commandHint("service")} start\``);
+      } else {
+        const port = argValue(previous?.hostArgs ?? [], "--port");
+        const code = await restartService({
+          force: false,
+          argv: ["--data-dir", dataDir, ...port === undefined ? [] : ["--url", `ws://127.0.0.1:${port}`]],
+          manager,
+          ...rewriting ? {
+            restart: async () => {
+              await manager.install(stripped);
+            }
+          } : {}
+        });
+        if (code !== 0)
+          warnings.push("the service restart did not finish — check `service status`");
+      }
     }
   } catch (error) {
     warnings.push(`could not update the service definition: ${message(error)} — remove --relay from it and restart manually`);

package/dist/{chunk-as6pyf00.js → chunk-aqj9wfmb.js}

@@ -3,7 +3,7 @@ import {
 } from "./chunk-ngf1zatm.js";
 import {
   packagedVersion
-} from "./chunk-sd5fkxjj.js";
+} from "./chunk-7wj0jh3t.js";
 import"./chunk-df32avw6.js";
 
 // apps/host/src/cli/web-link.ts

package/dist/{chunk-y127fe1a.js → chunk-g3ahp7b9.js}

@@ -15,6 +15,7 @@ var RELAY_CLOSE = {
   handshakeTimeout: 4608,
   replaced: 4609,
   acceptTimeout: 4610,
+  hostRemoved: 4611,
   tooManyConnections: 4629,
   trafficLimit: 4630
 };
@@ -467,6 +468,14 @@ function startRelayLink(options) {
     }
     if (stopped)
       return;
+    if (code === RELAY_CLOSE.hostRemoved) {
+      stopped = true;
+      setState({
+        status: "removed",
+        reason: `relay ${origin}: the account removed this host (${hostId}); join it again with \`pinomad up\` (${code})`
+      });
+      return;
+    }
     const rejection = REJECTION_REASONS[code];
     if (rejection !== undefined) {
       const reason = `relay ${origin}: ${rejection(hostId)} (${code})`;
@@ -494,6 +503,8 @@ function startRelayLink(options) {
     origin,
     state: () => state,
     sendPush(request) {
+      if (state.status === "removed")
+        return Promise.resolve({ result: "unavailable", reason: "the account removed this host" });
       const socket = control;
       if (stopped || socket === undefined || socket.readyState !== WebSocket.OPEN || state.status !== "registered") {
         return Promise.resolve({ result: "retry", reason: "control disconnected" });