agenticmail 0.5.28 → 0.5.30

package/dist/cli.js

@@ -4627,8 +4627,8 @@ async function cmdSetup() {
     }
     await new Promise((r) => setTimeout(r, 300));
   }
-  const stalwart = deps.find((d) => d.name === "stalwart");
-  if (!stalwart?.installed) {
+  const stalwartDep = deps.find((d) => d.name === "stalwart");
+  if (!stalwartDep?.installed) {
     const spinner = new Spinner("stalwart");
     spinner.start();
     const stalwartSetup = new SetupManager((msg) => spinner.update(msg));
@@ -4640,6 +4640,11 @@ async function cmdSetup() {
       process.exit(1);
     }
   } else {
+    ok2(`${c2.bold("Mail Server")} ${c2.dim("\u2014 already running")}`);
+    await new Promise((r) => setTimeout(r, 300));
+  }
+  {
+    let stalwartAuthOk = false;
     try {
       const authCheck = await fetch(`${result.config.stalwart.url}/api/principal`, {
         headers: {
@@ -4647,36 +4652,33 @@ async function cmdSetup() {
         },
         signal: AbortSignal.timeout(5e3)
       });
-      if (authCheck.status === 401) {
-        const spinner = new Spinner("stalwart", "Resetting mail server (stale credentials)...");
-        spinner.start();
+      stalwartAuthOk = authCheck.status !== 401;
+    } catch {
+    }
+    if (!stalwartAuthOk) {
+      const spinner = new Spinner("stalwart", "Resetting mail server (stale credentials)...");
+      spinner.start();
+      try {
+        const { execFileSync } = await import("child_process");
+        execFileSync("docker", ["rm", "-f", "agenticmail-stalwart"], { timeout: 15e3, stdio: "ignore" });
         try {
-          const { execFileSync } = await import("child_process");
-          execFileSync("docker", ["rm", "-f", "agenticmail-stalwart"], { timeout: 15e3, stdio: "ignore" });
-          try {
-            const volumes = execFileSync(
-              "docker",
-              ["volume", "ls", "-q", "--filter", "name=stalwart-data"],
-              { timeout: 5e3, stdio: ["ignore", "pipe", "ignore"] }
-            ).toString().trim();
-            for (const vol of volumes.split("\n").filter(Boolean)) {
-              execFileSync("docker", ["volume", "rm", vol], { timeout: 1e4, stdio: "ignore" });
-            }
-          } catch {
+          const volumes = execFileSync(
+            "docker",
+            ["volume", "ls", "-q", "--filter", "name=stalwart-data"],
+            { timeout: 5e3, stdio: ["ignore", "pipe", "ignore"] }
+          ).toString().trim();
+          for (const vol of volumes.split("\n").filter(Boolean)) {
+            execFileSync("docker", ["volume", "rm", vol], { timeout: 1e4, stdio: "ignore" });
           }
-          await setup.ensureStalwart();
-          spinner.succeed(`${c2.bold("Mail Server")} \u2014 recreated with fresh credentials`);
-        } catch (err) {
-          spinner.fail(`Couldn't reset mail server: ${err.message}`);
-          process.exit(1);
+        } catch {
         }
-      } else {
-        ok2(`${c2.bold("Mail Server")} ${c2.dim("\u2014 already running")}`);
+        await setup.ensureStalwart();
+        spinner.succeed(`${c2.bold("Mail Server")} \u2014 recreated with fresh credentials`);
+      } catch (err) {
+        spinner.fail(`Couldn't reset mail server: ${err.message}`);
+        process.exit(1);
       }
-    } catch {
-      ok2(`${c2.bold("Mail Server")} ${c2.dim("\u2014 already running")}`);
     }
-    await new Promise((r) => setTimeout(r, 300));
   }
   const cf = deps.find((d) => d.name === "cloudflared");
   if (!cf?.installed) {
@@ -5208,7 +5210,13 @@ function parseFriendlyError(rawText) {
         isAuthError: true
       };
     }
-    if (error.includes("Invalid API key") || error.includes("Unauthorized") || error.includes("401")) {
+    if (error.includes("Stalwart API error") && (error.includes("401") || error.includes("Unauthorized"))) {
+      return {
+        message: "Mail server credentials mismatch \u2014 the container may have stale data. Run: agenticmail setup",
+        isAuthError: false
+      };
+    }
+    if (error.includes("Invalid API key") || error.includes("Master API key required")) {
       return {
         message: "Server authorization failed \u2014 the mail server may still be starting up. Try again in a moment.",
         isAuthError: false

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agenticmail",
-  "version": "0.5.28",
+  "version": "0.5.30",
   "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",
@@ -16,6 +16,7 @@
   },
   "files": [
     "dist",
+    "scripts",
     "README.md",
     "REFERENCE.md",
     "LICENSE"
@@ -23,6 +24,7 @@
   "scripts": {
     "build": "tsup src/index.ts src/cli.ts --format esm --dts --clean",
     "test": "vitest run --passWithNoTests",
+    "preuninstall": "node scripts/uninstall.mjs",
     "prepublishOnly": "npm run build"
   },
   "dependencies": {

package/scripts/uninstall.mjs

@@ -0,0 +1,98 @@
+#!/usr/bin/env node
+
+/**
+ * Cleanup script that runs on `npm uninstall agenticmail`.
+ *
+ * 1. Unloads & removes the launchd / systemd auto-start service
+ * 2. Stops & removes the agenticmail-stalwart Docker container
+ * 3. Cleans agenticmail entries from OpenClaw config
+ * 4. Removes ~/.agenticmail data directory
+ */
+
+import { execSync, execFileSync } from 'node:child_process';
+import { readFileSync, writeFileSync, existsSync, rmSync, unlinkSync } from 'node:fs';
+import { join } from 'node:path';
+import { homedir, platform } from 'node:os';
+
+const home = homedir();
+const os = platform();
+
+function log(msg) { console.log(`[agenticmail] ${msg}`); }
+function tryExec(cmd, opts = {}) { try { execSync(cmd, { timeout: 15_000, stdio: 'ignore', ...opts }); } catch { /* ignore */ } }
+
+// ── 1. Unload auto-start service ─────────────────────────────────
+
+if (os === 'darwin') {
+  const plist = join(home, 'Library', 'LaunchAgents', 'com.agenticmail.server.plist');
+  if (existsSync(plist)) {
+    log('Unloading launchd service...');
+    tryExec(`launchctl bootout gui/$(id -u) "${plist}"`);
+    try { unlinkSync(plist); } catch { /* ignore */ }
+  }
+} else if (os === 'linux') {
+  const unit = 'agenticmail.service';
+  tryExec(`systemctl --user stop ${unit}`);
+  tryExec(`systemctl --user disable ${unit}`);
+  const unitPath = join(home, '.config', 'systemd', 'user', unit);
+  if (existsSync(unitPath)) {
+    try { unlinkSync(unitPath); } catch { /* ignore */ }
+    tryExec('systemctl --user daemon-reload');
+  }
+}
+
+// ── 2. Stop Docker container ──────────────────────────────────────
+
+try {
+  const ps = execFileSync('docker', ['ps', '-a', '--filter', 'name=agenticmail-stalwart', '--format', '{{.Names}}'],
+    { timeout: 10_000, stdio: ['ignore', 'pipe', 'ignore'] }).toString().trim();
+  if (ps.includes('agenticmail-stalwart')) {
+    log('Stopping mail server container...');
+    tryExec('docker rm -f agenticmail-stalwart');
+  }
+} catch { /* docker not available — skip */ }
+
+// ── 3. Clean OpenClaw config ──────────────────────────────────────
+
+const openclawConfig = join(home, '.openclaw', 'openclaw.json');
+if (existsSync(openclawConfig)) {
+  try {
+    const raw = readFileSync(openclawConfig, 'utf-8');
+    const config = JSON.parse(raw);
+    let changed = false;
+
+    // Remove plugins.entries.agenticmail
+    if (config.plugins?.entries?.agenticmail) {
+      delete config.plugins.entries.agenticmail;
+      changed = true;
+      if (Object.keys(config.plugins.entries).length === 0) delete config.plugins.entries;
+    }
+
+    // Remove our path from plugins.load.paths
+    if (Array.isArray(config.plugins?.load?.paths)) {
+      const before = config.plugins.load.paths.length;
+      config.plugins.load.paths = config.plugins.load.paths.filter(
+        (p) => !p.includes('@agenticmail')
+      );
+      if (config.plugins.load.paths.length !== before) changed = true;
+      if (config.plugins.load.paths.length === 0) {
+        delete config.plugins.load.paths;
+        if (config.plugins.load && Object.keys(config.plugins.load).length === 0) delete config.plugins.load;
+      }
+    }
+
+    if (changed) {
+      writeFileSync(openclawConfig, JSON.stringify(config, null, 2) + '\n');
+      log('Cleaned OpenClaw config');
+    }
+  } catch { /* don't fail uninstall */ }
+}
+
+// ── 4. Remove ~/.agenticmail ──────────────────────────────────────
+
+const dataDir = join(home, '.agenticmail');
+if (existsSync(dataDir)) {
+  log('Removing ~/.agenticmail/ ...');
+  try { rmSync(dataDir, { recursive: true, force: true }); } catch { /* ignore */ }
+}
+
+log('Uninstall complete.');