From cc64a93953d17ae3161f36da8030498af37d143d Mon Sep 17 00:00:00 2001
From: Viktor Liu <17948409+lixmal@users.noreply.github.com>
Date: Tue, 14 Jul 2026 01:49:17 +0900
Subject: [PATCH] [client] Include system events in ToProtoFullStatus
 conversion (#6746)

---
 client/internal/debug/debug.go | 1 -
 client/status/status.go        | 2 ++
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/client/internal/debug/debug.go b/client/internal/debug/debug.go
index 3a7c0ebff..0e506ccd7 100644
--- a/client/internal/debug/debug.go
+++ b/client/internal/debug/debug.go
@@ -480,7 +480,6 @@ func (g *BundleGenerator) addStatus() error {
 
 		fullStatus := g.statusRecorder.GetFullStatus()
 		protoFullStatus := nbstatus.ToProtoFullStatus(fullStatus)
-		protoFullStatus.Events = g.statusRecorder.GetEventHistory()
 		overview := nbstatus.ConvertToStatusOutputOverview(protoFullStatus, nbstatus.ConvertOptions{
 			Anonymize:     g.anonymize,
 			ProfileName:   profName,
diff --git a/client/status/status.go b/client/status/status.go
index a53585c99..e8276d0fa 100644
--- a/client/status/status.go
+++ b/client/status/status.go
@@ -746,6 +746,8 @@ func ToProtoFullStatus(fullStatus peer.FullStatus) *proto.FullStatus {
 		pbFullStatus.DnsServers = append(pbFullStatus.DnsServers, pbDnsState)
 	}
 
+	pbFullStatus.Events = fullStatus.Events
+
 	return &pbFullStatus
 }