@agenticmail/core 0.5.4 → 0.5.6

package/dist/index.d.ts

@@ -1412,22 +1412,41 @@ declare class DependencyChecker {
 type InstallProgress = (message: string) => void;
 /**
  * DependencyInstaller handles installing all external dependencies.
- * Everything is auto-installed — no optional deps.
+ * Everything is auto-installed — no optional deps, no manual steps.
  */
 declare class DependencyInstaller {
     private onProgress;
     constructor(onProgress?: InstallProgress);
     /**
      * Ensure Docker is installed AND the daemon is running.
-     * macOS: Downloads official DMG and runs Docker's CLI installer (no Homebrew needed).
-     * Linux: Uses Docker's official convenience script (https://get.docker.com).
-     * Starts the daemon if Docker CLI is present but daemon is stopped.
+     * Fully automatic — installs, accepts license, starts daemon, waits for ready.
+     * Never asks the user to do anything manually.
+     *
+     * Flow:
+     *   1. docker CLI + daemon running? → done
+     *   2. docker CLI exists but daemon stopped? → start daemon, wait
+     *   3. Docker.app exists (in /Applications or Caskroom)? → run installer --accept-license, start, wait
+     *   4. Nothing installed? → install via Homebrew or DMG download, then start, wait
      */
     installDocker(): Promise<void>;
+    /** Check if `docker info` succeeds (CLI + daemon both working). */
+    private isDockerReady;
+    /** Check if `docker` CLI is in PATH (daemon may be stopped). */
+    private isDockerCliInstalled;
+    /**
+     * Find Docker.app on macOS.
+     * Checks /Applications first, then Homebrew Caskroom.
+     * Validates symlinks aren't broken.
+     */
+    private findDockerApp;
+    /**
+     * Docker.app exists but CLI isn't available.
+     * Run the built-in installer (--accept-license), start Docker Desktop, wait.
+     */
+    private setupExistingDockerApp;
     /**
-     * Install Docker Desktop on macOS using the official DMG installer.
-     * Downloads the DMG, mounts it, runs the silent CLI installer, then starts Docker Desktop.
-     * This is Docker's recommended command-line installation method.
+     * Full Docker Desktop install on macOS.
+     * Tries Homebrew first (cleaner, handles updates), falls back to DMG download.
      */
     private installDockerMac;
     /**
@@ -1436,14 +1455,14 @@ declare class DependencyInstaller {
      */
     private installDockerLinux;
     /**
-     * Attempt to start the Docker daemon using multiple strategies.
-     * On macOS: tries Docker Desktop app, then docker CLI commands.
-     * On Linux: tries systemctl, then dockerd direct, then snap.
+     * Start the Docker daemon using multiple strategies.
+     * On macOS: tries Docker Desktop app via `open`, direct binary launch, etc.
+     * On Linux: tries systemctl, service, snap.
      */
     private startDockerDaemon;
     /**
-     * Wait for Docker daemon to be ready, with automatic retry strategies.
-     * Tries multiple approaches to start Docker if the first one fails.
+     * Wait for Docker daemon to be ready.
+     * Cycles through multiple start strategies automatically.
      * Reports progress as a percentage (0-100).
      */
     private waitForDocker;

package/dist/index.js

@@ -5894,7 +5894,7 @@ var DependencyChecker = class {
 
 // src/setup/installer.ts
 import { execFileSync as execFileSync2, execSync, spawn as spawnChild } from "child_process";
-import { existsSync as existsSync4 } from "fs";
+import { existsSync as existsSync4, readdirSync, lstatSync, readlinkSync } from "fs";
 import { writeFile, rename, chmod as chmod2, mkdir as mkdir2, unlink } from "fs/promises";
 import { join as join6 } from "path";
 import { homedir as homedir5, platform as platform2, arch as arch2 } from "os";
@@ -6016,6 +6016,31 @@ function runShellWithRollingOutput(cmd, opts = {}) {
     });
   });
 }
+function existsReal(p) {
+  try {
+    const stat = lstatSync(p);
+    if (stat.isSymbolicLink()) {
+      try {
+        const target = readlinkSync(p);
+        const resolved = target.startsWith("/") ? target : join6(p, "..", target);
+        return existsSync4(resolved);
+      } catch {
+        return false;
+      }
+    }
+    return true;
+  } catch {
+    return false;
+  }
+}
+function hasHomebrew() {
+  try {
+    execFileSync2("brew", ["--version"], { timeout: 5e3, stdio: "ignore" });
+    return true;
+  } catch {
+    return false;
+  }
+}
 var DependencyInstaller = class {
   onProgress;
   constructor(onProgress) {
@@ -6024,27 +6049,28 @@ var DependencyInstaller = class {
   }
   /**
    * Ensure Docker is installed AND the daemon is running.
-   * macOS: Downloads official DMG and runs Docker's CLI installer (no Homebrew needed).
-   * Linux: Uses Docker's official convenience script (https://get.docker.com).
-   * Starts the daemon if Docker CLI is present but daemon is stopped.
+   * Fully automatic — installs, accepts license, starts daemon, waits for ready.
+   * Never asks the user to do anything manually.
+   *
+   * Flow:
+   *   1. docker CLI + daemon running? → done
+   *   2. docker CLI exists but daemon stopped? → start daemon, wait
+   *   3. Docker.app exists (in /Applications or Caskroom)? → run installer --accept-license, start, wait
+   *   4. Nothing installed? → install via Homebrew or DMG download, then start, wait
    */
   async installDocker() {
-    let cliInstalled = false;
-    try {
-      execFileSync2("docker", ["--version"], { timeout: 5e3, stdio: "ignore" });
-      cliInstalled = true;
-    } catch {
+    if (this.isDockerReady()) return;
+    if (this.isDockerCliInstalled()) {
+      this.onProgress("__progress__:10:Docker installed \u2014 starting the engine...");
+      this.startDockerDaemon();
+      await this.waitForDocker();
+      return;
     }
-    if (cliInstalled) {
-      try {
-        execFileSync2("docker", ["info"], { timeout: 1e4, stdio: "ignore" });
-        return;
-      } catch {
-        this.onProgress("Docker found but not running \u2014 starting it now...");
-        this.startDockerDaemon();
-        await this.waitForDocker();
-        return;
-      }
+    const dockerApp = this.findDockerApp();
+    if (dockerApp) {
+      this.onProgress("__progress__:10:Docker Desktop found \u2014 setting it up...");
+      await this.setupExistingDockerApp(dockerApp);
+      return;
     }
     const os = platform2();
     if (os === "darwin") {
@@ -6052,15 +6078,102 @@ var DependencyInstaller = class {
     } else if (os === "linux") {
       await this.installDockerLinux();
     } else {
-      throw new Error(`Automatic Docker installation not supported on ${os}. Install it manually: https://docs.docker.com/get-docker/`);
+      throw new Error(
+        `Docker auto-install isn't supported on ${os} yet. Install it from https://docs.docker.com/get-docker/ and try again.`
+      );
+    }
+  }
+  /** Check if `docker info` succeeds (CLI + daemon both working). */
+  isDockerReady() {
+    try {
+      execFileSync2("docker", ["info"], { timeout: 1e4, stdio: "ignore" });
+      return true;
+    } catch {
+      return false;
     }
   }
+  /** Check if `docker` CLI is in PATH (daemon may be stopped). */
+  isDockerCliInstalled() {
+    try {
+      execFileSync2("docker", ["--version"], { timeout: 5e3, stdio: "ignore" });
+      return true;
+    } catch {
+      return false;
+    }
+  }
+  /**
+   * Find Docker.app on macOS.
+   * Checks /Applications first, then Homebrew Caskroom.
+   * Validates symlinks aren't broken.
+   */
+  findDockerApp() {
+    if (existsReal("/Applications/Docker.app")) {
+      return "/Applications/Docker.app";
+    }
+    const caskroomBases = [
+      "/opt/homebrew/Caskroom",
+      "/usr/local/Caskroom"
+    ];
+    const caskNames = ["docker-desktop", "docker"];
+    for (const base of caskroomBases) {
+      for (const name of caskNames) {
+        const caskroom = join6(base, name);
+        if (!existsSync4(caskroom)) continue;
+        try {
+          const versions = readdirSync(caskroom).filter((d) => !d.startsWith("."));
+          for (const ver of versions) {
+            const appPath = join6(caskroom, ver, "Docker.app");
+            if (existsReal(appPath)) return appPath;
+          }
+        } catch {
+        }
+      }
+    }
+    return null;
+  }
   /**
-   * Install Docker Desktop on macOS using the official DMG installer.
-   * Downloads the DMG, mounts it, runs the silent CLI installer, then starts Docker Desktop.
-   * This is Docker's recommended command-line installation method.
+   * Docker.app exists but CLI isn't available.
+   * Run the built-in installer (--accept-license), start Docker Desktop, wait.
+   */
+  async setupExistingDockerApp(appPath) {
+    const installBin = join6(appPath, "Contents", "MacOS", "install");
+    if (existsSync4(installBin)) {
+      this.onProgress("__progress__:20:Installing Docker CLI tools...");
+      const user = process.env.USER || execSync("whoami", { timeout: 5e3 }).toString().trim();
+      try {
+        await runWithRollingOutput(installBin, ["--accept-license", `--user=${user}`], {
+          timeout: 12e4
+        });
+      } catch {
+      }
+    }
+    this.onProgress("__progress__:40:Starting Docker Desktop...");
+    this.startDockerDaemon();
+    await this.waitForDocker();
+  }
+  /**
+   * Full Docker Desktop install on macOS.
+   * Tries Homebrew first (cleaner, handles updates), falls back to DMG download.
    */
   async installDockerMac() {
+    if (hasHomebrew()) {
+      this.onProgress("__progress__:5:Installing Docker Desktop via Homebrew...");
+      const brewResult = await runWithRollingOutput(
+        "brew",
+        ["install", "--cask", "docker"],
+        { timeout: 6e5 }
+        // can be slow on first install
+      );
+      if (brewResult.exitCode === 0) {
+        this.onProgress("__progress__:50:Docker Desktop installed!");
+        const appPath = this.findDockerApp();
+        if (appPath) {
+          await this.setupExistingDockerApp(appPath);
+          return;
+        }
+      }
+      this.onProgress("__progress__:10:Homebrew install didn't work, downloading directly...");
+    }
     const cpu = arch2();
     const archName = cpu === "arm64" ? "arm64" : "amd64";
     const dmgUrl = `https://desktop.docker.com/mac/main/${archName}/Docker.dmg`;
@@ -6094,18 +6207,16 @@ var DependencyInstaller = class {
         ["--accept-license", `--user=${user}`],
         { timeout: 12e4 }
       );
-      if (installResult.exitCode !== 0) {
-        if (!existsSync4("/Applications/Docker.app")) {
-          throw new Error("Installer exited with errors");
-        }
+      if (installResult.exitCode !== 0 && !existsSync4("/Applications/Docker.app")) {
+        throw new Error("Installer exited with errors");
       }
-    } catch (err) {
+    } catch {
       if (!existsSync4("/Applications/Docker.app")) {
         this.onProgress("__progress__:60:Trying alternative install method...");
         try {
           execSync('cp -R "/Volumes/Docker/Docker.app" /Applications/', { timeout: 6e4, stdio: "ignore" });
         } catch {
-          throw new Error("Failed to install Docker Desktop. Try dragging Docker.app to Applications manually.");
+          throw new Error("Failed to install Docker Desktop. You may need to run this with admin privileges.");
         }
       }
     }
@@ -6117,9 +6228,14 @@ var DependencyInstaller = class {
       await unlink(dmgPath);
     } catch {
     }
-    this.onProgress("__progress__:70:Starting Docker Desktop...");
-    this.startDockerDaemon();
-    await this.waitForDocker();
+    const installed = this.findDockerApp();
+    if (installed) {
+      await this.setupExistingDockerApp(installed);
+    } else {
+      this.onProgress("__progress__:70:Starting Docker Desktop...");
+      this.startDockerDaemon();
+      await this.waitForDocker();
+    }
   }
   /**
    * Install Docker Engine on Linux using Docker's official convenience script.
@@ -6160,13 +6276,14 @@ var DependencyInstaller = class {
     await this.waitForDocker();
   }
   /**
-   * Attempt to start the Docker daemon using multiple strategies.
-   * On macOS: tries Docker Desktop app, then docker CLI commands.
-   * On Linux: tries systemctl, then dockerd direct, then snap.
+   * Start the Docker daemon using multiple strategies.
+   * On macOS: tries Docker Desktop app via `open`, direct binary launch, etc.
+   * On Linux: tries systemctl, service, snap.
    */
   startDockerDaemon(strategy) {
     const os = platform2();
     if (os === "darwin") {
+      const dockerApp = this.findDockerApp();
       switch (strategy) {
         case "cli":
           try {
@@ -6183,24 +6300,56 @@ var DependencyInstaller = class {
             execFileSync2("sleep", ["2"], { timeout: 5e3, stdio: "ignore" });
           } catch {
           }
-          try {
-            execFileSync2("open", ["-a", "Docker"], { timeout: 1e4, stdio: "ignore" });
-          } catch {
+          if (dockerApp) {
+            try {
+              execFileSync2("open", [dockerApp], { timeout: 1e4, stdio: "ignore" });
+            } catch {
+            }
+          } else {
+            try {
+              execFileSync2("open", ["-a", "Docker"], { timeout: 1e4, stdio: "ignore" });
+            } catch {
+            }
           }
           break;
-        case "background":
+        case "background": {
+          const appBin = dockerApp ? join6(dockerApp, "Contents", "MacOS", "Docker") : "/Applications/Docker.app/Contents/MacOS/Docker";
           try {
-            const appBin = "/Applications/Docker.app/Contents/MacOS/Docker";
             if (existsSync4(appBin)) {
               execSync(`"${appBin}" &`, { timeout: 5e3, stdio: "ignore", shell: "sh" });
             }
           } catch {
           }
           break;
+        }
+        case "install": {
+          const installBin = dockerApp ? join6(dockerApp, "Contents", "MacOS", "install") : "/Applications/Docker.app/Contents/MacOS/install";
+          if (existsSync4(installBin)) {
+            const user = process.env.USER || "nobody";
+            try {
+              execSync(`"${installBin}" --accept-license --user=${user}`, { timeout: 6e4, stdio: "ignore" });
+            } catch {
+            }
+          }
+          if (dockerApp) {
+            try {
+              execFileSync2("open", [dockerApp], { timeout: 1e4, stdio: "ignore" });
+            } catch {
+            }
+          }
+          break;
+        }
         default:
-          try {
-            execFileSync2("open", ["-a", "Docker"], { timeout: 1e4, stdio: "ignore" });
-          } catch {
+          if (dockerApp) {
+            try {
+              execFileSync2("open", [dockerApp], { timeout: 1e4, stdio: "ignore" });
+            } catch {
+            }
+          } else {
+            try {
+              execFileSync2("open", ["-a", "Docker"], { timeout: 1e4, stdio: "ignore" });
+            } catch {
+            }
           }
       }
     } else if (os === "linux") {
@@ -6226,14 +6375,14 @@ var DependencyInstaller = class {
     }
   }
   /**
-   * Wait for Docker daemon to be ready, with automatic retry strategies.
-   * Tries multiple approaches to start Docker if the first one fails.
+   * Wait for Docker daemon to be ready.
+   * Cycles through multiple start strategies automatically.
    * Reports progress as a percentage (0-100).
    */
   async waitForDocker() {
     const os = platform2();
-    const strategies = os === "darwin" ? ["default", "cli", "reopen", "background"] : ["default", "service", "snap"];
-    const totalTime = 24e4;
+    const strategies = os === "darwin" ? ["default", "cli", "reopen", "background", "install"] : ["default", "service", "snap"];
+    const totalTime = 3e5;
     const perStrategyTime = Math.floor(totalTime / strategies.length);
     const start = Date.now();
     let strategyIdx = 0;
@@ -6255,6 +6404,7 @@ var DependencyInstaller = class {
           cli: "Trying Docker CLI...",
           reopen: "Restarting Docker Desktop...",
           background: "Trying direct launch...",
+          install: "Re-running Docker installer...",
           service: "Trying service command...",
           snap: "Trying snap..."
         };
@@ -6275,7 +6425,9 @@ var DependencyInstaller = class {
       }
       await new Promise((r) => setTimeout(r, 3e3));
     }
-    throw new Error("DOCKER_MANUAL_START");
+    throw new Error(
+      "Docker could not be started after trying all available methods. This usually means Docker Desktop needs a one-time manual launch to complete its setup. Open Docker from your Applications folder, then run this command again."
+    );
   }
   /**
    * Start the Stalwart mail server Docker container.

package/package.json

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