From a6c64279e85e44f30e20042f1587f8bb505b3c82 Mon Sep 17 00:00:00 2001
From: Jack Kingsman <jack.kingsman@gmail.com>
Date: Wed, 8 Jul 2026 14:09:08 -0700
Subject: [PATCH] Plumb through total neighbor count from radio and expose that
 in the UI. Closes #310.

---
 app/models.py                                 |  8 +++++
 app/routers/repeaters.py                      |  3 +-
 .../repeater/RepeaterNeighborsPane.tsx        |  8 ++++-
 frontend/src/types.ts                         |  4 +++
 tests/test_repeater_routes.py                 | 29 +++++++++++++++++++
 5 files changed, 50 insertions(+), 2 deletions(-)

diff --git a/app/models.py b/app/models.py
index a2315c3..42efecc 100644
--- a/app/models.py
+++ b/app/models.py
@@ -672,6 +672,14 @@ class RepeaterNeighborsResponse(BaseModel):
     neighbors: list[NeighborInfo] = Field(
         default_factory=list, description="List of neighbors seen by repeater"
     )
+    reported_count: int | None = Field(
+        default=None,
+        description=(
+            "Total neighbor count reported by the repeater firmware, independent of "
+            "how many entries were actually returned. May exceed len(neighbors) when a "
+            "multi-chunk fetch is incomplete (dropped follow-up query / duty-cycle throttle)."
+        ),
+    )
 
 
 class RepeaterAclResponse(BaseModel):
diff --git a/app/routers/repeaters.py b/app/routers/repeaters.py
index 7317b84..2eaedfe 100644
--- a/app/routers/repeaters.py
+++ b/app/routers/repeaters.py
@@ -265,7 +265,8 @@ async def repeater_neighbors(public_key: str) -> RepeaterNeighborsResponse:
                 )
             )
 
-    return RepeaterNeighborsResponse(neighbors=neighbors)
+    reported_count = neighbors_data.get("neighbours_count") if neighbors_data else None
+    return RepeaterNeighborsResponse(neighbors=neighbors, reported_count=reported_count)
 
 
 @router.post("/{public_key}/repeater/acl", response_model=RepeaterAclResponse)
diff --git a/frontend/src/components/repeater/RepeaterNeighborsPane.tsx b/frontend/src/components/repeater/RepeaterNeighborsPane.tsx
index 2947687..157d572 100644
--- a/frontend/src/components/repeater/RepeaterNeighborsPane.tsx
+++ b/frontend/src/components/repeater/RepeaterNeighborsPane.tsx
@@ -203,7 +203,13 @@ export function NeighborsPane({
 
   return (
     <RepeaterPane
-      title="Neighbors"
+      title={
+        !data
+          ? 'Neighbors'
+          : data.reported_count != null && data.reported_count !== data.neighbors.length
+            ? `Neighbors (${data.neighbors.length} of ${data.reported_count})`
+            : `Neighbors (${data.reported_count ?? data.neighbors.length})`
+      }
       headerNote={headerNote}
       state={state}
       onRefresh={onRefresh}
diff --git a/frontend/src/types.ts b/frontend/src/types.ts
index ef6994e..b102e95 100644
--- a/frontend/src/types.ts
+++ b/frontend/src/types.ts
@@ -467,6 +467,10 @@ export interface RepeaterStatusResponse {
 
 export interface RepeaterNeighborsResponse {
   neighbors: NeighborInfo[];
+  // Total neighbor count reported by the repeater firmware, independent of how many
+  // entries were actually returned. Exceeds neighbors.length when a multi-chunk fetch
+  // is incomplete. Null on older firmware / failed fetches.
+  reported_count?: number | null;
 }
 
 export interface RepeaterAclResponse {
diff --git a/tests/test_repeater_routes.py b/tests/test_repeater_routes.py
index f759af5..acc1004 100644
--- a/tests/test_repeater_routes.py
+++ b/tests/test_repeater_routes.py
@@ -873,6 +873,35 @@ class TestRepeaterNeighbors:
         assert response.neighbors[0].snr == 9.0
         assert response.neighbors[1].name is None
         assert response.neighbors[1].last_heard_seconds == 120
+        # No firmware-reported total in this payload → reported_count stays None.
+        assert response.reported_count is None
+
+    @pytest.mark.asyncio
+    async def test_reported_count_captured_on_partial_fetch(self, test_db):
+        """Firmware neighbours_count is surfaced even when fewer entries return."""
+        mc = _mock_mc()
+        await _insert_contact(KEY_A, name="Repeater", contact_type=2)
+        # Repeater claims 30 neighbours but only 2 came back this fetch (dropped
+        # multi-chunk follow-up); reported_count must reflect the true total.
+        mc.commands.fetch_all_neighbours = AsyncMock(
+            return_value={
+                "neighbours_count": 30,
+                "results_count": 2,
+                "neighbours": [
+                    {"pubkey": "aaaaaaaaaaaa", "snr": 9.0, "secs_ago": 5},
+                    {"pubkey": "cccccccccccc", "snr": 3.0, "secs_ago": 120},
+                ],
+            }
+        )
+
+        with (
+            patch("app.routers.repeaters.radio_manager.require_connected", return_value=mc),
+            patch.object(radio_manager, "_meshcore", mc),
+        ):
+            response = await repeater_neighbors(KEY_A)
+
+        assert len(response.neighbors) == 2
+        assert response.reported_count == 30
 
     @pytest.mark.asyncio
     async def test_empty_neighbors(self, test_db):