@mailmodo/cli 0.0.30-beta.pr32.51 → 0.0.30-beta.pr32.53

package/dist/commands/edit/index.js

@@ -3,7 +3,7 @@ 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, resolveTemplateFilename, saveTemplate, saveYaml, } from '../../lib/yaml-config.js';
+import { loadTemplate, getTemplateFilename, saveTemplate, saveYaml, } from '../../lib/yaml-config.js';
 export default class Edit extends BaseCommand {
     static args = {
         id: Args.string({
@@ -31,7 +31,7 @@ export default class Edit extends BaseCommand {
             this.error(`Email '${args.id}' not found in mailmodo.yaml.`);
         }
         const email = yamlConfig.emails[emailIndex];
-        const templateFilename = resolveTemplateFilename(email.id, email.style, yamlConfig.project?.emailStyle);
+        const templateFilename = getTemplateFilename(email.id, email.style, yamlConfig.project?.emailStyle);
         const ctx = {
             email,
             emailIndex,
@@ -43,7 +43,7 @@ export default class Edit extends BaseCommand {
             json: flags.json ?? false,
             yes: flags.yes ?? false,
         };
-        const initialChange = flags.change ?? (await this.askChangeDescription());
+        const initialChange = flags.change?.trim() || (await this.askChangeDescription());
         await this.runEditStep(ctx, initialChange, editFlags);
     }
     async runEditStep(ctx, changeDescription, flags) {

package/dist/commands/emails/index.js

@@ -79,11 +79,16 @@ export default class Emails extends BaseCommand {
         this.log(`\n  Opening ${template}...\n`);
         const editor = process.env.VISUAL || process.env.EDITOR;
         if (editor) {
-            const child = spawn(editor, [templatePath], { stdio: 'inherit' });
-            await new Promise((resolve) => {
-                child.on('close', resolve);
+            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));
             });
-            return;
+            if (launched)
+                return;
         }
         if (await this.trySpawnEditor('code', templatePath))
             return;

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

@@ -23,8 +23,12 @@ export default class Preview extends BaseCommand {
      */
     private sendTestEmail;
     /**
-     * Starts a local HTTP server on PREVIEW_PORT to serve the rendered email
-     * template, then opens the user's default browser to view it.
+     * Probes ports starting at startPort and returns the first one not in use.
+     */
+    private findAvailablePort;
+    /**
+     * Starts a local HTTP server to serve the rendered email template,
+     * then opens the user's default browser to view it.
      */
     private startPreviewServer;
 }

package/dist/commands/preview/index.js

@@ -4,7 +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 { loadTemplate, resolveTemplateFilename, } from '../../lib/yaml-config.js';
+import { loadTemplate, getEmailStyle, getTemplateFilename, } from '../../lib/yaml-config.js';
 /* eslint-disable camelcase */
 const SAMPLE_DATA = Object.freeze({
     app_url: 'https://yourapp.com',
@@ -84,7 +84,8 @@ export default class Preview extends BaseCommand {
             app_url: yamlConfig.project?.url || 'https://yourapp.com', // eslint-disable-line camelcase
             product_name: yamlConfig.project?.name || 'YourApp', // eslint-disable-line camelcase
         };
-        const templateHtml = await loadTemplate(resolveTemplateFilename(email.id, email.style, yamlConfig.project?.emailStyle));
+        const effectiveStyle = getEmailStyle(email.style, yamlConfig.project?.emailStyle);
+        const templateHtml = await loadTemplate(getTemplateFilename(email.id, email.style, yamlConfig.project?.emailStyle));
         if (flags.send) {
             const rendered = templateHtml
                 ? renderTemplate(templateHtml, sampleData)
@@ -100,7 +101,10 @@ export default class Preview extends BaseCommand {
             await this.renderText(email, templateHtml, sampleData, flags.json);
             return;
         }
-        await this.startPreviewServer(email, templateHtml, sampleData, flags.json);
+        await this.startPreviewServer(email, templateHtml, sampleData, {
+            effectiveStyle,
+            jsonOutput: flags.json,
+        });
     }
     /**
      * Renders a plain text version of the email to stdout. Used by AI agents
@@ -154,10 +158,28 @@ export default class Preview extends BaseCommand {
         this.log('');
     }
     /**
-     * Starts a local HTTP server on PREVIEW_PORT to serve the rendered email
-     * template, then opens the user's default browser to view it.
+     * Probes ports starting at startPort and returns the first one not in use.
      */
-    async startPreviewServer(email, templateHtml, sampleData, jsonOutput) {
+    async findAvailablePort(startPort, endPort = startPort + 10) {
+        if (startPort > endPort) {
+            throw new Error(`No available port found starting from port ${endPort - 10}`);
+        }
+        const available = await new Promise((resolve) => {
+            const probe = createServer();
+            probe.once('error', () => resolve(false));
+            probe.once('listening', () => probe.close(() => resolve(true)));
+            probe.listen(startPort);
+        });
+        return available
+            ? startPort
+            : this.findAvailablePort(startPort + 1, endPort);
+    }
+    /**
+     * Starts a local HTTP server to serve the rendered email template,
+     * then opens the user's default browser to view it.
+     */
+    async startPreviewServer(email, templateHtml, sampleData, opts) {
+        const { effectiveStyle, jsonOutput } = opts;
         const rendered = templateHtml
             ? renderTemplate(templateHtml, sampleData)
             : '<p>No template found.</p>';
@@ -183,7 +205,7 @@ export default class Preview extends BaseCommand {
 <body>
   <div class="preview-bar">
     <h3>Mailmodo Preview — ${email.id}</h3>
-    <span>Style: ${email.style || 'branded'} · Press Ctrl+C in terminal to stop</span>
+    <span>Style: ${effectiveStyle} · Press Ctrl+C in terminal to stop</span>
   </div>
   <div class="email-frame">
     <div class="email-header">
@@ -194,11 +216,15 @@ export default class Preview extends BaseCommand {
   </div>
 </body>
 </html>`;
+        const port = await this.findAvailablePort(PREVIEW_PORT);
+        if (!jsonOutput && port !== PREVIEW_PORT) {
+            this.log(`\n  ${chalk.yellow('!')} Port ${PREVIEW_PORT} is already in use. Opening preview on port ${chalk.cyan(String(port))}.`);
+        }
         if (jsonOutput) {
             this.log(JSON.stringify({
                 id: email.id,
-                style: email.style || 'branded',
-                url: `http://localhost:${PREVIEW_PORT}`,
+                style: effectiveStyle,
+                url: `http://localhost:${port}`,
             }, null, 2));
         }
         const server = createServer((_req, res) => {
@@ -206,11 +232,11 @@ export default class Preview extends BaseCommand {
             res.end(wrapperHtml);
         });
         await new Promise((resolve) => {
-            server.listen(PREVIEW_PORT, () => resolve());
+            server.listen(port, () => resolve());
         });
-        const url = `http://localhost:${PREVIEW_PORT}`;
+        const url = `http://localhost:${port}`;
         if (!jsonOutput) {
-            this.log(`\n  Style: ${chalk.cyan(email.style || 'branded')}`);
+            this.log(`\n  Style: ${chalk.cyan(effectiveStyle)}`);
             this.log(`  Preview server at ${chalk.cyan(url)}`);
             this.log(`  Opening in browser...\n`);
             this.log(`  ${chalk.dim('Press Ctrl+C to stop the preview server.')}\n`);

package/dist/lib/yaml-config.d.ts

@@ -68,4 +68,5 @@ export declare function saveTemplate(filename: string, html: string, cwd?: strin
  *   or null if the file doesn't exist or can't be read.
  */
 export declare function loadTemplate(filename: string, cwd?: string): Promise<null | string>;
-export declare function resolveTemplateFilename(emailId: string, emailStyle?: 'branded' | 'plain', projectStyle?: 'branded' | 'plain'): string;
+export declare function getEmailStyle(emailStyle?: 'branded' | 'plain', projectStyle?: 'branded' | 'plain'): 'branded' | 'plain';
+export declare function getTemplateFilename(emailId: string, emailStyle?: 'branded' | 'plain', projectStyle?: 'branded' | 'plain'): string;

package/dist/lib/yaml-config.js

@@ -72,7 +72,10 @@ export async function loadTemplate(filename, cwd) {
         return null;
     }
 }
-export function resolveTemplateFilename(emailId, emailStyle, projectStyle) {
-    const style = emailStyle ?? projectStyle ?? 'branded';
+export function getEmailStyle(emailStyle, projectStyle) {
+    return emailStyle ?? projectStyle ?? 'branded';
+}
+export function getTemplateFilename(emailId, emailStyle, projectStyle) {
+    const style = getEmailStyle(emailStyle, projectStyle);
     return style === 'plain' ? `${emailId}_plain.html` : `${emailId}.html`;
 }

package/oclif.manifest.json

@@ -657,5 +657,5 @@
       ]
     }
   },
-  "version": "0.0.30-beta.pr32.51"
+  "version": "0.0.30-beta.pr32.53"
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@mailmodo/cli",
   "description": "Email lifecycle automation for the AI-native builder generation.",
-  "version": "0.0.30-beta.pr32.51",
+  "version": "0.0.30-beta.pr32.53",
   "author": "provishalk",
   "bin": {
     "mailmodo": "bin/run.js"