tumwater 0.2.0 → 0.3.0

package/dist/src/report/report-data.js

@@ -1,32 +1,33 @@
-// vocabulary: plain
 /** Collection half of the usage report: read the harness's event log (through the shared
  * event-folding layer in src/report/report-fold.ts) and the backlog history over a window of
  * local calendar days and distill it into a `ReportData` / `SinceReport` — per-day
- * tick/token/commit/cost counts plus features-done and bugs-fixed tallies from PLANS.md and
+ * run/token/commit/cost counts plus features-done and bugs-fixed tallies from PLANS.md and
  * BUGS.md. The Markdown rendering of this data lives in src/report/report-render.ts, a pure
  * function of it; the split mirrors the failure report's (src/failure/failure-data.ts /
  * src/failure/failure-render.ts) and keeps "what happened" (window math, aggregation, bounds)
  * apart from "how it prints" (bars, cell wording), which change for different reasons — and
  * keeps core data collection out of the presentation layer, so a core consumer (as
  * /api/report already is) never forces a core→ui import. This file holds the two window
- * collectors and the report shapes they produce; the event-log folding and its memoized
- * per-window cache live in src/report/report-fold.ts (its own test, report-fold-cache). */
-import { assertReportSinceMs, eventWindowCovers, readWindowEvents } from "../events/event-window.js";
-import { DONE_DATE_RE, FIXED_DATE_RE, completionDate, finishedFiles, fixedBugEntries, sectionCompletionDates, sectionFilingDates, } from "../backlog/backlog.js";
+ * collectors; the report shapes they produce live in src/report/report-types.ts, and the
+ * event-log folding and its memoized per-window cache in src/report/report-fold.ts (its own
+ * test, report-fold-cache). */
+import { assertReportSinceMs, eventWindowCovers, readWindowEvents, sinceWindowTiming } from "../events/event-window.js";
+import { DONE_DATE_RE, FIXED_DATE_RE, completionDate, finishedFiles, fixedBugEntries, sectionCompletionDates, sectionCompletionLags, sectionFilingDates, } from "../backlog/backlog.js";
 import { validationGapTag } from "../backlog/backlog-md.js";
 import { dayAt, dayKey, dayWindow, formatDate } from "../text/datetime.js";
 import { addTo, lowerMedian } from "../collections.js";
-import { baseRoleOf } from "../roles/loop-ids.js";
 import { commitTier } from "../roles/roles.js";
-import { foldUsageEvent, foldWindowEvents, narrowToRole, roleSum, scopedByRole, zeroCommitCounts, zeroMergeCounts, } from "./report-fold.js";
-/** Aggregate team usage over the trailing `sinceMs` window ending now, from the event log
- * only (run_end/merged — see SinceReport for why the backlog files are not read). Kept a
+import { foldUsageEvent, foldWindowEvents, narrowToRole, roleSum, scopeBases, scopedByRole, zeroCommitCounts, zeroMergeCounts, } from "./report-fold.js";
+import { mainRedMinutesByDay } from "./report-main-red.js";
+/** Aggregate team usage over the trailing `sinceMs` window ending now (or `untilMs` ago, which
+ * drops events at or after that end; `coversFullWindow` still judges the far edge
+ * only), from the event log only (run_end/merged — see SinceReport for why the backlog files
+ * are not read). Kept a
  * separate function rather than a `collectReport` variant flag: the day collector's
  * zero-filled series and backlog-file reads have no place in a window totals view. */
-export function collectReportSince(root, sinceMs, role) {
+export function collectReportSince(root, sinceMs, role, untilMs) {
     assertReportSinceMs(sinceMs);
-    const now = Date.now();
-    const cutoff = now - sinceMs;
+    const { now, cutoff, end, slice } = sinceWindowTiming(sinceMs, untilMs);
     // The window key is the cutoff's local calendar day, from the shared dayKey helper
     // eventDayKey buckets events with, so the read's day keys cannot disagree with the ts
     // filter below; the day-keyed read may include earlier hours of that day, which the ts
@@ -40,11 +41,16 @@ export function collectReportSince(root, sinceMs, role) {
         rejectionsByRole: {},
         revisionsByRole: {},
         refusalsByRole: {},
+        revertsByRole: {},
         checkDurationsMs: [],
         checkFailures: 0,
         mergeWaitsMs: [],
+        mergeDurationsMs: [],
+        runDurationsMs: [],
         providerWaitsMs: [],
         slotWaitsMs: [],
+        checkWaitsMs: [],
+        reviewDurationsMs: [],
         failedRunsByRole: {},
         fallbacksByRole: {},
         imageReroutesByRole: {},
@@ -61,11 +67,12 @@ export function collectReportSince(root, sinceMs, role) {
         mergeFailedByReason: {},
         costByProvider: {},
         notionalByProvider: {},
+        notionalByBackend: {},
         runsByModel: {},
         deferredByReason: {},
     };
     for (const ev of raw.events) {
-        if (typeof ev.ts !== "number" || ev.ts < cutoff || ev.ts > now)
+        if (typeof ev.ts !== "number" || ev.ts < cutoff || ev.ts > now || (untilMs !== undefined && ev.ts >= end))
             continue;
         foldUsageEvent(acc, ev);
     }
@@ -74,18 +81,19 @@ export function collectReportSince(root, sinceMs, role) {
     // history that never existed. When neither proof holds, the oldest retained event lies inside
     // the window and the render notes the possible truncation.
     const coversFullWindow = eventWindowCovers(raw, cutoff);
-    // Role scope: every total derives from the fold's per-role maps for the named base role alone
+    // Role scope: every total derives from the fold's per-role maps for the named base roles alone
     // — merge usage (the merge slot's, not the role's) and the team-only fields stay out, so
     // a scoped --since report sums exactly the same events the scoped day report would. The scope
-    // is the base role, so instances (`feature-2`) aggregate into their group as the cap does.
-    const base = role === undefined ? undefined : baseRoleOf(role);
-    const scopedTotals = base === undefined
+    // is the base roles, so instances (`feature-2`) aggregate into their group as the cap does.
+    const bases = scopeBases(role);
+    const scopedTotals = bases === undefined
         ? {
             tokensOut: acc.tokensOut + (acc.mergeTokens ?? 0),
             runs: acc.runs ?? 0,
             commits: acc.commits,
             costUsd: acc.costUsd + (acc.mergeCostUsd ?? 0),
             ...(acc.notionalCostUsd > 0 ? { notionalCostUsd: acc.notionalCostUsd } : {}),
+            ...(Object.keys(acc.notionalByBackend).length > 0 ? { notionalByBackend: acc.notionalByBackend } : {}),
             mergeRuns: acc.mergeRuns ?? 0,
             mergeTokens: acc.mergeTokens ?? 0,
             mergeCostUsd: acc.mergeCostUsd ?? 0,
@@ -94,12 +102,12 @@ export function collectReportSince(root, sinceMs, role) {
         : (() => {
             // The role's own notional spend, from its run_end events; the merge slot's
             // notional is team-wide and stays out like its cost.
-            const notional = roleSum(acc.notionalByRole, base);
+            const notional = roleSum(acc.notionalByRole, bases);
             return {
-                tokensOut: roleSum(acc.tokensByRole, base),
-                runs: roleSum(acc.runsByRole, base),
-                commits: roleSum(acc.commitsByRole, base),
-                costUsd: roleSum(acc.costByRole, base),
+                tokensOut: roleSum(acc.tokensByRole, bases),
+                runs: roleSum(acc.runsByRole, bases),
+                commits: roleSum(acc.commitsByRole, bases),
+                costUsd: roleSum(acc.costByRole, bases),
                 ...(notional > 0 ? { notionalCostUsd: notional } : {}),
                 ...zeroMergeCounts(),
             };
@@ -108,49 +116,67 @@ export function collectReportSince(root, sinceMs, role) {
     // notional spend, scoped to base when a role is given — the same conditional the day
     // collector applies to ReportDay.notionalByRole (line ~573), so a role-scoped window
     // whose role spent no notional carries no notionalByRole instead of an empty map.
-    const notionalByRole = scopedByRole(acc.notionalByRole, base);
+    const notionalByRole = scopedByRole(acc.notionalByRole, bases);
     // Deferred runs are bucketed by a reason code (not a role), so a role-scoped window
     // carries no entries — the same team-only rule runsByModel follows. Only set when the
     // window actually deferred (zero means absent), so a deferral-free --since JSON omits it.
-    const deferred = scopedByRole(acc.deferredByReason, base);
+    const deferred = scopedByRole(acc.deferredByReason, bases);
     return {
-        sinceMs,
-        fromIso: new Date(cutoff).toISOString(),
-        ...(base === undefined ? {} : { role: base }),
+        ...slice,
+        ...(bases === undefined ? {} : { role: bases.join(",") }),
         totals: scopedTotals,
-        runsByRole: scopedByRole(acc.runsByRole, base),
-        costByRole: scopedByRole(acc.costByRole, base),
-        rejectionsByRole: scopedByRole(acc.rejectionsByRole, base),
-        revisionsByRole: scopedByRole(acc.revisionsByRole, base),
-        refusalsByRole: scopedByRole(acc.refusalsByRole, base),
-        failedRunsByRole: scopedByRole(acc.failedRunsByRole, base),
-        fallbacksByRole: scopedByRole(acc.fallbacksByRole, base),
-        imageReroutesByRole: scopedByRole(acc.imageReroutesByRole, base),
-        tokensByRole: scopedByRole(acc.tokensByRole, base),
-        commitsByRole: scopedByRole(acc.commitsByRole, base),
-        mergedByRole: scopedByRole(acc.mergedByRole, base),
-        mergeFailedByRole: scopedByRole(acc.mergeFailedByRole, base),
+        runsByRole: scopedByRole(acc.runsByRole, bases),
+        costByRole: scopedByRole(acc.costByRole, bases),
+        rejectionsByRole: scopedByRole(acc.rejectionsByRole, bases),
+        revisionsByRole: scopedByRole(acc.revisionsByRole, bases),
+        refusalsByRole: scopedByRole(acc.refusalsByRole, bases),
+        revertsByRole: scopedByRole(acc.revertsByRole, bases),
+        failedRunsByRole: scopedByRole(acc.failedRunsByRole, bases),
+        fallbacksByRole: scopedByRole(acc.fallbacksByRole, bases),
+        imageReroutesByRole: scopedByRole(acc.imageReroutesByRole, bases),
+        tokensByRole: scopedByRole(acc.tokensByRole, bases),
+        commitsByRole: scopedByRole(acc.commitsByRole, bases),
+        mergedByRole: scopedByRole(acc.mergedByRole, bases),
+        mergeFailedByRole: scopedByRole(acc.mergeFailedByRole, bases),
         // A result code is not a role, so a role-scoped window carries an empty map (a code
         // never baseRoleOf to the role) — the render gates the reason line to the team report.
-        mergeFailedByReason: scopedByRole(acc.mergeFailedByReason, base),
+        mergeFailedByReason: scopedByRole(acc.mergeFailedByReason, bases),
         ...(Object.keys(notionalByRole).length > 0 ? { notionalByRole } : {}),
         // Provider spend is a team attribution (a provider is not a role), so a role-scoped
         // window carries empty maps — providers never baseRoleOf to the role — and the render
         // gates the provider lines to the team report anyway. Always present, empty when none.
-        costByProvider: scopedByRole(acc.costByProvider, base),
-        notionalByProvider: scopedByRole(acc.notionalByProvider, base),
+        costByProvider: scopedByRole(acc.costByProvider, bases),
+        notionalByProvider: scopedByRole(acc.notionalByProvider, bases),
+        // Backend spend is a team attribution (a backend is not a role), so a role-scoped window
+        // omits it — the same absent-when-empty rule the day collector applies.
+        ...(Object.keys(scopedByRole(acc.notionalByBackend, bases)).length > 0
+            ? { notionalByBackend: scopedByRole(acc.notionalByBackend, bases) }
+            : {}),
         // Model attribution is team-only (a model is not a role, so no model folds to the
         // scoped role), the same full-map-for-team / empty-for-scoped rule costByProvider
         // follows. Always present so the render can gate on the window's own events.
-        runsByModel: scopedByRole(acc.runsByModel, base),
+        runsByModel: scopedByRole(acc.runsByModel, bases),
         ...(Object.keys(deferred).length > 0 ? { deferredByReason: deferred } : {}),
+        // Main's red time is main's own (G1's rule), not any role's, so a role-scoped window
+        // carries 0 — the type's always-present default for the team-only field.
+        mainRedMs: bases === undefined
+            ? [...mainRedMinutesByDay(raw.events, cutoff, end).values()].reduce((a, b) => a + b, 0)
+            : 0,
         coversFullWindow,
     };
 }
+/** Set one per-day median cell only when the day actually has samples (`ms` non-empty), so a
+ * medians-free day keeps its exact pre-feature shape (the field stays absent). The single home
+ * of that guard — the day collector's eight `…MedianMs` cells all followed it inline before. */
+function setLowerMedian(day, key, ms) {
+    if (ms.length > 0)
+        day[key] = lowerMedian(ms);
+}
 /** Aggregate team usage over exactly `days` local calendar days ending today, from the event
  * log (run_end/merged) and the backlog history (`## Done` in PLANS.md and PLANS-DONE.md,
  * `## Fixed` in BUGS.md and BUGS-FIXED.md). */
 export function collectReport(root, days, role) {
+    const bases = scopeBases(role);
     const now = new Date();
     // One captured instant for the whole window, so every day key derives from the same day.
     const { from, to } = dayWindow(days, now);
@@ -175,7 +201,7 @@ export function collectReport(root, days, role) {
         const day = byDate.get(dayKey);
         if (!day)
             continue; // Out-of-window day key (e.g. future-dated) — no series slot to fill.
-        if (role === undefined) {
+        if (bases === undefined) {
             day.tokensOut = fold.tokensOut;
             day.runsByRole = fold.runsByRole;
             day.tokensByRole = fold.tokensByRole;
@@ -187,19 +213,23 @@ export function collectReport(root, days, role) {
                 day.revisionsByRole = fold.revisionsByRole;
             if (Object.keys(fold.refusalsByRole).length > 0)
                 day.refusalsByRole = fold.refusalsByRole;
+            if (Object.keys(fold.revertsByRole).length > 0)
+                day.revertsByRole = fold.revertsByRole;
             // Checks belong to the merge slot, so only the team series carries the median.
-            if (fold.checkDurationsMs.length > 0) {
-                day.checkMedianMs = lowerMedian(fold.checkDurationsMs);
-            }
+            setLowerMedian(day, "checkMedianMs", fold.checkDurationsMs);
             if (fold.checkFailures > 0)
                 day.checkFailures = fold.checkFailures;
-            if (fold.mergeWaitsMs.length > 0)
-                day.mergeWaitMedianMs = lowerMedian(fold.mergeWaitsMs);
-            if (fold.providerWaitsMs.length > 0)
-                day.providerWaitMedianMs = lowerMedian(fold.providerWaitsMs);
+            setLowerMedian(day, "mergeWaitMedianMs", fold.mergeWaitsMs);
+            setLowerMedian(day, "mergeSlotMedianMs", fold.mergeDurationsMs);
+            setLowerMedian(day, "runMedianMs", fold.runDurationsMs);
+            setLowerMedian(day, "providerWaitMedianMs", fold.providerWaitsMs);
             // A workspace wait is the pool's, not a role's, so only the team series carries it.
-            if (fold.slotWaitsMs.length > 0)
-                day.slotWaitMedianMs = lowerMedian(fold.slotWaitsMs);
+            setLowerMedian(day, "slotWaitMedianMs", fold.slotWaitsMs);
+            // A check permit is the team's, not a role's, so only the team series carries it.
+            setLowerMedian(day, "checkWaitMedianMs", fold.checkWaitsMs);
+            // A review belongs to the merge slot/reviewer, not the author role, so only the team
+            // series carries the median, mirroring checkMedianMs.
+            setLowerMedian(day, "reviewMedianMs", fold.reviewDurationsMs);
             // Only set when nonzero, so a failure-free day keeps its exact pre-feature shape.
             if (Object.keys(fold.failedRunsByRole).length > 0)
                 day.failedRunsByRole = fold.failedRunsByRole;
@@ -223,6 +253,11 @@ export function collectReport(root, days, role) {
                 day.costByProvider = fold.costByProvider;
             if (Object.keys(fold.notionalByProvider).length > 0)
                 day.notionalByProvider = fold.notionalByProvider;
+            // Backends are a team attribution (a backend is not a role), so only the team series
+            // carries the map; only set when a backend actually spent (zero means absent), so a
+            // backend-free day keeps its exact pre-feature shape.
+            if (Object.keys(fold.notionalByBackend).length > 0)
+                day.notionalByBackend = fold.notionalByBackend;
             // Models are a team attribution (a model is not a role), so only the team series
             // carries the map; only set when a modelled start happened (zero means absent), so a
             // model-less day keeps its exact pre-feature shape.
@@ -254,53 +289,55 @@ export function collectReport(root, days, role) {
         }
         else {
             // Role scope: derive this day from the fold's per-role maps, so the series carries only
-            // the named role's ticks/tokens/cost and (base-role-keyed) commits. The scope is the
+            // the named role's runs/tokens/cost and (base-role-keyed) commits. The scope is the
             // base role, so an instance id's usage and its siblings' commits fold into one group and
             // the numbers match the per-role cap, which is base-role keyed too. The merge fields
             // stay unset — merge runs are the merge slot's, not this role's — and the work /
             // maintenance split follows the base role's own tier rather than the day's whole split.
-            const base = baseRoleOf(role);
-            const commits = roleSum(fold.commitsByRole, base);
-            const tier = commitTier(base);
-            day.tokensOut = roleSum(fold.tokensByRole, base);
-            day.runsByRole = narrowToRole(fold.runsByRole, base);
-            day.tokensByRole = narrowToRole(fold.tokensByRole, base);
-            day.costByRole = narrowToRole(fold.costByRole, base);
-            const rejs = narrowToRole(fold.rejectionsByRole, base);
+            const commits = roleSum(fold.commitsByRole, bases);
+            day.tokensOut = roleSum(fold.tokensByRole, bases);
+            day.runsByRole = narrowToRole(fold.runsByRole, bases);
+            day.tokensByRole = narrowToRole(fold.tokensByRole, bases);
+            day.costByRole = narrowToRole(fold.costByRole, bases);
+            const rejs = narrowToRole(fold.rejectionsByRole, bases);
             if (Object.keys(rejs).length > 0)
                 day.rejectionsByRole = rejs;
-            const revs = narrowToRole(fold.revisionsByRole, base);
+            const revs = narrowToRole(fold.revisionsByRole, bases);
             if (Object.keys(revs).length > 0)
                 day.revisionsByRole = revs;
-            const refusals = narrowToRole(fold.refusalsByRole, base);
+            const refusals = narrowToRole(fold.refusalsByRole, bases);
             if (Object.keys(refusals).length > 0)
                 day.refusalsByRole = refusals;
-            const fails = narrowToRole(fold.failedRunsByRole, base);
+            const reverts = narrowToRole(fold.revertsByRole, bases);
+            if (Object.keys(reverts).length > 0)
+                day.revertsByRole = reverts;
+            const fails = narrowToRole(fold.failedRunsByRole, bases);
             if (Object.keys(fails).length > 0)
                 day.failedRunsByRole = fails;
-            const falls = narrowToRole(fold.fallbacksByRole, base);
+            const falls = narrowToRole(fold.fallbacksByRole, bases);
             if (Object.keys(falls).length > 0)
                 day.fallbacksByRole = falls;
-            const reroutes = narrowToRole(fold.imageReroutesByRole, base);
+            const reroutes = narrowToRole(fold.imageReroutesByRole, bases);
             if (Object.keys(reroutes).length > 0)
                 day.imageReroutesByRole = reroutes;
             day.commits = commits;
-            day.commitsByRole = narrowToRole(fold.commitsByRole, base);
-            day.workCommits = tier === "work" ? commits : 0;
-            day.maintenanceCommits = tier === "maintenance" ? commits : 0;
-            day.costUsd = roleSum(fold.costByRole, base);
-            const notional = roleSum(fold.notionalByRole, base);
+            day.commitsByRole = narrowToRole(fold.commitsByRole, bases);
+            const tierCommits = (tier) => bases.filter((b) => commitTier(b) === tier).reduce((n, b) => n + roleSum(fold.commitsByRole, b), 0);
+            day.workCommits = tierCommits("work");
+            day.maintenanceCommits = tierCommits("maintenance");
+            day.costUsd = roleSum(fold.costByRole, bases);
+            const notional = roleSum(fold.notionalByRole, bases);
             if (notional > 0) {
                 day.notionalCostUsd = notional;
-                day.notionalByRole = narrowToRole(fold.notionalByRole, base);
+                day.notionalByRole = narrowToRole(fold.notionalByRole, bases);
             }
             // Merge runs belong to the merge slot, not this role, so the role-scoped series
             // keeps them unset (matching the merge-share fields) — the render omits the merge
             // line for a scoped report, so these are carried only for shape consistency.
-            const mergeDone = narrowToRole(fold.mergedByRole, base);
+            const mergeDone = narrowToRole(fold.mergedByRole, bases);
             if (Object.keys(mergeDone).length > 0)
                 day.mergedByRole = mergeDone;
-            const mergeDoneFailed = narrowToRole(fold.mergeFailedByRole, base);
+            const mergeDoneFailed = narrowToRole(fold.mergeFailedByRole, bases);
             if (Object.keys(mergeDoneFailed).length > 0)
                 day.mergeFailedByRole = mergeDoneFailed;
         }
@@ -312,6 +349,19 @@ export function collectReport(root, days, role) {
         d.tokensOut += d.mergeTokens ?? 0;
         d.costUsd += d.mergeCostUsd ?? 0;
     }
+    // Main's red wall-clock per day, from G1's rule (main_red_hold / failed ran main_check open a
+    // spell, a passing ran main_check closes it, an open spell runs to now). Team-only: main's
+    // red time is main's own, not any role's, so a role-scoped series leaves every day unset —
+    // exactly as checkFailures is team-only. Only set when a day actually was red (zero-absent,
+    // like checkMedianMs).
+    if (bases === undefined) {
+        const redByDay = mainRedMinutesByDay(foldEntry.redEvents, dayAt(days - 1, now).getTime(), now.getTime());
+        for (const d of series) {
+            const ms = redByDay.get(d.date);
+            if (ms !== undefined)
+                d.mainRedMs = ms;
+        }
+    }
     const countOn = (date, field) => {
         const day = byDate.get(date);
         if (day)
@@ -366,6 +416,36 @@ export function collectReport(root, days, role) {
             }
         }
     }
+    // The per-day backlog lag median: how long each finished plan or bug waited from its filing
+    // stamp to its done/fixed stamp, folded per completion day — the median backlog age at
+    // which the day's items closed. Team-only (a lag has no role, like the validation tally
+    // and the filing stamps above) and zero-means-absent: a day with no lag-carrying completion
+    // keeps its exact pre-feature shape, and an out-of-window completion date drops out (it
+    // must be a byDate key, the same drop countOn applies). The same entry detection and date
+    // rules (sectionCompletionLags / entryLags) the completion and filing reads use, so the
+    // spans pair the days `featuresDone`/`bugsFixed` count.
+    if (role === undefined) {
+        const lagsByDay = new Map();
+        const foldLag = (date, lagDays) => {
+            const list = lagsByDay.get(date);
+            if (list)
+                list.push(lagDays);
+            else
+                lagsByDay.set(date, [lagDays]);
+        };
+        for (const file of finishedFiles("PLANS.md")) {
+            for (const { date, lagDays } of sectionCompletionLags(root, file, "Done", DONE_DATE_RE))
+                if (byDate.has(date))
+                    foldLag(date, lagDays);
+        }
+        for (const file of finishedFiles("BUGS.md")) {
+            for (const { date, lagDays } of sectionCompletionLags(root, file, "Fixed", FIXED_DATE_RE))
+                if (byDate.has(date))
+                    foldLag(date, lagDays);
+        }
+        for (const [date, lags] of lagsByDay)
+            byDate.get(date).backlogLagMedianDays = lowerMedian(lags);
+    }
     const totals = {
         tokensOut: 0,
         runs: 0,
@@ -383,6 +463,7 @@ export function collectReport(root, days, role) {
     let mergeFailed = 0;
     let plansAdded = 0;
     let bugsFiled = 0;
+    const notionalByBackend = {};
     for (const d of series) {
         totals.tokensOut += d.tokensOut;
         for (const n of Object.values(d.runsByRole))
@@ -394,6 +475,8 @@ export function collectReport(root, days, role) {
         totals.maintenanceCommits += d.maintenanceCommits ?? 0;
         totals.costUsd += d.costUsd;
         notionalCostUsd += d.notionalCostUsd ?? 0;
+        for (const [backend, c] of Object.entries(d.notionalByBackend ?? {}))
+            addTo(notionalByBackend, backend, c);
         totals.featuresDone += d.featuresDone;
         totals.bugsFixed += d.bugsFixed;
         plansAdded += d.plansAdded ?? 0;
@@ -419,11 +502,12 @@ export function collectReport(root, days, role) {
         days,
         from,
         to,
-        ...(role === undefined ? {} : { role: baseRoleOf(role) }),
+        ...(bases === undefined ? {} : { role: bases.join(",") }),
         series,
         totals: {
             ...totals,
             ...(notionalCostUsd > 0 ? { notionalCostUsd } : {}),
+            ...(Object.keys(notionalByBackend).length > 0 ? { notionalByBackend } : {}),
             ...(mergeFailed > 0 ? { mergeFailed } : {}),
             ...(plansAdded > 0 ? { plansAdded } : {}),
             ...(bugsFiled > 0 ? { bugsFiled } : {}),