@bli-cockpit/mcp 0.1.84 → 0.1.85

package/dist/usage-tools.d.ts

@@ -1,4 +1,39 @@
 import { type ToolDeps } from "./tool-result.js";
+/**
+ * BLI-12561: the sentences about the GitHub counts, worded exactly as the /usage
+ * page and `cockpit usage people` word them (`apps/dashboard/src/lib/usage/
+ * usage-github-words.ts` is the original; every copy has the same cases). This
+ * package does not import the dashboard, so the words are carried here.
+ */
+interface GithubCounts {
+    match: string;
+    pull_requests_opened: number | null;
+    pull_requests_merged: number | null;
+    commits: number | null;
+}
+interface GithubBlock {
+    status: "ok" | "unavailable";
+    reason?: string;
+    detail?: string;
+    counts_label?: string;
+    repositories?: unknown[];
+    oldest_pull_request_at?: string | null;
+    newest_pull_request_at?: string | null;
+    unattributed?: {
+        pull_requests_opened: number;
+        pull_requests_merged: number;
+        commits: number;
+    };
+}
+export declare function githubWords(github: GithubBlock, people: readonly {
+    github?: GithubCounts;
+}[]): {
+    lines: string[];
+    label: string;
+};
+/** The sentence appended to the text half, or the line that says a dashboard sent no GitHub block. */
+export declare function githubSentence(body: Record<string, unknown>): string;
 export declare function registerUsageTools(server: {
     registerTool: (...args: never[]) => unknown;
 }, deps: ToolDeps): void;
+export {};

package/dist/usage-tools.js

@@ -6,10 +6,43 @@ import { dataResult, doorFailureText, errorResult, registrarFor, withSession } f
 // half alone) could say how many sessions were counted and never whose they
 // were or what they cost (BLI-10432).
 const WINDOW_BOUND = "<n>d (1 to 365), <n>h (1 to 8760), or an ISO timestamp";
+const noun = (n, one, many = `${one}s`) => `${n} ${n === 1 ? one : many}`;
+const PLACED = new Set(["github_login", "counted_on_other_account"]);
+export function githubWords(github, people) {
+    const label = github.counts_label ?? "";
+    if (github.status === "unavailable") {
+        return { lines: [`GitHub counts are unavailable: ${github.reason ?? "unknown_reason"}${github.detail ? ` (${github.detail})` : ""}.`], 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 };
+}
+/** The sentence appended to the text half, or the line that says a dashboard sent no GitHub block. */
+export function githubSentence(body) {
+    const github = body.github;
+    if (github === undefined)
+        return " GitHub counts: this dashboard sent none (it predates them).";
+    const people = Array.isArray(body.people) ? body.people : [];
+    const words = githubWords(github, people);
+    return ` ${[...words.lines, words.label].filter(Boolean).join(" ")}`;
+}
 export function registerUsageTools(server, deps) {
     registrarFor(server)("usage_people", {
         title: "Read usage by person",
-        description: "Per-person Claude Code and Codex token usage, list-price equivalent (not actual spend), and extraction coverage, over a window (default the last 30 days). groupBy adds a per-person breakdown; groupBy topic or ticket lists the labels usage_sessions takes as subject or task.",
+        description: "Per-person Claude Code and Codex token usage, list-price equivalent (not actual spend), and extraction coverage, over a window (default the last 30 days). Each person also carries GitHub pull requests opened, pull requests merged and commits from the pull requests Tower mirrors from GitHub (null means Tower cannot match that person to a GitHub login: unknown, not zero); the github block says which repositories the mirror holds and what matched nobody. groupBy adds a per-person breakdown; groupBy topic or ticket lists the labels usage_sessions takes as subject or task.",
         inputSchema: {
             minConfidence: z.enum(["high", "medium", "low"]).optional().describe("With groupBy task_type or topic: only labels at or above this confidence."),
             groupBy: z.enum(["repo", "task_type", "topic", "ticket"]).optional().describe("Break each person's usage down by repo, task type, topic or ticket."),
@@ -43,7 +76,11 @@ export function registerUsageTools(server, deps) {
         const priceLabel = typeof response.body.api_list_price_equivalent_label === "string"
             ? ` ${response.body.api_list_price_equivalent_label}.`
             : "";
-        return dataResult(`${coverage?.sessions_extracted ?? 0} of ${coverage?.sessions_observed ?? 0} sessions extracted.${why} ${coverage?.sessions_counted_at_upload ?? 0} of ${coverage?.sessions_observed ?? 0} sessions counted at upload, ${coverage?.sessions_counted_by_server ?? 0} by server backfill, ${coverage?.sessions_counted_by_ladder ?? 0} by the ladder.${args.groupBy === "task_type" ? ` ${coverage?.sessions_labelled ?? 0} of ${coverage?.sessions_observed ?? 0} sessions labelled by topic.` : ""}${priceLabel}`, response.body);
+        // BLI-12561: the same GitHub sentences the page and the CLI print, so an
+        // agent reading only the text half cannot quote a pull-request count without
+        // what it covers and who it left out.
+        const github = githubSentence(response.body);
+        return dataResult(`${coverage?.sessions_extracted ?? 0} of ${coverage?.sessions_observed ?? 0} sessions extracted.${why} ${coverage?.sessions_counted_at_upload ?? 0} of ${coverage?.sessions_observed ?? 0} sessions counted at upload, ${coverage?.sessions_counted_by_server ?? 0} by server backfill, ${coverage?.sessions_counted_by_ladder ?? 0} by the ladder.${args.groupBy === "task_type" ? ` ${coverage?.sessions_labelled ?? 0} of ${coverage?.sessions_observed ?? 0} sessions labelled by topic.` : ""}${priceLabel}${github}`, response.body);
     }));
     registrarFor(server)("usage_sessions", {
         title: "Read task or subject sessions",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bli-cockpit/mcp",
-  "version": "0.1.84",
+  "version": "0.1.85",
   "private": false,
   "description": "bli-tower: an MCP server over BLI Cockpit's agent doors: JARVIS (jarvis_*), documents (docs_*), channels (msg_*), issues (work_*), the daily page (brief_*), meeting notes (notes_*), the ops board (ops_status/slack_*), settings/team/model, Scout and the workbook, plus the legacy event-stream tools (emit_event, get_ticket_timeline, get_active_tickets).",
   "type": "module",