claudemesh-cli 1.0.0-alpha.34 → 1.0.0-alpha.36

package/dist/entrypoints/cli.js

@@ -88,7 +88,7 @@ __export(exports_urls, {
   VERSION: () => VERSION,
   URLS: () => URLS
 });
-var URLS, VERSION = "1.0.0-alpha.34", env;
+var URLS, VERSION = "1.0.0-alpha.36", env;
 var init_urls = __esm(() => {
   URLS = {
     BROKER: process.env.CLAUDEMESH_BROKER_URL ?? "wss://ic.claudemesh.com/ws",
@@ -1132,6 +1132,7 @@ class BrokerClient {
   outbound = [];
   pushHandlers = new Set;
   pushBuffer = [];
+  pushChain = Promise.resolve();
   listPeersResolvers = new Map;
   stateResolvers = new Map;
   stateListResolvers = new Map;
@@ -2479,10 +2480,9 @@ class BrokerClient {
     if (msg.type === "ack") {
       const pending = this.pendingSends.get(String(msg.id ?? ""));
       if (pending) {
-        pending.resolve({
-          ok: true,
-          messageId: String(msg.messageId ?? "")
-        });
+        const queued = msg.queued !== false;
+        const errStr = typeof msg.error === "string" ? msg.error : undefined;
+        pending.resolve(queued ? { ok: true, messageId: String(msg.messageId ?? "") } : { ok: false, error: errStr ?? "broker rejected send" });
         this.pendingSends.delete(pending.id);
       }
       return;
@@ -2497,7 +2497,7 @@ class BrokerClient {
       const nonce = String(msg.nonce ?? "");
       const ciphertext = String(msg.ciphertext ?? "");
       const senderPubkey = String(msg.senderPubkey ?? "");
-      (async () => {
+      this.pushChain = this.pushChain.then(async () => {
         const isSystem = msg.subtype === "system" || senderPubkey === "system";
         const kind = isSystem ? "broadcast" : senderPubkey ? "direct" : "unknown";
         let plaintext = null;
@@ -2574,7 +2574,9 @@ class BrokerClient {
             h(push);
           } catch {}
         }
-      })();
+      }).catch((e) => {
+        this.debug(`push handler chain error: ${e instanceof Error ? e.message : e}`);
+      });
       return;
     }
     if (msg.type === "state_result") {
@@ -3020,11 +3022,17 @@ class BrokerClient {
       send();
   }
   scheduleReconnect() {
+    if (this.reconnectTimer) {
+      this.debug("reconnect already scheduled — skipping");
+      return;
+    }
     this.setConnStatus("reconnecting");
-    const delay = BACKOFF_CAPS[Math.min(this.reconnectAttempt, BACKOFF_CAPS.length - 1)];
+    const base = BACKOFF_CAPS[Math.min(this.reconnectAttempt, BACKOFF_CAPS.length - 1)];
+    const delay = Math.floor(Math.random() * base);
     this.reconnectAttempt += 1;
-    this.debug(`reconnect in ${delay}ms (attempt ${this.reconnectAttempt})`);
+    this.debug(`reconnect in ${delay}ms (attempt ${this.reconnectAttempt}, base ${base}ms)`);
     this.reconnectTimer = setTimeout(() => {
+      this.reconnectTimer = null;
       if (this.closed)
         return;
       this.connect().catch((e) => {
@@ -4109,19 +4117,13 @@ async function createMesh2(name, opts) {
   const auth = getStoredToken();
   if (!auth)
     throw new Error("Not signed in");
-  let userId = "";
-  try {
-    const payload = JSON.parse(Buffer.from(auth.session_token.split(".")[1], "base64url").toString());
-    userId = payload.sub ?? "";
-  } catch {}
-  if (!userId)
-    throw new Error("Invalid token — run `claudemesh login` again");
   const kp = await generateKeypair3();
   const result = await request({
     path: "/cli/mesh/create",
     method: "POST",
-    body: { user_id: userId, name, pubkey: kp.publicKey, ...opts },
-    baseUrl: BROKER_HTTP2
+    body: { name, pubkey: kp.publicKey, ...opts },
+    baseUrl: BROKER_HTTP2,
+    token: auth.session_token
   });
   const mesh = {
     meshId: result.id,
@@ -4263,18 +4265,12 @@ async function generateInvite(meshSlug, opts) {
   const auth = getStoredToken();
   if (!auth)
     throw new Error("Not signed in");
-  let userId = "";
-  try {
-    const payload = JSON.parse(Buffer.from(auth.session_token.split(".")[1], "base64url").toString());
-    userId = payload.sub ?? "";
-  } catch {}
-  if (!userId)
-    throw new Error("Invalid token");
   return request({
     path: `/cli/mesh/${meshSlug}/invite`,
     method: "POST",
-    body: { user_id: userId, email: opts?.email, role: opts?.role },
-    baseUrl: BROKER_HTTP3
+    body: { email: opts?.email, role: opts?.role },
+    baseUrl: BROKER_HTTP3,
+    token: auth.session_token
   });
 }
 var BROKER_HTTP3;
@@ -4442,9 +4438,15 @@ async function claimInviteV2(opts) {
   const s = await ensureSodium2();
   const { publicKeyB64, secretKey } = await generateX25519Keypair();
   const publicKeyBytes = s.from_base64(publicKeyB64, s.base64_variants.URLSAFE_NO_PADDING);
-  const base = opts.appBaseUrl.replace(/\/$/, "");
   const code = encodeURIComponent(opts.code);
-  const url = `${base}/api/public/invites/${code}/claim`;
+  const override = process.env.CLAUDEMESH_CLAIM_URL;
+  let url;
+  if (override) {
+    url = override.replace(/\{code\}/g, code);
+  } else {
+    const brokerBase = process.env.CLAUDEMESH_BROKER_HTTP ?? "https://ic.claudemesh.com";
+    url = `${brokerBase.replace(/\/$/, "")}/invites/${code}/claim`;
+  }
   let res;
   try {
     res = await fetch(url, {
@@ -4673,18 +4675,12 @@ async function runList() {
   let serverMeshes = [];
   if (auth) {
     try {
-      let userId = "";
-      try {
-        const payload = JSON.parse(Buffer.from(auth.session_token.split(".")[1], "base64url").toString());
-        userId = payload.sub ?? "";
-      } catch {}
-      if (userId) {
-        const res = await request({
-          path: `/cli/meshes?user_id=${userId}`,
-          baseUrl: BROKER_HTTP4
-        });
-        serverMeshes = res.meshes ?? [];
-      }
+      const res = await request({
+        path: `/cli/meshes`,
+        baseUrl: BROKER_HTTP4,
+        token: auth.session_token
+      });
+      serverMeshes = res.meshes ?? [];
     } catch {}
   }
   const localSlugs = new Set(config.meshes.map((m) => m.slug));
@@ -8612,21 +8608,13 @@ async function syncToBroker(meshSlug, grants) {
   const auth = getStoredToken();
   if (!auth)
     return;
-  let userId = "";
-  try {
-    const payload = JSON.parse(Buffer.from(auth.session_token.split(".")[1], "base64url").toString());
-    userId = payload.sub ?? "";
-  } catch {
-    return;
-  }
-  if (!userId)
-    return;
   try {
     await request({
       path: `/cli/mesh/${meshSlug}/grants`,
       method: "POST",
-      body: { user_id: userId, grants },
-      baseUrl: BROKER_HTTP7
+      body: { grants },
+      baseUrl: BROKER_HTTP7,
+      token: auth.session_token
     });
   } catch (e) {
     render.warn(`broker grant sync failed — client filter still active: ${e instanceof Error ? e.message : e}`);
@@ -8655,8 +8643,11 @@ function resolveCaps(input) {
 async function resolvePeer(meshSlug, name) {
   return await withMesh({ meshSlug }, async (client) => {
     const peers = await client.listPeers();
-    const match = peers.find((p) => p.displayName === name || p.pubkey === name || p.pubkey.startsWith(name));
-    return match ? { displayName: match.displayName, pubkey: match.pubkey } : null;
+    const match = peers.find((p) => p.displayName === name || p.pubkey === name || p.pubkey.startsWith(name) || p.memberPubkey === name || p.memberPubkey && p.memberPubkey.startsWith(name));
+    if (!match)
+      return null;
+    const key = match.memberPubkey ?? match.pubkey;
+    return { displayName: match.displayName, pubkey: key };
   });
 }
 function pickMesh2(slug) {
@@ -12490,4 +12481,4 @@ main().catch((err) => {
   process.exit(EXIT.INTERNAL_ERROR);
 });
 
-//# debugId=9FBBACA39D70481964756E2164756E21
+//# debugId=7F65AA4EF7F0222264756E2164756E21