@darksol/terminal 0.5.0 → 0.5.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@darksol/terminal",
-  "version": "0.5.0",
+  "version": "0.5.1",
   "description": "DARKSOL Terminal — unified CLI for all DARKSOL services. Market intel, trading, oracle, casino, and more.",
   "type": "module",
   "bin": {

package/src/cli.js

@@ -274,13 +274,20 @@ export function cli(argv) {
   cards
     .command('order')
     .description('Order a prepaid card')
-    .requiredOption('-p, --provider <name>', 'Card provider')
+    .requiredOption('-p, --provider <name>', 'Card provider (swype/mpc/reward)')
     .requiredOption('-a, --amount <usd>', 'Card amount in USD')
-    .action((opts) => cardsOrder(opts.provider, parseFloat(opts.amount)));
+    .requiredOption('-e, --email <address>', 'Delivery email for card activation link')
+    .option('-t, --ticker <coin>', 'Payment crypto (default: usdc)')
+    .option('-n, --network <net>', 'Payment network (default: base)')
+    .action((opts) => cardsOrder(opts.provider, parseFloat(opts.amount), {
+      email: opts.email,
+      ticker: opts.ticker,
+      network: opts.network,
+    }));
 
   cards
-    .command('status <orderId>')
-    .description('Check order status')
+    .command('status <tradeId>')
+    .description('Check order status by trade ID')
     .action((id) => cardsStatus(id));
 
   // ═══════════════════════════════════════

package/src/services/cards.js

@@ -4,27 +4,39 @@ import { theme } from '../ui/theme.js';
 import { spinner, kvDisplay, error, info, table } from '../ui/components.js';
 import { showSection } from '../ui/banner.js';
 
-const getURL = () => getServiceURL('cards') || 'https://acp.darksol.net/cards';
+const BASE = () => getServiceURL('cards') || 'https://acp.darksol.net';
 
 export async function cardsCatalog() {
   const spin = spinner('Loading card catalog...').start();
   try {
-    const data = await fetchJSON(`${getURL()}/api/cards/catalog`);
+    const data = await fetchJSON(`${BASE()}/api/cards/catalog`);
     spin.succeed('Catalog loaded');
 
     showSection('PREPAID CARDS');
     const cards = data.providers || data;
     if (Array.isArray(cards)) {
       const rows = cards.map(c => [
-        theme.gold(c.name),
-        c.network || 'Visa/MC',
-        c.denominations?.join(', ') || 'Various',
+        theme.gold(c.name || c.id),
+        c.brand || c.network || 'Visa/MC',
+        c.currency || 'USD',
         c.region || 'Global',
       ]);
-      table(['Provider', 'Network', 'Amounts', 'Region'], rows);
+      table(['Provider', 'Brand', 'Currency', 'Region'], rows);
     } else {
       kvDisplay(Object.entries(cards).map(([k, v]) => [k, String(v)]));
     }
+
+    // Show pricing tiers if available
+    if (data.pricing?.tiers) {
+      console.log('');
+      showSection('PRICING');
+      const tRows = data.pricing.tiers.map(t => [
+        `$${t.denomination}`,
+        `$${t.youPay}`,
+      ]);
+      table(['Card Value', 'You Pay'], tRows);
+      console.log(theme.dim(`  ${data.pricing.markup || '3% service fee'} + ${data.pricing.issuanceFee || '~3% provider fee'}`));
+    }
   } catch (err) {
     spin.fail('Catalog failed');
     error(err.message);
@@ -32,33 +44,68 @@ export async function cardsCatalog() {
   }
 }
 
-export async function cardsOrder(provider, amount) {
+export async function cardsOrder(provider, amount, opts = {}) {
+  if (!opts.email) {
+    error('Email is required for card delivery. Use --email <address>');
+    info('Example: darksol cards order -p swype -a 100 --email you@example.com');
+    return;
+  }
+
   const spin = spinner('Processing card order...').start();
   try {
-    const data = await fetchJSON(`${getURL()}/api/cards/order`, {
+    const body = {
+      provider,
+      amount: Number(amount),
+      email: opts.email,
+    };
+    // Optional: custom crypto + network
+    if (opts.ticker) body.tickerFrom = opts.ticker;
+    if (opts.network) body.networkFrom = opts.network;
+
+    const data = await fetchJSON(`${BASE()}/api/cards/order`, {
       method: 'POST',
       headers: { 'Content-Type': 'application/json' },
-      body: JSON.stringify({ provider, amount }),
+      body: JSON.stringify(body),
     });
     spin.succeed('Order placed');
 
-    showSection('CARD ORDER');
-    kvDisplay(Object.entries(data).map(([k, v]) => [k, String(v)]));
+    if (data.order) {
+      showSection('CARD ORDER');
+      kvDisplay([
+        ['Trade ID', theme.gold(data.order.tradeId)],
+        ['Status', data.order.status],
+        ['Card', `$${data.order.cardAmount} ${data.order.currency} ${data.order.brand}`],
+        ['Provider', data.order.provider],
+        ['Pay', `${data.order.amountCrypto} ${data.order.ticker?.toUpperCase()} (${data.order.network})`],
+        ['To Address', data.order.paymentAddress],
+        ...(data.order.paymentMemo ? [['Memo', data.order.paymentMemo]] : []),
+        ['Delivery', opts.email],
+      ]);
+      console.log('');
+      console.log(theme.accent(`  ${data.order.message}`));
+      console.log('');
+      info(`Check status: darksol cards status ${data.order.tradeId}`);
+    } else {
+      kvDisplay(Object.entries(data).map(([k, v]) => [k, String(v)]));
+    }
   } catch (err) {
     spin.fail('Order failed');
     error(err.message);
-    info('The cards order API may not be live yet. Check: https://acp.darksol.net/cards');
   }
 }
 
-export async function cardsStatus(orderId) {
+export async function cardsStatus(tradeId) {
   const spin = spinner('Checking order...').start();
   try {
-    const data = await fetchJSON(`${getURL()}/api/cards/status?orderId=${orderId}`);
+    const data = await fetchJSON(`${BASE()}/api/cards/status?tradeId=${tradeId}`);
     spin.succeed('Status loaded');
 
-    showSection(`CARD ORDER — ${orderId}`);
-    kvDisplay(Object.entries(data).map(([k, v]) => [k, String(v)]));
+    showSection(`CARD ORDER — ${tradeId}`);
+    if (data.order) {
+      kvDisplay(Object.entries(data.order).map(([k, v]) => [k, String(v)]));
+    } else {
+      kvDisplay(Object.entries(data).map(([k, v]) => [k, String(v)]));
+    }
   } catch (err) {
     spin.fail('Status check failed');
     error(err.message);

package/src/web/commands.js

@@ -173,6 +173,51 @@ export async function handleMenuSelect(id, value, item, ws) {
       });
       return {};
 
+    case 'cards_action':
+      if (value === 'order') {
+        ws.sendMenu('cards_provider', '◆ Select Provider', [
+          { value: 'swype', label: 'Swype', desc: 'Mastercard · Global' },
+          { value: 'mpc', label: 'MPC', desc: 'Mastercard · US Only' },
+          { value: 'reward', label: 'Reward', desc: 'Visa · US Only' },
+          { value: 'back', label: '← Back', desc: '' },
+        ]);
+        return {};
+      }
+      if (value === 'status') {
+        ws.sendPrompt('cards_status_id', 'Trade ID:', {});
+        return {};
+      }
+      return {};
+
+    case 'cards_provider':
+      if (value === 'back') return {};
+      // Store provider, ask for amount
+      ws.sendMenu('cards_amount', `◆ Card Amount (${value})`, [
+        { value: '10', label: '$10', desc: 'Pay ~$10.60' },
+        { value: '25', label: '$25', desc: 'Pay ~$26.50' },
+        { value: '50', label: '$50', desc: 'Pay ~$53' },
+        { value: '100', label: '$100', desc: 'Pay ~$106' },
+        { value: '250', label: '$250', desc: 'Pay ~$265' },
+        { value: '500', label: '$500', desc: 'Pay ~$530' },
+        { value: '1000', label: '$1,000', desc: 'Pay ~$1,060' },
+        { value: 'back', label: '← Back', desc: '' },
+      ].map(i => ({ ...i, meta: { provider: value } })));
+      return {};
+
+    case 'cards_amount':
+      if (value === 'back') return {};
+      // Store provider+amount, ask for email
+      ws.sendPrompt('cards_email', 'Delivery email (card activation link will be sent here):', {
+        provider: item?.meta?.provider || 'swype',
+        amount: value,
+      });
+      return {};
+
+    case 'cards_crypto':
+      if (value === 'back') return {};
+      // Execute the order
+      return await executeCardOrder(item?.meta || {}, ws);
+
     case 'agent_action':
       if (value === 'start') {
         const { listWallets } = await import('../wallet/keystore.js');
@@ -275,6 +320,31 @@ export async function handlePromptResponse(id, value, meta, ws) {
     return {};
   }
 
+  if (id === 'cards_status_id') {
+    if (!value) { ws.sendLine(`  ${ANSI.red}✗ Cancelled${ANSI.reset}`); ws.sendLine(''); return {}; }
+    return await showCardStatus(value.trim(), ws);
+  }
+
+  if (id === 'cards_email') {
+    if (!value) { ws.sendLine(`  ${ANSI.red}✗ Cancelled${ANSI.reset}`); ws.sendLine(''); return {}; }
+    const provider = meta.provider || 'swype';
+    const amount = meta.amount || '100';
+    const email = value.trim();
+
+    // Ask for crypto selection
+    ws.sendMenu('cards_crypto', `◆ Pay With (${provider} $${amount} → ${email})`, [
+      { value: 'usdc_base', label: 'USDC on Base', desc: 'Default · fast & cheap', meta: { provider, amount, email, ticker: 'usdc', network: 'base' } },
+      { value: 'usdc_eth', label: 'USDC on Ethereum', desc: 'Higher fees', meta: { provider, amount, email, ticker: 'usdc', network: 'eth' } },
+      { value: 'usdt_trc20', label: 'USDT on Tron', desc: 'TRC-20', meta: { provider, amount, email, ticker: 'usdt', network: 'trc20' } },
+      { value: 'btc', label: 'Bitcoin', desc: 'BTC mainnet', meta: { provider, amount, email, ticker: 'btc', network: 'mainnet' } },
+      { value: 'eth', label: 'Ethereum', desc: 'ETH mainnet', meta: { provider, amount, email, ticker: 'eth', network: 'eth' } },
+      { value: 'sol', label: 'Solana', desc: 'SOL', meta: { provider, amount, email, ticker: 'sol', network: 'sol' } },
+      { value: 'xmr', label: 'Monero', desc: 'XMR', meta: { provider, amount, email, ticker: 'xmr', network: 'xmr' } },
+      { value: 'default', label: 'Default (USDC/Base)', desc: 'Let API choose', meta: { provider, amount, email } },
+    ]);
+    return {};
+  }
+
   if (id === 'agent_signer_password') {
     const wallet = meta.wallet;
     if (!wallet || !value) {
@@ -359,6 +429,8 @@ export async function handleCommand(cmd, ws) {
       return await cmdConfig(ws);
     case 'oracle':
       return await cmdOracle(args, ws);
+    case 'cards':
+      return await cmdCards(args, ws);
     case 'casino':
       return await cmdCasino(args, ws);
     case 'facilitator':
@@ -911,6 +983,140 @@ async function cmdHistory(args, ws) {
 // ══════════════════════════════════════════════════
 // SERVICE COMMANDS (thin wrappers)
 // ══════════════════════════════════════════════════
+// ══════════════════════════════════════════════════
+// CARDS (interactive ordering)
+// ══════════════════════════════════════════════════
+const CARDS_API = 'https://acp.darksol.net/api/cards';
+
+async function cmdCards(args, ws) {
+  const sub = (args[0] || '').toLowerCase();
+
+  if (sub === 'status' && args[1]) {
+    return await showCardStatus(args[1], ws);
+  }
+
+  // Show catalog + order menu
+  ws.sendLine(`${ANSI.gold}  ◆ PREPAID CARDS${ANSI.reset}`);
+  ws.sendLine(`${ANSI.dim}  ${'─'.repeat(50)}${ANSI.reset}`);
+
+  try {
+    const resp = await fetch(`${CARDS_API}/catalog`);
+    const data = await resp.json();
+
+    if (data.providers) {
+      for (const p of data.providers) {
+        ws.sendLine(`  ${ANSI.gold}${p.name}${ANSI.reset}  ${ANSI.dim}${p.brand} · ${p.region}${ANSI.reset}`);
+      }
+    }
+    if (data.pricing?.tiers) {
+      ws.sendLine('');
+      ws.sendLine(`  ${ANSI.darkGold}Pricing${ANSI.reset}  ${ANSI.dim}${data.pricing.markup} + ${data.pricing.issuanceFee}${ANSI.reset}`);
+      const tierStr = data.pricing.tiers.map(t => `$${t.denomination}→$${t.youPay}`).join('  ');
+      ws.sendLine(`  ${ANSI.dim}${tierStr}${ANSI.reset}`);
+    }
+    ws.sendLine('');
+  } catch {
+    ws.sendLine(`  ${ANSI.dim}Could not load catalog${ANSI.reset}`);
+    ws.sendLine('');
+  }
+
+  ws.sendMenu('cards_action', '◆ Prepaid Cards', [
+    { value: 'order', label: '💳 Order Card', desc: 'Start a new order' },
+    { value: 'status', label: '🔍 Check Status', desc: 'Track existing order' },
+    { value: 'back', label: '← Back', desc: '' },
+  ]);
+  return {};
+}
+
+async function showCardStatus(tradeId, ws) {
+  try {
+    const resp = await fetch(`${CARDS_API}/status?tradeId=${tradeId}`);
+    const ct = resp.headers.get('content-type') || '';
+    if (!ct.includes('json')) {
+      ws.sendLine(`  ${ANSI.red}✗ Invalid response from status endpoint${ANSI.reset}`);
+      return {};
+    }
+    const data = await resp.json();
+    ws.sendLine(`${ANSI.gold}  ◆ ORDER STATUS — ${tradeId}${ANSI.reset}`);
+    ws.sendLine(`${ANSI.dim}  ${'─'.repeat(50)}${ANSI.reset}`);
+    const order = data.order || data;
+    for (const [k, v] of Object.entries(order)) {
+      if (v !== null && v !== undefined) {
+        ws.sendLine(`  ${ANSI.darkGold}${k}${ANSI.reset}  ${ANSI.white}${v}${ANSI.reset}`);
+      }
+    }
+    ws.sendLine('');
+  } catch (err) {
+    ws.sendLine(`  ${ANSI.red}✗ ${err.message}${ANSI.reset}`);
+    ws.sendLine('');
+  }
+  return {};
+}
+
+async function executeCardOrder(orderMeta, ws) {
+  const { provider, amount, email, ticker, network } = orderMeta;
+  ws.sendLine(`  ${ANSI.dim}Placing order...${ANSI.reset}`);
+
+  try {
+    const body = { provider: provider || 'swype', amount: Number(amount), email };
+    if (ticker) body.tickerFrom = ticker;
+    if (network) body.networkFrom = network;
+
+    const resp = await fetch(`${CARDS_API}/order`, {
+      method: 'POST',
+      headers: { 'Content-Type': 'application/json' },
+      body: JSON.stringify(body),
+    });
+    const ct = resp.headers.get('content-type') || '';
+    if (!ct.includes('json')) {
+      const text = await resp.text();
+      ws.sendLine(`  ${ANSI.red}✗ API returned non-JSON: ${text.substring(0, 80)}${ANSI.reset}`);
+      ws.sendLine('');
+      return {};
+    }
+    const data = await resp.json();
+
+    if (!data.success || !data.order) {
+      ws.sendLine(`  ${ANSI.red}✗ Order failed: ${data.error || JSON.stringify(data)}${ANSI.reset}`);
+      ws.sendLine('');
+      return {};
+    }
+
+    const o = data.order;
+    ws.sendLine('');
+    ws.sendLine(`${ANSI.gold}  ◆ ORDER PLACED${ANSI.reset}`);
+    ws.sendLine(`${ANSI.dim}  ${'─'.repeat(50)}${ANSI.reset}`);
+    ws.sendLine(`  ${ANSI.darkGold}Trade ID${ANSI.reset}      ${ANSI.gold}${o.tradeId}${ANSI.reset}`);
+    ws.sendLine(`  ${ANSI.darkGold}Status${ANSI.reset}        ${ANSI.white}${o.status}${ANSI.reset}`);
+    ws.sendLine(`  ${ANSI.darkGold}Card${ANSI.reset}          ${ANSI.white}$${o.cardAmount} ${o.currency} ${o.brand}${ANSI.reset}`);
+    ws.sendLine(`  ${ANSI.darkGold}Provider${ANSI.reset}      ${ANSI.white}${o.provider}${ANSI.reset}`);
+    ws.sendLine(`  ${ANSI.darkGold}Delivery${ANSI.reset}      ${ANSI.white}${email}${ANSI.reset}`);
+    ws.sendLine('');
+    ws.sendLine(`  ${ANSI.green}PAY EXACTLY:${ANSI.reset}`);
+    ws.sendLine(`  ${ANSI.gold}${o.amountCrypto} ${(o.ticker || '').toUpperCase()}${ANSI.reset} ${ANSI.dim}(${o.network})${ANSI.reset}`);
+    ws.sendLine('');
+    ws.sendLine(`  ${ANSI.darkGold}To Address:${ANSI.reset}`);
+    const addr = o.paymentAddress;
+    ws.sendLine(`  ${ANSI.dim}┌${'─'.repeat(addr.length + 4)}┐${ANSI.reset}`);
+    ws.sendLine(`  ${ANSI.dim}│  ${ANSI.gold}${addr}${ANSI.dim}  │${ANSI.reset}`);
+    ws.sendLine(`  ${ANSI.dim}└${'─'.repeat(addr.length + 4)}┘${ANSI.reset}`);
+    if (o.paymentMemo) {
+      ws.sendLine(`  ${ANSI.darkGold}Memo:${ANSI.reset} ${ANSI.white}${o.paymentMemo}${ANSI.reset}`);
+    }
+    ws.sendLine('');
+    ws.sendLine(`  ${ANSI.dim}${o.message}${ANSI.reset}`);
+    ws.sendLine(`  ${ANSI.dim}Check status: cards status ${o.tradeId}${ANSI.reset}`);
+    ws.sendLine('');
+  } catch (err) {
+    ws.sendLine(`  ${ANSI.red}✗ ${err.message}${ANSI.reset}`);
+    ws.sendLine('');
+  }
+  return {};
+}
+
+// ══════════════════════════════════════════════════
+// ORACLE
+// ══════════════════════════════════════════════════
 async function cmdOracle(args, ws) {
   try {
     const resp = await fetch('https://acp.darksol.net/oracle');

package/src/web/server.js

@@ -169,6 +169,7 @@ export async function startWebShell(opts = {}) {
                 { value: 'portfolio', label: '📊 Portfolio', desc: 'Multi-chain balances' },
                 { value: 'market', label: '📈 Market', desc: 'Price + liquidity intel' },
                 { value: 'mail', label: '📧 Mail', desc: 'AgentMail status/inbox' },
+                { value: 'cards', label: '💳 Cards', desc: 'Order prepaid Visa/MC' },
                 { value: 'oracle', label: '🎲 Oracle', desc: 'Randomness service' },
                 { value: 'casino', label: '🎰 Casino', desc: 'Service status' },
                 { value: 'facilitator', label: '💸 Facilitator', desc: 'x402 health' },
@@ -308,6 +309,7 @@ function getHelp() {
     ['', ''],
     ['', `${gold}SERVICES${reset}`],
     ['market <token>', 'Market intel & data'],
+    ['cards', 'Order prepaid Visa/MC cards'],
     ['mail status', 'AgentMail status'],
     ['mail inbox', 'Check email inbox'],
     ['oracle roll', 'On-chain random oracle'],

package/src/web/terminal.js

@@ -16,7 +16,7 @@ const A = {
 
 const COMMANDS = [
   'ai', 'price', 'watch', 'gas', 'portfolio', 'history', 'market',
-  'wallet', 'send', 'receive', 'agent', 'mail', 'keys', 'oracle', 'casino',
+  'wallet', 'send', 'receive', 'agent', 'cards', 'mail', 'keys', 'oracle', 'casino',
   'facilitator', 'config', 'logs', 'help', 'clear', 'banner', 'exit',
 ];