From 27dff10891c36dde09c21477907c6ab5c3adece8 Mon Sep 17 00:00:00 2001
From: Sean Ahern <sean.ahern@synopsys.com>
Date: Sun, 20 Sep 2026 00:00:31 -0400
Subject: [PATCH 1/2] Send the sweep strip as a bitmap rather than a list of
 positions

A branch's completed-candidate set was serialized as one JSON integer per
swept candidate, so the overview's cost grew with the swept fraction of the
vocabulary rather than with the vocabulary. One bit per candidate makes the
cost constant: 2,476 bytes per branch at 14,855 candidates, whatever the
sweep has reached. Measured on the production overview, 412,016 bytes to
34,917.

Both renderers decode it. The client tests bits in place instead of
building a Set of every swept position on each redraw.

SCHEMA_VERSION goes to 4: the key is new and the old one is gone, so a
client from before this change must not read the payload as if the strip
were simply empty.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01PpacbZRqT46b4Duhxq5QNQ
---
 report_client.html                            |  27 +-
 report_model.py                               |  63 ++-
 report_terminal.py                            |   4 +-
 tests/fixtures/reports/branch.json            | 249 ++++++++--
 tests/fixtures/reports/cache.json             | 166 +++----
 tests/fixtures/reports/hotspots.json          |  71 ++-
 tests/fixtures/reports/leaderboard.json       | 137 ++++--
 tests/fixtures/reports/openers-word.json      | 284 ++++++------
 tests/fixtures/reports/openers.json           | 438 +++++++++---------
 tests/fixtures/reports/overview.json          | 368 +++++++++++++--
 tests/fixtures/reports/queue-tree.json        |  67 ++-
 tests/fixtures/reports/queue.json             | 175 ++++++-
 .../reports/root_progress-inherited.json      |   4 +-
 tests/fixtures/reports/root_progress.json     |   4 +-
 tests/fixtures/reports/tree.json              |  98 +++-
 tests/fixtures/reports/word.json              | 178 +++++--
 tests/fixtures/reports/work_distribution.json | 312 ++++++-------
 tests/fixtures/reports/workers-tree.json      |  77 ++-
 tests/fixtures/reports/workers.json           | 181 +++++++-
 tests/test_report_model.py                    |  55 ++-
 tests/test_report_terminal.py                 |   6 +-
 21 files changed, 2173 insertions(+), 791 deletions(-)

diff --git a/report_client.html b/report_client.html
index 54aa5fe3..aa8b61b8 100644
--- a/report_client.html
+++ b/report_client.html
@@ -405,7 +405,7 @@
   <script>
   (() => {
     "use strict";
-    const SCHEMA_VERSION=3, DEFAULT_POLL=2000, STUCK_REQUEST_MILLIS=60000;
+    const SCHEMA_VERSION=4, DEFAULT_POLL=2000, STUCK_REQUEST_MILLIS=60000;
     const branchStatusNames=["unqueued","queued","evaluating","finalizing","done"];
     const branchWorkerStatusNames=["active","waiting"];
     // The overview answers what the swarm is doing right now, so it offers
@@ -1030,7 +1030,7 @@
       card.append(title);
       if(row.spine?.length)card.append(renderSpine(Array.isArray(row.spine)?row.spine:spineFromText(row.spine)));
       const parts=[];
-      if(row.candidate_count){const line=element("div","progress-line");const fill=Array.isArray(row.completed_candidate_indexes)?sweepStrip(row.candidate_count,row.completed_candidate_indexes,branchWorkers,previousWorkersById):progress(row.completed_candidate_count,row.candidate_count);line.append(fill);card.append(line);parts.push(numText(row.completed_candidate_count)+"/"+numText(row.candidate_count)+" cands");}
+      if(row.candidate_count){const line=element("div","progress-line");const fill=typeof row.completed_candidate_bitmap==="string"?sweepStrip(row.candidate_count,row.completed_candidate_bitmap,branchWorkers,previousWorkersById):progress(row.completed_candidate_count,row.candidate_count);line.append(fill);card.append(line);parts.push(numText(row.completed_candidate_count)+"/"+numText(row.candidate_count)+" cands");}
       parts.push(numText(row.answer_count)+(row.answer_count===1?" answer":" answers"));
       const best=bestText(row);if(best)parts.push(best);
       if(row.worker_count)parts.push(numText(row.worker_count)+(row.worker_count===1?" worker":" workers"));
@@ -1099,13 +1099,28 @@
       if(worker.candidate_index===null||worker.candidate_index===undefined)return null;
       return {candidate_index:worker.candidate_index,state:"working"};
     }
-    function sweepStrip(candidateCount,completedCandidateIndexes,workers,previousWorkersById){
+    // One bit per candidate, little-endian within each byte, matching
+    // report_model.encode_candidate_bitmap.  A branch carries up to the whole
+    // vocabulary of candidates, and the overview draws one strip per active
+    // branch on a page that polls every two seconds; as a list of positions
+    // that reached 91,643 bytes for a single production branch against 2,478
+    // for the same branch as bits.  Testing bits directly also avoids building
+    // a Set of every completed position just to ask about ranges of it.
+    function decodeCandidateBitmap(bitmap){
+      if(typeof bitmap!=="string"||!bitmap)return new Uint8Array(0);
+      let binary;
+      try{binary=atob(bitmap);}catch(error){return new Uint8Array(0);}
+      const bytes=new Uint8Array(binary.length);
+      for(let index=0;index<binary.length;index++)bytes[index]=binary.charCodeAt(index);
+      return bytes;
+    }
+    function sweepStrip(candidateCount,completedCandidateBitmap,workers,previousWorkersById){
       const cellCount=Math.max(1,Math.min(50,candidateCount));
-      const strip=element("div","sweep"),done=new Set(completedCandidateIndexes||[]);
+      const strip=element("div","sweep"),done=decodeCandidateBitmap(completedCandidateBitmap);
       strip.dataset.cellCount=cellCount;
       for(let cell=0;cell<cellCount;cell++){
         const start=Math.floor(cell*candidateCount/cellCount),end=Math.max(start+1,Math.floor((cell+1)*candidateCount/cellCount));
-        let doneCount=0;for(let index=start;index<end;index++)if(done.has(index))doneCount++;
+        let doneCount=0;for(let index=start;index<end;index++)if(done[index>>3]&(1<<(index&7)))doneCount++;
         const cellNode=element("span","sweep-cell");
         // A 100% fill is reserved for a cell whose every candidate is done;
         // partial completion is capped below full (and lifted off zero) so a
@@ -1714,7 +1729,7 @@
       const queueFacts=data.queue?[["status",data.queue.branch_status],["worker",data.queue.branch_worker_status],["priority",data.queue.priority],["budget",data.queue.budget],["best",bestGuessCell(data.queue,branch.answer_count)||"none yet"],["ERD ceiling",erdValue(data.queue.ceiling,branch.answer_count,{ceiling:true})],["nodes",data.queue.search_node_count],...(bundleSummary.wall_millis?[['wall time',formatDuration(bundleSummary.wall_millis/1000)]]:[])]:null;
       fragment.append(section("Queue",queueFacts?labeledFacts(queueFacts):element("p","empty","No current queue state")));
       const claimSummary=data.claim_summary||{};
-      if(data.queue&&data.queue.candidate_count){const liveWorkers=(data.workers||[]).filter(worker=>worker.is_live);const candidateFacts=[["candidates",formatInteger(data.queue.completed_candidate_count)+"/"+formatInteger(data.queue.candidate_count)+" ="],["evaluated",claimSummary.evaluated_count||0],["+ one-level ERD prunes",data.queue.one_level_erd_pruned_candidate_count??data.queue.bulk_completed_candidate_count],["+ two-level ERD prunes",data.queue.two_level_erd_pruned_candidate_count??0],...(claimSummary.provenance_unknown_count?[["+ unattributed",claimSummary.provenance_unknown_count]]:[])];const candidateStatusFacts=[...(claimSummary.in_flight_count?[["in flight",claimSummary.in_flight_count]]:[])],candidateETAFacts=[];const candidateETA=data.candidate_eta;if(candidateETA?.state==="ready"||candidateETA?.state==="rough"){const etaDataMinutes=Math.round(candidateETA.sample_duration_seconds/60),etaWorkers=candidateETA.worker_count_changed?"; scaling "+candidateETA.sample_worker_count+"→"+candidateETA.current_worker_count+" workers":"";candidateETAFacts.push([(candidateETA.state==="rough"?"Rough ETA":"ETA")+" ("+etaDataMinutes+" min data"+etaWorkers+")","~"+formatDuration(candidateETA.estimated_seconds)]);candidateETAFacts.push(["ETA work remaining","checks "+numText(candidateETA.remaining_inspection_count)+" · full evals ~"+numText(candidateETA.expected_full_evaluation_count)]);}else if(candidateETA?.state==="learning")candidateETAFacts.push(["ETA","learning: first 3 min of current work sample"]);const republishedList=data.republished_candidates||[];if(republishedList.length)candidateStatusFacts.push(["candidates re-queued",numText(republishedList.length)+" (up to "+Math.max(...republishedList.map(row=>row.republish_count))+"× each)"]);if(claimSummary.worker_contributions?.length)candidateStatusFacts.push(["worker evals",claimSummary.worker_contributions.map(row=>workerName({worker_id:row.worker_id})+":"+numText(row.done_count)).join(" ")]);const candidates=element("div");candidates.append(sweepStrip(data.queue.candidate_count,data.completed_candidate_indexes,liveWorkers,previousBy(previous,"workers","worker_id")),labeledFacts(candidateFacts));if(candidateStatusFacts.length)candidates.append(labeledFacts(candidateStatusFacts));for(const fact of candidateETAFacts)candidates.append(labeledFacts([fact]));fragment.append(section("Candidates",candidates));}
+      if(data.queue&&data.queue.candidate_count){const liveWorkers=(data.workers||[]).filter(worker=>worker.is_live);const candidateFacts=[["candidates",formatInteger(data.queue.completed_candidate_count)+"/"+formatInteger(data.queue.candidate_count)+" ="],["evaluated",claimSummary.evaluated_count||0],["+ one-level ERD prunes",data.queue.one_level_erd_pruned_candidate_count??data.queue.bulk_completed_candidate_count],["+ two-level ERD prunes",data.queue.two_level_erd_pruned_candidate_count??0],...(claimSummary.provenance_unknown_count?[["+ unattributed",claimSummary.provenance_unknown_count]]:[])];const candidateStatusFacts=[...(claimSummary.in_flight_count?[["in flight",claimSummary.in_flight_count]]:[])],candidateETAFacts=[];const candidateETA=data.candidate_eta;if(candidateETA?.state==="ready"||candidateETA?.state==="rough"){const etaDataMinutes=Math.round(candidateETA.sample_duration_seconds/60),etaWorkers=candidateETA.worker_count_changed?"; scaling "+candidateETA.sample_worker_count+"→"+candidateETA.current_worker_count+" workers":"";candidateETAFacts.push([(candidateETA.state==="rough"?"Rough ETA":"ETA")+" ("+etaDataMinutes+" min data"+etaWorkers+")","~"+formatDuration(candidateETA.estimated_seconds)]);candidateETAFacts.push(["ETA work remaining","checks "+numText(candidateETA.remaining_inspection_count)+" · full evals ~"+numText(candidateETA.expected_full_evaluation_count)]);}else if(candidateETA?.state==="learning")candidateETAFacts.push(["ETA","learning: first 3 min of current work sample"]);const republishedList=data.republished_candidates||[];if(republishedList.length)candidateStatusFacts.push(["candidates re-queued",numText(republishedList.length)+" (up to "+Math.max(...republishedList.map(row=>row.republish_count))+"× each)"]);if(claimSummary.worker_contributions?.length)candidateStatusFacts.push(["worker evals",claimSummary.worker_contributions.map(row=>workerName({worker_id:row.worker_id})+":"+numText(row.done_count)).join(" ")]);const candidates=element("div");candidates.append(sweepStrip(data.queue.candidate_count,data.completed_candidate_bitmap,liveWorkers,previousBy(previous,"workers","worker_id")),labeledFacts(candidateFacts));if(candidateStatusFacts.length)candidates.append(labeledFacts(candidateStatusFacts));for(const fact of candidateETAFacts)candidates.append(labeledFacts([fact]));fragment.append(section("Candidates",candidates));}
       // Live workers sits directly under Candidates: they are the two panels
       // that change on every poll, and keeping them adjacent gives them a
       // chance to share one scrolled page.
diff --git a/report_model.py b/report_model.py
index 1ed63230..549cc6c5 100644
--- a/report_model.py
+++ b/report_model.py
@@ -3,6 +3,7 @@
 from __future__ import annotations
 
 from dataclasses import dataclass, field, replace
+import base64
 import collections
 import datetime
 import os
@@ -34,7 +35,7 @@
 from wordle_ui import fmt_pattern, parse_pattern
 
 
-SCHEMA_VERSION = 3
+SCHEMA_VERSION = 4
 WORKER_STALE_SECONDS = 20
 DEFAULT_TREE_PAGE_SIZE = 10
 # A tree page groups sibling nodes by the guess word on their spine, and a page
@@ -774,6 +775,56 @@ def _worker_process_is_running(pid):
         return False
 
 
+def encode_candidate_bitmap(indexes, candidate_count):
+    """Pack completed candidate positions into a base64 little-endian bitset.
+
+    The sweep strip needs to know which candidates a branch has finished, and
+    a branch carries up to the whole vocabulary of them.  Sent as a list of
+    positions that is tens of thousands of numbers -- 91,643 bytes for one
+    production branch, and the overview draws one strip per active branch on a
+    page the client polls every two seconds.
+
+    A bitset is one bit per candidate whatever the pattern: 2,478 base64 bytes
+    for a 14,855-candidate branch, against 6,890 to 91,643 for the same
+    branches as positions.  Run-length encoding was measured first and rejected
+    on the same data: it is smaller on a contiguous sweep and barely smaller on
+    a fragmented one (64.7% of the raw list at worst), and a swarm of six
+    workers claiming scattered ranges produces exactly the fragmented case.
+    The bitset has no worst case to avoid.
+
+    Returns None when there is nothing to draw, so a branch with no candidate
+    count carries no field rather than an empty one.
+    """
+    if not candidate_count or candidate_count < 1:
+        return None
+    bits = bytearray((candidate_count + 7) // 8)
+    for index in indexes or ():
+        if index is None or not 0 <= index < candidate_count:
+            continue
+        bits[index >> 3] |= 1 << (index & 7)
+    return base64.b64encode(bytes(bits)).decode("ascii")
+
+
+def decode_candidate_bitmap(bitmap, candidate_count):
+    """Positions set in a bitmap `encode_candidate_bitmap` produced.
+
+    The renderers count completions per cell at their own resolutions -- the
+    browser draws up to 50 cells, the terminal between 10 and 40 -- so the wire
+    format keeps every position rather than a histogram either of them would
+    have to resample.
+    """
+    if not bitmap or not candidate_count:
+        return []
+    try:
+        bits = base64.b64decode(bitmap, validate=True)
+    except (ValueError, TypeError):
+        return []
+    return [
+        index for index in range(min(candidate_count, len(bits) * 8))
+        if bits[index >> 3] & (1 << (index & 7))
+    ]
+
+
 def _normalize_worker(row, generated_at, answer_set):
     branch_key_value = _row_value(row, "current_branch_key")
     branch_key = bytes(branch_key_value) if branch_key_value is not None else None
@@ -1044,8 +1095,9 @@ def _queue_overview(sources, generated_at, answer_set, report):
             # displays can draw the candidate sweep. Other statuses have no
             # live claim rows.
             if normalized["branch_worker_status"] == "active":
-                normalized["completed_candidate_indexes"] = (
-                    completed_candidate_indexes[bytes(row["branch_key"])]
+                normalized["completed_candidate_bitmap"] = encode_candidate_bitmap(
+                    completed_candidate_indexes[bytes(row["branch_key"])],
+                    normalized.get("candidate_count"),
                 )
             normalized_rows.append(normalized)
 
@@ -2806,8 +2858,9 @@ def collect_branch_report(sources: ReportOpeners, request: ReportRequest) -> dic
             {"candidate_index": row["idx"], "republish_count": row["count"]}
             for row in republish_rows
         ],
-        "completed_candidate_indexes": sorted(
-            row["idx"] for row in claim_rows if row["done"]
+        "completed_candidate_bitmap": encode_candidate_bitmap(
+            (row["idx"] for row in claim_rows if row["done"]),
+            (queue_payload or {}).get("candidate_count"),
         ),
         "claims": normalized_claims if request.include_claims else None,
         "claim_summary": _summarize_claims(normalized_claims),
diff --git a/report_terminal.py b/report_terminal.py
index 1cb7af18..fd0f782e 100644
--- a/report_terminal.py
+++ b/report_terminal.py
@@ -13,6 +13,7 @@
 import time
 
 from report_model import (
+    decode_candidate_bitmap,
     ROOT_PROGRESS_DISPLAY_STATES,
     ROOT_PROGRESS_GROUP_STATES,
     ReportRequest,
@@ -1253,7 +1254,8 @@ def _render_branch_sections(report, previous_report, color, width, display_order
         ]
         sweep = candidate_sweep_bar(
             candidate_count,
-            data.get("completed_candidate_indexes") or (),
+            decode_candidate_bitmap(
+                data.get("completed_candidate_bitmap"), candidate_count),
             worker_positions,
             width=max(10, min(40, width - 4)),
         )
diff --git a/tests/fixtures/reports/branch.json b/tests/fixtures/reports/branch.json
index 0bf3e1c4..a26b4586 100644
--- a/tests/fixtures/reports/branch.json
+++ b/tests/fixtures/reports/branch.json
@@ -1,31 +1,222 @@
 {
-  "schema_version": 3,
-  "report_kind": "branch",
-  "generated_at": 1000,
-  "branch_target": {"kind": "branch", "steps": [{"word": "raise", "pattern": "-----"}], "trailing_word": null, "branch_reference": null, "input_text": "RAISE -----"},
-  "filters": {},
-  "tree": false,
-  "sources": {"queue": {"path": "fixture/queue.sqlite3", "ok": true, "error": null, "epoch": 4, "label": "packed", "git_sha": "abcdef12"}, "telemetry": {"path": "fixture/telemetry.sqlite3", "ok": true, "error": null}, "cache": {"path": "fixture/cache.sqlite3", "ok": true, "error": null}},
-  "data": {
-    "branch": {"branch_reference": "111111111111", "branch_key_hex": "01", "spine": [{"word": "raise", "pattern": "-----", "word_is_answer": false}], "guess_depth": 1, "budget": 5, "answer_count": 8, "branch_status": "done", "branch_worker_status": null},
-    "queue": {"branch_status": "done", "branch_worker_status": null, "pending_status": "in_progress", "active_status": "open", "priority": 5, "candidate_count": 100, "completed_candidate_count": 25, "bulk_completed_candidate_count": 4, "one_level_erd_pruned_candidate_count": 3, "two_level_erd_pruned_candidate_count": 1, "best_guess": "crane", "best_guess_is_answer": true, "best_erd": 2.1, "best_max_remaining_depth": 3, "ceiling": 2.4, "search_node_count": 12000, "created_at": 900, "finalized_at": null},
-    "cache": {"cache_state": "exact", "best_guess": "crane", "best_guess_is_answer": true, "best_erd": 2.1, "max_remaining_depth": 3, "solve_budget": 5, "tainted": false, "updated_at": 990},
-    "workers": [],
-    "republished_candidates": [{"candidate_index": 7, "republish_count": 2}],
-    "completed_candidate_indexes": [3, 4],
-    "claims": [
-      {"candidate_index": 3, "state": "done", "completion_kind": "evaluated", "worker_id": "worker-0", "bundle_id": "bundle-1", "claimed_at": 930, "done_at": 940, "republish_count": 0},
-      {"candidate_index": 4, "state": "done", "completion_kind": "one_level_erd_pruned", "worker_id": null, "bundle_id": null, "claimed_at": 940, "done_at": 940, "republish_count": 0}
-    ],
-    "claim_summary": {"total_claim_count": 12972, "done_count": 12819, "in_flight_count": 5, "evaluated_count": 11200, "one_level_erd_pruned_count": 1500, "two_level_erd_pruned_count": 119, "provenance_unknown_count": 0, "worker_contributions": [{"worker_id": "worker-0", "done_count": 6484}, {"worker_id": "worker-2", "done_count": 6335}]},
-    "provenance_unknown": false,
-    "bundle_summary": {"bundle_count": 3, "node_count": 9000, "wall_millis": 800, "censored_unit_count": 1, "maximum_bundle_node_count": 5000},
-    "recent_finalizations": [
-      {"finalization_id": 3, "spine": "SLATE g---- CRIMP -----", "outcome": "exact", "ceiling": null, "budget": 5, "answer_count": 8, "search_node_count": 12000, "created_at": 800, "finalized_at": 900, "wall_millis": 1000, "bundle_count": 3, "maximum_bundle_node_count": 5000, "censored_unit_count": 1, "epoch": 4, "evaluated_candidate_count": 20, "bulk_completed_candidate_count": 4, "one_level_erd_pruned_candidate_count": 3, "two_level_erd_pruned_candidate_count": 1, "recorded_at": 901},
-      {"finalization_id": 2, "spine": "SLATE g---- DUCHY -----", "outcome": "cut", "ceiling": 2.2, "budget": 5, "answer_count": 8, "search_node_count": 9000, "created_at": 700, "finalized_at": 790, "wall_millis": 800, "bundle_count": 2, "maximum_bundle_node_count": 4500, "censored_unit_count": 0, "epoch": 4, "evaluated_candidate_count": 15, "bulk_completed_candidate_count": 2, "one_level_erd_pruned_candidate_count": 2, "two_level_erd_pruned_candidate_count": 0, "recorded_at": 791},
-      {"finalization_id": 1, "spine": "SLATE g---- WRUNG -----", "outcome": "loss", "ceiling": null, "budget": 4, "answer_count": 8, "search_node_count": 6000, "created_at": 600, "finalized_at": 680, "wall_millis": 700, "bundle_count": 2, "maximum_bundle_node_count": 3500, "censored_unit_count": 0, "epoch": 3, "evaluated_candidate_count": 12, "bulk_completed_candidate_count": 1, "one_level_erd_pruned_candidate_count": 1, "two_level_erd_pruned_candidate_count": 0, "recorded_at": 681}
-    ],
-    "finalization_total_count": 3,
-    "cut_reuse_misses": [{"cut_reuse_miss_id": 1, "answer_count": 8, "budget": 5, "wanted_ceiling": null, "available_bound": 2.2, "available_budget": 4, "epoch": 4, "recorded_at": 950}]
+ "branch_target": {
+  "branch_reference": null,
+  "input_text": "RAISE -----",
+  "kind": "branch",
+  "steps": [
+   {
+    "pattern": "-----",
+    "word": "raise"
+   }
+  ],
+  "trailing_word": null
+ },
+ "data": {
+  "branch": {
+   "answer_count": 8,
+   "branch_key_hex": "01",
+   "branch_reference": "111111111111",
+   "branch_status": "done",
+   "branch_worker_status": null,
+   "budget": 5,
+   "guess_depth": 1,
+   "spine": [
+    {
+     "pattern": "-----",
+     "word": "raise",
+     "word_is_answer": false
+    }
+   ]
+  },
+  "bundle_summary": {
+   "bundle_count": 3,
+   "censored_unit_count": 1,
+   "maximum_bundle_node_count": 5000,
+   "node_count": 9000,
+   "wall_millis": 800
+  },
+  "cache": {
+   "best_erd": 2.1,
+   "best_guess": "crane",
+   "best_guess_is_answer": true,
+   "cache_state": "exact",
+   "max_remaining_depth": 3,
+   "solve_budget": 5,
+   "tainted": false,
+   "updated_at": 990
+  },
+  "claim_summary": {
+   "done_count": 12819,
+   "evaluated_count": 11200,
+   "in_flight_count": 5,
+   "one_level_erd_pruned_count": 1500,
+   "provenance_unknown_count": 0,
+   "total_claim_count": 12972,
+   "two_level_erd_pruned_count": 119,
+   "worker_contributions": [
+    {
+     "done_count": 6484,
+     "worker_id": "worker-0"
+    },
+    {
+     "done_count": 6335,
+     "worker_id": "worker-2"
+    }
+   ]
+  },
+  "claims": [
+   {
+    "bundle_id": "bundle-1",
+    "candidate_index": 3,
+    "claimed_at": 930,
+    "completion_kind": "evaluated",
+    "done_at": 940,
+    "republish_count": 0,
+    "state": "done",
+    "worker_id": "worker-0"
+   },
+   {
+    "bundle_id": null,
+    "candidate_index": 4,
+    "claimed_at": 940,
+    "completion_kind": "one_level_erd_pruned",
+    "done_at": 940,
+    "republish_count": 0,
+    "state": "done",
+    "worker_id": null
+   }
+  ],
+  "completed_candidate_bitmap": "GA==",
+  "cut_reuse_misses": [
+   {
+    "answer_count": 8,
+    "available_bound": 2.2,
+    "available_budget": 4,
+    "budget": 5,
+    "cut_reuse_miss_id": 1,
+    "epoch": 4,
+    "recorded_at": 950,
+    "wanted_ceiling": null
+   }
+  ],
+  "finalization_total_count": 3,
+  "provenance_unknown": false,
+  "queue": {
+   "active_status": "open",
+   "best_erd": 2.1,
+   "best_guess": "crane",
+   "best_guess_is_answer": true,
+   "best_max_remaining_depth": 3,
+   "branch_status": "done",
+   "branch_worker_status": null,
+   "bulk_completed_candidate_count": 4,
+   "candidate_count": 100,
+   "ceiling": 2.4,
+   "completed_candidate_count": 25,
+   "created_at": 900,
+   "finalized_at": null,
+   "one_level_erd_pruned_candidate_count": 3,
+   "pending_status": "in_progress",
+   "priority": 5,
+   "search_node_count": 12000,
+   "two_level_erd_pruned_candidate_count": 1
+  },
+  "recent_finalizations": [
+   {
+    "answer_count": 8,
+    "budget": 5,
+    "bulk_completed_candidate_count": 4,
+    "bundle_count": 3,
+    "ceiling": null,
+    "censored_unit_count": 1,
+    "created_at": 800,
+    "epoch": 4,
+    "evaluated_candidate_count": 20,
+    "finalization_id": 3,
+    "finalized_at": 900,
+    "maximum_bundle_node_count": 5000,
+    "one_level_erd_pruned_candidate_count": 3,
+    "outcome": "exact",
+    "recorded_at": 901,
+    "search_node_count": 12000,
+    "spine": "SLATE g---- CRIMP -----",
+    "two_level_erd_pruned_candidate_count": 1,
+    "wall_millis": 1000
+   },
+   {
+    "answer_count": 8,
+    "budget": 5,
+    "bulk_completed_candidate_count": 2,
+    "bundle_count": 2,
+    "ceiling": 2.2,
+    "censored_unit_count": 0,
+    "created_at": 700,
+    "epoch": 4,
+    "evaluated_candidate_count": 15,
+    "finalization_id": 2,
+    "finalized_at": 790,
+    "maximum_bundle_node_count": 4500,
+    "one_level_erd_pruned_candidate_count": 2,
+    "outcome": "cut",
+    "recorded_at": 791,
+    "search_node_count": 9000,
+    "spine": "SLATE g---- DUCHY -----",
+    "two_level_erd_pruned_candidate_count": 0,
+    "wall_millis": 800
+   },
+   {
+    "answer_count": 8,
+    "budget": 4,
+    "bulk_completed_candidate_count": 1,
+    "bundle_count": 2,
+    "ceiling": null,
+    "censored_unit_count": 0,
+    "created_at": 600,
+    "epoch": 3,
+    "evaluated_candidate_count": 12,
+    "finalization_id": 1,
+    "finalized_at": 680,
+    "maximum_bundle_node_count": 3500,
+    "one_level_erd_pruned_candidate_count": 1,
+    "outcome": "loss",
+    "recorded_at": 681,
+    "search_node_count": 6000,
+    "spine": "SLATE g---- WRUNG -----",
+    "two_level_erd_pruned_candidate_count": 0,
+    "wall_millis": 700
+   }
+  ],
+  "republished_candidates": [
+   {
+    "candidate_index": 7,
+    "republish_count": 2
+   }
+  ],
+  "workers": []
+ },
+ "filters": {},
+ "generated_at": 1000,
+ "report_kind": "branch",
+ "schema_version": 4,
+ "sources": {
+  "cache": {
+   "error": null,
+   "ok": true,
+   "path": "fixture/cache.sqlite3"
+  },
+  "queue": {
+   "epoch": 4,
+   "error": null,
+   "git_sha": "abcdef12",
+   "label": "packed",
+   "ok": true,
+   "path": "fixture/queue.sqlite3"
+  },
+  "telemetry": {
+   "error": null,
+   "ok": true,
+   "path": "fixture/telemetry.sqlite3"
   }
-}
+ },
+ "tree": false
+}
\ No newline at end of file
diff --git a/tests/fixtures/reports/cache.json b/tests/fixtures/reports/cache.json
index ebfc23ae..d3dbca3f 100644
--- a/tests/fixtures/reports/cache.json
+++ b/tests/fixtures/reports/cache.json
@@ -1,87 +1,87 @@
 {
-  "schema_version": 3,
-  "report_kind": "cache",
-  "generated_at": 1000,
-  "branch_target": {
-    "kind": "root",
-    "steps": [],
-    "trailing_word": null,
-    "branch_reference": null,
-    "input_text": ""
+ "branch_target": {
+  "branch_reference": null,
+  "input_text": "",
+  "kind": "root",
+  "steps": [],
+  "trailing_word": null
+ },
+ "data": {
+  "distributions": {
+   "exact_branch_count_by_max_remaining_depth": {
+    "2": 8,
+    "3": 12
+   },
+   "exact_branch_count_by_solve_budget": {
+    "4": 5,
+    "5": 15
+   },
+   "exact_branch_count_by_taint": {
+    "tainted": 2,
+    "untainted": 18
+   },
+   "loss_branch_count_by_loss_budget": {
+    "4": 2
+   },
+   "state_branch_counts": {
+    "exact_branch_count": 20,
+    "loss_branch_count": 2
+   }
   },
-  "filters": {},
-  "tree": false,
-  "sources": {
-    "queue": {
-      "path": "fixture/queue.sqlite3",
-      "ok": false,
-      "error": null,
-      "epoch": null,
-      "label": null,
-      "git_sha": null
-    },
-    "telemetry": {
-      "path": "fixture/telemetry.sqlite3",
-      "ok": false,
-      "error": null
-    },
-    "cache": {
-      "path": "fixture/cache.sqlite3",
-      "ok": true,
-      "error": null
-    }
+  "recent_rows": [
+   {
+    "best_erd": 2.1,
+    "best_guess": "crane",
+    "branch_key_hex": "01",
+    "branch_reference": "111111111111",
+    "max_remaining_depth": 3,
+    "solve_budget": 5,
+    "tainted": false,
+    "updated_at": 990
+   },
+   {
+    "best_erd": 2.2,
+    "best_guess": "slate",
+    "branch_key_hex": "02",
+    "branch_reference": "222222222222",
+    "max_remaining_depth": 3,
+    "solve_budget": null,
+    "tainted": false,
+    "updated_at": 980
+   }
+  ],
+  "summary": {
+   "budgeted_branch_count": 4,
+   "budgeted_result_count": 6,
+   "exact_branch_count": 20,
+   "loss_branch_count": 2,
+   "recent_budgeted_result_count": 1,
+   "recent_exact_branch_count": 3
+  }
+ },
+ "filters": {},
+ "generated_at": 1000,
+ "report_kind": "cache",
+ "schema_version": 4,
+ "sources": {
+  "cache": {
+   "error": null,
+   "ok": true,
+   "path": "fixture/cache.sqlite3"
+  },
+  "queue": {
+   "epoch": null,
+   "error": null,
+   "git_sha": null,
+   "label": null,
+   "ok": false,
+   "path": "fixture/queue.sqlite3"
   },
-  "data": {
-    "summary": {
-      "budgeted_branch_count": 4,
-      "budgeted_result_count": 6,
-      "exact_branch_count": 20,
-      "loss_branch_count": 2,
-      "recent_budgeted_result_count": 1,
-      "recent_exact_branch_count": 3
-    },
-    "distributions": {
-      "state_branch_counts": {
-        "exact_branch_count": 20,
-        "loss_branch_count": 2
-      },
-      "exact_branch_count_by_max_remaining_depth": {
-        "2": 8,
-        "3": 12
-      },
-      "exact_branch_count_by_solve_budget": {
-        "4": 5,
-        "5": 15
-      },
-      "exact_branch_count_by_taint": {
-        "untainted": 18,
-        "tainted": 2
-      },
-      "loss_branch_count_by_loss_budget": {
-        "4": 2
-      }
-    },
-    "recent_rows": [
-      {
-        "branch_key_hex": "01",
-        "branch_reference": "111111111111",
-        "best_guess": "crane",
-        "best_erd": 2.1,
-        "max_remaining_depth": 3,
-        "solve_budget": 5,
-        "tainted": false,
-        "updated_at": 990
-      },
-      {
-        "branch_key_hex": "02",
-        "branch_reference": "222222222222",
-        "best_guess": "slate",
-        "best_erd": 2.2,
-        "max_remaining_depth": 3,
-        "solve_budget": null,
-        "tainted": false,
-        "updated_at": 980
-      }
-    ]
+  "telemetry": {
+   "error": null,
+   "ok": false,
+   "path": "fixture/telemetry.sqlite3"
   }
-}
+ },
+ "tree": false
+}
\ No newline at end of file
diff --git a/tests/fixtures/reports/hotspots.json b/tests/fixtures/reports/hotspots.json
index c7c62046..b861663b 100644
--- a/tests/fixtures/reports/hotspots.json
+++ b/tests/fixtures/reports/hotspots.json
@@ -1,7 +1,66 @@
 {
-  "schema_version": 3, "report_kind": "hotspots", "generated_at": 1000,
-  "branch_target": {"kind": "root", "steps": [], "trailing_word": null, "branch_reference": null, "input_text": ""},
-  "filters": {"limit": 10}, "tree": false,
-  "sources": {"queue": {"path": "fixture/queue.sqlite3", "ok": true, "error": null, "epoch": 4, "label": "packed", "git_sha": "abcdef12"}, "telemetry": {"path": "fixture/telemetry.sqlite3", "ok": true, "error": null}, "cache": {"path": "fixture/cache.sqlite3", "ok": false, "error": null}},
-  "data": {"field": "coordination", "population": "recent_claim_coordination_buckets", "epoch": 4, "since_seconds": 3600, "window_started_at": 0, "sample_size": 50000, "sampled_row_count": 400, "sample_truncated": false, "rows": [{"row_id": "coordination:20:4", "answer_count": 20, "worker_count": 4, "claim_count": 120, "coordination_millis": 900, "claim_retry_count": 4, "busy_wait_millis": 120}, {"row_id": "coordination:50:6", "answer_count": 50, "worker_count": 6, "claim_count": 80, "coordination_millis": 700, "claim_retry_count": 3, "busy_wait_millis": 90}]}
-}
+ "branch_target": {
+  "branch_reference": null,
+  "input_text": "",
+  "kind": "root",
+  "steps": [],
+  "trailing_word": null
+ },
+ "data": {
+  "epoch": 4,
+  "field": "coordination",
+  "population": "recent_claim_coordination_buckets",
+  "rows": [
+   {
+    "answer_count": 20,
+    "busy_wait_millis": 120,
+    "claim_count": 120,
+    "claim_retry_count": 4,
+    "coordination_millis": 900,
+    "row_id": "coordination:20:4",
+    "worker_count": 4
+   },
+   {
+    "answer_count": 50,
+    "busy_wait_millis": 90,
+    "claim_count": 80,
+    "claim_retry_count": 3,
+    "coordination_millis": 700,
+    "row_id": "coordination:50:6",
+    "worker_count": 6
+   }
+  ],
+  "sample_size": 50000,
+  "sample_truncated": false,
+  "sampled_row_count": 400,
+  "since_seconds": 3600,
+  "window_started_at": 0
+ },
+ "filters": {
+  "limit": 10
+ },
+ "generated_at": 1000,
+ "report_kind": "hotspots",
+ "schema_version": 4,
+ "sources": {
+  "cache": {
+   "error": null,
+   "ok": false,
+   "path": "fixture/cache.sqlite3"
+  },
+  "queue": {
+   "epoch": 4,
+   "error": null,
+   "git_sha": "abcdef12",
+   "label": "packed",
+   "ok": true,
+   "path": "fixture/queue.sqlite3"
+  },
+  "telemetry": {
+   "error": null,
+   "ok": true,
+   "path": "fixture/telemetry.sqlite3"
+  }
+ },
+ "tree": false
+}
\ No newline at end of file
diff --git a/tests/fixtures/reports/leaderboard.json b/tests/fixtures/reports/leaderboard.json
index b6544b66..5caa8ce4 100644
--- a/tests/fixtures/reports/leaderboard.json
+++ b/tests/fixtures/reports/leaderboard.json
@@ -1,40 +1,101 @@
 {
-  "schema_version": 3,
-  "report_kind": "leaderboard",
-  "generated_at": 1000,
-  "branch_target": null,
-  "filters": {},
-  "tree": false,
-  "sources": {"queue": {"path": "fixture/queue.sqlite3", "ok": false, "error": null, "epoch": null, "label": null, "git_sha": null}, "telemetry": {"path": "fixture/telemetry.sqlite3", "ok": false, "error": null}, "cache": {"path": "fixture/cache.sqlite3", "ok": true, "error": null}},
-  "data": {
-    "candidate_count": 14855,
-    "response_pattern_count": 243,
-    "counts": {"complete": 2, "pending": 14852, "infeasible": 1},
-    "total_rows": 2,
-    "matched_rows": 2,
-    "rows": [
-      {
-        "word": "salet", "word_is_answer": false, "erd": 3.5643502648,
-        "max_remaining_depth": 6, "rank": 1, "answer_count": 100,
-        "response_groups": [
-          {"pattern": "-----", "answer_count": 31},
-          {"pattern": "---g-", "answer_count": 24},
-          {"pattern": "---y-", "answer_count": 21},
-          {"pattern": "-y---", "answer_count": 14},
-          {"pattern": "--y--", "answer_count": 10}
-        ]
-      },
-      {
-        "word": "crane", "word_is_answer": true, "erd": 3.7124567,
-        "max_remaining_depth": 5, "rank": 2, "answer_count": 100,
-        "response_groups": [
-          {"pattern": "-----", "answer_count": 40},
-          {"pattern": "----y", "answer_count": 25},
-          {"pattern": "---y-", "answer_count": 20},
-          {"pattern": "--y--", "answer_count": 10},
-          {"pattern": "-y---", "answer_count": 5}
-        ]
-      }
-    ]
+ "branch_target": null,
+ "data": {
+  "candidate_count": 14855,
+  "counts": {
+   "complete": 2,
+   "infeasible": 1,
+   "pending": 14852
+  },
+  "matched_rows": 2,
+  "response_pattern_count": 243,
+  "rows": [
+   {
+    "answer_count": 100,
+    "erd": 3.5643502648,
+    "max_remaining_depth": 6,
+    "rank": 1,
+    "response_groups": [
+     {
+      "answer_count": 31,
+      "pattern": "-----"
+     },
+     {
+      "answer_count": 24,
+      "pattern": "---g-"
+     },
+     {
+      "answer_count": 21,
+      "pattern": "---y-"
+     },
+     {
+      "answer_count": 14,
+      "pattern": "-y---"
+     },
+     {
+      "answer_count": 10,
+      "pattern": "--y--"
+     }
+    ],
+    "word": "salet",
+    "word_is_answer": false
+   },
+   {
+    "answer_count": 100,
+    "erd": 3.7124567,
+    "max_remaining_depth": 5,
+    "rank": 2,
+    "response_groups": [
+     {
+      "answer_count": 40,
+      "pattern": "-----"
+     },
+     {
+      "answer_count": 25,
+      "pattern": "----y"
+     },
+     {
+      "answer_count": 20,
+      "pattern": "---y-"
+     },
+     {
+      "answer_count": 10,
+      "pattern": "--y--"
+     },
+     {
+      "answer_count": 5,
+      "pattern": "-y---"
+     }
+    ],
+    "word": "crane",
+    "word_is_answer": true
+   }
+  ],
+  "total_rows": 2
+ },
+ "filters": {},
+ "generated_at": 1000,
+ "report_kind": "leaderboard",
+ "schema_version": 4,
+ "sources": {
+  "cache": {
+   "error": null,
+   "ok": true,
+   "path": "fixture/cache.sqlite3"
+  },
+  "queue": {
+   "epoch": null,
+   "error": null,
+   "git_sha": null,
+   "label": null,
+   "ok": false,
+   "path": "fixture/queue.sqlite3"
+  },
+  "telemetry": {
+   "error": null,
+   "ok": false,
+   "path": "fixture/telemetry.sqlite3"
   }
-}
+ },
+ "tree": false
+}
\ No newline at end of file
diff --git a/tests/fixtures/reports/openers-word.json b/tests/fixtures/reports/openers-word.json
index be9e2151..62bad0b7 100644
--- a/tests/fixtures/reports/openers-word.json
+++ b/tests/fixtures/reports/openers-word.json
@@ -1,146 +1,146 @@
 {
-  "schema_version": 3,
-  "report_kind": "openers",
-  "generated_at": 1000,
-  "branch_target": {
-    "kind": "word",
-    "steps": [],
-    "trailing_word": "salet",
-    "branch_reference": null,
-    "input_text": "SALET"
-  },
-  "filters": {},
-  "tree": false,
-  "sources": {
-    "queue": {
-      "path": "fixture/queue.sqlite3",
-      "ok": true,
-      "error": null,
-      "epoch": 4,
-      "label": "packed",
-      "git_sha": "abcdef12"
-    },
-    "telemetry": {
-      "path": "fixture/telemetry.sqlite3",
-      "ok": true,
-      "error": null
+ "branch_target": {
+  "branch_reference": null,
+  "input_text": "SALET",
+  "kind": "word",
+  "steps": [],
+  "trailing_word": "salet"
+ },
+ "data": {
+  "branch_row_offset": 0,
+  "matched_branch_count": 1240,
+  "matched_open_branch_count": 1203,
+  "matched_opener_count": 1,
+  "matched_rows": 4,
+  "opener_offset": 0,
+  "rows": [
+   {
+    "branch_effective_priority": 5,
+    "branch_key_hex": "02",
+    "branch_reference": "222222222222",
+    "branch_status": "evaluating",
+    "branch_worker_status": "active",
+    "is_shared": true,
+    "opener": "salet",
+    "opener_is_answer": false,
+    "opener_state": "queued",
+    "opener_work_id": 1,
+    "owner_count": 2,
+    "parent_branch_reference": null,
+    "requested_priority": 5,
+    "resolved_at": null,
+    "root_pattern": "-y---",
+    "worker_count": 2
+   },
+   {
+    "branch_effective_priority": 5,
+    "branch_key_hex": "03",
+    "branch_reference": "333333333333",
+    "branch_status": "finalizing",
+    "branch_worker_status": "active",
+    "is_shared": false,
+    "opener": "salet",
+    "opener_is_answer": false,
+    "opener_state": "queued",
+    "opener_work_id": 1,
+    "owner_count": 1,
+    "parent_branch_reference": "222222222222",
+    "requested_priority": 5,
+    "resolved_at": null,
+    "root_pattern": "--g--",
+    "worker_count": 1
+   },
+   {
+    "branch_effective_priority": 5,
+    "branch_key_hex": "02",
+    "branch_reference": "222222222222",
+    "branch_status": "evaluating",
+    "branch_worker_status": "active",
+    "is_shared": true,
+    "opener": "raise",
+    "opener_is_answer": true,
+    "opener_state": "queued",
+    "opener_work_id": 2,
+    "owner_count": 2,
+    "parent_branch_reference": "111111111111",
+    "requested_priority": 3,
+    "resolved_at": null,
+    "root_pattern": "-----",
+    "worker_count": 2
+   },
+   {
+    "branch_effective_priority": 3,
+    "branch_key_hex": "04",
+    "branch_reference": "444444444444",
+    "branch_status": "queued",
+    "branch_worker_status": null,
+    "is_shared": false,
+    "opener": "raise",
+    "opener_is_answer": true,
+    "opener_state": "queued",
+    "opener_work_id": 2,
+    "owner_count": 1,
+    "parent_branch_reference": null,
+    "requested_priority": 3,
+    "resolved_at": null,
+    "root_pattern": "-----",
+    "worker_count": 0
+   }
+  ],
+  "shared_branch_count": 1,
+  "summary": [
+   {
+    "branch_count": 1240,
+    "completed_at": null,
+    "direct_branch_count": 12,
+    "direct_done_branch_count": 3,
+    "done_branch_count": 37,
+    "elapsed_millis": 120000,
+    "erd_summary": {
+     "erd": null,
+     "infeasible_group_count": 0,
+     "max_remaining_depth": null,
+     "resolved_group_count": 96,
+     "response_group_count": 148,
+     "state": "pending"
     },
-    "cache": {
-      "path": "fixture/cache.sqlite3",
-      "ok": true,
-      "error": null
-    }
+    "open_branch_count": 1203,
+    "opener": "salet",
+    "opener_is_answer": false,
+    "request_count": 2,
+    "requested_at": 400,
+    "requested_priority": 5,
+    "started_at": null,
+    "state": "queued",
+    "worker_count": 3,
+    "worker_millis": 240000
+   }
+  ],
+  "total_opener_count": 1
+ },
+ "filters": {},
+ "generated_at": 1000,
+ "report_kind": "openers",
+ "schema_version": 4,
+ "sources": {
+  "cache": {
+   "error": null,
+   "ok": true,
+   "path": "fixture/cache.sqlite3"
+  },
+  "queue": {
+   "epoch": 4,
+   "error": null,
+   "git_sha": "abcdef12",
+   "label": "packed",
+   "ok": true,
+   "path": "fixture/queue.sqlite3"
   },
-  "data": {
-    "summary": [
-      {
-        "opener": "salet",
-        "opener_is_answer": false,
-        "requested_priority": 5,
-        "requested_at": 400,
-        "started_at": null,
-        "completed_at": null,
-        "request_count": 2,
-        "state": "queued",
-        "branch_count": 1240,
-        "open_branch_count": 1203,
-        "done_branch_count": 37,
-        "worker_count": 3,
-        "direct_branch_count": 12,
-        "direct_done_branch_count": 3,
-        "elapsed_millis": 120000,
-        "worker_millis": 240000,
-        "erd_summary": {
-          "state": "pending",
-          "erd": null,
-          "max_remaining_depth": null,
-          "response_group_count": 148,
-          "resolved_group_count": 96,
-          "infeasible_group_count": 0
-        }
-      }
-    ],
-    "total_opener_count": 1,
-    "matched_opener_count": 1,
-    "matched_branch_count": 1240,
-    "matched_open_branch_count": 1203,
-    "opener_offset": 0,
-    "matched_rows": 4,
-    "shared_branch_count": 1,
-    "branch_row_offset": 0,
-    "rows": [
-      {
-        "opener_work_id": 1,
-        "opener": "salet",
-        "opener_is_answer": false,
-        "requested_priority": 5,
-        "opener_state": "queued",
-        "branch_reference": "222222222222",
-        "branch_key_hex": "02",
-        "root_pattern": "-y---",
-        "parent_branch_reference": null,
-        "branch_status": "evaluating",
-        "branch_worker_status": "active",
-        "branch_effective_priority": 5,
-        "worker_count": 2,
-        "owner_count": 2,
-        "is_shared": true,
-        "resolved_at": null
-      },
-      {
-        "opener_work_id": 1,
-        "opener": "salet",
-        "opener_is_answer": false,
-        "requested_priority": 5,
-        "opener_state": "queued",
-        "branch_reference": "333333333333",
-        "branch_key_hex": "03",
-        "root_pattern": "--g--",
-        "parent_branch_reference": "222222222222",
-        "branch_status": "finalizing",
-        "branch_worker_status": "active",
-        "branch_effective_priority": 5,
-        "worker_count": 1,
-        "owner_count": 1,
-        "is_shared": false,
-        "resolved_at": null
-      },
-      {
-        "opener_work_id": 2,
-        "opener": "raise",
-        "opener_is_answer": true,
-        "requested_priority": 3,
-        "opener_state": "queued",
-        "branch_reference": "222222222222",
-        "branch_key_hex": "02",
-        "root_pattern": "-----",
-        "parent_branch_reference": "111111111111",
-        "branch_status": "evaluating",
-        "branch_worker_status": "active",
-        "branch_effective_priority": 5,
-        "worker_count": 2,
-        "owner_count": 2,
-        "is_shared": true,
-        "resolved_at": null
-      },
-      {
-        "opener_work_id": 2,
-        "opener": "raise",
-        "opener_is_answer": true,
-        "requested_priority": 3,
-        "opener_state": "queued",
-        "branch_reference": "444444444444",
-        "branch_key_hex": "04",
-        "root_pattern": "-----",
-        "parent_branch_reference": null,
-        "branch_status": "queued",
-        "branch_worker_status": null,
-        "branch_effective_priority": 3,
-        "worker_count": 0,
-        "owner_count": 1,
-        "is_shared": false,
-        "resolved_at": null
-      }
-    ]
+  "telemetry": {
+   "error": null,
+   "ok": true,
+   "path": "fixture/telemetry.sqlite3"
   }
-}
+ },
+ "tree": false
+}
\ No newline at end of file
diff --git a/tests/fixtures/reports/openers.json b/tests/fixtures/reports/openers.json
index be603e7a..7d3906f6 100644
--- a/tests/fixtures/reports/openers.json
+++ b/tests/fixtures/reports/openers.json
@@ -1,226 +1,226 @@
 {
-  "schema_version": 3,
-  "report_kind": "openers",
-  "generated_at": 1000,
-  "branch_target": {
-    "kind": "root",
-    "steps": [],
-    "trailing_word": null,
-    "branch_reference": null,
-    "input_text": ""
-  },
-  "filters": {},
-  "tree": false,
-  "sources": {
-    "queue": {
-      "path": "fixture/queue.sqlite3",
-      "ok": true,
-      "error": null,
-      "epoch": 4,
-      "label": "packed",
-      "git_sha": "abcdef12"
+ "branch_target": {
+  "branch_reference": null,
+  "input_text": "",
+  "kind": "root",
+  "steps": [],
+  "trailing_word": null
+ },
+ "data": {
+  "branch_row_offset": 0,
+  "matched_branch_count": 1376,
+  "matched_open_branch_count": 1211,
+  "matched_opener_count": 3,
+  "matched_rows": 0,
+  "opener_offset": 0,
+  "rows": [],
+  "shared_branch_count": 0,
+  "summary": [
+   {
+    "branch_count": 1240,
+    "completed_at": null,
+    "direct_branch_count": 12,
+    "direct_done_branch_count": 3,
+    "done_branch_count": 37,
+    "elapsed_millis": 120000,
+    "erd_summary": {
+     "erd": null,
+     "infeasible_group_count": 0,
+     "max_remaining_depth": null,
+     "resolved_group_count": 96,
+     "response_group_count": 148,
+     "state": "pending"
     },
-    "telemetry": {
-      "path": "fixture/telemetry.sqlite3",
-      "ok": true,
-      "error": null
+    "open_branch_count": 1203,
+    "opener": "salet",
+    "opener_is_answer": false,
+    "request_count": 2,
+    "requested_at": 400,
+    "requested_priority": 5,
+    "started_at": null,
+    "state": "queued",
+    "worker_count": 3,
+    "worker_millis": 240000
+   },
+   {
+    "branch_count": 96,
+    "completed_at": null,
+    "direct_branch_count": 4,
+    "direct_done_branch_count": 4,
+    "done_branch_count": 88,
+    "elapsed_millis": 180000,
+    "erd_summary": {
+     "erd": 3.4207,
+     "infeasible_group_count": 0,
+     "max_remaining_depth": 5,
+     "resolved_group_count": 132,
+     "response_group_count": 132,
+     "state": "complete"
     },
-    "cache": {
-      "path": "fixture/cache.sqlite3",
-      "ok": true,
-      "error": null
-    }
-  },
-  "data": {
-    "summary": [
-      {
-        "opener": "salet",
-        "opener_is_answer": false,
-        "requested_priority": 5,
-        "requested_at": 400,
-        "started_at": null,
-        "completed_at": null,
-        "request_count": 2,
-        "state": "queued",
-        "branch_count": 1240,
-        "open_branch_count": 1203,
-        "done_branch_count": 37,
-        "worker_count": 3,
-        "direct_branch_count": 12,
-        "direct_done_branch_count": 3,
-        "elapsed_millis": 120000,
-        "worker_millis": 240000,
-        "erd_summary": {
-          "state": "pending",
-          "erd": null,
-          "max_remaining_depth": null,
-          "response_group_count": 148,
-          "resolved_group_count": 96,
-          "infeasible_group_count": 0
-        }
+    "open_branch_count": 8,
+    "opener": "raise",
+    "opener_is_answer": true,
+    "request_count": 1,
+    "requested_at": 200,
+    "requested_priority": 3,
+    "started_at": null,
+    "state": "queued",
+    "worker_count": 1,
+    "worker_millis": 360000
+   },
+   {
+    "branch_count": 40,
+    "completed_at": 490,
+    "direct_branch_count": 2,
+    "direct_done_branch_count": 2,
+    "done_branch_count": 40,
+    "elapsed_millis": 480000,
+    "erd_summary": {
+     "erd": 3.3891,
+     "infeasible_group_count": 0,
+     "max_remaining_depth": 4,
+     "resolved_group_count": 141,
+     "response_group_count": 141,
+     "state": "complete"
+    },
+    "open_branch_count": 0,
+    "opener": "crane",
+    "opener_is_answer": true,
+    "request_count": 1,
+    "requested_at": 100,
+    "requested_priority": 1,
+    "started_at": null,
+    "state": "complete",
+    "worker_count": 0,
+    "worker_millis": 600000
+   }
+  ],
+  "summary_groups": [
+   {
+    "label": "queued",
+    "rollup": {
+     "branch_count": 1336,
+     "done_branch_count": 125,
+     "open_branch_count": 1211,
+     "opener_count": 2,
+     "worker_count": 4
+    },
+    "rows": [
+     {
+      "branch_count": 1240,
+      "completed_at": null,
+      "direct_branch_count": 12,
+      "direct_done_branch_count": 3,
+      "done_branch_count": 37,
+      "elapsed_millis": 120000,
+      "erd_summary": {
+       "erd": null,
+       "infeasible_group_count": 0,
+       "max_remaining_depth": null,
+       "resolved_group_count": 96,
+       "response_group_count": 148,
+       "state": "pending"
       },
-      {
-        "opener": "raise",
-        "opener_is_answer": true,
-        "requested_priority": 3,
-        "requested_at": 200,
-        "started_at": null,
-        "completed_at": null,
-        "request_count": 1,
-        "state": "queued",
-        "branch_count": 96,
-        "open_branch_count": 8,
-        "done_branch_count": 88,
-        "worker_count": 1,
-        "direct_branch_count": 4,
-        "direct_done_branch_count": 4,
-        "elapsed_millis": 180000,
-        "worker_millis": 360000,
-        "erd_summary": {
-          "state": "complete",
-          "erd": 3.4207,
-          "max_remaining_depth": 5,
-          "response_group_count": 132,
-          "resolved_group_count": 132,
-          "infeasible_group_count": 0
-        }
+      "open_branch_count": 1203,
+      "opener": "salet",
+      "opener_is_answer": false,
+      "request_count": 2,
+      "requested_at": 400,
+      "requested_priority": 5,
+      "state": "queued",
+      "worker_count": 3,
+      "worker_millis": 240000
+     },
+     {
+      "branch_count": 96,
+      "completed_at": null,
+      "direct_branch_count": 4,
+      "direct_done_branch_count": 4,
+      "done_branch_count": 88,
+      "elapsed_millis": 180000,
+      "erd_summary": {
+       "erd": 3.4207,
+       "infeasible_group_count": 0,
+       "max_remaining_depth": 5,
+       "resolved_group_count": 132,
+       "response_group_count": 132,
+       "state": "complete"
       },
-      {
-        "opener": "crane",
-        "opener_is_answer": true,
-        "requested_priority": 1,
-        "requested_at": 100,
-        "started_at": null,
-        "request_count": 1,
-        "state": "complete",
-        "completed_at": 490,
-        "branch_count": 40,
-        "open_branch_count": 0,
-        "done_branch_count": 40,
-        "worker_count": 0,
-        "direct_branch_count": 2,
-        "direct_done_branch_count": 2,
-        "elapsed_millis": 480000,
-        "worker_millis": 600000,
-        "erd_summary": {
-          "state": "complete",
-          "erd": 3.3891,
-          "max_remaining_depth": 4,
-          "response_group_count": 141,
-          "resolved_group_count": 141,
-          "infeasible_group_count": 0
-        }
-      }
-    ],
-    "summary_groups": [
-      {
-        "label": "queued",
-        "rows": [
-          {
-            "opener": "salet",
-            "opener_is_answer": false,
-            "requested_priority": 5,
-            "requested_at": 400,
-            "completed_at": null,
-            "request_count": 2,
-            "state": "queued",
-            "branch_count": 1240,
-            "open_branch_count": 1203,
-            "done_branch_count": 37,
-            "worker_count": 3,
-            "direct_branch_count": 12,
-            "direct_done_branch_count": 3,
-            "elapsed_millis": 120000,
-            "worker_millis": 240000,
-            "erd_summary": {
-              "state": "pending",
-              "erd": null,
-              "max_remaining_depth": null,
-              "response_group_count": 148,
-              "resolved_group_count": 96,
-              "infeasible_group_count": 0
-            }
-          },
-          {
-            "opener": "raise",
-            "opener_is_answer": true,
-            "requested_priority": 3,
-            "requested_at": 200,
-            "completed_at": null,
-            "request_count": 1,
-            "state": "queued",
-            "branch_count": 96,
-            "open_branch_count": 8,
-            "done_branch_count": 88,
-            "worker_count": 1,
-            "direct_branch_count": 4,
-            "direct_done_branch_count": 4,
-            "elapsed_millis": 180000,
-            "worker_millis": 360000,
-            "erd_summary": {
-              "state": "complete",
-              "erd": 3.4207,
-              "max_remaining_depth": 5,
-              "response_group_count": 132,
-              "resolved_group_count": 132,
-              "infeasible_group_count": 0
-            }
-          }
-        ],
-        "rollup": {
-          "opener_count": 2,
-          "branch_count": 1336,
-          "open_branch_count": 1211,
-          "done_branch_count": 125,
-          "worker_count": 4
-        }
+      "open_branch_count": 8,
+      "opener": "raise",
+      "opener_is_answer": true,
+      "request_count": 1,
+      "requested_at": 200,
+      "requested_priority": 3,
+      "state": "queued",
+      "worker_count": 1,
+      "worker_millis": 360000
+     }
+    ]
+   },
+   {
+    "label": "complete",
+    "rollup": {
+     "branch_count": 40,
+     "done_branch_count": 40,
+     "open_branch_count": 0,
+     "opener_count": 1,
+     "worker_count": 0
+    },
+    "rows": [
+     {
+      "branch_count": 40,
+      "completed_at": 490,
+      "direct_branch_count": 2,
+      "direct_done_branch_count": 2,
+      "done_branch_count": 40,
+      "elapsed_millis": 480000,
+      "erd_summary": {
+       "erd": 3.3891,
+       "infeasible_group_count": 0,
+       "max_remaining_depth": 4,
+       "resolved_group_count": 141,
+       "response_group_count": 141,
+       "state": "complete"
       },
-      {
-        "label": "complete",
-        "rows": [
-          {
-            "opener": "crane",
-            "opener_is_answer": true,
-            "requested_priority": 1,
-            "requested_at": 100,
-            "request_count": 1,
-            "state": "complete",
-            "completed_at": 490,
-            "branch_count": 40,
-            "open_branch_count": 0,
-            "done_branch_count": 40,
-            "worker_count": 0,
-            "direct_branch_count": 2,
-            "direct_done_branch_count": 2,
-            "elapsed_millis": 480000,
-            "worker_millis": 600000,
-            "erd_summary": {
-              "state": "complete",
-              "erd": 3.3891,
-              "max_remaining_depth": 4,
-              "response_group_count": 141,
-              "resolved_group_count": 141,
-              "infeasible_group_count": 0
-            }
-          }
-        ],
-        "rollup": {
-          "opener_count": 1,
-          "branch_count": 40,
-          "open_branch_count": 0,
-          "done_branch_count": 40,
-          "worker_count": 0
-        }
-      }
-    ],
-    "total_opener_count": 3,
-    "matched_opener_count": 3,
-    "matched_branch_count": 1376,
-    "matched_open_branch_count": 1211,
-    "opener_offset": 0,
-    "matched_rows": 0,
-    "shared_branch_count": 0,
-    "branch_row_offset": 0,
-    "rows": []
+      "open_branch_count": 0,
+      "opener": "crane",
+      "opener_is_answer": true,
+      "request_count": 1,
+      "requested_at": 100,
+      "requested_priority": 1,
+      "state": "complete",
+      "worker_count": 0,
+      "worker_millis": 600000
+     }
+    ]
+   }
+  ],
+  "total_opener_count": 3
+ },
+ "filters": {},
+ "generated_at": 1000,
+ "report_kind": "openers",
+ "schema_version": 4,
+ "sources": {
+  "cache": {
+   "error": null,
+   "ok": true,
+   "path": "fixture/cache.sqlite3"
+  },
+  "queue": {
+   "epoch": 4,
+   "error": null,
+   "git_sha": "abcdef12",
+   "label": "packed",
+   "ok": true,
+   "path": "fixture/queue.sqlite3"
+  },
+  "telemetry": {
+   "error": null,
+   "ok": true,
+   "path": "fixture/telemetry.sqlite3"
   }
-}
+ },
+ "tree": false
+}
\ No newline at end of file
diff --git a/tests/fixtures/reports/overview.json b/tests/fixtures/reports/overview.json
index b602902a..64ea669c 100644
--- a/tests/fixtures/reports/overview.json
+++ b/tests/fixtures/reports/overview.json
@@ -1,31 +1,343 @@
 {
-  "schema_version": 3,
-  "report_kind": "overview",
-  "generated_at": 1000,
-  "branch_target": null,
-  "filters": {"branch_statuses": [], "branch_worker_statuses": ["active"]},
-  "tree": false,
-  "sources": {
-    "queue": {"path": "fixture/queue.sqlite3", "ok": true, "error": null, "epoch": 4, "label": "packed", "git_sha": "abcdef12"},
-    "telemetry": {"path": "fixture/telemetry.sqlite3", "ok": true, "error": null},
-    "cache": {"path": "fixture/cache.sqlite3", "ok": true, "error": null}
-  },
-  "data": {
-    "disk": {"total_bytes": 429496729600, "used_bytes": 53687091200, "available_bytes": 375809638400, "used_fraction": 0.125, "queue_wal_bytes": 1073741824, "fill_rate_bytes_per_second": 31457280, "warning_fraction": 0.8, "stop_fraction": 0.9},
-    "queue_counts": {"pending_branch_count": 3, "evaluating_user_branch_count": 1, "evaluating_cooperative_branch_count": 1, "finalizing_branch_count": 1, "done_branch_count": 8},
-    "cache_summary": {"exact_branch_count": 20, "recent_exact_branch_count": 2, "loss_branch_count": 1},
-    "worker_totals": {"cache_hit_count": 80, "cache_miss_count": 20, "solved_evaluation_count": 40, "erd_cutoff_evaluation_count": 10, "remaining_depth_pruned_evaluation_count": 5},
-    "branches": [
-      {"branch_reference": "111111111111", "branch_key_hex": "01", "branch_status": "evaluating", "branch_worker_status": "active", "raw_status": "in_progress", "answer_count": 33, "candidate_count": 100, "completed_candidate_count": 25, "bulk_completed_candidate_count": 5, "one_level_erd_pruned_candidate_count": 4, "two_level_erd_pruned_candidate_count": 1, "priority": 10, "is_cooperative": false, "opener": "raise", "opener_pattern": "-----", "best_guess": "crane", "best_guess_is_answer": true, "best_erd": 2.25, "best_max_remaining_depth": 3, "budget": 5, "guess_depth": 1, "spine": [{"word": "raise", "pattern": "-----", "word_is_answer": false}], "completed_candidate_indexes": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 20, 22, 24, 26, 28, 40, 45, 50, 55, 60], "worker_count": 1, "created_at": 900, "search_node_count": 12000, "ceiling": null},
-      {"branch_reference": "222222222222", "branch_key_hex": "02", "branch_status": "evaluating", "branch_worker_status": "active", "raw_status": "open", "answer_count": 8, "candidate_count": 50, "completed_candidate_count": 20, "bulk_completed_candidate_count": 0, "one_level_erd_pruned_candidate_count": 0, "two_level_erd_pruned_candidate_count": 0, "priority": 1000000, "is_cooperative": true, "opener": "alibi", "opener_pattern": "y----", "best_guess": "cigar", "best_guess_is_answer": true, "best_erd": 1.75, "best_max_remaining_depth": 2, "budget": 4, "guess_depth": 2, "spine": [{"word": "raise", "pattern": "-----", "word_is_answer": false}, {"word": "alibi", "pattern": "y----", "word_is_answer": true}], "completed_candidate_indexes": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19], "worker_count": 1, "created_at": 920, "search_node_count": 8000, "ceiling": 2.0},
-      {"branch_reference": "333333333333", "branch_key_hex": "03", "branch_status": "finalizing", "branch_worker_status": "active", "raw_status": "finalized", "answer_count": 4, "candidate_count": 20, "completed_candidate_count": 20, "bulk_completed_candidate_count": 0, "one_level_erd_pruned_candidate_count": 0, "two_level_erd_pruned_candidate_count": 0, "priority": 0, "is_cooperative": true, "opener": "crane", "opener_pattern": "yy---", "best_guess": "cigar", "best_guess_is_answer": true, "best_erd": 1.5, "best_max_remaining_depth": 2, "budget": 3, "guess_depth": 3, "spine": [{"word": "raise", "pattern": "-----", "word_is_answer": false}, {"word": "alibi", "pattern": "y----", "word_is_answer": true}, {"word": "crane", "pattern": "yy---", "word_is_answer": false}], "completed_candidate_indexes": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19], "worker_count": 1, "created_at": 930, "search_node_count": 5000, "ceiling": null}
+ "branch_target": null,
+ "data": {
+  "branches": [
+   {
+    "answer_count": 33,
+    "best_erd": 2.25,
+    "best_guess": "crane",
+    "best_guess_is_answer": true,
+    "best_max_remaining_depth": 3,
+    "branch_key_hex": "01",
+    "branch_reference": "111111111111",
+    "branch_status": "evaluating",
+    "branch_worker_status": "active",
+    "budget": 5,
+    "bulk_completed_candidate_count": 5,
+    "candidate_count": 100,
+    "ceiling": null,
+    "completed_candidate_bitmap": "/39QFQAhhBAAAAAAAA==",
+    "completed_candidate_count": 25,
+    "created_at": 900,
+    "guess_depth": 1,
+    "is_cooperative": false,
+    "one_level_erd_pruned_candidate_count": 4,
+    "opener": "raise",
+    "opener_pattern": "-----",
+    "priority": 10,
+    "raw_status": "in_progress",
+    "search_node_count": 12000,
+    "spine": [
+     {
+      "pattern": "-----",
+      "word": "raise",
+      "word_is_answer": false
+     }
+    ],
+    "two_level_erd_pruned_candidate_count": 1,
+    "worker_count": 1
+   },
+   {
+    "answer_count": 8,
+    "best_erd": 1.75,
+    "best_guess": "cigar",
+    "best_guess_is_answer": true,
+    "best_max_remaining_depth": 2,
+    "branch_key_hex": "02",
+    "branch_reference": "222222222222",
+    "branch_status": "evaluating",
+    "branch_worker_status": "active",
+    "budget": 4,
+    "bulk_completed_candidate_count": 0,
+    "candidate_count": 50,
+    "ceiling": 2.0,
+    "completed_candidate_bitmap": "//8PAAAAAA==",
+    "completed_candidate_count": 20,
+    "created_at": 920,
+    "guess_depth": 2,
+    "is_cooperative": true,
+    "one_level_erd_pruned_candidate_count": 0,
+    "opener": "alibi",
+    "opener_pattern": "y----",
+    "priority": 1000000,
+    "raw_status": "open",
+    "search_node_count": 8000,
+    "spine": [
+     {
+      "pattern": "-----",
+      "word": "raise",
+      "word_is_answer": false
+     },
+     {
+      "pattern": "y----",
+      "word": "alibi",
+      "word_is_answer": true
+     }
+    ],
+    "two_level_erd_pruned_candidate_count": 0,
+    "worker_count": 1
+   },
+   {
+    "answer_count": 4,
+    "best_erd": 1.5,
+    "best_guess": "cigar",
+    "best_guess_is_answer": true,
+    "best_max_remaining_depth": 2,
+    "branch_key_hex": "03",
+    "branch_reference": "333333333333",
+    "branch_status": "finalizing",
+    "branch_worker_status": "active",
+    "budget": 3,
+    "bulk_completed_candidate_count": 0,
+    "candidate_count": 20,
+    "ceiling": null,
+    "completed_candidate_bitmap": "//8P",
+    "completed_candidate_count": 20,
+    "created_at": 930,
+    "guess_depth": 3,
+    "is_cooperative": true,
+    "one_level_erd_pruned_candidate_count": 0,
+    "opener": "crane",
+    "opener_pattern": "yy---",
+    "priority": 0,
+    "raw_status": "finalized",
+    "search_node_count": 5000,
+    "spine": [
+     {
+      "pattern": "-----",
+      "word": "raise",
+      "word_is_answer": false
+     },
+     {
+      "pattern": "y----",
+      "word": "alibi",
+      "word_is_answer": true
+     },
+     {
+      "pattern": "yy---",
+      "word": "crane",
+      "word_is_answer": false
+     }
     ],
-    "workers": [
-      {"worker_id": "worker-0", "worker_number": "0", "pid": 100, "updated_at": 998, "is_live": true, "branch_reference": "111111111111", "branch_key_hex": "01", "candidate_index": 7, "claim_started_at": 990, "completed_claim_count": 12, "current_candidate": "nurdy", "current_candidate_is_answer": false, "current_max_guess_depth": 4, "current_node_count": 900, "nodes_per_second": 45.5, "descent": [], "cache_hit_count": 50, "cache_miss_count": 10, "solved_evaluation_count": 20, "erd_cutoff_evaluation_count": 5, "remaining_depth_pruned_evaluation_count": 2, "best_guess": "crane", "best_erd": 2.25, "bound_erd": 2.5, "on_active_branch": true, "opener_work_id": 1, "scheduling_role": "preferred", "scheduling_role_reason": "serving its preferred opener work", "state": "working"},
-      {"worker_id": "worker-1", "worker_number": "1", "pid": 101, "updated_at": 998, "is_live": true, "branch_reference": null, "branch_key_hex": null, "candidate_index": null, "claim_started_at": null, "completed_claim_count": 10, "current_candidate": null, "current_candidate_is_answer": false, "current_max_guess_depth": null, "current_node_count": null, "nodes_per_second": null, "descent": [], "cache_hit_count": 20, "cache_miss_count": 5, "solved_evaluation_count": 10, "erd_cutoff_evaluation_count": 2, "remaining_depth_pruned_evaluation_count": 1, "best_guess": null, "best_erd": null, "bound_erd": null, "on_active_branch": false, "opener_work_id": null, "scheduling_role": null, "scheduling_role_reason": "unattributed", "state": "idle"},
-      {"worker_id": "worker-2", "worker_number": "2", "pid": 102, "updated_at": 997, "is_live": true, "branch_reference": "333333333333", "branch_key_hex": "03", "candidate_index": 19, "claim_started_at": 980, "completed_claim_count": 20, "current_candidate": "cigar", "current_candidate_is_answer": true, "current_max_guess_depth": 5, "current_node_count": 1200, "nodes_per_second": 30.0, "descent": [], "cache_hit_count": 10, "cache_miss_count": 5, "solved_evaluation_count": 10, "erd_cutoff_evaluation_count": 3, "remaining_depth_pruned_evaluation_count": 2, "best_guess": "cigar", "best_erd": 1.5, "bound_erd": null, "on_active_branch": true, "opener_work_id": null, "scheduling_role": "direct", "scheduling_role_reason": "direct branch work with no live opener-work ownership", "state": "finalizing"},
-      {"worker_id": "worker-3", "worker_number": "3", "pid": 103, "updated_at": 975, "is_live": true, "branch_reference": "222222222222", "branch_key_hex": "02", "candidate_index": 3, "claim_started_at": 950, "completed_claim_count": 4, "current_candidate": "blush", "current_candidate_is_answer": true, "current_max_guess_depth": 4, "current_node_count": 300, "nodes_per_second": 0.0, "descent": [], "cache_hit_count": 0, "cache_miss_count": 0, "solved_evaluation_count": 0, "erd_cutoff_evaluation_count": 0, "remaining_depth_pruned_evaluation_count": 0, "best_guess": null, "best_erd": null, "bound_erd": 2.0, "on_active_branch": true, "opener_work_id": 2, "scheduling_role": "fallback", "scheduling_role_reason": "serving fallback work: preferred opener(s) had no claimable bundle at the last claim boundary", "state": "stale"},
-      {"worker_id": "worker-4", "worker_number": "4", "pid": 104, "updated_at": 800, "is_live": false, "branch_reference": null, "branch_key_hex": null, "candidate_index": null, "claim_started_at": null, "completed_claim_count": 0, "current_candidate": null, "current_candidate_is_answer": false, "current_max_guess_depth": null, "current_node_count": null, "nodes_per_second": null, "descent": [], "cache_hit_count": 0, "cache_miss_count": 0, "solved_evaluation_count": 0, "erd_cutoff_evaluation_count": 0, "remaining_depth_pruned_evaluation_count": 0, "best_guess": null, "best_erd": null, "bound_erd": null, "on_active_branch": false, "opener_work_id": null, "scheduling_role": null, "scheduling_role_reason": "unattributed", "state": "dead"}
-    ]
+    "two_level_erd_pruned_candidate_count": 0,
+    "worker_count": 1
+   }
+  ],
+  "cache_summary": {
+   "exact_branch_count": 20,
+   "loss_branch_count": 1,
+   "recent_exact_branch_count": 2
+  },
+  "disk": {
+   "available_bytes": 375809638400,
+   "fill_rate_bytes_per_second": 31457280,
+   "queue_wal_bytes": 1073741824,
+   "stop_fraction": 0.9,
+   "total_bytes": 429496729600,
+   "used_bytes": 53687091200,
+   "used_fraction": 0.125,
+   "warning_fraction": 0.8
+  },
+  "queue_counts": {
+   "done_branch_count": 8,
+   "evaluating_cooperative_branch_count": 1,
+   "evaluating_user_branch_count": 1,
+   "finalizing_branch_count": 1,
+   "pending_branch_count": 3
+  },
+  "worker_totals": {
+   "cache_hit_count": 80,
+   "cache_miss_count": 20,
+   "erd_cutoff_evaluation_count": 10,
+   "remaining_depth_pruned_evaluation_count": 5,
+   "solved_evaluation_count": 40
+  },
+  "workers": [
+   {
+    "best_erd": 2.25,
+    "best_guess": "crane",
+    "bound_erd": 2.5,
+    "branch_key_hex": "01",
+    "branch_reference": "111111111111",
+    "cache_hit_count": 50,
+    "cache_miss_count": 10,
+    "candidate_index": 7,
+    "claim_started_at": 990,
+    "completed_claim_count": 12,
+    "current_candidate": "nurdy",
+    "current_candidate_is_answer": false,
+    "current_max_guess_depth": 4,
+    "current_node_count": 900,
+    "descent": [],
+    "erd_cutoff_evaluation_count": 5,
+    "is_live": true,
+    "nodes_per_second": 45.5,
+    "on_active_branch": true,
+    "opener_work_id": 1,
+    "pid": 100,
+    "remaining_depth_pruned_evaluation_count": 2,
+    "scheduling_role": "preferred",
+    "scheduling_role_reason": "serving its preferred opener work",
+    "solved_evaluation_count": 20,
+    "state": "working",
+    "updated_at": 998,
+    "worker_id": "worker-0",
+    "worker_number": "0"
+   },
+   {
+    "best_erd": null,
+    "best_guess": null,
+    "bound_erd": null,
+    "branch_key_hex": null,
+    "branch_reference": null,
+    "cache_hit_count": 20,
+    "cache_miss_count": 5,
+    "candidate_index": null,
+    "claim_started_at": null,
+    "completed_claim_count": 10,
+    "current_candidate": null,
+    "current_candidate_is_answer": false,
+    "current_max_guess_depth": null,
+    "current_node_count": null,
+    "descent": [],
+    "erd_cutoff_evaluation_count": 2,
+    "is_live": true,
+    "nodes_per_second": null,
+    "on_active_branch": false,
+    "opener_work_id": null,
+    "pid": 101,
+    "remaining_depth_pruned_evaluation_count": 1,
+    "scheduling_role": null,
+    "scheduling_role_reason": "unattributed",
+    "solved_evaluation_count": 10,
+    "state": "idle",
+    "updated_at": 998,
+    "worker_id": "worker-1",
+    "worker_number": "1"
+   },
+   {
+    "best_erd": 1.5,
+    "best_guess": "cigar",
+    "bound_erd": null,
+    "branch_key_hex": "03",
+    "branch_reference": "333333333333",
+    "cache_hit_count": 10,
+    "cache_miss_count": 5,
+    "candidate_index": 19,
+    "claim_started_at": 980,
+    "completed_claim_count": 20,
+    "current_candidate": "cigar",
+    "current_candidate_is_answer": true,
+    "current_max_guess_depth": 5,
+    "current_node_count": 1200,
+    "descent": [],
+    "erd_cutoff_evaluation_count": 3,
+    "is_live": true,
+    "nodes_per_second": 30.0,
+    "on_active_branch": true,
+    "opener_work_id": null,
+    "pid": 102,
+    "remaining_depth_pruned_evaluation_count": 2,
+    "scheduling_role": "direct",
+    "scheduling_role_reason": "direct branch work with no live opener-work ownership",
+    "solved_evaluation_count": 10,
+    "state": "finalizing",
+    "updated_at": 997,
+    "worker_id": "worker-2",
+    "worker_number": "2"
+   },
+   {
+    "best_erd": null,
+    "best_guess": null,
+    "bound_erd": 2.0,
+    "branch_key_hex": "02",
+    "branch_reference": "222222222222",
+    "cache_hit_count": 0,
+    "cache_miss_count": 0,
+    "candidate_index": 3,
+    "claim_started_at": 950,
+    "completed_claim_count": 4,
+    "current_candidate": "blush",
+    "current_candidate_is_answer": true,
+    "current_max_guess_depth": 4,
+    "current_node_count": 300,
+    "descent": [],
+    "erd_cutoff_evaluation_count": 0,
+    "is_live": true,
+    "nodes_per_second": 0.0,
+    "on_active_branch": true,
+    "opener_work_id": 2,
+    "pid": 103,
+    "remaining_depth_pruned_evaluation_count": 0,
+    "scheduling_role": "fallback",
+    "scheduling_role_reason": "serving fallback work: preferred opener(s) had no claimable bundle at the last claim boundary",
+    "solved_evaluation_count": 0,
+    "state": "stale",
+    "updated_at": 975,
+    "worker_id": "worker-3",
+    "worker_number": "3"
+   },
+   {
+    "best_erd": null,
+    "best_guess": null,
+    "bound_erd": null,
+    "branch_key_hex": null,
+    "branch_reference": null,
+    "cache_hit_count": 0,
+    "cache_miss_count": 0,
+    "candidate_index": null,
+    "claim_started_at": null,
+    "completed_claim_count": 0,
+    "current_candidate": null,
+    "current_candidate_is_answer": false,
+    "current_max_guess_depth": null,
+    "current_node_count": null,
+    "descent": [],
+    "erd_cutoff_evaluation_count": 0,
+    "is_live": false,
+    "nodes_per_second": null,
+    "on_active_branch": false,
+    "opener_work_id": null,
+    "pid": 104,
+    "remaining_depth_pruned_evaluation_count": 0,
+    "scheduling_role": null,
+    "scheduling_role_reason": "unattributed",
+    "solved_evaluation_count": 0,
+    "state": "dead",
+    "updated_at": 800,
+    "worker_id": "worker-4",
+    "worker_number": "4"
+   }
+  ]
+ },
+ "filters": {
+  "branch_statuses": [],
+  "branch_worker_statuses": [
+   "active"
+  ]
+ },
+ "generated_at": 1000,
+ "report_kind": "overview",
+ "schema_version": 4,
+ "sources": {
+  "cache": {
+   "error": null,
+   "ok": true,
+   "path": "fixture/cache.sqlite3"
+  },
+  "queue": {
+   "epoch": 4,
+   "error": null,
+   "git_sha": "abcdef12",
+   "label": "packed",
+   "ok": true,
+   "path": "fixture/queue.sqlite3"
+  },
+  "telemetry": {
+   "error": null,
+   "ok": true,
+   "path": "fixture/telemetry.sqlite3"
   }
-}
+ },
+ "tree": false
+}
\ No newline at end of file
diff --git a/tests/fixtures/reports/queue-tree.json b/tests/fixtures/reports/queue-tree.json
index 5c9fbba6..442e2852 100644
--- a/tests/fixtures/reports/queue-tree.json
+++ b/tests/fixtures/reports/queue-tree.json
@@ -1,7 +1,62 @@
 {
-  "schema_version": 3, "report_kind": "queue", "generated_at": 1000,
-  "branch_target": {"kind": "root", "steps": [], "trailing_word": null, "branch_reference": null, "input_text": ""},
-  "filters": {}, "tree": true,
-  "sources": {"queue": {"path": "fixture/queue.sqlite3", "ok": true, "error": null, "epoch": 4, "label": "packed", "git_sha": "abcdef12"}, "telemetry": {"path": "fixture/telemetry.sqlite3", "ok": true, "error": null}, "cache": {"path": "fixture/cache.sqlite3", "ok": true, "error": null}},
-  "data": {"root": {"kind": "root"}, "topology_source": "queue", "tree_available": true, "unavailable_reason": null, "nodes": [{"node_id": "raise:-----", "parent_node_id": null, "step": {"word": "raise", "pattern": "-----"}, "branch_key_hex": "02", "branch_reference": "222222222222", "branch_status": "evaluating", "branch_worker_status": "active", "answer_count": 8, "guess_depth": 1, "worker_count": 2, "completed_candidate_count": 20, "candidate_count": 50, "is_context": false}]}
-}
+ "branch_target": {
+  "branch_reference": null,
+  "input_text": "",
+  "kind": "root",
+  "steps": [],
+  "trailing_word": null
+ },
+ "data": {
+  "nodes": [
+   {
+    "answer_count": 8,
+    "branch_key_hex": "02",
+    "branch_reference": "222222222222",
+    "branch_status": "evaluating",
+    "branch_worker_status": "active",
+    "candidate_count": 50,
+    "completed_candidate_count": 20,
+    "guess_depth": 1,
+    "is_context": false,
+    "node_id": "raise:-----",
+    "parent_node_id": null,
+    "step": {
+     "pattern": "-----",
+     "word": "raise"
+    },
+    "worker_count": 2
+   }
+  ],
+  "root": {
+   "kind": "root"
+  },
+  "topology_source": "queue",
+  "tree_available": true,
+  "unavailable_reason": null
+ },
+ "filters": {},
+ "generated_at": 1000,
+ "report_kind": "queue",
+ "schema_version": 4,
+ "sources": {
+  "cache": {
+   "error": null,
+   "ok": true,
+   "path": "fixture/cache.sqlite3"
+  },
+  "queue": {
+   "epoch": 4,
+   "error": null,
+   "git_sha": "abcdef12",
+   "label": "packed",
+   "ok": true,
+   "path": "fixture/queue.sqlite3"
+  },
+  "telemetry": {
+   "error": null,
+   "ok": true,
+   "path": "fixture/telemetry.sqlite3"
+  }
+ },
+ "tree": true
+}
\ No newline at end of file
diff --git a/tests/fixtures/reports/queue.json b/tests/fixtures/reports/queue.json
index 6f703b71..1dbdc588 100644
--- a/tests/fixtures/reports/queue.json
+++ b/tests/fixtures/reports/queue.json
@@ -1,12 +1,165 @@
 {
-  "schema_version": 3, "report_kind": "queue", "generated_at": 1000,
-  "branch_target": {"kind": "root", "steps": [], "trailing_word": null, "branch_reference": null, "input_text": ""},
-  "filters": {}, "tree": false,
-  "sources": {"queue": {"path": "fixture/queue.sqlite3", "ok": true, "error": null, "epoch": 4, "label": "packed", "git_sha": "abcdef12"}, "telemetry": {"path": "fixture/telemetry.sqlite3", "ok": true, "error": null}, "cache": {"path": "fixture/cache.sqlite3", "ok": true, "error": null}},
-  "data": {"summary": {"branch_count": 4, "branch_count_by_status": {"queued": 1, "evaluating": 1, "finalizing": 1, "done": 1}, "branch_count_by_worker_status": {"waiting": 1, "active": 2, "null": 1}}, "matched_rows": 4, "rows": [
-    {"branch_key_hex": "01", "branch_reference": "111111111111", "branch_status": "queued", "branch_worker_status": null, "raw_status": "pending", "is_cooperative": false, "answer_count": 20, "priority": 3, "budget": null, "candidate_count": null, "completed_candidate_count": 0, "bulk_completed_candidate_count": 0, "one_level_erd_pruned_candidate_count": 0, "two_level_erd_pruned_candidate_count": 0, "worker_count": 0, "search_node_count": 0, "ceiling": null, "best_guess": null, "best_erd": null, "best_max_remaining_depth": null, "opener": "raise", "opener_pattern": "-----", "spine": null, "created_at": null, "updated_at": 900, "is_context": false},
-    {"branch_key_hex": "02", "branch_reference": "222222222222", "branch_status": "evaluating", "branch_worker_status": "active", "raw_status": "open", "is_cooperative": true, "answer_count": 8, "priority": 1000000, "budget": 4, "candidate_count": 50, "completed_candidate_count": 20, "bulk_completed_candidate_count": 0, "one_level_erd_pruned_candidate_count": 0, "two_level_erd_pruned_candidate_count": 0, "worker_count": 2, "search_node_count": 8000, "ceiling": null, "best_guess": "crane", "best_erd": 1.8, "best_max_remaining_depth": 2, "opener": "alibi", "opener_pattern": "y----", "spine": "RAISE ----- ALIBI y----", "created_at": 920, "updated_at": 920, "is_context": false},
-    {"branch_key_hex": "03", "branch_reference": "333333333333", "branch_status": "finalizing", "branch_worker_status": "active", "raw_status": "finalized", "is_cooperative": true, "answer_count": 4, "priority": 1000000, "budget": 3, "candidate_count": 20, "completed_candidate_count": 20, "bulk_completed_candidate_count": 0, "one_level_erd_pruned_candidate_count": 0, "two_level_erd_pruned_candidate_count": 0, "worker_count": 1, "search_node_count": 5000, "ceiling": null, "best_guess": "cigar", "best_erd": 1.5, "best_max_remaining_depth": 2, "opener": "crane", "opener_pattern": "yy---", "spine": "RAISE ----- ALIBI y---- CRANE yy---", "created_at": 930, "updated_at": 980, "is_context": false},
-    {"branch_key_hex": "04", "branch_reference": "444444444444", "branch_status": "done", "branch_worker_status": null, "raw_status": "done", "is_cooperative": false, "answer_count": 3, "priority": 0, "budget": null, "candidate_count": null, "completed_candidate_count": 0, "bulk_completed_candidate_count": 0, "one_level_erd_pruned_candidate_count": 0, "two_level_erd_pruned_candidate_count": 0, "worker_count": 0, "search_node_count": 0, "ceiling": null, "best_guess": null, "best_erd": null, "best_max_remaining_depth": null, "opener": "slate", "opener_pattern": "-y---", "spine": null, "created_at": null, "updated_at": 970, "is_context": false}
-  ]}
-}
+ "branch_target": {
+  "branch_reference": null,
+  "input_text": "",
+  "kind": "root",
+  "steps": [],
+  "trailing_word": null
+ },
+ "data": {
+  "matched_rows": 4,
+  "rows": [
+   {
+    "answer_count": 20,
+    "best_erd": null,
+    "best_guess": null,
+    "best_max_remaining_depth": null,
+    "branch_key_hex": "01",
+    "branch_reference": "111111111111",
+    "branch_status": "queued",
+    "branch_worker_status": null,
+    "budget": null,
+    "bulk_completed_candidate_count": 0,
+    "candidate_count": null,
+    "ceiling": null,
+    "completed_candidate_count": 0,
+    "created_at": null,
+    "is_context": false,
+    "is_cooperative": false,
+    "one_level_erd_pruned_candidate_count": 0,
+    "opener": "raise",
+    "opener_pattern": "-----",
+    "priority": 3,
+    "raw_status": "pending",
+    "search_node_count": 0,
+    "spine": null,
+    "two_level_erd_pruned_candidate_count": 0,
+    "updated_at": 900,
+    "worker_count": 0
+   },
+   {
+    "answer_count": 8,
+    "best_erd": 1.8,
+    "best_guess": "crane",
+    "best_max_remaining_depth": 2,
+    "branch_key_hex": "02",
+    "branch_reference": "222222222222",
+    "branch_status": "evaluating",
+    "branch_worker_status": "active",
+    "budget": 4,
+    "bulk_completed_candidate_count": 0,
+    "candidate_count": 50,
+    "ceiling": null,
+    "completed_candidate_count": 20,
+    "created_at": 920,
+    "is_context": false,
+    "is_cooperative": true,
+    "one_level_erd_pruned_candidate_count": 0,
+    "opener": "alibi",
+    "opener_pattern": "y----",
+    "priority": 1000000,
+    "raw_status": "open",
+    "search_node_count": 8000,
+    "spine": "RAISE ----- ALIBI y----",
+    "two_level_erd_pruned_candidate_count": 0,
+    "updated_at": 920,
+    "worker_count": 2
+   },
+   {
+    "answer_count": 4,
+    "best_erd": 1.5,
+    "best_guess": "cigar",
+    "best_max_remaining_depth": 2,
+    "branch_key_hex": "03",
+    "branch_reference": "333333333333",
+    "branch_status": "finalizing",
+    "branch_worker_status": "active",
+    "budget": 3,
+    "bulk_completed_candidate_count": 0,
+    "candidate_count": 20,
+    "ceiling": null,
+    "completed_candidate_count": 20,
+    "created_at": 930,
+    "is_context": false,
+    "is_cooperative": true,
+    "one_level_erd_pruned_candidate_count": 0,
+    "opener": "crane",
+    "opener_pattern": "yy---",
+    "priority": 1000000,
+    "raw_status": "finalized",
+    "search_node_count": 5000,
+    "spine": "RAISE ----- ALIBI y---- CRANE yy---",
+    "two_level_erd_pruned_candidate_count": 0,
+    "updated_at": 980,
+    "worker_count": 1
+   },
+   {
+    "answer_count": 3,
+    "best_erd": null,
+    "best_guess": null,
+    "best_max_remaining_depth": null,
+    "branch_key_hex": "04",
+    "branch_reference": "444444444444",
+    "branch_status": "done",
+    "branch_worker_status": null,
+    "budget": null,
+    "bulk_completed_candidate_count": 0,
+    "candidate_count": null,
+    "ceiling": null,
+    "completed_candidate_count": 0,
+    "created_at": null,
+    "is_context": false,
+    "is_cooperative": false,
+    "one_level_erd_pruned_candidate_count": 0,
+    "opener": "slate",
+    "opener_pattern": "-y---",
+    "priority": 0,
+    "raw_status": "done",
+    "search_node_count": 0,
+    "spine": null,
+    "two_level_erd_pruned_candidate_count": 0,
+    "updated_at": 970,
+    "worker_count": 0
+   }
+  ],
+  "summary": {
+   "branch_count": 4,
+   "branch_count_by_status": {
+    "done": 1,
+    "evaluating": 1,
+    "finalizing": 1,
+    "queued": 1
+   },
+   "branch_count_by_worker_status": {
+    "active": 2,
+    "null": 1,
+    "waiting": 1
+   }
+  }
+ },
+ "filters": {},
+ "generated_at": 1000,
+ "report_kind": "queue",
+ "schema_version": 4,
+ "sources": {
+  "cache": {
+   "error": null,
+   "ok": true,
+   "path": "fixture/cache.sqlite3"
+  },
+  "queue": {
+   "epoch": 4,
+   "error": null,
+   "git_sha": "abcdef12",
+   "label": "packed",
+   "ok": true,
+   "path": "fixture/queue.sqlite3"
+  },
+  "telemetry": {
+   "error": null,
+   "ok": true,
+   "path": "fixture/telemetry.sqlite3"
+  }
+ },
+ "tree": false
+}
\ No newline at end of file
diff --git a/tests/fixtures/reports/root_progress-inherited.json b/tests/fixtures/reports/root_progress-inherited.json
index fc4b5518..878c4f40 100644
--- a/tests/fixtures/reports/root_progress-inherited.json
+++ b/tests/fixtures/reports/root_progress-inherited.json
@@ -1162,7 +1162,7 @@
  },
  "generated_at": 1786547682,
  "report_kind": "root_progress",
- "schema_version": 3,
+ "schema_version": 4,
  "sources": {
   "cache": {
    "error": null,
@@ -1184,4 +1184,4 @@
   }
  },
  "tree": false
-}
+}
\ No newline at end of file
diff --git a/tests/fixtures/reports/root_progress.json b/tests/fixtures/reports/root_progress.json
index 91426026..6676d492 100644
--- a/tests/fixtures/reports/root_progress.json
+++ b/tests/fixtures/reports/root_progress.json
@@ -1162,7 +1162,7 @@
  },
  "generated_at": 1786547682,
  "report_kind": "root_progress",
- "schema_version": 3,
+ "schema_version": 4,
  "sources": {
   "cache": {
    "error": null,
@@ -1184,4 +1184,4 @@
   }
  },
  "tree": false
-}
+}
\ No newline at end of file
diff --git a/tests/fixtures/reports/tree.json b/tests/fixtures/reports/tree.json
index 101ba15d..11249bed 100644
--- a/tests/fixtures/reports/tree.json
+++ b/tests/fixtures/reports/tree.json
@@ -1,10 +1,90 @@
 {
-  "schema_version": 3, "report_kind": "branch", "generated_at": 1000,
-  "branch_target": {"kind": "branch", "steps": [{"word": "raise", "pattern": "-----"}], "trailing_word": null, "branch_reference": null, "input_text": "RAISE -----"},
-  "filters": {"branch_statuses": [], "branch_worker_statuses": ["active"]}, "tree": true,
-  "sources": {"queue": {"path": "fixture/queue.sqlite3", "ok": true, "error": null, "epoch": 4, "label": "packed", "git_sha": "abcdef12"}, "telemetry": {"path": "fixture/telemetry.sqlite3", "ok": true, "error": null}, "cache": {"path": "fixture/cache.sqlite3", "ok": true, "error": null}},
-  "data": {"root": {"kind": "branch"}, "topology_source": "queue", "tree_available": true, "unavailable_reason": null, "nodes": [
-    {"node_id": "raise:-----", "parent_node_id": null, "step": {"word": "raise", "pattern": "-----"}, "branch_key_hex": "01", "branch_reference": "111111111111", "branch_status": "evaluating", "branch_worker_status": "waiting", "answer_count": 8, "guess_depth": 1, "worker_count": 0, "completed_candidate_count": 0, "candidate_count": 100, "is_context": true},
-    {"node_id": "raise:-----/alibi:y----", "parent_node_id": "raise:-----", "step": {"word": "alibi", "pattern": "y----"}, "branch_key_hex": "02", "branch_reference": "222222222222", "branch_status": "evaluating", "branch_worker_status": "active", "answer_count": 3, "guess_depth": 2, "worker_count": 1, "completed_candidate_count": 8, "candidate_count": 20, "is_context": false}
-  ]}
-}
+ "branch_target": {
+  "branch_reference": null,
+  "input_text": "RAISE -----",
+  "kind": "branch",
+  "steps": [
+   {
+    "pattern": "-----",
+    "word": "raise"
+   }
+  ],
+  "trailing_word": null
+ },
+ "data": {
+  "nodes": [
+   {
+    "answer_count": 8,
+    "branch_key_hex": "01",
+    "branch_reference": "111111111111",
+    "branch_status": "evaluating",
+    "branch_worker_status": "waiting",
+    "candidate_count": 100,
+    "completed_candidate_count": 0,
+    "guess_depth": 1,
+    "is_context": true,
+    "node_id": "raise:-----",
+    "parent_node_id": null,
+    "step": {
+     "pattern": "-----",
+     "word": "raise"
+    },
+    "worker_count": 0
+   },
+   {
+    "answer_count": 3,
+    "branch_key_hex": "02",
+    "branch_reference": "222222222222",
+    "branch_status": "evaluating",
+    "branch_worker_status": "active",
+    "candidate_count": 20,
+    "completed_candidate_count": 8,
+    "guess_depth": 2,
+    "is_context": false,
+    "node_id": "raise:-----/alibi:y----",
+    "parent_node_id": "raise:-----",
+    "step": {
+     "pattern": "y----",
+     "word": "alibi"
+    },
+    "worker_count": 1
+   }
+  ],
+  "root": {
+   "kind": "branch"
+  },
+  "topology_source": "queue",
+  "tree_available": true,
+  "unavailable_reason": null
+ },
+ "filters": {
+  "branch_statuses": [],
+  "branch_worker_statuses": [
+   "active"
+  ]
+ },
+ "generated_at": 1000,
+ "report_kind": "branch",
+ "schema_version": 4,
+ "sources": {
+  "cache": {
+   "error": null,
+   "ok": true,
+   "path": "fixture/cache.sqlite3"
+  },
+  "queue": {
+   "epoch": 4,
+   "error": null,
+   "git_sha": "abcdef12",
+   "label": "packed",
+   "ok": true,
+   "path": "fixture/queue.sqlite3"
+  },
+  "telemetry": {
+   "error": null,
+   "ok": true,
+   "path": "fixture/telemetry.sqlite3"
+  }
+ },
+ "tree": true
+}
\ No newline at end of file
diff --git a/tests/fixtures/reports/word.json b/tests/fixtures/reports/word.json
index 71c9c2fc..fcf013eb 100644
--- a/tests/fixtures/reports/word.json
+++ b/tests/fixtures/reports/word.json
@@ -1,30 +1,152 @@
 {
-  "schema_version": 3,
-  "report_kind": "word",
-  "generated_at": 1000,
-  "branch_target": {"kind": "word", "steps": [], "trailing_word": "queue", "branch_reference": null, "input_text": "QUEUE"},
-  "filters": {},
-  "tree": false,
-  "sources": {"queue": {"path": "fixture/queue.sqlite3", "ok": true, "error": null, "epoch": 4, "label": "packed", "git_sha": "abcdef12"}, "telemetry": {"path": "fixture/telemetry.sqlite3", "ok": true, "error": null}, "cache": {"path": "fixture/cache.sqlite3", "ok": true, "error": null}},
-  "data": {
-    "word": "queue",
-    "word_is_answer": true,
-    "context": {"branch_reference": "000000000000", "branch_key_hex": "00", "spine": [], "guess_depth": 0, "answer_count": 20},
-    "response_group_counts": {"response_group_count": 4, "trivial_response_group_count": 1, "queued_response_group_count": 3, "active_response_group_count": 0, "exact_response_group_count": 1, "loss_response_group_count": 1, "missing_response_group_count": 1},
-    "erd_summary": {"state": "infeasible", "erd": null, "max_remaining_depth": null, "resolved_group_count": 2, "infeasible_group_count": 1, "response_group_count": 4},
-    "total_rows": 4,
-    "matched_rows": 4,
-    "response_groups": [
-      {"pattern": "-----", "answer_count": 8, "branch_reference": "111111111111", "branch_key_hex": "01", "branch_status": "done", "branch_worker_status": null, "priority": 5, "worker_count": 1, "cache_state": "exact", "best_guess": "crane", "best_guess_is_answer": true, "best_erd": 2.1, "max_remaining_depth": 3, "updated_at": 990},
-      {"pattern": "y----", "answer_count": 5, "branch_reference": "222222222222", "branch_key_hex": "02", "branch_status": "done", "branch_worker_status": null, "priority": 2, "worker_count": 0, "cache_state": "loss", "best_guess": null, "best_guess_is_answer": false, "best_erd": null, "max_remaining_depth": null, "updated_at": 980},
-      {"pattern": "-y---", "answer_count": 3, "branch_reference": "333333333333", "branch_key_hex": "03", "branch_status": "unqueued", "branch_worker_status": null, "priority": null, "worker_count": 0, "cache_state": "missing", "best_guess": null, "best_guess_is_answer": false, "best_erd": null, "max_remaining_depth": null, "updated_at": null},
-      {"pattern": "ggggg", "answer_count": 1, "branch_reference": "444444444444", "branch_key_hex": "04", "branch_status": "done", "branch_worker_status": null, "priority": null, "worker_count": 0, "cache_state": "not_applicable", "best_guess": null, "best_guess_is_answer": false, "best_erd": null, "max_remaining_depth": null, "updated_at": null}
-    ],
-    "response_group_breakdown": [
-      {"pattern": "-----", "answer_count": 8, "solved": true},
-      {"pattern": "y----", "answer_count": 5, "solved": false},
-      {"pattern": "-y---", "answer_count": 3, "solved": false},
-      {"pattern": "ggggg", "answer_count": 1, "solved": true}
-    ]
+ "branch_target": {
+  "branch_reference": null,
+  "input_text": "QUEUE",
+  "kind": "word",
+  "steps": [],
+  "trailing_word": "queue"
+ },
+ "data": {
+  "context": {
+   "answer_count": 20,
+   "branch_key_hex": "00",
+   "branch_reference": "000000000000",
+   "guess_depth": 0,
+   "spine": []
+  },
+  "erd_summary": {
+   "erd": null,
+   "infeasible_group_count": 1,
+   "max_remaining_depth": null,
+   "resolved_group_count": 2,
+   "response_group_count": 4,
+   "state": "infeasible"
+  },
+  "matched_rows": 4,
+  "response_group_breakdown": [
+   {
+    "answer_count": 8,
+    "pattern": "-----",
+    "solved": true
+   },
+   {
+    "answer_count": 5,
+    "pattern": "y----",
+    "solved": false
+   },
+   {
+    "answer_count": 3,
+    "pattern": "-y---",
+    "solved": false
+   },
+   {
+    "answer_count": 1,
+    "pattern": "ggggg",
+    "solved": true
+   }
+  ],
+  "response_group_counts": {
+   "active_response_group_count": 0,
+   "exact_response_group_count": 1,
+   "loss_response_group_count": 1,
+   "missing_response_group_count": 1,
+   "queued_response_group_count": 3,
+   "response_group_count": 4,
+   "trivial_response_group_count": 1
+  },
+  "response_groups": [
+   {
+    "answer_count": 8,
+    "best_erd": 2.1,
+    "best_guess": "crane",
+    "best_guess_is_answer": true,
+    "branch_key_hex": "01",
+    "branch_reference": "111111111111",
+    "branch_status": "done",
+    "branch_worker_status": null,
+    "cache_state": "exact",
+    "max_remaining_depth": 3,
+    "pattern": "-----",
+    "priority": 5,
+    "updated_at": 990,
+    "worker_count": 1
+   },
+   {
+    "answer_count": 5,
+    "best_erd": null,
+    "best_guess": null,
+    "best_guess_is_answer": false,
+    "branch_key_hex": "02",
+    "branch_reference": "222222222222",
+    "branch_status": "done",
+    "branch_worker_status": null,
+    "cache_state": "loss",
+    "max_remaining_depth": null,
+    "pattern": "y----",
+    "priority": 2,
+    "updated_at": 980,
+    "worker_count": 0
+   },
+   {
+    "answer_count": 3,
+    "best_erd": null,
+    "best_guess": null,
+    "best_guess_is_answer": false,
+    "branch_key_hex": "03",
+    "branch_reference": "333333333333",
+    "branch_status": "unqueued",
+    "branch_worker_status": null,
+    "cache_state": "missing",
+    "max_remaining_depth": null,
+    "pattern": "-y---",
+    "priority": null,
+    "updated_at": null,
+    "worker_count": 0
+   },
+   {
+    "answer_count": 1,
+    "best_erd": null,
+    "best_guess": null,
+    "best_guess_is_answer": false,
+    "branch_key_hex": "04",
+    "branch_reference": "444444444444",
+    "branch_status": "done",
+    "branch_worker_status": null,
+    "cache_state": "not_applicable",
+    "max_remaining_depth": null,
+    "pattern": "ggggg",
+    "priority": null,
+    "updated_at": null,
+    "worker_count": 0
+   }
+  ],
+  "total_rows": 4,
+  "word": "queue",
+  "word_is_answer": true
+ },
+ "filters": {},
+ "generated_at": 1000,
+ "report_kind": "word",
+ "schema_version": 4,
+ "sources": {
+  "cache": {
+   "error": null,
+   "ok": true,
+   "path": "fixture/cache.sqlite3"
+  },
+  "queue": {
+   "epoch": 4,
+   "error": null,
+   "git_sha": "abcdef12",
+   "label": "packed",
+   "ok": true,
+   "path": "fixture/queue.sqlite3"
+  },
+  "telemetry": {
+   "error": null,
+   "ok": true,
+   "path": "fixture/telemetry.sqlite3"
   }
-}
+ },
+ "tree": false
+}
\ No newline at end of file
diff --git a/tests/fixtures/reports/work_distribution.json b/tests/fixtures/reports/work_distribution.json
index 2ea265e9..5f6bc1d9 100644
--- a/tests/fixtures/reports/work_distribution.json
+++ b/tests/fixtures/reports/work_distribution.json
@@ -1,161 +1,161 @@
 {
-  "branch_target": {
-    "branch_reference": null,
-    "input_text": "",
-    "kind": "root",
-    "steps": [],
-    "trailing_word": null
+ "branch_target": {
+  "branch_reference": null,
+  "input_text": "",
+  "kind": "root",
+  "steps": [],
+  "trailing_word": null
+ },
+ "data": {
+  "band_edge_seconds": [
+   2,
+   30,
+   300,
+   3600
+  ],
+  "bands": [
+   {
+    "band_index": 0,
+    "band_label": "<=2s",
+    "branch_count": 26,
+    "branch_share": 0.5777777777777777,
+    "claim_count": 364,
+    "claim_share": 0.3888888888888889,
+    "coordination_millis": 14924,
+    "coordination_share_per_work_share": 231869.61965811966,
+    "search_node_count": 728,
+    "search_node_share": 1.6771877638057388e-06,
+    "search_nodes_per_branch": 28.0,
+    "unfinished_branch_count": 0,
+    "worker_millis": 7644,
+    "worker_time_share": 0.0005290125016920925
+   },
+   {
+    "band_index": 1,
+    "band_label": "2-30s",
+    "branch_count": 9,
+    "branch_share": 0.2,
+    "claim_count": 288,
+    "claim_share": 0.3076923076923077,
+    "coordination_millis": 11808,
+    "coordination_share_per_work_share": 515.2658214624881,
+    "search_node_count": 259200,
+    "search_node_share": 0.0005971525664539114,
+    "search_nodes_per_branch": 28800.0,
+    "unfinished_branch_count": 0,
+    "worker_millis": 97920,
+    "worker_time_share": 0.006776675060922254
+   },
+   {
+    "band_index": 2,
+    "band_label": "30-300s",
+    "branch_count": 5,
+    "branch_share": 0.1111111111111111,
+    "claim_count": 200,
+    "claim_share": 0.21367521367521367,
+    "coordination_millis": 8200,
+    "coordination_share_per_work_share": 10.305316429249762,
+    "search_node_count": 9000000,
+    "search_node_share": 0.020734464112983034,
+    "search_nodes_per_branch": 1800000.0,
+    "unfinished_branch_count": 0,
+    "worker_millis": 520000,
+    "worker_time_share": 0.03598724501306752
+   },
+   {
+    "band_index": 3,
+    "band_label": "300-3,600s",
+    "branch_count": 3,
+    "branch_share": 0.06666666666666667,
+    "claim_count": 72,
+    "claim_share": 0.07692307692307693,
+    "coordination_millis": 2952,
+    "coordination_share_per_work_share": 0.5152658214624881,
+    "search_node_count": 64800000,
+    "search_node_share": 0.14928814161347786,
+    "search_nodes_per_branch": 21600000.0,
+    "unfinished_branch_count": 3,
+    "worker_millis": 3024000,
+    "worker_time_share": 0.20927967099906958
+   },
+   {
+    "band_index": 4,
+    "band_label": ">3,600s",
+    "branch_count": 2,
+    "branch_share": 0.044444444444444446,
+    "claim_count": 12,
+    "claim_share": 0.01282051282051282,
+    "coordination_millis": 492,
+    "coordination_share_per_work_share": 0.015457974643874644,
+    "search_node_count": 360000000,
+    "search_node_share": 0.8293785645193213,
+    "search_nodes_per_branch": 180000000.0,
+    "unfinished_branch_count": 2,
+    "worker_millis": 10800000,
+    "worker_time_share": 0.7474273964252486
+   }
+  ],
+  "epoch": 0,
+  "maximum_answer_count": null,
+  "minimum_answer_count": null,
+  "population": "epoch_claims_by_branch",
+  "scan_seconds": 0.184,
+  "since_seconds": null,
+  "totals": {
+   "branch_count": 45,
+   "claim_count": 936,
+   "coordination_millis": 38376,
+   "search_node_count": 434059928,
+   "unfinished_branch_count": 5,
+   "worker_millis": 14449564
   },
-  "data": {
-    "band_edge_seconds": [
-      2,
-      30,
-      300,
-      3600
-    ],
-    "bands": [
-      {
-        "band_index": 0,
-        "band_label": "<=2s",
-        "branch_count": 26,
-        "branch_share": 0.5777777777777777,
-        "claim_count": 364,
-        "claim_share": 0.3888888888888889,
-        "coordination_millis": 14924,
-        "coordination_share_per_work_share": 231869.61965811966,
-        "search_node_count": 728,
-        "search_node_share": 1.6771877638057388e-06,
-        "search_nodes_per_branch": 28.0,
-        "unfinished_branch_count": 0,
-        "worker_millis": 7644,
-        "worker_time_share": 0.0005290125016920925
-      },
-      {
-        "band_index": 1,
-        "band_label": "2-30s",
-        "branch_count": 9,
-        "branch_share": 0.2,
-        "claim_count": 288,
-        "claim_share": 0.3076923076923077,
-        "coordination_millis": 11808,
-        "coordination_share_per_work_share": 515.2658214624881,
-        "search_node_count": 259200,
-        "search_node_share": 0.0005971525664539114,
-        "search_nodes_per_branch": 28800.0,
-        "unfinished_branch_count": 0,
-        "worker_millis": 97920,
-        "worker_time_share": 0.006776675060922254
-      },
-      {
-        "band_index": 2,
-        "band_label": "30-300s",
-        "branch_count": 5,
-        "branch_share": 0.1111111111111111,
-        "claim_count": 200,
-        "claim_share": 0.21367521367521367,
-        "coordination_millis": 8200,
-        "coordination_share_per_work_share": 10.305316429249762,
-        "search_node_count": 9000000,
-        "search_node_share": 0.020734464112983034,
-        "search_nodes_per_branch": 1800000.0,
-        "unfinished_branch_count": 0,
-        "worker_millis": 520000,
-        "worker_time_share": 0.03598724501306752
-      },
-      {
-        "band_index": 3,
-        "band_label": "300-3,600s",
-        "branch_count": 3,
-        "branch_share": 0.06666666666666667,
-        "claim_count": 72,
-        "claim_share": 0.07692307692307693,
-        "coordination_millis": 2952,
-        "coordination_share_per_work_share": 0.5152658214624881,
-        "search_node_count": 64800000,
-        "search_node_share": 0.14928814161347786,
-        "search_nodes_per_branch": 21600000.0,
-        "unfinished_branch_count": 3,
-        "worker_millis": 3024000,
-        "worker_time_share": 0.20927967099906958
-      },
-      {
-        "band_index": 4,
-        "band_label": ">3,600s",
-        "branch_count": 2,
-        "branch_share": 0.044444444444444446,
-        "claim_count": 12,
-        "claim_share": 0.01282051282051282,
-        "coordination_millis": 492,
-        "coordination_share_per_work_share": 0.015457974643874644,
-        "search_node_count": 360000000,
-        "search_node_share": 0.8293785645193213,
-        "search_nodes_per_branch": 180000000.0,
-        "unfinished_branch_count": 2,
-        "worker_millis": 10800000,
-        "worker_time_share": 0.7474273964252486
-      }
-    ],
-    "epoch": 0,
-    "maximum_answer_count": null,
-    "minimum_answer_count": null,
-    "population": "epoch_claims_by_branch",
-    "scan_seconds": 0.184,
-    "since_seconds": null,
-    "totals": {
-      "branch_count": 45,
-      "claim_count": 936,
-      "coordination_millis": 38376,
-      "search_node_count": 434059928,
-      "unfinished_branch_count": 5,
-      "worker_millis": 14449564
-    },
-    "unattributed": {
-      "claim_count": 37,
-      "coordination_millis": 666,
-      "search_node_count": 0,
-      "worker_millis": 74
-    },
-    "unmeasured": {
-      "branch_count": 1,
-      "claim_count": 5,
-      "coordination_millis": 150,
-      "search_node_count": 60000,
-      "worker_millis": 0
-    },
-    "window_started_at": null
+  "unattributed": {
+   "claim_count": 37,
+   "coordination_millis": 666,
+   "search_node_count": 0,
+   "worker_millis": 74
   },
-  "filters": {
-    "branch_statuses": [],
-    "branch_worker_statuses": [],
-    "budget": null,
-    "limit": null,
-    "maximum_answer_count": null,
-    "minimum_answer_count": null,
-    "priority": null,
-    "sort": null
+  "unmeasured": {
+   "branch_count": 1,
+   "claim_count": 5,
+   "coordination_millis": 150,
+   "search_node_count": 60000,
+   "worker_millis": 0
   },
-  "generated_at": 1771000000,
-  "report_kind": "work_distribution",
-  "schema_version": 3,
-  "sources": {
-    "cache": {
-      "error": null,
-      "ok": false,
-      "path": "runtime/wordle_cache.sqlite3"
-    },
-    "queue": {
-      "epoch": null,
-      "error": null,
-      "git_sha": null,
-      "label": null,
-      "ok": true,
-      "path": "runtime/erd_queue.sqlite3"
-    },
-    "telemetry": {
-      "error": null,
-      "ok": true,
-      "path": "runtime/erd_queue_telemetry.sqlite3"
-    }
+  "window_started_at": null
+ },
+ "filters": {
+  "branch_statuses": [],
+  "branch_worker_statuses": [],
+  "budget": null,
+  "limit": null,
+  "maximum_answer_count": null,
+  "minimum_answer_count": null,
+  "priority": null,
+  "sort": null
+ },
+ "generated_at": 1771000000,
+ "report_kind": "work_distribution",
+ "schema_version": 4,
+ "sources": {
+  "cache": {
+   "error": null,
+   "ok": false,
+   "path": "runtime/wordle_cache.sqlite3"
   },
-  "tree": false
-}
+  "queue": {
+   "epoch": null,
+   "error": null,
+   "git_sha": null,
+   "label": null,
+   "ok": true,
+   "path": "runtime/erd_queue.sqlite3"
+  },
+  "telemetry": {
+   "error": null,
+   "ok": true,
+   "path": "runtime/erd_queue_telemetry.sqlite3"
+  }
+ },
+ "tree": false
+}
\ No newline at end of file
diff --git a/tests/fixtures/reports/workers-tree.json b/tests/fixtures/reports/workers-tree.json
index e2dd488e..197cf38b 100644
--- a/tests/fixtures/reports/workers-tree.json
+++ b/tests/fixtures/reports/workers-tree.json
@@ -1,7 +1,72 @@
 {
-  "schema_version": 3, "report_kind": "workers", "generated_at": 1000,
-  "branch_target": {"kind": "root", "steps": [], "trailing_word": null, "branch_reference": null, "input_text": ""},
-  "filters": {}, "tree": true,
-  "sources": {"queue": {"path": "fixture/queue.sqlite3", "ok": true, "error": null, "epoch": 4, "label": "packed", "git_sha": "abcdef12"}, "telemetry": {"path": "fixture/telemetry.sqlite3", "ok": true, "error": null}, "cache": {"path": "fixture/cache.sqlite3", "ok": true, "error": null}},
-  "data": {"root": {"kind": "root"}, "topology_source": "queue", "tree_available": true, "unavailable_reason": null, "nodes": [{"node_id": "raise:-----", "parent_node_id": null, "step": {"word": "raise", "pattern": "-----"}, "branch_key_hex": "02", "branch_reference": "222222222222", "branch_status": "evaluating", "branch_worker_status": "active", "answer_count": 8, "guess_depth": 1, "worker_count": 2, "completed_candidate_count": 20, "candidate_count": 50, "is_context": false}], "workers": [{"worker_id": "worker-0", "worker_number": "0", "branch_key_hex": "02", "branch_reference": "222222222222", "is_live": true, "on_active_branch": true}]}
-}
+ "branch_target": {
+  "branch_reference": null,
+  "input_text": "",
+  "kind": "root",
+  "steps": [],
+  "trailing_word": null
+ },
+ "data": {
+  "nodes": [
+   {
+    "answer_count": 8,
+    "branch_key_hex": "02",
+    "branch_reference": "222222222222",
+    "branch_status": "evaluating",
+    "branch_worker_status": "active",
+    "candidate_count": 50,
+    "completed_candidate_count": 20,
+    "guess_depth": 1,
+    "is_context": false,
+    "node_id": "raise:-----",
+    "parent_node_id": null,
+    "step": {
+     "pattern": "-----",
+     "word": "raise"
+    },
+    "worker_count": 2
+   }
+  ],
+  "root": {
+   "kind": "root"
+  },
+  "topology_source": "queue",
+  "tree_available": true,
+  "unavailable_reason": null,
+  "workers": [
+   {
+    "branch_key_hex": "02",
+    "branch_reference": "222222222222",
+    "is_live": true,
+    "on_active_branch": true,
+    "worker_id": "worker-0",
+    "worker_number": "0"
+   }
+  ]
+ },
+ "filters": {},
+ "generated_at": 1000,
+ "report_kind": "workers",
+ "schema_version": 4,
+ "sources": {
+  "cache": {
+   "error": null,
+   "ok": true,
+   "path": "fixture/cache.sqlite3"
+  },
+  "queue": {
+   "epoch": 4,
+   "error": null,
+   "git_sha": "abcdef12",
+   "label": "packed",
+   "ok": true,
+   "path": "fixture/queue.sqlite3"
+  },
+  "telemetry": {
+   "error": null,
+   "ok": true,
+   "path": "fixture/telemetry.sqlite3"
+  }
+ },
+ "tree": true
+}
\ No newline at end of file
diff --git a/tests/fixtures/reports/workers.json b/tests/fixtures/reports/workers.json
index 48cf1b51..3c9ea9b9 100644
--- a/tests/fixtures/reports/workers.json
+++ b/tests/fixtures/reports/workers.json
@@ -1,12 +1,171 @@
 {
-  "schema_version": 3, "report_kind": "workers", "generated_at": 1000,
-  "branch_target": {"kind": "root", "steps": [], "trailing_word": null, "branch_reference": null, "input_text": ""},
-  "filters": {}, "tree": false,
-  "sources": {"queue": {"path": "fixture/queue.sqlite3", "ok": true, "error": null, "epoch": 4, "label": "packed", "git_sha": "abcdef12"}, "telemetry": {"path": "fixture/telemetry.sqlite3", "ok": true, "error": null}, "cache": {"path": "fixture/cache.sqlite3", "ok": true, "error": null}},
-  "data": {"summary": {"worker_count": 4, "worker_count_by_state": {"live": 3, "dead": 1, "idle": 1}}, "matched_rows": 4, "rows": [
-    {"worker_id": "worker-0", "worker_number": "0", "pid": 100, "updated_at": 998, "is_live": true, "branch_reference": "222222222222", "branch_key_hex": "02", "candidate_index": 7, "claim_started_at": 990, "completed_claim_count": 12, "current_candidate": "nurdy", "current_candidate_is_answer": false, "current_max_guess_depth": 4, "current_node_count": 900, "nodes_per_second": 45.5, "descent": [], "cache_hit_count": 50, "cache_miss_count": 10, "solved_evaluation_count": 20, "erd_cutoff_evaluation_count": 5, "remaining_depth_pruned_evaluation_count": 2, "best_guess": "crane", "best_erd": 2.25, "bound_erd": 2.5, "on_active_branch": true, "opener_work_id": 1, "scheduling_role": "preferred", "scheduling_role_reason": "serving its preferred opener work", "state": "working"},
-    {"worker_id": "worker-1", "worker_number": "1", "pid": 101, "updated_at": 998, "is_live": true, "branch_reference": null, "branch_key_hex": null, "candidate_index": null, "claim_started_at": null, "completed_claim_count": 10, "current_candidate": null, "current_candidate_is_answer": false, "current_max_guess_depth": null, "current_node_count": null, "nodes_per_second": null, "descent": [], "cache_hit_count": 20, "cache_miss_count": 5, "solved_evaluation_count": 10, "erd_cutoff_evaluation_count": 2, "remaining_depth_pruned_evaluation_count": 1, "best_guess": null, "best_erd": null, "bound_erd": null, "on_active_branch": false, "opener_work_id": null, "scheduling_role": null, "scheduling_role_reason": "unattributed", "state": "idle"},
-    {"worker_id": "worker-2", "worker_number": "2", "pid": 102, "updated_at": 975, "is_live": true, "branch_reference": "333333333333", "branch_key_hex": "03", "candidate_index": 19, "claim_started_at": 950, "completed_claim_count": 20, "current_candidate": "cigar", "current_candidate_is_answer": true, "current_max_guess_depth": 5, "current_node_count": 1200, "nodes_per_second": 0.0, "descent": [], "cache_hit_count": 10, "cache_miss_count": 5, "solved_evaluation_count": 10, "erd_cutoff_evaluation_count": 3, "remaining_depth_pruned_evaluation_count": 2, "best_guess": "cigar", "best_erd": 1.5, "bound_erd": null, "on_active_branch": true, "opener_work_id": 2, "scheduling_role": "fallback", "scheduling_role_reason": "serving fallback work: preferred opener(s) had no claimable bundle at the last claim boundary", "state": "stale"},
-    {"worker_id": "worker-3", "worker_number": "3", "pid": 103, "updated_at": 800, "is_live": false, "branch_reference": null, "branch_key_hex": null, "candidate_index": null, "claim_started_at": null, "completed_claim_count": 0, "current_candidate": null, "current_candidate_is_answer": false, "current_max_guess_depth": null, "current_node_count": null, "nodes_per_second": null, "descent": [], "cache_hit_count": 0, "cache_miss_count": 0, "solved_evaluation_count": 0, "erd_cutoff_evaluation_count": 0, "remaining_depth_pruned_evaluation_count": 0, "best_guess": null, "best_erd": null, "bound_erd": null, "on_active_branch": false, "opener_work_id": null, "scheduling_role": null, "scheduling_role_reason": "unattributed", "state": "dead"}
-  ]}
-}
+ "branch_target": {
+  "branch_reference": null,
+  "input_text": "",
+  "kind": "root",
+  "steps": [],
+  "trailing_word": null
+ },
+ "data": {
+  "matched_rows": 4,
+  "rows": [
+   {
+    "best_erd": 2.25,
+    "best_guess": "crane",
+    "bound_erd": 2.5,
+    "branch_key_hex": "02",
+    "branch_reference": "222222222222",
+    "cache_hit_count": 50,
+    "cache_miss_count": 10,
+    "candidate_index": 7,
+    "claim_started_at": 990,
+    "completed_claim_count": 12,
+    "current_candidate": "nurdy",
+    "current_candidate_is_answer": false,
+    "current_max_guess_depth": 4,
+    "current_node_count": 900,
+    "descent": [],
+    "erd_cutoff_evaluation_count": 5,
+    "is_live": true,
+    "nodes_per_second": 45.5,
+    "on_active_branch": true,
+    "opener_work_id": 1,
+    "pid": 100,
+    "remaining_depth_pruned_evaluation_count": 2,
+    "scheduling_role": "preferred",
+    "scheduling_role_reason": "serving its preferred opener work",
+    "solved_evaluation_count": 20,
+    "state": "working",
+    "updated_at": 998,
+    "worker_id": "worker-0",
+    "worker_number": "0"
+   },
+   {
+    "best_erd": null,
+    "best_guess": null,
+    "bound_erd": null,
+    "branch_key_hex": null,
+    "branch_reference": null,
+    "cache_hit_count": 20,
+    "cache_miss_count": 5,
+    "candidate_index": null,
+    "claim_started_at": null,
+    "completed_claim_count": 10,
+    "current_candidate": null,
+    "current_candidate_is_answer": false,
+    "current_max_guess_depth": null,
+    "current_node_count": null,
+    "descent": [],
+    "erd_cutoff_evaluation_count": 2,
+    "is_live": true,
+    "nodes_per_second": null,
+    "on_active_branch": false,
+    "opener_work_id": null,
+    "pid": 101,
+    "remaining_depth_pruned_evaluation_count": 1,
+    "scheduling_role": null,
+    "scheduling_role_reason": "unattributed",
+    "solved_evaluation_count": 10,
+    "state": "idle",
+    "updated_at": 998,
+    "worker_id": "worker-1",
+    "worker_number": "1"
+   },
+   {
+    "best_erd": 1.5,
+    "best_guess": "cigar",
+    "bound_erd": null,
+    "branch_key_hex": "03",
+    "branch_reference": "333333333333",
+    "cache_hit_count": 10,
+    "cache_miss_count": 5,
+    "candidate_index": 19,
+    "claim_started_at": 950,
+    "completed_claim_count": 20,
+    "current_candidate": "cigar",
+    "current_candidate_is_answer": true,
+    "current_max_guess_depth": 5,
+    "current_node_count": 1200,
+    "descent": [],
+    "erd_cutoff_evaluation_count": 3,
+    "is_live": true,
+    "nodes_per_second": 0.0,
+    "on_active_branch": true,
+    "opener_work_id": 2,
+    "pid": 102,
+    "remaining_depth_pruned_evaluation_count": 2,
+    "scheduling_role": "fallback",
+    "scheduling_role_reason": "serving fallback work: preferred opener(s) had no claimable bundle at the last claim boundary",
+    "solved_evaluation_count": 10,
+    "state": "stale",
+    "updated_at": 975,
+    "worker_id": "worker-2",
+    "worker_number": "2"
+   },
+   {
+    "best_erd": null,
+    "best_guess": null,
+    "bound_erd": null,
+    "branch_key_hex": null,
+    "branch_reference": null,
+    "cache_hit_count": 0,
+    "cache_miss_count": 0,
+    "candidate_index": null,
+    "claim_started_at": null,
+    "completed_claim_count": 0,
+    "current_candidate": null,
+    "current_candidate_is_answer": false,
+    "current_max_guess_depth": null,
+    "current_node_count": null,
+    "descent": [],
+    "erd_cutoff_evaluation_count": 0,
+    "is_live": false,
+    "nodes_per_second": null,
+    "on_active_branch": false,
+    "opener_work_id": null,
+    "pid": 103,
+    "remaining_depth_pruned_evaluation_count": 0,
+    "scheduling_role": null,
+    "scheduling_role_reason": "unattributed",
+    "solved_evaluation_count": 0,
+    "state": "dead",
+    "updated_at": 800,
+    "worker_id": "worker-3",
+    "worker_number": "3"
+   }
+  ],
+  "summary": {
+   "worker_count": 4,
+   "worker_count_by_state": {
+    "dead": 1,
+    "idle": 1,
+    "live": 3
+   }
+  }
+ },
+ "filters": {},
+ "generated_at": 1000,
+ "report_kind": "workers",
+ "schema_version": 4,
+ "sources": {
+  "cache": {
+   "error": null,
+   "ok": true,
+   "path": "fixture/cache.sqlite3"
+  },
+  "queue": {
+   "epoch": 4,
+   "error": null,
+   "git_sha": "abcdef12",
+   "label": "packed",
+   "ok": true,
+   "path": "fixture/queue.sqlite3"
+  },
+  "telemetry": {
+   "error": null,
+   "ok": true,
+   "path": "fixture/telemetry.sqlite3"
+  }
+ },
+ "tree": false
+}
\ No newline at end of file
diff --git a/tests/test_report_model.py b/tests/test_report_model.py
index 2dce1a3c..e608f66e 100644
--- a/tests/test_report_model.py
+++ b/tests/test_report_model.py
@@ -15,6 +15,8 @@
 import erd_search
 import report_model
 from report_model import (
+    encode_candidate_bitmap,
+    decode_candidate_bitmap,
     _worker_process_is_running,
     _normalize_worker,
     DEFAULT_QUEUE_ROW_LIMIT,
@@ -2086,6 +2088,54 @@ def test_a_recycled_pid_does_not_resurrect_a_departed_worker(self):
         self.assertFalse(_worker_process_is_running(2 ** 31 - 1))
         self.assertFalse(_worker_process_is_running("not-a-pid"))
 
+    def test_a_candidate_bitmap_round_trips_every_position(self):
+        # The renderers count completions per cell at their own resolutions --
+        # the browser draws up to 50 cells, the terminal 10 to 40 -- so the
+        # wire format has to keep every position, not a histogram either of
+        # them would then resample.
+        for indexes, total in (
+            ([], 10),
+            ([0], 1),
+            ([0, 7, 8, 9], 16),
+            (list(range(0, 40)), 100),
+            (list(range(0, 14_855, 3)), 14_855),
+            ([14_854], 14_855),
+        ):
+            with self.subTest(total=total, count=len(indexes)):
+                bitmap = encode_candidate_bitmap(indexes, total)
+                self.assertEqual(
+                    decode_candidate_bitmap(bitmap, total), list(indexes))
+
+    def test_a_candidate_bitmap_is_one_size_whatever_the_sweep_looks_like(self):
+        # This is the whole reason it is a bitset and not run-length pairs.
+        # Six workers claim scattered ranges, so runs are short, and run-length
+        # encoding measured 64.7% of the raw list on the worst live branch.
+        # A bitset has no fragmented case to degrade into.
+        total = 14_855
+        contiguous = encode_candidate_bitmap(range(0, 7_000), total)
+        scattered = encode_candidate_bitmap(range(0, 14_000, 2), total)
+        self.assertEqual(len(contiguous), len(scattered))
+        # And it is far smaller than the positions it replaces.
+        as_positions = len(json.dumps(list(range(0, 14_000, 2))))
+        self.assertLess(len(scattered) * 10, as_positions)
+
+    def test_a_candidate_bitmap_ignores_positions_outside_the_vocabulary(self):
+        # A claim index past the candidate count would otherwise write outside
+        # the bitset and raise, taking the whole report with it.
+        bitmap = encode_candidate_bitmap([0, 5, 99, -1, None], 8)
+        self.assertEqual(decode_candidate_bitmap(bitmap, 8), [0, 5])
+
+    def test_a_candidate_bitmap_is_absent_when_there_is_nothing_to_draw(self):
+        self.assertIsNone(encode_candidate_bitmap([1, 2], 0))
+        self.assertIsNone(encode_candidate_bitmap([1, 2], None))
+        self.assertEqual(decode_candidate_bitmap(None, 10), [])
+        self.assertEqual(decode_candidate_bitmap("", 10), [])
+
+    def test_a_corrupt_candidate_bitmap_draws_nothing_rather_than_raising(self):
+        # The strip is decoration on a progress card; a malformed value must
+        # not take the report down with it.
+        self.assertEqual(decode_candidate_bitmap("not base64!!", 10), [])
+
     def test_the_queue_report_limits_its_rows_when_the_caller_names_no_limit(self):
         # Without a default the queue returns every branch it has registered.
         # On the production queue that is 54,201 rows and 68 MB, which the
@@ -2524,7 +2574,10 @@ def test_overview_uses_one_queue_snapshot_and_preserves_worker_ramps(self):
 
         self.assertEqual(report_queue_rows.call_count, 1)
         self.assertEqual(
-            report["data"]["branches"][0]["completed_candidate_indexes"], [1, 3]
+            decode_candidate_bitmap(
+                report["data"]["branches"][0]["completed_candidate_bitmap"],
+                report["data"]["branches"][0]["candidate_count"]),
+            [1, 3]
         )
 
     def test_active_report_rows_ignore_inactive_claim_history(self):
diff --git a/tests/test_report_terminal.py b/tests/test_report_terminal.py
index 974ab50d..65a7b6be 100644
--- a/tests/test_report_terminal.py
+++ b/tests/test_report_terminal.py
@@ -19,6 +19,7 @@
 import report_model
 import report_terminal
 from report_model import (
+    encode_candidate_bitmap,
     WORK_DISTRIBUTION_BAND_EDGE_SECONDS,
     ReportFilters,
     parse_report_branch_target,
@@ -1038,7 +1039,8 @@ def test_branch_report_renders_sweep_with_worker_position(self):
                     "current_max_guess_depth": 2, "nodes_per_second": 10.0,
                 }],
                 "republished_candidates": [],
-                "completed_candidate_indexes": list(range(0, 40)),
+                "completed_candidate_bitmap": encode_candidate_bitmap(
+                    range(0, 40), 100),
                 "claims": None,
                 "provenance_unknown": False,
             },
@@ -1065,7 +1067,7 @@ def test_branch_report_renders_sweep_with_worker_position(self):
         self.assertLess(moved_line.index("2"), sweep_line.index("2"))
 
         unswept = deepcopy(report)
-        unswept["data"]["completed_candidate_indexes"] = []
+        unswept["data"]["completed_candidate_bitmap"] = None
         unswept["data"]["workers"] = []
         unswept_output = render_report(unswept, width=80)
         self.assertFalse(any(

From 240a6b3d005654468c70893a4c9d45255c3f40fd Mon Sep 17 00:00:00 2001
From: Sean Ahern <sean.ahern@synopsys.com>
Date: Sun, 20 Sep 2026 00:14:26 -0400
Subject: [PATCH 2/2] Build the browser tests' sweep fixtures as bitmaps

The browser tests set the sweep strip on a report payload from inside the
page, so they construct the wire format by hand rather than reading a
fixture file.  Six such sites still wrote a list of positions, which the
client no longer reads, and a strip that decodes to nothing renders as a
strip nobody has swept.

`SWEEP_BITMAP_JS` builds the bitset once and every site calls it, so a
test states the two numbers the format needs -- how many candidates the
branch holds, and how many of them are swept -- rather than restating the
packing.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01PpacbZRqT46b4Duhxq5QNQ
---
 tests/test_report_client.py | 33 +++++++++++++++++++++++++++------
 1 file changed, 27 insertions(+), 6 deletions(-)

diff --git a/tests/test_report_client.py b/tests/test_report_client.py
index bae85057..cbb6ba16 100644
--- a/tests/test_report_client.py
+++ b/tests/test_report_client.py
@@ -33,6 +33,18 @@
 # The client's DEFAULT_POLL; a re-render lands on every one of these.
 CLIENT_POLL_MILLIS = 2000
 CLIENT_PATH = os.path.join(ROOT, "report_client.html")
+# The sweep strip arrives as a base64 bitset, one bit per candidate, sized by
+# the whole candidate list rather than by how far the sweep has reached.  A
+# test therefore states both numbers: how many candidates the branch holds and
+# how many of them are swept.
+SWEEP_BITMAP_JS = (
+    "const sweepBitmap=(sweptCount,candidateCount)=>{"
+    "const bytes=new Uint8Array(Math.ceil(candidateCount/8));"
+    "for(let index=0;index<sweptCount;index++)bytes[index>>3]|=1<<(index&7);"
+    "let binary='';"
+    "for(const byte of bytes)binary+=String.fromCharCode(byte);"
+    "return btoa(binary);};"
+)
 # Both browser suites run by default, and a browser that will not start is a
 # failure rather than a skip.  This client is used overwhelmingly from WebKit
 # (Safari and iOS Chrome), so a run that quietly covered only Chromium would
@@ -3994,10 +4006,11 @@ def _sweep(self, workers_js, candidate_count=100):
         """Render a strip whose first half is complete, and report how each
         worker's marker was drawn against the cell geometry."""
         return self.page.evaluate("""async ([workersJs,candidateCount]) => {
+          """ + SWEEP_BITMAP_JS + """
           const branch=await (await fetch('/api/view?branch_target=RAISE%20.....')).json();
           branch.data.queue.candidate_count=candidateCount;
-          branch.data.completed_candidate_indexes=
-            Array.from({length:candidateCount/2},(_,i)=>i);
+          branch.data.completed_candidate_bitmap=
+            sweepBitmap(candidateCount/2,candidateCount);
           branch.data.workers=JSON.parse(workersJs).map(worker=>({
             state:'working',is_live:true,updated_at:branch.generated_at,
             current_candidate:'crane',branch_reference:'eb81eb81eb81',...worker}));
@@ -4380,8 +4393,10 @@ def render_sweep_marker(self):
         """Render a branch report with one live worker; the marker persists
         in the DOM afterward for a subsequent theme check with no rerender."""
         self.page.evaluate("""async () => {
+          """ + SWEEP_BITMAP_JS + """
           const branch=await (await fetch('/api/view?branch_target=RAISE%20.....')).json();
-          branch.data.completed_candidate_indexes=[...Array(50).keys()];
+          branch.data.completed_candidate_bitmap=
+            sweepBitmap(50,branch.data.queue.candidate_count);
           branch.data.workers=[{worker_id:'worker-3',worker_number:'3',updated_at:999,is_live:true,branch_key_hex:'01',branch_reference:'111111111111',candidate_index:75,current_candidate:'crane',current_candidate_is_answer:true}];
           applyReport(branch,null,{...__reportClient.getState(),branch_target:'RAISE .....'});
         }""")
@@ -4798,12 +4813,14 @@ def test_a_lattice_rational_wraps_instead_of_leaving_the_card(self):
             self.page.goto(self.base_url)
             self.page.wait_for_selector(".card")
             measured = self.page.evaluate("""async () => {
+              """ + SWEEP_BITMAP_JS + """
               const report = await (await fetch('/api/view')).json();
               report.data.branches = [{...report.data.branches[0],
                 answer_count: 502, candidate_count: 14855,
                 completed_candidate_count: 6363, best_guess: 'clart',
                 best_guess_is_answer: false, best_erd: 1572 / 502,
-                worker_count: 1, completed_candidate_indexes: [],
+                worker_count: 1,
+                completed_candidate_bitmap: sweepBitmap(0, 14855),
                 spine: [{word: 'raise', pattern: '-----'}]}];
               applyReport(report, null, {...__reportClient.getState()});
               const card = document.querySelector('.card');
@@ -4944,8 +4961,10 @@ def test_leaderboard_legend_labels_never_overlap_after_an_unhandled_resize(self)
 
     def test_branch_report_renders_candidate_sweep_with_worker_marker(self):
         result = self.page.evaluate("""async () => {
+          """ + SWEEP_BITMAP_JS + """
           const branch=await (await fetch('/api/view?branch_target=RAISE%20.....')).json();
-          branch.data.completed_candidate_indexes=[...Array(50).keys()];
+          branch.data.completed_candidate_bitmap=
+            sweepBitmap(50,branch.data.queue.candidate_count);
           branch.data.workers=[{worker_id:'worker-3',worker_number:'3',updated_at:999,is_live:true,branch_key_hex:'01',branch_reference:'111111111111',candidate_index:75,current_candidate:'crane',current_candidate_is_answer:true}];
           applyReport(branch,null,{...__reportClient.getState(),branch_target:'RAISE .....'});
           const cells=[...document.querySelectorAll('.sweep-cell')];
@@ -4959,8 +4978,10 @@ def test_branch_report_renders_candidate_sweep_with_worker_marker(self):
 
     def test_completed_sweep_cells_are_marked_for_desaturated_color(self):
         result = self.page.evaluate("""async () => {
+          """ + SWEEP_BITMAP_JS + """
           const branch=await (await fetch('/api/view?branch_target=RAISE%20.....')).json();
-          branch.data.completed_candidate_indexes=[...Array(branch.data.queue.candidate_count).keys()];
+          branch.data.completed_candidate_bitmap=sweepBitmap(
+            branch.data.queue.candidate_count,branch.data.queue.candidate_count);
           applyReport(branch,null,{...__reportClient.getState(),branch_target:'RAISE .....'});
           const cells=[...document.querySelectorAll('.sweep-cell')];
           const rootStyle=getComputedStyle(document.documentElement);