@agenticmail/core 0.5.22 → 0.5.24

package/dist/index.d.ts

@@ -1456,12 +1456,13 @@ declare class DependencyInstaller {
      * Runs the built-in installer silently (--accept-license to link CLI tools),
      * then starts Docker Desktop hidden (no GUI window).
      */
-    private setupExistingDockerApp;
     /**
-     * Accept Docker Desktop license by writing acceptance files directly to disk.
-     * This bypasses the GUI terms dialog entirely.
+     * 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 acceptLicenseProgrammatically;
+    private setupExistingDockerApp;
     /**
      * Hide Docker Desktop completely — close all windows, hide from dock, make invisible.
      * Called after starting Docker to ensure the user never sees any Docker UI.
@@ -1470,8 +1471,20 @@ 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.
+     */
+    /**
+     * Ensure /usr/local/bin and /usr/local/cli-plugins are writable by the
+     * current user. Brew needs to create symlinks there and will fail silently
+     * if they're root-owned (it tries sudo which fails non-interactively).
+     */
+    private fixLocalDirPermissions;
+    /**
+     * After DMG install, manually link Docker CLI tools (brew does this
+     * automatically, but the DMG path doesn't).
      */
+    private linkDockerCli;
     private installDockerMac;
     /**
      * Install Docker Engine on Linux using Docker's official convenience script.

package/dist/index.js

@@ -6221,86 +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) {
+  /**
+   * 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.acceptLicenseProgrammatically();
-    const installBin = join6(appPath, "Contents", "MacOS", "install");
-    if (existsSync4(installBin)) {
-      this.onProgress("__progress__:30: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));
     }
-    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, 2e3));
-    this.configureDockerHeadless();
-    this.onProgress("__progress__:50:Starting engine...");
-    this.startDockerDaemon();
-    await this.waitForDocker();
-    this.hideDockerWindow();
-  }
-  /**
-   * Accept Docker Desktop license by writing acceptance files directly to disk.
-   * This bypasses the GUI terms dialog entirely.
-   */
-  acceptLicenseProgrammatically() {
-    try {
-      const sysDir = "/Library/Application Support/com.docker.docker";
-      if (!existsSync4(sysDir)) {
-        try {
-          mkdirSync3(sysDir, { recursive: true });
-        } catch {
-        }
-      }
-      if (existsSync4(sysDir)) {
-        writeFileSync3(join6(sysDir, "install-settings.json"), JSON.stringify({ acceptLicense: true }));
-      }
-    } catch {
-    }
-    try {
-      const userDir = join6(process.env.HOME || homedir5(), "Library/Group Containers/group.com.docker");
-      if (!existsSync4(userDir)) {
-        mkdirSync3(userDir, { recursive: true });
-      }
-      const settingsFile = join6(userDir, "settings-store.json");
-      const settings = {};
-      if (existsSync4(settingsFile)) {
-        try {
-          Object.assign(settings, JSON.parse(readFileSync2(settingsFile, "utf-8")));
-        } catch {
-        }
-      }
-      Object.assign(settings, {
-        AutoStart: false,
-        OpenUIOnStartupDisabled: true,
-        TipShown: true,
-        SUAutomaticallyUpdate: false,
-        AnalyticsEnabled: false
-      });
-      writeFileSync3(settingsFile, JSON.stringify(settings, null, 2));
-    } catch {
-    }
+    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.
@@ -6351,70 +6309,130 @@ 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.
+   */
+  /**
+   * Ensure /usr/local/bin and /usr/local/cli-plugins are writable by the
+   * current user. Brew needs to create symlinks there and will fail silently
+   * if they're root-owned (it tries sudo which fails non-interactively).
    */
+  fixLocalDirPermissions() {
+    const user = process.env.USER || "";
+    if (!user) return;
+    const dirs = ["/usr/local/bin", "/usr/local/cli-plugins"];
+    for (const dir of dirs) {
+      try {
+        if (!existsSync4(dir)) {
+          execSync(`mkdir -p "${dir}"`, { timeout: 5e3, stdio: "ignore" });
+        }
+        const stat = execSync(`stat -f '%Su' "${dir}"`, { timeout: 5e3, stdio: ["ignore", "pipe", "ignore"] }).toString().trim();
+        if (stat !== user) {
+          try {
+            execSync(`find "${dir}" -maxdepth 1 -type l ! -exec test -e {} \\; -delete 2>/dev/null`, { timeout: 5e3, stdio: "ignore" });
+          } catch {
+          }
+          try {
+            execSync(`chown -R ${user} "${dir}"`, { timeout: 5e3, stdio: "ignore" });
+          } catch {
+          }
+        }
+      } catch {
+      }
+    }
+  }
+  /**
+   * After DMG install, manually link Docker CLI tools (brew does this
+   * automatically, but the DMG path doesn't).
+   */
+  linkDockerCli(appPath) {
+    const links = [
+      [join6(appPath, "Contents/Resources/bin/docker"), "/usr/local/bin/docker"],
+      [join6(appPath, "Contents/Resources/bin/docker-credential-desktop"), "/usr/local/bin/docker-credential-desktop"],
+      [join6(appPath, "Contents/Resources/bin/docker-credential-ecr-login"), "/usr/local/bin/docker-credential-ecr-login"],
+      [join6(appPath, "Contents/Resources/bin/docker-credential-osxkeychain"), "/usr/local/bin/docker-credential-osxkeychain"],
+      [join6(appPath, "Contents/Resources/cli-plugins/docker-compose"), "/usr/local/cli-plugins/docker-compose"]
+    ];
+    for (const [src, dest] of links) {
+      try {
+        if (existsSync4(src)) {
+          const destDir = join6(dest, "..");
+          if (!existsSync4(destDir)) mkdirSync3(destDir, { recursive: true });
+          try {
+            execSync(`rm -f "${dest}"`, { timeout: 3e3, stdio: "ignore" });
+          } catch {
+          }
+          execSync(`ln -s "${src}" "${dest}"`, { timeout: 3e3, stdio: "ignore" });
+        }
+      } catch {
+      }
+    }
+  }
   async installDockerMac() {
+    let installed = false;
+    this.fixLocalDirPermissions();
     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!");
-          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.");
+        }
       }
-      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" });
+        execSync("hdiutil detach /Volumes/Docker -quiet", { timeout: 15e3, stdio: "ignore" });
       } catch {
-        throw new Error("Failed to install. You may need to run this with admin privileges.");
       }
+      try {
+        await unlink(dmgPath);
+      } catch {
+      }
+      const appPath2 = this.findDockerApp();
+      if (appPath2) this.linkDockerCli(appPath2);
     }
-    try {
-      execSync("hdiutil detach /Volumes/Docker -quiet", { timeout: 15e3, stdio: "ignore" });
-    } catch {
-    }
-    try {
-      await unlink(dmgPath);
-    } catch {
+    const appPath = this.findDockerApp();
+    if (!appPath) {
+      throw new Error("Docker Desktop was installed but could not be found. Try again.");
     }
-    await this.setupExistingDockerApp("/Applications/Docker.app");
+    await this.setupExistingDockerApp(appPath);
   }
   /**
    * Install Docker Engine on Linux using Docker's official convenience script.

package/package.json

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