@wraps.dev/cli 2.18.3 → 2.18.4

package/dist/cli.js

@@ -8978,9 +8978,8 @@ Run ${pc27.cyan("wraps email init")} to deploy email infrastructure.
     process.exit(1);
     return;
   }
-  const emailConfig = metadata.services.email;
-  const domain = emailConfig.config.domain;
-  if (!domain) {
+  const trackedDomains = getAllTrackedDomains(metadata);
+  if (trackedDomains.length === 0) {
     progress.stop();
     clack25.log.error("No domain configured in email infrastructure");
     console.log(`
@@ -8989,6 +8988,24 @@ Run ${pc27.cyan("wraps email init")} to set up a domain.
     process.exit(1);
     return;
   }
+  let domain;
+  if (trackedDomains.length === 1) {
+    domain = trackedDomains[0].domain;
+  } else {
+    const selected = await clack25.select({
+      message: "Which domain do you want to send from?",
+      options: trackedDomains.map((d) => ({
+        value: d.domain,
+        label: d.domain,
+        hint: d.isPrimary ? "primary" : d.purpose
+      }))
+    });
+    if (clack25.isCancel(selected)) {
+      clack25.cancel("Operation cancelled.");
+      process.exit(0);
+    }
+    domain = selected;
+  }
   let toEmail = options.to;
   if (!toEmail) {
     if (isJsonMode() && !options.scenario) {
@@ -17714,12 +17731,7 @@ async function createSMTPCredentials(config2) {
         {
           Effect: "Allow",
           Action: "ses:SendRawEmail",
-          Resource: "*",
-          Condition: {
-            StringEquals: {
-              "ses:ConfigurationSetName": config2.configSetName
-            }
-          }
+          Resource: "*"
         }
       ]
     })
@@ -19749,18 +19761,17 @@ Run ${pc23.cyan("wraps email init")} first to deploy email infrastructure.
     }
     clack21.log.step(`Adding ${pc23.cyan(domain)}`);
     const sesClient = new SESv2Client4({ region });
+    let domainAlreadyExists = false;
+    let dkimTokens = [];
     try {
-      await sesClient.send(
+      const existing = await sesClient.send(
         new GetEmailIdentityCommand2({ EmailIdentity: domain })
       );
-      progress.stop();
-      clack21.log.warn(`Domain ${domain} already exists in SES`);
-      console.log(
-        `
-Run ${pc23.cyan(`wraps email domains verify --domain ${domain}`)} to check verification status.
-`
+      domainAlreadyExists = true;
+      dkimTokens = existing.DkimAttributes?.Tokens || [];
+      clack21.log.info(
+        `Domain ${pc23.cyan(domain)} already exists in SES \u2014 adopting into Wraps`
       );
-      return;
     } catch (error) {
       if (!isAWSNotFoundError(error)) {
         throw error;
@@ -19770,22 +19781,34 @@ Run ${pc23.cyan(`wraps email domains verify --domain ${domain}`)} to check verif
     if (!options.yes) {
       purpose = await promptDomainPurpose();
     }
-    const { CreateEmailIdentityCommand } = await import("@aws-sdk/client-sesv2");
-    await progress.execute("Creating SES identity", async () => {
-      await sesClient.send(
-        new CreateEmailIdentityCommand({
-          EmailIdentity: domain,
-          ConfigurationSetName: "wraps-email-tracking",
-          DkimSigningAttributes: {
-            NextSigningKeyLength: "RSA_2048_BIT"
-          }
-        })
+    if (domainAlreadyExists) {
+      const { PutEmailIdentityConfigurationSetAttributesCommand } = await import("@aws-sdk/client-sesv2");
+      await progress.execute("Associating tracking configuration", async () => {
+        await sesClient.send(
+          new PutEmailIdentityConfigurationSetAttributesCommand({
+            EmailIdentity: domain,
+            ConfigurationSetName: "wraps-email-tracking"
+          })
+        );
+      });
+    } else {
+      const { CreateEmailIdentityCommand } = await import("@aws-sdk/client-sesv2");
+      await progress.execute("Creating SES identity", async () => {
+        await sesClient.send(
+          new CreateEmailIdentityCommand({
+            EmailIdentity: domain,
+            ConfigurationSetName: "wraps-email-tracking",
+            DkimSigningAttributes: {
+              NextSigningKeyLength: "RSA_2048_BIT"
+            }
+          })
+        );
+      });
+      const sesIdentity = await sesClient.send(
+        new GetEmailIdentityCommand2({ EmailIdentity: domain })
       );
-    });
-    const sesIdentity = await sesClient.send(
-      new GetEmailIdentityCommand2({ EmailIdentity: domain })
-    );
-    const dkimTokens = sesIdentity.DkimAttributes?.Tokens || [];
+      dkimTokens = sesIdentity.DkimAttributes?.Tokens || [];
+    }
     let mailFromDomain;
     if (options.yes) {
       mailFromDomain = `mail.${domain}`;
@@ -20477,12 +20500,30 @@ async function inboundInit(options) {
   if (!metadata?.services?.email) {
     throw errors.inboundRequiresOutbound();
   }
-  const emailService = metadata.services.email;
-  const emailConfig = emailService.config;
-  const domain = emailConfig.domain;
-  if (!domain) {
+  const trackedDomains = getAllTrackedDomains(metadata);
+  if (trackedDomains.length === 0) {
     throw errors.inboundRequiresOutbound();
   }
+  let domain;
+  if (trackedDomains.length === 1) {
+    domain = trackedDomains[0].domain;
+  } else {
+    const selected = await clack22.select({
+      message: "Which domain do you want to receive email on?",
+      options: trackedDomains.map((d) => ({
+        value: d.domain,
+        label: d.domain,
+        hint: d.isPrimary ? "primary" : d.purpose
+      }))
+    });
+    if (clack22.isCancel(selected)) {
+      clack22.cancel("Operation cancelled.");
+      process.exit(0);
+    }
+    domain = selected;
+  }
+  const emailService = metadata.services.email;
+  const emailConfig = emailService.config;
   const subdomain = options.root ? "" : options.subdomain ?? (options.yes ? "inbound" : await promptInboundSubdomain(domain));
   const receivingDomain = subdomain ? `${subdomain}.${domain}` : domain;
   clack22.log.info(`Receiving domain: ${pc24.cyan(receivingDomain)}`);
@@ -21658,6 +21699,21 @@ async function init2(options) {
   if (domain) {
     emailConfig.domain = domain;
   }
+  if (domain && !options.quick && preset !== "custom") {
+    const wantsMailFrom = await clack26.confirm({
+      message: `Configure MAIL FROM for ${pc28.cyan(domain)}? ${pc28.dim("(improves DMARC alignment)")}`,
+      initialValue: true
+    });
+    if (clack26.isCancel(wantsMailFrom)) {
+      clack26.cancel("Operation cancelled.");
+      process.exit(0);
+    }
+    if (wantsMailFrom) {
+      const mailFromFull = await promptMailFromSubdomain(domain);
+      const suffix = `.${domain}`;
+      emailConfig.mailFromSubdomain = mailFromFull.endsWith(suffix) ? mailFromFull.slice(0, -suffix.length) || "mail" : "mail";
+    }
+  }
   let costSummary;
   if (!options.quick) {
     const estimatedVolume = await promptEstimatedVolume();