agenticmail 0.3.9 → 0.3.11

package/dist/cli.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
 // src/cli.ts
-import { createInterface as createInterface2, emitKeypressEvents } from "readline";
+import { createInterface as createInterface2, emitKeypressEvents as emitKeypressEvents2 } from "readline";
 import { existsSync as existsSync2, readFileSync as readFileSync2, writeFileSync as writeFileSync2, mkdirSync, realpathSync } from "fs";
 import { join, dirname } from "path";
 import { fileURLToPath } from "url";
@@ -13,7 +13,7 @@ import {
 } from "@agenticmail/core";
 
 // src/shell.ts
-import { createInterface } from "readline";
+import { createInterface, emitKeypressEvents } from "readline";
 import { readFileSync, writeFileSync, existsSync } from "fs";
 import { basename } from "path";
 var c = {
@@ -3303,6 +3303,10 @@ ${orig.text || ""}`;
           } catch {
           }
           rl.__chatMode = true;
+          rl.pause();
+          emitKeypressEvents(process.stdin);
+          if (process.stdin.isTTY) process.stdin.setRawMode(true);
+          process.stdin.resume();
           process.stdout.write("\x1B[3A\r\x1B[J");
           log(hr());
           log(`  ${c.bold(c.cyan("\u{1F380} Agent Chat"))} ${c.dim("| Esc to leave | Enter to send | \\\\ + Enter for new line")}`);
@@ -3365,6 +3369,8 @@ ${c.dim(boxChar.bl + boxChar.h.repeat(bWidth) + boxChar.br)}`);
             log("");
           }
           chat.close();
+          if (process.stdin.isTTY) process.stdin.setRawMode(false);
+          rl.resume();
           rl.__chatMode = false;
           log("");
           log(`  ${c.dim("Chat ended")}`);
@@ -4210,21 +4216,6 @@ async function cmdSetup() {
   await new Promise((r) => setTimeout(r, 800));
   log2(`  ${c2.bold("Step 4 of 4")} ${c2.dim("\u2014")} ${c2.bold("Connect your email")}`);
   log2("");
-  log2(`  How should your AI agent send and receive email?`);
-  log2("");
-  log2(`  ${c2.cyan("1.")} Use my Gmail or Outlook`);
-  log2(`     ${c2.dim("Easiest option \u2014 connect your existing email account.")}`);
-  log2(`     ${c2.dim("Your agent emails as you+agent@gmail.com")}`);
-  log2("");
-  log2(`  ${c2.cyan("2.")} Use my own domain`);
-  log2(`     ${c2.dim("Your agent gets a custom address like agent@yourcompany.com")}`);
-  log2(`     ${c2.dim("Requires a Cloudflare account and a domain.")}`);
-  log2("");
-  log2(`  ${c2.cyan("3.")} Skip for now`);
-  log2(`     ${c2.dim("You can always set this up later.")}`);
-  log2("");
-  const choice = await pick(`  ${c2.magenta(">")} `, ["1", "2", "3"]);
-  log2("");
   const serverSpinner = new Spinner("server", "Starting the server...");
   serverSpinner.start();
   let serverReady = false;
@@ -4275,6 +4266,62 @@ async function cmdSetup() {
       serverSpinner.fail(`Could not start server: ${err.message}`);
     }
   }
+  let existingEmail = null;
+  let existingProvider = null;
+  if (serverReady) {
+    try {
+      const base = `http://${result.config.api.host}:${result.config.api.port}`;
+      const statusResp = await fetch(`${base}/api/agenticmail/gateway/status`, {
+        headers: { "Authorization": `Bearer ${result.config.masterKey}` },
+        signal: AbortSignal.timeout(5e3)
+      });
+      if (statusResp.ok) {
+        const status = await statusResp.json();
+        if (status.mode === "relay" && status.relay?.email) {
+          existingEmail = status.relay.email;
+          existingProvider = status.relay.provider || "custom";
+        }
+      }
+    } catch {
+    }
+  }
+  let choice;
+  if (existingEmail) {
+    const provLabel = existingProvider === "gmail" ? "Gmail" : existingProvider === "outlook" ? "Outlook" : existingProvider;
+    log2("");
+    ok2(`Email already connected: ${c2.cyan(existingEmail)} ${c2.dim(`(${provLabel})`)}`);
+    log2("");
+    log2(`  ${c2.cyan("1.")} Keep current email`);
+    log2(`  ${c2.cyan("2.")} Remove and connect a different email`);
+    log2(`  ${c2.cyan("3.")} Set up a custom domain instead`);
+    log2("");
+    const existChoice = await pick(`  ${c2.magenta(">")} `, ["1", "2", "3"]);
+    if (existChoice === "1") {
+      choice = "3";
+      log2("");
+      ok2(`Keeping ${c2.cyan(existingEmail)}`);
+    } else if (existChoice === "3") {
+      choice = "2";
+    } else {
+      choice = "1";
+    }
+  } else {
+    log2(`  How should your AI agent send and receive email?`);
+    log2("");
+    log2(`  ${c2.cyan("1.")} Use my Gmail or Outlook`);
+    log2(`     ${c2.dim("Easiest option \u2014 connect your existing email account.")}`);
+    log2(`     ${c2.dim("Your agent emails as you+agent@gmail.com")}`);
+    log2("");
+    log2(`  ${c2.cyan("2.")} Use my own domain`);
+    log2(`     ${c2.dim("Your agent gets a custom address like agent@yourcompany.com")}`);
+    log2(`     ${c2.dim("Requires a Cloudflare account and a domain.")}`);
+    log2("");
+    log2(`  ${c2.cyan("3.")} Skip for now`);
+    log2(`     ${c2.dim("You can always set this up later.")}`);
+    log2("");
+    choice = await pick(`  ${c2.magenta(">")} `, ["1", "2", "3"]);
+  }
+  log2("");
   if (choice === "1" || choice === "2") {
     if (!serverReady) {
       info2("You can configure email later by running: agenticmail setup");
@@ -4288,7 +4335,7 @@ async function cmdSetup() {
     } else {
       await setupDomain(result.config);
     }
-  } else {
+  } else if (!existingEmail) {
     info2("No problem! You can set up email anytime by running this again.");
   }
   printSummary(result, false);
@@ -4883,7 +4930,7 @@ async function cmdOpenClaw() {
     const selectedIdx = await new Promise((resolve) => {
       let sel = 0;
       const totalOpts = options.length;
-      emitKeypressEvents(process.stdin);
+      emitKeypressEvents2(process.stdin);
       if (process.stdin.isTTY) process.stdin.setRawMode(true);
       const renderList = () => {
         const totalLines = totalOpts + 3;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agenticmail",
-  "version": "0.3.9",
+  "version": "0.3.11",
   "description": "Email infrastructure for AI agents — send and receive real email programmatically",
   "type": "module",
   "main": "dist/index.js",