@bli-cockpit/cli 0.2.195 → 0.2.197

package/dist/commands/doctor-report.js

@@ -169,6 +169,7 @@ export function doctorNeedsPerson(rows, receipt) {
         "roots-cover-work": "cockpit doctor",
         "single-install": "Run npm uninstall -g @bli-cockpit/cli with the Node installation that owns the extra CLI listed above.",
         "autostart-alive": "cockpit doctor",
+        "usage-telemetry": "cockpit doctor",
         "memory-registered": "cockpit doctor",
         "agent-rules": "cockpit doctor",
         "mcp-answers": "cockpit doctor",

package/dist/commands/doctor-update.js

@@ -73,6 +73,8 @@ function parseNpmVersion(stdout) {
 }
 export function reexecDoctor(command, io) {
     const args = ["doctor"];
+    if (command.noUsageTelemetry)
+        args.push("--no-usage-telemetry");
     if (command.homeDir)
         args.push("--home", command.homeDir);
     if (command.backfillBudgetSeconds)

package/dist/commands/doctor-usage-telemetry.js

@@ -0,0 +1,96 @@
+import os from "node:os";
+import path from "node:path";
+import { getCollectorRuntimePaths, readLocalCollectorSessionFile } from "../local-state.js";
+import { claudeSettingsFile } from "./memory-install-claude.js";
+import { codexConfigFile } from "./tower-mcp-codex.js";
+import { defaultMemoryFileIo } from "./memory-install-files.js";
+import { mergeUsageToml } from "./usage-telemetry-toml.js";
+import { fail, needsFix, ok } from "./doctor-report.js";
+export function mergeClaudeUsageSettings(raw, origin, token, off) {
+    const root = JSON.parse(raw || "{}");
+    if (!root || typeof root !== "object" || Array.isArray(root) || (root.env !== undefined && (!root.env || typeof root.env !== "object" || Array.isArray(root.env))))
+        throw new Error("config_unreadable");
+    root.env = { ...root.env, CLAUDE_CODE_ENABLE_TELEMETRY: off ? "0" : "1",
+        OTEL_METRICS_EXPORTER: off ? "none" : "otlp", OTEL_LOGS_EXPORTER: off ? "none" : "otlp",
+        OTEL_EXPORTER_OTLP_PROTOCOL: "http/json", OTEL_EXPORTER_OTLP_ENDPOINT: `${new URL(origin).origin}/api/otel`,
+        OTEL_EXPORTER_OTLP_HEADERS: `Authorization=Bearer ${token}` };
+    // OTEL_LOG_USER_PROMPTS is never added or changed. Existing person keys survive.
+    return `${JSON.stringify(root, null, 2)}\n`;
+}
+export function mergeCodexUsageSettings(raw, origin, token, off) {
+    // Disabled exporter options remain as comments, including person-set TLS and
+    // headers. Restore them before enabling, rather than discard configuration.
+    const prefix = "# TOWER usage telemetry opt-out: ";
+    let table = "";
+    raw = raw.split("\n").flatMap(line => {
+        if (!off && line.startsWith(prefix))
+            line = line.slice(prefix.length);
+        const header = /^\s*\[([^\]]+)\]/.exec(line);
+        if (header)
+            table = header[1].replace(/["']/g, "").replace(/\s/g, "");
+        const exporterTable = /^otel\.(?:exporter|metrics_exporter)(?:\.|$)/.test(table);
+        const exporterAssignment = table === "otel" && /^\s*(?:exporter|metrics_exporter)\s*=/.test(line);
+        if (off && (exporterTable || exporterAssignment) && !/^\s*(?:exporter|metrics_exporter)\s*=\s*["']none["']/.test(line))
+            return [prefix + line];
+        if (!off && exporterAssignment && /^\s*(?:exporter|metrics_exporter)\s*=\s*["']none["']/.test(line))
+            return [];
+        return [line];
+    }).join("\n");
+    const exporter = off ? '"none"' : { "otlp-http": {
+            endpoint: JSON.stringify(`${new URL(origin).origin}/api/otel/v1/logs`), protocol: '"json"', headers: { Authorization: JSON.stringify(`Bearer ${token}`) },
+        } };
+    const metrics = off ? '"none"' : { "otlp-http": {
+            endpoint: JSON.stringify(`${new URL(origin).origin}/api/otel/v1/metrics`), protocol: '"json"', headers: { Authorization: JSON.stringify(`Bearer ${token}`) },
+        } };
+    return mergeUsageToml(raw, ["otel"], { log_user_prompt: "false", exporter, metrics_exporter: metrics });
+}
+export async function configureUsageTelemetry(options) {
+    const marker = path.join(getCollectorRuntimePaths(options.homeDir).state_dir, "usage-telemetry-opt-out.json");
+    const persisted = await options.io.readText(marker) !== null;
+    const off = persisted || Boolean(options.optOut);
+    let changed = Boolean(options.optOut && !persisted);
+    const files = [
+        [claudeSettingsFile(options.homeDir), mergeClaudeUsageSettings],
+        [codexConfigFile(options.homeDir), mergeCodexUsageSettings],
+    ];
+    const updates = [];
+    for (const [file, merge] of files) {
+        const raw = await options.io.readText(file) ?? "";
+        const next = merge(raw, options.origin, options.token, off);
+        updates.push({ file, merge, raw, next });
+    }
+    if (options.optOut && !persisted && !options.checkOnly)
+        await options.io.writeText(marker, '{"opt_out":true}\n');
+    for (const { file, merge, raw, next } of updates) {
+        if (raw === next)
+            continue;
+        changed = true;
+        if (options.checkOnly)
+            continue;
+        await options.io.writeText(file, next);
+        const stored = await options.io.readText(file);
+        if (stored === null || merge(stored, options.origin, options.token, off) !== stored)
+            throw new Error("read_back_mismatch");
+    }
+    console.error("[usage telemetry] configured", JSON.stringify({ reason: off ? "explicit_opt_out" : changed ? "settings_changed" : "already_current", check_only: Boolean(options.checkOnly) }));
+    return { off, changed };
+}
+async function usageTelemetryStep(context, checkOnly) {
+    try {
+        const home = context.command.homeDir ?? os.homedir();
+        const session = await readLocalCollectorSessionFile(getCollectorRuntimePaths(home));
+        if (!session?.device_token)
+            return needsFix("usage-telemetry", "device_token_missing", "usage telemetry: needs Tower sign-in");
+        const result = await configureUsageTelemetry({ homeDir: home, origin: context.command.dashboardUrl, token: session.device_token,
+            optOut: context.command.noUsageTelemetry, checkOnly, io: defaultMemoryFileIo({ mode: 0o600 }) });
+        const message = result.off ? "usage telemetry: off (explicit opt-out)" : "usage telemetry: on (claude code, codex)";
+        return checkOnly && result.changed ? needsFix("usage-telemetry", "settings_differ", message) : ok("usage-telemetry", result.off ? "explicit_opt_out" : "already_current", message);
+    }
+    catch (error) {
+        const reason = error instanceof SyntaxError ? "config_unreadable" : error instanceof Error && ["config_unreadable", "read_back_mismatch"].includes(error.message) ? error.message : "settings_io_failed";
+        console.error("[usage telemetry] refused", JSON.stringify({ reason }));
+        return fail("usage-telemetry", reason, "usage telemetry: settings could not be safely merged");
+    }
+}
+export const checkUsageTelemetry = (context) => usageTelemetryStep(context, true);
+export const fixUsageTelemetry = (context) => usageTelemetryStep(context, false);

package/dist/commands/doctor.js

@@ -1,3 +1,4 @@
+import { checkUsageTelemetry, fixUsageTelemetry } from "./doctor-usage-telemetry.js";
 import { LOCAL_COLLECTOR_VERSION } from "../local-state.js";
 import { isSemverBelow } from "../scheduled-self-update.js";
 import { describeError } from "../health-detail.js";
@@ -184,6 +185,7 @@ function doctorInvariants() {
             check: (context) => context.deps.checkMemory(context),
             fix: (context, _state) => context.deps.fixMemory(context),
         },
+        { id: "usage-telemetry", check: context => context.deps.checkUsageTelemetry(context), fix: context => context.deps.fixUsageTelemetry(context) },
         { id: "agent-rules", check: (context) => context.deps.checkAgentRules(context), fix: (context) => context.deps.fixAgentRules(context) },
         // BLI-3804. Right after the registration row, because it asks the second
         // half of the same question: `memory-registered` proves the entry exists
@@ -248,6 +250,8 @@ function defaultDoctorDeps(hooks) {
         checkSingleInstall: checkSingleInstallState,
         checkAutostart: checkAutostartState,
         fixAutostart: fixAutostartState,
+        checkUsageTelemetry,
+        fixUsageTelemetry,
         checkMemory: checkMemoryState,
         fixMemory: fixMemoryState,
         checkMcpAnswers: (context) => checkMcpAnswersState(context),

package/dist/commands/local-args-collector-setup.js

@@ -100,6 +100,7 @@ export function parseDoctorArgs(alias, args) {
             "--dry-run",
             "--check",
             "--no-repair",
+            "--no-usage-telemetry",
             "--lock-wait",
             "--backfill-budget",
             "--json",
@@ -141,6 +142,7 @@ export function parseDoctorArgs(alias, args) {
     }
     return {
         kind: "doctor",
+        noUsageTelemetry: values.booleans.has("--no-usage-telemetry"),
         checkOnly: values.booleans.has("--check") || values.booleans.has("--no-repair"),
         // Absent stays absent (BLI-11101): `doctor-budget.ts` owns the defaults,
         // and `--json` without either flag runs under one bounded budget.

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

@@ -89,11 +89,12 @@ export function localSubcommandHelp(command) {
         [
             "doctor",
             [
-                "Usage: cockpit doctor [--workspace <path>] [--check | --no-repair] [--lock-wait <seconds>] [--backfill-budget <seconds>] [--json]",
+                "Usage: cockpit doctor [--workspace <path>] [--check | --no-repair] [--no-usage-telemetry] [--lock-wait <seconds>] [--backfill-budget <seconds>] [--json]",
                 "",
                 "Diagnose, repair, and verify this machine.",
                 "Repairs CLI, background sync, sign-in, roots, memory and hooks, agent rules, catch-up, uploads, and cleanup.",
                 "roots-cover-work is informational: it names how many sessions are inside vs. outside saved roots (all already uploaded, outside ones labelled) and gives cockpit roots add commands for widening a root's redacted transcript content. It never needs a fix.",
+                "--no-usage-telemetry switches off Claude Code and Codex usage export, including later doctor runs.",
                 "--check or --no-repair diagnoses without repairs. --dry-run previews repairs.",
                 "--backfill-budget defaults to 900 seconds; catch-up repeats chunks until complete, with progress every 30 seconds.",
                 "Doctor never waits for the background sync: a running sync is reported as running (with how long ago it started) and doctor finishes; a sync that stopped responding or made no progress for 15 minutes is ended and doctor carries on. --lock-wait is accepted and changes nothing. Progress prints at most every 30 seconds and says what changed.",

package/dist/commands/memory-install-files.js

@@ -16,7 +16,7 @@ import { chmod, mkdir, readFile, rename, stat, unlink, writeFile, } from "node:f
 import path from "node:path";
 import { randomBytes } from "node:crypto";
 import { describeError, isMissingFileFailure } from "../health-detail.js";
-export function defaultMemoryFileIo() {
+export function defaultMemoryFileIo(options = {}) {
     return {
         async readText(file) {
             try {
@@ -40,9 +40,10 @@ export function defaultMemoryFileIo() {
                 .then((info) => info.mode & 0o777)
                 .catch(() => null);
             try {
-                await writeFile(staged, contents, "utf8");
-                if (existingMode !== null)
-                    await chmod(staged, existingMode);
+                await writeFile(staged, contents, { encoding: "utf8", ...(options.mode !== undefined ? { mode: options.mode } : {}) });
+                const targetMode = options.mode ?? existingMode;
+                if (targetMode !== null)
+                    await chmod(staged, targetMode);
                 await rename(staged, file);
             }
             catch (error) {
@@ -53,10 +54,12 @@ export function defaultMemoryFileIo() {
                 console.error("[memory-install] staged write could not be renamed; writing in place", JSON.stringify({
                     reason: "staged_rename_failed",
                     byte_size: contents.length,
-                    ...describeError(error),
+                    ...(options.mode !== undefined ? { error_name: error instanceof Error ? error.name : "unknown" } : describeError(error)),
                 }));
                 await unlink(staged).catch(() => undefined);
-                await writeFile(file, contents, "utf8");
+                await writeFile(file, contents, { encoding: "utf8", ...(options.mode !== undefined ? { mode: options.mode } : {}) });
+                if (options.mode !== undefined)
+                    await chmod(file, options.mode);
             }
         },
     };

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

package/dist/commands/setup.js

@@ -15,11 +15,16 @@ export async function runSetup(command, io) {
     if (door.json)
         return emitAgentDoor(door, answer.body);
     const body = answer.body;
-    const number = (value) => value === null ? "unknown" : value.toLocaleString(undefined, { maximumFractionDigits: 1 });
+    const number = (value) => value === null ? "n/a" : value.toLocaleString(undefined, { maximumFractionDigits: 1 });
+    // BLI-13066: the server writes what each number rests on (the share of sessions counted, the sessions judged), so the CLI, the web page and JARVIS say the same words. An older server sends none.
+    const coverage = (words) => words ? ` (${words})` : "";
     for (const person of body.people ?? []) {
-        writeLine(io.stdout, `${person.rank ? `#${person.rank} ` : "Unranked · "}${person.display_name ?? person.email ?? "Unknown person"}: ${number(person.prs_per_week)} merged PRs/week · ${number(person.tokens_per_pr)} tokens/merged PR · ${person.yield === null ? "unknown yield" : `${number(person.yield * 100)}% session yield`}`);
+        writeLine(io.stdout, `${person.rank ? `#${person.rank} ` : "Unranked · "}${person.display_name ?? person.email ?? "Unknown person"}: ${number(person.prs_per_week)} merged PRs/week · ${number(person.tokens_per_pr)} tokens/merged PR${coverage(person.coverage_words?.tokens)} · ${person.yield === null ? "no session judged yet" : `${number(person.yield * 100)}% session yield`}${coverage(person.coverage_words?.yield)}`);
         if (person.tokens_basis)
             writeLine(io.stdout, `  Token basis: ${person.tokens_basis === "total_fallback" ? "total (input/cache breakdown unavailable)" : "input + output, excluding cache reads"}`);
+        // What they really ran and used over the window (BLI-13067); a read that did not answer says so.
+        writeLine(io.stdout, `  Tokens by model: ${person.model_use?.words ?? "not available right now."}`);
+        writeLine(io.stdout, `  Skills used: ${person.skill_use?.words ?? "not available right now."}`);
         if (!person.machines.length)
             writeLine(io.stdout, "  No setup received.");
         for (const machine of person.machines) {
@@ -39,6 +44,9 @@ export async function runSetup(command, io) {
         writeLine(io.stdout, `${pair.first ?? "Unknown person"} / ${pair.second ?? "Unknown person"}`);
         for (const difference of command.details ? [...pair.differences, ...(pair.details ?? [])] : pair.differences)
             writeLine(io.stdout, `  ${difference}`);
+        for (const side of ["first", "second"])
+            if (pair.use?.[side])
+                writeLine(io.stdout, `  ${side === "first" ? pair.first : pair.second}: tokens by model: ${pair.use[side].models ?? "not available right now."} Skills used: ${pair.use[side].skills ?? "not available right now."}`);
     }
     if (body.note)
         writeLine(io.stdout, body.note);

package/dist/commands/usage-telemetry-toml.js

@@ -0,0 +1,116 @@
+import { findTomlTableSpan, upsertTomlTable } from "./memory-install-toml.js";
+const render = (value) => typeof value === "string" ? value : `{ ${Object.entries(value).map(([k, v]) => `${k} = ${render(v)}`).join(", ")} }`;
+/** Split inline TOML at commas outside strings/nested arrays/tables. Keep unknown values verbatim. */
+function splitEntries(text) {
+    const entries = [];
+    let start = 0, depth = 0, quote = "", escaped = false;
+    for (let i = 0; i < text.length; i++) {
+        const c = text[i];
+        if (quote) {
+            if (escaped)
+                escaped = false;
+            else if (c === "\\" && quote === '"')
+                escaped = true;
+            else if (c === quote)
+                quote = "";
+        }
+        else if (c === '"' || c === "'")
+            quote = c;
+        else if (c === "{" || c === "[")
+            depth++;
+        else if (c === "}" || c === "]")
+            depth--;
+        else if (c === "," && depth === 0) {
+            entries.push(text.slice(start, i).trim());
+            start = i + 1;
+        }
+    }
+    if (quote || depth !== 0)
+        throw new Error("config_unreadable");
+    entries.push(text.slice(start).trim());
+    return entries.filter(Boolean);
+}
+function mergeInline(previous, values) {
+    const raw = previous.trim();
+    if (!raw.startsWith("{"))
+        return render(values);
+    if (!raw.endsWith("}"))
+        throw new Error("config_unreadable");
+    const remaining = { ...values };
+    const entries = splitEntries(raw.slice(1, -1)).map(entry => {
+        const match = /^\s*([\w-]+|"[^"\n]+"|'[^'\n]+')\s*=\s*([\s\S]*)$/.exec(entry);
+        if (!match)
+            throw new Error("config_unreadable");
+        const key = match[1].replace(/^["']|["']$/g, "");
+        const value = remaining[key];
+        if (value === undefined)
+            return entry;
+        delete remaining[key];
+        return `${match[1]} = ${typeof value === "string" ? value : mergeInline(match[2], value)}`;
+    });
+    for (const [key, value] of Object.entries(remaining))
+        entries.push(`${key} = ${render(value)}`);
+    return `{ ${entries.join(", ")} }`;
+}
+/** Update only managed assignments; recurse through existing explicit subtables. */
+export function mergeUsageToml(text, tablePath, values) {
+    let next = text;
+    const local = {};
+    for (const [key, value] of Object.entries(values)) {
+        const childPath = [...tablePath, key].join(".");
+        const childExists = next.split("\n").some(line => {
+            const header = /^\s*\[([^\]]+)\]/.exec(line)?.[1].replace(/["']/g, "").replace(/\s/g, "");
+            return header === childPath || header?.startsWith(childPath + ".");
+        });
+        if (typeof value !== "string" && childExists)
+            next = mergeUsageToml(next, [...tablePath, key], value);
+        else
+            local[key] = value;
+    }
+    const span = findTomlTableSpan(next, tablePath);
+    if (!span)
+        return Object.keys(local).length ? upsertTomlTable(next, tablePath, `[${tablePath.join(".")}]\n${Object.entries(local).map(([k, v]) => `${k} = ${render(v)}`).join("\n")}`) : next;
+    const lines = next.split("\n");
+    const remaining = { ...local };
+    const body = lines.slice(span.start_line + 1, span.end_line).map(line => {
+        const match = /^(\s*)([\w-]+|"[^"\n]+"|'[^'\n]+')\s*=\s*(.*)$/.exec(line);
+        if (!match)
+            return line;
+        const key = match[2].replace(/^["']|["']$/g, "");
+        const value = remaining[key];
+        if (value === undefined)
+            return line;
+        delete remaining[key];
+        // Strip a trailing comment only outside a string or inline table.
+        const raw = match[3];
+        let quote = "", depth = 0, comment = raw.length, escaped = false;
+        for (let i = 0; i < raw.length; i++) {
+            const c = raw[i];
+            if (quote) {
+                if (escaped)
+                    escaped = false;
+                else if (c === "\\" && quote === '"')
+                    escaped = true;
+                else if (c === quote)
+                    quote = "";
+            }
+            else if (c === '"' || c === "'")
+                quote = c;
+            else if (c === "{" || c === "[")
+                depth++;
+            else if (c === "}" || c === "]")
+                depth--;
+            else if (c === "#" && depth === 0) {
+                comment = i;
+                break;
+            }
+        }
+        if (quote || depth !== 0)
+            throw new Error("config_unreadable");
+        const updated = typeof value === "string" ? value : mergeInline(raw.slice(0, comment), value);
+        return `${match[1]}${match[2]} = ${updated}${comment < raw.length ? ` ${raw.slice(comment)}` : ""}`;
+    });
+    for (const [key, value] of Object.entries(remaining))
+        body.push(`${key} = ${render(value)}`);
+    return [...lines.slice(0, span.start_line + 1), ...body, ...lines.slice(span.end_line)].join("\n");
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bli-cockpit/cli",
-  "version": "0.2.195",
+  "version": "0.2.197",
   "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.58",
-    "@bli-cockpit/mcp": "0.1.107",
-    "@bli-cockpit/telemetry-core": "0.1.67"
+    "@bli-cockpit/memory-mcp": "0.1.60",
+    "@bli-cockpit/mcp": "0.1.109",
+    "@bli-cockpit/telemetry-core": "0.1.69"
   },
   "repository": {
     "type": "git",