claudemesh-cli 1.0.0-alpha.35 → 1.0.0-alpha.37

package/dist/entrypoints/cli.js

@@ -88,7 +88,7 @@ __export(exports_urls, {
   VERSION: () => VERSION,
   URLS: () => URLS
 });
-var URLS, VERSION = "1.0.0-alpha.35", env;
+var URLS, VERSION = "1.0.0-alpha.37", 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;
@@ -2276,6 +2277,22 @@ class BrokerClient {
       return;
     this.ws.send(JSON.stringify(payload));
   }
+  async sendAndWait(payload, timeoutMs = 1e4) {
+    const reqId = `rw-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`;
+    return new Promise((resolve, reject) => {
+      const timer = setTimeout(() => {
+        this.genericResolvers.delete(reqId);
+        reject(new Error("sendAndWait timeout"));
+      }, timeoutMs);
+      this.genericResolvers.set(reqId, (msg) => {
+        clearTimeout(timer);
+        this.genericResolvers.delete(reqId);
+        resolve(msg);
+      });
+      this.sendRaw({ ...payload, _reqId: reqId });
+    });
+  }
+  genericResolvers = new Map;
   close() {
     this.closed = true;
     this.stopStatsReporting();
@@ -2476,6 +2493,11 @@ class BrokerClient {
   }
   handleServerMessage(msg) {
     const msgReqId = msg._reqId;
+    if (msgReqId && this.genericResolvers.has(msgReqId)) {
+      const resolve = this.genericResolvers.get(msgReqId);
+      resolve(msg);
+      return;
+    }
     if (msg.type === "ack") {
       const pending = this.pendingSends.get(String(msg.id ?? ""));
       if (pending) {
@@ -2496,7 +2518,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;
@@ -2573,7 +2595,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") {
@@ -3019,11 +3043,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) => {
@@ -4108,19 +4138,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,
@@ -4262,18 +4286,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;
@@ -4441,9 +4459,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, {
@@ -4672,18 +4696,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));
@@ -6140,6 +6158,149 @@ var init_connect = __esm(() => {
   init_facade();
 });
 
+// src/commands/kick.ts
+var exports_kick = {};
+__export(exports_kick, {
+  runKick: () => runKick
+});
+function parseStaleMs(input) {
+  const m = input.match(/^(\d+)(s|m|h)$/);
+  if (!m)
+    return null;
+  const val = parseInt(m[1], 10);
+  const unit = m[2];
+  if (unit === "s")
+    return val * 1000;
+  if (unit === "m")
+    return val * 60000;
+  if (unit === "h")
+    return val * 3600000;
+  return null;
+}
+async function runKick(target, opts = {}) {
+  const config = readConfig();
+  const meshSlug = opts.mesh ?? config.meshes[0]?.slug;
+  if (!meshSlug) {
+    render.err("No mesh joined.");
+    return EXIT.NOT_FOUND;
+  }
+  return await withMesh({ meshSlug }, async (client) => {
+    let payload;
+    if (opts.all) {
+      payload = { type: "kick", all: true };
+    } else if (opts.stale) {
+      const ms = parseStaleMs(opts.stale);
+      if (!ms) {
+        render.err(`Invalid stale duration: "${opts.stale}". Use e.g. 30m, 1h, 300s.`);
+        return EXIT.INVALID_ARGS;
+      }
+      payload = { type: "kick", stale: ms };
+    } else if (target) {
+      payload = { type: "kick", target };
+    } else {
+      render.err("Usage: claudemesh kick <peer> | --stale 30m | --all");
+      return EXIT.INVALID_ARGS;
+    }
+    const result = await client.sendAndWait(payload);
+    const kicked = result?.kicked ?? [];
+    if (kicked.length === 0) {
+      render.info("No peers matched.");
+    } else {
+      render.ok(`Kicked ${kicked.length} peer(s): ${kicked.join(", ")}`);
+    }
+    return EXIT.SUCCESS;
+  });
+}
+var init_kick = __esm(() => {
+  init_connect();
+  init_facade();
+  init_render();
+  init_exit_codes();
+});
+
+// src/commands/ban.ts
+var exports_ban = {};
+__export(exports_ban, {
+  runUnban: () => runUnban,
+  runBans: () => runBans,
+  runBan: () => runBan
+});
+async function runBan(target, opts = {}) {
+  if (!target) {
+    render.err("Usage: claudemesh ban <peer-name-or-pubkey>");
+    return EXIT.INVALID_ARGS;
+  }
+  const config = readConfig();
+  const meshSlug = opts.mesh ?? config.meshes[0]?.slug;
+  if (!meshSlug) {
+    render.err("No mesh joined.");
+    return EXIT.NOT_FOUND;
+  }
+  return await withMesh({ meshSlug }, async (client) => {
+    const result = await client.sendAndWait({ type: "ban", target });
+    if (result?.banned) {
+      render.ok(`Banned ${result.banned} from ${meshSlug}. They cannot reconnect until unbanned.`);
+      render.hint(`Undo: claudemesh unban ${result.banned} --mesh ${meshSlug}`);
+    } else {
+      render.err(result?.error ?? "ban failed");
+    }
+    return result?.banned ? EXIT.SUCCESS : EXIT.INTERNAL_ERROR;
+  });
+}
+async function runUnban(target, opts = {}) {
+  if (!target) {
+    render.err("Usage: claudemesh unban <peer-name-or-pubkey>");
+    return EXIT.INVALID_ARGS;
+  }
+  const config = readConfig();
+  const meshSlug = opts.mesh ?? config.meshes[0]?.slug;
+  if (!meshSlug) {
+    render.err("No mesh joined.");
+    return EXIT.NOT_FOUND;
+  }
+  return await withMesh({ meshSlug }, async (client) => {
+    const result = await client.sendAndWait({ type: "unban", target });
+    if (result?.unbanned) {
+      render.ok(`Unbanned ${result.unbanned} from ${meshSlug}. They can rejoin.`);
+    } else {
+      render.err(result?.error ?? "unban failed");
+    }
+    return result?.unbanned ? EXIT.SUCCESS : EXIT.INTERNAL_ERROR;
+  });
+}
+async function runBans(opts = {}) {
+  const config = readConfig();
+  const meshSlug = opts.mesh ?? config.meshes[0]?.slug;
+  if (!meshSlug) {
+    render.err("No mesh joined.");
+    return EXIT.NOT_FOUND;
+  }
+  return await withMesh({ meshSlug }, async (client) => {
+    const result = await client.sendAndWait({ type: "list_bans" });
+    const bans = result?.bans ?? [];
+    if (opts.json) {
+      process.stdout.write(JSON.stringify(bans, null, 2) + `
+`);
+      return EXIT.SUCCESS;
+    }
+    if (bans.length === 0) {
+      render.info("No banned members.");
+      return EXIT.SUCCESS;
+    }
+    render.section(`banned members on ${meshSlug}`);
+    for (const b of bans) {
+      render.kv([[b.name, `${b.pubkey.slice(0, 16)}… · banned ${new Date(b.revokedAt).toLocaleDateString()}`]]);
+    }
+    return EXIT.SUCCESS;
+  });
+}
+var init_ban = __esm(() => {
+  init_connect();
+  init_facade();
+  init_render();
+  init_exit_codes();
+});
+
 // src/commands/peers.ts
 var exports_peers = {};
 __export(exports_peers, {
@@ -8611,21 +8772,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}`);
@@ -8654,8 +8807,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) {
@@ -12164,6 +12320,12 @@ Mesh
   claudemesh delete [slug]         delete a mesh (alias: rm)
   claudemesh rename <slug> <name>  rename a mesh
   claudemesh share [email]         share mesh (invite link / send email)
+  claudemesh kick <peer>           disconnect a peer (can reconnect)
+  claudemesh kick --stale 30m      disconnect idle peers (> duration)
+  claudemesh kick --all            disconnect everyone except you
+  claudemesh ban <peer>            kick + permanently revoke (can't rejoin)
+  claudemesh unban <peer>          lift a ban
+  claudemesh bans                  list banned members
 
 Messaging
   claudemesh peers                 see who's online
@@ -12302,6 +12464,26 @@ async function main() {
       process.exit(await invite2(positionals[0], { mesh: flags.mesh, json: !!flags.json }));
       break;
     }
+    case "kick": {
+      const { runKick: runKick2 } = await Promise.resolve().then(() => (init_kick(), exports_kick));
+      process.exit(await runKick2(positionals[0], { mesh: flags.mesh, stale: flags.stale, all: !!flags.all }));
+      break;
+    }
+    case "ban": {
+      const { runBan: runBan2 } = await Promise.resolve().then(() => (init_ban(), exports_ban));
+      process.exit(await runBan2(positionals[0], { mesh: flags.mesh }));
+      break;
+    }
+    case "unban": {
+      const { runUnban: runUnban2 } = await Promise.resolve().then(() => (init_ban(), exports_ban));
+      process.exit(await runUnban2(positionals[0], { mesh: flags.mesh }));
+      break;
+    }
+    case "bans": {
+      const { runBans: runBans2 } = await Promise.resolve().then(() => (init_ban(), exports_ban));
+      process.exit(await runBans2({ mesh: flags.mesh, json: !!flags.json }));
+      break;
+    }
     case "peers": {
       const { runPeers: runPeers2 } = await Promise.resolve().then(() => (init_peers(), exports_peers));
       await runPeers2({ mesh: flags.mesh, json: !!flags.json });
@@ -12489,4 +12671,4 @@ main().catch((err) => {
   process.exit(EXIT.INTERNAL_ERROR);
 });
 
-//# debugId=5BA2A4C8E9E8C67464756E2164756E21
+//# debugId=95D625F3B4CFD9EA64756E2164756E21