mercury-agent 0.4.11 → 0.4.13

package/examples/extensions/gws/index.ts

@@ -44,7 +44,7 @@ type MercuryExt = {
   ): void;
 };
 
-import manifest from "../../../resources/connection-env-vars.json";
+import manifest from "mercury-agent/resources/connection-env-vars.json";
 
 const gwsEnv = manifest.gws;
 

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

@@ -30,7 +30,7 @@ type MercuryExt = {
   }): void;
 };
 
-import manifest from "../../../resources/connection-env-vars.json";
+import manifest from "mercury-agent/resources/connection-env-vars.json";
 
 const yahooEnv = manifest["yahoo-mail"];
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mercury-agent",
-  "version": "0.4.11",
+  "version": "0.4.13",
   "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

package/src/cli/mercury.ts

@@ -185,13 +185,30 @@ async function runAction(): Promise<void> {
     stdio: "pipe",
   });
   if (imageCheck.status !== 0) {
-    console.error(`Error: Container image '${imageName}' not found.`);
-    if (imageName.startsWith("ghcr.io/")) {
-      console.error(`Run 'docker pull ${imageName}' to pull it.`);
+    // If the configured (registry) image isn't available, try the local build tag
+    const localTag = "mercury-agent:latest";
+    if (imageName !== localTag) {
+      const localCheck = spawnSync("docker", ["image", "inspect", localTag], {
+        stdio: "pipe",
+      });
+      if (localCheck.status === 0) {
+        console.log(
+          `ℹ️  Registry image not found, using locally built ${localTag}\n`,
+        );
+        process.env.MERCURY_AGENT_IMAGE = localTag;
+      } else {
+        console.error(`Error: Container image '${imageName}' not found.`);
+        console.error(
+          `Pull it:  docker pull ${imageName}\n` +
+            `Or build: mercury build`,
+        );
+        process.exit(1);
+      }
     } else {
+      console.error(`Error: Container image '${imageName}' not found.`);
       console.error("Run 'mercury build' to build it.");
+      process.exit(1);
     }
-    process.exit(1);
   }
 
   console.log("🪽 Starting mercury...\n");