claudemesh-cli 1.8.0 → 1.9.3

package/README.md

@@ -2,7 +2,9 @@
 
 Peer mesh for Claude Code sessions. Connect multiple Claude Code instances into a shared mesh with real-time messaging, shared state, memory, file sharing, vector store, scheduled jobs, and more — all driven from the `claudemesh` CLI. The MCP server is a tool-less push-pipe that delivers inbound peer messages to Claude as `<channel>` interrupts; everything else lives behind CLI verbs that Claude learns from the auto-installed `claudemesh` skill.
 
-> **What's new in 1.8.0:** per-topic end-to-end encryption (v0.3.0 phase 3, CLI side). `claudemesh topic post <topic> <msg>` encrypts the body with `crypto_secretbox` under the topic's symmetric key — broker stores ciphertext only. `claudemesh topic tail` now decrypts v2 messages on render and runs a background re-seal loop every 30s, so new topic joiners get their sealed keys without manual action. `topic-key` cache is process-only — kill the CLI, the key forgets. Web dashboard reads v1 plaintext for now (phase 3.5 brings browser-side identity).
+> **What's new in 1.9.x:** topic threading + multi-session reliability fixes. `claudemesh topic post <topic> <msg> --reply-to <id>` threads a reply onto a previous topic message (full id or 8+ char prefix); `topic tail` renders `↳ in reply to <name>: "<snippet>"` above replies and shows a copyable `#xxxxxxxx` short id on every row. `<channel>` MCP attrs now carry `from_member_id`, `from_pubkey` (stable), `from_session_pubkey` (ephemeral), `message_id`, `topic`, `reply_to_id` — everything the recipient needs to reply directly. Broker fixes (v0.3.2): replies to a stale session pubkey now resolve to the owning member's live session instead of bouncing with "not online", and broadcast `*` no longer loopbacks decrypt-fail warnings to the sender's sibling sessions.
+>
+> **What was new in 1.8.0:** per-topic end-to-end encryption (v0.3.0 phase 3, CLI side). `claudemesh topic post <topic> <msg>` encrypts the body with `crypto_secretbox` under the topic's symmetric key — broker stores ciphertext only. `claudemesh topic tail` now decrypts v2 messages on render and runs a background re-seal loop every 30s, so new topic joiners get their sealed keys without manual action. `topic-key` cache is process-only — kill the CLI, the key forgets. Web dashboard reads v1 plaintext for now (phase 3.5 brings browser-side identity).
 >
 > **What was new in 1.7.0:** terminal parity for the v1.6.x server features. New verbs: `claudemesh topic tail` (live SSE message stream — Ctrl-C to exit), `claudemesh notification list` (recent `@you` mentions across topics), `claudemesh member list` (mesh roster with online dots, distinct from `peer list`'s live-session view). Each command auto-mints a 5-minute read-only apikey via the WebSocket and revokes it on exit, so no token plumbing is needed.
 >

package/dist/entrypoints/cli.js

@@ -88,7 +88,7 @@ __export(exports_urls, {
   VERSION: () => VERSION,
   URLS: () => URLS
 });
-var URLS, VERSION = "1.8.0", env;
+var URLS, VERSION = "1.9.3", env;
 var init_urls = __esm(() => {
   URLS = {
     BROKER: process.env.CLAUDEMESH_BROKER_URL ?? "wss://ic.claudemesh.com/ws",
@@ -2779,6 +2779,11 @@ class BrokerClient {
           messageId: String(msg.messageId ?? ""),
           meshId: String(msg.meshId ?? ""),
           senderPubkey,
+          ...msg.senderMemberPubkey ? { senderMemberPubkey: String(msg.senderMemberPubkey) } : {},
+          ...msg.senderMemberId ? { senderMemberId: String(msg.senderMemberId) } : {},
+          ...msg.senderName ? { senderName: String(msg.senderName) } : {},
+          ...msg.topic ? { topic: String(msg.topic) } : {},
+          ...msg.replyToId ? { replyToId: String(msg.replyToId) } : {},
           priority: msg.priority ?? "next",
           nonce,
           ciphertext,
@@ -7078,6 +7083,61 @@ var init_recall = __esm(() => {
   init_exit_codes();
 });
 
+// src/cli/validators.ts
+function validateMessageId(input) {
+  if (!input) {
+    return {
+      ok: false,
+      code: "missing",
+      reason: "message id is required",
+      expected: "32-char base62 id, or ≥8-char prefix"
+    };
+  }
+  if (input.length < 8) {
+    return {
+      ok: false,
+      code: "too_short",
+      reason: `id is ${input.length} chars, needs ≥8`,
+      expected: "8+ chars (paste from a previous send/post output)"
+    };
+  }
+  if (input.length > 32) {
+    return {
+      ok: false,
+      code: "too_long",
+      reason: `id is ${input.length} chars, max 32`,
+      expected: "trim trailing characters"
+    };
+  }
+  if (!BASE62_RE.test(input)) {
+    return {
+      ok: false,
+      code: "bad_charset",
+      reason: "id contains characters outside [A-Za-z0-9]",
+      expected: "base62 only"
+    };
+  }
+  return { ok: true, value: { value: input, isPrefix: input.length < 32 } };
+}
+function renderValidationError(args, write = (s) => process.stderr.write(s)) {
+  write(`  \x1B[31m✘\x1B[0m ${args.verb} ${args.input}
+`);
+  write(`     ${args.result.reason}.
+`);
+  if (args.result.expected) {
+    write(`     expected: ${args.result.expected}
+`);
+  }
+  if (args.nearest) {
+    write(`     did you mean: \x1B[36m${args.nearest}\x1B[0m
+`);
+  }
+}
+var BASE62_RE;
+var init_validators = __esm(() => {
+  BASE62_RE = /^[A-Za-z0-9]+$/;
+});
+
 // src/commands/broker-actions.ts
 var exports_broker_actions = {};
 __export(exports_broker_actions, {
@@ -7241,17 +7301,44 @@ async function runForget(id, opts) {
   return EXIT.SUCCESS;
 }
 async function runMsgStatus(id, opts) {
-  if (!id) {
-    render.err("Usage: claudemesh msg-status <message-id>");
+  const v = validateMessageId(id);
+  if (!v.ok) {
+    if (opts.json) {
+      console.log(JSON.stringify({
+        ok: false,
+        error: "invalid_argument",
+        field: "messageId",
+        code: v.code,
+        reason: v.reason,
+        expected: v.expected
+      }));
+    } else {
+      renderValidationError({
+        verb: "msg-status",
+        input: id ?? "(missing)",
+        result: v
+      });
+    }
     return EXIT.INVALID_ARGS;
   }
+  const lookupId = v.value.value;
   return await withMesh({ meshSlug: opts.mesh ?? null }, async (client) => {
-    const result = await client.messageStatus(id);
+    const result = await client.messageStatus(lookupId);
     if (!result) {
-      if (opts.json)
-        console.log(JSON.stringify({ id, found: false }));
-      else
-        render.err(`Message ${id} not found or timed out.`);
+      if (opts.json) {
+        console.log(JSON.stringify({
+          ok: false,
+          error: "not_found",
+          id: lookupId,
+          isPrefix: v.value.isPrefix
+        }));
+      } else {
+        const hint = v.value.isPrefix ? `   no message id starts with ${dim('"' + lookupId + '"')} in this mesh.
+   try: claudemesh msg-status <full-32-char-id>` : `   message ${dim(lookupId.slice(0, 12) + "…")} not in queue (already drained, expired, or never sent in this mesh).`;
+        render.err(`message not found`);
+        process.stderr.write(hint + `
+`);
+      }
       return EXIT.NOT_FOUND;
     }
     if (opts.json) {
@@ -7383,6 +7470,7 @@ var init_broker_actions = __esm(() => {
   init_render();
   init_styles();
   init_exit_codes();
+  init_validators();
 });
 
 // src/commands/remind.ts
@@ -11798,6 +11886,17 @@ var exports_topic_tail = {};
 __export(exports_topic_tail, {
   runTopicTail: () => runTopicTail
 });
+function rememberRendered(cache2, m, text) {
+  cache2.set(m.id, {
+    name: m.senderName || m.senderPubkey.slice(0, 8),
+    snippet: text.replace(/\s+/g, " ").slice(0, 60)
+  });
+  if (cache2.size > RECENT_CACHE_MAX) {
+    const firstKey = cache2.keys().next().value;
+    if (firstKey)
+      cache2.delete(firstKey);
+  }
+}
 function decodeV1(b64) {
   try {
     return Buffer.from(b64, "base64").toString("utf-8");
@@ -11824,15 +11923,24 @@ function fmtTime(iso) {
     return iso;
   }
 }
-async function printMessage(m, topicKey, json) {
+async function printMessage(m, topicKey, json, cache2) {
   const text = await decryptForRender(m, topicKey);
   if (json) {
     console.log(JSON.stringify({ ...m, message: text }));
+    rememberRendered(cache2, m, text);
     return;
   }
   const v2Marker = (m.bodyVersion ?? 1) === 2 ? dim("\uD83D\uDD12 ") : "";
-  process.stdout.write(`  ${dim(fmtTime(m.createdAt))}  ${bold(m.senderName || m.senderPubkey.slice(0, 8))}  ${v2Marker}${text}
+  if (m.replyToId) {
+    const parent = cache2.get(m.replyToId);
+    const ref = parent ? `${parent.name}: "${parent.snippet}${parent.snippet.length === 60 ? "…" : ""}"` : `${m.replyToId.slice(0, 8)}…`;
+    process.stdout.write(`  ${dim("↳ in reply to " + ref)}
+`);
+  }
+  const idTag = dim(`#${m.id.slice(0, 8)}`);
+  process.stdout.write(`  ${dim(fmtTime(m.createdAt))}  ${bold(m.senderName || m.senderPubkey.slice(0, 8))}  ${idTag}  ${v2Marker}${text}
 `);
+  rememberRendered(cache2, m, text);
 }
 async function* readSseStream(reader) {
   const decoder = new TextDecoder;
@@ -11891,6 +11999,7 @@ async function runTopicTail(name, flags) {
       topicName: cleanName
     });
     const topicKey = keyResult.ok ? keyResult.topicKey ?? null : null;
+    const snippetCache = new Map;
     let resealTimer = null;
     if (topicKey) {
       const reseal = async () => {
@@ -11943,7 +12052,7 @@ async function runTopicTail(name, flags) {
           render.section(`${clay("#" + cleanName)} on ${dim(meshSlug)} — backfill ${history.messages.length}, then live`);
         }
         for (const m of history.messages.slice().reverse()) {
-          await printMessage(m, topicKey, flags.json ?? false);
+          await printMessage(m, topicKey, flags.json ?? false, snippetCache);
         }
       } catch (err) {
         render.warn(`backfill failed: ${err.message}`);
@@ -11982,7 +12091,7 @@ async function runTopicTail(name, flags) {
         if (ev.event === "message") {
           try {
             const m = JSON.parse(ev.data);
-            await printMessage(m, topicKey, flags.json ?? false);
+            await printMessage(m, topicKey, flags.json ?? false, snippetCache);
           } catch {}
         }
       }
@@ -12000,6 +12109,7 @@ async function runTopicTail(name, flags) {
     }
   });
 }
+var RECENT_CACHE_MAX = 256;
 var init_topic_tail = __esm(() => {
   init_urls();
   init_with_rest_key();
@@ -12060,6 +12170,27 @@ async function runTopicPost(topicName, message, flags) {
         return EXIT.INTERNAL_ERROR;
       }
     }
+    let replyToId;
+    if (flags.replyTo) {
+      if (flags.replyTo.length >= 16) {
+        replyToId = flags.replyTo;
+      } else if (flags.replyTo.length >= 6) {
+        const recent = await request({
+          path: `/api/v1/topics/${encodeURIComponent(cleanName)}/messages?limit=200`,
+          method: "GET",
+          token: secret
+        });
+        const hit = recent.messages?.find((r) => r.id.startsWith(flags.replyTo));
+        if (!hit) {
+          render.err(`--reply-to ${flags.replyTo}: no recent message id starts with that prefix`);
+          return EXIT.INVALID_ARGS;
+        }
+        replyToId = hit.id;
+      } else {
+        render.err("--reply-to needs at least 6 characters of the message id");
+        return EXIT.INVALID_ARGS;
+      }
+    }
     const result = await request({
       path: "/api/v1/messages",
       method: "POST",
@@ -12069,7 +12200,8 @@ async function runTopicPost(topicName, message, flags) {
         ciphertext,
         nonce,
         bodyVersion,
-        ...mentions.length > 0 ? { mentions } : {}
+        ...mentions.length > 0 ? { mentions } : {},
+        ...replyToId ? { replyToId } : {}
       }
     });
     if (flags.json) {
@@ -12077,7 +12209,8 @@ async function runTopicPost(topicName, message, flags) {
       return EXIT.SUCCESS;
     }
     const versionTag = bodyVersion === 2 ? green("\uD83D\uDD12 v2") : dim("v1");
-    render.ok("posted", `${clay("#" + cleanName)}  ${versionTag}  ${dim(`(${result.notifications} mentions)`)}`);
+    const replyTag = result.replyToId ? `  ${dim("↳ " + result.replyToId.slice(0, 8))}` : "";
+    render.ok("posted", `${clay("#" + cleanName)}  ${versionTag}${replyTag}  ${dim(`(${result.notifications} mentions)`)}`);
     return EXIT.SUCCESS;
   });
 }
@@ -12445,7 +12578,16 @@ async function startMcpServer() {
 You are "${myName}"${myRole ? ` (${myRole})` : ""} — a peer in the claudemesh network. Your groups: ${myGroups}. You are one of several Claude Code sessions connected to the same mesh. No orchestrator exists — peers are equals. Your identity comes from your name and group roles, not from a central authority.
 
 ## Responding to messages
-When you receive a <channel source="claudemesh" ...> message, RESPOND IMMEDIATELY. Pause your current task, reply via send_message, then resume. Read from_name, mesh_slug, and priority from the channel attributes. Reply by setting \`to\` to the sender's from_name (display name). Stay in character per your system prompt. Do not ignore low-priority messages — acknowledge them briefly even if you defer action.
+When you receive a <channel source="claudemesh" ...> message, RESPOND IMMEDIATELY. Pause your current task, reply via send_message (or \`claudemesh topic post --reply-to <message_id>\` for topic threads), then resume. Stay in character per your system prompt. Do not ignore low-priority messages — acknowledge them briefly even if you defer action.
+
+The channel attributes carry everything you need to reply — no extra lookups:
+- \`from_name\` — sender display name. Use as the \`to\` arg when replying to a DM.
+- \`from_pubkey\` / \`from_member_id\` — stable ids. Use \`from_member_id\` if the sender's display name might change.
+- \`mesh_slug\` — pass via \`--mesh\` if your default mesh differs.
+- \`priority\` — \`now\` / \`next\` / \`low\`.
+- \`message_id\` — id of THIS message. To thread a reply onto it in a topic, run \`claudemesh topic post <topic> "<text>" --reply-to <message_id>\`.
+- \`topic\` — set when the message arrived through a topic (vs DM). Reply in the same topic.
+- \`reply_to_id\` — set when the incoming message is itself a reply. Render thread context if you re-narrate.
 
 If the channel meta contains \`subtype: reminder\`, this is a scheduled reminder you set for yourself — act on it immediately (no reply needed).
 
@@ -12805,20 +12947,27 @@ ${manifest.allowed_tools.map((t) => `  - ${t}`).join(`
         const prioBadge = msg.priority === "now" ? "[URGENT] " : msg.priority === "low" ? "[low] " : "";
         const kindBadge = msg.kind === "broadcast" ? " (broadcast)" : "";
         const content = `${prioBadge}${fromName}${kindBadge}: ${body}`;
+        const fromMemberPubkey = msg.senderMemberPubkey ?? fromPubkey;
         try {
           await server.notification({
             method: "notifications/claude/channel",
             params: {
               content,
               meta: {
-                from_id: fromPubkey,
+                from_id: fromMemberPubkey,
+                from_pubkey: fromMemberPubkey,
+                from_session_pubkey: fromPubkey,
                 from_name: fromName,
+                ...msg.senderMemberId ? { from_member_id: msg.senderMemberId } : {},
                 mesh_slug: client.meshSlug,
                 mesh_id: client.meshId,
                 priority: msg.priority,
                 sent_at: msg.createdAt,
                 delivered_at: msg.receivedAt,
                 kind: msg.kind,
+                message_id: msg.messageId,
+                ...msg.topic ? { topic: msg.topic } : {},
+                ...msg.replyToId ? { reply_to_id: msg.replyToId } : {},
                 ...msg.subtype ? { subtype: msg.subtype } : {}
               }
             }
@@ -13682,6 +13831,7 @@ async function gate(ctx, opts) {
 }
 
 // src/entrypoints/cli.ts
+init_styles();
 installSignalHandlers();
 installErrorHandlers();
 var { command, positionals, flags } = parseArgv(process.argv);
@@ -13772,7 +13922,7 @@ Topic  (conversation scope, v0.2.0)
   claudemesh topic history <t>     fetch message history [--limit --before]
   claudemesh topic read <topic>    mark all as read
   claudemesh topic tail <topic>    live SSE tail [--limit --forward-only]
-  claudemesh topic post <t> <msg>  encrypted REST post (v0.3.0 v2)
+  claudemesh topic post <t> <msg>  encrypted REST post (v0.3.0 v2) [--reply-to <id>]
   claudemesh send "#topic" "msg"   send to a topic (WS path, v1 plaintext)
   claudemesh member list           mesh roster with online state [--online]
   claudemesh notification list     recent @-mentions of you [--since <ISO>]
@@ -13843,9 +13993,44 @@ Flags
   -y, --yes                        skip confirmations (= --approval-mode yolo)
   -q, --quiet                      suppress non-essential output
 `;
+function colorizeHelp(raw) {
+  const lines = raw.split(`
+`);
+  const SECTION_HEADER_RE = /^([A-Z][A-Za-z0-9 /+-]*?)(\s*\(.*\))?$/;
+  const VERB_ROW_RE = /^(\s{2})(claudemesh[^\s]*(?:\s+[^\s]+)*?)(\s{2,})(.*)$/;
+  const ALIAS_RE = /(\(alias[^)]*\))/g;
+  const out = [];
+  for (const line of lines) {
+    if (line.startsWith("claudemesh —")) {
+      out.push(orange(line));
+      continue;
+    }
+    if (line.trim() === "") {
+      out.push(line);
+      continue;
+    }
+    if (!line.startsWith(" ") && SECTION_HEADER_RE.test(line)) {
+      const m = line.match(SECTION_HEADER_RE);
+      const head = bold(clay(m[1]));
+      const meta = m[2] ? dim(m[2]) : "";
+      out.push(head + meta);
+      continue;
+    }
+    const verbMatch = line.match(VERB_ROW_RE);
+    if (verbMatch) {
+      const [, indent, syntax, gap, rest] = verbMatch;
+      const dimmedRest = rest.replace(ALIAS_RE, (m) => dim(m));
+      out.push(`${indent}${cyan(syntax)}${gap}${dimmedRest}`);
+      continue;
+    }
+    out.push(line);
+  }
+  return out.join(`
+`);
+}
 async function main() {
   if (flags.help || flags.h) {
-    console.log(HELP);
+    console.log(colorizeHelp(HELP));
     process.exit(EXIT.SUCCESS);
   }
   if (flags.version || flags.V) {
@@ -14567,7 +14752,8 @@ async function main() {
         const postFlags = {
           mesh: flags.mesh,
           json: !!flags.json,
-          plaintext: !!flags.plaintext
+          plaintext: !!flags.plaintext,
+          replyTo: flags["reply-to"] || flags.replyTo
         };
         const message = positionals.slice(2).join(" ");
         const { runTopicPost: runTopicPost2 } = await Promise.resolve().then(() => (init_topic_post(), exports_topic_post));
@@ -14660,4 +14846,4 @@ main().catch((err) => {
   process.exit(EXIT.INTERNAL_ERROR);
 });
 
-//# debugId=25484051F3F24E9464756E2164756E21
+//# debugId=AEE2B186929FB60F64756E2164756E21