PR fixes

ibetitsmike · ibetitsmike · commit 419dcb2aced1 · 2025-06-24T14:17:57.000+02:00
diff --git a/App/ViewModels/AgentViewModel.cs b/App/ViewModels/AgentViewModel.cs
@@ -45,7 +45,6 @@ public AgentViewModel Create(IAgentExpanderHost expanderHost, Uuid id, string fu
         string? workspaceName, bool? didP2p, string? preferredDerp, TimeSpan? latency, TimeSpan? preferredDerpLatency,
         DateTime? lastHandshake)
     {
-        System.Diagnostics.Debug.WriteLine($"Creating agent: {didP2p} {preferredDerp} {latency} {lastHandshake}");
         return new AgentViewModel(childLogger, coderApiClientFactory, credentialManager, agentAppViewModelFactory,
             expanderHost, id)
         {
@@ -88,6 +87,19 @@ public enum AgentConnectionStatus
     Offline,
 }
 
+public static class AgentConnectionStatusExtensions
+{
+    public static string ToDisplayString(this AgentConnectionStatus status) =>
+        status switch
+        {
+            AgentConnectionStatus.Healthy => "Healthy",
+            AgentConnectionStatus.Unhealthy => "High latency",
+            AgentConnectionStatus.NoRecentHandshake => "No recent handshake",
+            AgentConnectionStatus.Offline => "Offline",
+            _ => status.ToString()
+        };
+}
+
 public partial class AgentViewModel : ObservableObject, IModelUpdateable<AgentViewModel>
 {
     private const string DefaultDashboardUrl = "https://coder.com";
@@ -169,6 +181,7 @@ public string FullyQualifiedDomainName
     [ObservableProperty]
     [NotifyPropertyChangedFor(nameof(ShowExpandAppsMessage))]
     [NotifyPropertyChangedFor(nameof(ExpandAppsMessage))]
+    [NotifyPropertyChangedFor(nameof(ConnectionTooltip))]
     public required partial AgentConnectionStatus ConnectionStatus { get; set; }
 
     [ObservableProperty]
@@ -214,11 +227,12 @@ public string FullyQualifiedDomainName
     public string ConnectionTooltip { get
         {
             var description = new StringBuilder();
+            var highLatencyWarning = ConnectionStatus == AgentConnectionStatus.Unhealthy ? $"({AgentConnectionStatus.Unhealthy.ToDisplayString()})" : "";
 
             if (DidP2p != null && DidP2p.Value && Latency != null)
             {
                 description.Append($"""
-                You're connected peer-to-peer.
+                You're connected peer-to-peer. {highLatencyWarning}
 
                 You ↔ {Latency.Value.Milliseconds} ms ↔ {WorkspaceName}
                 """
@@ -227,7 +241,7 @@ public string ConnectionTooltip { get
             else if (PreferredDerpLatency != null)
             {
                 description.Append($"""
-                You're connected through a DERP relay.
+                You're connected through a DERP relay. {highLatencyWarning}
                 We'll switch over to peer-to-peer when available.
 
                 Total latency: {PreferredDerpLatency.Value.Milliseconds} ms
@@ -247,15 +261,14 @@ public string ConnectionTooltip { get
                     }
                 }
             }
+            else
+            {
+                description.Append(ConnectionStatus.ToDisplayString());
+            }
             if (LastHandshake != null)
-                description.Append($"\n\nLast handshake: {LastHandshake?.ToString() ?? "Unknown"}");
-
-            var tooltip = description.ToString().TrimEnd('\n', ' ');
-
-            if (string.IsNullOrEmpty(tooltip))
-                return "No connection information available.";
+                description.Append($"\n\nLast handshake: {LastHandshake?.ToString()}");
 
-            return tooltip;
+            return description.ToString().TrimEnd('\n', ' '); ;
         }
     }
 
diff --git a/App/ViewModels/TrayWindowViewModel.cs b/App/ViewModels/TrayWindowViewModel.cs
@@ -224,12 +224,13 @@ private void UpdateFromRpcModel(RpcModel rpcModel)
             if (string.IsNullOrWhiteSpace(fqdn))
                 continue;
 
-
+#pragma warning disable CS8602 // Protobuf will always set this value, so we can safely dereference them.
             var lastHandshakeAgo = DateTime.UtcNow.Subtract(agent.LastHandshake.ToDateTime());
+#pragma warning restore CS8602
 
             // For compatibility with older deployments, we assume that if the
             // last ping is null, the agent is healthy.
-            var isLatencyAcceptable = agent.LastPing != null ? agent.LastPing.Latency.ToTimeSpan() < HealthyPingThreshold : true;
+            var isLatencyAcceptable = agent.LastPing == null || agent.LastPing.Latency.ToTimeSpan() < HealthyPingThreshold;
             var connectionStatus = AgentConnectionStatus.Healthy;
             if (lastHandshakeAgo > TimeSpan.FromMinutes(5))
             {
@@ -243,7 +244,6 @@ private void UpdateFromRpcModel(RpcModel rpcModel)
             
             workspacesWithAgents.Add(agent.WorkspaceId);
             var workspace = rpcModel.Workspaces.FirstOrDefault(w => w.Id == agent.WorkspaceId);
-            System.Diagnostics.Debug.WriteLine($"Agent {uuid} LastHandshakeAgo: {lastHandshakeAgo} ConnectionStatus: {connectionStatus} FQDN: {fqdn} Last ping: {agent.LastPing} Last handshake: {agent.LastHandshake}");
 
             agents.Add(_agentViewModelFactory.Create(
                 this,
