@bli-cockpit/cli 0.2.108 → 0.2.110

package/dist/commands/local-args-tower-usage.js

@@ -1,13 +1,15 @@
 import { optionalNonEmpty, optionalUrl, parseNamedArgs } from "./local-arg-values.js";
 export function parseUsageArgs(args) {
-    const values = parseNamedArgs(args, { allowedFlags: ["--min-confidence", "--by-topic", "--by-repo", "--person", "--all", "--since", "--until", "--include-automated", "--detail", "--home", "--dashboard-url", "--json"], valueFlags: ["--min-confidence", "--person", "--since", "--until", "--home", "--dashboard-url"] });
-    if (values.booleans.has("--by-repo") && values.booleans.has("--by-topic"))
-        throw new Error("--by-repo and --by-topic cannot be used together.");
+    const values = parseNamedArgs(args, { allowedFlags: ["--by-subject", "--subject", "--repo", "--session", "--from-window", "--min-confidence", "--by-topic", "--by-repo", "--person", "--all", "--since", "--until", "--include-automated", "--detail", "--home", "--dashboard-url", "--json"], valueFlags: ["--subject", "--repo", "--session", "--from-window", "--min-confidence", "--person", "--since", "--until", "--home", "--dashboard-url"] });
+    if (["--by-repo", "--by-topic", "--by-subject"].filter(flag => values.booleans.has(flag)).length > 1)
+        throw new Error("--by-repo and --by-topic cannot be used together or with --by-subject.");
     const minConfidence = values.flags.get("--min-confidence");
     if (minConfidence !== undefined && !["high", "medium", "low"].includes(minConfidence))
         throw new Error("--min-confidence accepts high, medium or low.");
     const action = values.positionals[0] ?? "people";
-    if (action !== "people" || values.positionals.length > 1)
-        throw new Error("usage takes one verb: people.");
-    return { kind: "usage", ...(minConfidence ? { minConfidence: minConfidence } : {}), byTopic: values.booleans.has("--by-topic"), byRepo: values.booleans.has("--by-repo"), person: optionalNonEmpty(values.flags.get("--person")), all: values.booleans.has("--all"), action: "people", since: optionalNonEmpty(values.flags.get("--since")) ?? "30d", until: optionalNonEmpty(values.flags.get("--until")), detail: values.booleans.has("--detail"), includeAutomated: values.booleans.has("--include-automated"), homeDir: optionalNonEmpty(values.flags.get("--home")), dashboardUrl: optionalUrl(values.flags.get("--dashboard-url")), json: values.booleans.has("--json") };
+    if (!["people", "sessions"].includes(action) || values.positionals.length > 1)
+        throw new Error("usage takes people or sessions.");
+    if (action === "sessions" && !values.flags.get("--subject") && !values.flags.get("--session"))
+        throw new Error("usage sessions requires --subject or --session.");
+    return { bySubject: values.booleans.has("--by-subject"), subject: optionalNonEmpty(values.flags.get("--subject")), repo: optionalNonEmpty(values.flags.get("--repo")), session: optionalNonEmpty(values.flags.get("--session")), fromWindow: optionalNonEmpty(values.flags.get("--from-window")), kind: "usage", ...(minConfidence ? { minConfidence: minConfidence } : {}), byTopic: values.booleans.has("--by-topic"), byRepo: values.booleans.has("--by-repo"), person: optionalNonEmpty(values.flags.get("--person")), all: values.booleans.has("--all"), action: action, since: optionalNonEmpty(values.flags.get("--since")) ?? "30d", until: optionalNonEmpty(values.flags.get("--until")), detail: values.booleans.has("--detail"), includeAutomated: values.booleans.has("--include-automated"), homeDir: optionalNonEmpty(values.flags.get("--home")), dashboardUrl: optionalUrl(values.flags.get("--dashboard-url")), json: values.booleans.has("--json") };
 }

package/dist/commands/local-help-commands-tower.js

@@ -143,7 +143,10 @@ export const TOWER_COMMAND_HELP = [
     [
         "usage",
         [
-            "Usage: cockpit usage people [--by-repo | --by-topic] [--min-confidence high|medium|low] [--person <email|me>] [--all] [--since <n>d|<n>h|<iso>] [--detail] [--until <iso>] [--include-automated] [--json]",
+            "Usage: cockpit usage people [--by-repo | --by-topic | --by-subject] [--min-confidence high|medium|low] [--person <email|me>] [--all] [--since <n>d|<n>h|<iso>] [--detail] [--until <iso>] [--include-automated] [--json]",
+            "  cockpit usage sessions --subject <name> [--repo <label>] [--since <window>] [--json]",
+            "  cockpit usage sessions --session <id> [--from-window <n>] [--json]",
+            "  --by-topic groups work types; --by-subject groups open subjects from session summaries.",
             "",
             "--by-topic adds topic rows, including (unlabelled). Choose only one grouping. --by-repo adds project rows under each person (top 10; --all shows every repo). --person me uses your signed-in email.",
             "Claude Code and Codex usage per person: sessions observed and extracted, tokens (total, output,",

package/dist/commands/local-help.js

@@ -102,7 +102,10 @@ export function localCommandHelp(command) {
         `  cockpit search "<words>" [--kind ${SEARCH_KINDS.join(",")}] [--limit <n>] [--dashboard-url <url>] [--json]`,
         "  cockpit release [--dry-run] [--skip-checks] [--no-floor] [--tag <tag>] [--access <public|restricted>] [--otp <code>]",
         "  cockpit careers [list|show <id>|rescreen <id>] [--role <slug>] [--min-score <n>] [--since <date>] [--json]",
-        "  cockpit usage people [--by-repo | --by-topic] [--min-confidence high|medium|low] [--person <email|me>] [--all] [--detail] [--since <n>d|<n>h|<iso>] [--until <iso>] [--include-automated] [--dashboard-url <url>] [--json]",
+        "  cockpit usage sessions --subject <name> [--repo <label>] [--since <window>] [--json]",
+        "  cockpit usage sessions --session <id> [--from-window <n>] [--json]",
+        "  --by-topic groups work types; --by-subject groups open subjects from session summaries.",
+        "  cockpit usage people [--by-repo | --by-topic | --by-subject] [--min-confidence high|medium|low] [--person <email|me>] [--all] [--detail] [--since <n>d|<n>h|<iso>] [--until <iso>] [--include-automated] [--dashboard-url <url>] [--json]",
         "",
         `Default dashboard: ${DEFAULT_DASHBOARD_URL}. Omit --dashboard-url for normal production use; pass it only for staging/custom dashboards or to force a different pairing.`,
     ].join("\n");

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

package/dist/commands/usage.js

@@ -5,6 +5,8 @@ import { writeLine } from "./cli-io.js";
 export async function runUsage(command, io) {
     const door = await openAgentDoor("usage", command, io);
     const query = new URLSearchParams({ since: command.since });
+    if (command.bySubject)
+        query.set("groupBy", "topic");
     if (command.minConfidence)
         query.set("minConfidence", command.minConfidence);
     if (command.byTopic)
@@ -15,6 +17,21 @@ export async function runUsage(command, io) {
         query.set("until", command.until);
     if (command.includeAutomated)
         query.set("include_automated", "1");
+    if (command.action === "sessions") {
+        for (const [key, value] of [["subject", command.subject], ["repo", command.repo], ["session", command.session], ["fromWindow", command.fromWindow]])
+            if (value)
+                query.set(key, value);
+        const response = await askAgentDoor(door, { path: `/api/usage/sessions?${query}`, method: "GET", label: "usage sessions", timeoutMs: 30_000 });
+        if (!response.ok)
+            return failAgentDoor(door, "[usage]", response.reason, response.detail);
+        if (door.json || command.session)
+            return emitAgentDoor(door, response.body);
+        const sessions = response.body.sessions ?? [];
+        for (const session of sessions)
+            writeLine(io.stdout, `${session.session_id}  ${formatCount(session.tokens)}  ${session.task_type}  ${session.title}`);
+        writeLine(io.stdout, `${sessions.length} sessions`);
+        return 0;
+    }
     const answer = await askAgentDoor(door, { path: `/api/usage/people?${query}`, method: "GET", label: "usage people", timeoutMs: 30_000 });
     if (!answer.ok)
         return failAgentDoor(door, "[usage]", answer.reason, answer.detail);
@@ -31,6 +48,8 @@ export async function runUsage(command, io) {
     }
     if (command.byTopic && body.people?.some((person) => !Array.isArray(person.task_types)))
         return failAgentDoor(door, "[usage]", "topic_grouping_unavailable", "The dashboard returned person totals without topic rows. Deploy the dashboard topic split before using --by-topic.");
+    if (command.bySubject && body.people?.some(person => !Array.isArray(person.subjects)))
+        return failAgentDoor(door, "[usage]", "subject_grouping_unavailable", "Deploy the dashboard subject split before using --by-subject.");
     if (door.json)
         return emitAgentDoor(door, body);
     let nameWidth = 20;
@@ -41,6 +60,13 @@ export async function runUsage(command, io) {
                 nameWidth = Math.max(nameWidth, repo.repo_label.length + 2);
         }
     }
+    if (command.bySubject)
+        for (const person of body.people ?? [])
+            for (const subject of person.subjects ?? []) {
+                nameWidth = Math.max(nameWidth, subject.repo_label.length + subject.topic.length + 5);
+                for (const sub of subject.children ?? [])
+                    nameWidth = Math.max(nameWidth, sub.subtopic.length + 4);
+            }
     const widths = [nameWidth, 8, 15, 12, 10, 10, 12, 14];
     const printRow = (cells) => writeLine(io.stdout, cells.map((cell, index) => index === 0 ? cell.padEnd(widths[index]) : cell.padStart(widths[index])).join("  ").trimEnd());
     printRow(["Person", "Tokens", "List equivalent", "Coverage", ...(command.detail ? ["Output", "Input", "Cache read", "Cache creation"] : [])]);
@@ -52,6 +78,12 @@ export async function runUsage(command, io) {
             `${row.sessions_extracted}/${row.sessions_observed}`,
             ...(command.detail ? [row.output_tokens, row.input_tokens, row.cache_read_input_tokens, row.cache_creation_input_tokens].map(formatCount) : []),
         ]);
+        if (command.bySubject)
+            for (const subject of row.subjects ?? []) {
+                printRow([`  ${subject.repo_label} / ${subject.topic}`, formatCount(subject.tokens), formatUsageDollars(subject.api_list_price_equivalent_usd), `${subject.extracted_sessions}/${subject.sessions}`, ...(command.detail ? [subject.output, subject.input, subject.cache_read, subject.cache_creation].map(formatCount) : [])]);
+                for (const sub of subject.children ?? [])
+                    printRow([`    ${sub.subtopic}`, formatCount(sub.tokens), formatUsageDollars(sub.api_list_price_equivalent_usd), `${sub.extracted_sessions}/${sub.sessions}`, ...(command.detail ? [sub.output, sub.input, sub.cache_read, sub.cache_creation].map(formatCount) : [])]);
+            }
         if (command.byRepo || command.byTopic) {
             const repos = (command.byTopic ? row.task_types : row.repos) ?? [];
             for (const repo of command.all ? repos : repos.slice(0, 10)) {
@@ -66,6 +98,8 @@ export async function runUsage(command, io) {
     writeLine(io.stdout, "");
     writeLine(io.stdout, body.api_list_price_equivalent_label ?? "API list-price equivalent (not actual spend)");
     writeLine(io.stdout, `${body.coverage?.sessions_extracted ?? 0} of ${body.coverage?.sessions_observed ?? 0} sessions extracted`);
+    if (command.bySubject)
+        writeLine(io.stdout, `${(body.people ?? []).reduce((n, person) => n + (person.sessions_summarized ?? 0), 0)} of ${body.coverage?.sessions_observed ?? 0} sessions summarized`);
     if (command.byTopic)
         writeLine(io.stdout, `${body.coverage?.sessions_labelled ?? 0} of ${body.coverage?.sessions_observed ?? 0} sessions labelled by topic`);
     return 0;

package/dist/evidence-upload-object.js

@@ -1,3 +1,4 @@
+import { gzipSync } from "node:zlib";
 import { COMMIT_CRASHED_PLATFORM, RawEvidenceUploadCommitResponseSchema, isPermanentUploadFailure, } from "@bli-cockpit/telemetry-core";
 import { beginOneObject } from "./evidence-upload-terminal.js";
 import { isNonJsonResponseBody, requestJson, safeFailureDetail, sha256, } from "./evidence-upload-transport.js";
@@ -46,8 +47,14 @@ async function uploadObjectChunks(options, entry, disposition, chunkSizeBytes, o
         if (received.has(index))
             continue;
         const chunk = entry.bytes.subarray(index * chunkSizeBytes, Math.min((index + 1) * chunkSizeBytes, entry.bytes.byteLength));
+        const encodedChunk = gzipSync(chunk);
+        console.error("[evidence-upload] chunk encoded", JSON.stringify({
+            upload_id: disposition.upload_id, chunk_index: index, chunk_encoding: "gzip",
+            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.v1",
+            schema_version: "ambient-raw-evidence-upload-chunk.v2",
+            encoding: "gzip",
             generated_at: options.generatedAt,
             provenance: options.provenance,
             upload_id: disposition.upload_id,
@@ -55,7 +62,7 @@ async function uploadObjectChunks(options, entry, disposition, chunkSizeBytes, o
             chunk_index: index,
             chunk_count: entry.chunkCount,
             chunk_hash_sha256: sha256(chunk),
-            content_base64: chunk.toString("base64"),
+            content_base64: encodedChunk.toString("base64"),
         });
         if (!chunkResponse.ok) {
             // Same treatment the commit path has had since BLI-2528: the server's

package/dist/raw-evidence-staging.js

@@ -70,7 +70,9 @@ export function rawEvidenceStagingStatePath(stateDir) {
 export async function readRawEvidenceStagingState(stateDir) {
     try {
         const raw = JSON.parse(await fs.readFile(rawEvidenceStagingStatePath(stateDir), "utf8"));
-        return parseStagingState(raw);
+        const state = parseStagingState(raw);
+        resetStorage403ForEncoding(state);
+        return state;
     }
     catch (error) {
         // Empty is right before the first staged pack. Unreadable is not: this
@@ -160,6 +162,7 @@ export function recordDeliveryFailure(state, contentHash, options) {
     const attemptedAtIso = options.attemptedAt.toISOString();
     const entry = {
         attempts,
+        ...(previous?.encoding_retry_version ? { encoding_retry_version: previous.encoding_retry_version } : {}),
         ...(terminalDeliveryReason(options.reason) ? { terminal_reason: options.reason } : {}),
         first_failed_at: previous?.first_failed_at ?? attemptedAtIso,
         last_attempt_at: attemptedAtIso,
@@ -295,6 +298,7 @@ function parseAttemptEntry(value) {
     const attempts = optionalNumber(record["attempts"]);
     return {
         ...(terminalDeliveryReason(optionalString(record["last_reason"])) ? { terminal_reason: String(record["last_reason"]) } : {}),
+        ...(record["encoding_retry_version"] === 1 ? { encoding_retry_version: 1 } : {}),
         attempts: attempts > 0 ? attempts : 1,
         first_failed_at: optionalString(record["first_failed_at"]) ?? lastAttemptAt,
         last_attempt_at: lastAttemptAt,
@@ -320,4 +324,21 @@ function shortHash(value) {
 /** A persisted clock cannot extend a retry beyond the last attempt's ceiling. */
 export function deliveryRetryAtMs(entry) {
     return Math.min(Date.parse(entry.next_attempt_at), Date.parse(entry.last_attempt_at) + EVIDENCE_DELIVERY_BACKOFF_MAX_MS);
+}
+/** One retry per object for the encoding repair, without erasing other refusals. */
+export function resetStorage403ForEncoding(state) {
+    let count = 0;
+    for (const entry of Object.values(state.delivery_attempts)) {
+        if (entry.encoding_retry_version === 1 || !/^chunk_\d+_failed_http_503_chunk_staging_upload_refused_storage_403$/u.test(entry.last_reason))
+            continue;
+        entry.encoding_retry_version = 1;
+        entry.next_attempt_at = new Date(0).toISOString();
+        delete entry.terminal_reason;
+        count += 1;
+    }
+    if (count > 0)
+        console.error("[raw-evidence-staging] storage refusals offered with encoding", JSON.stringify({
+            reason: "storage_403_encoding_retry", chunk_encoding: "gzip", objects_reset: count,
+        }));
+    return count;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bli-cockpit/cli",
-  "version": "0.2.108",
+  "version": "0.2.110",
   "private": false,
   "type": "module",
   "bin": {
@@ -27,8 +27,8 @@
     "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-runtime-files.mjs && node ../../scripts/assert-public-cli-exit-contract.mjs && node ../../scripts/assert-public-cli-no-fleet-posts.mjs && node ../../scripts/assert-public-package-pack.mjs --workspace=@bli-cockpit/cli"
   },
   "dependencies": {
-    "@bli-cockpit/memory-mcp": "0.1.27",
-    "@bli-cockpit/mcp": "0.1.36",
-    "@bli-cockpit/telemetry-core": "0.1.43"
+    "@bli-cockpit/memory-mcp": "0.1.28",
+    "@bli-cockpit/mcp": "0.1.38",
+    "@bli-cockpit/telemetry-core": "0.1.44"
   }
 }