From 97dbd6edbbc4c9ddcb19b2c5046f2a98d399e1c8 Mon Sep 17 00:00:00 2001
From: ClaudioESSilva <claudiosil100@gmail.com>
Date: Thu, 5 Mar 2026 09:11:43 +0000
Subject: [PATCH 01/17] Allow horizontal scroll fixes #14

---
 src/PlanViewer.App/Controls/QueryStoreGridControl.axaml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/PlanViewer.App/Controls/QueryStoreGridControl.axaml b/src/PlanViewer.App/Controls/QueryStoreGridControl.axaml
index 74e346d..a9cded8 100644
--- a/src/PlanViewer.App/Controls/QueryStoreGridControl.axaml
+++ b/src/PlanViewer.App/Controls/QueryStoreGridControl.axaml
@@ -78,7 +78,8 @@
                   HeadersVisibility="Column"
                   FontSize="11"
                   Background="{DynamicResource BackgroundDarkBrush}"
-                  BorderThickness="0">
+                  BorderThickness="0"
+                  ScrollViewer.HorizontalScrollBarVisibility="Auto">
             <DataGrid.ContextMenu>
                 <ContextMenu>
                     <MenuItem Header="Load Plan" Click="LoadHighlightedPlan_Click"/>
@@ -108,7 +109,7 @@
                 <DataGridTextColumn Header="Avg Physical Reads" Binding="{ReflectionBinding AvgPhysReadsDisplay}" Width="140"/>
                 <DataGridTextColumn Header="Total Memory (MB)" Binding="{ReflectionBinding TotalMemDisplay}" Width="140"/>
                 <DataGridTextColumn Header="Avg Memory (MB)" Binding="{ReflectionBinding AvgMemDisplay}" Width="130"/>
-                <DataGridTemplateColumn Header="Query Text" Width="*">
+                <DataGridTemplateColumn Header="Query Text" Width="300" MinWidth="150">
                     <DataGridTemplateColumn.CellTemplate>
                         <DataTemplate x:DataType="local:QueryStoreRow">
                             <TextBlock Text="{Binding QueryPreview}"

From 968f5ca68159771d115bc43704884547a1792def Mon Sep 17 00:00:00 2001
From: ClaudioESSilva <claudiosil100@gmail.com>
Date: Thu, 5 Mar 2026 10:00:09 +0000
Subject: [PATCH 02/17] Fixes #15

---
 .../Controls/QueryStoreGridControl.axaml      | 26 +++++++++----------
 .../Controls/QueryStoreGridControl.axaml.cs   | 16 ++++++++++++
 2 files changed, 29 insertions(+), 13 deletions(-)

diff --git a/src/PlanViewer.App/Controls/QueryStoreGridControl.axaml b/src/PlanViewer.App/Controls/QueryStoreGridControl.axaml
index a9cded8..566edf9 100644
--- a/src/PlanViewer.App/Controls/QueryStoreGridControl.axaml
+++ b/src/PlanViewer.App/Controls/QueryStoreGridControl.axaml
@@ -96,19 +96,19 @@
                 <DataGridTextColumn Header="QueryId" Binding="{ReflectionBinding QueryId}" Width="90"/>
                 <DataGridTextColumn Header="PlanId" Binding="{ReflectionBinding PlanId}" Width="80"/>
                 <DataGridTextColumn Header="Last Executed (Local)" Binding="{ReflectionBinding LastExecutedLocal}" Width="160"/>
-                <DataGridTextColumn Header="Executions" Binding="{ReflectionBinding ExecsDisplay}" Width="100"/>
-                <DataGridTextColumn Header="Total CPU (ms)" Binding="{ReflectionBinding TotalCpuDisplay}" Width="120"/>
-                <DataGridTextColumn Header="Avg CPU (ms)" Binding="{ReflectionBinding AvgCpuDisplay}" Width="110"/>
-                <DataGridTextColumn Header="Total Duration (ms)" Binding="{ReflectionBinding TotalDurDisplay}" Width="150"/>
-                <DataGridTextColumn Header="Avg Duration (ms)" Binding="{ReflectionBinding AvgDurDisplay}" Width="140"/>
-                <DataGridTextColumn Header="Total Reads" Binding="{ReflectionBinding TotalReadsDisplay}" Width="100"/>
-                <DataGridTextColumn Header="Avg Reads" Binding="{ReflectionBinding AvgReadsDisplay}" Width="100"/>
-                <DataGridTextColumn Header="Total Writes" Binding="{ReflectionBinding TotalWritesDisplay}" Width="100"/>
-                <DataGridTextColumn Header="Avg Writes" Binding="{ReflectionBinding AvgWritesDisplay}" Width="100"/>
-                <DataGridTextColumn Header="Total Physical Reads" Binding="{ReflectionBinding TotalPhysReadsDisplay}" Width="155"/>
-                <DataGridTextColumn Header="Avg Physical Reads" Binding="{ReflectionBinding AvgPhysReadsDisplay}" Width="140"/>
-                <DataGridTextColumn Header="Total Memory (MB)" Binding="{ReflectionBinding TotalMemDisplay}" Width="140"/>
-                <DataGridTextColumn Header="Avg Memory (MB)" Binding="{ReflectionBinding AvgMemDisplay}" Width="130"/>
+                <DataGridTextColumn Header="Executions" Binding="{ReflectionBinding ExecsDisplay}" SortMemberPath="ExecsSort" Width="100"/>
+                <DataGridTextColumn Header="Total CPU (ms)" Binding="{ReflectionBinding TotalCpuDisplay}" SortMemberPath="TotalCpuSort" Width="120"/>
+                <DataGridTextColumn Header="Avg CPU (ms)" Binding="{ReflectionBinding AvgCpuDisplay}" SortMemberPath="AvgCpuSort" Width="110"/>
+                <DataGridTextColumn Header="Total Duration (ms)" Binding="{ReflectionBinding TotalDurDisplay}" SortMemberPath="TotalDurSort" Width="150"/>
+                <DataGridTextColumn Header="Avg Duration (ms)" Binding="{ReflectionBinding AvgDurDisplay}" SortMemberPath="AvgDurSort" Width="140"/>
+                <DataGridTextColumn Header="Total Reads" Binding="{ReflectionBinding TotalReadsDisplay}" SortMemberPath="TotalReadsSort" Width="100"/>
+                <DataGridTextColumn Header="Avg Reads" Binding="{ReflectionBinding AvgReadsDisplay}" SortMemberPath="AvgReadsSort" Width="100"/>
+                <DataGridTextColumn Header="Total Writes" Binding="{ReflectionBinding TotalWritesDisplay}" SortMemberPath="TotalWritesSort" Width="100"/>
+                <DataGridTextColumn Header="Avg Writes" Binding="{ReflectionBinding AvgWritesDisplay}" SortMemberPath="AvgWritesSort" Width="100"/>
+                <DataGridTextColumn Header="Total Physical Reads" Binding="{ReflectionBinding TotalPhysReadsDisplay}" SortMemberPath="TotalPhysReadsSort" Width="155"/>
+                <DataGridTextColumn Header="Avg Physical Reads" Binding="{ReflectionBinding AvgPhysReadsDisplay}" SortMemberPath="AvgPhysReadsSort" Width="140"/>
+                <DataGridTextColumn Header="Total Memory (MB)" Binding="{ReflectionBinding TotalMemDisplay}" SortMemberPath="TotalMemSort" Width="140"/>
+                <DataGridTextColumn Header="Avg Memory (MB)" Binding="{ReflectionBinding AvgMemDisplay}" SortMemberPath="AvgMemSort" Width="130"/>
                 <DataGridTemplateColumn Header="Query Text" Width="300" MinWidth="150">
                     <DataGridTemplateColumn.CellTemplate>
                         <DataTemplate x:DataType="local:QueryStoreRow">
diff --git a/src/PlanViewer.App/Controls/QueryStoreGridControl.axaml.cs b/src/PlanViewer.App/Controls/QueryStoreGridControl.axaml.cs
index b7d7817..2412ead 100644
--- a/src/PlanViewer.App/Controls/QueryStoreGridControl.axaml.cs
+++ b/src/PlanViewer.App/Controls/QueryStoreGridControl.axaml.cs
@@ -134,6 +134,22 @@ public bool IsSelected
     public string AvgPhysReadsDisplay => Plan.AvgPhysicalIoReads.ToString("N0");
     public string TotalMemDisplay => (Plan.TotalMemoryGrantPages * 8.0 / 1024.0).ToString("N1");
     public string AvgMemDisplay => (Plan.AvgMemoryGrantPages * 8.0 / 1024.0).ToString("N1");
+
+    // Numeric sort properties (DataGrid SortMemberPath targets)
+    public long ExecsSort => Plan.CountExecutions;
+    public long TotalCpuSort => Plan.TotalCpuTimeUs;
+    public double AvgCpuSort => Plan.AvgCpuTimeUs;
+    public long TotalDurSort => Plan.TotalDurationUs;
+    public double AvgDurSort => Plan.AvgDurationUs;
+    public long TotalReadsSort => Plan.TotalLogicalIoReads;
+    public double AvgReadsSort => Plan.AvgLogicalIoReads;
+    public long TotalWritesSort => Plan.TotalLogicalIoWrites;
+    public double AvgWritesSort => Plan.AvgLogicalIoWrites;
+    public long TotalPhysReadsSort => Plan.TotalPhysicalIoReads;
+    public double AvgPhysReadsSort => Plan.AvgPhysicalIoReads;
+    public long TotalMemSort => Plan.TotalMemoryGrantPages;
+    public double AvgMemSort => Plan.AvgMemoryGrantPages;
+
     public string LastExecutedLocal => Plan.LastExecutedUtc.ToLocalTime().ToString("yyyy-MM-dd HH:mm");
     public string QueryPreview => Plan.QueryText.Length > 80
         ? Plan.QueryText[..80].Replace("\n", " ").Replace("\r", "") + "..."

From ac924956e025ae1137ea46eddf61676bee3c5f6a Mon Sep 17 00:00:00 2001
From: ClaudioESSilva <claudiosil100@gmail.com>
Date: Thu, 5 Mar 2026 10:05:23 +0000
Subject: [PATCH 03/17] implements #16

---
 src/PlanViewer.App/Controls/QueryStoreGridControl.axaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/PlanViewer.App/Controls/QueryStoreGridControl.axaml b/src/PlanViewer.App/Controls/QueryStoreGridControl.axaml
index 566edf9..f2f2eb2 100644
--- a/src/PlanViewer.App/Controls/QueryStoreGridControl.axaml
+++ b/src/PlanViewer.App/Controls/QueryStoreGridControl.axaml
@@ -70,7 +70,7 @@
         <DataGrid Grid.Row="1" x:Name="ResultsGrid"
                   AutoGenerateColumns="False"
                   CanUserSortColumns="True"
-                  CanUserReorderColumns="False"
+                  CanUserReorderColumns="True"
                   CanUserResizeColumns="True"
                   IsReadOnly="False"
                   SelectionMode="Single"

From 1fe18556d730eeb15ec92816ce3399a7ca3d5b67 Mon Sep 17 00:00:00 2001
From: ClaudioESSilva <claudiosil100@gmail.com>
Date: Thu, 5 Mar 2026 12:01:37 +0000
Subject: [PATCH 04/17] Implements #17

---
 .../Controls/ColumnFilterPopup.axaml          |  32 +++
 .../Controls/ColumnFilterPopup.axaml.cs       | 113 +++++++++
 .../Controls/ColumnFilterState.cs             |  75 ++++++
 .../Controls/QueryStoreGridControl.axaml.cs   | 235 +++++++++++++++++-
 4 files changed, 451 insertions(+), 4 deletions(-)
 create mode 100644 src/PlanViewer.App/Controls/ColumnFilterPopup.axaml
 create mode 100644 src/PlanViewer.App/Controls/ColumnFilterPopup.axaml.cs
 create mode 100644 src/PlanViewer.App/Controls/ColumnFilterState.cs

diff --git a/src/PlanViewer.App/Controls/ColumnFilterPopup.axaml b/src/PlanViewer.App/Controls/ColumnFilterPopup.axaml
new file mode 100644
index 0000000..5a54155
--- /dev/null
+++ b/src/PlanViewer.App/Controls/ColumnFilterPopup.axaml
@@ -0,0 +1,32 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             x:Class="PlanViewer.App.Controls.ColumnFilterPopup"
+             Width="220">
+    <Border Background="{DynamicResource BackgroundDarkBrush}"
+            BorderBrush="{DynamicResource BorderBrush}"
+            BorderThickness="1" CornerRadius="6">
+        <StackPanel Margin="12" Spacing="4">
+            <TextBlock x:Name="HeaderText" Text="Filter Column"
+                       FontWeight="SemiBold" FontSize="13" Margin="0,0,0,8"
+                       Foreground="{DynamicResource ForegroundBrush}"/>
+            <TextBlock Text="Operator:" FontSize="11" Margin="0,0,0,2"
+                       Foreground="{DynamicResource ForegroundBrush}"/>
+            <ComboBox x:Name="OperatorComboBox" HorizontalAlignment="Stretch"
+                      Height="28" FontSize="12" Margin="0,0,0,8"
+                      SelectionChanged="OperatorComboBox_SelectionChanged"/>
+            <TextBlock x:Name="ValueLabel" Text="Value:" FontSize="11" Margin="0,0,0,2"
+                       Foreground="{DynamicResource ForegroundBrush}"/>
+            <TextBox x:Name="ValueTextBox" HorizontalAlignment="Stretch"
+                     Height="28" FontSize="12" Margin="0,0,0,12"
+                     KeyDown="ValueTextBox_KeyDown"/>
+            <StackPanel Orientation="Horizontal" HorizontalAlignment="Right" Spacing="8">
+                <Button Content="Clear" Width="65" Height="28"
+                        Click="ClearButton_Click"
+                        Theme="{StaticResource AppButton}"/>
+                <Button Content="Apply" Width="65" Height="28"
+                        Click="ApplyButton_Click"
+                        Theme="{StaticResource AppButton}"/>
+            </StackPanel>
+        </StackPanel>
+    </Border>
+</UserControl>
diff --git a/src/PlanViewer.App/Controls/ColumnFilterPopup.axaml.cs b/src/PlanViewer.App/Controls/ColumnFilterPopup.axaml.cs
new file mode 100644
index 0000000..b2b7f32
--- /dev/null
+++ b/src/PlanViewer.App/Controls/ColumnFilterPopup.axaml.cs
@@ -0,0 +1,113 @@
+using System;
+using Avalonia.Controls;
+using Avalonia.Input;
+using Avalonia.Interactivity;
+
+namespace PlanViewer.App.Controls;
+
+public partial class ColumnFilterPopup : UserControl
+{
+    public event EventHandler<FilterAppliedEventArgs>? FilterApplied;
+    public event EventHandler? FilterCleared;
+
+    private string _currentColumnName = "";
+
+    private static readonly (string Display, FilterOperator Op)[] Operators =
+    [
+        ("Contains",           FilterOperator.Contains),
+        ("Equals (=)",         FilterOperator.Equals),
+        ("Not Equals (!=)",    FilterOperator.NotEquals),
+        ("Starts With",        FilterOperator.StartsWith),
+        ("Ends With",          FilterOperator.EndsWith),
+        ("Greater Than (>)",   FilterOperator.GreaterThan),
+        ("Greater or Equal (>=)", FilterOperator.GreaterThanOrEqual),
+        ("Less Than (<)",      FilterOperator.LessThan),
+        ("Less or Equal (<=)", FilterOperator.LessThanOrEqual),
+        ("Is Empty",           FilterOperator.IsEmpty),
+        ("Is Not Empty",       FilterOperator.IsNotEmpty),
+    ];
+
+    public ColumnFilterPopup()
+    {
+        InitializeComponent();
+        foreach (var (display, _) in Operators)
+            OperatorComboBox.Items.Add(display);
+        OperatorComboBox.SelectedIndex = 0;
+    }
+
+    public void Initialize(string columnName, ColumnFilterState? existingFilter)
+    {
+        _currentColumnName = columnName;
+        HeaderText.Text = $"Filter: {columnName}";
+
+        if (existingFilter?.IsActive == true)
+        {
+            var idx = Array.FindIndex(Operators, o => o.Op == existingFilter.Operator);
+            OperatorComboBox.SelectedIndex = idx >= 0 ? idx : 0;
+            ValueTextBox.Text = existingFilter.Value;
+        }
+        else
+        {
+            OperatorComboBox.SelectedIndex = 0;
+            ValueTextBox.Text = "";
+        }
+
+        UpdateValueVisibility();
+        ValueTextBox.Focus();
+    }
+
+    private void UpdateValueVisibility()
+    {
+        var idx = OperatorComboBox.SelectedIndex;
+        var op = (idx >= 0 && idx < Operators.Length) ? Operators[idx].Op : FilterOperator.Contains;
+        var showValue = op != FilterOperator.IsEmpty && op != FilterOperator.IsNotEmpty;
+        ValueLabel.IsVisible = showValue;
+        ValueTextBox.IsVisible = showValue;
+    }
+
+    private void OperatorComboBox_SelectionChanged(object? sender, SelectionChangedEventArgs e)
+    {
+        UpdateValueVisibility();
+    }
+
+    private void ApplyFilter()
+    {
+        var idx = OperatorComboBox.SelectedIndex;
+        if (idx < 0 || idx >= Operators.Length) return;
+
+        FilterApplied?.Invoke(this, new FilterAppliedEventArgs
+        {
+            FilterState = new ColumnFilterState
+            {
+                ColumnName = _currentColumnName,
+                Operator   = Operators[idx].Op,
+                Value      = ValueTextBox.Text ?? "",
+            }
+        });
+    }
+
+    private void ApplyButton_Click(object? sender, RoutedEventArgs e) => ApplyFilter();
+
+    private void ClearButton_Click(object? sender, RoutedEventArgs e)
+    {
+        FilterApplied?.Invoke(this, new FilterAppliedEventArgs
+        {
+            FilterState = new ColumnFilterState { ColumnName = _currentColumnName }
+        });
+        FilterCleared?.Invoke(this, EventArgs.Empty);
+    }
+
+    private void ValueTextBox_KeyDown(object? sender, KeyEventArgs e)
+    {
+        if (e.Key == Key.Enter)
+        {
+            ApplyFilter();
+            e.Handled = true;
+        }
+        else if (e.Key == Key.Escape)
+        {
+            FilterCleared?.Invoke(this, EventArgs.Empty);
+            e.Handled = true;
+        }
+    }
+}
diff --git a/src/PlanViewer.App/Controls/ColumnFilterState.cs b/src/PlanViewer.App/Controls/ColumnFilterState.cs
new file mode 100644
index 0000000..ea5cb04
--- /dev/null
+++ b/src/PlanViewer.App/Controls/ColumnFilterState.cs
@@ -0,0 +1,75 @@
+using System;
+
+namespace PlanViewer.App.Controls;
+
+public enum FilterOperator
+{
+    Contains,
+    Equals,
+    NotEquals,
+    StartsWith,
+    EndsWith,
+    GreaterThan,
+    GreaterThanOrEqual,
+    LessThan,
+    LessThanOrEqual,
+    IsEmpty,
+    IsNotEmpty,
+}
+
+public class ColumnFilterState
+{
+    public string ColumnName { get; set; } = string.Empty;
+    public FilterOperator Operator { get; set; } = FilterOperator.Contains;
+    public string Value { get; set; } = string.Empty;
+
+    public bool IsActive =>
+        !string.IsNullOrEmpty(Value) ||
+        Operator == FilterOperator.IsEmpty ||
+        Operator == FilterOperator.IsNotEmpty;
+
+    public string DisplayText
+    {
+        get
+        {
+            if (!IsActive) return string.Empty;
+
+            return Operator switch
+            {
+                FilterOperator.Contains          => $"Contains '{Value}'",
+                FilterOperator.Equals            => $"= '{Value}'",
+                FilterOperator.NotEquals         => $"!= '{Value}'",
+                FilterOperator.GreaterThan       => $"> {Value}",
+                FilterOperator.GreaterThanOrEqual => $">= {Value}",
+                FilterOperator.LessThan          => $"< {Value}",
+                FilterOperator.LessThanOrEqual   => $"<= {Value}",
+                FilterOperator.StartsWith        => $"Starts with '{Value}'",
+                FilterOperator.EndsWith          => $"Ends with '{Value}'",
+                FilterOperator.IsEmpty           => "Is Empty",
+                FilterOperator.IsNotEmpty        => "Is Not Empty",
+                _                                => Value,
+            };
+        }
+    }
+
+    public static string GetOperatorDisplayName(FilterOperator op) => op switch
+    {
+        FilterOperator.Contains          => "Contains",
+        FilterOperator.Equals            => "Equals (=)",
+        FilterOperator.NotEquals         => "Not Equals (!=)",
+        FilterOperator.GreaterThan       => "Greater Than (>)",
+        FilterOperator.GreaterThanOrEqual => "Greater or Equal (>=)",
+        FilterOperator.LessThan          => "Less Than (<)",
+        FilterOperator.LessThanOrEqual   => "Less or Equal (<=)",
+        FilterOperator.StartsWith        => "Starts With",
+        FilterOperator.EndsWith          => "Ends With",
+        FilterOperator.IsEmpty           => "Is Empty",
+        FilterOperator.IsNotEmpty        => "Is Not Empty",
+        _                                => op.ToString(),
+    };
+}
+
+public class FilterAppliedEventArgs : EventArgs
+{
+    public ColumnFilterState FilterState { get; set; } = new ColumnFilterState();
+}
diff --git a/src/PlanViewer.App/Controls/QueryStoreGridControl.axaml.cs b/src/PlanViewer.App/Controls/QueryStoreGridControl.axaml.cs
index 2412ead..207f06a 100644
--- a/src/PlanViewer.App/Controls/QueryStoreGridControl.axaml.cs
+++ b/src/PlanViewer.App/Controls/QueryStoreGridControl.axaml.cs
@@ -6,7 +6,9 @@
 using System.Runtime.CompilerServices;
 using System.Threading;
 using Avalonia.Controls;
+using Avalonia.Controls.Primitives;
 using Avalonia.Interactivity;
+using Avalonia.Media;
 using PlanViewer.Core.Models;
 using PlanViewer.Core.Services;
 
@@ -18,6 +20,10 @@ public partial class QueryStoreGridControl : UserControl
     private readonly string _database;
     private CancellationTokenSource? _fetchCts;
     private ObservableCollection<QueryStoreRow> _rows = new();
+    private ObservableCollection<QueryStoreRow> _filteredRows = new();
+    private readonly Dictionary<string, ColumnFilterState> _activeFilters = new();
+    private Popup? _filterPopup;
+    private ColumnFilterPopup? _filterPopupContent;
 
     public event EventHandler<List<QueryStorePlan>>? PlansSelected;
 
@@ -26,7 +32,9 @@ public QueryStoreGridControl(string connectionString, string database)
         _connectionString = connectionString;
         _database = database;
         InitializeComponent();
-        ResultsGrid.ItemsSource = _rows;
+        ResultsGrid.ItemsSource = _filteredRows;
+        EnsureFilterPopup();
+        SetupColumnHeaders();
     }
 
     private async void Fetch_Click(object? sender, RoutedEventArgs e)
@@ -43,6 +51,7 @@ private async void Fetch_Click(object? sender, RoutedEventArgs e)
         LoadButton.IsEnabled = false;
         StatusText.Text = "Fetching...";
         _rows.Clear();
+        _filteredRows.Clear();
 
         try
         {
@@ -58,7 +67,7 @@ private async void Fetch_Click(object? sender, RoutedEventArgs e)
             foreach (var plan in plans)
                 _rows.Add(new QueryStoreRow(plan));
 
-            StatusText.Text = $"{plans.Count} plans";
+            ApplyFilters();
             LoadButton.IsEnabled = true;
         }
         catch (OperationCanceledException)
@@ -77,13 +86,13 @@ private async void Fetch_Click(object? sender, RoutedEventArgs e)
 
     private void SelectAll_Click(object? sender, RoutedEventArgs e)
     {
-        foreach (var row in _rows)
+        foreach (var row in _filteredRows)
             row.IsSelected = true;
     }
 
     private void SelectNone_Click(object? sender, RoutedEventArgs e)
     {
-        foreach (var row in _rows)
+        foreach (var row in _filteredRows)
             row.IsSelected = false;
     }
 
@@ -99,6 +108,224 @@ private void LoadHighlightedPlan_Click(object? sender, RoutedEventArgs e)
         if (ResultsGrid.SelectedItem is QueryStoreRow row)
             PlansSelected?.Invoke(this, new List<QueryStorePlan> { row.Plan });
     }
+
+    // ── Column filter infrastructure ───────────────────────────────────────
+
+    private static readonly Dictionary<string, Func<QueryStoreRow, string>> TextAccessors = new()
+    {
+        ["LastExecuted"] = r => r.LastExecutedLocal,
+        ["QueryText"]    = r => r.FullQueryText,
+    };
+
+    private static readonly Dictionary<string, Func<QueryStoreRow, double>> NumericAccessors = new()
+    {
+        ["QueryId"]        = r => r.QueryId,
+        ["PlanId"]         = r => r.PlanId,
+        ["Executions"]     = r => r.ExecsSort,
+        ["TotalCpu"]       = r => r.TotalCpuSort / 1000.0,       // µs → ms (matches display)
+        ["AvgCpu"]         = r => r.AvgCpuSort / 1000.0,         // µs → ms
+        ["TotalDuration"]  = r => r.TotalDurSort / 1000.0,       // µs → ms
+        ["AvgDuration"]    = r => r.AvgDurSort / 1000.0,         // µs → ms
+        ["TotalReads"]     = r => r.TotalReadsSort,
+        ["AvgReads"]       = r => r.AvgReadsSort,
+        ["TotalWrites"]    = r => r.TotalWritesSort,
+        ["AvgWrites"]      = r => r.AvgWritesSort,
+        ["TotalPhysReads"] = r => r.TotalPhysReadsSort,
+        ["AvgPhysReads"]   = r => r.AvgPhysReadsSort,
+        ["TotalMemory"]    = r => r.TotalMemSort * 8.0 / 1024.0, // pages → MB (matches display)
+        ["AvgMemory"]      = r => r.AvgMemSort * 8.0 / 1024.0,   // pages → MB
+    };
+
+    private void SetupColumnHeaders()
+    {
+        var cols = ResultsGrid.Columns;
+        SetColumnFilterButton(cols[1],  "QueryId",        "Query ID");
+        SetColumnFilterButton(cols[2],  "PlanId",         "Plan ID");
+        SetColumnFilterButton(cols[3],  "LastExecuted",   "Last Executed (Local)");
+        SetColumnFilterButton(cols[4],  "Executions",     "Executions");
+        SetColumnFilterButton(cols[5],  "TotalCpu",       "Total CPU (ms)");
+        SetColumnFilterButton(cols[6],  "AvgCpu",         "Avg CPU (ms)");
+        SetColumnFilterButton(cols[7],  "TotalDuration",  "Total Duration (ms)");
+        SetColumnFilterButton(cols[8],  "AvgDuration",    "Avg Duration (ms)");
+        SetColumnFilterButton(cols[9],  "TotalReads",     "Total Reads");
+        SetColumnFilterButton(cols[10], "AvgReads",       "Avg Reads");
+        SetColumnFilterButton(cols[11], "TotalWrites",    "Total Writes");
+        SetColumnFilterButton(cols[12], "AvgWrites",      "Avg Writes");
+        SetColumnFilterButton(cols[13], "TotalPhysReads", "Total Physical Reads");
+        SetColumnFilterButton(cols[14], "AvgPhysReads",   "Avg Physical Reads");
+        SetColumnFilterButton(cols[15], "TotalMemory",    "Total Memory (MB)");
+        SetColumnFilterButton(cols[16], "AvgMemory",      "Avg Memory (MB)");
+        SetColumnFilterButton(cols[17], "QueryText",      "Query Text");
+    }
+
+    private void SetColumnFilterButton(DataGridColumn col, string columnId, string label)
+    {
+        var icon = new TextBlock
+        {
+            Text = "▼",
+            FontSize = 9,
+            VerticalAlignment = Avalonia.Layout.VerticalAlignment.Center,
+            HorizontalAlignment = Avalonia.Layout.HorizontalAlignment.Center,
+        };
+        var btn = new Button
+        {
+            Content = icon,
+            Tag = columnId,
+            Width = 14,
+            Height = 14,
+            Padding = new Avalonia.Thickness(0),
+            Background = Brushes.Transparent,
+            BorderThickness = new Avalonia.Thickness(0),
+            VerticalAlignment = Avalonia.Layout.VerticalAlignment.Center,
+        };
+        btn.Click += ColumnFilter_Click;
+        ToolTip.SetTip(btn, "Click to filter");
+
+        var text = new TextBlock
+        {
+            Text = label,
+            FontWeight = FontWeight.Bold,
+            VerticalAlignment = Avalonia.Layout.VerticalAlignment.Center,
+            Margin = new Avalonia.Thickness(4, 0, 0, 0),
+        };
+
+        var header = new StackPanel { Orientation = Avalonia.Layout.Orientation.Horizontal };
+        header.Children.Add(btn);
+        header.Children.Add(text);
+        col.Header = header;
+    }
+
+    private void EnsureFilterPopup()
+    {
+        if (_filterPopup != null) return;
+        _filterPopupContent = new ColumnFilterPopup();
+        _filterPopup = new Popup
+        {
+            Child = _filterPopupContent,
+            IsLightDismissEnabled = true,
+            Placement = PlacementMode.Bottom,
+        };
+        // Add to visual tree so DynamicResources resolve inside the popup
+        ((Grid)Content!).Children.Add(_filterPopup);
+        _filterPopupContent.FilterApplied += OnFilterApplied;
+        _filterPopupContent.FilterCleared += OnFilterCleared;
+    }
+
+    private void ColumnFilter_Click(object? sender, RoutedEventArgs e)
+    {
+        if (sender is not Button button || button.Tag is not string columnId) return;
+        EnsureFilterPopup();
+        _activeFilters.TryGetValue(columnId, out var existing);
+        _filterPopupContent!.Initialize(columnId, existing);
+        _filterPopup!.PlacementTarget = button;
+        _filterPopup.IsOpen = true;
+    }
+
+    private void OnFilterApplied(object? sender, FilterAppliedEventArgs e)
+    {
+        _filterPopup!.IsOpen = false;
+        if (e.FilterState.IsActive)
+            _activeFilters[e.FilterState.ColumnName] = e.FilterState;
+        else
+            _activeFilters.Remove(e.FilterState.ColumnName);
+        ApplyFilters();
+        UpdateFilterButtonStyles();
+    }
+
+    private void OnFilterCleared(object? sender, EventArgs e)
+    {
+        _filterPopup!.IsOpen = false;
+    }
+
+    private void UpdateFilterButtonStyles()
+    {
+        foreach (var col in ResultsGrid.Columns)
+        {
+            if (col.Header is not StackPanel sp) continue;
+            var btn = sp.Children.OfType<Button>().FirstOrDefault();
+            if (btn?.Tag is not string colId) continue;
+            if (btn.Content is not TextBlock tb) continue;
+
+            bool hasFilter = _activeFilters.TryGetValue(colId, out var f) && f.IsActive;
+            if (hasFilter)
+                tb.Foreground = new SolidColorBrush(Color.FromRgb(0xFF, 0xD7, 0x00));
+            else
+                tb.ClearValue(TextBlock.ForegroundProperty);
+
+            ToolTip.SetTip(btn, hasFilter
+                ? $"Filter: {f!.DisplayText} (click to modify)"
+                : "Click to filter");
+        }
+    }
+
+    private void ApplyFilters()
+    {
+        _filteredRows.Clear();
+        foreach (var row in _rows)
+        {
+            if (RowMatchesAllFilters(row))
+                _filteredRows.Add(row);
+        }
+        UpdateStatusText();
+    }
+
+    private bool RowMatchesAllFilters(QueryStoreRow row)
+    {
+        foreach (var (colId, state) in _activeFilters)
+        {
+            if (!state.IsActive) continue;
+            if (TextAccessors.TryGetValue(colId, out var textAcc))
+            {
+                if (!MatchText(textAcc(row), state.Operator, state.Value)) return false;
+            }
+            else if (NumericAccessors.TryGetValue(colId, out var numAcc))
+            {
+                var isTextOp = state.Operator is FilterOperator.Contains or FilterOperator.StartsWith
+                               or FilterOperator.EndsWith or FilterOperator.IsEmpty or FilterOperator.IsNotEmpty;
+                if (isTextOp)
+                {
+                    if (!MatchText(numAcc(row).ToString("G"), state.Operator, state.Value)) return false;
+                }
+                else
+                {
+                    if (!double.TryParse(state.Value, out var numVal)) continue;
+                    if (!MatchNumeric(numAcc(row), state.Operator, numVal)) return false;
+                }
+            }
+        }
+        return true;
+    }
+
+    private static bool MatchText(string data, FilterOperator op, string val) => op switch
+    {
+        FilterOperator.Contains   => data.Contains(val, StringComparison.OrdinalIgnoreCase),
+        FilterOperator.Equals     => data.Equals(val, StringComparison.OrdinalIgnoreCase),
+        FilterOperator.NotEquals  => !data.Equals(val, StringComparison.OrdinalIgnoreCase),
+        FilterOperator.StartsWith => data.StartsWith(val, StringComparison.OrdinalIgnoreCase),
+        FilterOperator.EndsWith   => data.EndsWith(val, StringComparison.OrdinalIgnoreCase),
+        FilterOperator.IsEmpty    => string.IsNullOrEmpty(data),
+        FilterOperator.IsNotEmpty => !string.IsNullOrEmpty(data),
+        _                         => true,
+    };
+
+    private static bool MatchNumeric(double data, FilterOperator op, double val) => op switch
+    {
+        FilterOperator.Equals            => Math.Abs(data - val) < 1e-9,
+        FilterOperator.NotEquals         => Math.Abs(data - val) >= 1e-9,
+        FilterOperator.GreaterThan       => data > val,
+        FilterOperator.GreaterThanOrEqual => data >= val,
+        FilterOperator.LessThan          => data < val,
+        FilterOperator.LessThanOrEqual   => data <= val,
+        _                                => true,
+    };
+
+    private void UpdateStatusText()
+    {
+        if (_rows.Count == 0) return;
+        StatusText.Text = _filteredRows.Count == _rows.Count
+            ? $"{_rows.Count} plans"
+            : $"{_filteredRows.Count} / {_rows.Count} plans (filtered)";
+    }
 }
 
 public class QueryStoreRow : INotifyPropertyChanged

From 559756887f14f38914ee788e2ab86eaeee8e7a2e Mon Sep 17 00:00:00 2001
From: ClaudioESSilva <claudiosil100@gmail.com>
Date: Thu, 5 Mar 2026 13:53:46 +0000
Subject: [PATCH 05/17] Add better icon for "fiter" and odering

---
 .../Controls/QueryStoreGridControl.axaml.cs     | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/PlanViewer.App/Controls/QueryStoreGridControl.axaml.cs b/src/PlanViewer.App/Controls/QueryStoreGridControl.axaml.cs
index 207f06a..2117088 100644
--- a/src/PlanViewer.App/Controls/QueryStoreGridControl.axaml.cs
+++ b/src/PlanViewer.App/Controls/QueryStoreGridControl.axaml.cs
@@ -5,6 +5,7 @@
 using System.Linq;
 using System.Runtime.CompilerServices;
 using System.Threading;
+using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Controls.Primitives;
 using Avalonia.Interactivity;
@@ -162,8 +163,9 @@ private void SetColumnFilterButton(DataGridColumn col, string columnId, string l
     {
         var icon = new TextBlock
         {
-            Text = "▼",
-            FontSize = 9,
+            Text = "\uE71C",
+            FontFamily = new Avalonia.Media.FontFamily("Segoe Fluent Icons,Segoe MDL2 Assets"),
+            FontSize = 12,
             VerticalAlignment = Avalonia.Layout.VerticalAlignment.Center,
             HorizontalAlignment = Avalonia.Layout.HorizontalAlignment.Center,
         };
@@ -171,8 +173,8 @@ private void SetColumnFilterButton(DataGridColumn col, string columnId, string l
         {
             Content = icon,
             Tag = columnId,
-            Width = 14,
-            Height = 14,
+            Width = 16,
+            Height = 16,
             Padding = new Avalonia.Thickness(0),
             Background = Brushes.Transparent,
             BorderThickness = new Avalonia.Thickness(0),
@@ -189,7 +191,11 @@ private void SetColumnFilterButton(DataGridColumn col, string columnId, string l
             Margin = new Avalonia.Thickness(4, 0, 0, 0),
         };
 
-        var header = new StackPanel { Orientation = Avalonia.Layout.Orientation.Horizontal };
+        var header = new StackPanel
+        {
+            Orientation = Avalonia.Layout.Orientation.Horizontal,
+            HorizontalAlignment = Avalonia.Layout.HorizontalAlignment.Left,
+        };
         header.Children.Add(btn);
         header.Children.Add(text);
         col.Header = header;
@@ -247,6 +253,7 @@ private void UpdateFilterButtonStyles()
             if (btn.Content is not TextBlock tb) continue;
 
             bool hasFilter = _activeFilters.TryGetValue(colId, out var f) && f.IsActive;
+            tb.Text = hasFilter ? "\uE16E" : "\uE71C";
             if (hasFilter)
                 tb.Foreground = new SolidColorBrush(Color.FromRgb(0xFF, 0xD7, 0x00));
             else

From 26989dcd4db2af887e5c1a0bb2ac14bf2cc4c84c Mon Sep 17 00:00:00 2001
From: Erik Darling <2136037+erikdarlingdata@users.noreply.github.com>
Date: Thu, 5 Mar 2026 11:07:08 -0500
Subject: [PATCH 06/17] Fix obsolete IClipboard.GetTextAsync() warnings

Replace GetTextAsync() with ClipboardExtensions.TryGetTextAsync()
in both QuerySessionControl and MainWindow paste handlers.

Closes #3

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 src/PlanViewer.App/Controls/QuerySessionControl.axaml.cs | 3 ++-
 src/PlanViewer.App/MainWindow.axaml.cs                   | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/PlanViewer.App/Controls/QuerySessionControl.axaml.cs b/src/PlanViewer.App/Controls/QuerySessionControl.axaml.cs
index 2dcb52f..7bc9cfa 100644
--- a/src/PlanViewer.App/Controls/QuerySessionControl.axaml.cs
+++ b/src/PlanViewer.App/Controls/QuerySessionControl.axaml.cs
@@ -8,6 +8,7 @@
 using System.Xml.Linq;
 using Avalonia.Controls;
 using Avalonia.Input;
+using Avalonia.Input.Platform;
 using Avalonia.Interactivity;
 using Avalonia.Layout;
 using Avalonia.Media;
@@ -120,7 +121,7 @@ private void SetupEditorContextMenu()
         {
             var clipboard = TopLevel.GetTopLevel(this)?.Clipboard;
             if (clipboard == null) return;
-            var text = await clipboard.GetTextAsync();
+            var text = await clipboard.TryGetTextAsync();
             if (string.IsNullOrEmpty(text)) return;
             QueryEditor.TextArea.PerformTextInput(text);
         };
diff --git a/src/PlanViewer.App/MainWindow.axaml.cs b/src/PlanViewer.App/MainWindow.axaml.cs
index 3304a71..726e80a 100644
--- a/src/PlanViewer.App/MainWindow.axaml.cs
+++ b/src/PlanViewer.App/MainWindow.axaml.cs
@@ -9,6 +9,7 @@
 using System.Xml.Linq;
 using Avalonia.Controls;
 using Avalonia.Input;
+using Avalonia.Input.Platform;
 using Avalonia.Interactivity;
 using Avalonia.Layout;
 using Avalonia.Media;
@@ -370,7 +371,7 @@ private async Task PasteXmlAsync()
         var clipboard = this.Clipboard;
         if (clipboard == null) return;
 
-        var xml = await clipboard.GetTextAsync();
+        var xml = await clipboard.TryGetTextAsync();
         if (string.IsNullOrWhiteSpace(xml))
         {
             ShowError("The clipboard does not contain any text.");

From 12a3e82c878c68c769ef2fdd0854fa63d8fa623c Mon Sep 17 00:00:00 2001
From: ClaudioESSilva <claudiosil100@gmail.com>
Date: Thu, 5 Mar 2026 16:13:19 +0000
Subject: [PATCH 07/17] fix: LoadSelectedPlans_Click Should Use _filteredRows

---
 src/PlanViewer.App/Controls/QueryStoreGridControl.axaml.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/PlanViewer.App/Controls/QueryStoreGridControl.axaml.cs b/src/PlanViewer.App/Controls/QueryStoreGridControl.axaml.cs
index 2117088..643e7ab 100644
--- a/src/PlanViewer.App/Controls/QueryStoreGridControl.axaml.cs
+++ b/src/PlanViewer.App/Controls/QueryStoreGridControl.axaml.cs
@@ -99,7 +99,7 @@ private void SelectNone_Click(object? sender, RoutedEventArgs e)
 
     private void LoadSelected_Click(object? sender, RoutedEventArgs e)
     {
-        var selected = _rows.Where(r => r.IsSelected).Select(r => r.Plan).ToList();
+        var selected = _filteredRows.Where(r => r.IsSelected).Select(r => r.Plan).ToList();
         if (selected.Count > 0)
             PlansSelected?.Invoke(this, selected);
     }

From 489c923e76b840bc8325248faf2e9233f465c8e4 Mon Sep 17 00:00:00 2001
From: ClaudioESSilva <claudiosil100@gmail.com>
Date: Thu, 5 Mar 2026 16:14:03 +0000
Subject: [PATCH 08/17] Fix: Query Text Column Width

---
 src/PlanViewer.App/Controls/QueryStoreGridControl.axaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/PlanViewer.App/Controls/QueryStoreGridControl.axaml b/src/PlanViewer.App/Controls/QueryStoreGridControl.axaml
index f2f2eb2..8037ff5 100644
--- a/src/PlanViewer.App/Controls/QueryStoreGridControl.axaml
+++ b/src/PlanViewer.App/Controls/QueryStoreGridControl.axaml
@@ -109,7 +109,7 @@
                 <DataGridTextColumn Header="Avg Physical Reads" Binding="{ReflectionBinding AvgPhysReadsDisplay}" SortMemberPath="AvgPhysReadsSort" Width="140"/>
                 <DataGridTextColumn Header="Total Memory (MB)" Binding="{ReflectionBinding TotalMemDisplay}" SortMemberPath="TotalMemSort" Width="140"/>
                 <DataGridTextColumn Header="Avg Memory (MB)" Binding="{ReflectionBinding AvgMemDisplay}" SortMemberPath="AvgMemSort" Width="130"/>
-                <DataGridTemplateColumn Header="Query Text" Width="300" MinWidth="150">
+                <DataGridTemplateColumn Header="Query Text" Width="*" MinWidth="300">
                     <DataGridTemplateColumn.CellTemplate>
                         <DataTemplate x:DataType="local:QueryStoreRow">
                             <TextBlock Text="{Binding QueryPreview}"

From 743e36b6894426180f87230c558d3c911bbeabb7 Mon Sep 17 00:00:00 2001
From: ClaudioESSilva <claudiosil100@gmail.com>
Date: Thu, 5 Mar 2026 16:14:48 +0000
Subject: [PATCH 09/17] Fix: Remove Dead Code

---
 src/PlanViewer.App/Controls/ColumnFilterState.cs | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/src/PlanViewer.App/Controls/ColumnFilterState.cs b/src/PlanViewer.App/Controls/ColumnFilterState.cs
index ea5cb04..1cc8176 100644
--- a/src/PlanViewer.App/Controls/ColumnFilterState.cs
+++ b/src/PlanViewer.App/Controls/ColumnFilterState.cs
@@ -51,22 +51,6 @@ public string DisplayText
             };
         }
     }
-
-    public static string GetOperatorDisplayName(FilterOperator op) => op switch
-    {
-        FilterOperator.Contains          => "Contains",
-        FilterOperator.Equals            => "Equals (=)",
-        FilterOperator.NotEquals         => "Not Equals (!=)",
-        FilterOperator.GreaterThan       => "Greater Than (>)",
-        FilterOperator.GreaterThanOrEqual => "Greater or Equal (>=)",
-        FilterOperator.LessThan          => "Less Than (<)",
-        FilterOperator.LessThanOrEqual   => "Less or Equal (<=)",
-        FilterOperator.StartsWith        => "Starts With",
-        FilterOperator.EndsWith          => "Ends With",
-        FilterOperator.IsEmpty           => "Is Empty",
-        FilterOperator.IsNotEmpty        => "Is Not Empty",
-        _                                => op.ToString(),
-    };
 }
 
 public class FilterAppliedEventArgs : EventArgs

From 9a1371749b869dec3f0d17e43edbb32adbb6dc95 Mon Sep 17 00:00:00 2001
From: Erik Darling <2136037+erikdarlingdata@users.noreply.github.com>
Date: Thu, 5 Mar 2026 11:17:49 -0500
Subject: [PATCH 10/17] Show all plan warnings in root operator tooltip

Root node tooltip now displays warnings from all child nodes,
matching the warning count badge already visible on the node.

Closes #20

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 .../Controls/PlanViewerControl.axaml.cs       | 22 ++++++++++++++-----
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/src/PlanViewer.App/Controls/PlanViewerControl.axaml.cs b/src/PlanViewer.App/Controls/PlanViewerControl.axaml.cs
index 2b4afb1..47c6187 100644
--- a/src/PlanViewer.App/Controls/PlanViewerControl.axaml.cs
+++ b/src/PlanViewer.App/Controls/PlanViewerControl.axaml.cs
@@ -307,8 +307,17 @@ private Border CreateNodeVisual(PlanNode node, int totalWarningCount = -1)
         // Map border to node (replaces WPF Tag)
         _nodeBorderMap[border] = node;
 
-        // Tooltip
-        ToolTip.SetTip(border, BuildNodeTooltipContent(node));
+        // Tooltip — root node gets all collected warnings so the tooltip shows them
+        if (totalWarningCount > 0)
+        {
+            var allWarnings = new List<PlanWarning>();
+            CollectWarnings(node, allWarnings);
+            ToolTip.SetTip(border, BuildNodeTooltipContent(node, allWarnings));
+        }
+        else
+        {
+            ToolTip.SetTip(border, BuildNodeTooltipContent(node));
+        }
 
         // Click to select + show properties
         border.PointerPressed += Node_Click;
@@ -1649,7 +1658,7 @@ private void ClosePropertiesPanel()
 
     #region Tooltips
 
-    private object BuildNodeTooltipContent(PlanNode node)
+    private object BuildNodeTooltipContent(PlanNode node, List<PlanWarning>? allWarnings = null)
     {
         var tipBorder = new Border
         {
@@ -1790,11 +1799,12 @@ private object BuildNodeTooltipContent(PlanNode node)
             AddTooltipRow(stack, "Columns", node.OutputColumns, isCode: true);
         }
 
-        // Warnings
-        if (node.HasWarnings)
+        // Warnings — use allWarnings (all nodes) for root, node.Warnings for others
+        var warnings = allWarnings ?? (node.HasWarnings ? node.Warnings : null);
+        if (warnings != null && warnings.Count > 0)
         {
             stack.Children.Add(new Separator { Margin = new Thickness(0, 6, 0, 6) });
-            foreach (var w in node.Warnings)
+            foreach (var w in warnings)
             {
                 var warnColor = w.Severity == PlanWarningSeverity.Critical ? "#E57373"
                     : w.Severity == PlanWarningSeverity.Warning ? "#FFB347" : "#6BB5FF";

From 0b6b73286204b5123227c0ee2c7f032dd894c956 Mon Sep 17 00:00:00 2001
From: ClaudioESSilva <claudiosil100@gmail.com>
Date: Thu, 5 Mar 2026 16:18:33 +0000
Subject: [PATCH 11/17] Fix icon for cross platform

---
 src/PlanViewer.App/Controls/QueryStoreGridControl.axaml.cs | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/PlanViewer.App/Controls/QueryStoreGridControl.axaml.cs b/src/PlanViewer.App/Controls/QueryStoreGridControl.axaml.cs
index 643e7ab..ea4e394 100644
--- a/src/PlanViewer.App/Controls/QueryStoreGridControl.axaml.cs
+++ b/src/PlanViewer.App/Controls/QueryStoreGridControl.axaml.cs
@@ -163,8 +163,7 @@ private void SetColumnFilterButton(DataGridColumn col, string columnId, string l
     {
         var icon = new TextBlock
         {
-            Text = "\uE71C",
-            FontFamily = new Avalonia.Media.FontFamily("Segoe Fluent Icons,Segoe MDL2 Assets"),
+            Text = "▽",
             FontSize = 12,
             VerticalAlignment = Avalonia.Layout.VerticalAlignment.Center,
             HorizontalAlignment = Avalonia.Layout.HorizontalAlignment.Center,
@@ -253,7 +252,7 @@ private void UpdateFilterButtonStyles()
             if (btn.Content is not TextBlock tb) continue;
 
             bool hasFilter = _activeFilters.TryGetValue(colId, out var f) && f.IsActive;
-            tb.Text = hasFilter ? "\uE16E" : "\uE71C";
+            tb.Text = hasFilter ? "▼" : "▽";
             if (hasFilter)
                 tb.Foreground = new SolidColorBrush(Color.FromRgb(0xFF, 0xD7, 0x00));
             else

From cf5d1d4852b90d26e385427819726089975e69cb Mon Sep 17 00:00:00 2001
From: ClaudioESSilva <claudiosil100@gmail.com>
Date: Thu, 5 Mar 2026 16:28:04 +0000
Subject: [PATCH 12/17] Rollback to 300 so we can see all columns headers and
 be able to resize over the screen width

---
 src/PlanViewer.App/Controls/QueryStoreGridControl.axaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/PlanViewer.App/Controls/QueryStoreGridControl.axaml b/src/PlanViewer.App/Controls/QueryStoreGridControl.axaml
index 8037ff5..6fdc840 100644
--- a/src/PlanViewer.App/Controls/QueryStoreGridControl.axaml
+++ b/src/PlanViewer.App/Controls/QueryStoreGridControl.axaml
@@ -109,7 +109,7 @@
                 <DataGridTextColumn Header="Avg Physical Reads" Binding="{ReflectionBinding AvgPhysReadsDisplay}" SortMemberPath="AvgPhysReadsSort" Width="140"/>
                 <DataGridTextColumn Header="Total Memory (MB)" Binding="{ReflectionBinding TotalMemDisplay}" SortMemberPath="TotalMemSort" Width="140"/>
                 <DataGridTextColumn Header="Avg Memory (MB)" Binding="{ReflectionBinding AvgMemDisplay}" SortMemberPath="AvgMemSort" Width="130"/>
-                <DataGridTemplateColumn Header="Query Text" Width="*" MinWidth="300">
+                <DataGridTemplateColumn Header="Query Text" Width="300" MinWidth="300">
                     <DataGridTemplateColumn.CellTemplate>
                         <DataTemplate x:DataType="local:QueryStoreRow">
                             <TextBlock Text="{Binding QueryPreview}"

From c961b1f9c1bb1b0151abb62f17b06959d7bc0abb Mon Sep 17 00:00:00 2001
From: Erik Darling <2136037+erikdarlingdata@users.noreply.github.com>
Date: Thu, 5 Mar 2026 12:11:24 -0500
Subject: [PATCH 13/17] Add Server Context pane to Plan Insights and Advice for
 Humans

- New Server Context column in Plan Insights showing server name,
  edition, hardware, MAXDOP, cost threshold, max memory, and database
- Only visible when connected (query editor or Run Repro Script)
- Run Repro Script now fetches server metadata so Advice for Humans
  includes the === Server Context === block
- File-opened plan Advice buttons now pass viewer metadata through

Closes #22
Closes #23

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 .../Controls/PlanViewerControl.axaml          | 29 +++++--
 .../Controls/PlanViewerControl.axaml.cs       | 86 +++++++++++++++++++
 .../Controls/QuerySessionControl.axaml.cs     |  1 +
 src/PlanViewer.App/MainWindow.axaml.cs        | 16 +++-
 4 files changed, 125 insertions(+), 7 deletions(-)

diff --git a/src/PlanViewer.App/Controls/PlanViewerControl.axaml b/src/PlanViewer.App/Controls/PlanViewerControl.axaml
index 9366b28..b050af6 100644
--- a/src/PlanViewer.App/Controls/PlanViewerControl.axaml
+++ b/src/PlanViewer.App/Controls/PlanViewerControl.axaml
@@ -60,14 +60,33 @@
                 </Expander.Header>
                 <Grid MaxHeight="220">
                     <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="Auto" MinWidth="0"/>
                         <ColumnDefinition Width="Auto" MinWidth="180"/>
                         <ColumnDefinition Width="*" MinWidth="200"/>
                         <ColumnDefinition Width="*" MinWidth="200"/>
                         <ColumnDefinition Width="*" MinWidth="200"/>
                     </Grid.ColumnDefinitions>
 
-                    <!-- Runtime Summary (left) -->
-                    <Border Grid.Column="0" Padding="10,4,10,8"
+                    <!-- Server Context (first, only visible when connected) -->
+                    <Border x:Name="ServerContextBorder" Grid.Column="0" Padding="10,4,10,8"
+                            Background="#1A1A2D"
+                            BorderBrush="#3A3A5A" BorderThickness="0,0,1,0"
+                            IsVisible="False">
+                        <ScrollViewer VerticalScrollBarVisibility="Auto"
+                                      HorizontalScrollBarVisibility="Disabled">
+                            <StackPanel>
+                                <TextBlock Text="Server Context"
+                                           FontSize="13"
+                                           FontWeight="SemiBold"
+                                           Foreground="#9B9BFF"
+                                           Margin="0,0,0,6"/>
+                                <StackPanel x:Name="ServerContextContent"/>
+                            </StackPanel>
+                        </ScrollViewer>
+                    </Border>
+
+                    <!-- Runtime Summary -->
+                    <Border Grid.Column="1" Padding="10,4,10,8"
                             Background="{DynamicResource BackgroundDarkBrush}"
                             BorderBrush="{DynamicResource BorderBrush}" BorderThickness="0,0,1,0">
                         <StackPanel>
@@ -81,7 +100,7 @@
                     </Border>
 
                     <!-- Missing Indexes (center) -->
-                    <Border Grid.Column="1" Padding="10,4,10,8"
+                    <Border Grid.Column="2" Padding="10,4,10,8"
                             Background="#3D2A0E"
                             BorderBrush="#7A5A1E" BorderThickness="0,0,1,0">
                         <ScrollViewer VerticalScrollBarVisibility="Auto"
@@ -102,7 +121,7 @@
                     </Border>
 
                     <!-- Parameters -->
-                    <Border Grid.Column="2" Padding="10,4,10,8"
+                    <Border Grid.Column="3" Padding="10,4,10,8"
                             Background="#1A2D1A"
                             BorderBrush="#3A5A3A" BorderThickness="0,0,1,0">
                         <ScrollViewer VerticalScrollBarVisibility="Auto"
@@ -123,7 +142,7 @@
                     </Border>
 
                     <!-- Wait Stats (right, fills remaining space) -->
-                    <Border Grid.Column="3" Padding="10,4,10,8"
+                    <Border Grid.Column="4" Padding="10,4,10,8"
                             Background="#1A2A3D">
                         <ScrollViewer VerticalScrollBarVisibility="Auto"
                                       HorizontalScrollBarVisibility="Disabled">
diff --git a/src/PlanViewer.App/Controls/PlanViewerControl.axaml.cs b/src/PlanViewer.App/Controls/PlanViewerControl.axaml.cs
index 47c6187..55de492 100644
--- a/src/PlanViewer.App/Controls/PlanViewerControl.axaml.cs
+++ b/src/PlanViewer.App/Controls/PlanViewerControl.axaml.cs
@@ -57,6 +57,7 @@ public partial class PlanViewerControl : UserControl
     private ParsedPlan? _currentPlan;
     private PlanStatement? _currentStatement;
     private string? _queryText;
+    private ServerMetadata? _serverMetadata;
     private double _zoomLevel = 1.0;
     private const double ZoomStep = 0.15;
     private const double MinZoom = 0.1;
@@ -146,6 +147,20 @@ public PlanViewerControl()
     /// </summary>
     public string? QueryText => _queryText;
 
+    /// <summary>
+    /// Server metadata for advice generation and Plan Insights display.
+    /// </summary>
+    public ServerMetadata? Metadata
+    {
+        get => _serverMetadata;
+        set
+        {
+            _serverMetadata = value;
+            if (_currentStatement != null)
+                ShowServerContext();
+        }
+    }
+
     public void LoadPlan(string planXml, string label, string? queryText = null)
     {
         _label = label;
@@ -2327,6 +2342,77 @@ void AddRow(string label, string value)
             AddRow("Early abort", statement.StatementOptmEarlyAbortReason);
 
         RuntimeSummaryContent.Children.Add(grid);
+        ShowServerContext();
+    }
+
+    private void ShowServerContext()
+    {
+        ServerContextContent.Children.Clear();
+        if (_serverMetadata == null)
+        {
+            ServerContextBorder.IsVisible = false;
+            return;
+        }
+
+        var m = _serverMetadata;
+        var fgColor = "#E4E6EB";
+
+        var grid = new Grid { ColumnDefinitions = new ColumnDefinitions("Auto,*") };
+        int rowIndex = 0;
+
+        void AddRow(string label, string value)
+        {
+            grid.RowDefinitions.Add(new RowDefinition(GridLength.Auto));
+            var lb = new TextBlock
+            {
+                Text = label, FontSize = 11,
+                Foreground = new SolidColorBrush(Color.Parse(fgColor)),
+                HorizontalAlignment = HorizontalAlignment.Left,
+                Margin = new Thickness(0, 1, 8, 1)
+            };
+            Grid.SetRow(lb, rowIndex);
+            Grid.SetColumn(lb, 0);
+            grid.Children.Add(lb);
+
+            var vb = new TextBlock
+            {
+                Text = value, FontSize = 11,
+                Foreground = new SolidColorBrush(Color.Parse(fgColor)),
+                Margin = new Thickness(0, 1, 0, 1)
+            };
+            Grid.SetRow(vb, rowIndex);
+            Grid.SetColumn(vb, 1);
+            grid.Children.Add(vb);
+            rowIndex++;
+        }
+
+        // Server name + edition
+        var edition = m.Edition;
+        if (edition != null)
+        {
+            var idx = edition.IndexOf(" (64-bit)");
+            if (idx > 0) edition = edition[..idx];
+        }
+        var serverLine = m.ServerName ?? "Unknown";
+        if (edition != null) serverLine += $" ({edition})";
+        if (m.ProductVersion != null) serverLine += $", {m.ProductVersion}";
+        AddRow("Server", serverLine);
+
+        // Hardware
+        if (m.CpuCount > 0)
+            AddRow("Hardware", $"{m.CpuCount} CPUs, {m.PhysicalMemoryMB:N0} MB RAM");
+
+        // Instance settings
+        AddRow("MAXDOP", m.MaxDop.ToString());
+        AddRow("Cost threshold", m.CostThresholdForParallelism.ToString());
+        AddRow("Max memory", $"{m.MaxServerMemoryMB:N0} MB");
+
+        // Database
+        if (m.Database != null)
+            AddRow("Database", $"{m.Database.Name} (compat {m.Database.CompatibilityLevel})");
+
+        ServerContextContent.Children.Add(grid);
+        ServerContextBorder.IsVisible = true;
     }
 
     private void UpdateInsightsHeader()
diff --git a/src/PlanViewer.App/Controls/QuerySessionControl.axaml.cs b/src/PlanViewer.App/Controls/QuerySessionControl.axaml.cs
index 7bc9cfa..7311a70 100644
--- a/src/PlanViewer.App/Controls/QuerySessionControl.axaml.cs
+++ b/src/PlanViewer.App/Controls/QuerySessionControl.axaml.cs
@@ -642,6 +642,7 @@ private void AddPlanTab(string planXml, string queryText, bool estimated, string
         var label = labelOverride ?? (estimated ? $"Est Plan {_planCounter}" : $"Plan {_planCounter}");
 
         var viewer = new PlanViewerControl();
+        viewer.Metadata = _serverMetadata;
         viewer.LoadPlan(planXml, label, queryText);
 
         // Build tab header with close button and right-click rename
diff --git a/src/PlanViewer.App/MainWindow.axaml.cs b/src/PlanViewer.App/MainWindow.axaml.cs
index 726e80a..2c39362 100644
--- a/src/PlanViewer.App/MainWindow.axaml.cs
+++ b/src/PlanViewer.App/MainWindow.axaml.cs
@@ -442,14 +442,14 @@ private DockPanel CreatePlanTabContent(PlanViewerControl viewer)
         humanBtn.Click += (_, _) =>
         {
             if (viewer.CurrentPlan == null) return;
-            var analysis = ResultMapper.Map(viewer.CurrentPlan, "file");
+            var analysis = ResultMapper.Map(viewer.CurrentPlan, "file", viewer.Metadata);
             ShowAdviceWindow("Advice for Humans", TextFormatter.Format(analysis));
         };
 
         robotBtn.Click += (_, _) =>
         {
             if (viewer.CurrentPlan == null) return;
-            var analysis = ResultMapper.Map(viewer.CurrentPlan, "file");
+            var analysis = ResultMapper.Map(viewer.CurrentPlan, "file", viewer.Metadata);
             var json = JsonSerializer.Serialize(analysis, new JsonSerializerOptions { WriteIndented = true });
             ShowAdviceWindow("Advice for Robots", json);
         };
@@ -1024,6 +1024,17 @@ private async Task GetActualPlanFromFile(PlanViewerControl viewer)
 
         try
         {
+            // Fetch server metadata for advice and Plan Insights
+            ServerMetadata? metadata = null;
+            try
+            {
+                metadata = await ServerMetadataService.FetchServerMetadataAsync(
+                    connectionString, isAzure);
+                metadata.Database = await ServerMetadataService.FetchDatabaseMetadataAsync(
+                    connectionString, metadata.SupportsScopedConfigs);
+            }
+            catch { /* Non-fatal — advice will just lack server context */ }
+
             var cts = new System.Threading.CancellationTokenSource();
             var sw = System.Diagnostics.Stopwatch.StartNew();
 
@@ -1042,6 +1053,7 @@ private async Task GetActualPlanFromFile(PlanViewerControl viewer)
 
             // Add a new tab with the actual plan
             var actualViewer = new PlanViewerControl();
+            actualViewer.Metadata = metadata;
             actualViewer.LoadPlan(actualPlanXml, "Actual Plan", queryText);
 
             var content = CreatePlanTabContent(actualViewer);

From dbc1c67b9c1df730e031c8dbb94d32d214327eca Mon Sep 17 00:00:00 2001
From: Erik Darling <2136037+erikdarlingdata@users.noreply.github.com>
Date: Thu, 5 Mar 2026 12:58:37 -0500
Subject: [PATCH 14/17] Fix warnings gap in properties panel (#29)

Warning items were added outside their Expander (directly to PropertiesContent),
leaving an empty Expander header with a visible gap. Now both Plan Warnings and
operator Warnings create their own Expander with a StackPanel content so items
render inside the collapsible section with no gap.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 .../Controls/PlanViewerControl.axaml.cs       | 52 +++++++++++++++++--
 1 file changed, 48 insertions(+), 4 deletions(-)

diff --git a/src/PlanViewer.App/Controls/PlanViewerControl.axaml.cs b/src/PlanViewer.App/Controls/PlanViewerControl.axaml.cs
index 55de492..90d0b97 100644
--- a/src/PlanViewer.App/Controls/PlanViewerControl.axaml.cs
+++ b/src/PlanViewer.App/Controls/PlanViewerControl.axaml.cs
@@ -1465,7 +1465,7 @@ private void ShowPropertiesPanel(PlanNode node)
             // === Plan-Level Warnings ===
             if (s.PlanWarnings.Count > 0)
             {
-                AddPropertySection("Plan Warnings");
+                var planWarningsPanel = new StackPanel();
                 foreach (var w in s.PlanWarnings)
                 {
                     var warnColor = w.Severity == PlanWarningSeverity.Critical ? "#E57373"
@@ -1486,8 +1486,30 @@ private void ShowPropertiesPanel(PlanNode node)
                         TextWrapping = TextWrapping.Wrap,
                         Margin = new Thickness(16, 0, 0, 0)
                     });
-                    (_currentPropertySection ?? PropertiesContent).Children.Add(warnPanel);
+                    planWarningsPanel.Children.Add(warnPanel);
                 }
+
+                var planWarningsExpander = new Expander
+                {
+                    IsExpanded = true,
+                    Header = new TextBlock
+                    {
+                        Text = "Plan Warnings",
+                        FontWeight = FontWeight.SemiBold,
+                        FontSize = 11,
+                        Foreground = SectionHeaderBrush
+                    },
+                    Content = planWarningsPanel,
+                    Margin = new Thickness(0, 2, 0, 0),
+                    Padding = new Thickness(0),
+                    Foreground = SectionHeaderBrush,
+                    Background = new SolidColorBrush(Color.FromArgb(0x18, 0x4F, 0xA3, 0xFF)),
+                    BorderBrush = PropSeparatorBrush,
+                    BorderThickness = new Thickness(0, 0, 0, 1),
+                    HorizontalAlignment = HorizontalAlignment.Stretch,
+                    HorizontalContentAlignment = HorizontalAlignment.Stretch
+                };
+                PropertiesContent.Children.Add(planWarningsExpander);
             }
 
             // === Missing Indexes ===
@@ -1506,7 +1528,7 @@ private void ShowPropertiesPanel(PlanNode node)
         // === Warnings ===
         if (node.HasWarnings)
         {
-            AddPropertySection("Warnings");
+            var warningsPanel = new StackPanel();
             foreach (var w in node.Warnings)
             {
                 var warnColor = w.Severity == PlanWarningSeverity.Critical ? "#E57373"
@@ -1527,8 +1549,30 @@ private void ShowPropertiesPanel(PlanNode node)
                     TextWrapping = TextWrapping.Wrap,
                     Margin = new Thickness(16, 0, 0, 0)
                 });
-                PropertiesContent.Children.Add(warnPanel);
+                warningsPanel.Children.Add(warnPanel);
             }
+
+            var warningsExpander = new Expander
+            {
+                IsExpanded = true,
+                Header = new TextBlock
+                {
+                    Text = "Warnings",
+                    FontWeight = FontWeight.SemiBold,
+                    FontSize = 11,
+                    Foreground = SectionHeaderBrush
+                },
+                Content = warningsPanel,
+                Margin = new Thickness(0, 2, 0, 0),
+                Padding = new Thickness(0),
+                Foreground = SectionHeaderBrush,
+                Background = new SolidColorBrush(Color.FromArgb(0x18, 0x4F, 0xA3, 0xFF)),
+                BorderBrush = PropSeparatorBrush,
+                BorderThickness = new Thickness(0, 0, 0, 1),
+                HorizontalAlignment = HorizontalAlignment.Stretch,
+                HorizontalContentAlignment = HorizontalAlignment.Stretch
+            };
+            PropertiesContent.Children.Add(warningsExpander);
         }
 
         // Show the panel

From fe399d59b203e7118e92ae356ceed4727f7a80b0 Mon Sep 17 00:00:00 2001
From: Erik Darling <2136037+erikdarlingdata@users.noreply.github.com>
Date: Thu, 5 Mar 2026 13:08:22 -0500
Subject: [PATCH 15/17] Add MCP registration command copy button to About
 screen (#26)

Adds a "Copy MCP Command" button below the MCP settings that copies the
claude mcp add registration command to clipboard with the current port.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 src/PlanViewer.App/AboutWindow.axaml    |  8 +++++++-
 src/PlanViewer.App/AboutWindow.axaml.cs | 13 +++++++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/src/PlanViewer.App/AboutWindow.axaml b/src/PlanViewer.App/AboutWindow.axaml
index 8f5b51e..97d2223 100644
--- a/src/PlanViewer.App/AboutWindow.axaml
+++ b/src/PlanViewer.App/AboutWindow.axaml
@@ -2,7 +2,7 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         x:Class="PlanViewer.App.AboutWindow"
         Title="About Performance Studio"
-        Width="450" Height="420"
+        Width="450" Height="460"
         CanResize="False"
         WindowStartupLocation="CenterOwner"
         Icon="avares://PlanViewer.App/EDD.ico"
@@ -63,6 +63,12 @@
             <TextBlock Text="Restart the application after changing MCP settings."
                        FontSize="11" Foreground="{DynamicResource ForegroundMutedBrush}"
                        Margin="0,4,0,0"/>
+            <StackPanel Orientation="Horizontal" Spacing="8" Margin="0,8,0,0">
+                <Button x:Name="CopyMcpCommandButton" Content="Copy MCP Command"
+                        Click="CopyMcpCommand_Click" Padding="10,4" FontSize="12"/>
+                <TextBlock x:Name="McpCopyStatus" FontSize="11" VerticalAlignment="Center"
+                           Foreground="{DynamicResource ForegroundMutedBrush}"/>
+            </StackPanel>
         </StackPanel>
 
         <!-- Close -->
diff --git a/src/PlanViewer.App/AboutWindow.axaml.cs b/src/PlanViewer.App/AboutWindow.axaml.cs
index c47485c..66a487e 100644
--- a/src/PlanViewer.App/AboutWindow.axaml.cs
+++ b/src/PlanViewer.App/AboutWindow.axaml.cs
@@ -12,6 +12,7 @@
 using System.Text.Json;
 using Avalonia.Controls;
 using Avalonia.Input;
+using Avalonia.Input.Platform;
 using Avalonia.Interactivity;
 using PlanViewer.App.Mcp;
 
@@ -59,6 +60,18 @@ private void SaveMcpSettings()
     private void GitHubLink_Click(object? sender, PointerPressedEventArgs e) => OpenUrl(GitHubUrl);
     private void ReportIssueLink_Click(object? sender, PointerPressedEventArgs e) => OpenUrl(IssuesUrl);
     private void DarlingDataLink_Click(object? sender, PointerPressedEventArgs e) => OpenUrl(DarlingDataUrl);
+    private async void CopyMcpCommand_Click(object? sender, RoutedEventArgs e)
+    {
+        var port = int.TryParse(McpPortInput.Text, out var p) && p >= 1024 && p <= 65535 ? p : 5152;
+        var command = $"claude mcp add --transport streamable-http --scope user performance-studio http://localhost:{port}/";
+        var clipboard = TopLevel.GetTopLevel(this)?.Clipboard;
+        if (clipboard != null)
+        {
+            await clipboard.SetTextAsync(command);
+            McpCopyStatus.Text = "Copied to clipboard!";
+        }
+    }
+
     private void CloseButton_Click(object? sender, RoutedEventArgs e) => Close();
 
     private static void OpenUrl(string url)

From cb234f357b1555f1a5d1730bdba038ece21cf5ed Mon Sep 17 00:00:00 2001
From: Erik Darling <2136037+erikdarlingdata@users.noreply.github.com>
Date: Thu, 5 Mar 2026 13:24:51 -0500
Subject: [PATCH 16/17] Show loading placeholder tab for Run Repro Script (#24)

Opens an "Actual Plan" tab immediately with an indeterminate progress bar
and status text while the query executes. Replaces with the real plan on
success, or shows the error message in-place on failure.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 src/PlanViewer.App/MainWindow.axaml.cs | 53 ++++++++++++++++++++++----
 1 file changed, 45 insertions(+), 8 deletions(-)

diff --git a/src/PlanViewer.App/MainWindow.axaml.cs b/src/PlanViewer.App/MainWindow.axaml.cs
index 2c39362..15cad87 100644
--- a/src/PlanViewer.App/MainWindow.axaml.cs
+++ b/src/PlanViewer.App/MainWindow.axaml.cs
@@ -1022,6 +1022,43 @@ private async Task GetActualPlanFromFile(PlanViewerControl viewer)
                       dialog.ResultConnection.ServerName.Contains(".database.azure.com",
                           StringComparison.OrdinalIgnoreCase);
 
+        // Create a loading placeholder tab immediately
+        var loadingPanel = new StackPanel
+        {
+            VerticalAlignment = VerticalAlignment.Center,
+            HorizontalAlignment = HorizontalAlignment.Center,
+            Width = 300
+        };
+
+        var progressBar = new ProgressBar
+        {
+            IsIndeterminate = true,
+            Height = 4,
+            Margin = new Avalonia.Thickness(0, 0, 0, 12)
+        };
+
+        var statusText = new TextBlock
+        {
+            Text = "Executing query...",
+            FontSize = 14,
+            Foreground = new SolidColorBrush(Color.Parse("#B0B6C0")),
+            HorizontalAlignment = HorizontalAlignment.Center
+        };
+
+        loadingPanel.Children.Add(progressBar);
+        loadingPanel.Children.Add(statusText);
+
+        var loadingContainer = new Grid
+        {
+            Background = new SolidColorBrush(Color.Parse("#1A1D23")),
+            Children = { loadingPanel }
+        };
+
+        var tab = CreateTab("Actual Plan", loadingContainer);
+        MainTabControl.Items.Add(tab);
+        MainTabControl.SelectedItem = tab;
+        UpdateEmptyOverlay();
+
         try
         {
             // Fetch server metadata for advice and Plan Insights
@@ -1035,6 +1072,8 @@ private async Task GetActualPlanFromFile(PlanViewerControl viewer)
             }
             catch { /* Non-fatal — advice will just lack server context */ }
 
+            statusText.Text = "Capturing actual plan...";
+
             var cts = new System.Threading.CancellationTokenSource();
             var sw = System.Diagnostics.Stopwatch.StartNew();
 
@@ -1047,24 +1086,22 @@ private async Task GetActualPlanFromFile(PlanViewerControl viewer)
 
             if (string.IsNullOrEmpty(actualPlanXml))
             {
-                ShowError($"No actual plan returned ({sw.Elapsed.TotalSeconds:F1}s).");
+                statusText.Text = $"No actual plan returned ({sw.Elapsed.TotalSeconds:F1}s).";
+                progressBar.IsVisible = false;
                 return;
             }
 
-            // Add a new tab with the actual plan
+            // Replace loading content with the actual plan
             var actualViewer = new PlanViewerControl();
             actualViewer.Metadata = metadata;
             actualViewer.LoadPlan(actualPlanXml, "Actual Plan", queryText);
 
-            var content = CreatePlanTabContent(actualViewer);
-            var tab = CreateTab("Actual Plan", content);
-            MainTabControl.Items.Add(tab);
-            MainTabControl.SelectedItem = tab;
-            UpdateEmptyOverlay();
+            tab.Content = CreatePlanTabContent(actualViewer);
         }
         catch (Exception ex)
         {
-            ShowError($"Error capturing actual plan:\n\n{ex.Message}");
+            statusText.Text = $"Error: {ex.Message}";
+            progressBar.IsVisible = false;
         }
     }
 

From 5032d6312cc2373b2fb1aac542fae67854611790 Mon Sep 17 00:00:00 2001
From: Erik Darling <2136037+erikdarlingdata@users.noreply.github.com>
Date: Thu, 5 Mar 2026 13:34:25 -0500
Subject: [PATCH 17/17] Bump version to 0.9.0

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 src/PlanViewer.App/PlanViewer.App.csproj | 2 +-
 src/PlanViewer.Cli/PlanViewer.Cli.csproj | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/PlanViewer.App/PlanViewer.App.csproj b/src/PlanViewer.App/PlanViewer.App.csproj
index a3b9da9..0f5548a 100644
--- a/src/PlanViewer.App/PlanViewer.App.csproj
+++ b/src/PlanViewer.App/PlanViewer.App.csproj
@@ -5,7 +5,7 @@
     <Nullable>enable</Nullable>
     <ApplicationManifest>app.manifest</ApplicationManifest>
     <AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
-    <Version>0.8.2</Version>
+    <Version>0.9.0</Version>
     <Authors>Erik Darling</Authors>
     <Company>Darling Data LLC</Company>
     <Product>Performance Studio</Product>
diff --git a/src/PlanViewer.Cli/PlanViewer.Cli.csproj b/src/PlanViewer.Cli/PlanViewer.Cli.csproj
index 22b4195..f07b1ac 100644
--- a/src/PlanViewer.Cli/PlanViewer.Cli.csproj
+++ b/src/PlanViewer.Cli/PlanViewer.Cli.csproj
@@ -11,7 +11,7 @@
     <Nullable>enable</Nullable>
     <RootNamespace>PlanViewer.Cli</RootNamespace>
     <AssemblyName>planview</AssemblyName>
-    <Version>0.8.2</Version>
+    <Version>0.9.0</Version>
     <Authors>Erik Darling</Authors>
     <Company>Darling Data LLC</Company>
     <Product>Performance Studio</Product>