claudemesh-cli 1.34.2 → 1.34.4

package/dist/entrypoints/mcp.js

@@ -81,7 +81,7 @@ __export(exports_urls, {
   VERSION: () => VERSION,
   URLS: () => URLS
 });
-var URLS, VERSION = "1.34.2", env;
+var URLS, VERSION = "1.34.4", env;
 var init_urls = __esm(() => {
   URLS = {
     BROKER: process.env.CLAUDEMESH_BROKER_URL ?? "wss://ic.claudemesh.com/ws",
@@ -2632,6 +2632,44 @@ var init_facade3 = __esm(() => {
   init_errors();
 });
 
+// src/services/session/token.ts
+var exports_token = {};
+__export(exports_token, {
+  readSessionTokenFromEnv: () => readSessionTokenFromEnv,
+  mintSessionToken: () => mintSessionToken,
+  TOKEN_FILE_ENV: () => TOKEN_FILE_ENV
+});
+import { randomBytes as randomBytes3 } from "node:crypto";
+import { existsSync as existsSync2, readFileSync as readFileSync2, writeFileSync as writeFileSync2 } from "node:fs";
+function mintSessionToken(dir, fileName = "session-token") {
+  const token = randomBytes3(32).toString("hex");
+  const filePath = `${dir}/${fileName}`;
+  writeFileSync2(filePath, token, { mode: 384 });
+  return { token, filePath };
+}
+function readSessionTokenFromEnv(env2 = process.env) {
+  const direct = env2.CLAUDEMESH_IPC_TOKEN;
+  if (direct && /^[0-9a-f]{64}$/i.test(direct))
+    return direct.toLowerCase();
+  const path = env2[ENV_TOKEN_FILE];
+  if (!path)
+    return null;
+  try {
+    if (!existsSync2(path))
+      return null;
+    const raw = readFileSync2(path, "utf8").trim();
+    if (/^[0-9a-f]{64}$/i.test(raw))
+      return raw.toLowerCase();
+    return null;
+  } catch {
+    return null;
+  }
+}
+var ENV_TOKEN_FILE = "CLAUDEMESH_IPC_TOKEN_FILE", TOKEN_FILE_ENV;
+var init_token = __esm(() => {
+  TOKEN_FILE_ENV = ENV_TOKEN_FILE;
+});
+
 // src/mcp/server.ts
 import { Server } from "@modelcontextprotocol/sdk/server/index.js";
 import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
@@ -2643,12 +2681,12 @@ import {
   ListResourcesRequestSchema,
   ReadResourceRequestSchema
 } from "@modelcontextprotocol/sdk/types.js";
-import { existsSync as existsSync2, appendFileSync } from "node:fs";
+import { existsSync as existsSync3, appendFileSync } from "node:fs";
 import { request as httpRequest } from "node:http";
 import { join as join3 } from "node:path";
 async function daemonReady() {
   for (let i = 0;i < DAEMON_BOOT_RETRIES; i++) {
-    if (existsSync2(DAEMON_PATHS.SOCK_FILE))
+    if (existsSync3(DAEMON_PATHS.SOCK_FILE))
       return true;
     await new Promise((r) => setTimeout(r, DAEMON_BOOT_RETRY_MS));
   }
@@ -2666,9 +2704,12 @@ function bailNoDaemon() {
 `);
   process.exit(1);
 }
-function daemonGet(path) {
+function daemonGet(path, opts = {}) {
   return new Promise((resolve, reject) => {
-    const req = httpRequest({ socketPath: DAEMON_PATHS.SOCK_FILE, path, method: "GET", timeout: 5000 }, (res) => {
+    const headers = {};
+    if (opts.sessionToken)
+      headers.Authorization = `ClaudeMesh-Session ${opts.sessionToken}`;
+    const req = httpRequest({ socketPath: DAEMON_PATHS.SOCK_FILE, path, method: "GET", timeout: 5000, headers }, (res) => {
       const chunks = [];
       res.on("data", (c) => chunks.push(c));
       res.on("end", () => {
@@ -2962,13 +3003,19 @@ ${mf.allowed_tools.map((t) => `  - ${t}`).join(`
       } catch {}
     }
   });
+  let welcomeSent = false;
+  const WELCOME_GRACE_MS = 2000;
+  server.oninitialized = () => {
+    mcpLog("server_initialized");
+    if (welcomeSent)
+      return;
+    welcomeSent = true;
+    setTimeout(() => {
+      emitMeshWelcome(server, mcpLog);
+    }, WELCOME_GRACE_MS);
+  };
   const transport = new StdioServerTransport;
   await server.connect(transport);
-  const WELCOME_DELAY_MS = 5000;
-  const WELCOME_LOOKBACK_MS = 24 * 60 * 60 * 1000;
-  setTimeout(() => {
-    emitInboxWelcome(server, mcpLog, WELCOME_LOOKBACK_MS);
-  }, WELCOME_DELAY_MS);
   const keepalive = setInterval(() => {}, 1000);
   const shutdown = () => {
     clearInterval(keepalive);
@@ -2978,52 +3025,95 @@ ${mf.allowed_tools.map((t) => `  - ${t}`).join(`
   process.on("SIGTERM", shutdown);
   process.on("SIGINT", shutdown);
 }
-async function emitInboxWelcome(server, mcpLog, lookbackMs) {
-  const sinceIso = new Date(Date.now() - lookbackMs).toISOString();
-  const path = `/v1/inbox?since=${encodeURIComponent(sinceIso)}&limit=20`;
-  let body;
+async function emitMeshWelcome(server, mcpLog) {
+  const { readSessionTokenFromEnv: readSessionTokenFromEnv2 } = await Promise.resolve().then(() => (init_token(), exports_token));
+  const sessionToken = readSessionTokenFromEnv2();
+  let selfDisplayName;
+  let selfSessionPubkey;
+  let selfMeshSlug;
+  let selfRole;
+  if (sessionToken) {
+    try {
+      const { status, body } = await daemonGet("/v1/sessions/me", { sessionToken });
+      if (status === 200 && body?.session) {
+        selfDisplayName = body.session.displayName;
+        selfMeshSlug = body.session.mesh;
+        selfRole = body.session.role;
+        selfSessionPubkey = body.session.presence?.sessionPubkey;
+      }
+    } catch (e) {
+      mcpLog("welcome_self_lookup_failed", { err: String(e) });
+    }
+  }
+  let peerCount = -1;
+  let peerNames = [];
   try {
-    const res = await daemonGet(path);
-    if (res.status !== 200) {
-      mcpLog("welcome_skip", { reason: "ipc_status", status: res.status });
-      return;
+    const path = selfMeshSlug ? `/v1/peers?mesh=${encodeURIComponent(selfMeshSlug)}` : "/v1/peers";
+    const { status, body } = await daemonGet(path, { sessionToken });
+    if (status === 200 && Array.isArray(body?.peers)) {
+      const peers = body.peers;
+      const real = peers.filter((p) => {
+        const channel = String(p.channel ?? "");
+        const peerRole = String(p.peerRole ?? "");
+        const isInfra = channel === "claudemesh-daemon" || peerRole === "control-plane";
+        if (isInfra)
+          return false;
+        if (selfSessionPubkey && p.pubkey === selfSessionPubkey)
+          return false;
+        return true;
+      });
+      peerCount = real.length;
+      peerNames = real.map((p) => String(p.displayName ?? "unknown")).filter((n, i, arr) => arr.indexOf(n) === i).slice(0, 5);
+      mcpLog("welcome_peers_resolved", { total: peers.length, real: real.length });
+    } else {
+      mcpLog("welcome_peers_status", { status });
+    }
+  } catch (e) {
+    mcpLog("welcome_peers_lookup_failed", { err: String(e) });
+  }
+  const sinceIso = new Date(Date.now() - 86400000).toISOString();
+  const inboxPath = selfMeshSlug ? `/v1/inbox?mesh=${encodeURIComponent(selfMeshSlug)}&since=${encodeURIComponent(sinceIso)}&limit=20` : `/v1/inbox?since=${encodeURIComponent(sinceIso)}&limit=20`;
+  let inboxItems = [];
+  try {
+    const { status, body } = await daemonGet(inboxPath, { sessionToken });
+    if (status === 200 && Array.isArray(body?.items)) {
+      inboxItems = body.items;
     }
-    body = res.body;
   } catch (e) {
-    mcpLog("welcome_skip", { reason: "ipc_threw", err: String(e) });
-    return;
-  }
-  const items = Array.isArray(body.items) ? body.items : [];
-  if (items.length === 0) {
-    mcpLog("welcome_skip", { reason: "empty" });
-    return;
-  }
-  const byMesh = new Map;
-  for (const it of items) {
-    const meshSlug = String(it.mesh ?? "");
-    const arr = byMesh.get(meshSlug) ?? [];
-    arr.push(it);
-    byMesh.set(meshSlug, arr);
-  }
-  const preview = items.slice(0, 3).map((it) => {
-    const sender = String(it.sender_name ?? "unknown");
-    const senderPub = String(it.sender_pubkey ?? "").slice(0, 8);
-    const meshSlug = String(it.mesh ?? "");
-    const bodyText = (typeof it.body === "string" ? it.body : "(encrypted)").slice(0, 60);
-    const ts = String(it.received_at ?? "");
-    const time = ts ? new Date(ts).toLocaleTimeString() : "";
-    const tag = sender !== senderPub ? `${sender} (${senderPub})` : senderPub;
-    return `  ${tag} [${meshSlug}] ${time}: ${bodyText}`;
-  }).join(`
+    mcpLog("welcome_inbox_lookup_failed", { err: String(e) });
+  }
+  const lines = [];
+  const idTag = selfDisplayName ? `${selfDisplayName}${selfSessionPubkey ? ` (${selfSessionPubkey.slice(0, 8)})` : ""}${selfRole ? ` [${selfRole}]` : ""}` : "session";
+  const meshTag = selfMeshSlug ? ` on mesh \`${selfMeshSlug}\`` : "";
+  lines.push(`\uD83C\uDF10 [welcome] claudemesh connected — you are **${idTag}**${meshTag}.`);
+  if (peerCount === 0) {
+    lines.push(`\uD83D\uDC65 No other peers online right now.`);
+  } else if (peerCount > 0) {
+    const namesPreview = peerNames.join(", ");
+    const more = peerCount > peerNames.length ? ` …and ${peerCount - peerNames.length} more` : "";
+    lines.push(`\uD83D\uDC65 ${peerCount} peer${peerCount === 1 ? "" : "s"} online: ${namesPreview}${more}`);
+  } else {
+    lines.push(`\uD83D\uDC65 Peer list unavailable (daemon query failed).`);
+  }
+  if (inboxItems.length === 0) {
+    lines.push(`\uD83D\uDCE5 Inbox is empty (last 24h).`);
+  } else {
+    lines.push(`\uD83D\uDCE5 ${inboxItems.length} message${inboxItems.length === 1 ? "" : "s"} in inbox (last 24h):`);
+    for (const it of inboxItems.slice(0, 3)) {
+      const sender = String(it.sender_name ?? "unknown");
+      const senderPub = String(it.sender_pubkey ?? "").slice(0, 8);
+      const tag = sender !== senderPub ? `${sender} (${senderPub})` : senderPub;
+      const bodyText = (typeof it.body === "string" ? it.body : "(encrypted)").slice(0, 60);
+      const time = it.received_at ? new Date(String(it.received_at)).toLocaleTimeString() : "";
+      lines.push(`  ${tag} ${time}: ${bodyText}`);
+    }
+    if (inboxItems.length > 3)
+      lines.push(`  …and ${inboxItems.length - 3} more`);
+  }
+  lines.push(`\uD83D\uDCA1 Use: \`claudemesh peer list\` · \`claudemesh send <peer> <msg>\` · \`claudemesh inbox\``);
+  lines.push(`\uD83D\uDCDA Read the \`claudemesh\` skill (SKILL.md) for full CLI / channel / inbox reference if not yet in context.`);
+  const content = lines.join(`
 `);
-  const remainder = items.length > 3 ? `
-  …and ${items.length - 3} more` : "";
-  const meshList = [...byMesh.keys()].filter(Boolean).join(", ");
-  const header = `\uD83D\uDCE5 [welcome] ${items.length} message${items.length === 1 ? "" : "s"} in inbox from the last 24h${meshList ? ` (${meshList})` : ""}`;
-  const footer = `
-Run \`claudemesh inbox\` for full content.`;
-  const content = `${header}
-${preview}${remainder}${footer}`;
   try {
     await server.notification({
       method: "notifications/claude/channel",
@@ -3031,13 +3121,22 @@ ${preview}${remainder}${footer}`;
         content,
         meta: {
           kind: "welcome",
-          unread_count: items.length,
-          meshes: [...byMesh.keys()],
-          latest_message_ids: items.slice(0, 10).map((it) => String(it.id ?? ""))
+          self_display_name: selfDisplayName ?? "",
+          self_session_pubkey: selfSessionPubkey ?? "",
+          self_role: selfRole ?? "",
+          mesh_slug: selfMeshSlug ?? "",
+          peer_count: peerCount >= 0 ? peerCount : null,
+          peer_names: peerNames,
+          unread_count: inboxItems.length,
+          latest_message_ids: inboxItems.slice(0, 10).map((it) => String(it.id ?? ""))
         }
       }
     });
-    mcpLog("welcome_emitted", { count: items.length, meshes: [...byMesh.keys()] });
+    mcpLog("welcome_emitted", {
+      mesh: selfMeshSlug ?? "",
+      peer_count: peerCount,
+      unread_count: inboxItems.length
+    });
   } catch (err) {
     mcpLog("welcome_emit_failed", { err: String(err) });
   }
@@ -3154,4 +3253,4 @@ startMcpServer().catch((err) => {
   process.exit(1);
 });
 
-//# debugId=BF4B7D5AF5C8B94C64756E2164756E21
+//# debugId=37722A693A6DEC1564756E2164756E21