codeam-cli 2.60.69 → 2.61.0

package/CHANGELOG.md

@@ -4,6 +4,35 @@ All notable changes to `codeam-cli` are documented here.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2.60.70] — 2026-07-15
+
+### Added
+
+- **cli:** Fleet control plane — DockerRunner + fleet_* box handlers
+- **box:** Production codeam-box rescue-fleet runtime image
+
+### Chore
+
+- **meta:** Register box/test commitlint scopes for the fleet work
+
+### Documentation
+
+- **fleet:** CLAUDE.md fleet CLI section
+
+### Fixed
+
+- **cli:** Deliver fleet box enroll token via env passthrough, not docker argv
+
+### Tests
+
+- **test:** Real-Docker integration gate for the fleet control plane
+
+## [2.60.69] — 2026-07-15
+
+### Fixed
+
+- **cli:** Provision uvx via the standalone uv installer and resolve per-user bin paths for MCP launchers
+
 ## [2.60.68] — 2026-07-15
 
 ### Added

package/dist/index.js

@@ -5970,7 +5970,7 @@ function readAnonId() {
 }
 function superProperties() {
   return {
-    cliVersion: true ? "2.60.69" : "0.0.0-dev",
+    cliVersion: true ? "2.61.0" : "0.0.0-dev",
     nodeVersion: process.version,
     platform: process.platform,
     arch: process.arch,
@@ -6151,7 +6151,7 @@ var os4 = __toESM(require("os"));
 // package.json
 var package_default = {
   name: "codeam-cli",
-  version: "2.60.69",
+  version: "2.61.0",
   description: "Workflow-continuity bridge for AI coding agents. Wrap Claude Code or Codex in a PTY and supervise, approve, and redirect the session from any device \u2014 async. The terminal companion for CodeAgent Mobile.",
   type: "commonjs",
   main: "dist/index.js",
@@ -7294,7 +7294,7 @@ var CommandRelayService = class _CommandRelayService {
       // fresh + clear the "CLI update available" banner after a self-update
       // (a codespace that reinstalls @latest reconnects via heartbeat, not
       // pair/reconnect). Older backends ignore the extra field.
-      ..."2.60.69" ? { ideVersion: "2.60.69" } : {}
+      ..."2.61.0" ? { ideVersion: "2.61.0" } : {}
     }).then(() => log.trace("relay", `heartbeat ok online=${online}`)).catch((err) => log.trace("relay", `heartbeat failed online=${online}`, err));
   }
   /**
@@ -16494,10 +16494,16 @@ async function postJson(pathname, body) {
   }
   return json.data;
 }
+function resolveHostLabel(label) {
+  const explicit = label?.trim();
+  const envLabel = process.env.CODEAM_HOST_LABEL?.trim();
+  const resolved = explicit || envLabel || os30.hostname();
+  return resolved.slice(0, 80);
+}
 async function redeemEnrollToken(token, label) {
   const data = await postJson("/api/self-hosted/redeem", {
     token,
-    ...label ? { label } : {},
+    label: resolveHostLabel(label),
     osInfo: collectOsInfo()
   });
   return {
@@ -17871,7 +17877,7 @@ async function autoUpgradeBeforeCriticalCommand() {
   if (process.env.NODE_ENV === "test") return;
   if (process.env.CODEAM_DISABLE_UPDATE_CHECK === "1") return;
   if (process.env.CI) return;
-  const current = true ? "2.60.69" : null;
+  const current = true ? "2.61.0" : null;
   if (!current) return;
   const cache = readCache();
   const fresh = cache && Date.now() - cache.fetchedAt < TTL_MS;
@@ -17888,7 +17894,7 @@ function checkForUpdates() {
   if (process.env.CODEAM_DISABLE_UPDATE_CHECK === "1") return;
   if (process.env.CI) return;
   if (!process.stdout.isTTY) return;
-  const current = true ? "2.60.69" : null;
+  const current = true ? "2.61.0" : null;
   if (!current) return;
   const cache = readCache();
   const fresh = cache && Date.now() - cache.fetchedAt < TTL_MS;
@@ -17908,7 +17914,7 @@ var SELF_UPDATE_INTERVAL_MS = 60 * 60 * 1e3;
 var SELF_UPDATE_VIEW_TIMEOUT_MS = 3e4;
 var SELF_UPDATE_INSTALL_TIMEOUT_MS = 18e4;
 function currentCliVersion() {
-  return true ? "2.60.69" : null;
+  return true ? "2.61.0" : null;
 }
 function runCmd(cmd, args2, timeoutMs) {
   return new Promise((resolve7) => {
@@ -18136,6 +18142,78 @@ function isDeployPayload(p2) {
 function isStopPayload(p2) {
   return typeof p2.sessionId === "string";
 }
+var FLEET_CONTAINER_NAME_RE = /^codeam-box-[a-z0-9]+$/;
+function isFleetContainerName(v) {
+  return typeof v === "string" && FLEET_CONTAINER_NAME_RE.test(v);
+}
+function isFiniteNumber(v) {
+  return typeof v === "number" && Number.isFinite(v);
+}
+function isFleetLimits(v) {
+  if (typeof v !== "object" || v === null) return false;
+  const l = v;
+  return isFiniteNumber(l.memoryMb) && isFiniteNumber(l.cpus) && isFiniteNumber(l.pidsLimit) && isFiniteNumber(l.diskGb);
+}
+function isFleetCreateBoxPayload(p2) {
+  return typeof p2.boxId === "string" && isFleetContainerName(p2.containerName) && typeof p2.enrollToken === "string" && p2.enrollToken.length > 0 && typeof p2.apiOrigin === "string" && p2.apiOrigin.length > 0 && isFleetLimits(p2.limits);
+}
+function isFleetBoxRefPayload(p2) {
+  if (typeof p2.boxId !== "string") return false;
+  if (!isFleetContainerName(p2.containerName)) return false;
+  if (p2.removeVolume !== void 0 && typeof p2.removeVolume !== "boolean") return false;
+  return true;
+}
+function fleetUserIdFromContainerName(containerName) {
+  return containerName.slice("codeam-box-".length);
+}
+function isMissingContainerError(stderr) {
+  return /no such container/i.test(stderr);
+}
+function isMissingVolumeError(stderr) {
+  return /no such volume/i.test(stderr);
+}
+function resolveFleetBoxImage() {
+  return process.env.CODEAM_FLEET_BOX_IMAGE || "ghcr.io/edgar-durand/codeam-box:latest";
+}
+var DOCKER_RUN_TIMEOUT_MS = 12e4;
+var defaultDockerRunner = {
+  run(args2, opts = {}) {
+    return new Promise((resolve7) => {
+      const child = (0, import_node_child_process23.spawn)("docker", args2, {
+        stdio: ["ignore", "pipe", "pipe"],
+        env: { ...process.env, ...opts.env }
+      });
+      let stdoutBuf = "";
+      let stderrBuf = "";
+      let settled = false;
+      const timer = setTimeout(
+        () => {
+          if (settled) return;
+          killQuiet(child);
+        },
+        opts.timeoutMs ?? DOCKER_RUN_TIMEOUT_MS
+      );
+      const done = (code) => {
+        if (settled) return;
+        settled = true;
+        clearTimeout(timer);
+        resolve7({ code, stderr: stderrBuf, stdout: stdoutBuf });
+      };
+      child.stdout?.on("data", (b) => {
+        stdoutBuf += b.toString();
+      });
+      child.stderr?.on("data", (b) => {
+        stderrBuf += b.toString();
+      });
+      child.once("error", (err) => {
+        stderrBuf += stderrBuf ? `
+${err.message}` : err.message;
+        done(null);
+      });
+      child.once("exit", (code) => done(code));
+    });
+  }
+};
 var CONTROL_AGENT_META = {
   id: "claude",
   displayName: "CodeAgent Host Agent",
@@ -18177,6 +18255,7 @@ var HostAgentSupervisor = class {
     this.teardownHeadroom = deps.teardownHeadroom ?? defaultTeardownHeadroom;
     this.selfUpdate = deps.selfUpdate ?? runSelfUpdate;
     this.onUpdated = deps.onUpdated ?? defaultOnUpdated;
+    this.docker = deps.docker ?? defaultDockerRunner;
   }
   identity;
   deps;
@@ -18213,6 +18292,8 @@ var HostAgentSupervisor = class {
   /** Best-effort systemd de-provision used by `self_hosted_wipe`. */
   disableService;
   teardownHeadroom;
+  /** Docker runner for the fleet `fleet_*` control-plane handlers. */
+  docker;
   /** Guards against firing the self-heal more than once. */
   healing = false;
   /**
@@ -18380,6 +18461,38 @@ var HostAgentSupervisor = class {
    * arbitrary command surface).
    */
   async handleCommand(cmd) {
+    if (cmd.type === "fleet_create_box") {
+      if (!isFleetCreateBoxPayload(cmd.payload)) {
+        log.warn("host-agent", `ignoring malformed fleet_create_box id=${cmd.id}`);
+        return;
+      }
+      await this.fleetCreateBox(cmd.payload);
+      return;
+    }
+    if (cmd.type === "fleet_start_box") {
+      if (!isFleetBoxRefPayload(cmd.payload)) {
+        log.warn("host-agent", `ignoring malformed fleet_start_box id=${cmd.id}`);
+        return;
+      }
+      await this.fleetStartBox(cmd.payload);
+      return;
+    }
+    if (cmd.type === "fleet_stop_box") {
+      if (!isFleetBoxRefPayload(cmd.payload)) {
+        log.warn("host-agent", `ignoring malformed fleet_stop_box id=${cmd.id}`);
+        return;
+      }
+      await this.fleetStopBox(cmd.payload);
+      return;
+    }
+    if (cmd.type === "fleet_delete_box") {
+      if (!isFleetBoxRefPayload(cmd.payload)) {
+        log.warn("host-agent", `ignoring malformed fleet_delete_box id=${cmd.id}`);
+        return;
+      }
+      await this.fleetDeleteBox(cmd.payload);
+      return;
+    }
     if (cmd.type === "self_hosted_deploy") {
       if (!isDeployPayload(cmd.payload)) {
         log.warn("host-agent", `ignoring malformed self_hosted_deploy id=${cmd.id}`);
@@ -18417,6 +18530,137 @@ var HostAgentSupervisor = class {
     }
     log.trace("host-agent", `ignoring unsupported command type=${cmd.type}`);
   }
+  /**
+   * `fleet_create_box` — `docker run` a per-user rescue box. Builds the FULL
+   * argv from a fixed template (Global Constraints — nothing from the wire
+   * is passed through as a raw docker argument beyond the already-validated
+   * `containerName` and the numeric resource limits): hard isolation
+   * (`--cap-drop ALL`, `--security-opt no-new-privileges`, resource caps,
+   * the isolated `fleet-net` network, a SINGLE named volume mounted at
+   * `/home/box` — named identically to the container, per the Global
+   * Constraints — and the ops labels). NEVER `--privileged`, NEVER a
+   * `docker.sock` mount, NEVER a host bind mount. The api origin (not a
+   * secret) is delivered via a normal `-e KEY=value`. The enroll token IS a
+   * secret — spec invariant #1 is "token via env, NEVER argv" — so it is
+   * delivered as a BARE `-e CODEAM_ENROLL_TOKEN` (no `=value`) with the
+   * actual value passed only through {@link DockerRunner.run}'s `env` map,
+   * which the runner merges into the `docker` CLI process's OWN env; docker
+   * then reads a bare `-e NAME` from its own env and forwards it into the
+   * container. The value never appears in the `docker run` argv, so it's
+   * never visible via `ps` on the shared fleet host; never logged either.
+   */
+  async fleetCreateBox(payload) {
+    const { containerName, limits } = payload;
+    const userId = fleetUserIdFromContainerName(containerName);
+    log.info(
+      "host-agent",
+      `fleet_create_box id=${payload.boxId} name=${containerName} mem=${limits.memoryMb}m cpus=${limits.cpus} pids=${limits.pidsLimit}`
+    );
+    const args2 = [
+      "run",
+      "-d",
+      "--name",
+      containerName,
+      "--cap-drop",
+      "ALL",
+      "--security-opt",
+      "no-new-privileges",
+      "--memory",
+      `${limits.memoryMb}m`,
+      "--cpus",
+      String(limits.cpus),
+      "--pids-limit",
+      String(limits.pidsLimit),
+      "--network",
+      "fleet-net",
+      "--label",
+      `com.codeagent.user-id=${userId}`,
+      "--label",
+      `com.codeagent.box-id=${payload.boxId}`,
+      "--label",
+      "com.codeagent.created-by=fleet",
+      "-v",
+      `${containerName}:/home/box`,
+      // Bare `-e NAME` (no `=value`) — docker reads the value from ITS OWN
+      // process env (supplied below via `opts.env`), never from this argv.
+      "-e",
+      "CODEAM_ENROLL_TOKEN",
+      "-e",
+      `CODEAM_API_URL=${payload.apiOrigin}`,
+      // User-facing label for the rescued box's "My Servers" card. Not a
+      // secret → plain `-e KEY=value`. The box's host-agent reads it at
+      // redeem (resolveHostLabel) so a rescued user sees "CodeAgent Box",
+      // not the generic "my-server" or the ugly container cuid.
+      "-e",
+      "CODEAM_HOST_LABEL=CodeAgent Box",
+      resolveFleetBoxImage()
+    ];
+    const res = await this.docker.run(args2, {
+      timeoutMs: DOCKER_RUN_TIMEOUT_MS,
+      env: { CODEAM_ENROLL_TOKEN: payload.enrollToken }
+    });
+    if (res.code === 0) {
+      log.info(
+        "host-agent",
+        `fleet box ${containerName} created (${res.stdout.trim().slice(0, 12)})`
+      );
+    } else {
+      log.warn(
+        "host-agent",
+        `fleet_create_box ${containerName} failed (code=${res.code}): ${res.stderr.trim().slice(-300)}`
+      );
+    }
+  }
+  /** `fleet_start_box` — wake a sleeping box (`docker start`). Idempotent: a
+   *  container the host already removed is treated as success. */
+  async fleetStartBox(payload) {
+    log.info("host-agent", `fleet_start_box id=${payload.boxId} name=${payload.containerName}`);
+    const res = await this.docker.run(["start", payload.containerName]);
+    if (res.code !== 0 && !isMissingContainerError(res.stderr)) {
+      log.warn(
+        "host-agent",
+        `fleet_start_box ${payload.containerName} failed (code=${res.code}): ${res.stderr.trim().slice(-300)}`
+      );
+    }
+  }
+  /** `fleet_stop_box` — sleep an idle box (`docker stop`). MUST be
+   *  idempotent — the backend's reap sweeps may re-send a stop for a box
+   *  the host already stopped/removed; "No such container" is success. */
+  async fleetStopBox(payload) {
+    log.info("host-agent", `fleet_stop_box id=${payload.boxId} name=${payload.containerName}`);
+    const res = await this.docker.run(["stop", payload.containerName]);
+    if (res.code !== 0 && !isMissingContainerError(res.stderr)) {
+      log.warn(
+        "host-agent",
+        `fleet_stop_box ${payload.containerName} failed (code=${res.code}): ${res.stderr.trim().slice(-300)}`
+      );
+    }
+  }
+  /** `fleet_delete_box` — `docker rm -f`, plus `docker volume rm` when the
+   *  backend asks for a reap (`removeVolume`). MUST be idempotent — deleting
+   *  an already-gone container/volume is success, never a failure. */
+  async fleetDeleteBox(payload) {
+    log.info(
+      "host-agent",
+      `fleet_delete_box id=${payload.boxId} name=${payload.containerName} removeVolume=${Boolean(payload.removeVolume)}`
+    );
+    const res = await this.docker.run(["rm", "-f", payload.containerName]);
+    if (res.code !== 0 && !isMissingContainerError(res.stderr)) {
+      log.warn(
+        "host-agent",
+        `fleet_delete_box ${payload.containerName} failed (code=${res.code}): ${res.stderr.trim().slice(-300)}`
+      );
+    }
+    if (payload.removeVolume) {
+      const volRes = await this.docker.run(["volume", "rm", payload.containerName]);
+      if (volRes.code !== 0 && !isMissingVolumeError(volRes.stderr)) {
+        log.warn(
+          "host-agent",
+          `fleet_delete_box volume rm ${payload.containerName} failed (code=${volRes.code}): ${volRes.stderr.trim().slice(-300)}`
+        );
+      }
+    }
+  }
   /**
    * Prepare the workspace, write the agent credential (same as codespace
    * provisioning), and spawn a supervised `codeam pair-auto` child.
@@ -19604,8 +19848,8 @@ function isJsInstallCommand(cmd, args2) {
 
 // src/services/preview/tunnel-bringup.ts
 var TUNNEL_REGISTERED_RE = /Registered tunnel connection/i;
-async function awaitTunnelRegistered(candidate, hostname3, deadlineMs) {
-  let url = hostname3 ? `https://${hostname3}` : null;
+async function awaitTunnelRegistered(candidate, hostname4, deadlineMs) {
+  let url = hostname4 ? `https://${hostname4}` : null;
   let registered = false;
   if (candidate.exitCode != null) {
     return { kind: "exited", sawUrl: url != null, code: candidate.exitCode };
@@ -35337,7 +35581,7 @@ function checkChokidar() {
 }
 async function doctor(args2 = []) {
   const json = args2.includes("--json");
-  const cliVersion = true ? "2.60.69" : "0.0.0-dev";
+  const cliVersion = true ? "2.61.0" : "0.0.0-dev";
   const apiBase2 = resolveApiBaseUrl();
   const diagnosticId = (0, import_node_crypto12.randomUUID)();
   log.info("doctor", `run id=${diagnosticId} cli=${cliVersion}`);
@@ -35848,7 +36092,7 @@ async function mcpRun(args2) {
 // src/commands/version.ts
 var import_picocolors15 = __toESM(require("picocolors"));
 function version2() {
-  const v = true ? "2.60.69" : "unknown";
+  const v = true ? "2.61.0" : "unknown";
   console.log(`${import_picocolors15.default.bold("codeam-cli")} ${import_picocolors15.default.cyan(v)}`);
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "codeam-cli",
-  "version": "2.60.69",
+  "version": "2.61.0",
   "description": "Workflow-continuity bridge for AI coding agents. Wrap Claude Code or Codex in a PTY and supervise, approve, and redirect the session from any device — async. The terminal companion for CodeAgent Mobile.",
   "type": "commonjs",
   "main": "dist/index.js",