claudemesh-cli 1.34.2 → 1.34.4

package/dist/entrypoints/cli.js

@@ -104,7 +104,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",
@@ -15721,9 +15721,13 @@ description: Use when the user asks to send a message to a peer Claude session,
 
 **You invoke claudemesh exclusively through the \`claudemesh\` CLI via Bash.** There are no MCP tools to call — \`tools/list\` returns empty for the claudemesh MCP server. The MCP server exists only to deliver inbound peer messages as \`<channel source="claudemesh">\` interrupts mid-turn. Everything else is CLI.
 
+## Launch welcome (\`kind: "welcome"\`) — 1.34.2+
+
+5 seconds after Claude Code attaches to claudemesh via \`claudemesh launch\`, the MCP server emits ONE \`<channel source="claudemesh">\` push with \`meta.kind: "welcome"\`. It carries identity (\`self_display_name\`, \`self_session_pubkey\`, \`self_role\`), the active \`mesh_slug\`, live \`peer_count\` + \`peer_names\`, recent \`unread_count\` + \`latest_message_ids\`, and a CLI hint line. Treat it as the "mesh is connected" handshake — read it once, internalize identity + peers + inbox state, and use it to decide whether to act on unread items right away. Do NOT reply to a welcome push the way you reply to a DM; it has no sender.
+
 ## When you receive a \`<channel source="claudemesh">\` message
 
-Respond IMMEDIATELY. Pause your current task, reply via \`claudemesh send\`, then resume. Read \`from_name\`, \`mesh_slug\`, and \`priority\` from the channel attributes. Reply by setting \`<to>\` to the sender's \`from_name\`. Do not ignore low-priority messages — acknowledge them briefly even if you defer action. If the channel meta contains \`subtype: reminder\`, this is a scheduled reminder you set yourself — act on it.
+Respond IMMEDIATELY (unless \`meta.kind\` is \`"welcome"\` or \`"system"\` — those are informational, no reply needed). Pause your current task, reply via \`claudemesh send\`, then resume. Read \`from_name\`, \`mesh_slug\`, and \`priority\` from the channel attributes. Reply by setting \`<to>\` to the sender's \`from_name\`. Do not ignore low-priority messages — acknowledge them briefly even if you defer action. If the channel meta contains \`subtype: reminder\`, this is a scheduled reminder you set yourself — act on it.
 
 ### Channel attributes (everything you need to reply is in the push)
 
@@ -15731,14 +15735,17 @@ The \`<channel>\` interrupt carries these attributes — no lookup needed:
 
 | Attribute | What it is |
 |---|---|
-| \`from_name\` | Sender's display name. **Use as \`to\` in your reply** for DMs. |
-| \`from_pubkey\` | Sender's session pubkey (hex). Stable per-session. |
-| \`from_member_id\` | Sender's stable mesh.member id. Survives display-name changes — the canonical id. |
+| \`from_name\` | Sender's display name. **Use as \`to\` in your reply** for DMs. Empty/absent on \`kind: "welcome"\` and \`kind: "system"\`. |
+| \`from_pubkey\` | Sender's **session pubkey** (hex, ephemeral per-launch). Since 1.34.0 this is the session pubkey of the launched session that originated the send, NOT the daemon's stable member pubkey — sibling sessions of the same human are correctly disambiguated. |
+| \`from_session_pubkey\` | Same as \`from_pubkey\` for session-originated DMs. Kept as a separate key so the model never confuses session vs member identity when a control-plane source is involved. |
+| \`from_member_id\` / \`from_member_pubkey\` | Sender's stable mesh.member id / pubkey. Survives display-name and session rotation. Use to recognize "the same human across multiple Claude Code windows". |
 | \`mesh_slug\` | Mesh the message arrived on. Pass via \`--mesh <slug>\` if the parent isn't on the same mesh. |
 | \`priority\` | \`now\` / \`next\` / \`low\`. |
 | \`message_id\` | Server-side id of THIS message. **Pass to \`--reply-to <id>\` to thread your reply** in topic posts. |
+| \`client_message_id\` | Sender-stable idempotency id (UUID). Survives broker restarts; safe to log. |
 | \`topic\` | Set when the source is a topic post. Reply via \`topic post <topic> --reply-to <message_id>\`. |
 | \`reply_to_id\` | Set when the message itself is a reply to a previous one — render thread context. |
+| \`kind\` (welcome/system meta only) | \`"welcome"\` for the launch handshake, \`"system"\` for peer_join/peer_leave/etc. — neither needs a reply. |
 
 **Reply patterns:**
 
@@ -16082,15 +16089,19 @@ claudemesh message send <p> "..." --priority now       # bypass busy gates
 claudemesh message send <p> "..." --priority next      # default
 claudemesh message send <p> "..." --priority low       # pull-only
 
-# inbox (alias: claudemesh inbox)
-claudemesh message inbox
-claudemesh message inbox --json
+# inbox (alias: claudemesh inbox) — 1.34.0+ reads from inbox.db via daemon IPC
+claudemesh inbox                                       # all attached meshes, last 100
+claudemesh inbox --mesh <slug>                         # scoped to one mesh
+claudemesh inbox --mesh <slug> --limit 20              # custom cap
+claudemesh inbox --json                                # full row (sender_pubkey, mesh, body, received_at, …)
 
 # delivery status (alias: claudemesh msg-status <id>)
 claudemesh message status <message-id>
 claudemesh message status <message-id> --json
 \`\`\`
 
+**Inbox source (1.34.0+):** \`claudemesh inbox\` queries the daemon's persistent \`~/.claudemesh/daemon/inbox.db\` over IPC — it is NOT a fresh broker-WS buffer drain. Rows survive daemon restarts. Sender attribution is the actual session pubkey of the launched session that originated the send (NOT the stable member pubkey of the sender's daemon), so two sibling sessions of the same human appear as distinct rows.
+
 \`send\` JSON output: \`{"ok": true, "messageId": "...", "target": "..."}\`. Errors: \`{"ok": false, "error": "..."}\`.
 
 ### \`state\` — shared per-mesh key-value store
@@ -18170,9 +18181,12 @@ function bailNoDaemon() {
 `);
   process.exit(1);
 }
-function daemonGet(path2) {
+function daemonGet(path2, opts = {}) {
   return new Promise((resolve3, reject) => {
-    const req = httpRequest2({ socketPath: DAEMON_PATHS.SOCK_FILE, path: path2, method: "GET", timeout: 5000 }, (res) => {
+    const headers = {};
+    if (opts.sessionToken)
+      headers.Authorization = `ClaudeMesh-Session ${opts.sessionToken}`;
+    const req = httpRequest2({ socketPath: DAEMON_PATHS.SOCK_FILE, path: path2, method: "GET", timeout: 5000, headers }, (res) => {
       const chunks = [];
       res.on("data", (c) => chunks.push(c));
       res.on("end", () => {
@@ -18466,13 +18480,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);
@@ -18482,52 +18502,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 path2 = `/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(path2);
-    if (res.status !== 200) {
-      mcpLog("welcome_skip", { reason: "ipc_status", status: res.status });
-      return;
+    const path2 = selfMeshSlug ? `/v1/peers?mesh=${encodeURIComponent(selfMeshSlug)}` : "/v1/peers";
+    const { status, body } = await daemonGet(path2, { 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 });
     }
-    body = res.body;
   } catch (e) {
-    mcpLog("welcome_skip", { reason: "ipc_threw", err: String(e) });
-    return;
+    mcpLog("welcome_peers_lookup_failed", { err: String(e) });
   }
-  const items = Array.isArray(body.items) ? body.items : [];
-  if (items.length === 0) {
-    mcpLog("welcome_skip", { reason: "empty" });
-    return;
+  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;
+    }
+  } catch (e) {
+    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).`);
   }
-  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(`
+  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",
@@ -18535,13 +18598,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) });
   }
@@ -19416,7 +19488,9 @@ Message  (resource form)
                                           [--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 inbox         read persisted inbox       (alias: inbox)
+                                   flags: [--mesh <slug>] [--limit N] [--json]
+                                   reads ~/.claudemesh/daemon/inbox.db via daemon
   claudemesh message status <id>   delivery status            (alias: msg-status)
 
 Memory  (resource form)
@@ -20582,4 +20656,4 @@ main().catch((err) => {
   process.exit(EXIT.INTERNAL_ERROR);
 });
 
-//# debugId=FD137608913AB26764756E2164756E21
+//# debugId=A642AC8B680B8F3E64756E2164756E21