agenticmail 0.5.26 → 0.5.28

package/dist/cli.js

@@ -4776,9 +4776,12 @@ async function cmdSetup() {
     }
     log2("");
     let emailOk = false;
+    let lastRelayInfo;
     while (!emailOk) {
       if (choice === "1") {
-        emailOk = await setupRelay(result.config);
+        const relayResult = await setupRelay(result.config, lastRelayInfo);
+        emailOk = relayResult.success;
+        lastRelayInfo = relayResult.info;
       } else {
         await setupDomain(result.config);
         emailOk = true;
@@ -5072,44 +5075,67 @@ async function registerWithOpenClaw(config) {
   } catch {
   }
 }
-async function setupRelay(config) {
-  log2("  Which email service do you use?");
-  log2(`    ${c2.cyan("1.")} Gmail`);
-  log2(`    ${c2.cyan("2.")} Outlook / Hotmail`);
-  log2(`    ${c2.cyan("3.")} Something else`);
-  const provChoice = await pick(`  ${c2.magenta(">")} `, ["1", "2", "3"]);
+async function setupRelay(config, previous) {
   let provider;
-  if (provChoice === "1") provider = "gmail";
-  else if (provChoice === "2") provider = "outlook";
-  else provider = "custom";
-  const email = await ask(`  ${c2.cyan("Your email address:")} `);
-  if (provider === "gmail") {
-    log2("");
-    log2(`  ${c2.dim("You'll need a Gmail App Password.")}`);
-    log2(`  ${c2.dim("1. Go to")} ${c2.cyan("https://myaccount.google.com/apppasswords")}`);
-    log2(`  ${c2.dim("2. Create an app password and copy it")}`);
-    log2(`  ${c2.dim("3. Paste it below (spaces are fine, we'll remove them)")}`);
-  } else if (provider === "outlook") {
-    log2(`  ${c2.dim("You'll need an Outlook App Password from your account security settings.")}`);
-  }
-  log2("");
+  let email;
+  let name;
   let smtpHost;
   let smtpPort;
   let imapHost;
   let imapPort;
-  if (provider === "custom") {
-    log2(`  ${c2.dim("We need your email server details (check your provider's settings):")}`);
-    smtpHost = await ask(`  ${c2.cyan("Outgoing mail server:")} `);
-    const smtpPortStr = await ask(`  ${c2.cyan("Outgoing port")} ${c2.dim("(usually 587)")}: `);
-    smtpPort = smtpPortStr ? parseInt(smtpPortStr, 10) : 587;
-    imapHost = await ask(`  ${c2.cyan("Incoming mail server:")} `);
-    const imapPortStr = await ask(`  ${c2.cyan("Incoming port")} ${c2.dim("(usually 993)")}: `);
-    imapPort = imapPortStr ? parseInt(imapPortStr, 10) : 993;
+  if (previous) {
+    log2(`  ${c2.dim("Using your previous settings:")}`);
+    log2(`    ${c2.dim("Email:")} ${c2.cyan(previous.email)}`);
+    log2(`    ${c2.dim("Agent name:")} ${c2.cyan(previous.name)}`);
+    log2("");
+    const change = await ask(`  ${c2.bold("Change these?")} ${c2.dim("(y/N)")} `);
+    if (change.toLowerCase().startsWith("y")) {
+      previous = void 0;
+    } else {
+      provider = previous.provider;
+      email = previous.email;
+      name = previous.name;
+      smtpHost = previous.smtpHost;
+      smtpPort = previous.smtpPort;
+      imapHost = previous.imapHost;
+      imapPort = previous.imapPort;
+    }
+  }
+  if (!previous) {
+    log2("  Which email service do you use?");
+    log2(`    ${c2.cyan("1.")} Gmail`);
+    log2(`    ${c2.cyan("2.")} Outlook / Hotmail`);
+    log2(`    ${c2.cyan("3.")} Something else`);
+    const provChoice = await pick(`  ${c2.magenta(">")} `, ["1", "2", "3"]);
+    if (provChoice === "1") provider = "gmail";
+    else if (provChoice === "2") provider = "outlook";
+    else provider = "custom";
+    email = await ask(`  ${c2.cyan("Your email address:")} `);
+    if (provider === "gmail") {
+      log2("");
+      log2(`  ${c2.dim("You'll need a Gmail App Password.")}`);
+      log2(`  ${c2.dim("1. Go to")} ${c2.cyan("https://myaccount.google.com/apppasswords")}`);
+      log2(`  ${c2.dim("2. Create an app password and copy it")}`);
+      log2(`  ${c2.dim("3. Paste it below (spaces are fine, we'll remove them)")}`);
+    } else if (provider === "outlook") {
+      log2(`  ${c2.dim("You'll need an Outlook App Password from your account security settings.")}`);
+    }
     log2("");
+    if (provider === "custom") {
+      log2(`  ${c2.dim("We need your email server details (check your provider's settings):")}`);
+      smtpHost = await ask(`  ${c2.cyan("Outgoing mail server:")} `);
+      const smtpPortStr = await ask(`  ${c2.cyan("Outgoing port")} ${c2.dim("(usually 587)")}: `);
+      smtpPort = smtpPortStr ? parseInt(smtpPortStr, 10) : 587;
+      imapHost = await ask(`  ${c2.cyan("Incoming mail server:")} `);
+      const imapPortStr = await ask(`  ${c2.cyan("Incoming port")} ${c2.dim("(usually 993)")}: `);
+      imapPort = imapPortStr ? parseInt(imapPortStr, 10) : 993;
+      log2("");
+    }
+    log2(`  ${c2.dim("Give your AI agent a name \u2014 this is what people will see in emails.")}`);
+    const agentName = await ask(`  ${c2.cyan("Agent name")} ${c2.dim("(secretary)")}: `);
+    name = agentName.trim() || "secretary";
   }
-  log2(`  ${c2.dim("Give your AI agent a name \u2014 this is what people will see in emails.")}`);
-  const agentName = await ask(`  ${c2.cyan("Agent name")} ${c2.dim("(secretary)")}: `);
-  const name = agentName.trim() || "secretary";
+  const relayInfo = { provider, email, name, smtpHost, smtpPort, imapHost, imapPort };
   const apiBase = `http://${config.api.host}:${config.api.port}`;
   const MAX_ATTEMPTS = 3;
   for (let attempt = 1; attempt <= MAX_ATTEMPTS; attempt++) {
@@ -5126,14 +5152,14 @@ async function setupRelay(config) {
           "Content-Type": "application/json"
         },
         body: JSON.stringify({
-          provider,
-          email,
+          provider: relayInfo.provider,
+          email: relayInfo.email,
           password,
-          smtpHost,
-          smtpPort,
-          imapHost,
-          imapPort,
-          agentName: name
+          smtpHost: relayInfo.smtpHost,
+          smtpPort: relayInfo.smtpPort,
+          imapHost: relayInfo.imapHost,
+          imapPort: relayInfo.imapPort,
+          agentName: relayInfo.name
         }),
         signal: AbortSignal.timeout(3e4)
       });
@@ -5151,7 +5177,7 @@ async function setupRelay(config) {
           log2("");
           info2("Double-check your email and app password, then run: agenticmail setup");
         }
-        return false;
+        return { success: false, info: relayInfo };
       }
       const data = await response.json();
       spinner.succeed("Email connected!");
@@ -5162,15 +5188,15 @@ async function setupRelay(config) {
         log2(`    ${c2.dim("Agent key:")}   ${c2.yellow(data.agent.apiKey)}`);
         log2("");
         info2("People can email your agent at the address above.");
-        await sendWelcomeEmail(apiBase, data.agent.apiKey, email, data.agent.name, data.agent.subAddress);
+        await sendWelcomeEmail(apiBase, data.agent.apiKey, relayInfo.email, data.agent.name, data.agent.subAddress);
       }
-      return true;
+      return { success: true, info: relayInfo };
     } catch (err) {
       spinner.fail(`Couldn't connect: ${err.message}`);
-      return false;
+      return { success: false, info: relayInfo };
     }
   }
-  return false;
+  return { success: false, info: relayInfo };
 }
 function parseFriendlyError(rawText) {
   try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agenticmail",
-  "version": "0.5.26",
+  "version": "0.5.28",
   "description": "Email and SMS infrastructure for AI agents \u2014 the first platform to give agents real email addresses and phone numbers",
   "type": "module",
   "main": "dist/index.js",