pinomad 0.12.0 → 0.14.0

package/dist/{chunk-t5abqsva.js → chunk-mxwcnnkg.js}

@@ -1,29 +1,7 @@
-import {
-  ProtocolMismatchError,
-  connectRemoteDurable
-} from "./chunk-np4jd070.js";
-import {
-  isParseArgsError
-} from "./chunk-kzbzacz9.js";
-import {
-  DEFAULT_DATA_DIR,
-  hostAddress
-} from "./chunk-ngf1zatm.js";
-import {
-  commandHint,
-  hostEntry,
-  packagedVersion
-} from "./chunk-7wj0jh3t.js";
-
-// apps/host/src/cli/service.ts
-import { execFile as execFile2 } from "node:child_process";
-import { homedir as homedir2 } from "node:os";
-import { resolve as resolve2 } from "node:path";
-import { fileURLToPath } from "node:url";
-import { parseArgs, promisify as promisify2 } from "node:util";
-
 // apps/host/src/service/definition.ts
 import { join, resolve } from "node:path";
+var LAUNCHER_EXECUTABLE = "pinomad-host";
+var isLauncher = (path) => path.endsWith(`.app/Contents/MacOS/${LAUNCHER_EXECUTABLE}`);
 function sanitizePath(path) {
   const seen = new Set;
   const kept = [];
@@ -149,11 +127,21 @@ function specFromLaunchdPlist(text) {
   const workdir = /<key>WorkingDirectory<\/key>\s*<string>([\s\S]*?)<\/string>/.exec(text)?.[1];
   if (workdir === undefined)
     throw new Error("plist has no WorkingDirectory");
-  return specFromProgram(program, env, xmlUnescape(workdir));
+  if (program[0] === undefined || !isLauncher(program[0]))
+    return specFromProgram(program, env, xmlUnescape(workdir));
+  return { ...specFromProgram(program.slice(1), env, xmlUnescape(workdir)), launcher: program[0] };
 }
 var xmlEscape = (value) => value.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;").replace(/'/g, "&apos;");
 function launchdPlist(spec) {
-  const program = [spec.nodePath, spec.mainPath, ...spec.entryArgs, "--data-dir", spec.dataDir, ...spec.hostArgs];
+  const program = [
+    ...spec.launcher === undefined ? [] : [spec.launcher],
+    spec.nodePath,
+    spec.mainPath,
+    ...spec.entryArgs,
+    "--data-dir",
+    spec.dataDir,
+    ...spec.hostArgs
+  ];
   const log = join(spec.dataDir, "logs", "host.log");
   const env = Object.entries(spec.env).map(([key, value]) => `    <key>${xmlEscape(key)}</key>
     <string>${xmlEscape(value)}</string>`);
@@ -207,37 +195,6 @@ WantedBy=default.target
 `;
 }
 
-// apps/host/src/service/idle.ts
-async function waitForIdle(remote, onBusy) {
-  if (remote.view.current().tasks === undefined)
-    await remote.controller.toggleTasks();
-  let announced = false;
-  await new Promise((resolve2) => {
-    const check = () => {
-      const view = remote.view.current();
-      if (view.connection !== "connected") {
-        unsubscribe();
-        resolve2();
-        return;
-      }
-      const tasks = view.tasks;
-      if (tasks === undefined)
-        return;
-      if (Object.keys(tasks.tasks).length === 0) {
-        unsubscribe();
-        resolve2();
-        return;
-      }
-      if (!announced) {
-        announced = true;
-        onBusy(tasks);
-      }
-    };
-    const unsubscribe = remote.view.subscribe(check);
-    check();
-  });
-}
-
 // apps/host/src/service/manager.ts
 import { execFile, spawn } from "node:child_process";
 import { mkdir, readFile, rm, writeFile } from "node:fs/promises";
@@ -416,251 +373,4 @@ function serviceManager(platform = process.platform) {
   throw new Error(`service commands support macOS and Linux, not ${platform}`);
 }
 
-// apps/host/src/cli/service.ts
-var run2 = promisify2(execFile2);
-var repoRoot = fileURLToPath(new URL("../../../../", import.meta.url));
-var message = (error) => error instanceof Error ? error.message : String(error);
-function connectToHost(url, token, timeoutMs = 3000) {
-  const connecting = connectRemoteDurable({ url, token, reconnectDelayMs: { min: 200, max: 2000 } });
-  const timedOut = Symbol("timedOut");
-  return Promise.race([
-    connecting,
-    new Promise((resolve3) => {
-      const timer = setTimeout(() => resolve3(timedOut), timeoutMs);
-      timer.unref();
-    })
-  ]).then((winner) => {
-    if (winner !== timedOut)
-      return winner;
-    connecting.then((remote) => remote.close(), () => {});
-    throw new Error("connect timed out");
-  });
-}
-async function install(argv) {
-  const spec = installSpec(argv, {
-    execPath: process.execPath,
-    env: process.env,
-    home: homedir2(),
-    cwd: process.cwd(),
-    mainPath: hostEntry.script,
-    entryArgs: hostEntry.args
-  });
-  const path = await serviceManager().install(spec);
-  console.log(`installed ${path}`);
-  console.log(`data dir: ${spec.dataDir}`);
-  console.log(`browser link: ${commandHint("link")}    pairing QR: ${commandHint("pair")}`);
-}
-async function waitUntilIdle(address, connect, log) {
-  try {
-    const remote = await connect(address.url, address.token);
-    await waitForIdle(remote, (tasks) => {
-      log("waiting for running tasks to finish (Ctrl-C to cancel)");
-      for (const task of Object.values(tasks.tasks)) {
-        log(`  ${task.kind} in conversation ${task.conversationId}`);
-      }
-    });
-    remote.close();
-  } catch {}
-}
-async function stopService({
-  force,
-  argv,
-  manager = serviceManager(),
-  connect = connectToHost,
-  log = (line) => console.log(line),
-  logError = (line) => console.error(line)
-}) {
-  const state = await manager.state();
-  if (!state.installed) {
-    log(`service not installed (${commandHint("service")} install)`);
-    return 1;
-  }
-  if (state.stopped) {
-    log("already stopped");
-    return 0;
-  }
-  if (!force) {
-    const spec = argv.length === 0 ? await manager.read() : undefined;
-    const port = spec === undefined ? undefined : argValue(spec.hostArgs, "--port");
-    const flags = spec === undefined ? argv : ["--data-dir", spec.dataDir, ...port === undefined ? [] : ["--url", `ws://127.0.0.1:${port}`]];
-    const address = await hostAddress(flags).catch((error) => {
-      if (isParseArgsError(error))
-        throw error;
-      return;
-    });
-    if (address !== undefined)
-      await waitUntilIdle(address, connect, log);
-  }
-  const holdInterrupt = () => {};
-  process.on("SIGINT", holdInterrupt);
-  try {
-    await manager.stop();
-  } finally {
-    process.off("SIGINT", holdInterrupt);
-  }
-  const after = await manager.state();
-  if (!after.stopped) {
-    logError(`the host is still running (${after.detail}); run \`${commandHint("service")} stop\` again`);
-    return 1;
-  }
-  log(`stopped; it stays off, also after a restart, until \`${commandHint("service")} start\``);
-  return 0;
-}
-async function startService({
-  manager = serviceManager(),
-  log = (line) => console.log(line)
-} = {}) {
-  if (!(await manager.state()).installed) {
-    log(`service not installed (${commandHint("service")} install)`);
-    return 1;
-  }
-  await manager.start();
-  log("started");
-  return 0;
-}
-async function versionLine() {
-  if (packagedVersion !== undefined)
-    return `version: ${packagedVersion}`;
-  const head = await run2("git", ["rev-parse", "--short", "HEAD"], { cwd: repoRoot }).then(({ stdout }) => stdout.trim(), () => "unknown");
-  return `checkout: ${head}`;
-}
-async function reachabilityLine(argv) {
-  try {
-    const { url, token } = await hostAddress(argv);
-    const remote = await connectToHost(url, token);
-    if (remote.view.current().tasks === undefined)
-      await remote.controller.toggleTasks();
-    const tasks = remote.view.current().tasks;
-    const count = tasks === undefined ? 0 : Object.keys(tasks.tasks).length;
-    remote.close();
-    return `host: reachable at ${url}, ${count} live task${count === 1 ? "" : "s"}`;
-  } catch (error) {
-    if (isParseArgsError(error))
-      throw error;
-    return `host: unreachable (${message(error)})`;
-  }
-}
-var serviceStatusJson = (state) => JSON.stringify({
-  installed: state.installed,
-  stopped: state.stopped,
-  running: state.running,
-  ...state.pid === undefined ? {} : { pid: state.pid },
-  detail: state.detail
-});
-async function status(argv) {
-  const state = await serviceManager().state();
-  if (argv.includes("--json")) {
-    console.log(serviceStatusJson(state));
-    return;
-  }
-  console.log(`service: ${state.installed ? state.detail : "not installed"}`);
-  console.log(await versionLine());
-  console.log(await reachabilityLine(argv));
-}
-async function restartService({
-  force,
-  argv,
-  manager = serviceManager(),
-  restart,
-  connect = connectToHost,
-  pollTimeoutMs = 30000,
-  pollDelayMs = 500
-}) {
-  const state = await manager.state();
-  if (!state.installed) {
-    console.log(`service not installed (${commandHint("service")} install)`);
-    return 1;
-  }
-  if (state.stopped && restart === undefined) {
-    console.log(`service stopped (${commandHint("service")} start)`);
-    return 1;
-  }
-  const address = await hostAddress(argv).catch((error) => {
-    if (isParseArgsError(error))
-      throw error;
-    return;
-  });
-  if (!force && address !== undefined)
-    await waitUntilIdle(address, connect, (line) => console.log(line));
-  await (restart?.() ?? manager.restart());
-  if (address === undefined) {
-    console.log("restart requested (host address unknown; not polling)");
-    return 0;
-  }
-  const deadline = Date.now() + pollTimeoutMs;
-  for (;; ) {
-    try {
-      const remote = await connect(address.url, address.token, 2000);
-      remote.close();
-      console.log(`host restarted, reachable at ${address.url}`);
-      return 0;
-    } catch (error) {
-      if (error instanceof ProtocolMismatchError && error.direction === "client-older") {
-        const newer = error.hostVersion ?? `protocol major ${error.hostMajor}`;
-        console.log(`host restarted (${newer}, newer than this upgrader), reachable at ${address.url}`);
-        return 0;
-      }
-      if (Date.now() > deadline) {
-        console.error(`host did not answer within ${pollTimeoutMs / 1000}s after restart: ${message(error)}`);
-        return 1;
-      }
-      await new Promise((resolve3) => setTimeout(resolve3, pollDelayMs));
-    }
-  }
-}
-async function logs(argv) {
-  const { values } = parseArgs({
-    args: [...argv],
-    options: {
-      follow: { type: "boolean", default: false },
-      lines: { type: "string", short: "n", default: "100" },
-      "data-dir": { type: "string" }
-    }
-  });
-  const dataDir = resolve2(values["data-dir"] ?? DEFAULT_DATA_DIR);
-  await serviceManager().logs(dataDir, Number(values.lines), values.follow);
-}
-async function main(argv) {
-  const [command, ...args] = argv;
-  try {
-    switch (command) {
-      case "install":
-        await install(args);
-        break;
-      case "uninstall":
-        await serviceManager().uninstall();
-        console.log("uninstalled");
-        break;
-      case "status":
-        await status(args);
-        break;
-      case "restart": {
-        const force = args.includes("--force");
-        process.exitCode = await restartService({ force, argv: args.filter((arg) => arg !== "--force") });
-        break;
-      }
-      case "stop": {
-        const force = args.includes("--force");
-        process.exitCode = await stopService({ force, argv: args.filter((arg) => arg !== "--force") });
-        break;
-      }
-      case "start":
-        process.exitCode = await startService();
-        break;
-      case "logs":
-        await logs(args);
-        break;
-      default:
-        console.error(`usage: ${commandHint("service")} install|uninstall|status|restart|stop|start|logs`);
-        process.exitCode = 1;
-    }
-  } catch (error) {
-    if (isParseArgsError(error))
-      throw error;
-    console.error(message(error));
-    process.exitCode = 1;
-  }
-}
-if (false) {}
-
-export { installSpec, argValue, withoutArg, withoutRelayArgs, serviceManager, stopService, startService, versionLine, reachabilityLine, serviceStatusJson, restartService, main };
+export { LAUNCHER_EXECUTABLE, isLauncher, installSpec, argValue, withoutArg, withoutRelayArgs, serviceManager };

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

@@ -3,36 +3,40 @@ import {
   joinServer,
   openServiceSlot,
   writeService
-} from "./chunk-gg2dcqbg.js";
-import"./chunk-7mn38n4f.js";
-import"./chunk-nppgxh6c.js";
-import"./chunk-t91zt5f0.js";
+} from "./chunk-b0nwq1dt.js";
+import"./chunk-63ymn5c9.js";
+import"./chunk-6j6hkfbj.js";
+import"./chunk-hg9gs396.js";
 import {
   normalizeOrigin,
   readRemovalNotice,
   readServerConfig
 } from "./chunk-nq57fdnq.js";
-import"./chunk-g3ahp7b9.js";
+import"./chunk-9trbbz4r.js";
+import"./chunk-eerpgvy9.js";
+import"./chunk-e59k3bmz.js";
+import"./chunk-kzbzacz9.js";
 import {
+  LAUNCHER_EXECUTABLE,
   argValue,
+  isLauncher,
   serviceManager,
   withoutArg,
   withoutRelayArgs
-} from "./chunk-t5abqsva.js";
-import"./chunk-np4jd070.js";
-import"./chunk-kzbzacz9.js";
-import"./chunk-47ff1d1t.js";
-import"./chunk-pqe7q1s7.js";
+} from "./chunk-mxwcnnkg.js";
+import"./chunk-1mjbt2z2.js";
+import"./chunk-6vbp1vva.js";
 import {
   DEFAULT_DATA_DIR
 } from "./chunk-ngf1zatm.js";
 import {
   commandHint
-} from "./chunk-7wj0jh3t.js";
+} from "./chunk-1rdbnvy6.js";
 import"./chunk-df32avw6.js";
 
 // apps/host/src/cli/up.ts
-import { resolve } from "node:path";
+import { existsSync } from "node:fs";
+import { isAbsolute, resolve } from "node:path";
 import { createInterface } from "node:readline/promises";
 import { parseArgs } from "node:util";
 var OFFICIAL_SERVER_ORIGIN = "https://app.pinomad.si";
@@ -85,7 +89,14 @@ async function upHost(args, deps) {
   const lan = (hostArgs) => withLan(hostArgs, lanPort);
   const notes = [];
   if (reach.server && config === undefined) {
-    const joined = await joinServer({ origin, dataDir, code: args.code, editHostArgs: lan }, { ...deps, manager });
+    const joined = await joinServer({
+      origin,
+      dataDir,
+      code: args.code,
+      ...args.token === undefined ? {} : { token: args.token },
+      ...args.launcher === undefined ? {} : { launcher: args.launcher },
+      editHostArgs: lan
+    }, { ...deps, manager });
     return {
       joined: { origin: joined.origin, username: joined.username, fresh: true },
       ...lanPort === undefined ? {} : { lanPort },
@@ -94,7 +105,7 @@ async function upHost(args, deps) {
     };
   }
   const edit = reach.server ? (hostArgs) => lan(withoutRelayArgs(hostArgs)) : lan;
-  const service = await writeService(slot, edit, { changed: reach.server });
+  const service = await writeService(slot, edit, { changed: reach.server, launcher: args.launcher });
   if (!reach.server && config !== undefined) {
     notes.push(`still joined to ${config.origin} — run \`${commandHint("leave")}\` to leave it`);
   }
@@ -105,6 +116,12 @@ async function upHost(args, deps) {
     notes
   };
 }
+async function readAllStdin() {
+  let text = "";
+  for await (const chunk of process.stdin)
+    text += String(chunk);
+  return text;
+}
 async function askOnTerminal(question) {
   const terminal = createInterface({ input: process.stdin, output: process.stdout });
   try {
@@ -139,7 +156,8 @@ var FLAGS = `choose with flags:
   --server [--origin URL]   through a PiNomad server (default ${OFFICIAL_SERVER_ORIGIN})
   --lan [--remote-port N]   only on the local network and tailnet (default port ${DEFAULT_REMOTE_PORT})
   --server --lan            both
-  --yes                     keep what this host has, or the server on a new host`;
+  --yes                     keep what this host has, or the server on a new host
+  --token-stdin             join with a one-time token read from stdin, without a code`;
 async function main(argv, deps) {
   const { values } = parseArgs({
     args: [...argv],
@@ -150,6 +168,8 @@ async function main(argv, deps) {
       yes: { type: "boolean", short: "y" },
       origin: { type: "string" },
       code: { type: "boolean" },
+      "token-stdin": { type: "boolean" },
+      launcher: { type: "string" },
       "remote-port": { type: "string" },
       "data-dir": { type: "string" }
     }
@@ -157,6 +177,20 @@ async function main(argv, deps) {
   const log = deps?.log ?? ((line) => console.log(line));
   try {
     const dataDir = resolve(values["data-dir"] ?? DEFAULT_DATA_DIR);
+    const launcher = values.launcher;
+    if (launcher !== undefined && process.platform !== "darwin")
+      throw new Error("--launcher is for the Mac App's service only");
+    if (launcher !== undefined && !(isAbsolute(launcher) && isLauncher(launcher))) {
+      throw new Error(`--launcher ${launcher}: not a path to the launcher inside an app (….app/Contents/MacOS/${LAUNCHER_EXECUTABLE})`);
+    }
+    if (launcher !== undefined && !existsSync(launcher))
+      throw new Error(`--launcher ${launcher}: no such file`);
+    let token;
+    if (values["token-stdin"] === true) {
+      token = (await (deps?.readStdin ?? readAllStdin)()).trim();
+      if (token === "")
+        throw new Error("--token-stdin: no join token on stdin");
+    }
     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);
@@ -182,7 +216,9 @@ async function main(argv, deps) {
       origin,
       reach,
       ...values["remote-port"] === undefined ? {} : { remotePort: values["remote-port"] },
-      ...values.code === true ? { code: true } : {}
+      ...values.code === true ? { code: true } : {},
+      ...token === undefined ? {} : { token },
+      ...launcher === undefined ? {} : { launcher }
     }, deps);
     if (outcome.joined !== undefined) {
       const who = outcome.joined.username ?? "an account";

package/dist/pinomad.js

@@ -5,24 +5,24 @@ import {
 } from "./chunk-kzbzacz9.js";
 import {
   packagedVersion
-} from "./chunk-7wj0jh3t.js";
+} from "./chunk-1rdbnvy6.js";
 import {
   __require
 } from "./chunk-df32avw6.js";
 
 // apps/cli/src/pinomad.ts
 var COMMANDS = {
-  up: () => import("./chunk-5qf1grkk.js"),
-  status: () => import("./chunk-41q0saz0.js"),
-  host: () => import("./chunk-ksfxqd8s.js"),
-  server: () => import("./chunk-mnmqyq7d.js"),
-  relay: () => import("./chunk-mnmqyq7d.js"),
-  service: () => import("./chunk-vx7dy07y.js"),
-  upgrade: () => import("./chunk-jeqsdcj1.js"),
-  link: () => import("./chunk-aqj9wfmb.js"),
-  pair: () => import("./chunk-vqkb70d7.js"),
-  join: () => import("./chunk-42nqtx5r.js"),
-  leave: () => import("./chunk-agq4tn9r.js")
+  up: () => import("./chunk-w927q9m1.js"),
+  status: () => import("./chunk-e53c0s8z.js"),
+  host: () => import("./chunk-35szq73k.js"),
+  server: () => import("./chunk-5j7ybhjj.js"),
+  relay: () => import("./chunk-5j7ybhjj.js"),
+  service: () => import("./chunk-ex5yr09h.js"),
+  upgrade: () => import("./chunk-eewxy4cp.js"),
+  link: () => import("./chunk-mtkvft88.js"),
+  pair: () => import("./chunk-evbv1fkn.js"),
+  join: () => import("./chunk-dsr19q5h.js"),
+  leave: () => import("./chunk-5pv0g1nj.js")
 };
 var USAGE = `pinomad — PiNomad host, server, and utilities
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pinomad",
-  "version": "0.12.0",
+  "version": "0.14.0",
   "description": "PiNomad — self-hosted coding agent: host, relay, and web client in one package",
   "license": "Apache-2.0",
   "type": "module",
@@ -20,25 +20,30 @@
   },
   "homepage": "https://github.com/bubbleptr/pinomad",
   "dependencies": {
-    "@earendil-works/chord": "1.4.0",
-    "@earendil-works/pi-ai": "1.4.0",
-    "@earendil-works/pi-codemode": "1.4.0",
-    "@earendil-works/pi-coding-agent": "1.4.0",
-    "@earendil-works/pi-durable": "1.4.0",
-    "@earendil-works/pi-mcp": "1.4.0",
+    "@earendil-works/chord": "1.5.0",
+    "@earendil-works/pi-ai": "1.5.0",
+    "@earendil-works/pi-codemode": "1.5.0",
+    "@earendil-works/pi-coding-agent": "1.5.0",
+    "@earendil-works/pi-durable": "1.5.0",
+    "@earendil-works/pi-mcp": "1.5.0",
     "@lydell/node-pty": "1.2.0-beta.18",
     "@noble/curves": "2.4.0",
     "diff": "8.0.4",
     "node-datachannel": "0.33.4",
     "proper-lockfile": "4.1.2",
     "typebox": "1.3.27",
-    "undici": "8.10.2",
+    "undici": "8.12.3",
     "uqr": "0.1.3",
     "ws": "8.22.0",
+    "nodemailer": "10.3.1",
     "@noble/ciphers": "2.4.0",
     "@noble/hashes": "2.4.0",
-    "@earendil-works/pi-agent-core": "1.4.0",
-    "@earendil-works/pi-telemetry": "1.4.0",
-    "@earendil-works/pi-tui": "1.4.0"
+    "@earendil-works/pi-agent-core": "1.5.0",
+    "@earendil-works/pi-schema": "1.5.0",
+    "@earendil-works/pi-telemetry": "1.5.0",
+    "@earendil-works/pi-tui": "1.5.0"
+  },
+  "pinomad": {
+    "protocolMajor": 5
   }
 }