@bli-cockpit/cli 0.2.103 → 0.2.106

package/dist/commands/backfill-upload.js

@@ -18,7 +18,14 @@ const BACKFILL_MAX_CONSECUTIVE_FAILURES = 3;
  */
 export async function uploadBackfillBatches(command, io, lock, ctx) {
     const uploadable = uploadableCandidates(ctx.scan.candidates);
-    const batches = buildBackfillBatches(uploadable);
+    // Doctor needs a boundary after each session. Ordinary backfill retains
+    // its existing batching, and scheduled sync does not use this command.
+    const plannedBatches = buildBackfillBatches(uploadable);
+    const batches = command.deadlineMs !== undefined || command.onProgress
+        ? plannedBatches.flatMap((batch) => batch.candidates.map((candidate) => ({
+            worktree: batch.worktree, candidates: [candidate],
+        })))
+        : plannedBatches;
     const rawEvidenceBudget = {
         remainingBytes: RAW_EVIDENCE_DEFAULT_BYTE_BUDGET,
         remainingObjects: RAW_EVIDENCE_DEFAULT_OBJECT_BUDGET,
@@ -34,10 +41,33 @@ export async function uploadBackfillBatches(command, io, lock, ctx) {
         done: tally.done,
         total: uploadable.length,
     });
+    const reportProgress = () => {
+        if (!command.onProgress)
+            return;
+        const unresolved = new Set([
+            ...uploadable.map(candidateCursorKey).filter((key) => !tally.durableCandidateKeys.has(key)),
+            ...ctx.scan.retryable_candidate_keys,
+        ]);
+        command.onProgress({
+            processed: tally.done,
+            uploaded: tally.backfilledSessions,
+            remaining: unresolved.size + ctx.scan.omitted_candidate_count + ctx.scan.issues
+                .filter((issue) => issue.scope === "global")
+                .reduce((total, issue) => total + issue.count, 0),
+            elapsedMs: Date.now() - ctx.now.getTime(),
+        });
+    };
+    reportProgress();
     for (const [index, batch] of batches.entries()) {
         await lock.handle.heartbeat();
+        if (command.deadlineMs !== undefined && Date.now() >= command.deadlineMs) {
+            blockedAt = stoppedAt("backfill time budget reached", index);
+            failureReason = "deferred_budget_exhausted";
+            break;
+        }
         const outcome = await uploadOneBackfillBatch(command, io, ctx, batch, rawEvidenceBudget);
         foldBatchIntoTally(tally, batch, outcome);
+        reportProgress();
         consecutiveFailures = outcome.failed ? consecutiveFailures + 1 : 0;
         if (!command.json) {
             writeLine(io.stdout, `Uploaded ${tally.done}/${uploadable.length} (batch ${index + 1}/${batches.length})`);

package/dist/commands/doctor-pipeline.js

@@ -50,15 +50,29 @@ export async function fixBackfillState(context) {
     const started = Date.now();
     const deadline = started + (context.command.backfillBudgetSeconds ?? 900) * 1000;
     let caughtUp = 0;
+    let chunks = 0;
+    let live = null;
+    const elapsed = () => {
+        const seconds = Math.floor((Date.now() - started) / 1000);
+        return `${Math.floor(seconds / 60)}m${String(seconds % 60).padStart(2, "0")}s`;
+    };
+    const receipt = () => `caught up on ${caughtUp} old sessions in ${chunks} chunk${chunks === 1 ? "" : "s"} over ${elapsed()}`;
     let remaining = null;
     const unfinished = (code, reason) => ({
-        ...needsFix("backfill-complete", code, `caught up on ${caughtUp} old sessions this run, ${remaining ?? "unknown"} still to go; ${reason}; run \`cockpit doctor\` again to continue`),
+        ...needsFix("backfill-complete", code, `${receipt()}, ${remaining ?? "unknown"} still to go; ${reason}; run \`cockpit doctor\` again to continue`),
         nextAction: "cockpit doctor",
     });
     const progress = setInterval(() => {
         const seconds = Math.floor((Date.now() - started) / 1000);
-        context.io.stderr.write(`backfill: ${caughtUp} caught up, ${remaining ?? "unknown"} to go, ${Math.floor(seconds / 60)}m${seconds % 60}s\n`);
-        console.error("[doctor] backfill-complete progress", JSON.stringify({ caught_up: caughtUp, remaining, elapsed_seconds: seconds }));
+        const uploaded = live === null ? null : caughtUp + live.uploaded;
+        context.io.stderr.write(live === null
+            ? `backfill: starting, ${elapsed()}\n`
+            : `backfill: ${uploaded} caught up, ${live.processed} processed in this chunk, ${live.remaining} to go, ${elapsed()}\n`);
+        console.error("[doctor] backfill-complete progress", JSON.stringify({
+            status: live === null ? "starting" : "running", processed: live?.processed ?? null,
+            uploaded, caught_up: uploaded, remaining: live?.remaining ?? null,
+            chunks, elapsed_seconds: seconds,
+        }));
     }, 30_000);
     try {
         while (Date.now() < deadline) {
@@ -71,20 +85,25 @@ export async function fixBackfillState(context) {
                 if (Date.now() >= deadline)
                     return unfinished("backfill_budget_timeout", "backfill time budget reached");
                 const capture = capturedIo(context.io, false);
+                live = null;
+                chunks += 1;
                 const code = await runBackfillCommand({
                     homeDir: context.command.homeDir, repoRoot: context.command.repoRoot,
                     all: true, dryRun: false, yes: true, json: true,
+                    deadlineMs: deadline,
+                    onProgress: (progress) => { live = progress; },
                 }, capture.io);
                 const parsed = parseDoctorBackfillJson(capture.stdout());
                 const counts = asRecord(parsed?.counts);
                 const count = (value) => typeof value === "number" && Number.isFinite(value) && value >= 0 ? value : null;
                 caughtUp += count(counts?.["backfilled"]) ?? 0;
                 remaining = count(counts?.["remaining"]) ?? remaining;
+                live = null;
                 if (code === 0 && parsed?.status === "complete") {
                     // Reporting totals include permanent caps. Preserve their marker
                     // note instead of retrying history the collector says is complete.
                     const checked = await checkBackfillState(context);
-                    return ok("backfill-complete", checked.status === "ok" ? checked.code : "complete", `caught up on ${caughtUp} old sessions this run` + (checked.status === "ok" ? `; ${checked.message}` : ""));
+                    return ok("backfill-complete", checked.status === "ok" ? checked.code : "complete", receipt() + (checked.status === "ok" ? `; ${checked.message}` : ""));
                 }
                 const verdict = backfillFixVerdict(parsed, jsonField(capture.stderr(), "failure_reason"));
                 if (parsed?.status === "partial" &&
@@ -94,7 +113,7 @@ export async function fixBackfillState(context) {
                 return { ...verdict, message: typeof parsed?.failure_reason === "string" ? parsed.failure_reason : "backfill failed without a valid completion receipt" };
             });
             if (row.status === "ok") {
-                console.error("[doctor] backfill-complete finished", JSON.stringify({ caught_up: caughtUp, remaining, elapsed_seconds: Math.floor((Date.now() - started) / 1000) }));
+                console.error("[doctor] backfill-complete finished", JSON.stringify({ caught_up: caughtUp, remaining, chunks, elapsed_seconds: Math.floor((Date.now() - started) / 1000) }));
                 return row;
             }
             if (row.code !== "backfill_chunk_pending") {

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

@@ -1,8 +1,10 @@
 import { optionalNonEmpty, optionalUrl, parseNamedArgs } from "./local-arg-values.js";
 export function parseUsageArgs(args) {
-    const values = parseNamedArgs(args, { allowedFlags: ["--since", "--until", "--include-automated", "--detail", "--home", "--dashboard-url", "--json"], valueFlags: ["--since", "--until", "--home", "--dashboard-url"] });
+    const values = parseNamedArgs(args, { allowedFlags: ["--by-topic", "--by-repo", "--person", "--all", "--since", "--until", "--include-automated", "--detail", "--home", "--dashboard-url", "--json"], valueFlags: ["--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 action = values.positionals[0] ?? "people";
     if (action !== "people" || values.positionals.length > 1)
         throw new Error("usage takes one verb: people.");
-    return { kind: "usage", 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") };
+    return { kind: "usage", 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") };
 }

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

@@ -143,8 +143,9 @@ export const TOWER_COMMAND_HELP = [
     [
         "usage",
         [
-            "Usage: cockpit usage people [--since <n>d|<n>h|<iso>] [--detail] [--until <iso>] [--include-automated] [--json]",
+            "Usage: cockpit usage people [--by-repo | --by-topic] [--person <email|me>] [--all] [--since <n>d|<n>h|<iso>] [--detail] [--until <iso>] [--include-automated] [--json]",
             "",
+            "--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,",
             "and the input / cache split when the row carries it), and an API list-price equivalent that is",
             "labelled as such and is never actual spend. A super_admin sees everyone; a member sees their own row.",

package/dist/commands/local-help.js

@@ -102,7 +102,7 @@ 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 [--since 30d|<iso>] [--until <iso>] [--include-automated] [--dashboard-url <url>] [--json]",
+        "  cockpit usage people [--by-repo | --by-topic] [--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.103");
+    writeLine(io?.stdout ?? process.stdout, "0.2.106");
     return 0;
   }
 

package/dist/commands/usage-format.js

@@ -12,6 +12,8 @@ export function formatCount(value) {
     return String(value);
 }
 export function formatUsageDollars(value) {
+    if (value === null)
+        return "Unavailable";
     return new Intl.NumberFormat("en-US", {
         style: "currency", currency: "USD", maximumFractionDigits: 0,
     }).format(value);

package/dist/commands/usage.js

@@ -1,9 +1,14 @@
+import { loadPairedSession } from "../tower-client.js";
 import { formatCount, formatUsageDollars } from "./usage-format.js";
 import { askAgentDoor, emitAgentDoor, failAgentDoor, openAgentDoor } from "./agent-door.js";
 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.byTopic)
+        query.set("groupBy", "task_type");
+    if (command.byRepo)
+        query.set("groupBy", "repo");
     if (command.until)
         query.set("until", command.until);
     if (command.includeAutomated)
@@ -12,9 +17,29 @@ export async function runUsage(command, io) {
     if (!answer.ok)
         return failAgentDoor(door, "[usage]", answer.reason, answer.detail);
     const body = answer.body;
+    if (command.person) {
+        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) };
+    }
+    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.");
+    }
+    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 (door.json)
         return emitAgentDoor(door, body);
-    const widths = [20, 8, 15, 12, 10, 10, 12, 14];
+    let nameWidth = 20;
+    if (command.byRepo || command.byTopic) {
+        for (const person of body.people ?? []) {
+            const repos = (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);
+        }
+    }
+    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"] : [])]);
     for (const row of body.people ?? []) {
@@ -25,9 +50,19 @@ 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.byRepo || command.byTopic) {
+            const repos = (command.byTopic ? row.task_types : row.repos) ?? [];
+            for (const repo of command.all ? repos : repos.slice(0, 10)) {
+                printRow([`  ${repo.repo_label}`, formatCount(repo.tokens), formatUsageDollars(repo.api_list_price_equivalent_usd), `${repo.extracted_sessions}/${repo.sessions}`, ...(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.byTopic ? "topics" : "repos"}`);
+        }
     }
     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.byTopic)
+        writeLine(io.stdout, `${body.coverage?.sessions_labelled ?? 0} of ${body.coverage?.sessions_observed ?? 0} sessions labelled by topic`);
     return 0;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bli-cockpit/cli",
-  "version": "0.2.103",
+  "version": "0.2.106",
   "private": false,
   "type": "module",
   "bin": {
@@ -28,7 +28,7 @@
   },
   "dependencies": {
     "@bli-cockpit/memory-mcp": "0.1.27",
-    "@bli-cockpit/mcp": "0.1.33",
+    "@bli-cockpit/mcp": "0.1.35",
     "@bli-cockpit/telemetry-core": "0.1.43"
   }
 }