@the-open-engine/zeroshot 6.23.0 → 6.24.0

package/src/orchestrator.js

@@ -1836,12 +1836,18 @@ class Orchestrator {
         throw new Error('Docker is not available. Install Docker to use --docker mode.');
       }
 
+      // Pre-effect platform probe: fail before any workspace/container side effect when the
+      // Docker engine cannot run the provider's registry-owned platform (e.g. OMP's linux/amd64).
+      const platform = IsolationManager.providerDockerPlatform(providerName);
+      IsolationManager.assertPlatformSupported(platform);
+
       const baseImage = options.isolationImage || 'zeroshot-cluster-base';
       const image = IsolationManager.imageForProvider(providerName, baseImage);
       await IsolationManager.ensureImage(
         image,
         true,
-        IsolationManager.providerBuildArgs(providerName)
+        IsolationManager.providerBuildArgs(providerName, options.containerHome || '/home/node'),
+        platform
       );
       isolationImage = image;
 
@@ -1856,6 +1862,7 @@ class Orchestrator {
         mounts: options.mounts,
         containerHome: options.containerHome,
         provider: providerName,
+        platform,
       });
       this._log(`[Orchestrator] Container created: ${containerId} (workDir: ${workDir})`);
     } else if (options.worktree) {
@@ -2848,11 +2855,14 @@ class Orchestrator {
     }
 
     const providerName = this._resolveClusterProvider(cluster.config);
+    const platform = IsolationManager.providerDockerPlatform(providerName);
+    IsolationManager.assertPlatformSupported(platform);
     const newContainerId = await cluster.isolation.manager.createContainer(clusterId, {
       workDir,
       image: cluster.isolation.image,
       reuseExistingWorkspace: true,
       provider: providerName,
+      platform,
     });
 
     this._log(`[Orchestrator] New container created: ${newContainerId}`);

package/src/preflight.js

@@ -551,7 +551,7 @@ function validateGhRequirement() {
   return errors;
 }
 
-function validateDockerRequirement() {
+function validateDockerRequirement(providerName) {
   const errors = [];
   const docker = checkDocker();
   if (!docker.available) {
@@ -567,6 +567,19 @@ function validateDockerRequirement() {
             ]
       )
     );
+    return errors;
+  }
+
+  try {
+    const IsolationManager = require('./isolation-manager');
+    IsolationManager.assertPlatformSupported(IsolationManager.providerDockerPlatform(providerName));
+  } catch (err) {
+    errors.push(
+      formatError('Docker cannot run required platform', err.message, [
+        'Install Buildx and run: docker run --privileged --rm tonistiigi/binfmt --install amd64',
+        'Or run Zeroshot on a native amd64 Docker host',
+      ])
+    );
   }
 
   return errors;
@@ -732,7 +745,7 @@ async function runPreflight(options = {}) {
 
   // 6. Check Docker (if required)
   if (options.requireDocker) {
-    errors.push(...validateDockerRequirement());
+    errors.push(...validateDockerRequirement(providerName));
   }
 
   // 7. Check git repo (if required for worktree isolation)