From 35496d5a0df23b7e3f90c6762f13682e9cd57cca Mon Sep 17 00:00:00 2001
From: Hannah Vernon <hannah@mvct.com>
Date: Tue, 10 Mar 2026 17:08:56 -0500
Subject: [PATCH 1/5] Pre-fill context fields and add default expiration
 setting

- Parse detail_text to extract Database, Query Text, and Wait Type
  when using 'Mute This Alert' from alert history (both editions)
- Add PopulateFromDetailText() to AlertMuteContext for structured
  field extraction from the label: value format
- Add 'Default expiration for new mute rules' dropdown to Settings
  in both editions (1 hour, 24 hours, 7 days, Never; default 24h)
- MuteRuleDialog now selects the configured default expiration
  instead of always defaulting to 'Never'
- Persist setting as mute_rule_default_expiration in settings.json
  (Lite) and preferences.json (Dashboard)

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 .../Controls/AlertsHistoryContent.xaml.cs     |  1 +
 Dashboard/MainWindow.xaml.cs                  |  1 +
 Dashboard/Models/MuteRule.cs                  | 21 +++++++++++++++++++
 Dashboard/Models/UserPreferences.cs           |  3 +++
 Dashboard/MuteRuleDialog.xaml.cs              | 18 ++++++++++++++++
 Dashboard/SettingsWindow.xaml                 |  9 ++++++++
 Dashboard/SettingsWindow.xaml.cs              | 11 ++++++++++
 Lite/App.xaml.cs                              |  7 +++++++
 Lite/Controls/AlertsHistoryTab.xaml.cs        |  1 +
 Lite/Models/MuteRule.cs                       | 21 +++++++++++++++++++
 Lite/Windows/MuteRuleDialog.xaml.cs           | 12 +++++++++++
 Lite/Windows/SettingsWindow.xaml              | 12 ++++++++++-
 Lite/Windows/SettingsWindow.xaml.cs           | 10 +++++++++
 13 files changed, 126 insertions(+), 1 deletion(-)

diff --git a/Dashboard/Controls/AlertsHistoryContent.xaml.cs b/Dashboard/Controls/AlertsHistoryContent.xaml.cs
index 9c4469be..03e28753 100644
--- a/Dashboard/Controls/AlertsHistoryContent.xaml.cs
+++ b/Dashboard/Controls/AlertsHistoryContent.xaml.cs
@@ -482,6 +482,7 @@ private void MuteThisAlert_Click(object sender, RoutedEventArgs e)
                 ServerName = item.ServerName,
                 MetricName = item.MetricName
             };
+            context.PopulateFromDetailText(item.DetailText);
 
             var dialog = new MuteRuleDialog(context) { Owner = Window.GetWindow(this) };
             if (dialog.ShowDialog() == true)
diff --git a/Dashboard/MainWindow.xaml.cs b/Dashboard/MainWindow.xaml.cs
index 99008b11..a6f4eec8 100644
--- a/Dashboard/MainWindow.xaml.cs
+++ b/Dashboard/MainWindow.xaml.cs
@@ -151,6 +151,7 @@ private async void MainWindow_Loaded(object sender, RoutedEventArgs e)
             // Sync preferences
             var startupPrefs = _preferencesService.GetPreferences();
             TabHelpers.CsvSeparator = startupPrefs.CsvSeparator;
+            MuteRuleDialog.DefaultExpiration = startupPrefs.MuteRuleDefaultExpiration;
             if (Enum.TryParse<Helpers.TimeDisplayMode>(startupPrefs.TimeDisplayMode, out var tdm))
                 Helpers.ServerTimeHelper.CurrentDisplayMode = tdm;
 
diff --git a/Dashboard/Models/MuteRule.cs b/Dashboard/Models/MuteRule.cs
index ba0e97e4..0b6e3e7b 100644
--- a/Dashboard/Models/MuteRule.cs
+++ b/Dashboard/Models/MuteRule.cs
@@ -82,5 +82,26 @@ public class AlertMuteContext
         public string? QueryText { get; set; }
         public string? WaitType { get; set; }
         public string? JobName { get; set; }
+
+        /// <summary>
+        /// Extracts context fields (Database, Query, Wait Type, Job Name) from the
+        /// structured detail_text stored with each alert. The format is label/value
+        /// pairs indented with two spaces, e.g. "  Database: MyDB".
+        /// </summary>
+        public void PopulateFromDetailText(string? detailText)
+        {
+            if (string.IsNullOrEmpty(detailText)) return;
+
+            foreach (var line in detailText.Split('\n'))
+            {
+                var trimmed = line.TrimStart();
+                if (DatabaseName == null && trimmed.StartsWith("Database: ", StringComparison.Ordinal))
+                    DatabaseName = trimmed.Substring("Database: ".Length).Trim();
+                else if (QueryText == null && trimmed.StartsWith("Query: ", StringComparison.Ordinal))
+                    QueryText = trimmed.Substring("Query: ".Length).Trim();
+                else if (WaitType == null && trimmed.StartsWith("Wait Type: ", StringComparison.Ordinal))
+                    WaitType = trimmed.Substring("Wait Type: ".Length).Trim();
+            }
+        }
     }
 }
diff --git a/Dashboard/Models/UserPreferences.cs b/Dashboard/Models/UserPreferences.cs
index aa2a3cd3..9276408c 100644
--- a/Dashboard/Models/UserPreferences.cs
+++ b/Dashboard/Models/UserPreferences.cs
@@ -141,6 +141,9 @@ private static string GetDefaultCsvSeparator()
         // Alert database exclusions
         public List<string> AlertExcludedDatabases { get; set; } = new();
 
+        // Default mute rule expiration ("1 hour", "24 hours", "7 days", "Never")
+        public string MuteRuleDefaultExpiration { get; set; } = "24 hours";
+
         // Alert suppression (persisted)
         public List<string> SilencedServers { get; set; } = new();
         public List<string> SilencedServerTabs { get; set; } = new();
diff --git a/Dashboard/MuteRuleDialog.xaml.cs b/Dashboard/MuteRuleDialog.xaml.cs
index 104441d8..a24a0559 100644
--- a/Dashboard/MuteRuleDialog.xaml.cs
+++ b/Dashboard/MuteRuleDialog.xaml.cs
@@ -17,6 +17,12 @@ public partial class MuteRuleDialog : Window
     {
         public MuteRule Rule { get; private set; }
 
+        /// <summary>
+        /// Default expiration selection for new mute rules.
+        /// Set from UserPreferences at startup. Values: "1 hour", "24 hours", "7 days", "Never".
+        /// </summary>
+        public static string DefaultExpiration { get; set; } = "24 hours";
+
         public MuteRuleDialog(MuteRule? existingRule = null)
         {
             InitializeComponent();
@@ -31,6 +37,7 @@ public MuteRuleDialog(MuteRule? existingRule = null)
             else
             {
                 Rule = new MuteRule();
+                ApplyDefaultExpiration();
             }
         }
 
@@ -148,5 +155,16 @@ private void MetricCombo_SelectionChanged(object sender, SelectionChangedEventAr
             PatternFieldsGrid.Visibility = (showDatabase || showWaitType || showQueryText || showJobName)
                 ? Visibility.Visible : Visibility.Collapsed;
         }
+
+        private void ApplyDefaultExpiration()
+        {
+            ExpirationCombo.SelectedIndex = DefaultExpiration switch
+            {
+                "1 hour" => 0,
+                "24 hours" => 1,
+                "7 days" => 2,
+                _ => 3
+            };
+        }
     }
 }
diff --git a/Dashboard/SettingsWindow.xaml b/Dashboard/SettingsWindow.xaml
index 2b73cba6..e626d4ec 100644
--- a/Dashboard/SettingsWindow.xaml
+++ b/Dashboard/SettingsWindow.xaml
@@ -286,6 +286,15 @@
 
                             <!-- Mute Rules -->
                             <TextBlock Text="Alert Muting" FontWeight="Bold" FontSize="12" Margin="0,16,0,6"/>
+                            <StackPanel Orientation="Horizontal" Margin="0,0,0,4">
+                                <TextBlock Text="Default expiration for new mute rules:" VerticalAlignment="Center" Margin="0,0,8,0"/>
+                                <ComboBox x:Name="MuteRuleDefaultExpirationCombo" Width="130" VerticalAlignment="Center">
+                                    <ComboBoxItem Content="1 hour"/>
+                                    <ComboBoxItem Content="24 hours"/>
+                                    <ComboBoxItem Content="7 days"/>
+                                    <ComboBoxItem Content="Never"/>
+                                </ComboBox>
+                            </StackPanel>
                             <Button x:Name="ManageMuteRulesButton" Content="Manage Mute Rules..."
                                     Click="ManageMuteRulesButton_Click" HorizontalAlignment="Left"
                                     Padding="12,4" Margin="0,0,0,4"/>
diff --git a/Dashboard/SettingsWindow.xaml.cs b/Dashboard/SettingsWindow.xaml.cs
index d22775e9..7aa20e53 100644
--- a/Dashboard/SettingsWindow.xaml.cs
+++ b/Dashboard/SettingsWindow.xaml.cs
@@ -179,6 +179,13 @@ private void LoadSettings()
             LongRunningJobMultiplierTextBox.Text = prefs.LongRunningJobMultiplier.ToString(CultureInfo.InvariantCulture);
             AlertCooldownTextBox.Text = prefs.AlertCooldownMinutes.ToString(CultureInfo.InvariantCulture);
             EmailCooldownTextBox.Text = prefs.EmailCooldownMinutes.ToString(CultureInfo.InvariantCulture);
+            MuteRuleDefaultExpirationCombo.SelectedIndex = prefs.MuteRuleDefaultExpiration switch
+            {
+                "1 hour" => 0,
+                "24 hours" => 1,
+                "7 days" => 2,
+                _ => 3
+            };
 
             UpdateNotificationCheckboxStates();
 
@@ -322,6 +329,7 @@ private void RestoreAlertDefaultsButton_Click(object sender, RoutedEventArgs e)
             AlertCooldownTextBox.Text = "5";
             EmailCooldownTextBox.Text = "15";
             AlertExcludedDatabasesTextBox.Text = "";
+            MuteRuleDefaultExpirationCombo.SelectedIndex = 1; // 24 hours
             UpdateAlertPreviewText();
         }
 
@@ -659,6 +667,9 @@ private async void OkButton_Click(object sender, RoutedEventArgs e)
             else
                 validationErrors.Add("Email alert cooldown must be between 1 and 120 minutes");
 
+            prefs.MuteRuleDefaultExpiration = (MuteRuleDefaultExpirationCombo.SelectedItem as ComboBoxItem)?.Content?.ToString() ?? "24 hours";
+            MuteRuleDialog.DefaultExpiration = prefs.MuteRuleDefaultExpiration;
+
             // Save SMTP email settings
             prefs.SmtpEnabled = SmtpEnabledCheckBox.IsChecked == true;
             prefs.SmtpServer = SmtpServerTextBox.Text?.Trim() ?? "";
diff --git a/Lite/App.xaml.cs b/Lite/App.xaml.cs
index 97d84a45..2095aade 100644
--- a/Lite/App.xaml.cs
+++ b/Lite/App.xaml.cs
@@ -76,6 +76,7 @@ public partial class App : Application
     public static int AlertLongRunningJobMultiplier { get; set; } = 3;
     public static int AlertCooldownMinutes { get; set; } = 5;  // Tray notification cooldown between repeated alerts
     public static int EmailCooldownMinutes { get; set; } = 15; // Email cooldown between repeated alerts
+    public static string MuteRuleDefaultExpiration { get; set; } = "24 hours"; // Default expiration for new mute rules
 
     /* Connection settings */
     public static int ConnectionTimeoutSeconds { get; set; } = 5;
@@ -270,6 +271,12 @@ public static void LoadAlertSettings()
             if (root.TryGetProperty("alert_long_running_job_multiplier", out v)) AlertLongRunningJobMultiplier = v.GetInt32();
             if (root.TryGetProperty("alert_cooldown_minutes", out v)) AlertCooldownMinutes = (int)Math.Clamp(v.GetInt64(), 1, 120);
             if (root.TryGetProperty("email_cooldown_minutes", out v)) EmailCooldownMinutes = (int)Math.Clamp(v.GetInt64(), 1, 120);
+            if (root.TryGetProperty("mute_rule_default_expiration", out v))
+            {
+                var exp = v.GetString();
+                if (exp is "1 hour" or "24 hours" or "7 days" or "Never")
+                    MuteRuleDefaultExpiration = exp;
+            }
 
             /* Connection settings */
             if (root.TryGetProperty("connection_timeout_seconds", out v))
diff --git a/Lite/Controls/AlertsHistoryTab.xaml.cs b/Lite/Controls/AlertsHistoryTab.xaml.cs
index 9ea4d1e5..18886a84 100644
--- a/Lite/Controls/AlertsHistoryTab.xaml.cs
+++ b/Lite/Controls/AlertsHistoryTab.xaml.cs
@@ -444,6 +444,7 @@ private async void MuteThisAlert_Click(object sender, RoutedEventArgs e)
             ServerName = item.ServerName,
             MetricName = item.MetricName
         };
+        context.PopulateFromDetailText(item.DetailText);
 
         var dialog = new Windows.MuteRuleDialog(context) { Owner = Window.GetWindow(this) };
         if (dialog.ShowDialog() == true)
diff --git a/Lite/Models/MuteRule.cs b/Lite/Models/MuteRule.cs
index 94a743eb..e02aa1fc 100644
--- a/Lite/Models/MuteRule.cs
+++ b/Lite/Models/MuteRule.cs
@@ -82,4 +82,25 @@ public class AlertMuteContext
     public string? QueryText { get; set; }
     public string? WaitType { get; set; }
     public string? JobName { get; set; }
+
+    /// <summary>
+    /// Extracts context fields (Database, Query, Wait Type, Job Name) from the
+    /// structured detail_text stored with each alert. The format is label/value
+    /// pairs indented with two spaces, e.g. "  Database: MyDB".
+    /// </summary>
+    public void PopulateFromDetailText(string? detailText)
+    {
+        if (string.IsNullOrEmpty(detailText)) return;
+
+        foreach (var line in detailText.Split('\n'))
+        {
+            var trimmed = line.TrimStart();
+            if (DatabaseName == null && trimmed.StartsWith("Database: ", StringComparison.Ordinal))
+                DatabaseName = trimmed.Substring("Database: ".Length).Trim();
+            else if (QueryText == null && trimmed.StartsWith("Query: ", StringComparison.Ordinal))
+                QueryText = trimmed.Substring("Query: ".Length).Trim();
+            else if (WaitType == null && trimmed.StartsWith("Wait Type: ", StringComparison.Ordinal))
+                WaitType = trimmed.Substring("Wait Type: ".Length).Trim();
+        }
+    }
 }
diff --git a/Lite/Windows/MuteRuleDialog.xaml.cs b/Lite/Windows/MuteRuleDialog.xaml.cs
index 3a1f75fd..9ef81952 100644
--- a/Lite/Windows/MuteRuleDialog.xaml.cs
+++ b/Lite/Windows/MuteRuleDialog.xaml.cs
@@ -31,6 +31,7 @@ public MuteRuleDialog(MuteRule? existingRule = null)
         else
         {
             Rule = new MuteRule();
+            ApplyDefaultExpiration();
         }
     }
 
@@ -145,4 +146,15 @@ private void MetricCombo_SelectionChanged(object sender, SelectionChangedEventAr
         PatternFieldsGrid.Visibility = (showDatabase || showWaitType || showQueryText || showJobName)
             ? Visibility.Visible : Visibility.Collapsed;
     }
+
+    private void ApplyDefaultExpiration()
+    {
+        ExpirationCombo.SelectedIndex = App.MuteRuleDefaultExpiration switch
+        {
+            "1 hour" => 0,
+            "24 hours" => 1,
+            "7 days" => 2,
+            _ => 3
+        };
+    }
 }
diff --git a/Lite/Windows/SettingsWindow.xaml b/Lite/Windows/SettingsWindow.xaml
index 40ef0ef1..6ae0e7ed 100644
--- a/Lite/Windows/SettingsWindow.xaml
+++ b/Lite/Windows/SettingsWindow.xaml
@@ -251,9 +251,19 @@
                 <!-- Mute Rules -->
                 <TextBlock Text="Alert Muting" FontWeight="SemiBold" FontSize="12"
                            Foreground="{DynamicResource ForegroundBrush}" Margin="20,14,0,4"/>
+                <StackPanel Orientation="Horizontal" Margin="20,0,0,4">
+                    <TextBlock Text="Default expiration for new mute rules:" VerticalAlignment="Center" Margin="0,0,8,0"
+                               Foreground="{DynamicResource ForegroundBrush}"/>
+                    <ComboBox x:Name="MuteRuleDefaultExpirationCombo" Width="130" VerticalAlignment="Center">
+                        <ComboBoxItem Content="1 hour"/>
+                        <ComboBoxItem Content="24 hours"/>
+                        <ComboBoxItem Content="7 days"/>
+                        <ComboBoxItem Content="Never"/>
+                    </ComboBox>
+                </StackPanel>
                 <Button x:Name="ManageMuteRulesButton" Content="Manage Mute Rules..."
                         Click="ManageMuteRulesButton_Click" HorizontalAlignment="Left"
-                        Padding="12,4" Margin="20,0,0,4"/>
+                        Padding="12,4" Margin="20,4,0,4"/>
                 <TextBlock Text="Create rules to suppress specific recurring alerts while still logging them."
                            FontSize="11" FontStyle="Italic" Foreground="{DynamicResource ForegroundMutedBrush}"
                            Margin="20,0,0,0" TextWrapping="Wrap"/>
diff --git a/Lite/Windows/SettingsWindow.xaml.cs b/Lite/Windows/SettingsWindow.xaml.cs
index 8366eb3c..b743b563 100644
--- a/Lite/Windows/SettingsWindow.xaml.cs
+++ b/Lite/Windows/SettingsWindow.xaml.cs
@@ -559,6 +559,13 @@ private void LoadAlertSettings()
         AlertLongRunningJobMultiplierBox.Text = App.AlertLongRunningJobMultiplier.ToString();
         AlertCooldownBox.Text = App.AlertCooldownMinutes.ToString();
         EmailCooldownBox.Text = App.EmailCooldownMinutes.ToString();
+        MuteRuleDefaultExpirationCombo.SelectedIndex = App.MuteRuleDefaultExpiration switch
+        {
+            "1 hour" => 0,
+            "24 hours" => 1,
+            "7 days" => 2,
+            _ => 3
+        };
         UpdateAlertControlStates();
     }
 
@@ -608,6 +615,7 @@ private bool SaveAlertSettings()
             App.EmailCooldownMinutes = emailCooldown;
         else
             validationErrors.Add("Email alert cooldown must be between 1 and 120 minutes.");
+        App.MuteRuleDefaultExpiration = (MuteRuleDefaultExpirationCombo.SelectedItem as ComboBoxItem)?.Content?.ToString() ?? "24 hours";
 
         var settingsPath = Path.Combine(App.ConfigDirectory, "settings.json");
         try
@@ -650,6 +658,7 @@ private bool SaveAlertSettings()
             root["alert_long_running_job_multiplier"] = App.AlertLongRunningJobMultiplier;
             root["alert_cooldown_minutes"] = App.AlertCooldownMinutes;
             root["email_cooldown_minutes"] = App.EmailCooldownMinutes;
+            root["mute_rule_default_expiration"] = App.MuteRuleDefaultExpiration;
 
             var options = new JsonSerializerOptions { WriteIndented = true };
             File.WriteAllText(settingsPath, root.ToJsonString(options));
@@ -688,6 +697,7 @@ private void RestoreAlertDefaultsButton_Click(object sender, RoutedEventArgs e)
         AlertCooldownBox.Text = "5";
         EmailCooldownBox.Text = "15";
         AlertExcludedDatabasesBox.Text = "";
+        MuteRuleDefaultExpirationCombo.SelectedIndex = 1; // 24 hours
         UpdateAlertPreviewText();
     }
 

From fc9c5cd53261b7768fa5b3dbbf5af791ded2faea Mon Sep 17 00:00:00 2001
From: Hannah Vernon <hannah@mvct.com>
Date: Thu, 19 Mar 2026 11:59:29 -0500
Subject: [PATCH 2/5] Add missing Job Name parsing to PopulateFromDetailText

The XML doc claimed Job Name extraction but the parser did not
implement it. Add the missing branch in both Dashboard and Lite
editions so the behavior matches the documentation.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 Dashboard/Models/MuteRule.cs | 246 ++++++++++++++++++-----------------
 Lite/Models/MuteRule.cs      | 244 +++++++++++++++++-----------------
 2 files changed, 247 insertions(+), 243 deletions(-)

diff --git a/Dashboard/Models/MuteRule.cs b/Dashboard/Models/MuteRule.cs
index 0bd81c87..0b9e429b 100644
--- a/Dashboard/Models/MuteRule.cs
+++ b/Dashboard/Models/MuteRule.cs
@@ -1,122 +1,124 @@
-using System;
-
-namespace PerformanceMonitorDashboard.Models
-{
-    public class MuteRule
-    {
-        public string Id { get; set; } = Guid.NewGuid().ToString();
-        public bool Enabled { get; set; } = true;
-        public DateTime CreatedAtUtc { get; set; } = DateTime.UtcNow;
-        public DateTime? ExpiresAtUtc { get; set; }
-        public string? Reason { get; set; }
-
-        public string? ServerName { get; set; }
-        public string? MetricName { get; set; }
-        public string? DatabasePattern { get; set; }
-        public string? QueryTextPattern { get; set; }
-        public string? WaitTypePattern { get; set; }
-        public string? JobNamePattern { get; set; }
-
-        public bool IsExpired => ExpiresAtUtc.HasValue && DateTime.UtcNow >= ExpiresAtUtc.Value;
-
-        public MuteRule Clone() => new()
-        {
-            Id = Id,
-            Enabled = Enabled,
-            CreatedAtUtc = CreatedAtUtc,
-            ExpiresAtUtc = ExpiresAtUtc,
-            Reason = Reason,
-            ServerName = ServerName,
-            MetricName = MetricName,
-            DatabasePattern = DatabasePattern,
-            QueryTextPattern = QueryTextPattern,
-            WaitTypePattern = WaitTypePattern,
-            JobNamePattern = JobNamePattern
-        };
-
-        public string ExpiresDisplay => ExpiresAtUtc.HasValue
-            ? (IsExpired ? "Expired" : ExpiresAtUtc.Value.ToLocalTime().ToString("g"))
-            : "Never";
-
-        public string Summary
-        {
-            get
-            {
-                var parts = new System.Collections.Generic.List<string>();
-                if (MetricName != null) parts.Add(MetricName);
-                if (ServerName != null) parts.Add($"on {ServerName}");
-                if (DatabasePattern != null) parts.Add($"db≈{DatabasePattern}");
-                if (QueryTextPattern != null) parts.Add($"query≈{QueryTextPattern}");
-                if (WaitTypePattern != null) parts.Add($"wait≈{WaitTypePattern}");
-                if (JobNamePattern != null) parts.Add($"job≈{JobNamePattern}");
-                return parts.Count > 0 ? string.Join(", ", parts) : "(matches all alerts)";
-            }
-        }
-
-        public bool Matches(AlertMuteContext context)
-        {
-            if (!Enabled || IsExpired) return false;
-
-            if (ServerName != null &&
-                !string.Equals(ServerName, context.ServerName, StringComparison.OrdinalIgnoreCase))
-                return false;
-
-            if (MetricName != null &&
-                !string.Equals(MetricName, context.MetricName, StringComparison.OrdinalIgnoreCase))
-                return false;
-
-            if (DatabasePattern != null &&
-                (context.DatabaseName == null ||
-                 !context.DatabaseName.Contains(DatabasePattern, StringComparison.OrdinalIgnoreCase)))
-                return false;
-
-            if (QueryTextPattern != null &&
-                (context.QueryText == null ||
-                 !context.QueryText.Contains(QueryTextPattern, StringComparison.OrdinalIgnoreCase)))
-                return false;
-
-            if (WaitTypePattern != null &&
-                (context.WaitType == null ||
-                 !context.WaitType.Contains(WaitTypePattern, StringComparison.OrdinalIgnoreCase)))
-                return false;
-
-            if (JobNamePattern != null &&
-                (context.JobName == null ||
-                 !context.JobName.Contains(JobNamePattern, StringComparison.OrdinalIgnoreCase)))
-                return false;
-
-            return true;
-        }
-    }
-
-    public class AlertMuteContext
-    {
-        public string ServerName { get; set; } = "";
-        public string MetricName { get; set; } = "";
-        public string? DatabaseName { get; set; }
-        public string? QueryText { get; set; }
-        public string? WaitType { get; set; }
-        public string? JobName { get; set; }
-
-        /// <summary>
-        /// Extracts context fields (Database, Query, Wait Type, Job Name) from the
-        /// structured detail_text stored with each alert. The format is label/value
-        /// pairs indented with two spaces, e.g. "  Database: MyDB".
-        /// </summary>
-        public void PopulateFromDetailText(string? detailText)
-        {
-            if (string.IsNullOrEmpty(detailText)) return;
-
-            foreach (var line in detailText.Split('\n'))
-            {
-                var trimmed = line.TrimStart();
-                if (DatabaseName == null && trimmed.StartsWith("Database: ", StringComparison.Ordinal))
-                    DatabaseName = trimmed.Substring("Database: ".Length).Trim();
-                else if (QueryText == null && trimmed.StartsWith("Query: ", StringComparison.Ordinal))
-                    QueryText = trimmed.Substring("Query: ".Length).Trim();
-                else if (WaitType == null && trimmed.StartsWith("Wait Type: ", StringComparison.Ordinal))
-                    WaitType = trimmed.Substring("Wait Type: ".Length).Trim();
-            }
-        }
-    }
-}
+using System;
+
+namespace PerformanceMonitorDashboard.Models
+{
+    public class MuteRule
+    {
+        public string Id { get; set; } = Guid.NewGuid().ToString();
+        public bool Enabled { get; set; } = true;
+        public DateTime CreatedAtUtc { get; set; } = DateTime.UtcNow;
+        public DateTime? ExpiresAtUtc { get; set; }
+        public string? Reason { get; set; }
+
+        public string? ServerName { get; set; }
+        public string? MetricName { get; set; }
+        public string? DatabasePattern { get; set; }
+        public string? QueryTextPattern { get; set; }
+        public string? WaitTypePattern { get; set; }
+        public string? JobNamePattern { get; set; }
+
+        public bool IsExpired => ExpiresAtUtc.HasValue && DateTime.UtcNow >= ExpiresAtUtc.Value;
+
+        public MuteRule Clone() => new()
+        {
+            Id = Id,
+            Enabled = Enabled,
+            CreatedAtUtc = CreatedAtUtc,
+            ExpiresAtUtc = ExpiresAtUtc,
+            Reason = Reason,
+            ServerName = ServerName,
+            MetricName = MetricName,
+            DatabasePattern = DatabasePattern,
+            QueryTextPattern = QueryTextPattern,
+            WaitTypePattern = WaitTypePattern,
+            JobNamePattern = JobNamePattern
+        };
+
+        public string ExpiresDisplay => ExpiresAtUtc.HasValue
+            ? (IsExpired ? "Expired" : ExpiresAtUtc.Value.ToLocalTime().ToString("g"))
+            : "Never";
+
+        public string Summary
+        {
+            get
+            {
+                var parts = new System.Collections.Generic.List<string>();
+                if (MetricName != null) parts.Add(MetricName);
+                if (ServerName != null) parts.Add($"on {ServerName}");
+                if (DatabasePattern != null) parts.Add($"db≈{DatabasePattern}");
+                if (QueryTextPattern != null) parts.Add($"query≈{QueryTextPattern}");
+                if (WaitTypePattern != null) parts.Add($"wait≈{WaitTypePattern}");
+                if (JobNamePattern != null) parts.Add($"job≈{JobNamePattern}");
+                return parts.Count > 0 ? string.Join(", ", parts) : "(matches all alerts)";
+            }
+        }
+
+        public bool Matches(AlertMuteContext context)
+        {
+            if (!Enabled || IsExpired) return false;
+
+            if (ServerName != null &&
+                !string.Equals(ServerName, context.ServerName, StringComparison.OrdinalIgnoreCase))
+                return false;
+
+            if (MetricName != null &&
+                !string.Equals(MetricName, context.MetricName, StringComparison.OrdinalIgnoreCase))
+                return false;
+
+            if (DatabasePattern != null &&
+                (context.DatabaseName == null ||
+                 !context.DatabaseName.Contains(DatabasePattern, StringComparison.OrdinalIgnoreCase)))
+                return false;
+
+            if (QueryTextPattern != null &&
+                (context.QueryText == null ||
+                 !context.QueryText.Contains(QueryTextPattern, StringComparison.OrdinalIgnoreCase)))
+                return false;
+
+            if (WaitTypePattern != null &&
+                (context.WaitType == null ||
+                 !context.WaitType.Contains(WaitTypePattern, StringComparison.OrdinalIgnoreCase)))
+                return false;
+
+            if (JobNamePattern != null &&
+                (context.JobName == null ||
+                 !context.JobName.Contains(JobNamePattern, StringComparison.OrdinalIgnoreCase)))
+                return false;
+
+            return true;
+        }
+    }
+
+    public class AlertMuteContext
+    {
+        public string ServerName { get; set; } = "";
+        public string MetricName { get; set; } = "";
+        public string? DatabaseName { get; set; }
+        public string? QueryText { get; set; }
+        public string? WaitType { get; set; }
+        public string? JobName { get; set; }
+
+        /// <summary>
+        /// Extracts context fields (Database, Query, Wait Type, Job Name) from the
+        /// structured detail_text stored with each alert. The format is label/value
+        /// pairs indented with two spaces, e.g. "  Database: MyDB".
+        /// </summary>
+        public void PopulateFromDetailText(string? detailText)
+        {
+            if (string.IsNullOrEmpty(detailText)) return;
+
+            foreach (var line in detailText.Split('\n'))
+            {
+                var trimmed = line.TrimStart();
+                if (DatabaseName == null && trimmed.StartsWith("Database: ", StringComparison.Ordinal))
+                    DatabaseName = trimmed.Substring("Database: ".Length).Trim();
+                else if (QueryText == null && trimmed.StartsWith("Query: ", StringComparison.Ordinal))
+                    QueryText = trimmed.Substring("Query: ".Length).Trim();
+                else if (WaitType == null && trimmed.StartsWith("Wait Type: ", StringComparison.Ordinal))
+                    WaitType = trimmed.Substring("Wait Type: ".Length).Trim();
+                else if (JobName == null && trimmed.StartsWith("Job Name: ", StringComparison.Ordinal))
+                    JobName = trimmed.Substring("Job Name: ".Length).Trim();
+            }
+        }
+    }
+}
diff --git a/Lite/Models/MuteRule.cs b/Lite/Models/MuteRule.cs
index 27567e1d..496ab655 100644
--- a/Lite/Models/MuteRule.cs
+++ b/Lite/Models/MuteRule.cs
@@ -1,121 +1,123 @@
-using System;
-
-namespace PerformanceMonitorLite.Models;
-
-public class MuteRule
-{
-    public string Id { get; set; } = Guid.NewGuid().ToString();
-    public bool Enabled { get; set; } = true;
-    public DateTime CreatedAtUtc { get; set; } = DateTime.UtcNow;
-    public DateTime? ExpiresAtUtc { get; set; }
-    public string? Reason { get; set; }
-
-    public string? ServerName { get; set; }
-    public string? MetricName { get; set; }
-    public string? DatabasePattern { get; set; }
-    public string? QueryTextPattern { get; set; }
-    public string? WaitTypePattern { get; set; }
-    public string? JobNamePattern { get; set; }
-
-    public bool IsExpired => ExpiresAtUtc.HasValue && DateTime.UtcNow >= ExpiresAtUtc.Value;
-
-    public MuteRule Clone() => new()
-    {
-        Id = Id,
-        Enabled = Enabled,
-        CreatedAtUtc = CreatedAtUtc,
-        ExpiresAtUtc = ExpiresAtUtc,
-        Reason = Reason,
-        ServerName = ServerName,
-        MetricName = MetricName,
-        DatabasePattern = DatabasePattern,
-        QueryTextPattern = QueryTextPattern,
-        WaitTypePattern = WaitTypePattern,
-        JobNamePattern = JobNamePattern
-    };
-
-    public string ExpiresDisplay => ExpiresAtUtc.HasValue
-        ? (IsExpired ? "Expired" : ExpiresAtUtc.Value.ToLocalTime().ToString("g"))
-        : "Never";
-
-    public string Summary
-    {
-        get
-        {
-            var parts = new System.Collections.Generic.List<string>();
-            if (MetricName != null) parts.Add(MetricName);
-            if (ServerName != null) parts.Add($"on {ServerName}");
-            if (DatabasePattern != null) parts.Add($"db≈{DatabasePattern}");
-            if (QueryTextPattern != null) parts.Add($"query≈{QueryTextPattern}");
-            if (WaitTypePattern != null) parts.Add($"wait≈{WaitTypePattern}");
-            if (JobNamePattern != null) parts.Add($"job≈{JobNamePattern}");
-            return parts.Count > 0 ? string.Join(", ", parts) : "(matches all alerts)";
-        }
-    }
-
-    public bool Matches(AlertMuteContext context)
-    {
-        if (!Enabled || IsExpired) return false;
-
-        if (ServerName != null &&
-            !string.Equals(ServerName, context.ServerName, StringComparison.OrdinalIgnoreCase))
-            return false;
-
-        if (MetricName != null &&
-            !string.Equals(MetricName, context.MetricName, StringComparison.OrdinalIgnoreCase))
-            return false;
-
-        if (DatabasePattern != null &&
-            (context.DatabaseName == null ||
-             !context.DatabaseName.Contains(DatabasePattern, StringComparison.OrdinalIgnoreCase)))
-            return false;
-
-        if (QueryTextPattern != null &&
-            (context.QueryText == null ||
-             !context.QueryText.Contains(QueryTextPattern, StringComparison.OrdinalIgnoreCase)))
-            return false;
-
-        if (WaitTypePattern != null &&
-            (context.WaitType == null ||
-             !context.WaitType.Contains(WaitTypePattern, StringComparison.OrdinalIgnoreCase)))
-            return false;
-
-        if (JobNamePattern != null &&
-            (context.JobName == null ||
-             !context.JobName.Contains(JobNamePattern, StringComparison.OrdinalIgnoreCase)))
-            return false;
-
-        return true;
-    }
-}
-
-public class AlertMuteContext
-{
-    public string ServerName { get; set; } = "";
-    public string MetricName { get; set; } = "";
-    public string? DatabaseName { get; set; }
-    public string? QueryText { get; set; }
-    public string? WaitType { get; set; }
-    public string? JobName { get; set; }
-
-    /// <summary>
-    /// Extracts context fields (Database, Query, Wait Type, Job Name) from the
-    /// structured detail_text stored with each alert. The format is label/value
-    /// pairs indented with two spaces, e.g. "  Database: MyDB".
-    /// </summary>
-    public void PopulateFromDetailText(string? detailText)
-    {
-        if (string.IsNullOrEmpty(detailText)) return;
-
-        foreach (var line in detailText.Split('\n'))
-        {
-            var trimmed = line.TrimStart();
-            if (DatabaseName == null && trimmed.StartsWith("Database: ", StringComparison.Ordinal))
-                DatabaseName = trimmed.Substring("Database: ".Length).Trim();
-            else if (QueryText == null && trimmed.StartsWith("Query: ", StringComparison.Ordinal))
-                QueryText = trimmed.Substring("Query: ".Length).Trim();
-            else if (WaitType == null && trimmed.StartsWith("Wait Type: ", StringComparison.Ordinal))
-                WaitType = trimmed.Substring("Wait Type: ".Length).Trim();
-        }
-    }
-}
+using System;
+
+namespace PerformanceMonitorLite.Models;
+
+public class MuteRule
+{
+    public string Id { get; set; } = Guid.NewGuid().ToString();
+    public bool Enabled { get; set; } = true;
+    public DateTime CreatedAtUtc { get; set; } = DateTime.UtcNow;
+    public DateTime? ExpiresAtUtc { get; set; }
+    public string? Reason { get; set; }
+
+    public string? ServerName { get; set; }
+    public string? MetricName { get; set; }
+    public string? DatabasePattern { get; set; }
+    public string? QueryTextPattern { get; set; }
+    public string? WaitTypePattern { get; set; }
+    public string? JobNamePattern { get; set; }
+
+    public bool IsExpired => ExpiresAtUtc.HasValue && DateTime.UtcNow >= ExpiresAtUtc.Value;
+
+    public MuteRule Clone() => new()
+    {
+        Id = Id,
+        Enabled = Enabled,
+        CreatedAtUtc = CreatedAtUtc,
+        ExpiresAtUtc = ExpiresAtUtc,
+        Reason = Reason,
+        ServerName = ServerName,
+        MetricName = MetricName,
+        DatabasePattern = DatabasePattern,
+        QueryTextPattern = QueryTextPattern,
+        WaitTypePattern = WaitTypePattern,
+        JobNamePattern = JobNamePattern
+    };
+
+    public string ExpiresDisplay => ExpiresAtUtc.HasValue
+        ? (IsExpired ? "Expired" : ExpiresAtUtc.Value.ToLocalTime().ToString("g"))
+        : "Never";
+
+    public string Summary
+    {
+        get
+        {
+            var parts = new System.Collections.Generic.List<string>();
+            if (MetricName != null) parts.Add(MetricName);
+            if (ServerName != null) parts.Add($"on {ServerName}");
+            if (DatabasePattern != null) parts.Add($"db≈{DatabasePattern}");
+            if (QueryTextPattern != null) parts.Add($"query≈{QueryTextPattern}");
+            if (WaitTypePattern != null) parts.Add($"wait≈{WaitTypePattern}");
+            if (JobNamePattern != null) parts.Add($"job≈{JobNamePattern}");
+            return parts.Count > 0 ? string.Join(", ", parts) : "(matches all alerts)";
+        }
+    }
+
+    public bool Matches(AlertMuteContext context)
+    {
+        if (!Enabled || IsExpired) return false;
+
+        if (ServerName != null &&
+            !string.Equals(ServerName, context.ServerName, StringComparison.OrdinalIgnoreCase))
+            return false;
+
+        if (MetricName != null &&
+            !string.Equals(MetricName, context.MetricName, StringComparison.OrdinalIgnoreCase))
+            return false;
+
+        if (DatabasePattern != null &&
+            (context.DatabaseName == null ||
+             !context.DatabaseName.Contains(DatabasePattern, StringComparison.OrdinalIgnoreCase)))
+            return false;
+
+        if (QueryTextPattern != null &&
+            (context.QueryText == null ||
+             !context.QueryText.Contains(QueryTextPattern, StringComparison.OrdinalIgnoreCase)))
+            return false;
+
+        if (WaitTypePattern != null &&
+            (context.WaitType == null ||
+             !context.WaitType.Contains(WaitTypePattern, StringComparison.OrdinalIgnoreCase)))
+            return false;
+
+        if (JobNamePattern != null &&
+            (context.JobName == null ||
+             !context.JobName.Contains(JobNamePattern, StringComparison.OrdinalIgnoreCase)))
+            return false;
+
+        return true;
+    }
+}
+
+public class AlertMuteContext
+{
+    public string ServerName { get; set; } = "";
+    public string MetricName { get; set; } = "";
+    public string? DatabaseName { get; set; }
+    public string? QueryText { get; set; }
+    public string? WaitType { get; set; }
+    public string? JobName { get; set; }
+
+    /// <summary>
+    /// Extracts context fields (Database, Query, Wait Type, Job Name) from the
+    /// structured detail_text stored with each alert. The format is label/value
+    /// pairs indented with two spaces, e.g. "  Database: MyDB".
+    /// </summary>
+    public void PopulateFromDetailText(string? detailText)
+    {
+        if (string.IsNullOrEmpty(detailText)) return;
+
+        foreach (var line in detailText.Split('\n'))
+        {
+            var trimmed = line.TrimStart();
+            if (DatabaseName == null && trimmed.StartsWith("Database: ", StringComparison.Ordinal))
+                DatabaseName = trimmed.Substring("Database: ".Length).Trim();
+            else if (QueryText == null && trimmed.StartsWith("Query: ", StringComparison.Ordinal))
+                QueryText = trimmed.Substring("Query: ".Length).Trim();
+            else if (WaitType == null && trimmed.StartsWith("Wait Type: ", StringComparison.Ordinal))
+                WaitType = trimmed.Substring("Wait Type: ".Length).Trim();
+            else if (JobName == null && trimmed.StartsWith("Job Name: ", StringComparison.Ordinal))
+                JobName = trimmed.Substring("Job Name: ".Length).Trim();
+        }
+    }
+}

From 13760941d75e06e31fbccb8a856dd8da68f3a2ee Mon Sep 17 00:00:00 2001
From: Hannah Vernon <hannah@mvct.com>
Date: Thu, 19 Mar 2026 16:16:32 -0500
Subject: [PATCH 3/5] Fix mute dialog showing truncated query text for blocking
 alerts

- Collapse newlines in Truncate/TruncateText so detail_text fields
  stay single-line in the label: value format
- Handle multi-line query values in PopulateFromDetailText by
  accumulating continuation lines until the next indented field
- Recognize variant query labels (Blocked Query, Blocking Query,
  Victim SQL) in addition to Query

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 Dashboard/MainWindow.xaml.cs |    2 +-
 Dashboard/Models/MuteRule.cs |   59 +-
 Lite/MainWindow.xaml.cs      | 4456 +++++++++++++++++-----------------
 Lite/Models/MuteRule.cs      |   59 +-
 4 files changed, 2341 insertions(+), 2235 deletions(-)

diff --git a/Dashboard/MainWindow.xaml.cs b/Dashboard/MainWindow.xaml.cs
index 7eb918c4..7fa625d7 100644
--- a/Dashboard/MainWindow.xaml.cs
+++ b/Dashboard/MainWindow.xaml.cs
@@ -1630,7 +1630,7 @@ await _emailAlertService.TrySendAlertEmailAsync(
         private static string Truncate(string text, int maxLength = 300)
         {
             if (string.IsNullOrEmpty(text)) return "";
-            text = text.Trim();
+            text = text.Replace('\r', ' ').Replace('\n', ' ').Trim();
             return text.Length <= maxLength ? text : text.Substring(0, maxLength) + "...";
         }
 
diff --git a/Dashboard/Models/MuteRule.cs b/Dashboard/Models/MuteRule.cs
index 0b9e429b..f103a14e 100644
--- a/Dashboard/Models/MuteRule.cs
+++ b/Dashboard/Models/MuteRule.cs
@@ -102,23 +102,76 @@ public class AlertMuteContext
         /// Extracts context fields (Database, Query, Wait Type, Job Name) from the
         /// structured detail_text stored with each alert. The format is label/value
         /// pairs indented with two spaces, e.g. "  Database: MyDB".
+        /// Query values may span multiple lines and use variant labels
+        /// (Blocked Query, Blocking Query, Victim SQL).
         /// </summary>
         public void PopulateFromDetailText(string? detailText)
         {
             if (string.IsNullOrEmpty(detailText)) return;
 
-            foreach (var line in detailText.Split('\n'))
+            System.Text.StringBuilder? queryBuilder = null;
+            var lines = detailText.Split('\n');
+
+            foreach (var line in lines)
             {
                 var trimmed = line.TrimStart();
+
                 if (DatabaseName == null && trimmed.StartsWith("Database: ", StringComparison.Ordinal))
+                {
+                    FlushQuery(ref queryBuilder);
                     DatabaseName = trimmed.Substring("Database: ".Length).Trim();
-                else if (QueryText == null && trimmed.StartsWith("Query: ", StringComparison.Ordinal))
-                    QueryText = trimmed.Substring("Query: ".Length).Trim();
+                }
                 else if (WaitType == null && trimmed.StartsWith("Wait Type: ", StringComparison.Ordinal))
+                {
+                    FlushQuery(ref queryBuilder);
                     WaitType = trimmed.Substring("Wait Type: ".Length).Trim();
+                }
                 else if (JobName == null && trimmed.StartsWith("Job Name: ", StringComparison.Ordinal))
+                {
+                    FlushQuery(ref queryBuilder);
                     JobName = trimmed.Substring("Job Name: ".Length).Trim();
+                }
+                else if (QueryText == null && queryBuilder == null && TryExtractQueryValue(trimmed, out var qv))
+                {
+                    queryBuilder = new System.Text.StringBuilder(qv);
+                }
+                else if (queryBuilder != null)
+                {
+                    // Continuation lines from multi-line query values don't start
+                    // with the two-space indent used by ContextToDetailText fields.
+                    if (string.IsNullOrWhiteSpace(trimmed) || line.StartsWith("  ", StringComparison.Ordinal))
+                    {
+                        FlushQuery(ref queryBuilder);
+                    }
+                    else
+                    {
+                        queryBuilder.Append(' ').Append(trimmed.Trim());
+                    }
+                }
+            }
+
+            FlushQuery(ref queryBuilder);
+        }
+
+        private void FlushQuery(ref System.Text.StringBuilder? builder)
+        {
+            if (builder != null && QueryText == null)
+                QueryText = builder.ToString();
+            builder = null;
+        }
+
+        private static bool TryExtractQueryValue(string trimmed, out string value)
+        {
+            foreach (var prefix in new[] { "Query: ", "Blocked Query: ", "Blocking Query: ", "Victim SQL: " })
+            {
+                if (trimmed.StartsWith(prefix, StringComparison.Ordinal))
+                {
+                    value = trimmed.Substring(prefix.Length).Trim();
+                    return true;
+                }
             }
+            value = "";
+            return false;
         }
     }
 }
diff --git a/Lite/MainWindow.xaml.cs b/Lite/MainWindow.xaml.cs
index 33577bb4..76044216 100644
--- a/Lite/MainWindow.xaml.cs
+++ b/Lite/MainWindow.xaml.cs
@@ -1,2228 +1,2228 @@
-/*
- * Copyright (c) 2026 Erik Darling, Darling Data LLC
- *
- * This file is part of the SQL Server Performance Monitor Lite.
- *
- * Licensed under the MIT License. See LICENSE file in the project root for full license information.
- */
-
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using System.Linq;
-using System.Xml.Linq;
-using System.Net;
-using System.Threading;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Input;
-using System.Windows.Threading;
-using PerformanceMonitorLite.Controls;
-using PerformanceMonitorLite.Database;
-using PerformanceMonitorLite.Mcp;
-using PerformanceMonitorLite.Models;
-using PerformanceMonitorLite.Services;
-using PerformanceMonitorLite.Windows;
-
-namespace PerformanceMonitorLite;
-
-public partial class MainWindow : Window
-{
-    private readonly DuckDbInitializer _databaseInitializer;
-    private readonly ServerManager _serverManager;
-    private readonly ScheduleManager _scheduleManager;
-    private RemoteCollectorService? _collectorService;
-    private CollectionBackgroundService? _backgroundService;
-    private CancellationTokenSource? _backgroundCts;
-    private SystemTrayService? _trayService;
-    private readonly Dictionary<string, TabItem> _openServerTabs = new();
-    private readonly Dictionary<string, bool> _previousConnectionStates = new();
-    private readonly Dictionary<string, bool> _previousCollectorErrorStates = new();
-    private readonly Dictionary<string, DateTime> _lastCpuAlert = new();
-    private readonly Dictionary<string, DateTime> _lastBlockingAlert = new();
-    private readonly Dictionary<string, DateTime> _lastDeadlockAlert = new();
-    private readonly Dictionary<string, DateTime> _lastPoisonWaitAlert = new();
-    private readonly Dictionary<string, DateTime> _lastLongRunningQueryAlert = new();
-    private readonly Dictionary<string, DateTime> _lastTempDbSpaceAlert = new();
-    private readonly Dictionary<string, DateTime> _lastLongRunningJobAlert = new();
-    private readonly DispatcherTimer _statusTimer;
-    private LocalDataService? _dataService;
-    private McpHostService? _mcpService;
-    private readonly AlertStateService _alertStateService = new();
-    private readonly MuteRuleService _muteRuleService;
-    private EmailAlertService _emailAlertService;
-
-    /* Track active alert states for resolved notifications */
-    private readonly Dictionary<string, bool> _activeCpuAlert = new();
-    private readonly Dictionary<string, bool> _activeBlockingAlert = new();
-    private readonly Dictionary<string, bool> _activeDeadlockAlert = new();
-    private readonly Dictionary<string, bool> _activePoisonWaitAlert = new();
-    private readonly Dictionary<string, bool> _activeLongRunningQueryAlert = new();
-    private readonly Dictionary<string, bool> _activeTempDbSpaceAlert = new();
-    private readonly Dictionary<string, bool> _activeLongRunningJobAlert = new();
-
-    public MainWindow()
-    {
-        InitializeComponent();
-
-        // Initialize services (with loggers wired to AppLogger)
-        _databaseInitializer = new DuckDbInitializer(App.DatabasePath, new AppLoggerAdapter<DuckDbInitializer>());
-        _emailAlertService = new EmailAlertService(_databaseInitializer);
-        _muteRuleService = new MuteRuleService(_databaseInitializer);
-        _serverManager = new ServerManager(App.ConfigDirectory, logger: new AppLoggerAdapter<ServerManager>());
-        _scheduleManager = new ScheduleManager(App.ConfigDirectory);
-
-        // Status bar update timer
-        _statusTimer = new DispatcherTimer { Interval = TimeSpan.FromSeconds(30) };
-        _statusTimer.Tick += async (s, e) =>
-        {
-            UpdateStatusBar();
-            await RefreshOverviewAsync();
-            CheckConnectionsAndNotify();
-
-            /* Auto-refresh alert history if the tab is active */
-            if (ServerTabControl.SelectedItem == AlertsTab)
-                AlertsHistoryContent.RefreshAlerts();
-        };
-
-        // Initialize database and UI
-        Loaded += MainWindow_Loaded;
-        Closing += MainWindow_Closing;
-        ServerTabControl.SelectionChanged += ServerTabControl_SelectionChanged;
-    }
-
-    private async void MainWindow_Loaded(object sender, RoutedEventArgs e)
-    {
-        try
-        {
-            StatusText.Text = "Initializing database...";
-
-            // Initialize the DuckDB database
-            await _databaseInitializer.InitializeAsync();
-
-            // Initialize the collection engine (with loggers wired to AppLogger)
-            _collectorService = new RemoteCollectorService(
-                _databaseInitializer,
-                _serverManager,
-                _scheduleManager,
-                new AppLoggerAdapter<RemoteCollectorService>());
-
-            var archiveService = new ArchiveService(_databaseInitializer, App.ArchiveDirectory, new AppLoggerAdapter<ArchiveService>());
-            var retentionService = new RetentionService(App.ArchiveDirectory, new AppLoggerAdapter<RetentionService>());
-
-            _backgroundService = new CollectionBackgroundService(
-                _collectorService, _databaseInitializer, archiveService, retentionService, _serverManager,
-                new AppLoggerAdapter<CollectionBackgroundService>());
-
-            // Start background collection
-            _backgroundCts = new CancellationTokenSource();
-            _ = _backgroundService.StartAsync(_backgroundCts.Token);
-
-            // Initialize system tray
-            _trayService = new SystemTrayService(this, _backgroundService);
-            _trayService.Initialize();
-
-            // Initialize data service for overview
-            _dataService = new LocalDataService(_databaseInitializer);
-
-            // Load mute rules from database
-            await _muteRuleService.LoadAsync();
-
-            // Initialize alerts history tab
-            AlertsHistoryContent.Initialize(_dataService);
-            AlertsHistoryContent.MuteRuleService = _muteRuleService;
-
-            // Initialize FinOps tab
-            FinOpsContent.Initialize(_dataService, _serverManager);
-
-            // Start MCP server if enabled
-            await StartMcpServerAsync();
-
-            // Load servers
-            RefreshServerList();
-
-            // Update status
-            UpdateStatusBar();
-            _statusTimer.Start();
-
-            await RefreshOverviewAsync();
-            StatusText.Text = "Ready - Collection active";
-
-            _ = CheckForUpdatesOnStartupAsync();
-        }
-        catch (Exception ex)
-        {
-            StatusText.Text = $"Error: {ex.Message}";
-            MessageBox.Show(
-                $"Failed to initialize the application:\n\n{ex.Message}",
-                "Initialization Error",
-                MessageBoxButton.OK,
-                MessageBoxImage.Error);
-        }
-    }
-
-    private async Task CheckForUpdatesOnStartupAsync()
-    {
-        try
-        {
-            if (!App.CheckForUpdatesOnStartup) return;
-
-            var result = await UpdateCheckService.CheckForUpdateAsync();
-            if (result?.IsUpdateAvailable == true)
-            {
-                var answer = MessageBox.Show(
-                    $"Performance Monitor {result.LatestVersion} is available (you have {result.CurrentVersion}).\n\nWould you like to open the download page?",
-                    "Update Available",
-                    MessageBoxButton.YesNo,
-                    MessageBoxImage.Information);
-
-                if (answer == MessageBoxResult.Yes)
-                {
-                    System.Diagnostics.Process.Start(new System.Diagnostics.ProcessStartInfo
-                    {
-                        FileName = result.ReleaseUrl,
-                        UseShellExecute = true
-                    });
-                }
-            }
-        }
-        catch
-        {
-            // Never crash on update check failure
-        }
-    }
-
-    private async void MainWindow_Closing(object? sender, System.ComponentModel.CancelEventArgs e)
-    {
-        // Dispose system tray
-        _trayService?.Dispose();
-
-        // Stop background collection with timeout
-        _backgroundCts?.Cancel();
-
-        await StopMcpServerAsync();
-
-        if (_backgroundService != null)
-        {
-            try
-            {
-                using var shutdownCts = new CancellationTokenSource(TimeSpan.FromSeconds(5));
-                await _backgroundService.StopAsync(shutdownCts.Token);
-            }
-            catch (OperationCanceledException)
-            {
-                /* Shutdown timed out, proceeding anyway */
-            }
-        }
-
-        // Stop all server tab refresh timers
-        foreach (var tab in _openServerTabs.Values)
-        {
-            if (tab.Content is ServerTab serverTab)
-            {
-                serverTab.StopRefresh();
-            }
-        }
-
-        _statusTimer.Stop();
-    }
-
-    private void ServerTabControl_SelectionChanged(object sender, SelectionChangedEventArgs e)
-    {
-        // Only respond to tab selection changes, not child control selection events that bubble up
-        if (e.OriginalSource != ServerTabControl) return;
-
-        /* Restore the selected tab's UTC offset so charts use the correct server timezone */
-        if (ServerTabControl.SelectedItem is TabItem { Content: ServerTab serverTab })
-        {
-            ServerTimeHelper.UtcOffsetMinutes = serverTab.UtcOffsetMinutes;
-            StatusText.Text = $"Connected to {serverTab.Server.DisplayNameWithIntent}";
-        }
-
-        /* Refresh alerts tab when selected */
-        if (ServerTabControl.SelectedItem == AlertsTab)
-        {
-            AlertsHistoryContent.RefreshAlerts();
-        }
-
-        UpdateCollectorHealth();
-    }
-
-    private async Task StartMcpServerAsync()
-    {
-        var mcpSettings = McpSettings.Load(App.ConfigDirectory);
-        if (!mcpSettings.Enabled) return;
-
-        try
-        {
-            bool portInUse = await PortUtilityService.IsTcpPortListeningAsync(mcpSettings.Port, IPAddress.Loopback);
-            if (portInUse)
-            {
-                AppLogger.Error("MCP", $"Port {mcpSettings.Port} is already in use — MCP server not started");
-                return;
-            }
-
-            _mcpService = new McpHostService(_dataService!, _serverManager, _muteRuleService, _databaseInitializer, mcpSettings.Port);
-            _ = _mcpService.StartAsync(_backgroundCts!.Token);
-        }
-        catch (Exception ex)
-        {
-            AppLogger.Error("MCP", $"Failed to start MCP server: {ex.Message}");
-        }
-    }
-
-    private async Task StopMcpServerAsync()
-    {
-        if (_mcpService != null)
-        {
-            try
-            {
-                using var shutdownCts = new CancellationTokenSource(TimeSpan.FromSeconds(5));
-                await _mcpService.StopAsync(shutdownCts.Token);
-            }
-            catch (OperationCanceledException)
-            {
-                /* MCP shutdown timed out */
-            }
-            _mcpService = null;
-        }
-    }
-
-    private void RefreshServerList()
-    {
-        var servers = _serverManager.GetAllServers();
-        foreach (var server in servers)
-        {
-            server.IsOnline = _serverManager.GetConnectionStatus(server.Id).IsOnline;
-            server.HasCollectorErrors = _collectorService != null
-                && server.IsOnline == true
-                && _collectorService.GetHealthSummary(server).ErroringCollectors > 0;
-        }
-        ServerListView.ItemsSource = servers;
-
-        // Update UI based on server count
-        if (servers.Count == 0 && _openServerTabs.Count == 0)
-        {
-            EmptyStatePanel.Visibility = Visibility.Visible;
-            ServerTabControl.Visibility = Visibility.Collapsed;
-        }
-        else
-        {
-            EmptyStatePanel.Visibility = Visibility.Collapsed;
-            ServerTabControl.Visibility = Visibility.Visible;
-        }
-
-        ServerCountText.Text = $"Servers: {servers.Count}";
-
-        // Refresh FinOps server dropdown when server list changes
-        FinOpsContent.RefreshServerList();
-
-        // Refresh overview when server list changes
-        _ = RefreshOverviewAsync();
-    }
-
-    private void UpdateStatusBar()
-    {
-        // Update database size
-        var fileSizeMb = _databaseInitializer.GetDatabaseSizeMb();
-        var usedSizeMb = _databaseInitializer.GetUsedDataSizeMb();
-        if (fileSizeMb > 0)
-        {
-            DatabaseSizeText.Text = usedSizeMb.HasValue
-                ? $"Database: {usedSizeMb.Value:F1} / {fileSizeMb:F1} MB"
-                : $"Database: {fileSizeMb:F1} MB";
-        }
-        else
-        {
-            DatabaseSizeText.Text = "Database: New";
-        }
-
-        // Update collection status
-        if (_backgroundService != null)
-        {
-            if (_backgroundService.IsCollecting)
-            {
-                CollectionStatusText.Text = "Collection: Running";
-            }
-            else if (_backgroundService.IsPaused)
-            {
-                CollectionStatusText.Text = "Collection: Paused";
-            }
-            else if (_backgroundService.LastCollectionTime.HasValue)
-            {
-                var ago = DateTime.UtcNow - _backgroundService.LastCollectionTime.Value;
-                CollectionStatusText.Text = $"Collection: {ago.TotalSeconds:F0}s ago";
-            }
-            else
-            {
-                CollectionStatusText.Text = "Collection: Starting...";
-            }
-        }
-        else
-        {
-            CollectionStatusText.Text = "Collection: Stopped";
-        }
-
-        // Update collector health
-        UpdateCollectorHealth();
-    }
-
-    private void UpdateCollectorHealth()
-    {
-        if (_collectorService == null)
-        {
-            CollectorHealthText.Text = "";
-            return;
-        }
-
-        int? selectedServerId = null;
-        if (ServerTabControl.SelectedItem is TabItem { Content: ServerTab serverTab })
-        {
-            selectedServerId = serverTab.ServerId;
-        }
-
-        var health = _collectorService.GetHealthSummary(selectedServerId);
-
-        if (health.TotalCollectors == 0)
-        {
-            CollectorHealthText.Text = "";
-            return;
-        }
-
-        if (health.LoggingFailures > 0)
-        {
-            CollectorHealthText.Text = $"Logging: BROKEN ({health.LoggingFailures} failures)";
-            CollectorHealthText.Foreground = System.Windows.Media.Brushes.Red;
-            CollectorHealthText.ToolTip = $"collection_log INSERT is failing.\nThis means collector errors are invisible.\nCheck the log file for details.";
-        }
-        else if (health.ErroringCollectors > 0)
-        {
-            var names = string.Join(", ", health.Errors.Select(e => e.CollectorName));
-            CollectorHealthText.Text = $"Collectors: {health.ErroringCollectors} erroring";
-            CollectorHealthText.Foreground = System.Windows.Media.Brushes.OrangeRed;
-            CollectorHealthText.ToolTip = $"Failing: {names}\n\n" +
-                string.Join("\n", health.Errors.Select(e =>
-                    $"{e.CollectorName}: {e.ConsecutiveErrors}x consecutive - {e.LastErrorMessage}"));
-        }
-        else
-        {
-            CollectorHealthText.Text = $"Collectors: {health.TotalCollectors} OK";
-            CollectorHealthText.Foreground = (System.Windows.Media.Brush)FindResource("ForegroundBrush");
-            CollectorHealthText.ToolTip = null;
-        }
-    }
-
-    private async Task RefreshOverviewAsync()
-    {
-        if (_dataService == null) return;
-
-        var servers = _serverManager.GetAllServers();
-        if (servers.Count == 0) return;
-
-        try
-        {
-            var summaries = new List<ServerSummaryItem>();
-            foreach (var server in servers)
-            {
-                try
-                {
-                    var serverId = RemoteCollectorService.GetDeterministicHashCode(RemoteCollectorService.GetServerNameForStorage(server));
-                    var summary = await _dataService.GetServerSummaryAsync(serverId, server.DisplayNameWithIntent);
-                    if (summary != null)
-                    {
-                        summary.ServerName = server.ServerName;
-                        var connStatus = _serverManager.GetConnectionStatus(server.Id);
-                        summary.IsOnline = connStatus.IsOnline;
-                        if (_collectorService != null && connStatus.IsOnline == true)
-                            summary.HasCollectorErrors = _collectorService.GetHealthSummary(server).ErroringCollectors > 0;
-                        summaries.Add(summary);
-                    }
-                }
-                catch (Exception ex)
-                {
-                    AppLogger.Info("Overview", $"Failed to get summary for {server.DisplayName}: {ex.Message}");
-                }
-            }
-
-            OverviewItemsControl.ItemsSource = summaries;
-
-            foreach (var summary in summaries)
-            {
-                CheckPerformanceAlerts(summary);
-            }
-        }
-        catch (Exception ex)
-        {
-            AppLogger.Info("Overview", $"RefreshOverviewAsync failed: {ex.Message}");
-        }
-    }
-
-    private void ServerListView_MouseDoubleClick(object sender, MouseButtonEventArgs e)
-    {
-        if (ServerListView.SelectedItem is ServerConnection server)
-        {
-            ConnectToServer(server);
-        }
-    }
-
-    private void OverviewCard_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
-    {
-        if (e.ClickCount == 2 && sender is FrameworkElement fe && fe.DataContext is ServerSummaryItem summary)
-        {
-            var server = _serverManager.GetAllServers()
-                .FirstOrDefault(s => s.ServerName == summary.ServerName);
-            if (server != null)
-            {
-                ConnectToServer(server);
-            }
-        }
-    }
-
-    private async void ConnectToServer(ServerConnection server)
-    {
-        // Check if tab already open
-        if (_openServerTabs.TryGetValue(server.Id, out var existingTab))
-        {
-            ServerTabControl.SelectedItem = existingTab;
-            return;
-        }
-
-        // Clear MFA cancellation flag when user explicitly connects
-        // This gives them a fresh attempt at authentication
-        var currentStatus = _serverManager.GetConnectionStatus(server.Id);
-        if (server.AuthenticationType == AuthenticationTypes.EntraMFA && currentStatus.UserCancelledMfa)
-        {
-            currentStatus.UserCancelledMfa = false;
-            StatusText.Text = "Retrying MFA authentication...";
-        }
-
-        // Ensure connection status is populated with UTC offset before opening tab
-        // This is critical for timezone-correct chart display
-        var status = _serverManager.GetConnectionStatus(server.Id);
-        if (!status.UtcOffsetMinutes.HasValue)
-        {
-            StatusText.Text = "Checking server connection...";
-            // Allow interactive auth (MFA) when user explicitly opens a server
-            status = await _serverManager.CheckConnectionAsync(server.Id, allowInteractiveAuth: true);
-        }
-
-        var utcOffset = status.UtcOffsetMinutes ?? 0;
-        var serverTab = new ServerTab(server, _databaseInitializer, _serverManager.CredentialService, utcOffset);
-        var tabHeader = CreateTabHeader(server);
-        var tabItem = new TabItem
-        {
-            Header = tabHeader,
-            Content = serverTab
-        };
-
-        /* Subscribe to alert counts for badge updates */
-        var serverId = server.Id;
-        serverTab.AlertCountsChanged += (blockingCount, deadlockCount, latestEventTime) =>
-        {
-            Dispatcher.Invoke(() => UpdateTabBadge(tabHeader, serverId, blockingCount, deadlockCount, latestEventTime));
-        };
-
-        /* Subscribe to "Apply to All" time range propagation */
-        serverTab.ApplyTimeRangeRequested += (selectedIndex) =>
-        {
-            Dispatcher.Invoke(() =>
-            {
-                foreach (var tab in _openServerTabs.Values)
-                {
-                    if (tab.Content is ServerTab st && st != serverTab)
-                    {
-                        st.SetTimeRangeIndex(selectedIndex);
-                    }
-                }
-            });
-        };
-
-        /* Re-collect on-load data (config, trace flags) when refresh button is clicked */
-        serverTab.ManualRefreshRequested += async () =>
-        {
-            if (_collectorService != null)
-            {
-                var onLoadCollectors = _scheduleManager.GetOnLoadCollectors();
-                foreach (var collector in onLoadCollectors)
-                {
-                    try
-                    {
-                        await _collectorService.RunCollectorAsync(server, collector.Name);
-                    }
-                    catch (Exception ex)
-                    {
-                        AppLogger.Info("MainWindow", $"Re-collection of {collector.Name} failed: {ex.Message}");
-                    }
-                }
-            }
-        };
-
-        _openServerTabs[server.Id] = tabItem;
-        ServerTabControl.Items.Add(tabItem);
-        ServerTabControl.SelectedItem = tabItem;
-
-        // Show the tab control, hide empty state
-        EmptyStatePanel.Visibility = Visibility.Collapsed;
-        ServerTabControl.Visibility = Visibility.Visible;
-
-        _serverManager.UpdateLastConnected(server.Id);
-
-        // Show existing historical data immediately
-        serverTab.RefreshData();
-
-        // Then collect fresh data and refresh again
-        if (_collectorService != null)
-        {
-            StatusText.Text = $"Collecting data from {server.DisplayNameWithIntent}...";
-            try
-            {
-                await _collectorService.RunAllCollectorsForServerAsync(server);
-                StatusText.Text = $"Connected to {server.DisplayNameWithIntent} - Data loaded";
-                serverTab.RefreshData();
-                UpdateCollectorHealth();
-                _ = RefreshOverviewAsync();
-            }
-            catch (Exception ex)
-            {
-                StatusText.Text = $"Connected to {server.DisplayNameWithIntent} - Collection error: {ex.Message}";
-            }
-        }
-        else
-        {
-            StatusText.Text = $"Connected to {server.DisplayNameWithIntent}";
-        }
-    }
-
-    private StackPanel CreateTabHeader(ServerConnection server)
-    {
-        var panel = new StackPanel { Orientation = Orientation.Horizontal };
-
-        var tabLabel = server.ReadOnlyIntent ? $"{server.DisplayName} (RO)" : server.DisplayName;
-        panel.Children.Add(new TextBlock
-        {
-            Text = tabLabel,
-            VerticalAlignment = VerticalAlignment.Center,
-            Margin = new Thickness(0, 0, 4, 0)
-        });
-
-        /* Alert badge - hidden by default, shown when blocking/deadlocks detected */
-        var badge = new System.Windows.Controls.Border
-        {
-            Background = System.Windows.Media.Brushes.OrangeRed,
-            CornerRadius = new CornerRadius(7),
-            Padding = new Thickness(5, 1, 5, 1),
-            Margin = new Thickness(0, 0, 4, 0),
-            VerticalAlignment = VerticalAlignment.Center,
-            Visibility = Visibility.Collapsed,
-            Child = new TextBlock
-            {
-                FontSize = 10,
-                FontWeight = FontWeights.Bold,
-                Foreground = System.Windows.Media.Brushes.White,
-                VerticalAlignment = VerticalAlignment.Center
-            }
-        };
-        badge.Tag = "AlertBadge";
-
-        /* Add context menu to badge for acknowledge/silence functionality */
-        var serverId = server.Id;
-        var contextMenu = new ContextMenu();
-
-        var acknowledgeItem = new MenuItem
-        {
-            Header = "Acknowledge Alert",
-            Tag = serverId,
-            Icon = new TextBlock { Text = "✓", FontWeight = FontWeights.Bold }
-        };
-        acknowledgeItem.Click += AcknowledgeServerAlert_Click;
-
-        var silenceItem = new MenuItem
-        {
-            Header = "Silence This Server",
-            Tag = serverId,
-            Icon = new TextBlock { Text = "🔇" }
-        };
-        silenceItem.Click += SilenceServer_Click;
-
-        var unsilenceItem = new MenuItem
-        {
-            Header = "Unsilence",
-            Tag = serverId,
-            Icon = new TextBlock { Text = "🔔" }
-        };
-        unsilenceItem.Click += UnsilenceServer_Click;
-
-        contextMenu.Items.Add(acknowledgeItem);
-        contextMenu.Items.Add(silenceItem);
-        contextMenu.Items.Add(new Separator());
-        contextMenu.Items.Add(unsilenceItem);
-
-        /* Update menu items based on state when opened */
-        contextMenu.Opened += (s, args) =>
-        {
-            var isSilenced = _alertStateService.IsServerSilenced(serverId);
-            var hasAlert = badge.Visibility == Visibility.Visible;
-
-            acknowledgeItem.IsEnabled = hasAlert;
-            silenceItem.IsEnabled = !isSilenced;
-            unsilenceItem.IsEnabled = isSilenced;
-        };
-
-        badge.ContextMenu = contextMenu;
-        panel.Children.Add(badge);
-
-        var closeButton = new Button
-        {
-            Content = "x",
-            FontSize = 10,
-            Padding = new Thickness(4, 0, 4, 0),
-            VerticalAlignment = VerticalAlignment.Center,
-            Cursor = Cursors.Hand
-        };
-        closeButton.Click += (s, e) => CloseServerTab(server.Id);
-        panel.Children.Add(closeButton);
-
-        return panel;
-    }
-
-    private void UpdateTabBadge(StackPanel tabHeader, string serverId, int blockingCount, int deadlockCount, DateTime? latestEventTime)
-    {
-        var totalAlerts = blockingCount + deadlockCount;
-
-        /* Delegate count tracking and acknowledgement clearing to AlertStateService.
-           Uses latestEventTime to only clear ack when genuinely new events arrive,
-           not when the user just switches time ranges. */
-        bool shouldShow = _alertStateService.UpdateAlertCounts(serverId, blockingCount, deadlockCount, latestEventTime);
-
-        foreach (var child in tabHeader.Children)
-        {
-            if (child is System.Windows.Controls.Border border && border.Tag as string == "AlertBadge")
-            {
-                if (shouldShow)
-                {
-                    border.Visibility = Visibility.Visible;
-                    border.Background = deadlockCount > 0
-                        ? System.Windows.Media.Brushes.Red
-                        : System.Windows.Media.Brushes.OrangeRed;
-
-                    if (border.Child is TextBlock text)
-                    {
-                        text.Text = totalAlerts > 99 ? "99+" : totalAlerts.ToString();
-                        text.ToolTip = $"Blocking: {blockingCount}, Deadlocks: {deadlockCount}\nRight-click to dismiss";
-                    }
-                }
-                else
-                {
-                    border.Visibility = Visibility.Collapsed;
-                }
-                break;
-            }
-        }
-    }
-
-    private void AcknowledgeServerAlert_Click(object sender, RoutedEventArgs e)
-    {
-        if (sender is MenuItem menuItem && menuItem.Tag is string serverId)
-        {
-            _alertStateService.AcknowledgeAlert(serverId);
-
-            /* Find and hide the badge for this server */
-            if (_openServerTabs.TryGetValue(serverId, out var tab) && tab.Header is StackPanel panel)
-            {
-                foreach (var child in panel.Children)
-                {
-                    if (child is System.Windows.Controls.Border border && border.Tag as string == "AlertBadge")
-                    {
-                        border.Visibility = Visibility.Collapsed;
-                        break;
-                    }
-                }
-            }
-        }
-    }
-
-    private void SilenceServer_Click(object sender, RoutedEventArgs e)
-    {
-        if (sender is MenuItem menuItem && menuItem.Tag is string serverId)
-        {
-            _alertStateService.SilenceServer(serverId);
-
-            /* Find and hide the badge for this server */
-            if (_openServerTabs.TryGetValue(serverId, out var tab) && tab.Header is StackPanel panel)
-            {
-                foreach (var child in panel.Children)
-                {
-                    if (child is System.Windows.Controls.Border border && border.Tag as string == "AlertBadge")
-                    {
-                        border.Visibility = Visibility.Collapsed;
-                        break;
-                    }
-                }
-            }
-        }
-    }
-
-    private void UnsilenceServer_Click(object sender, RoutedEventArgs e)
-    {
-        if (sender is MenuItem menuItem && menuItem.Tag is string serverId)
-        {
-            _alertStateService.UnsilenceServer(serverId);
-
-            /* The next refresh cycle will show the badge if there are alerts */
-        }
-    }
-
-    private void CloseServerTab(string serverId)
-    {
-        if (_openServerTabs.TryGetValue(serverId, out var tab))
-        {
-            if (tab.Content is ServerTab serverTab)
-            {
-                serverTab.StopRefresh();
-            }
-
-            ServerTabControl.Items.Remove(tab);
-            _openServerTabs.Remove(serverId);
-
-            /* Clean up alert state for this server */
-            _alertStateService.RemoveServerState(serverId);
-
-            // Show empty state if no tabs open
-            if (_openServerTabs.Count == 0)
-            {
-                var servers = _serverManager.GetAllServers();
-                if (servers.Count == 0)
-                {
-                    EmptyStatePanel.Visibility = Visibility.Visible;
-                    ServerTabControl.Visibility = Visibility.Collapsed;
-                }
-            }
-        }
-    }
-
-    private void AddServerButton_Click(object sender, RoutedEventArgs e)
-    {
-        var dialog = new AddServerDialog(_serverManager) { Owner = this };
-        if (dialog.ShowDialog() == true && dialog.AddedServer != null)
-        {
-            RefreshServerList();
-            StatusText.Text = $"Added server: {dialog.AddedServer.DisplayNameWithIntent}";
-        }
-    }
-
-    private void ManageServersButton_Click(object sender, RoutedEventArgs e)
-    {
-        var window = new ManageServersWindow(_serverManager) { Owner = this };
-        window.ShowDialog();
-
-        if (window.ServersChanged)
-        {
-            RefreshServerList();
-        }
-    }
-
-    private async void SettingsButton_Click(object sender, RoutedEventArgs e)
-    {
-        var window = new SettingsWindow(_scheduleManager, _backgroundService, _mcpService, _muteRuleService) { Owner = this };
-        window.ShowDialog();
-        UpdateStatusBar();
-
-        if (window.McpSettingsChanged)
-        {
-            await StopMcpServerAsync();
-            await StartMcpServerAsync();
-        }
-    }
-
-    private void AboutButton_Click(object sender, RoutedEventArgs e)
-    {
-        var window = new Windows.AboutWindow { Owner = this };
-        window.ShowDialog();
-    }
-
-    private void ImportConnectionsButton_Click(object sender, RoutedEventArgs e)
-    {
-        var dialog = new Microsoft.Win32.OpenFolderDialog
-        {
-            Title = "Select Previous Lite Install Folder"
-        };
-
-        if (dialog.ShowDialog() != true) return;
-
-        var serversJsonPath = System.IO.Path.Combine(dialog.FolderName, "config", "servers.json");
-        if (!System.IO.File.Exists(serversJsonPath))
-        {
-            MessageBox.Show(
-                "No config\\servers.json found in the selected folder.\n\nSelect the root folder of a previous Lite installation.",
-                "Import Connections",
-                MessageBoxButton.OK,
-                MessageBoxImage.Warning);
-            return;
-        }
-
-        try
-        {
-            var (imported, skipped) = _serverManager.ImportServersFromFile(serversJsonPath);
-
-            var message = $"Imported {imported} server connection(s).";
-            if (skipped > 0)
-                message += $"\nSkipped {skipped} duplicate(s) (already configured).";
-            if (imported > 0)
-                message += "\n\nCredentials from the previous install are preserved.\nIf any connections fail to authenticate, re-enter the password in Manage Servers.";
-
-            MessageBox.Show(message, "Import Connections", MessageBoxButton.OK, MessageBoxImage.Information);
-
-            if (imported > 0)
-                RefreshServerList();
-        }
-        catch (Exception ex)
-        {
-            MessageBox.Show($"Failed to import connections: {ex.Message}", "Import Error", MessageBoxButton.OK, MessageBoxImage.Error);
-        }
-    }
-
-    private async void ImportDataButton_Click(object sender, RoutedEventArgs e)
-    {
-        /* Open folder browser to select the old Lite install directory */
-        var dialog = new Microsoft.Win32.OpenFolderDialog
-        {
-            Title = "Select Previous Lite Install Folder",
-            Multiselect = false
-        };
-
-        if (dialog.ShowDialog(this) != true || string.IsNullOrWhiteSpace(dialog.FolderName))
-        {
-            return;
-        }
-
-        var sourceFolder = dialog.FolderName;
-
-        /* Validate that monitor.duckdb exists in the selected folder */
-        if (!DataImportService.ValidateSourceFolder(sourceFolder))
-        {
-            MessageBox.Show(
-                "The selected folder does not contain a monitor.duckdb file.\n\n" +
-                "Please select the folder where the previous Lite application was installed.",
-                "Invalid Folder",
-                MessageBoxButton.OK,
-                MessageBoxImage.Warning);
-            return;
-        }
-
-        /* Prevent double-clicks */
-        ImportDataButton.IsEnabled = false;
-        ImportDataButtonText.Text = "Importing...";
-        StatusText.Text = "Importing data from previous install...";
-
-        try
-        {
-            var importService = new DataImportService(_databaseInitializer, App.ArchiveDirectory);
-
-            /* The tryLockOldDb callback runs on the UI thread to show the retry dialog */
-            var result = await Task.Run(async () =>
-                await importService.RunImportAsync(sourceFolder, async _ =>
-                {
-                    var answer = MessageBoxResult.Cancel;
-                    await Dispatcher.InvokeAsync(() =>
-                    {
-                        answer = MessageBox.Show(
-                            "Could not lock the database to flush current data.\n\n" +
-                            "Close the previous Lite application and click OK to try again.",
-                            "Database Locked",
-                            MessageBoxButton.OKCancel,
-                            MessageBoxImage.Warning);
-                    });
-                    return answer == MessageBoxResult.OK;
-                }));
-
-            if (result.Success)
-            {
-                StatusText.Text = "Import complete — refreshing views...";
-                await _serverManager.CheckAllConnectionsAsync();
-                RefreshServerList();
-                UpdateStatusBar();
-                StatusText.Text = "Import complete";
-
-                MessageBox.Show(
-                    $"Import completed successfully.\n\n" +
-                    $"Tables flushed from old database: {result.TablesFlushed}\n" +
-                    $"Parquet files imported: {result.FilesImported}\n\n" +
-                    "Historical data is now available in all views.",
-                    "Import Complete",
-                    MessageBoxButton.OK,
-                    MessageBoxImage.Information);
-            }
-            else
-            {
-                StatusText.Text = "Import cancelled or failed";
-                if (!string.IsNullOrEmpty(result.ErrorMessage))
-                {
-                    MessageBox.Show(
-                        result.ErrorMessage,
-                        "Import Failed",
-                        MessageBoxButton.OK,
-                        MessageBoxImage.Error);
-                }
-            }
-        }
-        catch (Exception ex)
-        {
-            AppLogger.Error("DataImport", "Unhandled import error", ex);
-            StatusText.Text = "Import failed";
-            MessageBox.Show(
-                $"An unexpected error occurred during import:\n\n{ex.Message}",
-                "Import Error",
-                MessageBoxButton.OK,
-                MessageBoxImage.Error);
-        }
-        finally
-        {
-            ImportDataButton.IsEnabled = true;
-            ImportDataButtonText.Text = "Import Data";
-        }
-    }
-
-    /// <summary>
-    /// Gets the ServerConnection from a context menu click on a server list item.
-    /// </summary>
-    private ServerConnection? GetServerFromContextMenu(object sender)
-    {
-        if (sender is not MenuItem menuItem) return null;
-        var contextMenu = menuItem.Parent as ContextMenu;
-        var border = contextMenu?.PlacementTarget as FrameworkElement;
-        return border?.DataContext as ServerConnection;
-    }
-
-    private void ServerContextMenu_Connect_Click(object sender, RoutedEventArgs e)
-    {
-        var server = GetServerFromContextMenu(sender);
-        if (server != null) ConnectToServer(server);
-    }
-
-    private void ServerContextMenu_Disconnect_Click(object sender, RoutedEventArgs e)
-    {
-        var server = GetServerFromContextMenu(sender);
-        if (server != null) CloseServerTab(server.Id);
-    }
-
-    private void ServerContextMenu_ToggleFavorite_Click(object sender, RoutedEventArgs e)
-    {
-        var server = GetServerFromContextMenu(sender);
-        if (server != null)
-        {
-            _serverManager.ToggleFavorite(server.Id);
-            RefreshServerList();
-        }
-    }
-
-    private void ServerContextMenu_Edit_Click(object sender, RoutedEventArgs e)
-    {
-        var server = GetServerFromContextMenu(sender);
-        if (server == null) return;
-
-        var dialog = new AddServerDialog(_serverManager, server) { Owner = this };
-        if (dialog.ShowDialog() == true)
-        {
-            RefreshServerList();
-        }
-    }
-
-    private void ServerContextMenu_Remove_Click(object sender, RoutedEventArgs e)
-    {
-        var server = GetServerFromContextMenu(sender);
-        if (server == null) return;
-
-        var result = MessageBox.Show(
-            $"Remove server '{server.DisplayNameWithIntent}'?",
-            "Remove Server",
-            MessageBoxButton.YesNo,
-            MessageBoxImage.Question);
-
-        if (result == MessageBoxResult.Yes)
-        {
-            CloseServerTab(server.Id);
-            _serverManager.DeleteServer(server.Id);
-            RefreshServerList();
-            StatusText.Text = $"Removed server: {server.DisplayNameWithIntent}";
-        }
-    }
-
-    private bool _sidebarCollapsed;
-
-    private void ToggleSidebar_Click(object sender, RoutedEventArgs e)
-    {
-        _sidebarCollapsed = !_sidebarCollapsed;
-
-        if (_sidebarCollapsed)
-        {
-            SidebarColumn.Width = new GridLength(40);
-            SidebarTitle.Visibility = Visibility.Collapsed;
-            SidebarSubtitle.Visibility = Visibility.Collapsed;
-            if (sender is System.Windows.Controls.Button btn) btn.Content = "»";
-        }
-        else
-        {
-            SidebarColumn.Width = new GridLength(280);
-            SidebarTitle.Visibility = Visibility.Visible;
-            SidebarSubtitle.Visibility = Visibility.Visible;
-            if (sender is System.Windows.Controls.Button btn) btn.Content = "«";
-        }
-    }
-
-    private async void RefreshButton_Click(object sender, RoutedEventArgs e)
-    {
-        try
-        {
-            StatusText.Text = "Refreshing...";
-
-            // Check all server connections
-            await _serverManager.CheckAllConnectionsAsync();
-
-            RefreshServerList();
-            UpdateStatusBar();
-
-            StatusText.Text = "Refresh complete";
-        }
-        catch (Exception ex)
-        {
-            StatusText.Text = $"Refresh failed: {ex.Message}";
-        }
-    }
-
-    private void CheckConnectionsAndNotify()
-    {
-        try
-        {
-            var servers = _serverManager.GetAllServers();
-            bool needsRefresh = false;
-            foreach (var server in servers)
-            {
-                var status = _serverManager.GetConnectionStatus(server.Id);
-                server.IsOnline = status?.IsOnline;
-                if (status?.IsOnline == null) continue;
-
-                bool isOnline = status.IsOnline == true;
-                bool hasErrors = _collectorService != null && isOnline
-                    && _collectorService.GetHealthSummary(server).ErroringCollectors > 0;
-                server.HasCollectorErrors = hasErrors;
-
-                if (_previousConnectionStates.TryGetValue(server.Id, out var wasOnline))
-                {
-                    if (App.AlertsEnabled && App.NotifyConnectionChanges)
-                    {
-                        if (wasOnline && !isOnline)
-                        {
-                            _trayService?.ShowNotification(
-                                "Server Offline",
-                                $"{server.DisplayNameWithIntent} is unreachable: {status.ErrorMessage ?? "unknown error"}",
-                                Hardcodet.Wpf.TaskbarNotification.BalloonIcon.Error);
-                        }
-                        else if (!wasOnline && isOnline)
-                        {
-                            _trayService?.ShowNotification(
-                                "Server Online",
-                                $"{server.DisplayNameWithIntent} is back online",
-                                Hardcodet.Wpf.TaskbarNotification.BalloonIcon.Info);
-                        }
-                    }
-
-                    if (wasOnline != isOnline)
-                    {
-                        needsRefresh = true;
-                    }
-                }
-                else
-                {
-                    /* First time seeing this server's status — need to refresh */
-                    needsRefresh = true;
-                }
-
-                if (_previousCollectorErrorStates.TryGetValue(server.Id, out var prevHasErrors) && prevHasErrors != hasErrors)
-                    needsRefresh = true;
-
-                _previousConnectionStates[server.Id] = isOnline;
-                _previousCollectorErrorStates[server.Id] = hasErrors;
-            }
-
-            if (needsRefresh)
-            {
-                RefreshServerList();
-            }
-        }
-        catch (Exception ex)
-        {
-            AppLogger.Error("ConnectionAlerts", $"Connection check notify failed: {ex.Message}");
-        }
-    }
-
-    private async void CheckPerformanceAlerts(ServerSummaryItem summary)
-    {
-        if (!App.AlertsEnabled || _trayService == null) return;
-
-        var key = summary.ServerId.ToString();
-        var now = DateTime.UtcNow;
-        var alertCooldown = TimeSpan.FromMinutes(App.AlertCooldownMinutes);
-
-        /* Skip popup/email alerts if user has acknowledged or silenced this server */
-        bool suppressPopups = !_alertStateService.ShouldShowAlerts(key);
-
-        /* CPU alerts */
-        bool cpuExceeded = App.AlertCpuEnabled
-            && summary.CpuPercent.HasValue
-            && summary.CpuPercent.Value >= App.AlertCpuThreshold;
-
-        if (cpuExceeded)
-        {
-            _activeCpuAlert[key] = true;
-            if (!suppressPopups && (!_lastCpuAlert.TryGetValue(key, out var lastCpu) || now - lastCpu >= alertCooldown))
-            {
-                var muteCtx = new AlertMuteContext { ServerName = summary.DisplayName, MetricName = "High CPU" };
-                bool isMuted = _muteRuleService.IsAlertMuted(muteCtx);
-                _lastCpuAlert[key] = now;
-
-                if (!isMuted)
-                {
-                    _trayService.ShowNotification(
-                        "High CPU",
-                        $"{summary.DisplayName}: CPU at {summary.CpuPercent:F0}% (threshold: {App.AlertCpuThreshold}%)",
-                        Hardcodet.Wpf.TaskbarNotification.BalloonIcon.Warning);
-                }
-
-                var cpuDetailText = $"  CPU: {summary.CpuPercent:F0}%\n  Threshold: {App.AlertCpuThreshold}%";
-
-                await _emailAlertService.TrySendAlertEmailAsync(
-                    "High CPU",
-                    summary.DisplayName,
-                    $"{summary.CpuPercent:F0}%",
-                    $"{App.AlertCpuThreshold}%",
-                    summary.ServerId,
-                    muted: isMuted,
-                    detailText: cpuDetailText);
-            }
-        }
-        else if (_activeCpuAlert.TryGetValue(key, out var wasCpu) && wasCpu)
-        {
-            _activeCpuAlert[key] = false;
-            _trayService.ShowNotification(
-                "CPU Resolved",
-                $"{summary.DisplayName}: CPU back to {summary.CpuPercent:F0}%",
-                Hardcodet.Wpf.TaskbarNotification.BalloonIcon.Info);
-        }
-
-        /* Blocking alerts */
-        var effectiveBlockingCount = summary.BlockingCount;
-        if (App.AlertBlockingEnabled && App.AlertExcludedDatabases.Count > 0
-            && summary.BlockingCount >= App.AlertBlockingThreshold && _dataService != null)
-        {
-            try
-            {
-                var blockingRows = await _dataService.GetRecentBlockedProcessReportsAsync(summary.ServerId, hoursBack: 1);
-                effectiveBlockingCount = blockingRows
-                    .Count(r => string.IsNullOrEmpty(r.DatabaseName) ||
-                        !App.AlertExcludedDatabases.Any(e =>
-                            string.Equals(e, r.DatabaseName, StringComparison.OrdinalIgnoreCase)));
-            }
-            catch (Exception ex)
-            {
-                AppLogger.Error("Alerts", $"Failed to filter blocking count for {summary.DisplayName}: {ex.Message}");
-            }
-        }
-
-        bool blockingExceeded = App.AlertBlockingEnabled
-            && effectiveBlockingCount >= App.AlertBlockingThreshold;
-
-        if (blockingExceeded)
-        {
-            _activeBlockingAlert[key] = true;
-            if (!suppressPopups && (!_lastBlockingAlert.TryGetValue(key, out var lastBlocking) || now - lastBlocking >= alertCooldown))
-            {
-                var muteCtx = new AlertMuteContext { ServerName = summary.DisplayName, MetricName = "Blocking Detected" };
-                bool isMuted = _muteRuleService.IsAlertMuted(muteCtx);
-                _lastBlockingAlert[key] = now;
-
-                if (!isMuted)
-                {
-                    _trayService.ShowNotification(
-                        "Blocking Detected",
-                        $"{summary.DisplayName}: {effectiveBlockingCount} blocking session(s)",
-                        Hardcodet.Wpf.TaskbarNotification.BalloonIcon.Warning);
-                }
-
-                var blockingContext = await BuildBlockingContextAsync(summary.ServerId);
-                var detailText = ContextToDetailText(blockingContext);
-
-                await _emailAlertService.TrySendAlertEmailAsync(
-                    "Blocking Detected",
-                    summary.DisplayName,
-                    effectiveBlockingCount.ToString(),
-                    App.AlertBlockingThreshold.ToString(),
-                    summary.ServerId,
-                    blockingContext,
-                    muted: isMuted,
-                    detailText: detailText);
-            }
-        }
-        else if (_activeBlockingAlert.TryGetValue(key, out var wasBlocking) && wasBlocking)
-        {
-            _activeBlockingAlert[key] = false;
-            _trayService.ShowNotification(
-                "Blocking Cleared",
-                $"{summary.DisplayName}: No active blocking",
-                Hardcodet.Wpf.TaskbarNotification.BalloonIcon.Info);
-        }
-
-        /* Deadlock alerts */
-        var effectiveDeadlockCount = summary.DeadlockCount;
-        if (App.AlertDeadlockEnabled && App.AlertExcludedDatabases.Count > 0
-            && summary.DeadlockCount >= App.AlertDeadlockThreshold && _dataService != null)
-        {
-            try
-            {
-                var deadlockRows = await _dataService.GetRecentDeadlocksAsync(summary.ServerId, hoursBack: 1);
-                effectiveDeadlockCount = deadlockRows
-                    .Count(r => !IsDeadlockExcluded(r, App.AlertExcludedDatabases));
-            }
-            catch (Exception ex)
-            {
-                AppLogger.Error("Alerts", $"Failed to filter deadlock count for {summary.DisplayName}: {ex.Message}");
-            }
-        }
-
-        bool deadlocksExceeded = App.AlertDeadlockEnabled
-            && effectiveDeadlockCount >= App.AlertDeadlockThreshold;
-
-        if (deadlocksExceeded)
-        {
-            _activeDeadlockAlert[key] = true;
-            if (!suppressPopups && (!_lastDeadlockAlert.TryGetValue(key, out var lastDeadlock) || now - lastDeadlock >= alertCooldown))
-            {
-                var muteCtx = new AlertMuteContext { ServerName = summary.DisplayName, MetricName = "Deadlocks Detected" };
-                bool isMuted = _muteRuleService.IsAlertMuted(muteCtx);
-                _lastDeadlockAlert[key] = now;
-
-                if (!isMuted)
-                {
-                    _trayService.ShowNotification(
-                        "Deadlocks Detected",
-                        $"{summary.DisplayName}: {effectiveDeadlockCount} deadlock(s) in the last hour",
-                        Hardcodet.Wpf.TaskbarNotification.BalloonIcon.Error);
-                }
-
-                var deadlockContext = await BuildDeadlockContextAsync(summary.ServerId);
-                var detailText = ContextToDetailText(deadlockContext);
-
-                await _emailAlertService.TrySendAlertEmailAsync(
-                    "Deadlocks Detected",
-                    summary.DisplayName,
-                    effectiveDeadlockCount.ToString(),
-                    App.AlertDeadlockThreshold.ToString(),
-                    summary.ServerId,
-                    deadlockContext,
-                    muted: isMuted,
-                    detailText: detailText);
-            }
-        }
-        else if (_activeDeadlockAlert.TryGetValue(key, out var wasDeadlock) && wasDeadlock)
-        {
-            _activeDeadlockAlert[key] = false;
-            _trayService.ShowNotification(
-                "Deadlocks Cleared",
-                $"{summary.DisplayName}: No deadlocks in the last hour",
-                Hardcodet.Wpf.TaskbarNotification.BalloonIcon.Info);
-        }
-
-        /* Poison wait alerts */
-        if (App.AlertPoisonWaitEnabled && _dataService != null)
-        {
-            try
-            {
-                var poisonWaits = await _dataService.GetLatestPoisonWaitAvgsAsync(summary.ServerId);
-                var triggered = poisonWaits.FindAll(w => w.AvgMsPerWait >= App.AlertPoisonWaitThresholdMs);
-
-                if (triggered.Count > 0)
-                {
-                    _activePoisonWaitAlert[key] = true;
-                    if (!suppressPopups && (!_lastPoisonWaitAlert.TryGetValue(key, out var lastPoisonWait) || now - lastPoisonWait >= alertCooldown))
-                    {
-                        var worst = triggered[0];
-                        var allWaitNames = string.Join(", ", triggered.ConvertAll(w => $"{w.WaitType} ({w.AvgMsPerWait:F0}ms)"));
-
-                        /* Poison wait mute check uses the worst (highest avg ms/wait) triggered wait type.
-                           Limitation: if a user mutes a specific wait type that isn't the worst, the alert
-                           still fires. Conversely, muting the worst type suppresses the entire alert even
-                           if other unmuted poison waits are present. */
-                        var muteCtx = new AlertMuteContext { ServerName = summary.DisplayName, MetricName = "Poison Wait", WaitType = worst.WaitType };
-                        bool isMuted = _muteRuleService.IsAlertMuted(muteCtx);
-                        _lastPoisonWaitAlert[key] = now;
-
-                        if (!isMuted)
-                        {
-                            _trayService.ShowNotification(
-                                "Poison Wait",
-                                $"{summary.DisplayName}: {worst.WaitType} avg {worst.AvgMsPerWait:F0}ms/wait",
-                                Hardcodet.Wpf.TaskbarNotification.BalloonIcon.Error);
-                        }
-
-                        var poisonContext = BuildPoisonWaitContext(triggered);
-                        var detailText = ContextToDetailText(poisonContext);
-
-                        await _emailAlertService.TrySendAlertEmailAsync(
-                            "Poison Wait",
-                            summary.DisplayName,
-                            allWaitNames,
-                            $"{App.AlertPoisonWaitThresholdMs}ms avg",
-                            summary.ServerId,
-                            poisonContext,
-                            numericCurrentValue: worst.AvgMsPerWait,
-                            numericThresholdValue: App.AlertPoisonWaitThresholdMs,
-                            muted: isMuted,
-                            detailText: detailText);
-                    }
-                }
-                else if (_activePoisonWaitAlert.TryGetValue(key, out var wasPoisonWait) && wasPoisonWait)
-                {
-                    _activePoisonWaitAlert[key] = false;
-                    _trayService.ShowNotification(
-                        "Poison Waits Cleared",
-                        $"{summary.DisplayName}: Poison wait avg below threshold",
-                        Hardcodet.Wpf.TaskbarNotification.BalloonIcon.Info);
-                }
-            }
-            catch (Exception ex)
-            {
-                AppLogger.Error("Alerts", $"Failed to check poison waits for {summary.DisplayName}: {ex.Message}");
-            }
-        }
-
-        /* Long-running query alerts */
-        if (App.AlertLongRunningQueryEnabled && _dataService != null)
-        {
-            try
-            {
-                var longRunning = await _dataService.GetLongRunningQueriesAsync(summary.ServerId, App.AlertLongRunningQueryThresholdMinutes, App.AlertLongRunningQueryMaxResults, App.AlertLongRunningQueryExcludeSpServerDiagnostics, App.AlertLongRunningQueryExcludeWaitFor, App.AlertLongRunningQueryExcludeBackups, App.AlertLongRunningQueryExcludeMiscWaits);
-
-                if (App.AlertExcludedDatabases.Count > 0)
-                {
-                    longRunning = longRunning
-                        .Where(q => string.IsNullOrEmpty(q.DatabaseName) ||
-                            !App.AlertExcludedDatabases.Any(e =>
-                                string.Equals(e, q.DatabaseName, StringComparison.OrdinalIgnoreCase)))
-                        .ToList();
-                }
-
-                if (longRunning.Count > 0)
-                {
-                    _activeLongRunningQueryAlert[key] = true;
-                    if (!suppressPopups && (!_lastLongRunningQueryAlert.TryGetValue(key, out var lastLrq) || now - lastLrq >= alertCooldown))
-                    {
-                        var worst = longRunning[0];
-                        var elapsedMinutes = worst.ElapsedSeconds / 60;
-                        var preview = TruncateText(worst.QueryText, 80);
-                        var previewSuffix = string.IsNullOrEmpty(preview) ? "" : $" — {preview}";
-
-                        var muteCtx = new AlertMuteContext
-                        {
-                            ServerName = summary.DisplayName,
-                            MetricName = "Long-Running Query",
-                            DatabaseName = worst.DatabaseName,
-                            QueryText = worst.QueryText
-                        };
-                        bool isMuted = _muteRuleService.IsAlertMuted(muteCtx);
-                        _lastLongRunningQueryAlert[key] = now;
-
-                        if (!isMuted)
-                        {
-                            _trayService.ShowNotification(
-                                "Long-Running Query",
-                                $"{summary.DisplayName}: Session #{worst.SessionId} running {elapsedMinutes}m{previewSuffix}",
-                                Hardcodet.Wpf.TaskbarNotification.BalloonIcon.Warning);
-                        }
-
-                        var lrqContext = BuildLongRunningQueryContext(longRunning);
-                        var detailText = ContextToDetailText(lrqContext);
-
-                        await _emailAlertService.TrySendAlertEmailAsync(
-                            "Long-Running Query",
-                            summary.DisplayName,
-                            $"{longRunning.Count} query(s), longest {elapsedMinutes}m",
-                            $"{App.AlertLongRunningQueryThresholdMinutes}m",
-                            summary.ServerId,
-                            lrqContext,
-                            numericCurrentValue: elapsedMinutes,
-                            numericThresholdValue: App.AlertLongRunningQueryThresholdMinutes,
-                            muted: isMuted,
-                            detailText: detailText);
-                    }
-                }
-                else if (_activeLongRunningQueryAlert.TryGetValue(key, out var wasLongRunning) && wasLongRunning)
-                {
-                    _activeLongRunningQueryAlert[key] = false;
-                    _trayService.ShowNotification(
-                        "Long-Running Queries Cleared",
-                        $"{summary.DisplayName}: No queries over threshold",
-                        Hardcodet.Wpf.TaskbarNotification.BalloonIcon.Info);
-                }
-            }
-            catch (Exception ex)
-            {
-                AppLogger.Error("Alerts", $"Failed to check long-running queries for {summary.DisplayName}: {ex.Message}");
-            }
-        }
-
-        /* TempDB space alerts */
-        if (App.AlertTempDbSpaceEnabled && _dataService != null)
-        {
-            try
-            {
-                var tempDb = await _dataService.GetLatestTempDbSpaceAsync(summary.ServerId);
-
-                if (tempDb != null && tempDb.UsedPercent >= App.AlertTempDbSpaceThresholdPercent)
-                {
-                    _activeTempDbSpaceAlert[key] = true;
-                    if (!suppressPopups && (!_lastTempDbSpaceAlert.TryGetValue(key, out var lastTempDb) || now - lastTempDb >= alertCooldown))
-                    {
-                        var muteCtx = new AlertMuteContext { ServerName = summary.DisplayName, MetricName = "TempDB Space" };
-                        bool isMuted = _muteRuleService.IsAlertMuted(muteCtx);
-                        _lastTempDbSpaceAlert[key] = now;
-
-                        if (!isMuted)
-                        {
-                            _trayService.ShowNotification(
-                                "TempDB Space",
-                                $"{summary.DisplayName}: TempDB {tempDb.UsedPercent:F0}% used",
-                                Hardcodet.Wpf.TaskbarNotification.BalloonIcon.Warning);
-                        }
-
-                        var tempDbContext = BuildTempDbSpaceContext(tempDb);
-                        var detailText = ContextToDetailText(tempDbContext);
-
-                        await _emailAlertService.TrySendAlertEmailAsync(
-                            "TempDB Space",
-                            summary.DisplayName,
-                            $"{tempDb.UsedPercent:F0}% used ({tempDb.TotalReservedMb:F0} MB)",
-                            $"{App.AlertTempDbSpaceThresholdPercent}%",
-                            summary.ServerId,
-                            tempDbContext,
-                            numericCurrentValue: tempDb.UsedPercent,
-                            numericThresholdValue: App.AlertTempDbSpaceThresholdPercent,
-                            muted: isMuted,
-                            detailText: detailText);
-                    }
-                }
-                else if (_activeTempDbSpaceAlert.TryGetValue(key, out var wasTempDb) && wasTempDb)
-                {
-                    _activeTempDbSpaceAlert[key] = false;
-                    var pct = tempDb != null ? $"{tempDb.UsedPercent:F0}%" : "N/A";
-                    _trayService.ShowNotification(
-                        "TempDB Space Resolved",
-                        $"{summary.DisplayName}: TempDB usage back to {pct}",
-                        Hardcodet.Wpf.TaskbarNotification.BalloonIcon.Info);
-                }
-            }
-            catch (Exception ex)
-            {
-                AppLogger.Error("Alerts", $"Failed to check TempDB space for {summary.DisplayName}: {ex.Message}");
-            }
-        }
-
-        /* Anomalous Agent job alerts */
-        if (App.AlertLongRunningJobEnabled && _dataService != null)
-        {
-            try
-            {
-                var anomalousJobs = await _dataService.GetAnomalousJobsAsync(summary.ServerId, App.AlertLongRunningJobMultiplier);
-
-                if (anomalousJobs.Count > 0)
-                {
-                    _activeLongRunningJobAlert[key] = true;
-                    var worst = anomalousJobs[0];
-                    var jobKey = $"{key}:{worst.JobId}:{worst.StartTime:O}";
-
-                    if (!suppressPopups && (!_lastLongRunningJobAlert.TryGetValue(jobKey, out var lastJob) || now - lastJob >= alertCooldown))
-                    {
-                        var currentMinutes = worst.CurrentDurationSeconds / 60;
-
-                        var muteCtx = new AlertMuteContext { ServerName = summary.DisplayName, MetricName = "Long-Running Job", JobName = worst.JobName };
-                        bool isMuted = _muteRuleService.IsAlertMuted(muteCtx);
-                        _lastLongRunningJobAlert[jobKey] = now;
-
-                        if (!isMuted)
-                        {
-                            _trayService.ShowNotification(
-                                "Long-Running Job",
-                                $"{summary.DisplayName}: {worst.JobName} at {worst.PercentOfAverage:F0}% of avg ({currentMinutes}m)",
-                                Hardcodet.Wpf.TaskbarNotification.BalloonIcon.Warning);
-                        }
-
-                        var jobContext = BuildAnomalousJobContext(anomalousJobs);
-                        var detailText = ContextToDetailText(jobContext);
-
-                        await _emailAlertService.TrySendAlertEmailAsync(
-                            "Long-Running Job",
-                            summary.DisplayName,
-                            $"{anomalousJobs.Count} job(s) exceeding {App.AlertLongRunningJobMultiplier}x average",
-                            $"{App.AlertLongRunningJobMultiplier}x historical avg",
-                            summary.ServerId,
-                            jobContext,
-                            numericCurrentValue: (double)(worst.PercentOfAverage ?? 0),
-                            numericThresholdValue: App.AlertLongRunningJobMultiplier * 100,
-                            muted: isMuted,
-                            detailText: detailText);
-                    }
-                }
-                else if (_activeLongRunningJobAlert.TryGetValue(key, out var wasJob) && wasJob)
-                {
-                    _activeLongRunningJobAlert[key] = false;
-                    _trayService.ShowNotification(
-                        "Long-Running Jobs Cleared",
-                        $"{summary.DisplayName}: No jobs exceeding threshold",
-                        Hardcodet.Wpf.TaskbarNotification.BalloonIcon.Info);
-                }
-            }
-            catch (Exception ex)
-            {
-                AppLogger.Error("Alerts", $"Failed to check anomalous jobs for {summary.DisplayName}: {ex.Message}");
-            }
-        }
-    }
-
-        private static string TruncateText(string text, int maxLength = 300)
-        {
-            if (string.IsNullOrEmpty(text)) return "";
-            text = text.Trim();
-            return text.Length <= maxLength ? text : text.Substring(0, maxLength) + "...";
-        }
-
-        private static string? ContextToDetailText(AlertContext? context)
-        {
-            if (context == null || context.Details.Count == 0) return null;
-            var sb = new System.Text.StringBuilder();
-            foreach (var detail in context.Details)
-            {
-                if (sb.Length > 0) sb.AppendLine();
-                sb.AppendLine(detail.Heading);
-                foreach (var (label, value) in detail.Fields)
-                    sb.AppendLine($"  {label}: {value}");
-            }
-            return sb.ToString().TrimEnd();
-        }
-
-        private async Task<AlertContext?> BuildBlockingContextAsync(int serverId)
-        {
-            try
-            {
-                if (_dataService == null) return null;
-
-                var events = await _dataService.GetRecentBlockedProcessReportsAsync(serverId, hoursBack: 1);
-                if (events == null || events.Count == 0) return null;
-
-                if (App.AlertExcludedDatabases.Count > 0)
-                {
-                    events = events
-                        .Where(e => string.IsNullOrEmpty(e.DatabaseName) ||
-                            !App.AlertExcludedDatabases.Any(ex =>
-                                string.Equals(ex, e.DatabaseName, StringComparison.OrdinalIgnoreCase)))
-                        .ToList();
-                    if (events.Count == 0) return null;
-                }
-
-                var context = new AlertContext();
-                var firstXml = (string?)null;
-
-                foreach (var e in events.Take(3))
-                {
-                    var item = new AlertDetailItem
-                    {
-                        Heading = $"Blocked #{e.BlockedSpid} by #{e.BlockingSpid}",
-                        Fields = new()
-                    };
-
-                    if (!string.IsNullOrEmpty(e.DatabaseName))
-                        item.Fields.Add(("Database", e.DatabaseName));
-                    if (!string.IsNullOrEmpty(e.BlockedSqlText))
-                        item.Fields.Add(("Blocked Query", TruncateText(e.BlockedSqlText)));
-                    if (!string.IsNullOrEmpty(e.BlockingSqlText))
-                        item.Fields.Add(("Blocking Query", TruncateText(e.BlockingSqlText)));
-                    item.Fields.Add(("Wait Time", e.WaitTimeFormatted));
-                    if (!string.IsNullOrEmpty(e.LockMode))
-                        item.Fields.Add(("Lock Mode", e.LockMode));
-
-                    context.Details.Add(item);
-                    if (firstXml == null && e.HasReportXml)
-                        firstXml = e.BlockedProcessReportXml;
-                }
-
-                if (!string.IsNullOrEmpty(firstXml))
-                {
-                    context.AttachmentXml = firstXml;
-                    context.AttachmentFileName = "blocked_process_report.xml";
-                }
-
-                return context;
-            }
-            catch (Exception ex)
-            {
-                AppLogger.Error("EmailAlert", $"Failed to fetch blocking detail for email: {ex.Message}");
-                return null;
-            }
-        }
-
-        private async Task<AlertContext?> BuildDeadlockContextAsync(int serverId)
-        {
-            try
-            {
-                if (_dataService == null) return null;
-
-                var deadlocks = await _dataService.GetRecentDeadlocksAsync(serverId, hoursBack: 1);
-                if (deadlocks == null || deadlocks.Count == 0) return null;
-
-                if (App.AlertExcludedDatabases.Count > 0)
-                {
-                    deadlocks = deadlocks
-                        .Where(d => !IsDeadlockExcluded(d, App.AlertExcludedDatabases))
-                        .ToList();
-                    if (deadlocks.Count == 0) return null;
-                }
-
-                var context = new AlertContext();
-                var firstGraph = (string?)null;
-
-                foreach (var d in deadlocks.Take(3))
-                {
-                    var item = new AlertDetailItem
-                    {
-                        Heading = "Deadlock Victim",
-                        Fields = new()
-                    };
-
-                    if (!string.IsNullOrEmpty(d.VictimSqlText))
-                        item.Fields.Add(("Victim SQL", TruncateText(d.VictimSqlText)));
-                    if (!string.IsNullOrEmpty(d.ProcessSummary))
-                        item.Fields.Add(("Processes", d.ProcessSummary));
-
-                    context.Details.Add(item);
-                    if (firstGraph == null && d.HasDeadlockXml)
-                        firstGraph = d.DeadlockGraphXml;
-                }
-
-                if (!string.IsNullOrEmpty(firstGraph))
-                {
-                    context.AttachmentXml = firstGraph;
-                    context.AttachmentFileName = "deadlock_graph.xml";
-                }
-
-                return context;
-            }
-            catch (Exception ex)
-            {
-                AppLogger.Error("EmailAlert", $"Failed to fetch deadlock detail for email: {ex.Message}");
-                return null;
-            }
-        }
-
-        private static bool IsDeadlockExcluded(DeadlockRow row, List<string> excludedDatabases)
-        {
-            if (string.IsNullOrEmpty(row.DeadlockGraphXml)) return false;
-            try
-            {
-                var doc = XElement.Parse(row.DeadlockGraphXml);
-                var dbNames = doc.Descendants("process")
-                    .Select(p => p.Attribute("currentdbname")?.Value)
-                    .Where(n => !string.IsNullOrEmpty(n))
-                    .Cast<string>()
-                    .ToList();
-                if (dbNames.Count == 0) return false;
-                return dbNames.All(db => excludedDatabases.Any(e =>
-                    string.Equals(e, db, StringComparison.OrdinalIgnoreCase)));
-            }
-            catch { return false; }
-        }
-
-        private static AlertContext? BuildPoisonWaitContext(List<PoisonWaitDelta> triggeredWaits)
-        {
-            if (triggeredWaits.Count == 0) return null;
-
-            var context = new AlertContext();
-            foreach (var w in triggeredWaits)
-            {
-                context.Details.Add(new AlertDetailItem
-                {
-                    Heading = w.WaitType,
-                    Fields = new()
-                    {
-                        ("Avg ms/wait", $"{w.AvgMsPerWait:F1}"),
-                        ("Delta wait ms", $"{w.DeltaMs:N0}"),
-                        ("Delta tasks", $"{w.DeltaTasks:N0}")
-                    }
-                });
-            }
-            return context;
-        }
-
-        private static AlertContext? BuildLongRunningQueryContext(List<LongRunningQueryInfo> queries)
-        {
-            if (queries.Count == 0) return null;
-
-            var context = new AlertContext();
-            foreach (var q in queries.GetRange(0, Math.Min(3, queries.Count)))
-            {
-                var item = new AlertDetailItem
-                {
-                    Heading = $"Session #{q.SessionId} — {q.ElapsedSeconds / 60}m {q.ElapsedSeconds % 60}s",
-                    Fields = new()
-                };
-
-                if (!string.IsNullOrEmpty(q.DatabaseName))
-                    item.Fields.Add(("Database", q.DatabaseName));
-                if (!string.IsNullOrEmpty(q.QueryText))
-                    item.Fields.Add(("Query", TruncateText(q.QueryText)));
-                item.Fields.Add(("CPU Time", $"{q.CpuTimeMs:N0} ms"));
-                item.Fields.Add(("Reads", $"{q.Reads:N0}"));
-                item.Fields.Add(("Writes", $"{q.Writes:N0}"));
-                if (!string.IsNullOrEmpty(q.WaitType))
-                    item.Fields.Add(("Wait Type", q.WaitType));
-                if (q.BlockingSessionId.HasValue && q.BlockingSessionId.Value > 0)
-                    item.Fields.Add(("Blocked By", $"Session #{q.BlockingSessionId.Value}"));
-
-                context.Details.Add(item);
-            }
-            return context;
-        }
-
-        private static AlertContext? BuildTempDbSpaceContext(TempDbSpaceInfo tempDb)
-        {
-            var context = new AlertContext();
-            context.Details.Add(new AlertDetailItem
-            {
-                Heading = $"TempDB — {tempDb.UsedPercent:F0}% Used",
-                Fields = new()
-                {
-                    ("Total Reserved", $"{tempDb.TotalReservedMb:F0} MB"),
-                    ("Unallocated", $"{tempDb.UnallocatedMb:F0} MB"),
-                    ("User Objects", $"{tempDb.UserObjectReservedMb:F0} MB"),
-                    ("Internal Objects", $"{tempDb.InternalObjectReservedMb:F0} MB"),
-                    ("Version Store", $"{tempDb.VersionStoreReservedMb:F0} MB"),
-                    ("Top Consumer", tempDb.TopConsumerSessionId > 0
-                        ? $"Session #{tempDb.TopConsumerSessionId} ({tempDb.TopConsumerMb:F0} MB)"
-                        : "None")
-                }
-            });
-            return context;
-        }
-
-        private static AlertContext? BuildAnomalousJobContext(List<AnomalousJobInfo> jobs)
-        {
-            if (jobs.Count == 0) return null;
-
-            var context = new AlertContext();
-            foreach (var j in jobs.GetRange(0, Math.Min(3, jobs.Count)))
-            {
-                context.Details.Add(new AlertDetailItem
-                {
-                    Heading = j.JobName,
-                    Fields = new()
-                    {
-                        ("Current Duration", FormatDuration(j.CurrentDurationSeconds)),
-                        ("Avg Duration", FormatDuration(j.AvgDurationSeconds)),
-                        ("P95 Duration", FormatDuration(j.P95DurationSeconds)),
-                        ("% of Average", j.PercentOfAverage.HasValue ? $"{j.PercentOfAverage:F0}%" : "N/A"),
-                        ("Started", j.StartTime.ToString("yyyy-MM-dd HH:mm:ss"))
-                    }
-                });
-            }
-            return context;
-        }
-
-        private static string FormatDuration(long seconds)
-        {
-            if (seconds < 60) return $"{seconds}s";
-            if (seconds < 3600) return $"{seconds / 60}m {seconds % 60}s";
-            return $"{seconds / 3600}h {(seconds % 3600) / 60}m";
-        }
-
-        private void OpenPlanViewerButton_Click(object sender, RoutedEventArgs e)
-        {
-            EnsurePlanTabControlInitialized();
-            EmptyStatePanel.Visibility = Visibility.Collapsed;
-            ServerTabControl.Visibility = Visibility.Visible;
-            MainWindowPlanViewerTab.Visibility = Visibility.Visible;
-            if (MainWindowPlanViewerTab.IsSelected)
-            {
-                // Already on Plan Viewer — just add a new empty sub-tab
-                AddNewEmptyPlanSubTab();
-            }
-            else
-            {
-                MainWindowPlanViewerTab.IsSelected = true;
-                AddNewEmptyPlanSubTab();
-            }
-            Dispatcher.BeginInvoke(DispatcherPriority.Loaded, new Action(() => MainWindowPlanTabControl.Focus()));
-        }
-
-        private void MainWindowPlanViewerClose_Click(object sender, RoutedEventArgs e)
-        {
-            // Reset inner tab control so next open starts fresh
-            MainWindowPlanTabControl.Items.Clear();
-            _planTabControlInitialized = false;
-            MainWindowPlanViewerTab.Visibility = Visibility.Collapsed;
-            // Select first visible tab
-            foreach (TabItem item in ServerTabControl.Items)
-            {
-                if (item.Visibility == Visibility.Visible && item != MainWindowPlanViewerTab)
-                {
-                    item.IsSelected = true;
-                    break;
-                }
-            }
-        }
-
-        #region Main Window Plan Viewer
-
-        private const string LitePlanAddTabId = "__PLAN_ADD_TAB__";
-        private bool _planTabControlInitialized;
-
-        private void EnsurePlanTabControlInitialized()
-        {
-            if (_planTabControlInitialized) return;
-            _planTabControlInitialized = true;
-
-            // "+" tab at the end
-            var addTabHeader = new TextBlock
-            {
-                Text = "+",
-                FontSize = 14,
-                FontWeight = FontWeights.Bold,
-                VerticalAlignment = VerticalAlignment.Center,
-                ToolTip = "Open a new plan sub-tab"
-            };
-            var addTab = new TabItem
-            {
-                Header = addTabHeader,
-                Tag = LitePlanAddTabId,
-                Content = new Grid()
-            };
-            MainWindowPlanTabControl.Items.Add(addTab);
-
-            MainWindowPlanTabControl.SelectionChanged += (_, _) =>
-            {
-                if (MainWindowPlanTabControl.SelectedItem is TabItem { Tag: string t } && t == LitePlanAddTabId)
-                {
-                    var newSub = AddNewEmptyPlanSubTab();
-                    MainWindowPlanTabControl.SelectedItem = newSub;
-                }
-            };
-        }
-
-        /// <summary>
-        /// Adds a new empty "New Plan" sub-tab to the inner plan TabControl and selects it.
-        /// Returns the newly created sub-tab.
-        /// </summary>
-        private TabItem AddNewEmptyPlanSubTab()
-        {
-            EnsurePlanTabControlInitialized();
-
-            // --- Empty state layer ---
-            var emptyState = new Grid();
-            var dashedRect = new System.Windows.Shapes.Rectangle
-            {
-                Margin = new Thickness(24),
-                Stroke = (System.Windows.Media.Brush)FindResource("ForegroundMutedBrush"),
-                StrokeThickness = 1.5,
-                StrokeDashArray = new System.Windows.Media.DoubleCollection { 6, 4 },
-                RadiusX = 10, RadiusY = 10,
-                Opacity = 0.25
-            };
-            var emptyStack = new StackPanel { HorizontalAlignment = HorizontalAlignment.Center, VerticalAlignment = VerticalAlignment.Center };
-            emptyStack.Children.Add(new TextBlock
-            {
-                Text = "\uE896",
-                FontFamily = new System.Windows.Media.FontFamily("Segoe MDL2 Assets"),
-                FontSize = 52,
-                HorizontalAlignment = HorizontalAlignment.Center,
-                Foreground = (System.Windows.Media.Brush)FindResource("ForegroundMutedBrush"),
-                Opacity = 0.45,
-                Margin = new Thickness(0, 0, 0, 12)
-            });
-            emptyStack.Children.Add(new TextBlock
-            {
-                Text = "New Plan",
-                FontSize = 20,
-                FontWeight = FontWeights.Light,
-                Foreground = (System.Windows.Media.Brush)FindResource("ForegroundMutedBrush"),
-                HorizontalAlignment = HorizontalAlignment.Center
-            });
-            emptyStack.Children.Add(new TextBlock
-            {
-                Text = "Open or paste execution plan XML to render it",
-                FontSize = 13,
-                Foreground = (System.Windows.Media.Brush)FindResource("ForegroundMutedBrush"),
-                HorizontalAlignment = HorizontalAlignment.Center,
-                Margin = new Thickness(0, 8, 0, 0)
-            });
-            var btnPanel = new StackPanel { Orientation = Orientation.Horizontal, HorizontalAlignment = HorizontalAlignment.Center, Margin = new Thickness(0, 20, 0, 0) };
-            var openBtn = new Button { Content = "Open .sqlplan File", Height = 28, Padding = new Thickness(12, 0, 12, 0), ToolTip = "Open a .sqlplan or .xml file from disk" };
-            var pasteBtn = new Button { Content = "Paste XML", Height = 28, Padding = new Thickness(12, 0, 12, 0), Margin = new Thickness(8, 0, 0, 0), ToolTip = "Paste execution plan XML to render it (or use Ctrl+V)" };
-            btnPanel.Children.Add(openBtn);
-            btnPanel.Children.Add(pasteBtn);
-            emptyStack.Children.Add(btnPanel);
-            emptyStack.Children.Add(new TextBlock
-            {
-                Text = "or drag & drop a .sqlplan file anywhere in this area",
-                FontSize = 11,
-                Foreground = (System.Windows.Media.Brush)FindResource("ForegroundMutedBrush"),
-                HorizontalAlignment = HorizontalAlignment.Center,
-                Margin = new Thickness(0, 12, 0, 0)
-            });
-            emptyState.Children.Add(dashedRect);
-            emptyState.Children.Add(emptyStack);
-
-            // --- Viewer layer (hidden until a plan is loaded) ---
-            var viewer = new Controls.PlanViewerControl
-            {
-                Visibility = Visibility.Collapsed
-            };
-
-            // Sub-tab content grid: index 0 = emptyState, index 1 = viewer
-            var subTabContent = new Grid();
-            subTabContent.Children.Add(emptyState);
-            subTabContent.Children.Add(viewer);
-
-            // --- Sub-tab header: label + close button ---
-            var initialLabel = GetUniqueSubTabLabel("New Plan");
-            var labelBlock = new TextBlock
-            {
-                Text = initialLabel,
-                VerticalAlignment = VerticalAlignment.Center,
-                ToolTip = initialLabel
-            };
-            var subCloseBtn = new Button { Style = (Style)FindResource("TabCloseButton") };
-            var subTabHeader = new StackPanel { Orientation = Orientation.Horizontal };
-            subTabHeader.Children.Add(labelBlock);
-            subTabHeader.Children.Add(subCloseBtn);
-
-            var subTab = new TabItem { Header = subTabHeader, Content = subTabContent };
-
-            subCloseBtn.Tag = subTab;
-            subCloseBtn.Click += (_, _) =>
-            {
-                MainWindowPlanTabControl.Items.Remove(subTab);
-                // If only the "+" tab remains, open a fresh empty sub-tab
-                if (MainWindowPlanTabControl.Items.Count == 1 &&
-                    MainWindowPlanTabControl.Items[0] is TabItem { Tag: string t2 } && t2 == LitePlanAddTabId)
-                {
-                    AddNewEmptyPlanSubTab();
-                }
-            };
-
-            // Wire per-sub-tab buttons
-            openBtn.Click += (_, _) =>
-            {
-                var dialog = new Microsoft.Win32.OpenFileDialog
-                {
-                    Filter = "SQL Plan Files (*.sqlplan)|*.sqlplan|XML Files (*.xml)|*.xml|All Files (*.*)|*.*",
-                    DefaultExt = ".sqlplan",
-                    Multiselect = true
-                };
-                if (dialog.ShowDialog() != true) return;
-                var isFirst = true;
-                foreach (var fileName in dialog.FileNames)
-                {
-                    try
-                    {
-                        var xml = System.IO.File.ReadAllText(fileName);
-                        var targetTab = isFirst ? subTab : AddNewEmptyPlanSubTab();
-                        LoadPlanIntoSubTab(targetTab, xml, System.IO.Path.GetFileName(fileName));
-                    }
-                    catch (Exception ex)
-                    {
-                        MessageBox.Show($"Failed to open file:\n\n{ex.Message}", "Error",
-                            MessageBoxButton.OK, MessageBoxImage.Error);
-                    }
-                    isFirst = false;
-                }
-            };
-
-            pasteBtn.Click += (_, _) =>
-            {
-                var xml = Clipboard.GetText();
-                if (!string.IsNullOrWhiteSpace(xml))
-                {
-                    LoadPlanIntoSubTab(subTab, xml, "Pasted Plan");
-                    return;
-                }
-                MessageBox.Show("The clipboard does not contain any text.", "Paste Plan XML",
-                    MessageBoxButton.OK, MessageBoxImage.Information);
-            };
-
-            // Insert before "+" tab
-            var addTabIndex = -1;
-            for (var i = 0; i < MainWindowPlanTabControl.Items.Count; i++)
-            {
-                if (MainWindowPlanTabControl.Items[i] is TabItem { Tag: string t3 } && t3 == LitePlanAddTabId)
-                {
-                    addTabIndex = i;
-                    break;
-                }
-            }
-            if (addTabIndex >= 0)
-                MainWindowPlanTabControl.Items.Insert(addTabIndex, subTab);
-            else
-                MainWindowPlanTabControl.Items.Add(subTab);
-
-            MainWindowPlanTabControl.SelectedItem = subTab;
-            return subTab;
-        }
-
-        /// <summary>
-        /// Loads plan XML into an existing sub-tab (replacing whatever was there before).
-        /// </summary>
-        private void LoadPlanIntoSubTab(TabItem subTab, string planXml, string label, string? queryText = null)
-        {
-            try { System.Xml.Linq.XDocument.Parse(planXml); }
-            catch (System.Xml.XmlException ex)
-            {
-                MessageBox.Show(
-                    $"The plan XML is not valid:\n\n{ex.Message}",
-                    "Invalid Plan XML",
-                    MessageBoxButton.OK,
-                    MessageBoxImage.Warning);
-                return;
-            }
-
-            if (subTab.Content is not Grid subTabContent) return;
-            if (subTabContent.Children.Count < 2) return;
-
-            var emptyState = subTabContent.Children[0] as FrameworkElement;
-            var viewer = subTabContent.Children[1] as Controls.PlanViewerControl;
-            if (viewer == null) return;
-
-            viewer.LoadPlan(planXml, label, queryText);
-            emptyState!.Visibility = Visibility.Collapsed;
-            viewer.Visibility = Visibility.Visible;
-
-            var uniqueLabel = GetUniqueSubTabLabel(label);
-            if (subTab.Header is StackPanel headerPanel &&
-                headerPanel.Children[0] is TextBlock headerLabel)
-            {
-                headerLabel.Text = uniqueLabel.Length > 30 ? uniqueLabel[..30] + "\u2026" : uniqueLabel;
-                headerLabel.ToolTip = uniqueLabel;
-            }
-        }
-
-        /// <summary>
-        /// Returns a label that is unique among current inner plan sub-tab headers.
-        /// If <paramref name="baseLabel"/> is already taken, appends " (1)", " (2)", …
-        /// </summary>
-        private string GetUniqueSubTabLabel(string baseLabel)
-        {
-            var existing = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
-            foreach (var item in MainWindowPlanTabControl.Items)
-            {
-                if (item is TabItem { Tag: string t } && t == LitePlanAddTabId) continue;
-                if (item is TabItem subTab &&
-                    subTab.Header is StackPanel sp &&
-                    sp.Children[0] is TextBlock tb)
-                    existing.Add(tb.ToolTip as string ?? tb.Text);
-            }
-            if (!existing.Contains(baseLabel)) return baseLabel;
-            var counter = 1;
-            string candidate;
-            do { candidate = $"{baseLabel} ({counter++})"; }
-            while (existing.Contains(candidate));
-            return candidate;
-        }
-
-        /// <summary>
-        /// Returns the currently active real plan sub-tab (skips the "+" tab).
-        /// </summary>
-        private TabItem? GetActivePlanSubTab()
-        {
-            if (MainWindowPlanTabControl.SelectedItem is TabItem { Tag: string t } && t == LitePlanAddTabId)
-                return null;
-            return MainWindowPlanTabControl.SelectedItem as TabItem;
-        }
-
-        private void MainWindowPlanViewer_DragOver(object sender, DragEventArgs e)
-        {
-            if (e.Data.GetDataPresent(DataFormats.FileDrop))
-            {
-                var files = e.Data.GetData(DataFormats.FileDrop) as string[];
-                if (files?.Any(IsPlanFile) == true)
-                {
-                    e.Effects = DragDropEffects.Copy;
-                    e.Handled = true;
-                    return;
-                }
-            }
-            e.Effects = DragDropEffects.None;
-            e.Handled = true;
-        }
-
-        private void MainWindowPlanViewer_Drop(object sender, DragEventArgs e)
-        {
-            if (!e.Data.GetDataPresent(DataFormats.FileDrop)) return;
-            var planFiles = (e.Data.GetData(DataFormats.FileDrop) as string[])
-                ?.Where(IsPlanFile).ToArray();
-            if (planFiles == null || planFiles.Length == 0) return;
-            LoadMainWindowPlanFromFileIntoActiveTab(planFiles[0]);
-            for (var i = 1; i < planFiles.Length; i++)
-            {
-                var newTab = AddNewEmptyPlanSubTab();
-                try
-                {
-                    var xml = System.IO.File.ReadAllText(planFiles[i]);
-                    LoadPlanIntoSubTab(newTab, xml, System.IO.Path.GetFileName(planFiles[i]));
-                }
-                catch (Exception ex)
-                {
-                    MessageBox.Show($"Failed to load plan file:\n{ex.Message}", "Load Error",
-                        MessageBoxButton.OK, MessageBoxImage.Error);
-                }
-            }
-        }
-
-        private void MainWindowPlanViewer_KeyDown(object sender, System.Windows.Input.KeyEventArgs e)
-        {
-            if (e.Key == System.Windows.Input.Key.V &&
-                System.Windows.Input.Keyboard.Modifiers == System.Windows.Input.ModifierKeys.Control &&
-                e.OriginalSource is not System.Windows.Controls.TextBox)
-            {
-                var xml = Clipboard.GetText();
-                if (!string.IsNullOrWhiteSpace(xml))
-                {
-                    e.Handled = true;
-                    LoadPlanIntoActivePlanSubTab(xml, "Pasted Plan");
-                }
-            }
-        }
-
-        private void LoadMainWindowPlanFromFileIntoActiveTab(string path)
-        {
-            try
-            {
-                var xml = System.IO.File.ReadAllText(path);
-                LoadPlanIntoActivePlanSubTab(xml, System.IO.Path.GetFileName(path));
-            }
-            catch (Exception ex)
-            {
-                MessageBox.Show($"Failed to load plan file:\n{ex.Message}", "Load Error",
-                    MessageBoxButton.OK, MessageBoxImage.Error);
-            }
-        }
-
-        private void LoadPlanIntoActivePlanSubTab(string planXml, string label)
-        {
-            var activeSubTab = GetActivePlanSubTab();
-            if (activeSubTab != null)
-                LoadPlanIntoSubTab(activeSubTab, planXml, label);
-        }
-
-        private static bool IsPlanFile(string path)
-        {
-            var ext = System.IO.Path.GetExtension(path);
-            return string.Equals(ext, ".sqlplan", StringComparison.OrdinalIgnoreCase)
-                || string.Equals(ext, ".xml", StringComparison.OrdinalIgnoreCase);
-        }
-
-        #endregion
-    }
+/*
+ * Copyright (c) 2026 Erik Darling, Darling Data LLC
+ *
+ * This file is part of the SQL Server Performance Monitor Lite.
+ *
+ * Licensed under the MIT License. See LICENSE file in the project root for full license information.
+ */
+
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using System.Linq;
+using System.Xml.Linq;
+using System.Net;
+using System.Threading;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Input;
+using System.Windows.Threading;
+using PerformanceMonitorLite.Controls;
+using PerformanceMonitorLite.Database;
+using PerformanceMonitorLite.Mcp;
+using PerformanceMonitorLite.Models;
+using PerformanceMonitorLite.Services;
+using PerformanceMonitorLite.Windows;
+
+namespace PerformanceMonitorLite;
+
+public partial class MainWindow : Window
+{
+    private readonly DuckDbInitializer _databaseInitializer;
+    private readonly ServerManager _serverManager;
+    private readonly ScheduleManager _scheduleManager;
+    private RemoteCollectorService? _collectorService;
+    private CollectionBackgroundService? _backgroundService;
+    private CancellationTokenSource? _backgroundCts;
+    private SystemTrayService? _trayService;
+    private readonly Dictionary<string, TabItem> _openServerTabs = new();
+    private readonly Dictionary<string, bool> _previousConnectionStates = new();
+    private readonly Dictionary<string, bool> _previousCollectorErrorStates = new();
+    private readonly Dictionary<string, DateTime> _lastCpuAlert = new();
+    private readonly Dictionary<string, DateTime> _lastBlockingAlert = new();
+    private readonly Dictionary<string, DateTime> _lastDeadlockAlert = new();
+    private readonly Dictionary<string, DateTime> _lastPoisonWaitAlert = new();
+    private readonly Dictionary<string, DateTime> _lastLongRunningQueryAlert = new();
+    private readonly Dictionary<string, DateTime> _lastTempDbSpaceAlert = new();
+    private readonly Dictionary<string, DateTime> _lastLongRunningJobAlert = new();
+    private readonly DispatcherTimer _statusTimer;
+    private LocalDataService? _dataService;
+    private McpHostService? _mcpService;
+    private readonly AlertStateService _alertStateService = new();
+    private readonly MuteRuleService _muteRuleService;
+    private EmailAlertService _emailAlertService;
+
+    /* Track active alert states for resolved notifications */
+    private readonly Dictionary<string, bool> _activeCpuAlert = new();
+    private readonly Dictionary<string, bool> _activeBlockingAlert = new();
+    private readonly Dictionary<string, bool> _activeDeadlockAlert = new();
+    private readonly Dictionary<string, bool> _activePoisonWaitAlert = new();
+    private readonly Dictionary<string, bool> _activeLongRunningQueryAlert = new();
+    private readonly Dictionary<string, bool> _activeTempDbSpaceAlert = new();
+    private readonly Dictionary<string, bool> _activeLongRunningJobAlert = new();
+
+    public MainWindow()
+    {
+        InitializeComponent();
+
+        // Initialize services (with loggers wired to AppLogger)
+        _databaseInitializer = new DuckDbInitializer(App.DatabasePath, new AppLoggerAdapter<DuckDbInitializer>());
+        _emailAlertService = new EmailAlertService(_databaseInitializer);
+        _muteRuleService = new MuteRuleService(_databaseInitializer);
+        _serverManager = new ServerManager(App.ConfigDirectory, logger: new AppLoggerAdapter<ServerManager>());
+        _scheduleManager = new ScheduleManager(App.ConfigDirectory);
+
+        // Status bar update timer
+        _statusTimer = new DispatcherTimer { Interval = TimeSpan.FromSeconds(30) };
+        _statusTimer.Tick += async (s, e) =>
+        {
+            UpdateStatusBar();
+            await RefreshOverviewAsync();
+            CheckConnectionsAndNotify();
+
+            /* Auto-refresh alert history if the tab is active */
+            if (ServerTabControl.SelectedItem == AlertsTab)
+                AlertsHistoryContent.RefreshAlerts();
+        };
+
+        // Initialize database and UI
+        Loaded += MainWindow_Loaded;
+        Closing += MainWindow_Closing;
+        ServerTabControl.SelectionChanged += ServerTabControl_SelectionChanged;
+    }
+
+    private async void MainWindow_Loaded(object sender, RoutedEventArgs e)
+    {
+        try
+        {
+            StatusText.Text = "Initializing database...";
+
+            // Initialize the DuckDB database
+            await _databaseInitializer.InitializeAsync();
+
+            // Initialize the collection engine (with loggers wired to AppLogger)
+            _collectorService = new RemoteCollectorService(
+                _databaseInitializer,
+                _serverManager,
+                _scheduleManager,
+                new AppLoggerAdapter<RemoteCollectorService>());
+
+            var archiveService = new ArchiveService(_databaseInitializer, App.ArchiveDirectory, new AppLoggerAdapter<ArchiveService>());
+            var retentionService = new RetentionService(App.ArchiveDirectory, new AppLoggerAdapter<RetentionService>());
+
+            _backgroundService = new CollectionBackgroundService(
+                _collectorService, _databaseInitializer, archiveService, retentionService, _serverManager,
+                new AppLoggerAdapter<CollectionBackgroundService>());
+
+            // Start background collection
+            _backgroundCts = new CancellationTokenSource();
+            _ = _backgroundService.StartAsync(_backgroundCts.Token);
+
+            // Initialize system tray
+            _trayService = new SystemTrayService(this, _backgroundService);
+            _trayService.Initialize();
+
+            // Initialize data service for overview
+            _dataService = new LocalDataService(_databaseInitializer);
+
+            // Load mute rules from database
+            await _muteRuleService.LoadAsync();
+
+            // Initialize alerts history tab
+            AlertsHistoryContent.Initialize(_dataService);
+            AlertsHistoryContent.MuteRuleService = _muteRuleService;
+
+            // Initialize FinOps tab
+            FinOpsContent.Initialize(_dataService, _serverManager);
+
+            // Start MCP server if enabled
+            await StartMcpServerAsync();
+
+            // Load servers
+            RefreshServerList();
+
+            // Update status
+            UpdateStatusBar();
+            _statusTimer.Start();
+
+            await RefreshOverviewAsync();
+            StatusText.Text = "Ready - Collection active";
+
+            _ = CheckForUpdatesOnStartupAsync();
+        }
+        catch (Exception ex)
+        {
+            StatusText.Text = $"Error: {ex.Message}";
+            MessageBox.Show(
+                $"Failed to initialize the application:\n\n{ex.Message}",
+                "Initialization Error",
+                MessageBoxButton.OK,
+                MessageBoxImage.Error);
+        }
+    }
+
+    private async Task CheckForUpdatesOnStartupAsync()
+    {
+        try
+        {
+            if (!App.CheckForUpdatesOnStartup) return;
+
+            var result = await UpdateCheckService.CheckForUpdateAsync();
+            if (result?.IsUpdateAvailable == true)
+            {
+                var answer = MessageBox.Show(
+                    $"Performance Monitor {result.LatestVersion} is available (you have {result.CurrentVersion}).\n\nWould you like to open the download page?",
+                    "Update Available",
+                    MessageBoxButton.YesNo,
+                    MessageBoxImage.Information);
+
+                if (answer == MessageBoxResult.Yes)
+                {
+                    System.Diagnostics.Process.Start(new System.Diagnostics.ProcessStartInfo
+                    {
+                        FileName = result.ReleaseUrl,
+                        UseShellExecute = true
+                    });
+                }
+            }
+        }
+        catch
+        {
+            // Never crash on update check failure
+        }
+    }
+
+    private async void MainWindow_Closing(object? sender, System.ComponentModel.CancelEventArgs e)
+    {
+        // Dispose system tray
+        _trayService?.Dispose();
+
+        // Stop background collection with timeout
+        _backgroundCts?.Cancel();
+
+        await StopMcpServerAsync();
+
+        if (_backgroundService != null)
+        {
+            try
+            {
+                using var shutdownCts = new CancellationTokenSource(TimeSpan.FromSeconds(5));
+                await _backgroundService.StopAsync(shutdownCts.Token);
+            }
+            catch (OperationCanceledException)
+            {
+                /* Shutdown timed out, proceeding anyway */
+            }
+        }
+
+        // Stop all server tab refresh timers
+        foreach (var tab in _openServerTabs.Values)
+        {
+            if (tab.Content is ServerTab serverTab)
+            {
+                serverTab.StopRefresh();
+            }
+        }
+
+        _statusTimer.Stop();
+    }
+
+    private void ServerTabControl_SelectionChanged(object sender, SelectionChangedEventArgs e)
+    {
+        // Only respond to tab selection changes, not child control selection events that bubble up
+        if (e.OriginalSource != ServerTabControl) return;
+
+        /* Restore the selected tab's UTC offset so charts use the correct server timezone */
+        if (ServerTabControl.SelectedItem is TabItem { Content: ServerTab serverTab })
+        {
+            ServerTimeHelper.UtcOffsetMinutes = serverTab.UtcOffsetMinutes;
+            StatusText.Text = $"Connected to {serverTab.Server.DisplayNameWithIntent}";
+        }
+
+        /* Refresh alerts tab when selected */
+        if (ServerTabControl.SelectedItem == AlertsTab)
+        {
+            AlertsHistoryContent.RefreshAlerts();
+        }
+
+        UpdateCollectorHealth();
+    }
+
+    private async Task StartMcpServerAsync()
+    {
+        var mcpSettings = McpSettings.Load(App.ConfigDirectory);
+        if (!mcpSettings.Enabled) return;
+
+        try
+        {
+            bool portInUse = await PortUtilityService.IsTcpPortListeningAsync(mcpSettings.Port, IPAddress.Loopback);
+            if (portInUse)
+            {
+                AppLogger.Error("MCP", $"Port {mcpSettings.Port} is already in use — MCP server not started");
+                return;
+            }
+
+            _mcpService = new McpHostService(_dataService!, _serverManager, _muteRuleService, _databaseInitializer, mcpSettings.Port);
+            _ = _mcpService.StartAsync(_backgroundCts!.Token);
+        }
+        catch (Exception ex)
+        {
+            AppLogger.Error("MCP", $"Failed to start MCP server: {ex.Message}");
+        }
+    }
+
+    private async Task StopMcpServerAsync()
+    {
+        if (_mcpService != null)
+        {
+            try
+            {
+                using var shutdownCts = new CancellationTokenSource(TimeSpan.FromSeconds(5));
+                await _mcpService.StopAsync(shutdownCts.Token);
+            }
+            catch (OperationCanceledException)
+            {
+                /* MCP shutdown timed out */
+            }
+            _mcpService = null;
+        }
+    }
+
+    private void RefreshServerList()
+    {
+        var servers = _serverManager.GetAllServers();
+        foreach (var server in servers)
+        {
+            server.IsOnline = _serverManager.GetConnectionStatus(server.Id).IsOnline;
+            server.HasCollectorErrors = _collectorService != null
+                && server.IsOnline == true
+                && _collectorService.GetHealthSummary(server).ErroringCollectors > 0;
+        }
+        ServerListView.ItemsSource = servers;
+
+        // Update UI based on server count
+        if (servers.Count == 0 && _openServerTabs.Count == 0)
+        {
+            EmptyStatePanel.Visibility = Visibility.Visible;
+            ServerTabControl.Visibility = Visibility.Collapsed;
+        }
+        else
+        {
+            EmptyStatePanel.Visibility = Visibility.Collapsed;
+            ServerTabControl.Visibility = Visibility.Visible;
+        }
+
+        ServerCountText.Text = $"Servers: {servers.Count}";
+
+        // Refresh FinOps server dropdown when server list changes
+        FinOpsContent.RefreshServerList();
+
+        // Refresh overview when server list changes
+        _ = RefreshOverviewAsync();
+    }
+
+    private void UpdateStatusBar()
+    {
+        // Update database size
+        var fileSizeMb = _databaseInitializer.GetDatabaseSizeMb();
+        var usedSizeMb = _databaseInitializer.GetUsedDataSizeMb();
+        if (fileSizeMb > 0)
+        {
+            DatabaseSizeText.Text = usedSizeMb.HasValue
+                ? $"Database: {usedSizeMb.Value:F1} / {fileSizeMb:F1} MB"
+                : $"Database: {fileSizeMb:F1} MB";
+        }
+        else
+        {
+            DatabaseSizeText.Text = "Database: New";
+        }
+
+        // Update collection status
+        if (_backgroundService != null)
+        {
+            if (_backgroundService.IsCollecting)
+            {
+                CollectionStatusText.Text = "Collection: Running";
+            }
+            else if (_backgroundService.IsPaused)
+            {
+                CollectionStatusText.Text = "Collection: Paused";
+            }
+            else if (_backgroundService.LastCollectionTime.HasValue)
+            {
+                var ago = DateTime.UtcNow - _backgroundService.LastCollectionTime.Value;
+                CollectionStatusText.Text = $"Collection: {ago.TotalSeconds:F0}s ago";
+            }
+            else
+            {
+                CollectionStatusText.Text = "Collection: Starting...";
+            }
+        }
+        else
+        {
+            CollectionStatusText.Text = "Collection: Stopped";
+        }
+
+        // Update collector health
+        UpdateCollectorHealth();
+    }
+
+    private void UpdateCollectorHealth()
+    {
+        if (_collectorService == null)
+        {
+            CollectorHealthText.Text = "";
+            return;
+        }
+
+        int? selectedServerId = null;
+        if (ServerTabControl.SelectedItem is TabItem { Content: ServerTab serverTab })
+        {
+            selectedServerId = serverTab.ServerId;
+        }
+
+        var health = _collectorService.GetHealthSummary(selectedServerId);
+
+        if (health.TotalCollectors == 0)
+        {
+            CollectorHealthText.Text = "";
+            return;
+        }
+
+        if (health.LoggingFailures > 0)
+        {
+            CollectorHealthText.Text = $"Logging: BROKEN ({health.LoggingFailures} failures)";
+            CollectorHealthText.Foreground = System.Windows.Media.Brushes.Red;
+            CollectorHealthText.ToolTip = $"collection_log INSERT is failing.\nThis means collector errors are invisible.\nCheck the log file for details.";
+        }
+        else if (health.ErroringCollectors > 0)
+        {
+            var names = string.Join(", ", health.Errors.Select(e => e.CollectorName));
+            CollectorHealthText.Text = $"Collectors: {health.ErroringCollectors} erroring";
+            CollectorHealthText.Foreground = System.Windows.Media.Brushes.OrangeRed;
+            CollectorHealthText.ToolTip = $"Failing: {names}\n\n" +
+                string.Join("\n", health.Errors.Select(e =>
+                    $"{e.CollectorName}: {e.ConsecutiveErrors}x consecutive - {e.LastErrorMessage}"));
+        }
+        else
+        {
+            CollectorHealthText.Text = $"Collectors: {health.TotalCollectors} OK";
+            CollectorHealthText.Foreground = (System.Windows.Media.Brush)FindResource("ForegroundBrush");
+            CollectorHealthText.ToolTip = null;
+        }
+    }
+
+    private async Task RefreshOverviewAsync()
+    {
+        if (_dataService == null) return;
+
+        var servers = _serverManager.GetAllServers();
+        if (servers.Count == 0) return;
+
+        try
+        {
+            var summaries = new List<ServerSummaryItem>();
+            foreach (var server in servers)
+            {
+                try
+                {
+                    var serverId = RemoteCollectorService.GetDeterministicHashCode(RemoteCollectorService.GetServerNameForStorage(server));
+                    var summary = await _dataService.GetServerSummaryAsync(serverId, server.DisplayNameWithIntent);
+                    if (summary != null)
+                    {
+                        summary.ServerName = server.ServerName;
+                        var connStatus = _serverManager.GetConnectionStatus(server.Id);
+                        summary.IsOnline = connStatus.IsOnline;
+                        if (_collectorService != null && connStatus.IsOnline == true)
+                            summary.HasCollectorErrors = _collectorService.GetHealthSummary(server).ErroringCollectors > 0;
+                        summaries.Add(summary);
+                    }
+                }
+                catch (Exception ex)
+                {
+                    AppLogger.Info("Overview", $"Failed to get summary for {server.DisplayName}: {ex.Message}");
+                }
+            }
+
+            OverviewItemsControl.ItemsSource = summaries;
+
+            foreach (var summary in summaries)
+            {
+                CheckPerformanceAlerts(summary);
+            }
+        }
+        catch (Exception ex)
+        {
+            AppLogger.Info("Overview", $"RefreshOverviewAsync failed: {ex.Message}");
+        }
+    }
+
+    private void ServerListView_MouseDoubleClick(object sender, MouseButtonEventArgs e)
+    {
+        if (ServerListView.SelectedItem is ServerConnection server)
+        {
+            ConnectToServer(server);
+        }
+    }
+
+    private void OverviewCard_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
+    {
+        if (e.ClickCount == 2 && sender is FrameworkElement fe && fe.DataContext is ServerSummaryItem summary)
+        {
+            var server = _serverManager.GetAllServers()
+                .FirstOrDefault(s => s.ServerName == summary.ServerName);
+            if (server != null)
+            {
+                ConnectToServer(server);
+            }
+        }
+    }
+
+    private async void ConnectToServer(ServerConnection server)
+    {
+        // Check if tab already open
+        if (_openServerTabs.TryGetValue(server.Id, out var existingTab))
+        {
+            ServerTabControl.SelectedItem = existingTab;
+            return;
+        }
+
+        // Clear MFA cancellation flag when user explicitly connects
+        // This gives them a fresh attempt at authentication
+        var currentStatus = _serverManager.GetConnectionStatus(server.Id);
+        if (server.AuthenticationType == AuthenticationTypes.EntraMFA && currentStatus.UserCancelledMfa)
+        {
+            currentStatus.UserCancelledMfa = false;
+            StatusText.Text = "Retrying MFA authentication...";
+        }
+
+        // Ensure connection status is populated with UTC offset before opening tab
+        // This is critical for timezone-correct chart display
+        var status = _serverManager.GetConnectionStatus(server.Id);
+        if (!status.UtcOffsetMinutes.HasValue)
+        {
+            StatusText.Text = "Checking server connection...";
+            // Allow interactive auth (MFA) when user explicitly opens a server
+            status = await _serverManager.CheckConnectionAsync(server.Id, allowInteractiveAuth: true);
+        }
+
+        var utcOffset = status.UtcOffsetMinutes ?? 0;
+        var serverTab = new ServerTab(server, _databaseInitializer, _serverManager.CredentialService, utcOffset);
+        var tabHeader = CreateTabHeader(server);
+        var tabItem = new TabItem
+        {
+            Header = tabHeader,
+            Content = serverTab
+        };
+
+        /* Subscribe to alert counts for badge updates */
+        var serverId = server.Id;
+        serverTab.AlertCountsChanged += (blockingCount, deadlockCount, latestEventTime) =>
+        {
+            Dispatcher.Invoke(() => UpdateTabBadge(tabHeader, serverId, blockingCount, deadlockCount, latestEventTime));
+        };
+
+        /* Subscribe to "Apply to All" time range propagation */
+        serverTab.ApplyTimeRangeRequested += (selectedIndex) =>
+        {
+            Dispatcher.Invoke(() =>
+            {
+                foreach (var tab in _openServerTabs.Values)
+                {
+                    if (tab.Content is ServerTab st && st != serverTab)
+                    {
+                        st.SetTimeRangeIndex(selectedIndex);
+                    }
+                }
+            });
+        };
+
+        /* Re-collect on-load data (config, trace flags) when refresh button is clicked */
+        serverTab.ManualRefreshRequested += async () =>
+        {
+            if (_collectorService != null)
+            {
+                var onLoadCollectors = _scheduleManager.GetOnLoadCollectors();
+                foreach (var collector in onLoadCollectors)
+                {
+                    try
+                    {
+                        await _collectorService.RunCollectorAsync(server, collector.Name);
+                    }
+                    catch (Exception ex)
+                    {
+                        AppLogger.Info("MainWindow", $"Re-collection of {collector.Name} failed: {ex.Message}");
+                    }
+                }
+            }
+        };
+
+        _openServerTabs[server.Id] = tabItem;
+        ServerTabControl.Items.Add(tabItem);
+        ServerTabControl.SelectedItem = tabItem;
+
+        // Show the tab control, hide empty state
+        EmptyStatePanel.Visibility = Visibility.Collapsed;
+        ServerTabControl.Visibility = Visibility.Visible;
+
+        _serverManager.UpdateLastConnected(server.Id);
+
+        // Show existing historical data immediately
+        serverTab.RefreshData();
+
+        // Then collect fresh data and refresh again
+        if (_collectorService != null)
+        {
+            StatusText.Text = $"Collecting data from {server.DisplayNameWithIntent}...";
+            try
+            {
+                await _collectorService.RunAllCollectorsForServerAsync(server);
+                StatusText.Text = $"Connected to {server.DisplayNameWithIntent} - Data loaded";
+                serverTab.RefreshData();
+                UpdateCollectorHealth();
+                _ = RefreshOverviewAsync();
+            }
+            catch (Exception ex)
+            {
+                StatusText.Text = $"Connected to {server.DisplayNameWithIntent} - Collection error: {ex.Message}";
+            }
+        }
+        else
+        {
+            StatusText.Text = $"Connected to {server.DisplayNameWithIntent}";
+        }
+    }
+
+    private StackPanel CreateTabHeader(ServerConnection server)
+    {
+        var panel = new StackPanel { Orientation = Orientation.Horizontal };
+
+        var tabLabel = server.ReadOnlyIntent ? $"{server.DisplayName} (RO)" : server.DisplayName;
+        panel.Children.Add(new TextBlock
+        {
+            Text = tabLabel,
+            VerticalAlignment = VerticalAlignment.Center,
+            Margin = new Thickness(0, 0, 4, 0)
+        });
+
+        /* Alert badge - hidden by default, shown when blocking/deadlocks detected */
+        var badge = new System.Windows.Controls.Border
+        {
+            Background = System.Windows.Media.Brushes.OrangeRed,
+            CornerRadius = new CornerRadius(7),
+            Padding = new Thickness(5, 1, 5, 1),
+            Margin = new Thickness(0, 0, 4, 0),
+            VerticalAlignment = VerticalAlignment.Center,
+            Visibility = Visibility.Collapsed,
+            Child = new TextBlock
+            {
+                FontSize = 10,
+                FontWeight = FontWeights.Bold,
+                Foreground = System.Windows.Media.Brushes.White,
+                VerticalAlignment = VerticalAlignment.Center
+            }
+        };
+        badge.Tag = "AlertBadge";
+
+        /* Add context menu to badge for acknowledge/silence functionality */
+        var serverId = server.Id;
+        var contextMenu = new ContextMenu();
+
+        var acknowledgeItem = new MenuItem
+        {
+            Header = "Acknowledge Alert",
+            Tag = serverId,
+            Icon = new TextBlock { Text = "✓", FontWeight = FontWeights.Bold }
+        };
+        acknowledgeItem.Click += AcknowledgeServerAlert_Click;
+
+        var silenceItem = new MenuItem
+        {
+            Header = "Silence This Server",
+            Tag = serverId,
+            Icon = new TextBlock { Text = "🔇" }
+        };
+        silenceItem.Click += SilenceServer_Click;
+
+        var unsilenceItem = new MenuItem
+        {
+            Header = "Unsilence",
+            Tag = serverId,
+            Icon = new TextBlock { Text = "🔔" }
+        };
+        unsilenceItem.Click += UnsilenceServer_Click;
+
+        contextMenu.Items.Add(acknowledgeItem);
+        contextMenu.Items.Add(silenceItem);
+        contextMenu.Items.Add(new Separator());
+        contextMenu.Items.Add(unsilenceItem);
+
+        /* Update menu items based on state when opened */
+        contextMenu.Opened += (s, args) =>
+        {
+            var isSilenced = _alertStateService.IsServerSilenced(serverId);
+            var hasAlert = badge.Visibility == Visibility.Visible;
+
+            acknowledgeItem.IsEnabled = hasAlert;
+            silenceItem.IsEnabled = !isSilenced;
+            unsilenceItem.IsEnabled = isSilenced;
+        };
+
+        badge.ContextMenu = contextMenu;
+        panel.Children.Add(badge);
+
+        var closeButton = new Button
+        {
+            Content = "x",
+            FontSize = 10,
+            Padding = new Thickness(4, 0, 4, 0),
+            VerticalAlignment = VerticalAlignment.Center,
+            Cursor = Cursors.Hand
+        };
+        closeButton.Click += (s, e) => CloseServerTab(server.Id);
+        panel.Children.Add(closeButton);
+
+        return panel;
+    }
+
+    private void UpdateTabBadge(StackPanel tabHeader, string serverId, int blockingCount, int deadlockCount, DateTime? latestEventTime)
+    {
+        var totalAlerts = blockingCount + deadlockCount;
+
+        /* Delegate count tracking and acknowledgement clearing to AlertStateService.
+           Uses latestEventTime to only clear ack when genuinely new events arrive,
+           not when the user just switches time ranges. */
+        bool shouldShow = _alertStateService.UpdateAlertCounts(serverId, blockingCount, deadlockCount, latestEventTime);
+
+        foreach (var child in tabHeader.Children)
+        {
+            if (child is System.Windows.Controls.Border border && border.Tag as string == "AlertBadge")
+            {
+                if (shouldShow)
+                {
+                    border.Visibility = Visibility.Visible;
+                    border.Background = deadlockCount > 0
+                        ? System.Windows.Media.Brushes.Red
+                        : System.Windows.Media.Brushes.OrangeRed;
+
+                    if (border.Child is TextBlock text)
+                    {
+                        text.Text = totalAlerts > 99 ? "99+" : totalAlerts.ToString();
+                        text.ToolTip = $"Blocking: {blockingCount}, Deadlocks: {deadlockCount}\nRight-click to dismiss";
+                    }
+                }
+                else
+                {
+                    border.Visibility = Visibility.Collapsed;
+                }
+                break;
+            }
+        }
+    }
+
+    private void AcknowledgeServerAlert_Click(object sender, RoutedEventArgs e)
+    {
+        if (sender is MenuItem menuItem && menuItem.Tag is string serverId)
+        {
+            _alertStateService.AcknowledgeAlert(serverId);
+
+            /* Find and hide the badge for this server */
+            if (_openServerTabs.TryGetValue(serverId, out var tab) && tab.Header is StackPanel panel)
+            {
+                foreach (var child in panel.Children)
+                {
+                    if (child is System.Windows.Controls.Border border && border.Tag as string == "AlertBadge")
+                    {
+                        border.Visibility = Visibility.Collapsed;
+                        break;
+                    }
+                }
+            }
+        }
+    }
+
+    private void SilenceServer_Click(object sender, RoutedEventArgs e)
+    {
+        if (sender is MenuItem menuItem && menuItem.Tag is string serverId)
+        {
+            _alertStateService.SilenceServer(serverId);
+
+            /* Find and hide the badge for this server */
+            if (_openServerTabs.TryGetValue(serverId, out var tab) && tab.Header is StackPanel panel)
+            {
+                foreach (var child in panel.Children)
+                {
+                    if (child is System.Windows.Controls.Border border && border.Tag as string == "AlertBadge")
+                    {
+                        border.Visibility = Visibility.Collapsed;
+                        break;
+                    }
+                }
+            }
+        }
+    }
+
+    private void UnsilenceServer_Click(object sender, RoutedEventArgs e)
+    {
+        if (sender is MenuItem menuItem && menuItem.Tag is string serverId)
+        {
+            _alertStateService.UnsilenceServer(serverId);
+
+            /* The next refresh cycle will show the badge if there are alerts */
+        }
+    }
+
+    private void CloseServerTab(string serverId)
+    {
+        if (_openServerTabs.TryGetValue(serverId, out var tab))
+        {
+            if (tab.Content is ServerTab serverTab)
+            {
+                serverTab.StopRefresh();
+            }
+
+            ServerTabControl.Items.Remove(tab);
+            _openServerTabs.Remove(serverId);
+
+            /* Clean up alert state for this server */
+            _alertStateService.RemoveServerState(serverId);
+
+            // Show empty state if no tabs open
+            if (_openServerTabs.Count == 0)
+            {
+                var servers = _serverManager.GetAllServers();
+                if (servers.Count == 0)
+                {
+                    EmptyStatePanel.Visibility = Visibility.Visible;
+                    ServerTabControl.Visibility = Visibility.Collapsed;
+                }
+            }
+        }
+    }
+
+    private void AddServerButton_Click(object sender, RoutedEventArgs e)
+    {
+        var dialog = new AddServerDialog(_serverManager) { Owner = this };
+        if (dialog.ShowDialog() == true && dialog.AddedServer != null)
+        {
+            RefreshServerList();
+            StatusText.Text = $"Added server: {dialog.AddedServer.DisplayNameWithIntent}";
+        }
+    }
+
+    private void ManageServersButton_Click(object sender, RoutedEventArgs e)
+    {
+        var window = new ManageServersWindow(_serverManager) { Owner = this };
+        window.ShowDialog();
+
+        if (window.ServersChanged)
+        {
+            RefreshServerList();
+        }
+    }
+
+    private async void SettingsButton_Click(object sender, RoutedEventArgs e)
+    {
+        var window = new SettingsWindow(_scheduleManager, _backgroundService, _mcpService, _muteRuleService) { Owner = this };
+        window.ShowDialog();
+        UpdateStatusBar();
+
+        if (window.McpSettingsChanged)
+        {
+            await StopMcpServerAsync();
+            await StartMcpServerAsync();
+        }
+    }
+
+    private void AboutButton_Click(object sender, RoutedEventArgs e)
+    {
+        var window = new Windows.AboutWindow { Owner = this };
+        window.ShowDialog();
+    }
+
+    private void ImportConnectionsButton_Click(object sender, RoutedEventArgs e)
+    {
+        var dialog = new Microsoft.Win32.OpenFolderDialog
+        {
+            Title = "Select Previous Lite Install Folder"
+        };
+
+        if (dialog.ShowDialog() != true) return;
+
+        var serversJsonPath = System.IO.Path.Combine(dialog.FolderName, "config", "servers.json");
+        if (!System.IO.File.Exists(serversJsonPath))
+        {
+            MessageBox.Show(
+                "No config\\servers.json found in the selected folder.\n\nSelect the root folder of a previous Lite installation.",
+                "Import Connections",
+                MessageBoxButton.OK,
+                MessageBoxImage.Warning);
+            return;
+        }
+
+        try
+        {
+            var (imported, skipped) = _serverManager.ImportServersFromFile(serversJsonPath);
+
+            var message = $"Imported {imported} server connection(s).";
+            if (skipped > 0)
+                message += $"\nSkipped {skipped} duplicate(s) (already configured).";
+            if (imported > 0)
+                message += "\n\nCredentials from the previous install are preserved.\nIf any connections fail to authenticate, re-enter the password in Manage Servers.";
+
+            MessageBox.Show(message, "Import Connections", MessageBoxButton.OK, MessageBoxImage.Information);
+
+            if (imported > 0)
+                RefreshServerList();
+        }
+        catch (Exception ex)
+        {
+            MessageBox.Show($"Failed to import connections: {ex.Message}", "Import Error", MessageBoxButton.OK, MessageBoxImage.Error);
+        }
+    }
+
+    private async void ImportDataButton_Click(object sender, RoutedEventArgs e)
+    {
+        /* Open folder browser to select the old Lite install directory */
+        var dialog = new Microsoft.Win32.OpenFolderDialog
+        {
+            Title = "Select Previous Lite Install Folder",
+            Multiselect = false
+        };
+
+        if (dialog.ShowDialog(this) != true || string.IsNullOrWhiteSpace(dialog.FolderName))
+        {
+            return;
+        }
+
+        var sourceFolder = dialog.FolderName;
+
+        /* Validate that monitor.duckdb exists in the selected folder */
+        if (!DataImportService.ValidateSourceFolder(sourceFolder))
+        {
+            MessageBox.Show(
+                "The selected folder does not contain a monitor.duckdb file.\n\n" +
+                "Please select the folder where the previous Lite application was installed.",
+                "Invalid Folder",
+                MessageBoxButton.OK,
+                MessageBoxImage.Warning);
+            return;
+        }
+
+        /* Prevent double-clicks */
+        ImportDataButton.IsEnabled = false;
+        ImportDataButtonText.Text = "Importing...";
+        StatusText.Text = "Importing data from previous install...";
+
+        try
+        {
+            var importService = new DataImportService(_databaseInitializer, App.ArchiveDirectory);
+
+            /* The tryLockOldDb callback runs on the UI thread to show the retry dialog */
+            var result = await Task.Run(async () =>
+                await importService.RunImportAsync(sourceFolder, async _ =>
+                {
+                    var answer = MessageBoxResult.Cancel;
+                    await Dispatcher.InvokeAsync(() =>
+                    {
+                        answer = MessageBox.Show(
+                            "Could not lock the database to flush current data.\n\n" +
+                            "Close the previous Lite application and click OK to try again.",
+                            "Database Locked",
+                            MessageBoxButton.OKCancel,
+                            MessageBoxImage.Warning);
+                    });
+                    return answer == MessageBoxResult.OK;
+                }));
+
+            if (result.Success)
+            {
+                StatusText.Text = "Import complete — refreshing views...";
+                await _serverManager.CheckAllConnectionsAsync();
+                RefreshServerList();
+                UpdateStatusBar();
+                StatusText.Text = "Import complete";
+
+                MessageBox.Show(
+                    $"Import completed successfully.\n\n" +
+                    $"Tables flushed from old database: {result.TablesFlushed}\n" +
+                    $"Parquet files imported: {result.FilesImported}\n\n" +
+                    "Historical data is now available in all views.",
+                    "Import Complete",
+                    MessageBoxButton.OK,
+                    MessageBoxImage.Information);
+            }
+            else
+            {
+                StatusText.Text = "Import cancelled or failed";
+                if (!string.IsNullOrEmpty(result.ErrorMessage))
+                {
+                    MessageBox.Show(
+                        result.ErrorMessage,
+                        "Import Failed",
+                        MessageBoxButton.OK,
+                        MessageBoxImage.Error);
+                }
+            }
+        }
+        catch (Exception ex)
+        {
+            AppLogger.Error("DataImport", "Unhandled import error", ex);
+            StatusText.Text = "Import failed";
+            MessageBox.Show(
+                $"An unexpected error occurred during import:\n\n{ex.Message}",
+                "Import Error",
+                MessageBoxButton.OK,
+                MessageBoxImage.Error);
+        }
+        finally
+        {
+            ImportDataButton.IsEnabled = true;
+            ImportDataButtonText.Text = "Import Data";
+        }
+    }
+
+    /// <summary>
+    /// Gets the ServerConnection from a context menu click on a server list item.
+    /// </summary>
+    private ServerConnection? GetServerFromContextMenu(object sender)
+    {
+        if (sender is not MenuItem menuItem) return null;
+        var contextMenu = menuItem.Parent as ContextMenu;
+        var border = contextMenu?.PlacementTarget as FrameworkElement;
+        return border?.DataContext as ServerConnection;
+    }
+
+    private void ServerContextMenu_Connect_Click(object sender, RoutedEventArgs e)
+    {
+        var server = GetServerFromContextMenu(sender);
+        if (server != null) ConnectToServer(server);
+    }
+
+    private void ServerContextMenu_Disconnect_Click(object sender, RoutedEventArgs e)
+    {
+        var server = GetServerFromContextMenu(sender);
+        if (server != null) CloseServerTab(server.Id);
+    }
+
+    private void ServerContextMenu_ToggleFavorite_Click(object sender, RoutedEventArgs e)
+    {
+        var server = GetServerFromContextMenu(sender);
+        if (server != null)
+        {
+            _serverManager.ToggleFavorite(server.Id);
+            RefreshServerList();
+        }
+    }
+
+    private void ServerContextMenu_Edit_Click(object sender, RoutedEventArgs e)
+    {
+        var server = GetServerFromContextMenu(sender);
+        if (server == null) return;
+
+        var dialog = new AddServerDialog(_serverManager, server) { Owner = this };
+        if (dialog.ShowDialog() == true)
+        {
+            RefreshServerList();
+        }
+    }
+
+    private void ServerContextMenu_Remove_Click(object sender, RoutedEventArgs e)
+    {
+        var server = GetServerFromContextMenu(sender);
+        if (server == null) return;
+
+        var result = MessageBox.Show(
+            $"Remove server '{server.DisplayNameWithIntent}'?",
+            "Remove Server",
+            MessageBoxButton.YesNo,
+            MessageBoxImage.Question);
+
+        if (result == MessageBoxResult.Yes)
+        {
+            CloseServerTab(server.Id);
+            _serverManager.DeleteServer(server.Id);
+            RefreshServerList();
+            StatusText.Text = $"Removed server: {server.DisplayNameWithIntent}";
+        }
+    }
+
+    private bool _sidebarCollapsed;
+
+    private void ToggleSidebar_Click(object sender, RoutedEventArgs e)
+    {
+        _sidebarCollapsed = !_sidebarCollapsed;
+
+        if (_sidebarCollapsed)
+        {
+            SidebarColumn.Width = new GridLength(40);
+            SidebarTitle.Visibility = Visibility.Collapsed;
+            SidebarSubtitle.Visibility = Visibility.Collapsed;
+            if (sender is System.Windows.Controls.Button btn) btn.Content = "»";
+        }
+        else
+        {
+            SidebarColumn.Width = new GridLength(280);
+            SidebarTitle.Visibility = Visibility.Visible;
+            SidebarSubtitle.Visibility = Visibility.Visible;
+            if (sender is System.Windows.Controls.Button btn) btn.Content = "«";
+        }
+    }
+
+    private async void RefreshButton_Click(object sender, RoutedEventArgs e)
+    {
+        try
+        {
+            StatusText.Text = "Refreshing...";
+
+            // Check all server connections
+            await _serverManager.CheckAllConnectionsAsync();
+
+            RefreshServerList();
+            UpdateStatusBar();
+
+            StatusText.Text = "Refresh complete";
+        }
+        catch (Exception ex)
+        {
+            StatusText.Text = $"Refresh failed: {ex.Message}";
+        }
+    }
+
+    private void CheckConnectionsAndNotify()
+    {
+        try
+        {
+            var servers = _serverManager.GetAllServers();
+            bool needsRefresh = false;
+            foreach (var server in servers)
+            {
+                var status = _serverManager.GetConnectionStatus(server.Id);
+                server.IsOnline = status?.IsOnline;
+                if (status?.IsOnline == null) continue;
+
+                bool isOnline = status.IsOnline == true;
+                bool hasErrors = _collectorService != null && isOnline
+                    && _collectorService.GetHealthSummary(server).ErroringCollectors > 0;
+                server.HasCollectorErrors = hasErrors;
+
+                if (_previousConnectionStates.TryGetValue(server.Id, out var wasOnline))
+                {
+                    if (App.AlertsEnabled && App.NotifyConnectionChanges)
+                    {
+                        if (wasOnline && !isOnline)
+                        {
+                            _trayService?.ShowNotification(
+                                "Server Offline",
+                                $"{server.DisplayNameWithIntent} is unreachable: {status.ErrorMessage ?? "unknown error"}",
+                                Hardcodet.Wpf.TaskbarNotification.BalloonIcon.Error);
+                        }
+                        else if (!wasOnline && isOnline)
+                        {
+                            _trayService?.ShowNotification(
+                                "Server Online",
+                                $"{server.DisplayNameWithIntent} is back online",
+                                Hardcodet.Wpf.TaskbarNotification.BalloonIcon.Info);
+                        }
+                    }
+
+                    if (wasOnline != isOnline)
+                    {
+                        needsRefresh = true;
+                    }
+                }
+                else
+                {
+                    /* First time seeing this server's status — need to refresh */
+                    needsRefresh = true;
+                }
+
+                if (_previousCollectorErrorStates.TryGetValue(server.Id, out var prevHasErrors) && prevHasErrors != hasErrors)
+                    needsRefresh = true;
+
+                _previousConnectionStates[server.Id] = isOnline;
+                _previousCollectorErrorStates[server.Id] = hasErrors;
+            }
+
+            if (needsRefresh)
+            {
+                RefreshServerList();
+            }
+        }
+        catch (Exception ex)
+        {
+            AppLogger.Error("ConnectionAlerts", $"Connection check notify failed: {ex.Message}");
+        }
+    }
+
+    private async void CheckPerformanceAlerts(ServerSummaryItem summary)
+    {
+        if (!App.AlertsEnabled || _trayService == null) return;
+
+        var key = summary.ServerId.ToString();
+        var now = DateTime.UtcNow;
+        var alertCooldown = TimeSpan.FromMinutes(App.AlertCooldownMinutes);
+
+        /* Skip popup/email alerts if user has acknowledged or silenced this server */
+        bool suppressPopups = !_alertStateService.ShouldShowAlerts(key);
+
+        /* CPU alerts */
+        bool cpuExceeded = App.AlertCpuEnabled
+            && summary.CpuPercent.HasValue
+            && summary.CpuPercent.Value >= App.AlertCpuThreshold;
+
+        if (cpuExceeded)
+        {
+            _activeCpuAlert[key] = true;
+            if (!suppressPopups && (!_lastCpuAlert.TryGetValue(key, out var lastCpu) || now - lastCpu >= alertCooldown))
+            {
+                var muteCtx = new AlertMuteContext { ServerName = summary.DisplayName, MetricName = "High CPU" };
+                bool isMuted = _muteRuleService.IsAlertMuted(muteCtx);
+                _lastCpuAlert[key] = now;
+
+                if (!isMuted)
+                {
+                    _trayService.ShowNotification(
+                        "High CPU",
+                        $"{summary.DisplayName}: CPU at {summary.CpuPercent:F0}% (threshold: {App.AlertCpuThreshold}%)",
+                        Hardcodet.Wpf.TaskbarNotification.BalloonIcon.Warning);
+                }
+
+                var cpuDetailText = $"  CPU: {summary.CpuPercent:F0}%\n  Threshold: {App.AlertCpuThreshold}%";
+
+                await _emailAlertService.TrySendAlertEmailAsync(
+                    "High CPU",
+                    summary.DisplayName,
+                    $"{summary.CpuPercent:F0}%",
+                    $"{App.AlertCpuThreshold}%",
+                    summary.ServerId,
+                    muted: isMuted,
+                    detailText: cpuDetailText);
+            }
+        }
+        else if (_activeCpuAlert.TryGetValue(key, out var wasCpu) && wasCpu)
+        {
+            _activeCpuAlert[key] = false;
+            _trayService.ShowNotification(
+                "CPU Resolved",
+                $"{summary.DisplayName}: CPU back to {summary.CpuPercent:F0}%",
+                Hardcodet.Wpf.TaskbarNotification.BalloonIcon.Info);
+        }
+
+        /* Blocking alerts */
+        var effectiveBlockingCount = summary.BlockingCount;
+        if (App.AlertBlockingEnabled && App.AlertExcludedDatabases.Count > 0
+            && summary.BlockingCount >= App.AlertBlockingThreshold && _dataService != null)
+        {
+            try
+            {
+                var blockingRows = await _dataService.GetRecentBlockedProcessReportsAsync(summary.ServerId, hoursBack: 1);
+                effectiveBlockingCount = blockingRows
+                    .Count(r => string.IsNullOrEmpty(r.DatabaseName) ||
+                        !App.AlertExcludedDatabases.Any(e =>
+                            string.Equals(e, r.DatabaseName, StringComparison.OrdinalIgnoreCase)));
+            }
+            catch (Exception ex)
+            {
+                AppLogger.Error("Alerts", $"Failed to filter blocking count for {summary.DisplayName}: {ex.Message}");
+            }
+        }
+
+        bool blockingExceeded = App.AlertBlockingEnabled
+            && effectiveBlockingCount >= App.AlertBlockingThreshold;
+
+        if (blockingExceeded)
+        {
+            _activeBlockingAlert[key] = true;
+            if (!suppressPopups && (!_lastBlockingAlert.TryGetValue(key, out var lastBlocking) || now - lastBlocking >= alertCooldown))
+            {
+                var muteCtx = new AlertMuteContext { ServerName = summary.DisplayName, MetricName = "Blocking Detected" };
+                bool isMuted = _muteRuleService.IsAlertMuted(muteCtx);
+                _lastBlockingAlert[key] = now;
+
+                if (!isMuted)
+                {
+                    _trayService.ShowNotification(
+                        "Blocking Detected",
+                        $"{summary.DisplayName}: {effectiveBlockingCount} blocking session(s)",
+                        Hardcodet.Wpf.TaskbarNotification.BalloonIcon.Warning);
+                }
+
+                var blockingContext = await BuildBlockingContextAsync(summary.ServerId);
+                var detailText = ContextToDetailText(blockingContext);
+
+                await _emailAlertService.TrySendAlertEmailAsync(
+                    "Blocking Detected",
+                    summary.DisplayName,
+                    effectiveBlockingCount.ToString(),
+                    App.AlertBlockingThreshold.ToString(),
+                    summary.ServerId,
+                    blockingContext,
+                    muted: isMuted,
+                    detailText: detailText);
+            }
+        }
+        else if (_activeBlockingAlert.TryGetValue(key, out var wasBlocking) && wasBlocking)
+        {
+            _activeBlockingAlert[key] = false;
+            _trayService.ShowNotification(
+                "Blocking Cleared",
+                $"{summary.DisplayName}: No active blocking",
+                Hardcodet.Wpf.TaskbarNotification.BalloonIcon.Info);
+        }
+
+        /* Deadlock alerts */
+        var effectiveDeadlockCount = summary.DeadlockCount;
+        if (App.AlertDeadlockEnabled && App.AlertExcludedDatabases.Count > 0
+            && summary.DeadlockCount >= App.AlertDeadlockThreshold && _dataService != null)
+        {
+            try
+            {
+                var deadlockRows = await _dataService.GetRecentDeadlocksAsync(summary.ServerId, hoursBack: 1);
+                effectiveDeadlockCount = deadlockRows
+                    .Count(r => !IsDeadlockExcluded(r, App.AlertExcludedDatabases));
+            }
+            catch (Exception ex)
+            {
+                AppLogger.Error("Alerts", $"Failed to filter deadlock count for {summary.DisplayName}: {ex.Message}");
+            }
+        }
+
+        bool deadlocksExceeded = App.AlertDeadlockEnabled
+            && effectiveDeadlockCount >= App.AlertDeadlockThreshold;
+
+        if (deadlocksExceeded)
+        {
+            _activeDeadlockAlert[key] = true;
+            if (!suppressPopups && (!_lastDeadlockAlert.TryGetValue(key, out var lastDeadlock) || now - lastDeadlock >= alertCooldown))
+            {
+                var muteCtx = new AlertMuteContext { ServerName = summary.DisplayName, MetricName = "Deadlocks Detected" };
+                bool isMuted = _muteRuleService.IsAlertMuted(muteCtx);
+                _lastDeadlockAlert[key] = now;
+
+                if (!isMuted)
+                {
+                    _trayService.ShowNotification(
+                        "Deadlocks Detected",
+                        $"{summary.DisplayName}: {effectiveDeadlockCount} deadlock(s) in the last hour",
+                        Hardcodet.Wpf.TaskbarNotification.BalloonIcon.Error);
+                }
+
+                var deadlockContext = await BuildDeadlockContextAsync(summary.ServerId);
+                var detailText = ContextToDetailText(deadlockContext);
+
+                await _emailAlertService.TrySendAlertEmailAsync(
+                    "Deadlocks Detected",
+                    summary.DisplayName,
+                    effectiveDeadlockCount.ToString(),
+                    App.AlertDeadlockThreshold.ToString(),
+                    summary.ServerId,
+                    deadlockContext,
+                    muted: isMuted,
+                    detailText: detailText);
+            }
+        }
+        else if (_activeDeadlockAlert.TryGetValue(key, out var wasDeadlock) && wasDeadlock)
+        {
+            _activeDeadlockAlert[key] = false;
+            _trayService.ShowNotification(
+                "Deadlocks Cleared",
+                $"{summary.DisplayName}: No deadlocks in the last hour",
+                Hardcodet.Wpf.TaskbarNotification.BalloonIcon.Info);
+        }
+
+        /* Poison wait alerts */
+        if (App.AlertPoisonWaitEnabled && _dataService != null)
+        {
+            try
+            {
+                var poisonWaits = await _dataService.GetLatestPoisonWaitAvgsAsync(summary.ServerId);
+                var triggered = poisonWaits.FindAll(w => w.AvgMsPerWait >= App.AlertPoisonWaitThresholdMs);
+
+                if (triggered.Count > 0)
+                {
+                    _activePoisonWaitAlert[key] = true;
+                    if (!suppressPopups && (!_lastPoisonWaitAlert.TryGetValue(key, out var lastPoisonWait) || now - lastPoisonWait >= alertCooldown))
+                    {
+                        var worst = triggered[0];
+                        var allWaitNames = string.Join(", ", triggered.ConvertAll(w => $"{w.WaitType} ({w.AvgMsPerWait:F0}ms)"));
+
+                        /* Poison wait mute check uses the worst (highest avg ms/wait) triggered wait type.
+                           Limitation: if a user mutes a specific wait type that isn't the worst, the alert
+                           still fires. Conversely, muting the worst type suppresses the entire alert even
+                           if other unmuted poison waits are present. */
+                        var muteCtx = new AlertMuteContext { ServerName = summary.DisplayName, MetricName = "Poison Wait", WaitType = worst.WaitType };
+                        bool isMuted = _muteRuleService.IsAlertMuted(muteCtx);
+                        _lastPoisonWaitAlert[key] = now;
+
+                        if (!isMuted)
+                        {
+                            _trayService.ShowNotification(
+                                "Poison Wait",
+                                $"{summary.DisplayName}: {worst.WaitType} avg {worst.AvgMsPerWait:F0}ms/wait",
+                                Hardcodet.Wpf.TaskbarNotification.BalloonIcon.Error);
+                        }
+
+                        var poisonContext = BuildPoisonWaitContext(triggered);
+                        var detailText = ContextToDetailText(poisonContext);
+
+                        await _emailAlertService.TrySendAlertEmailAsync(
+                            "Poison Wait",
+                            summary.DisplayName,
+                            allWaitNames,
+                            $"{App.AlertPoisonWaitThresholdMs}ms avg",
+                            summary.ServerId,
+                            poisonContext,
+                            numericCurrentValue: worst.AvgMsPerWait,
+                            numericThresholdValue: App.AlertPoisonWaitThresholdMs,
+                            muted: isMuted,
+                            detailText: detailText);
+                    }
+                }
+                else if (_activePoisonWaitAlert.TryGetValue(key, out var wasPoisonWait) && wasPoisonWait)
+                {
+                    _activePoisonWaitAlert[key] = false;
+                    _trayService.ShowNotification(
+                        "Poison Waits Cleared",
+                        $"{summary.DisplayName}: Poison wait avg below threshold",
+                        Hardcodet.Wpf.TaskbarNotification.BalloonIcon.Info);
+                }
+            }
+            catch (Exception ex)
+            {
+                AppLogger.Error("Alerts", $"Failed to check poison waits for {summary.DisplayName}: {ex.Message}");
+            }
+        }
+
+        /* Long-running query alerts */
+        if (App.AlertLongRunningQueryEnabled && _dataService != null)
+        {
+            try
+            {
+                var longRunning = await _dataService.GetLongRunningQueriesAsync(summary.ServerId, App.AlertLongRunningQueryThresholdMinutes, App.AlertLongRunningQueryMaxResults, App.AlertLongRunningQueryExcludeSpServerDiagnostics, App.AlertLongRunningQueryExcludeWaitFor, App.AlertLongRunningQueryExcludeBackups, App.AlertLongRunningQueryExcludeMiscWaits);
+
+                if (App.AlertExcludedDatabases.Count > 0)
+                {
+                    longRunning = longRunning
+                        .Where(q => string.IsNullOrEmpty(q.DatabaseName) ||
+                            !App.AlertExcludedDatabases.Any(e =>
+                                string.Equals(e, q.DatabaseName, StringComparison.OrdinalIgnoreCase)))
+                        .ToList();
+                }
+
+                if (longRunning.Count > 0)
+                {
+                    _activeLongRunningQueryAlert[key] = true;
+                    if (!suppressPopups && (!_lastLongRunningQueryAlert.TryGetValue(key, out var lastLrq) || now - lastLrq >= alertCooldown))
+                    {
+                        var worst = longRunning[0];
+                        var elapsedMinutes = worst.ElapsedSeconds / 60;
+                        var preview = TruncateText(worst.QueryText, 80);
+                        var previewSuffix = string.IsNullOrEmpty(preview) ? "" : $" — {preview}";
+
+                        var muteCtx = new AlertMuteContext
+                        {
+                            ServerName = summary.DisplayName,
+                            MetricName = "Long-Running Query",
+                            DatabaseName = worst.DatabaseName,
+                            QueryText = worst.QueryText
+                        };
+                        bool isMuted = _muteRuleService.IsAlertMuted(muteCtx);
+                        _lastLongRunningQueryAlert[key] = now;
+
+                        if (!isMuted)
+                        {
+                            _trayService.ShowNotification(
+                                "Long-Running Query",
+                                $"{summary.DisplayName}: Session #{worst.SessionId} running {elapsedMinutes}m{previewSuffix}",
+                                Hardcodet.Wpf.TaskbarNotification.BalloonIcon.Warning);
+                        }
+
+                        var lrqContext = BuildLongRunningQueryContext(longRunning);
+                        var detailText = ContextToDetailText(lrqContext);
+
+                        await _emailAlertService.TrySendAlertEmailAsync(
+                            "Long-Running Query",
+                            summary.DisplayName,
+                            $"{longRunning.Count} query(s), longest {elapsedMinutes}m",
+                            $"{App.AlertLongRunningQueryThresholdMinutes}m",
+                            summary.ServerId,
+                            lrqContext,
+                            numericCurrentValue: elapsedMinutes,
+                            numericThresholdValue: App.AlertLongRunningQueryThresholdMinutes,
+                            muted: isMuted,
+                            detailText: detailText);
+                    }
+                }
+                else if (_activeLongRunningQueryAlert.TryGetValue(key, out var wasLongRunning) && wasLongRunning)
+                {
+                    _activeLongRunningQueryAlert[key] = false;
+                    _trayService.ShowNotification(
+                        "Long-Running Queries Cleared",
+                        $"{summary.DisplayName}: No queries over threshold",
+                        Hardcodet.Wpf.TaskbarNotification.BalloonIcon.Info);
+                }
+            }
+            catch (Exception ex)
+            {
+                AppLogger.Error("Alerts", $"Failed to check long-running queries for {summary.DisplayName}: {ex.Message}");
+            }
+        }
+
+        /* TempDB space alerts */
+        if (App.AlertTempDbSpaceEnabled && _dataService != null)
+        {
+            try
+            {
+                var tempDb = await _dataService.GetLatestTempDbSpaceAsync(summary.ServerId);
+
+                if (tempDb != null && tempDb.UsedPercent >= App.AlertTempDbSpaceThresholdPercent)
+                {
+                    _activeTempDbSpaceAlert[key] = true;
+                    if (!suppressPopups && (!_lastTempDbSpaceAlert.TryGetValue(key, out var lastTempDb) || now - lastTempDb >= alertCooldown))
+                    {
+                        var muteCtx = new AlertMuteContext { ServerName = summary.DisplayName, MetricName = "TempDB Space" };
+                        bool isMuted = _muteRuleService.IsAlertMuted(muteCtx);
+                        _lastTempDbSpaceAlert[key] = now;
+
+                        if (!isMuted)
+                        {
+                            _trayService.ShowNotification(
+                                "TempDB Space",
+                                $"{summary.DisplayName}: TempDB {tempDb.UsedPercent:F0}% used",
+                                Hardcodet.Wpf.TaskbarNotification.BalloonIcon.Warning);
+                        }
+
+                        var tempDbContext = BuildTempDbSpaceContext(tempDb);
+                        var detailText = ContextToDetailText(tempDbContext);
+
+                        await _emailAlertService.TrySendAlertEmailAsync(
+                            "TempDB Space",
+                            summary.DisplayName,
+                            $"{tempDb.UsedPercent:F0}% used ({tempDb.TotalReservedMb:F0} MB)",
+                            $"{App.AlertTempDbSpaceThresholdPercent}%",
+                            summary.ServerId,
+                            tempDbContext,
+                            numericCurrentValue: tempDb.UsedPercent,
+                            numericThresholdValue: App.AlertTempDbSpaceThresholdPercent,
+                            muted: isMuted,
+                            detailText: detailText);
+                    }
+                }
+                else if (_activeTempDbSpaceAlert.TryGetValue(key, out var wasTempDb) && wasTempDb)
+                {
+                    _activeTempDbSpaceAlert[key] = false;
+                    var pct = tempDb != null ? $"{tempDb.UsedPercent:F0}%" : "N/A";
+                    _trayService.ShowNotification(
+                        "TempDB Space Resolved",
+                        $"{summary.DisplayName}: TempDB usage back to {pct}",
+                        Hardcodet.Wpf.TaskbarNotification.BalloonIcon.Info);
+                }
+            }
+            catch (Exception ex)
+            {
+                AppLogger.Error("Alerts", $"Failed to check TempDB space for {summary.DisplayName}: {ex.Message}");
+            }
+        }
+
+        /* Anomalous Agent job alerts */
+        if (App.AlertLongRunningJobEnabled && _dataService != null)
+        {
+            try
+            {
+                var anomalousJobs = await _dataService.GetAnomalousJobsAsync(summary.ServerId, App.AlertLongRunningJobMultiplier);
+
+                if (anomalousJobs.Count > 0)
+                {
+                    _activeLongRunningJobAlert[key] = true;
+                    var worst = anomalousJobs[0];
+                    var jobKey = $"{key}:{worst.JobId}:{worst.StartTime:O}";
+
+                    if (!suppressPopups && (!_lastLongRunningJobAlert.TryGetValue(jobKey, out var lastJob) || now - lastJob >= alertCooldown))
+                    {
+                        var currentMinutes = worst.CurrentDurationSeconds / 60;
+
+                        var muteCtx = new AlertMuteContext { ServerName = summary.DisplayName, MetricName = "Long-Running Job", JobName = worst.JobName };
+                        bool isMuted = _muteRuleService.IsAlertMuted(muteCtx);
+                        _lastLongRunningJobAlert[jobKey] = now;
+
+                        if (!isMuted)
+                        {
+                            _trayService.ShowNotification(
+                                "Long-Running Job",
+                                $"{summary.DisplayName}: {worst.JobName} at {worst.PercentOfAverage:F0}% of avg ({currentMinutes}m)",
+                                Hardcodet.Wpf.TaskbarNotification.BalloonIcon.Warning);
+                        }
+
+                        var jobContext = BuildAnomalousJobContext(anomalousJobs);
+                        var detailText = ContextToDetailText(jobContext);
+
+                        await _emailAlertService.TrySendAlertEmailAsync(
+                            "Long-Running Job",
+                            summary.DisplayName,
+                            $"{anomalousJobs.Count} job(s) exceeding {App.AlertLongRunningJobMultiplier}x average",
+                            $"{App.AlertLongRunningJobMultiplier}x historical avg",
+                            summary.ServerId,
+                            jobContext,
+                            numericCurrentValue: (double)(worst.PercentOfAverage ?? 0),
+                            numericThresholdValue: App.AlertLongRunningJobMultiplier * 100,
+                            muted: isMuted,
+                            detailText: detailText);
+                    }
+                }
+                else if (_activeLongRunningJobAlert.TryGetValue(key, out var wasJob) && wasJob)
+                {
+                    _activeLongRunningJobAlert[key] = false;
+                    _trayService.ShowNotification(
+                        "Long-Running Jobs Cleared",
+                        $"{summary.DisplayName}: No jobs exceeding threshold",
+                        Hardcodet.Wpf.TaskbarNotification.BalloonIcon.Info);
+                }
+            }
+            catch (Exception ex)
+            {
+                AppLogger.Error("Alerts", $"Failed to check anomalous jobs for {summary.DisplayName}: {ex.Message}");
+            }
+        }
+    }
+
+        private static string TruncateText(string text, int maxLength = 300)
+        {
+            if (string.IsNullOrEmpty(text)) return "";
+            text = text.Replace('\r', ' ').Replace('\n', ' ').Trim();
+            return text.Length <= maxLength ? text : text.Substring(0, maxLength) + "...";
+        }
+
+        private static string? ContextToDetailText(AlertContext? context)
+        {
+            if (context == null || context.Details.Count == 0) return null;
+            var sb = new System.Text.StringBuilder();
+            foreach (var detail in context.Details)
+            {
+                if (sb.Length > 0) sb.AppendLine();
+                sb.AppendLine(detail.Heading);
+                foreach (var (label, value) in detail.Fields)
+                    sb.AppendLine($"  {label}: {value}");
+            }
+            return sb.ToString().TrimEnd();
+        }
+
+        private async Task<AlertContext?> BuildBlockingContextAsync(int serverId)
+        {
+            try
+            {
+                if (_dataService == null) return null;
+
+                var events = await _dataService.GetRecentBlockedProcessReportsAsync(serverId, hoursBack: 1);
+                if (events == null || events.Count == 0) return null;
+
+                if (App.AlertExcludedDatabases.Count > 0)
+                {
+                    events = events
+                        .Where(e => string.IsNullOrEmpty(e.DatabaseName) ||
+                            !App.AlertExcludedDatabases.Any(ex =>
+                                string.Equals(ex, e.DatabaseName, StringComparison.OrdinalIgnoreCase)))
+                        .ToList();
+                    if (events.Count == 0) return null;
+                }
+
+                var context = new AlertContext();
+                var firstXml = (string?)null;
+
+                foreach (var e in events.Take(3))
+                {
+                    var item = new AlertDetailItem
+                    {
+                        Heading = $"Blocked #{e.BlockedSpid} by #{e.BlockingSpid}",
+                        Fields = new()
+                    };
+
+                    if (!string.IsNullOrEmpty(e.DatabaseName))
+                        item.Fields.Add(("Database", e.DatabaseName));
+                    if (!string.IsNullOrEmpty(e.BlockedSqlText))
+                        item.Fields.Add(("Blocked Query", TruncateText(e.BlockedSqlText)));
+                    if (!string.IsNullOrEmpty(e.BlockingSqlText))
+                        item.Fields.Add(("Blocking Query", TruncateText(e.BlockingSqlText)));
+                    item.Fields.Add(("Wait Time", e.WaitTimeFormatted));
+                    if (!string.IsNullOrEmpty(e.LockMode))
+                        item.Fields.Add(("Lock Mode", e.LockMode));
+
+                    context.Details.Add(item);
+                    if (firstXml == null && e.HasReportXml)
+                        firstXml = e.BlockedProcessReportXml;
+                }
+
+                if (!string.IsNullOrEmpty(firstXml))
+                {
+                    context.AttachmentXml = firstXml;
+                    context.AttachmentFileName = "blocked_process_report.xml";
+                }
+
+                return context;
+            }
+            catch (Exception ex)
+            {
+                AppLogger.Error("EmailAlert", $"Failed to fetch blocking detail for email: {ex.Message}");
+                return null;
+            }
+        }
+
+        private async Task<AlertContext?> BuildDeadlockContextAsync(int serverId)
+        {
+            try
+            {
+                if (_dataService == null) return null;
+
+                var deadlocks = await _dataService.GetRecentDeadlocksAsync(serverId, hoursBack: 1);
+                if (deadlocks == null || deadlocks.Count == 0) return null;
+
+                if (App.AlertExcludedDatabases.Count > 0)
+                {
+                    deadlocks = deadlocks
+                        .Where(d => !IsDeadlockExcluded(d, App.AlertExcludedDatabases))
+                        .ToList();
+                    if (deadlocks.Count == 0) return null;
+                }
+
+                var context = new AlertContext();
+                var firstGraph = (string?)null;
+
+                foreach (var d in deadlocks.Take(3))
+                {
+                    var item = new AlertDetailItem
+                    {
+                        Heading = "Deadlock Victim",
+                        Fields = new()
+                    };
+
+                    if (!string.IsNullOrEmpty(d.VictimSqlText))
+                        item.Fields.Add(("Victim SQL", TruncateText(d.VictimSqlText)));
+                    if (!string.IsNullOrEmpty(d.ProcessSummary))
+                        item.Fields.Add(("Processes", d.ProcessSummary));
+
+                    context.Details.Add(item);
+                    if (firstGraph == null && d.HasDeadlockXml)
+                        firstGraph = d.DeadlockGraphXml;
+                }
+
+                if (!string.IsNullOrEmpty(firstGraph))
+                {
+                    context.AttachmentXml = firstGraph;
+                    context.AttachmentFileName = "deadlock_graph.xml";
+                }
+
+                return context;
+            }
+            catch (Exception ex)
+            {
+                AppLogger.Error("EmailAlert", $"Failed to fetch deadlock detail for email: {ex.Message}");
+                return null;
+            }
+        }
+
+        private static bool IsDeadlockExcluded(DeadlockRow row, List<string> excludedDatabases)
+        {
+            if (string.IsNullOrEmpty(row.DeadlockGraphXml)) return false;
+            try
+            {
+                var doc = XElement.Parse(row.DeadlockGraphXml);
+                var dbNames = doc.Descendants("process")
+                    .Select(p => p.Attribute("currentdbname")?.Value)
+                    .Where(n => !string.IsNullOrEmpty(n))
+                    .Cast<string>()
+                    .ToList();
+                if (dbNames.Count == 0) return false;
+                return dbNames.All(db => excludedDatabases.Any(e =>
+                    string.Equals(e, db, StringComparison.OrdinalIgnoreCase)));
+            }
+            catch { return false; }
+        }
+
+        private static AlertContext? BuildPoisonWaitContext(List<PoisonWaitDelta> triggeredWaits)
+        {
+            if (triggeredWaits.Count == 0) return null;
+
+            var context = new AlertContext();
+            foreach (var w in triggeredWaits)
+            {
+                context.Details.Add(new AlertDetailItem
+                {
+                    Heading = w.WaitType,
+                    Fields = new()
+                    {
+                        ("Avg ms/wait", $"{w.AvgMsPerWait:F1}"),
+                        ("Delta wait ms", $"{w.DeltaMs:N0}"),
+                        ("Delta tasks", $"{w.DeltaTasks:N0}")
+                    }
+                });
+            }
+            return context;
+        }
+
+        private static AlertContext? BuildLongRunningQueryContext(List<LongRunningQueryInfo> queries)
+        {
+            if (queries.Count == 0) return null;
+
+            var context = new AlertContext();
+            foreach (var q in queries.GetRange(0, Math.Min(3, queries.Count)))
+            {
+                var item = new AlertDetailItem
+                {
+                    Heading = $"Session #{q.SessionId} — {q.ElapsedSeconds / 60}m {q.ElapsedSeconds % 60}s",
+                    Fields = new()
+                };
+
+                if (!string.IsNullOrEmpty(q.DatabaseName))
+                    item.Fields.Add(("Database", q.DatabaseName));
+                if (!string.IsNullOrEmpty(q.QueryText))
+                    item.Fields.Add(("Query", TruncateText(q.QueryText)));
+                item.Fields.Add(("CPU Time", $"{q.CpuTimeMs:N0} ms"));
+                item.Fields.Add(("Reads", $"{q.Reads:N0}"));
+                item.Fields.Add(("Writes", $"{q.Writes:N0}"));
+                if (!string.IsNullOrEmpty(q.WaitType))
+                    item.Fields.Add(("Wait Type", q.WaitType));
+                if (q.BlockingSessionId.HasValue && q.BlockingSessionId.Value > 0)
+                    item.Fields.Add(("Blocked By", $"Session #{q.BlockingSessionId.Value}"));
+
+                context.Details.Add(item);
+            }
+            return context;
+        }
+
+        private static AlertContext? BuildTempDbSpaceContext(TempDbSpaceInfo tempDb)
+        {
+            var context = new AlertContext();
+            context.Details.Add(new AlertDetailItem
+            {
+                Heading = $"TempDB — {tempDb.UsedPercent:F0}% Used",
+                Fields = new()
+                {
+                    ("Total Reserved", $"{tempDb.TotalReservedMb:F0} MB"),
+                    ("Unallocated", $"{tempDb.UnallocatedMb:F0} MB"),
+                    ("User Objects", $"{tempDb.UserObjectReservedMb:F0} MB"),
+                    ("Internal Objects", $"{tempDb.InternalObjectReservedMb:F0} MB"),
+                    ("Version Store", $"{tempDb.VersionStoreReservedMb:F0} MB"),
+                    ("Top Consumer", tempDb.TopConsumerSessionId > 0
+                        ? $"Session #{tempDb.TopConsumerSessionId} ({tempDb.TopConsumerMb:F0} MB)"
+                        : "None")
+                }
+            });
+            return context;
+        }
+
+        private static AlertContext? BuildAnomalousJobContext(List<AnomalousJobInfo> jobs)
+        {
+            if (jobs.Count == 0) return null;
+
+            var context = new AlertContext();
+            foreach (var j in jobs.GetRange(0, Math.Min(3, jobs.Count)))
+            {
+                context.Details.Add(new AlertDetailItem
+                {
+                    Heading = j.JobName,
+                    Fields = new()
+                    {
+                        ("Current Duration", FormatDuration(j.CurrentDurationSeconds)),
+                        ("Avg Duration", FormatDuration(j.AvgDurationSeconds)),
+                        ("P95 Duration", FormatDuration(j.P95DurationSeconds)),
+                        ("% of Average", j.PercentOfAverage.HasValue ? $"{j.PercentOfAverage:F0}%" : "N/A"),
+                        ("Started", j.StartTime.ToString("yyyy-MM-dd HH:mm:ss"))
+                    }
+                });
+            }
+            return context;
+        }
+
+        private static string FormatDuration(long seconds)
+        {
+            if (seconds < 60) return $"{seconds}s";
+            if (seconds < 3600) return $"{seconds / 60}m {seconds % 60}s";
+            return $"{seconds / 3600}h {(seconds % 3600) / 60}m";
+        }
+
+        private void OpenPlanViewerButton_Click(object sender, RoutedEventArgs e)
+        {
+            EnsurePlanTabControlInitialized();
+            EmptyStatePanel.Visibility = Visibility.Collapsed;
+            ServerTabControl.Visibility = Visibility.Visible;
+            MainWindowPlanViewerTab.Visibility = Visibility.Visible;
+            if (MainWindowPlanViewerTab.IsSelected)
+            {
+                // Already on Plan Viewer — just add a new empty sub-tab
+                AddNewEmptyPlanSubTab();
+            }
+            else
+            {
+                MainWindowPlanViewerTab.IsSelected = true;
+                AddNewEmptyPlanSubTab();
+            }
+            Dispatcher.BeginInvoke(DispatcherPriority.Loaded, new Action(() => MainWindowPlanTabControl.Focus()));
+        }
+
+        private void MainWindowPlanViewerClose_Click(object sender, RoutedEventArgs e)
+        {
+            // Reset inner tab control so next open starts fresh
+            MainWindowPlanTabControl.Items.Clear();
+            _planTabControlInitialized = false;
+            MainWindowPlanViewerTab.Visibility = Visibility.Collapsed;
+            // Select first visible tab
+            foreach (TabItem item in ServerTabControl.Items)
+            {
+                if (item.Visibility == Visibility.Visible && item != MainWindowPlanViewerTab)
+                {
+                    item.IsSelected = true;
+                    break;
+                }
+            }
+        }
+
+        #region Main Window Plan Viewer
+
+        private const string LitePlanAddTabId = "__PLAN_ADD_TAB__";
+        private bool _planTabControlInitialized;
+
+        private void EnsurePlanTabControlInitialized()
+        {
+            if (_planTabControlInitialized) return;
+            _planTabControlInitialized = true;
+
+            // "+" tab at the end
+            var addTabHeader = new TextBlock
+            {
+                Text = "+",
+                FontSize = 14,
+                FontWeight = FontWeights.Bold,
+                VerticalAlignment = VerticalAlignment.Center,
+                ToolTip = "Open a new plan sub-tab"
+            };
+            var addTab = new TabItem
+            {
+                Header = addTabHeader,
+                Tag = LitePlanAddTabId,
+                Content = new Grid()
+            };
+            MainWindowPlanTabControl.Items.Add(addTab);
+
+            MainWindowPlanTabControl.SelectionChanged += (_, _) =>
+            {
+                if (MainWindowPlanTabControl.SelectedItem is TabItem { Tag: string t } && t == LitePlanAddTabId)
+                {
+                    var newSub = AddNewEmptyPlanSubTab();
+                    MainWindowPlanTabControl.SelectedItem = newSub;
+                }
+            };
+        }
+
+        /// <summary>
+        /// Adds a new empty "New Plan" sub-tab to the inner plan TabControl and selects it.
+        /// Returns the newly created sub-tab.
+        /// </summary>
+        private TabItem AddNewEmptyPlanSubTab()
+        {
+            EnsurePlanTabControlInitialized();
+
+            // --- Empty state layer ---
+            var emptyState = new Grid();
+            var dashedRect = new System.Windows.Shapes.Rectangle
+            {
+                Margin = new Thickness(24),
+                Stroke = (System.Windows.Media.Brush)FindResource("ForegroundMutedBrush"),
+                StrokeThickness = 1.5,
+                StrokeDashArray = new System.Windows.Media.DoubleCollection { 6, 4 },
+                RadiusX = 10, RadiusY = 10,
+                Opacity = 0.25
+            };
+            var emptyStack = new StackPanel { HorizontalAlignment = HorizontalAlignment.Center, VerticalAlignment = VerticalAlignment.Center };
+            emptyStack.Children.Add(new TextBlock
+            {
+                Text = "\uE896",
+                FontFamily = new System.Windows.Media.FontFamily("Segoe MDL2 Assets"),
+                FontSize = 52,
+                HorizontalAlignment = HorizontalAlignment.Center,
+                Foreground = (System.Windows.Media.Brush)FindResource("ForegroundMutedBrush"),
+                Opacity = 0.45,
+                Margin = new Thickness(0, 0, 0, 12)
+            });
+            emptyStack.Children.Add(new TextBlock
+            {
+                Text = "New Plan",
+                FontSize = 20,
+                FontWeight = FontWeights.Light,
+                Foreground = (System.Windows.Media.Brush)FindResource("ForegroundMutedBrush"),
+                HorizontalAlignment = HorizontalAlignment.Center
+            });
+            emptyStack.Children.Add(new TextBlock
+            {
+                Text = "Open or paste execution plan XML to render it",
+                FontSize = 13,
+                Foreground = (System.Windows.Media.Brush)FindResource("ForegroundMutedBrush"),
+                HorizontalAlignment = HorizontalAlignment.Center,
+                Margin = new Thickness(0, 8, 0, 0)
+            });
+            var btnPanel = new StackPanel { Orientation = Orientation.Horizontal, HorizontalAlignment = HorizontalAlignment.Center, Margin = new Thickness(0, 20, 0, 0) };
+            var openBtn = new Button { Content = "Open .sqlplan File", Height = 28, Padding = new Thickness(12, 0, 12, 0), ToolTip = "Open a .sqlplan or .xml file from disk" };
+            var pasteBtn = new Button { Content = "Paste XML", Height = 28, Padding = new Thickness(12, 0, 12, 0), Margin = new Thickness(8, 0, 0, 0), ToolTip = "Paste execution plan XML to render it (or use Ctrl+V)" };
+            btnPanel.Children.Add(openBtn);
+            btnPanel.Children.Add(pasteBtn);
+            emptyStack.Children.Add(btnPanel);
+            emptyStack.Children.Add(new TextBlock
+            {
+                Text = "or drag & drop a .sqlplan file anywhere in this area",
+                FontSize = 11,
+                Foreground = (System.Windows.Media.Brush)FindResource("ForegroundMutedBrush"),
+                HorizontalAlignment = HorizontalAlignment.Center,
+                Margin = new Thickness(0, 12, 0, 0)
+            });
+            emptyState.Children.Add(dashedRect);
+            emptyState.Children.Add(emptyStack);
+
+            // --- Viewer layer (hidden until a plan is loaded) ---
+            var viewer = new Controls.PlanViewerControl
+            {
+                Visibility = Visibility.Collapsed
+            };
+
+            // Sub-tab content grid: index 0 = emptyState, index 1 = viewer
+            var subTabContent = new Grid();
+            subTabContent.Children.Add(emptyState);
+            subTabContent.Children.Add(viewer);
+
+            // --- Sub-tab header: label + close button ---
+            var initialLabel = GetUniqueSubTabLabel("New Plan");
+            var labelBlock = new TextBlock
+            {
+                Text = initialLabel,
+                VerticalAlignment = VerticalAlignment.Center,
+                ToolTip = initialLabel
+            };
+            var subCloseBtn = new Button { Style = (Style)FindResource("TabCloseButton") };
+            var subTabHeader = new StackPanel { Orientation = Orientation.Horizontal };
+            subTabHeader.Children.Add(labelBlock);
+            subTabHeader.Children.Add(subCloseBtn);
+
+            var subTab = new TabItem { Header = subTabHeader, Content = subTabContent };
+
+            subCloseBtn.Tag = subTab;
+            subCloseBtn.Click += (_, _) =>
+            {
+                MainWindowPlanTabControl.Items.Remove(subTab);
+                // If only the "+" tab remains, open a fresh empty sub-tab
+                if (MainWindowPlanTabControl.Items.Count == 1 &&
+                    MainWindowPlanTabControl.Items[0] is TabItem { Tag: string t2 } && t2 == LitePlanAddTabId)
+                {
+                    AddNewEmptyPlanSubTab();
+                }
+            };
+
+            // Wire per-sub-tab buttons
+            openBtn.Click += (_, _) =>
+            {
+                var dialog = new Microsoft.Win32.OpenFileDialog
+                {
+                    Filter = "SQL Plan Files (*.sqlplan)|*.sqlplan|XML Files (*.xml)|*.xml|All Files (*.*)|*.*",
+                    DefaultExt = ".sqlplan",
+                    Multiselect = true
+                };
+                if (dialog.ShowDialog() != true) return;
+                var isFirst = true;
+                foreach (var fileName in dialog.FileNames)
+                {
+                    try
+                    {
+                        var xml = System.IO.File.ReadAllText(fileName);
+                        var targetTab = isFirst ? subTab : AddNewEmptyPlanSubTab();
+                        LoadPlanIntoSubTab(targetTab, xml, System.IO.Path.GetFileName(fileName));
+                    }
+                    catch (Exception ex)
+                    {
+                        MessageBox.Show($"Failed to open file:\n\n{ex.Message}", "Error",
+                            MessageBoxButton.OK, MessageBoxImage.Error);
+                    }
+                    isFirst = false;
+                }
+            };
+
+            pasteBtn.Click += (_, _) =>
+            {
+                var xml = Clipboard.GetText();
+                if (!string.IsNullOrWhiteSpace(xml))
+                {
+                    LoadPlanIntoSubTab(subTab, xml, "Pasted Plan");
+                    return;
+                }
+                MessageBox.Show("The clipboard does not contain any text.", "Paste Plan XML",
+                    MessageBoxButton.OK, MessageBoxImage.Information);
+            };
+
+            // Insert before "+" tab
+            var addTabIndex = -1;
+            for (var i = 0; i < MainWindowPlanTabControl.Items.Count; i++)
+            {
+                if (MainWindowPlanTabControl.Items[i] is TabItem { Tag: string t3 } && t3 == LitePlanAddTabId)
+                {
+                    addTabIndex = i;
+                    break;
+                }
+            }
+            if (addTabIndex >= 0)
+                MainWindowPlanTabControl.Items.Insert(addTabIndex, subTab);
+            else
+                MainWindowPlanTabControl.Items.Add(subTab);
+
+            MainWindowPlanTabControl.SelectedItem = subTab;
+            return subTab;
+        }
+
+        /// <summary>
+        /// Loads plan XML into an existing sub-tab (replacing whatever was there before).
+        /// </summary>
+        private void LoadPlanIntoSubTab(TabItem subTab, string planXml, string label, string? queryText = null)
+        {
+            try { System.Xml.Linq.XDocument.Parse(planXml); }
+            catch (System.Xml.XmlException ex)
+            {
+                MessageBox.Show(
+                    $"The plan XML is not valid:\n\n{ex.Message}",
+                    "Invalid Plan XML",
+                    MessageBoxButton.OK,
+                    MessageBoxImage.Warning);
+                return;
+            }
+
+            if (subTab.Content is not Grid subTabContent) return;
+            if (subTabContent.Children.Count < 2) return;
+
+            var emptyState = subTabContent.Children[0] as FrameworkElement;
+            var viewer = subTabContent.Children[1] as Controls.PlanViewerControl;
+            if (viewer == null) return;
+
+            viewer.LoadPlan(planXml, label, queryText);
+            emptyState!.Visibility = Visibility.Collapsed;
+            viewer.Visibility = Visibility.Visible;
+
+            var uniqueLabel = GetUniqueSubTabLabel(label);
+            if (subTab.Header is StackPanel headerPanel &&
+                headerPanel.Children[0] is TextBlock headerLabel)
+            {
+                headerLabel.Text = uniqueLabel.Length > 30 ? uniqueLabel[..30] + "\u2026" : uniqueLabel;
+                headerLabel.ToolTip = uniqueLabel;
+            }
+        }
+
+        /// <summary>
+        /// Returns a label that is unique among current inner plan sub-tab headers.
+        /// If <paramref name="baseLabel"/> is already taken, appends " (1)", " (2)", …
+        /// </summary>
+        private string GetUniqueSubTabLabel(string baseLabel)
+        {
+            var existing = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
+            foreach (var item in MainWindowPlanTabControl.Items)
+            {
+                if (item is TabItem { Tag: string t } && t == LitePlanAddTabId) continue;
+                if (item is TabItem subTab &&
+                    subTab.Header is StackPanel sp &&
+                    sp.Children[0] is TextBlock tb)
+                    existing.Add(tb.ToolTip as string ?? tb.Text);
+            }
+            if (!existing.Contains(baseLabel)) return baseLabel;
+            var counter = 1;
+            string candidate;
+            do { candidate = $"{baseLabel} ({counter++})"; }
+            while (existing.Contains(candidate));
+            return candidate;
+        }
+
+        /// <summary>
+        /// Returns the currently active real plan sub-tab (skips the "+" tab).
+        /// </summary>
+        private TabItem? GetActivePlanSubTab()
+        {
+            if (MainWindowPlanTabControl.SelectedItem is TabItem { Tag: string t } && t == LitePlanAddTabId)
+                return null;
+            return MainWindowPlanTabControl.SelectedItem as TabItem;
+        }
+
+        private void MainWindowPlanViewer_DragOver(object sender, DragEventArgs e)
+        {
+            if (e.Data.GetDataPresent(DataFormats.FileDrop))
+            {
+                var files = e.Data.GetData(DataFormats.FileDrop) as string[];
+                if (files?.Any(IsPlanFile) == true)
+                {
+                    e.Effects = DragDropEffects.Copy;
+                    e.Handled = true;
+                    return;
+                }
+            }
+            e.Effects = DragDropEffects.None;
+            e.Handled = true;
+        }
+
+        private void MainWindowPlanViewer_Drop(object sender, DragEventArgs e)
+        {
+            if (!e.Data.GetDataPresent(DataFormats.FileDrop)) return;
+            var planFiles = (e.Data.GetData(DataFormats.FileDrop) as string[])
+                ?.Where(IsPlanFile).ToArray();
+            if (planFiles == null || planFiles.Length == 0) return;
+            LoadMainWindowPlanFromFileIntoActiveTab(planFiles[0]);
+            for (var i = 1; i < planFiles.Length; i++)
+            {
+                var newTab = AddNewEmptyPlanSubTab();
+                try
+                {
+                    var xml = System.IO.File.ReadAllText(planFiles[i]);
+                    LoadPlanIntoSubTab(newTab, xml, System.IO.Path.GetFileName(planFiles[i]));
+                }
+                catch (Exception ex)
+                {
+                    MessageBox.Show($"Failed to load plan file:\n{ex.Message}", "Load Error",
+                        MessageBoxButton.OK, MessageBoxImage.Error);
+                }
+            }
+        }
+
+        private void MainWindowPlanViewer_KeyDown(object sender, System.Windows.Input.KeyEventArgs e)
+        {
+            if (e.Key == System.Windows.Input.Key.V &&
+                System.Windows.Input.Keyboard.Modifiers == System.Windows.Input.ModifierKeys.Control &&
+                e.OriginalSource is not System.Windows.Controls.TextBox)
+            {
+                var xml = Clipboard.GetText();
+                if (!string.IsNullOrWhiteSpace(xml))
+                {
+                    e.Handled = true;
+                    LoadPlanIntoActivePlanSubTab(xml, "Pasted Plan");
+                }
+            }
+        }
+
+        private void LoadMainWindowPlanFromFileIntoActiveTab(string path)
+        {
+            try
+            {
+                var xml = System.IO.File.ReadAllText(path);
+                LoadPlanIntoActivePlanSubTab(xml, System.IO.Path.GetFileName(path));
+            }
+            catch (Exception ex)
+            {
+                MessageBox.Show($"Failed to load plan file:\n{ex.Message}", "Load Error",
+                    MessageBoxButton.OK, MessageBoxImage.Error);
+            }
+        }
+
+        private void LoadPlanIntoActivePlanSubTab(string planXml, string label)
+        {
+            var activeSubTab = GetActivePlanSubTab();
+            if (activeSubTab != null)
+                LoadPlanIntoSubTab(activeSubTab, planXml, label);
+        }
+
+        private static bool IsPlanFile(string path)
+        {
+            var ext = System.IO.Path.GetExtension(path);
+            return string.Equals(ext, ".sqlplan", StringComparison.OrdinalIgnoreCase)
+                || string.Equals(ext, ".xml", StringComparison.OrdinalIgnoreCase);
+        }
+
+        #endregion
+    }
diff --git a/Lite/Models/MuteRule.cs b/Lite/Models/MuteRule.cs
index 496ab655..0f1516d4 100644
--- a/Lite/Models/MuteRule.cs
+++ b/Lite/Models/MuteRule.cs
@@ -102,22 +102,75 @@ public class AlertMuteContext
     /// Extracts context fields (Database, Query, Wait Type, Job Name) from the
     /// structured detail_text stored with each alert. The format is label/value
     /// pairs indented with two spaces, e.g. "  Database: MyDB".
+    /// Query values may span multiple lines and use variant labels
+    /// (Blocked Query, Blocking Query, Victim SQL).
     /// </summary>
     public void PopulateFromDetailText(string? detailText)
     {
         if (string.IsNullOrEmpty(detailText)) return;
 
-        foreach (var line in detailText.Split('\n'))
+        System.Text.StringBuilder? queryBuilder = null;
+        var lines = detailText.Split('\n');
+
+        foreach (var line in lines)
         {
             var trimmed = line.TrimStart();
+
             if (DatabaseName == null && trimmed.StartsWith("Database: ", StringComparison.Ordinal))
+            {
+                FlushQuery(ref queryBuilder);
                 DatabaseName = trimmed.Substring("Database: ".Length).Trim();
-            else if (QueryText == null && trimmed.StartsWith("Query: ", StringComparison.Ordinal))
-                QueryText = trimmed.Substring("Query: ".Length).Trim();
+            }
             else if (WaitType == null && trimmed.StartsWith("Wait Type: ", StringComparison.Ordinal))
+            {
+                FlushQuery(ref queryBuilder);
                 WaitType = trimmed.Substring("Wait Type: ".Length).Trim();
+            }
             else if (JobName == null && trimmed.StartsWith("Job Name: ", StringComparison.Ordinal))
+            {
+                FlushQuery(ref queryBuilder);
                 JobName = trimmed.Substring("Job Name: ".Length).Trim();
+            }
+            else if (QueryText == null && queryBuilder == null && TryExtractQueryValue(trimmed, out var qv))
+            {
+                queryBuilder = new System.Text.StringBuilder(qv);
+            }
+            else if (queryBuilder != null)
+            {
+                // Continuation lines from multi-line query values don't start
+                // with the two-space indent used by ContextToDetailText fields.
+                if (string.IsNullOrWhiteSpace(trimmed) || line.StartsWith("  ", StringComparison.Ordinal))
+                {
+                    FlushQuery(ref queryBuilder);
+                }
+                else
+                {
+                    queryBuilder.Append(' ').Append(trimmed.Trim());
+                }
+            }
+        }
+
+        FlushQuery(ref queryBuilder);
+    }
+
+    private void FlushQuery(ref System.Text.StringBuilder? builder)
+    {
+        if (builder != null && QueryText == null)
+            QueryText = builder.ToString();
+        builder = null;
+    }
+
+    private static bool TryExtractQueryValue(string trimmed, out string value)
+    {
+        foreach (var prefix in new[] { "Query: ", "Blocked Query: ", "Blocking Query: ", "Victim SQL: " })
+        {
+            if (trimmed.StartsWith(prefix, StringComparison.Ordinal))
+            {
+                value = trimmed.Substring(prefix.Length).Trim();
+                return true;
+            }
         }
+        value = "";
+        return false;
     }
 }

From b09adaed55f9af17dfced26049af839696eff509 Mon Sep 17 00:00:00 2001
From: Hannah Vernon <hannah@mvct.com>
Date: Thu, 19 Mar 2026 16:31:32 -0500
Subject: [PATCH 4/5] Add tooltip to Query Text field in mute rule dialog

Explain that the field is a case-insensitive substring match and
suggest entering a distinctive fragment like a table or procedure name.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 Dashboard/MuteRuleDialog.xaml    | 225 +++++++++++++++---------------
 Lite/Windows/MuteRuleDialog.xaml | 227 ++++++++++++++++---------------
 2 files changed, 227 insertions(+), 225 deletions(-)

diff --git a/Dashboard/MuteRuleDialog.xaml b/Dashboard/MuteRuleDialog.xaml
index cdae393e..45eb031f 100644
--- a/Dashboard/MuteRuleDialog.xaml
+++ b/Dashboard/MuteRuleDialog.xaml
@@ -1,112 +1,113 @@
-<Window x:Class="PerformanceMonitorDashboard.MuteRuleDialog"
-        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        Title="Create Mute Rule"
-        SizeToContent="Height" Width="500"
-        WindowStartupLocation="CenterOwner"
-        ResizeMode="NoResize"
-        Background="{DynamicResource BackgroundBrush}">
-    <Grid Margin="20">
-        <Grid.RowDefinitions>
-            <RowDefinition Height="Auto"/>
-            <RowDefinition Height="Auto"/>
-            <RowDefinition Height="Auto"/>
-            <RowDefinition Height="Auto"/>
-            <RowDefinition Height="Auto"/>
-            <RowDefinition Height="Auto"/>
-            <RowDefinition Height="Auto"/>
-            <RowDefinition Height="Auto"/>
-            <RowDefinition Height="Auto"/>
-            <RowDefinition Height="Auto"/>
-            <RowDefinition Height="Auto"/>
-            <RowDefinition Height="Auto"/>
-            <RowDefinition Height="Auto"/>
-            <RowDefinition Height="Auto"/>
-            <RowDefinition Height="Auto"/>
-            <RowDefinition Height="Auto"/>
-            <RowDefinition Height="Auto"/>
-        </Grid.RowDefinitions>
-
-        <!-- Header -->
-        <TextBlock Grid.Row="0" x:Name="HeaderText" Text="Create Mute Rule" FontSize="18" FontWeight="Bold"
-                   Foreground="{DynamicResource ForegroundBrush}" Margin="0,0,0,5"/>
-        <TextBlock Grid.Row="1" Text="Alerts matching all specified fields will be suppressed from notifications."
-                   Foreground="{DynamicResource ForegroundDimBrush}" TextWrapping="Wrap" Margin="0,0,0,15"/>
-
-        <!-- Reason -->
-        <TextBlock Grid.Row="2" Text="Reason (optional)" FontWeight="Bold"
-                   Foreground="{DynamicResource ForegroundBrush}" Margin="0,0,0,4"/>
-        <TextBox Grid.Row="3" x:Name="ReasonBox" Margin="0,0,0,12"/>
-
-        <!-- Expiration -->
-        <TextBlock Grid.Row="4" Text="Expires After" FontWeight="Bold"
-                   Foreground="{DynamicResource ForegroundBrush}" Margin="0,0,0,4"/>
-        <ComboBox Grid.Row="5" x:Name="ExpirationCombo" SelectedIndex="3" Margin="0,0,0,12">
-            <ComboBoxItem Content="1 hour"/>
-            <ComboBoxItem Content="24 hours"/>
-            <ComboBoxItem Content="7 days"/>
-            <ComboBoxItem Content="Never (permanent)"/>
-        </ComboBox>
-
-        <!-- Separator -->
-        <Border Grid.Row="6" BorderThickness="0,0,0,1" BorderBrush="{DynamicResource BorderBrush}" Margin="0,0,0,12"/>
-
-        <!-- Match Criteria -->
-        <TextBlock Grid.Row="7" Text="Match Criteria" FontSize="14" FontWeight="SemiBold"
-                   Foreground="{DynamicResource ForegroundBrush}" Margin="0,0,0,4"/>
-        <TextBlock Grid.Row="8" Text="Leave fields blank to match any value. All filled fields must match (AND logic)."
-                   Foreground="{DynamicResource ForegroundDimBrush}" TextWrapping="Wrap" Margin="0,0,0,12"/>
-
-        <!-- Server Name -->
-        <TextBlock Grid.Row="9" Text="Server Name (exact match)" Foreground="{DynamicResource ForegroundBrush}" Margin="0,0,0,4"/>
-        <TextBox Grid.Row="10" x:Name="ServerNameBox" Margin="0,0,0,8"/>
-
-        <!-- Metric Name -->
-        <TextBlock Grid.Row="11" Text="Metric" Foreground="{DynamicResource ForegroundBrush}" Margin="0,0,0,4"/>
-        <ComboBox Grid.Row="12" x:Name="MetricCombo" SelectedIndex="0" Margin="0,0,0,8"
-                  SelectionChanged="MetricCombo_SelectionChanged">
-            <ComboBoxItem Content="(any)"/>
-            <ComboBoxItem Content="Blocking Detected"/>
-            <ComboBoxItem Content="Deadlocks Detected"/>
-            <ComboBoxItem Content="High CPU"/>
-            <ComboBoxItem Content="Poison Wait"/>
-            <ComboBoxItem Content="Long-Running Query"/>
-            <ComboBoxItem Content="TempDB Space"/>
-            <ComboBoxItem Content="Long-Running Job"/>
-        </ComboBox>
-
-        <!-- Pattern fields in a uniform grid -->
-        <Grid Grid.Row="13" x:Name="PatternFieldsGrid" Margin="0,0,0,8">
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="*"/>
-                <ColumnDefinition Width="8"/>
-                <ColumnDefinition Width="*"/>
-            </Grid.ColumnDefinitions>
-            <Grid.RowDefinitions>
-                <RowDefinition Height="Auto"/>
-                <RowDefinition Height="Auto"/>
-                <RowDefinition Height="Auto"/>
-                <RowDefinition Height="Auto"/>
-            </Grid.RowDefinitions>
-
-            <TextBlock Grid.Row="0" Grid.Column="0" x:Name="DatabaseLabel" Text="Database (substring)" Foreground="{DynamicResource ForegroundBrush}" Margin="0,0,0,4"/>
-            <TextBox Grid.Row="1" Grid.Column="0" x:Name="DatabasePatternBox" Margin="0,0,0,8"/>
-
-            <TextBlock Grid.Row="0" Grid.Column="2" x:Name="WaitTypeLabel" Text="Wait Type (substring)" Foreground="{DynamicResource ForegroundBrush}" Margin="0,0,0,4"/>
-            <TextBox Grid.Row="1" Grid.Column="2" x:Name="WaitTypePatternBox" Margin="0,0,0,8"/>
-
-            <TextBlock Grid.Row="2" Grid.Column="0" x:Name="QueryTextLabel" Text="Query Text (substring)" Foreground="{DynamicResource ForegroundBrush}" Margin="0,0,0,4"/>
-            <TextBox Grid.Row="3" Grid.Column="0" x:Name="QueryTextPatternBox" Margin="0,0,0,8"/>
-
-            <TextBlock Grid.Row="2" Grid.Column="2" x:Name="JobNameLabel" Text="Job Name (substring)" Foreground="{DynamicResource ForegroundBrush}" Margin="0,0,0,4"/>
-            <TextBox Grid.Row="3" Grid.Column="2" x:Name="JobNamePatternBox" Margin="0,0,0,8"/>
-        </Grid>
-
-        <!-- Buttons -->
-        <StackPanel Grid.Row="16" Orientation="Horizontal" HorizontalAlignment="Right" Margin="0,12,0,0">
-            <Button Content="Save" Width="80" Height="28" Margin="0,0,8,0"
-                    Click="Save_Click" Style="{StaticResource AccentButton}"/>
-            <Button Content="Cancel" Width="80" Height="28" Click="Cancel_Click" IsCancel="True"/>
-        </StackPanel>
-    </Grid>
-</Window>
+<Window x:Class="PerformanceMonitorDashboard.MuteRuleDialog"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        Title="Create Mute Rule"
+        SizeToContent="Height" Width="500"
+        WindowStartupLocation="CenterOwner"
+        ResizeMode="NoResize"
+        Background="{DynamicResource BackgroundBrush}">
+    <Grid Margin="20">
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="Auto"/>
+        </Grid.RowDefinitions>
+
+        <!-- Header -->
+        <TextBlock Grid.Row="0" x:Name="HeaderText" Text="Create Mute Rule" FontSize="18" FontWeight="Bold"
+                   Foreground="{DynamicResource ForegroundBrush}" Margin="0,0,0,5"/>
+        <TextBlock Grid.Row="1" Text="Alerts matching all specified fields will be suppressed from notifications."
+                   Foreground="{DynamicResource ForegroundDimBrush}" TextWrapping="Wrap" Margin="0,0,0,15"/>
+
+        <!-- Reason -->
+        <TextBlock Grid.Row="2" Text="Reason (optional)" FontWeight="Bold"
+                   Foreground="{DynamicResource ForegroundBrush}" Margin="0,0,0,4"/>
+        <TextBox Grid.Row="3" x:Name="ReasonBox" Margin="0,0,0,12"/>
+
+        <!-- Expiration -->
+        <TextBlock Grid.Row="4" Text="Expires After" FontWeight="Bold"
+                   Foreground="{DynamicResource ForegroundBrush}" Margin="0,0,0,4"/>
+        <ComboBox Grid.Row="5" x:Name="ExpirationCombo" SelectedIndex="3" Margin="0,0,0,12">
+            <ComboBoxItem Content="1 hour"/>
+            <ComboBoxItem Content="24 hours"/>
+            <ComboBoxItem Content="7 days"/>
+            <ComboBoxItem Content="Never (permanent)"/>
+        </ComboBox>
+
+        <!-- Separator -->
+        <Border Grid.Row="6" BorderThickness="0,0,0,1" BorderBrush="{DynamicResource BorderBrush}" Margin="0,0,0,12"/>
+
+        <!-- Match Criteria -->
+        <TextBlock Grid.Row="7" Text="Match Criteria" FontSize="14" FontWeight="SemiBold"
+                   Foreground="{DynamicResource ForegroundBrush}" Margin="0,0,0,4"/>
+        <TextBlock Grid.Row="8" Text="Leave fields blank to match any value. All filled fields must match (AND logic)."
+                   Foreground="{DynamicResource ForegroundDimBrush}" TextWrapping="Wrap" Margin="0,0,0,12"/>
+
+        <!-- Server Name -->
+        <TextBlock Grid.Row="9" Text="Server Name (exact match)" Foreground="{DynamicResource ForegroundBrush}" Margin="0,0,0,4"/>
+        <TextBox Grid.Row="10" x:Name="ServerNameBox" Margin="0,0,0,8"/>
+
+        <!-- Metric Name -->
+        <TextBlock Grid.Row="11" Text="Metric" Foreground="{DynamicResource ForegroundBrush}" Margin="0,0,0,4"/>
+        <ComboBox Grid.Row="12" x:Name="MetricCombo" SelectedIndex="0" Margin="0,0,0,8"
+                  SelectionChanged="MetricCombo_SelectionChanged">
+            <ComboBoxItem Content="(any)"/>
+            <ComboBoxItem Content="Blocking Detected"/>
+            <ComboBoxItem Content="Deadlocks Detected"/>
+            <ComboBoxItem Content="High CPU"/>
+            <ComboBoxItem Content="Poison Wait"/>
+            <ComboBoxItem Content="Long-Running Query"/>
+            <ComboBoxItem Content="TempDB Space"/>
+            <ComboBoxItem Content="Long-Running Job"/>
+        </ComboBox>
+
+        <!-- Pattern fields in a uniform grid -->
+        <Grid Grid.Row="13" x:Name="PatternFieldsGrid" Margin="0,0,0,8">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="*"/>
+                <ColumnDefinition Width="8"/>
+                <ColumnDefinition Width="*"/>
+            </Grid.ColumnDefinitions>
+            <Grid.RowDefinitions>
+                <RowDefinition Height="Auto"/>
+                <RowDefinition Height="Auto"/>
+                <RowDefinition Height="Auto"/>
+                <RowDefinition Height="Auto"/>
+            </Grid.RowDefinitions>
+
+            <TextBlock Grid.Row="0" Grid.Column="0" x:Name="DatabaseLabel" Text="Database (substring)" Foreground="{DynamicResource ForegroundBrush}" Margin="0,0,0,4"/>
+            <TextBox Grid.Row="1" Grid.Column="0" x:Name="DatabasePatternBox" Margin="0,0,0,8"/>
+
+            <TextBlock Grid.Row="0" Grid.Column="2" x:Name="WaitTypeLabel" Text="Wait Type (substring)" Foreground="{DynamicResource ForegroundBrush}" Margin="0,0,0,4"/>
+            <TextBox Grid.Row="1" Grid.Column="2" x:Name="WaitTypePatternBox" Margin="0,0,0,8"/>
+
+            <TextBlock Grid.Row="2" Grid.Column="0" x:Name="QueryTextLabel" Text="Query Text (substring)" Foreground="{DynamicResource ForegroundBrush}" Margin="0,0,0,4"/>
+            <TextBox Grid.Row="3" Grid.Column="0" x:Name="QueryTextPatternBox" Margin="0,0,0,8"
+                     ToolTip="Alerts whose query text contains this value (case-insensitive) will be muted. Use a distinctive fragment such as a table name or procedure call."/>
+
+            <TextBlock Grid.Row="2" Grid.Column="2" x:Name="JobNameLabel" Text="Job Name (substring)" Foreground="{DynamicResource ForegroundBrush}" Margin="0,0,0,4"/>
+            <TextBox Grid.Row="3" Grid.Column="2" x:Name="JobNamePatternBox" Margin="0,0,0,8"/>
+        </Grid>
+
+        <!-- Buttons -->
+        <StackPanel Grid.Row="16" Orientation="Horizontal" HorizontalAlignment="Right" Margin="0,12,0,0">
+            <Button Content="Save" Width="80" Height="28" Margin="0,0,8,0"
+                    Click="Save_Click" Style="{StaticResource AccentButton}"/>
+            <Button Content="Cancel" Width="80" Height="28" Click="Cancel_Click" IsCancel="True"/>
+        </StackPanel>
+    </Grid>
+</Window>
diff --git a/Lite/Windows/MuteRuleDialog.xaml b/Lite/Windows/MuteRuleDialog.xaml
index 8d67fdf4..d9eb08b5 100644
--- a/Lite/Windows/MuteRuleDialog.xaml
+++ b/Lite/Windows/MuteRuleDialog.xaml
@@ -1,113 +1,114 @@
-<Window x:Class="PerformanceMonitorLite.Windows.MuteRuleDialog"
-        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        Title="Create Mute Rule"
-        SizeToContent="Height" Width="500"
-        WindowStartupLocation="CenterOwner"
-        ResizeMode="NoResize"
-        Icon="/EDD.ico"
-        Background="{DynamicResource BackgroundBrush}">
-    <Grid Margin="20">
-        <Grid.RowDefinitions>
-            <RowDefinition Height="Auto"/>
-            <RowDefinition Height="Auto"/>
-            <RowDefinition Height="Auto"/>
-            <RowDefinition Height="Auto"/>
-            <RowDefinition Height="Auto"/>
-            <RowDefinition Height="Auto"/>
-            <RowDefinition Height="Auto"/>
-            <RowDefinition Height="Auto"/>
-            <RowDefinition Height="Auto"/>
-            <RowDefinition Height="Auto"/>
-            <RowDefinition Height="Auto"/>
-            <RowDefinition Height="Auto"/>
-            <RowDefinition Height="Auto"/>
-            <RowDefinition Height="Auto"/>
-            <RowDefinition Height="Auto"/>
-            <RowDefinition Height="Auto"/>
-            <RowDefinition Height="Auto"/>
-        </Grid.RowDefinitions>
-
-        <!-- Header -->
-        <TextBlock Grid.Row="0" x:Name="HeaderText" Text="Create Mute Rule" FontSize="18" FontWeight="Bold"
-                   Foreground="{DynamicResource ForegroundBrush}" Margin="0,0,0,5"/>
-        <TextBlock Grid.Row="1" Text="Alerts matching all specified fields will be suppressed from notifications."
-                   Foreground="{DynamicResource ForegroundDimBrush}" TextWrapping="Wrap" Margin="0,0,0,15"/>
-
-        <!-- Reason -->
-        <TextBlock Grid.Row="2" Text="Reason (optional)" FontWeight="Bold"
-                   Foreground="{DynamicResource ForegroundBrush}" Margin="0,0,0,4"/>
-        <TextBox Grid.Row="3" x:Name="ReasonBox" Margin="0,0,0,12"/>
-
-        <!-- Expiration -->
-        <TextBlock Grid.Row="4" Text="Expires After" FontWeight="Bold"
-                   Foreground="{DynamicResource ForegroundBrush}" Margin="0,0,0,4"/>
-        <ComboBox Grid.Row="5" x:Name="ExpirationCombo" SelectedIndex="3" Margin="0,0,0,12">
-            <ComboBoxItem Content="1 hour"/>
-            <ComboBoxItem Content="24 hours"/>
-            <ComboBoxItem Content="7 days"/>
-            <ComboBoxItem Content="Never (permanent)"/>
-        </ComboBox>
-
-        <!-- Separator -->
-        <Border Grid.Row="6" BorderThickness="0,0,0,1" BorderBrush="{DynamicResource BorderBrush}" Margin="0,0,0,12"/>
-
-        <!-- Match Criteria -->
-        <TextBlock Grid.Row="7" Text="Match Criteria" FontSize="14" FontWeight="SemiBold"
-                   Foreground="{DynamicResource ForegroundBrush}" Margin="0,0,0,4"/>
-        <TextBlock Grid.Row="8" Text="Leave fields blank to match any value. All filled fields must match (AND logic)."
-                   Foreground="{DynamicResource ForegroundDimBrush}" TextWrapping="Wrap" Margin="0,0,0,12"/>
-
-        <!-- Server Name -->
-        <TextBlock Grid.Row="9" Text="Server Name (exact match)" Foreground="{DynamicResource ForegroundBrush}" Margin="0,0,0,4"/>
-        <TextBox Grid.Row="10" x:Name="ServerNameBox" Margin="0,0,0,8"/>
-
-        <!-- Metric Name -->
-        <TextBlock Grid.Row="11" Text="Metric" Foreground="{DynamicResource ForegroundBrush}" Margin="0,0,0,4"/>
-        <ComboBox Grid.Row="12" x:Name="MetricCombo" SelectedIndex="0" Margin="0,0,0,8"
-                  SelectionChanged="MetricCombo_SelectionChanged">
-            <ComboBoxItem Content="(any)"/>
-            <ComboBoxItem Content="Blocking Detected"/>
-            <ComboBoxItem Content="Deadlocks Detected"/>
-            <ComboBoxItem Content="High CPU"/>
-            <ComboBoxItem Content="Poison Wait"/>
-            <ComboBoxItem Content="Long-Running Query"/>
-            <ComboBoxItem Content="TempDB Space"/>
-            <ComboBoxItem Content="Long-Running Job"/>
-        </ComboBox>
-
-        <!-- Pattern fields -->
-        <Grid Grid.Row="13" x:Name="PatternFieldsGrid" Margin="0,0,0,8">
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="*"/>
-                <ColumnDefinition Width="8"/>
-                <ColumnDefinition Width="*"/>
-            </Grid.ColumnDefinitions>
-            <Grid.RowDefinitions>
-                <RowDefinition Height="Auto"/>
-                <RowDefinition Height="Auto"/>
-                <RowDefinition Height="Auto"/>
-                <RowDefinition Height="Auto"/>
-            </Grid.RowDefinitions>
-
-            <TextBlock Grid.Row="0" Grid.Column="0" x:Name="DatabaseLabel" Text="Database (substring)" Foreground="{DynamicResource ForegroundBrush}" Margin="0,0,0,4"/>
-            <TextBox Grid.Row="1" Grid.Column="0" x:Name="DatabasePatternBox" Margin="0,0,0,8"/>
-
-            <TextBlock Grid.Row="0" Grid.Column="2" x:Name="WaitTypeLabel" Text="Wait Type (substring)" Foreground="{DynamicResource ForegroundBrush}" Margin="0,0,0,4"/>
-            <TextBox Grid.Row="1" Grid.Column="2" x:Name="WaitTypePatternBox" Margin="0,0,0,8"/>
-
-            <TextBlock Grid.Row="2" Grid.Column="0" x:Name="QueryTextLabel" Text="Query Text (substring)" Foreground="{DynamicResource ForegroundBrush}" Margin="0,0,0,4"/>
-            <TextBox Grid.Row="3" Grid.Column="0" x:Name="QueryTextPatternBox" Margin="0,0,0,8"/>
-
-            <TextBlock Grid.Row="2" Grid.Column="2" x:Name="JobNameLabel" Text="Job Name (substring)" Foreground="{DynamicResource ForegroundBrush}" Margin="0,0,0,4"/>
-            <TextBox Grid.Row="3" Grid.Column="2" x:Name="JobNamePatternBox" Margin="0,0,0,8"/>
-        </Grid>
-
-        <!-- Buttons -->
-        <StackPanel Grid.Row="16" Orientation="Horizontal" HorizontalAlignment="Right" Margin="0,12,0,0">
-            <Button Content="Save" Width="80" Height="28" Margin="0,0,8,0"
-                    Click="Save_Click" Style="{StaticResource AccentButton}"/>
-            <Button Content="Cancel" Width="80" Height="28" Click="Cancel_Click" IsCancel="True"/>
-        </StackPanel>
-    </Grid>
-</Window>
+<Window x:Class="PerformanceMonitorLite.Windows.MuteRuleDialog"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        Title="Create Mute Rule"
+        SizeToContent="Height" Width="500"
+        WindowStartupLocation="CenterOwner"
+        ResizeMode="NoResize"
+        Icon="/EDD.ico"
+        Background="{DynamicResource BackgroundBrush}">
+    <Grid Margin="20">
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="Auto"/>
+        </Grid.RowDefinitions>
+
+        <!-- Header -->
+        <TextBlock Grid.Row="0" x:Name="HeaderText" Text="Create Mute Rule" FontSize="18" FontWeight="Bold"
+                   Foreground="{DynamicResource ForegroundBrush}" Margin="0,0,0,5"/>
+        <TextBlock Grid.Row="1" Text="Alerts matching all specified fields will be suppressed from notifications."
+                   Foreground="{DynamicResource ForegroundDimBrush}" TextWrapping="Wrap" Margin="0,0,0,15"/>
+
+        <!-- Reason -->
+        <TextBlock Grid.Row="2" Text="Reason (optional)" FontWeight="Bold"
+                   Foreground="{DynamicResource ForegroundBrush}" Margin="0,0,0,4"/>
+        <TextBox Grid.Row="3" x:Name="ReasonBox" Margin="0,0,0,12"/>
+
+        <!-- Expiration -->
+        <TextBlock Grid.Row="4" Text="Expires After" FontWeight="Bold"
+                   Foreground="{DynamicResource ForegroundBrush}" Margin="0,0,0,4"/>
+        <ComboBox Grid.Row="5" x:Name="ExpirationCombo" SelectedIndex="3" Margin="0,0,0,12">
+            <ComboBoxItem Content="1 hour"/>
+            <ComboBoxItem Content="24 hours"/>
+            <ComboBoxItem Content="7 days"/>
+            <ComboBoxItem Content="Never (permanent)"/>
+        </ComboBox>
+
+        <!-- Separator -->
+        <Border Grid.Row="6" BorderThickness="0,0,0,1" BorderBrush="{DynamicResource BorderBrush}" Margin="0,0,0,12"/>
+
+        <!-- Match Criteria -->
+        <TextBlock Grid.Row="7" Text="Match Criteria" FontSize="14" FontWeight="SemiBold"
+                   Foreground="{DynamicResource ForegroundBrush}" Margin="0,0,0,4"/>
+        <TextBlock Grid.Row="8" Text="Leave fields blank to match any value. All filled fields must match (AND logic)."
+                   Foreground="{DynamicResource ForegroundDimBrush}" TextWrapping="Wrap" Margin="0,0,0,12"/>
+
+        <!-- Server Name -->
+        <TextBlock Grid.Row="9" Text="Server Name (exact match)" Foreground="{DynamicResource ForegroundBrush}" Margin="0,0,0,4"/>
+        <TextBox Grid.Row="10" x:Name="ServerNameBox" Margin="0,0,0,8"/>
+
+        <!-- Metric Name -->
+        <TextBlock Grid.Row="11" Text="Metric" Foreground="{DynamicResource ForegroundBrush}" Margin="0,0,0,4"/>
+        <ComboBox Grid.Row="12" x:Name="MetricCombo" SelectedIndex="0" Margin="0,0,0,8"
+                  SelectionChanged="MetricCombo_SelectionChanged">
+            <ComboBoxItem Content="(any)"/>
+            <ComboBoxItem Content="Blocking Detected"/>
+            <ComboBoxItem Content="Deadlocks Detected"/>
+            <ComboBoxItem Content="High CPU"/>
+            <ComboBoxItem Content="Poison Wait"/>
+            <ComboBoxItem Content="Long-Running Query"/>
+            <ComboBoxItem Content="TempDB Space"/>
+            <ComboBoxItem Content="Long-Running Job"/>
+        </ComboBox>
+
+        <!-- Pattern fields -->
+        <Grid Grid.Row="13" x:Name="PatternFieldsGrid" Margin="0,0,0,8">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="*"/>
+                <ColumnDefinition Width="8"/>
+                <ColumnDefinition Width="*"/>
+            </Grid.ColumnDefinitions>
+            <Grid.RowDefinitions>
+                <RowDefinition Height="Auto"/>
+                <RowDefinition Height="Auto"/>
+                <RowDefinition Height="Auto"/>
+                <RowDefinition Height="Auto"/>
+            </Grid.RowDefinitions>
+
+            <TextBlock Grid.Row="0" Grid.Column="0" x:Name="DatabaseLabel" Text="Database (substring)" Foreground="{DynamicResource ForegroundBrush}" Margin="0,0,0,4"/>
+            <TextBox Grid.Row="1" Grid.Column="0" x:Name="DatabasePatternBox" Margin="0,0,0,8"/>
+
+            <TextBlock Grid.Row="0" Grid.Column="2" x:Name="WaitTypeLabel" Text="Wait Type (substring)" Foreground="{DynamicResource ForegroundBrush}" Margin="0,0,0,4"/>
+            <TextBox Grid.Row="1" Grid.Column="2" x:Name="WaitTypePatternBox" Margin="0,0,0,8"/>
+
+            <TextBlock Grid.Row="2" Grid.Column="0" x:Name="QueryTextLabel" Text="Query Text (substring)" Foreground="{DynamicResource ForegroundBrush}" Margin="0,0,0,4"/>
+            <TextBox Grid.Row="3" Grid.Column="0" x:Name="QueryTextPatternBox" Margin="0,0,0,8"
+                     ToolTip="Alerts whose query text contains this value (case-insensitive) will be muted. Use a distinctive fragment such as a table name or procedure call."/>
+
+            <TextBlock Grid.Row="2" Grid.Column="2" x:Name="JobNameLabel" Text="Job Name (substring)" Foreground="{DynamicResource ForegroundBrush}" Margin="0,0,0,4"/>
+            <TextBox Grid.Row="3" Grid.Column="2" x:Name="JobNamePatternBox" Margin="0,0,0,8"/>
+        </Grid>
+
+        <!-- Buttons -->
+        <StackPanel Grid.Row="16" Orientation="Horizontal" HorizontalAlignment="Right" Margin="0,12,0,0">
+            <Button Content="Save" Width="80" Height="28" Margin="0,0,8,0"
+                    Click="Save_Click" Style="{StaticResource AccentButton}"/>
+            <Button Content="Cancel" Width="80" Height="28" Click="Cancel_Click" IsCancel="True"/>
+        </StackPanel>
+    </Grid>
+</Window>

From a906242c9b135573fe9029b1f16de608d6928535 Mon Sep 17 00:00:00 2001
From: Hannah Vernon <hannah@mvct.com>
Date: Fri, 27 Mar 2026 10:19:45 -0500
Subject: [PATCH 5/5] Add dismissed_archive_alerts sidecar table for
 parquet-aware dismissal (#718)

The dismiss flow targets the live config_alert_log table, but alerts
archived to parquet are read-only. This adds a sidecar table that tracks
dismissed archived alerts so the view can filter them out.

Schema:
- New dismissed_archive_alerts table (alert_time, server_id, metric_name,
  dismissed_at) with composite index
- Schema version bumped to 23 with migration

View:
- v_config_alert_log parquet half now excludes rows present in the
  sidecar table via NOT EXISTS

Dismiss logic:
- DismissAlertsAsync: when UPDATE returns 0 rows (archived alert),
  falls back to sidecar INSERT with duplicate prevention
- DismissAllVisibleAlertsAsync: after live UPDATE, inserts remaining
  undismissed archived alerts into the sidecar table

Tests:
- 7 new xUnit tests covering sidecar creation, view filtering, duplicate
  prevention, mixed live+archive dismiss, and schema version
- Updated DuckDbSchemaTests table count from 28 to 29

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 Lite.Tests/DismissedArchiveSidecarTests.cs    |  282 +++
 Lite.Tests/DuckDbSchemaTests.cs               |    4 +-
 Lite.Tests/Helpers/TestAlertDataHelper.cs     |  189 ++
 Lite/Database/DuckDbInitializer.cs            |   35 +-
 Lite/Database/Schema.cs                       | 1544 +++++++++--------
 .../Services/LocalDataService.AlertHistory.cs |   88 +-
 6 files changed, 1366 insertions(+), 776 deletions(-)
 create mode 100644 Lite.Tests/DismissedArchiveSidecarTests.cs
 create mode 100644 Lite.Tests/Helpers/TestAlertDataHelper.cs

diff --git a/Lite.Tests/DismissedArchiveSidecarTests.cs b/Lite.Tests/DismissedArchiveSidecarTests.cs
new file mode 100644
index 00000000..53c61d58
--- /dev/null
+++ b/Lite.Tests/DismissedArchiveSidecarTests.cs
@@ -0,0 +1,282 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Threading.Tasks;
+using DuckDB.NET.Data;
+using PerformanceMonitorLite.Database;
+using PerformanceMonitorLite.Tests.Helpers;
+using Xunit;
+
+namespace PerformanceMonitorLite.Tests;
+
+/// <summary>
+/// Tests that the dismissed_archive_alerts sidecar table allows archived alerts
+/// to be dismissed, and that the archive view filters them out correctly.
+/// </summary>
+public class DismissedArchiveSidecarTests : IDisposable
+{
+    private readonly string _tempDir;
+    private readonly string _dbPath;
+    private readonly TestAlertDataHelper _helper;
+
+    public DismissedArchiveSidecarTests()
+    {
+        _tempDir = Path.Combine(Path.GetTempPath(), "LiteTests_" + Guid.NewGuid().ToString("N")[..8]);
+        Directory.CreateDirectory(_tempDir);
+        _dbPath = Path.Combine(_tempDir, "test.duckdb");
+        _helper = new TestAlertDataHelper(_dbPath);
+    }
+
+    public void Dispose()
+    {
+        try
+        {
+            if (Directory.Exists(_tempDir))
+                Directory.Delete(_tempDir, recursive: true);
+        }
+        catch
+        {
+            /* Best-effort cleanup */
+        }
+    }
+
+    private async Task<DuckDBConnection> InitializeDatabaseAsync()
+    {
+        var initializer = new DuckDbInitializer(_dbPath);
+        await initializer.InitializeAsync();
+
+        var connection = new DuckDBConnection($"Data Source={_dbPath}");
+        await connection.OpenAsync(TestContext.Current.CancellationToken);
+        return connection;
+    }
+
+    [Fact]
+    public async Task SidecarTable_ExistsAfterInit()
+    {
+        using var connection = await InitializeDatabaseAsync();
+
+        using var cmd = connection.CreateCommand();
+        cmd.CommandText = "SELECT COUNT(1) FROM information_schema.tables WHERE table_name = 'dismissed_archive_alerts'";
+        var count = Convert.ToInt32(await cmd.ExecuteScalarAsync(TestContext.Current.CancellationToken));
+
+        Assert.Equal(1, count);
+    }
+
+    [Fact]
+    public async Task SidecarTable_HasCorrectColumns()
+    {
+        using var connection = await InitializeDatabaseAsync();
+
+        using var cmd = connection.CreateCommand();
+        cmd.CommandText = @"
+SELECT column_name
+FROM information_schema.columns
+WHERE table_name = 'dismissed_archive_alerts'
+ORDER BY ordinal_position";
+
+        var columns = new List<string>();
+        using var reader = await cmd.ExecuteReaderAsync(TestContext.Current.CancellationToken);
+        while (await reader.ReadAsync(TestContext.Current.CancellationToken))
+            columns.Add(reader.GetString(0));
+
+        Assert.Equal(new[] { "alert_time", "server_id", "metric_name", "dismissed_at" }, columns);
+    }
+
+    [Fact]
+    public async Task SidecarInsert_HidesArchivedAlertFromView()
+    {
+        using var connection = await InitializeDatabaseAsync();
+
+        var alertTime = DateTime.UtcNow.AddDays(-14);
+        var archivedAlerts = new List<TestAlertRecord>
+        {
+            TestAlertDataHelper.CreateAlert(
+                alertTime: alertTime,
+                serverId: 1,
+                metricName: "High CPU",
+                serverName: "Server1")
+        };
+        await _helper.CreateArchivedAlertsParquetAsync(connection, archivedAlerts);
+        await _helper.RefreshArchiveViewsAsync();
+
+        // Verify alert is visible before sidecar insert
+        using var beforeCmd = connection.CreateCommand();
+        beforeCmd.CommandText = "SELECT COUNT(1) FROM v_config_alert_log WHERE metric_name = 'High CPU'";
+        var beforeCount = Convert.ToInt64(await beforeCmd.ExecuteScalarAsync(TestContext.Current.CancellationToken));
+        Assert.Equal(1, beforeCount);
+
+        // Insert into sidecar
+        using var insertCmd = connection.CreateCommand();
+        insertCmd.CommandText = @"
+INSERT INTO dismissed_archive_alerts (alert_time, server_id, metric_name)
+VALUES ($1, $2, $3)";
+        insertCmd.Parameters.Add(new DuckDBParameter { Value = alertTime });
+        insertCmd.Parameters.Add(new DuckDBParameter { Value = 1 });
+        insertCmd.Parameters.Add(new DuckDBParameter { Value = "High CPU" });
+        await insertCmd.ExecuteNonQueryAsync(TestContext.Current.CancellationToken);
+
+        // Verify alert is now hidden from view
+        using var afterCmd = connection.CreateCommand();
+        afterCmd.CommandText = "SELECT COUNT(1) FROM v_config_alert_log WHERE metric_name = 'High CPU'";
+        var afterCount = Convert.ToInt64(await afterCmd.ExecuteScalarAsync(TestContext.Current.CancellationToken));
+        Assert.Equal(0, afterCount);
+    }
+
+    [Fact]
+    public async Task SidecarInsert_DoesNotAffectLiveAlerts()
+    {
+        using var connection = await InitializeDatabaseAsync();
+
+        // Insert a live alert
+        var liveTime = DateTime.UtcNow.AddHours(-1);
+        await _helper.InsertLiveAlertAsync(connection, liveTime, 1, "Server1", "Blocking");
+
+        // Insert an archived alert
+        var archiveTime = DateTime.UtcNow.AddDays(-14);
+        var archivedAlerts = new List<TestAlertRecord>
+        {
+            TestAlertDataHelper.CreateAlert(
+                alertTime: archiveTime,
+                serverId: 1,
+                metricName: "High CPU",
+                serverName: "Server1")
+        };
+        await _helper.CreateArchivedAlertsParquetAsync(connection, archivedAlerts);
+        await _helper.RefreshArchiveViewsAsync();
+
+        // Dismiss the archived alert via sidecar
+        using var insertCmd = connection.CreateCommand();
+        insertCmd.CommandText = @"
+INSERT INTO dismissed_archive_alerts (alert_time, server_id, metric_name)
+VALUES ($1, $2, $3)";
+        insertCmd.Parameters.Add(new DuckDBParameter { Value = archiveTime });
+        insertCmd.Parameters.Add(new DuckDBParameter { Value = 1 });
+        insertCmd.Parameters.Add(new DuckDBParameter { Value = "High CPU" });
+        await insertCmd.ExecuteNonQueryAsync(TestContext.Current.CancellationToken);
+
+        // Live alert should still be visible
+        using var checkCmd = connection.CreateCommand();
+        checkCmd.CommandText = "SELECT COUNT(1) FROM v_config_alert_log WHERE metric_name = 'Blocking'";
+        var liveCount = Convert.ToInt64(await checkCmd.ExecuteScalarAsync(TestContext.Current.CancellationToken));
+        Assert.Equal(1, liveCount);
+
+        // Archived alert should be hidden
+        using var archiveCmd = connection.CreateCommand();
+        archiveCmd.CommandText = "SELECT COUNT(1) FROM v_config_alert_log WHERE metric_name = 'High CPU'";
+        var archiveCount = Convert.ToInt64(await archiveCmd.ExecuteScalarAsync(TestContext.Current.CancellationToken));
+        Assert.Equal(0, archiveCount);
+    }
+
+    [Fact]
+    public async Task SidecarInsert_PreventsDuplicates()
+    {
+        using var connection = await InitializeDatabaseAsync();
+
+        var alertTime = DateTime.UtcNow.AddDays(-14);
+
+        // Insert the same sidecar entry twice using the NOT EXISTS pattern
+        for (int i = 0; i < 2; i++)
+        {
+            using var cmd = connection.CreateCommand();
+            cmd.CommandText = @"
+INSERT INTO dismissed_archive_alerts (alert_time, server_id, metric_name)
+SELECT $1, $2, $3
+WHERE NOT EXISTS (
+    SELECT 1 FROM dismissed_archive_alerts
+    WHERE  alert_time = $1
+    AND    server_id  = $2
+    AND    metric_name = $3
+)";
+            cmd.Parameters.Add(new DuckDBParameter { Value = alertTime });
+            cmd.Parameters.Add(new DuckDBParameter { Value = 1 });
+            cmd.Parameters.Add(new DuckDBParameter { Value = "High CPU" });
+            await cmd.ExecuteNonQueryAsync(TestContext.Current.CancellationToken);
+        }
+
+        // Verify only one row exists
+        using var countCmd = connection.CreateCommand();
+        countCmd.CommandText = "SELECT COUNT(1) FROM dismissed_archive_alerts";
+        var count = Convert.ToInt64(await countCmd.ExecuteScalarAsync(TestContext.Current.CancellationToken));
+        Assert.Equal(1, count);
+    }
+
+    [Fact]
+    public async Task DismissAll_HandlesLiveAndArchivedAlerts()
+    {
+        using var connection = await InitializeDatabaseAsync();
+
+        // Insert live alerts
+        var liveTime1 = DateTime.UtcNow.AddHours(-1);
+        var liveTime2 = DateTime.UtcNow.AddHours(-2);
+        await _helper.InsertLiveAlertAsync(connection, liveTime1, 1, "Server1", "High CPU");
+        await _helper.InsertLiveAlertAsync(connection, liveTime2, 1, "Server1", "Blocking");
+
+        // Create archived alerts
+        var archiveTime = DateTime.UtcNow.AddDays(-3);
+        var archivedAlerts = new List<TestAlertRecord>
+        {
+            TestAlertDataHelper.CreateAlert(
+                alertTime: archiveTime,
+                serverId: 1,
+                metricName: "Deadlock Detected",
+                serverName: "Server1")
+        };
+        await _helper.CreateArchivedAlertsParquetAsync(connection, archivedAlerts);
+        await _helper.RefreshArchiveViewsAsync();
+
+        // Verify 3 alerts visible
+        using var beforeCmd = connection.CreateCommand();
+        beforeCmd.CommandText = "SELECT COUNT(1) FROM v_config_alert_log WHERE dismissed = FALSE";
+        var beforeCount = Convert.ToInt64(await beforeCmd.ExecuteScalarAsync(TestContext.Current.CancellationToken));
+        Assert.Equal(3, beforeCount);
+
+        // Dismiss all live alerts
+        using var updateCmd = connection.CreateCommand();
+        updateCmd.CommandText = @"
+UPDATE config_alert_log
+SET    dismissed = TRUE
+WHERE  dismissed = FALSE";
+        var liveAffected = await updateCmd.ExecuteNonQueryAsync(TestContext.Current.CancellationToken);
+        Assert.Equal(2, liveAffected);
+
+        // Insert archived alert into sidecar (simulates what DismissAllVisibleAlertsAsync does)
+        using var sidecarCmd = connection.CreateCommand();
+        sidecarCmd.CommandText = @"
+INSERT INTO dismissed_archive_alerts (alert_time, server_id, metric_name)
+SELECT v.alert_time, v.server_id, v.metric_name
+FROM   v_config_alert_log v
+WHERE  v.dismissed = FALSE
+AND    NOT EXISTS (
+    SELECT 1 FROM config_alert_log l
+    WHERE  l.alert_time = v.alert_time
+    AND    l.server_id  = v.server_id
+    AND    l.metric_name = v.metric_name
+)
+AND    NOT EXISTS (
+    SELECT 1 FROM dismissed_archive_alerts d
+    WHERE  d.alert_time = v.alert_time
+    AND    d.server_id  = v.server_id
+    AND    d.metric_name = v.metric_name
+)";
+        var archivedAffected = await sidecarCmd.ExecuteNonQueryAsync(TestContext.Current.CancellationToken);
+        Assert.Equal(1, archivedAffected);
+
+        // All alerts should now be hidden from view
+        using var afterCmd = connection.CreateCommand();
+        afterCmd.CommandText = "SELECT COUNT(1) FROM v_config_alert_log WHERE dismissed = FALSE";
+        var afterCount = Convert.ToInt64(await afterCmd.ExecuteScalarAsync(TestContext.Current.CancellationToken));
+        Assert.Equal(0, afterCount);
+    }
+
+    [Fact]
+    public async Task SchemaVersion_IsUpdatedTo23()
+    {
+        using var connection = await InitializeDatabaseAsync();
+
+        using var cmd = connection.CreateCommand();
+        cmd.CommandText = "SELECT MAX(version) FROM schema_version";
+        var version = Convert.ToInt32(await cmd.ExecuteScalarAsync(TestContext.Current.CancellationToken));
+
+        Assert.Equal(23, version);
+    }
+}
diff --git a/Lite.Tests/DuckDbSchemaTests.cs b/Lite.Tests/DuckDbSchemaTests.cs
index a1b68f58..c0526f64 100644
--- a/Lite.Tests/DuckDbSchemaTests.cs
+++ b/Lite.Tests/DuckDbSchemaTests.cs
@@ -138,8 +138,8 @@ public void SchemaStatements_MatchTableCount()
         foreach (var _ in Schema.GetAllTableStatements())
             tableCount++;
 
-        /* 28 tables from Schema (schema_version is created separately by DuckDbInitializer) */
-        Assert.Equal(28, tableCount);
+        /* 29 tables from Schema (schema_version is created separately by DuckDbInitializer) */
+        Assert.Equal(29, tableCount);
     }
 
     [Fact]
diff --git a/Lite.Tests/Helpers/TestAlertDataHelper.cs b/Lite.Tests/Helpers/TestAlertDataHelper.cs
new file mode 100644
index 00000000..0a44ff51
--- /dev/null
+++ b/Lite.Tests/Helpers/TestAlertDataHelper.cs
@@ -0,0 +1,189 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Threading.Tasks;
+using DuckDB.NET.Data;
+using PerformanceMonitorLite.Database;
+
+namespace PerformanceMonitorLite.Tests.Helpers;
+
+/// <summary>
+/// Helper for inserting test alert data into DuckDB live tables and archived parquet files.
+/// </summary>
+public class TestAlertDataHelper
+{
+    private readonly string _dbPath;
+    private readonly string _archivePath;
+
+    public TestAlertDataHelper(string dbPath)
+    {
+        _dbPath = dbPath;
+        _archivePath = Path.Combine(Path.GetDirectoryName(dbPath) ?? ".", "archive");
+        Directory.CreateDirectory(_archivePath);
+    }
+
+    public string ArchivePath => _archivePath;
+
+    /// <summary>
+    /// Inserts a single alert row into the live config_alert_log table.
+    /// </summary>
+    public async Task InsertLiveAlertAsync(
+        DuckDBConnection connection,
+        DateTime alertTime,
+        int serverId,
+        string serverName,
+        string metricName,
+        double currentValue = 95.0,
+        double thresholdValue = 80.0,
+        bool alertSent = true,
+        string notificationType = "tray",
+        string? sendError = null,
+        bool dismissed = false,
+        bool muted = false,
+        string? detailText = null)
+    {
+        using var cmd = connection.CreateCommand();
+        cmd.CommandText = @"
+INSERT INTO config_alert_log
+    (alert_time, server_id, server_name, metric_name, current_value,
+     threshold_value, alert_sent, notification_type, send_error,
+     dismissed, muted, detail_text)
+VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12)";
+        cmd.Parameters.Add(new DuckDBParameter { Value = alertTime });
+        cmd.Parameters.Add(new DuckDBParameter { Value = serverId });
+        cmd.Parameters.Add(new DuckDBParameter { Value = serverName });
+        cmd.Parameters.Add(new DuckDBParameter { Value = metricName });
+        cmd.Parameters.Add(new DuckDBParameter { Value = currentValue });
+        cmd.Parameters.Add(new DuckDBParameter { Value = thresholdValue });
+        cmd.Parameters.Add(new DuckDBParameter { Value = alertSent });
+        cmd.Parameters.Add(new DuckDBParameter { Value = notificationType });
+        cmd.Parameters.Add(new DuckDBParameter { Value = sendError ?? (object)DBNull.Value });
+        cmd.Parameters.Add(new DuckDBParameter { Value = dismissed });
+        cmd.Parameters.Add(new DuckDBParameter { Value = muted });
+        cmd.Parameters.Add(new DuckDBParameter { Value = detailText ?? (object)DBNull.Value });
+        await cmd.ExecuteNonQueryAsync();
+    }
+
+    /// <summary>
+    /// Creates a parquet file in the archive directory containing the specified alert rows.
+    /// Uses a staging table to avoid touching the live config_alert_log table.
+    /// The parquet file is named to match the ArchiveService naming convention.
+    /// </summary>
+    public async Task CreateArchivedAlertsParquetAsync(
+        DuckDBConnection connection,
+        List<TestAlertRecord> alerts,
+        string? parquetFileName = null)
+    {
+        parquetFileName ??= $"20260101_0000_config_alert_log.parquet";
+        var parquetPath = Path.Combine(_archivePath, parquetFileName).Replace("\\", "/");
+
+        using var createCmd = connection.CreateCommand();
+        createCmd.CommandText = @"
+CREATE TEMP TABLE _staging_alerts (
+    alert_time TIMESTAMP NOT NULL,
+    server_id INTEGER NOT NULL,
+    server_name VARCHAR NOT NULL,
+    metric_name VARCHAR NOT NULL,
+    current_value DOUBLE NOT NULL,
+    threshold_value DOUBLE NOT NULL,
+    alert_sent BOOLEAN NOT NULL DEFAULT false,
+    notification_type VARCHAR NOT NULL DEFAULT 'tray',
+    send_error VARCHAR,
+    dismissed BOOLEAN NOT NULL DEFAULT false,
+    muted BOOLEAN NOT NULL DEFAULT false,
+    detail_text VARCHAR
+)";
+        await createCmd.ExecuteNonQueryAsync();
+
+        foreach (var alert in alerts)
+        {
+            using var insertCmd = connection.CreateCommand();
+            insertCmd.CommandText = @"
+INSERT INTO _staging_alerts
+    (alert_time, server_id, server_name, metric_name, current_value,
+     threshold_value, alert_sent, notification_type, send_error,
+     dismissed, muted, detail_text)
+VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12)";
+            insertCmd.Parameters.Add(new DuckDBParameter { Value = alert.AlertTime });
+            insertCmd.Parameters.Add(new DuckDBParameter { Value = alert.ServerId });
+            insertCmd.Parameters.Add(new DuckDBParameter { Value = alert.ServerName });
+            insertCmd.Parameters.Add(new DuckDBParameter { Value = alert.MetricName });
+            insertCmd.Parameters.Add(new DuckDBParameter { Value = alert.CurrentValue });
+            insertCmd.Parameters.Add(new DuckDBParameter { Value = alert.ThresholdValue });
+            insertCmd.Parameters.Add(new DuckDBParameter { Value = alert.AlertSent });
+            insertCmd.Parameters.Add(new DuckDBParameter { Value = alert.NotificationType });
+            insertCmd.Parameters.Add(new DuckDBParameter { Value = alert.SendError ?? (object)DBNull.Value });
+            insertCmd.Parameters.Add(new DuckDBParameter { Value = alert.Dismissed });
+            insertCmd.Parameters.Add(new DuckDBParameter { Value = alert.Muted });
+            insertCmd.Parameters.Add(new DuckDBParameter { Value = alert.DetailText ?? (object)DBNull.Value });
+            await insertCmd.ExecuteNonQueryAsync();
+        }
+
+        using var copyCmd = connection.CreateCommand();
+        copyCmd.CommandText = $"COPY _staging_alerts TO '{parquetPath}' (FORMAT PARQUET)";
+        await copyCmd.ExecuteNonQueryAsync();
+
+        using var dropCmd = connection.CreateCommand();
+        dropCmd.CommandText = "DROP TABLE _staging_alerts";
+        await dropCmd.ExecuteNonQueryAsync();
+    }
+
+    /// <summary>
+    /// Recreates archive views so they pick up newly created parquet files.
+    /// </summary>
+    public async Task RefreshArchiveViewsAsync()
+    {
+        var initializer = new DuckDbInitializer(_dbPath);
+        await initializer.CreateArchiveViewsAsync();
+    }
+
+    /// <summary>
+    /// Creates a test alert record with sensible defaults. Adjust properties as needed.
+    /// </summary>
+    public static TestAlertRecord CreateAlert(
+        DateTime? alertTime = null,
+        int serverId = 1,
+        string serverName = "TestServer",
+        string metricName = "High CPU",
+        double currentValue = 95.0,
+        double thresholdValue = 80.0,
+        bool dismissed = false,
+        bool muted = false,
+        string? detailText = null)
+    {
+        return new TestAlertRecord
+        {
+            AlertTime = alertTime ?? DateTime.UtcNow.AddDays(-10),
+            ServerId = serverId,
+            ServerName = serverName,
+            MetricName = metricName,
+            CurrentValue = currentValue,
+            ThresholdValue = thresholdValue,
+            AlertSent = true,
+            NotificationType = "tray",
+            SendError = null,
+            Dismissed = dismissed,
+            Muted = muted,
+            DetailText = detailText
+        };
+    }
+}
+
+/// <summary>
+/// Plain record for constructing test alert data.
+/// </summary>
+public class TestAlertRecord
+{
+    public DateTime AlertTime { get; set; }
+    public int ServerId { get; set; }
+    public string ServerName { get; set; } = "TestServer";
+    public string MetricName { get; set; } = "High CPU";
+    public double CurrentValue { get; set; } = 95.0;
+    public double ThresholdValue { get; set; } = 80.0;
+    public bool AlertSent { get; set; } = true;
+    public string NotificationType { get; set; } = "tray";
+    public string? SendError { get; set; }
+    public bool Dismissed { get; set; }
+    public bool Muted { get; set; }
+    public string? DetailText { get; set; }
+}
diff --git a/Lite/Database/DuckDbInitializer.cs b/Lite/Database/DuckDbInitializer.cs
index 1a2c9876..cf11d36e 100644
--- a/Lite/Database/DuckDbInitializer.cs
+++ b/Lite/Database/DuckDbInitializer.cs
@@ -86,7 +86,7 @@ public void Dispose()
     /// <summary>
     /// Current schema version. Increment this when schema changes require table rebuilds.
     /// </summary>
-    internal const int CurrentSchemaVersion = 22;
+    internal const int CurrentSchemaVersion = 23;
 
     private readonly string _archivePath;
 
@@ -599,6 +599,21 @@ New tables only — no existing table changes needed. Tables created by
                 throw;
             }
         }
+
+        if (fromVersion < 23)
+        {
+            _logger?.LogInformation("Running migration to v23: adding dismissed_archive_alerts sidecar table");
+            try
+            {
+                await ExecuteNonQueryAsync(connection, Schema.CreateDismissedArchiveAlertsTable);
+                await ExecuteNonQueryAsync(connection, Schema.CreateDismissedArchiveAlertsIndex);
+            }
+            catch (Exception ex)
+            {
+                _logger?.LogError(ex, "Migration to v23 failed");
+                throw;
+            }
+        }
     }
 
     /// <summary>
@@ -685,7 +700,23 @@ public async Task CreateArchiveViewsAsync()
                 if (hasParquetFiles)
                 {
                     var globPath = parquetGlob.Replace("\\", "/");
-                    viewSql = $"CREATE OR REPLACE VIEW v_{table} AS SELECT * FROM {table} UNION ALL BY NAME SELECT * FROM read_parquet('{globPath}', union_by_name=true)";
+                    if (table == "config_alert_log")
+                    {
+                        viewSql = $@"CREATE OR REPLACE VIEW v_{table} AS
+SELECT * FROM {table}
+UNION ALL BY NAME
+SELECT * FROM read_parquet('{globPath}', union_by_name=true) p
+WHERE NOT EXISTS (
+    SELECT 1 FROM dismissed_archive_alerts d
+    WHERE d.alert_time = p.alert_time
+    AND   d.server_id  = p.server_id
+    AND   d.metric_name = p.metric_name
+)";
+                    }
+                    else
+                    {
+                        viewSql = $"CREATE OR REPLACE VIEW v_{table} AS SELECT * FROM {table} UNION ALL BY NAME SELECT * FROM read_parquet('{globPath}', union_by_name=true)";
+                    }
                 }
                 else
                 {
diff --git a/Lite/Database/Schema.cs b/Lite/Database/Schema.cs
index 41aae344..09ccc1a0 100644
--- a/Lite/Database/Schema.cs
+++ b/Lite/Database/Schema.cs
@@ -1,765 +1,779 @@
-using System.Collections.Generic;
-
-namespace PerformanceMonitorLite.Database;
-
-/// <summary>
-/// Contains all DuckDB table schema definitions as SQL constants.
-/// </summary>
-public static class Schema
-{
-    public const string CreateServersTable = @"
-CREATE TABLE IF NOT EXISTS servers (
-    server_id INTEGER PRIMARY KEY,
-    server_name VARCHAR NOT NULL,
-    display_name VARCHAR,
-    use_windows_auth BOOLEAN NOT NULL DEFAULT TRUE,
-    username VARCHAR,
-    is_enabled BOOLEAN NOT NULL DEFAULT TRUE,
-    created_date TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
-    modified_date TIMESTAMP DEFAULT CURRENT_TIMESTAMP
-)";
-
-    public const string CreateCollectionScheduleTable = @"
-CREATE TABLE IF NOT EXISTS collection_schedule (
-    schedule_id INTEGER PRIMARY KEY,
-    collector_name VARCHAR NOT NULL UNIQUE,
-    enabled BOOLEAN NOT NULL DEFAULT TRUE,
-    frequency_minutes INTEGER NOT NULL DEFAULT 15,
-    last_run_time TIMESTAMP,
-    next_run_time TIMESTAMP,
-    max_duration_minutes INTEGER DEFAULT 5,
-    retention_days INTEGER DEFAULT 30,
-    description VARCHAR,
-    created_date TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
-    modified_date TIMESTAMP DEFAULT CURRENT_TIMESTAMP
-)";
-
-    public const string CreateCollectionLogTable = @"
-CREATE TABLE IF NOT EXISTS collection_log (
-    log_id BIGINT PRIMARY KEY,
-    server_id INTEGER NOT NULL,
-    server_name VARCHAR,
-    collector_name VARCHAR NOT NULL,
-    collection_time TIMESTAMP NOT NULL,
-    duration_ms INTEGER,
-    status VARCHAR NOT NULL,
-    error_message VARCHAR,
-    rows_collected INTEGER,
-    sql_duration_ms INTEGER,
-    duckdb_duration_ms INTEGER
-)";
-
-    public const string CreateWaitStatsTable = @"
-CREATE TABLE IF NOT EXISTS wait_stats (
-    collection_id BIGINT PRIMARY KEY,
-    collection_time TIMESTAMP NOT NULL,
-    server_id INTEGER NOT NULL,
-    server_name VARCHAR NOT NULL,
-    wait_type VARCHAR NOT NULL,
-    waiting_tasks_count BIGINT,
-    wait_time_ms BIGINT,
-    signal_wait_time_ms BIGINT,
-    delta_waiting_tasks BIGINT,
-    delta_wait_time_ms BIGINT,
-    delta_signal_wait_time_ms BIGINT
-)";
-
-    public const string CreateQueryStatsTable = @"
-CREATE TABLE IF NOT EXISTS query_stats (
-    collection_id BIGINT PRIMARY KEY,
-    collection_time TIMESTAMP NOT NULL,
-    server_id INTEGER NOT NULL,
-    server_name VARCHAR NOT NULL,
-    database_name VARCHAR,
-    query_hash VARCHAR,
-    query_plan_hash VARCHAR,
-    creation_time TIMESTAMP,
-    last_execution_time TIMESTAMP,
-    execution_count BIGINT,
-    total_worker_time BIGINT,
-    total_elapsed_time BIGINT,
-    total_logical_reads BIGINT,
-    total_logical_writes BIGINT,
-    total_physical_reads BIGINT,
-    total_clr_time BIGINT,
-    total_rows BIGINT,
-    total_spills BIGINT,
-    min_worker_time BIGINT,
-    max_worker_time BIGINT,
-    min_elapsed_time BIGINT,
-    max_elapsed_time BIGINT,
-    min_physical_reads BIGINT,
-    max_physical_reads BIGINT,
-    min_rows BIGINT,
-    max_rows BIGINT,
-    min_dop BIGINT,
-    max_dop BIGINT,
-    min_grant_kb BIGINT,
-    max_grant_kb BIGINT,
-    min_used_grant_kb BIGINT,
-    max_used_grant_kb BIGINT,
-    min_ideal_grant_kb BIGINT,
-    max_ideal_grant_kb BIGINT,
-    min_reserved_threads BIGINT,
-    max_reserved_threads BIGINT,
-    min_used_threads BIGINT,
-    max_used_threads BIGINT,
-    min_spills BIGINT,
-    max_spills BIGINT,
-    query_text VARCHAR,
-    query_plan_xml VARCHAR,
-    sql_handle VARCHAR,
-    plan_handle VARCHAR,
-    delta_execution_count BIGINT,
-    delta_worker_time BIGINT,
-    delta_elapsed_time BIGINT,
-    delta_logical_reads BIGINT,
-    delta_logical_writes BIGINT,
-    delta_physical_reads BIGINT,
-    delta_rows BIGINT,
-    delta_spills BIGINT
-)";
-
-    public const string CreateCpuUtilizationStatsTable = @"
-CREATE TABLE IF NOT EXISTS cpu_utilization_stats (
-    collection_id BIGINT PRIMARY KEY,
-    collection_time TIMESTAMP NOT NULL,
-    server_id INTEGER NOT NULL,
-    server_name VARCHAR NOT NULL,
-    sample_time TIMESTAMP NOT NULL,
-    sqlserver_cpu_utilization INTEGER,
-    other_process_cpu_utilization INTEGER
-)";
-
-    public const string CreateFileIoStatsTable = @"
-CREATE TABLE IF NOT EXISTS file_io_stats (
-    collection_id BIGINT PRIMARY KEY,
-    collection_time TIMESTAMP NOT NULL,
-    server_id INTEGER NOT NULL,
-    server_name VARCHAR NOT NULL,
-    database_name VARCHAR,
-    file_name VARCHAR,
-    file_type VARCHAR,
-    physical_name VARCHAR,
-    size_mb DECIMAL(18,2),
-    num_of_reads BIGINT,
-    num_of_writes BIGINT,
-    read_bytes BIGINT,
-    write_bytes BIGINT,
-    io_stall_read_ms BIGINT,
-    io_stall_write_ms BIGINT,
-    io_stall_queued_read_ms BIGINT,
-    io_stall_queued_write_ms BIGINT,
-    delta_reads BIGINT,
-    delta_writes BIGINT,
-    delta_read_bytes BIGINT,
-    delta_write_bytes BIGINT,
-    delta_stall_read_ms BIGINT,
-    delta_stall_write_ms BIGINT,
-    delta_stall_queued_read_ms BIGINT,
-    delta_stall_queued_write_ms BIGINT
-)";
-
-    public const string CreateMemoryStatsTable = @"
-CREATE TABLE IF NOT EXISTS memory_stats (
-    collection_id BIGINT PRIMARY KEY,
-    collection_time TIMESTAMP NOT NULL,
-    server_id INTEGER NOT NULL,
-    server_name VARCHAR NOT NULL,
-    total_physical_memory_mb DECIMAL(18,2),
-    available_physical_memory_mb DECIMAL(18,2),
-    total_page_file_mb DECIMAL(18,2),
-    available_page_file_mb DECIMAL(18,2),
-    system_memory_state VARCHAR,
-    sql_memory_model VARCHAR,
-    target_server_memory_mb DECIMAL(18,2),
-    total_server_memory_mb DECIMAL(18,2),
-    buffer_pool_mb DECIMAL(18,2),
-    plan_cache_mb DECIMAL(18,2),
-    max_workers_count INTEGER,
-    current_workers_count INTEGER
-)";
-
-    public const string CreateMemoryClerksTable = @"
-CREATE TABLE IF NOT EXISTS memory_clerks (
-    collection_id BIGINT PRIMARY KEY,
-    collection_time TIMESTAMP NOT NULL,
-    server_id INTEGER NOT NULL,
-    server_name VARCHAR NOT NULL,
-    clerk_type VARCHAR NOT NULL,
-    memory_mb DECIMAL(18,2)
-)";
-
-    public const string CreateDeadlocksTable = @"
-CREATE TABLE IF NOT EXISTS deadlocks (
-    deadlock_id BIGINT PRIMARY KEY,
-    collection_time TIMESTAMP NOT NULL,
-    server_id INTEGER NOT NULL,
-    server_name VARCHAR NOT NULL,
-    deadlock_time TIMESTAMP,
-    victim_process_id VARCHAR,
-    victim_sql_text VARCHAR,
-    deadlock_graph_xml VARCHAR
-)";
-
-    public const string CreateProcedureStatsTable = @"
-CREATE TABLE IF NOT EXISTS procedure_stats (
-    collection_id BIGINT PRIMARY KEY,
-    collection_time TIMESTAMP NOT NULL,
-    server_id INTEGER NOT NULL,
-    server_name VARCHAR NOT NULL,
-    database_name VARCHAR,
-    schema_name VARCHAR,
-    object_name VARCHAR,
-    object_type VARCHAR,
-    cached_time TIMESTAMP,
-    last_execution_time TIMESTAMP,
-    execution_count BIGINT,
-    total_worker_time BIGINT,
-    total_elapsed_time BIGINT,
-    total_logical_reads BIGINT,
-    total_physical_reads BIGINT,
-    total_logical_writes BIGINT,
-    min_worker_time BIGINT,
-    max_worker_time BIGINT,
-    min_elapsed_time BIGINT,
-    max_elapsed_time BIGINT,
-    min_logical_reads BIGINT,
-    max_logical_reads BIGINT,
-    min_physical_reads BIGINT,
-    max_physical_reads BIGINT,
-    min_logical_writes BIGINT,
-    max_logical_writes BIGINT,
-    total_spills BIGINT,
-    min_spills BIGINT,
-    max_spills BIGINT,
-    sql_handle VARCHAR,
-    plan_handle VARCHAR,
-    delta_execution_count BIGINT,
-    delta_worker_time BIGINT,
-    delta_elapsed_time BIGINT,
-    delta_logical_reads BIGINT,
-    delta_logical_writes BIGINT,
-    delta_physical_reads BIGINT
-)";
-
-    public const string CreateQueryStoreStatsTable = @"
-CREATE TABLE IF NOT EXISTS query_store_stats (
-    collection_id BIGINT PRIMARY KEY,
-    collection_time TIMESTAMP NOT NULL,
-    server_id INTEGER NOT NULL,
-    server_name VARCHAR NOT NULL,
-    database_name VARCHAR NOT NULL,
-    query_id BIGINT,
-    plan_id BIGINT,
-    execution_type_desc VARCHAR,
-    first_execution_time TIMESTAMP,
-    last_execution_time TIMESTAMP,
-    module_name VARCHAR,
-    query_text VARCHAR,
-    query_hash VARCHAR,
-    execution_count BIGINT,
-    avg_duration_us BIGINT,
-    min_duration_us BIGINT,
-    max_duration_us BIGINT,
-    avg_cpu_time_us BIGINT,
-    min_cpu_time_us BIGINT,
-    max_cpu_time_us BIGINT,
-    avg_logical_io_reads BIGINT,
-    min_logical_io_reads BIGINT,
-    max_logical_io_reads BIGINT,
-    avg_logical_io_writes BIGINT,
-    min_logical_io_writes BIGINT,
-    max_logical_io_writes BIGINT,
-    avg_physical_io_reads BIGINT,
-    min_physical_io_reads BIGINT,
-    max_physical_io_reads BIGINT,
-    avg_clr_time_us BIGINT,
-    min_clr_time_us BIGINT,
-    max_clr_time_us BIGINT,
-    min_dop BIGINT,
-    max_dop BIGINT,
-    avg_query_max_used_memory BIGINT,
-    min_query_max_used_memory BIGINT,
-    max_query_max_used_memory BIGINT,
-    avg_rowcount BIGINT,
-    min_rowcount BIGINT,
-    max_rowcount BIGINT,
-    avg_num_physical_io_reads BIGINT,
-    min_num_physical_io_reads BIGINT,
-    max_num_physical_io_reads BIGINT,
-    avg_log_bytes_used BIGINT,
-    min_log_bytes_used BIGINT,
-    max_log_bytes_used BIGINT,
-    avg_tempdb_space_used BIGINT,
-    min_tempdb_space_used BIGINT,
-    max_tempdb_space_used BIGINT,
-    plan_type VARCHAR,
-    plan_forcing_type VARCHAR,
-    is_forced_plan BOOLEAN,
-    force_failure_count BIGINT,
-    last_force_failure_reason VARCHAR,
-    compatibility_level INTEGER,
-    query_plan_text VARCHAR,
-    query_plan_hash VARCHAR
-)";
-
-    public const string CreateQuerySnapshotsTable = @"
-CREATE TABLE IF NOT EXISTS query_snapshots (
-    collection_id BIGINT PRIMARY KEY,
-    collection_time TIMESTAMP NOT NULL,
-    server_id INTEGER NOT NULL,
-    server_name VARCHAR NOT NULL,
-    session_id INTEGER,
-    database_name VARCHAR,
-    elapsed_time_formatted VARCHAR,
-    query_text VARCHAR,
-    query_plan VARCHAR,
-    live_query_plan VARCHAR,
-    status VARCHAR,
-    blocking_session_id INTEGER,
-    wait_type VARCHAR,
-    wait_time_ms BIGINT,
-    wait_resource VARCHAR,
-    cpu_time_ms BIGINT,
-    total_elapsed_time_ms BIGINT,
-    reads BIGINT,
-    writes BIGINT,
-    logical_reads BIGINT,
-    granted_query_memory_gb DECIMAL(18,2),
-    transaction_isolation_level VARCHAR,
-    dop INTEGER,
-    parallel_worker_count INTEGER,
-    login_name VARCHAR,
-    host_name VARCHAR,
-    program_name VARCHAR,
-    open_transaction_count INTEGER,
-    percent_complete DECIMAL(5,2)
-)";
-
-    public const string CreateTempdbStatsTable = @"
-CREATE TABLE IF NOT EXISTS tempdb_stats (
-    collection_id BIGINT PRIMARY KEY,
-    collection_time TIMESTAMP NOT NULL,
-    server_id INTEGER NOT NULL,
-    server_name VARCHAR NOT NULL,
-    user_object_reserved_mb DECIMAL(18,2),
-    internal_object_reserved_mb DECIMAL(18,2),
-    version_store_reserved_mb DECIMAL(18,2),
-    total_reserved_mb DECIMAL(18,2),
-    unallocated_mb DECIMAL(18,2),
-    total_sessions_using_tempdb BIGINT,
-    top_session_id INTEGER,
-    top_session_tempdb_mb DECIMAL(18,2)
-)";
-
-    public const string CreatePerfmonStatsTable = @"
-CREATE TABLE IF NOT EXISTS perfmon_stats (
-    collection_id BIGINT PRIMARY KEY,
-    collection_time TIMESTAMP NOT NULL,
-    server_id INTEGER NOT NULL,
-    server_name VARCHAR NOT NULL,
-    object_name VARCHAR NOT NULL,
-    counter_name VARCHAR NOT NULL,
-    instance_name VARCHAR,
-    cntr_value BIGINT,
-    delta_cntr_value BIGINT,
-    sample_interval_seconds INTEGER
-)";
-
-    public const string CreateServerConfigTable = @"
-CREATE TABLE IF NOT EXISTS server_config (
-    config_id BIGINT PRIMARY KEY,
-    capture_time TIMESTAMP NOT NULL,
-    server_id INTEGER NOT NULL,
-    server_name VARCHAR NOT NULL,
-    configuration_name VARCHAR NOT NULL,
-    value_configured BIGINT,
-    value_in_use BIGINT,
-    is_dynamic BOOLEAN,
-    is_advanced BOOLEAN
-)";
-
-    public const string CreateMemoryGrantStatsTable = @"
-CREATE TABLE IF NOT EXISTS memory_grant_stats (
-    collection_id BIGINT PRIMARY KEY,
-    collection_time TIMESTAMP NOT NULL,
-    server_id INTEGER NOT NULL,
-    server_name VARCHAR NOT NULL,
-    resource_semaphore_id SMALLINT,
-    pool_id INTEGER,
-    target_memory_mb DECIMAL(18,2),
-    max_target_memory_mb DECIMAL(18,2),
-    total_memory_mb DECIMAL(18,2),
-    available_memory_mb DECIMAL(18,2),
-    granted_memory_mb DECIMAL(18,2),
-    used_memory_mb DECIMAL(18,2),
-    grantee_count INTEGER,
-    waiter_count INTEGER,
-    timeout_error_count BIGINT,
-    forced_grant_count BIGINT,
-    timeout_error_count_delta BIGINT,
-    forced_grant_count_delta BIGINT
-)";
-
-    public const string CreateWaitingTasksTable = @"
-CREATE TABLE IF NOT EXISTS waiting_tasks (
-    collection_id BIGINT PRIMARY KEY,
-    collection_time TIMESTAMP NOT NULL,
-    server_id INTEGER NOT NULL,
-    server_name VARCHAR NOT NULL,
-    session_id INTEGER,
-    wait_type VARCHAR,
-    wait_duration_ms BIGINT,
-    blocking_session_id INTEGER,
-    resource_description VARCHAR,
-    database_name VARCHAR
-)";
-
-    public const string CreateBlockedProcessReportsTable = @"
-CREATE TABLE IF NOT EXISTS blocked_process_reports (
-    blocked_report_id BIGINT PRIMARY KEY,
-    collection_time TIMESTAMP NOT NULL,
-    server_id INTEGER NOT NULL,
-    server_name VARCHAR NOT NULL,
-    event_time TIMESTAMP,
-    database_name VARCHAR,
-    blocked_spid INTEGER,
-    blocked_ecid INTEGER,
-    blocking_spid INTEGER,
-    blocking_ecid INTEGER,
-    wait_time_ms BIGINT,
-    wait_resource VARCHAR,
-    lock_mode VARCHAR,
-    blocked_status VARCHAR,
-    blocked_isolation_level VARCHAR,
-    blocked_log_used BIGINT,
-    blocked_transaction_count INTEGER,
-    blocked_client_app VARCHAR,
-    blocked_host_name VARCHAR,
-    blocked_login_name VARCHAR,
-    blocked_sql_text VARCHAR,
-    blocking_status VARCHAR,
-    blocking_isolation_level VARCHAR,
-    blocking_client_app VARCHAR,
-    blocking_host_name VARCHAR,
-    blocking_login_name VARCHAR,
-    blocking_sql_text VARCHAR,
-    blocked_transaction_name VARCHAR,
-    blocking_transaction_name VARCHAR,
-    blocked_last_tran_started TIMESTAMP,
-    blocking_last_tran_started TIMESTAMP,
-    blocked_last_batch_started TIMESTAMP,
-    blocking_last_batch_started TIMESTAMP,
-    blocked_last_batch_completed TIMESTAMP,
-    blocking_last_batch_completed TIMESTAMP,
-    blocked_priority INTEGER,
-    blocking_priority INTEGER,
-    blocked_process_report_xml VARCHAR
-)";
-
-    public const string CreateDatabaseConfigTable = @"
-CREATE TABLE IF NOT EXISTS database_config (
-    config_id BIGINT PRIMARY KEY,
-    capture_time TIMESTAMP NOT NULL,
-    server_id INTEGER NOT NULL,
-    server_name VARCHAR NOT NULL,
-    database_name VARCHAR NOT NULL,
-    state_desc VARCHAR,
-    compatibility_level INTEGER,
-    collation_name VARCHAR,
-    recovery_model VARCHAR,
-    is_read_only BOOLEAN,
-    is_auto_close_on BOOLEAN,
-    is_auto_shrink_on BOOLEAN,
-    is_auto_create_stats_on BOOLEAN,
-    is_auto_update_stats_on BOOLEAN,
-    is_auto_update_stats_async_on BOOLEAN,
-    is_read_committed_snapshot_on BOOLEAN,
-    snapshot_isolation_state VARCHAR,
-    is_parameterization_forced BOOLEAN,
-    is_query_store_on BOOLEAN,
-    is_encrypted BOOLEAN,
-    is_trustworthy_on BOOLEAN,
-    is_db_chaining_on BOOLEAN,
-    is_broker_enabled BOOLEAN,
-    is_cdc_enabled BOOLEAN,
-    is_mixed_page_allocation_on BOOLEAN,
-    log_reuse_wait_desc VARCHAR,
-    page_verify_option VARCHAR,
-    target_recovery_time_seconds INTEGER,
-    delayed_durability VARCHAR,
-    is_accelerated_database_recovery_on BOOLEAN,
-    is_memory_optimized_enabled BOOLEAN,
-    is_optimized_locking_on BOOLEAN
-)";
-
-    // Index definitions
-    public const string CreateWaitStatsIndex = @"
-CREATE INDEX IF NOT EXISTS idx_wait_stats_time ON wait_stats(server_id, collection_time)";
-
-    public const string CreateQueryStatsIndex = @"
-CREATE INDEX IF NOT EXISTS idx_query_stats_time ON query_stats(server_id, collection_time)";
-
-    public const string CreateProcedureStatsIndex = @"
-CREATE INDEX IF NOT EXISTS idx_procedure_stats_time ON procedure_stats(server_id, collection_time)";
-
-    public const string CreateQueryStoreIndex = @"
-CREATE INDEX IF NOT EXISTS idx_query_store_time ON query_store_stats(server_id, collection_time)";
-
-    public const string CreateQuerySnapshotsIndex = @"
-CREATE INDEX IF NOT EXISTS idx_query_snapshots_time ON query_snapshots(server_id, collection_time)";
-
-    public const string CreateCpuIndex = @"
-CREATE INDEX IF NOT EXISTS idx_cpu_time ON cpu_utilization_stats(server_id, collection_time)";
-
-    public const string CreateFileIoIndex = @"
-CREATE INDEX IF NOT EXISTS idx_file_io_time ON file_io_stats(server_id, collection_time)";
-
-    public const string CreateMemoryIndex = @"
-CREATE INDEX IF NOT EXISTS idx_memory_time ON memory_stats(server_id, collection_time)";
-
-    public const string CreateTempdbIndex = @"
-CREATE INDEX IF NOT EXISTS idx_tempdb_time ON tempdb_stats(server_id, collection_time)";
-
-    public const string CreatePerfmonIndex = @"
-CREATE INDEX IF NOT EXISTS idx_perfmon_time ON perfmon_stats(server_id, collection_time)";
-
-    public const string CreateDeadlocksIndex = @"
-CREATE INDEX IF NOT EXISTS idx_deadlocks_time ON deadlocks(server_id, collection_time)";
-
-    public const string CreateCollectionLogIndex = @"
-CREATE INDEX IF NOT EXISTS idx_collection_log_time ON collection_log(server_id, collection_time)";
-
-    public const string CreateMemoryGrantStatsIndex = @"
-CREATE INDEX IF NOT EXISTS idx_memory_grant_stats_time ON memory_grant_stats(server_id, collection_time)";
-
-    public const string CreateWaitingTasksIndex = @"
-CREATE INDEX IF NOT EXISTS idx_waiting_tasks_time ON waiting_tasks(server_id, collection_time)";
-
-    public const string CreateBlockedProcessReportsIndex = @"
-CREATE INDEX IF NOT EXISTS idx_blocked_process_reports_time ON blocked_process_reports(server_id, collection_time)";
-
-    public const string CreateMemoryClerksIndex = @"
-CREATE INDEX IF NOT EXISTS idx_memory_clerks_time ON memory_clerks(server_id, collection_time)";
-
-    public const string CreateDatabaseScopedConfigTable = @"
-CREATE TABLE IF NOT EXISTS database_scoped_config (
-    config_id BIGINT PRIMARY KEY,
-    capture_time TIMESTAMP NOT NULL,
-    server_id INTEGER NOT NULL,
-    server_name VARCHAR NOT NULL,
-    database_name VARCHAR NOT NULL,
-    configuration_name VARCHAR NOT NULL,
-    value VARCHAR,
-    value_for_secondary VARCHAR
-)";
-
-    public const string CreateDatabaseScopedConfigIndex = @"
-CREATE INDEX IF NOT EXISTS idx_database_scoped_config_time ON database_scoped_config(server_id, capture_time)";
-
-    public const string CreateTraceFlagsTable = @"
-CREATE TABLE IF NOT EXISTS trace_flags (
-    config_id BIGINT PRIMARY KEY,
-    capture_time TIMESTAMP NOT NULL,
-    server_id INTEGER NOT NULL,
-    server_name VARCHAR NOT NULL,
-    trace_flag INTEGER NOT NULL,
-    status BOOLEAN NOT NULL,
-    is_global BOOLEAN NOT NULL,
-    is_session BOOLEAN NOT NULL
-)";
-
-    public const string CreateTraceFlagsIndex = @"
-CREATE INDEX IF NOT EXISTS idx_trace_flags_time ON trace_flags(server_id, capture_time)";
-
-    public const string CreateRunningJobsTable = @"
-CREATE TABLE IF NOT EXISTS running_jobs (
-    collection_time TIMESTAMP NOT NULL,
-    server_id INTEGER NOT NULL,
-    server_name VARCHAR NOT NULL,
-    job_name VARCHAR NOT NULL,
-    job_id VARCHAR NOT NULL,
-    job_enabled BOOLEAN NOT NULL,
-    start_time TIMESTAMP NOT NULL,
-    current_duration_seconds BIGINT NOT NULL,
-    avg_duration_seconds BIGINT NOT NULL,
-    p95_duration_seconds BIGINT NOT NULL,
-    successful_run_count BIGINT NOT NULL,
-    is_running_long BOOLEAN NOT NULL,
-    percent_of_average DECIMAL(10,1)
-)";
-
-    public const string CreateRunningJobsIndex = @"
-CREATE INDEX IF NOT EXISTS idx_running_jobs_time ON running_jobs(server_id, collection_time)";
-
-    public const string CreateDatabaseSizeStatsTable = @"
-CREATE TABLE IF NOT EXISTS database_size_stats (
-    collection_id BIGINT PRIMARY KEY,
-    collection_time TIMESTAMP NOT NULL,
-    server_id INTEGER NOT NULL,
-    server_name VARCHAR NOT NULL,
-    database_name VARCHAR NOT NULL,
-    database_id INTEGER NOT NULL,
-    file_id INTEGER NOT NULL,
-    file_type_desc VARCHAR NOT NULL,
-    file_name VARCHAR NOT NULL,
-    physical_name VARCHAR NOT NULL,
-    total_size_mb DECIMAL(19,2) NOT NULL,
-    used_size_mb DECIMAL(19,2),
-    auto_growth_mb DECIMAL(19,2),
-    max_size_mb DECIMAL(19,2),
-    recovery_model_desc VARCHAR,
-    compatibility_level INTEGER,
-    state_desc VARCHAR,
-    volume_mount_point VARCHAR,
-    volume_total_mb DECIMAL(19,2),
-    volume_free_mb DECIMAL(19,2),
-    is_percent_growth BOOLEAN,
-    growth_pct INTEGER,
-    vlf_count INTEGER
-)";
-
-    public const string CreateDatabaseSizeStatsIndex = @"
-CREATE INDEX IF NOT EXISTS idx_database_size_stats_time ON database_size_stats(server_id, collection_time)";
-
-    public const string CreateServerPropertiesTable = @"
-CREATE TABLE IF NOT EXISTS server_properties (
-    collection_id BIGINT PRIMARY KEY,
-    collection_time TIMESTAMP NOT NULL,
-    server_id INTEGER NOT NULL,
-    server_name VARCHAR NOT NULL,
-    edition VARCHAR NOT NULL,
-    product_version VARCHAR NOT NULL,
-    product_level VARCHAR NOT NULL,
-    product_update_level VARCHAR,
-    engine_edition INTEGER NOT NULL,
-    cpu_count INTEGER NOT NULL,
-    hyperthread_ratio INTEGER NOT NULL,
-    physical_memory_mb BIGINT NOT NULL,
-    socket_count INTEGER,
-    cores_per_socket INTEGER,
-    is_hadr_enabled BOOLEAN,
-    is_clustered BOOLEAN,
-    enterprise_features VARCHAR,
-    service_objective VARCHAR
-)";
-
-    public const string CreateServerPropertiesIndex = @"
-CREATE INDEX IF NOT EXISTS idx_server_properties_time ON server_properties(server_id, collection_time)";
-
-    public const string CreateSessionStatsTable = @"
-CREATE TABLE IF NOT EXISTS session_stats (
-    collection_id BIGINT PRIMARY KEY,
-    collection_time TIMESTAMP NOT NULL,
-    server_id INTEGER NOT NULL,
-    server_name VARCHAR NOT NULL,
-    program_name VARCHAR NOT NULL,
-    connection_count BIGINT NOT NULL,
-    running_count INTEGER NOT NULL,
-    sleeping_count INTEGER NOT NULL,
-    dormant_count INTEGER NOT NULL,
-    total_cpu_time_ms BIGINT,
-    total_reads BIGINT,
-    total_writes BIGINT,
-    total_logical_reads BIGINT
-)";
-
-    public const string CreateSessionStatsIndex = @"
-CREATE INDEX IF NOT EXISTS idx_session_stats_time ON session_stats(server_id, collection_time)";
-
-    public const string CreateAlertLogTable = @"
-CREATE TABLE IF NOT EXISTS config_alert_log (
-    alert_time TIMESTAMP NOT NULL,
-    server_id INTEGER NOT NULL,
-    server_name VARCHAR NOT NULL,
-    metric_name VARCHAR NOT NULL,
-    current_value DOUBLE NOT NULL,
-    threshold_value DOUBLE NOT NULL,
-    alert_sent BOOLEAN NOT NULL DEFAULT false,
-    notification_type VARCHAR NOT NULL DEFAULT 'tray',
-    send_error VARCHAR,
-    dismissed BOOLEAN NOT NULL DEFAULT false,
-    muted BOOLEAN NOT NULL DEFAULT false,
-    detail_text VARCHAR
-)";
-
-    public const string CreateMuteRulesTable = @"
-CREATE TABLE IF NOT EXISTS config_mute_rules (
-    id VARCHAR NOT NULL PRIMARY KEY,
-    enabled BOOLEAN NOT NULL DEFAULT true,
-    created_at_utc TIMESTAMP NOT NULL,
-    expires_at_utc TIMESTAMP,
-    reason VARCHAR,
-    server_name VARCHAR,
-    metric_name VARCHAR,
-    database_pattern VARCHAR,
-    query_text_pattern VARCHAR,
-    wait_type_pattern VARCHAR,
-    job_name_pattern VARCHAR
-)";
-
-    /// <summary>
-    /// Returns all table creation statements in order.
-    /// </summary>
-    public static IEnumerable<string> GetAllTableStatements()
-    {
-        yield return CreateServersTable;
-        yield return CreateCollectionScheduleTable;
-        yield return CreateCollectionLogTable;
-        yield return CreateWaitStatsTable;
-        yield return CreateQueryStatsTable;
-        yield return CreateCpuUtilizationStatsTable;
-        yield return CreateFileIoStatsTable;
-        yield return CreateMemoryStatsTable;
-        yield return CreateMemoryClerksTable;
-        yield return CreateDeadlocksTable;
-        yield return CreateProcedureStatsTable;
-        yield return CreateQueryStoreStatsTable;
-        yield return CreateQuerySnapshotsTable;
-        yield return CreateTempdbStatsTable;
-        yield return CreatePerfmonStatsTable;
-        yield return CreateServerConfigTable;
-        yield return CreateDatabaseConfigTable;
-        yield return CreateMemoryGrantStatsTable;
-        yield return CreateWaitingTasksTable;
-        yield return CreateBlockedProcessReportsTable;
-        yield return CreateDatabaseScopedConfigTable;
-        yield return CreateTraceFlagsTable;
-        yield return CreateRunningJobsTable;
-        yield return CreateDatabaseSizeStatsTable;
-        yield return CreateServerPropertiesTable;
-        yield return CreateSessionStatsTable;
-        yield return CreateAlertLogTable;
-        yield return CreateMuteRulesTable;
-    }
-
-    /// <summary>
-    /// Returns all index creation statements.
-    /// </summary>
-    public static IEnumerable<string> GetAllIndexStatements()
-    {
-        yield return CreateWaitStatsIndex;
-        yield return CreateQueryStatsIndex;
-        yield return CreateProcedureStatsIndex;
-        yield return CreateQueryStoreIndex;
-        yield return CreateQuerySnapshotsIndex;
-        yield return CreateCpuIndex;
-        yield return CreateFileIoIndex;
-        yield return CreateMemoryIndex;
-        yield return CreateTempdbIndex;
-        yield return CreatePerfmonIndex;
-        yield return CreateDeadlocksIndex;
-        yield return CreateCollectionLogIndex;
-        yield return CreateMemoryGrantStatsIndex;
-        yield return CreateWaitingTasksIndex;
-        yield return CreateBlockedProcessReportsIndex;
-        yield return CreateMemoryClerksIndex;
-        yield return CreateDatabaseScopedConfigIndex;
-        yield return CreateTraceFlagsIndex;
-        yield return CreateRunningJobsIndex;
-        yield return CreateDatabaseSizeStatsIndex;
-        yield return CreateServerPropertiesIndex;
-        yield return CreateSessionStatsIndex;
-    }
-}
+using System.Collections.Generic;
+
+namespace PerformanceMonitorLite.Database;
+
+/// <summary>
+/// Contains all DuckDB table schema definitions as SQL constants.
+/// </summary>
+public static class Schema
+{
+    public const string CreateServersTable = @"
+CREATE TABLE IF NOT EXISTS servers (
+    server_id INTEGER PRIMARY KEY,
+    server_name VARCHAR NOT NULL,
+    display_name VARCHAR,
+    use_windows_auth BOOLEAN NOT NULL DEFAULT TRUE,
+    username VARCHAR,
+    is_enabled BOOLEAN NOT NULL DEFAULT TRUE,
+    created_date TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+    modified_date TIMESTAMP DEFAULT CURRENT_TIMESTAMP
+)";
+
+    public const string CreateCollectionScheduleTable = @"
+CREATE TABLE IF NOT EXISTS collection_schedule (
+    schedule_id INTEGER PRIMARY KEY,
+    collector_name VARCHAR NOT NULL UNIQUE,
+    enabled BOOLEAN NOT NULL DEFAULT TRUE,
+    frequency_minutes INTEGER NOT NULL DEFAULT 15,
+    last_run_time TIMESTAMP,
+    next_run_time TIMESTAMP,
+    max_duration_minutes INTEGER DEFAULT 5,
+    retention_days INTEGER DEFAULT 30,
+    description VARCHAR,
+    created_date TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+    modified_date TIMESTAMP DEFAULT CURRENT_TIMESTAMP
+)";
+
+    public const string CreateCollectionLogTable = @"
+CREATE TABLE IF NOT EXISTS collection_log (
+    log_id BIGINT PRIMARY KEY,
+    server_id INTEGER NOT NULL,
+    server_name VARCHAR,
+    collector_name VARCHAR NOT NULL,
+    collection_time TIMESTAMP NOT NULL,
+    duration_ms INTEGER,
+    status VARCHAR NOT NULL,
+    error_message VARCHAR,
+    rows_collected INTEGER,
+    sql_duration_ms INTEGER,
+    duckdb_duration_ms INTEGER
+)";
+
+    public const string CreateWaitStatsTable = @"
+CREATE TABLE IF NOT EXISTS wait_stats (
+    collection_id BIGINT PRIMARY KEY,
+    collection_time TIMESTAMP NOT NULL,
+    server_id INTEGER NOT NULL,
+    server_name VARCHAR NOT NULL,
+    wait_type VARCHAR NOT NULL,
+    waiting_tasks_count BIGINT,
+    wait_time_ms BIGINT,
+    signal_wait_time_ms BIGINT,
+    delta_waiting_tasks BIGINT,
+    delta_wait_time_ms BIGINT,
+    delta_signal_wait_time_ms BIGINT
+)";
+
+    public const string CreateQueryStatsTable = @"
+CREATE TABLE IF NOT EXISTS query_stats (
+    collection_id BIGINT PRIMARY KEY,
+    collection_time TIMESTAMP NOT NULL,
+    server_id INTEGER NOT NULL,
+    server_name VARCHAR NOT NULL,
+    database_name VARCHAR,
+    query_hash VARCHAR,
+    query_plan_hash VARCHAR,
+    creation_time TIMESTAMP,
+    last_execution_time TIMESTAMP,
+    execution_count BIGINT,
+    total_worker_time BIGINT,
+    total_elapsed_time BIGINT,
+    total_logical_reads BIGINT,
+    total_logical_writes BIGINT,
+    total_physical_reads BIGINT,
+    total_clr_time BIGINT,
+    total_rows BIGINT,
+    total_spills BIGINT,
+    min_worker_time BIGINT,
+    max_worker_time BIGINT,
+    min_elapsed_time BIGINT,
+    max_elapsed_time BIGINT,
+    min_physical_reads BIGINT,
+    max_physical_reads BIGINT,
+    min_rows BIGINT,
+    max_rows BIGINT,
+    min_dop BIGINT,
+    max_dop BIGINT,
+    min_grant_kb BIGINT,
+    max_grant_kb BIGINT,
+    min_used_grant_kb BIGINT,
+    max_used_grant_kb BIGINT,
+    min_ideal_grant_kb BIGINT,
+    max_ideal_grant_kb BIGINT,
+    min_reserved_threads BIGINT,
+    max_reserved_threads BIGINT,
+    min_used_threads BIGINT,
+    max_used_threads BIGINT,
+    min_spills BIGINT,
+    max_spills BIGINT,
+    query_text VARCHAR,
+    query_plan_xml VARCHAR,
+    sql_handle VARCHAR,
+    plan_handle VARCHAR,
+    delta_execution_count BIGINT,
+    delta_worker_time BIGINT,
+    delta_elapsed_time BIGINT,
+    delta_logical_reads BIGINT,
+    delta_logical_writes BIGINT,
+    delta_physical_reads BIGINT,
+    delta_rows BIGINT,
+    delta_spills BIGINT
+)";
+
+    public const string CreateCpuUtilizationStatsTable = @"
+CREATE TABLE IF NOT EXISTS cpu_utilization_stats (
+    collection_id BIGINT PRIMARY KEY,
+    collection_time TIMESTAMP NOT NULL,
+    server_id INTEGER NOT NULL,
+    server_name VARCHAR NOT NULL,
+    sample_time TIMESTAMP NOT NULL,
+    sqlserver_cpu_utilization INTEGER,
+    other_process_cpu_utilization INTEGER
+)";
+
+    public const string CreateFileIoStatsTable = @"
+CREATE TABLE IF NOT EXISTS file_io_stats (
+    collection_id BIGINT PRIMARY KEY,
+    collection_time TIMESTAMP NOT NULL,
+    server_id INTEGER NOT NULL,
+    server_name VARCHAR NOT NULL,
+    database_name VARCHAR,
+    file_name VARCHAR,
+    file_type VARCHAR,
+    physical_name VARCHAR,
+    size_mb DECIMAL(18,2),
+    num_of_reads BIGINT,
+    num_of_writes BIGINT,
+    read_bytes BIGINT,
+    write_bytes BIGINT,
+    io_stall_read_ms BIGINT,
+    io_stall_write_ms BIGINT,
+    io_stall_queued_read_ms BIGINT,
+    io_stall_queued_write_ms BIGINT,
+    delta_reads BIGINT,
+    delta_writes BIGINT,
+    delta_read_bytes BIGINT,
+    delta_write_bytes BIGINT,
+    delta_stall_read_ms BIGINT,
+    delta_stall_write_ms BIGINT,
+    delta_stall_queued_read_ms BIGINT,
+    delta_stall_queued_write_ms BIGINT
+)";
+
+    public const string CreateMemoryStatsTable = @"
+CREATE TABLE IF NOT EXISTS memory_stats (
+    collection_id BIGINT PRIMARY KEY,
+    collection_time TIMESTAMP NOT NULL,
+    server_id INTEGER NOT NULL,
+    server_name VARCHAR NOT NULL,
+    total_physical_memory_mb DECIMAL(18,2),
+    available_physical_memory_mb DECIMAL(18,2),
+    total_page_file_mb DECIMAL(18,2),
+    available_page_file_mb DECIMAL(18,2),
+    system_memory_state VARCHAR,
+    sql_memory_model VARCHAR,
+    target_server_memory_mb DECIMAL(18,2),
+    total_server_memory_mb DECIMAL(18,2),
+    buffer_pool_mb DECIMAL(18,2),
+    plan_cache_mb DECIMAL(18,2),
+    max_workers_count INTEGER,
+    current_workers_count INTEGER
+)";
+
+    public const string CreateMemoryClerksTable = @"
+CREATE TABLE IF NOT EXISTS memory_clerks (
+    collection_id BIGINT PRIMARY KEY,
+    collection_time TIMESTAMP NOT NULL,
+    server_id INTEGER NOT NULL,
+    server_name VARCHAR NOT NULL,
+    clerk_type VARCHAR NOT NULL,
+    memory_mb DECIMAL(18,2)
+)";
+
+    public const string CreateDeadlocksTable = @"
+CREATE TABLE IF NOT EXISTS deadlocks (
+    deadlock_id BIGINT PRIMARY KEY,
+    collection_time TIMESTAMP NOT NULL,
+    server_id INTEGER NOT NULL,
+    server_name VARCHAR NOT NULL,
+    deadlock_time TIMESTAMP,
+    victim_process_id VARCHAR,
+    victim_sql_text VARCHAR,
+    deadlock_graph_xml VARCHAR
+)";
+
+    public const string CreateProcedureStatsTable = @"
+CREATE TABLE IF NOT EXISTS procedure_stats (
+    collection_id BIGINT PRIMARY KEY,
+    collection_time TIMESTAMP NOT NULL,
+    server_id INTEGER NOT NULL,
+    server_name VARCHAR NOT NULL,
+    database_name VARCHAR,
+    schema_name VARCHAR,
+    object_name VARCHAR,
+    object_type VARCHAR,
+    cached_time TIMESTAMP,
+    last_execution_time TIMESTAMP,
+    execution_count BIGINT,
+    total_worker_time BIGINT,
+    total_elapsed_time BIGINT,
+    total_logical_reads BIGINT,
+    total_physical_reads BIGINT,
+    total_logical_writes BIGINT,
+    min_worker_time BIGINT,
+    max_worker_time BIGINT,
+    min_elapsed_time BIGINT,
+    max_elapsed_time BIGINT,
+    min_logical_reads BIGINT,
+    max_logical_reads BIGINT,
+    min_physical_reads BIGINT,
+    max_physical_reads BIGINT,
+    min_logical_writes BIGINT,
+    max_logical_writes BIGINT,
+    total_spills BIGINT,
+    min_spills BIGINT,
+    max_spills BIGINT,
+    sql_handle VARCHAR,
+    plan_handle VARCHAR,
+    delta_execution_count BIGINT,
+    delta_worker_time BIGINT,
+    delta_elapsed_time BIGINT,
+    delta_logical_reads BIGINT,
+    delta_logical_writes BIGINT,
+    delta_physical_reads BIGINT
+)";
+
+    public const string CreateQueryStoreStatsTable = @"
+CREATE TABLE IF NOT EXISTS query_store_stats (
+    collection_id BIGINT PRIMARY KEY,
+    collection_time TIMESTAMP NOT NULL,
+    server_id INTEGER NOT NULL,
+    server_name VARCHAR NOT NULL,
+    database_name VARCHAR NOT NULL,
+    query_id BIGINT,
+    plan_id BIGINT,
+    execution_type_desc VARCHAR,
+    first_execution_time TIMESTAMP,
+    last_execution_time TIMESTAMP,
+    module_name VARCHAR,
+    query_text VARCHAR,
+    query_hash VARCHAR,
+    execution_count BIGINT,
+    avg_duration_us BIGINT,
+    min_duration_us BIGINT,
+    max_duration_us BIGINT,
+    avg_cpu_time_us BIGINT,
+    min_cpu_time_us BIGINT,
+    max_cpu_time_us BIGINT,
+    avg_logical_io_reads BIGINT,
+    min_logical_io_reads BIGINT,
+    max_logical_io_reads BIGINT,
+    avg_logical_io_writes BIGINT,
+    min_logical_io_writes BIGINT,
+    max_logical_io_writes BIGINT,
+    avg_physical_io_reads BIGINT,
+    min_physical_io_reads BIGINT,
+    max_physical_io_reads BIGINT,
+    avg_clr_time_us BIGINT,
+    min_clr_time_us BIGINT,
+    max_clr_time_us BIGINT,
+    min_dop BIGINT,
+    max_dop BIGINT,
+    avg_query_max_used_memory BIGINT,
+    min_query_max_used_memory BIGINT,
+    max_query_max_used_memory BIGINT,
+    avg_rowcount BIGINT,
+    min_rowcount BIGINT,
+    max_rowcount BIGINT,
+    avg_num_physical_io_reads BIGINT,
+    min_num_physical_io_reads BIGINT,
+    max_num_physical_io_reads BIGINT,
+    avg_log_bytes_used BIGINT,
+    min_log_bytes_used BIGINT,
+    max_log_bytes_used BIGINT,
+    avg_tempdb_space_used BIGINT,
+    min_tempdb_space_used BIGINT,
+    max_tempdb_space_used BIGINT,
+    plan_type VARCHAR,
+    plan_forcing_type VARCHAR,
+    is_forced_plan BOOLEAN,
+    force_failure_count BIGINT,
+    last_force_failure_reason VARCHAR,
+    compatibility_level INTEGER,
+    query_plan_text VARCHAR,
+    query_plan_hash VARCHAR
+)";
+
+    public const string CreateQuerySnapshotsTable = @"
+CREATE TABLE IF NOT EXISTS query_snapshots (
+    collection_id BIGINT PRIMARY KEY,
+    collection_time TIMESTAMP NOT NULL,
+    server_id INTEGER NOT NULL,
+    server_name VARCHAR NOT NULL,
+    session_id INTEGER,
+    database_name VARCHAR,
+    elapsed_time_formatted VARCHAR,
+    query_text VARCHAR,
+    query_plan VARCHAR,
+    live_query_plan VARCHAR,
+    status VARCHAR,
+    blocking_session_id INTEGER,
+    wait_type VARCHAR,
+    wait_time_ms BIGINT,
+    wait_resource VARCHAR,
+    cpu_time_ms BIGINT,
+    total_elapsed_time_ms BIGINT,
+    reads BIGINT,
+    writes BIGINT,
+    logical_reads BIGINT,
+    granted_query_memory_gb DECIMAL(18,2),
+    transaction_isolation_level VARCHAR,
+    dop INTEGER,
+    parallel_worker_count INTEGER,
+    login_name VARCHAR,
+    host_name VARCHAR,
+    program_name VARCHAR,
+    open_transaction_count INTEGER,
+    percent_complete DECIMAL(5,2)
+)";
+
+    public const string CreateTempdbStatsTable = @"
+CREATE TABLE IF NOT EXISTS tempdb_stats (
+    collection_id BIGINT PRIMARY KEY,
+    collection_time TIMESTAMP NOT NULL,
+    server_id INTEGER NOT NULL,
+    server_name VARCHAR NOT NULL,
+    user_object_reserved_mb DECIMAL(18,2),
+    internal_object_reserved_mb DECIMAL(18,2),
+    version_store_reserved_mb DECIMAL(18,2),
+    total_reserved_mb DECIMAL(18,2),
+    unallocated_mb DECIMAL(18,2),
+    total_sessions_using_tempdb BIGINT,
+    top_session_id INTEGER,
+    top_session_tempdb_mb DECIMAL(18,2)
+)";
+
+    public const string CreatePerfmonStatsTable = @"
+CREATE TABLE IF NOT EXISTS perfmon_stats (
+    collection_id BIGINT PRIMARY KEY,
+    collection_time TIMESTAMP NOT NULL,
+    server_id INTEGER NOT NULL,
+    server_name VARCHAR NOT NULL,
+    object_name VARCHAR NOT NULL,
+    counter_name VARCHAR NOT NULL,
+    instance_name VARCHAR,
+    cntr_value BIGINT,
+    delta_cntr_value BIGINT,
+    sample_interval_seconds INTEGER
+)";
+
+    public const string CreateServerConfigTable = @"
+CREATE TABLE IF NOT EXISTS server_config (
+    config_id BIGINT PRIMARY KEY,
+    capture_time TIMESTAMP NOT NULL,
+    server_id INTEGER NOT NULL,
+    server_name VARCHAR NOT NULL,
+    configuration_name VARCHAR NOT NULL,
+    value_configured BIGINT,
+    value_in_use BIGINT,
+    is_dynamic BOOLEAN,
+    is_advanced BOOLEAN
+)";
+
+    public const string CreateMemoryGrantStatsTable = @"
+CREATE TABLE IF NOT EXISTS memory_grant_stats (
+    collection_id BIGINT PRIMARY KEY,
+    collection_time TIMESTAMP NOT NULL,
+    server_id INTEGER NOT NULL,
+    server_name VARCHAR NOT NULL,
+    resource_semaphore_id SMALLINT,
+    pool_id INTEGER,
+    target_memory_mb DECIMAL(18,2),
+    max_target_memory_mb DECIMAL(18,2),
+    total_memory_mb DECIMAL(18,2),
+    available_memory_mb DECIMAL(18,2),
+    granted_memory_mb DECIMAL(18,2),
+    used_memory_mb DECIMAL(18,2),
+    grantee_count INTEGER,
+    waiter_count INTEGER,
+    timeout_error_count BIGINT,
+    forced_grant_count BIGINT,
+    timeout_error_count_delta BIGINT,
+    forced_grant_count_delta BIGINT
+)";
+
+    public const string CreateWaitingTasksTable = @"
+CREATE TABLE IF NOT EXISTS waiting_tasks (
+    collection_id BIGINT PRIMARY KEY,
+    collection_time TIMESTAMP NOT NULL,
+    server_id INTEGER NOT NULL,
+    server_name VARCHAR NOT NULL,
+    session_id INTEGER,
+    wait_type VARCHAR,
+    wait_duration_ms BIGINT,
+    blocking_session_id INTEGER,
+    resource_description VARCHAR,
+    database_name VARCHAR
+)";
+
+    public const string CreateBlockedProcessReportsTable = @"
+CREATE TABLE IF NOT EXISTS blocked_process_reports (
+    blocked_report_id BIGINT PRIMARY KEY,
+    collection_time TIMESTAMP NOT NULL,
+    server_id INTEGER NOT NULL,
+    server_name VARCHAR NOT NULL,
+    event_time TIMESTAMP,
+    database_name VARCHAR,
+    blocked_spid INTEGER,
+    blocked_ecid INTEGER,
+    blocking_spid INTEGER,
+    blocking_ecid INTEGER,
+    wait_time_ms BIGINT,
+    wait_resource VARCHAR,
+    lock_mode VARCHAR,
+    blocked_status VARCHAR,
+    blocked_isolation_level VARCHAR,
+    blocked_log_used BIGINT,
+    blocked_transaction_count INTEGER,
+    blocked_client_app VARCHAR,
+    blocked_host_name VARCHAR,
+    blocked_login_name VARCHAR,
+    blocked_sql_text VARCHAR,
+    blocking_status VARCHAR,
+    blocking_isolation_level VARCHAR,
+    blocking_client_app VARCHAR,
+    blocking_host_name VARCHAR,
+    blocking_login_name VARCHAR,
+    blocking_sql_text VARCHAR,
+    blocked_transaction_name VARCHAR,
+    blocking_transaction_name VARCHAR,
+    blocked_last_tran_started TIMESTAMP,
+    blocking_last_tran_started TIMESTAMP,
+    blocked_last_batch_started TIMESTAMP,
+    blocking_last_batch_started TIMESTAMP,
+    blocked_last_batch_completed TIMESTAMP,
+    blocking_last_batch_completed TIMESTAMP,
+    blocked_priority INTEGER,
+    blocking_priority INTEGER,
+    blocked_process_report_xml VARCHAR
+)";
+
+    public const string CreateDatabaseConfigTable = @"
+CREATE TABLE IF NOT EXISTS database_config (
+    config_id BIGINT PRIMARY KEY,
+    capture_time TIMESTAMP NOT NULL,
+    server_id INTEGER NOT NULL,
+    server_name VARCHAR NOT NULL,
+    database_name VARCHAR NOT NULL,
+    state_desc VARCHAR,
+    compatibility_level INTEGER,
+    collation_name VARCHAR,
+    recovery_model VARCHAR,
+    is_read_only BOOLEAN,
+    is_auto_close_on BOOLEAN,
+    is_auto_shrink_on BOOLEAN,
+    is_auto_create_stats_on BOOLEAN,
+    is_auto_update_stats_on BOOLEAN,
+    is_auto_update_stats_async_on BOOLEAN,
+    is_read_committed_snapshot_on BOOLEAN,
+    snapshot_isolation_state VARCHAR,
+    is_parameterization_forced BOOLEAN,
+    is_query_store_on BOOLEAN,
+    is_encrypted BOOLEAN,
+    is_trustworthy_on BOOLEAN,
+    is_db_chaining_on BOOLEAN,
+    is_broker_enabled BOOLEAN,
+    is_cdc_enabled BOOLEAN,
+    is_mixed_page_allocation_on BOOLEAN,
+    log_reuse_wait_desc VARCHAR,
+    page_verify_option VARCHAR,
+    target_recovery_time_seconds INTEGER,
+    delayed_durability VARCHAR,
+    is_accelerated_database_recovery_on BOOLEAN,
+    is_memory_optimized_enabled BOOLEAN,
+    is_optimized_locking_on BOOLEAN
+)";
+
+    // Index definitions
+    public const string CreateWaitStatsIndex = @"
+CREATE INDEX IF NOT EXISTS idx_wait_stats_time ON wait_stats(server_id, collection_time)";
+
+    public const string CreateQueryStatsIndex = @"
+CREATE INDEX IF NOT EXISTS idx_query_stats_time ON query_stats(server_id, collection_time)";
+
+    public const string CreateProcedureStatsIndex = @"
+CREATE INDEX IF NOT EXISTS idx_procedure_stats_time ON procedure_stats(server_id, collection_time)";
+
+    public const string CreateQueryStoreIndex = @"
+CREATE INDEX IF NOT EXISTS idx_query_store_time ON query_store_stats(server_id, collection_time)";
+
+    public const string CreateQuerySnapshotsIndex = @"
+CREATE INDEX IF NOT EXISTS idx_query_snapshots_time ON query_snapshots(server_id, collection_time)";
+
+    public const string CreateCpuIndex = @"
+CREATE INDEX IF NOT EXISTS idx_cpu_time ON cpu_utilization_stats(server_id, collection_time)";
+
+    public const string CreateFileIoIndex = @"
+CREATE INDEX IF NOT EXISTS idx_file_io_time ON file_io_stats(server_id, collection_time)";
+
+    public const string CreateMemoryIndex = @"
+CREATE INDEX IF NOT EXISTS idx_memory_time ON memory_stats(server_id, collection_time)";
+
+    public const string CreateTempdbIndex = @"
+CREATE INDEX IF NOT EXISTS idx_tempdb_time ON tempdb_stats(server_id, collection_time)";
+
+    public const string CreatePerfmonIndex = @"
+CREATE INDEX IF NOT EXISTS idx_perfmon_time ON perfmon_stats(server_id, collection_time)";
+
+    public const string CreateDeadlocksIndex = @"
+CREATE INDEX IF NOT EXISTS idx_deadlocks_time ON deadlocks(server_id, collection_time)";
+
+    public const string CreateCollectionLogIndex = @"
+CREATE INDEX IF NOT EXISTS idx_collection_log_time ON collection_log(server_id, collection_time)";
+
+    public const string CreateMemoryGrantStatsIndex = @"
+CREATE INDEX IF NOT EXISTS idx_memory_grant_stats_time ON memory_grant_stats(server_id, collection_time)";
+
+    public const string CreateWaitingTasksIndex = @"
+CREATE INDEX IF NOT EXISTS idx_waiting_tasks_time ON waiting_tasks(server_id, collection_time)";
+
+    public const string CreateBlockedProcessReportsIndex = @"
+CREATE INDEX IF NOT EXISTS idx_blocked_process_reports_time ON blocked_process_reports(server_id, collection_time)";
+
+    public const string CreateMemoryClerksIndex = @"
+CREATE INDEX IF NOT EXISTS idx_memory_clerks_time ON memory_clerks(server_id, collection_time)";
+
+    public const string CreateDatabaseScopedConfigTable = @"
+CREATE TABLE IF NOT EXISTS database_scoped_config (
+    config_id BIGINT PRIMARY KEY,
+    capture_time TIMESTAMP NOT NULL,
+    server_id INTEGER NOT NULL,
+    server_name VARCHAR NOT NULL,
+    database_name VARCHAR NOT NULL,
+    configuration_name VARCHAR NOT NULL,
+    value VARCHAR,
+    value_for_secondary VARCHAR
+)";
+
+    public const string CreateDatabaseScopedConfigIndex = @"
+CREATE INDEX IF NOT EXISTS idx_database_scoped_config_time ON database_scoped_config(server_id, capture_time)";
+
+    public const string CreateTraceFlagsTable = @"
+CREATE TABLE IF NOT EXISTS trace_flags (
+    config_id BIGINT PRIMARY KEY,
+    capture_time TIMESTAMP NOT NULL,
+    server_id INTEGER NOT NULL,
+    server_name VARCHAR NOT NULL,
+    trace_flag INTEGER NOT NULL,
+    status BOOLEAN NOT NULL,
+    is_global BOOLEAN NOT NULL,
+    is_session BOOLEAN NOT NULL
+)";
+
+    public const string CreateTraceFlagsIndex = @"
+CREATE INDEX IF NOT EXISTS idx_trace_flags_time ON trace_flags(server_id, capture_time)";
+
+    public const string CreateRunningJobsTable = @"
+CREATE TABLE IF NOT EXISTS running_jobs (
+    collection_time TIMESTAMP NOT NULL,
+    server_id INTEGER NOT NULL,
+    server_name VARCHAR NOT NULL,
+    job_name VARCHAR NOT NULL,
+    job_id VARCHAR NOT NULL,
+    job_enabled BOOLEAN NOT NULL,
+    start_time TIMESTAMP NOT NULL,
+    current_duration_seconds BIGINT NOT NULL,
+    avg_duration_seconds BIGINT NOT NULL,
+    p95_duration_seconds BIGINT NOT NULL,
+    successful_run_count BIGINT NOT NULL,
+    is_running_long BOOLEAN NOT NULL,
+    percent_of_average DECIMAL(10,1)
+)";
+
+    public const string CreateRunningJobsIndex = @"
+CREATE INDEX IF NOT EXISTS idx_running_jobs_time ON running_jobs(server_id, collection_time)";
+
+    public const string CreateDatabaseSizeStatsTable = @"
+CREATE TABLE IF NOT EXISTS database_size_stats (
+    collection_id BIGINT PRIMARY KEY,
+    collection_time TIMESTAMP NOT NULL,
+    server_id INTEGER NOT NULL,
+    server_name VARCHAR NOT NULL,
+    database_name VARCHAR NOT NULL,
+    database_id INTEGER NOT NULL,
+    file_id INTEGER NOT NULL,
+    file_type_desc VARCHAR NOT NULL,
+    file_name VARCHAR NOT NULL,
+    physical_name VARCHAR NOT NULL,
+    total_size_mb DECIMAL(19,2) NOT NULL,
+    used_size_mb DECIMAL(19,2),
+    auto_growth_mb DECIMAL(19,2),
+    max_size_mb DECIMAL(19,2),
+    recovery_model_desc VARCHAR,
+    compatibility_level INTEGER,
+    state_desc VARCHAR,
+    volume_mount_point VARCHAR,
+    volume_total_mb DECIMAL(19,2),
+    volume_free_mb DECIMAL(19,2),
+    is_percent_growth BOOLEAN,
+    growth_pct INTEGER,
+    vlf_count INTEGER
+)";
+
+    public const string CreateDatabaseSizeStatsIndex = @"
+CREATE INDEX IF NOT EXISTS idx_database_size_stats_time ON database_size_stats(server_id, collection_time)";
+
+    public const string CreateServerPropertiesTable = @"
+CREATE TABLE IF NOT EXISTS server_properties (
+    collection_id BIGINT PRIMARY KEY,
+    collection_time TIMESTAMP NOT NULL,
+    server_id INTEGER NOT NULL,
+    server_name VARCHAR NOT NULL,
+    edition VARCHAR NOT NULL,
+    product_version VARCHAR NOT NULL,
+    product_level VARCHAR NOT NULL,
+    product_update_level VARCHAR,
+    engine_edition INTEGER NOT NULL,
+    cpu_count INTEGER NOT NULL,
+    hyperthread_ratio INTEGER NOT NULL,
+    physical_memory_mb BIGINT NOT NULL,
+    socket_count INTEGER,
+    cores_per_socket INTEGER,
+    is_hadr_enabled BOOLEAN,
+    is_clustered BOOLEAN,
+    enterprise_features VARCHAR,
+    service_objective VARCHAR
+)";
+
+    public const string CreateServerPropertiesIndex = @"
+CREATE INDEX IF NOT EXISTS idx_server_properties_time ON server_properties(server_id, collection_time)";
+
+    public const string CreateSessionStatsTable = @"
+CREATE TABLE IF NOT EXISTS session_stats (
+    collection_id BIGINT PRIMARY KEY,
+    collection_time TIMESTAMP NOT NULL,
+    server_id INTEGER NOT NULL,
+    server_name VARCHAR NOT NULL,
+    program_name VARCHAR NOT NULL,
+    connection_count BIGINT NOT NULL,
+    running_count INTEGER NOT NULL,
+    sleeping_count INTEGER NOT NULL,
+    dormant_count INTEGER NOT NULL,
+    total_cpu_time_ms BIGINT,
+    total_reads BIGINT,
+    total_writes BIGINT,
+    total_logical_reads BIGINT
+)";
+
+    public const string CreateSessionStatsIndex = @"
+CREATE INDEX IF NOT EXISTS idx_session_stats_time ON session_stats(server_id, collection_time)";
+
+    public const string CreateAlertLogTable = @"
+CREATE TABLE IF NOT EXISTS config_alert_log (
+    alert_time TIMESTAMP NOT NULL,
+    server_id INTEGER NOT NULL,
+    server_name VARCHAR NOT NULL,
+    metric_name VARCHAR NOT NULL,
+    current_value DOUBLE NOT NULL,
+    threshold_value DOUBLE NOT NULL,
+    alert_sent BOOLEAN NOT NULL DEFAULT false,
+    notification_type VARCHAR NOT NULL DEFAULT 'tray',
+    send_error VARCHAR,
+    dismissed BOOLEAN NOT NULL DEFAULT false,
+    muted BOOLEAN NOT NULL DEFAULT false,
+    detail_text VARCHAR
+)";
+
+    public const string CreateMuteRulesTable = @"
+CREATE TABLE IF NOT EXISTS config_mute_rules (
+    id VARCHAR NOT NULL PRIMARY KEY,
+    enabled BOOLEAN NOT NULL DEFAULT true,
+    created_at_utc TIMESTAMP NOT NULL,
+    expires_at_utc TIMESTAMP,
+    reason VARCHAR,
+    server_name VARCHAR,
+    metric_name VARCHAR,
+    database_pattern VARCHAR,
+    query_text_pattern VARCHAR,
+    wait_type_pattern VARCHAR,
+    job_name_pattern VARCHAR
+)";
+
+    public const string CreateDismissedArchiveAlertsTable = @"
+CREATE TABLE IF NOT EXISTS dismissed_archive_alerts (
+    alert_time TIMESTAMP NOT NULL,
+    server_id INTEGER NOT NULL,
+    metric_name VARCHAR NOT NULL,
+    dismissed_at TIMESTAMP NOT NULL DEFAULT current_timestamp
+)";
+
+    public const string CreateDismissedArchiveAlertsIndex = @"
+CREATE INDEX IF NOT EXISTS idx_dismissed_archive_alerts
+ON dismissed_archive_alerts (alert_time, server_id, metric_name)";
+
+    /// <summary>
+    /// Returns all table creation statements in order.
+    /// </summary>
+    public static IEnumerable<string> GetAllTableStatements()
+    {
+        yield return CreateServersTable;
+        yield return CreateCollectionScheduleTable;
+        yield return CreateCollectionLogTable;
+        yield return CreateWaitStatsTable;
+        yield return CreateQueryStatsTable;
+        yield return CreateCpuUtilizationStatsTable;
+        yield return CreateFileIoStatsTable;
+        yield return CreateMemoryStatsTable;
+        yield return CreateMemoryClerksTable;
+        yield return CreateDeadlocksTable;
+        yield return CreateProcedureStatsTable;
+        yield return CreateQueryStoreStatsTable;
+        yield return CreateQuerySnapshotsTable;
+        yield return CreateTempdbStatsTable;
+        yield return CreatePerfmonStatsTable;
+        yield return CreateServerConfigTable;
+        yield return CreateDatabaseConfigTable;
+        yield return CreateMemoryGrantStatsTable;
+        yield return CreateWaitingTasksTable;
+        yield return CreateBlockedProcessReportsTable;
+        yield return CreateDatabaseScopedConfigTable;
+        yield return CreateTraceFlagsTable;
+        yield return CreateRunningJobsTable;
+        yield return CreateDatabaseSizeStatsTable;
+        yield return CreateServerPropertiesTable;
+        yield return CreateSessionStatsTable;
+        yield return CreateAlertLogTable;
+        yield return CreateMuteRulesTable;
+        yield return CreateDismissedArchiveAlertsTable;
+    }
+
+    /// <summary>
+    /// Returns all index creation statements.
+    /// </summary>
+    public static IEnumerable<string> GetAllIndexStatements()
+    {
+        yield return CreateWaitStatsIndex;
+        yield return CreateQueryStatsIndex;
+        yield return CreateProcedureStatsIndex;
+        yield return CreateQueryStoreIndex;
+        yield return CreateQuerySnapshotsIndex;
+        yield return CreateCpuIndex;
+        yield return CreateFileIoIndex;
+        yield return CreateMemoryIndex;
+        yield return CreateTempdbIndex;
+        yield return CreatePerfmonIndex;
+        yield return CreateDeadlocksIndex;
+        yield return CreateCollectionLogIndex;
+        yield return CreateMemoryGrantStatsIndex;
+        yield return CreateWaitingTasksIndex;
+        yield return CreateBlockedProcessReportsIndex;
+        yield return CreateMemoryClerksIndex;
+        yield return CreateDatabaseScopedConfigIndex;
+        yield return CreateTraceFlagsIndex;
+        yield return CreateRunningJobsIndex;
+        yield return CreateDatabaseSizeStatsIndex;
+        yield return CreateServerPropertiesIndex;
+        yield return CreateSessionStatsIndex;
+        yield return CreateDismissedArchiveAlertsIndex;
+    }
+}
diff --git a/Lite/Services/LocalDataService.AlertHistory.cs b/Lite/Services/LocalDataService.AlertHistory.cs
index 9e29d212..a287b7ba 100644
--- a/Lite/Services/LocalDataService.AlertHistory.cs
+++ b/Lite/Services/LocalDataService.AlertHistory.cs
@@ -100,6 +100,7 @@ ORDER BY alert_time DESC
     /// <summary>
     /// Dismisses specific alerts by marking them as dismissed in DuckDB.
     /// Identifies rows by (alert_time, server_id, metric_name) composite key.
+    /// If an alert only exists in archived parquet, inserts into dismissed_archive_alerts instead.
     /// </summary>
     public async Task<int> DismissAlertsAsync(List<AlertHistoryRow> alerts)
     {
@@ -110,6 +111,7 @@ public async Task<int> DismissAlertsAsync(List<AlertHistoryRow> alerts)
 
         using var connection = await OpenConnectionAsync();
         int totalAffected = 0;
+        int archivedDismissed = 0;
 
         foreach (var alert in alerts)
         {
@@ -127,17 +129,37 @@ UPDATE config_alert_log
             var affected = await command.ExecuteNonQueryAsync();
             totalAffected += affected;
 
-            if (affected == 0 && App.LogAlertDismissals)
-                AppLogger.Warn("AlertDismiss", $"No rows updated for alert: time={alert.AlertTime:O}, server_id={alert.ServerId}, metric={alert.MetricName} — may be archived to parquet");
+            if (affected == 0)
+            {
+                using var sidecarCmd = connection.CreateCommand();
+                sidecarCmd.CommandText = @"
+INSERT INTO dismissed_archive_alerts (alert_time, server_id, metric_name)
+SELECT $1, $2, $3
+WHERE NOT EXISTS (
+    SELECT 1 FROM dismissed_archive_alerts
+    WHERE  alert_time = $1
+    AND    server_id  = $2
+    AND    metric_name = $3
+)";
+                sidecarCmd.Parameters.Add(new DuckDBParameter { Value = alert.AlertTime });
+                sidecarCmd.Parameters.Add(new DuckDBParameter { Value = alert.ServerId });
+                sidecarCmd.Parameters.Add(new DuckDBParameter { Value = alert.MetricName });
+                var sidecarAffected = await sidecarCmd.ExecuteNonQueryAsync();
+                archivedDismissed += sidecarAffected;
+
+                if (App.LogAlertDismissals)
+                    AppLogger.Info("AlertDismiss", $"Archived alert dismissed via sidecar: time={alert.AlertTime:O}, server_id={alert.ServerId}, metric={alert.MetricName}");
+            }
         }
 
         if (App.LogAlertDismissals)
-            AppLogger.Info("AlertDismiss", $"Dismiss complete: {totalAffected} row(s) updated out of {alerts.Count} selected");
-        return totalAffected;
+            AppLogger.Info("AlertDismiss", $"Dismiss complete: {totalAffected} live + {archivedDismissed} archived out of {alerts.Count} selected");
+        return totalAffected + archivedDismissed;
     }
 
     /// <summary>
     /// Dismisses all visible (non-dismissed) alerts matching the current filter criteria.
+    /// Updates the live table, then inserts any remaining archived alerts into the sidecar table.
     /// </summary>
     public async Task<int> DismissAllVisibleAlertsAsync(int hoursBack, int? serverId = null)
     {
@@ -170,10 +192,62 @@ UPDATE config_alert_log
             command.Parameters.Add(new DuckDBParameter { Value = cutoff });
         }
 
-        var affected = await command.ExecuteNonQueryAsync();
+        var liveAffected = await command.ExecuteNonQueryAsync();
+
+        // Dismiss any remaining archived alerts that matched the filter
+        using var sidecarCmd = connection.CreateCommand();
+        if (serverId.HasValue)
+        {
+            sidecarCmd.CommandText = @"
+INSERT INTO dismissed_archive_alerts (alert_time, server_id, metric_name)
+SELECT v.alert_time, v.server_id, v.metric_name
+FROM   v_config_alert_log v
+WHERE  v.alert_time >= $1
+AND    v.server_id = $2
+AND    v.dismissed = FALSE
+AND    NOT EXISTS (
+    SELECT 1 FROM config_alert_log l
+    WHERE  l.alert_time = v.alert_time
+    AND    l.server_id  = v.server_id
+    AND    l.metric_name = v.metric_name
+)
+AND    NOT EXISTS (
+    SELECT 1 FROM dismissed_archive_alerts d
+    WHERE  d.alert_time = v.alert_time
+    AND    d.server_id  = v.server_id
+    AND    d.metric_name = v.metric_name
+)";
+            sidecarCmd.Parameters.Add(new DuckDBParameter { Value = cutoff });
+            sidecarCmd.Parameters.Add(new DuckDBParameter { Value = serverId.Value });
+        }
+        else
+        {
+            sidecarCmd.CommandText = @"
+INSERT INTO dismissed_archive_alerts (alert_time, server_id, metric_name)
+SELECT v.alert_time, v.server_id, v.metric_name
+FROM   v_config_alert_log v
+WHERE  v.alert_time >= $1
+AND    v.dismissed = FALSE
+AND    NOT EXISTS (
+    SELECT 1 FROM config_alert_log l
+    WHERE  l.alert_time = v.alert_time
+    AND    l.server_id  = v.server_id
+    AND    l.metric_name = v.metric_name
+)
+AND    NOT EXISTS (
+    SELECT 1 FROM dismissed_archive_alerts d
+    WHERE  d.alert_time = v.alert_time
+    AND    d.server_id  = v.server_id
+    AND    d.metric_name = v.metric_name
+)";
+            sidecarCmd.Parameters.Add(new DuckDBParameter { Value = cutoff });
+        }
+
+        var archivedAffected = await sidecarCmd.ExecuteNonQueryAsync();
+
         if (App.LogAlertDismissals)
-            AppLogger.Info("AlertDismiss", $"Dismiss all complete: {affected} row(s) updated (cutoff={cutoff:O})");
-        return affected;
+            AppLogger.Info("AlertDismiss", $"Dismiss all complete: {liveAffected} live + {archivedAffected} archived (cutoff={cutoff:O})");
+        return liveAffected + archivedAffected;
     }
 }