@mailmodo/cli 0.0.35 → 0.0.36-beta.pr38.61

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

@@ -19,6 +19,7 @@ export default class Billing extends BaseCommand {
     private formatCurrency;
     private formatPaymentMethod;
     private formatUsageBlock;
+    private persistMonthlyCap;
     private pluralize;
     private purchaseBlocks;
     private setCap;

package/dist/commands/billing/index.js

@@ -4,6 +4,7 @@ import open from 'open';
 import { BaseCommand } from '../../lib/base-command.js';
 import { API_ENDPOINTS } from '../../lib/constants.js';
 import { INFO } from '../../lib/messages.js';
+import { loadYaml, saveYaml } from '../../lib/yaml-config.js';
 export default class Billing extends BaseCommand {
     static description = 'View billing status, purchase blocks, set cap, or add a payment method';
     static examples = [
@@ -89,18 +90,23 @@ export default class Billing extends BaseCommand {
         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)}`);
+        if (data.tier !== 'free') {
+            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;
         }
-        this.log('  Active blocks:');
-        for (const block of data.activeBlocks) {
-            this.log(`    - ${this.formatUsageBlock(block)}`);
+        else {
+            this.log('  Active blocks:');
+            for (const block of data.activeBlocks) {
+                this.log(`    - ${this.formatUsageBlock(block)}`);
+            }
         }
         this.log('');
+        if (!data.hasPaymentMethod) {
+            await this.startCheckout(jsonOutput);
+        }
     }
     formatAutoCharge(data) {
         if (!data.autoChargeEnabled) {
@@ -112,14 +118,18 @@ export default class Billing extends BaseCommand {
         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)}`);
+        const hasBlocks = typeof cap.inBlocks === 'number';
+        const hasEmails = typeof cap.inEmails === 'number';
+        if (hasBlocks && hasEmails) {
+            return `${cap.inBlocks} ${this.pluralize('block', cap.inBlocks)} (${cap.inEmails.toLocaleString()} ${this.pluralize('email', cap.inEmails)})`;
         }
-        if (typeof cap.inEmails === 'number') {
-            parts.push(`${cap.inEmails.toLocaleString()} emails`);
+        if (hasBlocks) {
+            return `${cap.inBlocks} ${this.pluralize('block', cap.inBlocks)}`;
         }
-        return parts.length > 0 ? parts.join(' / ') : 'not set';
+        if (hasEmails) {
+            return `${cap.inEmails.toLocaleString()} ${this.pluralize('email', cap.inEmails)}`;
+        }
+        return 'not set';
     }
     formatCurrency(amount, currency) {
         const numericAmount = typeof amount === 'number' ? amount : Number.parseFloat(amount);
@@ -154,9 +164,18 @@ export default class Billing extends BaseCommand {
         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')}`
+            ? `, activated at ${new Date(block.activatedAt).toLocaleDateString('en-US')}`
             : '';
-        return `${block.type} block: ${used.toLocaleString()} / ${allowance.toLocaleString()} used (${block.status}${activationSuffix})`;
+        return `${block.type} block (${used + allowance}): ${used} ${this.pluralize('email', used)} sent, ${allowance} ${this.pluralize('email', allowance)} remaining${activationSuffix}`;
+    }
+    async persistMonthlyCap(capBlocks) {
+        const yamlConfig = await loadYaml();
+        if (!yamlConfig)
+            return;
+        if (yamlConfig.project.monthlyCap === capBlocks)
+            return;
+        yamlConfig.project.monthlyCap = capBlocks;
+        await saveYaml(yamlConfig);
     }
     pluralize(word, count) {
         return count === 1 ? word : `${word}s`;
@@ -181,29 +200,20 @@ export default class Billing extends BaseCommand {
         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);
+        const data = await this.applyBillingCap({
+            autoChargeBlockCount,
+            cap,
+            json: jsonOutput,
         });
-        if (!response.ok) {
-            this.handleApiError(response);
-        }
+        await this.persistMonthlyCap(data.capBlocks);
         if (jsonOutput) {
-            this.log(JSON.stringify(response.data, null, 2));
+            this.log(JSON.stringify(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(`\n  ${chalk.green('✓')} ${data.message}`);
+        this.log(`  Monthly cap:   ${chalk.bold(String(data.capBlocks))} ${this.pluralize('block', data.capBlocks)} (${data.capEmails.toLocaleString()} emails)`);
+        if (data.autoChargeBlockCount !== undefined) {
+            this.log(`  Auto-charge:   ${data.autoChargeBlockCount} ${this.pluralize('block', data.autoChargeBlockCount)}`);
         }
         this.log('');
     }

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

@@ -9,6 +9,7 @@ export default class Settings extends BaseCommand {
     };
     run(): Promise<void>;
     private applySetFlag;
+    private applyMonthlyCapChange;
     private displaySettingsGroup;
     /**
      * Prompts the user to pick a setting key to edit and dispatches

package/dist/commands/settings/index.js

@@ -73,8 +73,11 @@ export default class Settings extends BaseCommand {
         if (!(propKey in project) && key !== 'logo_file') {
             this.error(`Unknown setting: ${key}`);
         }
-        project[propKey] =
-            propKey === 'monthlyCap' ? Number(value) : value;
+        if (propKey === 'monthlyCap') {
+            await this.applyMonthlyCapChange(yamlConfig, value, isJson);
+            return;
+        }
+        project[propKey] = value;
         await saveYaml(yamlConfig);
         if (isJson) {
             this.log(JSON.stringify({ [propKey]: value, status: 'updated' }, null, 2));
@@ -83,6 +86,21 @@ export default class Settings extends BaseCommand {
         this.log(`\n  ${chalk.green('✓')} ${key} updated to ${chalk.cyan(value)}`);
         this.log(`  ${INFO.DEPLOY_TO_APPLY}\n`);
     }
+    async applyMonthlyCapChange(yamlConfig, rawValue, isJson) {
+        const parsed = Number(rawValue);
+        if (!Number.isInteger(parsed) || parsed < 1) {
+            this.error('monthly_cap must be a positive integer (blocks).');
+        }
+        await this.ensureAuth();
+        const data = await this.applyBillingCap({ cap: parsed, json: isJson });
+        yamlConfig.project.monthlyCap = data.capBlocks;
+        await saveYaml(yamlConfig);
+        if (isJson) {
+            this.log(JSON.stringify({ monthlyCap: data.capBlocks, status: 'updated' }, null, 2));
+            return;
+        }
+        this.log(`\n  ${chalk.green('✓')} monthly_cap updated to ${chalk.cyan(String(data.capBlocks))} (${data.capEmails.toLocaleString()} emails)\n`);
+    }
     displaySettingsGroup(group, keys, project, domainVerified) {
         const availableKeys = keys.filter((key) => {
             if (group === 'brand' && key === 'logo_file')
@@ -159,6 +177,13 @@ export default class Settings extends BaseCommand {
             await this.handleDomainChange(yamlConfig);
             return;
         }
+        if (editKey === 'monthly_cap') {
+            const newValue = await input({
+                message: 'New monthly cap (blocks):',
+            });
+            await this.applyMonthlyCapChange(yamlConfig, newValue, false);
+            return;
+        }
         if (editKey === 'email_style') {
             const style = await select({
                 choices: [
@@ -176,8 +201,7 @@ export default class Settings extends BaseCommand {
         const newValue = await input({
             message: `New value for ${editKey}:`,
         });
-        project[editPropKey] =
-            editPropKey === 'monthlyCap' ? Number(newValue) : newValue;
+        project[editPropKey] = newValue;
         await saveYaml(yamlConfig);
         this.log(`\n  ${chalk.green('✓')} Updated. ${INFO.DEPLOY_TO_APPLY}\n`);
     }

package/dist/commands/status/index.js

@@ -42,15 +42,18 @@ export default class Status extends BaseCommand {
             this.log(`  Emails sent this month:  ${chalk.bold(String(monthlySent))}`);
         }
         if (quota) {
-            if (quota.freeRemaining > 0) {
-                this.log(`  Free tier remaining:     ${chalk.cyan(String(quota.freeRemaining))}`);
+            if (quota.plan === 'free') {
+                this.log(`  Free tier remaining:     ${chalk.cyan(String(quota.freeRemaining))} emails`);
             }
-            else if (quota.blocksUsed !== undefined) {
-                if (quota.currentBlockRemaining !== null &&
-                    quota.currentBlockRemaining !== undefined) {
-                    this.log(`  Current paid block:      ${chalk.cyan(`${quota.currentBlockRemaining} / 10,000 used`)}`);
+            else if (quota.plan === 'paid') {
+                if (quota.currentBlockEmailsRemaining !== null &&
+                    quota.currentBlockEmailsRemaining !== undefined) {
+                    const { blockSize } = quota;
+                    const sent = blockSize - quota.currentBlockEmailsRemaining;
+                    const remaining = quota.currentBlockEmailsRemaining;
+                    this.log(`  Current paid block (${blockSize} emails) : ${chalk.cyan(`${sent} emails sent, ${remaining} emails remaining`)}`);
                 }
-                this.log(`  Blocks purchased:        ${quota.blocksUsed}`);
+                this.log(`  Blocks used:             ${quota.blocksUsed}`);
             }
         }
         this.log('');

package/dist/lib/base-command.d.ts

@@ -2,6 +2,12 @@ import { Command } from '@oclif/core';
 import { ApiClient, type ApiRequestDebugInfo } from './api-client.js';
 import { type MailmodoConfig } from './config.js';
 import { type MailmodoYaml } from './yaml-config.js';
+export interface BillingCapUpdateResult {
+    autoChargeBlockCount?: number;
+    capBlocks: number;
+    capEmails: number;
+    message: string;
+}
 /**
  * Abstract base command providing shared functionality for all Mailmodo CLI commands.
  * Subclasses inherit --json and --yes base flags, authentication enforcement,
@@ -68,6 +74,17 @@ export declare abstract class BaseCommand extends Command {
         fromName: string;
         replyTo: string;
     }>;
+    /**
+     * Updates the account's monthly sending cap on the server.
+     * Validates inputs, wraps the POST /billing/cap call in a spinner, and
+     * surfaces errors via handleApiError. The caller is responsible for any
+     * local persistence (e.g. writing `monthlyCap` to mailmodo.yaml).
+     */
+    protected applyBillingCap(options: {
+        autoChargeBlockCount?: number;
+        cap: number;
+        json: boolean;
+    }): Promise<BillingCapUpdateResult>;
     protected registerDomain(yamlConfig: MailmodoYaml, inputs: {
         address: string;
         domain: string;

package/dist/lib/base-command.js

@@ -145,6 +145,32 @@ export class BaseCommand extends Command {
         });
         return { address, domain, fromEmail, fromName, replyTo };
     }
+    /**
+     * Updates the account's monthly sending cap on the server.
+     * Validates inputs, wraps the POST /billing/cap call in a spinner, and
+     * surfaces errors via handleApiError. The caller is responsible for any
+     * local persistence (e.g. writing `monthlyCap` to mailmodo.yaml).
+     */
+    async applyBillingCap(options) {
+        if (options.cap < 1) {
+            this.error('Cap must be at least 1 block.');
+        }
+        if (options.autoChargeBlockCount !== undefined &&
+            options.autoChargeBlockCount < 1) {
+            this.error('Auto-charge block count must be at least 1 block.');
+        }
+        const payload = options.autoChargeBlockCount === undefined
+            ? { cap: options.cap }
+            : {
+                autoChargeBlockCount: options.autoChargeBlockCount,
+                cap: options.cap,
+            };
+        const response = await this.withApiSpinner({ json: options.json, text: '  Updating spending cap...' }, () => this.apiClient.post(API_ENDPOINTS.BILLING_CAP, payload));
+        if (!response.ok) {
+            this.handleApiError(response);
+        }
+        return response.data;
+    }
     async registerDomain(yamlConfig, inputs, json) {
         const apiPayload = {
             address: inputs.address,

package/oclif.manifest.json

@@ -657,5 +657,5 @@
       ]
     }
   },
-  "version": "0.0.35"
+  "version": "0.0.36-beta.pr38.61"
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@mailmodo/cli",
   "description": "Email lifecycle automation for the AI-native builder generation.",
-  "version": "0.0.35",
+  "version": "0.0.36-beta.pr38.61",
   "author": "provishalk",
   "bin": {
     "mailmodo": "bin/run.js"