@btcemail/cli 0.1.1 → 0.3.0

package/dist/index.js

@@ -2,7 +2,7 @@
 
 // src/index.ts
 import { Command } from "commander";
-import pc9 from "picocolors";
+import pc11 from "picocolors";
 
 // src/commands/login.ts
 import { randomUUID } from "crypto";
@@ -200,6 +200,7 @@ async function logoutCommand() {
 
 // src/commands/whoami.ts
 import pc3 from "picocolors";
+import ora2 from "ora";
 
 // src/api.ts
 async function apiRequest(endpoint, options = {}) {
@@ -324,6 +325,100 @@ async function getL402Invoice(options) {
     };
   }
 }
+async function getDeliveredEmails(options = {}) {
+  const params = new URLSearchParams();
+  if (options.limit) params.set("limit", String(options.limit));
+  if (options.offset) params.set("offset", String(options.offset));
+  return apiRequest(`/inbound/delivered?${params}`);
+}
+async function getCreditTransactions(options = {}) {
+  const params = new URLSearchParams();
+  if (options.limit) params.set("limit", String(options.limit));
+  if (options.offset) params.set("offset", String(options.offset));
+  if (options.type) params.set("type", options.type);
+  return apiRequest(`/credits/transactions?${params}`);
+}
+async function purchaseCredits(optionIndex) {
+  return apiRequest("/credits/purchase", {
+    method: "POST",
+    body: JSON.stringify({ optionIndex })
+  });
+}
+async function checkPaymentStatus(paymentHash) {
+  const v1BaseUrl = getApiBaseUrl();
+  const rootApiUrl = v1BaseUrl.replace("/api/v1", "/api");
+  const token = getToken();
+  const headers = {
+    "Content-Type": "application/json"
+  };
+  if (token) {
+    headers.Authorization = `Bearer ${token}`;
+  }
+  try {
+    const response = await fetch(`${rootApiUrl}/lightning/webhook?payment_hash=${paymentHash}`, {
+      headers
+    });
+    const json = await response.json();
+    if (!response.ok || json.success === false) {
+      return {
+        ok: false,
+        error: json.error || {
+          code: "UNKNOWN_ERROR",
+          message: `Request failed with status ${response.status}`
+        }
+      };
+    }
+    return {
+      ok: true,
+      data: {
+        paid: json.paid || false,
+        delivered: json.delivered,
+        status: json.status || json.state,
+        pendingEmailId: json.pendingEmailId
+      }
+    };
+  } catch (error) {
+    return {
+      ok: false,
+      error: {
+        code: "NETWORK_ERROR",
+        message: error instanceof Error ? error.message : "Network request failed"
+      }
+    };
+  }
+}
+function getCreditPurchaseOptions() {
+  return [
+    {
+      amountSats: 1e3,
+      priceSats: 1e3,
+      bonusSats: 0,
+      label: "1,000 sats",
+      description: "Good for ~10 emails"
+    },
+    {
+      amountSats: 5e3,
+      priceSats: 4500,
+      bonusSats: 500,
+      label: "5,000 sats",
+      description: "Good for ~50 emails (+10% bonus)"
+    },
+    {
+      amountSats: 1e4,
+      priceSats: 8500,
+      bonusSats: 1500,
+      label: "10,000 sats",
+      description: "Good for ~100 emails (+15% bonus)"
+    },
+    {
+      amountSats: 5e4,
+      priceSats: 4e4,
+      bonusSats: 1e4,
+      label: "50,000 sats",
+      description: "Good for ~500 emails (+20% bonus)"
+    }
+  ];
+}
 
 // src/commands/whoami.ts
 async function whoamiCommand() {
@@ -337,14 +432,16 @@ async function whoamiCommand() {
     console.log(pc3.yellow("Not logged in."));
     process.exit(1);
   }
+  const spinner = ora2("Fetching account info...").start();
   const result = await getWhoami();
+  spinner.stop();
   if (result.ok) {
     console.log();
     console.log(pc3.bold("Current User"));
     console.log();
     console.log(`  ${pc3.dim("Email:")}    ${result.data.email}`);
     if (result.data.username) {
-      console.log(`  ${pc3.dim("Username:")} ${result.data.username}`);
+      console.log(`  ${pc3.dim("Username:")} ${result.data.username}@btc.email`);
     }
     console.log(`  ${pc3.dim("User ID:")}  ${result.data.id}`);
     const expiryInfo = getTokenExpiryInfo();
@@ -359,7 +456,7 @@ async function whoamiCommand() {
     }
   } else {
     console.log();
-    console.log(pc3.bold("Current User (cached)"));
+    console.log(pc3.bold("Current User") + pc3.dim(" (cached)"));
     console.log();
     console.log(`  ${pc3.dim("Email:")}   ${auth.email}`);
     console.log(`  ${pc3.dim("User ID:")} ${auth.userId}`);
@@ -372,29 +469,78 @@ async function whoamiCommand() {
 
 // src/commands/list.ts
 import pc4 from "picocolors";
+import ora3 from "ora";
+
+// src/utils/cache.ts
+var CACHE_KEY = "emailCache";
+var CACHE_TTL_MS = 30 * 60 * 1e3;
+function cacheEmailList(folder, emails) {
+  config.set(CACHE_KEY, {
+    folder,
+    emails,
+    timestamp: Date.now()
+  });
+}
+function getCachedEmailList(folder) {
+  const cache = config.get(CACHE_KEY);
+  if (!cache) return null;
+  if (Date.now() - cache.timestamp > CACHE_TTL_MS) {
+    config.delete(CACHE_KEY);
+    return null;
+  }
+  if (folder && cache.folder !== folder) {
+    return null;
+  }
+  return cache;
+}
+function getEmailIdByIndex(index) {
+  const cache = getCachedEmailList();
+  if (!cache) return null;
+  const idx = index - 1;
+  if (idx < 0 || idx >= cache.emails.length) {
+    return null;
+  }
+  return cache.emails[idx].id;
+}
+function isNumericId(id) {
+  return /^\d+$/.test(id);
+}
+
+// src/commands/list.ts
 async function listCommand(options) {
   if (!isAuthenticated()) {
     console.log(pc4.yellow("Not logged in."));
     console.log(pc4.dim("Run `btcemail login` to authenticate."));
     process.exit(1);
   }
+  const folder = options.folder || "inbox";
+  const limit = options.limit || 20;
+  const page = options.page || 1;
+  const offset = (page - 1) * limit;
+  const spinner = ora3("Loading emails...").start();
   const result = await getEmails({
-    folder: options.folder || "inbox",
-    limit: options.limit || 20
+    folder,
+    limit,
+    offset
   });
   if (!result.ok) {
-    console.error(pc4.red(`Error: ${result.error.message}`));
+    spinner.fail(`Error: ${result.error.message}`);
     process.exit(1);
   }
   const { data: emails, pagination } = result.data;
+  spinner.stop();
+  const cachedEmails = emails.map((e) => ({
+    id: e.id,
+    subject: e.subject,
+    from: e.from.name || e.from.email
+  }));
+  cacheEmailList(folder, cachedEmails);
   if (options.json) {
     console.log(JSON.stringify({ emails, pagination }, null, 2));
     return;
   }
   console.log();
-  console.log(
-    pc4.bold(`${options.folder || "Inbox"} (${pagination.total} emails)`)
-  );
+  console.log(pc4.bold(`${capitalize(folder)} (${pagination.total} emails)`));
   console.log();
   if (emails.length === 0) {
     console.log(pc4.dim("  No emails found."));
@@ -402,26 +548,34 @@ async function listCommand(options) {
     return;
   }
   console.log(
-    `  ${pc4.dim("ID".padEnd(12))} ${pc4.dim("From".padEnd(25))} ${pc4.dim("Subject".padEnd(40))} ${pc4.dim("Date")}`
+    `  ${pc4.dim("#".padEnd(4))} ${pc4.dim("From".padEnd(25))} ${pc4.dim("Subject".padEnd(45))} ${pc4.dim("Date")}`
   );
-  console.log(pc4.dim("  " + "-".repeat(90)));
-  for (const email of emails) {
-    const unreadMarker = email.unread ? pc4.cyan("*") : " ";
-    const id = email.id.slice(0, 10).padEnd(12);
+  console.log(pc4.dim("  " + "-".repeat(85)));
+  emails.forEach((email, index) => {
+    const num = pc4.cyan(String(index + 1).padEnd(4));
+    const unreadMarker = email.unread ? pc4.cyan("\u25CF") : " ";
     const from = truncate(email.from.name || email.from.email, 23).padEnd(25);
-    const subject = truncate(email.subject, 38).padEnd(40);
+    const subject = truncate(email.subject, 43).padEnd(45);
     const date = formatDate(email.date);
-    console.log(`${unreadMarker} ${id} ${from} ${subject} ${pc4.dim(date)}`);
-  }
+    console.log(`${unreadMarker} ${num}${from} ${subject} ${pc4.dim(date)}`);
+  });
   console.log();
-  if (pagination.hasMore) {
+  const totalPages = Math.ceil(pagination.total / limit);
+  const currentPage = page;
+  if (totalPages > 1) {
     console.log(
-      pc4.dim(
-        `  Showing ${emails.length} of ${pagination.total}. Use --limit to see more.`
-      )
+      pc4.dim(`  Page ${currentPage} of ${totalPages} (${emails.length} of ${pagination.total})`)
     );
+    if (currentPage < totalPages) {
+      console.log(pc4.dim(`  Next page: btcemail list --page ${currentPage + 1}`));
+    }
     console.log();
   }
+  console.log(pc4.dim("  Read email: btcemail read <#> or btcemail read <id>"));
+  console.log();
+}
+function capitalize(str) {
+  return str.charAt(0).toUpperCase() + str.slice(1);
 }
 function truncate(str, maxLength) {
   if (str.length <= maxLength) return str;
@@ -449,21 +603,42 @@ function formatDate(dateString) {
 
 // src/commands/read.ts
 import pc5 from "picocolors";
-async function readCommand(id, options) {
+import ora4 from "ora";
+async function readCommand(idOrNumber, options) {
   if (!isAuthenticated()) {
     console.log(pc5.yellow("Not logged in."));
     console.log(pc5.dim("Run `btcemail login` to authenticate."));
     process.exit(1);
   }
-  const result = await getEmail(id);
+  let emailId = idOrNumber;
+  if (isNumericId(idOrNumber)) {
+    const index = parseInt(idOrNumber, 10);
+    const cachedId = getEmailIdByIndex(index);
+    if (cachedId) {
+      emailId = cachedId;
+    } else {
+      const cache = getCachedEmailList();
+      if (cache) {
+        console.error(pc5.red(`Email #${index} not found in list.`));
+        console.log(pc5.dim(`List has ${cache.emails.length} emails. Run 'btcemail list' to refresh.`));
+      } else {
+        console.error(pc5.red(`No email list cached.`));
+        console.log(pc5.dim(`Run 'btcemail list' first, then use 'btcemail read <#>'.`));
+      }
+      process.exit(1);
+    }
+  }
+  const spinner = ora4("Loading email...").start();
+  const result = await getEmail(emailId);
   if (!result.ok) {
     if (result.error.code === "NOT_FOUND") {
-      console.error(pc5.red(`Email not found: ${id}`));
+      spinner.fail(`Email not found: ${emailId}`);
     } else {
-      console.error(pc5.red(`Error: ${result.error.message}`));
+      spinner.fail(`Error: ${result.error.message}`);
     }
     process.exit(1);
   }
+  spinner.stop();
   const email = result.data;
   if (options.json) {
     console.log(JSON.stringify(email, null, 2));
@@ -512,46 +687,349 @@ function formatFullDate(dateString) {
   });
 }
 
-// src/commands/credits.ts
+// src/commands/search.ts
 import pc6 from "picocolors";
-async function creditsBalanceCommand() {
+import ora5 from "ora";
+async function searchCommand(query, options) {
   if (!isAuthenticated()) {
     console.log(pc6.yellow("Not logged in."));
     console.log(pc6.dim("Run `btcemail login` to authenticate."));
     process.exit(1);
   }
+  if (!query || query.trim().length === 0) {
+    console.error(pc6.red("Error: Search query is required"));
+    process.exit(1);
+  }
+  const spinner = ora5(`Searching for "${query}"...`).start();
+  const result = await getEmails({
+    search: query.trim(),
+    limit: options.limit || 20
+  });
+  if (!result.ok) {
+    spinner.fail(`Error: ${result.error.message}`);
+    process.exit(1);
+  }
+  const { data: emails, pagination } = result.data;
+  spinner.stop();
+  const cachedEmails = emails.map((e) => ({
+    id: e.id,
+    subject: e.subject,
+    from: e.from.name || e.from.email
+  }));
+  cacheEmailList("search", cachedEmails);
+  if (options.json) {
+    console.log(JSON.stringify({ query, emails, pagination }, null, 2));
+    return;
+  }
+  console.log();
+  console.log(pc6.bold(`Search: "${query}" (${pagination.total} found)`));
+  console.log();
+  if (emails.length === 0) {
+    console.log(pc6.dim("  No emails found matching your search."));
+    console.log();
+    return;
+  }
+  console.log(
+    `  ${pc6.dim("#".padEnd(4))} ${pc6.dim("From".padEnd(25))} ${pc6.dim("Subject".padEnd(45))} ${pc6.dim("Date")}`
+  );
+  console.log(pc6.dim("  " + "-".repeat(85)));
+  emails.forEach((email, index) => {
+    const num = pc6.cyan(String(index + 1).padEnd(4));
+    const unreadMarker = email.unread ? pc6.cyan("\u25CF") : " ";
+    const from = truncate2(email.from.name || email.from.email, 23).padEnd(25);
+    const subject = truncate2(email.subject, 43).padEnd(45);
+    const date = formatDate2(email.date);
+    console.log(`${unreadMarker} ${num}${from} ${subject} ${pc6.dim(date)}`);
+  });
+  console.log();
+  if (pagination.hasMore) {
+    console.log(
+      pc6.dim(
+        `  Showing ${emails.length} of ${pagination.total}. Use --limit to see more.`
+      )
+    );
+    console.log();
+  }
+  console.log(pc6.dim("  Read email: btcemail read <#> or btcemail read <id>"));
+  console.log();
+}
+function truncate2(str, maxLength) {
+  if (str.length <= maxLength) return str;
+  return str.slice(0, maxLength - 1) + "\u2026";
+}
+function formatDate2(dateString) {
+  const date = new Date(dateString);
+  const now = /* @__PURE__ */ new Date();
+  const diffMs = now.getTime() - date.getTime();
+  const diffDays = Math.floor(diffMs / (1e3 * 60 * 60 * 24));
+  if (diffDays === 0) {
+    return date.toLocaleTimeString("en-US", {
+      hour: "numeric",
+      minute: "2-digit"
+    });
+  }
+  if (diffDays < 7) {
+    return date.toLocaleDateString("en-US", { weekday: "short" });
+  }
+  return date.toLocaleDateString("en-US", {
+    month: "short",
+    day: "numeric"
+  });
+}
+
+// src/commands/credits.ts
+import pc8 from "picocolors";
+import ora6 from "ora";
+import qrcode from "qrcode-terminal";
+
+// src/utils/payment-polling.ts
+import pc7 from "picocolors";
+var SPINNER_FRAMES = ["\u280B", "\u2819", "\u2839", "\u2838", "\u283C", "\u2834", "\u2826", "\u2827", "\u2807", "\u280F"];
+async function pollForPayment(options) {
+  const { paymentHash, checkFn, maxAttempts = 120, intervalMs = 2500, onPaid } = options;
+  let frame = 0;
+  let attempts = 0;
+  process.stdout.write(`${pc7.cyan(SPINNER_FRAMES[0])} Waiting for payment...`);
+  while (attempts < maxAttempts) {
+    try {
+      const status = await checkFn(paymentHash);
+      if (status.paid) {
+        process.stdout.write("\r" + " ".repeat(50) + "\r");
+        console.log(pc7.green("\u2713") + " Payment received!");
+        if (onPaid) onPaid();
+        return status;
+      }
+    } catch {
+    }
+    frame = (frame + 1) % SPINNER_FRAMES.length;
+    const timeLeft = Math.ceil((maxAttempts - attempts) * intervalMs / 1e3 / 60);
+    process.stdout.write(
+      `\r${pc7.cyan(SPINNER_FRAMES[frame])} Waiting for payment... (${timeLeft}m remaining)`
+    );
+    await sleep2(intervalMs);
+    attempts++;
+  }
+  process.stdout.write("\r" + " ".repeat(60) + "\r");
+  console.log(pc7.yellow("\u26A0") + " Timed out waiting for payment.");
+  return { paid: false };
+}
+function sleep2(ms) {
+  return new Promise((resolve) => setTimeout(resolve, ms));
+}
+
+// src/commands/credits.ts
+async function creditsBalanceCommand() {
+  if (!isAuthenticated()) {
+    console.log(pc8.yellow("Not logged in."));
+    console.log(pc8.dim("Run `btcemail login` to authenticate."));
+    process.exit(1);
+  }
+  const spinner = ora6("Fetching balance...").start();
   const result = await getCreditsBalance();
   if (!result.ok) {
-    console.error(pc6.red(`Error: ${result.error.message}`));
+    spinner.fail(`Error: ${result.error.message}`);
     process.exit(1);
   }
-  const { balanceSats } = result.data;
+  spinner.stop();
+  const { balanceSats, lifetimePurchasedSats, lifetimeSpentSats } = result.data;
   console.log();
-  console.log(pc6.bold("Credit Balance"));
+  console.log(pc8.bold("Credit Balance"));
   console.log();
-  console.log(`  ${pc6.green(formatSats(balanceSats))} sats`);
+  console.log(`  ${pc8.green(formatSats(balanceSats))} sats`);
   console.log();
+  if (lifetimePurchasedSats > 0 || lifetimeSpentSats > 0) {
+    console.log(pc8.dim(`  Purchased: ${formatSats(lifetimePurchasedSats)} sats`));
+    console.log(pc8.dim(`  Spent: ${formatSats(lifetimeSpentSats)} sats`));
+    console.log();
+  }
   if (balanceSats === 0) {
-    console.log(pc6.dim("  No credits available."));
-    console.log(pc6.dim("  Purchase credits at https://btc.email/payments"));
+    console.log(pc8.dim("  No credits available."));
+    console.log(pc8.dim("  Run `btcemail credits purchase` to buy credits."));
+    console.log();
+  }
+}
+async function creditsHistoryCommand(options) {
+  if (!isAuthenticated()) {
+    console.log(pc8.yellow("Not logged in."));
+    console.log(pc8.dim("Run `btcemail login` to authenticate."));
+    process.exit(1);
+  }
+  const spinner = ora6("Loading transaction history...").start();
+  const result = await getCreditTransactions({
+    limit: options.limit || 20,
+    type: options.type
+  });
+  if (!result.ok) {
+    spinner.fail(`Error: ${result.error.message}`);
+    process.exit(1);
+  }
+  const { data: transactions, pagination } = result.data;
+  spinner.stop();
+  if (options.json) {
+    console.log(JSON.stringify({ transactions, pagination }, null, 2));
+    return;
+  }
+  console.log();
+  console.log(pc8.bold("Transaction History"));
+  console.log();
+  if (transactions.length === 0) {
+    console.log(pc8.dim("  No transactions found."));
+    console.log();
+    return;
+  }
+  console.log(
+    `  ${pc8.dim("Date".padEnd(12))} ${pc8.dim("Type".padEnd(15))} ${pc8.dim("Amount".padEnd(12))} ${pc8.dim("Balance")}`
+  );
+  console.log(pc8.dim("  " + "-".repeat(55)));
+  for (const tx of transactions) {
+    const date = formatDate3(tx.createdAt);
+    const type = formatTransactionType(tx.transactionType).padEnd(15);
+    const amount = formatAmount(tx.amountSats).padEnd(12);
+    const balance = formatSats(tx.balanceAfter);
+    console.log(`  ${date.padEnd(12)} ${type} ${amount} ${pc8.dim(balance)}`);
+  }
+  console.log();
+  if (pagination.hasMore) {
+    console.log(pc8.dim(`  Use --limit to see more transactions.`));
+    console.log();
+  }
+}
+async function creditsPurchaseCommand(options) {
+  if (!isAuthenticated()) {
+    console.log(pc8.yellow("Not logged in."));
+    console.log(pc8.dim("Run `btcemail login` to authenticate."));
+    process.exit(1);
+  }
+  const purchaseOptions = getCreditPurchaseOptions();
+  if (options.option === void 0) {
+    console.log();
+    console.log(pc8.bold("Purchase Options"));
+    console.log();
+    purchaseOptions.forEach((opt, index) => {
+      console.log(`  ${pc8.cyan(`[${index}]`)} ${opt.label}`);
+      console.log(`      ${pc8.dim(opt.description)}`);
+      console.log(`      ${pc8.dim(`Price: ${formatSats(opt.priceSats)} sats`)}`);
+      if (opt.bonusSats > 0) {
+        console.log(`      ${pc8.green(`+${formatSats(opt.bonusSats)} bonus sats`)}`);
+      }
+      console.log();
+    });
+    console.log(pc8.dim("  Usage: btcemail credits purchase --option <index>"));
+    console.log(pc8.dim("  Add --wait to wait for payment confirmation."));
+    console.log();
+    return;
+  }
+  if (options.option < 0 || options.option >= purchaseOptions.length) {
+    console.error(pc8.red(`Error: Invalid option. Choose 0-${purchaseOptions.length - 1}.`));
+    process.exit(1);
+  }
+  const selectedOption = purchaseOptions[options.option];
+  const spinner = ora6("Creating invoice...").start();
+  const result = await purchaseCredits(options.option);
+  if (!result.ok) {
+    spinner.fail(`Error: ${result.error.message}`);
+    process.exit(1);
+  }
+  spinner.stop();
+  const purchase = result.data;
+  if (options.json) {
+    console.log(JSON.stringify(purchase, null, 2));
+    return;
+  }
+  console.log();
+  console.log(pc8.bold("Lightning Invoice"));
+  console.log();
+  console.log(`  ${pc8.dim("Amount:")} ${formatSats(purchase.amountSats)} sats`);
+  console.log(`  ${pc8.dim("Credits:")} ${formatSats(purchase.creditsToReceive)} sats`);
+  if (purchase.bonusSats > 0) {
+    console.log(`  ${pc8.dim("Bonus:")} ${pc8.green(`+${formatSats(purchase.bonusSats)} sats`)}`);
+  }
+  console.log();
+  console.log(pc8.bold("Scan to pay:"));
+  console.log();
+  qrcode.generate(purchase.invoice, { small: true }, (qr) => {
+    const indentedQr = qr.split("\n").map((line) => "  " + line).join("\n");
+    console.log(indentedQr);
+  });
+  console.log();
+  console.log(pc8.bold("Invoice:"));
+  console.log();
+  console.log(`  ${purchase.invoice}`);
+  console.log();
+  console.log(pc8.dim(`  Payment hash: ${purchase.paymentHash}`));
+  console.log(pc8.dim(`  Expires: ${new Date(purchase.expiresAt).toLocaleString()}`));
+  console.log();
+  if (options.wait) {
+    console.log();
+    const status = await pollForPayment({
+      paymentHash: purchase.paymentHash,
+      checkFn: async (hash) => {
+        const result2 = await checkPaymentStatus(hash);
+        if (result2.ok) {
+          return { paid: result2.data.paid };
+        }
+        return { paid: false };
+      },
+      onPaid: async () => {
+        const balanceResult = await getCreditsBalance();
+        if (balanceResult.ok) {
+          console.log();
+          console.log(`${pc8.dim("New balance:")} ${pc8.green(formatSats(balanceResult.data.balanceSats))} sats`);
+        }
+      }
+    });
+    if (!status.paid) {
+      console.log(pc8.dim("  You can still pay the invoice and credits will be added."));
+    }
+    console.log();
+  } else {
+    console.log(pc8.dim("  Scan the QR code or copy the invoice above to pay."));
+    console.log(pc8.dim("  Use --wait to wait for payment confirmation."));
     console.log();
   }
 }
 function formatSats(sats) {
   return sats.toLocaleString();
 }
+function formatAmount(sats) {
+  if (sats >= 0) {
+    return pc8.green(`+${formatSats(sats)}`);
+  }
+  return pc8.red(formatSats(sats));
+}
+function formatTransactionType(type) {
+  const types = {
+    topup: "Top-up",
+    email_sent: "Email Sent",
+    email_received: "Email Received",
+    refund: "Refund",
+    bonus: "Bonus"
+  };
+  return types[type] || type;
+}
+function formatDate3(dateString) {
+  const date = new Date(dateString);
+  return date.toLocaleDateString("en-US", {
+    month: "short",
+    day: "numeric"
+  });
+}
 
 // src/commands/send.ts
-import pc7 from "picocolors";
+import pc9 from "picocolors";
+import ora7 from "ora";
+import qrcode2 from "qrcode-terminal";
 async function sendCommand(options) {
   if (!isAuthenticated()) {
-    console.log(pc7.yellow("Not logged in."));
-    console.log(pc7.dim("Run `btcemail login` to authenticate."));
+    console.log(pc9.yellow("Not logged in."));
+    console.log(pc9.dim("Run `btcemail login` to authenticate."));
     process.exit(1);
   }
   let fromEmail = options.fromEmail;
   if (!fromEmail) {
+    const spinner2 = ora7("Fetching account info...").start();
     const whoamiResult = await getWhoami();
+    spinner2.stop();
     if (whoamiResult.ok && whoamiResult.data.username) {
       fromEmail = `${whoamiResult.data.username}@btc.email`;
     } else {
@@ -562,52 +1040,100 @@ async function sendCommand(options) {
     }
   }
   if (!fromEmail || !fromEmail.endsWith("@btc.email")) {
-    console.error(pc7.red("No @btc.email address found."));
-    console.log(pc7.dim("Register a username at https://btc.email"));
+    console.error(pc9.red("No @btc.email address found."));
+    console.log(pc9.dim("Register a username at https://btc.email"));
     process.exit(1);
   }
   if (!options.to) {
-    console.error(pc7.red("Recipient is required. Use --to <email>"));
+    console.error(pc9.red("Recipient is required. Use --to <email>"));
     process.exit(1);
   }
   if (!options.subject) {
-    console.error(pc7.red("Subject is required. Use --subject <text>"));
+    console.error(pc9.red("Subject is required. Use --subject <text>"));
     process.exit(1);
   }
   if (!options.body) {
-    console.error(pc7.red("Body is required. Use --body <text>"));
+    console.error(pc9.red("Body is required. Use --body <text>"));
     process.exit(1);
   }
   const toEmails = options.to.split(",").map((e) => e.trim());
   console.log();
-  console.log(pc7.bold("Sending Email"));
+  console.log(pc9.bold("Sending Email"));
   console.log();
-  console.log(`${pc7.dim("From:")}    ${fromEmail}`);
-  console.log(`${pc7.dim("To:")}      ${toEmails.join(", ")}`);
-  console.log(`${pc7.dim("Subject:")} ${options.subject}`);
+  console.log(`${pc9.dim("From:")}    ${fromEmail}`);
+  console.log(`${pc9.dim("To:")}      ${toEmails.join(", ")}`);
+  console.log(`${pc9.dim("Subject:")} ${options.subject}`);
   console.log();
   if (!options.paymentHash) {
+    const spinner2 = ora7("Getting invoice...").start();
     const invoiceResult = await getL402Invoice({
       fromEmail,
       toEmails
     });
+    spinner2.stop();
     if (invoiceResult.ok && invoiceResult.data.amountSats > 0) {
       const invoice = invoiceResult.data;
-      console.log(pc7.yellow(`Payment required: ${invoice.amountSats} sats`));
+      console.log(pc9.yellow(`Payment required: ${invoice.amountSats} sats`));
+      console.log();
+      console.log(pc9.bold("Scan to pay:"));
+      console.log();
+      qrcode2.generate(invoice.invoice, { small: true }, (qr) => {
+        const indentedQr = qr.split("\n").map((line) => "  " + line).join("\n");
+        console.log(indentedQr);
+      });
       console.log();
-      console.log(pc7.dim("Lightning Invoice:"));
-      console.log(pc7.cyan(invoice.invoice));
+      console.log(pc9.dim("Lightning Invoice:"));
+      console.log(pc9.cyan(invoice.invoice));
       console.log();
-      console.log(pc7.dim("Pay this invoice with your Lightning wallet, then run:"));
+      if (options.wait) {
+        const status = await pollForPayment({
+          paymentHash: invoice.paymentHash,
+          checkFn: async (hash) => {
+            const result2 = await checkPaymentStatus(hash);
+            if (result2.ok) {
+              return { paid: result2.data.paid };
+            }
+            return { paid: false };
+          }
+        });
+        if (status.paid) {
+          const sendSpinner = ora7("Sending email...").start();
+          const result2 = await sendEmail({
+            to: toEmails,
+            subject: options.subject,
+            body: options.body,
+            fromEmail,
+            paymentHash: invoice.paymentHash
+          });
+          if (!result2.ok) {
+            sendSpinner.fail(`Error: ${result2.error.message}`);
+            process.exit(1);
+          }
+          sendSpinner.succeed("Email sent!");
+          console.log();
+          console.log(`${pc9.dim("Email ID:")} ${result2.data.emailId}`);
+          if (result2.data.messageId) {
+            console.log(`${pc9.dim("Message ID:")} ${result2.data.messageId}`);
+          }
+          console.log();
+        } else {
+          console.log(pc9.dim("Payment not confirmed. You can still pay and resend with --payment-hash."));
+        }
+        return;
+      }
+      console.log(pc9.dim("Pay this invoice with your Lightning wallet, then run:"));
       console.log(
-        pc7.cyan(
+        pc9.cyan(
           `  btcemail send --to "${options.to}" --subject "${options.subject}" --body "${options.body}" --payment-hash ${invoice.paymentHash}`
         )
       );
       console.log();
+      console.log(pc9.dim("Or use --wait to automatically wait for payment."));
+      console.log();
       return;
     }
   }
+  const spinner = ora7("Sending email...").start();
   const result = await sendEmail({
     to: toEmails,
     subject: options.subject,
@@ -617,148 +1143,200 @@ async function sendCommand(options) {
   });
   if (!result.ok) {
     if (result.error.code === "PAYMENT_REQUIRED") {
-      console.error(pc7.yellow("Payment required to send this email."));
-      console.log(pc7.dim("Use the invoice above to pay, then include --payment-hash"));
+      spinner.fail("Payment required to send this email.");
+      console.log(pc9.dim("Use the invoice above to pay, then include --payment-hash"));
     } else {
-      console.error(pc7.red(`Error: ${result.error.message}`));
+      spinner.fail(`Error: ${result.error.message}`);
     }
     process.exit(1);
   }
-  console.log(pc7.green("Email sent successfully!"));
+  spinner.succeed("Email sent!");
   console.log();
-  console.log(`${pc7.dim("Email ID:")} ${result.data.emailId}`);
+  console.log(`${pc9.dim("Email ID:")} ${result.data.emailId}`);
   if (result.data.messageId) {
-    console.log(`${pc7.dim("Message ID:")} ${result.data.messageId}`);
+    console.log(`${pc9.dim("Message ID:")} ${result.data.messageId}`);
   }
   console.log();
 }
 
 // src/commands/inbound.ts
-import pc8 from "picocolors";
+import pc10 from "picocolors";
+import ora8 from "ora";
+async function inboundDeliveredCommand(options) {
+  if (!isAuthenticated()) {
+    console.log(pc10.yellow("Not logged in."));
+    console.log(pc10.dim("Run `btcemail login` to authenticate."));
+    process.exit(1);
+  }
+  const spinner = ora8("Loading delivered emails...").start();
+  const result = await getDeliveredEmails({
+    limit: options.limit || 20
+  });
+  if (!result.ok) {
+    spinner.fail(`Error: ${result.error.message}`);
+    process.exit(1);
+  }
+  const { data: emails, pagination } = result.data;
+  spinner.stop();
+  if (options.json) {
+    console.log(JSON.stringify({ emails, pagination }, null, 2));
+    return;
+  }
+  console.log();
+  console.log(pc10.bold(`Delivered (${pagination.total} paid emails received)`));
+  console.log();
+  if (emails.length === 0) {
+    console.log(pc10.dim("  No delivered emails yet."));
+    console.log();
+    return;
+  }
+  console.log(
+    `  ${pc10.dim("#".padEnd(4))} ${pc10.dim("From".padEnd(28))} ${pc10.dim("Subject".padEnd(40))} ${pc10.dim("Date")}`
+  );
+  console.log(pc10.dim("  " + "-".repeat(85)));
+  emails.forEach((email, index) => {
+    const num = pc10.cyan(String(index + 1).padEnd(4));
+    const from = truncate3(email.from.name || email.from.email, 26).padEnd(28);
+    const subject = truncate3(email.subject, 38).padEnd(40);
+    const date = formatDate4(email.date);
+    console.log(`  ${num}${from} ${subject} ${pc10.dim(date)}`);
+  });
+  console.log();
+  if (pagination.hasMore) {
+    console.log(
+      pc10.dim(`  Showing ${emails.length} of ${pagination.total}. Use --limit to see more.`)
+    );
+    console.log();
+  }
+  console.log(pc10.dim("  Read email: btcemail read <id>"));
+  console.log();
+}
 async function inboundPendingCommand(options) {
   if (!isAuthenticated()) {
-    console.log(pc8.yellow("Not logged in."));
-    console.log(pc8.dim("Run `btcemail login` to authenticate."));
+    console.log(pc10.yellow("Not logged in."));
+    console.log(pc10.dim("Run `btcemail login` to authenticate."));
     process.exit(1);
   }
+  const spinner = ora8("Loading pending emails...").start();
   const result = await getPendingEmails({
     limit: options.limit || 20
   });
   if (!result.ok) {
-    console.error(pc8.red(`Error: ${result.error.message}`));
+    spinner.fail(`Error: ${result.error.message}`);
     process.exit(1);
   }
   const { data: emails, pagination } = result.data;
+  spinner.stop();
   if (options.json) {
     console.log(JSON.stringify({ emails, pagination }, null, 2));
     return;
   }
   console.log();
-  console.log(pc8.bold(`Pending Emails (${pagination.total} awaiting payment)`));
+  console.log(pc10.bold(`Pending (${pagination.total} awaiting payment)`));
   console.log();
   if (emails.length === 0) {
-    console.log(pc8.dim("  No pending emails."));
+    console.log(pc10.dim("  No pending emails."));
     console.log();
     return;
   }
   console.log(
-    `  ${pc8.dim("ID".padEnd(12))} ${pc8.dim("From".padEnd(30))} ${pc8.dim("Subject".padEnd(30))} ${pc8.dim("Sats")}`
+    `  ${pc10.dim("#".padEnd(4))} ${pc10.dim("From".padEnd(28))} ${pc10.dim("Subject".padEnd(35))} ${pc10.dim("Sats")}`
   );
-  console.log(pc8.dim("  " + "-".repeat(85)));
-  for (const email of emails) {
-    const id = email.id.slice(0, 10).padEnd(12);
-    const from = truncate2(email.from.name || email.from.email, 28).padEnd(30);
-    const subject = truncate2(email.subject, 28).padEnd(30);
-    const sats = pc8.yellow(String(email.amountSats));
-    console.log(`  ${id} ${from} ${subject} ${sats}`);
-  }
+  console.log(pc10.dim("  " + "-".repeat(80)));
+  emails.forEach((email, index) => {
+    const num = pc10.cyan(String(index + 1).padEnd(4));
+    const from = truncate3(email.from.name || email.from.email, 26).padEnd(28);
+    const subject = truncate3(email.subject, 33).padEnd(35);
+    const sats = pc10.yellow(String(email.amountSats));
+    console.log(`  ${num}${from} ${subject} ${sats}`);
+  });
   console.log();
   if (pagination.hasMore) {
     console.log(
-      pc8.dim(`  Showing ${emails.length} of ${pagination.total}. Use --limit to see more.`)
+      pc10.dim(`  Showing ${emails.length} of ${pagination.total}. Use --limit to see more.`)
     );
     console.log();
   }
-  console.log(pc8.dim("  Use `btcemail inbound view <id>` to see details and payment invoice."));
+  console.log(pc10.dim("  View details: btcemail inbound view <id>"));
   console.log();
 }
 async function inboundViewCommand(id, options) {
   if (!isAuthenticated()) {
-    console.log(pc8.yellow("Not logged in."));
-    console.log(pc8.dim("Run `btcemail login` to authenticate."));
+    console.log(pc10.yellow("Not logged in."));
+    console.log(pc10.dim("Run `btcemail login` to authenticate."));
     process.exit(1);
   }
+  const spinner = ora8("Loading email details...").start();
   const result = await getPendingEmail(id);
   if (!result.ok) {
     if (result.error.code === "NOT_FOUND") {
-      console.error(pc8.red(`Pending email not found: ${id}`));
+      spinner.fail(`Pending email not found: ${id}`);
     } else {
-      console.error(pc8.red(`Error: ${result.error.message}`));
+      spinner.fail(`Error: ${result.error.message}`);
     }
     process.exit(1);
   }
+  spinner.stop();
   const email = result.data;
   if (options.json) {
     console.log(JSON.stringify(email, null, 2));
     return;
   }
   console.log();
-  console.log(pc8.bold(email.subject || "(No subject)"));
+  console.log(pc10.bold(email.subject || "(No subject)"));
   console.log();
-  console.log(`${pc8.dim("From:")}    ${formatAddress2(email.from)}`);
-  console.log(`${pc8.dim("Date:")}    ${formatFullDate2(email.createdAt)}`);
-  console.log(`${pc8.dim("ID:")}      ${email.id}`);
+  console.log(`${pc10.dim("From:")}    ${formatAddress2(email.from)}`);
+  console.log(`${pc10.dim("Date:")}    ${formatFullDate2(email.createdAt)}`);
+  console.log(`${pc10.dim("ID:")}      ${email.id}`);
   console.log();
-  console.log(pc8.yellow(`Payment Required: ${email.amountSats} sats`));
+  console.log(pc10.yellow(`Payment Required: ${email.amountSats} sats`));
   console.log();
   if (email.paymentHash) {
-    console.log(pc8.dim("To receive this email, pay the invoice and run:"));
-    console.log(pc8.cyan(`  btcemail inbound pay ${email.id} --payment-hash <preimage>`));
+    console.log(pc10.dim("To receive this email, pay the invoice and run:"));
+    console.log(pc10.cyan(`  btcemail inbound pay ${email.id} --payment-hash <preimage>`));
   } else {
-    console.log(pc8.dim("Payment information not available."));
+    console.log(pc10.dim("Payment information not available."));
   }
   console.log();
-  console.log(pc8.dim("-".repeat(60)));
+  console.log(pc10.dim("-".repeat(60)));
   console.log();
-  console.log(pc8.dim("Preview (full content available after payment):"));
+  console.log(pc10.dim("Preview (full content available after payment):"));
   console.log();
-  console.log(truncate2(email.bodyText || email.body, 200));
+  console.log(truncate3(email.bodyText || email.body, 200));
   console.log();
 }
 async function inboundPayCommand(id, options) {
   if (!isAuthenticated()) {
-    console.log(pc8.yellow("Not logged in."));
-    console.log(pc8.dim("Run `btcemail login` to authenticate."));
+    console.log(pc10.yellow("Not logged in."));
+    console.log(pc10.dim("Run `btcemail login` to authenticate."));
     process.exit(1);
   }
   if (!options.paymentHash) {
-    console.error(pc8.red("Payment hash is required. Use --payment-hash <preimage>"));
+    console.error(pc10.red("Payment hash is required. Use --payment-hash <preimage>"));
     process.exit(1);
   }
-  console.log();
-  console.log(pc8.dim("Verifying payment..."));
+  const spinner = ora8("Verifying payment...").start();
   const result = await payForEmail(id, options.paymentHash);
   if (!result.ok) {
     if (result.error.code === "PAYMENT_INVALID") {
-      console.error(pc8.red("Payment verification failed."));
-      console.log(pc8.dim("Make sure you paid the correct invoice and provided the preimage."));
+      spinner.fail("Payment verification failed.");
+      console.log(pc10.dim("Make sure you paid the correct invoice and provided the preimage."));
     } else if (result.error.code === "NOT_FOUND") {
-      console.error(pc8.red(`Pending email not found or already delivered: ${id}`));
+      spinner.fail(`Pending email not found or already delivered: ${id}`);
     } else {
-      console.error(pc8.red(`Error: ${result.error.message}`));
+      spinner.fail(`Error: ${result.error.message}`);
     }
     process.exit(1);
   }
+  spinner.succeed("Payment verified! Email delivered.");
   console.log();
-  console.log(pc8.green("Payment verified! Email delivered."));
+  console.log(`${pc10.dim("Email ID:")} ${result.data.emailId}`);
+  console.log(`${pc10.dim("Status:")}   ${result.data.status}`);
   console.log();
-  console.log(`${pc8.dim("Email ID:")} ${result.data.emailId}`);
-  console.log(`${pc8.dim("Status:")}   ${result.data.status}`);
-  console.log();
-  console.log(pc8.dim("Run `btcemail read " + result.data.emailId + "` to read the email."));
+  console.log(pc10.dim(`Read email: btcemail read ${result.data.emailId}`));
   console.log();
 }
-function truncate2(str, maxLength) {
+function truncate3(str, maxLength) {
   if (str.length <= maxLength) return str;
   return str.slice(0, maxLength - 1) + "\u2026";
 }
@@ -779,39 +1357,72 @@ function formatFullDate2(dateString) {
     minute: "2-digit"
   });
 }
+function formatDate4(dateString) {
+  const date = new Date(dateString);
+  const now = /* @__PURE__ */ new Date();
+  const diffMs = now.getTime() - date.getTime();
+  const diffDays = Math.floor(diffMs / (1e3 * 60 * 60 * 24));
+  if (diffDays === 0) {
+    return date.toLocaleTimeString("en-US", {
+      hour: "numeric",
+      minute: "2-digit"
+    });
+  }
+  if (diffDays < 7) {
+    return date.toLocaleDateString("en-US", { weekday: "short" });
+  }
+  return date.toLocaleDateString("en-US", {
+    month: "short",
+    day: "numeric"
+  });
+}
 
 // src/index.ts
 var program = new Command();
-program.name("btcemail").description("btc.email CLI - Spam-free email powered by Bitcoin Lightning").version("0.1.0");
+program.name("btcemail").description("btc.email CLI - Spam-free email powered by Bitcoin Lightning").version("0.3.0");
 program.command("login").description("Authenticate with btc.email (opens browser)").action(loginCommand);
 program.command("logout").description("Clear stored credentials").action(logoutCommand);
 program.command("whoami").description("Show current authenticated user").action(whoamiCommand);
-program.command("list").description("List emails").option("-f, --folder <folder>", "Folder to list (inbox, sent, drafts)", "inbox").option("-l, --limit <number>", "Number of emails to show", "20").option("--json", "Output as JSON").action(async (options) => {
+program.command("list").alias("ls").description("List emails (numbered for quick access)").option("-f, --folder <folder>", "Folder to list (inbox, sent, drafts)", "inbox").option("-l, --limit <number>", "Number of emails to show", "20").option("-p, --page <number>", "Page number", "1").option("--json", "Output as JSON").action(async (options) => {
   await listCommand({
     folder: options.folder,
     limit: parseInt(options.limit, 10),
+    page: parseInt(options.page, 10),
     json: options.json
   });
 });
-program.command("read <id>").description("Read an email by ID").option("--json", "Output as JSON").action(async (id, options) => {
+program.command("read <id>").alias("r").description("Read an email by # (from list) or ID").option("--json", "Output as JSON").action(async (id, options) => {
   await readCommand(id, { json: options.json });
 });
-program.command("send").description("Send an email").option("-t, --to <emails>", "Recipient email(s), comma-separated").option("-s, --subject <subject>", "Email subject").option("-b, --body <body>", "Email body").option("-f, --from <email>", "From email (@btc.email address)").option("--payment-hash <hash>", "Payment hash/preimage for L402").action(async (options) => {
+program.command("search <query>").alias("s").description("Search emails by subject, body, or sender").option("-l, --limit <number>", "Number of results to show", "20").option("--json", "Output as JSON").action(async (query, options) => {
+  await searchCommand(query, {
+    limit: parseInt(options.limit, 10),
+    json: options.json
+  });
+});
+program.command("send").description("Send an email (with Lightning payment)").option("-t, --to <emails>", "Recipient email(s), comma-separated").option("-s, --subject <subject>", "Email subject").option("-b, --body <body>", "Email body").option("-f, --from <email>", "From email (@btc.email address)").option("--payment-hash <hash>", "Payment preimage for L402").option("-w, --wait", "Wait for payment confirmation").action(async (options) => {
   await sendCommand({
     to: options.to,
     subject: options.subject,
     body: options.body,
     fromEmail: options.from,
-    paymentHash: options.paymentHash
+    paymentHash: options.paymentHash,
+    wait: options.wait
   });
 });
-var inbound = program.command("inbound").description("Manage pending emails requiring payment");
-inbound.command("pending").description("List pending emails awaiting payment").option("-l, --limit <number>", "Number of emails to show", "20").option("--json", "Output as JSON").action(async (options) => {
+var inbound = program.command("inbound").description("Manage inbound emails (pending and delivered)");
+inbound.command("pending").alias("p").description("List pending emails awaiting payment").option("-l, --limit <number>", "Number of emails to show", "20").option("--json", "Output as JSON").action(async (options) => {
   await inboundPendingCommand({
     limit: parseInt(options.limit, 10),
     json: options.json
   });
 });
+inbound.command("delivered").alias("d").description("List delivered emails (paid by senders)").option("-l, --limit <number>", "Number of emails to show", "20").option("--json", "Output as JSON").action(async (options) => {
+  await inboundDeliveredCommand({
+    limit: parseInt(options.limit, 10),
+    json: options.json
+  });
+});
 inbound.command("view <id>").description("View pending email details and payment info").option("--json", "Output as JSON").action(async (id, options) => {
   await inboundViewCommand(id, { json: options.json });
 });
@@ -819,11 +1430,24 @@ inbound.command("pay <id>").description("Pay for a pending email").requiredOptio
   await inboundPayCommand(id, { paymentHash: options.paymentHash });
 });
 var credits = program.command("credits").description("Manage credits");
-credits.command("balance").description("Show credit balance").action(creditsBalanceCommand);
+credits.command("balance").alias("bal").description("Show credit balance").action(creditsBalanceCommand);
+credits.command("history").description("Show transaction history").option("-l, --limit <number>", "Number of transactions to show", "20").option("-t, --type <type>", "Filter by type (topup, email_sent, email_received, refund, bonus)").option("--json", "Output as JSON").action(async (options) => {
+  await creditsHistoryCommand({
+    limit: parseInt(options.limit, 10),
+    type: options.type,
+    json: options.json
+  });
+});
+credits.command("purchase").alias("buy").description("Purchase credits with Lightning").option("-o, --option <index>", "Purchase option index (0-3)").option("-w, --wait", "Wait for payment confirmation").option("--json", "Output as JSON").action(async (options) => {
+  await creditsPurchaseCommand({
+    option: options.option !== void 0 ? parseInt(options.option, 10) : void 0,
+    json: options.json,
+    wait: options.wait
+  });
+});
 program.action(() => {
   console.log();
-  console.log(pc9.bold("btc.email CLI"));
-  console.log(pc9.dim("Spam-free email powered by Bitcoin Lightning"));
+  console.log(pc11.bold("btc.email CLI") + pc11.dim(" - Spam-free email powered by Bitcoin Lightning"));
   console.log();
   program.outputHelp();
 });