claudemesh-cli 1.0.0-alpha.8 → 1.0.0-alpha.9

package/dist/entrypoints/cli.js

@@ -1408,6 +1408,57 @@ __export(exports_login, {
   login: () => login
 });
 import { createInterface } from "node:readline";
+function prompt(question) {
+  const rl = createInterface({ input: process.stdin, output: process.stdout });
+  return new Promise((resolve) => {
+    rl.question(question, (answer) => {
+      rl.close();
+      resolve(answer.trim());
+    });
+  });
+}
+async function loginWithToken() {
+  console.log(`
+  Paste a token from ${dim(URLS.API_BASE + "/token")}`);
+  console.log(`  ${dim("Generate one in your browser, then paste it here.")}
+`);
+  const token = await prompt("  Token: ");
+  if (!token) {
+    console.error(`  ${icons.cross} No token provided.`);
+    return EXIT.AUTH_FAILED;
+  }
+  let user = { id: "", display_name: "", email: "" };
+  try {
+    const parts = token.split(".");
+    if (parts[1]) {
+      const payload = JSON.parse(Buffer.from(parts[1], "base64url").toString());
+      if (payload.exp && payload.exp < Date.now() / 1000) {
+        console.error(`  ${icons.cross} Token expired. Generate a new one.`);
+        return EXIT.AUTH_FAILED;
+      }
+      user = {
+        id: payload.sub ?? "",
+        display_name: payload.name ?? payload.email ?? "",
+        email: payload.email ?? ""
+      };
+    }
+  } catch {
+    console.error(`  ${icons.cross} Invalid token format.`);
+    return EXIT.AUTH_FAILED;
+  }
+  storeToken({ session_token: token, user, token_source: "manual" });
+  console.log(`  ${green(icons.check)} Signed in as ${user.display_name || user.email || "user"}.`);
+  return EXIT.SUCCESS;
+}
+async function syncMeshes(token) {
+  try {
+    const meshes = await exports_my.getMeshes(token);
+    if (meshes.length > 0) {
+      const names = meshes.map((m) => m.slug).join(", ");
+      console.log(`  ${green(icons.check)} Synced ${meshes.length} mesh${meshes.length === 1 ? "" : "es"}: ${names}`);
+    }
+  } catch {}
+}
 async function login() {
   const existing = getStoredToken();
   if (existing) {
@@ -1416,39 +1467,43 @@ async function login() {
   Already signed in as ${bold(name)}.`);
     console.log("");
     console.log(`    ${bold("1)")} Continue as ${name}`);
-    console.log(`    ${bold("2)")} Sign in as a different account`);
-    console.log(`    ${bold("3)")} Sign out ${dim("(claudemesh logout)")}`);
+    console.log(`    ${bold("2)")} Sign in via browser`);
+    console.log(`    ${bold("3)")} Paste a token from ${dim("claudemesh.com/token")}`);
+    console.log(`    ${bold("4)")} Sign out`);
     console.log("");
-    const rl = createInterface({ input: process.stdin, output: process.stdout });
-    const choice = await new Promise((resolve) => {
-      rl.question("  Choice [1]: ", (answer) => {
-        rl.close();
-        resolve(answer.trim() || "1");
-      });
-    });
+    const choice = await prompt("  Choice [1]: ") || "1";
     if (choice === "1") {
       console.log(`
   ${green(icons.check)} Continuing as ${name}.`);
       return EXIT.SUCCESS;
     }
-    if (choice === "3") {
+    if (choice === "4") {
       clearToken();
       console.log(`  ${green(icons.check)} Signed out.`);
       return EXIT.SUCCESS;
     }
+    if (choice === "3") {
+      clearToken();
+      return loginWithToken();
+    }
     clearToken();
-    console.log(`  ${dim("Signing in as a different account…")}`);
+    console.log(`  ${dim("Signing in…")}`);
+  } else {
+    console.log(`
+  ${bold("claudemesh")} — sign in to connect your terminal`);
+    console.log("");
+    console.log(`    ${bold("1)")} Sign in via browser ${dim("(opens automatically)")}`);
+    console.log(`    ${bold("2)")} Paste a token from ${dim("claudemesh.com/token")}`);
+    console.log("");
+    const choice = await prompt("  Choice [1]: ") || "1";
+    if (choice === "2") {
+      return loginWithToken();
+    }
   }
   try {
     const result = await loginWithDeviceCode();
     console.log(`  ${green(icons.check)} Signed in as ${result.user.display_name}.`);
-    try {
-      const meshes = await exports_my.getMeshes(result.session_token);
-      if (meshes.length > 0) {
-        const names = meshes.map((m) => m.slug).join(", ");
-        console.log(`  ${green(icons.check)} Synced ${meshes.length} mesh${meshes.length === 1 ? "" : "es"}: ${names}`);
-      }
-    } catch {}
+    await syncMeshes(result.session_token);
     return EXIT.SUCCESS;
   } catch (err) {
     console.error(`  ${icons.cross} Login failed: ${err instanceof Error ? err.message : err}`);
@@ -1460,6 +1515,7 @@ var init_login = __esm(() => {
   init_facade2();
   init_styles();
   init_exit_codes();
+  init_urls();
 });
 
 // src/commands/register.ts
@@ -3576,7 +3632,7 @@ function enterFullScreen() {
 function exitFullScreen() {
   process.stdout.write(SHOW_CURSOR + CLEAR_SCREEN);
 }
-async function menuSelect(itemsOrOpts, prompt = "Choice") {
+async function menuSelect(itemsOrOpts, prompt2 = "Choice") {
   const items = Array.isArray(itemsOrOpts) ? itemsOrOpts : itemsOrOpts.items;
   const title = !Array.isArray(itemsOrOpts) ? itemsOrOpts.title : undefined;
   if (title)
@@ -3586,7 +3642,7 @@ async function menuSelect(itemsOrOpts, prompt = "Choice") {
   console.log("");
   const rl = createInterface3({ input: process.stdin, output: process.stdout });
   return new Promise((resolve) => {
-    rl.question(`  ${prompt} [1]: `, (answer) => {
+    rl.question(`  ${prompt2} [1]: `, (answer) => {
       rl.close();
       const idx = parseInt(answer || "1", 10) - 1;
       resolve(idx >= 0 && idx < items.length ? idx : 0);
@@ -7759,7 +7815,7 @@ async function runPeers(flags) {
   const dim2 = (s) => useColor ? `\x1B[2m${s}\x1B[22m` : s;
   const bold2 = (s) => useColor ? `\x1B[1m${s}\x1B[22m` : s;
   const green3 = (s) => useColor ? `\x1B[32m${s}\x1B[39m` : s;
-  const yellow3 = (s) => useColor ? `\x1B[33m${s}\x1B[39m` : s;
+  const yellow2 = (s) => useColor ? `\x1B[33m${s}\x1B[39m` : s;
   const config = readConfig();
   const slugs = flags.mesh ? [flags.mesh] : config.meshes.map((m) => m.slug);
   if (slugs.length === 0) {
@@ -7782,7 +7838,7 @@ async function runPeers(flags) {
         } else {
           for (const p of peers) {
             const groups = p.groups.length ? " [" + p.groups.map((g) => `@${g.name}${g.role ? `:${g.role}` : ""}`).join(", ") + "]" : "";
-            const statusIcon = p.status === "working" ? yellow3("●") : green3("●");
+            const statusIcon = p.status === "working" ? yellow2("●") : green3("●");
             const name = bold2(p.displayName);
             const meta = [];
             if (p.peerType)
@@ -8787,7 +8843,7 @@ function runInstall(args = []) {
   }
   const useColor = !process.env.NO_COLOR && process.env.TERM !== "dumb" && process.stdout.isTTY;
   const bold2 = (s) => useColor ? `\x1B[1m${s}\x1B[22m` : s;
-  const yellow3 = (s) => useColor ? `\x1B[33m${s}\x1B[39m` : s;
+  const yellow2 = (s) => useColor ? `\x1B[33m${s}\x1B[39m` : s;
   const dim2 = (s) => useColor ? `\x1B[2m${s}\x1B[22m` : s;
   console.log(`✓ MCP server "${MCP_NAME}" ${action}`);
   console.log(dim2(`  config:  ${CLAUDE_CONFIG}`));
@@ -8827,10 +8883,10 @@ function runInstall(args = []) {
     hasMeshes = meshConfig.meshes.length > 0;
   } catch {}
   console.log("");
-  console.log(yellow3(bold2("⚠  RESTART CLAUDE CODE")) + yellow3(" for MCP tools to appear."));
+  console.log(yellow2(bold2("⚠  RESTART CLAUDE CODE")) + yellow2(" for MCP tools to appear."));
   if (!hasMeshes) {
     console.log("");
-    console.log(yellow3("No meshes joined.") + " To connect with peers:");
+    console.log(yellow2("No meshes joined.") + " To connect with peers:");
     console.log(`  ${bold2("claudemesh join <invite-url>")}` + dim2("   — join an existing mesh"));
     console.log(`  ${dim2("Create one at")} ${bold2("https://claudemesh.com/dashboard")}`);
   } else {
@@ -8838,7 +8894,7 @@ function runInstall(args = []) {
     console.log(`Next: ${bold2("claudemesh join https://claudemesh.com/join/<token>")}`);
   }
   console.log("");
-  console.log(yellow3("⚠  For real-time push messages from peers, launch with:"));
+  console.log(yellow2("⚠  For real-time push messages from peers, launch with:"));
   console.log(`     ${bold2("claudemesh launch")}` + dim2("    (or: claude --dangerously-load-development-channels server:claudemesh)"));
   console.log(dim2("   Plain `claude` still works — messages are then pull-only via check_messages."));
 }
@@ -10645,4 +10701,4 @@ main().catch((err) => {
   process.exit(EXIT.INTERNAL_ERROR);
 });
 
-//# debugId=A2CF6E1117A2110D64756E2164756E21
+//# debugId=B1D91566048A7A1864756E2164756E21