@agenticmail/enterprise 0.5.343 → 0.5.345

package/dist/{chunk-FWGDL7KF.js → chunk-WV6DLTYP.js}

@@ -1,9 +1,6 @@
 import {
   getSupportedDatabases
 } from "./chunk-Z3I6GNTS.js";
-import {
-  __require
-} from "./chunk-KFQGP6VL.js";
 
 // src/setup/index.ts
 import { execSync as execSync3 } from "child_process";
@@ -262,8 +259,8 @@ async function promptDatabase(inquirer, chalk) {
 import { execSync, exec as execCb } from "child_process";
 import { promisify } from "util";
 import { existsSync, writeFileSync, readFileSync } from "fs";
-import { join as join2 } from "path";
-import { homedir as homedir2, platform, arch } from "os";
+import { join } from "path";
+import { homedir, platform, arch } from "os";
 var execP = promisify(execCb);
 function whichCmd(bin) {
   const cmd = platform() === "win32" ? `where ${bin}` : `which ${bin}`;
@@ -488,7 +485,7 @@ async function runCloudSetup(inquirer, chalk, existingSubdomain) {
   console.log(`    ${chalk.cyan("npx @agenticmail/enterprise start")}`);
   console.log("");
   console.log(chalk.dim("  Or let the setup wizard start them with PM2 (next step).\n"));
-  const envPath = join2(homedir2(), ".agenticmail", ".env");
+  const envPath = join(homedir(), ".agenticmail", ".env");
   try {
     let envContent = "";
     if (existsSync(envPath)) {
@@ -508,7 +505,7 @@ CLOUDFLARED_TOKEN=${tunnelToken}
 `;
     }
     const { mkdirSync } = await import("fs");
-    mkdirSync(join2(homedir2(), ".agenticmail"), { recursive: true });
+    mkdirSync(join(homedir(), ".agenticmail"), { recursive: true });
     writeFileSync(envPath, envContent, { mode: 384 });
   } catch {
   }
@@ -562,8 +559,8 @@ async function runTunnelSetup(inquirer, chalk) {
     }
   }
   console.log(chalk.bold("  2. Cloudflare Authentication"));
-  const cfDir = join2(homedir2(), ".cloudflared");
-  const certPath = join2(cfDir, "cert.pem");
+  const cfDir = join(homedir(), ".cloudflared");
+  const certPath = join(cfDir, "cert.pem");
   const loggedIn = existsSync(certPath);
   if (loggedIn) {
     console.log(chalk.green("     \u2713 Already authenticated\n"));
@@ -644,14 +641,14 @@ async function runTunnelSetup(inquirer, chalk) {
   }
   const config = [
     `tunnel: ${tunnelId}`,
-    `credentials-file: ${join2(cfDir, tunnelId + ".json")}`,
+    `credentials-file: ${join(cfDir, tunnelId + ".json")}`,
     "",
     "ingress:",
     `  - hostname: ${domain}`,
     `    service: http://localhost:${port}`,
     "  - service: http_status:404"
   ].join("\n");
-  writeFileSync(join2(cfDir, "config.yml"), config);
+  writeFileSync(join(cfDir, "config.yml"), config);
   console.log(chalk.green(`     \u2713 Config written: ${domain} \u2192 localhost:${port}`));
   try {
     execSync(`cloudflared tunnel route dns ${tunnelId} ${domain} 2>&1`, { encoding: "utf8", timeout: 3e4 });
@@ -716,8 +713,8 @@ async function runTunnelSetup(inquirer, chalk) {
       console.log(chalk.yellow("     \u26A0 PM2 not available \u2014 tunnel started in background"));
       console.log(chalk.dim("       Install PM2 for auto-restart: npm install -g pm2"));
       try {
-        const { spawn } = await import("child_process");
-        const child = spawn("cloudflared", ["tunnel", "run"], { detached: true, stdio: "ignore" });
+        const { spawn: spawn2 } = await import("child_process");
+        const child = spawn2("cloudflared", ["tunnel", "run"], { detached: true, stdio: "ignore" });
         child.unref();
         started = true;
       } catch {
@@ -1048,7 +1045,10 @@ async function promptRegistration(inquirer, chalk, ora, domain, companyName, adm
 
 // src/setup/provision.ts
 import { randomUUID, randomBytes as randomBytes2 } from "crypto";
-import { execSync as execSync2 } from "child_process";
+import { execSync as execSync2, spawn } from "child_process";
+import { statSync, readFileSync as readFileSync2 } from "fs";
+import { join as join2 } from "path";
+import { homedir as homedir2 } from "os";
 function generateOrgId() {
   const chars = "ABCDEFGHJKLMNPQRSTUVWXYZ23456789";
   const bytes = randomBytes2(10);
@@ -1282,27 +1282,81 @@ async function deploy(config, db, jwtSecret, vaultKey, spinner, chalk) {
         execSync2("pm2 delete enterprise 2>&1", { stdio: "pipe", timeout: 1e4 });
       } catch {
       }
-      let cfPath = "cloudflared";
+      let cfPath = "";
       try {
         const whichBin = process.platform === "win32" ? "where" : "which";
         cfPath = execSync2(`${whichBin} cloudflared`, { encoding: "utf8", timeout: 5e3 }).trim().split("\n")[0].trim();
       } catch {
       }
-      execSync2(`pm2 start "${cfPath}" --name cloudflared --interpreter none -- tunnel --no-autoupdate run --token ${cloud.tunnelToken}`, { stdio: "pipe", timeout: 15e3 });
-      const envFile = join(homedir(), ".agenticmail", ".env");
-      const entryPoint = join(__require.resolve("@agenticmail/enterprise/package.json"), "..", "bin", "agenticmail-enterprise.cjs");
-      let startCmd;
+      if (!cfPath && process.platform === "win32") {
+        const localAppData = process.env.LOCALAPPDATA || `${process.env.USERPROFILE}\\AppData\\Local`;
+        const candidate = `${localAppData}\\cloudflared\\cloudflared.exe`;
+        try {
+          statSync(candidate);
+          cfPath = candidate;
+        } catch {
+        }
+      }
+      if (!cfPath) throw new Error("cloudflared not found \u2014 install it first");
+      const amDir = join2(homedir2(), ".agenticmail");
+      const { writeFileSync: writeFileSync2, mkdirSync } = await import("fs");
       try {
-        const { statSync } = __require("fs");
-        statSync(entryPoint);
-        startCmd = `pm2 start "${process.execPath}" --name enterprise -- "${entryPoint}" start`;
+        mkdirSync(amDir, { recursive: true });
       } catch {
-        const npxPath = process.platform === "win32" ? join(process.env.APPDATA || "", "npm", "npx.cmd") : "npx";
-        startCmd = `pm2 start "${npxPath}" --name enterprise -- @agenticmail/enterprise start`;
       }
-      execSync2(startCmd, {
+      const startScript = join2(amDir, "start.cjs");
+      writeFileSync2(startScript, [
+        `// Auto-generated by AgenticMail setup \u2014 do not edit`,
+        `const { execFileSync } = require('child_process');`,
+        `const { readFileSync } = require('fs');`,
+        `const { join } = require('path');`,
+        `// Load .env`,
+        `try {`,
+        `  const envFile = join(__dirname, '.env');`,
+        `  const lines = readFileSync(envFile, 'utf8').split('\\n');`,
+        `  for (const line of lines) {`,
+        `    const m = line.match(/^([A-Z_]+)=(.*)$/);`,
+        `    if (m) process.env[m[1]] = m[2];`,
+        `  }`,
+        `} catch {}`,
+        `// Run the CLI`,
+        `const { spawnSync } = require('child_process');`,
+        `const r = spawnSync(process.execPath, [require.resolve('@agenticmail/enterprise/dist/cli.js'), 'start'], {`,
+        `  stdio: 'inherit', env: process.env`,
+        `});`,
+        `process.exit(r.status || 0);`
+      ].join("\n"));
+      const cfScript = join2(amDir, "cloudflared.cjs");
+      writeFileSync2(cfScript, [
+        `// Auto-generated by AgenticMail setup \u2014 do not edit`,
+        `const { spawnSync } = require('child_process');`,
+        `const r = spawnSync(${JSON.stringify(cfPath)}, process.argv.slice(2), {`,
+        `  stdio: 'inherit'`,
+        `});`,
+        `process.exit(r.status || 0);`
+      ].join("\n"));
+      execSync2(`pm2 start "${cfScript}" --name cloudflared -- tunnel --no-autoupdate run --token ${cloud.tunnelToken}`, { stdio: "pipe", timeout: 15e3 });
+      const envLines = [
+        `PORT=${cloud.port || 8080}`,
+        `DATABASE_URL=${database.connectionString || ""}`,
+        `JWT_SECRET=${jwtSecret}`,
+        `AGENTICMAIL_VAULT_KEY=${vaultKey}`,
+        `AGENTICMAIL_DOMAIN=${cloud.fqdn}`
+      ];
+      const envFile = join2(amDir, ".env");
+      try {
+        const existing = readFileSync2(envFile, "utf8");
+        for (const line of envLines) {
+          const key = line.split("=")[0];
+          if (!existing.includes(`${key}=`)) {
+            writeFileSync2(envFile, existing.trimEnd() + "\n" + line + "\n");
+          }
+        }
+      } catch {
+      }
+      execSync2(`pm2 start "${startScript}" --name enterprise`, {
         stdio: "pipe",
-        timeout: 15e3,
+        timeout: 3e4,
         env: {
           ...process.env,
           PORT: String(cloud.port || 8080),
@@ -1312,21 +1366,12 @@ async function deploy(config, db, jwtSecret, vaultKey, spinner, chalk) {
           AGENTICMAIL_DOMAIN: cloud.fqdn
         }
       });
-      await new Promise((r) => setTimeout(r, 3e3));
-      try {
-        const jlist = execSync2("pm2 jlist", { encoding: "utf8", timeout: 1e4 });
-        const procs = JSON.parse(jlist);
-        const cfProc = procs.find((p) => p.name === "cloudflared");
-        const entProc = procs.find((p) => p.name === "enterprise");
-        if (cfProc?.pm2_env?.status !== "online") {
-          throw new Error("cloudflared not running");
-        }
-        if (entProc?.pm2_env?.status !== "online") {
-          throw new Error("enterprise server not running");
-        }
-      } catch (verifyErr) {
-        throw new Error(`Processes not healthy: ${verifyErr.message}`);
-      }
+      await new Promise((r) => setTimeout(r, 5e3));
+      const jlist = execSync2("pm2 jlist", { encoding: "utf8", timeout: 1e4 });
+      const procs = JSON.parse(jlist);
+      const cfOnline = procs.find((p) => p.name === "cloudflared")?.pm2_env?.status === "online";
+      const entOnline = procs.find((p) => p.name === "enterprise")?.pm2_env?.status === "online";
+      if (!cfOnline || !entOnline) throw new Error(`cloudflared=${cfOnline ? "ok" : "down"}, enterprise=${entOnline ? "ok" : "down"}`);
       try {
         execSync2("pm2 save", { timeout: 1e4, stdio: "pipe" });
       } catch {
@@ -1345,38 +1390,46 @@ async function deploy(config, db, jwtSecret, vaultKey, spinner, chalk) {
     } catch (e) {
       spinner.warn(`PM2 setup failed: ${e.message}`);
       console.log(chalk.dim("  Starting processes directly instead...\n"));
-      const { spawn } = __require("child_process");
-      let cfPath = "cloudflared";
+      let fallbackCfPath = "";
       try {
         const whichBin = process.platform === "win32" ? "where" : "which";
-        cfPath = execSync2(`${whichBin} cloudflared`, { encoding: "utf8", timeout: 5e3 }).trim().split("\n")[0].trim();
+        fallbackCfPath = execSync2(`${whichBin} cloudflared`, { encoding: "utf8", timeout: 5e3 }).trim().split("\n")[0].trim();
       } catch {
       }
-      const cfProc = spawn(cfPath, ["tunnel", "--no-autoupdate", "run", "--token", cloud.tunnelToken], {
+      if (!fallbackCfPath && process.platform === "win32") {
+        const localAppData = process.env.LOCALAPPDATA || `${process.env.USERPROFILE}\\AppData\\Local`;
+        const candidate = `${localAppData}\\cloudflared\\cloudflared.exe`;
+        try {
+          statSync(candidate);
+          fallbackCfPath = candidate;
+        } catch {
+        }
+      }
+      const serverEnv = {
+        ...process.env,
+        PORT: String(cloud.port || 8080),
+        DATABASE_URL: database.connectionString || "",
+        JWT_SECRET: jwtSecret,
+        AGENTICMAIL_VAULT_KEY: vaultKey,
+        AGENTICMAIL_DOMAIN: cloud.fqdn
+      };
+      if (fallbackCfPath) {
+        const cfProc = spawn(fallbackCfPath, ["tunnel", "--no-autoupdate", "run", "--token", cloud.tunnelToken], {
+          detached: true,
+          stdio: "ignore",
+          env: process.env
+        });
+        cfProc.unref();
+      }
+      const entProc = spawn("npx", ["@agenticmail/enterprise", "start"], {
         detached: true,
         stdio: "ignore",
-        env: process.env
-      });
-      cfProc.unref();
-      const entProc = spawn(process.execPath, [
-        "-e",
-        `process.env.PORT='${cloud.port || 8080}';process.env.DATABASE_URL='${(database.connectionString || "").replace(/'/g, "\\'")}';process.env.JWT_SECRET='${jwtSecret}';process.env.AGENTICMAIL_VAULT_KEY='${vaultKey}';process.env.AGENTICMAIL_DOMAIN='${cloud.fqdn}';require('@agenticmail/enterprise/dist/cli.js');`,
-        "--",
-        "start"
-      ], {
-        detached: true,
-        stdio: "ignore",
-        env: {
-          ...process.env,
-          PORT: String(cloud.port || 8080),
-          DATABASE_URL: database.connectionString || "",
-          JWT_SECRET: jwtSecret,
-          AGENTICMAIL_VAULT_KEY: vaultKey,
-          AGENTICMAIL_DOMAIN: cloud.fqdn
-        }
+        env: serverEnv,
+        shell: true
+        // Required on Windows for npx
       });
       entProc.unref();
-      await new Promise((r) => setTimeout(r, 5e3));
+      await new Promise((r) => setTimeout(r, 8e3));
       spinner.succeed(`Live at https://${cloud.fqdn}`);
       console.log(chalk.yellow("  Note: Processes running in background. They will stop when you close this terminal."));
       console.log(chalk.dim("  For persistence, install PM2: npm install -g pm2"));

package/dist/cli.js

@@ -64,7 +64,7 @@ Skill Development:
     break;
   case "setup":
   default:
-    import("./setup-KHWRJILU.js").then((m) => m.runSetupWizard()).catch(fatal);
+    import("./setup-PIBCCQVU.js").then((m) => m.runSetupWizard()).catch(fatal);
     break;
 }
 function fatal(err) {

package/dist/index.js

@@ -13,7 +13,7 @@ import {
 import {
   provision,
   runSetupWizard
-} from "./chunk-FWGDL7KF.js";
+} from "./chunk-WV6DLTYP.js";
 import {
   AgentRuntime,
   EmailChannel,

package/dist/setup-4AS2ASES.js

@@ -0,0 +1,20 @@
+import {
+  promptCompanyInfo,
+  promptDatabase,
+  promptDeployment,
+  promptDomain,
+  promptRegistration,
+  provision,
+  runSetupWizard
+} from "./chunk-AA6OVVQD.js";
+import "./chunk-Z3I6GNTS.js";
+import "./chunk-KFQGP6VL.js";
+export {
+  promptCompanyInfo,
+  promptDatabase,
+  promptDeployment,
+  promptDomain,
+  promptRegistration,
+  provision,
+  runSetupWizard
+};

package/dist/setup-PIBCCQVU.js

@@ -0,0 +1,20 @@
+import {
+  promptCompanyInfo,
+  promptDatabase,
+  promptDeployment,
+  promptDomain,
+  promptRegistration,
+  provision,
+  runSetupWizard
+} from "./chunk-WV6DLTYP.js";
+import "./chunk-Z3I6GNTS.js";
+import "./chunk-KFQGP6VL.js";
+export {
+  promptCompanyInfo,
+  promptDatabase,
+  promptDeployment,
+  promptDomain,
+  promptRegistration,
+  provision,
+  runSetupWizard
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agenticmail/enterprise",
-  "version": "0.5.343",
+  "version": "0.5.345",
   "description": "AgenticMail Enterprise — cloud-hosted AI agent identity, email, auth & compliance for organizations",
   "type": "module",
   "bin": {