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

package/dist/entrypoints/mcp.js

@@ -1299,6 +1299,7 @@ class BrokerClient {
   outbound = [];
   pushHandlers = new Set;
   pushBuffer = [];
+  pushChain = Promise.resolve();
   listPeersResolvers = new Map;
   stateResolvers = new Map;
   stateListResolvers = new Map;
@@ -2646,10 +2647,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;
@@ -2664,7 +2664,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;
@@ -2741,7 +2741,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") {
@@ -3187,11 +3189,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) => {
@@ -3494,7 +3502,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",
@@ -4174,21 +4182,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_HTTP2
+      body: { grants },
+      baseUrl: BROKER_HTTP2,
+      token: auth.session_token
     });
   } catch (e) {
     render.warn(`broker grant sync failed — client filter still active: ${e instanceof Error ? e.message : e}`);
@@ -4217,8 +4217,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) {
@@ -6533,4 +6536,4 @@ startMcpServer().catch((err) => {
   process.exit(1);
 });
 
-//# debugId=8F33C4D68058778464756E2164756E21
+//# debugId=F940F8787F28151764756E2164756E21