claudemesh-cli 1.34.8 → 1.34.10

package/dist/entrypoints/cli.js

@@ -104,7 +104,7 @@ __export(exports_urls, {
   VERSION: () => VERSION,
   URLS: () => URLS
 });
-var URLS, VERSION = "1.34.8", env;
+var URLS, VERSION = "1.34.10", env;
 var init_urls = __esm(() => {
   URLS = {
     BROKER: process.env.CLAUDEMESH_BROKER_URL ?? "wss://ic.claudemesh.com/ws",
@@ -4331,6 +4331,7 @@ async function ensureDaemonRunning(meshSlug, quiet) {
   if (res.state === "up") {
     if (!quiet)
       render.ok("daemon already running");
+    await warnIfDaemonStale(quiet);
     return;
   }
   if (res.state === "started") {
@@ -4338,7 +4339,22 @@ async function ensureDaemonRunning(meshSlug, quiet) {
       render.ok(`daemon ready (${res.durationMs}ms)`);
     return;
   }
-  render.warn(`daemon ${res.state}${res.reason ? `: ${res.reason}` : ""}`, "Run `claudemesh daemon up --mesh " + meshSlug + "` manually, then re-launch.");
+  render.warn(`daemon ${res.state}${res.reason ? `: ${res.reason}` : ""}`, "Run `claudemesh daemon up` manually, then re-launch.");
+}
+async function warnIfDaemonStale(quiet) {
+  if (quiet)
+    return;
+  try {
+    const { ipc: ipc2 } = await Promise.resolve().then(() => (init_client3(), exports_client));
+    const { VERSION: VERSION2 } = await Promise.resolve().then(() => (init_urls(), exports_urls));
+    const res = await ipc2({ path: "/v1/version", timeoutMs: 1500 });
+    if (res.status !== 200)
+      return;
+    const daemonVersion = res.body.daemon_version ?? "";
+    if (!daemonVersion || daemonVersion === VERSION2)
+      return;
+    render.warn(`daemon is ${daemonVersion}, CLI is ${VERSION2} — restart to pick up new fixes.`, "Run: `claudemesh daemon down && claudemesh daemon up` (no --mesh — daemon attaches to every joined mesh; restart the launchd / systemd-user unit if you installed one).");
+  } catch {}
 }
 function parseGroupsString(raw) {
   return raw.split(",").map((s) => s.trim()).filter(Boolean).map((token) => {
@@ -9703,7 +9719,29 @@ function writeSse(res, e, idCounter) {
 
 `);
 }
-function bindSseStream(res, bus) {
+function shouldDeliver(e, f) {
+  if (!f.sessionPubkey && !f.memberPubkey && !f.meshSlug)
+    return true;
+  if (f.meshSlug) {
+    const eventMesh = typeof e.data.mesh === "string" ? e.data.mesh : null;
+    if (eventMesh && eventMesh !== f.meshSlug)
+      return false;
+  }
+  if (e.kind !== "message")
+    return true;
+  const recipientKind = typeof e.data.recipient_kind === "string" ? e.data.recipient_kind : null;
+  const recipientPubkey = typeof e.data.recipient_pubkey === "string" ? e.data.recipient_pubkey.toLowerCase() : null;
+  if (!recipientKind || !recipientPubkey)
+    return true;
+  if (recipientKind === "session") {
+    return !!f.sessionPubkey && f.sessionPubkey.toLowerCase() === recipientPubkey;
+  }
+  if (recipientKind === "member") {
+    return !!f.memberPubkey && f.memberPubkey.toLowerCase() === recipientPubkey;
+  }
+  return true;
+}
+function bindSseStream(res, bus, filter = {}) {
   res.statusCode = 200;
   res.setHeader("Content-Type", "text/event-stream");
   res.setHeader("Cache-Control", "no-cache, no-transform");
@@ -9713,7 +9751,11 @@ function bindSseStream(res, bus) {
 
 `);
   let counter = 0;
-  const unsubscribe = bus.subscribe((e) => writeSse(res, e, ++counter));
+  const unsubscribe = bus.subscribe((e) => {
+    if (!shouldDeliver(e, filter))
+      return;
+    writeSse(res, e, ++counter);
+  });
   const heartbeat = setInterval(() => {
     try {
       res.write(`: keepalive
@@ -10130,7 +10172,16 @@ function makeHandler(opts) {
         respond(res, 503, { error: "event bus not initialised" });
         return;
       }
-      bindSseStream(res, opts.bus);
+      const filter = {};
+      if (session?.presence?.sessionPubkey)
+        filter.sessionPubkey = session.presence.sessionPubkey;
+      if (session?.mesh) {
+        filter.meshSlug = session.mesh;
+        const meshCfg = opts.meshConfigs?.get(session.mesh);
+        if (meshCfg?.pubkey)
+          filter.memberPubkey = meshCfg.pubkey;
+      }
+      bindSseStream(res, opts.bus, filter);
       return;
     }
     if (req.method === "GET" && url.pathname === "/v1/peers") {
@@ -11438,6 +11489,8 @@ class SessionBrokerClient {
           return;
         }
         if (msg.type === "push" || msg.type === "inbound") {
+          if (msg.subtype === "system")
+            return;
           const senderPubkey = String(msg.senderPubkey ?? "").toLowerCase();
           if (senderPubkey && senderPubkey === this.opts.sessionPubkey.toLowerCase()) {
             this.log("info", "self_echo_dropped", { sender: senderPubkey.slice(0, 12) });
@@ -11778,10 +11831,14 @@ var init_inbox_pruner = __esm(() => {
 import { randomUUID as randomUUID4 } from "node:crypto";
 async function handleBrokerPush(msg, ctx) {
   if (msg.subtype === "system" && typeof msg.event === "string") {
+    const eventData = msg.eventData ?? {};
+    const eventPubkey = typeof eventData.pubkey === "string" ? eventData.pubkey : "";
+    if (eventPubkey && ctx.isOwnPubkey?.(eventPubkey))
+      return;
     ctx.bus.publish(mapSystemEventKind(msg.event), {
       mesh: ctx.meshSlug,
       event: msg.event,
-      ...msg.eventData ?? {}
+      ...eventData
     });
     return;
   }
@@ -11835,7 +11892,9 @@ async function handleBrokerPush(msg, ctx) {
     priority,
     ...subtype ? { subtype } : {},
     body,
-    created_at: createdAt
+    created_at: createdAt,
+    ...ctx.recipientPubkey ? { recipient_pubkey: ctx.recipientPubkey } : {},
+    ...ctx.recipientKind ? { recipient_kind: ctx.recipientKind } : {}
   });
 }
 async function decryptOrFallback(args) {
@@ -12047,22 +12106,7 @@ async function runDaemon(opts = {}) {
   }
   const bus = new EventBus;
   const cfg = readConfig();
-  let meshes;
-  if (opts.mesh) {
-    const found = cfg.meshes.find((m) => m.slug === opts.mesh);
-    if (!found) {
-      process.stderr.write(`mesh not found: ${opts.mesh}
-`);
-      process.stderr.write(`joined meshes: ${cfg.meshes.map((m) => m.slug).join(", ") || "(none)"}
-`);
-      releaseSingletonLock();
-      try {
-        outboxDb.close();
-      } catch {}
-      return 2;
-    }
-    meshes = [found];
-  } else if (cfg.meshes.length === 0) {
+  if (cfg.meshes.length === 0) {
     process.stderr.write(`no mesh joined; run \`claudemesh join <invite-url>\` first
 `);
     releaseSingletonLock();
@@ -12070,15 +12114,15 @@ async function runDaemon(opts = {}) {
       outboxDb.close();
     } catch {}
     return 2;
-  } else {
-    meshes = cfg.meshes;
   }
+  const meshes = cfg.meshes;
+  const sessionBrokers = new Map;
+  const sessionBrokersByPubkey = new Map;
   const brokers = new Map;
   const meshConfigs = new Map;
   for (const mesh of meshes) {
     meshConfigs.set(mesh.slug, mesh);
     const broker = new DaemonBrokerClient(mesh, {
-      displayName: opts.displayName,
       onStatusChange: (s) => {
         process.stdout.write(JSON.stringify({
           msg: "broker_status",
@@ -12091,9 +12135,8 @@ async function runDaemon(opts = {}) {
       },
       onPush: (m) => {
         const senderMemberPk = String(m.senderMemberPubkey ?? "").toLowerCase();
-        const senderPubkey = String(m.senderPubkey ?? "").toLowerCase();
         const ownMember = mesh.pubkey.toLowerCase();
-        if (senderMemberPk && senderMemberPk === ownMember && senderPubkey === ownMember) {
+        if (senderMemberPk && senderMemberPk === ownMember) {
           return;
         }
         handleBrokerPush(m, {
@@ -12101,7 +12144,15 @@ async function runDaemon(opts = {}) {
           bus,
           meshSlug: mesh.slug,
           recipientSecretKeyHex: mesh.secretKey,
-          ackClientMessage: (cmid, bmid) => broker.sendClientAck(cmid, bmid)
+          ackClientMessage: (cmid, bmid) => broker.sendClientAck(cmid, bmid),
+          isOwnPubkey: (pubkey) => {
+            const lower = pubkey.toLowerCase();
+            if (lower === ownMember)
+              return true;
+            return sessionBrokersByPubkey.has(lower);
+          },
+          recipientPubkey: mesh.pubkey,
+          recipientKind: "member"
         });
       }
     });
@@ -12109,8 +12160,6 @@ async function runDaemon(opts = {}) {
 `));
     brokers.set(mesh.slug, broker);
   }
-  const sessionBrokers = new Map;
-  const sessionBrokersByPubkey = new Map;
   let drain = null;
   drain = startDrainWorker({
     db: outboxDb,
@@ -12142,6 +12191,7 @@ async function runDaemon(opts = {}) {
         prior.close().catch(() => {});
       }
       const sessionSecretKeyHex = info.presence.sessionSecretKey;
+      const sessionPubkeyHex = info.presence.sessionPubkey;
       const client = new SessionBrokerClient({
         mesh: meshConfig,
         sessionPubkey: info.presence.sessionPubkey,
@@ -12159,7 +12209,9 @@ async function runDaemon(opts = {}) {
             meshSlug: meshConfig.slug,
             recipientSecretKeyHex: meshConfig.secretKey,
             sessionSecretKeyHex,
-            ackClientMessage: (cmid, bmid) => client.sendClientAck(cmid, bmid)
+            ackClientMessage: (cmid, bmid) => client.sendClientAck(cmid, bmid),
+            recipientPubkey: sessionPubkeyHex,
+            recipientKind: "session"
           });
         }
       });
@@ -12207,6 +12259,7 @@ async function runDaemon(opts = {}) {
   }
   process.stdout.write(JSON.stringify({
     msg: "daemon_started",
+    version: VERSION,
     pid: process.pid,
     sock: DAEMON_PATHS.SOCK_FILE,
     tcp: tcpEnabled ? `127.0.0.1:47823` : null,
@@ -12262,6 +12315,7 @@ var init_run = __esm(() => {
   init_inbound();
   init_identity();
   init_facade();
+  init_urls();
 });
 
 // src/daemon/service-install.ts
@@ -12481,11 +12535,17 @@ async function runDaemonCommand(sub, opts, rest = []) {
       return printDaemonUsage();
     case "up":
     case "start":
+      if (opts.mesh) {
+        process.stderr.write(`[claudemesh] --mesh on \`daemon up\` is deprecated; the daemon attaches to every joined mesh automatically. ` + `Ignoring --mesh ${opts.mesh}.
+`);
+      }
+      if (opts.displayName) {
+        process.stderr.write(`[claudemesh] --name on \`daemon up\` is deprecated; per-mesh display names live in config.json (set at join time), ` + `and session display names come from \`claudemesh launch --name\`. Ignoring --name ${opts.displayName}.
+`);
+      }
       return runDaemon({
         tcpEnabled: !opts.noTcp,
-        publicHealthCheck: opts.publicHealth,
-        mesh: opts.mesh,
-        displayName: opts.displayName
+        publicHealthCheck: opts.publicHealth
       });
     case "help":
     case "--help":
@@ -12528,11 +12588,10 @@ COMMANDS
   accept-host                  pin the current host fingerprint
   outbox list                  list local outbox rows (newest first)
   outbox requeue <id>          re-enqueue an aborted / dead outbox row
-  install-service --mesh <s>   write launchd (macOS) / systemd-user (Linux) unit
+  install-service              write launchd (macOS) / systemd-user (Linux) unit
   uninstall-service            remove the platform service unit
 
 OPTIONS
-  --mesh <slug>                attach to / target this mesh
   --name <displayName>         override CLAUDEMESH_DISPLAY_NAME
   --no-tcp                     disable the loopback TCP listener (UDS only)
   --public-health              expose /v1/health unauthenticated on TCP
@@ -12640,11 +12699,17 @@ async function runInstallService(opts) {
       return 1;
     }
   }
+  if (opts.mesh) {
+    process.stderr.write(`[claudemesh] --mesh on \`daemon install-service\` is deprecated and ignored; the daemon attaches to every joined mesh.
+`);
+  }
+  if (opts.displayName) {
+    process.stderr.write(`[claudemesh] --name on \`daemon install-service\` is deprecated and ignored; per-mesh names live in config.json, session names come from \`claudemesh launch --name\`.
+`);
+  }
   try {
     const r = installService2({
-      binaryPath: binary,
-      ...opts.mesh ? { meshSlug: opts.mesh } : {},
-      ...opts.displayName ? { displayName: opts.displayName } : {}
+      binaryPath: binary
     });
     if (opts.json) {
       process.stdout.write(JSON.stringify({ ok: true, ...r }) + `
@@ -18796,11 +18861,23 @@ ${mf.allowed_tools.map((t) => `  - ${t}`).join(`
     } else if (ev.kind === "peer_join" || ev.kind === "peer_leave" || ev.kind === "system") {
       const d = ev.data;
       const eventName = String(d.event ?? ev.kind);
+      const renderPeerLine = (verb) => {
+        const name = String(d.name ?? "unknown");
+        const pubkey = String(d.pubkey ?? "");
+        const pubkeyTag = pubkey ? ` (${pubkey.slice(0, 8)})` : "";
+        const groups = Array.isArray(d.groups) ? d.groups : [];
+        const groupNames = groups.map((g) => typeof g === "object" && g !== null && ("name" in g) ? String(g.name) : typeof g === "string" ? g : "").filter(Boolean);
+        const groupsTag = groupNames.length > 0 ? ` [${groupNames.join(", ")}]` : "";
+        const lastSeen = typeof d.lastSeenAt === "string" ? d.lastSeenAt : null;
+        const summary = typeof d.summary === "string" && d.summary.trim() ? d.summary.trim() : null;
+        const returningTail = lastSeen ? ` — last seen ${new Date(lastSeen).toLocaleTimeString()}${summary ? ` · "${summary.slice(0, 80)}"` : ""}` : "";
+        return `[system] Peer "${name}"${pubkeyTag}${groupsTag} ${verb} the mesh${returningTail}`;
+      };
       let content;
       if (ev.kind === "peer_join") {
-        content = `[system] Peer "${String(d.name ?? "unknown")}" joined the mesh`;
+        content = renderPeerLine(eventName === "peer_returned" ? "returned to" : "joined");
       } else if (ev.kind === "peer_leave") {
-        content = `[system] Peer "${String(d.name ?? "unknown")}" left the mesh`;
+        content = renderPeerLine("left");
       } else {
         content = `[system] ${eventName}: ${JSON.stringify(d).slice(0, 240)}`;
       }
@@ -18812,7 +18889,12 @@ ${mf.allowed_tools.map((t) => `  - ${t}`).join(`
             meta: {
               kind: "system",
               event: eventName,
-              mesh_slug: String(d.mesh ?? "")
+              mesh_slug: String(d.mesh ?? ""),
+              ...typeof d.name === "string" ? { peer_name: d.name } : {},
+              ...typeof d.pubkey === "string" ? { peer_pubkey: d.pubkey } : {},
+              ...Array.isArray(d.groups) ? { peer_groups: JSON.stringify(d.groups) } : {},
+              ...typeof d.lastSeenAt === "string" ? { peer_last_seen_at: d.lastSeenAt } : {},
+              ...typeof d.summary === "string" ? { peer_summary: d.summary } : {}
             }
           }
         });
@@ -19934,16 +20016,18 @@ Security
   claudemesh backup [file]         encrypt config → portable recovery file
   claudemesh restore <file>        restore config from a backup file
 
-Daemon  (long-lived peer mesh runtime, v0.9.0)
-  claudemesh daemon up             start daemon (alias: start) [--mesh <slug>] [--no-tcp]
+Daemon  (long-lived peer mesh runtime — universal across every joined mesh)
+  claudemesh daemon up             start daemon (alias: start) [--no-tcp]
   claudemesh daemon status         show running pid + IPC health [--json]
   claudemesh daemon down           stop daemon (alias: stop)
   claudemesh daemon version        ipc + schema version of running daemon
   claudemesh daemon outbox list    list local outbox rows [--failed|--pending|--inflight|--done]
   claudemesh daemon outbox requeue <id>   re-enqueue an aborted/dead row [--new-client-id <id>]
   claudemesh daemon accept-host    pin current host fingerprint
-  claudemesh daemon install-service --mesh <slug>   write launchd / systemd-user unit
-  claudemesh daemon uninstall-service               remove the unit
+  claudemesh daemon install-service        write launchd / systemd-user unit
+  claudemesh daemon uninstall-service      remove the unit
+  Note: the daemon attaches to every mesh in ~/.claudemesh/config.json
+  automatically; --mesh on up / install-service is deprecated and ignored.
 
 Setup
   claudemesh install               register MCP server + hooks
@@ -21045,4 +21129,4 @@ main().catch((err) => {
   process.exit(EXIT.INTERNAL_ERROR);
 });
 
-//# debugId=99681AB539B313DF64756E2164756E21
+//# debugId=80324EA6AC54078664756E2164756E21