@bli-cockpit/cli 0.2.269 → 0.2.270

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.269");
+    writeLine(io?.stdout ?? process.stdout, "0.2.270");
     return 0;
   }
 

package/dist/evidence-upload-direct.js

@@ -1,11 +1,11 @@
-import { encodeEvidenceBytes } from "@bli-cockpit/telemetry-core/evidence-storage-encoding";
+import { encodeChunkForStorage } from "./evidence-upload-encoding.js";
 import { fetchWithDeadline, isUploadDeadlineError, uploadDeadlineMs } from "./evidence-upload-deadline.js";
 import { noteSyncProgress } from "./sync-lock.js";
-export async function putSignedChunk(options, signedUrl, bytes, uploadId, index) {
-    // Identical manifest + gzip framing to the server chunk route staging write.
-    const encoded = encodeEvidenceBytes(bytes);
+export async function putSignedChunk(options, signedUrl, bytes, uploadId, index, codec = "gzip") {
+    // Identical manifest + codec framing to the server chunk route staging write (gzip unless the server listed more).
+    const encoded = encodeChunkForStorage(bytes, codec);
     console.error("[evidence-upload] chunk encoded for storage", JSON.stringify({
-        upload_id: uploadId, chunk_index: index, chunk_encoding: "gzip",
+        upload_id: uploadId, chunk_index: index, chunk_encoding: codec,
         bytes_before: bytes.length, bytes_after: encoded.length,
     }));
     const deadlineMs = uploadDeadlineMs(encoded.length);

package/dist/evidence-upload-encoding.js

@@ -0,0 +1,23 @@
+import { EVIDENCE_CODEC_PREFERENCE, EVIDENCE_MANIFESTS, compressEvidenceBytes, zstdAvailable, } from "@bli-cockpit/telemetry-core/evidence-storage-encoding";
+/** What this Node can write, most preferred first. Sent on `begin`. */
+export function localEncodings(zstd = zstdAvailable()) {
+    return EVIDENCE_CODEC_PREFERENCE.filter(codec => codec !== "zstd" || zstd);
+}
+/**
+ * zstd when this Node has it and the server lists it, else brotli when listed, else gzip.
+ * A reply with no list (an old server) means gzip, which every server has always decoded.
+ */
+export function chooseUploadEncoding(accepted, zstd = zstdAvailable()) {
+    if (!accepted || accepted.length === 0)
+        return { codec: "gzip", reason: "server_did_not_advertise" };
+    if (accepted.includes("zstd") && zstd)
+        return { codec: "zstd", reason: "server_accepts_zstd" };
+    if (accepted.includes("br")) {
+        return { codec: "br", reason: accepted.includes("zstd") ? "node_without_zstd" : "server_accepts_brotli_only" };
+    }
+    return { codec: "gzip", reason: accepted.includes("zstd") ? "node_without_zstd" : "server_did_not_advertise" };
+}
+/** The bytes the server stages for one chunk: the codec's manifest, then its stream. */
+export function encodeChunkForStorage(bytes, codec) {
+    return Buffer.concat([EVIDENCE_MANIFESTS[codec], compressEvidenceBytes(bytes, codec)]);
+}

package/dist/evidence-upload-object.js

@@ -1,5 +1,6 @@
 import { putSignedChunk } from "./evidence-upload-direct.js";
-import { gzipSync } from "node:zlib";
+import { compressEvidenceBytes } from "@bli-cockpit/telemetry-core/evidence-storage-encoding";
+import { chooseUploadEncoding } from "./evidence-upload-encoding.js";
 import { COMMIT_CRASHED_PLATFORM, RawEvidenceUploadCommitResponseSchema, isPermanentUploadFailure, } from "@bli-cockpit/telemetry-core";
 import { StagedFileError, readVerifiedChunk } from "./evidence-upload-staged.js";
 import { beginOneObject } from "./evidence-upload-terminal.js";
@@ -41,6 +42,12 @@ async function uploadObjectChunks(options, entry, disposition, chunkSizeBytes, o
     if (disposition.disposition === "already_committed" || disposition.commit_ready) {
         return { ok: true, uploadedChunks };
     }
+    // BLI-23334: the server listed what it decodes; an older one lists nothing and gets gzip.
+    const encoding = chooseUploadEncoding(disposition.accepted_encodings);
+    console.error("[evidence-upload] encoding chosen", JSON.stringify({
+        upload_id: disposition.upload_id, chunk_encoding: encoding.codec, reason: encoding.reason,
+        server_listed: disposition.accepted_encodings?.join(",") ?? "none",
+    }));
     for (let index = 0; index < entry.chunkCount; index += 1) {
         if (received.has(index))
             continue;
@@ -60,7 +67,7 @@ async function uploadObjectChunks(options, entry, disposition, chunkSizeBytes, o
         }
         const offer = disposition.signed_uploads?.find(upload => upload.chunk_index === index);
         const direct = offer
-            ? await putSignedChunk(options, offer.signed_url, chunk, disposition.upload_id, index)
+            ? await putSignedChunk(options, offer.signed_url, chunk, disposition.upload_id, index, encoding.codec)
             : "refused";
         if (direct === "deadline") {
             // BLI-22801: the chunk route would push the same bytes over the same slow link.
@@ -75,26 +82,26 @@ async function uploadObjectChunks(options, entry, disposition, chunkSizeBytes, o
             uploadedChunks += 1;
             continue;
         }
-        const failure = await uploadChunkThroughEndpoint(options, entry, disposition, objectKey, index, chunk, uploadedChunks, Boolean(offer));
+        const failure = await uploadChunkThroughEndpoint(options, entry, disposition, objectKey, index, chunk, uploadedChunks, Boolean(offer), encoding.codec);
         if (failure)
             return failure;
         uploadedChunks += 1;
     }
     return { ok: true, uploadedChunks };
 }
-async function uploadChunkThroughEndpoint(options, entry, disposition, objectKey, index, chunk, uploadedChunks, hadSignedOffer) {
+async function uploadChunkThroughEndpoint(options, entry, disposition, objectKey, index, chunk, uploadedChunks, hadSignedOffer, codec) {
     console.error("[evidence-upload] using chunk route", JSON.stringify({
         reason: hadSignedOffer ? "signed_upload_refused_fallback" : "signed_upload_not_offered",
         upload_id: disposition.upload_id, chunk_index: index,
     }));
-    const encodedChunk = gzipSync(chunk);
+    const encodedChunk = compressEvidenceBytes(chunk, codec);
     console.error("[evidence-upload] chunk encoded", JSON.stringify({
-        upload_id: disposition.upload_id, chunk_index: index, chunk_encoding: "gzip",
+        upload_id: disposition.upload_id, chunk_index: index, chunk_encoding: codec,
         bytes_before: chunk.length, bytes_after: encodedChunk.length,
     }));
     const chunkResponse = await requestJson(options, "/api/ambient/evidence/upload/chunk", {
         schema_version: "ambient-raw-evidence-upload-chunk.v2",
-        encoding: "gzip",
+        encoding: codec,
         generated_at: options.generatedAt,
         provenance: options.provenance,
         upload_id: disposition.upload_id,

package/dist/evidence-upload-plan.js

@@ -243,6 +243,7 @@ export function readBeginDispositions(body) {
             signed_uploads: entry.signed_uploads,
             reason: entry.reason ?? null,
             raw_evidence_pointer_id: entry.raw_evidence_pointer_id,
+            ...(entry.accepted_encodings ? { accepted_encodings: entry.accepted_encodings } : {}),
         });
     }
     return map;

package/dist/evidence-upload-transport.js

@@ -1,4 +1,6 @@
 import crypto from "node:crypto";
+import { EVIDENCE_CODECS_HEADER } from "@bli-cockpit/telemetry-core";
+import { localEncodings } from "./evidence-upload-encoding.js";
 import { describeError } from "./health-detail.js";
 import { fetchWithDeadline, isUploadDeadlineError, uploadDeadlineMs } from "./evidence-upload-deadline.js";
 import { noteSyncProgress } from "./sync-lock.js";
@@ -26,7 +28,7 @@ export async function requestJson(options, routePath, body) {
                     "Authorization": `Bearer ${options.deviceToken}`,
                     "Content-Type": "application/json",
                     ...(routePath.endsWith("/evidence/upload/begin")
-                        ? { "x-tower-evidence-direct": "staged-gzip-v1" } : {}),
+                        ? { "x-tower-evidence-direct": "staged-gzip-v1", [EVIDENCE_CODECS_HEADER]: localEncodings().join(",") } : {}),
                 },
                 body: serialized,
             }, deadlineMs);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bli-cockpit/cli",
-  "version": "0.2.269",
+  "version": "0.2.270",
   "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.80",
-    "@bli-cockpit/mcp": "0.1.164",
-    "@bli-cockpit/telemetry-core": "0.1.87"
+    "@bli-cockpit/memory-mcp": "0.1.81",
+    "@bli-cockpit/mcp": "0.1.165",
+    "@bli-cockpit/telemetry-core": "0.1.88"
   },
   "repository": {
     "type": "git",