@clawcard/cli 1.0.3 → 1.0.5

package/package.json

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

package/src/commands/help.js

@@ -30,6 +30,7 @@ const COMMANDS = [
   ["", ""],
   [orange.bold("Other"), ""],
   ["  referral", "Show referral code"],
+  ["  update", "Check for updates"],
   ["  help", "Show this help"],
   ["  --version", "Show version"],
 ];

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,64 @@ 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) {
+        // Fetch email using the token
+        let email = "";
+        try {
+          const meRes = await fetch(`${BASE_URL}/api/me`, {
+            headers: { Authorization: `Bearer ${data.token}` },
+          });
+          const me = await meRes.json();
+          email = me.email || "";
+        } catch {
+          // non-critical
+        }
+
+        return { token: data.token, 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,68 @@ 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) {
+        let email = "";
+        try {
+          const meRes = await fetch(`${BASE_URL}/api/me`, {
+            headers: { Authorization: `Bearer ${data.token}` },
+          });
+          const me = await meRes.json();
+          email = me.email || "";
+        } catch {
+          // non-critical
+        }
+
+        return { token: data.token, email };
+      }
+    } catch {
+      // network error, keep polling
+    }
+
+    await new Promise((r) => setTimeout(r, interval));
+  }
+
+  throw new Error("Signup timed out — no response within 2 minutes");
+}

package/src/index.js

@@ -1,13 +1,19 @@
 import { Command } from "commander";
 import * as p from "@clack/prompts";
-import { showSplash } from "./splash.js";
+import chalk from "chalk";
+import { showSplash, checkForUpdate, VERSION } from "./splash.js";
 import { isLoggedIn } from "./config.js";
 
+const orange = chalk.hex("#FF6B35");
+
 // Show splash on every invocation
 showSplash();
 
+// Check for updates in background (non-blocking)
+const updatePromise = checkForUpdate();
+
 const program = new Command();
-program.name("clawcard").description("The ClawCard CLI").version("1.0.3");
+program.name("clawcard").description("The ClawCard CLI").version(VERSION);
 
 // Auth commands
 program
@@ -142,6 +148,22 @@ program
     await referralCommand();
   });
 
+// Update
+program
+  .command("update")
+  .description("Update to the latest version")
+  .action(async () => {
+    const s = p.spinner();
+    s.start("Checking for updates...");
+    const latest = await checkForUpdate();
+    if (latest) {
+      s.stop(`Update available: ${chalk.dim(VERSION)} → ${orange.bold(latest)}`);
+      p.log.info(`Run: ${orange("npm i -g @clawcard/cli@latest")}`);
+    } else {
+      s.stop("You're on the latest version!");
+    }
+  });
+
 // Help
 program
   .command("help")
@@ -155,6 +177,14 @@ program
 if (process.argv.length <= 2) {
   const loggedIn = isLoggedIn();
 
+  // Show update notice if available (non-blocking, already fetched)
+  const latest = await updatePromise;
+  if (latest) {
+    p.log.warn(
+      `Update available: ${chalk.dim(VERSION)} → ${orange.bold(latest)}  Run ${orange("npm i -g @clawcard/cli@latest")}`
+    );
+  }
+
   const options = loggedIn
     ? [
         {

package/src/splash.js

@@ -1,11 +1,33 @@
 import chalk from "chalk";
+import { readFileSync } from "fs";
+import { join, dirname } from "path";
+import { fileURLToPath } from "url";
 
 const o = chalk.hex("#FF6B35");
 const d = chalk.dim;
 
+const __dirname = dirname(fileURLToPath(import.meta.url));
+const pkg = JSON.parse(readFileSync(join(__dirname, "..", "package.json"), "utf-8"));
+export const VERSION = pkg.version;
+
+export async function checkForUpdate() {
+  try {
+    const res = await fetch("https://registry.npmjs.org/@clawcard/cli/latest", {
+      signal: AbortSignal.timeout(3000),
+    });
+    const data = await res.json();
+    if (data.version && data.version !== VERSION) {
+      return data.version;
+    }
+  } catch {
+    // offline or timeout — skip silently
+  }
+  return null;
+}
+
 export function showSplash() {
   console.log();
-  console.log(`  🦞 ${o.bold("clawcard.sh")}`);
+  console.log(`  🦞 ${o.bold("clawcard.sh")} ${d("v" + VERSION)}`);
   console.log(`  ${o("on-demand credit cards, email and phone for your agents")}`);
   console.log();
 }