claudemesh-cli 1.31.6 → 1.32.1

package/dist/entrypoints/cli.js

@@ -104,7 +104,7 @@ __export(exports_urls, {
   VERSION: () => VERSION,
   URLS: () => URLS
 });
-var URLS, VERSION = "1.31.6", env;
+var URLS, VERSION = "1.32.1", env;
 var init_urls = __esm(() => {
   URLS = {
     BROKER: process.env.CLAUDEMESH_BROKER_URL ?? "wss://ic.claudemesh.com/ws",
@@ -3966,6 +3966,252 @@ var init_lifecycle = __esm(() => {
   init_paths2();
 });
 
+// src/ui/warnings.ts
+function warnDaemonState(res, opts = {}) {
+  if (alreadyWarned)
+    return false;
+  if (opts.quiet || opts.json)
+    return false;
+  if (res.state === "up")
+    return false;
+  if (getDaemonPolicy().mode === "strict" && res.state !== "started")
+    return false;
+  alreadyWarned = true;
+  const tag = (label) => `[claudemesh] ${label}`;
+  const hint = (s) => dim(s);
+  switch (res.state) {
+    case "started":
+      process.stderr.write(`${tag("info")} daemon restarted automatically ${hint(`(took ${res.durationMs}ms)`)}
+`);
+      return true;
+    case "down":
+      process.stderr.write(`${tag("info")} daemon not running — using cold path ${hint("(slower; run `claudemesh daemon up` for warm path)")}
+`);
+      return true;
+    case "spawn-suppressed":
+      process.stderr.write(`${tag("warn")} ${res.reason ?? "daemon failed to start recently"} — using cold path ${hint("(run `claudemesh doctor`)")}
+`);
+      return true;
+    case "spawn-failed":
+      process.stderr.write(`${tag("warn")} daemon spawn failed${res.reason ? `: ${res.reason}` : ""} — using cold path ${hint("(check ~/.claudemesh/daemon/daemon.log)")}
+`);
+      return true;
+    case "service-not-ready":
+      process.stderr.write(`${tag("warn")} ${res.reason ?? "service-managed daemon not responding"} — using cold path ${hint("(check ~/.claudemesh/daemon/daemon.log)")}
+`);
+      return true;
+  }
+  return false;
+}
+var alreadyWarned = false;
+var init_warnings = __esm(() => {
+  init_policy();
+  init_styles();
+});
+
+// src/services/bridge/daemon-route.ts
+var exports_daemon_route = {};
+__export(exports_daemon_route, {
+  trySetStateViaDaemon: () => trySetStateViaDaemon,
+  trySendViaDaemon: () => trySendViaDaemon,
+  tryRememberViaDaemon: () => tryRememberViaDaemon,
+  tryRecallViaDaemon: () => tryRecallViaDaemon,
+  tryListStateViaDaemon: () => tryListStateViaDaemon,
+  tryListSkillsViaDaemon: () => tryListSkillsViaDaemon,
+  tryListPeersViaDaemon: () => tryListPeersViaDaemon,
+  tryGetStateViaDaemon: () => tryGetStateViaDaemon,
+  tryGetSkillViaDaemon: () => tryGetSkillViaDaemon,
+  tryForgetViaDaemon: () => tryForgetViaDaemon
+});
+function meshQuery(mesh) {
+  return mesh ? `?mesh=${encodeURIComponent(mesh)}` : "";
+}
+async function daemonReachable() {
+  const policy2 = getDaemonPolicy();
+  if (policy2.mode === "no-daemon")
+    return false;
+  const res = await ensureDaemonReady({ noAutoSpawn: false });
+  warnDaemonState(res, {});
+  return res.state === "up" || res.state === "started";
+}
+async function tryListPeersViaDaemon(mesh) {
+  if (!await daemonReachable())
+    return null;
+  try {
+    const res = await ipc({ path: `/v1/peers${meshQuery(mesh)}`, timeoutMs: 3000 });
+    if (res.status !== 200)
+      return null;
+    return Array.isArray(res.body.peers) ? res.body.peers : [];
+  } catch (err) {
+    const msg = String(err);
+    if (/ENOENT|ECONNREFUSED|ipc_timeout/.test(msg))
+      return null;
+    return null;
+  }
+}
+async function tryListSkillsViaDaemon(mesh) {
+  if (!await daemonReachable())
+    return null;
+  try {
+    const res = await ipc({ path: `/v1/skills${meshQuery(mesh)}`, timeoutMs: 3000 });
+    if (res.status !== 200)
+      return null;
+    return Array.isArray(res.body.skills) ? res.body.skills : [];
+  } catch (err) {
+    const msg = String(err);
+    if (/ENOENT|ECONNREFUSED|ipc_timeout/.test(msg))
+      return null;
+    return null;
+  }
+}
+async function tryGetSkillViaDaemon(name, mesh) {
+  if (!await daemonReachable())
+    return null;
+  try {
+    const res = await ipc({
+      path: `/v1/skills/${encodeURIComponent(name)}${meshQuery(mesh)}`,
+      timeoutMs: 3000
+    });
+    if (res.status === 404)
+      return null;
+    if (res.status !== 200)
+      return null;
+    return res.body.skill ?? null;
+  } catch {
+    return null;
+  }
+}
+async function tryGetStateViaDaemon(key, mesh) {
+  if (!await daemonReachable())
+    return null;
+  try {
+    const path = `/v1/state?key=${encodeURIComponent(key)}${mesh ? `&mesh=${encodeURIComponent(mesh)}` : ""}`;
+    const res = await ipc({ path, timeoutMs: 3000 });
+    if (res.status === 404)
+      return;
+    if (res.status !== 200)
+      return null;
+    return res.body.state ?? undefined;
+  } catch (err) {
+    const msg = String(err);
+    if (/ENOENT|ECONNREFUSED|ipc_timeout/.test(msg))
+      return null;
+    return null;
+  }
+}
+async function tryListStateViaDaemon(mesh) {
+  if (!await daemonReachable())
+    return null;
+  try {
+    const res = await ipc({ path: `/v1/state${meshQuery(mesh)}`, timeoutMs: 3000 });
+    if (res.status !== 200)
+      return null;
+    return Array.isArray(res.body.entries) ? res.body.entries : [];
+  } catch (err) {
+    const msg = String(err);
+    if (/ENOENT|ECONNREFUSED|ipc_timeout/.test(msg))
+      return null;
+    return null;
+  }
+}
+async function trySetStateViaDaemon(key, value, mesh) {
+  if (!await daemonReachable())
+    return false;
+  try {
+    const res = await ipc({
+      method: "POST",
+      path: "/v1/state",
+      timeoutMs: 3000,
+      body: { key, value, ...mesh ? { mesh } : {} }
+    });
+    return res.status === 200 && res.body.ok === true;
+  } catch {
+    return false;
+  }
+}
+async function tryRememberViaDaemon(content, tags, mesh) {
+  if (!await daemonReachable())
+    return null;
+  try {
+    const res = await ipc({
+      method: "POST",
+      path: "/v1/memory",
+      timeoutMs: 5000,
+      body: { content, ...tags?.length ? { tags } : {}, ...mesh ? { mesh } : {} }
+    });
+    if (res.status !== 200 || !res.body.id)
+      return null;
+    return { id: res.body.id, mesh: res.body.mesh };
+  } catch {
+    return null;
+  }
+}
+async function tryRecallViaDaemon(query, mesh) {
+  if (!await daemonReachable())
+    return null;
+  try {
+    const path = `/v1/memory?q=${encodeURIComponent(query)}${mesh ? `&mesh=${encodeURIComponent(mesh)}` : ""}`;
+    const res = await ipc({ path, timeoutMs: 5000 });
+    if (res.status !== 200)
+      return null;
+    return Array.isArray(res.body.matches) ? res.body.matches : [];
+  } catch (err) {
+    const msg = String(err);
+    if (/ENOENT|ECONNREFUSED|ipc_timeout/.test(msg))
+      return null;
+    return null;
+  }
+}
+async function tryForgetViaDaemon(id, mesh) {
+  if (!await daemonReachable())
+    return false;
+  try {
+    const path = `/v1/memory/${encodeURIComponent(id)}${meshQuery(mesh)}`;
+    const res = await ipc({ method: "DELETE", path, timeoutMs: 3000 });
+    return res.status === 200 && res.body.ok === true;
+  } catch {
+    return false;
+  }
+}
+async function trySendViaDaemon(args) {
+  if (!await daemonReachable())
+    return null;
+  try {
+    const res = await ipc({
+      method: "POST",
+      path: "/v1/send",
+      timeoutMs: 3000,
+      body: {
+        to: args.to,
+        message: args.message,
+        priority: args.priority,
+        ...args.idempotencyKey ? { client_message_id: args.idempotencyKey } : {},
+        ...args.expectedMesh ? { mesh: args.expectedMesh } : {}
+      }
+    });
+    if (res.status === 202 || res.status === 200) {
+      return {
+        ok: true,
+        messageId: res.body.broker_message_id ?? res.body.client_message_id ?? "",
+        duplicate: res.body.duplicate,
+        status: res.body.status
+      };
+    }
+    return { ok: false, error: res.body.error ?? `daemon http ${res.status}` };
+  } catch (err) {
+    const msg = String(err);
+    if (/ENOENT|ECONNREFUSED|ipc_timeout/.test(msg))
+      return null;
+    return { ok: false, error: msg };
+  }
+}
+var init_daemon_route = __esm(() => {
+  init_client3();
+  init_lifecycle();
+  init_policy();
+  init_warnings();
+});
+
 // src/services/broker/session-hello-sig.ts
 var exports_session_hello_sig = {};
 __export(exports_session_hello_sig, {
@@ -4166,18 +4412,61 @@ async function runLaunchWizard(opts) {
   exitFullScreen();
   return { mesh, role, groups, messageMode, skipPermissions };
 }
-function printBanner(name, meshSlug, role, groups, messageMode) {
+async function printBrokerWelcome(meshSlug) {
   const useColor = !process.env.NO_COLOR && process.env.TERM !== "dumb" && process.stdout.isTTY;
   const dim2 = (s) => useColor ? `\x1B[2m${s}\x1B[22m` : s;
-  const bold2 = (s) => useColor ? `\x1B[1m${s}\x1B[22m` : s;
-  const roleSuffix = role ? ` (${role})` : "";
-  const groupTags = groups.length ? " [" + groups.map((g) => `@${g.name}${g.role ? `:${g.role}` : ""}`).join(", ") + "]" : "";
-  const rule = "─".repeat(60);
-  console.log(bold2(`claudemesh launch`) + dim2(` — as ${name}${roleSuffix} on ${meshSlug}${groupTags} [${messageMode}]`));
-  console.log(rule);
-  if (messageMode === "push") {
-    console.log("Peer messages arrive as <channel> reminders in real-time.");
-  } else if (messageMode === "inbox") {
+  const green3 = (s) => useColor ? `\x1B[32m${s}\x1B[22m` : s;
+  const yellow2 = (s) => useColor ? `\x1B[33m${s}\x1B[22m` : s;
+  let brokerState = "unknown";
+  try {
+    const { ipc: ipc2 } = await Promise.resolve().then(() => (init_client3(), exports_client));
+    const res = await ipc2({
+      path: "/v1/health",
+      timeoutMs: 1500
+    });
+    if (res.status === 200 && res.body?.brokers) {
+      brokerState = res.body.brokers[meshSlug] ?? "unknown";
+    }
+  } catch {}
+  let peerCount = -1;
+  try {
+    const { tryListPeersViaDaemon: tryListPeersViaDaemon2 } = await Promise.resolve().then(() => (init_daemon_route(), exports_daemon_route));
+    const peers = await tryListPeersViaDaemon2() ?? [];
+    peerCount = peers.filter((p) => p.channel !== "claudemesh-daemon").length;
+  } catch {}
+  let unread = -1;
+  try {
+    const { ipc: ipc2 } = await Promise.resolve().then(() => (init_client3(), exports_client));
+    const res = await ipc2({
+      path: "/v1/inbox",
+      timeoutMs: 1500
+    });
+    if (res.status === 200 && Array.isArray(res.body?.messages)) {
+      unread = res.body.messages.length;
+    }
+  } catch {}
+  const dot = brokerState === "open" ? green3("●") : yellow2("●");
+  const parts = [];
+  parts.push(`broker ${brokerState === "open" ? "connected" : brokerState}`);
+  if (peerCount >= 0)
+    parts.push(`${peerCount} peer${peerCount === 1 ? "" : "s"} online`);
+  if (unread >= 0)
+    parts.push(`${unread} unread`);
+  console.log(`${dot} ${parts.join(dim2(" · "))}`);
+  console.log("");
+}
+function printBanner(name, meshSlug, role, groups, messageMode) {
+  const useColor = !process.env.NO_COLOR && process.env.TERM !== "dumb" && process.stdout.isTTY;
+  const dim2 = (s) => useColor ? `\x1B[2m${s}\x1B[22m` : s;
+  const bold2 = (s) => useColor ? `\x1B[1m${s}\x1B[22m` : s;
+  const roleSuffix = role ? ` (${role})` : "";
+  const groupTags = groups.length ? " [" + groups.map((g) => `@${g.name}${g.role ? `:${g.role}` : ""}`).join(", ") + "]" : "";
+  const rule = "─".repeat(60);
+  console.log(bold2(`claudemesh launch`) + dim2(` — as ${name}${roleSuffix} on ${meshSlug}${groupTags} [${messageMode}]`));
+  console.log(rule);
+  if (messageMode === "push") {
+    console.log("Peer messages arrive as <channel> reminders in real-time.");
+  } else if (messageMode === "inbox") {
     console.log("Peer messages held in inbox. Use check_messages to read.");
   } else {
     console.log("Messages off. Use check_messages to poll manually.");
@@ -4456,6 +4745,7 @@ async function runLaunch(flags, rawArgs) {
   } catch {}
   if (!args.quiet) {
     printBanner(displayName, mesh.slug, role, parsedGroups, messageMode);
+    await printBrokerWelcome(mesh.slug);
   }
   const meshMcpEntries = [];
   if (serviceCatalog.length > 0) {
@@ -7424,402 +7714,156 @@ function parseStaleMs(input) {
   if (unit === "h")
     return val * 3600000;
   return null;
-}
-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) => {
-    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`.");
-    }
-    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 ${peers.length} peer(s): ${peers.join(", ")}`);
-      render.hint("Their Claude Code session ended. They can rejoin anytime by running `claudemesh`.");
-    }
-    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?.message ?? result?.error ?? result?.code ?? "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?.message ?? result?.error ?? result?.code ?? "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/ui/warnings.ts
-function warnDaemonState(res, opts = {}) {
-  if (alreadyWarned)
-    return false;
-  if (opts.quiet || opts.json)
-    return false;
-  if (res.state === "up")
-    return false;
-  if (getDaemonPolicy().mode === "strict" && res.state !== "started")
-    return false;
-  alreadyWarned = true;
-  const tag = (label) => `[claudemesh] ${label}`;
-  const hint = (s) => dim(s);
-  switch (res.state) {
-    case "started":
-      process.stderr.write(`${tag("info")} daemon restarted automatically ${hint(`(took ${res.durationMs}ms)`)}
-`);
-      return true;
-    case "down":
-      process.stderr.write(`${tag("info")} daemon not running — using cold path ${hint("(slower; run `claudemesh daemon up` for warm path)")}
-`);
-      return true;
-    case "spawn-suppressed":
-      process.stderr.write(`${tag("warn")} ${res.reason ?? "daemon failed to start recently"} — using cold path ${hint("(run `claudemesh doctor`)")}
-`);
-      return true;
-    case "spawn-failed":
-      process.stderr.write(`${tag("warn")} daemon spawn failed${res.reason ? `: ${res.reason}` : ""} — using cold path ${hint("(check ~/.claudemesh/daemon/daemon.log)")}
-`);
-      return true;
-    case "service-not-ready":
-      process.stderr.write(`${tag("warn")} ${res.reason ?? "service-managed daemon not responding"} — using cold path ${hint("(check ~/.claudemesh/daemon/daemon.log)")}
-`);
-      return true;
-  }
-  return false;
-}
-var alreadyWarned = false;
-var init_warnings = __esm(() => {
-  init_policy();
-  init_styles();
-});
-
-// src/services/bridge/daemon-route.ts
-var exports_daemon_route = {};
-__export(exports_daemon_route, {
-  trySetStateViaDaemon: () => trySetStateViaDaemon,
-  trySendViaDaemon: () => trySendViaDaemon,
-  tryRememberViaDaemon: () => tryRememberViaDaemon,
-  tryRecallViaDaemon: () => tryRecallViaDaemon,
-  tryListStateViaDaemon: () => tryListStateViaDaemon,
-  tryListSkillsViaDaemon: () => tryListSkillsViaDaemon,
-  tryListPeersViaDaemon: () => tryListPeersViaDaemon,
-  tryGetStateViaDaemon: () => tryGetStateViaDaemon,
-  tryGetSkillViaDaemon: () => tryGetSkillViaDaemon,
-  tryForgetViaDaemon: () => tryForgetViaDaemon
-});
-function meshQuery(mesh) {
-  return mesh ? `?mesh=${encodeURIComponent(mesh)}` : "";
-}
-async function daemonReachable() {
-  const policy2 = getDaemonPolicy();
-  if (policy2.mode === "no-daemon")
-    return false;
-  const res = await ensureDaemonReady({ noAutoSpawn: false });
-  warnDaemonState(res, {});
-  return res.state === "up" || res.state === "started";
-}
-async function tryListPeersViaDaemon(mesh) {
-  if (!await daemonReachable())
-    return null;
-  try {
-    const res = await ipc({ path: `/v1/peers${meshQuery(mesh)}`, timeoutMs: 3000 });
-    if (res.status !== 200)
-      return null;
-    return Array.isArray(res.body.peers) ? res.body.peers : [];
-  } catch (err) {
-    const msg = String(err);
-    if (/ENOENT|ECONNREFUSED|ipc_timeout/.test(msg))
-      return null;
-    return null;
-  }
-}
-async function tryListSkillsViaDaemon(mesh) {
-  if (!await daemonReachable())
-    return null;
-  try {
-    const res = await ipc({ path: `/v1/skills${meshQuery(mesh)}`, timeoutMs: 3000 });
-    if (res.status !== 200)
-      return null;
-    return Array.isArray(res.body.skills) ? res.body.skills : [];
-  } catch (err) {
-    const msg = String(err);
-    if (/ENOENT|ECONNREFUSED|ipc_timeout/.test(msg))
-      return null;
-    return null;
-  }
-}
-async function tryGetSkillViaDaemon(name, mesh) {
-  if (!await daemonReachable())
-    return null;
-  try {
-    const res = await ipc({
-      path: `/v1/skills/${encodeURIComponent(name)}${meshQuery(mesh)}`,
-      timeoutMs: 3000
-    });
-    if (res.status === 404)
-      return null;
-    if (res.status !== 200)
-      return null;
-    return res.body.skill ?? null;
-  } catch {
-    return null;
-  }
-}
-async function tryGetStateViaDaemon(key, mesh) {
-  if (!await daemonReachable())
-    return null;
-  try {
-    const path = `/v1/state?key=${encodeURIComponent(key)}${mesh ? `&mesh=${encodeURIComponent(mesh)}` : ""}`;
-    const res = await ipc({ path, timeoutMs: 3000 });
-    if (res.status === 404)
-      return;
-    if (res.status !== 200)
-      return null;
-    return res.body.state ?? undefined;
-  } catch (err) {
-    const msg = String(err);
-    if (/ENOENT|ECONNREFUSED|ipc_timeout/.test(msg))
-      return null;
-    return null;
-  }
-}
-async function tryListStateViaDaemon(mesh) {
-  if (!await daemonReachable())
-    return null;
-  try {
-    const res = await ipc({ path: `/v1/state${meshQuery(mesh)}`, timeoutMs: 3000 });
-    if (res.status !== 200)
-      return null;
-    return Array.isArray(res.body.entries) ? res.body.entries : [];
-  } catch (err) {
-    const msg = String(err);
-    if (/ENOENT|ECONNREFUSED|ipc_timeout/.test(msg))
-      return null;
-    return null;
-  }
-}
-async function trySetStateViaDaemon(key, value, mesh) {
-  if (!await daemonReachable())
-    return false;
-  try {
-    const res = await ipc({
-      method: "POST",
-      path: "/v1/state",
-      timeoutMs: 3000,
-      body: { key, value, ...mesh ? { mesh } : {} }
-    });
-    return res.status === 200 && res.body.ok === true;
-  } catch {
-    return false;
+}
+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 tryRememberViaDaemon(content, tags, mesh) {
-  if (!await daemonReachable())
-    return null;
-  try {
-    const res = await ipc({
-      method: "POST",
-      path: "/v1/memory",
-      timeoutMs: 5000,
-      body: { content, ...tags?.length ? { tags } : {}, ...mesh ? { mesh } : {} }
-    });
-    if (res.status !== 200 || !res.body.id)
-      return null;
-    return { id: res.body.id, mesh: res.body.mesh };
-  } catch {
-    return null;
+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) => {
+    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`.");
+    }
+    return EXIT.SUCCESS;
+  });
 }
-async function tryRecallViaDaemon(query, mesh) {
-  if (!await daemonReachable())
-    return null;
-  try {
-    const path = `/v1/memory?q=${encodeURIComponent(query)}${mesh ? `&mesh=${encodeURIComponent(mesh)}` : ""}`;
-    const res = await ipc({ path, timeoutMs: 5000 });
-    if (res.status !== 200)
-      return null;
-    return Array.isArray(res.body.matches) ? res.body.matches : [];
-  } catch (err) {
-    const msg = String(err);
-    if (/ENOENT|ECONNREFUSED|ipc_timeout/.test(msg))
-      return null;
-    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;
+  }
+  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 ${peers.length} peer(s): ${peers.join(", ")}`);
+      render.hint("Their Claude Code session ended. They can rejoin anytime by running `claudemesh`.");
+    }
+    return EXIT.SUCCESS;
+  });
 }
-async function tryForgetViaDaemon(id, mesh) {
-  if (!await daemonReachable())
-    return false;
-  try {
-    const path = `/v1/memory/${encodeURIComponent(id)}${meshQuery(mesh)}`;
-    const res = await ipc({ method: "DELETE", path, timeoutMs: 3000 });
-    return res.status === 200 && res.body.ok === true;
-  } catch {
-    return false;
+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?.message ?? result?.error ?? result?.code ?? "ban failed");
+    }
+    return result?.banned ? EXIT.SUCCESS : EXIT.INTERNAL_ERROR;
+  });
 }
-async function trySendViaDaemon(args) {
-  if (!await daemonReachable())
-    return null;
-  try {
-    const res = await ipc({
-      method: "POST",
-      path: "/v1/send",
-      timeoutMs: 3000,
-      body: {
-        to: args.to,
-        message: args.message,
-        priority: args.priority,
-        ...args.idempotencyKey ? { client_message_id: args.idempotencyKey } : {},
-        ...args.expectedMesh ? { mesh: args.expectedMesh } : {}
-      }
-    });
-    if (res.status === 202 || res.status === 200) {
-      return {
-        ok: true,
-        messageId: res.body.broker_message_id ?? res.body.client_message_id ?? "",
-        duplicate: res.body.duplicate,
-        status: res.body.status
-      };
+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?.message ?? result?.error ?? result?.code ?? "unban failed");
     }
-    return { ok: false, error: res.body.error ?? `daemon http ${res.status}` };
-  } catch (err) {
-    const msg = String(err);
-    if (/ENOENT|ECONNREFUSED|ipc_timeout/.test(msg))
-      return null;
-    return { ok: false, error: msg };
+    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_daemon_route = __esm(() => {
-  init_client3();
-  init_lifecycle();
-  init_policy();
-  init_warnings();
+var init_ban = __esm(() => {
+  init_connect();
+  init_facade();
+  init_render();
+  init_exit_codes();
 });
 
 // src/services/session/resolve.ts
@@ -7878,18 +7922,26 @@ async function listPeersForMesh(slug) {
   const config = readConfig();
   const joined = config.meshes.find((m) => m.slug === slug);
   const selfMemberPubkey = joined?.pubkey ?? null;
+  let selfSessionPubkey = null;
+  try {
+    const { getSessionInfo: getSessionInfo2 } = await Promise.resolve().then(() => (init_resolve(), exports_resolve));
+    const sess = await getSessionInfo2();
+    if (sess && sess.mesh === slug && sess.presence?.sessionPubkey) {
+      selfSessionPubkey = sess.presence.sessionPubkey;
+    }
+  } catch {}
   try {
     const { tryListPeersViaDaemon: tryListPeersViaDaemon2 } = await Promise.resolve().then(() => (init_daemon_route(), exports_daemon_route));
     const dr = await tryListPeersViaDaemon2();
     if (dr !== null) {
-      return dr.map((p) => annotateSelf(p, selfMemberPubkey, null));
+      return dr.map((p) => annotateSelf(p, selfMemberPubkey, selfSessionPubkey));
     }
   } catch {}
   let result = [];
   await withMesh({ meshSlug: slug }, async (client) => {
     const all = await client.listPeers();
-    const selfSessionPubkey = client.getSessionPubkey();
-    result = all.map((p) => annotateSelf(p, selfMemberPubkey, selfSessionPubkey));
+    const selfSessionPubkey2 = client.getSessionPubkey();
+    result = all.map((p) => annotateSelf(p, selfMemberPubkey, selfSessionPubkey2));
   });
   return result;
 }
@@ -7925,12 +7977,19 @@ async function runPeers(flags) {
         allJson.push({ mesh: slug, peers: projected });
         continue;
       }
-      render.section(`peers on ${slug} (${peers.length})`);
-      if (peers.length === 0) {
+      const visible = flags.all ? peers : peers.filter((p) => p.channel !== "claudemesh-daemon");
+      const sorted = visible.slice().sort((a, b) => {
+        const score = (p) => p.isThisSession ? 0 : p.isSelf ? 1 : 2;
+        return score(a) - score(b);
+      });
+      const hiddenDaemons = peers.length - visible.length;
+      const header = hiddenDaemons > 0 ? `peers on ${slug} (${sorted.length}, ${hiddenDaemons} daemon hidden — use --all)` : `peers on ${slug} (${sorted.length})`;
+      render.section(header);
+      if (sorted.length === 0) {
         render.info(dim("  (no peers connected)"));
         continue;
       }
-      for (const p of peers) {
+      for (const p of sorted) {
         const statusDot = p.status === "working" ? yellow("●") : green("●");
         const name = bold(p.displayName);
         const meta = [];
@@ -7943,6 +8002,7 @@ async function runPeers(flags) {
         const metaStr = meta.length ? dim(` (${meta.join(", ")})`) : "";
         const summary = p.summary ? dim(`  — ${p.summary}`) : "";
         const pubkeyTag = dim(` · ${p.pubkey.slice(0, 16)}…`);
+        const sidTag = p.sessionId ? dim(` · sid:${p.sessionId.slice(0, 8)}`) : "";
         const selfTag = p.isThisSession ? dim(" ") + yellow("(this session)") : p.isSelf ? dim(" ") + yellow("(your other session)") : "";
         const inlineTags = [];
         const peerRole = p.profile?.role?.trim();
@@ -7952,7 +8012,7 @@ async function runPeers(flags) {
           inlineTags.push(...p.groups.map((g) => `@${g.name}${g.role ? `:${g.role}` : ""}`));
         }
         const tagsStr = inlineTags.length ? " [" + inlineTags.join(", ") + "]" : "";
-        render.info(`${statusDot} ${name}${selfTag}${tagsStr}${metaStr}${pubkeyTag}${summary}`);
+        render.info(`${statusDot} ${name}${selfTag}${tagsStr}${metaStr}${pubkeyTag}${sidTag}${summary}`);
         if (p.cwd)
           render.info(dim(`   cwd: ${p.cwd}`));
         if (!peerRole && p.groups.length === 0) {
@@ -8023,13 +8083,73 @@ async function runSend(flags, to, message) {
       to = matches2[0].pubkey ?? to;
     } catch {}
   }
-  if (!flags.self && meshSlug) {
+  if (meshSlug) {
     const joined = config.meshes.find((m) => m.slug === meshSlug);
-    if (joined && /^[0-9a-f]{64}$/i.test(to) && to.toLowerCase() === joined.pubkey.toLowerCase()) {
+    const isOwnMemberKey = joined && /^[0-9a-f]{64}$/i.test(to) && to.toLowerCase() === joined.pubkey.toLowerCase();
+    if (isOwnMemberKey && !flags.self) {
       render.err(`Target "${to.slice(0, 16)}…" is your own member pubkey on mesh "${meshSlug}".`);
       render.hint("Pass --self to message a sibling session of your own member, or pick a different peer's pubkey.");
       process.exit(1);
     }
+    if (isOwnMemberKey && flags.self) {
+      try {
+        const { tryListPeersViaDaemon: tryListPeersViaDaemon2 } = await Promise.resolve().then(() => (init_daemon_route(), exports_daemon_route));
+        const { getSessionInfo: getSessionInfo2 } = await Promise.resolve().then(() => (init_resolve(), exports_resolve));
+        const peers = await tryListPeersViaDaemon2() ?? [];
+        const session = await getSessionInfo2();
+        const ownSessionPk = session?.presence?.sessionPubkey?.toLowerCase();
+        const siblings = peers.filter((p) => {
+          const r = p;
+          if (!r.pubkey)
+            return false;
+          if (ownSessionPk && r.pubkey.toLowerCase() === ownSessionPk)
+            return false;
+          if (r.channel === "claudemesh-daemon")
+            return false;
+          return r.memberPubkey?.toLowerCase() === to.toLowerCase();
+        });
+        if (siblings.length === 0) {
+          render.err(`--self fan-out: no other sibling sessions of your member online.`);
+          process.exit(1);
+        }
+        const results = [];
+        for (const peer of siblings) {
+          const pk = peer.pubkey;
+          const dr = await trySendViaDaemon({ to: pk, message, priority, expectedMesh: meshSlug ?? undefined });
+          if (dr === null) {
+            results.push({ pubkey: pk, ok: false, error: "daemon path unavailable" });
+            continue;
+          }
+          if (dr.ok) {
+            results.push({
+              pubkey: pk,
+              ok: true,
+              ...dr.messageId ? { messageId: dr.messageId } : {}
+            });
+          } else {
+            results.push({ pubkey: pk, ok: false, error: dr.error });
+          }
+        }
+        const okCount = results.filter((r) => r.ok).length;
+        if (flags.json) {
+          console.log(JSON.stringify({ ok: okCount > 0, fanout: results, via: "daemon" }));
+        } else if (okCount === results.length) {
+          render.ok(`fanned out to ${okCount} sibling session${okCount === 1 ? "" : "s"} (daemon)`);
+          for (const r of results)
+            render.info(dim(`  → ${r.pubkey.slice(0, 16)}… ${r.messageId ? dim(r.messageId.slice(0, 8)) : ""}`));
+        } else {
+          render.warn(`fanned out: ${okCount}/${results.length} delivered`);
+          for (const r of results) {
+            const tag = r.ok ? "✔" : "✘";
+            render.info(`  ${tag} ${r.pubkey.slice(0, 16)}… ${r.error ? dim(`— ${r.error}`) : ""}`);
+          }
+        }
+        return;
+      } catch (e) {
+        render.err(`--self fan-out failed: ${e instanceof Error ? e.message : String(e)}`);
+        process.exit(1);
+      }
+    }
   }
   {
     const dr = await trySendViaDaemon({ to, message, priority, expectedMesh: meshSlug ?? undefined });
@@ -8879,15 +8999,30 @@ __export(exports_whoami, {
 });
 async function whoami(opts) {
   const result = await whoAmI();
+  const session = await getSessionInfo();
   if (opts.json) {
-    console.log(JSON.stringify({ schema_version: "1.0", ...result }, null, 2));
-    return result.signed_in || result.local ? EXIT.SUCCESS : EXIT.AUTH_FAILED;
+    console.log(JSON.stringify({ schema_version: "1.0", ...result, session }, null, 2));
+    return result.signed_in || result.local || session ? EXIT.SUCCESS : EXIT.AUTH_FAILED;
   }
-  if (!result.signed_in && !result.local) {
+  if (!result.signed_in && !result.local && !session) {
     render.err("Not signed in", "Run `claudemesh login` to sign in or `claudemesh <invite>` to join.");
     return EXIT.AUTH_FAILED;
   }
   render.section("whoami");
+  if (session) {
+    const sessionPk = session.presence?.sessionPubkey;
+    const groups = (session.groups ?? []).join(", ") || dim("(none)");
+    render.kv([
+      ["this session", `${yellow(session.displayName)} on ${bold(session.mesh)}`],
+      ["session id", dim(session.sessionId)],
+      ...sessionPk ? [["session pubkey", dim(`${sessionPk.slice(0, 16)}… (full: ${sessionPk})`)]] : [],
+      ...session.role ? [["role", session.role]] : [],
+      ["groups", groups],
+      ...session.cwd ? [["cwd", dim(session.cwd)]] : [],
+      ["pid", String(session.pid)]
+    ]);
+    render.blank();
+  }
   if (result.signed_in) {
     render.kv([
       ["user", `${bold(result.user.display_name)} ${dim(`(${result.user.email})`)}`],
@@ -8913,6 +9048,7 @@ async function whoami(opts) {
 }
 var init_whoami = __esm(() => {
   init_facade6();
+  init_resolve();
   init_render();
   init_styles();
   init_exit_codes();
@@ -10947,6 +11083,10 @@ class SessionBrokerClient {
           }
           return;
         }
+        if (msg.type === "push" || msg.type === "inbound") {
+          this.opts.onPush?.(msg);
+          return;
+        }
       });
       ws.on("close", (code, reason) => {
         if (this.helloTimer) {
@@ -11509,6 +11649,7 @@ async function runDaemon(opts = {}) {
         sessionBrokers.delete(info.token);
         prior.close().catch(() => {});
       }
+      const sessionSecretKeyHex = info.presence.sessionSecretKey;
       const client = new SessionBrokerClient({
         mesh: meshConfig,
         sessionPubkey: info.presence.sessionPubkey,
@@ -11518,7 +11659,16 @@ async function runDaemon(opts = {}) {
         displayName: info.displayName,
         ...info.role ? { role: info.role } : {},
         ...info.cwd ? { cwd: info.cwd } : {},
-        pid: info.pid
+        pid: info.pid,
+        onPush: (m) => {
+          handleBrokerPush(m, {
+            db: inboxDb,
+            bus,
+            meshSlug: meshConfig.slug,
+            recipientSecretKeyHex: meshConfig.secretKey,
+            sessionSecretKeyHex
+          });
+        }
       });
       sessionBrokers.set(info.token, client);
       client.connect().catch((err) => process.stderr.write(JSON.stringify({
@@ -18339,6 +18489,28 @@ var init_seed_test_mesh = __esm(() => {
 });
 
 // src/cli/argv.ts
+var BOOLEAN_FLAGS = new Set([
+  "self",
+  "json",
+  "all",
+  "yes",
+  "y",
+  "help",
+  "h",
+  "version",
+  "v",
+  "quiet",
+  "strict",
+  "continue",
+  "no-daemon",
+  "no-color",
+  "debug",
+  "allow-ci-persistent",
+  "force",
+  "dry-run",
+  "verbose",
+  "skip-service"
+]);
 function parseArgv(argv) {
   const args = argv.slice(2);
   const flags = {};
@@ -18346,18 +18518,32 @@ function parseArgv(argv) {
   let command = "";
   for (let i = 0;i < args.length; i++) {
     const arg = args[i];
+    if (arg.startsWith("--") && arg.includes("=")) {
+      const eq = arg.indexOf("=");
+      const key = arg.slice(2, eq);
+      flags[key] = arg.slice(eq + 1);
+      continue;
+    }
     if (arg.startsWith("--")) {
       const key = arg.slice(2);
+      if (BOOLEAN_FLAGS.has(key)) {
+        flags[key] = true;
+        continue;
+      }
       const next = args[i + 1];
-      if (next && !next.startsWith("-")) {
+      if (next !== undefined && !next.startsWith("-")) {
         flags[key] = next;
         i++;
       } else
         flags[key] = true;
     } else if (arg.startsWith("-") && arg.length === 2) {
       const key = arg.slice(1);
+      if (BOOLEAN_FLAGS.has(key)) {
+        flags[key] = true;
+        continue;
+      }
       const next = args[i + 1];
-      if (next && !next.startsWith("-")) {
+      if (next !== undefined && !next.startsWith("-")) {
         flags[key] = next;
         i++;
       } else
@@ -18931,6 +19117,10 @@ Peer (resource form, recommended)
 
 Message  (resource form)
   claudemesh message send <to> <m> send a message            (alias: send)
+                                   flags: [--priority now|next|low] [--mesh <slug>]
+                                          [--self] (allow targeting your own member/session pubkey;
+                                          fans out to every sibling session of your member)
+                                          [--json] (machine-readable result)
   claudemesh message inbox         drain pending              (alias: inbox)
   claudemesh message status <id>   delivery status            (alias: msg-status)
 
@@ -19279,7 +19469,7 @@ async function main() {
     }
     case "peers": {
       const { runPeers: runPeers2 } = await Promise.resolve().then(() => (init_peers(), exports_peers));
-      await runPeers2({ mesh: flags.mesh, json: flags.json });
+      await runPeers2({ mesh: flags.mesh, json: flags.json, all: !!flags.all });
       break;
     }
     case "send": {
@@ -19508,7 +19698,7 @@ async function main() {
     }
     case "peer": {
       const sub = positionals[0];
-      const f = { mesh: flags.mesh, json: flags.json };
+      const f = { mesh: flags.mesh, json: flags.json, all: !!flags.all };
       const id = positionals[1] ?? "";
       if (sub === "list") {
         const { runPeers: runPeers2 } = await Promise.resolve().then(() => (init_peers(), exports_peers));
@@ -19541,7 +19731,7 @@ async function main() {
       const sub = positionals[0];
       if (sub === "send") {
         const { runSend: runSend2 } = await Promise.resolve().then(() => (init_send(), exports_send));
-        await runSend2({ mesh: flags.mesh, priority: flags.priority, json: !!flags.json }, positionals[1] ?? "", positionals.slice(2).join(" "));
+        await runSend2({ mesh: flags.mesh, priority: flags.priority, json: !!flags.json, self: !!flags.self }, positionals[1] ?? "", positionals.slice(2).join(" "));
       } else if (sub === "inbox") {
         const { runInbox: runInbox2 } = await Promise.resolve().then(() => (init_inbox(), exports_inbox));
         await runInbox2({ json: !!flags.json });
@@ -20097,4 +20287,4 @@ main().catch((err) => {
   process.exit(EXIT.INTERNAL_ERROR);
 });
 
-//# debugId=F22F2E19502D800C64756E2164756E21
+//# debugId=FAFB4F8D5ECBBBB864756E2164756E21