claudemesh-cli 1.0.0-alpha.12 → 1.0.0-alpha.13

package/dist/entrypoints/cli.js

@@ -614,14 +614,31 @@ var init_errors2 = __esm(() => {
 });
 
 // src/services/auth/device-code.ts
+import { createInterface } from "node:readline";
+function parseJwtUser(token) {
+  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)
+        throw new Error("expired");
+      return {
+        id: payload.sub ?? "",
+        display_name: payload.name ?? payload.email ?? "",
+        email: payload.email ?? ""
+      };
+    }
+  } catch {}
+  throw new Error("Invalid token");
+}
 async function loginWithDeviceCode() {
   const device = getDeviceInfo();
-  const { device_code, user_code, verification_url } = await exports_public.requestDeviceCode({
+  const { device_code, user_code, session_id, verification_url, token_url } = await exports_public.requestDeviceCode({
     hostname: device.hostname,
     platform: device.platform,
     arch: device.arch
   });
-  const url = `${verification_url}?code=${user_code}`;
+  const browserUrl = `${verification_url}?session=${session_id}`;
   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;
@@ -636,38 +653,74 @@ async function loginWithDeviceCode() {
   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("  " + dim2("If the browser didn't open, visit:"));
+  log("  " + browserUrl);
+  log("");
+  log("  " + dim2("Can't use a browser? Generate a token at:"));
+  log("  " + (token_url || verification_url.replace("/cli-auth", "/token")));
+  log("  " + dim2("Then paste it below."));
   log("");
+  log("  Waiting… " + dim2("(paste token or Ctrl-C to cancel)"));
   try {
-    await openBrowser(`${verification_url}?code=${user_code}`);
+    await openBrowser(browserUrl);
   } catch {
-    warn("Could not open browser automatically.");
+    warn("  Could not open browser automatically.");
   }
-  const startTime = Date.now();
-  while (Date.now() - startTime < TIMINGS.DEVICE_CODE_TIMEOUT_MS) {
-    await new Promise((r) => setTimeout(r, TIMINGS.DEVICE_CODE_POLL_MS));
-    let poll;
-    try {
-      poll = await exports_public.pollDeviceCode(device_code);
-    } catch {
-      continue;
-    }
-    if (poll.status === "approved" && poll.session_token && poll.user) {
-      storeToken({
-        session_token: poll.session_token,
-        user: poll.user,
-        token_source: "device-code"
-      });
-      return { user: poll.user, session_token: poll.session_token };
-    }
-    if (poll.status === "expired") {
-      throw new DeviceCodeExpired;
-    }
-  }
-  throw new DeviceCodeExpired;
+  return new Promise((resolve, reject) => {
+    let done = false;
+    const rl = createInterface({ input: process.stdin, output: process.stdout });
+    rl.on("line", (line) => {
+      if (done)
+        return;
+      const trimmed = line.trim();
+      if (trimmed.split(".").length === 3 && trimmed.length > 50) {
+        done = true;
+        rl.close();
+        try {
+          const user = parseJwtUser(trimmed);
+          storeToken({ session_token: trimmed, user, token_source: "manual" });
+          resolve({ user, session_token: trimmed });
+        } catch (e) {
+          reject(new Error("Invalid or expired token. Generate a new one."));
+        }
+      }
+    });
+    const startTime = Date.now();
+    const poll = async () => {
+      while (!done && Date.now() - startTime < TIMINGS.DEVICE_CODE_TIMEOUT_MS) {
+        await new Promise((r) => setTimeout(r, TIMINGS.DEVICE_CODE_POLL_MS));
+        if (done)
+          return;
+        try {
+          const result = await exports_public.pollDeviceCode(device_code);
+          if (result.status === "approved" && result.session_token && result.user) {
+            if (done)
+              return;
+            done = true;
+            rl.close();
+            storeToken({ session_token: result.session_token, user: result.user, token_source: "device-code" });
+            resolve({ user: result.user, session_token: result.session_token });
+            return;
+          }
+          if (result.status === "expired") {
+            if (done)
+              return;
+            done = true;
+            rl.close();
+            reject(new DeviceCodeExpired);
+            return;
+          }
+        } catch {}
+      }
+      if (!done) {
+        done = true;
+        rl.close();
+        reject(new DeviceCodeExpired);
+      }
+    };
+    poll();
+  });
 }
 var init_device_code = __esm(() => {
   init_timings();
@@ -3548,7 +3601,7 @@ var init_facade11 = __esm(() => {
 });
 
 // src/ui/screen.ts
-import { createInterface } from "node:readline";
+import { createInterface as createInterface2 } from "node:readline";
 function termSize() {
   return { cols: process.stdout.columns || 80, rows: process.stdout.rows || 24 };
 }
@@ -3584,7 +3637,7 @@ async function menuSelect(itemsOrOpts, prompt = "Choice") {
   ${title}`);
   items.forEach((item, i) => console.log(`    ${bold(String(i + 1) + ")")} ${item}`));
   console.log("");
-  const rl = createInterface({ input: process.stdin, output: process.stdout });
+  const rl = createInterface2({ input: process.stdin, output: process.stdout });
   return new Promise((resolve) => {
     rl.question(`  ${prompt} [1]: `, (answer) => {
       rl.close();
@@ -3596,7 +3649,7 @@ async function menuSelect(itemsOrOpts, prompt = "Choice") {
 async function textInput(promptOrOpts, defaultVal = "") {
   const label = typeof promptOrOpts === "string" ? promptOrOpts : promptOrOpts.label;
   const placeholder = typeof promptOrOpts === "object" ? promptOrOpts.placeholder : undefined;
-  const rl = createInterface({ input: process.stdin, output: process.stdout });
+  const rl = createInterface2({ input: process.stdin, output: process.stdout });
   return new Promise((resolve) => {
     const hint = placeholder ? ` (${placeholder})` : defaultVal ? ` [${defaultVal}]` : "";
     rl.question(`  ${label}${hint}: `, (answer) => {
@@ -3608,7 +3661,7 @@ async function textInput(promptOrOpts, defaultVal = "") {
 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 = createInterface({ input: process.stdin, output: process.stdout });
+  const rl = createInterface2({ input: process.stdin, output: process.stdout });
   const hint = defYes ? "[Y/n]" : "[y/N]";
   return new Promise((resolve) => {
     rl.question(`  ${message} ${hint}: `, (answer) => {
@@ -3723,7 +3776,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 createInterface2 } from "node:readline";
+import { createInterface as createInterface3 } from "node:readline";
 async function pickMesh(meshes) {
   if (meshes.length === 1)
     return meshes[0];
@@ -3733,7 +3786,7 @@ async function pickMesh(meshes) {
     console.log(`    ${i + 1}) ${m.slug}`);
   });
   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("  Choice [1]: ", (answer) => {
       rl.close();
@@ -3975,7 +4028,7 @@ async function runLaunch(flags, rawArgs) {
     console.log(`  ${dim2(`Or join with invite: claudemesh launch --join <url>`)}
 `);
     const manualPromise = new Promise((resolve) => {
-      const rl = createInterface2({ input: process.stdin, output: process.stdout });
+      const rl = createInterface3({ input: process.stdin, output: process.stdout });
       rl.question("  Paste sync token (or wait for browser): ", (answer) => {
         rl.close();
         if (answer.trim())
@@ -4309,9 +4362,9 @@ var exports_delete_mesh = {};
 __export(exports_delete_mesh, {
   deleteMesh: () => deleteMesh
 });
-import { createInterface as createInterface3 } from "node:readline";
+import { createInterface as createInterface4 } from "node:readline";
 function prompt(question) {
-  const rl = createInterface3({ input: process.stdin, output: process.stdout });
+  const rl = createInterface4({ input: process.stdin, output: process.stdout });
   return new Promise((resolve) => {
     rl.question(question, (a) => {
       rl.close();
@@ -4454,9 +4507,9 @@ var exports_invite = {};
 __export(exports_invite, {
   invite: () => invite
 });
-import { createInterface as createInterface4 } from "node:readline";
+import { createInterface as createInterface5 } from "node:readline";
 function prompt2(question) {
-  const rl = createInterface4({ input: process.stdin, output: process.stdout });
+  const rl = createInterface5({ input: process.stdin, output: process.stdout });
   return new Promise((resolve) => {
     rl.question(question, (a) => {
       rl.close();
@@ -4571,9 +4624,9 @@ var exports_login = {};
 __export(exports_login, {
   login: () => login
 });
-import { createInterface as createInterface5 } from "node:readline";
+import { createInterface as createInterface6 } from "node:readline";
 function prompt3(question) {
-  const rl = createInterface5({ input: process.stdin, output: process.stdout });
+  const rl = createInterface6({ input: process.stdin, output: process.stdout });
   return new Promise((resolve) => {
     rl.question(question, (answer) => {
       rl.close();
@@ -4700,13 +4753,13 @@ __export(exports_welcome, {
   runWelcome: () => runWelcome,
   _stub: () => runWelcome
 });
-import { createInterface as createInterface6 } from "node:readline";
+import { createInterface as createInterface7 } from "node:readline";
 async function runWelcome() {
   const config = readConfig();
   if (config.meshes.length > 0)
     return EXIT.SUCCESS;
   renderWelcome();
-  const rl = createInterface6({ input: process.stdin, output: process.stdout });
+  const rl = createInterface7({ input: process.stdin, output: process.stdout });
   return new Promise((resolve) => {
     rl.question("  Choice [1]: ", async (answer) => {
       rl.close();
@@ -7857,7 +7910,7 @@ var init_whoami = __esm(() => {
 
 // src/commands/connect.ts
 import { hostname as hostname4 } from "node:os";
-import { createInterface as createInterface7 } from "node:readline";
+import { createInterface as createInterface8 } from "node:readline";
 async function pickMesh2(meshes) {
   console.log(`
   Select mesh:`);
@@ -7865,7 +7918,7 @@ async function pickMesh2(meshes) {
     console.log(`    ${i + 1}) ${m.slug}`);
   });
   console.log("");
-  const rl = createInterface7({ input: process.stdin, output: process.stdout });
+  const rl = createInterface8({ input: process.stdin, output: process.stdout });
   return new Promise((resolve) => {
     rl.question("  Choice [1]: ", (answer) => {
       rl.close();
@@ -9160,7 +9213,7 @@ var exports_sync = {};
 __export(exports_sync, {
   runSync: () => runSync
 });
-import { createInterface as createInterface8 } from "node:readline";
+import { createInterface as createInterface9 } 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;
@@ -9174,7 +9227,7 @@ async function runSync(args) {
   console.log(dim2(`Visit: ${url}`));
   await openBrowser(url);
   const manualPromise = new Promise((resolve2) => {
-    const rl = createInterface8({ input: process.stdin, output: process.stdout });
+    const rl = createInterface9({ input: process.stdin, output: process.stdout });
     rl.question("Paste sync token (or wait for browser): ", (answer) => {
       rl.close();
       if (answer.trim())
@@ -9769,4 +9822,4 @@ main().catch((err) => {
   process.exit(EXIT.INTERNAL_ERROR);
 });
 
-//# debugId=2903DE0B5859761A64756E2164756E21
+//# debugId=D73642E29B6C764B64756E2164756E21