@pleri/olam-cli 0.1.111 → 0.1.113

package/dist/index.js

@@ -21,11 +21,11 @@ import * as path from "node:path";
 import { fileURLToPath } from "node:url";
 function readCliVersion() {
   try {
-    const here = path.dirname(fileURLToPath(import.meta.url));
+    const here2 = path.dirname(fileURLToPath(import.meta.url));
     for (const candidate of [
-      path.join(here, "package.json"),
-      path.join(here, "..", "package.json"),
-      path.join(here, "..", "..", "package.json")
+      path.join(here2, "package.json"),
+      path.join(here2, "..", "package.json"),
+      path.join(here2, "..", "..", "package.json")
     ]) {
       if (fs.existsSync(candidate)) {
         const pkg = JSON.parse(fs.readFileSync(candidate, "utf-8"));
@@ -5198,7 +5198,7 @@ async function safeText(res) {
   }
 }
 function sleep(ms) {
-  return new Promise((resolve11) => setTimeout(resolve11, ms));
+  return new Promise((resolve12) => setTimeout(resolve12, ms));
 }
 var DEFAULT_BASE_URL, DEFAULT_TIMEOUT_MS, RETRY_COUNT, RETRY_BACKOFF_MS, AuthClient;
 var init_client = __esm({
@@ -5345,12 +5345,12 @@ import { existsSync as existsSync9 } from "node:fs";
 import * as path9 from "node:path";
 import { fileURLToPath as fileURLToPath2 } from "node:url";
 function resolveAuthServicePath() {
-  const here = fileURLToPath2(import.meta.url);
-  const pkgsDir = path9.resolve(path9.dirname(here), "..", "..", "..");
+  const here2 = fileURLToPath2(import.meta.url);
+  const pkgsDir = path9.resolve(path9.dirname(here2), "..", "..", "..");
   return path9.join(pkgsDir, "auth-service");
 }
 function sleep2(ms) {
-  return new Promise((resolve11) => setTimeout(resolve11, ms));
+  return new Promise((resolve12) => setTimeout(resolve12, ms));
 }
 var DEFAULT_PORT, DEFAULT_VOLUME, DEFAULT_CONTAINER, DEFAULT_IMAGE, AuthContainerController;
 var init_container = __esm({
@@ -5645,6 +5645,98 @@ var init_network = __esm({
   }
 });
 
+// ../adapters/dist/docker/pull.js
+import { spawn } from "node:child_process";
+function spawnAsync(cmd, args, opts = {}) {
+  return new Promise((resolve12) => {
+    const child = spawn(cmd, [...args], {
+      stdio: ["ignore", "pipe", "pipe"],
+      signal: opts.signal
+    });
+    let stdout = "";
+    let stderr = "";
+    child.stdout?.on("data", (chunk) => {
+      stdout += chunk.toString();
+    });
+    child.stderr?.on("data", (chunk) => {
+      stderr += chunk.toString();
+    });
+    child.on("error", (err) => {
+      resolve12({ exitCode: -1, stdout, stderr: stderr + err.message });
+    });
+    child.on("close", (code) => {
+      resolve12({ exitCode: code ?? -1, stdout, stderr });
+    });
+  });
+}
+function isTransientPullFailure(result) {
+  const s = result.stderr.toLowerCase();
+  return result.exitCode !== 0 && (/timeout|connection|temporarily|429|503|tls handshake|network/.test(s) || result.exitCode === 124 || result.exitCode === -1);
+}
+async function pullImageWithRetry(imageRef, docker2 = realDocker, policy = DEFAULT_PULL_POLICY) {
+  const key = policy.platform ? `${imageRef}@@${policy.platform}` : imageRef;
+  const existing = inflightPulls.get(key);
+  if (existing)
+    return existing;
+  const promise = (async () => {
+    let result = await pullOnce(imageRef, docker2, policy.perAttemptTimeoutMs, policy.platform);
+    if (result.exitCode !== 0 && policy.retryOnce && isTransientPullFailure(result)) {
+      result = await pullOnce(imageRef, docker2, policy.perAttemptTimeoutMs, policy.platform);
+    }
+    return result;
+  })();
+  inflightPulls.set(key, promise);
+  try {
+    return await promise;
+  } finally {
+    inflightPulls.delete(key);
+  }
+}
+async function pullOnce(imageRef, docker2, timeoutMs, platform) {
+  const ac = new AbortController();
+  const timer = setTimeout(() => ac.abort(), timeoutMs).unref?.();
+  try {
+    return await docker2.pull(imageRef, { signal: ac.signal, ...platform ? { platform } : {} });
+  } finally {
+    if (timer)
+      clearTimeout(timer);
+  }
+}
+var realDocker, inflightPulls, DEFAULT_PULL_POLICY;
+var init_pull = __esm({
+  "../adapters/dist/docker/pull.js"() {
+    "use strict";
+    realDocker = {
+      async info() {
+        return spawnAsync("docker", ["info"]);
+      },
+      async pull(imageRef, opts) {
+        const args = ["pull"];
+        if (opts?.platform)
+          args.push(`--platform=${opts.platform}`);
+        args.push(imageRef);
+        return spawnAsync("docker", args, { signal: opts?.signal });
+      },
+      async inspectLabel(imageRef, label) {
+        return spawnAsync("docker", [
+          "inspect",
+          imageRef,
+          "--format",
+          `{{ index .Config.Labels "${label}" }}`
+        ]);
+      },
+      async tag(source, target) {
+        return spawnAsync("docker", ["tag", source, target]);
+      }
+    };
+    inflightPulls = /* @__PURE__ */ new Map();
+    DEFAULT_PULL_POLICY = {
+      perAttemptTimeoutMs: 18e4,
+      retryOnce: true
+    };
+  }
+});
+
 // ../adapters/dist/docker/volume.js
 var volumeName, createVolume;
 var init_volume = __esm({
@@ -5736,12 +5828,14 @@ async function auditPortsForZombies(docker2, hostPorts) {
     }
   }
 }
-var serviceContainerName, worldContainerName, miseCacheVolumeName, PACKAGE_MANAGER_CACHE_DIRS, createServiceContainer, DEFAULT_IMAGE2, CONTROL_PLANE_PORT, HOST_CONTROL_PLANE_BASE, HOST_APP_PORT_BASE_DELTA, DEFAULT_MEMORY_BYTES, PortHeldByZombieError, createWorldContainer, stopAndRemove;
+var realPullImage, serviceContainerName, worldContainerName, miseCacheVolumeName, PACKAGE_MANAGER_CACHE_DIRS, createServiceContainer, DEFAULT_IMAGE2, CONTROL_PLANE_PORT, HOST_CONTROL_PLANE_BASE, HOST_APP_PORT_BASE_DELTA, DEFAULT_MEMORY_BYTES, PortHeldByZombieError, createWorldContainer, stopAndRemove;
 var init_container2 = __esm({
   "../adapters/dist/docker/container.js"() {
     "use strict";
     init_network();
+    init_pull();
     init_volume();
+    realPullImage = (imageRef, platform) => pullImageWithRetry(imageRef, void 0, platform ? { perAttemptTimeoutMs: 18e4, retryOnce: true, platform } : { perAttemptTimeoutMs: 18e4, retryOnce: true });
     serviceContainerName = (worldId, serviceName) => `olam-${sanitizeContainerName(worldId)}-${sanitizeContainerName(serviceName)}`;
     worldContainerName = (worldId) => `olam-${sanitizeContainerName(worldId)}-devbox`;
     miseCacheVolumeName = (arch2 = process.arch) => `olam-mise-cache-${arch2}`;
@@ -5751,10 +5845,15 @@ var init_container2 = __esm({
       { name: "yarn", hostSubpath: ".olam/cache/yarn", containerPath: "/usr/local/share/.cache/yarn" },
       { name: "pip", hostSubpath: ".olam/cache/pip", containerPath: "/home/olam/.cache/pip" }
     ];
-    createServiceContainer = async (docker2, worldId, worldName, service, portOffset) => {
+    createServiceContainer = async (docker2, worldId, worldName, service, portOffset, pullImage = realPullImage) => {
       const labels = olamLabels(worldId, worldName);
       const hostPort = service.port + portOffset;
       const envList = service.environment ? Object.entries(service.environment).map(([k, v]) => `${k}=${v}`) : [];
+      const pullResult = await pullImage(service.image, service.platform);
+      if (pullResult.exitCode !== 0) {
+        const reason = pullResult.stderr.trim() || `exit ${pullResult.exitCode}`;
+        throw new Error(`failed to pull ${service.image}${service.platform ? ` (platform=${service.platform})` : ""}: ${reason}`);
+      }
       const container = await docker2.createContainer({
         name: serviceContainerName(worldId, service.name),
         Image: service.image,
@@ -5951,7 +6050,7 @@ var demuxStream, execInContainer;
 var init_exec = __esm({
   "../adapters/dist/docker/exec.js"() {
     "use strict";
-    demuxStream = (stream) => new Promise((resolve11, reject) => {
+    demuxStream = (stream) => new Promise((resolve12, reject) => {
       const stdoutChunks = [];
       const stderrChunks = [];
       const stdout = new PassThrough();
@@ -5965,7 +6064,7 @@ var init_exec = __esm({
         stream.pipe(stdout);
       }
       stream.on("end", () => {
-        resolve11({
+        resolve12({
           stdout: Buffer.concat(stdoutChunks).toString("utf-8"),
           stderr: Buffer.concat(stderrChunks).toString("utf-8")
         });
@@ -6112,10 +6211,18 @@ var init_provider = __esm({
       };
       docker;
       dockerOptions;
-      constructor(dockerOptions) {
+      /**
+       * Injectable image-pull helper. Defaults to the real
+       * `pullImageWithRetry` (docker CLI shell-out). Tests override with a
+       * no-op so they don't need a real Docker daemon to exercise the
+       * dockerode-mocked code paths.
+       */
+      pullImage;
+      constructor(dockerOptions, opts) {
         super();
         this.docker = new Dockerode(dockerOptions);
         this.dockerOptions = dockerOptions;
+        this.pullImage = opts?.pullImage;
       }
       // -----------------------------------------------------------------------
       // createWorld
@@ -6134,7 +6241,7 @@ var init_provider = __esm({
           await createVolume(this.docker, id, name, svc.name);
         }
         for (const svc of services) {
-          await createServiceContainer(this.docker, id, name, svc, portOffset);
+          await createServiceContainer(this.docker, id, name, svc, portOffset, this.pullImage);
         }
         const SERVICE_ENV_ALIASES = {
           postgres: "POSTGRESQL",
@@ -6389,7 +6496,7 @@ var init_connection = __esm({
       // -----------------------------------------------------------------------
       async exec(host, command) {
         const client = await this.getConnection(host);
-        return new Promise((resolve11, reject) => {
+        return new Promise((resolve12, reject) => {
           client.exec(command, (err, stream) => {
             if (err) {
               reject(new Error(`SSH exec failed on ${host}: ${err.message}`));
@@ -6404,7 +6511,7 @@ var init_connection = __esm({
               stderr += data.toString();
             });
             stream.on("close", (code) => {
-              resolve11({
+              resolve12({
                 exitCode: code ?? 0,
                 stdout: stdout.trimEnd(),
                 stderr: stderr.trimEnd()
@@ -6435,10 +6542,10 @@ var init_connection = __esm({
           throw new Error(`No SSH configuration found for host: ${host}`);
         }
         const client = new SSHClient();
-        return new Promise((resolve11, reject) => {
+        return new Promise((resolve12, reject) => {
           client.on("ready", () => {
             this.connections.set(host, client);
-            resolve11(client);
+            resolve12(client);
           }).on("error", (err) => {
             this.connections.delete(host);
             reject(new Error(`SSH connection to ${host} failed: ${err.message}`));
@@ -7012,6 +7119,8 @@ __export(dist_exports, {
   buildPackageManagerCacheBinds: () => buildPackageManagerCacheBinds,
   cleanupOrphanedResources: () => cleanupOrphanedResources,
   describeDockerEndpoint: () => describeDockerEndpoint,
+  pullImageWithRetry: () => pullImageWithRetry,
+  realDocker: () => realDocker,
   resolveDockerHostOptions: () => resolveDockerHostOptions
 });
 var init_dist = __esm({
@@ -7023,6 +7132,7 @@ var init_dist = __esm({
     init_host();
     init_container2();
     init_container2();
+    init_pull();
     init_provider2();
     init_provider3();
   }
@@ -9056,7 +9166,7 @@ import * as crypto4 from "node:crypto";
 import * as fs16 from "node:fs";
 import * as os10 from "node:os";
 import * as path17 from "node:path";
-import { execFileSync as execFileSync4, spawn } from "node:child_process";
+import { execFileSync as execFileSync4, spawn as spawn2 } from "node:child_process";
 import { gunzipSync } from "node:zlib";
 function snapshotsDir() {
   return process.env["OLAM_SNAPSHOTS_DIR"] ?? path17.join(os10.homedir(), ".olam", "snapshots");
@@ -9477,7 +9587,7 @@ function spawnAutoCapture(worldId, olamBin = "olam") {
   if (!/^[a-zA-Z0-9_\-.]+$/.test(worldId))
     return null;
   try {
-    const child = spawn(olamBin, ["world", "snapshot", "create", worldId, "--kind", "all"], {
+    const child = spawn2(olamBin, ["world", "snapshot", "create", worldId, "--kind", "all"], {
       detached: true,
       stdio: "ignore",
       // OLAM_INTERNAL_SNAPSHOT=1 sentinel — Phase D D1's deprecation
@@ -12966,7 +13076,7 @@ var init_state2 = __esm({
 });
 
 // ../core/dist/dashboard/tunnel.js
-import { spawn as spawn2, execSync as execSync6 } from "node:child_process";
+import { spawn as spawn3, execSync as execSync6 } from "node:child_process";
 function isCloudflaredAvailable() {
   try {
     execSync6("which cloudflared", { stdio: "ignore" });
@@ -12976,8 +13086,8 @@ function isCloudflaredAvailable() {
   }
 }
 function startTunnel(port) {
-  return new Promise((resolve11, reject) => {
-    const child = spawn2("cloudflared", ["tunnel", "--url", `http://localhost:${port}`], {
+  return new Promise((resolve12, reject) => {
+    const child = spawn3("cloudflared", ["tunnel", "--url", `http://localhost:${port}`], {
       stdio: ["ignore", "pipe", "pipe"],
       detached: false
     });
@@ -12998,7 +13108,7 @@ function startTunnel(port) {
       if (match2) {
         resolved = true;
         clearTimeout(timeout);
-        resolve11(match2[0]);
+        resolve12(match2[0]);
       }
     }
     child.stdout?.on("data", scan);
@@ -13085,8 +13195,8 @@ var init_dashboard = __esm({
           }
           throw err;
         }
-        await new Promise((resolve11, reject) => {
-          this.server.on("listening", resolve11);
+        await new Promise((resolve12, reject) => {
+          this.server.on("listening", resolve12);
           this.server.on("error", reject);
         });
         this.info = { localUrl: `http://localhost:${port}` };
@@ -13132,8 +13242,8 @@ var init_dashboard = __esm({
       async stop() {
         stopTunnel();
         if (this.server) {
-          await new Promise((resolve11) => {
-            this.server.close(() => resolve11());
+          await new Promise((resolve12) => {
+            this.server.close(() => resolve12());
           });
           this.server = null;
         }
@@ -13955,8 +14065,8 @@ import { existsSync as existsSync23 } from "node:fs";
 import { dirname as dirname17, join as join28, resolve as resolve8 } from "node:path";
 import { fileURLToPath as fileURLToPath5 } from "node:url";
 function installRoot(metaUrl = import.meta.url) {
-  const here = fileURLToPath5(metaUrl);
-  return resolve8(dirname17(here), "..");
+  const here2 = fileURLToPath5(metaUrl);
+  return resolve8(dirname17(here2), "..");
 }
 function isDevMode(env = process.env, installRootDir = installRoot()) {
   if (env.OLAM_DEV !== "1") return false;
@@ -14931,11 +15041,12 @@ import ora2 from "ora";
 import pc7 from "picocolors";
 
 // src/commands/bootstrap.ts
+init_dist();
 init_install_root();
 init_exit_codes();
 init_protocol_version();
 init_output();
-import { spawn as spawn3, spawnSync as spawnSync6 } from "node:child_process";
+import { spawnSync as spawnSync6 } from "node:child_process";
 import { existsSync as existsSync24, readFileSync as readFileSync18 } from "node:fs";
 import { join as join29 } from "node:path";
 import ora from "ora";
@@ -14966,82 +15077,6 @@ function loadImageDigests(installRootDir = installRoot()) {
   }
   return parsed;
 }
-var realDocker = {
-  async info() {
-    return spawnAsync("docker", ["info"]);
-  },
-  async pull(imageRef, opts) {
-    return spawnAsync("docker", ["pull", imageRef], { signal: opts?.signal });
-  },
-  async inspectLabel(imageRef, label) {
-    return spawnAsync("docker", [
-      "inspect",
-      imageRef,
-      "--format",
-      `{{ index .Config.Labels "${label}" }}`
-    ]);
-  },
-  async tag(source, target) {
-    return spawnAsync("docker", ["tag", source, target]);
-  }
-};
-function spawnAsync(cmd, args, opts = {}) {
-  return new Promise((resolve11) => {
-    const child = spawn3(cmd, [...args], {
-      stdio: ["ignore", "pipe", "pipe"],
-      signal: opts.signal
-    });
-    let stdout = "";
-    let stderr = "";
-    child.stdout?.on("data", (chunk) => {
-      stdout += chunk.toString();
-    });
-    child.stderr?.on("data", (chunk) => {
-      stderr += chunk.toString();
-    });
-    child.on("error", (err) => {
-      resolve11({ exitCode: -1, stdout, stderr: stderr + err.message });
-    });
-    child.on("close", (code) => {
-      resolve11({ exitCode: code ?? -1, stdout, stderr });
-    });
-  });
-}
-var inflightPulls = /* @__PURE__ */ new Map();
-var DEFAULT_PULL_POLICY = {
-  perAttemptTimeoutMs: 18e4,
-  retryOnce: true
-};
-function isTransientPullFailure(result) {
-  const s = result.stderr.toLowerCase();
-  return result.exitCode !== 0 && (/timeout|connection|temporarily|429|503|tls handshake|network/.test(s) || result.exitCode === 124 || result.exitCode === -1);
-}
-async function pullImageWithRetry(imageRef, docker2 = realDocker, policy = DEFAULT_PULL_POLICY) {
-  const existing = inflightPulls.get(imageRef);
-  if (existing) return existing;
-  const promise = (async () => {
-    let result = await pullOnce(imageRef, docker2, policy.perAttemptTimeoutMs);
-    if (result.exitCode !== 0 && policy.retryOnce && isTransientPullFailure(result)) {
-      result = await pullOnce(imageRef, docker2, policy.perAttemptTimeoutMs);
-    }
-    return result;
-  })();
-  inflightPulls.set(imageRef, promise);
-  try {
-    return await promise;
-  } finally {
-    inflightPulls.delete(imageRef);
-  }
-}
-async function pullOnce(imageRef, docker2, timeoutMs) {
-  const ac = new AbortController();
-  const timer = setTimeout(() => ac.abort(), timeoutMs).unref?.();
-  try {
-    return await docker2.pull(imageRef, { signal: ac.signal });
-  } finally {
-    if (timer) clearTimeout(timer);
-  }
-}
 var REAL_OLAM_SUBCOMMAND = (args) => {
   const result = spawnSync6(process.execPath, [
     process.argv[1] ?? "olam",
@@ -15361,10 +15396,10 @@ async function confirm(message) {
   if (!process.stdin.isTTY) return true;
   const { createInterface: createInterface6 } = await import("node:readline");
   const rl = createInterface6({ input: process.stdin, output: process.stdout });
-  return new Promise((resolve11) => {
+  return new Promise((resolve12) => {
     rl.question(`${message} [y/N] `, (answer) => {
       rl.close();
-      resolve11(answer.toLowerCase() === "y" || answer.toLowerCase() === "yes");
+      resolve12(answer.toLowerCase() === "y" || answer.toLowerCase() === "yes");
     });
   });
 }
@@ -15738,7 +15773,7 @@ var McpAuthContainerController = class {
   }
 };
 function sleep3(ms) {
-  return new Promise((resolve11) => setTimeout(resolve11, ms));
+  return new Promise((resolve12) => setTimeout(resolve12, ms));
 }
 function dumpContainerLogs(container, tail = 40) {
   try {
@@ -17298,14 +17333,14 @@ function printTable(entries) {
 async function confirmInteractive() {
   process.stdout.write("  Type `yes` to proceed: ");
   const buf = [];
-  return new Promise((resolve11) => {
+  return new Promise((resolve12) => {
     const onData = (chunk) => {
       buf.push(chunk);
       if (Buffer.concat(buf).toString("utf-8").includes("\n")) {
         process.stdin.removeListener("data", onData);
         process.stdin.pause();
         const answer = Buffer.concat(buf).toString("utf-8").trim();
-        resolve11(answer.toLowerCase() === "yes");
+        resolve12(answer.toLowerCase() === "yes");
       }
     };
     process.stdin.resume();
@@ -23020,10 +23055,10 @@ async function confirm2(message) {
   if (!process.stdin.isTTY) return true;
   const { createInterface: createInterface6 } = await import("node:readline");
   const rl = createInterface6({ input: process.stdin, output: process.stdout });
-  return new Promise((resolve11) => {
+  return new Promise((resolve12) => {
     rl.question(`${message} [y/N] `, (answer) => {
       rl.close();
-      resolve11(answer.toLowerCase() === "y" || answer.toLowerCase() === "yes");
+      resolve12(answer.toLowerCase() === "y" || answer.toLowerCase() === "yes");
     });
   });
 }
@@ -25540,10 +25575,10 @@ var NEXT_STEPS_DOCS = [
   "docs/architecture/manifest-spec.md    \u2014 per-repo .adb.yaml schema",
   "docs/architecture/config-spec.md      \u2014 workspace .olam/config.yaml schema"
 ];
-var defaultSpawn = (cmd, args) => new Promise((resolve11) => {
+var defaultSpawn = (cmd, args) => new Promise((resolve12) => {
   const child = spawn5(cmd, [...args], { stdio: "inherit" });
-  child.on("exit", (code) => resolve11({ status: code }));
-  child.on("error", () => resolve11({ status: 1 }));
+  child.on("exit", (code) => resolve12({ status: code }));
+  child.on("error", () => resolve12({ status: 1 }));
 });
 var defaultPrompt = (question, defaultYes) => {
   if (!process.stdin.isTTY) {
@@ -25553,18 +25588,18 @@ var defaultPrompt = (question, defaultYes) => {
     );
     return Promise.resolve(defaultYes);
   }
-  return new Promise((resolve11) => {
+  return new Promise((resolve12) => {
     const rl = createInterface3({ input: process.stdin, output: process.stdout });
     const suffix = defaultYes ? " [Y/n]: " : " [y/N]: ";
     rl.question(`${question}${suffix}`, (answer) => {
       rl.close();
       const t = answer.trim().toLowerCase();
-      if (t === "") resolve11(defaultYes);
-      else if (t === "y" || t === "yes") resolve11(true);
-      else if (t === "n" || t === "no") resolve11(false);
-      else resolve11(defaultYes);
+      if (t === "") resolve12(defaultYes);
+      else if (t === "y" || t === "yes") resolve12(true);
+      else if (t === "n" || t === "no") resolve12(false);
+      else resolve12(defaultYes);
     });
-    rl.on("close", () => resolve11(defaultYes));
+    rl.on("close", () => resolve12(defaultYes));
   });
 };
 async function phase1SystemCheck(deps) {
@@ -26531,6 +26566,157 @@ function registerWorldUpgrade(program2) {
   });
 }
 
+// src/commands/mcp/serve.ts
+init_output();
+import { existsSync as existsSync50 } from "node:fs";
+import { dirname as dirname25, resolve as resolve10 } from "node:path";
+import { fileURLToPath as fileURLToPath6 } from "node:url";
+var here = dirname25(fileURLToPath6(import.meta.url));
+var BUNDLE_PATH = resolve10(here, "..", "..", "mcp-server.js");
+var MISSING_BUNDLE_REMEDY = "olam mcp server bundle missing at dist/mcp-server.js. For local dev, run: node packages/cli/scripts/bundle-mcp-server.mjs. Published @pleri/olam-cli tarballs always include this bundle (per prepublishOnly).";
+function registerMcpServe(cmd) {
+  cmd.command("serve").description(
+    "Run the olam MCP server (stdio transport). Claude Code wires this via `claude mcp add olam --scope user -- npx -y @pleri/olam-cli mcp serve`."
+  ).action(async () => {
+    if (!existsSync50(BUNDLE_PATH)) {
+      printError(MISSING_BUNDLE_REMEDY);
+      process.exitCode = 1;
+      return;
+    }
+    await import(BUNDLE_PATH);
+  });
+}
+
+// src/commands/mcp/install.ts
+init_output();
+
+// src/commands/mcp/install-shared.ts
+import { spawnSync as spawnSync15 } from "node:child_process";
+var DEFAULT_CLAUDE_SHELL_DEPS = {
+  spawn: spawnSync15,
+  log: (msg) => console.log(msg)
+};
+function isOnPath(deps, bin) {
+  const probe = process.platform === "win32" ? "where" : "which";
+  const result = deps.spawn(probe, [bin], {
+    encoding: "utf8",
+    stdio: ["ignore", "pipe", "ignore"]
+  });
+  return result.status === 0;
+}
+function normaliseScope(raw) {
+  const value = (raw ?? "user").toLowerCase();
+  return value === "user" || value === "project" || value === "local" ? value : null;
+}
+var REMEDY_CLAUDE_MISSING = "`claude` not found on PATH. Install Claude Code (https://docs.claude.com/claude-code) or paste the JSON snippet from docs/architecture/mcp-as-npx-served.md.";
+
+// src/commands/mcp/install.ts
+var NPM_PACKAGE_NAME = "@pleri/olam-cli";
+function buildClaudeMcpAddArgs(scope, useGlobal) {
+  const target = useGlobal ? { cmd: "olam", args: ["mcp", "serve"] } : { cmd: "npx", args: ["-y", NPM_PACKAGE_NAME, "mcp", "serve"] };
+  return {
+    command: "claude",
+    args: ["mcp", "add", "olam", "--scope", scope, "--", target.cmd, ...target.args]
+  };
+}
+async function runInstall(opts, deps = DEFAULT_CLAUDE_SHELL_DEPS) {
+  if (!isOnPath(deps, "claude")) {
+    printError(REMEDY_CLAUDE_MISSING);
+    return 1;
+  }
+  const useGlobal = isOnPath(deps, "olam");
+  const { command, args } = buildClaudeMcpAddArgs(opts.scope, useGlobal);
+  deps.log(`Wiring: ${command} ${args.join(" ")}`);
+  const result = deps.spawn(command, args, {
+    encoding: "utf8",
+    stdio: ["ignore", "pipe", "pipe"]
+  });
+  if (result.status !== 0) {
+    const detail = result.stderr?.trim() || result.stdout?.trim() || "(no output)";
+    printError(`claude mcp add failed (rc=${result.status ?? "unknown"}): ${detail}`);
+    return result.status ?? 1;
+  }
+  printSuccess(
+    `olam MCP registered with claude (--scope ${opts.scope}; command: ${useGlobal ? "olam" : "npx"}).`
+  );
+  return 0;
+}
+function registerMcpInstall(cmd) {
+  cmd.command("install").description(
+    "Add olam to Claude Code as an MCP server (auto-detects whether `olam` is on PATH; shells to `claude mcp add`)"
+  ).option("--scope <scope>", "claude mcp scope: user | project | local", "user").action(async (rawOpts) => {
+    const scope = normaliseScope(rawOpts.scope);
+    if (scope === null) {
+      printError(`--scope must be one of: user, project, local (got: ${rawOpts.scope})`);
+      process.exitCode = 1;
+      return;
+    }
+    const rc = await runInstall({ scope });
+    if (rc !== 0) {
+      process.exitCode = rc;
+    }
+  });
+}
+
+// src/commands/mcp/uninstall.ts
+init_output();
+var NOT_INSTALLED_PATTERN = /no\s+(?:\S+\s+)*mcp\s+server\s+found/i;
+function looksLikeNotInstalled(text) {
+  return NOT_INSTALLED_PATTERN.test(text);
+}
+function buildClaudeMcpRemoveArgs(scope) {
+  return {
+    command: "claude",
+    args: ["mcp", "remove", "olam", "--scope", scope]
+  };
+}
+async function runUninstall(opts, deps = DEFAULT_CLAUDE_SHELL_DEPS) {
+  if (!isOnPath(deps, "claude")) {
+    printError(REMEDY_CLAUDE_MISSING);
+    return 1;
+  }
+  const { command, args } = buildClaudeMcpRemoveArgs(opts.scope);
+  deps.log(`Unwiring: ${command} ${args.join(" ")}`);
+  const result = deps.spawn(command, args, {
+    encoding: "utf8",
+    stdio: ["ignore", "pipe", "pipe"]
+  });
+  if (result.status === 0) {
+    printSuccess(`olam MCP removed from claude (--scope ${opts.scope}).`);
+    return 0;
+  }
+  const stderr = result.stderr?.trim() ?? "";
+  const stdout = result.stdout?.trim() ?? "";
+  const combined = `${stderr}
+${stdout}`.trim();
+  if (looksLikeNotInstalled(combined)) {
+    printWarning(
+      `olam MCP not registered with claude (--scope ${opts.scope}); nothing to remove.`
+    );
+    return 0;
+  }
+  printError(
+    `claude mcp remove failed (rc=${result.status ?? "unknown"}): ${combined || "(no output)"}`
+  );
+  return result.status ?? 1;
+}
+function registerMcpUninstall(cmd) {
+  cmd.command("uninstall").description(
+    "Remove olam from Claude Code (symmetric with `install`; idempotent \u2014 exits 0 when olam is not registered)"
+  ).option("--scope <scope>", "claude mcp scope: user | project | local", "user").action(async (rawOpts) => {
+    const scope = normaliseScope(rawOpts.scope);
+    if (scope === null) {
+      printError(`--scope must be one of: user, project, local (got: ${rawOpts.scope})`);
+      process.exitCode = 1;
+      return;
+    }
+    const rc = await runUninstall({ scope });
+    if (rc !== 0) {
+      process.exitCode = rc;
+    }
+  });
+}
+
 // src/commands/mcp/login.ts
 init_output();
 
@@ -26628,7 +26814,7 @@ function registerMcpLogin(cmd) {
 init_output();
 import * as readline2 from "node:readline";
 async function readTokenSilent(prompt) {
-  return new Promise((resolve11, reject) => {
+  return new Promise((resolve12, reject) => {
     const rl = readline2.createInterface({
       input: process.stdin,
       output: process.stdout,
@@ -26646,7 +26832,7 @@ async function readTokenSilent(prompt) {
         process.stdin.removeListener("data", onData);
         process.stdout.write("\n");
         rl.close();
-        resolve11(token);
+        resolve12(token);
       } else if (char === "") {
         if (process.stdin.isTTY) process.stdin.setRawMode(false);
         process.stdin.removeListener("data", onData);
@@ -26921,7 +27107,7 @@ async function discoverMcpSources(repoPaths) {
 import { spawn as spawn7 } from "node:child_process";
 var VALIDATION_TIMEOUT_MS = 5e3;
 async function validateMcpEntry(entry) {
-  return new Promise((resolve11) => {
+  return new Promise((resolve12) => {
     let stdout = "";
     let timedOut = false;
     let child;
@@ -26931,7 +27117,7 @@ async function validateMcpEntry(entry) {
         env: { ...process.env, ...entry.env ?? {} }
       });
     } catch (err) {
-      resolve11({
+      resolve12({
         name: entry.name,
         validated: false,
         reason: err instanceof Error ? err.message : "spawn failed"
@@ -26948,11 +27134,11 @@ async function validateMcpEntry(entry) {
     child.on("close", (code) => {
       clearTimeout(timer);
       if (timedOut) {
-        resolve11({ name: entry.name, validated: false, reason: "timeout (5s)" });
+        resolve12({ name: entry.name, validated: false, reason: "timeout (5s)" });
         return;
       }
       const validated = code === 0 && stdout.trim().length > 0;
-      resolve11({
+      resolve12({
         name: entry.name,
         validated,
         reason: validated ? "ok" : `exit code ${code ?? "null"}`
@@ -26960,7 +27146,7 @@ async function validateMcpEntry(entry) {
     });
     child.on("error", (err) => {
       clearTimeout(timer);
-      resolve11({ name: entry.name, validated: false, reason: err.message });
+      resolve12({ name: entry.name, validated: false, reason: err.message });
     });
   });
 }
@@ -26975,11 +27161,11 @@ async function multiSelectPicker(entries) {
     );
   });
   console.log("\n" + pc29.dim('Enter numbers to import (e.g. 1,2,3 or "all" or Enter to skip):'));
-  const answer = await new Promise((resolve11) => {
+  const answer = await new Promise((resolve12) => {
     const rl = readline3.createInterface({ input: process.stdin, output: process.stdout });
     rl.question("> ", (ans) => {
       rl.close();
-      resolve11(ans.trim());
+      resolve12(ans.trim());
     });
   });
   if (!answer || answer === "") return [];
@@ -27107,7 +27293,10 @@ function registerMcpRevoke(cmd) {
 
 // src/commands/mcp/index.ts
 function registerMcp(program2) {
-  const mcp = program2.command("mcp").description("Manage MCP server credentials (login, add, list, remove, import, revoke)");
+  const mcp = program2.command("mcp").description("Run the olam MCP server, wire it into Claude Code, or manage MCP credentials (serve, install, uninstall, login, add, list, remove, import, revoke)");
+  registerMcpServe(mcp);
+  registerMcpInstall(mcp);
+  registerMcpUninstall(mcp);
   registerMcpLogin(mcp);
   registerMcpAdd(mcp);
   registerMcpList(mcp);
@@ -27118,13 +27307,13 @@ function registerMcp(program2) {
 }
 
 // src/commands/kg-build.ts
-import { spawnSync as spawnSync15 } from "node:child_process";
+import { spawnSync as spawnSync16 } from "node:child_process";
 import fs48 from "node:fs";
 import path53 from "node:path";
 
 // ../core/dist/kg/storage-paths.js
 import { homedir as homedir28 } from "node:os";
-import { join as join48, resolve as resolve10 } from "node:path";
+import { join as join48, resolve as resolve11 } from "node:path";
 
 // ../core/dist/world/workspace-name.js
 var InvalidWorkspaceNameError = class extends Error {
@@ -27161,7 +27350,7 @@ function assertWithinPrefix(path55, prefix, label) {
 function kgPristinePath(workspace) {
   validateWorkspaceName(workspace);
   const root = kgRoot();
-  const path55 = resolve10(join48(root, workspace));
+  const path55 = resolve11(join48(root, workspace));
   assertWithinPrefix(path55, root, "kgPristinePath");
   return path55;
 }
@@ -27532,16 +27721,16 @@ async function runKgWatch(workspaceArg, opts, deps = {}) {
     process.on("SIGINT", () => forward("SIGINT"));
     process.on("SIGTERM", () => forward("SIGTERM"));
   }
-  return new Promise((resolve11) => {
+  return new Promise((resolve12) => {
     child.on("exit", (code, signal) => {
       removePidFile(name);
       const exitCode = typeof code === "number" ? code : signal === "SIGINT" || signal === "SIGTERM" ? 0 : 1;
-      resolve11({ exitCode, pidWritten: true });
+      resolve12({ exitCode, pidWritten: true });
     });
     child.on("error", (err) => {
       removePidFile(name);
       printError(`graphify subprocess error: ${err.message}`);
-      resolve11({ exitCode: 1, pidWritten: true });
+      resolve12({ exitCode: 1, pidWritten: true });
     });
   });
 }
@@ -27564,13 +27753,13 @@ function resolveWorkspace(arg) {
 }
 function copyWorkspaceToScratch(source, scratch) {
   if (process.platform === "darwin") {
-    const r2 = spawnSync15("cp", ["-c", "-r", source + "/.", scratch], {
+    const r2 = spawnSync16("cp", ["-c", "-r", source + "/.", scratch], {
       stdio: ["ignore", "ignore", "pipe"],
       encoding: "utf-8"
     });
     if (r2.status === 0) return "cp-c-r-reflink";
   }
-  const r = spawnSync15("cp", ["-r", source + "/.", scratch], {
+  const r = spawnSync16("cp", ["-r", source + "/.", scratch], {
     stdio: ["ignore", "ignore", "pipe"],
     encoding: "utf-8"
   });
@@ -27591,7 +27780,7 @@ function parseNodeCount(graphifyOutDir) {
   }
 }
 function readGraphifyVersion(image) {
-  const r = spawnSync15(
+  const r = spawnSync16(
     "docker",
     [
       "run",
@@ -27643,7 +27832,7 @@ async function runKgBuild(workspaceArg, options = {}) {
       "update",
       "."
     ];
-    const r = human ? spawnSync15("docker", dockerArgs, { stdio: "inherit" }) : spawnSync15("docker", dockerArgs, { stdio: ["ignore", "ignore", "pipe"] });
+    const r = human ? spawnSync16("docker", dockerArgs, { stdio: "inherit" }) : spawnSync16("docker", dockerArgs, { stdio: ["ignore", "ignore", "pipe"] });
     if (r.status !== 0) {
       printError(`graphify update failed (exit ${r.status})`);
       return { exitCode: r.status ?? 1 };
@@ -27720,7 +27909,19 @@ function isPleriConfigured(configDir = process.env.OLAM_CONFIG_DIR ?? ".olam") {
 
 // src/index.ts
 var program = new Command();
-program.name("olam").description("Olam \u2014 isolated development worlds with thought graph capture").version(readCliVersion());
+program.name("olam").description("Olam \u2014 isolated development worlds with thought graph capture").option("--mcp", "Run the olam MCP server (stdio); alias for `olam mcp serve`").version(readCliVersion());
+var mcpFlagIndex = process.argv.indexOf("--mcp");
+if (mcpFlagIndex !== -1) {
+  const afterFlag = process.argv.slice(mcpFlagIndex + 1).filter((a) => !a.startsWith("-"));
+  if (afterFlag.length > 0) {
+    process.stderr.write(
+      `error: --mcp does not accept positional arguments (got ${JSON.stringify(afterFlag)}). Use 'olam mcp serve' directly if you need subcommand-level flags.
+`
+    );
+    process.exit(1);
+  }
+  process.argv.splice(mcpFlagIndex, 1, "mcp", "serve");
+}
 registerInit(program);
 registerInstall(program);
 registerAuth(program);