@bli-cockpit/cli 0.1.12 → 0.1.14

package/README.md

@@ -122,6 +122,35 @@ Remote dashboard:
 - Codex session attribution records (session id, file hash, attribution state
   and reason labels, scores) accepted by `/api/ambient/codex-sessions`.
 
+New raw evidence object keys are readable from the Storage browser:
+
+```text
+operators/<operator-slug>-<operator-short>/repos/<repo-slug>/worktrees/<worktree-slug>/tickets/<ticket-id-or-unbound>/dates/<YYYY-MM-DD>/sessions/<session-slug>/ids/<operator_user_id>/<work_context_id>/<source>/<source-path>
+```
+
+The readable folders are for humans. The canonical join still lives in
+`ambient_evidence_refs.raw_evidence_pointer_id`, `storage_bucket`, and
+`object_key`. For SQL recipes that reconstruct a day of work by operator, date,
+repo, ticket, and raw JSONL object, see
+[`docs/runbooks/cockpit-data-traceability.md`](../../docs/runbooks/cockpit-data-traceability.md).
+
+## Read or debug captured data
+
+Local attribution preview:
+
+```bash
+cockpit sessions --repo "$PWD" --json
+```
+
+Remote metadata path:
+
+1. Query `ambient_evidence_refs` by `operator_user_id`, `received_at`, and
+   optional `ticket_id`.
+2. Join `ambient_work_sessions` only for current labels such as repo, worktree,
+   branch, and collector version.
+3. Open the `ambient-raw-evidence` object only after SQL identifies the exact
+   row and `object_key`.
+
 Never provide Supabase service-role keys, raw DB URLs, root env files, cookies,
 or deployment tokens to this CLI. The collector must never read env files and
 does not collect random desktop screenshots or screen recordings.

package/dist/adapters/common.js

@@ -14,6 +14,8 @@ export function makeCaptureProvenance(context, captureSource) {
         collector_version: LOCAL_COLLECTOR_VERSION,
         repo: context.repoRoot,
         branch: context.branch,
+        repo_label: context.repoLabel,
+        worktree_label: context.worktreeLabel,
         operator_id: context.operatorId,
         session_id: context.sessionId,
         work_context_id: context.workContextId,

package/dist/adapters/local-sources.js

@@ -8,10 +8,14 @@ import { resolveTicketBinding, } from "./ticket-binding.js";
 export async function runLocalSourceCollectors(options) {
     const context = {
         repoRoot: options.repoRoot,
+        repoLabel: options.activeWorkContext?.repo_label,
+        worktreeLabel: options.activeWorkContext?.worktree_label,
         branch: options.branch,
         operatorId: options.operatorId,
+        operatorLabel: options.operatorLabel,
         sessionId: options.sessionId,
         workContextId: options.workContextId,
+        activeTicketId: options.activeWorkContext?.active_ticket_id ?? null,
         now: options.now ?? new Date(),
     };
     const git = await collectGitState(context);

package/dist/adapters/raw-evidence.js

@@ -99,10 +99,9 @@ export async function collectRawEvidencePack(context, options) {
         await fs.writeFile(manifestPath, manifestBytes, { mode: 0o600 });
         await chmodPrivate(manifestPath, 0o600);
         const manifestEntry = evidenceEntry({
+            context,
             kind: "manifest",
             packId,
-            operatorId: context.operatorId,
-            workContextId: context.workContextId,
             localPath: manifestPath,
             relativePath: "manifest.json",
             mediaType: "application/json",
@@ -350,10 +349,9 @@ async function collectOneAgentImageFile(collection, options) {
     await fs.writeFile(destination, raw, { mode: 0o600 });
     await chmodPrivate(destination, 0o600);
     collection.entries.push(evidenceEntry({
+        context: collection.context,
         kind: options.kind,
         packId: collection.packId,
-        operatorId: collection.context.operatorId,
-        workContextId: collection.context.workContextId,
         localPath: destination,
         relativePath,
         mediaType: metadata.media_type,
@@ -434,10 +432,9 @@ async function collectOneEvidenceFile(collection, options) {
     await fs.writeFile(destination, raw, { mode: 0o600 });
     await chmodPrivate(destination, 0o600);
     collection.entries.push(evidenceEntry({
+        context: collection.context,
         kind: options.kind,
         packId: collection.packId,
-        operatorId: collection.context.operatorId,
-        workContextId: collection.context.workContextId,
         localPath: destination,
         relativePath,
         mediaType: options.mediaType,
@@ -504,10 +501,9 @@ async function collectGitDiffFiles(collection, repoRoot) {
         await fs.writeFile(destination, raw, { mode: 0o600 });
         await chmodPrivate(destination, 0o600);
         collection.entries.push(evidenceEntry({
+            context: collection.context,
             kind: "git_diff",
             packId: collection.packId,
-            operatorId: collection.context.operatorId,
-            workContextId: collection.context.workContextId,
             localPath: destination,
             relativePath,
             mediaType: "text/x-diff",
@@ -577,6 +573,10 @@ function makeManifest(options) {
         work_context_id: options.context.workContextId,
         session_id: options.context.sessionId,
         operator_id: options.context.operatorId,
+        operator_label: options.context.operatorLabel,
+        repo_label: options.context.repoLabel ?? path.basename(options.context.repoRoot),
+        worktree_label: options.context.worktreeLabel,
+        active_ticket_id: options.context.activeTicketId ?? null,
         repo_basename: path.basename(options.context.repoRoot),
         branch: options.context.branch,
         storage_bucket: RAW_EVIDENCE_BUCKET,
@@ -599,8 +599,7 @@ function makeManifest(options) {
 function evidenceEntry(options) {
     const digest = sha256(options.bytes);
     const objectKey = remoteObjectKey({
-        operatorId: options.operatorId,
-        workContextId: options.workContextId,
+        context: options.context,
         packId: options.packId,
         relativePath: options.relativePath,
         contentAddress: options.contentAddress,
@@ -661,26 +660,63 @@ function pointerFromEntry(entry) {
     };
 }
 /**
- * Codex/Claude JSONL and git diff objects are content-addressed (kind/id/hash)
- * so the same content maps to the same remote key across syncs: interrupted
- * uploads resume and repeated syncs dedupe server-side. Pack-scoped keys remain
- * for the per-sync manifest.
+ * Raw evidence keys start with human-readable context, then end in immutable
+ * content addresses or pack-relative manifest paths. The local cursor reuses
+ * prior content hashes across syncs; the readable date/session folders are for
+ * operator debugging and incident response.
  */
 function remoteObjectKey(options) {
+    const namespace = readableEvidenceNamespace(options.context);
     if (options.contentAddress) {
         return posixPath([
-            options.operatorId,
-            options.workContextId,
+            ...namespace,
             options.contentAddress,
         ]);
     }
     return posixPath([
-        options.operatorId,
-        options.workContextId,
+        ...namespace,
         options.packId,
         options.relativePath,
     ]);
 }
+function readableEvidenceNamespace(context) {
+    return [
+        "operators",
+        operatorSlug(context),
+        "repos",
+        readableKeySegment(context.repoLabel ?? path.basename(context.repoRoot), "repo"),
+        "worktrees",
+        readableKeySegment(context.worktreeLabel ?? path.basename(context.repoRoot), "worktree"),
+        "tickets",
+        readableKeySegment(context.activeTicketId ?? "unbound", "unbound", {
+            lowercase: false,
+        }),
+        "dates",
+        context.now.toISOString().slice(0, 10),
+        "sessions",
+        readableKeySegment(context.sessionId, "session"),
+        "ids",
+        safeKeySegment(context.operatorId),
+        safeKeySegment(context.workContextId),
+    ];
+}
+function operatorSlug(context) {
+    const labelBeforeDomain = (context.operatorLabel ?? context.operatorId)
+        .split("@", 1)[0]
+        .trim();
+    const readable = readableKeySegment(labelBeforeDomain, "operator");
+    return `${readable}-${shortHash(context.operatorId).slice(0, 6)}`;
+}
+function readableKeySegment(value, fallback, options = {}) {
+    const base = options.lowercase === false ? value : value.toLowerCase();
+    const slug = base
+        .trim()
+        .replace(/[^A-Za-z0-9._-]+/g, "-")
+        .replace(/^-+|-+$/g, "")
+        .replace(/-{2,}/g, "-")
+        .slice(0, 80);
+    return slug || fallback;
+}
 function posixPath(parts) {
     return parts.join("/").replace(/\\/g, "/").replace(/\/+/g, "/");
 }

package/dist/commands/local.js

@@ -862,7 +862,9 @@ async function runStatus(command, io) {
     writeLine(io.stdout, `repo: ${status.repo}`);
     writeLine(io.stdout, `branch: ${status.branch}`);
     writeLine(io.stdout, `ticket: ${displayTicketId(status.active_ticket_id)}`);
+    writeLine(io.stdout, `work: ${displayWorkLabel(status)}`);
     writeLine(io.stdout, `collector_freshness: ${status.collector_freshness}`);
+    writeLine(io.stdout, `collector_version: ${status.collector_version}`);
     writeLine(io.stdout, `upload_state: ${status.upload_state}`);
     writeLine(io.stdout, `last_upload_attempt: ${status.last_upload_attempt_at ?? "never"}`);
     writeLine(io.stdout, `last_upload_success: ${status.last_upload_success_at ?? "never"}`);
@@ -875,6 +877,11 @@ async function runStatus(command, io) {
 function displayTicketId(ticketId) {
     return ticketId ?? "general ambient";
 }
+function displayWorkLabel(status) {
+    if (status.work_label && status.work_id)
+        return `${status.work_label} (${status.work_id})`;
+    return status.work_label ?? status.work_id ?? "no active work context";
+}
 /**
  * Read-only diagnostic: re-runs attribution (no upload, no cursor writes) and
  * prints why each session is or is not collected. Per-session reasons otherwise

package/dist/local-state.js

@@ -1,11 +1,15 @@
 import { getUserLocalCockpitPaths, LocalCollectorSessionFileSchema, LocalCollectorConfigSchema, LocalUserSessionReferenceSchema, LocalWorkContextSchema, } from "@bli-cockpit/telemetry-core";
 import crypto from "node:crypto";
+import { readFileSync } from "node:fs";
 import fs from "node:fs/promises";
 import os from "node:os";
 import path from "node:path";
 import { resolveRepoWorktreeIdentity, } from "./repo-identity.js";
 import { summarizeLocalUploadSpool } from "./spool/local-spool.js";
-export const LOCAL_COLLECTOR_VERSION = "0.1.10";
+const localCollectorPackage = JSON.parse(readFileSync(new URL("../package.json", import.meta.url), "utf8"));
+export const LOCAL_COLLECTOR_VERSION = typeof localCollectorPackage.version === "string"
+    ? localCollectorPackage.version
+    : "0.0.0";
 export const DEFAULT_DASHBOARD_URL = "https://bli-cockpit-dashboard.vercel.app";
 export function getCollectorRuntimePaths(homeDir = os.homedir()) {
     const paths = getUserLocalCockpitPaths(homeDir);
@@ -83,7 +87,7 @@ export async function pairLocalCollector(options = {}) {
         device_id: deviceId,
         device_name: deviceName,
         claimed_owner_email: claimedOwnerEmail,
-        collector_version: config.collector_version ?? LOCAL_COLLECTOR_VERSION,
+        collector_version: LOCAL_COLLECTOR_VERSION,
     });
     options.onPairStarted?.(startResponse);
     const sessionFile = await pollPairRequest(fetchImpl, dashboardUrl, {
@@ -218,7 +222,7 @@ export async function inspectLocalCollectorStatus(options = {}) {
         ? "Local user session is valid."
         : "Local user session missing or not paired; upload remains local-only.");
     details.push(context
-        ? `Active context ${context.work_context_id} last updated ${context.updated_at ?? context.started_at}.`
+        ? `Active work ${workDisplayLabel(context)} (${context.work_context_id}) last updated ${context.updated_at ?? context.started_at}.`
         : "Active work context missing. Run `cockpit start`.");
     details.push(uploadSpool.last_upload_attempt_at
         ? `Last upload attempt: ${uploadSpool.last_upload_attempt_at}.`
@@ -236,10 +240,14 @@ export async function inspectLocalCollectorStatus(options = {}) {
         installed: Boolean(config),
         config_file: paths.config_file,
         session_file: paths.session_file,
+        collector_version: LOCAL_COLLECTOR_VERSION,
+        config_collector_version: config?.collector_version ?? null,
         session_state: session.session_state,
         repo: context?.repo ?? identity.repo_root,
         branch,
         active_ticket_id: context?.active_ticket_id ?? null,
+        work_label: context ? workDisplayLabel(context) : null,
+        work_id: context?.work_context_id ?? null,
         work_context_id: context?.work_context_id ?? null,
         repo_label: context?.repo_label ?? identity.repo_label,
         repo_fingerprint: context?.repo_fingerprint ?? identity.repo_fingerprint,
@@ -256,6 +264,11 @@ export async function inspectLocalCollectorStatus(options = {}) {
         details,
     };
 }
+function workDisplayLabel(context) {
+    const repoLabel = (context.repo_label ?? path.basename(context.repo)) || "workspace";
+    const worktreeLabel = context.worktree_label ?? repoLabel;
+    return `${repoLabel}/${worktreeLabel}`;
+}
 export async function readLocalCollectorConfig(paths) {
     return LocalCollectorConfigSchema.parse(await readJsonFile(paths.config_file));
 }

package/dist/upload.js

@@ -41,15 +41,18 @@ export async function buildLocalAmbientEnvelope(options = {}) {
         repoLabel,
         now,
     });
-    const contextNamespacePrefix = `${session.operator_id}/${uploadContext.work_context_id}/`;
     const skipContentHashes = options.skipContentHashes ??
         new Set(Object.entries(options.cursorObjects ?? {})
-            .filter(([, entry]) => entry.object_key.startsWith(contextNamespacePrefix))
+            .filter(([, entry]) => rawEvidenceObjectKeyBelongsToWorkContext(entry.object_key, {
+            operatorId: session.operator_id,
+            workContextId: uploadContext.work_context_id,
+        }))
             .map(([hash]) => hash));
     const sourceCollection = await runLocalSourceCollectors({
         repoRoot,
         branch: uploadContext.branch,
         operatorId: session.operator_id,
+        operatorLabel: session.email ?? session.auth_subject_id,
         sessionId: session.session_id,
         workContextId: uploadContext.work_context_id,
         activeWorkContext: activeContext,
@@ -92,7 +95,7 @@ export async function buildLocalAmbientEnvelope(options = {}) {
     const envelope = TelemetryIngestEnvelopeSchema.parse({
         envelope_version: "telemetry-ingest.v1",
         generated_at: now.toISOString(),
-        collector_version: config.collector_version ?? LOCAL_COLLECTOR_VERSION,
+        collector_version: LOCAL_COLLECTOR_VERSION,
         session_reference: sanitizeSessionReference(session),
         work_context: uploadWorkContext,
         source_scan_results: sanitizeSourceScanResults(sourceCollection.scans, repoLabel),
@@ -767,4 +770,10 @@ function normalizeDashboardUrl(value) {
 function safeRepoLabel(repoRoot) {
     const basename = path.basename(repoRoot.replace(/[\\/]+$/, ""));
     return basename || "repo";
+}
+function rawEvidenceObjectKeyBelongsToWorkContext(objectKey, context) {
+    const legacyPrefix = `${context.operatorId}/${context.workContextId}/`;
+    const readableIdGuard = `/ids/${context.operatorId}/${context.workContextId}/`;
+    return (objectKey.startsWith(legacyPrefix) ||
+        (objectKey.startsWith("operators/") && objectKey.includes(readableIdGuard)));
 }

package/package.json

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