diff --git a/cmd/unbounded-net-controller/cluster_status.go b/cmd/unbounded-net-controller/cluster_status.go
index 6185da8c8..2f21c62ba 100644
--- a/cmd/unbounded-net-controller/cluster_status.go
+++ b/cmd/unbounded-net-controller/cluster_status.go
@@ -710,7 +710,6 @@ func fetchClusterStatus(ctx context.Context, health *healthState, pullEnabled bo
 	}
 
 	sort.Slice(status.Peerings, func(i, j int) bool { return status.Peerings[i].Name < status.Peerings[j].Name })
-	status.ConnectivityMatrix = buildConnectivityMatrix(status.Nodes, status.GatewayPools)
 	status.Problems = collectClusterProblems(status)
 
 	return status
@@ -1038,163 +1037,3 @@ func latestNodeUpdateTime(node *corev1.Node) time.Time {
 
 	return latest
 }
-
-// buildConnectivityMatrix builds health check connectivity matrices from node peer data.
-func buildConnectivityMatrix(nodes []*NodeStatusResponse, gatewayPools []GatewayPoolStatus) map[string]*SiteMatrix {
-	siteNodes := make(map[string]map[string]bool)
-	nodePeers := make(map[string][]WireGuardPeerStatus)
-	nodeByName := make(map[string]*NodeStatusResponse)
-
-	for _, n := range nodes {
-		name := n.NodeInfo.Name
-
-		site := n.NodeInfo.SiteName
-		if name == "" || site == "" {
-			continue
-		}
-
-		nodeByName[name] = n
-
-		if siteNodes[site] == nil {
-			siteNodes[site] = make(map[string]bool)
-		}
-
-		siteNodes[site][name] = true
-
-		// Keep the immutable snapshot's slice; filter when reading rather
-		// than copying every peer, including for scopes above the size limit.
-		nodePeers[name] = n.Peers
-
-		for _, p := range n.Peers {
-			if p.PeerType == "gateway" && p.Name != "" && p.SiteName == site {
-				siteNodes[site][p.Name] = true
-			}
-		}
-	}
-
-	if len(siteNodes) == 0 {
-		siteNodes = make(map[string]map[string]bool)
-	}
-
-	result := make(map[string]*SiteMatrix)
-	selfMatrixStatusFromCNI := func(node *NodeStatusResponse) string {
-		if node.NodeInfo.WireGuard != nil && strings.TrimSpace(node.NodeInfo.WireGuard.Interface) != "" {
-			return "up"
-		}
-
-		return ""
-	}
-
-	buildScopeMatrix := func(nodeSet map[string]bool) *SiteMatrix {
-		if len(nodeSet) == 0 || len(nodeSet) > 100 {
-			return nil
-		}
-
-		nodeNames := make([]string, 0, len(nodeSet))
-		for name := range nodeSet {
-			nodeNames = append(nodeNames, name)
-		}
-
-		sort.Strings(nodeNames)
-
-		results := make(map[string]map[string]string)
-		for _, srcNode := range nodeNames {
-			results[srcNode] = make(map[string]string)
-			if node, ok := nodeByName[srcNode]; ok {
-				results[srcNode][srcNode] = selfMatrixStatusFromCNI(node)
-			}
-
-			for _, peer := range nodePeers[srcNode] {
-				if !isConnectivityMatrixPeer(peer) {
-					continue
-				}
-
-				tgtNode := peer.Name
-				if tgtNode == "" || tgtNode == srcNode || !nodeSet[tgtNode] {
-					continue
-				}
-
-				cellStatus := ""
-				if peer.HealthCheck != nil {
-					cellStatus = peer.HealthCheck.Status
-				} else if peer.PeerType == "gateway" && !peer.Tunnel.LastHandshake.IsZero() {
-					cellStatus = "up"
-				}
-
-				results[srcNode][tgtNode] = cellStatus
-			}
-		}
-
-		return &SiteMatrix{Nodes: nodeNames, Results: results}
-	}
-
-	for site, nodeSet := range siteNodes {
-		scopeMatrix := buildScopeMatrix(nodeSet)
-		if scopeMatrix != nil {
-			result[site] = scopeMatrix
-		}
-	}
-
-	for _, pool := range gatewayPools {
-		poolName := strings.TrimSpace(pool.Name)
-		if poolName == "" {
-			continue
-		}
-
-		poolNodeSet := make(map[string]bool)
-
-		for _, gatewayName := range pool.Gateways {
-			name := strings.TrimSpace(gatewayName)
-			if name == "" {
-				continue
-			}
-
-			poolNodeSet[name] = true
-			for _, peer := range nodePeers[name] {
-				if !isConnectivityMatrixPeer(peer) {
-					continue
-				}
-
-				peerName := strings.TrimSpace(peer.Name)
-				if peerName == "" {
-					continue
-				}
-
-				if _, ok := nodeByName[peerName]; ok {
-					poolNodeSet[peerName] = true
-				}
-			}
-
-			for srcNodeName, peers := range nodePeers {
-				for _, peer := range peers {
-					if !isConnectivityMatrixPeer(peer) {
-						continue
-					}
-
-					if strings.TrimSpace(peer.Name) == name {
-						if _, ok := nodeByName[srcNodeName]; ok {
-							poolNodeSet[srcNodeName] = true
-						}
-
-						break
-					}
-				}
-			}
-		}
-
-		scopeMatrix := buildScopeMatrix(poolNodeSet)
-		if scopeMatrix != nil {
-			result["pool:"+poolName] = scopeMatrix
-		}
-	}
-
-	if len(result) == 0 {
-		return nil
-	}
-
-	return result
-}
-
-func isConnectivityMatrixPeer(peer WireGuardPeerStatus) bool {
-	return peer.PeerType == "site" || peer.PeerType == "gateway"
-}
diff --git a/cmd/unbounded-net-controller/cluster_status_test.go b/cmd/unbounded-net-controller/cluster_status_test.go
index 1caaeb41f..00d717c1d 100644
--- a/cmd/unbounded-net-controller/cluster_status_test.go
+++ b/cmd/unbounded-net-controller/cluster_status_test.go
@@ -7,7 +7,6 @@ import (
 	"context"
 	"fmt"
 	"slices"
-	"strconv"
 	"strings"
 	"testing"
 	"time"
@@ -447,88 +446,6 @@ func TestNodeReadinessAndLatestUpdateTime(t *testing.T) {
 	}
 }
 
-// TestBuildConnectivityMatrix tests BuildConnectivityMatrix.
-func TestBuildConnectivityMatrix(t *testing.T) {
-	now := time.Now().Add(-75 * time.Second)
-
-	nodes := []*NodeStatusResponse{
-		{
-			NodeInfo: NodeInfo{Name: "node-a", SiteName: "site-a", WireGuard: &WireGuardStatusInfo{Interface: "wg51820"}},
-			Peers: []WireGuardPeerStatus{
-				{Name: "node-b", PeerType: "site", HealthCheck: &HealthCheckPeerStatus{Status: "up", Uptime: "15s"}},
-				{Name: "gw-a", PeerType: "gateway", SiteName: "site-a", Tunnel: PeerTunnelStatus{LastHandshake: now}},
-				{Name: "gw-remote", PeerType: "gateway", SiteName: "site-b", Tunnel: PeerTunnelStatus{LastHandshake: now}},
-			},
-		},
-		{
-			NodeInfo: NodeInfo{Name: "node-b", SiteName: "site-a"},
-			Peers: []WireGuardPeerStatus{
-				{Name: "node-a", PeerType: "site", HealthCheck: &HealthCheckPeerStatus{Status: "down", Uptime: "3s"}},
-			},
-		},
-	}
-	for i := 0; i < 101; i++ {
-		nodes = append(nodes, &NodeStatusResponse{NodeInfo: NodeInfo{Name: "big-" + strconv.Itoa(i), SiteName: "site-big"}})
-	}
-
-	gatewayPools := []GatewayPoolStatus{{
-		Name:     "pool-a",
-		Gateways: []string{"gw-a"},
-	}}
-
-	matrix := buildConnectivityMatrix(nodes, gatewayPools)
-	if matrix == nil {
-		t.Fatalf("expected non-nil connectivity matrix")
-	}
-
-	if _, ok := matrix["site-big"]; ok {
-		t.Fatalf("expected site-big to be skipped when >100 nodes")
-	}
-
-	site := matrix["site-a"]
-	if site == nil {
-		t.Fatalf("expected site-a matrix")
-	}
-
-	if !slices.Equal(site.Nodes, []string{"gw-a", "node-a", "node-b"}) {
-		t.Fatalf("unexpected node list: %#v", site.Nodes)
-	}
-
-	if got := site.Results["node-a"]["node-b"]; got != "up" {
-		t.Fatalf("unexpected node-a->node-b status: %q", got)
-	}
-
-	gatewayCell := site.Results["node-a"]["gw-a"]
-	if gatewayCell != "up" {
-		t.Fatalf("unexpected gateway fallback cell: %q", gatewayCell)
-	}
-
-	if _, ok := site.Results["node-a"]["gw-remote"]; ok {
-		t.Fatalf("did not expect remote-site gateway in site matrix")
-	}
-
-	if got := site.Results["node-a"]["node-a"]; got != "up" {
-		t.Fatalf("expected self cell for node-a to be up from CNI health, got %q", got)
-	}
-
-	if got := site.Results["node-b"]["node-b"]; got != "" {
-		t.Fatalf("expected self cell for node-b to be unknown when CNI health is unavailable, got %q", got)
-	}
-
-	pool := matrix["pool:pool-a"]
-	if pool == nil {
-		t.Fatalf("expected pool:pool-a matrix")
-	}
-
-	if !slices.Equal(pool.Nodes, []string{"gw-a", "node-a"}) {
-		t.Fatalf("unexpected pool node list: %#v", pool.Nodes)
-	}
-
-	if got := pool.Results["node-a"]["gw-a"]; got != "up" {
-		t.Fatalf("unexpected node-a->gw-a pool status: %q", got)
-	}
-}
-
 // TestCollectClusterProblemsIncludesUnhealthySignals tests CollectClusterProblemsIncludesUnhealthySignals.
 func TestCollectClusterProblemsIncludesUnhealthySignals(t *testing.T) {
 	expectedTrue := true
diff --git a/cmd/unbounded-net-controller/matrix_memory_test.go b/cmd/unbounded-net-controller/matrix_memory_test.go
deleted file mode 100644
index e7ed3f048..000000000
--- a/cmd/unbounded-net-controller/matrix_memory_test.go
+++ /dev/null
@@ -1,113 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// SPDX-License-Identifier: Apache-2.0
-
-package main
-
-import (
-	"bytes"
-	"encoding/json"
-	"fmt"
-	"slices"
-	"testing"
-	"time"
-)
-
-func TestConnectivityMatrixMixedScopesPreservesPeers(t *testing.T) {
-	nodes := make([]*NodeStatusResponse, 0, 102)
-	for i := range 101 {
-		nodes = append(nodes, &NodeStatusResponse{NodeInfo: NodeInfo{
-			Name: fmt.Sprintf("node-%d", i), SiteName: "large",
-		}})
-	}
-
-	nodes[0].Peers = []WireGuardPeerStatus{{
-		Name: "gateway", PeerType: "gateway", SiteName: "small",
-		Tunnel: PeerTunnelStatus{LastHandshake: time.Unix(1, 0)},
-	}}
-	nodes[1].Peers = []WireGuardPeerStatus{{Name: "gateway", PeerType: "ignored"}}
-	nodes = append(nodes, &NodeStatusResponse{
-		NodeInfo: NodeInfo{Name: "gateway", SiteName: "small"},
-		Peers: []WireGuardPeerStatus{
-			{Name: "node-0", PeerType: "site", HealthCheck: &HealthCheckPeerStatus{Status: "up"}},
-			{Name: "node-0", PeerType: "ignored", HealthCheck: &HealthCheckPeerStatus{Status: "down"}},
-			{Name: "node-2", PeerType: "ignored"},
-			{Name: "gateway", PeerType: "ignored", HealthCheck: &HealthCheckPeerStatus{Status: "down"}},
-		},
-	})
-
-	before, err := json.Marshal(nodes)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	matrix := buildConnectivityMatrix(nodes, []GatewayPoolStatus{{Name: "pool", Gateways: []string{"gateway"}}})
-	if _, ok := matrix["large"]; ok {
-		t.Fatal("oversized site produced a matrix")
-	}
-
-	if matrix["small"] == nil || !slices.Equal(matrix["small"].Nodes, []string{"gateway"}) {
-		t.Fatalf("small site lost its matrix: %+v", matrix["small"])
-	}
-
-	pool := matrix["pool:pool"]
-	if pool == nil || !slices.Equal(pool.Nodes, []string{"gateway", "node-0"}) {
-		t.Fatalf("small pool crossing a large site has wrong membership: %+v", pool)
-	}
-
-	if pool.Results["gateway"]["node-0"] != "up" || pool.Results["node-0"]["gateway"] != "up" {
-		t.Fatalf("pool connectivity changed: %+v", pool.Results)
-	}
-
-	after, err := json.Marshal(nodes)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if !bytes.Equal(before, after) {
-		t.Fatal("matrix construction mutated the shared node snapshots")
-	}
-}
-
-func TestConnectivityMatrixDoesNotCopyPeerSlices(t *testing.T) {
-	nodes := matrixBenchmarkNodes(200)
-
-	peers := matrixBenchmarkNodes(2000)[0].Peers
-	for _, node := range nodes {
-		node.Peers = peers
-	}
-
-	var matrix map[string]*SiteMatrix
-
-	result := testing.Benchmark(func(b *testing.B) {
-		for b.Loop() {
-			matrix = buildConnectivityMatrix(nodes, nil)
-		}
-	})
-
-	if matrix != nil {
-		t.Fatal("oversized site produced a matrix")
-	}
-	// Allow map bookkeeping, but not storage proportional to every peer.
-	if allocated := result.AllocedBytesPerOp(); allocated > 512*1024 {
-		t.Fatalf("matrix copied peer data: %d bytes per call", allocated)
-	}
-}
-
-func TestConnectivityMatrixSizeBoundary(t *testing.T) {
-	for _, count := range []int{0, 100, 101} {
-		t.Run(fmt.Sprintf("nodes-%d", count), func(t *testing.T) {
-			matrix := buildConnectivityMatrix(matrixBenchmarkNodes(count), nil)
-			if count != 100 {
-				if matrix != nil {
-					t.Fatal("empty or oversized site produced a matrix")
-				}
-
-				return
-			}
-
-			if matrix["site-a"] == nil || len(matrix["site-a"].Nodes) != count {
-				t.Fatal("site at the size limit lost its matrix")
-			}
-		})
-	}
-}
diff --git a/cmd/unbounded-net-controller/memory_bench_test.go b/cmd/unbounded-net-controller/memory_bench_test.go
index ca548d0a6..1ccc15873 100644
--- a/cmd/unbounded-net-controller/memory_bench_test.go
+++ b/cmd/unbounded-net-controller/memory_bench_test.go
@@ -68,37 +68,3 @@ func BenchmarkProtoWSStatusFrame(b *testing.B) {
 		})
 	}
 }
-
-func matrixBenchmarkNodes(count int) []*NodeStatusResponse {
-	peers := make([]WireGuardPeerStatus, count)
-
-	nodes := make([]*NodeStatusResponse, count)
-	for i := range count {
-		name := fmt.Sprintf("node-%d", i)
-		peers[i] = WireGuardPeerStatus{Name: name, PeerType: "site", SiteName: "site-a"}
-		nodes[i] = &NodeStatusResponse{
-			NodeInfo: NodeInfo{Name: name, SiteName: "site-a"},
-			Peers:    peers,
-		}
-	}
-
-	return nodes
-}
-
-func BenchmarkBuildConnectivityMatrix(b *testing.B) {
-	for _, count := range []int{100, 101, 2000} {
-		b.Run(fmt.Sprintf("nodes-%d", count), func(b *testing.B) {
-			nodes := matrixBenchmarkNodes(count)
-
-			b.ReportAllocs()
-			b.ResetTimer()
-
-			for b.Loop() {
-				matrix := buildConnectivityMatrix(nodes, nil)
-				if count > 100 && matrix != nil {
-					b.Fatal("oversized site produced a matrix")
-				}
-			}
-		})
-	}
-}
diff --git a/cmd/unbounded-net-controller/status_types.go b/cmd/unbounded-net-controller/status_types.go
index 98b72c1bd..567a13be5 100644
--- a/cmd/unbounded-net-controller/status_types.go
+++ b/cmd/unbounded-net-controller/status_types.go
@@ -14,42 +14,40 @@ import (
 
 // ClusterStatusResponse is the top-level status response for the cluster.
 type ClusterStatusResponse struct {
-	Seq                uint64                 `json:"seq"`
-	Timestamp          time.Time              `json:"timestamp"`
-	NodeCount          int                    `json:"nodeCount"`
-	SiteCount          int                    `json:"siteCount"`
-	AzureTenantID      string                 `json:"azureTenantId,omitempty"`
-	LeaderInfo         *LeaderInfo            `json:"leaderInfo,omitempty"`
-	BuildInfo          *BuildInfo             `json:"buildInfo,omitempty"`
-	Nodes              []*NodeStatusResponse  `json:"nodes"`
-	Sites              []SiteStatus           `json:"sites"`
-	GatewayPools       []GatewayPoolStatus    `json:"gatewayPools"`
-	Peerings           []PeeringStatus        `json:"peerings"`
-	Errors             []string               `json:"errors,omitempty"`
-	Warnings           []string               `json:"warnings,omitempty"`
-	Problems           []StatusProblem        `json:"problems"`
-	ConnectivityMatrix map[string]*SiteMatrix `json:"connectivityMatrix,omitempty"`
-	PullEnabled        bool                   `json:"pullEnabled"`
+	Seq           uint64                `json:"seq"`
+	Timestamp     time.Time             `json:"timestamp"`
+	NodeCount     int                   `json:"nodeCount"`
+	SiteCount     int                   `json:"siteCount"`
+	AzureTenantID string                `json:"azureTenantId,omitempty"`
+	LeaderInfo    *LeaderInfo           `json:"leaderInfo,omitempty"`
+	BuildInfo     *BuildInfo            `json:"buildInfo,omitempty"`
+	Nodes         []*NodeStatusResponse `json:"nodes"`
+	Sites         []SiteStatus          `json:"sites"`
+	GatewayPools  []GatewayPoolStatus   `json:"gatewayPools"`
+	Peerings      []PeeringStatus       `json:"peerings"`
+	Errors        []string              `json:"errors,omitempty"`
+	Warnings      []string              `json:"warnings,omitempty"`
+	Problems      []StatusProblem       `json:"problems"`
+	PullEnabled   bool                  `json:"pullEnabled"`
 }
 
 // ClusterStatusDelta is a WebSocket delta update.
 type ClusterStatusDelta struct {
-	Seq                uint64                 `json:"seq"`
-	Timestamp          time.Time              `json:"timestamp"`
-	NodeCount          int                    `json:"nodeCount"`
-	SiteCount          int                    `json:"siteCount"`
-	AzureTenantID      string                 `json:"azureTenantId,omitempty"`
-	LeaderInfo         *LeaderInfo            `json:"leaderInfo,omitempty"`
-	Errors             []string               `json:"errors,omitempty"`
-	Warnings           []string               `json:"warnings,omitempty"`
-	Problems           []StatusProblem        `json:"problems"`
-	UpdatedNodes       []json.RawMessage      `json:"updatedNodes,omitempty"`
-	RemovedNodes       []string               `json:"removedNodes,omitempty"`
-	Sites              []SiteStatus           `json:"sites"`
-	GatewayPools       []GatewayPoolStatus    `json:"gatewayPools"`
-	Peerings           []PeeringStatus        `json:"peerings"`
-	ConnectivityMatrix map[string]*SiteMatrix `json:"connectivityMatrix,omitempty"`
-	PullEnabled        bool                   `json:"pullEnabled"`
+	Seq           uint64              `json:"seq"`
+	Timestamp     time.Time           `json:"timestamp"`
+	NodeCount     int                 `json:"nodeCount"`
+	SiteCount     int                 `json:"siteCount"`
+	AzureTenantID string              `json:"azureTenantId,omitempty"`
+	LeaderInfo    *LeaderInfo         `json:"leaderInfo,omitempty"`
+	Errors        []string            `json:"errors,omitempty"`
+	Warnings      []string            `json:"warnings,omitempty"`
+	Problems      []StatusProblem     `json:"problems"`
+	UpdatedNodes  []json.RawMessage   `json:"updatedNodes,omitempty"`
+	RemovedNodes  []string            `json:"removedNodes,omitempty"`
+	Sites         []SiteStatus        `json:"sites"`
+	GatewayPools  []GatewayPoolStatus `json:"gatewayPools"`
+	Peerings      []PeeringStatus     `json:"peerings"`
+	PullEnabled   bool                `json:"pullEnabled"`
 }
 
 // StatusProblem describes one unhealthy condition surfaced in cluster status.
@@ -149,22 +147,21 @@ type BpfEntry = statusv1alpha1.BpfEntry
 // everything from ClusterStatusResponse except detailed per-node status
 // (routes, peers, health check details), replacing those with NodeSummary rows.
 type ClusterSummary struct {
-	Seq                uint64                 `json:"seq"`
-	Timestamp          time.Time              `json:"timestamp"`
-	NodeCount          int                    `json:"nodeCount"`
-	SiteCount          int                    `json:"siteCount"`
-	AzureTenantID      string                 `json:"azureTenantId,omitempty"`
-	LeaderInfo         *LeaderInfo            `json:"leaderInfo,omitempty"`
-	BuildInfo          *BuildInfo             `json:"buildInfo,omitempty"`
-	Sites              []SiteStatus           `json:"sites"`
-	GatewayPools       []GatewayPoolStatus    `json:"gatewayPools"`
-	Peerings           []PeeringStatus        `json:"peerings"`
-	Errors             []string               `json:"errors,omitempty"`
-	Warnings           []string               `json:"warnings,omitempty"`
-	Problems           []StatusProblem        `json:"problems"`
-	PullEnabled        bool                   `json:"pullEnabled"`
-	NodeSummaries      []NodeSummary          `json:"nodeSummaries"`
-	ConnectivityMatrix map[string]*SiteMatrix `json:"connectivityMatrix,omitempty"`
+	Seq           uint64              `json:"seq"`
+	Timestamp     time.Time           `json:"timestamp"`
+	NodeCount     int                 `json:"nodeCount"`
+	SiteCount     int                 `json:"siteCount"`
+	AzureTenantID string              `json:"azureTenantId,omitempty"`
+	LeaderInfo    *LeaderInfo         `json:"leaderInfo,omitempty"`
+	BuildInfo     *BuildInfo          `json:"buildInfo,omitempty"`
+	Sites         []SiteStatus        `json:"sites"`
+	GatewayPools  []GatewayPoolStatus `json:"gatewayPools"`
+	Peerings      []PeeringStatus     `json:"peerings"`
+	Errors        []string            `json:"errors,omitempty"`
+	Warnings      []string            `json:"warnings,omitempty"`
+	Problems      []StatusProblem     `json:"problems"`
+	PullEnabled   bool                `json:"pullEnabled"`
+	NodeSummaries []NodeSummary       `json:"nodeSummaries"`
 }
 
 // NodeSummary is a compact per-node summary for use in ClusterSummary.
@@ -251,22 +248,21 @@ func buildClusterSummary(status *ClusterStatusResponse) *ClusterSummary {
 	sort.Slice(summaries, func(i, j int) bool { return summaries[i].Name < summaries[j].Name })
 
 	return &ClusterSummary{
-		Seq:                status.Seq,
-		Timestamp:          status.Timestamp,
-		NodeCount:          status.NodeCount,
-		SiteCount:          status.SiteCount,
-		AzureTenantID:      status.AzureTenantID,
-		LeaderInfo:         status.LeaderInfo,
-		BuildInfo:          status.BuildInfo,
-		Sites:              status.Sites,
-		GatewayPools:       status.GatewayPools,
-		Peerings:           status.Peerings,
-		Errors:             status.Errors,
-		Warnings:           status.Warnings,
-		Problems:           status.Problems,
-		PullEnabled:        status.PullEnabled,
-		NodeSummaries:      summaries,
-		ConnectivityMatrix: status.ConnectivityMatrix,
+		Seq:           status.Seq,
+		Timestamp:     status.Timestamp,
+		NodeCount:     status.NodeCount,
+		SiteCount:     status.SiteCount,
+		AzureTenantID: status.AzureTenantID,
+		LeaderInfo:    status.LeaderInfo,
+		BuildInfo:     status.BuildInfo,
+		Sites:         status.Sites,
+		GatewayPools:  status.GatewayPools,
+		Peerings:      status.Peerings,
+		Errors:        status.Errors,
+		Warnings:      status.Warnings,
+		Problems:      status.Problems,
+		PullEnabled:   status.PullEnabled,
+		NodeSummaries: summaries,
 	}
 }
 
@@ -330,33 +326,26 @@ type PeeringStatus struct {
 	HealthCheckEnabled bool     `json:"healthCheckEnabled,omitempty"`
 }
 
-// SiteMatrix contains connectivity results across site nodes.
-type SiteMatrix struct {
-	Nodes   []string                     `json:"nodes"`
-	Results map[string]map[string]string `json:"results"` // src -> dst -> status
-}
-
 // ClusterSummaryDelta contains only the fields of ClusterSummary that changed
 // since the last broadcast. NodeSummaries contains only added/changed entries;
 // RemovedNodes lists nodes that disappeared.
 type ClusterSummaryDelta struct {
-	Seq                uint64                 `json:"seq"`
-	Timestamp          time.Time              `json:"timestamp"`
-	NodeCount          *int                   `json:"nodeCount,omitempty"`
-	SiteCount          *int                   `json:"siteCount,omitempty"`
-	AzureTenantID      *string                `json:"azureTenantId,omitempty"`
-	LeaderInfo         *LeaderInfo            `json:"leaderInfo,omitempty"`
-	BuildInfo          *BuildInfo             `json:"buildInfo,omitempty"`
-	Sites              []SiteStatus           `json:"sites,omitempty"`
-	GatewayPools       []GatewayPoolStatus    `json:"gatewayPools,omitempty"`
-	Peerings           []PeeringStatus        `json:"peerings,omitempty"`
-	Errors             []string               `json:"errors,omitempty"`
-	Warnings           []string               `json:"warnings,omitempty"`
-	Problems           []StatusProblem        `json:"problems,omitempty"`
-	PullEnabled        *bool                  `json:"pullEnabled,omitempty"`
-	NodeSummaries      []NodeSummary          `json:"nodeSummaries,omitempty"`
-	RemovedNodes       []string               `json:"removedNodes,omitempty"`
-	ConnectivityMatrix map[string]*SiteMatrix `json:"connectivityMatrix,omitempty"`
+	Seq           uint64              `json:"seq"`
+	Timestamp     time.Time           `json:"timestamp"`
+	NodeCount     *int                `json:"nodeCount,omitempty"`
+	SiteCount     *int                `json:"siteCount,omitempty"`
+	AzureTenantID *string             `json:"azureTenantId,omitempty"`
+	LeaderInfo    *LeaderInfo         `json:"leaderInfo,omitempty"`
+	BuildInfo     *BuildInfo          `json:"buildInfo,omitempty"`
+	Sites         []SiteStatus        `json:"sites,omitempty"`
+	GatewayPools  []GatewayPoolStatus `json:"gatewayPools,omitempty"`
+	Peerings      []PeeringStatus     `json:"peerings,omitempty"`
+	Errors        []string            `json:"errors,omitempty"`
+	Warnings      []string            `json:"warnings,omitempty"`
+	Problems      []StatusProblem     `json:"problems,omitempty"`
+	PullEnabled   *bool               `json:"pullEnabled,omitempty"`
+	NodeSummaries []NodeSummary       `json:"nodeSummaries,omitempty"`
+	RemovedNodes  []string            `json:"removedNodes,omitempty"`
 }
 
 // computeClusterSummaryDelta computes a delta between two ClusterSummary snapshots.
@@ -437,11 +426,6 @@ func computeClusterSummaryDelta(prev, curr *ClusterSummary) *ClusterSummaryDelta
 		changed = true
 	}
 
-	if !jsonEqual(prev.ConnectivityMatrix, curr.ConnectivityMatrix) {
-		delta.ConnectivityMatrix = curr.ConnectivityMatrix
-		changed = true
-	}
-
 	// NodeSummaries: diff by name
 	prevByName := make(map[string]NodeSummary, len(prev.NodeSummaries))
 	for _, ns := range prev.NodeSummaries {
diff --git a/cmd/unbounded-net-controller/websocket.go b/cmd/unbounded-net-controller/websocket.go
index 0a9ceaf82..7a4bda15d 100644
--- a/cmd/unbounded-net-controller/websocket.go
+++ b/cmd/unbounded-net-controller/websocket.go
@@ -321,8 +321,8 @@ func (b *WSBroadcaster) broadcastUpdate(ctx context.Context) {
 				return
 			}
 
-			klog.V(4).Infof("WebSocket: summary delta: %d nodeSummaries, %d removed, sites=%v pools=%v matrix=%v",
-				len(delta.NodeSummaries), len(delta.RemovedNodes), delta.Sites != nil, delta.GatewayPools != nil, delta.ConnectivityMatrix != nil)
+			klog.V(4).Infof("WebSocket: summary delta: %d nodeSummaries, %d removed, sites=%v pools=%v",
+				len(delta.NodeSummaries), len(delta.RemovedNodes), delta.Sites != nil, delta.GatewayPools != nil)
 			msg := WSMessage{Type: "cluster_summary_delta", Data: delta}
 			summaryData, _ = json.Marshal(msg) //nolint:errcheck
 		} else {
@@ -422,9 +422,6 @@ func (b *WSBroadcaster) broadcastUpdate(ctx context.Context) {
 		PullEnabled:   status.PullEnabled,
 	}
 
-	// Always include ConnectivityMatrix so link-state-only changes refresh clients.
-	delta.ConnectivityMatrix = status.ConnectivityMatrix
-
 	msg := WSMessage{Type: "cluster_status_delta", Data: delta}
 
 	deltaData, err := json.Marshal(msg)
diff --git a/docs/net/operations.md b/docs/net/operations.md
index 77d3a073c..735d7cfd1 100644
--- a/docs/net/operations.md
+++ b/docs/net/operations.md
@@ -212,7 +212,6 @@ kubectl unbounded-system controller proxy
 The dashboard displays:
 - **Overview**: Cluster health summary with node counts, site counts, and gateway status
 - **Sites**: All configured sites with node counts and health indicators
-- **Connectivity Matrix**: Visual representation of node-to-node connectivity (pingmesh results)
 - **Nodes**: Detailed list of all nodes with filtering, sorting, and pagination
   - Tunnel peer status (WireGuard peers or eBPF tunnel endpoints)
   - Gateway health for each node
@@ -225,12 +224,10 @@ The dashboard uses **WebSocket** for real-time updates with delta compression, f
 - Filtering nodes by name, site, or role (gateway/worker)
 - Sorting by any column
 - Auto-sizing pagination based on screen height
-- Expandable connectivity matrix with zoom and labels
 - Dark/light theme toggle
 
-Connectivity matrices are omitted for site or gateway-pool scopes containing
-more than 100 nodes. Smaller scopes remain visible even when other scopes
-exceed that limit.
+The dashboard does not render a site connectivity graph or connectivity matrix.
+Use the Site summaries and filtered node list to inspect individual resources.
 
 ### Health Endpoints
 
diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx
index 63bb576f4..02cac42a7 100644
--- a/frontend/src/App.tsx
+++ b/frontend/src/App.tsx
@@ -4,7 +4,6 @@
 import * as React from 'react';
 import { Suspense, useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import NodeTable from './components/nodes/NodesTable';
-import NetworkCard from './components/dashboard/NetworkCard';
 import SitesCard from './components/network/SitesCard';
 import StatusJsonModal from './components/status/StatusJsonModal';
 import ErrorBoundary from './components/common/ErrorBoundary';
@@ -23,7 +22,6 @@ export default function App() {
   } = useClusterStatus();
   const nodes = status?.nodes || [];
   const sites = summary?.sites || status?.sites || [];
-  const peerings = summary?.peerings || status?.peerings || [];
   const gatewayPools = summary?.gatewayPools || status?.gatewayPools || [];
   const nodeSummaries = summary?.nodeSummaries || [];
   const [hiddenSites, setHiddenSites] = useState<Set<string>>(new Set());
@@ -32,8 +30,7 @@ export default function App() {
   const [selectedNodeDetailTab, setSelectedNodeDetailTab] = useState<'peerings' | 'routes' | 'bpf'>('peerings');
   const [pullEnabledOptimistic, setPullEnabledOptimistic] = useState<boolean | null>(null);
   const [selectedNodeTypesFilter, setSelectedNodeTypesFilter] = useState<Set<string>>(new Set(['Gateway', 'Worker']));
-  const [networkTab, setNetworkTab] = useState<'siteTopology' | 'matrix'>('siteTopology');
-  const [maximizedPanel, setMaximizedPanel] = useState<'nodes' | 'siteTopology' | 'matrix' | null>(null);
+  const [maximizedPanel, setMaximizedPanel] = useState<'nodes' | null>(null);
   const [infoOpen, setInfoOpen] = useState(false);
   const [statusJsonOpen, setStatusJsonOpen] = useState(false);
   const [errorsDismissed, setErrorsDismissed] = useState(false);
@@ -52,12 +49,6 @@ export default function App() {
     window.localStorage.setItem('theme', theme);
   }, [theme]);
 
-  useEffect(() => {
-    if (maximizedPanel === 'siteTopology' || maximizedPanel === 'matrix') {
-      setNetworkTab(maximizedPanel);
-    }
-  }, [maximizedPanel]);
-
   useEffect(() => {
     if (!maximizedPanel) return;
     const onKeyDown = (event: KeyboardEvent) => {
@@ -217,9 +208,7 @@ export default function App() {
   }, []);
 
   const {
-    activeNetworkTab,
     activeSelectedNode,
-    edgeHealthCheckCounts,
     effectivePullEnabled,
     gatewayByNode,
     nodeK8sStatusMap,
@@ -227,7 +216,6 @@ export default function App() {
     nodeTotalCount,
     peerHealth,
     poolCounts,
-    poolToSite,
     siteCounts,
     visibleNodeSummaries
   } = useDashboardData({
@@ -239,8 +227,6 @@ export default function App() {
     gatewayPoolHiddenNames: hiddenGatewayPools,
     hiddenSites,
     selectedNodeTypesFilter,
-    networkTab,
-    maximizedPanel,
     pullEnabledOptimistic,
     selectedNodeName,
     nodeDetail
@@ -272,18 +258,6 @@ export default function App() {
       ? 'Polling only'
       : 'No data';
 
-  const onSelectNetworkTab = (tab: 'siteTopology' | 'matrix') => {
-    if (maximizedPanel === 'siteTopology' || maximizedPanel === 'matrix') {
-      setMaximizedPanel(tab);
-      return;
-    }
-    setNetworkTab(tab);
-  };
-
-  const onToggleNetworkMaximize = (isMaximized: boolean) => {
-    setMaximizedPanel(isMaximized ? null : activeNetworkTab);
-  };
-
   const renderNodesCard = (isMaximized: boolean) => {
     const content = (
       <NodeTable
@@ -316,34 +290,12 @@ export default function App() {
   const buildInfo = summary?.buildInfo || status?.buildInfo;
   const leaderInfo = summary?.leaderInfo || status?.leaderInfo;
   const timestamp = summary?.timestamp || status?.timestamp;
-  const connectivityMatrix = summary?.connectivityMatrix || status?.connectivityMatrix;
 
   if (maximizedPanel) {
     return (
       <div className="app app-maximized">
         <div className="maximize-backdrop" onClick={() => setMaximizedPanel(null)}></div>
-        {maximizedPanel === 'nodes' ? renderNodesCard(true) : (
-          <NetworkCard
-            activeNetworkTab={activeNetworkTab}
-            edgeHealthCheckCounts={edgeHealthCheckCounts}
-            gatewayByNode={gatewayByNode}
-            nodeK8sStatusMap={nodeK8sStatusMap}
-            gatewayPools={gatewayPools}
-            hiddenGatewayPools={hiddenGatewayPools}
-            hiddenSites={hiddenSites}
-            isMaximized
-            nodeStatuses={nodes}
-            peerings={peerings}
-            poolCounts={poolCounts}
-            poolToSite={poolToSite}
-            siteCounts={siteCounts}
-            sites={sites}
-            statusMatrix={connectivityMatrix}
-            theme={theme}
-            onSelectTab={onSelectNetworkTab}
-            onToggleMaximize={() => onToggleNetworkMaximize(true)}
-          />
-        )}
+        {renderNodesCard(true)}
         <Suspense fallback={null}>
           <NodeDetailModal
             nodeName={selectedNodeName}
@@ -559,26 +511,6 @@ export default function App() {
               nodeSummaries={nodeSummaries}
               nodes={nodes}
             />
-            <NetworkCard
-              activeNetworkTab={activeNetworkTab}
-              edgeHealthCheckCounts={edgeHealthCheckCounts}
-              gatewayByNode={gatewayByNode}
-            nodeK8sStatusMap={nodeK8sStatusMap}
-              gatewayPools={gatewayPools}
-              hiddenGatewayPools={hiddenGatewayPools}
-              hiddenSites={hiddenSites}
-              isMaximized={false}
-              nodeStatuses={nodes}
-              peerings={peerings}
-              poolCounts={poolCounts}
-              poolToSite={poolToSite}
-              siteCounts={siteCounts}
-              sites={sites}
-              statusMatrix={connectivityMatrix}
-              theme={theme}
-              onSelectTab={onSelectNetworkTab}
-              onToggleMaximize={() => onToggleNetworkMaximize(false)}
-            />
           </div>
           <div>
             {loading && <div className="card">Loading...</div>}
diff --git a/frontend/src/api.ts b/frontend/src/api.ts
index 4036872df..49bce2631 100644
--- a/frontend/src/api.ts
+++ b/frontend/src/api.ts
@@ -90,10 +90,6 @@ export function mergeDelta(current: ClusterStatus | null, delta: ClusterStatusDe
     merged.nodes = Object.values(nodeMap);
   }
 
-  if (delta.connectivityMatrix !== undefined && delta.connectivityMatrix !== null) {
-    merged.connectivityMatrix = delta.connectivityMatrix || undefined;
-  }
-
   return merged;
 }
 
diff --git a/frontend/src/components/common/topologyIcons.tsx b/frontend/src/components/common/topologyIcons.tsx
deleted file mode 100644
index 0c81c0156..000000000
--- a/frontend/src/components/common/topologyIcons.tsx
+++ /dev/null
@@ -1,217 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// SPDX-License-Identifier: Apache-2.0
-
-import * as React from 'react';
-import { useEffect, useMemo } from 'react';
-import * as THREE from 'three';
-
-const gatewayPoolSvgIcon = `
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 572 42.22 40" preserveAspectRatio="xMidYMid meet">
-  <style>
-    .st1{fill:#00bbf1;stroke:none;stroke-linecap:round;stroke-linejoin:round;stroke-width:.75}
-    .st2{fill:#919191;stroke:none;stroke-linecap:round;stroke-linejoin:round;stroke-width:.75}
-    .st3{fill:#c5c5c5;stroke:none;stroke-linecap:round;stroke-linejoin:round;stroke-width:.75}
-    .st4{fill:#ffffff;stroke:none;stroke-linecap:round;stroke-linejoin:round;stroke-width:.75}
-  </style>
-  <g>
-    <g transform="translate(2.95521,-10.3094)"><path d="M37.33 585.68 L37.33 612 L0 612 L0 585.68 L37.39 585.59 L37.33 585.68 L37.33 585.68 Z" class="st1"/></g>
-    <g transform="translate(7.17693,0)"><path d="M20.26 603.97 C19.21 603.97 19.21 603.97 19.21 603.97 C9.24 603.97 9.24 603.97 9.24 603.97 C8.68 603.97 8.68 603.97 8.68 603.97 C10.05 608.8 8.18 609.52 0 609.52 C0 612 0 612 0 612 C10.48 612 10.48 612 10.48 612 C18.07 612 18.07 612 18.07 612 C27.86 612 27.86 612 27.86 612 C27.86 609.52 27.86 609.52 27.86 609.52 C19.71 609.52 18.89 608.8 20.26 603.97 Z" class="st2"/></g>
-    <g transform="translate(0,-8.02822)"><path d="M39.63 580.73 C2.37 580.73 2.37 580.73 2.37 580.73 C1.06 580.73 0 581.89 0 583.21 C0 609.62 0 609.62 0 609.62 C0 610.94 1.06 612 2.37 612 C39.63 612 39.63 612 39.63 612 C40.92 612 42.22 610.94 42.22 609.62 C42.22 583.21 42.22 583.21 42.22 583.21 C42.22 581.89 40.92 580.73 39.63 580.73 ZM39 584.03 C39 608.73 39 608.73 39 608.73 C3.25 608.73 3.25 608.73 3.25 608.73 C3.25 584.03 3.25 584.03 3.25 584.03 C39.08 583.95 39.08 583.95 39.08 583.95 L39 584.03 Z" class="st3"/></g>
-    <g transform="translate(6.48363,-15.7488)">
-      <g transform="translate(20.3825,0)"><path d="M8.87 604.07 L7.13 602.34 L1.01 596.33 L0 597.24 L6.95 604.07 L0 611.09 L1.01 612 L7.13 605.98 L8.87 604.07 L8.87 604.07 Z" class="st4"/></g>
-      <g><path d="M0 604.07 L1.73 602.34 L7.86 596.33 L8.87 597.24 L1.92 604.07 L8.87 611.09 L7.86 612 L1.73 605.98 L0 604.07 L0 604.07 Z" class="st4"/></g>
-      <g transform="translate(7.4917,-6.1882)"><path d="M3.57 610.26 C3.57 611.26 2.75 612 1.83 612 C0.91 612 0 611.17 0 610.26 C-0 609.35 0.74 608.53 1.83 608.53 C2.83 608.53 3.57 609.35 3.57 610.26 Z" class="st4"/></g>
-      <g transform="translate(12.7983,-6.1882)"><path d="M3.56 610.26 C3.56 611.26 2.74 612 1.83 612 C0.91 612 -0 611.17 0 610.26 C0 609.35 0.82 608.53 1.83 608.53 C2.83 608.53 3.56 609.35 3.56 610.26 Z" class="st4"/></g>
-      <g transform="translate(18.2784,-6.1882)"><path d="M3.48 610.26 C3.48 609.3 2.69 608.53 1.73 608.53 C0.79 608.53 -0 609.3 0 610.26 C0 611.22 0.79 612 1.73 612 C2.69 612 3.48 611.22 3.48 610.26 Z" class="st4"/></g>
-    </g>
-  </g>
-</svg>`;
-
-const workerSiteSvgIcon = `
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 81 103.336" preserveAspectRatio="xMidYMid meet">
-  <style>
-    .st1{fill:#00bbf1;stroke:none;stroke-linecap:round;stroke-linejoin:round;stroke-width:.75}
-    .st2{fill:#c5c5c5;stroke:none;stroke-linecap:round;stroke-linejoin:round;stroke-width:.75}
-    .st3{fill:#e6f8fe;stroke:none;stroke-linecap:round;stroke-linejoin:round;stroke-width:.75}
-    .st4{fill:#ccf1fc;stroke:none;stroke-linecap:round;stroke-linejoin:round;stroke-width:.75}
-    .st5{fill:#80ddf8;stroke:none;stroke-linecap:round;stroke-linejoin:round;stroke-width:.75}
-    .st6{fill:#919191;stroke:none;stroke-linecap:round;stroke-linejoin:round;stroke-width:.75}
-  </style>
-  <g transform="translate(0,-22.4)">
-    <g transform="translate(0,-36.5878)">
-      <g transform="translate(4.19152,-3.23548)"><path d="M52.95 66 L52.95 103.34 L0 103.34 L0 66 L53.03 65.88 L52.95 66 L52.95 66 Z" class="st1"/></g>
-      <g><path d="M56.21 58.99 C3.37 58.99 3.37 58.99 3.37 58.99 C1.5 58.99 -0 60.64 0 62.51 C0 99.97 0 99.97 0 99.97 C-0 101.84 1.5 103.34 3.37 103.34 C56.21 103.34 56.21 103.34 56.21 103.34 C58.05 103.34 59.88 101.84 59.88 99.97 C59.88 62.51 59.88 62.51 59.88 62.51 C59.88 60.64 58.05 58.99 56.21 58.99 ZM55.31 63.67 C55.31 98.69 55.31 98.69 55.31 98.69 C4.6 98.69 4.6 98.69 4.6 98.69 C4.6 63.67 4.6 63.67 4.6 63.67 C55.43 63.56 55.43 63.56 55.43 63.56 L55.31 63.67 Z" class="st2"/></g>
-      <g transform="translate(19.1612,-22.7736)"><path d="M10.78 90.75 C10.67 90.75 10.67 90.75 10.55 90.75 C0.15 96.78 0.15 96.78 0.15 96.78 C-0 96.78 0 96.89 0 97.01 C0 97.12 -0 97.23 0.15 97.34 C10.67 103.34 10.67 103.34 10.67 103.34 C10.67 103.34 10.78 103.34 10.78 103.34 C10.93 103.34 10.93 103.34 11.04 103.34 C21.44 97.34 21.44 97.34 21.44 97.34 C21.56 97.34 21.56 97.23 21.56 97.12 C21.56 97.01 21.56 96.89 21.44 96.78 C10.93 90.75 10.93 90.75 10.93 90.75 C10.93 90.75 10.78 90.75 10.78 90.75 Z" class="st3"/></g>
-      <g transform="translate(17.3649,-7.79098)"><path d="M0.37 84.16 C0.26 84.16 0.26 84.16 0.15 84.16 C0 84.16 0 84.31 0 84.42 C0 96.82 0 96.82 0 96.82 C0 96.93 -0 97.04 0.15 97.16 C10.93 103.22 10.93 103.22 10.93 103.22 C10.93 103.34 11.04 103.34 11.04 103.34 C11.15 103.34 11.15 103.34 11.26 103.22 C11.26 103.22 11.38 103.11 11.38 103 C11.38 90.6 11.38 90.6 11.38 90.6 C11.38 90.49 11.26 90.38 11.26 90.38 C0.49 84.16 0.49 84.16 0.49 84.16 C0.49 84.16 0.37 84.16 0.37 84.16 Z" class="st4"/></g>
-      <g transform="translate(31.137,-7.79098)"><path d="M10.48 84.16 C10.48 84.16 10.37 84.16 10.37 84.31 C0.22 90.38 0.22 90.38 0.22 90.38 C0.11 90.49 0 90.6 0 90.71 C0 103 0 103 0 103 C0 103.11 0.11 103.22 0.22 103.22 C0.22 103.34 0.22 103.34 0.34 103.34 C0.34 103.34 0.45 103.34 0.45 103.22 C10.67 97.16 10.67 97.16 10.67 97.16 C10.78 97.04 10.78 96.93 10.78 96.82 C10.78 84.53 10.78 84.53 10.78 84.53 C10.78 84.42 10.78 84.31 10.67 84.31 C10.59 84.16 10.59 84.16 10.48 84.16 Z" class="st5"/></g>
-    </g>
-    <g transform="translate(10.3295,-23.8226)">
-      <g transform="translate(4.19152,-3.23548)"><path d="M52.95 66 L52.95 103.34 L0 103.34 L0 66 L53.03 65.88 L52.95 66 L52.95 66 Z" class="st1"/></g>
-      <g><path d="M56.21 58.99 C3.37 58.99 3.37 58.99 3.37 58.99 C1.5 58.99 -0 60.64 0 62.51 C0 99.97 0 99.97 0 99.97 C-0 101.84 1.5 103.34 3.37 103.34 C56.21 103.34 56.21 103.34 56.21 103.34 C58.05 103.34 59.88 101.84 59.88 99.97 C59.88 62.51 59.88 62.51 59.88 62.51 C59.88 60.64 58.05 58.99 56.21 58.99 ZM55.31 63.67 C55.31 98.69 55.31 98.69 55.31 98.69 C4.6 98.69 4.6 98.69 4.6 98.69 C4.6 63.67 4.6 63.67 4.6 63.67 C55.43 63.56 55.43 63.56 55.43 63.56 L55.31 63.67 Z" class="st2"/></g>
-      <g transform="translate(19.1612,-22.7736)"><path d="M10.78 90.75 C10.67 90.75 10.67 90.75 10.55 90.75 C0.15 96.78 0.15 96.78 0.15 96.78 C-0 96.78 0 96.89 0 97.01 C0 97.12 -0 97.23 0.15 97.34 C10.67 103.34 10.67 103.34 10.67 103.34 C10.67 103.34 10.78 103.34 10.78 103.34 C10.93 103.34 10.93 103.34 11.04 103.34 C21.44 97.34 21.44 97.34 21.44 97.34 C21.56 97.34 21.56 97.23 21.56 97.12 C21.56 97.01 21.56 96.89 21.44 96.78 C10.93 90.75 10.93 90.75 10.93 90.75 C10.93 90.75 10.78 90.75 10.78 90.75 Z" class="st3"/></g>
-      <g transform="translate(17.3649,-7.79098)"><path d="M0.37 84.16 C0.26 84.16 0.26 84.16 0.15 84.16 C0 84.16 0 84.31 0 84.42 C0 96.82 0 96.82 0 96.82 C0 96.93 -0 97.04 0.15 97.16 C10.93 103.22 10.93 103.22 10.93 103.22 C10.93 103.34 11.04 103.34 11.04 103.34 C11.15 103.34 11.15 103.34 11.26 103.22 C11.26 103.22 11.38 103.11 11.38 103 C11.38 90.6 11.38 90.6 11.38 90.6 C11.38 90.49 11.26 90.38 11.26 90.38 C0.49 84.16 0.49 84.16 0.49 84.16 C0.49 84.16 0.37 84.16 0.37 84.16 Z" class="st4"/></g>
-      <g transform="translate(31.137,-7.79098)"><path d="M10.48 84.16 C10.48 84.16 10.37 84.16 10.37 84.31 C0.22 90.38 0.22 90.38 0.22 90.38 C0.11 90.49 0 90.6 0 90.71 C0 103 0 103 0 103 C0 103.11 0.11 103.22 0.22 103.22 C0.22 103.34 0.22 103.34 0.34 103.34 C0.34 103.34 0.45 103.34 0.45 103.22 C10.67 97.16 10.67 97.16 10.67 97.16 C10.78 97.04 10.78 96.93 10.78 96.82 C10.78 84.53 10.78 84.53 10.78 84.53 C10.78 84.42 10.78 84.31 10.67 84.31 C10.59 84.16 10.59 84.16 10.48 84.16 Z" class="st5"/></g>
-    </g>
-    <g transform="translate(25.3127,-14.6223)"><path d="M52.95 66 L52.95 103.34 L0 103.34 L0 66 L53.03 65.88 L52.95 66 L52.95 66 Z" class="st1"/></g>
-    <g transform="translate(31.3006,0)"><path d="M28.74 91.95 C27.24 91.95 27.24 91.95 27.24 91.95 C13.1 91.95 13.1 91.95 13.1 91.95 C12.31 91.95 12.31 91.95 12.31 91.95 C14.26 98.8 11.6 99.82 0 99.82 C0 103.34 0 103.34 0 103.34 C14.86 103.34 14.86 103.34 14.86 103.34 C25.64 103.34 25.64 103.34 25.64 103.34 C39.52 103.34 39.52 103.34 39.52 103.34 C39.52 99.82 39.52 99.82 39.52 99.82 C27.96 99.82 26.8 98.8 28.74 91.95 Z" class="st6"/></g>
-    <g transform="translate(21.1212,-11.3868)"><path d="M56.21 58.99 C3.37 58.99 3.37 58.99 3.37 58.99 C1.5 58.99 -0 60.64 0 62.51 C0 99.97 0 99.97 0 99.97 C-0 101.84 1.5 103.34 3.37 103.34 C56.21 103.34 56.21 103.34 56.21 103.34 C58.05 103.34 59.88 101.84 59.88 99.97 C59.88 62.51 59.88 62.51 59.88 62.51 C59.88 60.64 58.05 58.99 56.21 58.99 ZM55.31 63.67 C55.31 98.69 55.31 98.69 55.31 98.69 C4.6 98.69 4.6 98.69 4.6 98.69 C4.6 63.67 4.6 63.67 4.6 63.67 C55.43 63.56 55.43 63.56 55.43 63.56 L55.31 63.67 Z" class="st2"/></g>
-    <g transform="translate(40.2824,-34.1605)"><path d="M10.78 90.75 C10.67 90.75 10.67 90.75 10.55 90.75 C0.15 96.78 0.15 96.78 0.15 96.78 C-0 96.78 0 96.89 0 97.01 C0 97.12 -0 97.23 0.15 97.34 C10.67 103.34 10.67 103.34 10.67 103.34 C10.67 103.34 10.78 103.34 10.78 103.34 C10.93 103.34 10.93 103.34 11.04 103.34 C21.44 97.34 21.44 97.34 21.44 97.34 C21.56 97.34 21.56 97.23 21.56 97.12 C21.56 97.01 21.56 96.89 21.44 96.78 C10.93 90.75 10.93 90.75 10.93 90.75 C10.93 90.75 10.78 90.75 10.78 90.75 Z" class="st3"/></g>
-    <g transform="translate(38.486,-19.1778)"><path d="M0.37 84.16 C0.26 84.16 0.26 84.16 0.15 84.16 C0 84.16 -0 84.31 0 84.42 C0 96.82 0 96.82 0 96.82 C0 96.93 -0 97.04 0.15 97.16 C10.93 103.22 10.93 103.22 10.93 103.22 C10.93 103.34 11.04 103.34 11.04 103.34 C11.15 103.34 11.15 103.34 11.26 103.22 C11.26 103.22 11.38 103.11 11.38 103 C11.38 90.6 11.38 90.6 11.38 90.6 C11.38 90.49 11.26 90.38 11.26 90.38 C0.49 84.16 0.49 84.16 0.49 84.16 C0.49 84.16 0.37 84.16 0.37 84.16 Z" class="st4"/></g>
-    <g transform="translate(52.2582,-19.1778)"><path d="M10.48 84.16 C10.48 84.16 10.37 84.16 10.37 84.31 C0.22 90.38 0.22 90.38 0.22 90.38 C0.11 90.49 0 90.6 0 90.71 C0 103 0 103 0 103 C0 103.11 0.11 103.22 0.22 103.22 C0.22 103.34 0.22 103.34 0.34 103.34 C0.34 103.34 0.45 103.34 0.45 103.22 C10.67 97.16 10.67 97.16 10.67 97.16 C10.78 97.04 10.78 96.93 10.78 96.82 C10.78 84.53 10.78 84.53 10.78 84.53 C10.78 84.42 10.78 84.31 10.67 84.31 C10.59 84.16 10.59 84.16 10.48 84.16 Z" class="st5"/></g>
-  </g>
-</svg>`;
-
-const maskFromSVG = (svg: string): string => {
-  return svg
-    .split('#00bbf1').join('#ffffff')
-    .split('#c5c5c5').join('#ffffff')
-    .split('#e6f8fe').join('#ffffff')
-    .split('#ccf1fc').join('#ffffff')
-    .split('#80ddf8').join('#ffffff')
-    .split('#919191').join('#ffffff');
-};
-
-type TopologyNodeIconTextures = {
-  gatewayPoolIconTexture: THREE.Texture;
-  workerSiteIconTexture: THREE.Texture;
-  gatewayPoolMaskTexture: THREE.Texture;
-  workerSiteMaskTexture: THREE.Texture;
-};
-
-type RenderTopologyNodeGlyphArgs = {
-  glyph: 'router' | 'vm' | 'default';
-  size: number;
-  color: string;
-  textures: TopologyNodeIconTextures;
-  workerOffsetScale?: number;
-};
-
-export function getTopologyNodeGlyph(group?: string): 'router' | 'vm' | 'default' {
-  if (group === 'pool' || group === 'gateway-node') {
-    return 'router';
-  }
-  if (group === 'site' || group === 'worker-node') {
-    return 'vm';
-  }
-  return 'default';
-}
-
-export function useTopologyNodeIconTextures(): TopologyNodeIconTextures {
-  const gatewayPoolIconTexture = useMemo(() => {
-    const texture = new THREE.TextureLoader().load(`data:image/svg+xml;utf8,${encodeURIComponent(gatewayPoolSvgIcon)}`);
-    texture.colorSpace = THREE.SRGBColorSpace;
-    texture.needsUpdate = true;
-    return texture;
-  }, []);
-
-  const workerSiteIconTexture = useMemo(() => {
-    const texture = new THREE.TextureLoader().load(`data:image/svg+xml;utf8,${encodeURIComponent(workerSiteSvgIcon)}`);
-    texture.colorSpace = THREE.SRGBColorSpace;
-    texture.needsUpdate = true;
-    return texture;
-  }, []);
-
-  const gatewayPoolMaskTexture = useMemo(() => {
-    const texture = new THREE.TextureLoader().load(`data:image/svg+xml;utf8,${encodeURIComponent(maskFromSVG(gatewayPoolSvgIcon))}`);
-    texture.colorSpace = THREE.SRGBColorSpace;
-    texture.needsUpdate = true;
-    return texture;
-  }, []);
-
-  const workerSiteMaskTexture = useMemo(() => {
-    const texture = new THREE.TextureLoader().load(`data:image/svg+xml;utf8,${encodeURIComponent(maskFromSVG(workerSiteSvgIcon))}`);
-    texture.colorSpace = THREE.SRGBColorSpace;
-    texture.needsUpdate = true;
-    return texture;
-  }, []);
-
-  useEffect(() => {
-    return () => {
-      gatewayPoolIconTexture.dispose();
-      workerSiteIconTexture.dispose();
-      gatewayPoolMaskTexture.dispose();
-      workerSiteMaskTexture.dispose();
-    };
-  }, [gatewayPoolIconTexture, workerSiteIconTexture, gatewayPoolMaskTexture, workerSiteMaskTexture]);
-
-  return {
-    gatewayPoolIconTexture,
-    workerSiteIconTexture,
-    gatewayPoolMaskTexture,
-    workerSiteMaskTexture
-  };
-}
-
-export function renderTopologyNodeGlyph({
-  glyph,
-  size,
-  color,
-  textures,
-  workerOffsetScale = -0.16
-}: RenderTopologyNodeGlyphArgs): React.ReactNode {
-  if (glyph === 'router') {
-    return (
-      <group>
-        <mesh position={[0, 0, 0.022]} renderOrder={10}>
-          <planeGeometry args={[size * 2.28, size * 2.18]} />
-          <meshBasicMaterial
-            alphaMap={textures.gatewayPoolMaskTexture}
-            color={color}
-            transparent
-            toneMapped={false}
-            opacity={1}
-            alphaTest={0.01}
-            depthTest={false}
-            depthWrite={false}
-          />
-        </mesh>
-        <mesh position={[0, 0, 0.024]} renderOrder={11}>
-          <planeGeometry args={[size * 2.0, size * 1.9]} />
-          <meshBasicMaterial
-            map={textures.gatewayPoolIconTexture}
-            transparent
-            toneMapped={false}
-            opacity={1}
-            alphaTest={0.01}
-            depthTest={false}
-            depthWrite={false}
-          />
-        </mesh>
-      </group>
-    );
-  }
-
-  if (glyph === 'vm') {
-    return (
-      <group>
-        <mesh position={[size * workerOffsetScale, 0, 0.022]} renderOrder={10}>
-          <planeGeometry args={[size * 2.48, size * 2.86]} />
-          <meshBasicMaterial
-            alphaMap={textures.workerSiteMaskTexture}
-            color={color}
-            transparent
-            toneMapped={false}
-            opacity={1}
-            alphaTest={0.01}
-            depthTest={false}
-            depthWrite={false}
-          />
-        </mesh>
-        <mesh position={[size * workerOffsetScale, 0, 0.024]} renderOrder={11}>
-          <planeGeometry args={[size * 2.12, size * 2.5]} />
-          <meshBasicMaterial
-            map={textures.workerSiteIconTexture}
-            transparent
-            toneMapped={false}
-            opacity={1}
-            alphaTest={0.01}
-            depthTest={false}
-            depthWrite={false}
-          />
-        </mesh>
-      </group>
-    );
-  }
-
-  return null;
-}
diff --git a/frontend/src/components/dashboard/NetworkCard.tsx b/frontend/src/components/dashboard/NetworkCard.tsx
deleted file mode 100644
index aa599c22e..000000000
--- a/frontend/src/components/dashboard/NetworkCard.tsx
+++ /dev/null
@@ -1,118 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// SPDX-License-Identifier: Apache-2.0
-
-import React, { Suspense } from 'react';
-import { CloseXIcon, MagnifyPlusIcon } from '../nodes/shared/index';
-import ConnectivityHeatmap from '../network/ConnectivityHeatmap';
-const Topology = React.lazy(() => import('../network/Topology'));
-import { GatewayPoolStatus, NodeStatus, PeeringStatus, SiteMatrix, SiteStatus } from '../../types';
-
-type NetworkTab = 'siteTopology' | 'matrix';
-
-type NetworkCardProps = {
-  activeNetworkTab: NetworkTab;
-  edgeHealthCheckCounts: Map<string, { up: number; total: number }>;
-  gatewayByNode: Map<string, string>;
-  gatewayPools: GatewayPoolStatus[];
-  hiddenGatewayPools: Set<string>;
-  hiddenSites: Set<string>;
-  isMaximized: boolean;
-  nodeStatuses: NodeStatus[];
-  peerings: PeeringStatus[];
-  poolCounts: Map<string, { online: number; total: number }>;
-  poolToSite: Map<string, string>;
-  siteCounts: Map<string, { online: number; total: number }>;
-  sites: SiteStatus[];
-  statusMatrix?: Record<string, SiteMatrix>;
-  theme: 'dark' | 'light';
-  onSelectTab: (tab: NetworkTab) => void;
-  onToggleMaximize: () => void;
-};
-
-function NetworkCard({
-  activeNetworkTab,
-  edgeHealthCheckCounts,
-  gatewayByNode,
-  gatewayPools,
-  hiddenGatewayPools,
-  hiddenSites,
-  isMaximized,
-  nodeStatuses,
-  peerings,
-  poolCounts,
-  poolToSite,
-  siteCounts,
-  sites,
-  statusMatrix,
-  theme,
-  onSelectTab,
-  onToggleMaximize
-}: NetworkCardProps) {
-  return (
-    <div className={`card network-card ${isMaximized ? 'card-maximized' : ''}`}>
-      <div className="tabs-row detail-tabs-row">
-        <div className="tabs detail-tabs">
-          <button
-            className={`tab-button ${activeNetworkTab === 'siteTopology' ? 'active' : ''}`}
-            onClick={() => onSelectTab('siteTopology')}
-          >
-            Site Topology
-          </button>
-          <button
-            className={`tab-button ${activeNetworkTab === 'matrix' ? 'active' : ''}`}
-            onClick={() => onSelectTab('matrix')}
-          >
-            Connectivity Matrix
-          </button>
-        </div>
-        <div className="detail-tabs-controls">
-          <button
-            className="button zoom-action-button"
-            onClick={onToggleMaximize}
-            aria-label={isMaximized ? 'Restore' : 'Maximize'}
-            title={isMaximized ? 'Restore' : 'Maximize'}
-          >
-            {isMaximized ? <CloseXIcon /> : <MagnifyPlusIcon />}
-          </button>
-        </div>
-      </div>
-      {activeNetworkTab === 'siteTopology' && (
-        <div className="network-panel active">
-          <Suspense fallback={<div style={{ padding: '2rem', textAlign: 'center' }}>Loading topology...</div>}>
-            <Topology
-              mode="sitesAndPools"
-              isMaximized={isMaximized}
-              sites={sites}
-              peerings={peerings}
-              nodes={nodeStatuses}
-              gatewayPools={gatewayPools}
-              gatewayByNode={gatewayByNode}
-              hiddenSites={hiddenSites}
-              hiddenGatewayPools={hiddenGatewayPools}
-              theme={theme}
-              siteCounts={siteCounts}
-              poolCounts={poolCounts}
-              edgeHealthCheckCounts={edgeHealthCheckCounts}
-              poolToSite={poolToSite}
-            />
-          </Suspense>
-        </div>
-      )}
-      {activeNetworkTab === 'matrix' && (
-        <div className="network-panel active">
-          <ConnectivityHeatmap
-            matrix={statusMatrix}
-            hiddenSites={hiddenSites}
-            hiddenGatewayPools={hiddenGatewayPools}
-            sites={sites}
-            gatewayPools={gatewayPools}
-            siteCounts={siteCounts}
-            nodeStatuses={nodeStatuses}
-          />
-        </div>
-      )}
-    </div>
-  );
-}
-
-export default NetworkCard;
diff --git a/frontend/src/components/network/ConnectivityHeatmap.tsx b/frontend/src/components/network/ConnectivityHeatmap.tsx
deleted file mode 100644
index 0e6d24a4c..000000000
--- a/frontend/src/components/network/ConnectivityHeatmap.tsx
+++ /dev/null
@@ -1,422 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// SPDX-License-Identifier: Apache-2.0
-
-import { useEffect, useMemo, useRef, useState } from 'react';
-import { GatewayPoolStatus, NodeStatus, SiteMatrix, SiteStatus } from '../../types';
-import { getCniStatus } from '../nodes/shared/index';
-
-function getGatewayPoolNodeNames(pool: GatewayPoolStatus): string[] {
-  const nodeNames = (pool.nodes || [])
-    .map((node) => node.name)
-    .filter((name): name is string => Boolean(name));
-  if (nodeNames.length > 0) {
-    return nodeNames;
-  }
-  return (pool.gateways || []).filter((name): name is string => Boolean(name));
-}
-
-function ConnectivityHeatmap({
-  matrix,
-  hiddenSites,
-  hiddenGatewayPools,
-  sites,
-  gatewayPools,
-  siteCounts,
-  nodeStatuses
-}: {
-  matrix?: Record<string, SiteMatrix>;
-  hiddenSites: Set<string>;
-  hiddenGatewayPools: Set<string>;
-  sites: SiteStatus[];
-  gatewayPools: GatewayPoolStatus[];
-  siteCounts: Map<string, { online: number; total: number }>;
-  nodeStatuses: NodeStatus[];
-}) {
-  const [activeScope, setActiveScope] = useState<string>('all');
-  const matrixRef = useRef<HTMLDivElement | null>(null);
-  const [matrixSize, setMatrixSize] = useState({ width: 420, height: 420 });
-  const [tooltip, setTooltip] = useState<{
-    x: number;
-    y: number;
-    src: string;
-    dst: string;
-    value: number;
-  } | null>(null);
-  const siteNames = useMemo(() => {
-    return Object.keys(matrix || {})
-      .filter((name) => !name.startsWith('pool:'))
-      .filter((name) => !hiddenSites.has(name))
-      .sort();
-  }, [matrix, hiddenSites]);
-  const gatewayPoolNames = useMemo(() => {
-    return (gatewayPools || [])
-      .map((pool) => pool.name || '')
-      .filter((name) => Boolean(name) && !hiddenGatewayPools.has(name))
-      .sort();
-  }, [gatewayPools, hiddenGatewayPools]);
-  const selectorOptions = useMemo(
-    () => [
-      { key: 'all', label: 'All', kind: 'all' as const },
-      ...siteNames.map((site) => ({ key: `site:${site}`, label: site, kind: 'site' as const })),
-      ...gatewayPoolNames.map((pool) => ({ key: `pool:${pool}`, label: pool, kind: 'pool' as const }))
-    ],
-    [siteNames, gatewayPoolNames]
-  );
-  const siteLookup = useMemo(() => {
-    const map = new Map<string, SiteStatus>();
-    for (const site of sites) {
-      if (site.name) {
-        map.set(site.name, site);
-      }
-    }
-    return map;
-  }, [sites]);
-  const nodeStatusByName = useMemo(() => {
-    const map = new Map<string, NodeStatus>();
-    for (const node of nodeStatuses) {
-      const name = node.nodeInfo?.name;
-      if (name) {
-        map.set(name, node);
-      }
-    }
-    return map;
-  }, [nodeStatuses]);
-  const visibleNodeNames = useMemo(() => {
-    return nodeStatuses
-      .filter((node) => {
-        const nodeName = node.nodeInfo?.name || '';
-        if (!nodeName) return false;
-        const siteName = node.nodeInfo?.siteName;
-        if (siteName && hiddenSites.has(siteName)) {
-          return false;
-        }
-        const poolName = (gatewayPools || []).find((pool) => {
-          const poolNameValue = pool.name || '';
-          if (!poolNameValue) return false;
-          return getGatewayPoolNodeNames(pool).includes(nodeName);
-        })?.name;
-        if (poolName && hiddenGatewayPools.has(poolName)) {
-          return false;
-        }
-        return true;
-      })
-      .map((node) => node.nodeInfo?.name || '')
-      .filter((name) => Boolean(name));
-  }, [nodeStatuses, hiddenSites, hiddenGatewayPools, gatewayPools]);
-
-  const adjacency = useMemo(() => {
-    const map = new Map<string, Set<string>>();
-    const allVisible = new Set(visibleNodeNames);
-    for (const node of nodeStatuses) {
-      const src = node.nodeInfo?.name;
-      if (!src || !allVisible.has(src)) continue;
-      if (!map.has(src)) map.set(src, new Set<string>());
-      for (const peer of node.peers || []) {
-        const dst = peer.name;
-        if (!dst || !allVisible.has(dst) || dst === src) continue;
-        map.get(src)?.add(dst);
-        if (!map.has(dst)) map.set(dst, new Set<string>());
-        map.get(dst)?.add(src);
-      }
-    }
-    return map;
-  }, [nodeStatuses, visibleNodeNames]);
-
-  const healthCheckStatusByPair = useMemo(() => {
-    const map = new Map<string, string>();
-    for (const siteMatrix of Object.values(matrix || {})) {
-      const results = siteMatrix?.results || {};
-      for (const [src, row] of Object.entries(results)) {
-        for (const [dst, cell] of Object.entries(row || {})) {
-          const key = src < dst ? `${src}|${dst}` : `${dst}|${src}`;
-          if (!map.has(key) && cell) {
-            map.set(key, typeof cell === 'string' ? cell : (cell as { healthCheckStatus?: string })?.healthCheckStatus || '');
-          }
-        }
-      }
-    }
-    // Also extract health check status from per-node peer data (covers cross-site links)
-    for (const node of nodeStatuses) {
-      const src = node.nodeInfo?.name;
-      if (!src) continue;
-      for (const peer of node.peers || []) {
-        const dst = peer.name;
-        if (!dst || dst === src) continue;
-        const key = src < dst ? `${src}|${dst}` : `${dst}|${src}`;
-        if (map.has(key)) continue; // matrix data takes priority
-        const status = peer.healthCheck?.status;
-        if (status) {
-          map.set(key, status);
-        }
-      }
-    }
-    return map;
-  }, [matrix, nodeStatuses]);
-
-  const selectedNodeNames = useMemo(() => {
-    const visibleSet = new Set(visibleNodeNames);
-    if (activeScope === 'all') {
-      return [...visibleNodeNames].sort();
-    }
-
-    if (activeScope.startsWith('site:')) {
-      const siteName = activeScope.slice(5);
-      const fromMatrix = (matrix?.[siteName]?.nodes || [])
-        .map((name) => String(name))
-        .filter((name) => visibleSet.has(name));
-      if (fromMatrix.length > 0) {
-        return Array.from(new Set(fromMatrix)).sort();
-      }
-      return nodeStatuses
-        .map((node) => node.nodeInfo?.name || '')
-        .filter((name) => {
-          if (!name || !visibleSet.has(name)) return false;
-          const site = nodeStatusByName.get(name)?.nodeInfo?.siteName;
-          return site === siteName;
-        })
-        .sort();
-    }
-
-    if (activeScope.startsWith('pool:')) {
-      const poolName = activeScope.slice(5);
-      const poolMatrixNodes = (matrix?.[`pool:${poolName}`]?.nodes || [])
-        .map((name) => String(name))
-        .filter((name) => visibleSet.has(name));
-      if (poolMatrixNodes.length > 0) {
-        return Array.from(new Set(poolMatrixNodes)).sort();
-      }
-      const pool = gatewayPools.find((item) => item.name === poolName);
-      if (!pool) return [];
-      const members = new Set<string>();
-      for (const nodeName of getGatewayPoolNodeNames(pool)) {
-        if (!visibleSet.has(nodeName)) continue;
-        members.add(nodeName);
-        for (const peerName of adjacency.get(nodeName) || []) {
-          if (visibleSet.has(peerName)) {
-            members.add(peerName);
-          }
-        }
-      }
-      return Array.from(members).sort();
-    }
-
-    return [];
-  }, [activeScope, visibleNodeNames, matrix, nodeStatuses, nodeStatusByName, gatewayPools, adjacency]);
-
-  useEffect(() => {
-    if (!selectorOptions.some((option) => option.key === activeScope)) {
-      setActiveScope('all');
-    }
-  }, [activeScope, selectorOptions]);
-
-  useEffect(() => {
-    if (!matrixRef.current) return;
-    const updateSize = () => {
-      const rect = matrixRef.current?.getBoundingClientRect();
-      if (!rect) return;
-      const width = Math.max(0, Math.floor(rect.width));
-      const height = Math.max(0, Math.floor(rect.height));
-      if (width > 0 && height > 0) {
-        setMatrixSize({ width, height });
-      }
-    };
-    updateSize();
-    const observer = new ResizeObserver(updateSize);
-    observer.observe(matrixRef.current);
-    return () => observer.disconnect();
-  }, []);
-
-  if ((!matrix || siteNames.length === 0) && selectedNodeNames.length === 0) {
-    return <div>No connectivity data available.</div>;
-  }
-
-  const matrixNodes = selectedNodeNames;
-  if (matrixNodes.length === 0) {
-    return <div>No connectivity data available.</div>;
-  }
-  const cells: Array<{ row: number; col: number; value: number; src: string; dst: string }> = [];
-  const hasExpectedLink = (src: string, dst: string) => {
-    if (src === dst) return true;
-    return adjacency.get(src)?.has(dst) || adjacency.get(dst)?.has(src) || false;
-  };
-
-  const selfCellValueFromCniStatus = (node?: NodeStatus) => {
-    if (!node) {
-      return 0;
-    }
-    if (node.statusSource === 'apiserver-push' || node.statusSource === 'apiserver-ws') {
-      return 2;
-    }
-    const cni = getCniStatus(node);
-    if (cni.tone === 'success') return 1;
-    if (cni.tone === 'warning') return 2;
-    return 0;
-  };
-
-  for (let i = 0; i < matrixNodes.length; i++) {
-    const src = matrixNodes[i];
-    for (let j = 0; j < matrixNodes.length; j++) {
-      const dst = matrixNodes[j];
-      const pairKey = src < dst ? `${src}|${dst}` : `${dst}|${src}`;
-      const hcStatus = (healthCheckStatusByPair.get(pairKey) || '').trim().toLowerCase();
-      let value = hcStatus === 'up' ? 1 : hcStatus === 'mixed' ? 2 : hcStatus ? 0 : -1;
-      if (src === dst) {
-        const node = nodeStatusByName.get(src);
-        value = selfCellValueFromCniStatus(node);
-      } else if (!hasExpectedLink(src, dst)) {
-        value = -2;
-      }
-      cells.push({ row: i, col: j, value, src, dst });
-    }
-  }
-
-  const { width, height } = matrixSize;
-
-  const getColor = (value: number) => {
-    if (value === 1) return '#4ade80';
-    if (value === 2) return '#facc15';
-    if (value === 0) return '#f87171';
-    if (value === -2) return 'transparent';
-    return '#6b7280';
-  };
-
-  const renderMatrix = (width: number, height: number) => {
-    if (width <= 0 || height <= 0) {
-      return <div className="matrix-container" ref={matrixRef}></div>;
-    }
-    const showAxisLabels = false;
-    const margin = { top: 12, left: 12, right: 12, bottom: 12 };
-    const innerWidth = width - margin.left - margin.right;
-    const innerHeight = height - margin.top - margin.bottom;
-    const minInner = Math.min(innerWidth, innerHeight);
-    const gap = Math.max(1, Math.round(minInner * 0.005));
-    const cellSize = Math.floor((minInner - gap * (matrixNodes.length - 1)) / matrixNodes.length);
-    const gridWidth = cellSize * matrixNodes.length + gap * (matrixNodes.length - 1);
-    const gridHeight = cellSize * matrixNodes.length + gap * (matrixNodes.length - 1);
-    const offsetX = Math.max(0, Math.floor((innerWidth - gridWidth) / 2));
-    const offsetY = Math.max(0, Math.floor((innerHeight - gridHeight) / 2));
-    const scale = 1;
-
-    return (
-      <div className="matrix-container" ref={matrixRef}>
-        <div className="matrix-wrapper">
-          <svg width="100%" height="100%" viewBox={`0 0 ${width} ${height}`} preserveAspectRatio="xMidYMid meet">
-          <g
-            transform={`translate(${margin.left + offsetX}, ${margin.top + offsetY}) scale(${scale})`}
-          >
-            {cells.map((cell) => {
-              const x = cell.col * (cellSize + gap);
-              const y = cell.row * (cellSize + gap);
-              const w = cellSize;
-              const h = cellSize;
-              return (
-                <rect
-                  key={`${cell.src}-${cell.dst}`}
-                  x={x}
-                  y={y}
-                  width={w}
-                  height={h}
-                  fill={getColor(cell.value)}
-                  onMouseMove={(event) => {
-                    setTooltip({
-                      x: event.clientX + 12,
-                      y: event.clientY + 12,
-                      src: cell.src,
-                      dst: cell.dst,
-                      value: cell.value
-                    });
-                  }}
-                  onMouseLeave={() => setTooltip(null)}
-                />
-              );
-            })}
-            {showAxisLabels &&
-              matrixNodes.map((label, index) => (
-                <text
-                  key={`x-${label}`}
-                  x={index * (cellSize + gap) + cellSize / 2}
-                  y={-6}
-                  textAnchor="middle"
-                  fontSize={10}
-                  fill="var(--text-muted)"
-                >
-                  {label}
-                </text>
-              ))}
-            {showAxisLabels &&
-              matrixNodes.map((label, index) => (
-                <text
-                  key={`y-${label}`}
-                  x={-6}
-                  y={index * (cellSize + gap) + cellSize / 2 + 3}
-                  textAnchor="end"
-                  fontSize={10}
-                  fill="var(--text-muted)"
-                >
-                  {label}
-                </text>
-              ))}
-          </g>
-          </svg>
-        </div>
-        {tooltip && (
-          <div className="heatmap-tooltip" style={{ left: tooltip.x, top: tooltip.y }}>
-            <div>{tooltip.src} {'->'} {tooltip.dst}</div>
-            <div style={{ fontSize: '0.75rem', color: 'var(--text-muted)' }}>
-              {tooltip.src === tooltip.dst
-                ? (tooltip.value === 1
-                    ? 'CNI Healthy'
-                    : tooltip.value === 2
-                      ? `CNI Warning: ${getCniStatus(nodeStatusByName.get(tooltip.src))?.label || 'Warning'}`
-                      : 'CNI No Data')
-                : tooltip.value === 1
-                  ? 'HC Up'
-                  : tooltip.value === 2
-                    ? 'HC Mixed'
-                  : tooltip.value === 0
-                    ? 'HC Down'
-                    : tooltip.value === -2
-                      ? 'No Link Expected'
-                      : 'No Data'}
-            </div>
-          </div>
-        )}
-      </div>
-    );
-  };
-
-  return (
-    <div className="matrix-panel">
-      <div className="site-row">
-        {selectorOptions.map((option) => {
-          const isActive = option.key === activeScope;
-          const isSite = option.kind === 'site';
-          const isPool = option.kind === 'pool';
-          const siteInfo = isSite ? siteLookup.get(option.label) : undefined;
-          const counts = isSite ? siteCounts.get(option.label) : undefined;
-          const online = counts?.online ?? siteInfo?.onlineCount ?? 0;
-          const total = counts?.total ?? siteInfo?.nodeCount ?? 0;
-          const status = isSite
-            ? (online === 0 && total > 0 ? 'danger' : online < total ? 'warning' : 'success')
-            : isPool
-              ? 'info'
-              : 'all';
-          return (
-            <button
-              key={option.key}
-              className={`site-pill ${isActive ? 'active' : 'inactive'}`}
-              onClick={() => setActiveScope(option.key)}
-              style={{ cursor: 'pointer', border: 'none' }}
-            >
-              <span className={`badge ${status}`}>{option.label}</span>
-            </button>
-          );
-        })}
-      </div>
-      {renderMatrix(width, height)}
-    </div>
-  );
-}
-
-
-export default ConnectivityHeatmap;
diff --git a/frontend/src/components/network/Topology.tsx b/frontend/src/components/network/Topology.tsx
deleted file mode 100644
index 9107d77af..000000000
--- a/frontend/src/components/network/Topology.tsx
+++ /dev/null
@@ -1,949 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// SPDX-License-Identifier: Apache-2.0
-
-import * as React from 'react';
-import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
-import { createPortal } from 'react-dom';
-import {
-  getTopologyNodeGlyph,
-  renderTopologyNodeGlyph,
-  useTopologyNodeIconTextures
-} from '../common/topologyIcons';
-import { GatewayPoolStatus, NodeStatus, PeeringStatus, SiteStatus } from '../../types';
-import { getNodeStatus, ReagraphModule } from '../nodes/shared/index';
-
-function buildGraph(
-  allSiteNames: string[],
-  allPoolNames: string[],
-  peerings: PeeringStatus[],
-  hiddenSites: Set<string>,
-  hiddenGatewayPools: Set<string>,
-  existingGatewayPools: Set<string>,
-  palette: { site: string; siteEmpty: string; siteWarn: string; siteDanger: string; pool: string; poolEmpty: string; poolWarn: string; poolDanger: string; edge: string; edgeDim: string; edgeUp: string; edgeWarn: string; edgeDanger: string },
-  siteCounts?: Map<string, { online: number; total: number; warning?: number; danger?: number }>,
-  poolCounts?: Map<string, { online: number; total: number; warning?: number; danger?: number }>,
-  edgeHealthCheckCounts?: Map<string, { up: number; total: number }>,
-  poolToSite?: Map<string, string>
-) {
-  // Dim a hex color by reducing its opacity (blend toward background)
-  const dimColor = (hex: string) => {
-    const r = parseInt(hex.slice(1, 3), 16);
-    const g = parseInt(hex.slice(3, 5), 16);
-    const b = parseInt(hex.slice(5, 7), 16);
-    const mix = (c: number) => Math.round(c * 0.3 + 30 * 0.7);
-    return `#${mix(r).toString(16).padStart(2, '0')}${mix(g).toString(16).padStart(2, '0')}${mix(b).toString(16).padStart(2, '0')}`;
-  };
-  const nodes: { id: string; label: string; fill: string; activeFill: string; data: { level: number; group: string; peerings: string[] } }[] = [];
-  const edges: { id: string; source: string; target: string; fill?: string; size?: number; data?: { peerings: string[]; hcUp: number; hcTotal: number } }[] = [];
-  const nodeSet = new Set<string>();
-  const edgeSet = new Set<string>();
-  const edgePeerings = new Map<string, Set<string>>();
-  const sitePeerings = new Map<string, Set<string>>();
-  const poolPeerings = new Map<string, Set<string>>();
-
-  for (const peering of peerings) {
-    const peeringName = peering.name || 'peering';
-    for (const site of peering.sites || []) {
-      if (!sitePeerings.has(site)) {
-        sitePeerings.set(site, new Set());
-      }
-      sitePeerings.get(site)?.add(peeringName);
-    }
-    for (const pool of peering.gatewayPools || []) {
-      if (!existingGatewayPools.has(pool)) {
-        continue;
-      }
-      if (!poolPeerings.has(pool)) {
-        poolPeerings.set(pool, new Set());
-      }
-      poolPeerings.get(pool)?.add(peeringName);
-    }
-  }
-
-  const addNode = (id: string, label: string, group: string, hidden: boolean) => {
-    if (!nodeSet.has(id)) {
-      nodeSet.add(id);
-      let fill = group === 'pool' ? palette.pool : palette.site;
-      if (group === 'site' && siteCounts) {
-        const counts = siteCounts.get(label);
-        if (counts) {
-          if (counts.total === 0) {
-            fill = palette.siteEmpty;
-          } else if ((counts.danger || 0) > 0) {
-            fill = palette.siteDanger;
-          } else if ((counts.warning || 0) > 0) {
-            fill = palette.siteWarn;
-          }
-        }
-      }
-      if (group === 'pool' && poolCounts) {
-        const counts = poolCounts.get(label);
-        if (counts) {
-          // No matching node entries for this pool in current cluster status:
-          // render gray (empty) instead of green.
-          if (counts.total === 0) {
-            fill = palette.poolEmpty;
-          } else if ((counts.danger || 0) > 0) {
-            fill = palette.poolDanger;
-          } else if ((counts.warning || 0) > 0) {
-            fill = palette.poolWarn;
-          } else if (counts.online === 0 && counts.total > 0) {
-            fill = palette.poolDanger;
-          } else if (counts.online < counts.total) {
-            fill = palette.poolWarn;
-          }
-        }
-      }
-      if (hidden) {
-        fill = dimColor(fill);
-      }
-      const peeringsForNode = group === 'pool'
-        ? Array.from(poolPeerings.get(label) || [])
-        : Array.from(sitePeerings.get(label) || []);
-      nodes.push({ id, label, fill, activeFill: fill, data: { level: group === 'pool' ? 0 : 1, group, peerings: peeringsForNode } });
-    }
-  };
-
-  const addEdge = (a: string, b: string) => {
-    if (a === b) return;
-    const key = a < b ? `${a}|${b}` : `${b}|${a}`;
-    if (edgeSet.has(key)) return;
-    edgeSet.add(key);
-    const isHidden = (nodeId: string) => {
-      if (nodeId.startsWith('site:')) return hiddenSites.has(nodeId.slice(5));
-      if (nodeId.startsWith('pool:')) return hiddenGatewayPools.has(nodeId.slice(5));
-      return false;
-    };
-    let edgeFill = palette.edge;
-    if (isHidden(a) || isHidden(b)) {
-      edgeFill = palette.edgeDim;
-    } else if (edgeHealthCheckCounts) {
-      const counts = edgeHealthCheckCounts.get(key);
-      // No matching health check entries for this edge (missing map entry or total=0):
-      // keep default gray edge color. Only color healthy/warn/danger with real data.
-      if (!counts || counts.total === 0) {
-        edgeFill = palette.edge;
-      } else {
-        if (counts.up === counts.total) {
-          edgeFill = palette.edgeUp;
-        } else if (counts.total - counts.up > counts.total / 2) {
-          edgeFill = palette.edgeDanger;
-        } else {
-          edgeFill = palette.edgeWarn;
-        }
-      }
-    }
-    edges.push({ id: key, source: a, target: b, fill: edgeFill, size: 3.5 });
-  };
-
-  // Seed all known sites and gateway pools so isolated entities still render without edges.
-  for (const site of allSiteNames) {
-    addNode(`site:${site}`, site, 'site', hiddenSites.has(site));
-  }
-  for (const pool of allPoolNames) {
-    addNode(`pool:${pool}`, pool, 'pool', hiddenGatewayPools.has(pool));
-  }
-
-  for (const peering of peerings) {
-    const sites = peering.sites || [];
-    const pools = (peering.gatewayPools || []).filter((pool) => existingGatewayPools.has(pool));
-    const pName = peering.name || 'peering';
-    const isPoolPeering = pName.startsWith('poolpeering/');
-
-    for (const site of sites) {
-      addNode(`site:${site}`, site, 'site', hiddenSites.has(site));
-    }
-    for (const pool of pools) {
-      addNode(`pool:${pool}`, pool, 'pool', hiddenGatewayPools.has(pool));
-    }
-
-    // Track which peerings each edge belongs to
-    const trackEdgePeering = (a: string, b: string) => {
-      const key = a < b ? `${a}|${b}` : `${b}|${a}`;
-      if (!edgePeerings.has(key)) edgePeerings.set(key, new Set());
-      edgePeerings.get(key)?.add(pName);
-    };
-
-    if (pools.length > 0) {
-      for (const site of sites) {
-        for (const pool of pools) {
-          trackEdgePeering(`site:${site}`, `pool:${pool}`);
-          addEdge(`site:${site}`, `pool:${pool}`);
-        }
-      }
-      if (isPoolPeering && pools.length > 1) {
-        for (let i = 0; i < pools.length; i++) {
-          for (let j = i + 1; j < pools.length; j++) {
-            trackEdgePeering(`pool:${pools[i]}`, `pool:${pools[j]}`);
-            addEdge(`pool:${pools[i]}`, `pool:${pools[j]}`);
-          }
-        }
-      }
-    } else if (sites.length > 1) {
-      for (let i = 0; i < sites.length; i++) {
-        for (let j = i + 1; j < sites.length; j++) {
-          trackEdgePeering(`site:${sites[i]}`, `site:${sites[j]}`);
-          addEdge(`site:${sites[i]}`, `site:${sites[j]}`);
-        }
-      }
-    }
-  }
-
-  // Attach peering names and health check counts to edge data
-  for (const edge of edges) {
-    const pNames = edgePeerings.get(edge.id);
-    const hc = edgeHealthCheckCounts?.get(edge.id);
-    edge.data = {
-      peerings: pNames ? Array.from(pNames) : [],
-      hcUp: hc?.up ?? 0,
-      hcTotal: hc?.total ?? 0
-    };
-  }
-
-  // Sort nodes lexicographically by label so layout is deterministic
-  nodes.sort((a, b) => a.label.localeCompare(b.label));
-
-  return { nodes, edges };
-}
-
-function buildNodeGraph(
-  nodes: NodeStatus[],
-  gatewayByNode: Map<string, string>,
-  palette: {
-    nodeHealthy: string;
-    nodeWarn: string;
-    nodeDanger: string;
-    edge: string;
-    edgeUp: string;
-    edgeWarn: string;
-    edgeDanger: string;
-  },
-  options?: {
-    edgeSize?: number;
-  }
-) {
-  const graphNodes: {
-    id: string;
-    label: string;
-    fill: string;
-    activeFill: string;
-    data: { level: number; group: string; peerings: string[]; lines: string[] };
-  }[] = [];
-  const graphEdges: {
-    id: string;
-    source: string;
-    target: string;
-    fill?: string;
-    size?: number;
-    data?: {
-      peerings: string[];
-      hcUp: number;
-      hcTotal: number;
-      sourceLabel: string;
-      targetLabel: string;
-    };
-  }[] = [];
-
-  const nodeByName = new Map<string, NodeStatus>();
-  for (const node of nodes) {
-    const nodeName = node.nodeInfo?.name;
-    if (!nodeName) continue;
-    nodeByName.set(nodeName, node);
-  }
-
-  for (const [nodeName, node] of nodeByName.entries()) {
-    const isGateway = node.nodeInfo?.isGateway || gatewayByNode.has(nodeName);
-    const status = getNodeStatus(node);
-    let fill = palette.nodeHealthy;
-    if (status === 'warning') {
-      fill = palette.nodeWarn;
-    } else if (status === 'danger') {
-      fill = palette.nodeDanger;
-    }
-
-    const siteName = node.nodeInfo?.siteName || '-';
-    const poolName = gatewayByNode.get(nodeName) || '-';
-    const lines = isGateway
-      ? [`Gateway Pool: ${poolName}`, `Site: ${siteName}`]
-      : [`Site: ${siteName}`];
-
-    graphNodes.push({
-      id: `node:${nodeName}`,
-      label: nodeName,
-      fill,
-      activeFill: fill,
-      data: {
-        level: isGateway ? 0 : 1,
-        group: isGateway ? 'gateway-node' : 'worker-node',
-        peerings: [],
-        lines
-      }
-    });
-  }
-
-  const edgeCounts = new Map<string, { up: number; total: number }>();
-  for (const [nodeName, node] of nodeByName.entries()) {
-    for (const peer of node.peers || []) {
-      const peerName = peer.name;
-      if (!peerName || !nodeByName.has(peerName) || peerName === nodeName) {
-        continue;
-      }
-      const srcId = `node:${nodeName}`;
-      const dstId = `node:${peerName}`;
-      const key = srcId < dstId ? `${srcId}|${dstId}` : `${dstId}|${srcId}`;
-      const current = edgeCounts.get(key) || { up: 0, total: 0 };
-      if (peer.healthCheck?.enabled || peer.healthCheck) {
-        current.total += 1;
-        const rawStatus = (peer.healthCheck?.status || '').trim().toLowerCase();
-        if (rawStatus === 'up') {
-          current.up += 1;
-        }
-      }
-      edgeCounts.set(key, current);
-    }
-  }
-
-  for (const [edgeId, counts] of edgeCounts.entries()) {
-    const [source, target] = edgeId.split('|');
-    let edgeFill = palette.edge;
-    if (counts.total > 0) {
-      if (counts.up === counts.total) {
-        edgeFill = palette.edgeUp;
-      } else if (counts.total - counts.up > counts.total / 2) {
-        edgeFill = palette.edgeDanger;
-      } else {
-        edgeFill = palette.edgeWarn;
-      }
-    }
-
-    graphEdges.push({
-      id: edgeId,
-      source,
-      target,
-      fill: edgeFill,
-      size: options?.edgeSize ?? 2,
-      data: {
-        peerings: [],
-        hcUp: counts.up,
-        hcTotal: counts.total,
-        sourceLabel: source.startsWith('node:') ? source.slice(5) : source,
-        targetLabel: target.startsWith('node:') ? target.slice(5) : target
-      }
-    });
-  }
-
-  graphNodes.sort((a, b) => a.label.localeCompare(b.label));
-  graphEdges.sort((a, b) => a.id.localeCompare(b.id));
-
-  return { nodes: graphNodes, edges: graphEdges };
-}
-
-function Topology({
-  mode,
-  isMaximized,
-  sites,
-  peerings,
-  nodes,
-  gatewayPools,
-  gatewayByNode,
-  hiddenSites,
-  hiddenGatewayPools,
-  theme,
-  siteCounts,
-  poolCounts,
-  edgeHealthCheckCounts,
-  poolToSite
-}: {
-  mode: 'sitesAndPools' | 'nodes';
-  isMaximized: boolean;
-  sites: SiteStatus[];
-  peerings: PeeringStatus[];
-  nodes: NodeStatus[];
-  gatewayPools: GatewayPoolStatus[];
-  gatewayByNode: Map<string, string>;
-  hiddenSites: Set<string>;
-  hiddenGatewayPools: Set<string>;
-  theme: 'dark' | 'light';
-  siteCounts: Map<string, { online: number; total: number }>;
-  poolCounts: Map<string, { online: number; total: number }>;
-  edgeHealthCheckCounts: Map<string, { up: number; total: number }>;
-  poolToSite: Map<string, string>;
-}) {
-  const graphRef = useRef<any>(null);
-  const topologyWrapperRef = useRef<HTMLDivElement | null>(null);
-  const [reagraphModule, setReagraphModule] = useState<ReagraphModule | null>(null);
-
-  useEffect(() => {
-    let canceled = false;
-    import('reagraph')
-      .then((module) => {
-        if (canceled) return;
-        setReagraphModule({
-          GraphCanvas: module.GraphCanvas as React.ComponentType<any>,
-          darkTheme: module.darkTheme as Record<string, any>,
-          lightTheme: module.lightTheme as Record<string, any>
-        });
-      })
-      .catch((error) => {
-        console.error('Failed to load topology renderer', error);
-      });
-
-    return () => {
-      canceled = true;
-    };
-  }, []);
-
-  const palette = useMemo(
-    () =>
-      theme === 'light'
-        ? {
-          site: '#16a34a',
-          siteEmpty: '#6b7280',
-          siteWarn: '#facc15',
-          siteDanger: '#dc2626',
-          pool: '#15803d',
-          poolEmpty: '#6b7280',
-          poolWarn: '#facc15',
-          poolDanger: '#dc2626',
-          edge: '#94a3b8',
-          edgeDim: '#cbd5e1',
-          edgeUp: '#16a34a',
-          edgeWarn: '#facc15',
-          edgeDanger: '#dc2626',
-          nodeHealthy: '#16a34a',
-          nodeWarn: '#facc15',
-          nodeDanger: '#dc2626',
-          label: '#1f2937',
-          background: '#ffffff'
-        }
-        : {
-          site: '#1DE9AC',
-          siteEmpty: '#6b7280',
-          siteWarn: '#facc15',
-          siteDanger: '#ef4444',
-          pool: '#1DE9AC',
-          poolEmpty: '#6b7280',
-          poolWarn: '#facc15',
-          poolDanger: '#ef4444',
-          edge: '#4b5563',
-          edgeDim: '#334155',
-          edgeUp: '#1DE9AC',
-          edgeWarn: '#facc15',
-          edgeDanger: '#ef4444',
-          nodeHealthy: '#1DE9AC',
-          nodeWarn: '#facc15',
-          nodeDanger: '#ef4444',
-          label: '#e0e0e0',
-          background: '#1a1a1a'
-        },
-    [theme]
-  );
-  const graphTheme = useMemo(() => {
-    if (!reagraphModule) return null;
-    const base = theme === 'light' ? reagraphModule.lightTheme : reagraphModule.darkTheme;
-    return {
-      ...base,
-      canvas: {
-        ...base.canvas,
-        background: palette.background,
-        fog: null
-      },
-      edge: {
-        ...base.edge,
-        fill: palette.edge,
-        activeFill: palette.edge,
-        opacity: 1,
-        inactiveOpacity: 0.25
-      },
-      node: {
-        ...base.node,
-        activeFill: 'rgba(0,0,0,0)',
-        inactiveOpacity: 1,
-        hoverOpacity: 0,
-        label: {
-          ...base.node.label,
-          color: palette.label,
-          activeColor: palette.label,
-          fontSize: 16,
-          stroke: palette.background,
-          strokeColor: palette.background
-        }
-      }
-    };
-  }, [palette, reagraphModule, theme]);
-
-  const [hovered, setHovered] = useState<{
-    x: number;
-    y: number;
-    label: string;
-    group: string;
-    lines: string[];
-  } | null>(null);
-  const [edgeHovered, setEdgeHovered] = useState<{
-    x: number;
-    y: number;
-    title: string;
-    detail: string;
-  } | null>(null);
-  const [hoveredNodeId, setHoveredNodeId] = useState<string | null>(null);
-  const [showZoomHint, setShowZoomHint] = useState(false);
-  const [zoomHintRect, setZoomHintRect] = useState<{ left: number; top: number; width: number; height: number } | null>(null);
-  const zoomHintTimerRef = useRef<number | null>(null);
-  const topologyIconTextures = useTopologyNodeIconTextures();
-  const allSiteNames = useMemo(
-    () => sites
-      .map((site) => (site.name || '').trim())
-      .filter((name): name is string => name.length > 0),
-    [sites]
-  );
-  const allPoolNames = useMemo(
-    () => gatewayPools
-      .map((pool) => (pool.name || '').trim())
-      .filter((name): name is string => name.length > 0),
-    [gatewayPools]
-  );
-  const topologySiteCounts = useMemo(() => {
-    const counts = new Map<string, { online: number; total: number; warning: number; danger: number }>();
-    for (const siteName of allSiteNames) {
-      counts.set(siteName, { online: 0, total: 0, warning: 0, danger: 0 });
-    }
-
-    if (nodes.length > 0) {
-      for (const node of nodes) {
-        const siteName = node.nodeInfo?.siteName;
-        if (!siteName) continue;
-        const nodeName = node.nodeInfo?.name;
-        const isGatewayNode = node.nodeInfo?.isGateway || (nodeName ? gatewayByNode.has(nodeName) : false);
-        if (isGatewayNode) continue;
-
-        const current = counts.get(siteName) || { online: 0, total: 0, warning: 0, danger: 0 };
-        current.total += 1;
-
-        const status = getNodeStatus(node);
-        if (status === 'success') {
-          current.online += 1;
-        } else if (status === 'warning') {
-          current.warning += 1;
-        } else {
-          current.danger += 1;
-        }
-
-        counts.set(siteName, current);
-      }
-    } else {
-      // Summary mode: use siteCounts prop (online/total only).
-      for (const [siteName, sc] of siteCounts.entries()) {
-        const offline = Math.max(0, sc.total - sc.online);
-        counts.set(siteName, { online: sc.online, total: sc.total, warning: 0, danger: offline });
-      }
-    }
-
-    return counts;
-  }, [allSiteNames, gatewayByNode, nodes, siteCounts]);
-  const topologyPoolCounts = useMemo(() => {
-    const counts = new Map<string, { online: number; total: number; warning: number; danger: number }>();
-
-    if (nodes.length > 0) {
-      const nodeByName = new Map<string, NodeStatus>();
-      for (const node of nodes) {
-        const nodeName = node.nodeInfo?.name;
-        if (!nodeName) continue;
-        nodeByName.set(nodeName, node);
-      }
-
-      for (const poolName of allPoolNames) {
-        const baseline = poolCounts.get(poolName) || { online: 0, total: 0 };
-        const current = { online: 0, total: baseline.total, warning: 0, danger: 0 };
-
-        for (const [nodeName, nodePoolName] of gatewayByNode.entries()) {
-          if (nodePoolName !== poolName) continue;
-          const node = nodeByName.get(nodeName);
-          if (!node) continue;
-          const status = getNodeStatus(node);
-          if (status === 'success') {
-            current.online += 1;
-          } else if (status === 'warning') {
-            current.warning += 1;
-          } else {
-            current.danger += 1;
-          }
-        }
-
-        const accounted = current.online + current.warning + current.danger;
-        if (current.total < accounted) {
-          current.total = accounted;
-        } else if (current.total > accounted) {
-          current.danger += current.total - accounted;
-        }
-
-        counts.set(poolName, current);
-      }
-    } else {
-      // Summary mode: use poolCounts prop (online/total only).
-      for (const poolName of allPoolNames) {
-        const pc = poolCounts.get(poolName) || { online: 0, total: 0 };
-        const offline = Math.max(0, pc.total - pc.online);
-        counts.set(poolName, { online: pc.online, total: pc.total, warning: 0, danger: offline });
-      }
-    }
-
-    return counts;
-  }, [allPoolNames, gatewayByNode, nodes, poolCounts]);
-
-  const sitePoolGraph = useMemo(
-    () => buildGraph(
-      allSiteNames,
-      allPoolNames,
-      peerings,
-      hiddenSites,
-      hiddenGatewayPools,
-      new Set(gatewayPools.map((pool) => pool.name).filter((name): name is string => Boolean(name))),
-      palette,
-      topologySiteCounts,
-      topologyPoolCounts,
-      edgeHealthCheckCounts,
-      poolToSite
-    ),
-    [allPoolNames, allSiteNames, peerings, gatewayPools, hiddenSites, hiddenGatewayPools, palette, topologySiteCounts, topologyPoolCounts, edgeHealthCheckCounts, poolToSite]
-  );
-  const nodeGraph = useMemo(
-    () => buildNodeGraph(nodes, gatewayByNode, palette, { edgeSize: 1.4 }),
-    [nodes, gatewayByNode, palette]
-  );
-  const graph = mode === 'nodes' ? nodeGraph : sitePoolGraph;
-  const dimNodeColor = useCallback((color: string) => {
-    const hex = (color || '').trim();
-    const match = /^#([0-9a-fA-F]{6})$/.exec(hex);
-    if (!match) return palette.edgeDim;
-    const value = match[1];
-    const r = parseInt(value.slice(0, 2), 16);
-    const g = parseInt(value.slice(2, 4), 16);
-    const b = parseInt(value.slice(4, 6), 16);
-    const mix = (channel: number) => Math.round(channel * 0.35 + 40 * 0.65);
-    return `#${mix(r).toString(16).padStart(2, '0')}${mix(g).toString(16).padStart(2, '0')}${mix(b).toString(16).padStart(2, '0')}`;
-  }, [palette.edgeDim]);
-
-  const graphNodesForRender = useMemo(() => {
-    const baseNodes = mode === 'nodes'
-      ? graph.nodes.map((node) => ({ ...node, label: '' }))
-      : graph.nodes;
-
-    if (!hoveredNodeId) return baseNodes;
-    const connectedNodeIds = new Set<string>([hoveredNodeId]);
-    for (const edge of graph.edges) {
-      if (edge.source === hoveredNodeId) {
-        connectedNodeIds.add(edge.target);
-      } else if (edge.target === hoveredNodeId) {
-        connectedNodeIds.add(edge.source);
-      }
-    }
-
-    return baseNodes.map((node) => {
-      if (connectedNodeIds.has(node.id)) {
-        return node;
-      }
-      const dimmed = dimNodeColor(node.fill || palette.site);
-      return {
-        ...node,
-        fill: dimmed,
-        activeFill: dimmed
-      };
-    });
-  }, [graph.edges, graph.nodes, hoveredNodeId, dimNodeColor, mode, palette.site]);
-
-  const graphEdgesForRender = useMemo(() => {
-    if (!hoveredNodeId) return graph.edges;
-    return graph.edges.map((edge) => {
-      const connected = edge.source === hoveredNodeId || edge.target === hoveredNodeId;
-      if (connected) return edge;
-      return {
-        ...edge,
-        fill: palette.edgeDim
-      };
-    });
-  }, [graph.edges, hoveredNodeId, palette.edgeDim]);
-
-  const topologyConfig = useMemo(() => {
-    const nodeCount = graph.nodes.length;
-
-    const siteTopologyConfig = {
-      minCameraDistance: 2,
-      nodeSize: nodeCount <= 6 ? 68 : 50,
-      layoutOverrides: {
-        radius: 25,
-        concentricSpacing: 25
-      }
-    };
-
-    const nodeTopologyConfig = {
-      ...siteTopologyConfig,
-      minCameraDistance: 6,
-
-      layoutOverrides: {
-        ...siteTopologyConfig.layoutOverrides,
-        radius: 25,
-        concentricSpacing: 50
-      }
-    };
-
-    return mode === 'nodes' ? nodeTopologyConfig : siteTopologyConfig;
-  }, [graph.nodes.length, mode]);
-  const topologyLayoutType = mode === 'nodes' ? 'concentric2d' : 'concentric2d';
-
-  useEffect(() => {
-    if (mode !== 'sitesAndPools') return;
-    if (!graphRef.current) return;
-
-    const fit = () => graphRef.current?.fitNodesInView();
-    const first = requestAnimationFrame(() => {
-      const second = requestAnimationFrame(fit);
-      (fit as unknown as { _second?: number })._second = second;
-    });
-
-    return () => {
-      cancelAnimationFrame(first);
-      const second = (fit as unknown as { _second?: number })._second;
-      if (typeof second === 'number') {
-        cancelAnimationFrame(second);
-      }
-    };
-  }, [mode, graph.nodes.length, graph.edges.length]);
-
-  useEffect(() => () => {
-    if (zoomHintTimerRef.current !== null) {
-      window.clearTimeout(zoomHintTimerRef.current);
-      zoomHintTimerRef.current = null;
-    }
-  }, []);
-
-  const updateZoomHintRect = useCallback(() => {
-    const rect = topologyWrapperRef.current?.getBoundingClientRect();
-    if (!rect) {
-      setZoomHintRect(null);
-      return;
-    }
-    setZoomHintRect({ left: rect.left, top: rect.top, width: rect.width, height: rect.height });
-  }, []);
-
-  const showCtrlZoomHint = useCallback(() => {
-    updateZoomHintRect();
-    setShowZoomHint(true);
-    if (zoomHintTimerRef.current !== null) {
-      window.clearTimeout(zoomHintTimerRef.current);
-    }
-    zoomHintTimerRef.current = window.setTimeout(() => {
-      setShowZoomHint(false);
-      setZoomHintRect(null);
-      zoomHintTimerRef.current = null;
-    }, 1400);
-  }, [updateZoomHintRect]);
-
-  useEffect(() => {
-    if (!showZoomHint) {
-      return;
-    }
-    const update = () => updateZoomHintRect();
-    window.addEventListener('resize', update, { passive: true });
-    window.addEventListener('scroll', update, { passive: true, capture: true });
-    document.addEventListener('scroll', update, { passive: true, capture: true });
-    return () => {
-      window.removeEventListener('resize', update);
-      window.removeEventListener('scroll', update, true);
-      document.removeEventListener('scroll', update, true);
-    };
-  }, [showZoomHint, updateZoomHintRect]);
-
-  const handleWheelCapture = useCallback((event: React.WheelEvent<HTMLDivElement>) => {
-    if (event.ctrlKey) {
-      return;
-    }
-    event.stopPropagation();
-    showCtrlZoomHint();
-  }, [showCtrlZoomHint]);
-
-  if (graph.nodes.length === 0) {
-    return <div>No peering data available.</div>;
-  }
-
-  if (!reagraphModule || !graphTheme) {
-    return <div>Loading topology renderer...</div>;
-  }
-
-  const GraphCanvas = reagraphModule.GraphCanvas;
-  const zoomHintStyle = (() => {
-    if (!zoomHintRect) {
-      return { left: '50vw', top: '50vh' } as React.CSSProperties;
-    }
-    return { left: zoomHintRect.left + zoomHintRect.width / 2, top: zoomHintRect.top + zoomHintRect.height / 2 };
-  })();
-  const zoomHintOverlayStyle = (() => {
-    if (!zoomHintRect) {
-      return null;
-    }
-    return { left: zoomHintRect.left, top: zoomHintRect.top, width: zoomHintRect.width, height: zoomHintRect.height };
-  })();
-
-  return (
-    <div className="topology-card">
-      <div
-        ref={topologyWrapperRef}
-        className="topology-wrapper"
-        onWheelCapture={handleWheelCapture}
-        style={{
-          height: isMaximized ? '100%' : 'auto',
-          aspectRatio: isMaximized ? undefined : '1 / 1'
-        }}
-      >
-        <button
-          className="topology-reset"
-          onClick={() => graphRef.current?.fitNodesInView()}
-        >
-          Reset
-        </button>
-        <GraphCanvas
-          ref={graphRef}
-          nodes={graphNodesForRender}
-          edges={graphEdgesForRender}
-          draggable={mode === 'sitesAndPools'}
-          minDistance={topologyConfig.minCameraDistance}
-          theme={graphTheme}
-          animated={false}
-          layoutType={topologyLayoutType as any}
-          layoutOverrides={mode === 'nodes' ? (topologyConfig.layoutOverrides as any) : undefined}
-          labelType={'all' as any}
-          edgeArrowPosition={'none' as any}
-          defaultNodeSize={topologyConfig.nodeSize}
-          renderNode={({ node: n, size, opacity }) => {
-            const color = n.fill || palette.site;
-            const group = (n.data as { group?: string } | undefined)?.group;
-            const glyph = getTopologyNodeGlyph(group);
-            const material = (
-              <meshBasicMaterial
-                color={color}
-                opacity={opacity}
-                transparent={opacity < 1}
-              />
-            );
-            const iconNode = renderTopologyNodeGlyph({
-              glyph,
-              size,
-              color,
-              textures: topologyIconTextures,
-              workerOffsetScale: -0.16
-            });
-            if (iconNode) return iconNode;
-
-            return (
-              <mesh>
-                <sphereGeometry args={[size, 32, 32]} />
-                {material}
-              </mesh>
-            );
-          }}
-          onNodePointerOver={(node, event) => {
-            const tooltipLabel = (node.label || '').trim()
-              || (node.id.startsWith('node:')
-                ? node.id.slice(5)
-                : node.id.startsWith('site:')
-                  ? node.id.slice(5)
-                  : node.id.startsWith('pool:')
-                    ? node.id.slice(5)
-                    : node.id);
-            setHoveredNodeId(node.id);
-            setHovered({
-              x: event.clientX + 12,
-              y: event.clientY + 12,
-              label: tooltipLabel,
-              group: (node.data as { group?: string })?.group || 'site',
-              lines: (() => {
-                const data = node.data as { lines?: string[]; peerings?: string[] } | undefined;
-                if (data?.lines && data.lines.length > 0) {
-                  return data.lines;
-                }
-                const peerings = data?.peerings || [];
-                return [`Peerings: ${peerings.length > 0 ? peerings.join(', ') : '-'}`];
-              })()
-            });
-          }}
-          onNodePointerOut={() => {
-            setHovered(null);
-            setHoveredNodeId(null);
-          }}
-          onEdgePointerOver={(edge, event) => {
-            if (!event) return;
-            setHovered(null);
-            setHoveredNodeId(null);
-            const data = edge.data as {
-              peerings?: string[];
-              hcUp?: number;
-              hcTotal?: number;
-              sourceLabel?: string;
-              targetLabel?: string;
-            } | undefined;
-            const hcDetail = data?.hcTotal && data.hcTotal > 0
-              ? `${data.hcUp ?? 0}/${data.hcTotal} links up`
-              : 'No health check data';
-            const title = mode === 'nodes'
-              ? `${data?.sourceLabel || edge.source} <-> ${data?.targetLabel || edge.target}`
-              : (data?.peerings?.join(', ') || 'Unknown peering');
-            setEdgeHovered({
-              x: event.clientX + 12,
-              y: event.clientY + 12,
-              title,
-              detail: hcDetail
-            });
-          }}
-          onEdgePointerOut={() => setEdgeHovered(null)}
-          onCanvasPointerOut={() => {
-            setHovered(null);
-            setHoveredNodeId(null);
-            setEdgeHovered(null);
-          }}
-          onCanvasClick={() => {
-            setHovered(null);
-            setHoveredNodeId(null);
-            setEdgeHovered(null);
-          }}
-        />
-        {hovered && createPortal(
-          <div className="topology-tooltip" style={{ left: hovered.x, top: hovered.y }}>
-            <div><strong>{hovered.label}</strong></div>
-            <div>Type: {
-              hovered.group === 'pool'
-                ? 'Gateway Pool'
-                : hovered.group === 'site'
-                  ? 'Site'
-                  : hovered.group === 'gateway-node'
-                    ? 'Gateway Node'
-                    : 'Node'
-            }</div>
-            {hovered.lines.map((line, index) => (
-              <div key={`${hovered.label}-line-${index}`}>{line}</div>
-            ))}
-          </div>,
-          document.body
-        )}
-        {edgeHovered && createPortal(
-          <div className="topology-tooltip" style={{ left: edgeHovered.x, top: edgeHovered.y }}>
-            <div><strong>{edgeHovered.title}</strong></div>
-            <div>{edgeHovered.detail}</div>
-          </div>,
-          document.body
-        )}
-        {showZoomHint && zoomHintOverlayStyle && createPortal(
-          <div className="topology-zoom-hint-overlay" style={zoomHintOverlayStyle} />,
-          document.body
-        )}
-        {showZoomHint && createPortal(
-          <div className="topology-zoom-hint" style={zoomHintStyle}>
-            <span>Hold Ctrl and scroll to zoom graph</span>
-          </div>,
-          document.body
-        )}
-      </div>
-    </div>
-  );
-}
-
-
-export default Topology;
diff --git a/frontend/src/components/nodes/shared/index.ts b/frontend/src/components/nodes/shared/index.ts
index 6e8a4b51b..e57457d0f 100644
--- a/frontend/src/components/nodes/shared/index.ts
+++ b/frontend/src/components/nodes/shared/index.ts
@@ -1,8 +1,6 @@
 // Copyright (c) Microsoft Corporation.
 // SPDX-License-Identifier: Apache-2.0
 
-export type { ReagraphModule } from './types';
-
 export { uiDiag } from './uiDiag';
 export { CloseXIcon, MagnifyPlusIcon, TableFilterButton, useDismissOnOutside } from './tableUi';
 export {
diff --git a/frontend/src/components/nodes/shared/types.ts b/frontend/src/components/nodes/shared/types.ts
deleted file mode 100644
index f4a4994bc..000000000
--- a/frontend/src/components/nodes/shared/types.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// SPDX-License-Identifier: Apache-2.0
-
-import * as React from 'react';
-
-type ReagraphModule = {
-  GraphCanvas: React.ComponentType<any>;
-  darkTheme: Record<string, any>;
-  lightTheme: Record<string, any>;
-};
-
-export type { ReagraphModule };
diff --git a/frontend/src/hooks/useClusterStatus.ts b/frontend/src/hooks/useClusterStatus.ts
index c987b9fe8..7e9500520 100644
--- a/frontend/src/hooks/useClusterStatus.ts
+++ b/frontend/src/hooks/useClusterStatus.ts
@@ -160,7 +160,6 @@ function buildSummaryFromFullStatus(cs: ClusterStatus): ClusterSummary {
     problems: cs.problems,
     pullEnabled: cs.pullEnabled,
     nodeSummaries: nodes.map(buildNodeSummaryFromNodeStatus),
-    connectivityMatrix: cs.connectivityMatrix,
   };
 }
 
@@ -274,7 +273,6 @@ function useClusterStatus() {
           if (delta.warnings) merged.warnings = delta.warnings;
           if (delta.problems) merged.problems = delta.problems;
           if (delta.pullEnabled != null) merged.pullEnabled = delta.pullEnabled;
-          if (delta.connectivityMatrix !== undefined) merged.connectivityMatrix = delta.connectivityMatrix;
           if (delta.nodeSummaries || delta.removedNodes) {
             const byName = new Map<string, NodeSummary>();
             for (const ns of prev.nodeSummaries || []) {
diff --git a/frontend/src/hooks/useDashboardData.ts b/frontend/src/hooks/useDashboardData.ts
index f604a6766..1e4fde281 100644
--- a/frontend/src/hooks/useDashboardData.ts
+++ b/frontend/src/hooks/useDashboardData.ts
@@ -14,8 +14,6 @@ type DashboardDataParams = {
   gatewayPoolHiddenNames: Set<string>;
   hiddenSites: Set<string>;
   selectedNodeTypesFilter: Set<string>;
-  networkTab: 'siteTopology' | 'matrix';
-  maximizedPanel: 'nodes' | 'siteTopology' | 'matrix' | null;
   pullEnabledOptimistic: boolean | null;
   selectedNodeName: string | null;
   nodeDetail: (name: string) => NodeStatus | undefined;
@@ -30,8 +28,6 @@ function useDashboardData({
   gatewayPoolHiddenNames,
   hiddenSites,
   selectedNodeTypesFilter,
-  networkTab,
-  maximizedPanel,
   pullEnabledOptimistic,
   selectedNodeName,
   nodeDetail
@@ -163,96 +159,7 @@ function useDashboardData({
     return counts;
   }, [gatewayPools, nodes, nodeSummaries]);
 
-  const edgeHealthCheckCounts = useMemo(() => {
-    const nodeToEntity = new Map<string, string>();
-    const nodeNameSet = new Set<string>();
-
-    // Build node-to-entity mapping from full nodes or summaries
-    const nodeSource = nodes.length > 0
-      ? nodes.map((n) => ({ name: n.nodeInfo?.name, siteName: n.nodeInfo?.siteName }))
-      : nodeSummaries.map((ns) => ({ name: ns.name, siteName: ns.siteName }));
-    for (const node of nodeSource) {
-      const name = node.name;
-      if (!name) continue;
-      nodeNameSet.add(name);
-      const poolName = gatewayByNode.get(name);
-      if (poolName) {
-        nodeToEntity.set(name, `pool:${poolName}`);
-      } else if (node.siteName) {
-        nodeToEntity.set(name, `site:${node.siteName}`);
-      }
-    }
-
-    const counts = new Map<string, { up: number; total: number }>();
-
-    if (nodes.length > 0) {
-      // Full nodes available: use peer-level health check data
-      for (const node of nodes) {
-        const name = node.nodeInfo?.name;
-        if (!name) continue;
-        const srcEntity = nodeToEntity.get(name);
-        if (!srcEntity) continue;
-        for (const peer of node.peers || []) {
-          if (!peer.healthCheck?.enabled && !peer.healthCheck) continue;
-          const peerSite = peer.siteName;
-          if (!peerSite) continue;
-          let dstEntity: string | undefined;
-          if (peer.name) {
-            if (!nodeNameSet.has(peer.name)) continue;
-            dstEntity = nodeToEntity.get(peer.name);
-          }
-          if (!dstEntity) dstEntity = `site:${peerSite}`;
-          if (srcEntity === dstEntity) continue;
-          const edgeKey = srcEntity < dstEntity
-            ? `${srcEntity}|${dstEntity}`
-            : `${dstEntity}|${srcEntity}`;
-          const current = counts.get(edgeKey) || { up: 0, total: 0 };
-          current.total++;
-          const rawStatus = (peer.healthCheck?.status || '').trim().toLowerCase();
-          if (rawStatus === 'up') current.up++;
-          counts.set(edgeKey, current);
-        }
-      }
-    } else {
-      // Summary mode: derive counts from connectivity matrix
-      const matrix = summary?.connectivityMatrix;
-      if (matrix) {
-        for (const [, siteMatrix] of Object.entries(matrix)) {
-          const results = siteMatrix?.results || {};
-          for (const [src, row] of Object.entries(results)) {
-            const srcEntity = nodeToEntity.get(src);
-            if (!srcEntity) continue;
-            for (const [dst, cellStatus] of Object.entries(row || {})) {
-              if (src >= dst) continue; // count each pair once
-              const dstEntity = nodeToEntity.get(dst);
-              if (!dstEntity || srcEntity === dstEntity) continue;
-              const edgeKey = srcEntity < dstEntity
-                ? `${srcEntity}|${dstEntity}`
-                : `${dstEntity}|${srcEntity}`;
-              const current = counts.get(edgeKey) || { up: 0, total: 0 };
-              current.total++;
-              const status = (typeof cellStatus === 'string' ? cellStatus : '').trim().toLowerCase();
-              if (status === 'up') current.up++;
-              counts.set(edgeKey, current);
-            }
-          }
-        }
-      }
-    }
-    return counts;
-  }, [nodes, nodeSummaries, gatewayByNode, summary]);
-
-  const poolToSite = useMemo(() => {
-    const map = new Map<string, string>();
-    for (const pool of gatewayPools) {
-      if (pool.name && pool.siteName) {
-        map.set(pool.name, pool.siteName);
-      }
-    }
-    return map;
-  }, [gatewayPools]);
-
-  // Visible full nodes (for NetworkCard and other components needing full NodeStatus)
+  // Visible full nodes provide backward compatibility for summary filtering.
   const visibleNodes = useMemo(() => {
     return nodes.filter((node) => {
       const nodeName = node.nodeInfo?.name || '';
@@ -324,10 +231,6 @@ function useDashboardData({
     return { healthy, total };
   }, [nodes, nodeSummaries]);
 
-  const activeNetworkTab = maximizedPanel === 'siteTopology' || maximizedPanel === 'matrix'
-    ? maximizedPanel
-    : networkTab;
-
   const effectivePullEnabled = pullEnabledOptimistic ?? Boolean(summary?.pullEnabled ?? status?.pullEnabled);
 
   // Active selected node detail from the cache
@@ -340,9 +243,7 @@ function useDashboardData({
   }, [selectedNodeName, nodeDetail, nodes]);
 
   return {
-    activeNetworkTab,
     activeSelectedNode,
-    edgeHealthCheckCounts,
     effectivePullEnabled,
     gatewayByNode,
     nodeK8sStatusMap,
@@ -350,7 +251,6 @@ function useDashboardData({
     nodeTotalCount,
     peerHealth,
     poolCounts,
-    poolToSite,
     siteCounts,
     visibleNodes,
     visibleNodeSummaries
diff --git a/frontend/src/types.ts b/frontend/src/types.ts
index 79530d5a5..c6ad4a4ff 100644
--- a/frontend/src/types.ts
+++ b/frontend/src/types.ts
@@ -10,7 +10,6 @@ export type ClusterStatus = {
   sites?: SiteStatus[];
   gatewayPools?: GatewayPoolStatus[];
   peerings?: PeeringStatus[];
-  connectivityMatrix?: Record<string, SiteMatrix>;
   buildInfo?: BuildInfo;
   leaderInfo?: LeaderInfo;
   errors?: string[];
@@ -195,11 +194,6 @@ export type PeeringStatus = {
   healthCheckEnabled?: boolean;
 };
 
-export type SiteMatrix = {
-  nodes?: string[];
-  results?: Record<string, Record<string, string>>;
-};
-
 export type ClusterStatusDelta = {
   seq?: number;
   timestamp?: string;
@@ -212,7 +206,6 @@ export type ClusterStatusDelta = {
   sites?: SiteStatus[];
   gatewayPools?: GatewayPoolStatus[];
   peerings?: PeeringStatus[];
-  connectivityMatrix?: Record<string, SiteMatrix> | null;
   buildInfo?: BuildInfo;
   leaderInfo?: LeaderInfo;
   errors?: string[];
@@ -237,7 +230,6 @@ export type ClusterSummary = {
   problems?: StatusProblem[];
   pullEnabled?: boolean;
   nodeSummaries?: NodeSummary[];
-  connectivityMatrix?: Record<string, SiteMatrix>;
 };
 
 export type ClusterSummaryDelta = {
@@ -257,7 +249,6 @@ export type ClusterSummaryDelta = {
   pullEnabled?: boolean;
   nodeSummaries?: NodeSummary[];
   removedNodes?: string[];
-  connectivityMatrix?: Record<string, SiteMatrix>;
 };
 
 export type NodeSummary = {
diff --git a/frontend/vite.config.ts b/frontend/vite.config.ts
index 9a28582bd..9bf92c9b4 100644
--- a/frontend/vite.config.ts
+++ b/frontend/vite.config.ts
@@ -28,9 +28,7 @@ export default defineConfig(({ mode }) => {
         output: {
           codeSplitting: {
             groups: [
-              { name: 'tanstack', test: /node_modules[\\/]@tanstack[\\/](react-table|table-core)[\\/]/ },
-              { name: 'reagraph', test: /node_modules[\\/]reagraph[\\/]/ },
-              { name: 'three', test: /node_modules[\\/]three[\\/]/ }
+              { name: 'tanstack', test: /node_modules[\\/]@tanstack[\\/](react-table|table-core)[\\/]/ }
             ]
           }
         }
diff --git a/internal/net/status/details.go b/internal/net/status/details.go
new file mode 100644
index 000000000..4eeedb3bd
--- /dev/null
+++ b/internal/net/status/details.go
@@ -0,0 +1,81 @@
+// Copyright (c) Microsoft Corporation.
+// SPDX-License-Identifier: Apache-2.0
+
+package status
+
+import (
+	"fmt"
+	"time"
+
+	statusproto "github.com/Azure/unbounded/internal/net/status/proto"
+	statusv1alpha1 "github.com/Azure/unbounded/internal/net/status/v1alpha1"
+)
+
+// ValidateDetailRequest rejects missing identities and expired/unset deadlines.
+func ValidateDetailRequest(request *statusv1alpha1.DetailRequest, now time.Time) error {
+	if request == nil || request.RequestID == "" {
+		return fmt.Errorf("detail request ID is required")
+	}
+
+	if request.Deadline.IsZero() || !request.Deadline.After(now) {
+		return fmt.Errorf("detail request deadline must be in the future")
+	}
+
+	return nil
+}
+
+// DetailRequestToProto preserves nil requests and uses zero for unset deadlines.
+func DetailRequestToProto(request *statusv1alpha1.DetailRequest) *statusproto.DetailRequest {
+	if request == nil {
+		return nil
+	}
+
+	result := &statusproto.DetailRequest{RequestId: request.RequestID}
+	if !request.Deadline.IsZero() {
+		result.DeadlineUnixNs = request.Deadline.UnixNano()
+	}
+
+	return result
+}
+
+// DetailRequestFromProto preserves nil requests and unset deadlines.
+func DetailRequestFromProto(request *statusproto.DetailRequest) *statusv1alpha1.DetailRequest {
+	if request == nil {
+		return nil
+	}
+
+	result := &statusv1alpha1.DetailRequest{RequestID: request.RequestId}
+	if request.DeadlineUnixNs != 0 {
+		result.Deadline = time.Unix(0, request.DeadlineUnixNs).UTC()
+	}
+
+	return result
+}
+
+// NodeStatusAckToProto converts shared ACKs without conflating request IDs and revisions.
+func NodeStatusAckToProto(ack *statusv1alpha1.NodeStatusAck) *statusproto.NodeStatusAck {
+	if ack == nil {
+		return nil
+	}
+
+	return &statusproto.NodeStatusAck{
+		Status: ack.Status, Revision: ack.Revision, Reason: ack.Reason,
+		PeerMeasurements: ack.PeerMeasurements,
+		DetailRequest:    DetailRequestToProto(ack.DetailRequest),
+		SummarySupported: ack.SummarySupported, DetailRequestId: ack.DetailRequestID,
+	}
+}
+
+// NodeStatusAckFromProto converts shared ACKs for either response transport.
+func NodeStatusAckFromProto(ack *statusproto.NodeStatusAck) *statusv1alpha1.NodeStatusAck {
+	if ack == nil {
+		return nil
+	}
+
+	return &statusv1alpha1.NodeStatusAck{
+		Status: ack.Status, Revision: ack.Revision, Reason: ack.Reason,
+		PeerMeasurements: ack.PeerMeasurements,
+		DetailRequest:    DetailRequestFromProto(ack.DetailRequest),
+		SummarySupported: ack.SummarySupported, DetailRequestID: ack.DetailRequestId,
+	}
+}
diff --git a/internal/net/status/details_test.go b/internal/net/status/details_test.go
new file mode 100644
index 000000000..fc73a1f97
--- /dev/null
+++ b/internal/net/status/details_test.go
@@ -0,0 +1,151 @@
+// Copyright (c) Microsoft Corporation.
+// SPDX-License-Identifier: Apache-2.0
+
+package status
+
+import (
+	"encoding/json"
+	"reflect"
+	"testing"
+	"time"
+
+	"google.golang.org/protobuf/proto"
+	"google.golang.org/protobuf/reflect/protoreflect"
+
+	statusproto "github.com/Azure/unbounded/internal/net/status/proto"
+	statusv1alpha1 "github.com/Azure/unbounded/internal/net/status/v1alpha1"
+)
+
+func TestDetailRequestValidation(t *testing.T) {
+	now := time.Unix(100, 0)
+	for _, tc := range []struct {
+		name    string
+		request *statusv1alpha1.DetailRequest
+		valid   bool
+	}{
+		{"nil", nil, false},
+		{"missing ID", &statusv1alpha1.DetailRequest{Deadline: now.Add(time.Second)}, false},
+		{"missing deadline", &statusv1alpha1.DetailRequest{RequestID: "id"}, false},
+		{"expired", &statusv1alpha1.DetailRequest{RequestID: "id", Deadline: now.Add(-time.Nanosecond)}, false},
+		{"at deadline", &statusv1alpha1.DetailRequest{RequestID: "id", Deadline: now}, false},
+		{"live", &statusv1alpha1.DetailRequest{RequestID: "id", Deadline: now.Add(time.Nanosecond)}, true},
+	} {
+		t.Run(tc.name, func(t *testing.T) {
+			if err := ValidateDetailRequest(tc.request, now); (err == nil) != tc.valid {
+				t.Fatalf("ValidateDetailRequest() = %v, valid = %v", err, tc.valid)
+			}
+		})
+	}
+}
+
+func TestDetailACKRoundTrip(t *testing.T) {
+	request := &statusv1alpha1.DetailRequest{RequestID: "request", Deadline: time.Unix(100, 123).UTC()}
+	for _, tc := range []struct {
+		name        string
+		ack         *statusv1alpha1.NodeStatusAck
+		publication bool
+	}{
+		{"nil", nil, false},
+		{"legacy", &statusv1alpha1.NodeStatusAck{Status: "ok", Revision: 5}, true},
+		{"resync", &statusv1alpha1.NodeStatusAck{Status: "resync_required", Reason: "base expired"}, true},
+		{"command", &statusv1alpha1.NodeStatusAck{Status: statusv1alpha1.DetailRequestStatus, DetailRequest: request}, false},
+		{"details", &statusv1alpha1.NodeStatusAck{Status: "ok", DetailRequestID: "request"}, false},
+		{"unknown", &statusv1alpha1.NodeStatusAck{Status: "unknown"}, false},
+		{"piggyback", &statusv1alpha1.NodeStatusAck{
+			Status: "ok", Revision: 9, DetailRequest: request, SummarySupported: true, PeerMeasurements: true,
+		}, true},
+	} {
+		t.Run(tc.name, func(t *testing.T) {
+			pb := NodeStatusAckToProto(tc.ack)
+			if pb != nil {
+				data, err := proto.Marshal(pb)
+				if err != nil {
+					t.Fatal(err)
+				}
+
+				pb = &statusproto.NodeStatusAck{}
+				if err := proto.Unmarshal(data, pb); err != nil {
+					t.Fatal(err)
+				}
+			}
+
+			got := NodeStatusAckFromProto(pb)
+			if !reflect.DeepEqual(got, tc.ack) || got.IsPublicationAck() != tc.publication {
+				t.Fatalf("ACK changed or misclassified: %+v", got)
+			}
+
+			data, err := json.Marshal(got)
+			if err != nil {
+				t.Fatal(err)
+			}
+
+			var jsonAck *statusv1alpha1.NodeStatusAck
+			if err := json.Unmarshal(data, &jsonAck); err != nil {
+				t.Fatal(err)
+			}
+
+			if !reflect.DeepEqual(jsonAck, tc.ack) || jsonAck.IsPublicationAck() != tc.publication {
+				t.Fatalf("JSON ACK changed or misclassified: %s", data)
+			}
+		})
+	}
+
+	if got := DetailRequestFromProto(DetailRequestToProto(&statusv1alpha1.DetailRequest{RequestID: "unset"})); !got.Deadline.IsZero() {
+		t.Fatalf("unset deadline changed: %v", got.Deadline)
+	}
+}
+
+func TestDetailWireFields(t *testing.T) {
+	for _, tc := range []struct {
+		message proto.Message
+		fields  map[protoreflect.Name]protoreflect.FieldNumber
+	}{
+		{&statusproto.NodeStatusMessage{}, map[protoreflect.Name]protoreflect.FieldNumber{
+			"status": 4, "summary": 6, "detail_request_id": 7, "supports_details": 8,
+		}},
+		{&statusproto.NodeStatusAck{}, map[protoreflect.Name]protoreflect.FieldNumber{
+			"status": 1, "revision": 2, "reason": 3, "peer_measurements": 4,
+			"detail_request": 5, "summary_supported": 6, "detail_request_id": 7,
+		}},
+		{&statusproto.DetailRequest{}, map[protoreflect.Name]protoreflect.FieldNumber{
+			"request_id": 1, "deadline_unix_ns": 2,
+		}},
+	} {
+		fields := tc.message.ProtoReflect().Descriptor().Fields()
+		for name, number := range tc.fields {
+			if field := fields.ByName(name); field == nil || field.Number() != number {
+				t.Errorf("%T field %q no longer has number %d", tc.message, name, number)
+			}
+		}
+	}
+
+	legacy := &statusv1alpha1.NodeStatusAck{Status: "ok", Revision: 1}
+
+	data, err := json.Marshal(legacy)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	if string(data) != `{"status":"ok","revision":1}` {
+		t.Fatalf("legacy JSON shape changed: %s", data)
+	}
+
+	message := &statusv1alpha1.NodeStatusMessage{
+		Type: statusv1alpha1.NodeStatusDetailsType, NodeName: "node", DetailRequestID: "request",
+		SupportsDetails: true, Status: &statusv1alpha1.NodeStatusResponse{},
+	}
+
+	data, err = json.Marshal(message)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	var got statusv1alpha1.NodeStatusMessage
+	if err := json.Unmarshal(data, &got); err != nil {
+		t.Fatal(err)
+	}
+
+	if !reflect.DeepEqual(&got, message) || got.Summary != nil || got.BaseRevision != 0 {
+		t.Fatalf("detail JSON round trip changed payload: %s", data)
+	}
+}
diff --git a/internal/net/status/overview_test.go b/internal/net/status/overview_test.go
new file mode 100644
index 000000000..7b40088c4
--- /dev/null
+++ b/internal/net/status/overview_test.go
@@ -0,0 +1,80 @@
+// Copyright (c) Microsoft Corporation.
+// SPDX-License-Identifier: Apache-2.0
+
+package status
+
+import (
+	"encoding/json"
+	"testing"
+
+	"google.golang.org/protobuf/proto"
+	"google.golang.org/protobuf/reflect/protoreflect"
+
+	statusproto "github.com/Azure/unbounded/internal/net/status/proto"
+	"github.com/Azure/unbounded/internal/net/status/v1alpha1"
+)
+
+func TestOverviewJSONFields(t *testing.T) {
+	data, err := json.Marshal(v1alpha1.NodeStatusOverview{})
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	var fields map[string]json.RawMessage
+	if err := json.Unmarshal(data, &fields); err != nil {
+		t.Fatal(err)
+	}
+
+	for _, name := range []string{"peerCount", "healthyPeers", "routeCount", "routeMismatch"} {
+		if _, ok := fields[name]; !ok {
+			t.Errorf("zero-valued overview fact %q omitted", name)
+		}
+	}
+
+	for _, name := range []string{"peers", "routingTable", "bpfEntries", "peerMeasurements"} {
+		if _, ok := fields[name]; ok {
+			t.Errorf("detail field %q present", name)
+		}
+	}
+}
+
+func TestOverviewProtoContract(t *testing.T) {
+	want := &statusproto.NodeStatusMessage{
+		Type: "node_status_summary", NodeName: "node",
+		Summary: &statusproto.NodeStatusOverview{
+			NodeInfo:  &statusproto.NodeInfo{Name: "node"},
+			PeerCount: 7, HealthyPeers: 5, RouteCount: 11, RouteMismatch: true,
+			NodeErrors: []*statusproto.NodeError{{Type: "cni", Message: "not ready"}},
+		},
+	}
+
+	data, err := proto.Marshal(want)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	got := &statusproto.NodeStatusMessage{}
+	if err := proto.Unmarshal(data, got); err != nil {
+		t.Fatal(err)
+	}
+
+	if !proto.Equal(got, want) || got.Status != nil || got.Delta != nil {
+		t.Fatalf("summary round trip changed payload: %v", got)
+	}
+
+	fields := got.ProtoReflect().Descriptor().Fields()
+	for name, number := range map[protoreflect.Name]protoreflect.FieldNumber{
+		"type": 1, "node_name": 2, "base_revision": 3, "status": 4, "delta": 5, "summary": 6,
+	} {
+		if field := fields.ByName(name); field == nil || field.Number() != number {
+			t.Errorf("field %s no longer has number %d", name, number)
+		}
+	}
+
+	summaryFields := got.Summary.ProtoReflect().Descriptor().Fields()
+	for _, name := range []protoreflect.Name{"peers", "routing_table", "bpf_entries", "peer_measurements"} {
+		if summaryFields.ByName(name) != nil {
+			t.Errorf("summary exposes detail field %q", name)
+		}
+	}
+}
diff --git a/internal/net/status/proto/status.pb.go b/internal/net/status/proto/status.pb.go
index 3330a065b..79eff0d73 100644
--- a/internal/net/status/proto/status.pb.go
+++ b/internal/net/status/proto/status.pb.go
@@ -26,14 +26,17 @@ const (
 
 // NodeStatusMessage wraps all node-to-controller status messages.
 type NodeStatusMessage struct {
-	state         protoimpl.MessageState `protogen:"open.v1"`
-	Type          string                 `protobuf:"bytes,1,opt,name=type,proto3" json:"type,omitempty"` // "node_status_full" or "node_status_delta"
-	NodeName      string                 `protobuf:"bytes,2,opt,name=node_name,json=nodeName,proto3" json:"node_name,omitempty"`
-	BaseRevision  uint64                 `protobuf:"varint,3,opt,name=base_revision,json=baseRevision,proto3" json:"base_revision,omitempty"`
-	Status        *NodeStatusFull        `protobuf:"bytes,4,opt,name=status,proto3" json:"status,omitempty"` // set for full updates
-	Delta         *NodeStatusDelta       `protobuf:"bytes,5,opt,name=delta,proto3" json:"delta,omitempty"`   // set for delta updates
-	unknownFields protoimpl.UnknownFields
-	sizeCache     protoimpl.SizeCache
+	state           protoimpl.MessageState `protogen:"open.v1"`
+	Type            string                 `protobuf:"bytes,1,opt,name=type,proto3" json:"type,omitempty"` // "node_status_full", "node_status_delta", "node_status_summary", or "node_status_details"
+	NodeName        string                 `protobuf:"bytes,2,opt,name=node_name,json=nodeName,proto3" json:"node_name,omitempty"`
+	BaseRevision    uint64                 `protobuf:"varint,3,opt,name=base_revision,json=baseRevision,proto3" json:"base_revision,omitempty"`
+	Status          *NodeStatusFull        `protobuf:"bytes,4,opt,name=status,proto3" json:"status,omitempty"`                                            // set for full updates
+	Delta           *NodeStatusDelta       `protobuf:"bytes,5,opt,name=delta,proto3" json:"delta,omitempty"`                                              // set for delta updates
+	Summary         *NodeStatusOverview    `protobuf:"bytes,6,opt,name=summary,proto3" json:"summary,omitempty"`                                          // complete overview, including on resync
+	DetailRequestId string                 `protobuf:"bytes,7,opt,name=detail_request_id,json=detailRequestId,proto3" json:"detail_request_id,omitempty"` // correlates one-shot details in status, never a revision
+	SupportsDetails bool                   `protobuf:"varint,8,opt,name=supports_details,json=supportsDetails,proto3" json:"supports_details,omitempty"`
+	unknownFields   protoimpl.UnknownFields
+	sizeCache       protoimpl.SizeCache
 }
 
 func (x *NodeStatusMessage) Reset() {
@@ -101,6 +104,27 @@ func (x *NodeStatusMessage) GetDelta() *NodeStatusDelta {
 	return nil
 }
 
+func (x *NodeStatusMessage) GetSummary() *NodeStatusOverview {
+	if x != nil {
+		return x.Summary
+	}
+	return nil
+}
+
+func (x *NodeStatusMessage) GetDetailRequestId() string {
+	if x != nil {
+		return x.DetailRequestId
+	}
+	return ""
+}
+
+func (x *NodeStatusMessage) GetSupportsDetails() bool {
+	if x != nil {
+		return x.SupportsDetails
+	}
+	return false
+}
+
 // NodeStatusAck is the acknowledgment returned by the controller for push updates.
 type NodeStatusAck struct {
 	state            protoimpl.MessageState `protogen:"open.v1"`
@@ -108,6 +132,9 @@ type NodeStatusAck struct {
 	Revision         uint64                 `protobuf:"varint,2,opt,name=revision,proto3" json:"revision,omitempty"`
 	Reason           string                 `protobuf:"bytes,3,opt,name=reason,proto3" json:"reason,omitempty"`
 	PeerMeasurements bool                   `protobuf:"varint,4,opt,name=peer_measurements,json=peerMeasurements,proto3" json:"peer_measurements,omitempty"` // Positive capability, scoped to this WebSocket connection.
+	DetailRequest    *DetailRequest         `protobuf:"bytes,5,opt,name=detail_request,json=detailRequest,proto3" json:"detail_request,omitempty"`           // unsolicited WS command or piggybacked HTTP response
+	SummarySupported bool                   `protobuf:"varint,6,opt,name=summary_supported,json=summarySupported,proto3" json:"summary_supported,omitempty"`
+	DetailRequestId  string                 `protobuf:"bytes,7,opt,name=detail_request_id,json=detailRequestId,proto3" json:"detail_request_id,omitempty"` // a detail ACK must not acknowledge a routine publication
 	unknownFields    protoimpl.UnknownFields
 	sizeCache        protoimpl.SizeCache
 }
@@ -170,6 +197,27 @@ func (x *NodeStatusAck) GetPeerMeasurements() bool {
 	return false
 }
 
+func (x *NodeStatusAck) GetDetailRequest() *DetailRequest {
+	if x != nil {
+		return x.DetailRequest
+	}
+	return nil
+}
+
+func (x *NodeStatusAck) GetSummarySupported() bool {
+	if x != nil {
+		return x.SummarySupported
+	}
+	return false
+}
+
+func (x *NodeStatusAck) GetDetailRequestId() string {
+	if x != nil {
+		return x.DetailRequestId
+	}
+	return ""
+}
+
 // NodeStatusFull mirrors the complete NodeStatusResponse payload.
 type NodeStatusFull struct {
 	state              protoimpl.MessageState `protogen:"open.v1"`
@@ -1822,22 +1870,215 @@ func (x *BpfEntry) GetHealthy() bool {
 	return false
 }
 
+// NodeStatusOverview carries observed overview facts without detailed arrays.
+type NodeStatusOverview struct {
+	state              protoimpl.MessageState `protogen:"open.v1"`
+	TimestampUnixNs    int64                  `protobuf:"varint,1,opt,name=timestamp_unix_ns,json=timestampUnixNs,proto3" json:"timestamp_unix_ns,omitempty"`
+	NodeInfo           *NodeInfo              `protobuf:"bytes,2,opt,name=node_info,json=nodeInfo,proto3" json:"node_info,omitempty"`
+	HealthCheck        *HealthCheckStatus     `protobuf:"bytes,3,opt,name=health_check,json=healthCheck,proto3" json:"health_check,omitempty"`
+	NodeErrors         []*NodeError           `protobuf:"bytes,4,rep,name=node_errors,json=nodeErrors,proto3" json:"node_errors,omitempty"`
+	FetchError         string                 `protobuf:"bytes,5,opt,name=fetch_error,json=fetchError,proto3" json:"fetch_error,omitempty"`
+	LastPushTimeUnixNs int64                  `protobuf:"varint,6,opt,name=last_push_time_unix_ns,json=lastPushTimeUnixNs,proto3" json:"last_push_time_unix_ns,omitempty"` // 0 means unset
+	StatusSource       string                 `protobuf:"bytes,7,opt,name=status_source,json=statusSource,proto3" json:"status_source,omitempty"`
+	NodePodInfo        *NodePodInfo           `protobuf:"bytes,8,opt,name=node_pod_info,json=nodePodInfo,proto3" json:"node_pod_info,omitempty"`
+	PeerCount          int32                  `protobuf:"varint,9,opt,name=peer_count,json=peerCount,proto3" json:"peer_count,omitempty"`
+	HealthyPeers       int32                  `protobuf:"varint,10,opt,name=healthy_peers,json=healthyPeers,proto3" json:"healthy_peers,omitempty"`
+	RouteCount         int32                  `protobuf:"varint,11,opt,name=route_count,json=routeCount,proto3" json:"route_count,omitempty"`
+	RouteMismatch      bool                   `protobuf:"varint,12,opt,name=route_mismatch,json=routeMismatch,proto3" json:"route_mismatch,omitempty"`
+	unknownFields      protoimpl.UnknownFields
+	sizeCache          protoimpl.SizeCache
+}
+
+func (x *NodeStatusOverview) Reset() {
+	*x = NodeStatusOverview{}
+	mi := &file_status_proto_msgTypes[21]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
+}
+
+func (x *NodeStatusOverview) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*NodeStatusOverview) ProtoMessage() {}
+
+func (x *NodeStatusOverview) ProtoReflect() protoreflect.Message {
+	mi := &file_status_proto_msgTypes[21]
+	if x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use NodeStatusOverview.ProtoReflect.Descriptor instead.
+func (*NodeStatusOverview) Descriptor() ([]byte, []int) {
+	return file_status_proto_rawDescGZIP(), []int{21}
+}
+
+func (x *NodeStatusOverview) GetTimestampUnixNs() int64 {
+	if x != nil {
+		return x.TimestampUnixNs
+	}
+	return 0
+}
+
+func (x *NodeStatusOverview) GetNodeInfo() *NodeInfo {
+	if x != nil {
+		return x.NodeInfo
+	}
+	return nil
+}
+
+func (x *NodeStatusOverview) GetHealthCheck() *HealthCheckStatus {
+	if x != nil {
+		return x.HealthCheck
+	}
+	return nil
+}
+
+func (x *NodeStatusOverview) GetNodeErrors() []*NodeError {
+	if x != nil {
+		return x.NodeErrors
+	}
+	return nil
+}
+
+func (x *NodeStatusOverview) GetFetchError() string {
+	if x != nil {
+		return x.FetchError
+	}
+	return ""
+}
+
+func (x *NodeStatusOverview) GetLastPushTimeUnixNs() int64 {
+	if x != nil {
+		return x.LastPushTimeUnixNs
+	}
+	return 0
+}
+
+func (x *NodeStatusOverview) GetStatusSource() string {
+	if x != nil {
+		return x.StatusSource
+	}
+	return ""
+}
+
+func (x *NodeStatusOverview) GetNodePodInfo() *NodePodInfo {
+	if x != nil {
+		return x.NodePodInfo
+	}
+	return nil
+}
+
+func (x *NodeStatusOverview) GetPeerCount() int32 {
+	if x != nil {
+		return x.PeerCount
+	}
+	return 0
+}
+
+func (x *NodeStatusOverview) GetHealthyPeers() int32 {
+	if x != nil {
+		return x.HealthyPeers
+	}
+	return 0
+}
+
+func (x *NodeStatusOverview) GetRouteCount() int32 {
+	if x != nil {
+		return x.RouteCount
+	}
+	return 0
+}
+
+func (x *NodeStatusOverview) GetRouteMismatch() bool {
+	if x != nil {
+		return x.RouteMismatch
+	}
+	return false
+}
+
+// DetailRequest uses the same deadline across all delivery attempts.
+// Standalone commands use ACK status "detail_request", not "ok".
+type DetailRequest struct {
+	state          protoimpl.MessageState `protogen:"open.v1"`
+	RequestId      string                 `protobuf:"bytes,1,opt,name=request_id,json=requestId,proto3" json:"request_id,omitempty"`
+	DeadlineUnixNs int64                  `protobuf:"varint,2,opt,name=deadline_unix_ns,json=deadlineUnixNs,proto3" json:"deadline_unix_ns,omitempty"`
+	unknownFields  protoimpl.UnknownFields
+	sizeCache      protoimpl.SizeCache
+}
+
+func (x *DetailRequest) Reset() {
+	*x = DetailRequest{}
+	mi := &file_status_proto_msgTypes[22]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
+}
+
+func (x *DetailRequest) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*DetailRequest) ProtoMessage() {}
+
+func (x *DetailRequest) ProtoReflect() protoreflect.Message {
+	mi := &file_status_proto_msgTypes[22]
+	if x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use DetailRequest.ProtoReflect.Descriptor instead.
+func (*DetailRequest) Descriptor() ([]byte, []int) {
+	return file_status_proto_rawDescGZIP(), []int{22}
+}
+
+func (x *DetailRequest) GetRequestId() string {
+	if x != nil {
+		return x.RequestId
+	}
+	return ""
+}
+
+func (x *DetailRequest) GetDeadlineUnixNs() int64 {
+	if x != nil {
+		return x.DeadlineUnixNs
+	}
+	return 0
+}
+
 var File_status_proto protoreflect.FileDescriptor
 
 const file_status_proto_rawDesc = "" +
 	"\n" +
-	"\fstatus.proto\x12\x16unboundednet.status.v1\"\xe8\x01\n" +
+	"\fstatus.proto\x12\x16unboundednet.status.v1\"\x85\x03\n" +
 	"\x11NodeStatusMessage\x12\x12\n" +
 	"\x04type\x18\x01 \x01(\tR\x04type\x12\x1b\n" +
 	"\tnode_name\x18\x02 \x01(\tR\bnodeName\x12#\n" +
 	"\rbase_revision\x18\x03 \x01(\x04R\fbaseRevision\x12>\n" +
 	"\x06status\x18\x04 \x01(\v2&.unboundednet.status.v1.NodeStatusFullR\x06status\x12=\n" +
-	"\x05delta\x18\x05 \x01(\v2'.unboundednet.status.v1.NodeStatusDeltaR\x05delta\"\x88\x01\n" +
+	"\x05delta\x18\x05 \x01(\v2'.unboundednet.status.v1.NodeStatusDeltaR\x05delta\x12D\n" +
+	"\asummary\x18\x06 \x01(\v2*.unboundednet.status.v1.NodeStatusOverviewR\asummary\x12*\n" +
+	"\x11detail_request_id\x18\a \x01(\tR\x0fdetailRequestId\x12)\n" +
+	"\x10supports_details\x18\b \x01(\bR\x0fsupportsDetails\"\xaf\x02\n" +
 	"\rNodeStatusAck\x12\x16\n" +
 	"\x06status\x18\x01 \x01(\tR\x06status\x12\x1a\n" +
 	"\brevision\x18\x02 \x01(\x04R\brevision\x12\x16\n" +
 	"\x06reason\x18\x03 \x01(\tR\x06reason\x12+\n" +
-	"\x11peer_measurements\x18\x04 \x01(\bR\x10peerMeasurements\"\x9c\x05\n" +
+	"\x11peer_measurements\x18\x04 \x01(\bR\x10peerMeasurements\x12L\n" +
+	"\x0edetail_request\x18\x05 \x01(\v2%.unboundednet.status.v1.DetailRequestR\rdetailRequest\x12+\n" +
+	"\x11summary_supported\x18\x06 \x01(\bR\x10summarySupported\x12*\n" +
+	"\x11detail_request_id\x18\a \x01(\tR\x0fdetailRequestId\"\x9c\x05\n" +
 	"\x0eNodeStatusFull\x12*\n" +
 	"\x11timestamp_unix_ns\x18\x01 \x01(\x03R\x0ftimestampUnixNs\x12=\n" +
 	"\tnode_info\x18\x02 \x01(\v2 .unboundednet.status.v1.NodeInfoR\bnodeInfo\x128\n" +
@@ -2011,7 +2252,29 @@ const file_status_proto_rawDesc = "" +
 	"\x03vni\x18\x06 \x01(\rR\x03vni\x12\x10\n" +
 	"\x03mtu\x18\a \x01(\x05R\x03mtu\x12\x18\n" +
 	"\aifindex\x18\b \x01(\rR\aifindex\x12\x18\n" +
-	"\ahealthy\x18\t \x01(\bR\ahealthyB6Z4github.com/Azure/unbounded/internal/net/status/protob\x06proto3"
+	"\ahealthy\x18\t \x01(\bR\ahealthy\"\xe0\x04\n" +
+	"\x12NodeStatusOverview\x12*\n" +
+	"\x11timestamp_unix_ns\x18\x01 \x01(\x03R\x0ftimestampUnixNs\x12=\n" +
+	"\tnode_info\x18\x02 \x01(\v2 .unboundednet.status.v1.NodeInfoR\bnodeInfo\x12L\n" +
+	"\fhealth_check\x18\x03 \x01(\v2).unboundednet.status.v1.HealthCheckStatusR\vhealthCheck\x12B\n" +
+	"\vnode_errors\x18\x04 \x03(\v2!.unboundednet.status.v1.NodeErrorR\n" +
+	"nodeErrors\x12\x1f\n" +
+	"\vfetch_error\x18\x05 \x01(\tR\n" +
+	"fetchError\x122\n" +
+	"\x16last_push_time_unix_ns\x18\x06 \x01(\x03R\x12lastPushTimeUnixNs\x12#\n" +
+	"\rstatus_source\x18\a \x01(\tR\fstatusSource\x12G\n" +
+	"\rnode_pod_info\x18\b \x01(\v2#.unboundednet.status.v1.NodePodInfoR\vnodePodInfo\x12\x1d\n" +
+	"\n" +
+	"peer_count\x18\t \x01(\x05R\tpeerCount\x12#\n" +
+	"\rhealthy_peers\x18\n" +
+	" \x01(\x05R\fhealthyPeers\x12\x1f\n" +
+	"\vroute_count\x18\v \x01(\x05R\n" +
+	"routeCount\x12%\n" +
+	"\x0eroute_mismatch\x18\f \x01(\bR\rrouteMismatch\"X\n" +
+	"\rDetailRequest\x12\x1d\n" +
+	"\n" +
+	"request_id\x18\x01 \x01(\tR\trequestId\x12(\n" +
+	"\x10deadline_unix_ns\x18\x02 \x01(\x03R\x0edeadlineUnixNsB6Z4github.com/Azure/unbounded/internal/net/status/protob\x06proto3"
 
 var (
 	file_status_proto_rawDescOnce sync.Once
@@ -2025,7 +2288,7 @@ func file_status_proto_rawDescGZIP() []byte {
 	return file_status_proto_rawDescData
 }
 
-var file_status_proto_msgTypes = make([]protoimpl.MessageInfo, 23)
+var file_status_proto_msgTypes = make([]protoimpl.MessageInfo, 25)
 var file_status_proto_goTypes = []any{
 	(*NodeStatusMessage)(nil),     // 0: unboundednet.status.v1.NodeStatusMessage
 	(*NodeStatusAck)(nil),         // 1: unboundednet.status.v1.NodeStatusAck
@@ -2048,44 +2311,52 @@ var file_status_proto_goTypes = []any{
 	(*NodeError)(nil),             // 18: unboundednet.status.v1.NodeError
 	(*NodePodInfo)(nil),           // 19: unboundednet.status.v1.NodePodInfo
 	(*BpfEntry)(nil),              // 20: unboundednet.status.v1.BpfEntry
-	nil,                           // 21: unboundednet.status.v1.NodeInfo.K8sLabelsEntry
-	nil,                           // 22: unboundednet.status.v1.PeerStatus.RouteDistancesEntry
+	(*NodeStatusOverview)(nil),    // 21: unboundednet.status.v1.NodeStatusOverview
+	(*DetailRequest)(nil),         // 22: unboundednet.status.v1.DetailRequest
+	nil,                           // 23: unboundednet.status.v1.NodeInfo.K8sLabelsEntry
+	nil,                           // 24: unboundednet.status.v1.PeerStatus.RouteDistancesEntry
 }
 var file_status_proto_depIdxs = []int32{
 	2,  // 0: unboundednet.status.v1.NodeStatusMessage.status:type_name -> unboundednet.status.v1.NodeStatusFull
 	3,  // 1: unboundednet.status.v1.NodeStatusMessage.delta:type_name -> unboundednet.status.v1.NodeStatusDelta
-	5,  // 2: unboundednet.status.v1.NodeStatusFull.node_info:type_name -> unboundednet.status.v1.NodeInfo
-	8,  // 3: unboundednet.status.v1.NodeStatusFull.peers:type_name -> unboundednet.status.v1.PeerStatus
-	10, // 4: unboundednet.status.v1.NodeStatusFull.routing_table:type_name -> unboundednet.status.v1.RoutingTableInfo
-	16, // 5: unboundednet.status.v1.NodeStatusFull.health_check:type_name -> unboundednet.status.v1.HealthCheckStatus
-	18, // 6: unboundednet.status.v1.NodeStatusFull.node_errors:type_name -> unboundednet.status.v1.NodeError
-	19, // 7: unboundednet.status.v1.NodeStatusFull.node_pod_info:type_name -> unboundednet.status.v1.NodePodInfo
-	20, // 8: unboundednet.status.v1.NodeStatusFull.bpf_entries:type_name -> unboundednet.status.v1.BpfEntry
-	5,  // 9: unboundednet.status.v1.NodeStatusDelta.node_info:type_name -> unboundednet.status.v1.NodeInfo
-	8,  // 10: unboundednet.status.v1.NodeStatusDelta.peers:type_name -> unboundednet.status.v1.PeerStatus
-	10, // 11: unboundednet.status.v1.NodeStatusDelta.routing_table:type_name -> unboundednet.status.v1.RoutingTableInfo
-	16, // 12: unboundednet.status.v1.NodeStatusDelta.health_check:type_name -> unboundednet.status.v1.HealthCheckStatus
-	18, // 13: unboundednet.status.v1.NodeStatusDelta.node_errors:type_name -> unboundednet.status.v1.NodeError
-	20, // 14: unboundednet.status.v1.NodeStatusDelta.bpf_entries:type_name -> unboundednet.status.v1.BpfEntry
-	4,  // 15: unboundednet.status.v1.NodeStatusDelta.peer_measurements:type_name -> unboundednet.status.v1.PeerMeasurements
-	19, // 16: unboundednet.status.v1.NodeStatusDelta.node_pod_info:type_name -> unboundednet.status.v1.NodePodInfo
-	6,  // 17: unboundednet.status.v1.NodeInfo.build_info:type_name -> unboundednet.status.v1.BuildInfo
-	7,  // 18: unboundednet.status.v1.NodeInfo.wire_guard:type_name -> unboundednet.status.v1.WireGuardStatusInfo
-	21, // 19: unboundednet.status.v1.NodeInfo.k8s_labels:type_name -> unboundednet.status.v1.NodeInfo.K8sLabelsEntry
-	22, // 20: unboundednet.status.v1.PeerStatus.route_distances:type_name -> unboundednet.status.v1.PeerStatus.RouteDistancesEntry
-	9,  // 21: unboundednet.status.v1.PeerStatus.tunnel:type_name -> unboundednet.status.v1.PeerTunnelStatus
-	17, // 22: unboundednet.status.v1.PeerStatus.health_check:type_name -> unboundednet.status.v1.HealthCheckPeerStatus
-	11, // 23: unboundednet.status.v1.RoutingTableInfo.routes:type_name -> unboundednet.status.v1.RouteEntry
-	12, // 24: unboundednet.status.v1.RouteEntry.next_hops:type_name -> unboundednet.status.v1.NextHop
-	15, // 25: unboundednet.status.v1.NextHop.route_types:type_name -> unboundednet.status.v1.RouteType
-	13, // 26: unboundednet.status.v1.NextHop.expected:type_name -> unboundednet.status.v1.OptionalBool
-	13, // 27: unboundednet.status.v1.NextHop.present:type_name -> unboundednet.status.v1.OptionalBool
-	14, // 28: unboundednet.status.v1.NextHop.info:type_name -> unboundednet.status.v1.NextHopInfo
-	29, // [29:29] is the sub-list for method output_type
-	29, // [29:29] is the sub-list for method input_type
-	29, // [29:29] is the sub-list for extension type_name
-	29, // [29:29] is the sub-list for extension extendee
-	0,  // [0:29] is the sub-list for field type_name
+	21, // 2: unboundednet.status.v1.NodeStatusMessage.summary:type_name -> unboundednet.status.v1.NodeStatusOverview
+	22, // 3: unboundednet.status.v1.NodeStatusAck.detail_request:type_name -> unboundednet.status.v1.DetailRequest
+	5,  // 4: unboundednet.status.v1.NodeStatusFull.node_info:type_name -> unboundednet.status.v1.NodeInfo
+	8,  // 5: unboundednet.status.v1.NodeStatusFull.peers:type_name -> unboundednet.status.v1.PeerStatus
+	10, // 6: unboundednet.status.v1.NodeStatusFull.routing_table:type_name -> unboundednet.status.v1.RoutingTableInfo
+	16, // 7: unboundednet.status.v1.NodeStatusFull.health_check:type_name -> unboundednet.status.v1.HealthCheckStatus
+	18, // 8: unboundednet.status.v1.NodeStatusFull.node_errors:type_name -> unboundednet.status.v1.NodeError
+	19, // 9: unboundednet.status.v1.NodeStatusFull.node_pod_info:type_name -> unboundednet.status.v1.NodePodInfo
+	20, // 10: unboundednet.status.v1.NodeStatusFull.bpf_entries:type_name -> unboundednet.status.v1.BpfEntry
+	5,  // 11: unboundednet.status.v1.NodeStatusDelta.node_info:type_name -> unboundednet.status.v1.NodeInfo
+	8,  // 12: unboundednet.status.v1.NodeStatusDelta.peers:type_name -> unboundednet.status.v1.PeerStatus
+	10, // 13: unboundednet.status.v1.NodeStatusDelta.routing_table:type_name -> unboundednet.status.v1.RoutingTableInfo
+	16, // 14: unboundednet.status.v1.NodeStatusDelta.health_check:type_name -> unboundednet.status.v1.HealthCheckStatus
+	18, // 15: unboundednet.status.v1.NodeStatusDelta.node_errors:type_name -> unboundednet.status.v1.NodeError
+	20, // 16: unboundednet.status.v1.NodeStatusDelta.bpf_entries:type_name -> unboundednet.status.v1.BpfEntry
+	4,  // 17: unboundednet.status.v1.NodeStatusDelta.peer_measurements:type_name -> unboundednet.status.v1.PeerMeasurements
+	19, // 18: unboundednet.status.v1.NodeStatusDelta.node_pod_info:type_name -> unboundednet.status.v1.NodePodInfo
+	6,  // 19: unboundednet.status.v1.NodeInfo.build_info:type_name -> unboundednet.status.v1.BuildInfo
+	7,  // 20: unboundednet.status.v1.NodeInfo.wire_guard:type_name -> unboundednet.status.v1.WireGuardStatusInfo
+	23, // 21: unboundednet.status.v1.NodeInfo.k8s_labels:type_name -> unboundednet.status.v1.NodeInfo.K8sLabelsEntry
+	24, // 22: unboundednet.status.v1.PeerStatus.route_distances:type_name -> unboundednet.status.v1.PeerStatus.RouteDistancesEntry
+	9,  // 23: unboundednet.status.v1.PeerStatus.tunnel:type_name -> unboundednet.status.v1.PeerTunnelStatus
+	17, // 24: unboundednet.status.v1.PeerStatus.health_check:type_name -> unboundednet.status.v1.HealthCheckPeerStatus
+	11, // 25: unboundednet.status.v1.RoutingTableInfo.routes:type_name -> unboundednet.status.v1.RouteEntry
+	12, // 26: unboundednet.status.v1.RouteEntry.next_hops:type_name -> unboundednet.status.v1.NextHop
+	15, // 27: unboundednet.status.v1.NextHop.route_types:type_name -> unboundednet.status.v1.RouteType
+	13, // 28: unboundednet.status.v1.NextHop.expected:type_name -> unboundednet.status.v1.OptionalBool
+	13, // 29: unboundednet.status.v1.NextHop.present:type_name -> unboundednet.status.v1.OptionalBool
+	14, // 30: unboundednet.status.v1.NextHop.info:type_name -> unboundednet.status.v1.NextHopInfo
+	5,  // 31: unboundednet.status.v1.NodeStatusOverview.node_info:type_name -> unboundednet.status.v1.NodeInfo
+	16, // 32: unboundednet.status.v1.NodeStatusOverview.health_check:type_name -> unboundednet.status.v1.HealthCheckStatus
+	18, // 33: unboundednet.status.v1.NodeStatusOverview.node_errors:type_name -> unboundednet.status.v1.NodeError
+	19, // 34: unboundednet.status.v1.NodeStatusOverview.node_pod_info:type_name -> unboundednet.status.v1.NodePodInfo
+	35, // [35:35] is the sub-list for method output_type
+	35, // [35:35] is the sub-list for method input_type
+	35, // [35:35] is the sub-list for extension type_name
+	35, // [35:35] is the sub-list for extension extendee
+	0,  // [0:35] is the sub-list for field type_name
 }
 
 func init() { file_status_proto_init() }
@@ -2099,7 +2370,7 @@ func file_status_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: unsafe.Slice(unsafe.StringData(file_status_proto_rawDesc), len(file_status_proto_rawDesc)),
 			NumEnums:      0,
-			NumMessages:   23,
+			NumMessages:   25,
 			NumExtensions: 0,
 			NumServices:   0,
 		},
diff --git a/internal/net/status/proto/status.proto b/internal/net/status/proto/status.proto
index 98903e2d8..867fafa46 100644
--- a/internal/net/status/proto/status.proto
+++ b/internal/net/status/proto/status.proto
@@ -7,11 +7,14 @@ option go_package = "github.com/Azure/unbounded/internal/net/status/proto";
 
 // NodeStatusMessage wraps all node-to-controller status messages.
 message NodeStatusMessage {
-  string type = 1;           // "node_status_full" or "node_status_delta"
+  string type = 1; // "node_status_full", "node_status_delta", "node_status_summary", or "node_status_details"
   string node_name = 2;
   uint64 base_revision = 3;
   NodeStatusFull status = 4; // set for full updates
   NodeStatusDelta delta = 5; // set for delta updates
+  NodeStatusOverview summary = 6; // complete overview, including on resync
+  string detail_request_id = 7; // correlates one-shot details in status, never a revision
+  bool supports_details = 8;
 }
 
 // NodeStatusAck is the acknowledgment returned by the controller for push updates.
@@ -20,6 +23,9 @@ message NodeStatusAck {
   uint64 revision = 2;
   string reason = 3;
   bool peer_measurements = 4; // Positive capability, scoped to this WebSocket connection.
+  DetailRequest detail_request = 5; // unsolicited WS command or piggybacked HTTP response
+  bool summary_supported = 6;
+  string detail_request_id = 7; // a detail ACK must not acknowledge a routine publication
 }
 
 // NodeStatusFull mirrors the complete NodeStatusResponse payload.
@@ -220,3 +226,26 @@ message BpfEntry {
   uint32 ifindex = 8;
   bool healthy = 9;
 }
+
+// NodeStatusOverview carries observed overview facts without detailed arrays.
+message NodeStatusOverview {
+  int64 timestamp_unix_ns = 1;
+  NodeInfo node_info = 2;
+  HealthCheckStatus health_check = 3;
+  repeated NodeError node_errors = 4;
+  string fetch_error = 5;
+  int64 last_push_time_unix_ns = 6; // 0 means unset
+  string status_source = 7;
+  NodePodInfo node_pod_info = 8;
+  int32 peer_count = 9;
+  int32 healthy_peers = 10;
+  int32 route_count = 11;
+  bool route_mismatch = 12;
+}
+
+// DetailRequest uses the same deadline across all delivery attempts.
+// Standalone commands use ACK status "detail_request", not "ok".
+message DetailRequest {
+  string request_id = 1;
+  int64 deadline_unix_ns = 2;
+}
diff --git a/internal/net/status/v1alpha1/messages.go b/internal/net/status/v1alpha1/messages.go
new file mode 100644
index 000000000..3ec66ced8
--- /dev/null
+++ b/internal/net/status/v1alpha1/messages.go
@@ -0,0 +1,54 @@
+// Copyright (c) Microsoft Corporation.
+// SPDX-License-Identifier: Apache-2.0
+
+package v1alpha1
+
+import (
+	"encoding/json"
+	"time"
+)
+
+const (
+	NodeStatusSummaryType = "node_status_summary"
+	NodeStatusDetailsType = "node_status_details"
+	DetailRequestStatus   = "detail_request"
+)
+
+// DetailRequest is a node-bound diagnostic command, independent of revisions.
+type DetailRequest struct {
+	RequestID string    `json:"requestId"`
+	Deadline  time.Time `json:"deadline"`
+}
+
+// NodeStatusMessage is the JSON equivalent of the protobuf status envelope.
+// Status holds legacy full publications or one-shot node_status_details replies.
+type NodeStatusMessage struct {
+	Type            string                     `json:"type"`
+	NodeName        string                     `json:"nodeName,omitempty"`
+	BaseRevision    uint64                     `json:"baseRevision,omitempty"`
+	Status          *NodeStatusResponse        `json:"status,omitempty"`
+	Delta           map[string]json.RawMessage `json:"delta,omitempty"`
+	Summary         *NodeStatusOverview        `json:"summary,omitempty"`
+	DetailRequestID string                     `json:"detailRequestId,omitempty"`
+	SupportsDetails bool                       `json:"supportsDetails,omitempty"`
+}
+
+// NodeStatusAck is shared by HTTP responses and WebSocket ACK/command data.
+// An unsolicited command uses DetailRequestStatus and leaves Revision unset.
+// An HTTP publication ACK may also carry a pending DetailRequest.
+type NodeStatusAck struct {
+	Status           string         `json:"status"`
+	Revision         uint64         `json:"revision,omitempty"`
+	Reason           string         `json:"reason,omitempty"`
+	PeerMeasurements bool           `json:"peerMeasurements,omitempty"`
+	DetailRequest    *DetailRequest `json:"detailRequest,omitempty"`
+	SummarySupported bool           `json:"summarySupported,omitempty"`
+	DetailRequestID  string         `json:"detailRequestId,omitempty"`
+}
+
+// IsPublicationAck excludes standalone commands and one-shot detail ACKs.
+// Only publication ACKs may clear a routine publisher's pending ACK state.
+func (a *NodeStatusAck) IsPublicationAck() bool {
+	return a != nil && a.DetailRequestID == "" &&
+		(a.Status == "ok" || a.Status == "resync_required")
+}
diff --git a/internal/net/status/v1alpha1/types.go b/internal/net/status/v1alpha1/types.go
index e2eb291d1..34a7766f4 100644
--- a/internal/net/status/v1alpha1/types.go
+++ b/internal/net/status/v1alpha1/types.go
@@ -5,6 +5,23 @@ package v1alpha1
 
 import "time"
 
+// NodeStatusOverview contains routine status without peer, route, or BPF details.
+// Counts and mismatch state are observed facts, not inferred from missing details.
+type NodeStatusOverview struct {
+	Timestamp     time.Time          `json:"timestamp"`
+	NodeInfo      NodeInfo           `json:"nodeInfo"`
+	HealthCheck   *HealthCheckStatus `json:"healthCheck,omitempty"`
+	NodeErrors    []NodeError        `json:"nodeErrors,omitempty"`
+	FetchError    string             `json:"fetchError,omitempty"`
+	LastPushTime  *time.Time         `json:"lastPushTime,omitempty"`
+	StatusSource  string             `json:"statusSource,omitempty"`
+	NodePodInfo   *NodePodInfo       `json:"nodePodInfo,omitempty"`
+	PeerCount     int                `json:"peerCount"`
+	HealthyPeers  int                `json:"healthyPeers"`
+	RouteCount    int                `json:"routeCount"`
+	RouteMismatch bool               `json:"routeMismatch"`
+}
+
 // NodeStatusResponse is the top-level status response for a node.
 type NodeStatusResponse struct {
 	Timestamp    time.Time          `json:"timestamp"`