arispay 0.1.2 → 0.1.4

package/dist/cli.js

@@ -110,6 +110,78 @@ ${bold("Get started")}
     }
   }
 }
+async function collectAndTokenizeCard(client, userId) {
+  console.log(`
+  ${dim("Enter your card details below. They are sent directly to Fiserv for")}`);
+  console.log(`  ${dim("tokenization \u2014 ArisPay never sees or stores your full card number.")}
+`);
+  const cardNumber = await promptSecret(`  Card number: `);
+  if (!cardNumber) {
+    console.log(dim("  Cancelled."));
+    return false;
+  }
+  const expiry = await prompt(`  Expiry ${dim("(MM/YY)")}: `);
+  if (!expiry) {
+    console.log(dim("  Cancelled."));
+    return false;
+  }
+  const securityCode = await promptSecret(`  CVV: `);
+  if (!securityCode) {
+    console.log(dim("  Cancelled."));
+    return false;
+  }
+  const [expiryMonth, expiryYear] = expiry.split("/").map((s) => s.trim());
+  if (!expiryMonth || !expiryYear) {
+    console.log(`  ${dim("Invalid expiry format. Use MM/YY.")}`);
+    return false;
+  }
+  console.log(`
+  ${dim("Tokenizing and verifying card...")}`);
+  try {
+    const result = await client.users.addPaymentMethod({
+      userId,
+      type: "card",
+      cardNumber: cardNumber.replace(/\s/g, ""),
+      expiryMonth,
+      expiryYear: expiryYear.length === 2 ? `20${expiryYear}` : expiryYear,
+      securityCode
+    });
+    const r = result;
+    if (r.requiresVerification) {
+      const challengeUrl = r.challengeUrl;
+      if (challengeUrl) {
+        console.log();
+        console.log(`  ${bold("Card verification required")}`);
+        console.log(`  ${dim("Your bank requires 3D Secure verification. Open this link:")}
+`);
+        console.log(`    ${cyan(challengeUrl)}
+`);
+        console.log(`  ${dim("Complete the verification in your browser, then come back here.")}`);
+        await prompt(`
+  Press Enter when done...`);
+        success("Card added (verification pending)\n");
+      } else {
+        console.log();
+        success("Card tokenized (verification in progress)\n");
+      }
+      console.log(`  ${bold("Card:")}   ${r.cardBrand?.toUpperCase() || "Card"} ending in ${r.cardLast4 || "****"}
+`);
+      return true;
+    }
+    console.log();
+    success(`Card verified!
+`);
+    console.log(`  ${bold("Card:")}   ${r.cardBrand?.toUpperCase() || "Card"} ending in ${r.cardLast4 || "****"}`);
+    console.log(`
+  ${dim("Your card is now linked and verified. You can make payments.")}
+`);
+    return true;
+  } catch (e) {
+    console.log();
+    console.error(`  \x1B[31m\u2717\x1B[0m ${e.message || "Failed to tokenize card"}`);
+    return false;
+  }
+}
 async function wizardConnectAgent(client) {
   console.log(`
 ${bold("Connect your agent to ArisPay")}`);
@@ -122,12 +194,13 @@ ${bold("Connect your agent to ArisPay")}`);
     return;
   }
   console.log(`
-  ${dim("How does your agent make payments?")}`);
-  console.log(`  ${dim("  platform   \u2014 Your app triggers payments on behalf of the agent (default)")}`);
-  console.log(`  ${dim("  autonomous \u2014 The agent decides when to pay, within spend limits you set")}
+  ${dim("How does your agent make payments?")}
+`);
+  console.log(`  ${cyan("[1]")} Platform   ${dim("\u2014 Your app triggers payments on behalf of the agent")}`);
+  console.log(`  ${cyan("[2]")} Autonomous ${dim("\u2014 The agent decides when to pay, within spend limits you set")}
 `);
-  const modeInput = await prompt(`  Mode ${dim("[platform]")}: `);
-  const mode = modeInput === "autonomous" ? "autonomous" : "platform";
+  const modeChoice = await prompt(`  Enter choice ${dim("[1]")}: `);
+  const mode = modeChoice === "2" ? "autonomous" : "platform";
   console.log(`
   ${dim("Connecting agent...")}`);
   try {
@@ -138,19 +211,110 @@ ${bold("Connect your agent to ArisPay")}`);
     });
     const a = agent;
     const config = loadConfig(BRAND);
-    saveConfig(BRAND, { ...config, agentId: a.id });
+    saveConfig(BRAND, { ...config, agentId: a.id, agentName: a.name || name, agentMode: a.mode || mode });
     console.log();
     success(`Agent connected!
 `);
-    console.log(`  ${dim("ArisPay generated an Ed25519 keypair for your agent \u2014 this is its")}`);
-    console.log(`  ${dim("cryptographic identity for signing payments (RFC 9421 TAP).")}`);
-    console.log(`  ${dim("A circuit breaker has been set up to auto-pause if anything looks off.")}
+    console.log(`  ${dim("ArisPay has created a Visa TAP cryptographic identity for your agent.")}`);
+    console.log(`  ${dim("Every payment your agent makes is signed with this identity so merchants")}`);
+    console.log(`  ${dim("can verify it is authorised. A circuit breaker is also in place to")}`);
+    console.log(`  ${dim("auto-pause your agent if unusual spending is detected.")}
 `);
     console.log(`  ${bold("Agent ID:")}  ${a.id}`);
     console.log(`  ${bold("Name:")}      ${a.name}`);
     console.log(`  ${bold("Mode:")}      ${a.mode || mode}`);
     console.log(`  ${bold("Status:")}    ${a.status}
 `);
+    if (mode === "autonomous") {
+      console.log(`  ${bold("Set spend limits")}`);
+      console.log(`  ${dim("Autonomous agents need spend limits so they can only spend within bounds you control.")}
+`);
+      const perTxStr = await prompt(`  Max per transaction ${dim("(e.g. 50.00)")}: $`);
+      const dailyStr = await prompt(`  Max per day ${dim("(e.g. 200.00)")}: $`);
+      const monthlyStr = await prompt(`  Max per month ${dim("(e.g. 1000.00)")}: $`);
+      const perTx = parseFloat(perTxStr);
+      const daily = parseFloat(dailyStr);
+      const monthly = parseFloat(monthlyStr);
+      if (perTx || daily || monthly) {
+        let endUserId = config.endUserId;
+        if (!endUserId) {
+          try {
+            const user = await client.users.create({ externalId: `cli_${Date.now()}` });
+            endUserId = user.id;
+            saveConfig(BRAND, { ...config, agentId: a.id, agentName: a.name || name, endUserId });
+          } catch {
+          }
+        }
+        if (endUserId) {
+          try {
+            await client.users.setLimits({
+              userId: endUserId,
+              agentId: a.id,
+              ...perTx ? { maxPerTransaction: Math.round(perTx * 100) } : {},
+              ...daily ? { maxDaily: Math.round(daily * 100) } : {},
+              ...monthly ? { maxMonthly: Math.round(monthly * 100) } : {}
+            });
+            console.log();
+            success("Spend limits set\n");
+          } catch (e) {
+            console.log();
+            console.error(`  \x1B[31m\u2717\x1B[0m ${e.message || "Failed to set spend limits"}`);
+          }
+        }
+      } else {
+        console.log(`
+  ${dim("No limits set. You can configure them later on your dashboard.")}
+`);
+      }
+      console.log(`  ${bold("Fund your agent")}`);
+      console.log(`  ${dim("Autonomous agents spend from their own balance. You need to add a")}`);
+      console.log(`  ${dim("payment method and top up your agent before it can make payments.")}
+`);
+      const fundNow = await prompt(`  Add a card and fund your agent now? ${dim("(Y/n)")}: `);
+      if (fundNow.toLowerCase() !== "n") {
+        const latestConfig = loadConfig(BRAND);
+        let endUserId = latestConfig.endUserId;
+        if (!endUserId) {
+          try {
+            const user = await client.users.create({ externalId: `cli_${Date.now()}` });
+            endUserId = user.id;
+            saveConfig(BRAND, { ...latestConfig, endUserId });
+          } catch (e) {
+            console.error(`  \x1B[31m\u2717\x1B[0m ${e.message || "Failed to set up account"}`);
+            return;
+          }
+        }
+        const cardOk = await collectAndTokenizeCard(client, endUserId);
+        if (!cardOk) return;
+        const topupStr = await prompt(`
+  Amount to load ${dim("(e.g. 50.00)")}: $`);
+        const topupDollars = parseFloat(topupStr);
+        if (!topupDollars || isNaN(topupDollars)) {
+          console.log(dim("  Skipped. You can top up later from your dashboard."));
+        } else {
+          console.log(`
+  ${dim(`Loading $${topupDollars.toFixed(2)} to ${a.name}...`)}`);
+          try {
+            const result = await client.agents.topup(a.id, {
+              amount: Math.round(topupDollars * 100),
+              userId: endUserId,
+              currency: "USD",
+              description: "Initial top-up via CLI"
+            });
+            console.log();
+            success(`Agent funded! Balance: $${((result.balance ?? result.availableBalance ?? 0) / 100).toFixed(2)}
+`);
+          } catch (e) {
+            console.log();
+            console.error(`  \x1B[31m\u2717\x1B[0m ${e.message || "Failed to top up agent"}`);
+          }
+        }
+      } else {
+        console.log(`
+  ${dim("You can add a payment method and fund your agent from the menu or dashboard.")}
+`);
+      }
+    }
   } catch (e) {
     console.log();
     console.error(`  \x1B[31m\u2717\x1B[0m ${e.message || "Failed to connect agent"}`);
@@ -187,54 +351,7 @@ ${bold("Add a payment method")}`);
 `);
   const methodChoice = await prompt(`  Enter choice: `);
   if (methodChoice === "1") {
-    console.log(`
-  ${dim("Enter your card details below. They are sent directly to Fiserv for")}`);
-    console.log(`  ${dim("tokenization \u2014 ArisPay never sees or stores your full card number.")}
-`);
-    const cardNumber = await promptSecret(`  Card number: `);
-    if (!cardNumber) {
-      console.log(dim("  Cancelled."));
-      return;
-    }
-    const expiry = await prompt(`  Expiry ${dim("(MM/YY)")}: `);
-    if (!expiry) {
-      console.log(dim("  Cancelled."));
-      return;
-    }
-    const securityCode = await promptSecret(`  CVV: `);
-    if (!securityCode) {
-      console.log(dim("  Cancelled."));
-      return;
-    }
-    const [expiryMonth, expiryYear] = expiry.split("/").map((s) => s.trim());
-    if (!expiryMonth || !expiryYear) {
-      console.log(`  ${dim("Invalid expiry format. Use MM/YY.")}`);
-      return;
-    }
-    console.log(`
-  ${dim("Tokenizing card...")}`);
-    try {
-      const result = await client.users.addPaymentMethod({
-        userId,
-        type: "card",
-        cardNumber: cardNumber.replace(/\s/g, ""),
-        expiryMonth,
-        expiryYear: expiryYear.length === 2 ? `20${expiryYear}` : expiryYear,
-        securityCode
-      });
-      const r = result;
-      console.log();
-      success(`Card tokenized!
-`);
-      console.log(`  ${bold("Card:")}   ${r.cardBrand?.toUpperCase() || "Card"} ending in ${r.cardLast4 || "****"}`);
-      console.log(`  ${bold("Token:")}  ${dim(r.tokenId || "stored securely")}`);
-      console.log(`
-  ${dim("Your card is now linked to your agent. You can make test payments.")}
-`);
-    } catch (e) {
-      console.log();
-      console.error(`  \x1B[31m\u2717\x1B[0m ${e.message || "Failed to tokenize card"}`);
-    }
+    await collectAndTokenizeCard(client, userId);
   } else if (methodChoice === "2") {
     console.log();
     const chain = await prompt(`  Chain ${dim("(ethereum, base, polygon, solana)")}: `);
@@ -278,13 +395,16 @@ ${bold("Add a payment method")}`);
 async function wizardTestPayment(client) {
   console.log(`
 ${bold("Make a test payment")}`);
-  console.log(`  ${dim("Verify your integration works by sending a test payment.")}
+  console.log(`  ${dim("Verify your integration works by sending a test payment.")}`);
+  console.log(`  ${dim("This is a sandbox test \u2014 no real funds are moved.")}
 `);
   const config = loadConfig(BRAND);
   const storedAgentId = config.agentId;
+  const storedAgentName = config.agentName;
   let agentId;
   if (storedAgentId) {
-    const useStored = await prompt(`  Use agent ${dim(storedAgentId.slice(0, 12) + "...")}? ${dim("(Y/n)")}: `);
+    const agentLabel = storedAgentName ? bold(storedAgentName) : dim(storedAgentId.slice(0, 12) + "...");
+    const useStored = await prompt(`  Use agent ${agentLabel}? ${dim("(Y/n)")}: `);
     if (useStored.toLowerCase() === "n") {
       agentId = await prompt(`  Agent ID: `);
       if (!agentId) {
@@ -301,27 +421,43 @@ ${bold("Make a test payment")}`);
       return;
     }
   }
-  const amountStr = await prompt(`  Amount in cents ${dim("(e.g. 500 = $5.00)")}: `);
-  const amount = Number(amountStr);
-  if (!amount || isNaN(amount)) {
+  const amountStr = await prompt(`  Amount ${dim("(e.g. 5.00)")}: $`);
+  const dollars = parseFloat(amountStr);
+  if (!dollars || isNaN(dollars)) {
     console.log(dim("  Invalid amount. Cancelled."));
     return;
   }
-  const memo = await prompt(`  What is this payment for? `);
+  const amount = Math.round(dollars * 100);
+  const memo = await prompt(`  Description ${dim("(appears on the transaction record)")}: `);
   if (!memo) {
     console.log(dim("  Cancelled."));
     return;
   }
+  const agentMode = config.agentMode;
+  const isAutonomous = agentMode === "autonomous";
+  if (!isAutonomous) {
+    const userId = config.endUserId;
+    if (!userId) {
+      console.log(`
+  ${dim("No payment method set up yet. Run option [2] first.")}`);
+      return;
+    }
+  }
   console.log(`
-  ${dim(`Sending $${(amount / 100).toFixed(2)} test payment...`)}`);
+  ${dim(`Sending $${dollars.toFixed(2)} test payment...`)}`);
   try {
-    const payment = await client.payments.create({
+    const paymentParams = {
       agentId,
       amount,
       currency: "USD",
       memo,
       idempotencyKey: `cli_${Date.now()}_${Math.random().toString(36).slice(2, 8)}`
-    });
+    };
+    if (!isAutonomous) {
+      paymentParams.userId = config.endUserId;
+      paymentParams.merchantUrl = "https://test.arispay.app";
+    }
+    const payment = await client.payments.create(paymentParams);
     const p = payment;
     console.log();
     if (p.status === "succeeded") {
@@ -386,8 +522,8 @@ ${bold("Examples:")}
   arispay init
   arispay agents create --name "BookingBot" --mode autonomous
   arispay agents list
-  arispay pay --agent <id> --amount 2000 --memo "Dinner for 2"
-  arispay transactions --agent <id> --from 2025-01-01
+  arispay pay --agent <id> --amount 20.00 --memo "Dinner for 2"
+  arispay transactions --agent <id> --from 2026-01-01
 
 ${bold("Environment:")}
   ARISPAY_API_KEY       Override API key

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "arispay",
-  "version": "0.1.2",
+  "version": "0.1.4",
   "description": "SDK and CLI for enabling agent-initiated payments via Visa TAP + Fiserv",
   "type": "module",
   "main": "./dist/index.js",

package/src/cli.ts

@@ -130,6 +130,73 @@ async function postInitMenu(config: { apiKey?: string; environment?: string; bas
   }
 }
 
+// ── Card Tokenization + 3DS Helper ──────────────────────────────────
+
+async function collectAndTokenizeCard(
+  client: ArisPayClient,
+  userId: string,
+): Promise<boolean> {
+  console.log(`\n  ${dim('Enter your card details below. They are sent directly to Fiserv for')}`);
+  console.log(`  ${dim('tokenization — ArisPay never sees or stores your full card number.')}\n`);
+
+  const cardNumber = await promptSecret(`  Card number: `);
+  if (!cardNumber) { console.log(dim('  Cancelled.')); return false; }
+
+  const expiry = await prompt(`  Expiry ${dim('(MM/YY)')}: `);
+  if (!expiry) { console.log(dim('  Cancelled.')); return false; }
+
+  const securityCode = await promptSecret(`  CVV: `);
+  if (!securityCode) { console.log(dim('  Cancelled.')); return false; }
+
+  const [expiryMonth, expiryYear] = expiry.split('/').map(s => s.trim());
+  if (!expiryMonth || !expiryYear) {
+    console.log(`  ${dim('Invalid expiry format. Use MM/YY.')}`);
+    return false;
+  }
+
+  console.log(`\n  ${dim('Tokenizing and verifying card...')}`);
+  try {
+    const result = await client.users.addPaymentMethod({
+      userId,
+      type: 'card',
+      cardNumber: cardNumber.replace(/\s/g, ''),
+      expiryMonth,
+      expiryYear: expiryYear.length === 2 ? `20${expiryYear}` : expiryYear,
+      securityCode,
+    });
+    const r = result as any;
+
+    if (r.requiresVerification) {
+      // 3DS verification required — open browser
+      const challengeUrl = r.challengeUrl;
+      if (challengeUrl) {
+        console.log();
+        console.log(`  ${bold('Card verification required')}`);
+        console.log(`  ${dim('Your bank requires 3D Secure verification. Open this link:')}\n`);
+        console.log(`    ${cyan(challengeUrl)}\n`);
+        console.log(`  ${dim('Complete the verification in your browser, then come back here.')}`);
+        await prompt(`\n  Press Enter when done...`);
+        success('Card added (verification pending)\n');
+      } else {
+        console.log();
+        success('Card tokenized (verification in progress)\n');
+      }
+      console.log(`  ${bold('Card:')}   ${r.cardBrand?.toUpperCase() || 'Card'} ending in ${r.cardLast4 || '****'}\n`);
+      return true;
+    }
+
+    console.log();
+    success(`Card verified!\n`);
+    console.log(`  ${bold('Card:')}   ${r.cardBrand?.toUpperCase() || 'Card'} ending in ${r.cardLast4 || '****'}`);
+    console.log(`\n  ${dim('Your card is now linked and verified. You can make payments.')}\n`);
+    return true;
+  } catch (e: any) {
+    console.log();
+    console.error(`  \x1b[31m✗\x1b[0m ${e.message || 'Failed to tokenize card'}`);
+    return false;
+  }
+}
+
 // ── Wizard: Connect Agent ────────────────────────────────────────────
 
 async function wizardConnectAgent(client: ArisPayClient): Promise<void> {
@@ -140,12 +207,12 @@ async function wizardConnectAgent(client: ArisPayClient): Promise<void> {
   const name = await prompt(`  What is your agent called? `);
   if (!name) { console.log(dim('  Cancelled.')); return; }
 
-  console.log(`\n  ${dim('How does your agent make payments?')}`);
-  console.log(`  ${dim('  platform   — Your app triggers payments on behalf of the agent (default)')}`);
-  console.log(`  ${dim('  autonomous — The agent decides when to pay, within spend limits you set')}\n`);
+  console.log(`\n  ${dim('How does your agent make payments?')}\n`);
+  console.log(`  ${cyan('[1]')} Platform   ${dim('— Your app triggers payments on behalf of the agent')}`);
+  console.log(`  ${cyan('[2]')} Autonomous ${dim('— The agent decides when to pay, within spend limits you set')}\n`);
 
-  const modeInput = await prompt(`  Mode ${dim('[platform]')}: `);
-  const mode = modeInput === 'autonomous' ? 'autonomous' : 'platform';
+  const modeChoice = await prompt(`  Enter choice ${dim('[1]')}: `);
+  const mode = modeChoice === '2' ? 'autonomous' : 'platform';
 
   console.log(`\n  ${dim('Connecting agent...')}`);
 
@@ -159,17 +226,113 @@ async function wizardConnectAgent(client: ArisPayClient): Promise<void> {
 
     // Store agent ID so other steps can auto-fill it
     const config = loadConfig(BRAND);
-    saveConfig(BRAND, { ...config, agentId: a.id } as any);
+    saveConfig(BRAND, { ...config, agentId: a.id, agentName: a.name || name, agentMode: a.mode || mode } as any);
 
     console.log();
     success(`Agent connected!\n`);
-    console.log(`  ${dim('ArisPay generated an Ed25519 keypair for your agent — this is its')}`);
-    console.log(`  ${dim('cryptographic identity for signing payments (RFC 9421 TAP).')}`);
-    console.log(`  ${dim('A circuit breaker has been set up to auto-pause if anything looks off.')}\n`);
+    console.log(`  ${dim('ArisPay has created a Visa TAP cryptographic identity for your agent.')}`);
+    console.log(`  ${dim('Every payment your agent makes is signed with this identity so merchants')}`);
+    console.log(`  ${dim('can verify it is authorised. A circuit breaker is also in place to')}`);
+    console.log(`  ${dim('auto-pause your agent if unusual spending is detected.')}\n`);
     console.log(`  ${bold('Agent ID:')}  ${a.id}`);
     console.log(`  ${bold('Name:')}      ${a.name}`);
     console.log(`  ${bold('Mode:')}      ${a.mode || mode}`);
     console.log(`  ${bold('Status:')}    ${a.status}\n`);
+
+    // Prompt for spend limits when autonomous
+    if (mode === 'autonomous') {
+      console.log(`  ${bold('Set spend limits')}`);
+      console.log(`  ${dim('Autonomous agents need spend limits so they can only spend within bounds you control.')}\n`);
+
+      const perTxStr = await prompt(`  Max per transaction ${dim('(e.g. 50.00)')}: $`);
+      const dailyStr = await prompt(`  Max per day ${dim('(e.g. 200.00)')}: $`);
+      const monthlyStr = await prompt(`  Max per month ${dim('(e.g. 1000.00)')}: $`);
+
+      const perTx = parseFloat(perTxStr);
+      const daily = parseFloat(dailyStr);
+      const monthly = parseFloat(monthlyStr);
+
+      if (perTx || daily || monthly) {
+        // Need an end user to attach limits — create one if not stored
+        let endUserId = (config as any).endUserId;
+        if (!endUserId) {
+          try {
+            const user = await client.users.create({ externalId: `cli_${Date.now()}` });
+            endUserId = (user as any).id;
+            saveConfig(BRAND, { ...config, agentId: a.id, agentName: a.name || name, endUserId } as any);
+          } catch { /* will be created later in payment method step */ }
+        }
+
+        if (endUserId) {
+          try {
+            await client.users.setLimits({
+              userId: endUserId,
+              agentId: a.id,
+              ...(perTx ? { maxPerTransaction: Math.round(perTx * 100) } : {}),
+              ...(daily ? { maxDaily: Math.round(daily * 100) } : {}),
+              ...(monthly ? { maxMonthly: Math.round(monthly * 100) } : {}),
+            });
+            console.log();
+            success('Spend limits set\n');
+          } catch (e: any) {
+            console.log();
+            console.error(`  \x1b[31m✗\x1b[0m ${e.message || 'Failed to set spend limits'}`);
+          }
+        }
+      } else {
+        console.log(`\n  ${dim('No limits set. You can configure them later on your dashboard.')}\n`);
+      }
+
+      // Offer to fund the autonomous agent
+      console.log(`  ${bold('Fund your agent')}`);
+      console.log(`  ${dim('Autonomous agents spend from their own balance. You need to add a')}`);
+      console.log(`  ${dim('payment method and top up your agent before it can make payments.')}\n`);
+
+      const fundNow = await prompt(`  Add a card and fund your agent now? ${dim('(Y/n)')}: `);
+      if (fundNow.toLowerCase() !== 'n') {
+        // Ensure end user exists
+        const latestConfig = loadConfig(BRAND);
+        let endUserId = (latestConfig as any).endUserId;
+        if (!endUserId) {
+          try {
+            const user = await client.users.create({ externalId: `cli_${Date.now()}` });
+            endUserId = (user as any).id;
+            saveConfig(BRAND, { ...latestConfig, endUserId } as any);
+          } catch (e: any) {
+            console.error(`  \x1b[31m✗\x1b[0m ${e.message || 'Failed to set up account'}`);
+            return;
+          }
+        }
+
+        // Collect card details and verify via 3DS
+        const cardOk = await collectAndTokenizeCard(client, endUserId);
+        if (!cardOk) return;
+
+        // Top up
+        const topupStr = await prompt(`\n  Amount to load ${dim('(e.g. 50.00)')}: $`);
+        const topupDollars = parseFloat(topupStr);
+        if (!topupDollars || isNaN(topupDollars)) {
+          console.log(dim('  Skipped. You can top up later from your dashboard.'));
+        } else {
+          console.log(`\n  ${dim(`Loading $${topupDollars.toFixed(2)} to ${a.name}...`)}`);
+          try {
+            const result = await client.agents.topup(a.id, {
+              amount: Math.round(topupDollars * 100),
+              userId: endUserId,
+              currency: 'USD',
+              description: 'Initial top-up via CLI',
+            }) as any;
+            console.log();
+            success(`Agent funded! Balance: $${((result.balance ?? result.availableBalance ?? 0) / 100).toFixed(2)}\n`);
+          } catch (e: any) {
+            console.log();
+            console.error(`  \x1b[31m✗\x1b[0m ${e.message || 'Failed to top up agent'}`);
+          }
+        }
+      } else {
+        console.log(`\n  ${dim('You can add a payment method and fund your agent from the menu or dashboard.')}\n`);
+      }
+    }
   } catch (e: any) {
     console.log();
     console.error(`  \x1b[31m✗\x1b[0m ${e.message || 'Failed to connect agent'}`);
@@ -210,44 +373,7 @@ async function wizardAddPaymentMethod(client: ArisPayClient): Promise<void> {
   const methodChoice = await prompt(`  Enter choice: `);
 
   if (methodChoice === '1') {
-    console.log(`\n  ${dim('Enter your card details below. They are sent directly to Fiserv for')}`);
-    console.log(`  ${dim('tokenization — ArisPay never sees or stores your full card number.')}\n`);
-
-    const cardNumber = await promptSecret(`  Card number: `);
-    if (!cardNumber) { console.log(dim('  Cancelled.')); return; }
-
-    const expiry = await prompt(`  Expiry ${dim('(MM/YY)')}: `);
-    if (!expiry) { console.log(dim('  Cancelled.')); return; }
-
-    const securityCode = await promptSecret(`  CVV: `);
-    if (!securityCode) { console.log(dim('  Cancelled.')); return; }
-
-    const [expiryMonth, expiryYear] = expiry.split('/').map(s => s.trim());
-    if (!expiryMonth || !expiryYear) {
-      console.log(`  ${dim('Invalid expiry format. Use MM/YY.')}`);
-      return;
-    }
-
-    console.log(`\n  ${dim('Tokenizing card...')}`);
-    try {
-      const result = await client.users.addPaymentMethod({
-        userId,
-        type: 'card',
-        cardNumber: cardNumber.replace(/\s/g, ''),
-        expiryMonth,
-        expiryYear: expiryYear.length === 2 ? `20${expiryYear}` : expiryYear,
-        securityCode,
-      });
-      const r = result as any;
-      console.log();
-      success(`Card tokenized!\n`);
-      console.log(`  ${bold('Card:')}   ${r.cardBrand?.toUpperCase() || 'Card'} ending in ${r.cardLast4 || '****'}`);
-      console.log(`  ${bold('Token:')}  ${dim(r.tokenId || 'stored securely')}`);
-      console.log(`\n  ${dim('Your card is now linked to your agent. You can make test payments.')}\n`);
-    } catch (e: any) {
-      console.log();
-      console.error(`  \x1b[31m✗\x1b[0m ${e.message || 'Failed to tokenize card'}`);
-    }
+    await collectAndTokenizeCard(client, userId);
   } else if (methodChoice === '2') {
     console.log();
     const chain = await prompt(`  Chain ${dim('(ethereum, base, polygon, solana)')}: `);
@@ -283,14 +409,17 @@ async function wizardAddPaymentMethod(client: ArisPayClient): Promise<void> {
 
 async function wizardTestPayment(client: ArisPayClient): Promise<void> {
   console.log(`\n${bold('Make a test payment')}`);
-  console.log(`  ${dim('Verify your integration works by sending a test payment.')}\n`);
+  console.log(`  ${dim('Verify your integration works by sending a test payment.')}`);
+  console.log(`  ${dim('This is a sandbox test — no real funds are moved.')}\n`);
 
   const config = loadConfig(BRAND);
   const storedAgentId = (config as any).agentId;
+  const storedAgentName = (config as any).agentName;
 
   let agentId: string;
   if (storedAgentId) {
-    const useStored = await prompt(`  Use agent ${dim(storedAgentId.slice(0, 12) + '...')}? ${dim('(Y/n)')}: `);
+    const agentLabel = storedAgentName ? bold(storedAgentName) : dim(storedAgentId.slice(0, 12) + '...');
+    const useStored = await prompt(`  Use agent ${agentLabel}? ${dim('(Y/n)')}: `);
     if (useStored.toLowerCase() === 'n') {
       agentId = await prompt(`  Agent ID: `);
       if (!agentId) { console.log(dim('  Cancelled.')); return; }
@@ -302,23 +431,42 @@ async function wizardTestPayment(client: ArisPayClient): Promise<void> {
     if (!agentId) { console.log(dim('  Cancelled.')); return; }
   }
 
-  const amountStr = await prompt(`  Amount in cents ${dim('(e.g. 500 = $5.00)')}: `);
-  const amount = Number(amountStr);
-  if (!amount || isNaN(amount)) { console.log(dim('  Invalid amount. Cancelled.')); return; }
+  const amountStr = await prompt(`  Amount ${dim('(e.g. 5.00)')}: $`);
+  const dollars = parseFloat(amountStr);
+  if (!dollars || isNaN(dollars)) { console.log(dim('  Invalid amount. Cancelled.')); return; }
+  const amount = Math.round(dollars * 100);
 
-  const memo = await prompt(`  What is this payment for? `);
+  const memo = await prompt(`  Description ${dim('(appears on the transaction record)')}: `);
   if (!memo) { console.log(dim('  Cancelled.')); return; }
 
-  console.log(`\n  ${dim(`Sending $${(amount / 100).toFixed(2)} test payment...`)}`);
+  const agentMode = (config as any).agentMode;
+  const isAutonomous = agentMode === 'autonomous';
+
+  if (!isAutonomous) {
+    const userId = (config as any).endUserId;
+    if (!userId) {
+      console.log(`\n  ${dim('No payment method set up yet. Run option [2] first.')}`);
+      return;
+    }
+  }
+
+  console.log(`\n  ${dim(`Sending $${dollars.toFixed(2)} test payment...`)}`);
 
   try {
-    const payment = await client.payments.create({
+    const paymentParams: Record<string, unknown> = {
       agentId,
       amount,
       currency: 'USD',
       memo,
       idempotencyKey: `cli_${Date.now()}_${Math.random().toString(36).slice(2, 8)}`,
-    } as any);
+    };
+
+    if (!isAutonomous) {
+      paymentParams.userId = (config as any).endUserId;
+      paymentParams.merchantUrl = 'https://test.arispay.app';
+    }
+
+    const payment = await client.payments.create(paymentParams as any);
     const p = payment as any;
     console.log();
     if (p.status === 'succeeded') {
@@ -387,8 +535,8 @@ ${bold('Examples:')}
   arispay init
   arispay agents create --name "BookingBot" --mode autonomous
   arispay agents list
-  arispay pay --agent <id> --amount 2000 --memo "Dinner for 2"
-  arispay transactions --agent <id> --from 2025-01-01
+  arispay pay --agent <id> --amount 20.00 --memo "Dinner for 2"
+  arispay transactions --agent <id> --from 2026-01-01
 
 ${bold('Environment:')}
   ARISPAY_API_KEY       Override API key