@agenticmail/core 0.5.21 → 0.5.23

package/dist/index.d.ts

@@ -1456,6 +1456,12 @@ declare class DependencyInstaller {
      * Runs the built-in installer silently (--accept-license to link CLI tools),
      * then starts Docker Desktop hidden (no GUI window).
      */
+    /**
+     * Docker.app exists but daemon isn't running.
+     * Simple approach: if Docker was already running, great. If not, just
+     * tell the user to open Docker and accept the terms themselves.
+     * No GUI manipulation, no programmatic license tricks — just wait.
+     */
     private setupExistingDockerApp;
     /**
      * Hide Docker Desktop completely — close all windows, hide from dock, make invisible.
@@ -1465,7 +1471,8 @@ declare class DependencyInstaller {
     /**
      * Full Docker Desktop install on macOS.
      * Tries Homebrew first (cleaner), falls back to DMG download.
-     * All output is suppressed — only our progress spinner shows.
+     * After install, tells the user to open Docker and accept the terms.
+     * No GUI manipulation — the user handles Docker themselves.
      */
     private installDockerMac;
     /**

package/dist/index.js

@@ -5180,8 +5180,8 @@ var GatewayManager = class {
     const { homedir: homedir8 } = await import("os");
     const backupDir = join4(homedir8(), ".agenticmail");
     const backupPath = join4(backupDir, `dns-backup-${domain}-${Date.now()}.json`);
-    const { writeFileSync: writeFileSync6, mkdirSync: mkdirSync5 } = await import("fs");
-    mkdirSync5(backupDir, { recursive: true });
+    const { writeFileSync: writeFileSync6, mkdirSync: mkdirSync6 } = await import("fs");
+    mkdirSync6(backupDir, { recursive: true });
     writeFileSync6(backupPath, JSON.stringify({
       domain,
       zoneId: zone.id,
@@ -5813,7 +5813,7 @@ var RELAY_PRESETS = {
 
 // src/setup/index.ts
 import { randomBytes as randomBytes2 } from "crypto";
-import { existsSync as existsSync6, readFileSync as readFileSync4, writeFileSync as writeFileSync5, mkdirSync as mkdirSync4, chmodSync } from "fs";
+import { existsSync as existsSync6, readFileSync as readFileSync4, writeFileSync as writeFileSync5, mkdirSync as mkdirSync5, chmodSync } from "fs";
 import { join as join8 } from "path";
 import { homedir as homedir7 } from "os";
 
@@ -6221,52 +6221,44 @@ var DependencyInstaller = class {
    * Runs the built-in installer silently (--accept-license to link CLI tools),
    * then starts Docker Desktop hidden (no GUI window).
    */
-  async setupExistingDockerApp(appPath) {
-    let wasAlreadyRunning = false;
-    try {
-      execFileSync2("docker", ["info"], { timeout: 5e3, stdio: "ignore" });
-      wasAlreadyRunning = true;
-    } catch {
-    }
-    const installBin = join6(appPath, "Contents", "MacOS", "install");
-    if (wasAlreadyRunning) {
-      if (existsSync4(installBin)) {
-        this.onProgress("__progress__:30:Setting up CLI tools...");
-        const user = process.env.USER || execSync("whoami", { timeout: 5e3 }).toString().trim();
-        try {
-          execSync(`"${installBin}" --accept-license --user=${user}`, {
-            timeout: 12e4,
-            stdio: "ignore"
-          });
-        } catch {
-        }
-      }
+  /**
+   * Docker.app exists but daemon isn't running.
+   * Simple approach: if Docker was already running, great. If not, just
+   * tell the user to open Docker and accept the terms themselves.
+   * No GUI manipulation, no programmatic license tricks — just wait.
+   */
+  async setupExistingDockerApp(_appPath) {
+    if (this.isDockerReady()) {
       this.onProgress("__progress__:100:Engine is ready!");
-      this.hideDockerWindow();
-      this.configureDockerHeadless();
       return;
     }
-    this._firstLaunchMode = true;
-    this.onProgress("__progress__:50:Please accept the Docker license agreement...");
-    try {
-      execFileSync2("open", [appPath], { timeout: 1e4, stdio: "ignore" });
-    } catch {
-    }
-    await this.waitForDocker();
-    if (existsSync4(installBin)) {
-      this.onProgress("Setting up CLI tools...");
-      const user = process.env.USER || execSync("whoami", { timeout: 5e3 }).toString().trim();
+    this.onProgress("Open Docker Desktop and accept the license agreement, then we'll continue automatically...");
+    const totalTime = 6e5;
+    const start = Date.now();
+    while (Date.now() - start < totalTime) {
       try {
-        execSync(`"${installBin}" --accept-license --user=${user}`, {
-          timeout: 12e4,
-          stdio: "ignore"
-        });
+        execFileSync2("docker", ["info"], { timeout: 5e3, stdio: "ignore" });
+        this.onProgress("__progress__:100:Engine is ready!");
+        this.configureDockerHeadless();
+        this.hideDockerWindow();
+        return;
       } catch {
       }
+      const elapsed = Date.now() - start;
+      const pct = Math.min(95, Math.round(elapsed / totalTime * 100));
+      const msgs = [
+        "Open Docker Desktop and accept the license to continue...",
+        "Waiting for Docker to be ready...",
+        "Accept the terms in Docker Desktop to continue...",
+        "Still waiting for Docker..."
+      ];
+      const msgIdx = Math.floor(elapsed / 8e3) % msgs.length;
+      this.onProgress(`__progress__:${pct}:${msgs[msgIdx]}`);
+      await new Promise((r) => setTimeout(r, 3e3));
     }
-    this._firstLaunchMode = false;
-    this.configureDockerHeadless();
-    this.hideDockerWindow();
+    throw new Error(
+      "Docker did not start. Open Docker Desktop from your Applications folder, accept the license agreement, then run this command again."
+    );
   }
   /**
    * Hide Docker Desktop completely — close all windows, hide from dock, make invisible.
@@ -6317,103 +6309,84 @@ var DependencyInstaller = class {
   /**
    * Full Docker Desktop install on macOS.
    * Tries Homebrew first (cleaner), falls back to DMG download.
-   * All output is suppressed — only our progress spinner shows.
+   * After install, tells the user to open Docker and accept the terms.
+   * No GUI manipulation — the user handles Docker themselves.
    */
   async installDockerMac() {
+    let installed = false;
     if (hasHomebrew()) {
-      this.onProgress("__progress__:5:Installing mail server engine...");
+      this.onProgress("__progress__:5:Installing Docker Desktop...");
       try {
         const brewResult = await runSilent(
           "brew",
           ["install", "--cask", "docker"],
           { timeout: 6e5 }
         );
-        if (brewResult.exitCode === 0) {
-          this.onProgress("__progress__:45:Mail server engine installed!");
-          try {
-            execSync(`osascript -e 'quit app "Docker Desktop"' 2>/dev/null`, { timeout: 5e3, stdio: "ignore" });
-          } catch {
-          }
-          try {
-            execSync(`osascript -e 'quit app "Docker"' 2>/dev/null`, { timeout: 5e3, stdio: "ignore" });
-          } catch {
-          }
-          try {
-            execSync("pkill -f Docker.app 2>/dev/null", { timeout: 5e3, stdio: "ignore" });
-          } catch {
-          }
-          await new Promise((r) => setTimeout(r, 3e3));
-          const appPath = this.findDockerApp();
-          if (appPath) {
-            await this.setupExistingDockerApp(appPath);
-            return;
-          }
+        if (brewResult.exitCode === 0 && this.findDockerApp()) {
+          installed = true;
         }
       } catch {
       }
-      this.onProgress("__progress__:10:Trying direct download...");
     }
-    const cpu = arch2();
-    const archName = cpu === "arm64" ? "arm64" : "amd64";
-    const dmgUrl = `https://desktop.docker.com/mac/main/${archName}/Docker.dmg`;
-    const dmgPath = "/tmp/Docker.dmg";
-    this.onProgress("__progress__:5:Downloading mail server engine...");
-    const dlResult = await runSilent("curl", [
-      "-fSL",
-      "-o",
-      dmgPath,
-      dmgUrl
-    ], { timeout: 6e5 });
-    if (dlResult.exitCode !== 0) {
-      throw new Error("Failed to download Docker Desktop. Check your internet connection and try again.");
-    }
-    this.onProgress("__progress__:40:Installing mail server engine...");
-    try {
+    if (!installed) {
+      const cpu = arch2();
+      const archName = cpu === "arm64" ? "arm64" : "amd64";
+      const dmgUrl = `https://desktop.docker.com/mac/main/${archName}/Docker.dmg`;
+      const dmgPath = "/tmp/Docker.dmg";
+      this.onProgress("__progress__:5:Downloading Docker Desktop...");
+      const dlResult = await runSilent("curl", [
+        "-fSL",
+        "-o",
+        dmgPath,
+        dmgUrl
+      ], { timeout: 6e5 });
+      if (dlResult.exitCode !== 0) {
+        throw new Error("Failed to download Docker Desktop. Check your internet connection and try again.");
+      }
+      this.onProgress("__progress__:40:Installing Docker Desktop...");
       try {
-        execSync("hdiutil detach /Volumes/Docker 2>/dev/null", { timeout: 1e4, stdio: "ignore" });
+        try {
+          execSync("hdiutil detach /Volumes/Docker 2>/dev/null", { timeout: 1e4, stdio: "ignore" });
+        } catch {
+        }
+        execSync(`hdiutil attach "${dmgPath}" -nobrowse -quiet`, { timeout: 3e4, stdio: "ignore" });
+      } catch {
+        throw new Error("Failed to mount Docker DMG. The download may be corrupted \u2014 try again.");
+      }
+      if (!existsSync4("/Applications/Docker.app")) {
+        try {
+          execSync('cp -R "/Volumes/Docker/Docker.app" /Applications/', { timeout: 6e4, stdio: "ignore" });
+        } catch {
+          throw new Error("Failed to install. You may need to run this with admin privileges.");
+        }
+      }
+      try {
+        execSync("hdiutil detach /Volumes/Docker -quiet", { timeout: 15e3, stdio: "ignore" });
       } catch {
       }
-      execSync(`hdiutil attach "${dmgPath}" -nobrowse -quiet`, { timeout: 3e4, stdio: "ignore" });
-    } catch {
-      throw new Error("Failed to mount Docker DMG. The download may be corrupted \u2014 try again.");
-    }
-    this.onProgress("__progress__:55:Installing...");
-    if (!existsSync4("/Applications/Docker.app")) {
       try {
-        execSync('cp -R "/Volumes/Docker/Docker.app" /Applications/', { timeout: 6e4, stdio: "ignore" });
+        await unlink(dmgPath);
       } catch {
-        throw new Error("Failed to install. You may need to run this with admin privileges.");
       }
     }
     try {
-      execSync("hdiutil detach /Volumes/Docker -quiet", { timeout: 15e3, stdio: "ignore" });
+      execSync(`osascript -e 'quit app "Docker Desktop"' 2>/dev/null`, { timeout: 5e3, stdio: "ignore" });
     } catch {
     }
     try {
-      await unlink(dmgPath);
+      execSync(`osascript -e 'quit app "Docker"' 2>/dev/null`, { timeout: 5e3, stdio: "ignore" });
     } catch {
     }
-    this._firstLaunchMode = true;
-    this.onProgress("__progress__:70:Please accept the Docker license agreement...");
     try {
-      execFileSync2("open", ["/Applications/Docker.app"], { timeout: 1e4, stdio: "ignore" });
+      execSync("pkill -f Docker.app 2>/dev/null", { timeout: 5e3, stdio: "ignore" });
     } catch {
     }
-    await this.waitForDocker();
-    this._firstLaunchMode = false;
-    const installBin = "/Applications/Docker.app/Contents/MacOS/install";
-    if (existsSync4(installBin)) {
-      const user = process.env.USER || execSync("whoami", { timeout: 5e3 }).toString().trim();
-      try {
-        execSync(`"${installBin}" --accept-license --user=${user}`, {
-          timeout: 12e4,
-          stdio: "ignore"
-        });
-      } catch {
-      }
+    await new Promise((r) => setTimeout(r, 2e3));
+    const appPath = this.findDockerApp();
+    if (!appPath) {
+      throw new Error("Docker Desktop was installed but could not be found. Try again.");
     }
-    this.configureDockerHeadless();
-    this.hideDockerWindow();
+    await this.setupExistingDockerApp(appPath);
   }
   /**
    * Install Docker Engine on Linux using Docker's official convenience script.
@@ -6727,7 +6700,7 @@ var DependencyInstaller = class {
 
 // src/setup/service.ts
 import { execFileSync as execFileSync3, execSync as execSync2 } from "child_process";
-import { existsSync as existsSync5, readFileSync as readFileSync3, writeFileSync as writeFileSync4, unlinkSync, mkdirSync as mkdirSync3 } from "fs";
+import { existsSync as existsSync5, readFileSync as readFileSync3, writeFileSync as writeFileSync4, unlinkSync, mkdirSync as mkdirSync4 } from "fs";
 import { join as join7 } from "path";
 import { homedir as homedir6, platform as platform3 } from "os";
 var PLIST_LABEL = "com.agenticmail.server";
@@ -6800,7 +6773,7 @@ var ServiceManager = class {
    */
   cacheApiEntryPath(entryPath) {
     const dataDir = join7(homedir6(), ".agenticmail");
-    if (!existsSync5(dataDir)) mkdirSync3(dataDir, { recursive: true });
+    if (!existsSync5(dataDir)) mkdirSync4(dataDir, { recursive: true });
     writeFileSync4(join7(dataDir, "api-entry.path"), entryPath);
   }
   /**
@@ -6834,7 +6807,7 @@ var ServiceManager = class {
   generateStartScript(nodePath, apiEntry) {
     const scriptPath = join7(homedir6(), ".agenticmail", "bin", "start-server.sh");
     const scriptDir = join7(homedir6(), ".agenticmail", "bin");
-    if (!existsSync5(scriptDir)) mkdirSync3(scriptDir, { recursive: true });
+    if (!existsSync5(scriptDir)) mkdirSync4(scriptDir, { recursive: true });
     const script = [
       "#!/bin/bash",
       "# AgenticMail auto-start script",
@@ -6900,7 +6873,7 @@ var ServiceManager = class {
   generatePlist(nodePath, apiEntry, configPath) {
     const config = JSON.parse(readFileSync3(configPath, "utf-8"));
     const logDir = join7(homedir6(), ".agenticmail", "logs");
-    if (!existsSync5(logDir)) mkdirSync3(logDir, { recursive: true });
+    if (!existsSync5(logDir)) mkdirSync4(logDir, { recursive: true });
     const version = this.getVersion();
     const startScript = this.generateStartScript(nodePath, apiEntry);
     return `<?xml version="1.0" encoding="UTF-8"?>
@@ -7051,7 +7024,7 @@ WantedBy=default.target
     const servicePath = this.getServicePath();
     if (this.os === "darwin") {
       const dir = join7(homedir6(), "Library", "LaunchAgents");
-      if (!existsSync5(dir)) mkdirSync3(dir, { recursive: true });
+      if (!existsSync5(dir)) mkdirSync4(dir, { recursive: true });
       if (existsSync5(servicePath)) {
         try {
           execFileSync3("launchctl", ["unload", servicePath], { timeout: 1e4, stdio: "ignore" });
@@ -7068,7 +7041,7 @@ WantedBy=default.target
       return { installed: true, message: `Service installed at ${servicePath}` };
     } else if (this.os === "linux") {
       const dir = join7(homedir6(), ".config", "systemd", "user");
-      if (!existsSync5(dir)) mkdirSync3(dir, { recursive: true });
+      if (!existsSync5(dir)) mkdirSync4(dir, { recursive: true });
       const unit = this.generateSystemdUnit(nodePath, apiEntry, configPath);
       writeFileSync4(servicePath, unit);
       try {
@@ -7228,7 +7201,7 @@ var SetupManager = class {
       }
     }
     if (!existsSync6(dataDir)) {
-      mkdirSync4(dataDir, { recursive: true });
+      mkdirSync5(dataDir, { recursive: true });
     }
     const masterKey = `mk_${randomBytes2(24).toString("hex")}`;
     const stalwartPassword = randomBytes2(16).toString("hex");
@@ -7272,7 +7245,7 @@ IMAP_PORT=143
   generateDockerFiles(config) {
     const dataDir = config.dataDir || join8(homedir7(), ".agenticmail");
     if (!existsSync6(dataDir)) {
-      mkdirSync4(dataDir, { recursive: true });
+      mkdirSync5(dataDir, { recursive: true });
     }
     const password = config.stalwart?.adminPassword || "changeme";
     const composePath = join8(dataDir, "docker-compose.yml");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agenticmail/core",
-  "version": "0.5.21",
+  "version": "0.5.23",
   "description": "Core SDK for AgenticMail \u2014 email, SMS, and phone number access for AI agents",
   "type": "module",
   "main": "dist/index.js",