@bli-cockpit/cli 0.2.236 → 0.2.238

package/dist/commands/sync-doctor.js

@@ -49,54 +49,7 @@ export async function runDoctorAfterSync(command, io, dashboardUrl, overrides =
                 return;
         }
         const requestId = requestedDoctorId();
-        const session = await readLocalCollectorSessionFile(paths).catch(() => null);
-        let receipt = null;
-        const quiet = new Writable({ write(_chunk, _encoding, done) { done(); } });
-        const doctorIo = { ...io, stdout: quiet };
-        await runDoctor({ kind: "doctor", alias: "doctor", automaticTick: true, homeDir: command.homeDir, dashboardUrl, json: true, dryRun: false }, doctorIo, {
-            selfUpdate: (updateIo, options) => runSelfUpdate({ ...updateIo, stdout: quiet }, options),
-            runLogin: async () => { throw new Error("automatic_doctor_cannot_prompt"); },
-            resolveAndSaveRoots: async () => { throw new Error("automatic_doctor_cannot_pick_folders"); },
-            reportInstallEvents: (options) => reportInstallEventsBestEffort({ ...options, homeDir: command.homeDir,
-                // Automatic receipts carry labels, never terminal instructions or paths.
-                events: options.events.map((event) => ({ step: event.step, status: event.status, ...(event.error_code ? { error_code: event.error_code } : {}) })),
-            }),
-            onReceipt: (rows, repairs, setup) => {
-                const actions = new Set();
-                for (const item of doctorNeedsPerson(rows, setup)) {
-                    if (item.step === "authed" && (!session?.device_token || [401, 403].includes(heartbeatRefusalStatus() ?? 0)))
-                        actions.add("browser_sign_in");
-                    if (item.step === "roots-ok")
-                        actions.add("folder_selection");
-                    if (item.step === "single-install")
-                        actions.add("duplicate_install");
-                    if (item.reason === "needs_trust" || item.action?.includes("/hooks"))
-                        actions.add("hook_trust");
-                    if (/permission|eacces|eperm|access_denied/u.test(item.reason))
-                        actions.add("os_permission");
-                }
-                receipt = {
-                    request_id: requestId, completed_at: new Date().toISOString(),
-                    status: rows.some((row) => row.status === "fail" || row.status === "needs_fix") || actions.size ? "attention" : "pass",
-                    repairs: repairs.map((repair) => ({ step: repair.step, before: safeVerdict(repair.before), after: safeVerdict(repair.after), fix_attempted: repair.fix_attempted ?? false })),
-                    person_actions: [...actions],
-                };
-            },
-        }, {
-            // The collection phase already ran. Never recurse through another sync.
-            checkSync: async () => ({ id: "sync-fresh", status: facts?.status === "fail" ? "needs_fix" : "skipped", code: facts?.status === "fail" ? "tick_collection_failed" : "tick_collection_reported", message: "This tick already reported its collection outcome; it retries on the next tick." }),
-            fixSync: async (context) => context.deps.checkSync(context),
-            checkAutostart: async (context) => await isAutostartOptedOut(paths)
-                ? { id: "autostart-alive", status: "skipped", code: "operator_uninstalled", message: "Background sync was deliberately turned off." }
-                : checkAutostartState(context),
-            fixAutostart: async (context) => {
-                // macOS uses the detached healer; Windows repairs in place. Neither
-                // overrides an explicit opt-out nor unloads this tick's macOS job.
-                await runAutostartSelfHealAfterSync(command, io, dashboardUrl);
-                return checkAutostartState(context);
-            },
-            ...overrides,
-        });
+        const receipt = await collectDoctorReceipt(command, io, dashboardUrl, overrides, facts, paths, requestId);
         if (!receipt)
             throw new Error("doctor_receipt_missing");
         await fs.mkdir(paths.state_dir, { recursive: true, mode: 0o700 });
@@ -116,6 +69,57 @@ export async function runDoctorAfterSync(command, io, dashboardUrl, overrides =
         await lock.handle.release();
     }
 }
+async function collectDoctorReceipt(command, io, dashboardUrl, overrides, facts, paths, requestId) {
+    const session = await readLocalCollectorSessionFile(paths).catch(() => null);
+    let receipt = null;
+    const quiet = new Writable({ write(_chunk, _encoding, done) { done(); } });
+    const doctorIo = { ...io, stdout: quiet };
+    await runDoctor({ kind: "doctor", alias: "doctor", automaticTick: true, homeDir: command.homeDir, dashboardUrl, json: true, dryRun: false }, doctorIo, {
+        selfUpdate: (updateIo, options) => runSelfUpdate({ ...updateIo, stdout: quiet }, options),
+        runLogin: async () => { throw new Error("automatic_doctor_cannot_prompt"); },
+        resolveAndSaveRoots: async () => { throw new Error("automatic_doctor_cannot_pick_folders"); },
+        reportInstallEvents: (options) => reportInstallEventsBestEffort({ ...options, homeDir: command.homeDir,
+            // Automatic receipts carry labels, never terminal instructions or paths.
+            events: options.events.map((event) => ({ step: event.step, status: event.status, ...(event.error_code ? { error_code: event.error_code } : {}) })),
+        }),
+        onReceipt: (rows, repairs, setup) => {
+            const actions = new Set();
+            for (const item of doctorNeedsPerson(rows, setup)) {
+                if (item.step === "authed" && (!session?.device_token || [401, 403].includes(heartbeatRefusalStatus() ?? 0)))
+                    actions.add("browser_sign_in");
+                if (item.step === "roots-ok")
+                    actions.add("folder_selection");
+                if (item.step === "single-install")
+                    actions.add("duplicate_install");
+                if (item.reason === "needs_trust" || item.action?.includes("/hooks"))
+                    actions.add("hook_trust");
+                if (/permission|eacces|eperm|access_denied/u.test(item.reason))
+                    actions.add("os_permission");
+            }
+            receipt = {
+                request_id: requestId, completed_at: new Date().toISOString(),
+                status: rows.some((row) => row.status === "fail" || row.status === "needs_fix") || actions.size ? "attention" : "pass",
+                repairs: repairs.map((repair) => ({ step: repair.step, before: safeVerdict(repair.before), after: safeVerdict(repair.after), fix_attempted: repair.fix_attempted ?? false })),
+                person_actions: [...actions],
+            };
+        },
+    }, {
+        // The collection phase already ran. Never recurse through another sync.
+        checkSync: async () => ({ id: "sync-fresh", status: facts?.status === "fail" ? "needs_fix" : "skipped", code: facts?.status === "fail" ? "tick_collection_failed" : "tick_collection_reported", message: "This tick already reported its collection outcome; it retries on the next tick." }),
+        fixSync: async (context) => context.deps.checkSync(context),
+        checkAutostart: async (context) => await isAutostartOptedOut(paths)
+            ? { id: "autostart-alive", status: "skipped", code: "operator_uninstalled", message: "Background sync was deliberately turned off." }
+            : checkAutostartState(context),
+        fixAutostart: async (context) => {
+            // macOS uses the detached healer; Windows repairs in place. Neither
+            // overrides an explicit opt-out nor unloads this tick's macOS job.
+            await runAutostartSelfHealAfterSync(command, io, dashboardUrl);
+            return checkAutostartState(context);
+        },
+        ...overrides,
+    });
+    return receipt;
+}
 function safeVerdict(value) {
     const [status, code] = (value ?? "fail:receipt_missing").split(":");
     return `${status}:${sanitizeEventCode(code ?? "receipt_missing")}`;

package/dist/commands/sync.js

@@ -80,23 +80,29 @@ async function runSyncTick(command, io, tick) {
     const minCliVersionAtStart = await reportTickStarted(command, io, dashboardUrl);
     const updated = await tick.selfUpdate(() => runScheduledSelfUpdateAfterSync(command, io, dashboardUrl, minCliVersionAtStart));
     if (updated && io.exec) {
-        const args = ["sync"];
-        if (command.homeDir)
-            args.push("--home", command.homeDir);
-        if (command.repoRoot)
-            args.push("--workspace", command.repoRoot);
-        if (command.dashboardUrl)
-            args.push("--dashboard-url", command.dashboardUrl);
-        if (command.maxDepth)
-            args.push("--max-depth", String(command.maxDepth));
-        if (command.maxRepos)
-            args.push("--max-repos", String(command.maxRepos));
-        if (command.json)
-            args.push("--json");
-        const exec = io.interactiveExec ?? createInteractiveExecRunner();
-        const result = await exec("cockpit", args, { env: envWithNodeRuntimeOnPath({ ...process.env, ...io.env, COCKPIT_SYNC_REEXEC: "1" }) });
-        return result.code;
+        return reexecuteSync(command, io);
     }
+    return collectAndReportTick(command, io, tick, dashboardUrl);
+}
+async function reexecuteSync(command, io) {
+    const args = ["sync"];
+    if (command.homeDir)
+        args.push("--home", command.homeDir);
+    if (command.repoRoot)
+        args.push("--workspace", command.repoRoot);
+    if (command.dashboardUrl)
+        args.push("--dashboard-url", command.dashboardUrl);
+    if (command.maxDepth)
+        args.push("--max-depth", String(command.maxDepth));
+    if (command.maxRepos)
+        args.push("--max-repos", String(command.maxRepos));
+    if (command.json)
+        args.push("--json");
+    const exec = io.interactiveExec ?? createInteractiveExecRunner();
+    const result = await exec("cockpit", args, { env: envWithNodeRuntimeOnPath({ ...process.env, ...io.env, COCKPIT_SYNC_REEXEC: "1" }) });
+    return result.code;
+}
+async function collectAndReportTick(command, io, tick, dashboardUrl) {
     try {
         const result = await tick.collect(() => runSyncWithHealthReceipt(command, io));
         // BLI-3551: every tick checks in, including one that collected nothing.

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

@@ -7,20 +7,31 @@ function splitEntries(text) {
     for (let i = 0; i < text.length; i++) {
         const c = text[i];
         if (quote) {
-            if (escaped)
+            if (escaped) {
                 escaped = false;
-            else if (c === "\\" && quote === '"')
+                continue;
+            }
+            if (c === "\\" && quote === '"') {
                 escaped = true;
-            else if (c === quote)
+                continue;
+            }
+            if (c === quote)
                 quote = "";
+            continue;
         }
-        else if (c === '"' || c === "'")
+        if (c === '"' || c === "'") {
             quote = c;
-        else if (c === "{" || c === "[")
+            continue;
+        }
+        if (c === "{" || c === "[") {
             depth++;
-        else if (c === "}" || c === "]")
+            continue;
+        }
+        if (c === "}" || c === "]") {
             depth--;
-        else if (c === "," && depth === 0) {
+            continue;
+        }
+        if (c === "," && depth === 0) {
             entries.push(text.slice(start, i).trim());
             start = i + 1;
         }
@@ -72,45 +83,60 @@ export function mergeUsageToml(text, tablePath, values) {
         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)}` : ""}`;
-    });
+    const body = lines.slice(span.start_line + 1, span.end_line)
+        .map(line => mergeUsageAssignment(line, remaining));
     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");
+}
+function mergeUsageAssignment(line, remaining) {
+    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];
+    const comment = findTrailingComment(raw);
+    const updated = typeof value === "string" ? value : mergeInline(raw.slice(0, comment), value);
+    return `${match[1]}${match[2]} = ${updated}${comment < raw.length ? ` ${raw.slice(comment)}` : ""}`;
+}
+function findTrailingComment(raw) {
+    let quote = "", depth = 0, escaped = false;
+    for (let i = 0; i < raw.length; i++) {
+        const c = raw[i];
+        if (quote) {
+            if (escaped) {
+                escaped = false;
+                continue;
+            }
+            if (c === "\\" && quote === '"') {
+                escaped = true;
+                continue;
+            }
+            if (c === quote)
+                quote = "";
+            continue;
+        }
+        if (c === '"' || c === "'") {
+            quote = c;
+            continue;
+        }
+        if (c === "{" || c === "[") {
+            depth++;
+            continue;
+        }
+        if (c === "}" || c === "]") {
+            depth--;
+            continue;
+        }
+        if (c === "#" && depth === 0)
+            return i;
+    }
+    if (quote || depth !== 0)
+        throw new Error("config_unreadable");
+    return raw.length;
 }

package/dist/commands/usage.js

@@ -5,42 +5,9 @@ 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.byTask)
-        query.set("groupBy", "ticket");
-    if (command.bySubject)
-        query.set("groupBy", "topic");
-    if (command.minConfidence)
-        query.set("minConfidence", command.minConfidence);
-    if (command.byTopic)
-        query.set("groupBy", "task_type");
-    if (command.byRepo)
-        query.set("groupBy", "repo");
-    if (command.byClient)
-        query.set("groupBy", "client");
-    if (command.until)
-        query.set("until", command.until);
-    if (command.includeAutomated)
-        query.set("include_automated", "1");
-    if (command.action === "sessions") {
-        for (const [key, value] of [["person", command.person], ["tool", command.tool], ["cursor", command.cursor], ["limit", command.limit], ["task", command.task], ["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.start_time ?? "start unknown"}  ${session.tool ?? session.task_type}  ${session.model ?? "model unknown"}  ${session.title ?? "no title yet"}`);
-        writeLine(io.stdout, `${sessions.length} sessions`);
-        const page = response.body;
-        for (const line of page.read_coverage ?? [])
-            writeLine(io.stdout, line);
-        if (page.next_cursor)
-            writeLine(io.stdout, `Next page: ${page.window ? `--since ${page.window.since} --until ${page.window.until} ` : ""}--cursor ${page.next_cursor}`);
-        return 0;
-    }
+    addUsageGroupingFilters(command, query);
+    if (command.action === "sessions")
+        return runUsageSessions(command, io, door, query);
     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);
@@ -56,8 +23,7 @@ export async function runUsage(command, io) {
         const email = command.person === "me" ? (await loadPairedSession("usage", command.homeDir)).email : command.person;
         if (!email)
             return failAgentDoor(door, "[usage]", "caller_email_unavailable", "The paired session has no email. Sign in again or pass --person <email>.");
-        body.people = (body.people ?? []).filter((person) => person.email?.toLowerCase() === email.toLowerCase());
-        body.coverage = { sessions_labelled: body.people.reduce((total, person) => total + (person.sessions_labelled ?? 0), 0), sessions_extracted: body.people.reduce((total, person) => total + person.sessions_extracted, 0), sessions_observed: body.people.reduce((total, person) => total + person.sessions_observed, 0), sessions_counted_at_upload: body.people.reduce((total, person) => total + (person.sessions_counted_at_upload ?? 0), 0), sessions_counted_by_server: body.people.reduce((total, person) => total + (person.sessions_counted_by_server ?? 0), 0), sessions_counted_by_ladder: body.people.reduce((total, person) => total + (person.sessions_counted_by_ladder ?? 0), 0), sessions_awaiting_count: body.people.reduce((total, person) => total + (person.sessions_awaiting_count ?? 0), 0), sessions_automated_excluded: body.people.reduce((total, person) => total + (person.sessions_automated_excluded ?? 0), 0) };
+        filterUsageToPerson(body, email);
     }
     if (command.byRepo && body.people?.some((person) => !Array.isArray(person.repos))) {
         return failAgentDoor(door, "[usage]", "repo_grouping_unavailable", "The dashboard returned person totals without project rows. Deploy the dashboard project split before using --by-repo.");
@@ -70,21 +36,52 @@ export async function runUsage(command, io) {
         return failAgentDoor(door, "[usage]", "ticket_grouping_unavailable", "Deploy the dashboard task split before using --by-task.");
     if (door.json)
         return emitAgentDoor(door, body);
-    let nameWidth = 20;
-    if (command.byTask || command.byRepo || command.byTopic) {
-        for (const person of body.people ?? []) {
-            const repos = (command.byTask ? person.tickets : command.byTopic ? person.task_types : person.repos) ?? [];
-            for (const repo of command.all ? repos : repos.slice(0, 10))
-                nameWidth = Math.max(nameWidth, repo.repo_label.length + 2);
-        }
-    }
+    return writeUsagePeople(command, io, body);
+}
+function addUsageGroupingFilters(command, query) {
+    if (command.byTask)
+        query.set("groupBy", "ticket");
     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);
-            }
+        query.set("groupBy", "topic");
+    if (command.minConfidence)
+        query.set("minConfidence", command.minConfidence);
+    if (command.byTopic)
+        query.set("groupBy", "task_type");
+    if (command.byRepo)
+        query.set("groupBy", "repo");
+    if (command.byClient)
+        query.set("groupBy", "client");
+    if (command.until)
+        query.set("until", command.until);
+    if (command.includeAutomated)
+        query.set("include_automated", "1");
+}
+async function runUsageSessions(command, io, door, query) {
+    for (const [key, value] of [["person", command.person], ["tool", command.tool], ["cursor", command.cursor], ["limit", command.limit], ["task", command.task], ["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.start_time ?? "start unknown"}  ${session.tool ?? session.task_type}  ${session.model ?? "model unknown"}  ${session.title ?? "no title yet"}`);
+    writeLine(io.stdout, `${sessions.length} sessions`);
+    const page = response.body;
+    for (const line of page.read_coverage ?? [])
+        writeLine(io.stdout, line);
+    if (page.next_cursor)
+        writeLine(io.stdout, `Next page: ${page.window ? `--since ${page.window.since} --until ${page.window.until} ` : ""}--cursor ${page.next_cursor}`);
+    return 0;
+}
+function filterUsageToPerson(body, email) {
+    body.people = (body.people ?? []).filter((person) => person.email?.toLowerCase() === email.toLowerCase());
+    body.coverage = { sessions_labelled: body.people.reduce((total, person) => total + (person.sessions_labelled ?? 0), 0), sessions_extracted: body.people.reduce((total, person) => total + person.sessions_extracted, 0), sessions_observed: body.people.reduce((total, person) => total + person.sessions_observed, 0), sessions_counted_at_upload: body.people.reduce((total, person) => total + (person.sessions_counted_at_upload ?? 0), 0), sessions_counted_by_server: body.people.reduce((total, person) => total + (person.sessions_counted_by_server ?? 0), 0), sessions_counted_by_ladder: body.people.reduce((total, person) => total + (person.sessions_counted_by_ladder ?? 0), 0), sessions_awaiting_count: body.people.reduce((total, person) => total + (person.sessions_awaiting_count ?? 0), 0), sessions_automated_excluded: body.people.reduce((total, person) => total + (person.sessions_automated_excluded ?? 0), 0) };
+}
+function writeUsagePeople(command, io, body) {
+    const nameWidth = usageNameWidth(command, body);
     // BLI-12561: the three GitHub columns sit right after Coverage, ahead of the
     // optional token splits, and only when the dashboard sent a `github` block.
     // A sub-row has no GitHub counts of its own and prints blanks in their place,
@@ -105,24 +102,14 @@ export async function runUsage(command, io) {
             ...(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}`, ...githubBlanks, ...(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}`, ...githubBlanks, ...(command.detail ? [sub.output, sub.input, sub.cache_read, sub.cache_creation].map(formatCount) : [])]);
-            }
+            writeUsageSubjects(command, row, githubBlanks, printRow);
         if (command.byTask || command.byRepo || command.byTopic) {
-            const repos = (command.byTask ? row.tickets : command.byTopic ? row.task_types : row.repos) ?? [];
-            for (const repo of command.all ? repos : repos.slice(0, 10)) {
-                if (command.byTask)
-                    writeLine(io.stdout, `  ${repo.ticket_title ?? ""} Sources: ${Object.entries(repo.binding_sources ?? {}).map(([source, count]) => `${source} ${count}`).join(", ")}`);
-                if (command.byTopic && repo.confidence)
-                    writeLine(io.stdout, `  Confidence: ${repo.confidence.high} high, ${repo.confidence.medium} medium, ${repo.confidence.low} low`);
-                printRow([`  ${repo.repo_label}`, formatCount(repo.tokens), formatUsageDollars(repo.api_list_price_equivalent_usd), `${repo.extracted_sessions}/${repo.sessions}`, ...githubBlanks, ...(command.detail ? [repo.output, repo.input, repo.cache_read, repo.cache_creation].map(formatCount) : [])]);
-            }
-            if (!command.all && repos.length > 10)
-                writeLine(io.stdout, `  and ${repos.length - 10} more ${command.byTask ? "tasks" : command.byTopic ? "topics" : "repos"}`);
+            writeUsageGroups(command, row, io, githubBlanks, printRow);
         }
     }
+    return writeUsageCoverage(command, io, body);
+}
+function writeUsageCoverage(command, io, body) {
     // BLI-4554: the door sends the label, and the label carries the price
     // sheet's version and date, so a figure on a terminal can be traced to the
     // rates that produced it. The fallback is only reached against a dashboard
@@ -163,4 +150,41 @@ export async function runUsage(command, io) {
     if (words.label)
         writeLine(io.stdout, words.label);
     return 0;
+}
+function usageNameWidth(command, body) {
+    let nameWidth = 20;
+    if (command.byTask || command.byRepo || command.byTopic) {
+        for (const person of body.people ?? []) {
+            const repos = (command.byTask ? person.tickets : command.byTopic ? person.task_types : person.repos) ?? [];
+            for (const repo of command.all ? repos : repos.slice(0, 10))
+                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);
+            }
+    return nameWidth;
+}
+function writeUsageSubjects(command, row, githubBlanks, printRow) {
+    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}`, ...githubBlanks, ...(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}`, ...githubBlanks, ...(command.detail ? [sub.output, sub.input, sub.cache_read, sub.cache_creation].map(formatCount) : [])]);
+    }
+}
+function writeUsageGroups(command, row, io, githubBlanks, printRow) {
+    const repos = (command.byTask ? row.tickets : command.byTopic ? row.task_types : row.repos) ?? [];
+    for (const repo of command.all ? repos : repos.slice(0, 10)) {
+        if (command.byTask)
+            writeLine(io.stdout, `  ${repo.ticket_title ?? ""} Sources: ${Object.entries(repo.binding_sources ?? {}).map(([source, count]) => `${source} ${count}`).join(", ")}`);
+        if (command.byTopic && repo.confidence)
+            writeLine(io.stdout, `  Confidence: ${repo.confidence.high} high, ${repo.confidence.medium} medium, ${repo.confidence.low} low`);
+        printRow([`  ${repo.repo_label}`, formatCount(repo.tokens), formatUsageDollars(repo.api_list_price_equivalent_usd), `${repo.extracted_sessions}/${repo.sessions}`, ...githubBlanks, ...(command.detail ? [repo.output, repo.input, repo.cache_read, repo.cache_creation].map(formatCount) : [])]);
+    }
+    if (!command.all && repos.length > 10)
+        writeLine(io.stdout, `  and ${repos.length - 10} more ${command.byTask ? "tasks" : command.byTopic ? "topics" : "repos"}`);
 }

package/dist/commands/workbook-render.js

@@ -91,19 +91,22 @@ export function renderMarkdownText(markdown, width, styled) {
             continue;
         }
         if (text.startsWith("- ")) {
-            for (const item of text.split("\n")) {
-                const body = plain(item.replace(/^-\s+/, ""));
-                const wrapped = wrap(body, width - 4);
-                wrapped.forEach((line, index) => {
-                    out.push(index === 0 ? `  · ${line}` : `    ${line}`);
-                });
-            }
+            appendMarkdownList(out, text, width);
             continue;
         }
         out.push(...wrap(plain(text), width));
     }
     return out;
 }
+function appendMarkdownList(out, text, width) {
+    for (const item of text.split("\n")) {
+        const body = plain(item.replace(/^-\s+/, ""));
+        const wrapped = wrap(body, width - 4);
+        wrapped.forEach((line, index) => {
+            out.push(index === 0 ? `  · ${line}` : `    ${line}`);
+        });
+    }
+}
 /**
  * A GFM pipe table as padded columns. When the padded table would not fit the
  * width, each row is printed as `header: cell` lines instead — narrower, and