@clawcard/cli 1.0.5 → 1.0.9

package/README.md

@@ -79,11 +79,13 @@ Each API key comes with:
 
 ## Pricing
 
-- **Free** — 1 key, 1 card/month
-- **Starter** ($7/mo) — 2 keys, 5 cards/month
-- **Pro** ($19/mo) — 5 keys, 25 cards/month
+Pay as you go. No subscriptions, no monthly fees.
 
-Card spend is separate — top up your balance anytime.
+- **Minimum top-up** — $5
+- **Processing fee** — 10%
+- **Cards** — Unlimited
+
+Top up your balance and your agent spends it on virtual cards.
 
 ## Links
 

package/package.json

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

package/src/commands/billing.js

@@ -2,13 +2,7 @@ import * as p from "@clack/prompts";
 import chalk from "chalk";
 import open from "open";
 import { requireAuth } from "../auth-guard.js";
-import {
-  getBalance,
-  getSubscription,
-  getTransactions,
-  createCheckout,
-  createPortal,
-} from "../api.js";
+import { getBalance, getTransactions, createCheckout } from "../api.js";
 
 const orange = chalk.hex("#FF6B35");
 
@@ -19,26 +13,13 @@ export async function billingCommand() {
   s.start("Loading billing info...");
 
   try {
-    const [balance, sub] = await Promise.all([
-      getBalance(),
-      getSubscription(),
-    ]);
+    const balance = await getBalance();
     s.stop("Billing loaded");
 
-    const planColors = {
-      free: chalk.gray,
-      starter: chalk.blue,
-      pro: orange,
-    };
-    const colorPlan = (planColors[sub.subscription?.plan] || chalk.white)(
-      sub.subscription?.planName || sub.subscription?.plan || "Free"
-    );
-
     const info = [
-      `Plan:     ${colorPlan}`,
       `Balance:  ${chalk.green("$" + (balance.amountCents / 100).toFixed(2))}`,
-      `Keys:     ${sub.subscription?.currentAgentKeys || 0}/${sub.subscription?.maxAgentKeys || 1}`,
-      `Cards:    ${sub.subscription?.currentCards || 0}/${sub.subscription?.maxCardsPerMonth || 1} this period`,
+      "",
+      chalk.dim("Pay as you go — 10% processing fee on top-ups"),
     ].join("\n");
 
     p.note(info, "Billing");
@@ -47,7 +28,6 @@ export async function billingCommand() {
       message: "What would you like to do?",
       options: [
         { value: "topup", label: "Top up balance" },
-        { value: "upgrade", label: "Upgrade plan" },
         { value: "transactions", label: "View transactions" },
         { value: "back", label: "Back" },
       ],
@@ -58,8 +38,6 @@ export async function billingCommand() {
     switch (action) {
       case "topup":
         return billingTopupCommand();
-      case "upgrade":
-        return billingUpgradeCommand();
       case "transactions":
         return billingTransactionsCommand();
     }
@@ -91,13 +69,13 @@ export async function billingTopupCommand() {
   requireAuth();
 
   const amount = await p.select({
-    message: "How much would you like to add?",
+    message: "How much would you like to add? (10% processing fee)",
     options: [
-      { value: 500, label: "$5.00" },
-      { value: 1000, label: "$10.00" },
-      { value: 2500, label: "$25.00" },
-      { value: 5000, label: "$50.00" },
-      { value: 10000, label: "$100.00" },
+      { value: 500, label: "$5.00", hint: "you pay $5.50" },
+      { value: 1000, label: "$10.00", hint: "you pay $11.00" },
+      { value: 2500, label: "$25.00", hint: "you pay $27.50" },
+      { value: 5000, label: "$50.00", hint: "you pay $55.00" },
+      { value: 10000, label: "$100.00", hint: "you pay $110.00" },
     ],
   });
 
@@ -119,24 +97,6 @@ export async function billingTopupCommand() {
   }
 }
 
-export async function billingUpgradeCommand() {
-  requireAuth();
-
-  const s = p.spinner();
-  s.start("Opening billing portal...");
-
-  try {
-    const result = await createPortal();
-    s.stop("");
-
-    await open(result.url);
-    p.log.success("Manage your subscription in the browser");
-  } catch (err) {
-    s.stop("Failed");
-    p.log.error(err.message);
-  }
-}
-
 export async function billingTransactionsCommand() {
   requireAuth();
 

package/src/commands/help.js

@@ -25,7 +25,6 @@ const COMMANDS = [
   ["  billing", "Interactive billing dashboard"],
   ["  billing balance", "Quick balance check"],
   ["  billing topup", "Top up balance"],
-  ["  billing upgrade", "Upgrade subscription"],
   ["  billing transactions", "View transaction history"],
   ["", ""],
   [orange.bold("Other"), ""],

package/src/commands/login.js

@@ -49,19 +49,7 @@ async function pollForToken(code, timeout = 120_000) {
       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 };
+        return { token: data.token, email: data.email || "" };
       }
     } catch {
       // network error, keep polling

package/src/commands/setup.js

@@ -1,11 +1,6 @@
 import * as p from "@clack/prompts";
 import { execSync } from "child_process";
-import {
-  readFileSync,
-  writeFileSync,
-  mkdirSync,
-  existsSync,
-} from "fs";
+import { readFileSync, writeFileSync, mkdirSync } from "fs";
 import { join } from "path";
 import { homedir } from "os";
 import { requireAuth } from "../auth-guard.js";
@@ -16,107 +11,13 @@ import chalk from "chalk";
 const orange = chalk.hex("#FF6B35");
 const home = homedir();
 
-// ── Per-harness env var writers ──
-
-const HARNESSES = [
-  {
-    value: "claude-code",
-    label: "Claude Code",
-    hint: "~/.claude/settings.json",
-    write(apiKey) {
-      const settingsPath = join(home, ".claude", "settings.json");
-      let settings = {};
-      try {
-        settings = JSON.parse(readFileSync(settingsPath, "utf-8"));
-      } catch {
-        // doesn't exist yet
-      }
-      if (!settings.env) settings.env = {};
-      settings.env.CLAWCARD_API_KEY = apiKey;
-      mkdirSync(join(home, ".claude"), { recursive: true });
-      writeFileSync(settingsPath, JSON.stringify(settings, null, 2));
-      return settingsPath;
-    },
-  },
-  {
-    value: "cursor",
-    label: "Cursor",
-    hint: ".cursor/environment.json (project)",
-    write(apiKey) {
-      const envPath = join(process.cwd(), ".cursor", "environment.json");
-      let config = {};
-      try {
-        config = JSON.parse(readFileSync(envPath, "utf-8"));
-      } catch {
-        // doesn't exist yet
-      }
-      if (!config.env) config.env = {};
-      config.env.CLAWCARD_API_KEY = apiKey;
-      mkdirSync(join(process.cwd(), ".cursor"), { recursive: true });
-      writeFileSync(envPath, JSON.stringify(config, null, 2));
-      return envPath;
-    },
-  },
-  {
-    value: "openclaw",
-    label: "OpenClaw",
-    hint: "~/.openclaw/.env",
-    write(apiKey) {
-      const envPath = join(home, ".openclaw", ".env");
-      let content = "";
-      try {
-        content = readFileSync(envPath, "utf-8");
-      } catch {
-        // doesn't exist
-      }
-      const regex = /^CLAWCARD_API_KEY=.*$/m;
-      if (regex.test(content)) {
-        content = content.replace(regex, `CLAWCARD_API_KEY=${apiKey}`);
-      } else {
-        content = content.trimEnd() + `\nCLAWCARD_API_KEY=${apiKey}\n`;
-      }
-      mkdirSync(join(home, ".openclaw"), { recursive: true });
-      writeFileSync(envPath, content);
-      return envPath;
-    },
-  },
-  {
-    value: "codex",
-    label: "Codex (OpenAI)",
-    hint: "shell env",
-    write(apiKey) {
-      // Codex reads from shell env; write to ~/.clawcard/.env and instruct user
-      return writeToClawcardEnv(apiKey);
-    },
-  },
-  {
-    value: "cline",
-    label: "Cline",
-    hint: "shell env",
-    write(apiKey) {
-      // Cline reads from shell env; write to ~/.clawcard/.env and instruct user
-      return writeToClawcardEnv(apiKey);
-    },
-  },
-  {
-    value: "other",
-    label: "Other / manual",
-    hint: "~/.clawcard/.env",
-    write(apiKey) {
-      return writeToClawcardEnv(apiKey);
-    },
-  },
-];
-
-function writeToClawcardEnv(apiKey) {
+function writeApiKey(apiKey) {
   const envPath = join(home, ".clawcard", ".env");
   mkdirSync(join(home, ".clawcard"), { recursive: true });
   let content = "";
   try {
     content = readFileSync(envPath, "utf-8");
-  } catch {
-    // doesn't exist
-  }
+  } catch {}
   const regex = /^CLAWCARD_API_KEY=.*$/m;
   if (regex.test(content)) {
     content = content.replace(regex, `CLAWCARD_API_KEY=${apiKey}`);
@@ -147,36 +48,17 @@ export async function setupCommand() {
   }
 
   if (agents.length === 0) {
-    p.log.info("You don't have any keys yet. Let's create one first.");
-    const { keysCreateCommand } = await import("./keys.js");
-    await keysCreateCommand();
-    return setupCommand();
-  }
-
-  const keyChoice = await p.select({
-    message: "Which API key should this agent use?",
-    options: [
-      ...agents.map((a) => ({
-        value: a.id,
-        label: `${a.name || "unnamed"} (${a.keyPrefix}...)`,
-        hint: a.email,
-      })),
-      { value: "create", label: "Create a new key" },
-    ],
-  });
-
-  if (p.isCancel(keyChoice)) return;
-
-  if (keyChoice === "create") {
+    p.log.info("You don't have an agent key yet. Let's create one.");
     const { keysCreateCommand } = await import("./keys.js");
     await keysCreateCommand();
     return setupCommand();
   }
 
-  const selectedKey = agents.find((a) => a.id === keyChoice);
+  // Auto-select if there's only one key
+  const selectedKey = agents[0];
 
   // Step 2: Get the raw API key
-  let apiKey = getSavedKey(keyChoice);
+  let apiKey = getSavedKey(selectedKey.id);
 
   if (!apiKey) {
     p.log.warn("Raw API key not found locally (it's only shown at creation).");
@@ -191,19 +73,7 @@ export async function setupCommand() {
     apiKey = pastedKey;
   }
 
-  // Step 3: Which harness?
-  const harness = await p.select({
-    message: "Which agent harness are you using?",
-    options: HARNESSES.map((h) => ({
-      value: h.value,
-      label: h.label,
-      hint: h.hint,
-    })),
-  });
-
-  if (p.isCancel(harness)) return;
-
-  // Step 4: Global or project?
+  // Step 3: Global or project?
   const scope = await p.select({
     message: "Install skill globally or for this project?",
     options: [
@@ -222,7 +92,7 @@ export async function setupCommand() {
 
   if (p.isCancel(scope)) return;
 
-  // Step 5: Install skill via skills.sh
+  // Step 4: Install skill via skills.sh (auto-detects all agents)
   const s2 = p.spinner();
   s2.start("Installing ClawCard skill...");
 
@@ -243,37 +113,11 @@ export async function setupCommand() {
     );
   }
 
-  // Step 6: Write API key to harness-specific location
-  const s3 = p.spinner();
-  s3.start("Configuring API key...");
-
-  const harnessConfig = HARNESSES.find((h) => h.value === harness);
-  const writtenPath = harnessConfig.write(apiKey);
-
-  s3.stop("API key configured!");
-
-  // Step 7: Harness-specific follow-up instructions
-  const needsShellExport = ["codex", "cline", "other"].includes(harness);
-
-  if (needsShellExport) {
-    p.note(
-      [
-        `Key saved to: ${chalk.dim(writtenPath)}`,
-        "",
-        `Add this to your shell profile (.zshrc, .bashrc):`,
-        "",
-        orange(`  export CLAWCARD_API_KEY="${apiKey}"`),
-        "",
-        chalk.dim("Or source the env file:"),
-        orange(`  source ${writtenPath}`),
-      ].join("\n"),
-      "Manual step required"
-    );
-  } else {
-    p.log.info(`Key written to ${chalk.dim(writtenPath)}`);
-  }
+  // Step 5: Write API key to ~/.clawcard/.env
+  const envPath = writeApiKey(apiKey);
+  p.log.info(`API key saved to ${chalk.dim(envPath)}`);
 
-  // Step 8: Summary
+  // Step 6: Summary
   p.log.success("Your agent is ready to use ClawCard!");
   p.log.info(
     [

package/src/commands/signup.js

@@ -1,8 +1,11 @@
 import * as p from "@clack/prompts";
+import chalk from "chalk";
 import open from "open";
 import crypto from "crypto";
 import { saveConfig, BASE_URL } from "../config.js";
 
+const orange = chalk.hex("#FF6B35");
+
 export async function signupCommand() {
   const inviteCode = await p.text({
     message: "Enter your invite code",
@@ -39,6 +42,38 @@ export async function signupCommand() {
     });
 
     p.log.success(`Welcome to ClawCard, ${result.email}!`);
+
+    p.note(
+      [
+        `${orange.bold("Step 1:")} Create an API key`,
+        `  ${chalk.dim("$ clawcard keys create")}`,
+        "",
+        `${orange.bold("Step 2:")} Set up your agent`,
+        `  ${chalk.dim("$ clawcard setup")}`,
+        "",
+        `${orange.bold("Step 3:")} Top up your balance`,
+        `  ${chalk.dim("$ clawcard billing topup")}`,
+      ].join("\n"),
+      "Getting Started"
+    );
+
+    const next = await p.confirm({
+      message: "Create your first API key now?",
+    });
+
+    if (!p.isCancel(next) && next) {
+      const { keysCreateCommand } = await import("./keys.js");
+      await keysCreateCommand();
+
+      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) {
     s.stop("Signup failed");
     p.log.error(err.message);
@@ -57,18 +92,7 @@ async function pollForToken(code, timeout = 120_000) {
       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 };
+        return { token: data.token, email: data.email || "" };
       }
     } catch {
       // network error, keep polling

package/src/index.js

@@ -121,14 +121,6 @@ billing
     await billingTopupCommand();
   });
 
-billing
-  .command("upgrade")
-  .description("Upgrade subscription")
-  .action(async () => {
-    const { billingUpgradeCommand } = await import("./commands/billing.js");
-    await billingUpgradeCommand();
-  });
-
 billing
   .command("transactions")
   .description("View transaction history")
@@ -190,9 +182,8 @@ if (process.argv.length <= 2) {
         {
           value: "setup",
           label: "Setup",
-          hint: "connect ClawCard to your agent",
+          hint: "set up your agent",
         },
-        { value: "keys", label: "Keys", hint: "create & manage API keys" },
         { value: "billing", label: "Billing", hint: "check balance & top up" },
         { value: "referral", label: "Referral", hint: "share & earn $10" },
         { value: "whoami", label: "Who am I?", hint: "show current account" },