pinomad 0.4.0 → 0.6.0

package/dist/{chunk-374zqx5h.js → chunk-d93kvxvc.js}

@@ -11,7 +11,7 @@ import {
   hostSupportsCall,
   hostSupportsFeature,
   organize
-} from "./chunk-myjp910s.js";
+} from "./chunk-n4tjhcb7.js";
 
 // packages/protocol/src/remote-durable.ts
 import { applyImmutable } from "@earendil-works/chord/delta";
@@ -440,6 +440,9 @@ 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 (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");
+        }
         const { conversationId: conversationId2 } = await this.#call("createConversation", {
           home,
           text,
@@ -447,6 +450,7 @@ class RemoteClient {
           ...options?.checkout === undefined ? {} : { checkout: options.checkout },
           ...options?.model === undefined ? {} : { model: options.model },
           ...options?.thinkingLevel === undefined ? {} : { thinkingLevel: options.thinkingLevel },
+          ...options?.agent === undefined ? {} : { agent: options.agent },
           ...images.length === 0 ? {} : { images }
         });
         await this.#switch(conversationId2);
@@ -510,6 +514,12 @@ class RemoteClient {
       }),
       answer: (kind, requestId, answers, target) => this.#command(() => this.#call("answer", { conversationId: target ?? conversationId(), kind, requestId, answers })),
       changes: () => this.#request(() => this.#call("changes", { conversationId: conversationId() })),
+      listFiles: (scope, query) => {
+        if (!hostSupportsCall(this.#hostMinor, "listFiles")) {
+          return Promise.reject(new Error("The host is too old for this (needs protocol 5.10); run `pinomad upgrade` on the host"));
+        }
+        return this.#call("listFiles", { scope, query });
+      },
       createPairing: () => this.#request(() => this.#call("createPairing", {})),
       revokeDevice: (publicKey) => this.#command(() => this.#call("revokeDevice", { publicKey })),
       logout: (providerId) => this.#command(() => {
@@ -525,6 +535,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 () => {
@@ -549,6 +562,9 @@ class RemoteClient {
         if (!hostSupportsCall(this.#hostMinor, "setPushToken")) {
           throw new Error("The host is too old for this (needs protocol 5.7); run `pinomad upgrade` on the host");
         }
+        if (token !== null && typeof token !== "string" && !hostSupportsFeature(this.#hostMinor, "apnsPush")) {
+          throw new Error("The host is too old for this (needs protocol 5.9); run `pinomad upgrade` on the host");
+        }
         await this.#call("setPushToken", { token });
       })
     };
@@ -591,4 +607,4 @@ class RemoteClient {
   }
 }
 
-export { connectRemoteDurable };
+export { connectRemoteDurable, ProtocolMismatchError };

package/dist/chunk-ggb1taqy.js

@@ -0,0 +1,16 @@
+#!/usr/bin/env node
+import {
+  main,
+  restartService
+} from "./chunk-d5ypmmr7.js";
+import"./chunk-kzbzacz9.js";
+import"./chunk-c8nxym2z.js";
+import"./chunk-d93kvxvc.js";
+import"./chunk-n4tjhcb7.js";
+import"./chunk-znhn8af7.js";
+import"./chunk-ngf1zatm.js";
+import"./chunk-df32avw6.js";
+export {
+  restartService,
+  main
+};

package/dist/chunk-jn7y815x.js

@@ -0,0 +1,79 @@
+#!/usr/bin/env node
+import {
+  restartService,
+  serviceManager
+} from "./chunk-d5ypmmr7.js";
+import"./chunk-kzbzacz9.js";
+import {
+  globalPrefixOf,
+  packageDir,
+  packagedVersion
+} from "./chunk-c8nxym2z.js";
+import"./chunk-d93kvxvc.js";
+import"./chunk-n4tjhcb7.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-b3f0ced1.js → chunk-k2s1hfq5.js}

@@ -3,46 +3,55 @@ import {
   assertSecureServerOrigin,
   probeServerAccounts,
   runServerOperation
-} from "./chunk-5785kwej.js";
+} from "./chunk-ywmm63ks.js";
 import {
+  constantValue,
+  openHostSettings
+} from "./chunk-b1h374jr.js";
+import {
+  loadHostKey,
+  loadRelayKey,
   writeServerConfig
-} from "./chunk-302y6by9.js";
-import"./chunk-knaw1a9g.js";
+} from "./chunk-0xh6cy9v.js";
+import {
+  relayHostId
+} from "./chunk-7qb9tq54.js";
 import {
   argValue,
   installSpec,
   restartService,
   serviceManager,
   withoutRelayArgs
-} from "./chunk-akgxwg8f.js";
+} from "./chunk-d5ypmmr7.js";
+import"./chunk-kzbzacz9.js";
 import {
   commandHint,
   hostEntry
-} from "./chunk-fgx2sh7d.js";
-import"./chunk-374zqx5h.js";
-import"./chunk-myjp910s.js";
+} from "./chunk-c8nxym2z.js";
+import"./chunk-d93kvxvc.js";
+import"./chunk-n4tjhcb7.js";
 import {
-  loadHostKey,
-  loadRelayKey
-} from "./chunk-837gh8nr.js";
-import {
-  relayHostId
-} from "./chunk-7gmkgyaz.js";
+  cleanHostName,
+  normalizeHostName
+} from "./chunk-znhn8af7.js";
 import {
   DEFAULT_DATA_DIR
-} from "./chunk-cjfmfyjb.js";
+} from "./chunk-ngf1zatm.js";
 import"./chunk-df32avw6.js";
 
 // apps/host/src/cli/join.ts
 import { mkdir } from "node:fs/promises";
 import { homedir, hostname } from "node:os";
-import { resolve } from "node:path";
+import { join, resolve } from "node:path";
 import { parseArgs } from "node:util";
 var message = (error) => error instanceof Error ? error.message : String(error);
 async function joinServer(args, deps) {
   const origin = args.origin.replace(/\/+$/, "");
   const dataDir = resolve(args.dataDir);
   assertSecureServerOrigin(origin);
+  if (args.name !== undefined && cleanHostName(args.name) === "") {
+    throw new Error(`Invalid host name: ${JSON.stringify(args.name)}`);
+  }
   await mkdir(dataDir, { recursive: true });
   const signingKey = await loadRelayKey(dataDir);
   const hostKey = await loadHostKey(dataDir);
@@ -59,13 +68,25 @@ async function joinServer(args, deps) {
   if (probe === "disabled") {
     throw new Error(`${origin} does not run server accounts — the server is too old or was started without a data dir`);
   }
+  const settings = await openHostSettings({
+    path: join(dataDir, "settings.json"),
+    fallback: {
+      defaultModel: () => null,
+      defaultThinkingLevel: () => null,
+      steeringMode: () => "one-at-a-time",
+      followUpMode: () => "one-at-a-time"
+    },
+    models: constantValue([])
+  });
+  const current = settings.value;
+  const storedName = current.custom.includes("hostName") ? current.hostName : undefined;
   const reply = await runServerOperation({
     origin,
     signingKey,
     noisePublicKey: hostKey.publicKey,
     op: "join",
     joinToken: args.token,
-    name: args.name ?? deps?.hostname ?? hostname()
+    name: normalizeHostName(args.name ?? storedName ?? deps?.hostname ?? hostname())
   });
   if (reply.t === "refused") {
     throw new Error(reply.reason === "expired_token" ? "the join token expired — generate a fresh one" : reply.reason === "invalid_token" ? "the join token is invalid or already spent — generate a fresh one" : `the server refused the join: ${reply.reason}`);
@@ -76,6 +97,8 @@ async function joinServer(args, deps) {
   let service;
   try {
     await writeServerConfig(dataDir, { origin });
+    if (args.name !== undefined)
+      await settings.update({ hostName: args.name });
     const freshSpec = installSpec(["--data-dir", dataDir], {
       execPath: process.execPath,
       env: process.env,

package/dist/chunk-kzbzacz9.js

@@ -0,0 +1,12 @@
+// apps/host/src/cli/args.ts
+function isParseArgsError(error) {
+  const code = error.code;
+  return typeof code === "string" && code.startsWith("ERR_PARSE_ARGS_");
+}
+function reportParseArgsError(command, error) {
+  console.error(`${command}: ${error instanceof Error ? error.message : String(error)}`);
+  console.error(`run "${command} --help" for usage`);
+  process.exitCode = 2;
+}
+
+export { isParseArgsError, reportParseArgsError };

package/dist/{chunk-myjp910s.js → chunk-n4tjhcb7.js}

@@ -1,16 +1,8 @@
-// packages/protocol/src/settings.ts
-var HOST_SETTING_KEY_SET = {
-  defaultModel: true,
-  defaultThinkingLevel: true,
-  steeringMode: true,
-  followUpMode: true,
-  acceptAccountDevices: 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";
+import {
+  HOST_SETTING_KEYS,
+  isQueueMode,
+  isThinkingLevel
+} from "./chunk-znhn8af7.js";
 
 // packages/protocol/src/frames.ts
 var HOST_STREAMS = { conversations: 0, index: 0, devices: 0, mcp: 0, models: 1, auth: 1, settings: 2, agents: 6 };
@@ -22,7 +14,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: 8 };
+var PROTOCOL = { major: 5, minor: 12 };
 var CALL_SINCE = {
   logout: 1,
   updateSettings: 2,
@@ -31,12 +23,20 @@ var CALL_SINCE = {
   createAgent: 6,
   updateAgent: 6,
   deleteAgent: 6,
-  setPushToken: 7
+  setPushToken: 7,
+  listFiles: 10
 };
 function hostSupportsCall(hostMinor, method) {
   return hostMinor >= (CALL_SINCE[method] ?? 0);
 }
-var FEATURE_SINCE = { images: 5, acceptAccountDevices: 8 };
+var FEATURE_SINCE = {
+  images: 5,
+  acceptAccountDevices: 8,
+  apnsPush: 9,
+  agentConversations: 10,
+  liveBranch: 11,
+  hostName: 12
+};
 function hostSupportsFeature(hostMinor, feature) {
   return hostMinor >= FEATURE_SINCE[feature];
 }
@@ -92,14 +92,16 @@ var CALL_METHODS = [
   "createAgent",
   "updateAgent",
   "deleteAgent",
-  "setPushToken"
+  "setPushToken",
+  "listFiles"
 ];
 var SETTING_VALIDATORS = {
   defaultModel: (value) => value === null || record(value) && nonempty(value.provider) && nonempty(value.modelId),
   defaultThinkingLevel: (value) => value === null || isThinkingLevel(value),
   steeringMode: (value) => value === null || isQueueMode(value),
   followUpMode: (value) => value === null || isQueueMode(value),
-  acceptAccountDevices: (value) => value === null || typeof value === "boolean"
+  acceptAccountDevices: (value) => value === null || typeof value === "boolean",
+  hostName: (value) => value === null || typeof value === "string"
 };
 function validCallArgs(method, args) {
   const conversationId = () => typeof args.conversationId === "number" && Number.isSafeInteger(args.conversationId) && args.conversationId >= 1;
@@ -128,7 +130,9 @@ function validCallArgs(method, args) {
     case "listFolders":
       return args.path === undefined || nonempty(args.path);
     case "createConversation":
-      return record(args.home) && (args.home.kind === "chat" || args.home.kind === "project" && nonempty(args.home.path)) && typeof args.text === "string" && (nonempty(args.text) || Array.isArray(args.images) && args.images.length > 0) && nonempty(args.requestId) && images() && (args.checkout === undefined || args.checkout === "worktree" || args.checkout === "project") && (args.model === undefined || record(args.model) && nonempty(args.model.provider) && nonempty(args.model.modelId)) && (args.thinkingLevel === undefined || nonempty(args.thinkingLevel));
+      return record(args.home) && (args.home.kind === "chat" || args.home.kind === "project" && nonempty(args.home.path)) && typeof args.text === "string" && (nonempty(args.text) || Array.isArray(args.images) && args.images.length > 0) && nonempty(args.requestId) && images() && (args.checkout === undefined || args.checkout === "worktree" || args.checkout === "project") && (args.model === undefined || record(args.model) && nonempty(args.model.provider) && nonempty(args.model.modelId)) && (args.thinkingLevel === undefined || nonempty(args.thinkingLevel)) && (args.agent === undefined || nonempty(args.agent));
+    case "listFiles":
+      return typeof args.query === "string" && record(args.scope) && (args.scope.kind === "conversation" && typeof args.scope.conversationId === "number" && Number.isSafeInteger(args.scope.conversationId) && args.scope.conversationId >= 1 || args.scope.kind === "project" && nonempty(args.scope.path) && (args.scope.checkout === "worktree" || args.scope.checkout === "project"));
     case "archive":
       return conversationId() && typeof args.archived === "boolean";
     case "renameConversation":
@@ -145,7 +149,7 @@ function validCallArgs(method, args) {
     case "deleteAgent":
       return typeof args.name === "string";
     case "setPushToken":
-      return args.token === null || typeof args.token === "string";
+      return args.token === null || typeof args.token === "string" || record(args.token) && typeof args.token.apns === "string" && (args.token.environment === "production" || args.token.environment === "development");
     case "updateSettings":
       return record(args.patch) && Object.keys(args.patch).every((key) => HOST_SETTING_KEYS.includes(key)) && Object.entries(args.patch).every(([key, value]) => SETTING_VALIDATORS[key]?.(value) === true);
   }
@@ -250,4 +254,4 @@ function homeOf(index, summaries, id) {
   return;
 }
 
-export { HOST_SETTING_KEYS, THINKING_LEVELS, isThinkingLevel, isQueueMode, HOST_STREAM_NAMES, hostStreams, conversationStream, docStream, UNAUTHORIZED_CLOSE_CODE, INVALID_FRAME_CLOSE_CODE, PROTOCOL, hostSupportsCall, hostSupportsFeature, parseClientFrame, organize, checkoutOf, homeOf };
+export { HOST_STREAM_NAMES, hostStreams, conversationStream, docStream, UNAUTHORIZED_CLOSE_CODE, INVALID_FRAME_CLOSE_CODE, PROTOCOL, hostSupportsCall, hostSupportsFeature, parseClientFrame, organize, checkoutOf, homeOf };

package/dist/{chunk-cjfmfyjb.js → chunk-ngf1zatm.js}

@@ -4,18 +4,19 @@ import { homedir } from "node:os";
 import { join, resolve } from "node:path";
 import { parseArgs } from "node:util";
 var DEFAULT_DATA_DIR = process.env.PINOMAD_DATA_DIR ?? join(homedir(), ".pinomad");
+var hostAddressOptions = {
+  "data-dir": { type: "string" },
+  url: { type: "string", default: "ws://127.0.0.1:7420" },
+  token: { type: "string" }
+};
 async function hostAddress(argv) {
   const { values } = parseArgs({
     args: [...argv],
-    options: {
-      "data-dir": { type: "string" },
-      url: { type: "string", default: "ws://127.0.0.1:7420" },
-      token: { type: "string" }
-    }
+    options: hostAddressOptions
   });
   const dataDir = resolve(values["data-dir"] ?? DEFAULT_DATA_DIR);
   const token = values.token ?? (await readFile(join(dataDir, "token"), "utf8")).trim();
   return { url: values.url, token, dataDir };
 }
 
-export { DEFAULT_DATA_DIR, hostAddress };
+export { DEFAULT_DATA_DIR, hostAddressOptions, hostAddress };