@clawcard/cli 1.1.2 → 1.1.5

package/package.json

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

package/src/commands/signup.js

@@ -45,33 +45,53 @@ export async function signupCommand() {
 
     p.note(
       [
-        `${orange.bold("Step 1:")} Create an API key`,
-        `  ${chalk.dim("$ clawcard keys create")}`,
+        `${orange.bold("Step 1:")} Top up your balance`,
+        `  ${chalk.dim("Minimum $5 to get started")}`,
         "",
-        `${orange.bold("Step 2:")} Set up your agent`,
-        `  ${chalk.dim("$ clawcard setup")}`,
+        `${orange.bold("Step 2:")} Create your agent key`,
+        `  ${chalk.dim("Gets you an email, phone number, and virtual cards")}`,
         "",
-        `${orange.bold("Step 3:")} Top up your balance`,
-        `  ${chalk.dim("$ clawcard billing topup")}`,
+        `${orange.bold("Step 3:")} Set up your agent`,
+        `  ${chalk.dim("Installs the ClawCard skill for your agent")}`,
       ].join("\n"),
       "Getting Started"
     );
 
-    const next = await p.confirm({
-      message: "Create your first API key now?",
+    // Step 1: Top up
+    const topup = await p.confirm({
+      message: "Top up your balance now? (required to create an agent)",
     });
 
-    if (!p.isCancel(next) && next) {
-      const { keysCreateCommand } = await import("./keys.js");
-      await keysCreateCommand();
+    if (!p.isCancel(topup) && topup) {
+      const { billingTopupCommand } = await import("./billing.js");
+      await billingTopupCommand();
 
-      const runSetup = await p.confirm({
-        message: "Set up your agent now?",
+      p.log.info(chalk.dim("Complete the payment in your browser, then come back here."));
+
+      const ready = await p.confirm({
+        message: "Payment complete?",
+      });
+
+      if (p.isCancel(ready) || !ready) return;
+
+      // Step 2: Create key
+      const createKey = await p.confirm({
+        message: "Create your agent key now?",
       });
 
-      if (!p.isCancel(runSetup) && runSetup) {
-        const { setupCommand } = await import("./setup.js");
-        await setupCommand();
+      if (!p.isCancel(createKey) && createKey) {
+        const { keysCreateCommand } = await import("./keys.js");
+        await keysCreateCommand();
+
+        // Step 3: Setup
+        const runSetup = await p.confirm({
+          message: "Set up your agent now?",
+        });
+
+        if (!p.isCancel(runSetup) && runSetup) {
+          const { setupCommand } = await import("./setup.js");
+          await setupCommand();
+        }
       }
     }
   } catch (err) {

package/src/index.js

@@ -186,33 +186,61 @@ if (process.argv.length <= 2) {
     );
   }
 
-  const options = loggedIn
-    ? [
-        {
-          value: "agent",
-          label: "My Agent",
-          hint: "email, phone, key details",
-        },
-        {
-          value: "setup",
-          label: "Setup",
-          hint: "set up your agent",
-        },
-        { value: "billing", label: "Billing", hint: "check balance & top up" },
-        { value: "referral", label: "Referral", hint: "share & earn $5" },
-        { value: "whoami", label: "Who am I?", hint: "show current account" },
-        { value: "logout", label: "Logout", hint: "clear session" },
-        { value: "help", label: "Help", hint: "show all commands" },
-      ]
-    : [
-        { value: "login", label: "Log in", hint: "authenticate via browser" },
-        {
-          value: "signup",
-          label: "Sign up",
-          hint: "create account with invite code",
-        },
-        { value: "help", label: "Help", hint: "show all commands" },
-      ];
+  let options;
+
+  if (!loggedIn) {
+    options = [
+      { value: "login", label: "Log in", hint: "authenticate via browser" },
+      {
+        value: "signup",
+        label: "Sign up",
+        hint: "create account with invite code",
+      },
+      { value: "help", label: "Help", hint: "show all commands" },
+    ];
+  } else {
+    // Check user state to show contextual nudges
+    let hasBalance = true;
+    let hasAgent = true;
+
+    try {
+      const { getBalance, listAgents } = await import("./api.js");
+      const [balance, agents] = await Promise.all([
+        getBalance().catch(() => ({ amountCents: 0 })),
+        listAgents().catch(() => []),
+      ]);
+      hasBalance = balance.amountCents >= 500;
+      hasAgent = agents.some((a) => a.status === "active");
+    } catch {
+      // couldn't check — show full menu
+    }
+
+    if (!hasBalance) {
+      p.log.warn(
+        `You need at least $5 balance to create an agent. Run ${orange("clawcard billing topup")} to get started.`
+      );
+    } else if (!hasAgent) {
+      p.log.warn(
+        `You have balance but no agent yet. Run ${orange("clawcard keys create")} to create one.`
+      );
+    }
+
+    options = [
+      ...(!hasBalance
+        ? [{ value: "topup", label: "Top up balance", hint: "required — minimum $5 to get started" }]
+        : !hasAgent
+          ? [{ value: "keys-create", label: "Create agent", hint: "you have balance — create your agent now" }]
+          : [{ value: "agent", label: "My Agent", hint: "email, phone, key details" }]),
+      ...(hasAgent
+        ? [{ value: "setup", label: "Setup", hint: "set up your agent" }]
+        : []),
+      { value: "billing", label: "Billing", hint: "check balance & top up" },
+      { value: "referral", label: "Referral", hint: "share & earn $5" },
+      { value: "whoami", label: "Who am I?", hint: "show current account" },
+      { value: "logout", label: "Logout", hint: "clear session" },
+      { value: "help", label: "Help", hint: "show all commands" },
+    ];
+  }
 
   const action = await p.select({
     message: "What would you like to do?",
@@ -230,6 +258,8 @@ if (process.argv.length <= 2) {
     logout: () => import("./commands/logout.js").then((m) => m.logoutCommand()),
     whoami: () => import("./commands/whoami.js").then((m) => m.whoamiCommand()),
     agent: () => import("./commands/keys.js").then((m) => m.agentStatusCommand()),
+    "keys-create": () => import("./commands/keys.js").then((m) => m.keysCreateCommand()),
+    "topup": () => import("./commands/billing.js").then((m) => m.billingTopupCommand()),
     keys: () => import("./commands/keys.js").then((m) => m.keysCommand()),
     setup: () => import("./commands/setup.js").then((m) => m.setupCommand()),
     billing: () =>