@bli-cockpit/cli 0.2.166 → 0.2.167

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

@@ -197,6 +197,7 @@ export const TOWER_COMMAND_HELP = [
             "labelled as such and is never actual spend. A super_admin sees everyone; a member sees their own row.",
             "--since takes <n>d (1 to 365), <n>h (1 to 8760), or an ISO timestamp; --until an ISO timestamp (default now).",
             "--detail adds Output, Input, Cache read and Cache creation. Counts use K/M/B; dollars are rounded.",
+            "PRs opened, PRs merged and Commits come from the pull requests Tower mirrors from GitHub, matched to people by GitHub login. n/a means Tower cannot match that person to a login: unknown, not zero. The footer says how many repositories the mirror holds, the range of its pull requests and what matched nobody; --json lists the repositories.",
             "--include-automated adds harness, subagent and scheduled sessions, which are excluded by default.",
             "It presses the same door as the /usage page and the usage_people MCP tool (GET /api/usage/people).",
             "--json writes one machine-readable object to stdout; every reason and receipt line stays on stderr.",

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

package/dist/commands/usage-format.js

@@ -17,4 +17,37 @@ export function formatUsageDollars(value) {
     return new Intl.NumberFormat("en-US", {
         style: "currency", currency: "USD", maximumFractionDigits: 0,
     }).format(value);
+}
+const noun = (n, one, many = `${one}s`) => `${n} ${n === 1 ? one : many}`;
+/** A row whose counts are numbers, or ride on the same person's other row. Anything else is a gap. */
+const PLACED = new Set(["github_login", "counted_on_other_account"]);
+/**
+ * The sentences under the table, worded exactly as the /usage page and the
+ * `usage_people` MCP tool word them (`apps/dashboard/src/lib/usage/
+ * usage-github-words.ts` is the original; each copy has the same cases).
+ * `people` is whoever the table shows, so `--person` narrows the totals too.
+ */
+export function githubWords(github, people) {
+    const label = github.counts_label ?? "";
+    if (github.status === "unavailable") {
+        const why = github.detail ? ` (${github.detail})` : "";
+        return { lines: [`GitHub counts are unavailable: ${github.reason ?? "unknown_reason"}${why}.`], label };
+    }
+    const sum = (field) => people.reduce((total, person) => total + (person.github?.[field] ?? 0), 0);
+    const range = github.oldest_pull_request_at && github.newest_pull_request_at
+        ? `; mirrored pull requests run from ${github.oldest_pull_request_at} to ${github.newest_pull_request_at}`
+        : "; the mirror holds no pull requests";
+    const lines = [
+        `GitHub: ${noun(sum("pull_requests_opened"), "pull request")} opened, ${sum("pull_requests_merged")} merged, ${noun(sum("commits"), "commit")}, ` +
+            `from ${noun((github.repositories ?? []).length, "mirrored repository", "mirrored repositories")}${range}.`,
+    ];
+    const unmatched = github.unattributed;
+    if (unmatched && unmatched.pull_requests_opened + unmatched.pull_requests_merged + unmatched.commits > 0) {
+        lines.push(`Not matched to a person: ${noun(unmatched.pull_requests_opened, "pull request")} opened, ${unmatched.pull_requests_merged} merged, ${noun(unmatched.commits, "commit")}.`);
+    }
+    const unplaced = people.filter((person) => person.github && !PLACED.has(person.github.match)).length;
+    if (unplaced > 0) {
+        lines.push(`${noun(unplaced, "person cannot", "people cannot")} be matched to a GitHub login, so their GitHub counts are unknown, not zero.`);
+    }
+    return { lines, label };
 }

package/dist/commands/usage.js

@@ -1,5 +1,5 @@
 import { loadPairedSession } from "../tower-client.js";
-import { formatCount, formatUsageDollars } from "./usage-format.js";
+import { formatCount, formatUsageDollars, githubWords } 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) {
@@ -71,22 +71,30 @@ export async function runUsage(command, io) {
                 for (const sub of subject.children ?? [])
                     nameWidth = Math.max(nameWidth, sub.subtopic.length + 4);
             }
-    const widths = [nameWidth, 8, 15, 12, 10, 10, 12, 14];
+    // 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,
+    // so its token splits stay under the right headings.
+    const hasGithub = body.github !== undefined;
+    const githubBlanks = hasGithub ? ["", "", ""] : [];
+    const githubCells = (row) => hasGithub ? [row.github?.pull_requests_opened, row.github?.pull_requests_merged, row.github?.commits].map((count) => count === null || count === undefined ? "n/a" : String(count)) : [];
+    const widths = [nameWidth, 8, 15, 12, ...(hasGithub ? [10, 10, 8] : []), 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"] : [])]);
+    printRow(["Person", "Tokens", "List equivalent", "Coverage", ...(hasGithub ? ["PRs opened", "PRs merged", "Commits"] : []), ...(command.detail ? ["Output", "Input", "Cache read", "Cache creation"] : [])]);
     for (const row of body.people ?? []) {
         printRow([
             (row.display_name ?? row.email ?? "Unknown").slice(0, 20),
             formatCount(row.tokens_total),
             formatUsageDollars(row.api_list_price_equivalent_usd),
             `${row.sessions_extracted}/${row.sessions_observed}`,
+            ...githubCells(row),
             ...(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) : [])]);
+                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}`, ...(command.detail ? [sub.output, sub.input, sub.cache_read, sub.cache_creation].map(formatCount) : [])]);
+                    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) : [])]);
             }
         if (command.byTask || command.byRepo || command.byTopic) {
             const repos = (command.byTask ? row.tickets : command.byTopic ? row.task_types : row.repos) ?? [];
@@ -95,7 +103,7 @@ export async function runUsage(command, io) {
                     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}`, ...(command.detail ? [repo.output, repo.input, repo.cache_read, repo.cache_creation].map(formatCount) : [])]);
+                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"}`);
@@ -126,5 +134,17 @@ export async function runUsage(command, io) {
         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`);
+    // BLI-12561: what the GitHub columns cover and what they leave out. A
+    // dashboard that sent no block is named rather than left to look as if there
+    // were nothing to show.
+    if (body.github === undefined) {
+        writeLine(io.stdout, "GitHub counts: this dashboard sent none (it predates them).");
+        return 0;
+    }
+    const words = githubWords(body.github, body.people ?? []);
+    for (const line of words.lines)
+        writeLine(io.stdout, line);
+    if (words.label)
+        writeLine(io.stdout, words.label);
     return 0;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bli-cockpit/cli",
-  "version": "0.2.166",
+  "version": "0.2.167",
   "private": false,
   "type": "module",
   "bin": {
@@ -28,7 +28,7 @@
   },
   "dependencies": {
     "@bli-cockpit/memory-mcp": "0.1.45",
-    "@bli-cockpit/mcp": "0.1.84",
+    "@bli-cockpit/mcp": "0.1.85",
     "@bli-cockpit/telemetry-core": "0.1.57"
   },
   "repository": {