agenticmail 0.3.23 → 0.3.25

package/dist/cli.js

@@ -2,7 +2,7 @@
 
 // src/cli.ts
 import { createInterface as createInterface2, emitKeypressEvents as emitKeypressEvents2 } from "readline";
-import { existsSync as existsSync2, readFileSync as readFileSync2, writeFileSync as writeFileSync2, mkdirSync, realpathSync } from "fs";
+import { existsSync as existsSync2, readFileSync as readFileSync2, writeFileSync as writeFileSync2, mkdirSync, realpathSync, unlinkSync } from "fs";
 import { join, dirname } from "path";
 import { fileURLToPath } from "url";
 import { createRequire } from "module";
@@ -4054,22 +4054,53 @@ async function waitForApi(host, port, timeoutMs = 15e3) {
   }
   return false;
 }
-var apiChild = null;
-function cleanupChild() {
-  if (apiChild) {
-    apiChild.kill();
-    apiChild = null;
+var PID_FILE = join(homedir(), ".agenticmail", "server.pid");
+async function startApiServer(config) {
+  const host = config.api.host;
+  const port = config.api.port;
+  try {
+    const probe = await fetch(`http://${host}:${port}/api/agenticmail/health`, {
+      signal: AbortSignal.timeout(2e3)
+    });
+    if (probe.ok) return true;
+  } catch {
+  }
+  const { spawn } = await import("child_process");
+  const apiEntry = resolveApiEntry();
+  const env = configToEnv(config);
+  const child = spawn(process.execPath, [apiEntry], {
+    detached: true,
+    stdio: "ignore",
+    env
+  });
+  child.unref();
+  if (child.pid) {
+    try {
+      writeFileSync2(PID_FILE, String(child.pid));
+    } catch {
+    }
+  }
+  return waitForApi(host, port);
+}
+function stopApiServer() {
+  try {
+    if (!existsSync2(PID_FILE)) return false;
+    const pid = parseInt(readFileSync2(PID_FILE, "utf-8").trim(), 10);
+    if (isNaN(pid)) return false;
+    process.kill(pid, "SIGTERM");
+    try {
+      unlinkSync(PID_FILE);
+    } catch {
+    }
+    return true;
+  } catch {
+    try {
+      unlinkSync(PID_FILE);
+    } catch {
+    }
+    return false;
   }
 }
-process.on("exit", cleanupChild);
-process.on("SIGINT", () => {
-  cleanupChild();
-  process.exit(0);
-});
-process.on("SIGTERM", () => {
-  cleanupChild();
-  process.exit(0);
-});
 async function cmdSetup() {
   log2("");
   log2(`  ${c2.bgCyan(" AgenticMail Setup ")}`);
@@ -4258,51 +4289,14 @@ async function cmdSetup() {
   serverSpinner.start();
   let serverReady = false;
   try {
-    const probe = await fetch(`http://${result.config.api.host}:${result.config.api.port}/api/agenticmail/health`, {
-      signal: AbortSignal.timeout(2e3)
-    });
-    if (probe.ok) serverReady = true;
-  } catch {
-  }
-  if (serverReady) {
-    serverSpinner.succeed(`Server already running at ${c2.cyan(`http://${result.config.api.host}:${result.config.api.port}`)}`);
-  } else {
-    try {
-      const { fork } = await import("child_process");
-      const apiEntry = resolveApiEntry();
-      const env = configToEnv(result.config);
-      apiChild = fork(apiEntry, [], { stdio: ["ignore", "ignore", "pipe", "ipc"], env });
-      const stderrLines = [];
-      apiChild.stderr?.on("data", (chunk) => {
-        const lines = chunk.toString().trim().split("\n");
-        for (const line of lines) {
-          stderrLines.push(line);
-          if (stderrLines.length > 50) stderrLines.shift();
-        }
-      });
-      apiChild.on("exit", (code, signal) => {
-        apiChild = null;
-        log2("");
-        fail2(`Server stopped unexpectedly${signal ? ` (signal: ${signal})` : code ? ` (exit code: ${code})` : ""}`);
-        if (stderrLines.length > 0) {
-          log2("");
-          log2(`  ${c2.dim("Last server output:")}`);
-          for (const line of stderrLines.slice(-10)) {
-            log2(`  ${c2.dim(line)}`);
-          }
-        }
-        log2("");
-        process.exit(code ?? 1);
-      });
-      serverReady = await waitForApi(result.config.api.host, result.config.api.port);
-      if (serverReady) {
-        serverSpinner.succeed(`Server running at ${c2.cyan(`http://${result.config.api.host}:${result.config.api.port}`)}`);
-      } else {
-        serverSpinner.fail("Server did not start in time");
-      }
-    } catch (err) {
-      serverSpinner.fail(`Could not start server: ${err.message}`);
+    serverReady = await startApiServer(result.config);
+    if (serverReady) {
+      serverSpinner.succeed(`Server running at ${c2.cyan(`http://${result.config.api.host}:${result.config.api.port}`)}`);
+    } else {
+      serverSpinner.fail("Server did not start in time");
     }
+  } catch (err) {
+    serverSpinner.fail(`Could not start server: ${err.message}`);
   }
   let existingEmail = null;
   let existingProvider = null;
@@ -4363,7 +4357,6 @@ async function cmdSetup() {
   if (choice === "1" || choice === "2") {
     if (!serverReady) {
       info2("You can configure email later by running: agenticmail setup");
-      cleanupChild();
       printSummary(result, true);
       return;
     }
@@ -4378,7 +4371,6 @@ async function cmdSetup() {
     if (!emailOk) {
       log2("");
       info2("Email setup did not complete. Run " + c2.green("npx agenticmail setup") + " again to retry.");
-      cleanupChild();
       printSummary(result, true);
       return;
     }
@@ -4393,7 +4385,8 @@ async function cmdSetup() {
   }
   printSummary(result, false);
   if (serverReady) {
-    await interactiveShell({ config: result.config, onExit: cleanupChild });
+    await interactiveShell({ config: result.config, onExit: () => {
+    } });
   }
 }
 function printSummary(result, exitAfter) {
@@ -4427,14 +4420,14 @@ async function restartOpenClawGateway() {
     restartSpinner.start();
     try {
       const { execSync } = await import("child_process");
-      execSync("openclaw gateway restart", { stdio: "pipe", timeout: 3e4 });
+      execSync("openclaw gateway start", { stdio: "pipe", timeout: 3e4 });
       restartSpinner.succeed("OpenClaw gateway restarted");
     } catch {
       restartSpinner.fail("Gateway restart failed");
-      log2(`    Run manually: ${c2.green("openclaw gateway restart")}`);
+      log2(`    Run manually: ${c2.green("openclaw gateway start")}`);
     }
   } else {
-    info2(`Restart OpenClaw to pick up the changes: ${c2.green("openclaw gateway restart")}`);
+    info2(`Restart OpenClaw to pick up the changes: ${c2.green("openclaw gateway start")}`);
   }
 }
 async function registerWithOpenClaw(config) {
@@ -5057,17 +5050,9 @@ async function cmdOpenClaw() {
     const serverSpinner = new Spinner("server", "Starting the server...");
     serverSpinner.start();
     try {
-      const { fork } = await import("child_process");
-      const apiEntry = resolveApiEntry();
-      const env = configToEnv(config);
-      apiChild = fork(apiEntry, [], { stdio: ["ignore", "ignore", "pipe", "ipc"], env });
-      apiChild.on("exit", () => {
-        apiChild = null;
-      });
-      const ready = await waitForApi(apiHost, apiPort);
+      const ready = await startApiServer(config);
       if (!ready) {
         serverSpinner.fail("Server did not start in time");
-        cleanupChild();
         process.exit(1);
       }
       serverSpinner.succeed(`Server running at ${c2.cyan(apiBase)}`);
@@ -5335,7 +5320,7 @@ async function cmdOpenClaw() {
   }
   if (!hasOpenClawCli) {
     log2(`  ${c2.yellow("\u26A0")} OpenClaw CLI not found in PATH`);
-    log2(`    Run manually: ${c2.green("openclaw gateway restart")}`);
+    log2(`    Run manually: ${c2.green("openclaw gateway start")}`);
   } else {
     const isInteractive = process.stdin.isTTY === true;
     let shouldRestart = !isInteractive;
@@ -5348,16 +5333,16 @@ async function cmdOpenClaw() {
       restartSpinner.start();
       try {
         const { execSync } = await import("child_process");
-        execSync("openclaw gateway restart", { stdio: "pipe", timeout: 3e4 });
+        execSync("openclaw gateway start", { stdio: "pipe", timeout: 3e4 });
         restartSpinner.succeed("OpenClaw gateway restarted");
         gatewayRestarted = true;
       } catch (err) {
         restartSpinner.fail("Gateway restart failed");
         log2(`  ${c2.yellow("\u26A0")} Gateway restart failed: ${err.message}`);
-        log2(`    Run manually: ${c2.green("openclaw gateway restart")}`);
+        log2(`    Run manually: ${c2.green("openclaw gateway start")}`);
       }
     } else {
-      log2(`  ${c2.dim("Skipped.")} Run later: ${c2.green("openclaw gateway restart")}`);
+      log2(`  ${c2.dim("Skipped.")} Run later: ${c2.green("openclaw gateway start")}`);
     }
   }
   log2("");
@@ -5387,11 +5372,8 @@ async function cmdOpenClaw() {
   }
   log2("");
   if (process.stdin.isTTY) {
-    await interactiveShell({ config, onExit: cleanupChild });
-  } else {
-    if (!serverWasRunning) {
-      cleanupChild();
-    }
+    await interactiveShell({ config, onExit: () => {
+    } });
   }
 }
 function printPluginSnippet(apiUrl, masterKey, agentApiKey) {
@@ -5532,61 +5514,30 @@ async function cmdStart() {
   }
   const serverSpinner = new Spinner("server", "Launching your server...");
   serverSpinner.start();
-  let alreadyRunning = false;
   try {
-    const probe = await fetch(`http://${config.api.host}:${config.api.port}/api/agenticmail/health`, {
-      signal: AbortSignal.timeout(2e3)
-    });
-    if (probe.ok) alreadyRunning = true;
-  } catch {
-  }
-  if (alreadyRunning) {
-    serverSpinner.succeed(`Server already running at ${c2.cyan(`http://${config.api.host}:${config.api.port}`)}`);
-  } else {
-    try {
-      const { fork } = await import("child_process");
-      const apiEntry = resolveApiEntry();
-      if (!existsSync2(apiEntry)) {
-        serverSpinner.fail(`Server isn't built yet. Run: ${c2.bold("npm run build")}`);
-        process.exit(1);
-      }
-      const env = configToEnv(config);
-      apiChild = fork(apiEntry, [], { stdio: ["ignore", "ignore", "pipe", "ipc"], env });
-      const stderrLines = [];
-      apiChild.stderr?.on("data", (chunk) => {
-        const lines = chunk.toString().trim().split("\n");
-        for (const line of lines) {
-          stderrLines.push(line);
-          if (stderrLines.length > 50) stderrLines.shift();
-        }
-      });
-      apiChild.on("exit", (code, signal) => {
-        apiChild = null;
-        log2("");
-        fail2(`Server stopped unexpectedly${signal ? ` (signal: ${signal})` : code ? ` (exit code: ${code})` : ""}`);
-        if (stderrLines.length > 0) {
-          log2("");
-          log2(`  ${c2.dim("Last server output:")}`);
-          for (const line of stderrLines.slice(-10)) {
-            log2(`  ${c2.dim(line)}`);
-          }
-        }
-        log2("");
-        process.exit(code ?? 1);
-      });
-      const ready = await waitForApi(config.api.host, config.api.port, 2e4);
-      if (!ready) {
-        serverSpinner.fail("Server did not start in time");
-        cleanupChild();
-        process.exit(1);
-      }
+    const ready = await startApiServer(config);
+    if (ready) {
       serverSpinner.succeed(`Server running at ${c2.cyan(`http://${config.api.host}:${config.api.port}`)}`);
-    } catch (err) {
-      serverSpinner.fail(`Couldn't start the server: ${err.message}`);
+    } else {
+      serverSpinner.fail("Server did not start in time");
       process.exit(1);
     }
+  } catch (err) {
+    serverSpinner.fail(`Couldn't start the server: ${err.message}`);
+    process.exit(1);
   }
-  await interactiveShell({ config, onExit: cleanupChild });
+  await interactiveShell({ config, onExit: () => {
+  } });
+}
+async function cmdStop() {
+  log2("");
+  const stopped = stopApiServer();
+  if (stopped) {
+    ok2("AgenticMail server stopped");
+  } else {
+    info2("Server is not running");
+  }
+  log2("");
 }
 var command = process.argv[2];
 switch (command) {
@@ -5602,6 +5553,14 @@ switch (command) {
       process.exit(1);
     });
     break;
+  case "stop":
+    cmdStop().then(() => {
+      process.exit(0);
+    }).catch((err) => {
+      console.error(err);
+      process.exit(1);
+    });
+    break;
   case "status":
     cmdStatus().then(() => {
       process.exit(0);
@@ -5626,6 +5585,7 @@ switch (command) {
     log2(`    ${c2.green("agenticmail")}           Get started (setup + start)`);
     log2(`    ${c2.green("agenticmail setup")}     Re-run the setup wizard`);
     log2(`    ${c2.green("agenticmail start")}     Start the server`);
+    log2(`    ${c2.green("agenticmail stop")}      Stop the server`);
     log2(`    ${c2.green("agenticmail status")}    See what's running`);
     log2(`    ${c2.green("agenticmail openclaw")}  Set up AgenticMail for OpenClaw`);
     log2("");

package/package.json

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