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

package/dist/entrypoints/cli.js

@@ -88,7 +88,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",
@@ -1150,6 +1150,7 @@ class BrokerClient {
     return this._serviceCatalog;
   }
   closed = false;
+  terminalClose = null;
   reconnectAttempt = 0;
   helloTimer = null;
   reconnectTimer = null;
@@ -1277,12 +1278,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"));
         }
@@ -2965,6 +2976,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) {
@@ -6164,6 +6178,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();
   }
@@ -6176,7 +6209,8 @@ var init_connect = __esm(() => {
 // src/commands/kick.ts
 var exports_kick = {};
 __export(exports_kick, {
-  runKick: () => runKick
+  runKick: () => runKick,
+  runDisconnect: () => runDisconnect
 });
 function parseStaleMs(input) {
   const m = input.match(/^(\d+)(s|m|h)$/);
@@ -6192,36 +6226,63 @@ function parseStaleMs(input) {
     return val * 3600000;
   return null;
 }
-async function runKick(target, opts = {}) {
+function buildPayload(kind, target, opts) {
+  if (opts.all)
+    return { type: kind, all: true };
+  if (opts.stale) {
+    const ms = parseStaleMs(opts.stale);
+    if (!ms)
+      return { error: `Invalid stale duration: "${opts.stale}". Use e.g. 30m, 1h, 300s.` };
+    return { type: kind, stale: ms };
+  }
+  if (target)
+    return { type: kind, target };
+  return { error: `Usage: claudemesh ${kind} <peer> | --stale 30m | --all` };
+}
+async function runDisconnect(target, opts = {}) {
   const config = readConfig();
   const meshSlug = opts.mesh ?? config.meshes[0]?.slug;
   if (!meshSlug) {
     render.err("No mesh joined.");
     return EXIT.NOT_FOUND;
   }
+  const built = buildPayload("disconnect", target, opts);
+  if ("error" in built) {
+    render.err(String(built.error));
+    return EXIT.INVALID_ARGS;
+  }
   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(built);
+    const peers = result?.affected ?? result?.kicked ?? [];
+    if (peers.length === 0)
+      render.info("No peers matched.");
+    else {
+      render.ok(`Disconnected ${peers.length} peer(s): ${peers.join(", ")}`);
+      render.hint("They will auto-reconnect within seconds. For a session-ending kick, use `claudemesh kick`.");
     }
-    const result = await client.sendAndWait(payload);
-    const kicked = result?.kicked ?? [];
-    if (kicked.length === 0) {
+    return EXIT.SUCCESS;
+  });
+}
+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;
+  }
+  const built = buildPayload("kick", target, opts);
+  if ("error" in built) {
+    render.err(String(built.error));
+    return EXIT.INVALID_ARGS;
+  }
+  return await withMesh({ meshSlug }, async (client) => {
+    const result = await client.sendAndWait(built);
+    const peers = result?.affected ?? result?.kicked ?? [];
+    if (peers.length === 0)
       render.info("No peers matched.");
-    } else {
-      render.ok(`Kicked ${kicked.length} peer(s): ${kicked.join(", ")}`);
+    else {
+      render.ok(`Kicked ${peers.length} peer(s): ${peers.join(", ")}`);
+      render.hint("Their Claude Code session ended. They can rejoin anytime by running `claudemesh`.");
     }
     return EXIT.SUCCESS;
   });
@@ -6358,7 +6419,8 @@ async function runPeers(flags) {
             meta.push(p.model);
           const metaStr = meta.length ? dim(` (${meta.join(", ")})`) : "";
           const summary = p.summary ? dim(`  — ${p.summary}`) : "";
-          render.info(`${statusDot} ${name}${groups}${metaStr}${summary}`);
+          const pubkeyTag = dim(` · ${p.pubkey.slice(0, 16)}…`);
+          render.info(`${statusDot} ${name}${groups}${metaStr}${pubkeyTag}${summary}`);
           if (p.cwd)
             render.info(dim(`   cwd: ${p.cwd}`));
         }
@@ -7584,7 +7646,7 @@ async function checkNpmLatest() {
       return { name: "CLI up-to-date", pass: true, detail: `npm unreachable (${res.status}) — skipped` };
     }
     const body = await res.json();
-    const latest = body["dist-tags"]?.alpha ?? body["dist-tags"]?.latest;
+    const latest = body["dist-tags"]?.latest ?? body["dist-tags"]?.alpha;
     if (!latest)
       return { name: "CLI up-to-date", pass: true, detail: "no dist-tag — skipped" };
     const up = latest === VERSION;
@@ -7592,7 +7654,7 @@ async function checkNpmLatest() {
       name: "CLI up-to-date",
       pass: up,
       detail: up ? `latest ${latest}` : `installed ${VERSION} → latest ${latest}`,
-      fix: up ? undefined : "npm i -g claudemesh-cli@alpha"
+      fix: up ? undefined : "npm i -g claudemesh-cli"
     };
   } catch {
     return { name: "CLI up-to-date", pass: true, detail: "npm check skipped" };
@@ -8700,13 +8762,13 @@ __export(exports_upgrade, {
 import { spawnSync as spawnSync6 } from "node:child_process";
 import { existsSync as existsSync16 } from "node:fs";
 import { dirname as dirname3, join as join8, resolve as resolve2 } from "node:path";
-async function latestAlpha() {
+async function latestVersion() {
   try {
     const res = await fetch(URLS.NPM_REGISTRY, { signal: AbortSignal.timeout(8000) });
     if (!res.ok)
       return null;
     const body = await res.json();
-    return body["dist-tags"]?.alpha ?? body["dist-tags"]?.latest ?? null;
+    return body["dist-tags"]?.latest ?? body["dist-tags"]?.alpha ?? null;
   } catch {
     return null;
   }
@@ -8731,7 +8793,7 @@ async function runUpgrade(opts = {}) {
     ["installed", VERSION],
     ["checking", "npm registry…"]
   ]);
-  const latest = await latestAlpha();
+  const latest = await latestVersion();
   if (!latest) {
     render.warn("Could not reach npm registry — skipped.");
     return EXIT.SUCCESS;
@@ -8752,7 +8814,7 @@ async function runUpgrade(opts = {}) {
   const args = ["install", "-g"];
   if (prefix)
     args.push("--prefix", prefix);
-  args.push("claudemesh-cli@alpha");
+  args.push("claudemesh-cli");
   render.blank();
   render.info(`Updating ${VERSION} → ${latest}…`);
   render.hint(`${npm} ${args.join(" ")}`);
@@ -8760,7 +8822,7 @@ async function runUpgrade(opts = {}) {
   const res = spawnSync6(npm, args, { stdio: "inherit" });
   if (res.status !== 0) {
     render.err(`npm exited with status ${res.status}`);
-    render.hint("Try: npm i -g claudemesh-cli@alpha");
+    render.hint("Try: npm i -g claudemesh-cli");
     return EXIT.INTERNAL_ERROR;
   }
   render.blank();
@@ -9949,7 +10011,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 };
     }
@@ -9959,21 +10021,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,
@@ -10356,7 +10492,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(`
@@ -12337,9 +12473,10 @@ 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 disconnect <peer>     soft disconnect (peer auto-reconnects)
+  claudemesh kick <peer>           end session (peer must manually rejoin)
+  claudemesh kick --stale 30m      kick peers idle > duration
+  claudemesh kick --all            kick everyone except yourself
   claudemesh ban <peer>            kick + permanently revoke (can't rejoin)
   claudemesh unban <peer>          lift a ban
   claudemesh bans                  list banned members
@@ -12481,6 +12618,11 @@ async function main() {
       process.exit(await invite2(positionals[0], { mesh: flags.mesh, json: !!flags.json }));
       break;
     }
+    case "disconnect": {
+      const { runDisconnect: runDisconnect2 } = await Promise.resolve().then(() => (init_kick(), exports_kick));
+      process.exit(await runDisconnect2(positionals[0], { mesh: flags.mesh, stale: flags.stale, all: !!flags.all }));
+      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 }));
@@ -12688,4 +12830,4 @@ main().catch((err) => {
   process.exit(EXIT.INTERNAL_ERROR);
 });
 
-//# debugId=8EADAA692E07F7AD64756E2164756E21
+//# debugId=EB94FD910CC928B864756E2164756E21