agenticmail 0.3.10 → 0.3.12

package/dist/cli.js

@@ -4216,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;
@@ -4281,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");
@@ -4294,9 +4335,12 @@ 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.");
   }
+  if (serverReady) {
+    await registerWithOpenClaw(result.config);
+  }
   printSummary(result, false);
   if (serverReady) {
     await interactiveShell({ config: result.config, onExit: cleanupChild });
@@ -4319,6 +4363,92 @@ function printSummary(result, exitAfter) {
     process.exit(0);
   }
 }
+async function registerWithOpenClaw(config) {
+  const openclawConfig = join(homedir(), ".openclaw", "openclaw.json");
+  if (!existsSync2(openclawConfig)) return;
+  try {
+    const raw = readFileSync2(openclawConfig, "utf8");
+    const ocConfig = JSON.parse(raw);
+    if (ocConfig.plugins?.entries?.agenticmail?.config?.apiKey) {
+      ok2(`OpenClaw integration already configured`);
+      return;
+    }
+    let pluginPath = null;
+    try {
+      const resolved = import.meta.resolve("@agenticmail/openclaw");
+      const resolvedPath = fileURLToPath(resolved);
+      pluginPath = dirname(dirname(resolvedPath));
+    } catch {
+    }
+    if (!pluginPath) {
+      const thisDir = dirname(fileURLToPath(import.meta.url));
+      let dir = thisDir;
+      for (let i = 0; i < 10; i++) {
+        const candidate = join(dir, "node_modules", "@agenticmail", "openclaw");
+        if (existsSync2(join(candidate, "package.json"))) {
+          pluginPath = candidate;
+          break;
+        }
+        const parent = dirname(dir);
+        if (parent === dir) break;
+        dir = parent;
+      }
+    }
+    if (!pluginPath) {
+      try {
+        const { execSync } = await import("child_process");
+        const prefix = execSync("npm prefix -g", { timeout: 5e3, stdio: ["ignore", "pipe", "ignore"] }).toString().trim();
+        const globalCandidate = join(prefix, "lib", "node_modules", "@agenticmail", "openclaw");
+        if (existsSync2(join(globalCandidate, "package.json"))) pluginPath = globalCandidate;
+        if (!pluginPath) {
+          const globalCandidate2 = join(prefix, "node_modules", "@agenticmail", "openclaw");
+          if (existsSync2(join(globalCandidate2, "package.json"))) pluginPath = globalCandidate2;
+        }
+      } catch {
+      }
+    }
+    if (!pluginPath) return;
+    try {
+      pluginPath = realpathSync(pluginPath);
+    } catch {
+    }
+    let apiKey = "";
+    try {
+      const base = `http://${config.api.host}:${config.api.port}`;
+      const resp = await fetch(`${base}/api/agenticmail/accounts`, {
+        headers: { "Authorization": `Bearer ${config.masterKey}` },
+        signal: AbortSignal.timeout(5e3)
+      });
+      if (resp.ok) {
+        const data = await resp.json();
+        const agents = data.agents || data || [];
+        if (agents.length > 0) {
+          apiKey = agents[0].apiKey;
+        }
+      }
+    } catch {
+    }
+    if (!apiKey) return;
+    if (!ocConfig.plugins) ocConfig.plugins = {};
+    if (!ocConfig.plugins.load) ocConfig.plugins.load = {};
+    if (!ocConfig.plugins.load.paths) ocConfig.plugins.load.paths = [];
+    if (!ocConfig.plugins.entries) ocConfig.plugins.entries = {};
+    if (!ocConfig.plugins.load.paths.includes(pluginPath)) {
+      ocConfig.plugins.load.paths.push(pluginPath);
+    }
+    ocConfig.plugins.entries.agenticmail = {
+      enabled: true,
+      config: {
+        apiUrl: `http://${config.api.host}:${config.api.port}`,
+        apiKey,
+        masterKey: config.masterKey
+      }
+    };
+    writeFileSync2(openclawConfig, JSON.stringify(ocConfig, null, 2) + "\n", "utf8");
+    ok2(`OpenClaw integration configured \u2014 your agents can now use email!`);
+  } catch {
+  }
+}
 async function setupRelay(config) {
   log2("  Which email service do you use?");
   log2(`    ${c2.cyan("1.")} Gmail`);

package/package.json

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