agenticmail 0.3.15 → 0.3.17

package/dist/cli.js

@@ -4375,11 +4375,23 @@ async function registerWithOpenClaw(config) {
   try {
     const raw = readFileSync2(openclawConfigPath, "utf-8");
     const existing = JSON5.parse(raw);
-    if (existing.plugins?.entries?.agenticmail?.config?.apiKey) {
-      ok2(`OpenClaw integration already configured`);
-      return;
+    const existingEntry = existing.plugins?.entries?.agenticmail;
+    if (existingEntry?.config?.apiKey) {
+      const existingPaths = existing.plugins?.load?.paths ?? [];
+      const pluginFound = existingPaths.some(
+        (p) => existsSync2(join(p, "openclaw.plugin.json"))
+      );
+      if (pluginFound) {
+        ok2(`OpenClaw integration already configured`);
+        return;
+      }
     }
     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 agentApiKey;
     try {
       const base = `http://${config.api.host}:${config.api.port}`;
@@ -4745,25 +4757,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.15",
+  "version": "0.3.17",
   "description": "Email infrastructure for AI agents — send and receive real email programmatically",
   "type": "module",
   "main": "dist/index.js",