claudemesh-cli 1.0.0-alpha.41 → 1.0.0-alpha.43

package/dist/entrypoints/mcp.js

@@ -1317,6 +1317,7 @@ class BrokerClient {
     return this._serviceCatalog;
   }
   closed = false;
+  terminalClose = null;
   reconnectAttempt = 0;
   helloTimer = null;
   reconnectTimer = null;
@@ -1444,12 +1445,22 @@ class BrokerClient {
         }
         this.handleServerMessage(msg);
       };
-      const onClose = () => {
+      const onClose = (code, reasonBuf) => {
         if (this.helloTimer)
           clearTimeout(this.helloTimer);
         this.helloTimer = null;
         if (this.ws === ws)
           this.ws = null;
+        const reason = reasonBuf?.toString("utf-8") ?? "";
+        if (code === 4001 || code === 4002) {
+          this.closed = true;
+          this.setConnStatus("closed");
+          this.terminalClose = { code, reason };
+          if (this._status !== "open") {
+            reject(new Error(`ws terminal close ${code}: ${reason || "session ended"}`));
+          }
+          return;
+        }
         if (this._status !== "open" && this._status !== "reconnecting") {
           reject(new Error("ws closed before hello_ack"));
         }
@@ -3132,6 +3143,9 @@ class BrokerClient {
     }
     if (msg.type === "error") {
       this.debug(`broker error: ${msg.code} ${msg.message}`);
+      if (msg.code === "revoked") {
+        this.terminalClose = { code: 4002, reason: String(msg.message ?? "revoked") };
+      }
       const id = msg.id ? String(msg.id) : null;
       let handledByPendingSend = false;
       if (id) {
@@ -3372,6 +3386,25 @@ async function withMesh(opts, fn) {
     await client.connect();
     const result = await fn(client, mesh);
     return result;
+  } catch (e) {
+    if (client.terminalClose) {
+      const { code, reason } = client.terminalClose;
+      if (code === 4002) {
+        console.error(`
+  ✘ ${reason}
+`);
+      } else if (code === 4001) {
+        console.error(`
+  ✘ Kicked from this mesh. Run \`claudemesh\` to rejoin.
+`);
+      } else {
+        console.error(`
+  ✘ Broker closed connection: ${reason}
+`);
+      }
+      process.exit(1);
+    }
+    throw e;
   } finally {
     client.close();
   }
@@ -3525,7 +3558,7 @@ __export(exports_urls, {
   VERSION: () => VERSION,
   URLS: () => URLS
 });
-var URLS, VERSION = "1.0.0-alpha.41", env;
+var URLS, VERSION = "1.0.0-alpha.43", env;
 var init_urls = __esm(() => {
   URLS = {
     BROKER: process.env.CLAUDEMESH_BROKER_URL ?? "wss://ic.claudemesh.com/ws",
@@ -4442,7 +4475,7 @@ async function resolveClient(to) {
       target = rest;
     }
   }
-  if (/^[0-9a-f]{64}$/.test(target) || target.startsWith("#") || target.startsWith("@") || target === "*") {
+  if (target.startsWith("#") || target.startsWith("@") || target === "*") {
     if (targetClients.length === 1) {
       return { client: targetClients[0], targetSpec: target };
     }
@@ -4452,21 +4485,95 @@ async function resolveClient(to) {
       error: `multiple meshes joined; prefix target with "<mesh-slug>:" (joined: ${clients2.map((c) => c.meshSlug).join(", ")})`
     };
   }
+  if (/^[0-9a-f]{8,64}$/.test(target)) {
+    const hits = [];
+    for (const c of targetClients) {
+      const peers = await c.listPeers();
+      for (const p of peers) {
+        if (p.pubkey.startsWith(target)) {
+          hits.push({ mesh: c, pubkey: p.pubkey, displayName: p.displayName });
+        }
+      }
+    }
+    if (hits.length === 1) {
+      return { client: hits[0].mesh, targetSpec: hits[0].pubkey };
+    }
+    if (hits.length > 1) {
+      const lines = hits.map((h) => `  - ${h.displayName} @ ${h.mesh.meshSlug} · pubkey ${h.pubkey.slice(0, 20)}…`).join(`
+`);
+      return {
+        client: null,
+        targetSpec: target,
+        error: `ambiguous pubkey prefix "${target}" matches ${hits.length} peers:
+${lines}
+Use a longer prefix.`
+      };
+    }
+    if (target.length === 64) {
+      if (targetClients.length === 1) {
+        return { client: targetClients[0], targetSpec: target };
+      }
+      return {
+        client: null,
+        targetSpec: target,
+        error: `multiple meshes joined; prefix target with "<mesh-slug>:" (joined: ${clients2.map((c) => c.meshSlug).join(", ")})`
+      };
+    }
+    return {
+      client: null,
+      targetSpec: target,
+      error: `no online peer's pubkey starts with "${target}".`
+    };
+  }
   const nameLower = target.toLowerCase();
   const candidates = [];
+  const exactMatches = [];
+  const partialMatches = [];
   for (const c of targetClients) {
+    const ownSession = c.getSessionPubkey();
     const peers = await c.listPeers();
     candidates.push({ mesh: c.meshSlug, peers });
-    const match = peers.find((p) => p.displayName.toLowerCase() === nameLower);
-    if (match)
-      return { client: c, targetSpec: match.pubkey };
-    const partials = peers.filter((p) => p.displayName.toLowerCase().includes(nameLower));
-    if (partials.length === 1) {
-      process.stderr.write(`[claudemesh] resolved "${target}" → "${partials[0].displayName}" (partial match)
-`);
-      return { client: c, targetSpec: partials[0].pubkey };
+    for (const p of peers) {
+      if (ownSession && p.pubkey === ownSession)
+        continue;
+      const nameLow = p.displayName.toLowerCase();
+      if (nameLow === nameLower) {
+        exactMatches.push({ mesh: c, pubkey: p.pubkey, displayName: p.displayName, cwd: p.cwd });
+      } else if (nameLow.includes(nameLower)) {
+        partialMatches.push({ mesh: c, pubkey: p.pubkey, displayName: p.displayName, cwd: p.cwd });
+      }
     }
   }
+  if (exactMatches.length === 1) {
+    return { client: exactMatches[0].mesh, targetSpec: exactMatches[0].pubkey };
+  }
+  if (exactMatches.length > 1) {
+    const lines = exactMatches.map((m) => `  - ${m.displayName} · pubkey ${m.pubkey.slice(0, 16)}…${m.cwd ? ` · cwd ${m.cwd}` : ""}`).join(`
+`);
+    return {
+      client: null,
+      targetSpec: target,
+      error: `"${target}" is ambiguous — ${exactMatches.length} peers share that display name:
+${lines}
+` + `Disambiguate by pubkey prefix (e.g. send to "${exactMatches[0].pubkey.slice(0, 12)}…").`
+    };
+  }
+  if (partialMatches.length === 1) {
+    process.stderr.write(`[claudemesh] resolved "${target}" → "${partialMatches[0].displayName}" (partial match)
+`);
+    return { client: partialMatches[0].mesh, targetSpec: partialMatches[0].pubkey };
+  }
+  if (partialMatches.length > 1) {
+    const lines = partialMatches.map((m) => `  - ${m.displayName} · pubkey ${m.pubkey.slice(0, 16)}…`).join(`
+`);
+    return {
+      client: null,
+      targetSpec: target,
+      error: `"${target}" partially matches ${partialMatches.length} peers:
+${lines}
+Be more specific, or use a pubkey prefix.`
+    };
+  }
   const known = candidates.flatMap((c) => c.peers.map((p) => `${c.mesh}/${p.displayName}`));
   return {
     client: null,
@@ -4849,7 +4956,7 @@ No peers connected.`);
               const hiddenTag = p.visible === false ? " [hidden]" : "";
               const sameKeyCount = pubkeyCounts.get(p.pubkey) ?? 1;
               const sameKeyTag = sameKeyCount > 1 ? ` [shares key with ${sameKeyCount - 1} other session(s)]` : "";
-              return `- ${profileAvatar}**${p.displayName}**${profileTitle} [${p.status}]${localityTag}${hiddenTag}${sameKeyTag}${groupsStr}${metaStr} (${p.pubkey.slice(0, 12)}…)${cwdStr}${summary}`;
+              return `- ${profileAvatar}**${p.displayName}**${profileTitle} [${p.status}]${localityTag}${hiddenTag}${sameKeyTag}${groupsStr}${metaStr} (pubkey: ${p.pubkey.slice(0, 16)}…)${cwdStr}${summary}`;
             });
             sections.push(`${header}
 ${peerLines.join(`
@@ -6559,4 +6666,4 @@ startMcpServer().catch((err) => {
   process.exit(1);
 });
 
-//# debugId=384C31621EECEF0164756E2164756E21
+//# debugId=BEB2D087B169664064756E2164756E21