claudemesh-cli 0.10.3 → 0.10.5

package/dist/index.js

@@ -40189,7 +40189,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "claudemesh-cli",
-    version: "0.10.3",
+    version: "0.10.5",
     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);
@@ -55030,6 +55182,68 @@ async function runPeers(flags) {
 // src/commands/welcome.ts
 init_colors();
 init_spinner();
+async function browserAuthFlow(action) {
+  const { generatePairingCode: generatePairingCode2, startCallbackListener: startCallbackListener2, openBrowser: openBrowser2 } = await Promise.resolve().then(() => (init_auth(), exports_auth));
+  const code = generatePairingCode2();
+  const listener = await startCallbackListener2();
+  const baseUrl = action === "register" ? `https://claudemesh.com/register?callbackUrl=${encodeURIComponent(`/cli-auth?port=${listener.port}&code=${code}&action=sync`)}` : `https://claudemesh.com/cli-auth?port=${listener.port}&code=${code}&action=sync`;
+  console.log(dim(action === "register" ? `  Opening browser to create your account...
+` : `  Opening browser to sign in...
+`));
+  const opened = await openBrowser2(baseUrl);
+  if (!opened) {
+    console.log("  Couldn't open browser. Visit:");
+  }
+  console.log(dim(`  ${baseUrl}
+`));
+  const manualPromise = new Promise((resolve2) => {
+    const rl = createInterface3({ input: process.stdin, output: process.stdout });
+    rl.question("  Paste sync token (or wait for browser): ", (answer) => {
+      rl.close();
+      if (answer.trim())
+        resolve2(answer.trim());
+    });
+  });
+  const timeoutPromise = new Promise((resolve2) => {
+    setTimeout(() => resolve2(null), 900000);
+  });
+  const syncToken = await Promise.race([
+    listener.token,
+    manualPromise,
+    timeoutPromise
+  ]);
+  listener.close();
+  if (!syncToken) {
+    console.error(`
+  Timed out waiting for sign-in.`);
+    process.exit(1);
+  }
+  const { generateKeypair: generateKeypair3 } = await Promise.resolve().then(() => (init_keypair(), exports_keypair));
+  const keypair = await generateKeypair3();
+  const displayName = `${hostname4()}-${process.pid}`;
+  const { syncWithBroker: syncWithBroker2 } = await Promise.resolve().then(() => exports_sync_with_broker);
+  const result = await syncWithBroker2(syncToken, keypair.publicKey, displayName);
+  const config2 = loadConfig();
+  const { saveConfig: saveConfig2 } = await Promise.resolve().then(() => (init_config(), exports_config));
+  for (const m of result.meshes) {
+    config2.meshes.push({
+      meshId: m.mesh_id,
+      memberId: m.member_id,
+      slug: m.slug,
+      name: m.slug,
+      pubkey: keypair.publicKey,
+      secretKey: keypair.secretKey,
+      brokerUrl: m.broker_url,
+      joinedAt: new Date().toISOString()
+    });
+  }
+  config2.accountId = result.account_id;
+  saveConfig2(config2);
+  console.log(`
+  ${green("✓")} Synced ${result.meshes.length} mesh(es): ${result.meshes.map((m) => m.slug).join(", ")}
+`);
+  await runLaunch({}, []);
+}
 function detectState() {
   const claudeConfig = join6(homedir6(), ".claude.json");
   let mcpRegistered = false;
@@ -55110,84 +55324,27 @@ async function runWelcome() {
     }
     spinner.stop();
     const choice = await menuSelect({
-      title: "Connect to a mesh",
+      title: "Get started",
       items: [
-        "Sign in via browser (create or join meshes)",
+        "Create account (new to claudemesh)",
+        "Sign in (existing account)",
         "Paste an invite URL",
         "Exit"
       ],
       row
     });
-    if (choice === 2) {
-      exitFullScreen();
+    exitFullScreen();
+    if (choice === 3)
       return;
-    }
     if (choice === 0) {
-      exitFullScreen();
-      console.log(dim(`  Opening browser for sign-in...
-`));
-      const { generatePairingCode: generatePairingCode2 } = await Promise.resolve().then(() => (init_auth(), exports_auth));
-      const { startCallbackListener: startCallbackListener2, openBrowser: openBrowser2 } = await Promise.resolve().then(() => (init_auth(), exports_auth));
-      const code = generatePairingCode2();
-      const listener = await startCallbackListener2();
-      const url = `https://claudemesh.com/cli-auth?port=${listener.port}&code=${code}&action=sync`;
-      const opened = await openBrowser2(url);
-      if (!opened) {
-        console.log("  Couldn't open browser. Visit:");
-      }
-      console.log(dim(`  ${url}
-`));
-      const manualPromise = new Promise((resolve2) => {
-        const rl = createInterface3({ input: process.stdin, output: process.stdout });
-        rl.question("  Paste sync token (or wait for browser): ", (answer) => {
-          rl.close();
-          if (answer.trim())
-            resolve2(answer.trim());
-        });
-      });
-      const timeoutPromise = new Promise((resolve2) => {
-        setTimeout(() => resolve2(null), 900000);
-      });
-      const syncToken = await Promise.race([
-        listener.token,
-        manualPromise,
-        timeoutPromise
-      ]);
-      listener.close();
-      if (!syncToken) {
-        console.error(`
-  Timed out waiting for sign-in.`);
-        process.exit(1);
-      }
-      const { generateKeypair: generateKeypair3 } = await Promise.resolve().then(() => (init_keypair(), exports_keypair));
-      const keypair = await generateKeypair3();
-      const displayName = `${hostname4()}-${process.pid}`;
-      const { syncWithBroker: syncWithBroker2 } = await Promise.resolve().then(() => exports_sync_with_broker);
-      const result = await syncWithBroker2(syncToken, keypair.publicKey, displayName);
-      const config2 = loadConfig();
-      const { saveConfig: saveConfig2 } = await Promise.resolve().then(() => (init_config(), exports_config));
-      for (const m of result.meshes) {
-        config2.meshes.push({
-          meshId: m.mesh_id,
-          memberId: m.member_id,
-          slug: m.slug,
-          name: m.slug,
-          pubkey: keypair.publicKey,
-          secretKey: keypair.secretKey,
-          brokerUrl: m.broker_url,
-          joinedAt: new Date().toISOString()
-        });
-      }
-      config2.accountId = result.account_id;
-      saveConfig2(config2);
-      console.log(`
-  ${green("✓")} Synced ${result.meshes.length} mesh(es): ${result.meshes.map((m) => m.slug).join(", ")}
-`);
-      await runLaunch({}, []);
+      await browserAuthFlow("register");
       return;
     }
     if (choice === 1) {
-      exitFullScreen();
+      await browserAuthFlow("sync");
+      return;
+    }
+    if (choice === 2) {
       const rl = createInterface3({ input: process.stdin, output: process.stdout });
       const url = await new Promise((resolve2) => {
         rl.question("  Invite URL: ", (answer) => {
@@ -56279,4 +56436,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.3",
+  "version": "0.10.5",
   "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/eslint-config": "0.1.0",
     "@turbostarter/prettier-config": "0.1.0",
-    "@turbostarter/vitest-config": "0.1.0",
-    "@turbostarter/eslint-config": "0.1.0"
+    "@turbostarter/tsconfig": "0.1.0",
+    "@turbostarter/vitest-config": "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",