pinomad 0.2.0 → 0.4.0

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

@@ -1,103 +1,21 @@
 import {
+  HOST_STREAM_NAMES,
   INVALID_FRAME_CLOSE_CODE,
   PROTOCOL,
   UNAUTHORIZED_CLOSE_CODE,
+  checkoutOf,
   conversationStream,
-  docStream
-} from "./chunk-h35fermn.js";
+  docStream,
+  homeOf,
+  hostStreams,
+  hostSupportsCall,
+  hostSupportsFeature,
+  organize
+} from "./chunk-myjp910s.js";
 
 // packages/protocol/src/remote-durable.ts
 import { applyImmutable } from "@earendil-works/chord/delta";
 
-// packages/protocol/src/organization.ts
-function organize(index, summaries) {
-  const summaryById = new Map(summaries.map((summary) => [summary.id, summary]));
-  const nodes = new Map;
-  const topLevel = new Map;
-  for (const entry of index.conversations) {
-    if (entry.archived === true)
-      continue;
-    const home = entry.home;
-    if (home.kind === "project" && !index.projects.some((project) => project.path === home.path))
-      continue;
-    const summary = summaryById.get(entry.id);
-    if (summary === undefined)
-      continue;
-    topLevel.set(entry.id, entry);
-    nodes.set(entry.id, { summary, children: [] });
-  }
-  for (const summary of summaries) {
-    const chain = [summary];
-    let current = summary;
-    while (!topLevel.has(current.id)) {
-      const parent = current.parent === undefined ? undefined : summaryById.get(current.parent);
-      if (parent === undefined || chain.includes(parent))
-        break;
-      chain.push(parent);
-      current = parent;
-    }
-    if (!topLevel.has(current.id))
-      continue;
-    for (let i = chain.length - 1;i >= 0; i--) {
-      const member = chain[i];
-      if (!nodes.has(member.id))
-        nodes.set(member.id, { summary: member, children: [] });
-      if (i < chain.length - 1) {
-        const parent = nodes.get(chain[i + 1].id);
-        const child = nodes.get(member.id);
-        if (!parent.children.includes(child))
-          parent.children.push(child);
-      }
-    }
-  }
-  const byIdAscending = (a, b) => a.summary.id - b.summary.id;
-  const nodeList = (entry) => sortChildren(nodes.get(entry.id));
-  const sortChildren = (node) => ({
-    summary: node.summary,
-    children: [...node.children].sort(byIdAscending).map(sortChildren)
-  });
-  const entries = [...topLevel.values()].sort((a, b) => b.createdAt - a.createdAt);
-  return {
-    chats: entries.filter((entry) => entry.home.kind === "chat").map(nodeList),
-    projects: [...index.projects].sort((a, b) => b.addedAt - a.addedAt).map((project) => ({
-      project,
-      conversations: entries.filter((entry) => entry.home.kind === "project" && entry.home.path === project.path).map(nodeList)
-    }))
-  };
-}
-function checkoutOf(index, summaries, id) {
-  const record = index.checkouts?.find((checkout) => checkout.conversationId === id);
-  if (record !== undefined)
-    return record;
-  const summaryById = new Map(summaries.map((summary) => [summary.id, summary]));
-  const seen = new Set;
-  let current = summaryById.get(id);
-  while (current !== undefined && !seen.has(current.id)) {
-    seen.add(current.id);
-    const ancestor = index.checkouts?.find((checkout) => checkout.conversationId === current.id);
-    if (ancestor !== undefined)
-      return ancestor;
-    current = current.parent === undefined ? undefined : summaryById.get(current.parent);
-  }
-  return;
-}
-function homeOf(index, summaries, id) {
-  const entry = index.conversations.find((candidate) => candidate.id === id);
-  if (entry !== undefined)
-    return entry.home;
-  const summaryById = new Map(summaries.map((summary) => [summary.id, summary]));
-  const seen = new Set;
-  let current = summaryById.get(id);
-  while (current !== undefined && !seen.has(current.id)) {
-    seen.add(current.id);
-    const ancestor = index.conversations.find((candidate) => candidate.id === current.id);
-    if (ancestor !== undefined)
-      return ancestor.home;
-    current = current.parent === undefined ? undefined : summaryById.get(current.parent);
-  }
-  return;
-}
-
 // packages/protocol/src/transport.ts
 function webSocketTransport(url, token) {
   return {
@@ -147,7 +65,7 @@ class RemoteClient {
   #options;
   #listeners = new Set;
   #values = new Map;
-  #wanted = new Set(["conversations", "index", "devices", "mcp"]);
+  #wanted = new Set;
   #fresh = new Set;
   #docs = [];
   #toolPresentations = {};
@@ -160,6 +78,10 @@ class RemoteClient {
   #side;
   #nextCall = 1;
   #nextNotice = 1;
+  #hostMinor = 0;
+  #helloModels = [];
+  #helloDefaults = {};
+  #hostVersion;
   #attempt = 0;
   #closed = false;
   #notifying = false;
@@ -249,10 +171,25 @@ class RemoteClient {
           this.#connection?.close();
           return;
         }
+        const hostMinor = announced !== null && typeof announced === "object" && typeof announced.minor === "number" ? announced.minor : 0;
+        this.#hostMinor = hostMinor;
         this.#attempt = 0;
         this.#docs = frame.docs;
         this.#toolPresentations = frame.toolPresentations;
+        this.#helloModels = frame.models;
+        this.#helloDefaults = frame.defaults ?? {};
+        this.#hostVersion = frame.hostVersion;
         this.#fresh.clear();
+        const covered = new Set(hostStreams(hostMinor));
+        for (const name of HOST_STREAM_NAMES) {
+          if (covered.has(name)) {
+            this.#wanted.add(name);
+          } else {
+            this.#wanted.delete(name);
+            this.#values.delete(name);
+            this.#fresh.delete(name);
+          }
+        }
         if (this.#current !== undefined)
           for (const stream of this.#conversationStreams(this.#current))
             this.#wanted.add(stream);
@@ -264,13 +201,13 @@ class RemoteClient {
         if (this.#state !== undefined) {
           this.#update({
             session: frame.session,
-            models: frame.models,
             toolPresentations: frame.toolPresentations,
-            defaults: frame.defaults ?? {},
-            connection: "connected"
+            connection: "connected",
+            host: this.#hostInfo()
           });
+          this.#refresh();
         } else
-          this.#awaitFirstView(frame);
+          this.#awaitFirstView(frame, hostMinor);
         return;
       }
       case "snapshot":
@@ -311,19 +248,23 @@ class RemoteClient {
         return;
     }
   }
-  #awaitFirstView(hello) {
-    Promise.all([this.#snapshot("conversations"), this.#snapshot("index"), this.#snapshot("devices"), this.#snapshot("mcp")]).then(() => {
+  #awaitFirstView(hello, hostMinor) {
+    Promise.all(hostStreams(hostMinor).map((stream) => this.#snapshot(stream))).then(() => {
       this.#state = {
         session: hello.session,
-        organized: { chats: [], projects: [] },
-        models: hello.models,
-        defaults: hello.defaults ?? {},
+        organized: { chats: [], projects: [], archived: [] },
+        models: this.#host("models") ?? hello.models,
+        defaults: this.#effectiveDefaults(hello.defaults ?? {}),
         notices: [],
         connection: "connected",
         docs: [],
         toolPresentations: hello.toolPresentations,
         devices: [],
-        mcp: null
+        mcp: null,
+        auth: null,
+        settings: null,
+        agents: null,
+        host: this.#hostInfo()
       };
       this.#refresh();
       this.#resolveReady({ view: this.#viewSource(), controller: this.#controller(), close: () => this.#close() });
@@ -360,8 +301,26 @@ class RemoteClient {
       this.#send({ type: "unsubscribe", stream });
     }
   }
+  #host(name) {
+    return this.#values.get(name);
+  }
+  #hostInfo() {
+    return {
+      protocol: { major: PROTOCOL.major, minor: this.#hostMinor },
+      ...this.#hostVersion === undefined ? {} : { version: this.#hostVersion }
+    };
+  }
+  #effectiveDefaults(fallback) {
+    const settings = this.#host("settings");
+    if (settings === undefined)
+      return fallback;
+    return {
+      ...settings.defaultModel === null ? {} : { model: settings.defaultModel },
+      ...settings.defaultThinkingLevel === null ? {} : { thinkingLevel: settings.defaultThinkingLevel }
+    };
+  }
   #descendsFrom(id, ancestor) {
-    const summaries = this.#values.get("conversations") ?? [];
+    const summaries = this.#host("conversations") ?? [];
     const parentOf = new Map(summaries.map((summary) => [summary.id, summary.parent]));
     let cursor = id;
     for (let depth = 0;cursor !== undefined && depth < 8; depth++) {
@@ -383,12 +342,13 @@ class RemoteClient {
     const current = this.#current;
     const side = this.#side;
     const conversation = current === undefined ? undefined : this.#values.get(conversationStream(current));
-    const summaries = this.#values.get("conversations") ?? [];
-    const index = this.#values.get("index") ?? { projects: [], conversations: [] };
-    const devices = this.#values.get("devices")?.devices ?? [];
+    const summaries = this.#host("conversations") ?? [];
+    const index = this.#host("index") ?? { projects: [], conversations: [] };
+    const devices = this.#host("devices")?.devices ?? [];
     const tasks = this.#wanted.has("tasks") ? this.#values.get("tasks") : undefined;
     this.#update({
       conversation,
+      models: this.#host("models") ?? this.#helloModels,
       organized: organize(index, summaries),
       home: current === undefined ? undefined : homeOf(index, summaries, current),
       checkout: current === undefined ? undefined : checkoutOf(index, summaries, current),
@@ -400,7 +360,11 @@ class RemoteClient {
         docs: this.#docsOf(side)
       },
       devices,
-      mcp: this.#values.get("mcp") ?? null
+      mcp: this.#host("mcp") ?? null,
+      auth: this.#host("auth") ?? null,
+      settings: this.#host("settings") ?? null,
+      agents: this.#host("agents") ?? null,
+      defaults: this.#effectiveDefaults(this.#helloDefaults)
     });
   }
   #update(patch) {
@@ -435,6 +399,11 @@ class RemoteClient {
     this.#commands = this.#commands.then(operation).then(() => {}, (error) => this.#notice("error", error instanceof Error ? error.message : String(error)));
     return this.#commands;
   }
+  #request(operation) {
+    const request = this.#commands.then(operation);
+    this.#commands = request.then(() => {}, () => {});
+    return request;
+  }
   #viewSource() {
     return {
       current: () => this.#state,
@@ -452,16 +421,33 @@ class RemoteClient {
       return this.#current;
     };
     return {
-      addProject: (path) => this.#command(() => this.#call("addProject", { path })),
+      addProject: (path) => this.#request(() => this.#call("addProject", { path })),
+      listFolders: (path) => this.#request(() => {
+        if (!hostSupportsCall(this.#hostMinor, "listFolders")) {
+          throw new Error("The host is too old for this (needs protocol 5.3); run `pinomad upgrade` on the host");
+        }
+        return this.#call("listFolders", path === undefined ? {} : { path });
+      }),
       removeProject: (path) => this.#command(() => this.#call("removeProject", { path })),
+      renameConversation: (id, title) => this.#request(async () => {
+        if (!hostSupportsCall(this.#hostMinor, "renameConversation")) {
+          throw new Error("The host is too old for this (needs protocol 5.4); run `pinomad upgrade` on the host");
+        }
+        await this.#call("renameConversation", { conversationId: id, title });
+      }),
       createConversation: (home, text, options) => this.#command(async () => {
+        const images = options?.images ?? [];
+        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");
+        }
         const { conversationId: conversationId2 } = await this.#call("createConversation", {
           home,
           text,
           requestId: newRequestId(),
           ...options?.checkout === undefined ? {} : { checkout: options.checkout },
           ...options?.model === undefined ? {} : { model: options.model },
-          ...options?.thinkingLevel === undefined ? {} : { thinkingLevel: options.thinkingLevel }
+          ...options?.thinkingLevel === undefined ? {} : { thinkingLevel: options.thinkingLevel },
+          ...images.length === 0 ? {} : { images }
         });
         await this.#switch(conversationId2);
       }),
@@ -472,7 +458,19 @@ class RemoteClient {
         if (archived && this.#side !== undefined && this.#descendsFrom(this.#side, id))
           await this.#showSide(undefined);
       }),
-      submit: (text, whenBusy, target) => this.#command(() => this.#call("submit", { conversationId: target ?? conversationId(), text, whenBusy, requestId: newRequestId() })),
+      submit: (text, whenBusy, options) => this.#command(() => {
+        const images = options?.images ?? [];
+        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");
+        }
+        return this.#call("submit", {
+          conversationId: options?.target ?? conversationId(),
+          text,
+          whenBusy,
+          requestId: options?.requestId ?? newRequestId(),
+          ...images.length === 0 ? {} : { images }
+        });
+      }),
       compact: (instructions) => this.#command(() => this.#call("compact", { conversationId: conversationId(), ...instructions === undefined ? {} : { instructions } })),
       abort: (target) => {
         const targetConversation = target ?? this.#current;
@@ -511,17 +509,48 @@ class RemoteClient {
         await this.#call("submit", { conversationId: forked, text: prompt, whenBusy: "followUp", requestId: newRequestId() });
       }),
       answer: (kind, requestId, answers, target) => this.#command(() => this.#call("answer", { conversationId: target ?? conversationId(), kind, requestId, answers })),
-      changes: () => {
-        const call = this.#commands.then(() => this.#call("changes", { conversationId: conversationId() }));
-        this.#commands = call.then(() => {}, () => {});
-        return call;
-      },
-      createPairing: () => {
-        const pairing = this.#commands.then(() => this.#call("createPairing", {}));
-        this.#commands = pairing.then(() => {}, () => {});
-        return pairing;
-      },
-      revokeDevice: (publicKey) => this.#command(() => this.#call("revokeDevice", { publicKey }))
+      changes: () => this.#request(() => this.#call("changes", { conversationId: conversationId() })),
+      createPairing: () => this.#request(() => this.#call("createPairing", {})),
+      revokeDevice: (publicKey) => this.#command(() => this.#call("revokeDevice", { publicKey })),
+      logout: (providerId) => this.#command(() => {
+        if (!hostSupportsCall(this.#hostMinor, "logout")) {
+          throw new Error("The host is too old for this (needs protocol 5.1); run `pinomad upgrade` on the host");
+        }
+        return this.#call("logout", { providerId });
+      }),
+      updateSettings: (patch) => this.#command(() => {
+        if (!hostSupportsCall(this.#hostMinor, "updateSettings")) {
+          throw new Error("The host is too old for this (needs protocol 5.2); run `pinomad upgrade` on the host");
+        }
+        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");
+        }
+        return this.#call("updateSettings", { patch });
+      }),
+      createAgent: (role) => this.#request(async () => {
+        if (!hostSupportsCall(this.#hostMinor, "createAgent")) {
+          throw new Error("The host is too old for this (needs protocol 5.6); run `pinomad upgrade` on the host");
+        }
+        await this.#call("createAgent", { role });
+      }),
+      updateAgent: (role) => this.#request(async () => {
+        if (!hostSupportsCall(this.#hostMinor, "updateAgent")) {
+          throw new Error("The host is too old for this (needs protocol 5.6); run `pinomad upgrade` on the host");
+        }
+        await this.#call("updateAgent", { role });
+      }),
+      deleteAgent: (name) => this.#request(async () => {
+        if (!hostSupportsCall(this.#hostMinor, "deleteAgent")) {
+          throw new Error("The host is too old for this (needs protocol 5.6); run `pinomad upgrade` on the host");
+        }
+        await this.#call("deleteAgent", { name });
+      }),
+      setPushToken: (token) => this.#request(async () => {
+        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");
+        }
+        await this.#call("setPushToken", { token });
+      })
     };
   }
   async#switch(id) {

package/dist/chunk-5785kwej.js

@@ -0,0 +1,128 @@
+import {
+  relayWsBase
+} from "./chunk-knaw1a9g.js";
+import {
+  RELAY_CLOSE,
+  decodeRelayToHost,
+  encodeRelayFrame,
+  relayHostId,
+  signRelayChallenge,
+  signRelayChallengeV2,
+  toBase64Url
+} from "./chunk-7gmkgyaz.js";
+
+// apps/host/src/cli/server-ops.ts
+import { WebSocket } from "ws";
+
+// packages/client/src/account.ts
+var fallbackFetch = (url, init) => fetch(url, init);
+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 });
+    if (response.status === 401)
+      return "enabled";
+    if (response.status === 200) {
+      const text = await response.text();
+      let body;
+      try {
+        body = JSON.parse(text);
+      } catch {
+        return "disabled";
+      }
+      return typeof body?.user === "object" && body.user !== null ? "enabled" : "disabled";
+    }
+    return response.status === 404 ? "disabled" : "unreachable";
+  } catch {
+    return "unreachable";
+  } finally {
+    clearTimeout(timer);
+  }
+}
+function isSecureServerOrigin(origin) {
+  let url;
+  try {
+    url = new URL(origin);
+  } catch {
+    return false;
+  }
+  const host = url.hostname;
+  const loopback = host === "localhost" || host.endsWith(".localhost") || host.startsWith("127.") || host === "::1" || host === "[::1]";
+  return url.protocol === "https:" || url.protocol === "http:" && loopback;
+}
+
+// apps/host/src/cli/server-ops.ts
+function assertSecureServerOrigin(origin) {
+  try {
+    new URL(origin);
+  } catch {
+    throw new Error(`not a URL: ${origin}`);
+  }
+  if (isSecureServerOrigin(origin))
+    return;
+  throw new Error(`account operations need an https origin (loopback http allowed for development) — got ${origin}`);
+}
+var probeServerAccounts = (origin, fetchImpl = fetch) => probeAccounts(origin, fetchImpl);
+var closeReason = (code, origin) => {
+  switch (code) {
+    case RELAY_CLOSE.badSignature:
+      return `the server rejected this host's registration signature (${code})`;
+    case RELAY_CLOSE.hostNotAllowed:
+      return `the server does not know this host (${code}) — a pre-accounts server can't do join/leave; upgrade it first`;
+    default:
+      return `the connection to ${origin} closed (${code})`;
+  }
+};
+async function runServerOperation(options) {
+  const origin = options.origin.replace(/\/+$/, "");
+  assertSecureServerOrigin(origin);
+  const hostId = relayHostId(options.signingKey.publicKey);
+  const timeoutMs = options.timeoutMs ?? 1e4;
+  const socket = new WebSocket(`${relayWsBase(origin)}/host`, { handshakeTimeout: timeoutMs });
+  return await new Promise((resolve, reject) => {
+    const finish = (done) => {
+      clearTimeout(timer);
+      socket.close();
+      done();
+    };
+    const timer = setTimeout(() => finish(() => reject(new Error(`no answer from ${origin} within ${timeoutMs / 1000}s`))), timeoutMs);
+    socket.once("error", () => {});
+    socket.once("close", (code) => finish(() => reject(new Error(closeReason(code, origin)))));
+    socket.on("message", (data, isBinary) => {
+      let frame;
+      try {
+        if (isBinary)
+          throw new Error("binary frame");
+        frame = decodeRelayToHost(data.toString());
+      } catch {
+        finish(() => reject(new Error(`${origin} is not speaking the pinomad relay protocol`)));
+        return;
+      }
+      if (frame.t === "challenge") {
+        const noisePublicKey = toBase64Url(options.noisePublicKey);
+        const challenge = { relayOrigin: origin, hostId, nonce: frame.nonce };
+        socket.send(encodeRelayFrame({
+          t: "register",
+          hostId,
+          signature: signRelayChallenge(options.signingKey.secretKey, challenge),
+          signatureV2: signRelayChallengeV2(options.signingKey.secretKey, { ...challenge, noisePublicKey }),
+          noisePublicKey,
+          op: options.op,
+          ...options.joinToken === undefined ? {} : { joinToken: options.joinToken },
+          ...options.name === undefined ? {} : { name: options.name }
+        }));
+        return;
+      }
+      if (frame.t === "registered") {
+        finish(() => reject(new Error(`${origin} ignored the operation — the server is too old for accounts; upgrade it first`)));
+        return;
+      }
+      if (frame.t === "incoming" || frame.t === "pairing-request")
+        return;
+      finish(() => resolve(frame));
+    });
+  });
+}
+
+export { assertSecureServerOrigin, probeServerAccounts, runServerOperation };

package/dist/{chunk-z4x88s0q.js → chunk-7gmkgyaz.js}

@@ -290,6 +290,7 @@ function encodeRelayFrame(frame) {
   return JSON.stringify(frame);
 }
 var isString2 = (value) => typeof value === "string";
+var isBoundedString = (value, max = 64) => isString2(value) && value.length > 0 && value.length <= max;
 function decodeJson2(text) {
   try {
     return JSON.parse(text);
@@ -310,16 +311,71 @@ function decodeRelayToHost(text) {
       if (!isString2(value.connId))
         throw new Error("malformed incoming");
       return { t: "incoming", connId: value.connId };
+    case "pairing-request":
+      if (!isBoundedString(value.requestId))
+        throw new Error("malformed pairing-request");
+      return { t: "pairing-request", requestId: value.requestId };
+    case "joined":
+      if (!isString2(value.username))
+        throw new Error("malformed joined");
+      return { t: "joined", username: value.username };
+    case "left":
+      return { t: "left" };
+    case "refused":
+      if (!isString2(value.reason))
+        throw new Error("malformed refused");
+      return { t: "refused", reason: value.reason };
     default:
       throw new Error("unknown relay frame");
   }
 }
 function decodeHostToRelay(text) {
   const value = decodeJson2(text);
-  if (value?.t !== "register" || !isString2(value.hostId) || !isString2(value.signature)) {
+  switch (value?.t) {
+    case "register":
+      return decodeRegister(value);
+    case "pairing":
+      if (!isBoundedString(value.requestId) || !isBoundedString(value.secret) || typeof value.expiresAt !== "number" || !Number.isFinite(value.expiresAt)) {
+        throw new Error("malformed pairing");
+      }
+      return { t: "pairing", requestId: value.requestId, secret: value.secret, expiresAt: value.expiresAt };
+    case "pairing-refused":
+      if (!isBoundedString(value.requestId) || !isBoundedString(value.reason)) {
+        throw new Error("malformed pairing-refused");
+      }
+      return { t: "pairing-refused", requestId: value.requestId, reason: value.reason };
+    default:
+      throw new Error("unknown host frame");
+  }
+}
+function decodeRegister(value) {
+  if (value.t !== "register" || !isString2(value.hostId) || !isString2(value.signature)) {
+    throw new Error("malformed register");
+  }
+  if (value.op !== undefined && value.op !== "join" && value.op !== "leave")
+    throw new Error("malformed register");
+  if (value.signatureV2 !== undefined && !isString2(value.signatureV2))
+    throw new Error("malformed register");
+  if (value.noisePublicKey !== undefined && !isString2(value.noisePublicKey))
+    throw new Error("malformed register");
+  if (value.joinToken !== undefined && !isString2(value.joinToken))
+    throw new Error("malformed register");
+  if (value.name !== undefined && !isString2(value.name))
+    throw new Error("malformed register");
+  if (value.features !== undefined && (!Array.isArray(value.features) || value.features.length > 16 || !value.features.every((feature) => isString2(feature) && feature.length <= 64))) {
     throw new Error("malformed register");
   }
-  return { t: "register", hostId: value.hostId, signature: value.signature };
+  return {
+    t: "register",
+    hostId: value.hostId,
+    signature: value.signature,
+    ...value.signatureV2 === undefined ? {} : { signatureV2: value.signatureV2 },
+    ...value.noisePublicKey === undefined ? {} : { noisePublicKey: value.noisePublicKey },
+    ...value.op === undefined ? {} : { op: value.op },
+    ...value.joinToken === undefined ? {} : { joinToken: value.joinToken },
+    ...value.name === undefined ? {} : { name: value.name },
+    ...value.features === undefined ? {} : { features: value.features }
+  };
 }
 function relayHostId(publicKey) {
   if (publicKey.length !== 32)
@@ -343,5 +399,22 @@ function verifyRelayChallenge(signature, args) {
     return false;
   }
 }
+function relayChallengeMessageV2(args) {
+  return utf82.encode(`pinomad-relay/2
+${args.relayOrigin}
+${args.hostId}
+${args.nonce}
+${args.noisePublicKey}`);
+}
+function signRelayChallengeV2(secretKey, args) {
+  return toBase64Url(ed25519.sign(relayChallengeMessageV2(args), secretKey));
+}
+function verifyRelayChallengeV2(signature, args) {
+  try {
+    return ed25519.verify(fromBase64Url(signature), relayChallengeMessageV2(args), fromBase64Url(args.hostId));
+  } catch {
+    return false;
+  }
+}
 
-export { generateKeyPair, keyPairFromPrivate, respondIK, SECURE_PROLOGUE, encodeHostHello, decodeClientHello, toBase64Url, fromBase64Url, SecureSession, RELAY_CLOSE, encodeRelayFrame, decodeRelayToHost, decodeHostToRelay, relayHostId, signRelayChallenge, verifyRelayChallenge };
+export { generateKeyPair, keyPairFromPrivate, respondIK, SECURE_PROLOGUE, encodeHostHello, decodeClientHello, toBase64Url, fromBase64Url, SecureSession, RELAY_CLOSE, encodeRelayFrame, decodeRelayToHost, decodeHostToRelay, relayHostId, signRelayChallenge, verifyRelayChallenge, signRelayChallengeV2, verifyRelayChallengeV2 };