@mailmodo/cli 0.0.26-beta.pr29.44 → 0.0.27-beta.pr30.46

package/dist/commands/billing/index.d.ts

@@ -3,24 +3,23 @@ export default class Billing extends BaseCommand {
     static description: string;
     static examples: string[];
     static flags: {
+        'auto-charge-block-count': import("@oclif/core/interfaces").OptionFlag<number | undefined, import("@oclif/core/interfaces").CustomOptions>;
         cap: import("@oclif/core/interfaces").OptionFlag<number | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        checkout: import("@oclif/core/interfaces").BooleanFlag<boolean>;
+        purchase: import("@oclif/core/interfaces").OptionFlag<number | undefined, import("@oclif/core/interfaces").CustomOptions>;
         status: import("@oclif/core/interfaces").BooleanFlag<boolean>;
         json: import("@oclif/core/interfaces").BooleanFlag<boolean>;
         yes: import("@oclif/core/interfaces").BooleanFlag<boolean>;
     };
     run(): Promise<void>;
-    /**
-     * Retrieves and displays the current billing status including card info,
-     * block usage, spending total, AI generation limits, and optionally
-     * opens Stripe Checkout if no card is on file.
-     */
+    private startCheckout;
     private showStatus;
-    /**
-     * Updates the monthly block spending cap. This limits how many 10k-email
-     * blocks will be auto-charged per billing cycle.
-     *
-     * @param {number} cap - The maximum number of blocks per month.
-     * @param {boolean} jsonOutput - Whether to output JSON instead of formatted text.
-     */
+    private formatAutoCharge;
+    private formatCap;
+    private formatCurrency;
+    private formatPaymentMethod;
+    private formatUsageBlock;
+    private pluralize;
+    private purchaseBlocks;
     private setCap;
 }

package/dist/commands/billing/index.js

@@ -4,16 +4,29 @@ import open from 'open';
 import { BaseCommand } from '../../lib/base-command.js';
 import { API_ENDPOINTS } from '../../lib/constants.js';
 export default class Billing extends BaseCommand {
-    static description = 'View billing status, manage payment, and set spending cap';
+    static description = 'View billing status, purchase blocks, set cap, or add a payment method';
     static examples = [
         '<%= config.bin %> billing',
         '<%= config.bin %> billing --status',
         '<%= config.bin %> billing --cap 5',
+        '<%= config.bin %> billing --cap 5 --auto-charge-block-count 2',
+        '<%= config.bin %> billing --purchase 3',
+        '<%= config.bin %> billing --checkout',
     ];
     static flags = {
         ...BaseCommand.baseFlags,
+        'auto-charge-block-count': Flags.integer({
+            description: 'Blocks to auto-purchase when the quota runs low (use with --cap)',
+        }),
         cap: Flags.integer({
-            description: 'Set monthly block cap (max blocks to auto-charge)',
+            description: 'Set monthly sending cap in blocks',
+        }),
+        checkout: Flags.boolean({
+            default: false,
+            description: 'Open Stripe checkout to add or update a payment method',
+        }),
+        purchase: Flags.integer({
+            description: 'Manually purchase this many 10,000-email blocks',
         }),
         status: Flags.boolean({
             default: false,
@@ -23,17 +36,44 @@ export default class Billing extends BaseCommand {
     async run() {
         const { flags } = await this.parse(Billing);
         await this.ensureAuth();
+        const autoChargeBlockCount = flags['auto-charge-block-count'];
+        if (autoChargeBlockCount !== undefined && flags.cap === undefined) {
+            this.error(`Use ${chalk.cyan('--auto-charge-block-count')} together with ${chalk.cyan('--cap')}.`);
+        }
+        if (flags.checkout) {
+            await this.startCheckout(flags.json);
+            return;
+        }
+        if (flags.purchase !== undefined) {
+            await this.purchaseBlocks(flags.purchase, flags.json);
+            return;
+        }
         if (flags.cap !== undefined) {
-            await this.setCap(flags.cap, flags.json);
+            await this.setCap(flags.cap, autoChargeBlockCount, flags.json);
             return;
         }
         await this.showStatus(flags.json);
     }
-    /**
-     * Retrieves and displays the current billing status including card info,
-     * block usage, spending total, AI generation limits, and optionally
-     * opens Stripe Checkout if no card is on file.
-     */
+    async startCheckout(jsonOutput) {
+        const response = await this.withApiSpinner({ json: jsonOutput, text: '  Creating checkout session...' }, () => this.apiClient.post(API_ENDPOINTS.BILLING_CHECKOUT));
+        if (!response.ok) {
+            this.handleApiError(response);
+        }
+        const { checkoutUrl } = response.data;
+        if (jsonOutput) {
+            this.log(JSON.stringify({ checkoutUrl }, null, 2));
+            return;
+        }
+        this.log(`\n  ${chalk.bold('Stripe Checkout')} — add or update your payment method.`);
+        this.log(`  ${chalk.dim(checkoutUrl)}\n`);
+        try {
+            await open(checkoutUrl);
+            this.log(`  Opening in browser...\n`);
+        }
+        catch {
+            this.log(`  ${chalk.dim('Could not open browser. Visit the URL above manually.')}\n`);
+        }
+    }
     async showStatus(jsonOutput) {
         const response = await this.withApiSpinner({ json: jsonOutput, text: '  Loading billing status...' }, () => this.apiClient.get(API_ENDPOINTS.BILLING_STATUS));
         if (!response.ok) {
@@ -45,55 +85,125 @@ export default class Billing extends BaseCommand {
             return;
         }
         this.log('');
-        if (data.cardOnFile) {
-            this.log(`  Card:         ${data.cardSummary || 'Card on file'}`);
+        this.log(`  Tier:          ${data.tier}`);
+        this.log(`  Payment:       ${this.formatPaymentMethod(data)}`);
+        this.log(`  Auto-charge:   ${this.formatAutoCharge(data)}`);
+        this.log(`  Monthly cap:   ${this.formatCap(data.cap)}`);
+        this.log(`  Total spent:   ${this.formatCurrency(data.totalSpent, data.spentCurrency)}`);
+        if (data.activeBlocks.length === 0) {
+            this.log('  Active blocks: none');
+            this.log('');
+            return;
         }
-        else {
-            this.log(`  Card:         ${chalk.yellow('No card on file')}`);
+        this.log('  Active blocks:');
+        for (const block of data.activeBlocks) {
+            this.log(`    - ${this.formatUsageBlock(block)}`);
         }
-        if (data.freeExhausted) {
-            this.log(`  Free tier:    ${chalk.dim('exhausted')}`);
+        this.log('');
+    }
+    formatAutoCharge(data) {
+        if (!data.autoChargeEnabled) {
+            return 'disabled';
         }
-        else {
-            this.log(`  Free tier:    active`);
+        if (typeof data.autoChargeBlockCount !== 'number') {
+            return 'enabled';
         }
-        this.log(`  Current block: ${data.currentBlockUsed ?? 0} / 10,000 used`);
-        this.log(`  Blocks used:  ${data.blocksUsed ?? 0}  ($${data.totalSpent || '0'} total)`);
-        this.log(`  Monthly cap:  ${data.cap ?? 'not set'} blocks${data.cap ? ` ($${data.cap * 19} max/month)` : ''}`);
-        if (data.aiRemaining) {
-            this.log(`\n  AI generation:`);
-            this.log(`    Init uses remaining:  ${data.aiRemaining.inits}/5 this month`);
-            this.log(`    Edit uses remaining:  ${data.aiRemaining.edits}/50 this month`);
+        return `enabled (${data.autoChargeBlockCount} ${this.pluralize('block', data.autoChargeBlockCount)})`;
+    }
+    formatCap(cap) {
+        const parts = [];
+        if (typeof cap.inBlocks === 'number') {
+            parts.push(`${cap.inBlocks} ${this.pluralize('block', cap.inBlocks)}`);
         }
-        if (!data.cardOnFile && data.freeExhausted && data.checkoutUrl) {
-            this.log(`\n  ${chalk.yellow('Free tier exhausted.')} Opening payment page...\n`);
+        if (typeof cap.inEmails === 'number') {
+            parts.push(`${cap.inEmails.toLocaleString()} emails`);
+        }
+        return parts.length > 0 ? parts.join(' / ') : 'not set';
+    }
+    formatCurrency(amount, currency) {
+        const numericAmount = typeof amount === 'number' ? amount : Number.parseFloat(amount);
+        const normalizedCurrency = currency.toUpperCase();
+        if (Number.isFinite(numericAmount)) {
             try {
-                await open(data.checkoutUrl);
+                return new Intl.NumberFormat('en-US', {
+                    currency: normalizedCurrency,
+                    style: 'currency',
+                }).format(numericAmount);
             }
             catch {
-                this.log(`  Visit: ${chalk.cyan(data.checkoutUrl)}`);
+                return `${numericAmount.toFixed(2)} ${normalizedCurrency}`;
             }
         }
-        this.log('');
+        return `${String(amount)} ${normalizedCurrency}`;
+    }
+    formatPaymentMethod(data) {
+        if (!data.hasPaymentMethod) {
+            return 'No payment method on file';
+        }
+        const primaryMethod = data.paymentMethod[0];
+        if (!primaryMethod) {
+            return 'Payment method on file';
+        }
+        const brand = primaryMethod.brand || 'Card';
+        return primaryMethod.last4
+            ? `${brand} ending ${primaryMethod.last4}`
+            : `${brand} on file`;
     }
-    /**
-     * Updates the monthly block spending cap. This limits how many 10k-email
-     * blocks will be auto-charged per billing cycle.
-     *
-     * @param {number} cap - The maximum number of blocks per month.
-     * @param {boolean} jsonOutput - Whether to output JSON instead of formatted text.
-     */
-    async setCap(cap, jsonOutput) {
-        const response = await this.withApiSpinner({ json: jsonOutput, text: '  Updating spending cap...' }, () => this.apiClient.patch(API_ENDPOINTS.BILLING_CAP, {
-            cap,
+    formatUsageBlock(block) {
+        const allowance = block.blockAllowance ?? Math.max(block.blocksCount * block.blockSize, 0);
+        const used = Math.max(block.emailsSent ?? 0, 0);
+        const activationSuffix = block.activatedAt
+            ? `, activated ${new Date(block.activatedAt).toLocaleDateString('en-US')}`
+            : '';
+        return `${block.type} block: ${used.toLocaleString()} / ${allowance.toLocaleString()} used (${block.status}${activationSuffix})`;
+    }
+    pluralize(word, count) {
+        return count === 1 ? word : `${word}s`;
+    }
+    async purchaseBlocks(blocksCount, jsonOutput) {
+        if (blocksCount < 1) {
+            this.error('Purchase block count must be at least 1 block.');
+        }
+        const response = await this.withApiSpinner({ json: jsonOutput, text: '  Initiating block purchase...' }, () => this.apiClient.post(API_ENDPOINTS.BILLING_PURCHASE, {
+            blocksCount,
         }));
         if (!response.ok) {
             this.handleApiError(response);
         }
         if (jsonOutput) {
-            this.log(JSON.stringify({ cap, maxMonthlySpend: `$${cap * 19}`, status: 'updated' }, null, 2));
+            this.log(JSON.stringify(response.data, null, 2));
             return;
         }
-        this.log(`\n  ${chalk.green('✓')} Cap set to ${chalk.bold(String(cap))} blocks ($${cap * 19} max/month).\n`);
+        this.log(`\n  ${chalk.green('✓')} ${response.data.message}`);
+        this.log(`  Blocks:        ${blocksCount} ${this.pluralize('block', blocksCount)}`);
+        this.log(`  Payment intent:${` ${chalk.dim(response.data.paymentIntentId)}`}`);
+        this.log('');
+    }
+    async setCap(cap, autoChargeBlockCount, jsonOutput) {
+        if (cap < 1) {
+            this.error('Cap must be at least 1 block.');
+        }
+        if (autoChargeBlockCount !== undefined && autoChargeBlockCount < 1) {
+            this.error('Auto-charge block count must be at least 1 block.');
+        }
+        const response = await this.withApiSpinner({ json: jsonOutput, text: '  Updating spending cap...' }, () => {
+            const payload = autoChargeBlockCount === undefined
+                ? { cap }
+                : { autoChargeBlockCount, cap };
+            return this.apiClient.post(API_ENDPOINTS.BILLING_CAP, payload);
+        });
+        if (!response.ok) {
+            this.handleApiError(response);
+        }
+        if (jsonOutput) {
+            this.log(JSON.stringify(response.data, null, 2));
+            return;
+        }
+        this.log(`\n  ${chalk.green('✓')} ${response.data.message}`);
+        this.log(`  Monthly cap:   ${chalk.bold(String(response.data.capBlocks))} ${this.pluralize('block', response.data.capBlocks)} (${response.data.capEmails.toLocaleString()} emails)`);
+        if (response.data.autoChargeBlockCount !== undefined) {
+            this.log(`  Auto-charge:   ${response.data.autoChargeBlockCount} ${this.pluralize('block', response.data.autoChargeBlockCount)}`);
+        }
+        this.log('');
     }
 }

package/dist/commands/contacts/index.js

@@ -2,6 +2,7 @@ import { Flags } from '@oclif/core';
 import { confirm } from '@inquirer/prompts';
 import chalk from 'chalk';
 import { writeFile } from 'node:fs/promises';
+import { resolve } from 'node:path';
 import { BaseCommand } from '../../lib/base-command.js';
 import { API_ENDPOINTS } from '../../lib/constants.js';
 export default class Contacts extends BaseCommand {
@@ -9,7 +10,7 @@ export default class Contacts extends BaseCommand {
     static examples = [
         '<%= config.bin %> contacts',
         '<%= config.bin %> contacts --search sarah@example.com',
-        "<%= config.bin %> contacts --export   # GDPR CSV → contacts.csv",
+        '<%= config.bin %> contacts --export   # GDPR CSV → contacts.csv',
         '<%= config.bin %> contacts --delete sarah@example.com',
     ];
     static flags = {
@@ -112,14 +113,14 @@ export default class Contacts extends BaseCommand {
             this.log(`\n  Export status: ${status ?? 'unknown'}. No download URL yet.\n`);
             return;
         }
-        const url = `https://${downloadUrl}`;
-        const fileResult = await this.apiClient.getFile(url);
+        const fileResult = await this.apiClient.getPublicFile(downloadUrl.trim());
         if (!fileResult.ok) {
             this.error(`Download failed: ${fileResult.status} ${fileResult.error ?? ''}\n` +
                 `  URL: ${fileResult.debug.fullUrl}`);
         }
-        await writeFile('contacts.csv', Buffer.from(fileResult.body));
-        this.log(`\n  ${chalk.green('✓')} Contact export saved to ${chalk.cyan('contacts.csv')}\n`);
+        const outputPath = resolve('contacts.csv');
+        await writeFile(outputPath, Buffer.from(fileResult.body));
+        this.log(`\n  ${chalk.green('✓')} Contact export saved to ${chalk.cyan(outputPath)}\n`);
     }
     /**
      * Performs a GDPR-compliant hard delete of a contact and all their

package/dist/commands/deploy/index.js

@@ -73,9 +73,7 @@ export default class Deploy extends BaseCommand {
         return {
             condition: email.condition || null,
             ctaText: email.ctaText || '',
-            delay: typeof email.delay === 'string'
-                ? Number.parseInt(email.delay, 10) || 0
-                : email.delay,
+            delay: email.delay,
             goal: email.goal || '',
             id: email.id,
             isReminder: false,

package/dist/commands/domain/index.d.ts

@@ -23,5 +23,6 @@ export default class Domain extends BaseCommand {
      * bounce rate, and spam complaint rate.
      */
     private showDomainStatus;
+    private collectDomainInputs;
     private recordLabel;
 }

package/dist/commands/domain/index.js

@@ -45,69 +45,22 @@ export default class Domain extends BaseCommand {
         this.log(`\n  ${'─'.repeat(53)}`);
         this.log(`  ${chalk.bold('DOMAIN SETUP')}`);
         this.log(`  ${'─'.repeat(53)}\n`);
-        let domain;
-        let senderEmail;
-        let fromName;
-        let replyTo;
-        let address;
-        if (flags.yes) {
-            domain = yamlConfig.project?.domain || '';
-            senderEmail = yamlConfig.project?.fromEmail || '';
-            fromName = yamlConfig.project?.fromName || '';
-            replyTo = yamlConfig.project?.replyTo || '';
-            address = yamlConfig.project?.address || '';
-            if (!domain) {
-                this.error('Domain is required. Set it in mailmodo.yaml or use interactive mode.');
-            }
-        }
-        else {
-            domain = await input({
-                default: yamlConfig.project?.domain,
-                message: 'What domain will you send from?',
-                validate: (v) => (v?.trim() ? true : 'Domain is required'),
-            });
-            senderEmail = await input({
-                default: yamlConfig.project?.fromEmail,
-                message: 'Sender email address:',
-                validate: (v) => v?.includes('@') ? true : 'Please enter a valid email',
-            });
-            fromName = await input({
-                default: yamlConfig.project?.fromName || '',
-                message: 'Display name (optional, shown as sender name):',
-            });
-            replyTo = await input({
-                default: yamlConfig.project?.replyTo || '',
-                message: 'Reply-to address (optional, press Enter to use sender email):',
-            });
-            address = await input({
-                default: yamlConfig.project?.address,
-                message: 'Business address (required by law):',
-                validate: (v) => (v?.trim() ? true : 'Address is required'),
-            });
-        }
-        const apiPayload = {
+        const { domain, senderEmail, address } = await this.collectDomainInputs(flags.yes, yamlConfig);
+        const response = await this.withApiSpinner({ json: flags.json, text: '  Configuring domain...' }, () => this.apiClient.post(API_ENDPOINTS.DOMAIN, {
             address,
             domain,
             fromEmail: senderEmail,
-        };
-        if (fromName)
-            apiPayload.fromName = fromName;
-        if (replyTo)
-            apiPayload.replyTo = replyTo;
-        const response = await this.withApiSpinner({ json: flags.json, text: '  Configuring domain...' }, () => this.apiClient.post(API_ENDPOINTS.DOMAIN, apiPayload));
+        }));
         if (!response.ok) {
             this.handleApiError(response);
         }
         yamlConfig.project.domain = domain;
         yamlConfig.project.fromEmail = senderEmail;
         yamlConfig.project.address = address;
-        if (fromName)
-            yamlConfig.project.fromName = fromName;
-        if (replyTo)
-            yamlConfig.project.replyTo = replyTo;
         await saveYaml(yamlConfig);
         await saveConfig({ ...config, domain });
         const records = response.data?.dnsRecords || [];
+        const guideUrl = response.data?.dnsGuideUrl ?? DNS_GUIDE_URL;
         if (flags.json) {
             this.log(JSON.stringify({ dnsRecords: records, domain }, null, 2));
             return;
@@ -120,7 +73,7 @@ export default class Domain extends BaseCommand {
             this.log(`  Value:  ${record.value}\n`);
         }
         this.log(`  DNS changes take 5–30 minutes to propagate.`);
-        this.log(`  Full guide: ${chalk.cyan(DNS_GUIDE_URL)}\n`);
+        this.log(`  Full guide: ${chalk.cyan(guideUrl)}\n`);
         if (!flags.yes) {
             const action = await input({
                 default: '',
@@ -199,6 +152,35 @@ export default class Domain extends BaseCommand {
         this.log(`  Bounce rate: ${data.bounceRate ?? 'N/A'}%`);
         this.log(`  Spam rate:   ${data.spamRate ?? 'N/A'}%\n`);
     }
+    async collectDomainInputs(skipPrompts, yamlConfig) {
+        if (skipPrompts) {
+            const domain = yamlConfig.project?.domain || '';
+            if (!domain) {
+                this.error('Domain is required. Set it in mailmodo.yaml or use interactive mode.');
+            }
+            return {
+                address: yamlConfig.project?.address || '',
+                domain,
+                senderEmail: yamlConfig.project?.fromEmail || '',
+            };
+        }
+        const domain = await input({
+            default: yamlConfig.project?.domain,
+            message: 'What domain will you send from?',
+            validate: (v) => (v?.trim() ? true : 'Domain is required'),
+        });
+        const senderEmail = await input({
+            default: yamlConfig.project?.fromEmail,
+            message: 'Sender email address:',
+            validate: (v) => (v?.includes('@') ? true : 'Please enter a valid email'),
+        });
+        const address = await input({
+            default: yamlConfig.project?.address,
+            message: 'Business address (required by law):',
+            validate: (v) => (v?.trim() ? true : 'Address is required'),
+        });
+        return { address, domain, senderEmail };
+    }
     recordLabel(index) {
         const labels = ['DKIM', 'DMARC', 'Return Path'];
         return labels[index] || `Record ${index + 1}`;

package/dist/lib/api-client.d.ts

@@ -44,6 +44,10 @@ export declare class ApiClient {
      * Bearer auth as other requests; does not parse JSON.
      */
     getFile(url: string): Promise<FileFetchResult>;
+    /**
+     * GET an external URL (e.g. blob storage) without auth headers.
+     */
+    getPublicFile(url: string): Promise<FileFetchResult>;
     patch<T = Record<string, unknown>>(path: string, body?: Record<string, unknown>): Promise<ApiResponse<T>>;
     post<T = Record<string, unknown>>(path: string, body?: Record<string, unknown> | unknown): Promise<ApiResponse<T>>;
     postFormData<T = Record<string, unknown>>(path: string, formData: FormData): Promise<ApiResponse<T>>;

package/dist/lib/api-client.js

@@ -1,5 +1,5 @@
 import { API_BASE_URL } from './constants.js';
-import { fetchFileWithBearerAuth, } from './fetch-file.js';
+import { fetchFileNoAuth, fetchFileWithBearerAuth, } from './fetch-file.js';
 /**
  * HTTP client for the Mailmodo CLI API.
  * Wraps the native fetch API with Bearer token authentication,
@@ -123,6 +123,12 @@ export class ApiClient {
     async getFile(url) {
         return fetchFileWithBearerAuth(url, this.apiKey);
     }
+    /**
+     * GET an external URL (e.g. blob storage) without auth headers.
+     */
+    async getPublicFile(url) {
+        return fetchFileNoAuth(url);
+    }
     async patch(path, body) {
         return this.request('PATCH', path, body);
     }

package/dist/lib/constants.d.ts

@@ -5,6 +5,8 @@ export declare const API_ENDPOINTS: Readonly<{
     ASSETS_LOGO: "/assets/logo";
     AUTH_VALIDATE: "/auth/validate";
     BILLING_CAP: "/billing/cap";
+    BILLING_CHECKOUT: "/billing/checkout";
+    BILLING_PURCHASE: "/billing/purchase";
     BILLING_STATUS: "/billing/status";
     CONTACTS: "/contacts";
     CONTACTS_EXPORT: "/contacts/export";

package/dist/lib/constants.js

@@ -11,6 +11,8 @@ export const API_ENDPOINTS = Object.freeze({
     ASSETS_LOGO: '/assets/logo',
     AUTH_VALIDATE: '/auth/validate',
     BILLING_CAP: '/billing/cap',
+    BILLING_CHECKOUT: '/billing/checkout',
+    BILLING_PURCHASE: '/billing/purchase',
     BILLING_STATUS: '/billing/status',
     CONTACTS: '/contacts',
     CONTACTS_EXPORT: '/contacts/export',

package/dist/lib/fetch-file.d.ts

@@ -12,3 +12,7 @@ export interface FileFetchResult {
  * does not parse JSON.
  */
 export declare function fetchFileWithBearerAuth(url: string, apiKey: string): Promise<FileFetchResult>;
+/**
+ * GET an absolute external URL (e.g. blob storage) without auth headers.
+ */
+export declare function fetchFileNoAuth(url: string): Promise<FileFetchResult>;

package/dist/lib/fetch-file.js

@@ -1,31 +1,8 @@
 const USER_AGENT = '@mailmodo/cli';
-/**
- * GET an absolute URL and return the raw body (e.g. CSV). Uses Bearer auth;
- * does not parse JSON.
- */
-export async function fetchFileWithBearerAuth(url, apiKey) {
-    let href;
-    try {
-        href = new URL(url.trim()).toString();
-    }
-    catch {
-        return {
-            body: new ArrayBuffer(0),
-            debug: { fullUrl: url.trim() },
-            error: 'Invalid URL',
-            ok: false,
-            status: 0,
-        };
-    }
+async function doFetch(href, headers) {
     const debug = { fullUrl: href };
     try {
-        const response = await fetch(href, {
-            headers: {
-                Authorization: `Bearer ${apiKey}`,
-                'User-Agent': USER_AGENT,
-            },
-            method: 'GET',
-        });
+        const response = await fetch(href, { headers, method: 'GET' });
         const body = await response.arrayBuffer();
         if (!response.ok) {
             return {
@@ -49,3 +26,47 @@ export async function fetchFileWithBearerAuth(url, apiKey) {
         };
     }
 }
+function parseUrl(url) {
+    try {
+        return new URL(url.trim()).toString();
+    }
+    catch {
+        return null;
+    }
+}
+/**
+ * GET an absolute URL and return the raw body (e.g. CSV). Uses Bearer auth;
+ * does not parse JSON.
+ */
+export async function fetchFileWithBearerAuth(url, apiKey) {
+    const href = parseUrl(url);
+    if (!href) {
+        return {
+            body: new ArrayBuffer(0),
+            debug: { fullUrl: url.trim() },
+            error: 'Invalid URL',
+            ok: false,
+            status: 0,
+        };
+    }
+    return doFetch(href, {
+        Authorization: `Bearer ${apiKey}`,
+        'User-Agent': USER_AGENT,
+    });
+}
+/**
+ * GET an absolute external URL (e.g. blob storage) without auth headers.
+ */
+export async function fetchFileNoAuth(url) {
+    const href = parseUrl(url);
+    if (!href) {
+        return {
+            body: new ArrayBuffer(0),
+            debug: { fullUrl: url.trim() },
+            error: 'Invalid URL',
+            ok: false,
+            status: 0,
+        };
+    }
+    return doFetch(href, { 'User-Agent': USER_AGENT });
+}

package/oclif.manifest.json

@@ -3,11 +3,14 @@
     "billing": {
       "aliases": [],
       "args": {},
-      "description": "View billing status, manage payment, and set spending cap",
+      "description": "View billing status, purchase blocks, set cap, or add a payment method",
       "examples": [
         "<%= config.bin %> billing",
         "<%= config.bin %> billing --status",
-        "<%= config.bin %> billing --cap 5"
+        "<%= config.bin %> billing --cap 5",
+        "<%= config.bin %> billing --cap 5 --auto-charge-block-count 2",
+        "<%= config.bin %> billing --purchase 3",
+        "<%= config.bin %> billing --checkout"
       ],
       "flags": {
         "json": {
@@ -23,13 +26,33 @@
           "allowNo": false,
           "type": "boolean"
         },
+        "auto-charge-block-count": {
+          "description": "Blocks to auto-purchase when the quota runs low (use with --cap)",
+          "name": "auto-charge-block-count",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
         "cap": {
-          "description": "Set monthly block cap (max blocks to auto-charge)",
+          "description": "Set monthly sending cap in blocks",
           "name": "cap",
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
         },
+        "checkout": {
+          "description": "Open Stripe checkout to add or update a payment method",
+          "name": "checkout",
+          "allowNo": false,
+          "type": "boolean"
+        },
+        "purchase": {
+          "description": "Manually purchase this many 10,000-email blocks",
+          "name": "purchase",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
         "status": {
           "description": "Show billing status only",
           "name": "status",
@@ -419,15 +442,19 @@
         "index.js"
       ]
     },
-    "logs": {
+    "preview": {
       "aliases": [],
-      "args": {},
-      "description": "View email send logs and delivery events",
+      "args": {
+        "id": {
+          "description": "Email template ID to preview",
+          "name": "id"
+        }
+      },
+      "description": "Preview an email in browser, as text, or send a test",
       "examples": [
-        "<%= config.bin %> logs",
-        "<%= config.bin %> logs --email sarah@example.com",
-        "<%= config.bin %> logs --failed",
-        "<%= config.bin %> logs --json"
+        "<%= config.bin %> preview welcome",
+        "<%= config.bin %> preview welcome --text",
+        "<%= config.bin %> preview welcome --send me@example.com"
       ],
       "flags": {
         "json": {
@@ -443,39 +470,23 @@
           "allowNo": false,
           "type": "boolean"
         },
-        "email": {
-          "description": "Filter logs by contact email",
-          "name": "email",
+        "send": {
+          "description": "Send test email to this address",
+          "name": "send",
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
         },
-        "failed": {
-          "description": "Show only failed/bounced events",
-          "name": "failed",
+        "text": {
+          "description": "Output plain text version (for AI agents)",
+          "name": "text",
           "allowNo": false,
           "type": "boolean"
-        },
-        "limit": {
-          "description": "Entries per page (max 200)",
-          "name": "limit",
-          "default": 50,
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
-        "page": {
-          "description": "Page number",
-          "name": "page",
-          "default": 1,
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
         }
       },
       "hasDynamicHelp": false,
       "hiddenAliases": [],
-      "id": "logs",
+      "id": "preview",
       "pluginAlias": "@mailmodo/cli",
       "pluginName": "@mailmodo/cli",
       "pluginType": "core",
@@ -485,23 +496,18 @@
       "relativePath": [
         "dist",
         "commands",
-        "logs",
+        "preview",
         "index.js"
       ]
     },
-    "preview": {
+    "settings": {
       "aliases": [],
-      "args": {
-        "id": {
-          "description": "Email template ID to preview",
-          "name": "id"
-        }
-      },
-      "description": "Preview an email in browser, as text, or send a test",
+      "args": {},
+      "description": "View and update project settings",
       "examples": [
-        "<%= config.bin %> preview welcome",
-        "<%= config.bin %> preview welcome --text",
-        "<%= config.bin %> preview welcome --send me@example.com"
+        "<%= config.bin %> settings",
+        "<%= config.bin %> settings --set brand_color=#0F3460",
+        "<%= config.bin %> settings --json"
       ],
       "flags": {
         "json": {
@@ -517,23 +523,17 @@
           "allowNo": false,
           "type": "boolean"
         },
-        "send": {
-          "description": "Send test email to this address",
-          "name": "send",
+        "set": {
+          "description": "Set a setting (format: key=value)",
+          "name": "set",
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
-        },
-        "text": {
-          "description": "Output plain text version (for AI agents)",
-          "name": "text",
-          "allowNo": false,
-          "type": "boolean"
         }
       },
       "hasDynamicHelp": false,
       "hiddenAliases": [],
-      "id": "preview",
+      "id": "settings",
       "pluginAlias": "@mailmodo/cli",
       "pluginName": "@mailmodo/cli",
       "pluginType": "core",
@@ -543,17 +543,19 @@
       "relativePath": [
         "dist",
         "commands",
-        "preview",
+        "settings",
         "index.js"
       ]
     },
-    "status": {
+    "logs": {
       "aliases": [],
       "args": {},
-      "description": "View email performance metrics and quota usage",
+      "description": "View email send logs and delivery events",
       "examples": [
-        "<%= config.bin %> status",
-        "<%= config.bin %> status --json"
+        "<%= config.bin %> logs",
+        "<%= config.bin %> logs --email sarah@example.com",
+        "<%= config.bin %> logs --failed",
+        "<%= config.bin %> logs --json"
       ],
       "flags": {
         "json": {
@@ -568,11 +570,40 @@
           "name": "yes",
           "allowNo": false,
           "type": "boolean"
+        },
+        "email": {
+          "description": "Filter logs by contact email",
+          "name": "email",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "failed": {
+          "description": "Show only failed/bounced events",
+          "name": "failed",
+          "allowNo": false,
+          "type": "boolean"
+        },
+        "limit": {
+          "description": "Entries per page (max 200)",
+          "name": "limit",
+          "default": 50,
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "page": {
+          "description": "Page number",
+          "name": "page",
+          "default": 1,
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
         }
       },
       "hasDynamicHelp": false,
       "hiddenAliases": [],
-      "id": "status",
+      "id": "logs",
       "pluginAlias": "@mailmodo/cli",
       "pluginName": "@mailmodo/cli",
       "pluginType": "core",
@@ -582,18 +613,17 @@
       "relativePath": [
         "dist",
         "commands",
-        "status",
+        "logs",
         "index.js"
       ]
     },
-    "settings": {
+    "status": {
       "aliases": [],
       "args": {},
-      "description": "View and update project settings",
+      "description": "View email performance metrics and quota usage",
       "examples": [
-        "<%= config.bin %> settings",
-        "<%= config.bin %> settings --set brand_color=#0F3460",
-        "<%= config.bin %> settings --json"
+        "<%= config.bin %> status",
+        "<%= config.bin %> status --json"
       ],
       "flags": {
         "json": {
@@ -608,18 +638,11 @@
           "name": "yes",
           "allowNo": false,
           "type": "boolean"
-        },
-        "set": {
-          "description": "Set a setting (format: key=value)",
-          "name": "set",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
         }
       },
       "hasDynamicHelp": false,
       "hiddenAliases": [],
-      "id": "settings",
+      "id": "status",
       "pluginAlias": "@mailmodo/cli",
       "pluginName": "@mailmodo/cli",
       "pluginType": "core",
@@ -629,10 +652,10 @@
       "relativePath": [
         "dist",
         "commands",
-        "settings",
+        "status",
         "index.js"
       ]
     }
   },
-  "version": "0.0.26-beta.pr29.44"
+  "version": "0.0.27-beta.pr30.46"
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@mailmodo/cli",
   "description": "Email lifecycle automation for the AI-native builder generation.",
-  "version": "0.0.26-beta.pr29.44",
+  "version": "0.0.27-beta.pr30.46",
   "author": "provishalk",
   "bin": {
     "mailmodo": "bin/run.js"