@mailmodo/cli 0.0.54 → 0.0.55-beta.pr57.92

package/dist/commands/edit/index.js

@@ -1,9 +1,8 @@
 import { Args, Flags } from '@oclif/core';
-import { confirm, input, select } from '@inquirer/prompts';
-import chalk from 'chalk';
 import { BaseCommand } from '../../lib/base-command.js';
-import { API_ENDPOINTS } from '../../lib/constants.js';
-import { loadTemplate, getTemplateFilename, saveTemplate, saveYaml, } from '../../lib/yaml-config.js';
+import { getTemplateFilename, loadTemplate } from '../../lib/yaml-config.js';
+import { handleMissingTemplates } from '../../lib/templates/missing-templates.js';
+import { askChangeDescription, runEditStep, } from '../../lib/commands/edit/flow.js';
 export default class Edit extends BaseCommand {
     static args = {
         id: Args.string({
@@ -32,7 +31,7 @@ export default class Edit extends BaseCommand {
         }
         const email = yamlConfig.emails[emailIndex];
         const templateFilename = getTemplateFilename(email.id, email.style, yamlConfig.project?.emailStyle);
-        const ctx = {
+        const editCtx = {
             email,
             emailIndex,
             templateFilename,
@@ -43,247 +42,39 @@ export default class Edit extends BaseCommand {
             json: flags.json ?? false,
             yes: flags.yes ?? false,
         };
-        const initialChange = flags.change?.trim() || (await this.askChangeDescription());
-        await this.runEditStep(ctx, initialChange, editFlags);
-    }
-    async runEditStep(ctx, changeDescription, flags) {
-        const response = await this.withApiSpinner({ json: flags.json, text: '  Applying AI edits...' }, () => this.callEditApi(changeDescription, ctx.email, ctx.templateHtml));
-        if (!response.ok) {
-            this.handleAiQuotaError(response, 'edit');
-            this.handleApiError(response);
-        }
-        const updated = response.data;
-        if (flags.json) {
-            this.log(JSON.stringify(this.buildDiffPreview(ctx.email, updated, ctx.templateHtml), null, 2));
-        }
-        else {
-            this.showChangeSummary(ctx.email, updated, ctx.templateHtml);
-        }
-        if (flags.yes) {
-            await this.finalizeEdit(ctx, updated, flags);
-            return;
-        }
-        await this.handleUserAction(ctx, updated, changeDescription, flags);
-    }
-    async handleUserAction(ctx, updated, changeDescription, flags) {
-        this.log('');
-        const action = await this.promptEditAction();
-        if (action === 'skip') {
-            this.log('\n  Changes discarded.\n');
-            return;
-        }
-        if (action === 'retry') {
-            const newChange = await this.askChangeDescription();
-            await this.runEditStep(ctx, newChange, flags);
-            return;
-        }
-        await this.finalizeEdit(ctx, updated, flags);
-    }
-    callEditApi(changeDescription, email, templateHtml) {
-        return this.apiClient.post(API_ENDPOINTS.EDIT, {
-            changeRequest: changeDescription,
-            currentEmail: {
-                condition: email.condition,
-                goal: email.goal,
-                html: templateHtml,
-                id: email.id,
-                previewText: email.previewText,
-                subject: email.subject,
-                trigger: email.trigger,
-            },
-        });
-    }
-    async finalizeEdit(ctx, updated, flags) {
-        const oldSubject = ctx.email.subject;
-        this.applyEmailChanges(ctx.email, updated);
-        await this.persistChanges(ctx, updated);
-        if (flags.json) {
-            this.logJsonResult(ctx.email, updated, oldSubject);
-        }
-        else if (flags.yes) {
-            this.log(`\n  Updated ${chalk.green('mailmodo.yaml')}\n`);
-        }
-        else {
-            await this.handleAcceptOutput(ctx.email);
-        }
-    }
-    applyEmailChanges(email, updated) {
-        if (updated.subject)
-            email.subject = updated.subject;
-        if (updated.previewText)
-            email.previewText = updated.previewText;
-        if (updated.ctaText)
-            email.ctaText = updated.ctaText;
-    }
-    async persistChanges(ctx, updated) {
-        const updatedYaml = {
-            ...ctx.yamlConfig,
-            emails: [...ctx.yamlConfig.emails],
+        if (!editCtx.templateHtml) {
+            const regenerated = await handleMissingTemplates(this.makeRegenCtx(), yamlConfig, [email.id], editFlags);
+            if (!regenerated)
+                return;
+            editCtx.templateHtml = await loadTemplate(templateFilename);
+            if (!editCtx.templateHtml)
+                this.error('Template regeneration failed.');
+        }
+        const initialChange = flags.change?.trim() || (await askChangeDescription());
+        await runEditStep(this.makeCtx(), editCtx, initialChange, editFlags);
+    }
+    makeCtx() {
+        return {
+            error: (msg) => this.error(msg),
+            exit: (code) => this.exit(code),
+            handleAiQuotaError: (r, feature) => this.handleAiQuotaError(r, feature),
+            log: (msg) => this.log(msg),
+            onApiError: (r) => this.handleApiError(r),
+            post: (path, body) => this.apiClient.post(path, body),
+            runCommand: (id, argv) => this.config.runCommand(id, argv),
+            spinner: (text, json, work) => this.withApiSpinner({ json, text }, work),
+            syncYaml: () => this.syncYamlToServer(),
         };
-        updatedYaml.emails[ctx.emailIndex] = ctx.email;
-        await saveYaml(updatedYaml);
-        if (updated.html) {
-            await saveTemplate(ctx.templateFilename, updated.html);
-        }
-    }
-    logJsonResult(email, updated, oldSubject) {
-        this.log(JSON.stringify({
-            diff: {
-                previewText: updated.previewText && updated.previewText !== email.previewText
-                    ? { new: updated.previewText, old: email.previewText }
-                    : undefined,
-                subject: oldSubject === email.subject
-                    ? undefined
-                    : { new: email.subject, old: oldSubject },
-            },
-            email,
-            status: 'updated',
-        }, null, 2));
-    }
-    async handleAcceptOutput(email) {
-        this.log(`\n  Updated ${chalk.green('mailmodo.yaml')}`);
-        const shouldPreview = await confirm({
-            default: true,
-            message: 'Preview the change?',
-        });
-        if (shouldPreview) {
-            await this.config.runCommand('preview', [email.id]);
-        }
-        else {
-            this.log(`  Run: ${chalk.cyan(`mailmodo preview ${email.id}`)}\n`);
-        }
-    }
-    async promptEditAction() {
-        return select({
-            message: 'Accept, try again, or skip?',
-            choices: [
-                { name: 'Accept', value: 'accept' },
-                { name: 'Try again', value: 'retry' },
-                { name: 'Skip', value: 'skip' },
-            ],
-        });
-    }
-    async askChangeDescription() {
-        return input({
-            message: 'What do you want to change?',
-            validate: (value) => value?.trim() ? true : 'Please describe the change',
-        });
-    }
-    showFieldDiff(label, oldVal, newVal) {
-        if (!newVal || oldVal === newVal)
-            return false;
-        this.log(`\n  ${label}:`);
-        if (oldVal)
-            this.log(`  ${chalk.red(`- ${oldVal}`)}`);
-        this.log(`  ${chalk.green(`+ ${newVal}`)}`);
-        return true;
-    }
-    stripHtml(html) {
-        return html
-            .replaceAll(/<style[^>]*>[\s\S]*?<\/style>/gi, '')
-            .replaceAll(/<script[^>]*>[\s\S]*?<\/script>/gi, '')
-            .replaceAll(/<[^>]+>/g, ' ')
-            .replaceAll('&nbsp;', ' ')
-            .replaceAll('&amp;', '&')
-            .replaceAll('&lt;', '<')
-            .replaceAll('&gt;', '>')
-            .replaceAll(/\s+/g, ' ')
-            .trim();
-    }
-    truncate(text, max) {
-        return text.length > max ? `${text.slice(0, max)}…` : text;
-    }
-    showHtmlChange(oldHtml, newHtml) {
-        if (!newHtml || oldHtml === newHtml)
-            return false;
-        this.log(`\n  HTML Body:`);
-        const MAX = 500;
-        if (oldHtml) {
-            const oldText = this.truncate(this.stripHtml(oldHtml), MAX);
-            this.log(`  ${chalk.red(`- ${oldText}`)}`);
-        }
-        const newText = this.truncate(this.stripHtml(newHtml), MAX);
-        this.log(`  ${chalk.green(`+ ${newText}`)}`);
-        return true;
-    }
-    showUnchangedField(label, value) {
-        if (!value)
-            return;
-        this.log(`\n  ${label}:`);
-        this.log(`  ${chalk.dim(value)}`);
-    }
-    showUnchangedHtml(templateHtml) {
-        if (!templateHtml)
-            return;
-        this.log(`\n  HTML Body:`);
-        this.log(`  ${chalk.dim(this.truncate(this.stripHtml(templateHtml), 500))}`);
-    }
-    showSuggestedChanges(email, updated, templateHtml, changed) {
-        this.log('\n  Suggested Changes:');
-        if (changed.subject)
-            this.showFieldDiff('Subject', email.subject, updated.subject);
-        if (changed.preview)
-            this.showFieldDiff('Preview Text', email.previewText, updated.previewText);
-        if (changed.html)
-            this.showHtmlChange(templateHtml, updated.html);
-        if (changed.cta)
-            this.showFieldDiff('CTA Text', undefined, updated.ctaText);
-        if (!changed.subject && !changed.preview && !changed.html && !changed.cta) {
-            this.log(`\n  ${chalk.dim('No changes detected.')}`);
-        }
-    }
-    showUnchanged(email, templateHtml, changed) {
-        const hasContent = !changed.subject ||
-            (!changed.preview && Boolean(email.previewText)) ||
-            (!changed.html && Boolean(templateHtml));
-        if (!hasContent)
-            return;
-        this.log('\n  Unchanged:');
-        if (!changed.subject)
-            this.showUnchangedField('Subject', email.subject);
-        if (!changed.preview)
-            this.showUnchangedField('Preview Text', email.previewText);
-        if (!changed.html)
-            this.showUnchangedHtml(templateHtml);
-    }
-    buildDiffPreview(email, updated, templateHtml) {
-        const subjectChanged = Boolean(updated.subject) && updated.subject !== email.subject;
-        const previewChanged = Boolean(updated.previewText) && updated.previewText !== email.previewText;
-        const htmlChanged = Boolean(updated.html) && updated.html !== templateHtml;
-        const diff = {};
-        diff.subject = subjectChanged
-            ? { new: updated.subject, old: email.subject }
-            : { unchanged: true, value: email.subject };
-        if (email.previewText ?? updated.previewText) {
-            diff.previewText = previewChanged
-                ? { new: updated.previewText, old: email.previewText }
-                : { unchanged: true, value: email.previewText };
-        }
-        if (templateHtml ?? updated.html) {
-            const oldText = templateHtml
-                ? this.truncate(this.stripHtml(templateHtml), 500)
-                : null;
-            const newText = updated.html
-                ? this.truncate(this.stripHtml(updated.html), 500)
-                : null;
-            diff.html = htmlChanged
-                ? { new: newText, old: oldText }
-                : { unchanged: true, value: oldText };
-        }
-        if (updated.ctaText) {
-            diff.ctaText = { new: updated.ctaText };
-        }
-        return { diff };
     }
-    showChangeSummary(email, updated, templateHtml) {
-        const changed = {
-            cta: Boolean(updated.ctaText),
-            html: Boolean(updated.html) && updated.html !== templateHtml,
-            preview: Boolean(updated.previewText) &&
-                updated.previewText !== email.previewText,
-            subject: Boolean(updated.subject) && updated.subject !== email.subject,
+    makeRegenCtx() {
+        return {
+            error: (msg) => this.error(msg),
+            exit: (code) => this.exit(code),
+            log: (msg) => this.log(msg),
+            onApiError: (r) => this.handleApiError(r),
+            post: (path, body) => this.apiClient.post(path, body),
+            spinner: (text, json, work) => this.withApiSpinner({ json, text }, work),
+            syncYaml: () => this.syncYamlToServer(),
         };
-        this.showSuggestedChanges(email, updated, templateHtml, changed);
-        this.showUnchanged(email, templateHtml, changed);
     }
 }

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

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

package/dist/commands/emails/index.js

@@ -1,9 +1,7 @@
-import { spawn } from 'node:child_process';
-import { join } from 'node:path';
 import { confirm, input } from '@inquirer/prompts';
-import chalk from 'chalk';
-import open from 'open';
 import { BaseCommand } from '../../lib/base-command.js';
+import { openTemplateInEditor } from '../../lib/commands/emails/editor.js';
+import { renderEmailDetail, renderEmailTable, } from '../../lib/commands/emails/output.js';
 export default class Emails extends BaseCommand {
     static description = 'List and view configured email sequences';
     static examples = [
@@ -17,100 +15,37 @@ export default class Emails extends BaseCommand {
         const { flags } = await this.parse(Emails);
         const yamlConfig = await this.ensureYaml();
         const { emails } = yamlConfig;
+        const ctx = this.makeCtx();
         if (flags.json) {
             this.log(JSON.stringify({ emails, total: emails.length }, null, 2));
             return;
         }
-        this.log(`\n  ${chalk.bold(String(emails.length))} emails configured in mailmodo.yaml:\n`);
-        const idColW = Math.max(...emails.map((e) => e.id.length), 'ID'.length) + 2;
-        const triggerColW = Math.max(...emails.map((e) => e.trigger.length), 'Trigger'.length) + 2;
-        const delayColW = Math.max(...emails.map((e) => String(e.delay).length), 'Delay'.length) +
-            2;
-        const hasConditions = emails.some((e) => e.condition);
-        this.log(`  ${chalk.bold('ID'.padEnd(idColW))}${chalk.bold('Trigger'.padEnd(triggerColW))}${chalk.bold('Delay'.padEnd(delayColW))}${hasConditions ? chalk.bold('Condition') : ''}`);
-        this.log(`  ${'─'.repeat(idColW + triggerColW + delayColW + (hasConditions ? 'Condition'.length : 0))}`);
-        for (const email of emails) {
-            const id = chalk.cyan(email.id.padEnd(idColW));
-            const trigger = email.trigger.padEnd(triggerColW);
-            const delay = String(email.delay).padEnd(delayColW);
-            const condition = email.condition ? chalk.dim(email.condition) : '';
-            this.log(`  ${id}${trigger}${delay}${condition}`);
-        }
-        this.log('');
-        if (!flags.yes) {
-            const templateId = await input({
-                default: 'n',
-                message: "View an email? (id or 'n'):",
-            });
-            if (templateId !== 'n') {
-                const email = emails.find((e) => e.id === templateId);
-                if (!email) {
-                    this.log(`\n  Template '${templateId}' not found.\n`);
-                    return;
-                }
-                this.log('');
-                this.log(`  ${chalk.bold('ID:')}       ${email.id}`);
-                this.log(`  ${chalk.bold('Trigger:')}  ${email.trigger}`);
-                this.log(`  ${chalk.bold('Delay:')}    ${email.delay === 0 || email.delay === '0' ? '0 (immediate)' : email.delay}`);
-                this.log(`  ${chalk.bold('Subject:')}  ${email.subject}`);
-                this.log(`  ${chalk.bold('Template:')} ${email.template}`);
-                if (email.style) {
-                    this.log(`  ${chalk.bold('Style:')}    ${email.style}`);
-                }
-                if (email.condition) {
-                    this.log(`  ${chalk.bold('Condition:')} ${email.condition}`);
-                }
-                if (email.goal) {
-                    this.log(`  ${chalk.bold('Goal:')}     ${email.goal}`);
-                }
-                this.log('');
-                const openIt = await confirm({
-                    default: true,
-                    message: 'Open template in editor?',
-                });
-                if (openIt) {
-                    await this.openTemplateInEditor(email.template);
-                }
-            }
-        }
-    }
-    async openTemplateInEditor(template) {
-        const templatePath = join(process.cwd(), template);
-        this.log(`\n  Opening ${template}...\n`);
-        const editor = process.env.VISUAL || process.env.EDITOR;
-        if (editor) {
-            const [cmd, ...editorArgs] = editor.trim().split(/\s+/);
-            const launched = await new Promise((resolve) => {
-                const child = spawn(cmd, [...editorArgs, templatePath], {
-                    stdio: 'inherit',
-                });
-                child.on('error', () => resolve(false));
-                child.on('close', () => resolve(true));
-            });
-            if (launched)
-                return;
-        }
-        if (await this.trySpawnEditor('code', templatePath))
+        renderEmailTable(ctx, emails);
+        if (flags.yes)
+            return;
+        const templateId = await input({
+            default: 'n',
+            message: "View an email? (id or 'n'):",
+        });
+        if (templateId === 'n')
+            return;
+        const email = emails.find((e) => e.id === templateId);
+        if (!email) {
+            this.log(`\n  Template '${templateId}' not found.\n`);
             return;
-        try {
-            await open(templatePath);
         }
-        catch {
-            this.log(`  ${chalk.dim(`Could not open editor. Open the file manually: ${templatePath}`)}`);
+        renderEmailDetail(ctx, email);
+        const openIt = await confirm({
+            default: true,
+            message: 'Open template in editor?',
+        });
+        if (openIt) {
+            await openTemplateInEditor(ctx, email.template);
         }
     }
-    trySpawnEditor(editor, filePath) {
-        const [cmd, args] = process.platform === 'win32'
-            ? ['cmd.exe', ['/c', editor, filePath]]
-            : [editor, [filePath]];
-        return new Promise((resolve) => {
-            const child = spawn(cmd, [...args], { stdio: 'ignore' });
-            child.on('error', () => {
-                resolve(false);
-            });
-            child.on('close', (code) => {
-                resolve(code === 0);
-            });
-        });
+    makeCtx() {
+        return {
+            log: (msg) => this.log(msg),
+        };
     }
 }

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

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