claudemesh-cli 1.25.0 → 1.26.0

package/dist/entrypoints/cli.js

@@ -103,7 +103,7 @@ __export(exports_urls, {
   VERSION: () => VERSION,
   URLS: () => URLS
 });
-var URLS, VERSION = "1.25.0", env;
+var URLS, VERSION = "1.26.0", env;
 var init_urls = __esm(() => {
   URLS = {
     BROKER: process.env.CLAUDEMESH_BROKER_URL ?? "wss://ic.claudemesh.com/ws",
@@ -6944,7 +6944,8 @@ async function trySendViaDaemon(args) {
         to: args.to,
         message: args.message,
         priority: args.priority,
-        ...args.idempotencyKey ? { client_message_id: args.idempotencyKey } : {}
+        ...args.idempotencyKey ? { client_message_id: args.idempotencyKey } : {},
+        ...args.expectedMesh ? { mesh: args.expectedMesh } : {}
       }
     });
     if (res.status === 202 || res.status === 200) {
@@ -8908,10 +8909,9 @@ function startIpcServer(opts) {
     outboxDb: opts.outboxDb,
     inboxDb: opts.inboxDb,
     bus: opts.bus,
-    broker: opts.broker,
-    onPendingInserted: opts.onPendingInserted,
-    meshSecretKey: opts.meshSecretKey,
-    meshSlug: opts.meshSlug
+    brokers: opts.brokers,
+    meshConfigs: opts.meshConfigs,
+    onPendingInserted: opts.onPendingInserted
   });
   if (existsSync9(DAEMON_PATHS.SOCK_FILE)) {
     try {
@@ -9021,34 +9021,58 @@ function makeHandler(opts) {
       return;
     }
     if (req.method === "GET" && url.pathname === "/v1/peers") {
-      if (!opts.broker) {
+      if (!opts.brokers || opts.brokers.size === 0) {
         respond(res, 503, { error: "broker not initialised" });
         return;
       }
+      const filterMesh = url.searchParams.get("mesh") ?? undefined;
       try {
-        const peers = await opts.broker.listPeers();
-        respond(res, 200, { peers });
+        const all = [];
+        for (const [slug, b] of opts.brokers.entries()) {
+          if (filterMesh && filterMesh !== slug)
+            continue;
+          try {
+            const peers = await b.listPeers();
+            for (const p of peers)
+              all.push({ ...p, mesh: slug });
+          } catch (e) {
+            opts.log("warn", "ipc_peers_broker_failed", { mesh: slug, err: String(e) });
+          }
+        }
+        respond(res, 200, { peers: all });
       } catch (e) {
         respond(res, 502, { error: "broker_unreachable", detail: String(e) });
       }
       return;
     }
     if (req.method === "GET" && url.pathname === "/v1/skills") {
-      if (!opts.broker) {
+      if (!opts.brokers || opts.brokers.size === 0) {
         respond(res, 503, { error: "broker not initialised" });
         return;
       }
       const query = url.searchParams.get("query") ?? undefined;
+      const filterMesh = url.searchParams.get("mesh") ?? undefined;
       try {
-        const skills = await opts.broker.listSkills(query);
-        respond(res, 200, { skills });
+        const all = [];
+        for (const [slug, b] of opts.brokers.entries()) {
+          if (filterMesh && filterMesh !== slug)
+            continue;
+          try {
+            const skills = await b.listSkills(query);
+            for (const s of skills)
+              all.push({ ...s, mesh: slug });
+          } catch (e) {
+            opts.log("warn", "ipc_skills_broker_failed", { mesh: slug, err: String(e) });
+          }
+        }
+        respond(res, 200, { skills: all });
       } catch (e) {
         respond(res, 502, { error: "broker_unreachable", detail: String(e) });
       }
       return;
     }
     if (req.method === "GET" && url.pathname.startsWith("/v1/skills/")) {
-      if (!opts.broker) {
+      if (!opts.brokers || opts.brokers.size === 0) {
         respond(res, 503, { error: "broker not initialised" });
         return;
       }
@@ -9057,20 +9081,25 @@ function makeHandler(opts) {
         respond(res, 400, { error: "missing skill name" });
         return;
       }
+      const filterMesh = url.searchParams.get("mesh") ?? undefined;
       try {
-        const skill = await opts.broker.getSkill(name);
-        if (!skill) {
-          respond(res, 404, { error: "skill_not_found", name });
-          return;
+        for (const [slug, b] of opts.brokers.entries()) {
+          if (filterMesh && filterMesh !== slug)
+            continue;
+          const skill = await b.getSkill(name).catch(() => null);
+          if (skill) {
+            respond(res, 200, { skill: { ...skill, mesh: slug } });
+            return;
+          }
         }
-        respond(res, 200, { skill });
+        respond(res, 404, { error: "skill_not_found", name });
       } catch (e) {
         respond(res, 502, { error: "broker_unreachable", detail: String(e) });
       }
       return;
     }
     if (req.method === "POST" && url.pathname === "/v1/profile") {
-      if (!opts.broker) {
+      if (!opts.brokers || opts.brokers.size === 0) {
         respond(res, 503, { error: "broker not initialised" });
         return;
       }
@@ -9080,26 +9109,34 @@ function makeHandler(opts) {
           respond(res, 400, { error: "expected JSON object" });
           return;
         }
+        const requested = (typeof body.mesh === "string" ? body.mesh : url.searchParams.get("mesh")) || null;
+        const targets = requested ? [opts.brokers.get(requested)].filter(Boolean) : [...opts.brokers.values()];
+        if (targets.length === 0) {
+          respond(res, 404, { error: "mesh_not_attached", mesh: requested });
+          return;
+        }
         const updates = {};
-        if (typeof body.summary === "string")
-          opts.broker.setSummary(body.summary);
-        if (body.status === "idle" || body.status === "working" || body.status === "dnd")
-          opts.broker.setStatus(body.status);
-        if (typeof body.visible === "boolean")
-          opts.broker.setVisible(body.visible);
-        const profile = {};
-        if (typeof body.avatar === "string")
-          profile.avatar = body.avatar;
-        if (typeof body.title === "string")
-          profile.title = body.title;
-        if (typeof body.bio === "string")
-          profile.bio = body.bio;
-        if (Array.isArray(body.capabilities))
-          profile.capabilities = body.capabilities.filter((c) => typeof c === "string");
-        if (Object.keys(profile).length > 0)
-          opts.broker.setProfile(profile);
+        for (const b of targets) {
+          if (typeof body.summary === "string")
+            b.setSummary(body.summary);
+          if (body.status === "idle" || body.status === "working" || body.status === "dnd")
+            b.setStatus(body.status);
+          if (typeof body.visible === "boolean")
+            b.setVisible(body.visible);
+          const profile = {};
+          if (typeof body.avatar === "string")
+            profile.avatar = body.avatar;
+          if (typeof body.title === "string")
+            profile.title = body.title;
+          if (typeof body.bio === "string")
+            profile.bio = body.bio;
+          if (Array.isArray(body.capabilities))
+            profile.capabilities = body.capabilities.filter((c) => typeof c === "string");
+          if (Object.keys(profile).length > 0)
+            b.setProfile(profile);
+        }
         Object.assign(updates, body);
-        respond(res, 200, { ok: true, applied: Object.keys(updates) });
+        respond(res, 200, { ok: true, applied: Object.keys(updates), meshes: requested ? [requested] : [...opts.brokers.keys()] });
       } catch (e) {
         respond(res, 400, { error: String(e) });
       }
@@ -9217,9 +9254,27 @@ function makeHandler(opts) {
           respond(res, 400, { error: parsed.error });
           return;
         }
-        if (opts.broker && opts.meshSecretKey) {
+        if (opts.brokers && opts.brokers.size > 0 && opts.meshConfigs) {
+          let chosenSlug = parsed.req.mesh ?? null;
+          if (!chosenSlug && opts.brokers.size === 1) {
+            chosenSlug = opts.brokers.keys().next().value;
+          }
+          if (!chosenSlug) {
+            respond(res, 400, {
+              error: "mesh_required",
+              detail: `daemon attached to ${opts.brokers.size} meshes; pass 'mesh' in request body`,
+              attached: [...opts.brokers.keys()]
+            });
+            return;
+          }
+          const broker = opts.brokers.get(chosenSlug);
+          const meshCfg = opts.meshConfigs.get(chosenSlug);
+          if (!broker || !meshCfg) {
+            respond(res, 404, { error: "mesh_not_attached", mesh: chosenSlug });
+            return;
+          }
           try {
-            const routed = await resolveAndEncrypt(parsed.req, opts.broker, opts.meshSecretKey, opts.meshSlug ?? null);
+            const routed = await resolveAndEncrypt(parsed.req, broker, meshCfg.secretKey, chosenSlug);
             parsed.req.target_spec = routed.target_spec;
             parsed.req.ciphertext = routed.ciphertext;
             parsed.req.nonce = routed.nonce;
@@ -9321,6 +9376,7 @@ function parseSendRequest(body, idempotencyHeader) {
   const headerId = Array.isArray(idempotencyHeader) ? idempotencyHeader[0] : idempotencyHeader;
   const client_message_id = typeof b.client_message_id === "string" && b.client_message_id.trim() ? b.client_message_id.trim() : typeof headerId === "string" && headerId.trim() ? headerId.trim() : undefined;
   const reply_to_id = typeof b.reply_to_id === "string" ? b.reply_to_id : undefined;
+  const mesh = typeof b.mesh === "string" ? b.mesh.trim() : undefined;
   return {
     req: {
       to,
@@ -9330,7 +9386,8 @@ function parseSendRequest(body, idempotencyHeader) {
       reply_to_id,
       client_message_id,
       destination_kind,
-      destination_ref
+      destination_ref,
+      mesh
     }
   };
 }
@@ -9796,6 +9853,17 @@ async function drainOnce(opts, log2) {
     if (markInflight(opts.db, row.id, now) === 0)
       continue;
     const fpHex = bufferToHex(row.request_fingerprint);
+    let broker;
+    if (row.mesh) {
+      broker = opts.brokers.get(row.mesh);
+    } else if (opts.brokers.size === 1) {
+      broker = opts.brokers.values().next().value;
+    }
+    if (!broker) {
+      log2("warn", "drain_no_broker_for_mesh", { id: row.id, mesh: row.mesh ?? "(null)" });
+      markDead(opts.db, row.id, `no_broker_for_mesh:${row.mesh ?? "null"}`);
+      continue;
+    }
     let targetSpec;
     let nonce;
     let ciphertext;
@@ -9813,7 +9881,7 @@ async function drainOnce(opts, log2) {
     }
     let res;
     try {
-      res = await opts.broker.send({
+      res = await broker.send({
         targetSpec,
         priority,
         nonce,
@@ -10159,10 +10227,10 @@ async function runDaemon(opts = {}) {
   }
   const bus = new EventBus;
   const cfg = readConfig();
-  let mesh = null;
+  let meshes;
   if (opts.mesh) {
-    mesh = cfg.meshes.find((m) => m.slug === opts.mesh) ?? null;
-    if (!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)"}
@@ -10173,8 +10241,7 @@ async function runDaemon(opts = {}) {
       } catch {}
       return 2;
     }
-  } else if (cfg.meshes.length === 1) {
-    mesh = cfg.meshes[0];
+    meshes = [found];
   } else if (cfg.meshes.length === 0) {
     process.stderr.write(`no mesh joined; run \`claudemesh join <invite-url>\` first
 `);
@@ -10184,43 +10251,41 @@ async function runDaemon(opts = {}) {
     } catch {}
     return 2;
   } else {
-    process.stderr.write(`multiple meshes joined; pass --mesh <slug>
-`);
-    process.stderr.write(`available: ${cfg.meshes.map((m) => m.slug).join(", ")}
-`);
-    releaseSingletonLock();
-    try {
-      outboxDb.close();
-    } catch {}
-    return 2;
-  }
-  const broker = new DaemonBrokerClient(mesh, {
-    displayName: opts.displayName,
-    onStatusChange: (s) => {
-      process.stdout.write(JSON.stringify({
-        msg: "broker_status",
-        status: s,
-        mesh: mesh.slug,
-        ts: new Date().toISOString()
-      }) + `
+    meshes = cfg.meshes;
+  }
+  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",
+          status: s,
+          mesh: mesh.slug,
+          ts: new Date().toISOString()
+        }) + `
 `);
-      bus.publish("broker_status", { mesh: mesh.slug, status: s });
-    },
-    onPush: (m) => {
-      const sessionKeys = broker.getSessionKeys();
-      handleBrokerPush(m, {
-        db: inboxDb,
-        bus,
-        meshSlug: mesh.slug,
-        recipientSecretKeyHex: mesh.secretKey,
-        sessionSecretKeyHex: sessionKeys?.sessionSecretKey
-      });
-    }
-  });
-  broker.connect().catch((err) => process.stderr.write(`broker connect failed: ${String(err)}
+        bus.publish("broker_status", { mesh: mesh.slug, status: s });
+      },
+      onPush: (m) => {
+        const sessionKeys = broker.getSessionKeys();
+        handleBrokerPush(m, {
+          db: inboxDb,
+          bus,
+          meshSlug: mesh.slug,
+          recipientSecretKeyHex: mesh.secretKey,
+          sessionSecretKeyHex: sessionKeys?.sessionSecretKey
+        });
+      }
+    });
+    broker.connect().catch((err) => process.stderr.write(`broker connect failed for ${mesh.slug}: ${String(err)}
 `));
+    brokers.set(mesh.slug, broker);
+  }
   let drain = null;
-  drain = startDrainWorker({ db: outboxDb, broker });
+  drain = startDrainWorker({ db: outboxDb, brokers });
   const ipc2 = startIpcServer({
     localToken,
     tcpEnabled,
@@ -10228,10 +10293,9 @@ async function runDaemon(opts = {}) {
     outboxDb,
     inboxDb,
     bus,
-    broker,
-    onPendingInserted: () => drain?.wake(),
-    meshSecretKey: mesh.secretKey,
-    meshSlug: mesh.slug
+    brokers,
+    meshConfigs,
+    onPendingInserted: () => drain?.wake()
   });
   try {
     await ipc2.ready;
@@ -10246,7 +10310,7 @@ async function runDaemon(opts = {}) {
     pid: process.pid,
     sock: DAEMON_PATHS.SOCK_FILE,
     tcp: tcpEnabled ? `127.0.0.1:47823` : null,
-    mesh: mesh.slug,
+    meshes: meshes.map((m) => m.slug),
     ts: new Date().toISOString()
   }) + `
 `);
@@ -10259,7 +10323,11 @@ async function runDaemon(opts = {}) {
 `);
     if (drain)
       await drain.close();
-    await broker.close();
+    for (const b of brokers.values()) {
+      try {
+        await b.close();
+      } catch {}
+    }
     await ipc2.close();
     try {
       outboxDb.close();
@@ -18594,4 +18662,4 @@ main().catch((err) => {
   process.exit(EXIT.INTERNAL_ERROR);
 });
 
-//# debugId=EC115E4068A7B5F664756E2164756E21
+//# debugId=3BADD117052552A564756E2164756E21