@clawcard/cli 3.0.13 → 3.0.15

package/package.json

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

package/src/commands/agent.js

@@ -63,6 +63,9 @@ export async function agentInfoCmd(options) {
   if (wallet) {
     console.log(`  Wallet:  ${orange(wallet.address)} ${chalk.dim("(Base)")}`);
     console.log(`  USDC:    ${chalk.green(wallet.balanceUsdc + " USDC")}`);
+    if (wallet.balanceEth) {
+      console.log(`  ETH:     ${chalk.dim(wallet.balanceEth + " ETH (gas)")}`);
+    }
   } else {
     console.log(`  Wallet:  ${chalk.dim("none — run: clawcard agent wallet")}`);
   }
@@ -414,7 +417,8 @@ export async function agentWalletCmd(options) {
     console.log();
     console.log(`  Address:  ${orange(wallet.address)}`);
     console.log(`  Network:  Base`);
-    console.log(`  Balance:  ${chalk.green(wallet.balanceUsdc + " USDC")}`);
+    console.log(`  USDC:     ${chalk.green(wallet.balanceUsdc + " USDC")}`);
+    console.log(`  ETH:      ${chalk.dim((wallet.balanceEth || "0.000000") + " ETH (gas)")}`);
     console.log(`  Status:   ${wallet.status}`);
     console.log();
     return;
@@ -449,7 +453,8 @@ export async function agentWalletCmd(options) {
     console.log();
     console.log(`  Address:  ${orange(wallet.address)}`);
     console.log(`  Network:  Base`);
-    console.log(`  Balance:  ${wallet.balanceUsdc} USDC`);
+    console.log(`  USDC:     ${wallet.balanceUsdc} USDC`);
+    console.log(`  ETH:      ${wallet.balanceEth || "0.000000"} ETH (gas)`);
     console.log(`  Status:   ${wallet.status}`);
     console.log();
     console.log(chalk.dim("  Fund via FIAT balance or send USDC directly to the address above."));
@@ -473,7 +478,8 @@ export async function agentWalletBalanceCmd(options) {
 
     console.log();
     console.log(`  USDC Balance:  ${chalk.green(wallet.balanceUsdc + " USDC")}`);
-    console.log(`  FIAT Budget:   ${chalk.green("$" + fiatBudget.toFixed(2))} ${chalk.dim("(available for auto-conversion)")}`);
+    console.log(`  ETH (gas):     ${chalk.dim((wallet.balanceEth || "0.000000") + " ETH")}`);
+    console.log(`  FIAT Budget:   ${chalk.green("$" + fiatBudget.toFixed(2))} ${chalk.dim("(for cards)")}`);
     console.log(`  Effective:     ${chalk.green("~$" + effective.toFixed(2))} ${chalk.dim("total spending power")}`);
     console.log();
   } catch (err) {
@@ -571,48 +577,100 @@ export async function agentWalletTransactionsCmd(options) {
 }
 
 export async function agentWalletFundCmd(options) {
-  if (!options.amount) {
-    const err = "--amount is required (in dollars, e.g., 10.00)";
-    if (options.json) return output({ success: false, error: err }, true);
-    console.log(`  Error: ${err}`);
-    return;
+  // JSON mode — pass through to API directly
+  if (options.json) {
+    if (!options.amount) return output({ success: false, error: "--amount required" }, true);
+    const agentId = await getAgentId();
+    try {
+      const result = await walletFund(agentId, options.amount);
+      return output(result, true);
+    } catch (err) {
+      return output({ success: false, error: err.message }, true);
+    }
   }
 
+  // Interactive wizard
+  const prompts = await import("@clack/prompts");
   const agentId = await getAgentId();
+
+  console.log();
+  console.log(`  ${orange.bold("Fund Your Agent's Wallet")}`);
+  console.log();
+  console.log(chalk.dim("  Your agent's wallet uses USDC (a stablecoin pegged to $1) on the Base network."));
+  console.log(chalk.dim("  To send USDC, your wallet also needs a tiny bit of ETH for transaction fees."));
+  console.log(chalk.dim("  $1 of ETH covers thousands of transactions."));
+  console.log();
+
+  // Step 1: What to buy
+  const asset = await prompts.select({
+    message: "What would you like to purchase?",
+    options: [
+      { value: "eth", label: "ETH (for gas fees)", hint: "buy this first — $1-2 is plenty" },
+      { value: "usdc", label: "USDC (spending money)", hint: "your agent uses this to pay for things" },
+    ],
+  });
+
+  if (prompts.isCancel(asset)) return;
+
+  // Step 2: Amount
+  const defaultAmount = asset === "eth" ? "2" : "10";
+  const amountInput = await prompts.text({
+    message: `How much $ of ${asset === "eth" ? "ETH" : "USDC"} do you want to buy?`,
+    placeholder: defaultAmount,
+    defaultValue: defaultAmount,
+    validate: (v) => {
+      const n = parseFloat(v);
+      if (isNaN(n) || n < 1) return "Minimum is $1.00";
+    },
+  });
+
+  if (prompts.isCancel(amountInput)) return;
+
+  const amount = parseFloat(amountInput);
+
+  // Step 3: Open Coinbase
+  const s = prompts.spinner();
+  s.start("Preparing Coinbase checkout...");
+
   try {
-    const result = await walletFund(agentId, options.amount);
-    if (options.json) return output(result, true);
+    const result = await walletFund(agentId, String(amount));
+    s.stop("");
 
-    if (result.success) {
-      console.log();
-      console.log(`  ${chalk.green("Fund your wallet:")}`);
-      console.log();
-      console.log(`  ${result.instructions}`);
-      console.log();
-      console.log(`  ${orange(result.url)}`);
-      console.log();
-      console.log(chalk.dim(`  Important: Buy USDC for spending, plus ~$1 of ETH for gas fees.`));
-      console.log(chalk.dim(`  $1 of ETH covers thousands of transactions on Base.`));
-      console.log(chalk.dim(`  Or send USDC + ETH directly to ${result.walletAddress} on Base.`));
-      console.log();
+    if (!result.success) {
+      console.log(`  Error: ${result.error}`);
+      return;
+    }
 
-      // Try to open the URL in the browser
-      try {
-        const { default: open } = await import("open");
-        await open(result.url);
-        console.log(chalk.dim("  Opened in browser."));
-      } catch {
-        // open is optional — user can copy the URL
-      }
-      console.log();
-      console.log(`  ${orange("After purchasing, wait ~30 seconds then verify:")}`);
-      console.log(`  ${chalk.dim("$ clawcard agent wallet balance --json")}`);
-      console.log();
+    // Swap the default asset in the URL if they chose ETH
+    let url = result.url;
+    if (asset === "eth") {
+      url = url.replace("defaultAsset=USDC", "defaultAsset=ETH");
+    }
+
+    console.log();
+    console.log(`  ${chalk.green("Opening Coinbase...")} Buy $${amount.toFixed(2)} of ${asset === "eth" ? "ETH" : "USDC"}`);
+    console.log();
+    console.log(`  ${orange(url)}`);
+    console.log();
+
+    try {
+      const { default: open } = await import("open");
+      await open(url);
+    } catch {}
+
+    console.log(chalk.dim(`  After purchasing, wait ~30 seconds for it to arrive.`));
+    console.log();
+
+    // Prompt for next step
+    if (asset === "eth") {
+      console.log(`  ${orange("Next step:")} Run this command again and choose USDC to add spending money.`);
     } else {
-      console.log(`  Error: ${result.error}`);
+      console.log(`  ${orange("Verify your balance:")}`);
+      console.log(`  ${chalk.dim("$ clawcard agent wallet balance --json")}`);
     }
+    console.log();
   } catch (err) {
-    if (options.json) return output({ success: false, error: err.message }, true);
+    s.stop("Failed");
     console.log(`  Error: ${err.message}`);
   }
 }

package/src/index.js

@@ -248,8 +248,8 @@ agentWallet
   });
 agentWallet
   .command("fund")
-  .description("Fund wallet with USDC from FIAT balance")
-  .requiredOption("--amount <dollars>", "Amount in dollars to convert (e.g., 10.00)")
+  .description("Fund wallet — buy USDC and ETH via Coinbase")
+  .option("--amount <dollars>", "Amount in dollars (skips wizard)")
   .option("--json", "Output as JSON")
   .action(async (options) => {
     const { agentWalletFundCmd } = await import("./commands/agent.js");