@mailmodo/cli 0.0.45 → 0.0.46-beta.pr48.74

package/dist/commands/billing/index.js

@@ -1,7 +1,7 @@
 import { Flags } from '@oclif/core';
 import chalk from 'chalk';
 import open from 'open';
-import { BaseCommand } from '../../lib/base-command.js';
+import { BaseCommand, FREE_TIER } 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';
@@ -28,7 +28,7 @@ export default class Billing extends BaseCommand {
             description: 'Open Stripe checkout to add or update a payment method',
         }),
         purchase: Flags.integer({
-            description: 'Manually purchase this many 10,000-email blocks',
+            description: 'Manually purchase email blocks',
         }),
         status: Flags.boolean({
             default: false,
@@ -200,6 +200,12 @@ export default class Billing extends BaseCommand {
         this.log('');
     }
     async setCap(cap, autoChargeBlockCount, jsonOutput) {
+        this.validateBillingCapInputs({ autoChargeBlockCount, cap });
+        const tier = await this.fetchBillingTier();
+        if (tier === FREE_TIER) {
+            this.warnFreeTierCapBlocked(jsonOutput);
+            return;
+        }
         const data = await this.applyBillingCap({
             autoChargeBlockCount,
             cap,

package/dist/commands/settings/index.js

@@ -4,7 +4,7 @@ import chalk from 'chalk';
 import { existsSync } from 'node:fs';
 import { readFile } from 'node:fs/promises';
 import { resolve } from 'node:path';
-import { BaseCommand } from '../../lib/base-command.js';
+import { BaseCommand, FREE_TIER } from '../../lib/base-command.js';
 import { API_ENDPOINTS } from '../../lib/constants.js';
 import { INFO } from '../../lib/messages.js';
 import { saveYaml } from '../../lib/yaml-config.js';
@@ -52,13 +52,18 @@ export default class Settings extends BaseCommand {
             this.log(JSON.stringify({ settings: yamlConfig.project }, null, 2));
             return;
         }
-        const domainVerified = await this.fetchDomainVerified(yamlConfig.project.domain);
+        const [domainVerified, tier] = await Promise.all([
+            this.fetchDomainVerified(yamlConfig.project.domain),
+            this.fetchBillingTier(),
+        ]);
         this.log(`\n  Current settings for ${chalk.bold(yamlConfig.project.name || 'project')}:\n`);
         for (const [group, keys] of Object.entries(SETTINGS_GROUPS)) {
+            if (group === 'billing' && tier === FREE_TIER)
+                continue;
             this.displaySettingsGroup(group, keys, yamlConfig.project, domainVerified);
         }
         if (!flags.yes) {
-            await this.promptEditSetting(yamlConfig);
+            await this.promptEditSetting(yamlConfig, tier);
         }
     }
     async applySetFlag(setFlag, yamlConfig, isJson) {
@@ -74,7 +79,7 @@ export default class Settings extends BaseCommand {
             this.error(`Unknown setting: ${key}`);
         }
         if (propKey === 'monthlyCap') {
-            await this.applyMonthlyCapChange(yamlConfig, value, isJson);
+            await this.applyMonthlyCapChange(yamlConfig, value, isJson, null);
             return;
         }
         project[propKey] = value;
@@ -86,12 +91,17 @@ 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) {
+    async applyMonthlyCapChange(yamlConfig, rawValue, isJson, knownTier) {
         const parsed = Number(rawValue);
         if (!Number.isInteger(parsed) || parsed < 1) {
             this.error('monthly_cap must be a positive integer (blocks).');
         }
         await this.ensureAuth();
+        const tier = knownTier ?? (await this.fetchBillingTier());
+        if (tier === FREE_TIER) {
+            this.warnFreeTierCapBlocked(isJson);
+            return;
+        }
         const data = await this.applyBillingCap({ cap: parsed, json: isJson });
         yamlConfig.project.monthlyCap = data.capBlocks;
         await saveYaml(yamlConfig);
@@ -146,7 +156,7 @@ export default class Settings extends BaseCommand {
      * Prompts the user to pick a setting key to edit and dispatches
      * to the appropriate handler for that key.
      */
-    async promptEditSetting(yamlConfig) {
+    async promptEditSetting(yamlConfig, tier) {
         const { project } = yamlConfig;
         const editKey = await input({
             default: 'n',
@@ -154,6 +164,10 @@ export default class Settings extends BaseCommand {
         });
         if (editKey === 'n')
             return;
+        if (editKey === 'monthly_cap' && tier === FREE_TIER) {
+            this.warnFreeTierCapBlocked(false);
+            return;
+        }
         const editPropKey = settingKeyToProp(editKey);
         if (!(editPropKey in project)) {
             if (editKey === 'logo_file') {
@@ -181,7 +195,7 @@ export default class Settings extends BaseCommand {
             const newValue = await input({
                 message: 'New monthly cap (blocks):',
             });
-            await this.applyMonthlyCapChange(yamlConfig, newValue, false);
+            await this.applyMonthlyCapChange(yamlConfig, newValue, false, tier);
             return;
         }
         if (editKey === 'email_style') {

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

@@ -8,6 +8,7 @@ export interface BillingCapUpdateResult {
     capEmails: number;
     message: string;
 }
+export declare const FREE_TIER = "free";
 /**
  * Abstract base command providing shared functionality for all Mailmodo CLI commands.
  * Subclasses inherit --json and --yes base flags, authentication enforcement,
@@ -74,6 +75,15 @@ export declare abstract class BaseCommand extends Command {
         fromName: string;
         replyTo: string;
     }>;
+    /**
+     * Validates the inputs that would be sent to `POST /billing/cap`. Extracted
+     * so callers can run cheap, no-API local checks (positive integers) before
+     * the tier lookup or any other network round trip.
+     */
+    protected validateBillingCapInputs(options: {
+        autoChargeBlockCount?: number;
+        cap: number;
+    }): void;
     /**
      * Updates the account's monthly sending cap on the server.
      * Validates inputs, wraps the POST /billing/cap call in a spinner, and
@@ -85,6 +95,21 @@ export declare abstract class BaseCommand extends Command {
         cap: number;
         json: boolean;
     }): Promise<BillingCapUpdateResult>;
+    /**
+     * Shared "free-tier users can't set a monthly cap" notice for both the
+     * billing and settings commands. Prints a yellow warning in text mode and a
+     * `status: 'blocked'` payload in JSON mode so machine-readable callers can
+     * distinguish from a successful update.
+     */
+    protected warnFreeTierCapBlocked(jsonOutput: boolean): void;
+    /**
+     * Fetches the account's billing tier from `/billing/status`. Returns `null`
+     * when the request cannot be completed (no credentials, network failure,
+     * non-OK response) so callers can degrade gracefully without halting.
+     * Callers that need a hard "free vs paid" decision should treat `null` as
+     * unknown and fall through to their default behavior.
+     */
+    protected fetchBillingTier(): Promise<null | string>;
     protected registerDomain(yamlConfig: MailmodoYaml, inputs: {
         address: string;
         domain: string;

package/dist/lib/base-command.js

@@ -7,6 +7,7 @@ import { loadConfig } from './config.js';
 import { API_ENDPOINTS } from './constants.js';
 import { ERRORS, INFO, PROMPTS, recordLabel, VALIDATION } from './messages.js';
 import { loadYaml, saveYaml } from './yaml-config.js';
+export const FREE_TIER = 'free';
 /**
  * Abstract base command providing shared functionality for all Mailmodo CLI commands.
  * Subclasses inherit --json and --yes base flags, authentication enforcement,
@@ -146,12 +147,11 @@ 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).
+     * Validates the inputs that would be sent to `POST /billing/cap`. Extracted
+     * so callers can run cheap, no-API local checks (positive integers) before
+     * the tier lookup or any other network round trip.
      */
-    async applyBillingCap(options) {
+    validateBillingCapInputs(options) {
         if (options.cap < 1) {
             this.error('Cap must be at least 1 block.');
         }
@@ -159,6 +159,15 @@ export class BaseCommand extends Command {
             options.autoChargeBlockCount < 1) {
             this.error('Auto-charge block count must be at least 1 block.');
         }
+    }
+    /**
+     * 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) {
+        this.validateBillingCapInputs(options);
         const payload = options.autoChargeBlockCount === undefined
             ? { cap: options.cap }
             : {
@@ -171,6 +180,42 @@ export class BaseCommand extends Command {
         }
         return response.data;
     }
+    /**
+     * Shared "free-tier users can't set a monthly cap" notice for both the
+     * billing and settings commands. Prints a yellow warning in text mode and a
+     * `status: 'blocked'` payload in JSON mode so machine-readable callers can
+     * distinguish from a successful update.
+     */
+    warnFreeTierCapBlocked(jsonOutput) {
+        if (jsonOutput) {
+            this.log(JSON.stringify({
+                message: INFO.FREE_TIER_CAP_BLOCKED,
+                status: 'blocked',
+                tier: FREE_TIER,
+            }, null, 2));
+            return;
+        }
+        this.warn(chalk.yellow(INFO.FREE_TIER_CAP_BLOCKED));
+    }
+    /**
+     * Fetches the account's billing tier from `/billing/status`. Returns `null`
+     * when the request cannot be completed (no credentials, network failure,
+     * non-OK response) so callers can degrade gracefully without halting.
+     * Callers that need a hard "free vs paid" decision should treat `null` as
+     * unknown and fall through to their default behavior.
+     */
+    async fetchBillingTier() {
+        try {
+            await this.ensureAuth();
+            const response = await this.apiClient.get(API_ENDPOINTS.BILLING_STATUS);
+            if (!response.ok)
+                return null;
+            return response.data?.tier ?? null;
+        }
+        catch {
+            return null;
+        }
+    }
     async registerDomain(yamlConfig, inputs, json) {
         const apiPayload = {
             address: inputs.address,

package/dist/lib/messages.d.ts

@@ -32,6 +32,7 @@ export declare const INFO: {
     readonly DOMAIN_NOT_DEPLOYED_HINT: `When ready, run: ${string}
   Then: ${string}`;
     readonly DOMAIN_PENDING_VERIFICATION: `Your domain is not verified yet. Please verify it first. Run ${string} to check the status.`;
+    readonly FREE_TIER_CAP_BLOCKED: `Monthly cap is a paid-tier setting and is not available on the free tier. Run ${string} to add a payment method, then set a cap.`;
     readonly SEQUENCES_NOT_DEPLOYED: `Sequences saved but ${string}.`;
 };
 export declare function yamlParseError(detail: string): string;

package/dist/lib/messages.js

@@ -32,6 +32,7 @@ export const INFO = {
     DNS_RECORDS_FAILED: chalk.yellow('Some records failed.'),
     DOMAIN_NOT_DEPLOYED_HINT: `When ready, run: ${chalk.cyan('mailmodo domain')}\n  Then: ${chalk.cyan('mailmodo deploy')}`,
     DOMAIN_PENDING_VERIFICATION: `Your domain is not verified yet. Please verify it first. Run ${chalk.cyan('mailmodo domain --verify')} to check the status.`,
+    FREE_TIER_CAP_BLOCKED: `Monthly cap is a paid-tier setting and is not available on the free tier. Run ${chalk.cyan("'mailmodo billing --checkout'")} to add a payment method, then set a cap.`,
     SEQUENCES_NOT_DEPLOYED: `Sequences saved but ${chalk.yellow('NOT deployed')}.`,
 };
 export function yamlParseError(detail) {

package/oclif.manifest.json

@@ -47,7 +47,7 @@
           "type": "boolean"
         },
         "purchase": {
-          "description": "Manually purchase this many 10,000-email blocks",
+          "description": "Manually purchase email blocks",
           "name": "purchase",
           "hasDynamicHelp": false,
           "multiple": false,
@@ -76,13 +76,15 @@
         "index.js"
       ]
     },
-    "deploy": {
+    "contacts": {
       "aliases": [],
       "args": {},
-      "description": "Deploy email sequences and verify sending domain",
+      "description": "Manage contacts — search, export, or delete",
       "examples": [
-        "<%= config.bin %> deploy",
-        "<%= config.bin %> deploy --yes"
+        "<%= config.bin %> contacts",
+        "<%= config.bin %> contacts --search sarah@example.com",
+        "<%= config.bin %> contacts --export   # GDPR CSV → contacts.csv",
+        "<%= config.bin %> contacts --delete sarah@example.com"
       ],
       "flags": {
         "json": {
@@ -97,11 +99,31 @@
           "name": "yes",
           "allowNo": false,
           "type": "boolean"
+        },
+        "delete": {
+          "description": "GDPR hard delete a contact by email",
+          "name": "delete",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "export": {
+          "description": "Export all contacts as GDPR-compliant CSV (writes contacts.csv in the current directory)",
+          "name": "export",
+          "allowNo": false,
+          "type": "boolean"
+        },
+        "search": {
+          "description": "Search for a contact by email",
+          "name": "search",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
         }
       },
       "hasDynamicHelp": false,
       "hiddenAliases": [],
-      "id": "deploy",
+      "id": "contacts",
       "pluginAlias": "@mailmodo/cli",
       "pluginName": "@mailmodo/cli",
       "pluginType": "core",
@@ -111,19 +133,17 @@
       "relativePath": [
         "dist",
         "commands",
-        "deploy",
+        "contacts",
         "index.js"
       ]
     },
-    "contacts": {
+    "deploy": {
       "aliases": [],
       "args": {},
-      "description": "Manage contacts — search, export, or delete",
+      "description": "Deploy email sequences and verify sending domain",
       "examples": [
-        "<%= config.bin %> contacts",
-        "<%= config.bin %> contacts --search sarah@example.com",
-        "<%= config.bin %> contacts --export   # GDPR CSV → contacts.csv",
-        "<%= config.bin %> contacts --delete sarah@example.com"
+        "<%= config.bin %> deploy",
+        "<%= config.bin %> deploy --yes"
       ],
       "flags": {
         "json": {
@@ -138,31 +158,11 @@
           "name": "yes",
           "allowNo": false,
           "type": "boolean"
-        },
-        "delete": {
-          "description": "GDPR hard delete a contact by email",
-          "name": "delete",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
-        "export": {
-          "description": "Export all contacts as GDPR-compliant CSV (writes contacts.csv in the current directory)",
-          "name": "export",
-          "allowNo": false,
-          "type": "boolean"
-        },
-        "search": {
-          "description": "Search for a contact by email",
-          "name": "search",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
         }
       },
       "hasDynamicHelp": false,
       "hiddenAliases": [],
-      "id": "contacts",
+      "id": "deploy",
       "pluginAlias": "@mailmodo/cli",
       "pluginName": "@mailmodo/cli",
       "pluginType": "core",
@@ -172,7 +172,7 @@
       "relativePath": [
         "dist",
         "commands",
-        "contacts",
+        "deploy",
         "index.js"
       ]
     },
@@ -657,5 +657,5 @@
       ]
     }
   },
-  "version": "0.0.45"
+  "version": "0.0.46-beta.pr48.74"
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@mailmodo/cli",
   "description": "Email lifecycle automation for the AI-native builder generation.",
-  "version": "0.0.45",
+  "version": "0.0.46-beta.pr48.74",
   "author": "provishalk",
   "bin": {
     "mailmodo": "bin/run.js"