agenticmail 0.3.14 → 0.3.16

package/dist/cli.js

@@ -4370,55 +4370,22 @@ function printSummary(result, exitAfter) {
   }
 }
 async function registerWithOpenClaw(config) {
-  const openclawConfig = join(homedir(), ".openclaw", "openclaw.json");
-  if (!existsSync2(openclawConfig)) return;
+  const openclawConfigPath = findOpenClawConfig();
+  if (!openclawConfigPath) return;
   try {
-    const raw = readFileSync2(openclawConfig, "utf8");
-    const ocConfig = JSON.parse(raw);
-    if (ocConfig.plugins?.entries?.agenticmail?.config?.apiKey) {
+    const raw = readFileSync2(openclawConfigPath, "utf-8");
+    const existing = JSON5.parse(raw);
+    if (existing.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 {
+    const pluginDir = resolveOpenClawPluginDir();
+    if (!pluginDir) {
+      info2(`Install the OpenClaw plugin first: ${c2.green("npm i @agenticmail/openclaw")}`);
+      info2(`Then run: ${c2.green("agenticmail openclaw")}`);
+      return;
     }
-    let apiKey = "";
+    let agentApiKey;
     try {
       const base = `http://${config.api.host}:${config.api.port}`;
       const resp = await fetch(`${base}/api/agenticmail/accounts`, {
@@ -4428,31 +4395,19 @@ async function registerWithOpenClaw(config) {
       if (resp.ok) {
         const data = await resp.json();
         const agents = data.agents || data || [];
-        if (agents.length > 0) {
-          apiKey = agents[0].apiKey;
-        }
+        if (agents.length > 0) agentApiKey = 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);
+    if (!agentApiKey) return;
+    const apiUrl = `http://${config.api.host}:${config.api.port}`;
+    const updated = mergePluginConfig(existing, apiUrl, config.masterKey, agentApiKey, pluginDir);
+    writeFileSync2(openclawConfigPath, JSON.stringify(updated, null, 2) + "\n");
+    if (pluginDir) ok2(`Plugin found: ${c2.cyan(pluginDir)}`);
+    ok2(`OpenClaw config updated: ${c2.cyan(openclawConfigPath)}`);
+    if (!existing?.hooks?.enabled && updated?.hooks?.enabled) {
+      ok2(`${c2.bold("Agent auto-spawn")} enabled \u2014 call_agent will auto-create sessions`);
     }
-    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 config updated: ${c2.cyan(openclawConfig)}`);
-    if (pluginPath) ok2(`Plugin found: ${c2.cyan(pluginPath)}`);
     let hasOpenClawCli = false;
     try {
       const { execSync } = await import("child_process");
@@ -4795,25 +4750,58 @@ async function setupDomain(config) {
   }
 }
 function resolveOpenClawPluginDir() {
+  const pluginMarker = "openclaw.plugin.json";
+  const pkgPath = join("node_modules", "@agenticmail", "openclaw");
   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, "openclaw.plugin.json"))) return realpathSync(candidate);
+    const candidate = join(dir, pkgPath);
+    if (existsSync2(join(candidate, pluginMarker))) return realpathSync(candidate);
     const parent = dirname(dir);
     if (parent === dir) break;
     dir = parent;
   }
-  const candidates = [
+  const monorepo = [
     join(thisDir, "..", "..", "packages", "openclaw"),
     join(thisDir, "..", "packages", "openclaw")
   ];
-  for (const p of candidates) {
-    if (existsSync2(join(p, "openclaw.plugin.json"))) return p;
+  for (const p of monorepo) {
+    if (existsSync2(join(p, pluginMarker))) return p;
+  }
+  const userDirs = [
+    join(process.cwd(), pkgPath),
+    join(homedir(), pkgPath)
+  ];
+  for (const p of userDirs) {
+    if (existsSync2(join(p, pluginMarker))) {
+      try {
+        return realpathSync(p);
+      } catch {
+        return p;
+      }
+    }
+  }
+  try {
+    const cp = createRequire(import.meta.url)("node:child_process");
+    const prefix = cp.execSync("npm prefix -g", { timeout: 5e3, stdio: ["ignore", "pipe", "ignore"] }).toString().trim();
+    const globalCandidates = [
+      join(prefix, "lib", pkgPath),
+      join(prefix, pkgPath)
+    ];
+    for (const p of globalCandidates) {
+      if (existsSync2(join(p, pluginMarker))) {
+        try {
+          return realpathSync(p);
+        } catch {
+          return p;
+        }
+      }
+    }
+  } catch {
   }
   try {
-    const require2 = createRequire(import.meta.url);
-    const resolved = require2.resolve("@agenticmail/openclaw/openclaw.plugin.json");
+    const req = createRequire(import.meta.url);
+    const resolved = req.resolve("@agenticmail/openclaw/openclaw.plugin.json");
     return dirname(resolved);
   } catch {
   }

package/package.json

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