mercury-agent 0.4.12 → 0.4.14

package/examples/extensions/gws/index.ts

@@ -44,9 +44,13 @@ type MercuryExt = {
   ): void;
 };
 
-import manifest from "../../../resources/connection-env-vars.json";
-
-const gwsEnv = manifest.gws;
+const gwsEnv = {
+  credentialEnvVar: "MERCURY_GWS_CREDENTIALS_JSON",
+  env: {
+    credentials: "MERCURY_GWS_CREDENTIALS_JSON",
+    legacyCredentialsFile: "MERCURY_GOOGLE_WORKSPACE_CLI_CREDENTIALS_FILE",
+  },
+};
 
 /** Path where credentials are materialized inside the inner container's own /tmp. */
 const CREDENTIALS_FILE = "/tmp/gws-credentials.json";

package/examples/extensions/yahoo-mail/index.ts

@@ -30,9 +30,13 @@ type MercuryExt = {
   }): void;
 };
 
-import manifest from "../../../resources/connection-env-vars.json";
-
-const yahooEnv = manifest["yahoo-mail"];
+const yahooEnv = {
+  credentialEnvVar: "MERCURY_YAHOO_APP_PASSWORD",
+  env: {
+    email: "MERCURY_YAHOO_EMAIL",
+    appPassword: "MERCURY_YAHOO_APP_PASSWORD",
+  },
+};
 
 export default function (mercury: MercuryExt) {
   mercury.cli({

package/package.json

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

package/src/agent/container-runner.ts

@@ -385,6 +385,22 @@ const PACKAGE_ROOT = path.join(__dirname, "../..");
 /** Exit code 137 = SIGKILL (128 + 9), typically from OOM killer */
 const OOM_EXIT_CODE = 137;
 
+let _isDockerDesktop: boolean | undefined;
+function isDockerDesktop(): boolean {
+  if (_isDockerDesktop !== undefined) return _isDockerDesktop;
+  try {
+    const info = execFileSync("docker", ["info", "--format", "{{.Name}}"], {
+      encoding: "utf8",
+      timeout: 10_000,
+      stdio: ["pipe", "pipe", "pipe"],
+    }).trim();
+    _isDockerDesktop = info === "docker-desktop";
+  } catch {
+    _isDockerDesktop = false;
+  }
+  return _isDockerDesktop;
+}
+
 export class AgentContainerRunner {
   // Inner containers now run detached (no long-lived `docker` child process to
   // hold a handle to), so we track only the container name — termination is by
@@ -934,7 +950,7 @@ export class AgentContainerRunner {
         "-e",
         "CONTAINER_RUNTIME=runsc",
       );
-    } else if (this.config.containerBwrapDockerCompat) {
+    } 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