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

package/dist/entrypoints/cli.js

@@ -88,7 +88,7 @@ __export(exports_urls, {
   VERSION: () => VERSION,
   URLS: () => URLS
 });
-var URLS, VERSION = "1.0.0-alpha.32", env;
+var URLS, VERSION = "1.0.0-alpha.34", env;
 var init_urls = __esm(() => {
   URLS = {
     BROKER: process.env.CLAUDEMESH_BROKER_URL ?? "wss://ic.claudemesh.com/ws",
@@ -2522,7 +2522,13 @@ class BrokerClient {
             plaintext = `[${event}]`;
           }
         } else if (senderPubkey && nonce && ciphertext) {
-          plaintext = await decryptDirect({ nonce, ciphertext }, senderPubkey, this.sessionSecretKey ?? this.mesh.secretKey);
+          const envelope = { nonce, ciphertext };
+          if (this.sessionSecretKey) {
+            plaintext = await decryptDirect(envelope, senderPubkey, this.sessionSecretKey);
+          }
+          if (plaintext === null) {
+            plaintext = await decryptDirect(envelope, senderPubkey, this.mesh.secretKey);
+          }
         }
         if (plaintext === null && ciphertext && !senderPubkey) {
           try {
@@ -9782,8 +9788,10 @@ async function resolveClient(to) {
     };
   }
   const nameLower = target.toLowerCase();
+  const candidates = [];
   for (const c of targetClients) {
     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 };
@@ -9794,13 +9802,11 @@ async function resolveClient(to) {
       return { client: c, targetSpec: partials[0].pubkey };
     }
   }
-  if (targetClients.length === 1) {
-    return { client: targetClients[0], targetSpec: target };
-  }
+  const known = candidates.flatMap((c) => c.peers.map((p) => `${c.mesh}/${p.displayName}`));
   return {
     client: null,
     targetSpec: target,
-    error: `peer "${target}" not found in any mesh (joined: ${clients2.map((c) => c.meshSlug).join(", ")})`
+    error: `peer "${target}" not found. ` + (known.length ? `Known peers: ${known.slice(0, 10).join(", ")}${known.length > 10 ? ", …" : ""}` : "No connected peers on your mesh(es). Use pubkey hex, @group, or * for broadcast.")
   };
 }
 async function resolvePeerName(client, pubkey) {
@@ -10156,6 +10162,9 @@ ${manifest.allowed_tools.map((t) => `  - ${t}`).join(`
             sections.push(`${header}
 No peers connected.`);
           } else {
+            const pubkeyCounts = new Map;
+            for (const p of peers)
+              pubkeyCounts.set(p.pubkey, (pubkeyCounts.get(p.pubkey) ?? 0) + 1);
             const peerLines = peers.map((p) => {
               const summary = p.summary ? ` — "${p.summary}"` : "";
               const groupsStr = p.groups?.length ? ` [${p.groups.map((g) => `@${g.name}${g.role ? ":" + g.role : ""}`).join(", ")}]` : "";
@@ -10173,7 +10182,9 @@ No peers connected.`);
               const profileAvatar = p.profile?.avatar ? `${p.profile.avatar} ` : "";
               const profileTitle = p.profile?.title ? ` (${p.profile.title})` : "";
               const hiddenTag = p.visible === false ? " [hidden]" : "";
-              return `- ${profileAvatar}**${p.displayName}**${profileTitle} [${p.status}]${localityTag}${hiddenTag}${groupsStr}${metaStr} (${p.pubkey.slice(0, 12)}…)${cwdStr}${summary}`;
+              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}`;
             });
             sections.push(`${header}
 ${peerLines.join(`
@@ -12479,4 +12490,4 @@ main().catch((err) => {
   process.exit(EXIT.INTERNAL_ERROR);
 });
 
-//# debugId=E80C818349D554BA64756E2164756E21
+//# debugId=9FBBACA39D70481964756E2164756E21