claudemesh-cli 0.10.4 → 0.10.6

package/dist/index.js

@@ -40189,7 +40189,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "claudemesh-cli",
-    version: "0.10.4",
+    version: "0.10.6",
     description: "Claude Code MCP client for claudemesh — peer mesh messaging between Claude sessions.",
     keywords: [
       "claude-code",
@@ -53720,18 +53720,170 @@ async function enrollWithBroker2(args) {
 // src/commands/join.ts
 init_keypair();
 init_config();
+
+// src/lib/invite-v2.ts
+var import_libsodium_wrappers2 = __toESM(require_libsodium_wrappers(), 1);
+async function ensureSodium2() {
+  await import_libsodium_wrappers2.default.ready;
+  return import_libsodium_wrappers2.default;
+}
+async function generateX25519Keypair() {
+  const s = await ensureSodium2();
+  const kp = s.crypto_box_keypair();
+  const publicKeyB64 = s.to_base64(kp.publicKey, s.base64_variants.URLSAFE_NO_PADDING);
+  return { publicKeyB64, secretKey: kp.privateKey };
+}
+async function claimInviteV2(opts) {
+  const s = await ensureSodium2();
+  const { publicKeyB64, secretKey } = await generateX25519Keypair();
+  const publicKeyBytes = s.from_base64(publicKeyB64, s.base64_variants.URLSAFE_NO_PADDING);
+  const base = opts.appBaseUrl.replace(/\/$/, "");
+  const code = encodeURIComponent(opts.code);
+  const url = `${base}/api/public/invites/${code}/claim`;
+  let res;
+  try {
+    res = await fetch(url, {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json",
+        Accept: "application/json"
+      },
+      body: JSON.stringify({ recipient_x25519_pubkey: publicKeyB64 }),
+      signal: AbortSignal.timeout(15000)
+    });
+  } catch (e) {
+    throw new Error(`claim request failed (network): ${e instanceof Error ? e.message : String(e)}`);
+  }
+  let parsed = null;
+  try {
+    parsed = await res.json();
+  } catch {}
+  if (!res.ok) {
+    const err = parsed ?? {};
+    const reason = err.error ?? err.code ?? err.message ?? `HTTP ${res.status}`;
+    switch (res.status) {
+      case 400:
+        throw new Error(`invite claim rejected: ${reason}`);
+      case 404:
+        throw new Error(`invite not found: ${reason}`);
+      case 410:
+        throw new Error(`invite no longer usable: ${reason}`);
+      default:
+        throw new Error(`invite claim failed (${res.status}): ${reason}`);
+    }
+  }
+  const body = parsed ?? {};
+  if (!body.sealed_root_key || !body.mesh_id || !body.member_id || !body.owner_pubkey || !body.canonical_v2) {
+    throw new Error(`invite claim response malformed: missing required field(s)`);
+  }
+  let rootKey;
+  try {
+    const sealed = s.from_base64(body.sealed_root_key, s.base64_variants.URLSAFE_NO_PADDING);
+    const opened = s.crypto_box_seal_open(sealed, publicKeyBytes, secretKey);
+    if (!opened)
+      throw new Error("crypto_box_seal_open returned empty");
+    rootKey = opened;
+  } catch (e) {
+    throw new Error(`failed to unseal root key (server sealed to wrong pubkey?): ${e instanceof Error ? e.message : String(e)}`);
+  }
+  if (rootKey.length !== 32) {
+    throw new Error(`unsealed root key has wrong length: ${rootKey.length} (expected 32)`);
+  }
+  return {
+    meshId: body.mesh_id,
+    memberId: body.member_id,
+    ownerPubkey: body.owner_pubkey,
+    canonicalV2: body.canonical_v2,
+    rootKey
+  };
+}
+function parseV2InviteInput(input) {
+  const trimmed = input.trim();
+  const urlMatch = trimmed.match(/^https?:\/\/[^/]+(?:\/[a-z]{2})?\/i\/([A-Za-z0-9]+)\/?$/);
+  if (urlMatch)
+    return urlMatch[1];
+  const schemelessMatch = trimmed.match(/^[^/]+(?:\/[a-z]{2})?\/i\/([A-Za-z0-9]+)\/?$/);
+  if (schemelessMatch)
+    return schemelessMatch[1];
+  if (/^[A-Za-z0-9]{6,16}$/.test(trimmed))
+    return trimmed;
+  return null;
+}
+
+// src/commands/join.ts
 init_env();
+var import_libsodium_wrappers3 = __toESM(require_libsodium_wrappers(), 1);
 import { writeFileSync as writeFileSync3, mkdirSync as mkdirSync3 } from "node:fs";
 import { join as join3, dirname as dirname3 } from "node:path";
 import { homedir as homedir3, hostname } from "node:os";
+function deriveAppBaseUrl() {
+  const override = process.env.CLAUDEMESH_APP_URL;
+  if (override)
+    return override.replace(/\/$/, "");
+  try {
+    const u = new URL(env.CLAUDEMESH_BROKER_URL);
+    const host = u.host.replace(/^ic\./, "");
+    const scheme = u.protocol === "wss:" ? "https:" : "http:";
+    return `${scheme}//${host}`;
+  } catch {
+    return "https://claudemesh.com";
+  }
+}
+async function runJoinV2(code) {
+  const appBaseUrl = deriveAppBaseUrl();
+  console.log(`Claiming invite ${code} via ${appBaseUrl}…`);
+  let claim;
+  try {
+    claim = await claimInviteV2({ appBaseUrl, code });
+  } catch (e) {
+    console.error(`claudemesh: ${e instanceof Error ? e.message : String(e)}`);
+    process.exit(1);
+  }
+  const keypair = await generateKeypair2();
+  const displayName = `${hostname()}-${process.pid}`;
+  await import_libsodium_wrappers3.default.ready;
+  const rootKeyB64 = import_libsodium_wrappers3.default.to_base64(claim.rootKey, import_libsodium_wrappers3.default.base64_variants.URLSAFE_NO_PADDING);
+  const fallbackSlug = `mesh-${claim.meshId.slice(0, 8)}`;
+  const config2 = loadConfig();
+  config2.meshes = config2.meshes.filter((m) => m.meshId !== claim.meshId);
+  config2.meshes.push({
+    meshId: claim.meshId,
+    memberId: claim.memberId,
+    slug: fallbackSlug,
+    name: fallbackSlug,
+    pubkey: keypair.publicKey,
+    secretKey: keypair.secretKey,
+    brokerUrl: env.CLAUDEMESH_BROKER_URL,
+    joinedAt: new Date().toISOString(),
+    rootKey: rootKeyB64,
+    inviteVersion: 2
+  });
+  saveConfig(config2);
+  console.log("");
+  console.log(`✓ Joined mesh ${claim.meshId} via v2 invite`);
+  console.log(`  member id:  ${claim.memberId}`);
+  console.log(`  pubkey:     ${keypair.publicKey.slice(0, 16)}…`);
+  console.log(`  broker:     ${env.CLAUDEMESH_BROKER_URL}`);
+  console.log(`  config:     ${getConfigPath()}`);
+  console.log("");
+  console.log("Restart Claude Code to pick up the new mesh.");
+}
 async function runJoin(args) {
   const link = args[0];
   if (!link) {
-    console.error("Usage: claudemesh join <invite-url-or-token>");
+    console.error("Usage: claudemesh join <invite-url-or-code>");
     console.error("");
-    console.error("Example: claudemesh join https://claudemesh.com/join/eyJ2IjoxLC4uLn0");
+    console.error("Examples:");
+    console.error("  claudemesh join https://claudemesh.com/i/abc12345");
+    console.error("  claudemesh join abc12345");
+    console.error("  claudemesh join ic://join/eyJ2IjoxLC4uLn0   (v1 legacy)");
     process.exit(1);
   }
+  const v2Code = parseV2InviteInput(link);
+  if (v2Code) {
+    await runJoinV2(v2Code);
+    return;
+  }
   let invite;
   try {
     invite = await parseInviteLink2(link);
@@ -53936,7 +54088,7 @@ async function runHook(args) {
 // src/commands/launch.ts
 init_config();
 init_auth();
-import { spawn } from "node:child_process";
+import { spawnSync as spawnSync2 } from "node:child_process";
 import { randomUUID } from "node:crypto";
 import { mkdtempSync, writeFileSync as writeFileSync4, rmSync, readdirSync, statSync, existsSync as existsSync3, readFileSync as readFileSync3 } from "node:fs";
 import { tmpdir, hostname as hostname2, homedir as homedir4 } from "node:os";
@@ -54380,9 +54532,9 @@ async function runLaunch(flags, rawArgs) {
     const keypair = await generateKeypair3();
     const displayNameForSync = args.name ?? `${hostname2()}-${process.pid}`;
     const { syncWithBroker: syncWithBroker2 } = await Promise.resolve().then(() => exports_sync_with_broker);
-    const result = await syncWithBroker2(syncToken, keypair.publicKey, displayNameForSync);
+    const result2 = await syncWithBroker2(syncToken, keypair.publicKey, displayNameForSync);
     const { saveConfig: saveConfig2 } = await Promise.resolve().then(() => (init_config(), exports_config));
-    for (const m of result.meshes) {
+    for (const m of result2.meshes) {
       config2.meshes.push({
         meshId: m.mesh_id,
         memberId: m.member_id,
@@ -54394,11 +54546,11 @@ async function runLaunch(flags, rawArgs) {
         joinedAt: new Date().toISOString()
       });
     }
-    config2.accountId = result.account_id;
+    config2.accountId = result2.account_id;
     saveConfig2(config2);
     justSynced = true;
     console.log(`
-  ${green2("✓")} Synced ${result.meshes.length} mesh(es): ${result.meshes.map((m) => m.slug).join(", ")}
+  ${green2("✓")} Synced ${result2.meshes.length} mesh(es): ${result2.meshes.map((m) => m.slug).join(", ")}
 `);
   }
   if (config2.meshes.length === 0) {
@@ -54583,19 +54735,6 @@ async function runLaunch(flags, rawArgs) {
       }
     }
   }
-  const child = spawn(claudeBin, claudeArgs, {
-    stdio: "inherit",
-    shell: isWindows,
-    env: {
-      ...process.env,
-      CLAUDEMESH_CONFIG_DIR: tmpDir,
-      CLAUDEMESH_DISPLAY_NAME: displayName,
-      ...claudeSessionId ? { CLAUDEMESH_SESSION_ID: claudeSessionId } : {},
-      MCP_TIMEOUT: process.env.MCP_TIMEOUT ?? "30000",
-      MAX_MCP_OUTPUT_TOKENS: process.env.MAX_MCP_OUTPUT_TOKENS ?? "50000",
-      ...role ? { CLAUDEMESH_ROLE: role } : {}
-    }
-  });
   const cleanup = () => {
     if (meshMcpEntries.length > 0) {
       try {
@@ -54614,31 +54753,47 @@ async function runLaunch(flags, rawArgs) {
       rmSync(tmpDir, { recursive: true, force: true });
     } catch {}
   };
-  child.on("error", (err) => {
-    cleanup();
+  process.on("exit", cleanup);
+  if (process.stdin.isTTY) {
+    try {
+      process.stdin.setRawMode(false);
+    } catch {}
+  }
+  process.stdin.removeAllListeners("data");
+  process.stdin.removeAllListeners("keypress");
+  process.stdin.removeAllListeners("readable");
+  process.stdin.pause();
+  if (process.stdout.isTTY) {
+    process.stdout.write("\x1B[?25h");
+    process.stdout.write("\x1B[?1049l");
+  }
+  const result = spawnSync2(claudeBin, claudeArgs, {
+    stdio: "inherit",
+    shell: isWindows,
+    env: {
+      ...process.env,
+      CLAUDEMESH_CONFIG_DIR: tmpDir,
+      CLAUDEMESH_DISPLAY_NAME: displayName,
+      ...claudeSessionId ? { CLAUDEMESH_SESSION_ID: claudeSessionId } : {},
+      MCP_TIMEOUT: process.env.MCP_TIMEOUT ?? "30000",
+      MAX_MCP_OUTPUT_TOKENS: process.env.MAX_MCP_OUTPUT_TOKENS ?? "50000",
+      ...role ? { CLAUDEMESH_ROLE: role } : {}
+    }
+  });
+  if (result.error) {
+    const err = result.error;
     if (err.code === "ENOENT") {
       console.error("✗ `claude` not found on PATH. Install Claude Code first.");
     } else {
       console.error(`✗ failed to launch claude: ${err.message}`);
     }
     process.exit(1);
-  });
-  child.on("exit", (code, signal) => {
-    cleanup();
-    if (signal) {
-      process.kill(process.pid, signal);
-      return;
-    }
-    process.exit(code ?? 0);
-  });
-  process.on("SIGTERM", () => {
-    cleanup();
-    process.exit(0);
-  });
-  process.on("SIGINT", () => {
-    cleanup();
-    process.exit(0);
-  });
+  }
+  if (result.signal) {
+    process.kill(process.pid, result.signal);
+    return;
+  }
+  process.exit(result.status ?? 0);
 }
 
 // src/commands/status.ts
@@ -54729,7 +54884,7 @@ init_version();
 import { existsSync as existsSync5, readFileSync as readFileSync4, statSync as statSync3 } from "node:fs";
 import { homedir as homedir5, platform as platform2 } from "node:os";
 import { join as join5 } from "node:path";
-import { spawnSync as spawnSync2 } from "node:child_process";
+import { spawnSync as spawnSync3 } from "node:child_process";
 function checkNode() {
   const major = Number(process.versions.node.split(".")[0]);
   return {
@@ -54740,7 +54895,7 @@ function checkNode() {
   };
 }
 function checkClaudeOnPath() {
-  const res = platform2() === "win32" ? spawnSync2("where", ["claude"]) : spawnSync2("sh", ["-c", "command -v claude"]);
+  const res = platform2() === "win32" ? spawnSync3("where", ["claude"]) : spawnSync3("sh", ["-c", "command -v claude"]);
   const onPath = res.status === 0;
   const location = onPath ? res.stdout.toString().trim().split(`
 `)[0] : undefined;
@@ -56284,4 +56439,11 @@ var main = defineCommand({
     await runWelcome();
   }
 });
+var KNOWN_SUBCOMMANDS = new Set(Object.keys(main.subCommands ?? {}));
+var ROOT_PASSTHROUGH_FLAGS = new Set(["--help", "-h", "--version", "-v"]);
+var argv = process.argv.slice(2);
+var first = argv[0];
+if (first && !ROOT_PASSTHROUGH_FLAGS.has(first) && !KNOWN_SUBCOMMANDS.has(first)) {
+  process.argv.splice(2, 0, "launch");
+}
 runMain(main);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "claudemesh-cli",
-  "version": "0.10.4",
+  "version": "0.10.6",
   "description": "Claude Code MCP client for claudemesh — peer mesh messaging between Claude sessions.",
   "keywords": [
     "claude-code",
@@ -48,10 +48,10 @@
     "prettier": "3.6.2",
     "typescript": "5.9.3",
     "vitest": "4.0.14",
-    "@turbostarter/tsconfig": "0.1.0",
-    "@turbostarter/vitest-config": "0.1.0",
+    "@turbostarter/eslint-config": "0.1.0",
     "@turbostarter/prettier-config": "0.1.0",
-    "@turbostarter/eslint-config": "0.1.0"
+    "@turbostarter/vitest-config": "0.1.0",
+    "@turbostarter/tsconfig": "0.1.0"
   },
   "scripts": {
     "build": "bun build src/index.ts --target=node --outfile dist/index.js --banner \"#!/usr/bin/env node\" && chmod +x dist/index.js",