@pleri/olam-cli 0.1.24 → 0.1.29

package/dist/index.js

@@ -6824,6 +6824,47 @@ var init_dist = __esm({
   }
 });
 
+// src/docker-host.ts
+var docker_host_exports = {};
+__export(docker_host_exports, {
+  resolveDockerHostOptions: () => resolveDockerHostOptions
+});
+import { spawnSync as spawnSync2 } from "node:child_process";
+function resolveDockerHostOptions(spawnImpl = spawnSync2) {
+  if (process.env.DOCKER_HOST && process.env.DOCKER_HOST.length > 0) {
+    return {};
+  }
+  try {
+    const result = spawnImpl(
+      "docker",
+      ["context", "inspect", "--format", "{{.Endpoints.docker.Host}}"],
+      { encoding: "utf-8", stdio: ["ignore", "pipe", "pipe"] }
+    );
+    if (result.status === 0) {
+      const host = (result.stdout ?? "").trim();
+      if (host.startsWith("unix://")) {
+        return { socketPath: host.slice("unix://".length) };
+      }
+      if (host.startsWith("npipe://")) {
+        return { socketPath: host.slice("npipe://".length) };
+      }
+      if (host.startsWith("tcp://") || host.startsWith("http://") || host.startsWith("https://")) {
+        const url = new URL(host.startsWith("tcp://") ? host.replace("tcp://", "http://") : host);
+        const protocol = host.startsWith("https://") ? "https" : "http";
+        const port = url.port ? parseInt(url.port, 10) : protocol === "https" ? 2376 : 2375;
+        return { host: url.hostname, port, protocol };
+      }
+    }
+  } catch {
+  }
+  return { socketPath: "/var/run/docker.sock" };
+}
+var init_docker_host = __esm({
+  "src/docker-host.ts"() {
+    "use strict";
+  }
+});
+
 // ../core/src/world/state.ts
 var VALID_TRANSITIONS, WorldStateMachine;
 var init_state = __esm({
@@ -11736,7 +11777,8 @@ async function loadContext() {
     const { PleriClient: PleriClient2 } = await Promise.resolve().then(() => (init_pleri(), pleri_exports));
     const config = loadConfig2(process.env.OLAM_CONFIG_DIR);
     const registry = new WorldRegistry3();
-    const computeProvider = new DockerProvider2();
+    const { resolveDockerHostOptions: resolveDockerHostOptions2 } = await Promise.resolve().then(() => (init_docker_host(), docker_host_exports));
+    const computeProvider = new DockerProvider2(resolveDockerHostOptions2());
     const dashboardManager = new DashboardManager2(config.dashboard);
     let pleriClient;
     if (config.pleri) {
@@ -12733,7 +12775,7 @@ async function runAuthStatus(getStatus) {
 // src/commands/auth-upgrade.ts
 import * as fs20 from "node:fs";
 import * as path23 from "node:path";
-import { spawnSync as spawnSync6 } from "node:child_process";
+import { spawnSync as spawnSync7 } from "node:child_process";
 import ora2 from "ora";
 import pc7 from "picocolors";
 
@@ -12743,11 +12785,12 @@ import * as crypto5 from "node:crypto";
 import * as fs19 from "node:fs";
 import * as os12 from "node:os";
 import * as path22 from "node:path";
-import { spawnSync as spawnSync3 } from "node:child_process";
+import { spawnSync as spawnSync4 } from "node:child_process";
 import Dockerode2 from "dockerode";
+init_docker_host();
 
 // ../core/src/util/open-url.ts
-import { spawnSync as spawnSync2 } from "node:child_process";
+import { spawnSync as spawnSync3 } from "node:child_process";
 function openUrl(url) {
   if (process.env.CI === "true") {
     return { opened: false, reason: "CI environment detected" };
@@ -12771,7 +12814,7 @@ function openUrl(url) {
     args = [url];
   }
   try {
-    const result = spawnSync2(cmd, args, { stdio: "ignore", timeout: 5e3 });
+    const result = spawnSync3(cmd, args, { stdio: "ignore", timeout: 5e3 });
     if (result.error) {
       return { opened: false, reason: `spawn ${cmd}: ${result.error.message}` };
     }
@@ -12851,7 +12894,7 @@ function removePid() {
   return true;
 }
 async function findHostCpContainer() {
-  const docker2 = new Dockerode2();
+  const docker2 = new Dockerode2(resolveDockerHostOptions());
   const containers = await docker2.listContainers({ all: true });
   for (const c of containers) {
     const names = (c.Names ?? []).map((n) => n.replace(/^\//, ""));
@@ -12940,7 +12983,7 @@ async function probeHealth() {
   }
 }
 function runCompose(args, composeFile, extraEnv = {}) {
-  const result = spawnSync3("docker", ["compose", "-f", composeFile, ...args], {
+  const result = spawnSync4("docker", ["compose", "-f", composeFile, ...args], {
     encoding: "utf-8",
     stdio: ["ignore", "pipe", "pipe"],
     env: { ...process.env, ...extraEnv }
@@ -12963,7 +13006,7 @@ function buildComposeEnv(authSecret, ghToken) {
 }
 function captureGhToken() {
   try {
-    const result = spawnSync3("gh", ["auth", "token"], {
+    const result = spawnSync4("gh", ["auth", "token"], {
       encoding: "utf-8",
       stdio: ["ignore", "pipe", "pipe"]
     });
@@ -12990,7 +13033,7 @@ async function handleStart(opts) {
     return;
   }
   try {
-    const docker2 = new Dockerode2();
+    const docker2 = new Dockerode2(resolveDockerHostOptions());
     await auditPortsForZombies(docker2, [HOST_CP_PORT]);
   } catch (err) {
     if (err instanceof PortHeldByZombieError) {
@@ -13030,7 +13073,7 @@ async function handleStart(opts) {
       await new Promise((r) => setTimeout(r, PULL_BACKOFF_MS[attempt]));
     }
     const pullResult = runCompose(
-      ["pull", "--quiet", "--ignore-buildable"],
+      ["pull", "--quiet", "docker-socket-proxy"],
       composeFile,
       composeEnv
     );
@@ -13041,13 +13084,13 @@ async function handleStart(opts) {
     lastPullStderr = pullResult.stderr;
   }
   if (!pullOk) {
-    printError("docker compose pull failed after 3 attempts (sidecar image)");
+    printError("docker compose pull docker-socket-proxy failed after 3 attempts");
     process.stderr.write(lastPullStderr);
     removeToken();
     process.exitCode = 1;
     return;
   }
-  const result = runCompose(["up", "-d", "--build"], composeFile, composeEnv);
+  const result = runCompose(["up", "-d"], composeFile, composeEnv);
   if (!result.ok) {
     printError("docker compose up failed");
     process.stderr.write(result.stderr);
@@ -13320,14 +13363,14 @@ init_auth();
 
 // src/commands/bootstrap.ts
 init_install_root();
-import { spawn as spawn2, spawnSync as spawnSync5 } from "node:child_process";
+import { spawn as spawn2, spawnSync as spawnSync6 } from "node:child_process";
 import { existsSync as existsSync18, readFileSync as readFileSync15 } from "node:fs";
 import { join as join25 } from "node:path";
 import ora from "ora";
 import pc6 from "picocolors";
 
 // src/protocol-version.ts
-import { spawnSync as spawnSync4 } from "node:child_process";
+import { spawnSync as spawnSync5 } from "node:child_process";
 var OLAM_PROTOCOL_VERSIONS_SUPPORTED = [1];
 function parseProtocolVersionsLabel(labelValue) {
   if (!labelValue) return [];
@@ -13416,6 +13459,9 @@ var realDocker = {
       "--format",
       `{{ index .Config.Labels "${label}" }}`
     ]);
+  },
+  async tag(source, target) {
+    return spawnAsync("docker", ["tag", source, target]);
   }
 };
 function spawnAsync(cmd, args, opts = {}) {
@@ -13476,7 +13522,7 @@ async function pullOnce(imageRef, docker2, timeoutMs) {
   }
 }
 var REAL_OLAM_SUBCOMMAND = (args) => {
-  const result = spawnSync5(process.execPath, [
+  const result = spawnSync6(process.execPath, [
     process.argv[1] ?? "olam",
     ...args
   ], {
@@ -13569,6 +13615,24 @@ async function runBootstrap2(opts, deps = {}) {
     }
   }
   handshakeSpinner.succeed("Protocol handshake passed (all 3 images)");
+  const tagSpinner = ora("Aliasing pulled digests as :latest").start();
+  const tagPlan = [
+    { name: "host-cp", from: imageRefs[0].ref, to: `${registry}/olam-host-cp:latest` },
+    { name: "auth", from: imageRefs[1].ref, to: `${registry}/olam-auth:latest` },
+    { name: "devbox", from: imageRefs[2].ref, to: `${registry}/olam-devbox:latest` }
+  ];
+  for (const { name, from, to } of tagPlan) {
+    const result = await docker2.tag(from, to);
+    if (result.exitCode !== 0) {
+      tagSpinner.fail(`Failed to tag ${name}`);
+      process.stderr.write(
+        `${pc6.red("error")} docker tag ${from} ${to} failed: ${result.stderr}
+`
+      );
+      return { exitCode: EXIT_GENERIC_ERROR, summary: `tag failed: ${name}` };
+    }
+  }
+  tagSpinner.succeed("Aliased 3 images as :latest");
   const runOlam = deps.runOlamSubcommand ?? REAL_OLAM_SUBCOMMAND;
   const hostCpSpinner = ora("Starting host-cp").start();
   const hostCp = runOlam(["host-cp", "start"]);
@@ -13720,7 +13784,7 @@ async function smokeTestCodexProvider(authSecret) {
 function runStep(label, cmd, args, opts = {}) {
   const start = Date.now();
   process.stdout.write(`  ${pc7.dim(label.padEnd(34))}`);
-  const result = spawnSync6(cmd, [...args], {
+  const result = spawnSync7(cmd, [...args], {
     encoding: "utf-8",
     stdio: ["ignore", "pipe", "pipe"],
     cwd: opts.cwd ?? process.cwd(),
@@ -13840,7 +13904,7 @@ async function runAuthUpgradePullByDigest(deps = {}) {
 }
 function defaultTagAuth(from, to) {
   try {
-    const r = spawnSync6("docker", ["tag", from, to], {
+    const r = spawnSync7("docker", ["tag", from, to], {
       encoding: "utf-8",
       stdio: ["ignore", "ignore", "pipe"]
     });
@@ -13858,11 +13922,11 @@ function defaultTagAuth(from, to) {
 }
 async function defaultRecreateAuth() {
   try {
-    spawnSync6("docker", ["stop", "olam-auth"], {
+    spawnSync7("docker", ["stop", "olam-auth"], {
       encoding: "utf-8",
       stdio: ["ignore", "ignore", "ignore"]
     });
-    spawnSync6("docker", ["rm", "olam-auth"], {
+    spawnSync7("docker", ["rm", "olam-auth"], {
       encoding: "utf-8",
       stdio: ["ignore", "ignore", "ignore"]
     });
@@ -13931,7 +13995,7 @@ ${imageResult.stderr}`);
   }
   const stopStart = Date.now();
   process.stdout.write(`  ${pc7.dim("docker stop olam-auth".padEnd(34))}`);
-  spawnSync6("docker", ["stop", "olam-auth"], {
+  spawnSync7("docker", ["stop", "olam-auth"], {
     encoding: "utf-8",
     stdio: ["ignore", "pipe", "pipe"]
   });
@@ -13941,7 +14005,7 @@ ${imageResult.stderr}`);
   timings.push({ label: "container stop", durationMs: stopDurationMs });
   const rmStart = Date.now();
   process.stdout.write(`  ${pc7.dim("docker rm olam-auth".padEnd(34))}`);
-  spawnSync6("docker", ["rm", "olam-auth"], {
+  spawnSync7("docker", ["rm", "olam-auth"], {
     encoding: "utf-8",
     stdio: ["ignore", "pipe", "pipe"]
   });
@@ -14235,7 +14299,7 @@ ${pc8.dim("Next: olam create --name my-world")}`);
 
 // src/commands/create.ts
 init_manager();
-import { spawnSync as spawnSync7 } from "node:child_process";
+import { spawnSync as spawnSync8 } from "node:child_process";
 import { existsSync as existsSync21 } from "node:fs";
 import { dirname as dirname14, resolve as resolve7 } from "node:path";
 import ora3 from "ora";
@@ -14603,7 +14667,7 @@ function registerCreate(program2) {
             throw err;
           }
           const spinner2 = ora3("Rebuilding olam-devbox:latest\u2026").start();
-          const rebuild = spawnSync7(
+          const rebuild = spawnSync8(
             "bash",
             [buildScript],
             { cwd: repoRoot, stdio: "inherit" }
@@ -17495,7 +17559,7 @@ function registerPolicyCheck(program2) {
 // src/commands/upgrade.ts
 import * as fs24 from "node:fs";
 import * as path28 from "node:path";
-import { spawnSync as spawnSync9 } from "node:child_process";
+import { spawnSync as spawnSync10 } from "node:child_process";
 import ora7 from "ora";
 import pc16 from "picocolors";
 
@@ -17503,7 +17567,7 @@ import pc16 from "picocolors";
 import * as fs22 from "node:fs";
 import * as os13 from "node:os";
 import * as path26 from "node:path";
-import { spawnSync as spawnSync8 } from "node:child_process";
+import { spawnSync as spawnSync9 } from "node:child_process";
 var LOCK_FILE_PATH = path26.join(os13.homedir(), ".olam", ".upgrade.lock");
 var STALE_LOCK_TIMEOUT_MS = 5 * 60 * 1e3;
 function readLockFile(lockPath) {
@@ -17528,7 +17592,7 @@ function isPidAlive(pid) {
 }
 var PS_UNAVAILABLE = "__ps_unavailable__";
 function getPidCommand(pid) {
-  const result = spawnSync8("ps", ["-p", String(pid), "-o", "comm="], {
+  const result = spawnSync9("ps", ["-p", String(pid), "-o", "comm="], {
     encoding: "utf-8",
     stdio: ["ignore", "pipe", "ignore"]
   });
@@ -17784,7 +17848,7 @@ function extractBundleHash(indexHtml) {
 function runStep2(label, cmd, args, opts = {}) {
   const start = Date.now();
   process.stdout.write(`  ${pc16.dim(label.padEnd(34))}`);
-  const result = spawnSync9(cmd, [...args], {
+  const result = spawnSync10(cmd, [...args], {
     encoding: "utf-8",
     stdio: ["ignore", "pipe", "pipe"],
     cwd: opts.cwd ?? process.cwd(),
@@ -17803,7 +17867,7 @@ function runStep2(label, cmd, args, opts = {}) {
   };
 }
 function isGitDirty(cwd) {
-  const result = spawnSync9("git", ["status", "--porcelain"], {
+  const result = spawnSync10("git", ["status", "--porcelain"], {
     encoding: "utf-8",
     stdio: ["ignore", "pipe", "pipe"],
     cwd
@@ -17811,7 +17875,7 @@ function isGitDirty(cwd) {
   return (result.stdout ?? "").trim().length > 0;
 }
 function hasGitUpstream(cwd) {
-  const result = spawnSync9("git", ["rev-parse", "--abbrev-ref", "@{u}"], {
+  const result = spawnSync10("git", ["rev-parse", "--abbrev-ref", "@{u}"], {
     encoding: "utf-8",
     stdio: ["ignore", "pipe", "pipe"],
     cwd
@@ -17819,7 +17883,7 @@ function hasGitUpstream(cwd) {
   return result.status === 0;
 }
 function captureHeadSha(cwd) {
-  const result = spawnSync9("git", ["rev-parse", "HEAD"], {
+  const result = spawnSync10("git", ["rev-parse", "HEAD"], {
     encoding: "utf-8",
     stdio: ["ignore", "pipe", "pipe"],
     cwd
@@ -17834,7 +17898,7 @@ function abbreviateSha(sha) {
 }
 function imageExists(tag) {
   try {
-    const result = spawnSync9("docker", ["image", "inspect", "--format", "{{.Id}}", tag], {
+    const result = spawnSync10("docker", ["image", "inspect", "--format", "{{.Id}}", tag], {
       encoding: "utf-8",
       stdio: ["ignore", "pipe", "ignore"]
     });
@@ -17849,7 +17913,7 @@ function checkRollbackSetExists(plan) {
   return missing.join(", ");
 }
 function smokeImage(image, targetSha) {
-  const createResult = spawnSync9("docker", ["create", "--name", `olam-smoke-${Date.now()}`, image], {
+  const createResult = spawnSync10("docker", ["create", "--name", `olam-smoke-${Date.now()}`, image], {
     encoding: "utf-8",
     stdio: ["ignore", "pipe", "pipe"]
   });
@@ -17862,7 +17926,7 @@ function smokeImage(image, targetSha) {
     };
   }
   const containerId = (createResult.stdout ?? "").trim();
-  const inspectResult = spawnSync9(
+  const inspectResult = spawnSync10(
     "docker",
     ["inspect", "--format", '{{index .Config.Labels "olam.build.sha"}}', image],
     {
@@ -17871,7 +17935,7 @@ function smokeImage(image, targetSha) {
     }
   );
   if (containerId.length > 0) {
-    spawnSync9("docker", ["rm", "-f", containerId], {
+    spawnSync10("docker", ["rm", "-f", containerId], {
       encoding: "utf-8",
       stdio: ["ignore", "ignore", "ignore"]
     });
@@ -17910,7 +17974,7 @@ var PRODUCTION_SWAP_PLAN = [
 ];
 function dockerTag(source, dest) {
   try {
-    const result = spawnSync9("docker", ["tag", source, dest], {
+    const result = spawnSync10("docker", ["tag", source, dest], {
       encoding: "utf-8",
       stdio: ["ignore", "ignore", "pipe"]
     });
@@ -18073,11 +18137,11 @@ async function waitForAuthHealthLocal(timeoutMs = 15e3) {
 async function recreateAuthService() {
   const start = Date.now();
   try {
-    spawnSync9("docker", ["stop", "olam-auth"], {
+    spawnSync10("docker", ["stop", "olam-auth"], {
       encoding: "utf-8",
       stdio: ["ignore", "ignore", "ignore"]
     });
-    spawnSync9("docker", ["rm", "olam-auth"], {
+    spawnSync10("docker", ["rm", "olam-auth"], {
       encoding: "utf-8",
       stdio: ["ignore", "ignore", "ignore"]
     });
@@ -18241,11 +18305,11 @@ async function runUpgradePullByDigest(deps = {}) {
 }
 async function defaultRecreateAuthForUpgrade() {
   try {
-    spawnSync9("docker", ["stop", "olam-auth"], {
+    spawnSync10("docker", ["stop", "olam-auth"], {
       encoding: "utf-8",
       stdio: ["ignore", "ignore", "ignore"]
     });
-    spawnSync9("docker", ["rm", "olam-auth"], {
+    spawnSync10("docker", ["rm", "olam-auth"], {
       encoding: "utf-8",
       stdio: ["ignore", "ignore", "ignore"]
     });
@@ -18589,7 +18653,7 @@ ${spaResult.stderr}`);
       process.stdout.write(`  ${pc16.dim(step.label.padEnd(34))}
 `);
       const start = Date.now();
-      const result = spawnSync9("bash", [scriptPath], {
+      const result = spawnSync10("bash", [scriptPath], {
         stdio: "inherit",
         cwd,
         env: { ...process.env, ...olamTagEnv }
@@ -18935,7 +18999,7 @@ function registerLogs(program2) {
 // src/commands/ps.ts
 init_context();
 import pc18 from "picocolors";
-import { spawnSync as spawnSync10 } from "node:child_process";
+import { spawnSync as spawnSync11 } from "node:child_process";
 var SAFE_IDENT4 = /^[a-z0-9][a-z0-9-]{0,63}$/;
 function parseDockerTop(stdout) {
   const trimmed = stdout.trim();
@@ -19035,7 +19099,7 @@ function registerPs(program2) {
     const containerName = `olam-${worldId}-devbox`;
     let watchInterval;
     function fetchAndPrint() {
-      const result = spawnSync10(
+      const result = spawnSync11(
         "docker",
         ["top", containerName, "pid", "user", "pcpu", "pmem", "stime", "stat", "cmd"],
         { encoding: "utf-8", timeout: 3e3 }
@@ -19548,7 +19612,7 @@ init_context();
 import * as fs29 from "node:fs";
 import * as os17 from "node:os";
 import * as path33 from "node:path";
-import { spawnSync as spawnSync11 } from "node:child_process";
+import { spawnSync as spawnSync12 } from "node:child_process";
 import ora8 from "ora";
 
 // src/commands/refresh-helpers.ts
@@ -19592,7 +19656,7 @@ var RESTART_TIMEOUT_S = 30;
 var HEALTH_POLL_MS = 500;
 var HEALTH_TIMEOUT_MS = 3e4;
 function docker(args) {
-  const result = spawnSync11("docker", args, {
+  const result = spawnSync12("docker", args, {
     encoding: "utf-8",
     stdio: ["ignore", "pipe", "pipe"]
   });

package/host-cp/compose.yaml

@@ -26,10 +26,24 @@
 services:
   host-cp:
     container_name: olam-host-cp
-    build:
-      context: .
-      dockerfile: Dockerfile
-    image: olam-host-cp:latest
+    # Image-only — operator's `olam bootstrap` pulls the digest-pinned
+    # `ghcr.io/pleri/olam-host-cp:latest` (digest from image-digests.json)
+    # and tags it as the local `:latest` BEFORE compose up. No `build:`
+    # in this file — fresh-install operators don't have the source tree
+    # so a `build:` block crashes them with "Dockerfile not found".
+    #
+    # Local-dev contributors who want to test host-cp source changes
+    # use the sibling compose.dev.yaml as an override:
+    #
+    #   docker compose \
+    #     -f packages/host-cp/compose.yaml \
+    #     -f packages/host-cp/compose.dev.yaml \
+    #     up --build -d
+    #
+    # The CLI's `olam host-cp start` always uses ONLY compose.yaml, so
+    # operator boots are never blocked on a missing Dockerfile / build
+    # context.
+    image: ghcr.io/pleri/olam-host-cp:latest
     ports:
       # Bind to 127.0.0.1 only — single-user-per-host assumption (T4).
       # Multi-user / TLS / remote access lands in Phase G+.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pleri/olam-cli",
-  "version": "0.1.24",
+  "version": "0.1.29",
   "type": "module",
   "bin": {
     "olam": "./dist/index.js"