@runuai/host 0.9.65 → 0.9.66

package/lib/container-runtime.ts

@@ -883,14 +883,21 @@ export async function detectContainerRuntime(
         appleUnavailable(preference, selectedAppleRuntime(deps) === null, deps)
       );
     }
-    // ADR-106: prefer the bundled runtime wherever it can run — ambient
-    // Docker existing is not a reason to skip it. A failed activation falls
-    // through to Docker rather than degrading a machine that has one.
+    // ADR-119 (inverting ADR-106): a present, healthy ambient Docker/OrbStack
+    // daemon wins — it is the battle-tested path, and `auto` must never
+    // migrate a machine off a working daemon it already trusts. The bundled
+    // runtime is the zero-dependency fallback for machines with no daemon:
+    // an absent/remote/unanswering Docker on a machine that never chose
+    // Docker is not an error to surface. One probe serves both outcomes —
+    // its rendered state is reused if the bundled runtime also fails.
+    const ambient = await detectAmbientDockerCore(preference, deps);
+    if (ambient.usable) return ambient.state;
     const selected = await probeAndSelectApple(preference, deps);
     if (selected !== null) return selected;
+    return ambient.state;
   }
 
-  return detectAmbientDocker(preference, deps);
+  return (await detectAmbientDockerCore(preference, deps)).state;
 }
 
 function appleUnavailable(
@@ -915,10 +922,19 @@ function appleUnavailable(
   };
 }
 
-async function detectAmbientDocker(
+/**
+ * Ambient-Docker detection. `usable: false` marks the ADR-119 fall-through
+ * verdicts — an absent daemon, a remote endpoint, an unresolvable context —
+ * so `auto` can try the bundled runtime instead of surfacing Docker's
+ * errors on a machine that never chose Docker, while still carrying the
+ * rendered state for callers that need it (explicit `docker`, and auto once
+ * the bundled runtime also failed). A ready selection and a pin conflict
+ * are both `usable: true`: neither may fall through.
+ */
+async function detectAmbientDockerCore(
   preference: "auto" | "docker",
   deps: RuntimeDetectionDeps,
-): Promise<ContainerRuntimeState> {
+): Promise<{ usable: boolean; state: ContainerRuntimeState }> {
   // A successful ambient `docker info` is not a durable selection: collapse a
   // named context to its exact local endpoint before publishing DOCKER_HOST.
   const selection =
@@ -929,24 +945,30 @@ async function detectAmbientDocker(
         : null;
   if (selection && !isLocalDockerEndpoint(selection.host)) {
     return {
-      status: "no-runtime",
-      preference,
-      message:
-        "The selected Docker endpoint is remote. " +
-        "Uai Host requires a local Unix-socket daemon for workspace mounts and loopback tunnels. " +
-        `Select a local Docker context, then run \`${RUNTIME_RESTART_COMMAND}\`.`,
-      action: RUNTIME_RESTART_COMMAND,
+      usable: false,
+      state: {
+        status: "no-runtime",
+        preference,
+        message:
+          "The selected Docker endpoint is remote. " +
+          "Uai Host requires a local Unix-socket daemon for workspace mounts and loopback tunnels. " +
+          `Select a local Docker context, then run \`${RUNTIME_RESTART_COMMAND}\`.`,
+        action: RUNTIME_RESTART_COMMAND,
+      },
     };
   }
 
   if (deps.dockerInfo === undefined && selection === null) {
     return {
-      status: "no-runtime",
-      preference,
-      message:
-        "Uai Host could not resolve the selected Docker context to a local endpoint. " +
-        `Select a local Docker context and run \`${RUNTIME_RECHECK_COMMAND}\`.`,
-      action: RUNTIME_RECHECK_COMMAND,
+      usable: false,
+      state: {
+        status: "no-runtime",
+        preference,
+        message:
+          "Uai Host could not resolve the selected Docker context to a local endpoint. " +
+          `Select a local Docker context and run \`${RUNTIME_RECHECK_COMMAND}\`.`,
+        action: RUNTIME_RECHECK_COMMAND,
+      },
     };
   }
 
@@ -954,20 +976,26 @@ async function detectAmbientDocker(
   if (proof !== null) {
     if (selection) {
       if (!pinRuntime("docker", selection.host, proof.engineId)) {
-        return pinnedRuntimeUnavailable(preference);
+        return { usable: true, state: pinnedRuntimeUnavailable(preference) };
       }
     }
-    return { status: "ready", preference, provider: "docker" };
+    return {
+      usable: true,
+      state: { status: "ready", preference, provider: "docker" },
+    };
   }
   return {
-    status: "no-runtime",
-    preference,
-    message:
-      preference === "docker"
-        ? "No working Docker runtime was found. Install or start Docker, then run " +
-          `\`${RUNTIME_RECHECK_COMMAND}\`.`
-        : NO_RUNTIME_MESSAGE,
-    action: RUNTIME_RECHECK_COMMAND,
+    usable: false,
+    state: {
+      status: "no-runtime",
+      preference,
+      message:
+        preference === "docker"
+          ? "No working Docker runtime was found. Install or start Docker, then run " +
+            `\`${RUNTIME_RECHECK_COMMAND}\`.`
+          : NO_RUNTIME_MESSAGE,
+      action: RUNTIME_RECHECK_COMMAND,
+    },
   };
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@runuai/host",
-  "version": "0.9.65",
+  "version": "0.9.66",
   "description": "Uai host — runs ephemeral AI tasks in containers on a machine you control.",
   "license": "MIT",
   "author": "Uai Tech <team@runuai.com>",