@bli-cockpit/cli 0.2.266 → 0.2.267

package/dist/commands/public-root.js

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

package/dist/image-description-state.js

@@ -2,87 +2,32 @@
  * Which images this machine has already sent to the describe door (BLI-16977).
  *
  * One small file in the collector state directory. It is how "each distinct image is sent once"
- * survives from one 15-minute sync to the next. A key is the first 32 hex characters of the
- * image's sha256 (128 bits: no two images on one laptop will ever share one); the file holds keys
- * only, never a description, never a path, never a byte. If it is lost or corrupt the worst case
- * is the images are sent again and the server answers "known" without calling a model.
+ * survives from one 15-minute sync to the next. The file holds keys only, never a description, never
+ * a path, never a byte. If it is lost or corrupt the worst case is the images are sent again and the
+ * server answers "known" without calling a model.
+ *
+ * BLI-23328: the BLI Memory daemon writes the same file when it describes an image at turn end, so
+ * the format, the keys, the backoff steps and the locked read-merge-write live in telemetry-core
+ * (`image-description-store.ts`), shared by both writers. This module keeps the collector's names.
  */
-import path from "node:path";
-import { isMissingFileFailure } from "./health-detail.js";
-import { readJsonFile, writeJsonFileAtomic } from "./local-state-files.js";
-export const IMAGE_DESCRIPTION_STATE_FILENAME = "image-descriptions.json";
-/** Oldest keys leave first past this many (about 5 MB on disk). */
-export const IMAGE_DESCRIPTION_STATE_MAX_KEYS = 150_000;
-const KEY_CHARS = 32;
-export function imageStateKey(sha256) {
-    return sha256.slice(0, KEY_CHARS);
-}
-export function imageDescriptionStatePath(stateDir) {
-    return path.join(stateDir, IMAGE_DESCRIPTION_STATE_FILENAME);
-}
+import { IMAGE_DESCRIPTION_STATE_FILENAME, IMAGE_DESCRIPTION_STATE_MAX_KEYS, IMAGE_FAILED_STATE_MAX_KEYS, imageDescriptionStatePath, imageRetryDelayMs, imageStateKey, mergeImageDescriptionStates, readImageDescriptionState, updateImageDescriptionState, } from "@bli-cockpit/telemetry-core";
+export { IMAGE_DESCRIPTION_STATE_FILENAME, IMAGE_DESCRIPTION_STATE_MAX_KEYS, IMAGE_FAILED_STATE_MAX_KEYS, imageDescriptionStatePath, imageRetryDelayMs, imageStateKey, };
 /** The keys already described, oldest first. A missing or unreadable file is an empty list, said out loud when unreadable. */
 export async function readDescribedImageKeys(stateDir) {
-    try {
-        const raw = (await readJsonFile(imageDescriptionStatePath(stateDir)));
-        if (!Array.isArray(raw?.described))
-            return [];
-        return raw.described.filter((key) => typeof key === "string" && key.length === KEY_CHARS);
-    }
-    catch (error) {
-        if (!isMissingFileFailure(error)) {
-            console.error("[image-descriptions] state file unreadable, starting from an empty list", JSON.stringify({ reason: "image_state_unreadable" }));
-        }
-        return [];
-    }
-}
-/** Oldest failures leave first past this many. */
-export const IMAGE_FAILED_STATE_MAX_KEYS = 5_000;
-const HOUR_MS = 3_600_000;
-/** A refusal that repeats for the same bytes (a 4xx): a week, then a month. */
-const PERMANENT_BACKOFF_MS = [7 * 24 * HOUR_MS, 30 * 24 * HOUR_MS];
-/** A failure that may pass (the door or the model was down): 1 h, 6 h, 24 h, then 72 h. */
-const TRANSIENT_BACKOFF_MS = [HOUR_MS, 6 * HOUR_MS, 24 * HOUR_MS, 72 * HOUR_MS];
-/** How long to leave an image alone after its Nth failed attempt. */
-export function imageRetryDelayMs(attempts, permanent) {
-    const steps = permanent ? PERMANENT_BACKOFF_MS : TRANSIENT_BACKOFF_MS;
-    return steps[Math.min(Math.max(attempts, 1), steps.length) - 1];
+    return (await readImageDescriptionState(stateDir)).described;
 }
 /** The failures on record, key to record. A missing or unreadable file is an empty map, said out loud when unreadable. */
 export async function readFailedImages(stateDir) {
-    try {
-        const raw = (await readJsonFile(imageDescriptionStatePath(stateDir)));
-        if (!raw?.failed || typeof raw.failed !== "object" || Array.isArray(raw.failed))
-            return {};
-        const kept = {};
-        for (const [key, value] of Object.entries(raw.failed)) {
-            const record = value;
-            if (key.length !== KEY_CHARS || !record)
-                continue;
-            if (typeof record.reason !== "string" || typeof record.attempts !== "number" || typeof record.retry_after !== "number")
-                continue;
-            kept[key] = { reason: record.reason, attempts: record.attempts, retry_after: record.retry_after };
-        }
-        return kept;
-    }
-    catch (error) {
-        if (!isMissingFileFailure(error)) {
-            console.error("[image-descriptions] failed-image list unreadable, starting from an empty list", JSON.stringify({ reason: "image_failed_state_unreadable" }));
-        }
-        return {};
-    }
+    return (await readImageDescriptionState(stateDir)).failed;
 }
+/**
+ * Write this sync's view, merged with whatever the file holds now: the memory daemon may have
+ * described images since the tick opened its copy, and those entries must survive.
+ */
 export async function writeImageDescriptionState(stateDir, state) {
-    const keys = state.described;
-    const kept = keys.length > IMAGE_DESCRIPTION_STATE_MAX_KEYS ? keys.slice(keys.length - IMAGE_DESCRIPTION_STATE_MAX_KEYS) : keys;
-    const failedEntries = Object.entries(state.failed).sort((a, b) => a[1].retry_after - b[1].retry_after);
-    const failed = Object.fromEntries(failedEntries.slice(Math.max(0, failedEntries.length - IMAGE_FAILED_STATE_MAX_KEYS)));
-    await writeJsonFileAtomic(imageDescriptionStatePath(stateDir), {
-        schema_version: "cockpit-image-descriptions.v1",
-        described: kept,
-        failed,
-    });
+    await updateImageDescriptionState(stateDir, (disk) => mergeImageDescriptionStates({ described: [...state.described], failed: { ...state.failed } }, disk));
 }
 /** Writes the described list and keeps whatever failures are on record. */
 export async function writeDescribedImageKeys(stateDir, keys) {
-    await writeImageDescriptionState(stateDir, { described: keys, failed: await readFailedImages(stateDir) });
+    await writeImageDescriptionState(stateDir, { described: keys, failed: {} });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bli-cockpit/cli",
-  "version": "0.2.266",
+  "version": "0.2.267",
   "private": false,
   "type": "module",
   "bin": {
@@ -27,9 +27,9 @@
     "test": "node dist/cli.js --help && node ../../scripts/assert-public-cli-routing.mjs && node ../../scripts/assert-public-cli-verb-help.mjs && node ../../scripts/assert-public-cli-surface-doors.mjs && node ../../scripts/assert-public-cli-runtime-files.mjs && node ../../scripts/assert-public-cli-exit-contract.mjs && node ../../scripts/assert-public-cli-no-fleet-posts.mjs && node ../../scripts/assert-public-cli-doctor-json.mjs && node ../../scripts/assert-public-package-pack.mjs --workspace=@bli-cockpit/cli"
   },
   "dependencies": {
-    "@bli-cockpit/memory-mcp": "0.1.78",
-    "@bli-cockpit/mcp": "0.1.162",
-    "@bli-cockpit/telemetry-core": "0.1.85"
+    "@bli-cockpit/memory-mcp": "0.1.79",
+    "@bli-cockpit/mcp": "0.1.163",
+    "@bli-cockpit/telemetry-core": "0.1.86"
   },
   "repository": {
     "type": "git",