@pleri/olam-cli 0.1.69 → 0.1.70

package/host-cp/compose.yaml

@@ -85,6 +85,12 @@ services:
       # which surfaces in the dashboard as a failed Connect Claude flow.
       OLAM_AUTH_SERVICE_URL: "http://host.docker.internal:9999"
       OLAM_AUTH_SECRET: "${OLAM_AUTH_SECRET:-}"
+      # Operator's CLI version, propagated by `olam host-cp start` via
+      # buildComposeEnv. Surfaces in /api/version/status so the
+      # dashboard's TopNav can render "the version we're working on."
+      # Empty when older CLI versions render this compose; the server
+      # falls back to host-cp's own package.json.
+      OLAM_CLI_VERSION: "${OLAM_CLI_VERSION:-}"
       # Upgrade-trigger feature: host-cp uses these to construct bind
       # mounts on the spawned upgrader container. The upgrader runs
       # `olam upgrade -y` and needs (a) the operator's ~/.olam state,

package/host-cp/src/version-status.mjs

@@ -24,6 +24,7 @@ import path from 'node:path';
  * @property {ComponentVersion} devbox
  * @property {string} operatorHead  - resolved HEAD or 'unknown'
  * @property {string} checkedAt     - ISO timestamp
+ * @property {string} cliVersion    - operator's CLI semver (e.g. "0.1.69") or 'unknown'
  */
 
 /**
@@ -187,6 +188,14 @@ export async function buildVersionSnapshot({ authServiceUrl, dockerApiBase }) {
 
   const hostCpRunning = process.env.OLAM_BUILD_SHA ?? 'unknown';
 
+  // CLI version is propagated by `olam host-cp start` via the
+  // OLAM_CLI_VERSION env (see packages/cli/src/commands/host-cp.ts
+  // buildComposeEnv). Falls back to host-cp's own package.json when
+  // an older CLI started this container without setting the env.
+  const cliVersion = process.env.OLAM_CLI_VERSION
+    || readHostCpPackageVersion()
+    || 'unknown';
+
   return {
     hostCp: {
       running: hostCpRunning,
@@ -205,5 +214,32 @@ export async function buildVersionSnapshot({ authServiceUrl, dockerApiBase }) {
     },
     operatorHead,
     checkedAt: new Date().toISOString(),
+    cliVersion,
   };
 }
+
+/**
+ * Read host-cp's bundled package.json version as the CLI-version
+ * fallback when OLAM_CLI_VERSION isn't propagated. The container
+ * Dockerfile copies the manifest into /app, so the lookup walks up
+ * from this module's location.
+ *
+ * @returns {string | null}
+ */
+function readHostCpPackageVersion() {
+  try {
+    const here = path.dirname(new URL(import.meta.url).pathname);
+    for (const candidate of [
+      path.join(here, '..', 'package.json'),
+      path.join(here, '..', '..', 'package.json'),
+    ]) {
+      if (fs.existsSync(candidate)) {
+        const pkg = JSON.parse(fs.readFileSync(candidate, 'utf-8'));
+        if (typeof pkg.version === 'string' && pkg.version.length > 0) return pkg.version;
+      }
+    }
+  } catch {
+    // best-effort
+  }
+  return null;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pleri/olam-cli",
-  "version": "0.1.69",
+  "version": "0.1.70",
   "type": "module",
   "bin": {
     "olam": "./bin/olam.cjs"