@clawcard/cli 1.0.4 → 1.0.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clawcard/cli",
-  "version": "1.0.4",
+  "version": "1.0.6",
   "description": "The ClawCard CLI — manage your agent keys, billing, and setup from the terminal",
   "bin": {
     "clawcard": "./bin/clawcard.mjs"

package/src/commands/login.js

@@ -1,6 +1,6 @@
 import * as p from "@clack/prompts";
 import open from "open";
-import { startCallbackServer } from "../auth-server.js";
+import crypto from "crypto";
 import { saveConfig, isLoggedIn, getConfig, BASE_URL } from "../config.js";
 
 export async function loginCommand() {
@@ -11,29 +11,52 @@ export async function loginCommand() {
     if (p.isCancel(cont) || !cont) return;
   }
 
-  const s = p.spinner();
-  s.start("Opening browser...");
+  // Generate a random code for this CLI session
+  const code = crypto.randomBytes(16).toString("hex");
 
-  const { promise, port } = startCallbackServer();
-  const actualPort = await port;
-  const loginUrl = `${BASE_URL}/login?cli=true&port=${actualPort}`;
+  const loginUrl = `${BASE_URL}/login?cli=true&cli_code=${code}`;
   await open(loginUrl);
 
-  s.message("Waiting for login in browser...");
+  const s = p.spinner();
+  s.start("Waiting for login in browser...");
 
   try {
-    const { token, email } = await promise;
+    const result = await pollForToken(code);
     s.stop("Logged in!");
 
     saveConfig({
-      token,
-      email,
+      token: result.token,
+      email: result.email,
       loggedInAt: new Date().toISOString(),
     });
 
-    p.log.success(`Logged in as ${email}`);
+    p.log.success(`Logged in as ${result.email}`);
   } catch (err) {
     s.stop("Login failed");
     p.log.error(err.message);
   }
 }
+
+async function pollForToken(code, timeout = 120_000) {
+  const start = Date.now();
+  const interval = 2000;
+
+  while (Date.now() - start < timeout) {
+    try {
+      const res = await fetch(
+        `${BASE_URL}/api/auth/cli-callback?code=${code}`
+      );
+      const data = await res.json();
+
+      if (data.status === "complete" && data.token) {
+        return { token: data.token, email: data.email || "" };
+      }
+    } catch {
+      // network error, keep polling
+    }
+
+    await new Promise((r) => setTimeout(r, interval));
+  }
+
+  throw new Error("Login timed out — no response within 2 minutes");
+}

package/src/commands/signup.js

@@ -1,10 +1,10 @@
 import * as p from "@clack/prompts";
 import open from "open";
-import { startCallbackServer } from "../auth-server.js";
+import crypto from "crypto";
 import { saveConfig, BASE_URL } from "../config.js";
 
 export async function signupCommand() {
-  const code = await p.text({
+  const inviteCode = await p.text({
     message: "Enter your invite code",
     placeholder: "CLAW-XXXX",
     validate: (val) => {
@@ -14,34 +14,57 @@ export async function signupCommand() {
     },
   });
 
-  if (p.isCancel(code)) {
+  if (p.isCancel(inviteCode)) {
     p.cancel("Signup cancelled");
     return;
   }
 
-  const s = p.spinner();
-  s.start("Opening browser...");
+  // Generate a random code for this CLI session
+  const cliCode = crypto.randomBytes(16).toString("hex");
 
-  const { promise, port } = startCallbackServer();
-  const actualPort = await port;
-  const signupUrl = `${BASE_URL}/login?cli=true&port=${actualPort}&signup=true&code=${code}`;
+  const signupUrl = `${BASE_URL}/login?cli=true&cli_code=${cliCode}&signup=true&invite=${inviteCode}`;
   await open(signupUrl);
 
-  s.message("Waiting for signup in browser...");
+  const s = p.spinner();
+  s.start("Waiting for signup in browser...");
 
   try {
-    const { token, email } = await promise;
+    const result = await pollForToken(cliCode);
     s.stop("Account created!");
 
     saveConfig({
-      token,
-      email,
+      token: result.token,
+      email: result.email,
       loggedInAt: new Date().toISOString(),
     });
 
-    p.log.success(`Welcome to ClawCard, ${email}!`);
+    p.log.success(`Welcome to ClawCard, ${result.email}!`);
   } catch (err) {
     s.stop("Signup failed");
     p.log.error(err.message);
   }
 }
+
+async function pollForToken(code, timeout = 120_000) {
+  const start = Date.now();
+  const interval = 2000;
+
+  while (Date.now() - start < timeout) {
+    try {
+      const res = await fetch(
+        `${BASE_URL}/api/auth/cli-callback?code=${code}`
+      );
+      const data = await res.json();
+
+      if (data.status === "complete" && data.token) {
+        return { token: data.token, email: data.email || "" };
+      }
+    } catch {
+      // network error, keep polling
+    }
+
+    await new Promise((r) => setTimeout(r, interval));
+  }
+
+  throw new Error("Signup timed out — no response within 2 minutes");
+}