@mailmodo/cli 0.0.31 → 0.0.32-beta.pr34.57

package/dist/commands/billing/index.js

@@ -3,6 +3,7 @@ import chalk from 'chalk';
 import open from 'open';
 import { BaseCommand } from '../../lib/base-command.js';
 import { API_ENDPOINTS } from '../../lib/constants.js';
+import { INFO } from '../../lib/messages.js';
 export default class Billing extends BaseCommand {
     static description = 'View billing status, purchase blocks, set cap, or add a payment method';
     static examples = [
@@ -68,10 +69,10 @@ export default class Billing extends BaseCommand {
         this.log(`  ${chalk.dim(checkoutUrl)}\n`);
         try {
             await open(checkoutUrl);
-            this.log(`  Opening in browser...\n`);
+            this.log(`  ${INFO.BROWSER_OPENING}\n`);
         }
         catch {
-            this.log(`  ${chalk.dim('Could not open browser. Visit the URL above manually.')}\n`);
+            this.log(`  ${INFO.BROWSER_OPEN_FAILED}\n`);
         }
     }
     async showStatus(jsonOutput) {

package/dist/commands/deploy/index.js

@@ -2,6 +2,7 @@ import { confirm, input } from '@inquirer/prompts';
 import chalk from 'chalk';
 import { BaseCommand } from '../../lib/base-command.js';
 import { API_ENDPOINTS, DEFAULT_BRAND_COLOR, DEFAULT_MONTHLY_CAP, } from '../../lib/constants.js';
+import { ERRORS, INFO, PROMPTS, SEPARATOR, VALIDATION, } from '../../lib/messages.js';
 import { loadTemplate, saveYaml, } from '../../lib/yaml-config.js';
 export default class Deploy extends BaseCommand {
     static description = 'Deploy email sequences and verify sending domain';
@@ -50,10 +51,10 @@ export default class Deploy extends BaseCommand {
         const response = await this.withApiSpinner({ json: flags.json, text: '  Validating sequence...' }, () => this.apiClient.post(API_ENDPOINTS.SEQUENCES_VALIDATE, payload));
         if (!response.ok) {
             if (response.data.error === 'senderDomainNotFound') {
-                this.error(`Sending domain not registered. Run: ${chalk.cyan('mailmodo domain')}`);
+                this.error(ERRORS.DOMAIN_NOT_REGISTERED);
             }
             if (response.data.error === 'senderDomainNotVerified') {
-                this.error(`Sending domain not verified. Run: ${chalk.cyan('mailmodo domain --verify')}`);
+                this.error(ERRORS.DOMAIN_NOT_VERIFIED);
             }
             this.handleApiError(response);
         }
@@ -148,10 +149,9 @@ export default class Deploy extends BaseCommand {
                 message: 'Set up your sending domain now?',
             });
             if (!setupNow) {
-                this.log(`\n  Sequences saved but ${chalk.yellow('NOT deployed')}.`);
+                this.log(`\n  ${INFO.SEQUENCES_NOT_DEPLOYED}`);
                 this.log(`  Emails will not send until your domain is verified.`);
-                this.log(`  When ready, run: ${chalk.cyan('mailmodo domain')}`);
-                this.log(`  Then: ${chalk.cyan('mailmodo deploy')}\n`);
+                this.log(`  ${INFO.DOMAIN_NOT_DEPLOYED_HINT}\n`);
                 return false;
             }
         }
@@ -194,9 +194,9 @@ export default class Deploy extends BaseCommand {
     }
     logDeploySuccessInstructions(sdkSnippet) {
         this.log(`  ${chalk.green('Deployed.')} Emails are live.\n`);
-        this.log(`  ${'─'.repeat(53)}`);
+        this.log(`  ${SEPARATOR}`);
         this.log(`  ${chalk.bold('ADD THIS TO YOUR APP (one-time only):')}`);
-        this.log(`  ${'─'.repeat(53)}\n`);
+        this.log(`  ${SEPARATOR}\n`);
         this.log(`  ${chalk.cyan(sdkSnippet.install ?? 'npm install @mailmodo/sdk')}\n`);
         this.log(`  ${chalk.dim("import { track, identify } from '@mailmodo/sdk'")}\n`);
         if (sdkSnippet.examples) {
@@ -217,7 +217,7 @@ export default class Deploy extends BaseCommand {
         if (identifyCalls.length > 0)
             this.log('');
         this.log(`  Full SDK docs: ${chalk.cyan('mailmodo.com/docs/sdk')}\n`);
-        this.log(`  ${'─'.repeat(53)}\n`);
+        this.log(`  ${SEPARATOR}\n`);
     }
     async runDomainSetup(yamlConfig, flags) {
         const { address, domain, senderEmail } = await this.collectDomainInputs(yamlConfig, flags);
@@ -242,9 +242,8 @@ export default class Deploy extends BaseCommand {
             message: "Press Enter once you've added the records, or 'skip' to do this later.",
         });
         if (action.toLowerCase() === 'skip') {
-            this.log(`\n  Sequences saved but ${chalk.yellow('NOT deployed')}.`);
-            this.log(`  When ready, run: ${chalk.cyan('mailmodo domain')}`);
-            this.log(`  Then: ${chalk.cyan('mailmodo deploy')}\n`);
+            this.log(`\n  ${INFO.SEQUENCES_NOT_DEPLOYED}`);
+            this.log(`  ${INFO.DOMAIN_NOT_DEPLOYED_HINT}\n`);
             return false;
         }
         return this.verifyDomain(flags.json, domain);
@@ -257,20 +256,20 @@ export default class Deploy extends BaseCommand {
                 senderEmail: yamlConfig.project?.fromEmail || '',
             };
         }
-        this.log(`\n  ${'─'.repeat(53)}`);
+        this.log(`\n  ${SEPARATOR}`);
         this.log(`  ${chalk.bold('DOMAIN SETUP')}`);
-        this.log(`  ${'─'.repeat(53)}\n`);
+        this.log(`  ${SEPARATOR}\n`);
         const domain = await input({
-            message: 'What domain will you send from?',
-            validate: (v) => (v?.trim() ? true : 'Domain is required'),
+            message: PROMPTS.DOMAIN,
+            validate: (v) => (v?.trim() ? true : VALIDATION.DOMAIN_REQUIRED),
         });
         const senderEmail = await input({
-            message: 'Sender email address:',
-            validate: (v) => (v?.includes('@') ? true : 'Please enter a valid email'),
+            message: PROMPTS.SENDER_EMAIL,
+            validate: (v) => (v?.includes('@') ? true : VALIDATION.EMAIL_INVALID),
         });
         const address = await input({
-            message: 'Business address (required by law for email footers):',
-            validate: (v) => (v?.trim() ? true : 'Address is required'),
+            message: PROMPTS.BUSINESS_ADDRESS,
+            validate: (v) => (v?.trim() ? true : VALIDATION.ADDRESS_REQUIRED),
         });
         return { address, domain, senderEmail };
     }
@@ -284,7 +283,7 @@ export default class Deploy extends BaseCommand {
             this.log(`  Host:   ${record.host}`);
             this.log(`  Value:  ${record.value}\n`);
         }
-        this.log(`  DNS changes take 5–30 minutes to propagate.`);
+        this.log(`  ${INFO.DNS_PROPAGATION}`);
         if (dnsGuideUrl)
             this.log(`  Full guide: ${chalk.cyan(dnsGuideUrl)}\n`);
     }
@@ -305,7 +304,8 @@ export default class Deploy extends BaseCommand {
                 this.log(`\n  ${chalk.green('Domain verified.')} Continuing deploy...\n`);
             }
             else {
-                this.log(`\n  ${chalk.yellow('Some records failed.')} Fix them and run ${chalk.cyan('mailmodo domain --verify')}.`);
+                this.log(`\n  ${INFO.DNS_RECORDS_FAILED}`);
+                this.log(`\n  ${INFO.DNS_FIX_AND_VERIFY}`);
                 if (dnsGuideUrl)
                     this.log(`  Help: ${chalk.cyan(dnsGuideUrl)}\n`);
             }

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

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

package/dist/commands/domain/index.js

@@ -3,8 +3,7 @@ import { input } from '@inquirer/prompts';
 import chalk from 'chalk';
 import { BaseCommand } from '../../lib/base-command.js';
 import { API_ENDPOINTS } from '../../lib/constants.js';
-import { saveConfig } from '../../lib/config.js';
-import { saveYaml } from '../../lib/yaml-config.js';
+import { ERRORS, INFO, PROMPTS, SEPARATOR } from '../../lib/messages.js';
 export default class Domain extends BaseCommand {
     static description = 'Set up and verify your sending domain';
     static examples = [
@@ -25,83 +24,57 @@ export default class Domain extends BaseCommand {
     };
     async run() {
         const { flags } = await this.parse(Domain);
-        const config = await this.ensureAuth();
+        await this.ensureAuth();
         if (flags.verify) {
-            await this.verifyDomain(flags.json, config);
+            const yamlConfig = await this.ensureYaml();
+            const domain = yamlConfig.project?.domain;
+            if (!domain) {
+                this.error(ERRORS.DOMAIN_NOT_CONFIGURED);
+            }
+            await this.verifyDomain(flags.json, domain);
             return;
         }
         if (flags.status) {
-            await this.showDomainStatus(flags.json, config);
+            const yamlConfig = await this.ensureYaml();
+            const domain = yamlConfig.project?.domain;
+            if (!domain) {
+                this.error(ERRORS.DOMAIN_NOT_CONFIGURED);
+            }
+            await this.showDomainStatus(flags.json, domain);
             return;
         }
-        await this.setupDomain(flags, config);
+        await this.setupDomain(flags);
     }
     /**
      * Interactive domain setup: collects domain, sender email, and business address,
      * then calls the API to retrieve the required DNS records.
      */
-    async setupDomain(flags, config) {
+    async setupDomain(flags) {
         const yamlConfig = await this.ensureYaml();
-        this.log(`\n  ${'─'.repeat(53)}`);
+        this.log(`\n  ${SEPARATOR}`);
         this.log(`  ${chalk.bold('DOMAIN SETUP')}`);
-        this.log(`  ${'─'.repeat(53)}\n`);
-        const { domain, senderEmail, fromName, replyTo, address } = await this.collectDomainInputs(flags.yes, yamlConfig);
-        const apiPayload = {
-            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;
+        this.log(`  ${SEPARATOR}\n`);
+        const inputs = await this.collectDomainSetupInputs(yamlConfig, flags.yes);
+        const { dnsRecords, dnsGuideUrl } = await this.registerDomain(yamlConfig, inputs, flags.json);
         if (flags.json) {
-            this.log(JSON.stringify({ dnsRecords: records, domain }, null, 2));
+            this.log(JSON.stringify({ dnsRecords, domain: inputs.domain }, null, 2));
             return;
         }
-        this.log(`\n  Add these ${records.length} DNS records to your domain provider:\n`);
-        for (const [i, record] of records.entries()) {
-            this.log(`  ${chalk.bold(`RECORD ${i + 1} — ${this.recordLabel(i)}`)}`);
-            this.log(`  Type:   ${record.type}`);
-            this.log(`  Host:   ${record.host}`);
-            this.log(`  Value:  ${record.value}\n`);
-        }
-        this.log(`  DNS changes take 5–30 minutes to propagate.`);
-        if (guideUrl)
-            this.log(`  Full guide: ${chalk.cyan(guideUrl)}\n`);
+        this.logDnsRecords(dnsRecords, dnsGuideUrl, flags.json);
         if (!flags.yes) {
             const action = await input({
                 default: '',
-                message: "Press Enter once you've added the records, or 'skip'.",
+                message: PROMPTS.ENTER_AFTER_RECORDS,
             });
             if (action.toLowerCase() !== 'skip') {
-                await this.verifyDomain(false, { ...config, domain });
+                await this.verifyDomain(false, inputs.domain);
             }
         }
     }
     /**
      * Calls the domain verification API and displays pass/fail for each DNS record.
      */
-    async verifyDomain(jsonOutput, config) {
-        if (!config.domain) {
-            this.error(`No domain configured. Run ${chalk.cyan('mailmodo domain')} to set up your sending domain.`);
-        }
-        const domain = config.domain;
+    async verifyDomain(jsonOutput, domain) {
         const response = await this.withApiSpinner({ json: jsonOutput, text: '  Checking DNS...' }, () => this.apiClient.get(API_ENDPOINTS.DOMAIN_VERIFY, {
             domain,
         }));
@@ -121,7 +94,7 @@ export default class Domain extends BaseCommand {
             this.log(`\n  ${chalk.green('✓')} Domain verified.\n`);
         }
         else {
-            this.log(`\n  ${chalk.yellow('Some records failed.')}`);
+            this.log(`\n  ${INFO.DNS_RECORDS_FAILED}`);
             if (!dkim) {
                 this.log(`\n  DKIM common mistakes:`);
                 this.log(`  - Using TXT instead of CNAME record type`);
@@ -133,7 +106,7 @@ export default class Domain extends BaseCommand {
                 this.log(`  - Missing or incorrect CNAME for mm-bounce subdomain`);
                 this.log(`  - Cloudflare: proxy must be OFF (grey cloud, not orange)`);
             }
-            this.log(`\n  Fix the records and run ${chalk.cyan('mailmodo domain --verify')} again.`);
+            this.log(`\n  ${INFO.DNS_FIX_AND_VERIFY}`);
             if (dnsGuideUrl)
                 this.log(`  Help: ${chalk.cyan(dnsGuideUrl)}\n`);
         }
@@ -142,11 +115,7 @@ export default class Domain extends BaseCommand {
      * Displays domain health metrics including verification status,
      * bounce rate, and spam complaint rate.
      */
-    async showDomainStatus(jsonOutput, config) {
-        if (!config.domain) {
-            this.error(`No domain configured. Run ${chalk.cyan('mailmodo domain')} to set up your sending domain.`);
-        }
-        const domain = config.domain;
+    async showDomainStatus(jsonOutput, domain) {
         const response = await this.withApiSpinner({ json: jsonOutput, text: '  Loading domain status...' }, () => this.apiClient.get(API_ENDPOINTS.DOMAIN_STATUS, {
             domain,
         }));
@@ -163,47 +132,4 @@ 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,
-                fromName: yamlConfig.project?.fromName || '',
-                replyTo: yamlConfig.project?.replyTo || '',
-                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 fromName = await input({
-            default: yamlConfig.project?.fromName || '',
-            message: 'Display name (optional, shown as sender name):',
-        });
-        const replyTo = await input({
-            default: yamlConfig.project?.replyTo || '',
-            message: 'Reply-to address (optional, press Enter to use sender 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, fromName, replyTo, senderEmail };
-    }
-    recordLabel(index) {
-        const labels = ['DKIM', 'DMARC', 'Return Path'];
-        return labels[index] || `Record ${index + 1}`;
-    }
 }

package/dist/commands/login/index.js

@@ -5,6 +5,7 @@ import { BaseCommand } from '../../lib/base-command.js';
 import { ApiClient } from '../../lib/api-client.js';
 import { loadConfig, saveConfig } from '../../lib/config.js';
 import { API_ENDPOINTS, LOGIN_URL } from '../../lib/constants.js';
+import { INFO } from '../../lib/messages.js';
 export default class Login extends BaseCommand {
     static description = 'Authenticate with Mailmodo using your API key';
     static examples = [
@@ -22,10 +23,9 @@ export default class Login extends BaseCommand {
             if (existing?.apiKey) {
                 if (flags.json) {
                     this.log(JSON.stringify({
-                        accountName: existing.accountName ?? null,
                         email: existing.email ?? null,
-                        freeRemaining: existing.freeRemaining ?? null,
                         status: 'already_logged_in',
+                        totalFreeRemaining: existing.totalFreeRemaining ?? null,
                     }, null, 2));
                     return;
                 }
@@ -47,10 +47,10 @@ export default class Login extends BaseCommand {
             this.log(`\n  Get your free API key at: ${chalk.cyan(LOGIN_URL)}\n`);
             try {
                 await open(LOGIN_URL);
-                this.log('  Opening in browser...\n');
+                this.log(`  ${INFO.BROWSER_OPENING}\n`);
             }
             catch {
-                this.log(`  ${chalk.dim('Could not open browser. Visit the URL above manually.')}\n`);
+                this.log(`  ${INFO.BROWSER_OPEN_FAILED}\n`);
             }
             apiKey = await input({
                 message: 'Paste your API key:',
@@ -67,19 +67,20 @@ export default class Login extends BaseCommand {
         if (!response.ok) {
             this.handleApiError(response);
         }
-        const { accountName, email, freeRemaining } = response.data;
+        const { email, totalFreeRemaining } = response.data;
         await saveConfig({
-            accountName,
             apiKey: trimmedKey,
             email,
-            freeRemaining,
+            totalFreeRemaining,
         });
         if (flags.json) {
-            this.log(JSON.stringify({ accountName, email, freeRemaining, status: 'authenticated' }, null, 2));
+            this.log(JSON.stringify({ email, status: 'authenticated', totalFreeRemaining }, null, 2));
             return;
         }
         this.log(`\n  Logged in as ${chalk.green(email)}`);
-        this.log(`  Free tier: ${chalk.cyan(String(freeRemaining ?? 1000))} emails remaining`);
+        if (totalFreeRemaining !== null && totalFreeRemaining !== undefined) {
+            this.log(`  Free tier: ${chalk.cyan(String(totalFreeRemaining))} emails remaining`);
+        }
         this.log('  No credit card required.\n');
         this.log(`  Next: Run ${chalk.cyan("'mailmodo init'")} to generate your email sequences.\n`);
     }

package/dist/commands/preview/index.js

@@ -4,6 +4,7 @@ import chalk from 'chalk';
 import open from 'open';
 import { BaseCommand } from '../../lib/base-command.js';
 import { API_ENDPOINTS, PREVIEW_PORT } from '../../lib/constants.js';
+import { INFO } from '../../lib/messages.js';
 import { loadTemplate, getEmailStyle, getTemplateFilename, } from '../../lib/yaml-config.js';
 /* eslint-disable camelcase */
 const SAMPLE_DATA = Object.freeze({
@@ -238,7 +239,7 @@ export default class Preview extends BaseCommand {
         if (!jsonOutput) {
             this.log(`\n  Style: ${chalk.cyan(effectiveStyle)}`);
             this.log(`  Preview server at ${chalk.cyan(url)}`);
-            this.log(`  Opening in browser...\n`);
+            this.log(`  ${INFO.BROWSER_OPENING}\n`);
             this.log(`  ${chalk.dim('Press Ctrl+C to stop the preview server.')}\n`);
         }
         try {
@@ -246,7 +247,7 @@ export default class Preview extends BaseCommand {
         }
         catch {
             if (!jsonOutput) {
-                this.log(`  ${chalk.dim('Could not open browser. Visit the URL above manually.')}`);
+                this.log(`  ${INFO.BROWSER_OPEN_FAILED}`);
             }
         }
         await new Promise((resolve) => {

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

@@ -20,14 +20,7 @@ export default class Settings extends BaseCommand {
      * Returns true/false for verified/unverified, or null if unavailable.
      */
     private fetchDomainVerified;
-    /**
-     * Handles domain change: collects the new domain, sender email, and
-     * business address, calls the API to register them, displays the required
-     * DNS records, and saves the updated config. Emails won't send until the
-     * domain is re-verified.
-     */
     private handleDomainChange;
-    private recordLabel;
     /**
      * Handles the logo file upload flow: validates the local file exists,
      * reads it, uploads to Mailmodo CDN via API, and updates both logoFile

package/dist/commands/settings/index.js

@@ -6,6 +6,7 @@ import { readFile } from 'node:fs/promises';
 import { resolve } from 'node:path';
 import { BaseCommand } 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';
 const SETTINGS_GROUPS = Object.freeze({
     billing: ['monthly_cap'],
@@ -80,7 +81,7 @@ export default class Settings extends BaseCommand {
             return;
         }
         this.log(`\n  ${chalk.green('✓')} ${key} updated to ${chalk.cyan(value)}`);
-        this.log(`  Run ${chalk.cyan("'mailmodo deploy'")} to apply.\n`);
+        this.log(`  ${INFO.DEPLOY_TO_APPLY}\n`);
     }
     displaySettingsGroup(group, keys, project, domainVerified) {
         const availableKeys = keys.filter((key) => {
@@ -169,7 +170,7 @@ export default class Settings extends BaseCommand {
             project.emailStyle = style;
             await saveYaml(yamlConfig);
             this.log(`\n  ${chalk.green('✓')} email_style updated to ${chalk.cyan(style)}`);
-            this.log(`  Run ${chalk.cyan("'mailmodo deploy'")} to apply.\n`);
+            this.log(`  ${INFO.DEPLOY_TO_APPLY}\n`);
             return;
         }
         const newValue = await input({
@@ -178,7 +179,7 @@ export default class Settings extends BaseCommand {
         project[editPropKey] =
             editPropKey === 'monthlyCap' ? Number(newValue) : newValue;
         await saveYaml(yamlConfig);
-        this.log(`\n  ${chalk.green('✓')} Updated. Run ${chalk.cyan("'mailmodo deploy'")} to apply.\n`);
+        this.log(`\n  ${chalk.green('✓')} Updated. ${INFO.DEPLOY_TO_APPLY}\n`);
     }
     /**
      * Fetches the domain verification status from the API.
@@ -201,58 +202,14 @@ export default class Settings extends BaseCommand {
             return null;
         }
     }
-    /**
-     * Handles domain change: collects the new domain, sender email, and
-     * business address, calls the API to register them, displays the required
-     * DNS records, and saves the updated config. Emails won't send until the
-     * domain is re-verified.
-     */
     async handleDomainChange(yamlConfig) {
-        const newDomain = await input({
-            message: 'New domain:',
-            validate: (v) => (v?.trim() ? true : 'Domain is required'),
-        });
-        const newFromEmail = await input({
-            default: yamlConfig.project.fromEmail || '',
-            message: 'Sender email (from address):',
-            validate: (v) => (v?.includes('@') ? true : 'Please enter a valid email'),
-        });
-        const newAddress = await input({
-            default: yamlConfig.project.address || '',
-            message: 'Business address (required by law):',
-            validate: (v) => (v?.trim() ? true : 'Address is required'),
-        });
         await this.ensureAuth();
-        const response = await this.apiClient.post(API_ENDPOINTS.DOMAIN, {
-            address: newAddress,
-            domain: newDomain,
-            fromEmail: newFromEmail,
-        });
-        if (!response.ok) {
-            this.handleApiError(response);
-        }
-        const records = response.data?.dnsRecords || [];
-        const dnsGuideUrl = response.data?.dnsGuideUrl;
-        yamlConfig.project.domain = newDomain;
-        yamlConfig.project.fromEmail = newFromEmail;
-        yamlConfig.project.address = newAddress;
-        await saveYaml(yamlConfig);
-        this.log(`\n  Domain, sender email, and business address updated. You will need to re-verify.`);
-        this.log(`  New DNS records:\n`);
-        for (const [i, record] of records.entries()) {
-            this.log(`  ${chalk.bold(`RECORD ${i + 1} — ${this.recordLabel(i)}`)}`);
-            this.log(`  Type:   ${record.type}`);
-            this.log(`  Host:   ${record.host}`);
-            this.log(`  Value:  ${record.value}\n`);
-        }
+        const inputs = await this.collectDomainSetupInputs(yamlConfig, false);
+        const { dnsRecords, dnsGuideUrl } = await this.registerDomain(yamlConfig, inputs, false);
+        this.log(`\n  Domain and sender details updated. You will need to re-verify.`);
+        this.logDnsRecords(dnsRecords, dnsGuideUrl, false);
         this.log(`  Run ${chalk.cyan("'mailmodo domain --verify'")} once records are added.`);
         this.log(`  Emails will not send until the new domain is verified.`);
-        if (dnsGuideUrl)
-            this.log(`  Help: ${chalk.cyan(dnsGuideUrl)}\n`);
-    }
-    recordLabel(index) {
-        const labels = ['DKIM', 'DMARC', 'Return Path'];
-        return labels[index] || `Record ${index + 1}`;
     }
     /**
      * Handles the logo file upload flow: validates the local file exists,

package/dist/commands/status/index.js

@@ -38,13 +38,18 @@ export default class Status extends BaseCommand {
             this.log(`  ${chalk.dim('No data yet. Deploy emails first.')}`);
         }
         this.log('');
-        this.log(`  Emails sent this month:  ${chalk.bold(String(monthlySent ?? 0))}`);
+        if (monthlySent !== null && monthlySent !== undefined) {
+            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))}`);
             }
             else if (quota.blocksUsed !== undefined) {
-                this.log(`  Current paid block:      ${chalk.cyan(`${quota.currentBlockRemaining ?? 0} / 10,000 used`)}`);
+                if (quota.currentBlockRemaining !== null &&
+                    quota.currentBlockRemaining !== undefined) {
+                    this.log(`  Current paid block:      ${chalk.cyan(`${quota.currentBlockRemaining} / 10,000 used`)}`);
+                }
                 this.log(`  Blocks purchased:        ${quota.blocksUsed}`);
             }
         }

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

@@ -61,6 +61,32 @@ export declare abstract class BaseCommand extends Command {
         error?: string;
         status: number;
     }): never;
+    protected collectDomainSetupInputs(yamlConfig: MailmodoYaml, skipPrompts: boolean): Promise<{
+        address: string;
+        domain: string;
+        fromEmail: string;
+        fromName: string;
+        replyTo: string;
+    }>;
+    protected registerDomain(yamlConfig: MailmodoYaml, inputs: {
+        address: string;
+        domain: string;
+        fromEmail: string;
+        fromName?: string;
+        replyTo?: string;
+    }, json: boolean): Promise<{
+        dnsGuideUrl?: string;
+        dnsRecords: Array<{
+            host: string;
+            type: string;
+            value: string;
+        }>;
+    }>;
+    protected logDnsRecords(records: Array<{
+        host: string;
+        type: string;
+        value: string;
+    }>, guideUrl: string | undefined, json: boolean): void;
     /**
      * Builds the terminal error string for a failed API call, appending request
      * metadata when {@link ApiRequestDebugInfo} is available.

package/dist/lib/base-command.js

@@ -1,9 +1,12 @@
+import { input } from '@inquirer/prompts';
 import { Command, Flags } from '@oclif/core';
 import chalk from 'chalk';
 import ora from 'ora';
 import { ApiClient } from './api-client.js';
 import { loadConfig } from './config.js';
-import { loadYaml } from './yaml-config.js';
+import { API_ENDPOINTS } from './constants.js';
+import { ERRORS, INFO, PROMPTS, recordLabel, VALIDATION } from './messages.js';
+import { loadYaml, saveYaml } from './yaml-config.js';
 /**
  * Abstract base command providing shared functionality for all Mailmodo CLI commands.
  * Subclasses inherit --json and --yes base flags, authentication enforcement,
@@ -35,7 +38,7 @@ export class BaseCommand extends Command {
         }
         const config = await loadConfig();
         if (!config?.apiKey) {
-            this.error(`Not logged in. Run ${chalk.cyan('mailmodo login')} to authenticate.`);
+            this.error(ERRORS.NOT_LOGGED_IN);
         }
         this.apiClient = new ApiClient(config.apiKey);
         return config;
@@ -80,7 +83,7 @@ export class BaseCommand extends Command {
     async ensureYaml() {
         const config = await loadYaml();
         if (!config) {
-            this.error(`No mailmodo.yaml found. Run ${chalk.cyan('mailmodo init')} first.`);
+            this.error(ERRORS.NO_YAML);
         }
         return config;
     }
@@ -96,12 +99,92 @@ export class BaseCommand extends Command {
      */
     handleApiError(response) {
         if (response.status === 401) {
-            this.error(this.formatApiFailure(`Invalid API key. Run ${chalk.cyan('mailmodo login')} to re-authenticate.`, response));
+            this.error(this.formatApiFailure(ERRORS.INVALID_API_KEY, response));
         }
         if (response.status === 429) {
-            this.error(this.formatApiFailure('Rate limit exceeded. Please try again later.', response));
+            this.error(this.formatApiFailure(ERRORS.RATE_LIMIT, response));
         }
-        this.error(this.formatApiFailure(response.error || 'An unexpected API error occurred.', response));
+        this.error(this.formatApiFailure(response.error || ERRORS.UNEXPECTED_API, response));
+    }
+    async collectDomainSetupInputs(yamlConfig, skipPrompts) {
+        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,
+                fromEmail: yamlConfig.project?.fromEmail || '',
+                fromName: yamlConfig.project?.fromName || '',
+                replyTo: yamlConfig.project?.replyTo || '',
+            };
+        }
+        const domain = await input({
+            default: yamlConfig.project?.domain,
+            message: PROMPTS.DOMAIN,
+            validate: (v) => (v?.trim() ? true : VALIDATION.DOMAIN_REQUIRED),
+        });
+        const fromEmail = await input({
+            default: yamlConfig.project?.fromEmail,
+            message: PROMPTS.SENDER_EMAIL,
+            validate: (v) => (v?.includes('@') ? true : VALIDATION.EMAIL_INVALID),
+        });
+        const fromName = await input({
+            default: yamlConfig.project?.fromName || '',
+            message: PROMPTS.FROM_NAME,
+        });
+        const replyTo = await input({
+            default: yamlConfig.project?.replyTo || '',
+            message: PROMPTS.REPLY_TO,
+        });
+        const address = await input({
+            default: yamlConfig.project?.address,
+            message: PROMPTS.BUSINESS_ADDRESS,
+            validate: (v) => (v?.trim() ? true : VALIDATION.ADDRESS_REQUIRED),
+        });
+        return { address, domain, fromEmail, fromName, replyTo };
+    }
+    async registerDomain(yamlConfig, inputs, json) {
+        const apiPayload = {
+            address: inputs.address,
+            domain: inputs.domain,
+            fromEmail: inputs.fromEmail,
+        };
+        if (inputs.fromName)
+            apiPayload.fromName = inputs.fromName;
+        if (inputs.replyTo)
+            apiPayload.replyTo = inputs.replyTo;
+        const response = await this.withApiSpinner({ json, text: '  Configuring domain...' }, () => this.apiClient.post(API_ENDPOINTS.DOMAIN, apiPayload));
+        if (!response.ok) {
+            this.handleApiError(response);
+        }
+        yamlConfig.project.domain = inputs.domain;
+        yamlConfig.project.fromEmail = inputs.fromEmail;
+        yamlConfig.project.address = inputs.address;
+        if (inputs.fromName)
+            yamlConfig.project.fromName = inputs.fromName;
+        if (inputs.replyTo)
+            yamlConfig.project.replyTo = inputs.replyTo;
+        await saveYaml(yamlConfig);
+        return {
+            dnsGuideUrl: response.data?.dnsGuideUrl,
+            dnsRecords: response.data?.dnsRecords || [],
+        };
+    }
+    logDnsRecords(records, guideUrl, json) {
+        if (json)
+            return;
+        this.log(`\n  Add these ${records.length} DNS records to your domain provider:\n`);
+        for (const [i, record] of records.entries()) {
+            this.log(`  ${chalk.bold(`RECORD ${i + 1} — ${recordLabel(i)}`)}`);
+            this.log(`  Type:   ${record.type}`);
+            this.log(`  Host:   ${record.host}`);
+            this.log(`  Value:  ${record.value}\n`);
+        }
+        this.log(`  ${INFO.DNS_PROPAGATION}`);
+        if (guideUrl)
+            this.log(`  Full guide: ${chalk.cyan(guideUrl)}\n`);
     }
     /**
      * Builds the terminal error string for a failed API call, appending request

package/dist/lib/config.d.ts

@@ -1,16 +1,14 @@
 export interface MailmodoConfig {
-    accountName?: string;
     apiKey: string;
-    domain?: string;
     email?: string;
-    freeRemaining?: number;
+    totalFreeRemaining?: number;
 }
 /**
  * Loads the Mailmodo CLI configuration from ~/.mailmodo/config.
  * The config file stores the API key and account metadata as JSON.
  *
  * @returns {Promise<MailmodoConfig | null>} The parsed configuration object
- *   containing apiKey, email, accountName, and freeRemaining quota,
+ *   containing apiKey, email, and totalFreeRemaining quota,
  *   or null if the config file does not exist or is corrupted.
  */
 export declare function loadConfig(): Promise<MailmodoConfig | null>;
@@ -20,7 +18,7 @@ export declare function loadConfig(): Promise<MailmodoConfig | null>;
  * Overwrites any existing config file.
  *
  * @param {MailmodoConfig} config - The configuration to persist, must include
- *   at minimum an apiKey. Optional fields: email, accountName, freeRemaining.
+ *   at minimum an apiKey. Optional fields: email, totalFreeRemaining.
  */
 export declare function saveConfig(config: MailmodoConfig): Promise<void>;
 /**

package/dist/lib/config.js

@@ -9,7 +9,7 @@ const CONFIG_FILE = join(CONFIG_DIR, 'config');
  * The config file stores the API key and account metadata as JSON.
  *
  * @returns {Promise<MailmodoConfig | null>} The parsed configuration object
- *   containing apiKey, email, accountName, and freeRemaining quota,
+ *   containing apiKey, email, and totalFreeRemaining quota,
  *   or null if the config file does not exist or is corrupted.
  */
 export async function loadConfig() {
@@ -29,7 +29,7 @@ export async function loadConfig() {
  * Overwrites any existing config file.
  *
  * @param {MailmodoConfig} config - The configuration to persist, must include
- *   at minimum an apiKey. Optional fields: email, accountName, freeRemaining.
+ *   at minimum an apiKey. Optional fields: email, totalFreeRemaining.
  */
 export async function saveConfig(config) {
     if (!existsSync(CONFIG_DIR)) {

package/dist/lib/messages.d.ts

@@ -0,0 +1,36 @@
+export declare const SEPARATOR: string;
+export declare const VALIDATION: {
+    readonly ADDRESS_REQUIRED: "Address is required";
+    readonly DOMAIN_REQUIRED: "Domain is required";
+    readonly EMAIL_INVALID: "Please enter a valid email";
+};
+export declare const PROMPTS: {
+    readonly BUSINESS_ADDRESS: "Business address (required by law):";
+    readonly DOMAIN: "What domain will you send from?";
+    readonly ENTER_AFTER_RECORDS: "Press Enter once you've added the records, or 'skip'.";
+    readonly FROM_NAME: "Display name (optional, shown as sender name):";
+    readonly REPLY_TO: "Reply-to address (optional, press Enter to use sender email):";
+    readonly SENDER_EMAIL: "Sender email address:";
+};
+export declare const ERRORS: {
+    readonly DOMAIN_NOT_CONFIGURED: `No domain configured. Run ${string} to set up your sending domain.`;
+    readonly DOMAIN_NOT_REGISTERED: `Sending domain not registered. Run: ${string}`;
+    readonly DOMAIN_NOT_VERIFIED: `Sending domain not verified. Run: ${string}`;
+    readonly INVALID_API_KEY: `Invalid API key. Run ${string} to re-authenticate.`;
+    readonly NOT_LOGGED_IN: `Not logged in. Run ${string} to authenticate.`;
+    readonly NO_YAML: `No mailmodo.yaml found. Run ${string} first.`;
+    readonly RATE_LIMIT: "Rate limit exceeded. Please try again later.";
+    readonly UNEXPECTED_API: "An unexpected API error occurred.";
+};
+export declare const INFO: {
+    readonly BROWSER_OPEN_FAILED: string;
+    readonly BROWSER_OPENING: "Opening in browser...";
+    readonly DEPLOY_TO_APPLY: `Run ${string} to apply.`;
+    readonly DNS_FIX_AND_VERIFY: `Fix the records and run ${string} again.`;
+    readonly DNS_PROPAGATION: "DNS changes take 5–30 minutes to propagate.";
+    readonly DNS_RECORDS_FAILED: string;
+    readonly DOMAIN_NOT_DEPLOYED_HINT: `When ready, run: ${string}
+  Then: ${string}`;
+    readonly SEQUENCES_NOT_DEPLOYED: `Sequences saved but ${string}.`;
+};
+export declare function recordLabel(index: number): string;

package/dist/lib/messages.js

@@ -0,0 +1,39 @@
+import chalk from 'chalk';
+export const SEPARATOR = '─'.repeat(53);
+export const VALIDATION = {
+    ADDRESS_REQUIRED: 'Address is required',
+    DOMAIN_REQUIRED: 'Domain is required',
+    EMAIL_INVALID: 'Please enter a valid email',
+};
+export const PROMPTS = {
+    BUSINESS_ADDRESS: 'Business address (required by law):',
+    DOMAIN: 'What domain will you send from?',
+    ENTER_AFTER_RECORDS: "Press Enter once you've added the records, or 'skip'.",
+    FROM_NAME: 'Display name (optional, shown as sender name):',
+    REPLY_TO: 'Reply-to address (optional, press Enter to use sender email):',
+    SENDER_EMAIL: 'Sender email address:',
+};
+export const ERRORS = {
+    DOMAIN_NOT_CONFIGURED: `No domain configured. Run ${chalk.cyan('mailmodo domain')} to set up your sending domain.`,
+    DOMAIN_NOT_REGISTERED: `Sending domain not registered. Run: ${chalk.cyan('mailmodo domain')}`,
+    DOMAIN_NOT_VERIFIED: `Sending domain not verified. Run: ${chalk.cyan('mailmodo domain --verify')}`,
+    INVALID_API_KEY: `Invalid API key. Run ${chalk.cyan('mailmodo login')} to re-authenticate.`,
+    NOT_LOGGED_IN: `Not logged in. Run ${chalk.cyan('mailmodo login')} to authenticate.`,
+    NO_YAML: `No mailmodo.yaml found. Run ${chalk.cyan('mailmodo init')} first.`,
+    RATE_LIMIT: 'Rate limit exceeded. Please try again later.',
+    UNEXPECTED_API: 'An unexpected API error occurred.',
+};
+export const INFO = {
+    BROWSER_OPEN_FAILED: chalk.dim('Could not open browser. Visit the URL above manually.'),
+    BROWSER_OPENING: 'Opening in browser...',
+    DEPLOY_TO_APPLY: `Run ${chalk.cyan("'mailmodo deploy'")} to apply.`,
+    DNS_FIX_AND_VERIFY: `Fix the records and run ${chalk.cyan('mailmodo domain --verify')} again.`,
+    DNS_PROPAGATION: 'DNS changes take 5–30 minutes to propagate.',
+    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')}`,
+    SEQUENCES_NOT_DEPLOYED: `Sequences saved but ${chalk.yellow('NOT deployed')}.`,
+};
+export function recordLabel(index) {
+    const labels = ['DKIM', 'DMARC', 'Return Path'];
+    return labels[index] || `Record ${index + 1}`;
+}

package/oclif.manifest.json

@@ -228,19 +228,13 @@
         "index.js"
       ]
     },
-    "edit": {
+    "emails": {
       "aliases": [],
-      "args": {
-        "id": {
-          "description": "Email template ID to edit",
-          "name": "id",
-          "required": true
-        }
-      },
-      "description": "Edit an email using AI-assisted natural language changes",
+      "args": {},
+      "description": "List and view configured email sequences",
       "examples": [
-        "<%= config.bin %> edit welcome",
-        "<%= config.bin %> edit welcome --change \"make subject more urgent\" --yes"
+        "<%= config.bin %> emails",
+        "<%= config.bin %> emails --json"
       ],
       "flags": {
         "json": {
@@ -255,18 +249,11 @@
           "name": "yes",
           "allowNo": false,
           "type": "boolean"
-        },
-        "change": {
-          "description": "Natural language description of the change",
-          "name": "change",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
         }
       },
       "hasDynamicHelp": false,
       "hiddenAliases": [],
-      "id": "edit",
+      "id": "emails",
       "pluginAlias": "@mailmodo/cli",
       "pluginName": "@mailmodo/cli",
       "pluginType": "core",
@@ -276,7 +263,7 @@
       "relativePath": [
         "dist",
         "commands",
-        "edit",
+        "emails",
         "index.js"
       ]
     },
@@ -617,13 +604,19 @@
         "index.js"
       ]
     },
-    "emails": {
+    "edit": {
       "aliases": [],
-      "args": {},
-      "description": "List and view configured email sequences",
+      "args": {
+        "id": {
+          "description": "Email template ID to edit",
+          "name": "id",
+          "required": true
+        }
+      },
+      "description": "Edit an email using AI-assisted natural language changes",
       "examples": [
-        "<%= config.bin %> emails",
-        "<%= config.bin %> emails --json"
+        "<%= config.bin %> edit welcome",
+        "<%= config.bin %> edit welcome --change \"make subject more urgent\" --yes"
       ],
       "flags": {
         "json": {
@@ -638,11 +631,18 @@
           "name": "yes",
           "allowNo": false,
           "type": "boolean"
+        },
+        "change": {
+          "description": "Natural language description of the change",
+          "name": "change",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
         }
       },
       "hasDynamicHelp": false,
       "hiddenAliases": [],
-      "id": "emails",
+      "id": "edit",
       "pluginAlias": "@mailmodo/cli",
       "pluginName": "@mailmodo/cli",
       "pluginType": "core",
@@ -652,10 +652,10 @@
       "relativePath": [
         "dist",
         "commands",
-        "emails",
+        "edit",
         "index.js"
       ]
     }
   },
-  "version": "0.0.31"
+  "version": "0.0.32-beta.pr34.57"
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@mailmodo/cli",
   "description": "Email lifecycle automation for the AI-native builder generation.",
-  "version": "0.0.31",
+  "version": "0.0.32-beta.pr34.57",
   "author": "provishalk",
   "bin": {
     "mailmodo": "bin/run.js"