@mailmodo/cli 0.0.55 → 0.0.56-beta.pr58.101

package/dist/commands/settings/index.js

@@ -1,26 +1,10 @@
 import { Flags } from '@oclif/core';
-import { input, select } from '@inquirer/prompts';
 import chalk from 'chalk';
-import { existsSync } from 'node:fs';
-import { readFile } from 'node:fs/promises';
-import { resolve } from 'node:path';
 import { BaseCommand, FREE_TIER } from '../../lib/base-command.js';
-import { API_ENDPOINTS } from '../../lib/constants.js';
-import { INFO } from '../../lib/messages.js';
-import { settingKeyToProp } from '../../lib/utils.js';
 import { saveYaml } from '../../lib/yaml-config.js';
-const SETTINGS_GROUPS = Object.freeze({
-    billing: ['monthly_cap'],
-    brand: ['email_style', 'brand_color', 'logo_url', 'logo_file'],
-    domain: ['domain', 'address'],
-    identity: ['from_name', 'from_email', 'reply_to'],
-    integrations: ['webhook_url'],
-});
-const SETUP_HINTS = {
-    address: "'mailmodo domain'",
-    domain: "'mailmodo domain'",
-    monthlyCap: "'mailmodo billing --cap <n>'",
-};
+import { applySetFlag } from '../../lib/commands/settings/actions.js';
+import { displaySettingsGroup, fetchDomainVerified, SETTINGS_GROUPS, } from '../../lib/commands/settings/display.js';
+import { promptEditSetting } from '../../lib/commands/settings/prompt.js';
 export default class Settings extends BaseCommand {
     static description = 'View and update project settings';
     static examples = [
@@ -35,14 +19,18 @@ export default class Settings extends BaseCommand {
     async run() {
         const { flags } = await this.parse(Settings);
         const yamlConfig = await this.ensureYaml();
+        const ctx = this.makeCtx();
         if (flags.set) {
-            await this.applySetFlag(flags.set, yamlConfig, flags.json ?? false);
+            await applySetFlag(ctx, yamlConfig, {
+                isJson: flags.json ?? false,
+                setFlag: flags.set,
+            });
             return;
         }
         const [domainVerified, billingStatus] = await Promise.all([
             flags.json
                 ? Promise.resolve(null)
-                : this.fetchDomainVerified(yamlConfig.project.domain),
+                : fetchDomainVerified(ctx, yamlConfig.project.domain),
             this.fetchBillingStatus(),
         ]);
         const tier = billingStatus?.tier ?? null;
@@ -60,235 +48,35 @@ export default class Settings extends BaseCommand {
         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, tier);
-        }
-    }
-    async applySetFlag(setFlag, yamlConfig, isJson) {
-        const { project } = yamlConfig;
-        const eqIndex = setFlag.indexOf('=');
-        if (eqIndex === -1) {
-            this.error('Invalid format. Use --set key=value (e.g., --set brand_color=#0F3460)');
-        }
-        const key = setFlag.slice(0, eqIndex).trim();
-        const propKey = settingKeyToProp(key);
-        const value = setFlag.slice(eqIndex + 1).trim();
-        if (!(propKey in project) && key !== 'logo_file') {
-            this.error(`Unknown setting: ${key}`);
-        }
-        if (propKey === 'monthlyCap') {
-            await this.applyMonthlyCapChange(yamlConfig, value, isJson, null);
-            return;
-        }
-        project[propKey] = value;
-        await saveYaml(yamlConfig);
-        await this.syncYamlToServer();
-        if (isJson) {
-            this.log(JSON.stringify({ [propKey]: value, status: 'updated' }, null, 2));
-            return;
-        }
-        this.log(`\n  ${chalk.green('✓')} ${key} updated to ${chalk.cyan(value)}`);
-        this.log(`  ${INFO.DEPLOY_TO_APPLY}\n`);
-    }
-    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);
-        await this.syncYamlToServer();
-        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')
-                return true;
-            return settingKeyToProp(key) in project;
-        });
-        const groupTitle = `  ${chalk.bold(group.charAt(0).toUpperCase() + group.slice(1))}`;
-        if (availableKeys.length === 0) {
-            const hint = SETUP_HINTS[settingKeyToProp(keys[0])];
-            if (hint) {
-                this.log(groupTitle);
-                this.log(`  ${'─'.repeat(49)}`);
-                this.log(`  ${chalk.dim(`Run ${hint} to configure.`)}`);
-                this.log('');
-            }
-            return;
-        }
-        this.log(groupTitle);
-        this.log(`  ${'─'.repeat(49)}`);
-        for (const key of availableKeys) {
-            const propKey = settingKeyToProp(key);
-            const value = project[propKey];
-            let displayValue = value ? String(value) : chalk.dim('(not set)');
-            if (key === 'domain' && value && domainVerified === true) {
-                displayValue += `  ${chalk.green('✓ verified')}`;
-            }
-            else if (key === 'domain' && value && domainVerified === false) {
-                displayValue += `  ${chalk.red('✗ not verified')}`;
-            }
-            this.log(`  ${key.padEnd(16)} ${displayValue}`);
-        }
-        const missingKeys = keys.filter((key) => !(settingKeyToProp(key) in project) &&
-            !(group === 'brand' && key === 'logo_file'));
-        for (const key of missingKeys) {
-            const hint = SETUP_HINTS[settingKeyToProp(key)];
-            if (hint) {
-                this.log(`  ${key.padEnd(16)} ${chalk.dim(`(run ${hint} to set up)`)}`);
-            }
-        }
-        this.log('');
-    }
-    /**
-     * Prompts the user to pick a setting key to edit and dispatches
-     * to the appropriate handler for that key.
-     */
-    async promptEditSetting(yamlConfig, tier) {
-        const { project } = yamlConfig;
-        const editKey = await input({
-            default: 'n',
-            message: "Edit a setting? (key or 'n'):",
-        });
-        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') {
-                await this.handleLogoUpload(yamlConfig);
-                return;
-            }
-            const hint = SETUP_HINTS[editPropKey];
-            if (hint) {
-                this.log(`\n  ${editKey} is not configured yet. Run ${chalk.cyan(hint)} to set it up.\n`);
-            }
-            else {
-                this.log(`\n  Unknown setting: ${editKey}\n`);
-            }
-            return;
-        }
-        if (editKey === 'logo_file') {
-            await this.handleLogoUpload(yamlConfig);
-            return;
-        }
-        if (editKey === 'domain') {
-            await this.handleDomainChange(yamlConfig);
-            return;
-        }
-        if (editKey === 'monthly_cap') {
-            const newValue = await input({
-                message: 'New monthly cap (blocks):',
-            });
-            await this.applyMonthlyCapChange(yamlConfig, newValue, false, tier);
-            return;
-        }
-        if (editKey === 'email_style') {
-            const style = await select({
-                choices: [
-                    { name: 'plain', value: 'plain' },
-                    { name: 'branded', value: 'branded' },
-                ],
-                message: 'Email style:',
+            displaySettingsGroup(ctx, group, {
+                domainVerified,
+                keys,
+                project: yamlConfig.project,
             });
-            project.emailStyle = style;
-            await saveYaml(yamlConfig);
-            await this.syncYamlToServer();
-            this.log(`\n  ${chalk.green('✓')} email_style updated to ${chalk.cyan(style)}`);
-            this.log(`  ${INFO.DEPLOY_TO_APPLY}\n`);
-            return;
-        }
-        const newValue = await input({
-            message: `New value for ${editKey}:`,
-        });
-        project[editPropKey] = newValue;
-        await saveYaml(yamlConfig);
-        await this.syncYamlToServer();
-        this.log(`\n  ${chalk.green('✓')} Updated. ${INFO.DEPLOY_TO_APPLY}\n`);
-    }
-    /**
-     * Fetches the domain verification status from the API.
-     * Returns true/false for verified/unverified, or null if unavailable.
-     */
-    async fetchDomainVerified(domain) {
-        if (!domain)
-            return null;
-        try {
-            await this.ensureAuth();
-            const response = await this.apiClient.get(API_ENDPOINTS.DOMAIN_STATUS, { domain });
-            if (!response.ok) {
-                this.log(`  ${chalk.dim('Could not fetch domain status. Run')} ${chalk.cyan("'mailmodo domain --status'")} ${chalk.dim('to check manually.')}`);
-                return null;
-            }
-            return response.data?.verified === true;
         }
-        catch {
-            this.log(`  ${chalk.dim('Could not reach API for domain status. Skipping verification check.')}`);
-            return null;
+        if (!flags.yes) {
+            await promptEditSetting(ctx, yamlConfig, tier);
         }
     }
-    async handleDomainChange(yamlConfig) {
-        await this.ensureAuth();
-        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.`);
-    }
-    /**
-     * Handles the logo file upload flow: validates the local file exists,
-     * reads it, uploads to Mailmodo CDN via API, and updates both logoFile
-     * and logoUrl in the project config.
-     *
-     * @param {import('../../lib/yaml-config.js').MailmodoYaml} yamlConfig - The full YAML config to update and save.
-     */
-    async handleLogoUpload(yamlConfig) {
-        const logoPath = await input({ message: 'Path to logo file:' });
-        const resolvedPath = resolve(logoPath);
-        if (!existsSync(resolvedPath)) {
-            this.log(`\n  File not found: ${resolvedPath}\n`);
-            return;
-        }
-        await this.ensureAuth();
-        const fileBuffer = await readFile(resolvedPath);
-        const ext = resolvedPath.split('.').pop()?.toLowerCase();
-        const mimeTypes = {
-            png: 'image/png',
-            jpg: 'image/jpeg',
-            jpeg: 'image/jpeg',
-            svg: 'image/svg+xml',
+    makeCtx() {
+        return {
+            applyBillingCap: (opts) => this.applyBillingCap(opts),
+            collectDomainInputs: (yaml, skip) => this.collectDomainSetupInputs(yaml, skip),
+            ensureAuth: async () => {
+                await this.ensureAuth();
+            },
+            error: (msg) => this.error(msg),
+            fetchBillingStatus: () => this.fetchBillingStatus(),
+            fetchBillingTier: () => this.fetchBillingTier(),
+            get: (path, params) => this.apiClient.get(path, params),
+            log: (msg) => this.log(msg),
+            onApiError: (r) => this.handleApiError(r),
+            postFormData: (path, formData) => this.apiClient.postFormData(path, formData),
+            registerDomainAndSave: (yaml, inputs, json) => this.registerDomain(yaml, inputs, json),
+            showDnsRecords: (records, url, json) => this.logDnsRecords(records, url, json),
+            spinner: (text, json, work) => this.withApiSpinner({ json, text }, work),
+            syncYaml: () => this.syncYamlToServer(),
+            warnFreeTierCapBlocked: (json) => this.warnFreeTierCapBlocked(json),
         };
-        const mimeType = mimeTypes[ext ?? ''] ?? 'application/octet-stream';
-        const formData = new FormData();
-        formData.append('logo', new Blob([new Uint8Array(fileBuffer)], { type: mimeType }), logoPath.split(/[/\\]/).pop() || 'logo.png');
-        const response = await this.withApiSpinner({ json: false, text: '  Uploading logo file...' }, () => this.apiClient.postFormData(API_ENDPOINTS.ASSETS_LOGO, formData));
-        if (!response.ok) {
-            this.handleApiError(response);
-        }
-        yamlConfig.project.logoUrl = response.data?.url || '';
-        yamlConfig.project.logoFile = logoPath;
-        await saveYaml(yamlConfig);
-        await this.syncYamlToServer();
-        this.log(`\n  Logo uploaded and hosted at:`);
-        this.log(`  ${chalk.cyan(String(response.data?.url))}`);
-        this.log(`  Run ${chalk.cyan("'mailmodo deploy'")} to apply to all branded emails.\n`);
     }
 }

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

@@ -7,4 +7,5 @@ export default class Status extends BaseCommand {
         yes: import("@oclif/core/interfaces").BooleanFlag<boolean>;
     };
     run(): Promise<void>;
+    private makeCtx;
 }

package/dist/commands/status/index.js

@@ -1,6 +1,6 @@
-import chalk from 'chalk';
 import { BaseCommand } from '../../lib/base-command.js';
 import { API_ENDPOINTS } from '../../lib/constants.js';
+import { logStatusOutput } from '../../lib/commands/status/output.js';
 export default class Status extends BaseCommand {
     static description = 'View email performance metrics and quota usage';
     static examples = [
@@ -13,49 +13,23 @@ export default class Status extends BaseCommand {
     async run() {
         const { flags } = await this.parse(Status);
         await this.ensureAuth();
-        const response = await this.withApiSpinner({ json: flags.json, text: '  Loading analytics...' }, () => this.apiClient.get(API_ENDPOINTS.ANALYTICS));
+        const ctx = this.makeCtx();
+        const response = await ctx.spinner('  Loading analytics...', flags.json, () => ctx.get(API_ENDPOINTS.ANALYTICS));
         if (!response.ok) {
-            this.handleApiError(response);
+            ctx.onApiError(response);
         }
-        const { emails, monthlySent, quota } = response.data;
         if (flags.json) {
             this.log(JSON.stringify(response.data, null, 2));
             return;
         }
-        this.log(`\n  ${chalk.bold('Last 7 days')}${''.padEnd(20)}Sent   Open   Click   Conv`);
-        this.log(`  ${'─'.repeat(62)}`);
-        if (emails?.length) {
-            for (const metric of emails) {
-                const id = (metric.emailId || '').padEnd(30);
-                const sent = String(metric.sent ?? 0).padEnd(7);
-                const openRate = (metric.open || '0%').padEnd(7);
-                const clickRate = (metric.click || '0%').padEnd(8);
-                const convRate = metric.conv || '0%';
-                this.log(`  ${id}${sent}${openRate}${clickRate}${convRate}`);
-            }
-        }
-        else {
-            this.log(`  ${chalk.dim('No data yet. Deploy emails first.')}`);
-        }
-        this.log('');
-        if (monthlySent !== null && monthlySent !== undefined) {
-            this.log(`  Emails sent this month:  ${chalk.bold(String(monthlySent))}`);
-        }
-        if (quota) {
-            if (quota.plan === 'free') {
-                this.log(`  Free tier remaining:     ${chalk.cyan(String(quota.freeRemaining))} emails`);
-            }
-            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 used:             ${quota.blocksUsed}`);
-            }
-        }
-        this.log('');
+        logStatusOutput(ctx, response.data);
+    }
+    makeCtx() {
+        return {
+            get: (path, params) => this.apiClient.get(path, params),
+            log: (msg) => this.log(msg),
+            onApiError: (r) => this.handleApiError(r),
+            spinner: (text, json, work) => this.withApiSpinner({ json, text }, work),
+        };
     }
 }

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

@@ -68,28 +68,56 @@ export declare abstract class BaseCommand extends Command {
      *   settings and all email sequence definitions.
      */
     protected ensureYaml(): Promise<MailmodoYaml>;
+    protected isBlankDirectory(): boolean;
+    protected fetchYamlText(): Promise<null | string>;
+    private promptBlankDirRestore;
+    protected promptInitServerRestore(flags: {
+        json?: boolean;
+        yes?: boolean;
+    }): Promise<{
+        restored: boolean;
+        serverYaml: MailmodoYaml | null;
+    }>;
     private fetchAndWriteYaml;
     /**
      * Attempts to fetch mailmodo.yaml from the server and save it locally.
      * Returns null silently on any failure so callers can fall through to an error.
      */
     private restoreYamlFromServer;
-    /**
-     * If `mailmodo.yaml` is absent from the current directory, attempts to restore
-     * it from the server using the given client. Returns `true` if the file was
-     * successfully written, `false` otherwise (file already present, server 404,
-     * or any network error). Silent — never throws.
-     *
-     * Used by `mailmodo login` right after the API key is validated so a returning
-     * user automatically gets their config back without having to run `init` again.
-     */
-    protected recoverYamlAfterLogin(client: ApiClient): Promise<boolean>;
     /**
      * Uploads the current local mailmodo.yaml to the server as a backup.
      * Best-effort: silently ignores all errors so the originating command
      * always succeeds regardless of sync failures.
      */
     protected syncYamlToServer(): Promise<void>;
+    /**
+     * Bulk-uploads all template HTML files referenced in the YAML to the server
+     * as a backup. Best-effort: silently ignores all errors so the originating
+     * command always succeeds regardless of sync failures.
+     * Called after init, deploy, and AI regeneration.
+     */
+    protected syncTemplatesToServer(yaml: MailmodoYaml): Promise<void>;
+    /**
+     * Uploads a single template's HTML files to the server for incremental sync.
+     * Best-effort: silently ignores all errors. Called after the edit command
+     * applies changes to a specific template.
+     */
+    protected syncTemplateToServer(emailId: string): Promise<void>;
+    /**
+     * Fetches a single backed-up template from the server and writes it to the
+     * local mailmodo/ folder. Returns true if the template was successfully
+     * restored, false if it is not backed up or on any error.
+     * Used as the `ctx.fetchTemplate` bridge passed to handleMissingTemplates.
+     */
+    protected getTemplateFromServer(emailId: string): Promise<boolean>;
+    /**
+     * Silently restores any template files missing from disk by fetching them
+     * from the server. Uses the bulk endpoint when all templates are missing
+     * (single round-trip), or individual per-ID requests when only a subset is
+     * missing to avoid overwriting files that are already present. Best-effort —
+     * never throws.
+     */
+    private fetchMissingTemplates;
     /**
      * Handles a failed API response by mapping HTTP status codes to
      * user-friendly error messages and exiting the process.