mercury-agent 0.4.18 → 0.4.20

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mercury-agent",
-  "version": "0.4.18",
+  "version": "0.4.20",
   "description": "Personal AI assistant for chat platforms (WhatsApp, Slack, Discord, Telegram)",
   "license": "MIT",
   "author": "Avishai Tsabari",

package/src/agent/container-runner.ts

@@ -1,4 +1,4 @@
-import { execFileSync, execSync, spawn } from "node:child_process";
+import { execFileSync, execSync, spawn, spawnSync } from "node:child_process";
 import { randomBytes } from "node:crypto";
 import fs from "node:fs";
 import path, { dirname } from "node:path";
@@ -389,12 +389,39 @@ let _isDockerDesktop: boolean | undefined;
 function isDockerDesktop(): boolean {
   if (_isDockerDesktop !== undefined) return _isDockerDesktop;
   try {
-    const info = execFileSync("docker", ["info", "--format", "{{.Name}}"], {
+    const result = spawnSync("docker", ["info", "--format", "{{.Name}}"], {
       encoding: "utf8",
       timeout: 10_000,
       stdio: ["pipe", "pipe", "pipe"],
-    }).trim();
-    _isDockerDesktop = info === "docker-desktop";
+    });
+    const name = (result.stdout ?? "").trim();
+    const stderr = (result.stderr ?? "").trim();
+    if (name === "docker-desktop") {
+      _isDockerDesktop = true;
+    } else {
+      // Fallback: check Docker context or server OS for Docker Desktop indicators
+      const ctxResult = spawnSync(
+        "docker",
+        ["info", "--format", "{{.OperatingSystem}}"],
+        { encoding: "utf8", timeout: 10_000, stdio: ["pipe", "pipe", "pipe"] },
+      );
+      const os = (ctxResult.stdout ?? "").trim();
+      _isDockerDesktop =
+        os.includes("Docker Desktop") || os.includes("Docker for Windows");
+      if (_isDockerDesktop) {
+        logger.info("Docker Desktop detected via OperatingSystem field", {
+          name,
+          os,
+        });
+      } else {
+        logger.debug("Docker Desktop not detected", {
+          name,
+          os,
+          exitCode: result.status,
+          stderr: stderr.slice(0, 200),
+        });
+      }
+    }
   } catch {
     _isDockerDesktop = false;
   }
@@ -951,10 +978,10 @@ export class AgentContainerRunner {
         "CONTAINER_RUNTIME=runsc",
       );
     } else if (this.config.containerBwrapDockerCompat || isDockerDesktop()) {
-      // runc + bwrap: bubblewrap needs extra namespace syscalls that Docker's default
-      // seccomp/caps/AppArmor block. seccomp=unconfined allows unshare; apparmor=unconfined
-      // allows mount(MS_SLAVE); SYS_ADMIN grants the mount capability. Bwrap remains active
-      // inside the container; only the outer Docker layer is relaxed.
+      logger.info("Enabling bwrap Docker compat (seccomp/apparmor/SYS_ADMIN)", {
+        configFlag: this.config.containerBwrapDockerCompat,
+        dockerDesktop: isDockerDesktop(),
+      });
       args.push(
         "--security-opt",
         "seccomp=unconfined",