@bli-cockpit/cli 0.2.22 → 0.2.23

package/dist/commands/local.js

@@ -711,9 +711,16 @@ function sanitizeInstallErrorCode(value) {
         .slice(0, 120);
     return normalized || "unknown";
 }
+/**
+ * Posts pending install events. Also the collector's only per-tick listening
+ * post: the response carries the server-published `min_cli_version` floor
+ * (BLI-2678), so the last one observed is returned for the scheduled
+ * self-update step to act on. Every early-out returns null — no receipt, no
+ * floor.
+ */
 export async function reportInstallEventsBestEffort(options) {
     if (options.events.length === 0)
-        return;
+        return null;
     const paths = getCollectorRuntimePaths(options.homeDir);
     try {
         await enqueueInstallEventEntry(paths, {
@@ -744,17 +751,18 @@ export async function reportInstallEventsBestEffort(options) {
         if (options.json) {
             writeLine(options.io.stderr, "Install event outbox unavailable: local_write_failed");
         }
-        return;
+        return null;
     }
     const session = await readLocalCollectorSessionFile(paths).catch(() => null);
     if (!session ||
         session.session_state !== "valid" ||
         typeof session.device_token !== "string" ||
         !session.device_token) {
-        return;
+        return null;
     }
     const pending = (await readPendingInstallEventEntries(paths)).slice(0, 20);
     const failures = [];
+    let observedMinCliVersion = null;
     for (let offset = 0; offset < pending.length; offset += 5) {
         await Promise.all(pending.slice(offset, offset + 5).map(async (entry) => {
             const controller = new AbortController();
@@ -777,6 +785,13 @@ export async function reportInstallEventsBestEffort(options) {
                 if (!response.ok) {
                     throw new Error(`http_${response.status}`);
                 }
+                const receipt = (await response
+                    .json()
+                    .catch(() => null));
+                if (typeof receipt?.min_cli_version === "string" &&
+                    receipt.min_cli_version.trim()) {
+                    observedMinCliVersion = receipt.min_cli_version.trim();
+                }
                 await removeInstallEventEntry(paths, entry.outbox_id);
             }
             catch (error) {
@@ -795,6 +810,7 @@ export async function reportInstallEventsBestEffort(options) {
     if (options.json && failures.length > 0) {
         writeLine(options.io.stderr, `Install event telemetry queued for retry: ${[...new Set(failures)].join(",")}`);
     }
+    return observedMinCliVersion;
 }
 function classifyInstallTelemetryError(error) {
     if (error instanceof Error && error.name === "AbortError") {
@@ -2135,7 +2151,7 @@ async function runSync(command, io) {
     const paths = getCollectorRuntimePaths(command.homeDir);
     const config = await readLocalCollectorConfig(paths).catch(() => null);
     const dashboardUrl = command.dashboardUrl ?? config?.dashboard_url ?? DEFAULT_DASHBOARD_URL;
-    await reportInstallEventsBestEffort({
+    const minCliVersionAtStart = await reportInstallEventsBestEffort({
         homeDir: command.homeDir,
         dashboardUrl,
         command: "sync",
@@ -2145,7 +2161,7 @@ async function runSync(command, io) {
     });
     try {
         const result = await runSyncWithHealthReceipt(command, io);
-        await reportInstallEventsBestEffort({
+        const minCliVersion = await reportInstallEventsBestEffort({
             homeDir: command.homeDir,
             dashboardUrl,
             command: "sync",
@@ -2155,11 +2171,11 @@ async function runSync(command, io) {
         });
         // BLI-2601: self-update runs only after collection's own outcome above is
         // already decided and reported, win or lose. See the function doc.
-        await runScheduledSelfUpdateAfterSync(command, io, dashboardUrl);
+        await runScheduledSelfUpdateAfterSync(command, io, dashboardUrl, minCliVersion ?? minCliVersionAtStart);
         return result.exitCode;
     }
     catch (error) {
-        await reportInstallEventsBestEffort({
+        const minCliVersion = await reportInstallEventsBestEffort({
             homeDir: command.homeDir,
             dashboardUrl,
             command: "sync",
@@ -2174,7 +2190,7 @@ async function runSync(command, io) {
             json: command.json,
             io,
         });
-        await runScheduledSelfUpdateAfterSync(command, io, dashboardUrl);
+        await runScheduledSelfUpdateAfterSync(command, io, dashboardUrl, minCliVersion ?? minCliVersionAtStart);
         throw error;
     }
 }
@@ -2188,10 +2204,10 @@ async function runSync(command, io) {
  * reported as its own named `update` receipt, never surfaced as a `sync`
  * failure or thrown from this function.
  */
-async function runScheduledSelfUpdateAfterSync(command, io, dashboardUrl) {
+async function runScheduledSelfUpdateAfterSync(command, io, dashboardUrl, minCliVersion) {
     let event;
     try {
-        event = await runScheduledSelfUpdateForSync(command, io);
+        event = await runScheduledSelfUpdateForSync(command, io, minCliVersion);
     }
     catch (error) {
         // The throttle/probe/install machinery below is defensive already; this
@@ -2215,7 +2231,7 @@ async function runScheduledSelfUpdateAfterSync(command, io, dashboardUrl) {
         io,
     });
 }
-async function runScheduledSelfUpdateForSync(command, io) {
+async function runScheduledSelfUpdateForSync(command, io, minCliVersion) {
     const rawExec = io.exec;
     if (!rawExec) {
         // Only the real production `defaultIo()` supplies a process runner. A
@@ -2235,7 +2251,7 @@ async function runScheduledSelfUpdateForSync(command, io) {
         exec,
         currentVersion: LOCAL_COLLECTOR_VERSION,
         install: (tag) => attemptScheduledSelfUpdateInstall(scheduledIo, tag),
-    }, { env: io.env });
+    }, { env: io.env, minVersion: minCliVersion });
     return scheduledSelfUpdateInstallEvent(result);
 }
 async function attemptScheduledSelfUpdateInstall(io, tag) {
@@ -2260,9 +2276,21 @@ function scheduledSelfUpdateInstallEvent(result) {
     // produces a receipt.
     if (result.reason === "throttled_recent_attempt")
         return null;
-    if (result.status === "ok")
-        return { step: "update", status: "ok" };
+    // A forced attempt names its trigger in the receipt either way, so the
+    // ledger can tell "converged on the daily cadence" from "the floor pulled
+    // this machine forward" (BLI-2678).
+    const forcedDetail = result.forced && result.min_version
+        ? `forced_min_version ${result.min_version}`
+        : null;
+    if (result.status === "ok") {
+        return {
+            step: "update",
+            status: "ok",
+            ...(forcedDetail ? { error_detail: forcedDetail } : {}),
+        };
+    }
     const detail = [
+        forcedDetail,
         result.target_version ? `target ${result.target_version}` : null,
         result.installed_version ? `installed ${result.installed_version}` : null,
     ]

package/dist/commands/public-root.js

@@ -15,7 +15,7 @@ export async function runCockpitCli(argv, io) {
   }
 
   if (command === "--version" || command === "-V" || command === "version") {
-    writeLine(io?.stdout ?? process.stdout, "0.2.22");
+    writeLine(io?.stdout ?? process.stdout, "0.2.23");
     return 0;
   }
 

package/dist/scheduled-self-update.js

@@ -37,9 +37,22 @@ export async function runScheduledSelfUpdate(paths, deps, options = {}) {
     const env = options.env ?? process.env;
     const now = options.now ?? new Date();
     const tag = options.tag ?? "latest";
+    // BLI-2678: the fleet forced-update floor. When the server says the minimum
+    // is above what this process is running, the daily throttle stops applying —
+    // the whole point of the floor is converging faster than once a day. This is
+    // NOT remote code execution: being below the floor only makes the exact
+    // same npm self-update that runs daily anyway run now. An unparseable floor
+    // is ignored rather than obeyed — a typo must fail toward the safe default.
+    const minVersion = parseSemverTriple(options.minVersion ?? null)
+        ? options.minVersion.trim()
+        : null;
+    const forced = minVersion !== null && isSemverBelow(deps.currentVersion, minVersion);
+    const forcedFields = forced ? { forced: true, min_version: minVersion } : {};
     const marker = path.join(paths.state_dir, SELF_UPDATE_THROTTLE_MARKER);
     const lastCheck = await fs.stat(marker).catch(() => null);
-    if (lastCheck && now.getTime() - lastCheck.mtimeMs < SELF_UPDATE_MIN_INTERVAL_MS) {
+    if (!forced &&
+        lastCheck &&
+        now.getTime() - lastCheck.mtimeMs < SELF_UPDATE_MIN_INTERVAL_MS) {
         // The steady-state case: already checked today, nothing to do. Not
         // reported as an "attempt" by the caller — this fires on ~95 of every 96
         // ticks and would otherwise be pure noise.
@@ -56,11 +69,33 @@ export async function runScheduledSelfUpdate(paths, deps, options = {}) {
     // disabled machine reports itself at most once per day too, instead of on
     // every tick.
     if (env["COCKPIT_DISABLE_AUTO_UPDATE"] === "1") {
-        return { status: "skipped", reason: "disabled_by_env" };
+        // The incident-triage freeze outranks the forced floor: a human pinned
+        // this machine on purpose, and the server must not be able to unpin it.
+        return { status: "skipped", reason: "disabled_by_env", ...forcedFields };
     }
     const targetVersion = await latestCliVersionFromNpm(deps.exec, tag);
+    if (forced &&
+        targetVersion &&
+        isSemverBelow(targetVersion, minVersion)) {
+        // The floor is above what npm actually serves — a typo'd floor, or one set
+        // before the release finished publishing. Installing would not clear the
+        // floor, so every forced tick would run `npm install` forever. Skip loudly
+        // instead: this reason posts a receipt on every tick until the floor is
+        // corrected, which is exactly the alarm a misconfig should raise.
+        return {
+            status: "skipped",
+            reason: "min_version_above_npm_latest",
+            target_version: targetVersion,
+            ...forcedFields,
+        };
+    }
     if (targetVersion && targetVersion === deps.currentVersion) {
-        return { status: "ok", reason: "already_latest", target_version: targetVersion };
+        return {
+            status: "ok",
+            reason: "already_latest",
+            target_version: targetVersion,
+            ...forcedFields,
+        };
     }
     const installed = await deps.install(tag);
     if (!installed.ok) {
@@ -68,6 +103,7 @@ export async function runScheduledSelfUpdate(paths, deps, options = {}) {
             status: "fail",
             reason: installed.eacces ? "eacces_needs_chown" : "npm_install_failed",
             ...(targetVersion ? { target_version: targetVersion } : {}),
+            ...forcedFields,
         };
     }
     // Verify against what the platform returns, not the exit code npm handed
@@ -82,6 +118,7 @@ export async function runScheduledSelfUpdate(paths, deps, options = {}) {
             reason: "stale_after_self_update",
             ...(targetVersion ? { target_version: targetVersion } : {}),
             ...(installedVersion ? { installed_version: installedVersion } : {}),
+            ...forcedFields,
         };
     }
     return {
@@ -89,8 +126,37 @@ export async function runScheduledSelfUpdate(paths, deps, options = {}) {
         reason: "updated",
         target_version: targetVersion ?? installedVersion,
         installed_version: installedVersion,
+        ...forcedFields,
     };
 }
+/**
+ * Ordering comparison for the forced-update floor. Mirrors the dashboard's
+ * parseSemver/compareParsedSemver (apps/dashboard/src/lib/ambient/rollups.ts)
+ * rather than adding a `semver` dependency for two ten-line functions. A
+ * version either side fails to parse → false: an unreadable floor or version
+ * must never force anything.
+ */
+function parseSemverTriple(value) {
+    if (typeof value !== "string")
+        return null;
+    const match = value.trim().match(/^(\d+)\.(\d+)\.(\d+)/u);
+    if (!match)
+        return null;
+    return [Number(match[1]), Number(match[2]), Number(match[3])];
+}
+function isSemverBelow(left, right) {
+    const parsedLeft = parseSemverTriple(left);
+    const parsedRight = parseSemverTriple(right);
+    if (!parsedLeft || !parsedRight)
+        return false;
+    for (let part = 0; part < 3; part += 1) {
+        if ((parsedLeft[part] ?? 0) < (parsedRight[part] ?? 0))
+            return true;
+        if ((parsedLeft[part] ?? 0) > (parsedRight[part] ?? 0))
+            return false;
+    }
+    return false;
+}
 async function latestCliVersionFromNpm(exec, tag) {
     const result = await exec("npm", [
         "view",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bli-cockpit/cli",
-  "version": "0.2.22",
+  "version": "0.2.23",
   "private": false,
   "type": "module",
   "bin": {