claudemesh-cli 1.0.0-alpha.1 → 1.0.0-alpha.10

package/dist/entrypoints/cli.js

@@ -82,6 +82,12 @@ var init_exit_codes = __esm(() => {
 });
 
 // src/constants/urls.ts
+var exports_urls = {};
+__export(exports_urls, {
+  env: () => env,
+  VERSION: () => VERSION,
+  URLS: () => URLS
+});
 var URLS, VERSION = "1.0.0-alpha.0", env;
 var init_urls = __esm(() => {
   URLS = {
@@ -226,9 +232,6 @@ async function get(path, token) {
 async function post(path, body, token) {
   return request({ path, method: "POST", body, token });
 }
-async function del(path, token) {
-  return request({ path, method: "DELETE", token });
-}
 var init_client = __esm(() => {
   init_urls();
   init_timings();
@@ -268,7 +271,13 @@ async function createInvite(token, meshSlug, body) {
   return post(`/api/my/meshes/${meshSlug}/invites`, body, token);
 }
 async function revokeSession(token) {
-  return del("/api/my/sessions/current", token);
+  const BROKER_HTTP = (await Promise.resolve().then(() => (init_urls(), exports_urls))).URLS.BROKER.replace("wss://", "https://").replace("ws://", "http://").replace("/ws", "");
+  return request({
+    path: "/cli/session/revoke",
+    method: "POST",
+    body: { token },
+    baseUrl: BROKER_HTTP
+  });
 }
 async function cliSync(token) {
   return post("/cli-sync", undefined, token);
@@ -288,13 +297,24 @@ async function claimInvite(code, body) {
   return post(`/api/public/invites/${code}/claim`, body);
 }
 async function requestDeviceCode(deviceInfo) {
-  return post("/api/auth/cli/device-code/new", deviceInfo);
+  return request({
+    path: "/cli/device-code",
+    method: "POST",
+    body: deviceInfo,
+    baseUrl: BROKER_HTTP
+  });
 }
 async function pollDeviceCode(deviceCode) {
-  return get(`/api/auth/cli/device-code/${deviceCode}`);
+  return request({
+    path: `/cli/device-code/${deviceCode}`,
+    baseUrl: BROKER_HTTP
+  });
 }
+var BROKER_HTTP;
 var init_public = __esm(() => {
   init_client();
+  init_urls();
+  BROKER_HTTP = URLS.BROKER.replace("wss://", "https://").replace("ws://", "http://").replace("/ws", "");
 });
 
 // src/services/api/facade.ts
@@ -597,14 +617,26 @@ async function loginWithDeviceCode() {
     platform: device.platform,
     arch: device.arch
   });
-  log(`
-  Opening browser for sign-in…
-`);
-  log(`  If your browser didn't open, visit:`);
-  log(`    ${verification_url}?code=${user_code}
-`);
-  log(`  Waiting for confirmation…
-`);
+  const url = `${verification_url}?code=${user_code}`;
+  const isTTY2 = process.stdout.isTTY && !process.env.NO_COLOR;
+  const orange2 = (s) => isTTY2 ? `\x1B[38;5;208m${s}\x1B[0m` : s;
+  const bold2 = (s) => isTTY2 ? `\x1B[1m${s}\x1B[0m` : s;
+  const dim2 = (s) => isTTY2 ? `\x1B[2m${s}\x1B[0m` : s;
+  log("");
+  log("  " + orange2("claudemesh") + " — sign in to connect your terminal");
+  log("");
+  log("  ┌──────────────────────────────────┐");
+  log("  │                                  │");
+  log("  │   Your code:  " + bold2(user_code) + "          │");
+  log("  │                                  │");
+  log("  └──────────────────────────────────┘");
+  log("");
+  log("  " + dim2("Confirm this code matches your browser."));
+  log("  " + dim2("If your browser didn't open, visit:"));
+  log("  " + dim2(url));
+  log("");
+  log("  Waiting for confirmation… " + dim2("(Ctrl-C to cancel)"));
+  log("");
   try {
     await openBrowser(`${verification_url}?code=${user_code}`);
   } catch {
@@ -1384,17 +1416,103 @@ var exports_login = {};
 __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) {
+    const name = existing.user.display_name || existing.user.email || "unknown";
+    console.log(`
+  Already signed in as ${bold(name)}.`);
+    console.log("");
+    console.log(`    ${bold("1)")} Continue as ${name}`);
+    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 choice = await prompt("  Choice [1]: ") || "1";
+    if (choice === "1") {
+      console.log(`
+  ${green(icons.check)} Continuing as ${name}.`);
+      return EXIT.SUCCESS;
+    }
+    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…")}`);
+  } 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}`);
@@ -1406,6 +1524,7 @@ var init_login = __esm(() => {
   init_facade2();
   init_styles();
   init_exit_codes();
+  init_urls();
 });
 
 // src/commands/register.ts
@@ -1414,48 +1533,10 @@ __export(exports_register, {
   register: () => register2
 });
 async function register2() {
-  try {
-    const listener = await startCallbackListener();
-    console.log(`
-  Opening browser for account signup…
-`);
-    const url = `https://claudemesh.com/register?source=cli&callback=http://localhost:${listener.port}`;
-    try {
-      await openBrowser(url);
-    } catch {
-      console.log(`  Could not open browser. Visit:
-    ${url}
-`);
-    }
-    console.log(`  Waiting for signup to complete…
-`);
-    const token = await Promise.race([
-      listener.token,
-      new Promise((_, reject) => setTimeout(() => reject(new Error("Timed out waiting for signup (5 min). Try again.")), 5 * 60 * 1000))
-    ]).finally(() => listener.close());
-    let user = { id: "", display_name: "", email: "" };
-    try {
-      user = await exports_my.getProfile(token);
-    } catch {}
-    storeToken({
-      session_token: token,
-      user,
-      token_source: "callback"
-    });
-    const name = user.display_name || user.email || "you";
-    console.log(`  ${green(icons.check)} Account created. Signed in as ${name}.`);
-    return EXIT.SUCCESS;
-  } catch (err) {
-    console.error(`  ${icons.cross} Registration failed: ${err instanceof Error ? err.message : err}`);
-    return EXIT.AUTH_FAILED;
-  }
+  return login();
 }
 var init_register = __esm(() => {
-  init_facade6();
-  init_facade2();
-  init_facade4();
-  init_styles();
-  init_exit_codes();
+  init_login();
 });
 
 // src/commands/welcome.ts
@@ -1464,13 +1545,13 @@ __export(exports_welcome, {
   runWelcome: () => runWelcome,
   _stub: () => runWelcome
 });
-import { createInterface } from "node:readline";
+import { createInterface as createInterface2 } from "node:readline";
 async function runWelcome() {
   const config = readConfig();
   if (config.meshes.length > 0)
     return EXIT.SUCCESS;
   renderWelcome();
-  const rl = createInterface({ input: process.stdin, output: process.stdout });
+  const rl = createInterface2({ input: process.stdin, output: process.stdout });
   return new Promise((resolve) => {
     rl.question("  Choice [1]: ", async (answer) => {
       rl.close();
@@ -3532,7 +3613,7 @@ var init_facade9 = __esm(() => {
 });
 
 // src/ui/screen.ts
-import { createInterface as createInterface2 } from "node:readline";
+import { createInterface as createInterface3 } from "node:readline";
 function termSize() {
   return { cols: process.stdout.columns || 80, rows: process.stdout.rows || 24 };
 }
@@ -3560,37 +3641,46 @@ function enterFullScreen() {
 function exitFullScreen() {
   process.stdout.write(SHOW_CURSOR + CLEAR_SCREEN);
 }
-async function menuSelect(items, 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)
+    console.log(`
+  ${title}`);
   items.forEach((item, i) => console.log(`    ${bold(String(i + 1) + ")")} ${item}`));
   console.log("");
-  const rl = createInterface2({ input: process.stdin, output: process.stdout });
+  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);
     });
   });
 }
-async function textInput(prompt, defaultVal = "") {
-  const rl = createInterface2({ input: process.stdin, output: process.stdout });
+async function textInput(promptOrOpts, defaultVal = "") {
+  const label = typeof promptOrOpts === "string" ? promptOrOpts : promptOrOpts.label;
+  const placeholder = typeof promptOrOpts === "object" ? promptOrOpts.placeholder : undefined;
+  const rl = createInterface3({ input: process.stdin, output: process.stdout });
   return new Promise((resolve) => {
-    const hint = defaultVal ? ` [${defaultVal}]` : "";
-    rl.question(`  ${prompt}${hint}: `, (answer) => {
+    const hint = placeholder ? ` (${placeholder})` : defaultVal ? ` [${defaultVal}]` : "";
+    rl.question(`  ${label}${hint}: `, (answer) => {
       rl.close();
       resolve(answer.trim() || defaultVal);
     });
   });
 }
-async function confirmPrompt(prompt, defaultYes = true) {
-  const rl = createInterface2({ input: process.stdin, output: process.stdout });
-  const hint = defaultYes ? "[Y/n]" : "[y/N]";
+async function confirmPrompt(promptOrOpts, defaultYes = true) {
+  const message = typeof promptOrOpts === "string" ? promptOrOpts : promptOrOpts.message;
+  const defYes = typeof promptOrOpts === "object" && promptOrOpts.defaultYes !== undefined ? promptOrOpts.defaultYes : defaultYes;
+  const rl = createInterface3({ input: process.stdin, output: process.stdout });
+  const hint = defYes ? "[Y/n]" : "[y/N]";
   return new Promise((resolve) => {
-    rl.question(`  ${prompt} ${hint}: `, (answer) => {
+    rl.question(`  ${message} ${hint}: `, (answer) => {
       rl.close();
       const a = answer.trim().toLowerCase();
       if (!a)
-        resolve(defaultYes);
+        resolve(defYes);
       else
         resolve(a === "y" || a === "yes");
     });
@@ -3698,7 +3788,7 @@ import { randomUUID } from "node:crypto";
 import { mkdtempSync, writeFileSync as writeFileSync4, rmSync, readdirSync, statSync, existsSync as existsSync4, readFileSync as readFileSync3 } from "node:fs";
 import { tmpdir, hostname as hostname3, homedir as homedir3 } from "node:os";
 import { join as join3 } from "node:path";
-import { createInterface as createInterface3 } from "node:readline";
+import { createInterface as createInterface4 } from "node:readline";
 async function pickMesh(meshes) {
   if (meshes.length === 1)
     return meshes[0];
@@ -3708,7 +3798,7 @@ async function pickMesh(meshes) {
     console.log(`    ${i + 1}) ${m.slug}`);
   });
   console.log("");
-  const rl = createInterface3({ input: process.stdin, output: process.stdout });
+  const rl = createInterface4({ input: process.stdin, output: process.stdout });
   return new Promise((resolve) => {
     rl.question("  Choice [1]: ", (answer) => {
       rl.close();
@@ -3950,7 +4040,7 @@ async function runLaunch(flags, rawArgs) {
     console.log(`  ${dim2(`Or join with invite: claudemesh launch --join <url>`)}
 `);
     const manualPromise = new Promise((resolve) => {
-      const rl = createInterface3({ input: process.stdin, output: process.stdout });
+      const rl = createInterface4({ input: process.stdin, output: process.stdout });
       rl.question("  Paste sync token (or wait for browser): ", (answer) => {
         rl.close();
         if (answer.trim())
@@ -7668,7 +7758,7 @@ var init_rename2 = __esm(() => {
 
 // src/commands/connect.ts
 import { hostname as hostname4 } from "node:os";
-import { createInterface as createInterface4 } from "node:readline";
+import { createInterface as createInterface5 } from "node:readline";
 async function pickMesh2(meshes) {
   console.log(`
   Select mesh:`);
@@ -7676,7 +7766,7 @@ async function pickMesh2(meshes) {
     console.log(`    ${i + 1}) ${m.slug}`);
   });
   console.log("");
-  const rl = createInterface4({ input: process.stdin, output: process.stdout });
+  const rl = createInterface5({ input: process.stdin, output: process.stdout });
   return new Promise((resolve) => {
     rl.question("  Choice [1]: ", (answer) => {
       rl.close();
@@ -8971,7 +9061,7 @@ var exports_sync = {};
 __export(exports_sync, {
   runSync: () => runSync
 });
-import { createInterface as createInterface5 } from "node:readline";
+import { createInterface as createInterface6 } from "node:readline";
 import { hostname as hostname5 } from "node:os";
 async function runSync(args) {
   const useColor = !process.env.NO_COLOR && process.env.TERM !== "dumb" && process.stdout.isTTY;
@@ -8985,7 +9075,7 @@ async function runSync(args) {
   console.log(dim2(`Visit: ${url}`));
   await openBrowser(url);
   const manualPromise = new Promise((resolve2) => {
-    const rl = createInterface5({ input: process.stdin, output: process.stdout });
+    const rl = createInterface6({ input: process.stdin, output: process.stdout });
     rl.question("Paste sync token (or wait for browser): ", (answer) => {
       rl.close();
       if (answer.trim())
@@ -10620,4 +10710,4 @@ main().catch((err) => {
   process.exit(EXIT.INTERNAL_ERROR);
 });
 
-//# debugId=1E53C7F6AC10DB9F64756E2164756E21
+//# debugId=A4C7B40E17EDD0C564756E2164756E21