claudemesh-cli 1.34.9 → 1.34.11

package/dist/entrypoints/cli.js

@@ -104,7 +104,7 @@ __export(exports_urls, {
   VERSION: () => VERSION,
   URLS: () => URLS
 });
-var URLS, VERSION = "1.34.9", env;
+var URLS, VERSION = "1.34.11", env;
 var init_urls = __esm(() => {
   URLS = {
     BROKER: process.env.CLAUDEMESH_BROKER_URL ?? "wss://ic.claudemesh.com/ws",
@@ -4339,7 +4339,7 @@ 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)
@@ -4353,7 +4353,7 @@ async function warnIfDaemonStale(quiet) {
     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` (or restart the launchd / systemd-user unit).");
+    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) {
@@ -9615,6 +9615,11 @@ function migrateInbox(db) {
     db.exec(`ALTER TABLE inbox ADD COLUMN seen_at INTEGER`);
     db.exec(`CREATE INDEX IF NOT EXISTS inbox_seen_at ON inbox(seen_at)`);
   }
+  if (!cols.some((c) => c.name === "recipient_pubkey")) {
+    db.exec(`ALTER TABLE inbox ADD COLUMN recipient_pubkey TEXT`);
+    db.exec(`ALTER TABLE inbox ADD COLUMN recipient_kind TEXT`);
+    db.exec(`CREATE INDEX IF NOT EXISTS inbox_recipient ON inbox(recipient_pubkey)`);
+  }
 }
 function insertIfNew(db, row) {
   const before = db.prepare(`SELECT id FROM inbox WHERE client_message_id = ?`).get(row.client_message_id);
@@ -9623,10 +9628,11 @@ function insertIfNew(db, row) {
   db.prepare(`
     INSERT INTO inbox (
       id, client_message_id, broker_message_id, mesh, topic,
-      sender_pubkey, sender_name, body, meta, received_at, reply_to_id
-    ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+      sender_pubkey, sender_name, body, meta, received_at, reply_to_id,
+      recipient_pubkey, recipient_kind
+    ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
     ON CONFLICT(client_message_id) DO NOTHING
-  `).run(row.id, row.client_message_id, row.broker_message_id, row.mesh, row.topic, row.sender_pubkey, row.sender_name, row.body, row.meta, row.received_at, row.reply_to_id);
+  `).run(row.id, row.client_message_id, row.broker_message_id, row.mesh, row.topic, row.sender_pubkey, row.sender_name, row.body, row.meta, row.received_at, row.reply_to_id, row.recipient_pubkey, row.recipient_kind);
   const after = db.prepare(`SELECT id FROM inbox WHERE client_message_id = ?`).get(row.client_message_id);
   return after?.id === row.id ? row.id : null;
 }
@@ -9652,9 +9658,19 @@ function listInbox(db, p) {
   if (p.unreadOnly === true) {
     where.push("seen_at IS NULL");
   }
+  if (p.recipientPubkey) {
+    const ors = ["recipient_pubkey IS NULL", "recipient_pubkey = ?"];
+    args.push(p.recipientPubkey);
+    if (p.recipientMemberPubkey) {
+      ors.push("recipient_pubkey = ?");
+      args.push(p.recipientMemberPubkey);
+    }
+    where.push(`(${ors.join(" OR ")})`);
+  }
   const sql = `
     SELECT id, client_message_id, broker_message_id, mesh, topic,
-           sender_pubkey, sender_name, body, meta, received_at, reply_to_id, seen_at
+           sender_pubkey, sender_name, body, meta, received_at, reply_to_id, seen_at,
+           recipient_pubkey, recipient_kind
       FROM inbox
      ${where.length ? "WHERE " + where.join(" AND ") : ""}
      ORDER BY received_at DESC
@@ -9719,7 +9735,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");
@@ -9729,7 +9767,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
@@ -10146,7 +10188,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") {
@@ -10436,12 +10487,17 @@ function makeHandler(opts) {
       const meshFilter = meshFromCtx(url.searchParams.get("mesh")) ?? undefined;
       const unreadOnly = url.searchParams.get("unread_only") === "true";
       const markSeen = url.searchParams.get("mark_seen") !== "false";
+      const recipientPubkey = session?.presence?.sessionPubkey;
+      const meshCfgForRecipient = session?.mesh ? opts.meshConfigs?.get(session.mesh) : undefined;
+      const recipientMemberPubkey = meshCfgForRecipient?.pubkey;
       const rows = listInbox(opts.inboxDb, {
         since: Number.isFinite(since) ? since : undefined,
         topic,
         fromPubkey,
         ...meshFilter ? { mesh: meshFilter } : {},
         unreadOnly,
+        ...recipientPubkey ? { recipientPubkey } : {},
+        ...recipientMemberPubkey ? { recipientMemberPubkey } : {},
         limit: Number.isFinite(limit ?? NaN) ? limit : undefined
       });
       let flippedCount = 0;
@@ -10463,7 +10519,9 @@ function makeHandler(opts) {
           body: r.body,
           received_at: new Date(r.received_at).toISOString(),
           reply_to_id: r.reply_to_id,
-          seen_at: r.seen_at ? new Date(r.seen_at).toISOString() : null
+          seen_at: r.seen_at ? new Date(r.seen_at).toISOString() : null,
+          recipient_pubkey: r.recipient_pubkey,
+          recipient_kind: r.recipient_kind
         })),
         marked_seen: flippedCount
       });
@@ -11839,7 +11897,9 @@ async function handleBrokerPush(msg, ctx) {
     body,
     meta: createdAt ? JSON.stringify({ created_at: createdAt }) : null,
     received_at: Date.now(),
-    reply_to_id: replyToId
+    reply_to_id: replyToId,
+    recipient_pubkey: ctx.recipientPubkey ?? null,
+    recipient_kind: ctx.recipientKind ?? null
   });
   ctx.ackClientMessage?.(clientMessageId, brokerMessageId);
   if (!inserted)
@@ -11857,7 +11917,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) {
@@ -12069,22 +12131,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();
@@ -12092,9 +12139,8 @@ 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;
@@ -12102,7 +12148,6 @@ async function runDaemon(opts = {}) {
   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",
@@ -12130,7 +12175,9 @@ async function runDaemon(opts = {}) {
             if (lower === ownMember)
               return true;
             return sessionBrokersByPubkey.has(lower);
-          }
+          },
+          recipientPubkey: mesh.pubkey,
+          recipientKind: "member"
         });
       }
     });
@@ -12169,6 +12216,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,
@@ -12186,7 +12234,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"
           });
         }
       });
@@ -12234,6 +12284,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,
@@ -12289,6 +12340,7 @@ var init_run = __esm(() => {
   init_inbound();
   init_identity();
   init_facade();
+  init_urls();
 });
 
 // src/daemon/service-install.ts
@@ -12508,11 +12560,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":
@@ -12555,11 +12613,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
@@ -12667,11 +12724,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 }) + `
@@ -19978,16 +20041,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
@@ -21089,4 +21154,4 @@ main().catch((err) => {
   process.exit(EXIT.INTERNAL_ERROR);
 });
 
-//# debugId=7232363C9624744664756E2164756E21
+//# debugId=3D8CCE13DCC94B5264756E2164756E21