From 9f5ec6d3cd7cb239beca39fe07d968b88e24c03d Mon Sep 17 00:00:00 2001
From: jschick04 <jschick04@gmail.com>
Date: Fri, 19 Jun 2026 02:08:20 -0500
Subject: [PATCH 01/40] Add reusable Button component and migrate generic
 button markup app-wide

---
 .../Banner/AttentionBanner.razor              |  16 +-
 src/EventLogExpert.UI/Banner/BannerHost.razor |  26 +--
 .../Banner/CriticalBanner.razor               |  12 +-
 .../Banner/CriticalBanner.razor.cs            |   5 +-
 .../Banner/ErrorBanner.razor                  |  17 +-
 .../Banner/ExportProgressBanner.razor         |   7 +-
 src/EventLogExpert.UI/Banner/InfoBanner.razor |  10 +-
 .../Banner/UpgradeProgressBanner.razor        |   7 +-
 .../Dashboard/EmptyStateDashboard.razor       |   2 +-
 .../Database/DatabaseEntryRow.razor           |  68 +++---
 .../Database/DatabaseEntryRow.razor.css       |  12 +-
 .../Database/DatabaseRecoveryModal.razor      |  14 +-
 .../DatabaseTools/DatabaseToolsLogView.razor  |  12 +-
 .../Tabs/CreateDatabaseTab.razor              |  24 +-
 .../DatabaseTools/Tabs/DiffDatabasesTab.razor |  18 +-
 .../Tabs/ManageDatabasesTab.razor             |  56 ++---
 .../Tabs/ManageDatabasesTab.razor.cs          |  23 +-
 .../Tabs/ManageDatabasesTab.razor.css         |   2 +-
 .../DatabaseTools/Tabs/MergeDatabaseTab.razor |  16 +-
 .../DatabaseTools/Tabs/ShowProvidersTab.razor |  20 +-
 .../Tabs/UpgradeDatabaseTab.razor             |  14 +-
 .../DebugLog/DebugLogModal.razor              |  22 +-
 .../Editing/FilterEditPanel.razor             |  41 ++--
 .../Editing/FilterEditPanel.razor.css         |  14 +-
 .../Editing/FilterPredicateEditor.razor       |  26 +--
 .../Editing/FilterPredicateList.razor         |  17 +-
 .../Editing/FilterPredicateList.razor.cs      |   6 +-
 .../Editing/FilterPredicateList.razor.css     |   4 +-
 .../FilterEditor/Rows/FilterRowActions.razor  |  38 ++--
 .../Rows/FilterRowActions.razor.cs            |   5 +-
 .../FilterEditor/Rows/FilterRowHeader.razor   |  13 +-
 .../Rows/FilterRowHeader.razor.css            |   8 +-
 .../FilterLibrary/FilterLibraryModal.razor    |  15 +-
 .../LibraryEntryFilterEditor.razor            |   6 +-
 .../LibraryEntryFilterEditor.razor.css        |   2 +-
 .../FilterLibrary/LibraryEntryRow.razor       |  82 +++----
 .../FilterLibrary/LibraryEntryRow.razor.cs    |  12 +-
 .../FilterLibrary/LibraryEntryRow.razor.css   |  18 +-
 .../FilterLibrary/LibrarySavedTabHeader.razor |   6 +-
 .../LibrarySavedTabHeader.razor.css           |  15 --
 .../FilterLibrary/TagManagementPanel.razor    |  78 +++----
 .../FilterPane/FilterPane.razor               | 143 ++++++------
 .../FilterPane/FilterPane.razor.css           |   4 +-
 src/EventLogExpert.UI/Inputs/Button.cs        |   9 +
 src/EventLogExpert.UI/Inputs/ButtonBase.cs    |  75 +++++++
 src/EventLogExpert.UI/Inputs/DangerButton.cs  |   9 +
 src/EventLogExpert.UI/Inputs/PrimaryButton.cs |   9 +
 src/EventLogExpert.UI/Inputs/WarningButton.cs |   9 +
 src/EventLogExpert.UI/Modal/ModalChrome.razor | 119 +++++-----
 .../Modal/ModalChrome.razor.cs                |   8 +-
 .../Modal/ModalChrome.razor.css               |   2 +-
 src/EventLogExpert.UI/wwwroot/app.css         |  15 ++
 .../Inputs/ButtonTests.cs                     | 206 ++++++++++++++++++
 53 files changed, 827 insertions(+), 590 deletions(-)
 create mode 100644 src/EventLogExpert.UI/Inputs/Button.cs
 create mode 100644 src/EventLogExpert.UI/Inputs/ButtonBase.cs
 create mode 100644 src/EventLogExpert.UI/Inputs/DangerButton.cs
 create mode 100644 src/EventLogExpert.UI/Inputs/PrimaryButton.cs
 create mode 100644 src/EventLogExpert.UI/Inputs/WarningButton.cs
 create mode 100644 tests/Unit/EventLogExpert.UI.Tests/Inputs/ButtonTests.cs

diff --git a/src/EventLogExpert.UI/Banner/AttentionBanner.razor b/src/EventLogExpert.UI/Banner/AttentionBanner.razor
index dc947f951..d106b9308 100644
--- a/src/EventLogExpert.UI/Banner/AttentionBanner.razor
+++ b/src/EventLogExpert.UI/Banner/AttentionBanner.razor
@@ -3,16 +3,12 @@
 
     @CycleNav
 
-    <button class="banner-action button"
-        @onclick="OnOpenDatabasesClickedAsync"
-        type="button">
+    <Button CssClass="banner-action" OnClick="OnOpenDatabasesClickedAsync">
         Open Databases
-    </button>
+    </Button>
 
-    <button aria-label="Dismiss attention banner"
-        class="banner-dismiss button"
-        @onclick="OnDismissAttention"
-        type="button">
-        <i aria-hidden="true" class="bi bi-x"></i>
-    </button>
+    <Button aria-label="Dismiss attention banner"
+        CssClass="banner-dismiss"
+        IconClass="bi bi-x"
+        OnClick="OnDismissAttention" />
 </aside>
diff --git a/src/EventLogExpert.UI/Banner/BannerHost.razor b/src/EventLogExpert.UI/Banner/BannerHost.razor
index 49ff65a05..b560660b0 100644
--- a/src/EventLogExpert.UI/Banner/BannerHost.razor
+++ b/src/EventLogExpert.UI/Banner/BannerHost.razor
@@ -18,20 +18,18 @@
                                    @if (showCyclePagination)
                                    {
                                        <span class="banner-pagination">@(displayedIndex + 1) of @items.Count</span>
-                                       <button aria-label="Previous banner"
-                                           class="banner-cycle-prev button"
-                                           disabled="@(displayedIndex == 0)"
-                                           @onclick="CycleState.MovePrev"
-                                           type="button">
-                                           <i aria-hidden="true" class="bi bi-chevron-left"></i>
-                                       </button>
-                                       <button aria-label="Next banner"
-                                           class="banner-cycle-next button"
-                                           disabled="@(displayedIndex == items.Count - 1)"
-                                           @onclick="CycleState.MoveNext"
-                                           type="button">
-                                           <i aria-hidden="true" class="bi bi-chevron-right"></i>
-                                       </button>
+
+                                       <Button aria-label="Previous banner"
+                                           CssClass="banner-cycle-prev"
+                                           Disabled="@(displayedIndex == 0)"
+                                           IconClass="bi bi-chevron-left"
+                                           OnClick="CycleState.MovePrev" />
+
+                                       <Button aria-label="Next banner"
+                                           CssClass="banner-cycle-next"
+                                           Disabled="@(displayedIndex == items.Count - 1)"
+                                           IconClass="bi bi-chevron-right"
+                                           OnClick="CycleState.MoveNext" />
                                    }
                                </text>;
 
diff --git a/src/EventLogExpert.UI/Banner/CriticalBanner.razor b/src/EventLogExpert.UI/Banner/CriticalBanner.razor
index 374c7d9e0..337de69a8 100644
--- a/src/EventLogExpert.UI/Banner/CriticalBanner.razor
+++ b/src/EventLogExpert.UI/Banner/CriticalBanner.razor
@@ -2,15 +2,15 @@
     <span class="banner-message">An unexpected error occurred: @Critical.GetType().Name: @Critical.Message</span>
 
     <div class="banner-actions">
-        <button class="button" @onclick="OnReloadClickedAsync" @ref="_reloadButtonRef" type="button">
+        <Button OnClick="OnReloadClickedAsync" @ref="_reloadButton">
             <i aria-hidden="true" class="bi bi-arrow-clockwise"></i> Reload
-        </button>
-        <button class="button" @onclick="OnRelaunchClickedAsync" type="button">
+        </Button>
+        <Button OnClick="OnRelaunchClickedAsync">
             <i aria-hidden="true" class="bi bi-power"></i> Relaunch
-        </button>
-        <button class="button" @onclick="() => OnCopyDetailsClickedAsync(Critical)" type="button">
+        </Button>
+        <Button OnClick="() => OnCopyDetailsClickedAsync(Critical)">
             <i aria-hidden="true" class="bi bi-clipboard"></i> Copy details
-        </button>
+        </Button>
     </div>
 
     <div class="banner-feedback" role="status">
diff --git a/src/EventLogExpert.UI/Banner/CriticalBanner.razor.cs b/src/EventLogExpert.UI/Banner/CriticalBanner.razor.cs
index 46b92d8ee..1e676a8c9 100644
--- a/src/EventLogExpert.UI/Banner/CriticalBanner.razor.cs
+++ b/src/EventLogExpert.UI/Banner/CriticalBanner.razor.cs
@@ -5,6 +5,7 @@
 using EventLogExpert.Runtime.Banner;
 using EventLogExpert.Runtime.Common.Clipboard;
 using EventLogExpert.Runtime.Common.Restart;
+using EventLogExpert.UI.Inputs;
 using Microsoft.AspNetCore.Components;
 using Microsoft.JSInterop;
 
@@ -14,7 +15,7 @@ public sealed partial class CriticalBanner : ComponentBase, IDisposable
 {
     private CancellationTokenSource? _copiedFeedbackCts;
     private string? _recoveryFailureMessage;
-    private ElementReference _reloadButtonRef;
+    private Button? _reloadButton;
     private string? _restartFailureMessage;
     private bool _showCopiedFeedback;
 
@@ -42,7 +43,7 @@ protected override async Task OnAfterRenderAsync(bool firstRender)
         {
             try
             {
-                await _reloadButtonRef.FocusAsync();
+                await (_reloadButton?.FocusAsync() ?? ValueTask.CompletedTask);
             }
             catch (JSDisconnectedException) { /* Circuit gone — nothing to focus. */ }
             catch (TaskCanceledException) { /* Focus cancelled mid-render; harmless. */ }
diff --git a/src/EventLogExpert.UI/Banner/ErrorBanner.razor b/src/EventLogExpert.UI/Banner/ErrorBanner.razor
index 170128d64..5d280d7c9 100644
--- a/src/EventLogExpert.UI/Banner/ErrorBanner.razor
+++ b/src/EventLogExpert.UI/Banner/ErrorBanner.razor
@@ -5,17 +5,14 @@
 
     @if (Entry is { ActionLabel: { } actionLabel, Action: { } action })
     {
-        <button class="banner-action button"
-            @onclick="() => OnErrorActionClickedAsync(action)"
-            type="button">
+        <Button CssClass="banner-action"
+            OnClick="() => OnErrorActionClickedAsync(action)">
             @actionLabel
-        </button>
+        </Button>
     }
 
-    <button aria-label="Dismiss error banner"
-        class="banner-dismiss button"
-        @onclick="OnDismissError"
-        type="button">
-        <i aria-hidden="true" class="bi bi-x"></i>
-    </button>
+    <Button aria-label="Dismiss error banner"
+        CssClass="banner-dismiss"
+        IconClass="bi bi-x"
+        OnClick="OnDismissError" />
 </aside>
diff --git a/src/EventLogExpert.UI/Banner/ExportProgressBanner.razor b/src/EventLogExpert.UI/Banner/ExportProgressBanner.razor
index 490ba3b10..4ccde8894 100644
--- a/src/EventLogExpert.UI/Banner/ExportProgressBanner.razor
+++ b/src/EventLogExpert.UI/Banner/ExportProgressBanner.razor
@@ -5,9 +5,8 @@
 
     @CycleNav
 
-    <button class="banner-action button"
-        @onclick="() => OnCancelExportClickedAsync(Export)"
-        type="button">
+    <Button CssClass="banner-action"
+        OnClick="() => OnCancelExportClickedAsync(Export)">
         Cancel
-    </button>
+    </Button>
 </aside>
diff --git a/src/EventLogExpert.UI/Banner/InfoBanner.razor b/src/EventLogExpert.UI/Banner/InfoBanner.razor
index 4d34b0418..483a1c524 100644
--- a/src/EventLogExpert.UI/Banner/InfoBanner.razor
+++ b/src/EventLogExpert.UI/Banner/InfoBanner.razor
@@ -3,10 +3,8 @@
 
     @CycleNav
 
-    <button aria-label="Dismiss banner"
-        class="banner-dismiss button"
-        @onclick="OnDismissInfo"
-        type="button">
-        <i aria-hidden="true" class="bi bi-x"></i>
-    </button>
+    <Button aria-label="Dismiss banner"
+        CssClass="banner-dismiss"
+        IconClass="bi bi-x"
+        OnClick="OnDismissInfo" />
 </aside>
diff --git a/src/EventLogExpert.UI/Banner/UpgradeProgressBanner.razor b/src/EventLogExpert.UI/Banner/UpgradeProgressBanner.razor
index 37947b1d5..5faefc5c0 100644
--- a/src/EventLogExpert.UI/Banner/UpgradeProgressBanner.razor
+++ b/src/EventLogExpert.UI/Banner/UpgradeProgressBanner.razor
@@ -17,9 +17,8 @@
 
     @CycleNav
 
-    <button class="banner-action button"
-        @onclick="() => OnCancelUpgradeClickedAsync(Progress)"
-        type="button">
+    <Button CssClass="banner-action"
+        OnClick="() => OnCancelUpgradeClickedAsync(Progress)">
         Cancel
-    </button>
+    </Button>
 </aside>
diff --git a/src/EventLogExpert.UI/Dashboard/EmptyStateDashboard.razor b/src/EventLogExpert.UI/Dashboard/EmptyStateDashboard.razor
index a4b0b42ed..57a2370c3 100644
--- a/src/EventLogExpert.UI/Dashboard/EmptyStateDashboard.razor
+++ b/src/EventLogExpert.UI/Dashboard/EmptyStateDashboard.razor
@@ -15,7 +15,7 @@
                 <div class="empty-dashboard__chip" role="status">
                     <i aria-hidden="true" class="bi bi-funnel"></i>
                     <span class="empty-dashboard__chip-text">A filter is still applied and will affect your next open.</span>
-                    <button class="button" disabled="@_isBusy" @onclick="ClearFilter" type="button">Clear filter</button>
+                    <Button Disabled="@_isBusy" OnClick="ClearFilter">Clear filter</Button>
                 </div>
             }
             <button class="empty-dashboard__utility" disabled="@_isBusy" @onclick="OpenDatabaseToolsAsync" type="button">
diff --git a/src/EventLogExpert.UI/Database/DatabaseEntryRow.razor b/src/EventLogExpert.UI/Database/DatabaseEntryRow.razor
index 68765bf1f..abae970b4 100644
--- a/src/EventLogExpert.UI/Database/DatabaseEntryRow.razor
+++ b/src/EventLogExpert.UI/Database/DatabaseEntryRow.razor
@@ -57,9 +57,9 @@
                                     <span class="visually-hidden"> for @Entry.FileName</span>
                                 }
                             </span>
-                            <button class="button db-entry-cancel-btn" @onclick="OnCancelClick" type="button">
+                            <Button CssClass="db-entry-cancel-btn" OnClick="OnCancelClick">
                                 Cancel
-                            </button>
+                            </Button>
                         </span>
                     }
                     else
@@ -73,51 +73,51 @@
                     break;
 
                 case ActionKind.Upgrade:
-                    <button aria-label="@($"Upgrade database {Entry.FileName}")"
-                        class="button db-entry-upgrade-btn"
-                        disabled="@IsUpgradeBlocked"
-                        @onclick="@(async () =>
-                                  {
-                                      if (!IsUpgradeBlocked) { await OnUpgrade.InvokeAsync(); }
-                                  })"
-                        type="button">
+                    <Button aria-label="@($"Upgrade database {Entry.FileName}")"
+                        CssClass="db-entry-upgrade-btn"
+                        Disabled="@IsUpgradeBlocked"
+                        OnClick="@(async () =>
+                                 {
+                                     if (!IsUpgradeBlocked) { await OnUpgrade.InvokeAsync(); }
+                                 })">
                         <i aria-hidden="true" class="bi bi-arrow-up-circle"></i> Upgrade
-                    </button>
+                    </Button>
+
                     break;
 
                 case ActionKind.Retry:
-                    <button aria-label="@($"Retry upgrade of database {Entry.FileName}")"
-                        class="button button-red db-entry-upgrade-btn"
-                        disabled="@IsUpgradeBlocked"
-                        @onclick="@(async () =>
-                                  {
-                                      if (!IsUpgradeBlocked) { await OnUpgrade.InvokeAsync(); }
-                                  })"
-                        type="button">
+                    <DangerButton aria-label="@($"Retry upgrade of database {Entry.FileName}")"
+                        CssClass="db-entry-upgrade-btn"
+                        Disabled="@IsUpgradeBlocked"
+                        OnClick="@(async () =>
+                                 {
+                                     if (!IsUpgradeBlocked) { await OnUpgrade.InvokeAsync(); }
+                                 })">
                         <i aria-hidden="true" class="bi bi-arrow-clockwise"></i> Retry Upgrade
-                    </button>
+                    </DangerButton>
+
                     break;
 
                 case ActionKind.RestoreFromBackup:
-                    <button aria-label="@($"Restore database {Entry.FileName} from backup")"
-                        class="button db-entry-restore-btn"
-                        disabled="@IsRestoreBlocked"
-                        @onclick="@(async () =>
-                                  {
-                                      if (!IsRestoreBlocked) { await OnRestoreFromBackup.InvokeAsync(); }
-                                  })"
-                        type="button">
+                    <Button aria-label="@($"Restore database {Entry.FileName} from backup")"
+                        CssClass="db-entry-restore-btn"
+                        Disabled="@IsRestoreBlocked"
+                        OnClick="@(async () =>
+                                 {
+                                     if (!IsRestoreBlocked) { await OnRestoreFromBackup.InvokeAsync(); }
+                                 })">
                         <i aria-hidden="true" class="bi bi-arrow-counterclockwise"></i> Restore
-                    </button>
+                    </Button>
+
                     break;
 
                 case ActionKind.RetryClassification:
-                    <button aria-label="@($"Retry classification of database {Entry.FileName}")"
-                        class="button db-entry-retry-classification-btn"
-                        @onclick="@(async () => await OnRetryClassification.InvokeAsync())"
-                        type="button">
+                    <Button aria-label="@($"Retry classification of database {Entry.FileName}")"
+                        CssClass="db-entry-retry-classification-btn"
+                        OnClick="@(async () => await OnRetryClassification.InvokeAsync())">
                         <i aria-hidden="true" class="bi bi-arrow-repeat"></i> Retry classification
-                    </button>
+                    </Button>
+
                     break;
             }
         </div>
diff --git a/src/EventLogExpert.UI/Database/DatabaseEntryRow.razor.css b/src/EventLogExpert.UI/Database/DatabaseEntryRow.razor.css
index 15778f61b..8488f7aa0 100644
--- a/src/EventLogExpert.UI/Database/DatabaseEntryRow.razor.css
+++ b/src/EventLogExpert.UI/Database/DatabaseEntryRow.razor.css
@@ -91,7 +91,7 @@
     gap: .5rem;
 }
 
-.db-entry-upgrade-btn {
+::deep .db-entry-upgrade-btn {
     white-space: nowrap;
 }
 
@@ -128,7 +128,7 @@
     animation: db-entry-spin 1.5s linear infinite;
 }
 
-.db-entry-cancel-btn {
+::deep .db-entry-cancel-btn {
     flex: 0 0 auto;
     padding: .15rem .65rem;
 
@@ -147,8 +147,12 @@
 @media (prefers-reduced-motion: reduce) {
     .db-entry-row,
     .db-entry-upgrading,
-    .db-entry-upgrading-text,
-    .db-entry-cancel-btn {
+    .db-entry-upgrading-text {
+        animation: none;
+        transition: none;
+    }
+
+    ::deep .db-entry-cancel-btn {
         animation: none;
         transition: none;
     }
diff --git a/src/EventLogExpert.UI/Database/DatabaseRecoveryModal.razor b/src/EventLogExpert.UI/Database/DatabaseRecoveryModal.razor
index 458de1e6b..62d4fe993 100644
--- a/src/EventLogExpert.UI/Database/DatabaseRecoveryModal.razor
+++ b/src/EventLogExpert.UI/Database/DatabaseRecoveryModal.razor
@@ -23,18 +23,12 @@
         </p>
 
         <div class="recovery-batch-actions">
-            <button class="button"
-                disabled="@_isApplying"
-                @onclick="RestoreAll"
-                type="button">
+            <Button Disabled="@_isApplying" OnClick="RestoreAll">
                 Restore all
-            </button>
-            <button class="button"
-                disabled="@_isApplying"
-                @onclick="DeleteAll"
-                type="button">
+            </Button>
+            <Button Disabled="@_isApplying" OnClick="DeleteAll">
                 Delete all
-            </button>
+            </Button>
         </div>
 
         <ul class="recovery-rows">
diff --git a/src/EventLogExpert.UI/DatabaseTools/DatabaseToolsLogView.razor b/src/EventLogExpert.UI/DatabaseTools/DatabaseToolsLogView.razor
index e929c24d1..988bcf102 100644
--- a/src/EventLogExpert.UI/DatabaseTools/DatabaseToolsLogView.razor
+++ b/src/EventLogExpert.UI/DatabaseTools/DatabaseToolsLogView.razor
@@ -17,19 +17,19 @@
         }
 
         <div class="toolbar-trailing">
-            <button class="button" disabled="@(Entries.Count == 0)" @onclick="CopyAllAsync" type="button">
+            <Button Disabled="@(Entries.Count == 0)" OnClick="CopyAllAsync">
                 <i aria-hidden="true" class="bi bi-clipboard"></i> Copy
-            </button>
+            </Button>
 
-            <button class="button" disabled="@(Entries.Count == 0)" @onclick="ExportAsync" type="button">
+            <Button Disabled="@(Entries.Count == 0)" OnClick="ExportAsync">
                 <i aria-hidden="true" class="bi bi-download"></i> Export
-            </button>
+            </Button>
 
             @if (_showJumpToLatest)
             {
-                <button class="button jump-to-latest" @onclick="JumpToLatest" type="button">
+                <Button CssClass="jump-to-latest" OnClick="JumpToLatest">
                     <i aria-hidden="true" class="bi bi-arrow-down"></i> Jump to latest
-                </button>
+                </Button>
             }
         </div>
     </div>
diff --git a/src/EventLogExpert.UI/DatabaseTools/Tabs/CreateDatabaseTab.razor b/src/EventLogExpert.UI/DatabaseTools/Tabs/CreateDatabaseTab.razor
index 70c22ed87..2f1dc65da 100644
--- a/src/EventLogExpert.UI/DatabaseTools/Tabs/CreateDatabaseTab.razor
+++ b/src/EventLogExpert.UI/DatabaseTools/Tabs/CreateDatabaseTab.razor
@@ -15,7 +15,7 @@
                     placeholder="C:\path\to\new-database.db"
                     type="text"
                     value="@_targetPath" />
-                <button class="button" disabled="@IsRunning" @onclick="PickTargetAsync" type="button">Browse…</button>
+                <Button Disabled="@IsRunning" OnClick="PickTargetAsync">Browse…</Button>
             </div>
         </div>
 
@@ -33,7 +33,7 @@
                     placeholder="Leave empty for local providers, or pick / paste a path"
                     type="text"
                     value="@_sourcePath" />
-                <button class="button" disabled="@IsRunning" @onclick="PickSourceAsync" type="button">Browse…</button>
+                <Button Disabled="@IsRunning" OnClick="PickSourceAsync">Browse…</Button>
             </div>
         </div>
 
@@ -73,7 +73,7 @@
                     placeholder="Optional — path to .db or .evtx whose providers are excluded"
                     type="text"
                     value="@_skipPath" />
-                <button class="button" disabled="@IsRunning" @onclick="PickSkipAsync" type="button">Browse…</button>
+                <Button Disabled="@IsRunning" OnClick="PickSkipAsync">Browse…</Button>
             </div>
         </div>
 
@@ -83,7 +83,11 @@
                 <div class="elevation-warning" role="alert">
                     <i aria-hidden="true" class="bi bi-shield-exclamation"></i>
                     <span>Running without elevation — some local providers (Security, etc.) will be skipped or return incomplete metadata.</span>
-                    <button class="button" disabled="@IsRunning" @onclick="RunElevatedAsync" title="Run this operation in an elevated helper process; main app stays running." type="button">Run Elevated</button>
+                    <Button Disabled="@IsRunning"
+                        OnClick="RunElevatedAsync"
+                        title="Run this operation in an elevated helper process; main app stays running.">
+                        Run Elevated
+                    </Button>
                 </div>
             </div>
         }
@@ -95,22 +99,22 @@
             {
                 @if (IsCancelling)
                 {
-                    <button class="button" disabled type="button">
+                    <Button Disabled>
                         <i aria-hidden="true" class="bi bi-hourglass-split"></i> Cancelling…
-                    </button>
+                    </Button>
                 }
                 else
                 {
-                    <button class="button button-red" @onclick="CancelRun" type="button">
+                    <DangerButton OnClick="CancelRun">
                         <i aria-hidden="true" class="bi bi-x-circle"></i> Cancel
-                    </button>
+                    </DangerButton>
                 }
             }
             else
             {
-                <button class="button button-green" disabled="@(!CanRun)" @onclick="RunAsync" type="button">
+                <PrimaryButton Disabled="@(!CanRun)" OnClick="RunAsync">
                     <i aria-hidden="true" class="bi bi-play-fill"></i> Run
-                </button>
+                </PrimaryButton>
             }
         </ToolbarLeadingContent>
     </DatabaseToolsLogView>
diff --git a/src/EventLogExpert.UI/DatabaseTools/Tabs/DiffDatabasesTab.razor b/src/EventLogExpert.UI/DatabaseTools/Tabs/DiffDatabasesTab.razor
index ef599a352..3a06acf98 100644
--- a/src/EventLogExpert.UI/DatabaseTools/Tabs/DiffDatabasesTab.razor
+++ b/src/EventLogExpert.UI/DatabaseTools/Tabs/DiffDatabasesTab.razor
@@ -15,7 +15,7 @@
                     placeholder="Path to .db or .evtx (paste a folder path to use a directory)"
                     type="text"
                     value="@_firstPath" />
-                <button class="button" disabled="@IsRunning" @onclick="PickFirstAsync" type="button">Browse…</button>
+                <Button Disabled="@IsRunning" OnClick="PickFirstAsync">Browse…</Button>
             </div>
         </div>
 
@@ -31,7 +31,7 @@
                     placeholder="Path to .db or .evtx (paste a folder path to use a directory)"
                     type="text"
                     value="@_secondPath" />
-                <button class="button" disabled="@IsRunning" @onclick="PickSecondAsync" type="button">Browse…</button>
+                <Button Disabled="@IsRunning" OnClick="PickSecondAsync">Browse…</Button>
             </div>
         </div>
 
@@ -52,7 +52,7 @@
                     placeholder="C:\path\to\new-diff-database.db"
                     type="text"
                     value="@_newDbPath" />
-                <button class="button" disabled="@IsRunning" @onclick="PickNewDbAsync" type="button">Browse…</button>
+                <Button Disabled="@IsRunning" OnClick="PickNewDbAsync">Browse…</Button>
             </div>
         </div>
     </div>
@@ -63,22 +63,22 @@
             {
                 @if (IsCancelling)
                 {
-                    <button class="button" disabled type="button">
+                    <Button Disabled>
                         <i aria-hidden="true" class="bi bi-hourglass-split"></i> Cancelling…
-                    </button>
+                    </Button>
                 }
                 else
                 {
-                    <button class="button button-red" @onclick="CancelRun" type="button">
+                    <DangerButton OnClick="CancelRun">
                         <i aria-hidden="true" class="bi bi-x-circle"></i> Cancel
-                    </button>
+                    </DangerButton>
                 }
             }
             else
             {
-                <button class="button button-green" disabled="@(!CanRun)" @onclick="RunAsync" type="button">
+                <PrimaryButton Disabled="@(!CanRun)" OnClick="RunAsync">
                     <i aria-hidden="true" class="bi bi-play-fill"></i> Run
-                </button>
+                </PrimaryButton>
             }
         </ToolbarLeadingContent>
     </DatabaseToolsLogView>
diff --git a/src/EventLogExpert.UI/DatabaseTools/Tabs/ManageDatabasesTab.razor b/src/EventLogExpert.UI/DatabaseTools/Tabs/ManageDatabasesTab.razor
index a232b0802..fc7910698 100644
--- a/src/EventLogExpert.UI/DatabaseTools/Tabs/ManageDatabasesTab.razor
+++ b/src/EventLogExpert.UI/DatabaseTools/Tabs/ManageDatabasesTab.razor
@@ -14,23 +14,21 @@
     <div class="manage-databases-import-row">
         @if (DatabaseService.Entries.Count > 0)
         {
-            <button aria-pressed="@(_isSelectionModeActive ? "true" : "false")"
-                class="button manage-databases-select-btn"
+            <Button aria-pressed="@(_isSelectionModeActive ? "true" : "false")"
+                CssClass="manage-databases-select-btn"
                 id="manage-select-button"
-                @onclick="ToggleSelectionMode"
-                @ref="_selectButtonRef"
-                type="button">
+                OnClick="ToggleSelectionMode"
+                @ref="_selectButton">
                 <i aria-hidden="true" class="bi bi-check2-square"></i>
                 @(_isSelectionModeActive ? "Done" : "Select")
-            </button>
+            </Button>
         }
-        <button class="button manage-databases-import-btn"
+        <Button CssClass="manage-databases-import-btn"
             id="manage-import-button"
-            @onclick="ImportDatabase"
-            @ref="_importButtonRef"
-            type="button">
+            OnClick="ImportDatabase"
+            @ref="_importButton">
             <i aria-hidden="true" class="bi bi-plus-circle"></i> Import database&hellip;
-        </button>
+        </Button>
     </div>
 
     @if (_isSelectionModeActive && DatabaseService.Entries.Count > 0)
@@ -97,21 +95,17 @@
             </span>
             @if (_eligibleUpgradeCount > 0)
             {
-                <button aria-describedby="@(IsUpgradeBlocked ? _upgradeBlockedHelpId : null)"
-                    class="button button-green"
-                    disabled="@IsUpgradeBlocked"
-                    @onclick="OnBulkUpgradeClickAsync"
-                    @ref="_bulkUpgradeButtonRef"
-                    type="button">
+                <PrimaryButton aria-describedby="@(IsUpgradeBlocked ? _upgradeBlockedHelpId : null)"
+                    Disabled="@IsUpgradeBlocked"
+                    OnClick="OnBulkUpgradeClickAsync"
+                    @ref="_bulkUpgradeButton">
                     Upgrade @_eligibleUpgradeCount
-                </button>
+                </PrimaryButton>
             }
-            <button class="button button-red"
-                @onclick="OnBulkRemoveClickAsync"
-                @ref="_bulkRemoveButtonRef"
-                type="button">
+            <DangerButton OnClick="OnBulkRemoveClickAsync"
+                @ref="_bulkRemoveButton">
                 Remove @_selectedForBulk.Count
-            </button>
+            </DangerButton>
             <span class="visually-hidden" id="@_upgradeBlockedHelpId">
                 @(IsUpgradeBlocked
                     ? "Cannot upgrade: another upgrade is already in progress."
@@ -126,19 +120,15 @@
             <span class="manage-databases-pending-count">
                 @_pendingToggles.Count pending change@(_pendingToggles.Count == 1 ? "" : "s")
             </span>
-            <button class="button"
-                @onclick="DiscardPending"
-                type="button">
+            <Button OnClick="DiscardPending">
                 Discard
-            </button>
-            <button aria-describedby="@(IsUpgradeBlocked ? _saveBlockedHelpId : null)"
-                class="button button-green"
-                disabled="@IsUpgradeBlocked"
+            </Button>
+            <PrimaryButton aria-describedby="@(IsUpgradeBlocked ? _saveBlockedHelpId : null)"
+                Disabled="@IsUpgradeBlocked"
                 id="manage-save"
-                @onclick="OnSaveClickAsync"
-                type="button">
+                OnClick="OnSaveClickAsync">
                 Save changes
-            </button>
+            </PrimaryButton>
             <span class="visually-hidden" id="@_saveBlockedHelpId">
                 @(IsUpgradeBlocked ? "Cannot save: a database upgrade is in progress." : string.Empty)
             </span>
diff --git a/src/EventLogExpert.UI/DatabaseTools/Tabs/ManageDatabasesTab.razor.cs b/src/EventLogExpert.UI/DatabaseTools/Tabs/ManageDatabasesTab.razor.cs
index 84318c23e..d4c23cc84 100644
--- a/src/EventLogExpert.UI/DatabaseTools/Tabs/ManageDatabasesTab.razor.cs
+++ b/src/EventLogExpert.UI/DatabaseTools/Tabs/ManageDatabasesTab.razor.cs
@@ -10,6 +10,7 @@
 using EventLogExpert.Runtime.EventLog;
 using EventLogExpert.UI.Common;
 using EventLogExpert.UI.Database;
+using EventLogExpert.UI.Inputs;
 using Microsoft.AspNetCore.Components;
 using Microsoft.JSInterop;
 using System.Collections.Immutable;
@@ -27,19 +28,19 @@ public sealed partial class ManageDatabasesTab : ComponentBase, IAsyncDisposable
     private readonly HashSet<string> _selectedForBulk = new(StringComparer.OrdinalIgnoreCase);
     private readonly string _upgradeBlockedHelpId = ComponentId.NewUnique("manage-upgrade-blocked").Value;
 
-    private ElementReference _bulkRemoveButtonRef;
-    private ElementReference _bulkUpgradeButtonRef;
+    private DangerButton? _bulkRemoveButton;
+    private PrimaryButton? _bulkUpgradeButton;
     private CancellationTokenSource? _classificationObservationCts;
     private volatile bool _disposed;
     private int _eligibleUpgradeCount;
     private (string FileName, FocusTarget Target)? _focusRestorationTarget;
-    private ElementReference _importButtonRef;
+    private Button? _importButton;
     private ImmutableHashSet<string> _initialActiveSnapshot = ImmutableHashSet<string>.Empty;
     private bool _isSelectionModeActive;
     private ElementReference _masterCheckboxRef;
     private bool _restorationOccurred;
     private bool _schemaUpgradeOccurred;
-    private ElementReference _selectButtonRef;
+    private Button? _selectButton;
     private string _selectionAnnouncement = string.Empty;
 
     private enum FocusTarget
@@ -126,7 +127,7 @@ public async Task ExitSelectionModeWithFocusAsync()
         ExitSelectionMode();
         StateHasChanged();
 
-        try { await _selectButtonRef.FocusAsync(preventScroll: true); }
+        try { await (_selectButton?.FocusAsync(preventScroll: true) ?? ValueTask.CompletedTask); }
         catch (ObjectDisposedException) { }
         catch (JSDisconnectedException) { }
         catch (JSException) { }
@@ -182,9 +183,9 @@ protected override async Task OnAfterRenderAsync(bool firstRender)
                     FocusTarget.SameRowName when !string.IsNullOrEmpty(target.FileName) =>
                         FocusEntryRowNameAsync(target.FileName),
                     FocusTarget.BulkRemoveButton when HasBulkSelection =>
-                        _bulkRemoveButtonRef.FocusAsync(preventScroll: true),
+                        _bulkRemoveButton?.FocusAsync(preventScroll: true) ?? ValueTask.CompletedTask,
                     FocusTarget.ImportButton =>
-                        _importButtonRef.FocusAsync(preventScroll: true),
+                        _importButton?.FocusAsync(preventScroll: true) ?? ValueTask.CompletedTask,
                     _ => ValueTask.CompletedTask
                 });
             }
@@ -556,7 +557,7 @@ private async Task FocusAfterBulkUpgradeAsync()
         // button so keyboard users have a stable anchor.
         if (!_isSelectionModeActive)
         {
-            try { await _selectButtonRef.FocusAsync(preventScroll: true); }
+            try { await (_selectButton?.FocusAsync(preventScroll: true) ?? ValueTask.CompletedTask); }
             catch (ObjectDisposedException) { }
             catch (JSDisconnectedException) { }
             catch (JSException) { }
@@ -576,7 +577,7 @@ private async Task FocusAfterBulkUpgradeAsync()
             return;
         }
 
-        try { await _selectButtonRef.FocusAsync(preventScroll: true); }
+        try { await (_selectButton?.FocusAsync(preventScroll: true) ?? ValueTask.CompletedTask); }
         catch (ObjectDisposedException) { }
         catch (JSDisconnectedException) { }
         catch (JSException) { }
@@ -595,7 +596,7 @@ private async ValueTask FocusEntryRowNameAsync(string fileName)
             return;
         }
 
-        try { await _importButtonRef.FocusAsync(preventScroll: true); }
+        try { await (_importButton?.FocusAsync(preventScroll: true) ?? ValueTask.CompletedTask); }
         catch (ObjectDisposedException) { }
         catch (JSDisconnectedException) { }
         catch (JSException) { }
@@ -782,7 +783,7 @@ private async Task OnBulkUpgradeClickAsync()
             {
                 if (_disposed) { return; }
 
-                try { await _bulkUpgradeButtonRef.FocusAsync(preventScroll: true); }
+                try { await (_bulkUpgradeButton?.FocusAsync(preventScroll: true) ?? ValueTask.CompletedTask); }
                 catch (ObjectDisposedException) { }
                 catch (JSDisconnectedException) { }
                 catch (JSException) { }
diff --git a/src/EventLogExpert.UI/DatabaseTools/Tabs/ManageDatabasesTab.razor.css b/src/EventLogExpert.UI/DatabaseTools/Tabs/ManageDatabasesTab.razor.css
index 556f32035..a153488e4 100644
--- a/src/EventLogExpert.UI/DatabaseTools/Tabs/ManageDatabasesTab.razor.css
+++ b/src/EventLogExpert.UI/DatabaseTools/Tabs/ManageDatabasesTab.razor.css
@@ -14,7 +14,7 @@
     padding: .5rem 1rem;
 }
 
-.manage-databases-import-btn {
+::deep .manage-databases-import-btn {
     margin-left: auto;
 }
 
diff --git a/src/EventLogExpert.UI/DatabaseTools/Tabs/MergeDatabaseTab.razor b/src/EventLogExpert.UI/DatabaseTools/Tabs/MergeDatabaseTab.razor
index 7d66b1784..7a7fd8889 100644
--- a/src/EventLogExpert.UI/DatabaseTools/Tabs/MergeDatabaseTab.razor
+++ b/src/EventLogExpert.UI/DatabaseTools/Tabs/MergeDatabaseTab.razor
@@ -17,7 +17,7 @@
                     placeholder="Path to .db or .evtx (paste a folder path to use a directory)"
                     type="text"
                     value="@_sourcePath" />
-                <button class="button" disabled="@IsRunning" @onclick="PickSourceAsync" type="button">Browse…</button>
+                <Button Disabled="@IsRunning" OnClick="PickSourceAsync">Browse…</Button>
             </div>
         </div>
 
@@ -33,7 +33,7 @@
                     placeholder="C:\path\to\existing-database.db"
                     type="text"
                     value="@_targetPath" />
-                <button class="button" disabled="@IsRunning" @onclick="PickTargetAsync" type="button">Browse…</button>
+                <Button Disabled="@IsRunning" OnClick="PickTargetAsync">Browse…</Button>
             </div>
         </div>
 
@@ -56,22 +56,22 @@
             {
                 @if (IsCancelling)
                 {
-                    <button class="button" disabled type="button">
+                    <Button Disabled>
                         <i aria-hidden="true" class="bi bi-hourglass-split"></i> Cancelling…
-                    </button>
+                    </Button>
                 }
                 else
                 {
-                    <button class="button button-red" @onclick="CancelRun" type="button">
+                    <DangerButton OnClick="CancelRun">
                         <i aria-hidden="true" class="bi bi-x-circle"></i> Cancel
-                    </button>
+                    </DangerButton>
                 }
             }
             else
             {
-                <button class="button button-green" disabled="@(!CanRun)" @onclick="RunAsync" type="button">
+                <PrimaryButton Disabled="@(!CanRun)" OnClick="RunAsync">
                     <i aria-hidden="true" class="bi bi-play-fill"></i> Run
-                </button>
+                </PrimaryButton>
             }
         </ToolbarLeadingContent>
     </DatabaseToolsLogView>
diff --git a/src/EventLogExpert.UI/DatabaseTools/Tabs/ShowProvidersTab.razor b/src/EventLogExpert.UI/DatabaseTools/Tabs/ShowProvidersTab.razor
index 1cbc91b3e..1ccc2ef61 100644
--- a/src/EventLogExpert.UI/DatabaseTools/Tabs/ShowProvidersTab.razor
+++ b/src/EventLogExpert.UI/DatabaseTools/Tabs/ShowProvidersTab.razor
@@ -17,7 +17,7 @@
                     id="show-source-path"
                     placeholder="Leave empty for local providers, or pick / paste a path"
                     type="text" />
-                <button class="button" disabled="@IsRunning" @onclick="PickSourceAsync" type="button">Browse…</button>
+                <Button Disabled="@IsRunning" OnClick="PickSourceAsync">Browse…</Button>
             </div>
         </div>
 
@@ -51,7 +51,11 @@
                 <div class="elevation-warning" role="alert">
                     <i aria-hidden="true" class="bi bi-shield-exclamation"></i>
                     <span>Running without elevation — some local providers (Security, etc.) will be skipped or return incomplete metadata.</span>
-                    <button class="button" disabled="@IsRunning" @onclick="RunElevatedAsync" title="Run this operation in an elevated helper process; main app stays running." type="button">Run Elevated</button>
+                    <Button Disabled="@IsRunning"
+                        OnClick="RunElevatedAsync"
+                        title="Run this operation in an elevated helper process; main app stays running.">
+                        Run Elevated
+                    </Button>
                 </div>
             </div>
         }
@@ -63,22 +67,22 @@
             {
                 @if (IsCancelling)
                 {
-                    <button class="button" disabled type="button">
+                    <Button Disabled>
                         <i aria-hidden="true" class="bi bi-hourglass-split"></i> Cancelling…
-                    </button>
+                    </Button>
                 }
                 else
                 {
-                    <button class="button button-red" @onclick="CancelRun" type="button">
+                    <DangerButton OnClick="CancelRun">
                         <i aria-hidden="true" class="bi bi-x-circle"></i> Cancel
-                    </button>
+                    </DangerButton>
                 }
             }
             else
             {
-                <button class="button button-green" disabled="@(!CanRun)" @onclick="RunAsync" type="button">
+                <PrimaryButton Disabled="@(!CanRun)" OnClick="RunAsync">
                     <i aria-hidden="true" class="bi bi-play-fill"></i> Run
-                </button>
+                </PrimaryButton>
             }
         </ToolbarLeadingContent>
     </DatabaseToolsLogView>
diff --git a/src/EventLogExpert.UI/DatabaseTools/Tabs/UpgradeDatabaseTab.razor b/src/EventLogExpert.UI/DatabaseTools/Tabs/UpgradeDatabaseTab.razor
index 98d72c4de..19bc719ba 100644
--- a/src/EventLogExpert.UI/DatabaseTools/Tabs/UpgradeDatabaseTab.razor
+++ b/src/EventLogExpert.UI/DatabaseTools/Tabs/UpgradeDatabaseTab.razor
@@ -15,7 +15,7 @@
                     placeholder="C:\path\to\database.db"
                     type="text"
                     value="@_dbPath" />
-                <button class="button" disabled="@IsRunning" @onclick="PickDbAsync" type="button">Browse…</button>
+                <Button Disabled="@IsRunning" OnClick="PickDbAsync">Browse…</Button>
             </div>
         </div>
     </div>
@@ -26,22 +26,22 @@
             {
                 @if (IsCancelling)
                 {
-                    <button class="button" disabled type="button">
+                    <Button Disabled>
                         <i aria-hidden="true" class="bi bi-hourglass-split"></i> Cancelling…
-                    </button>
+                    </Button>
                 }
                 else
                 {
-                    <button class="button button-red" @onclick="CancelRun" type="button">
+                    <DangerButton OnClick="CancelRun">
                         <i aria-hidden="true" class="bi bi-x-circle"></i> Cancel
-                    </button>
+                    </DangerButton>
                 }
             }
             else
             {
-                <button class="button button-green" disabled="@(!CanRun)" @onclick="RunAsync" type="button">
+                <PrimaryButton Disabled="@(!CanRun)" OnClick="RunAsync">
                     <i aria-hidden="true" class="bi bi-play-fill"></i> Run
-                </button>
+                </PrimaryButton>
             }
         </ToolbarLeadingContent>
     </DatabaseToolsLogView>
diff --git a/src/EventLogExpert.UI/DebugLog/DebugLogModal.razor b/src/EventLogExpert.UI/DebugLog/DebugLogModal.razor
index c01448c8b..243e80889 100644
--- a/src/EventLogExpert.UI/DebugLog/DebugLogModal.razor
+++ b/src/EventLogExpert.UI/DebugLog/DebugLogModal.razor
@@ -61,7 +61,7 @@
                 value="@_pendingStringFilter" />
         </div>
         <div aria-busy="@(_hasLoaded ? "false" : "true")" aria-label="Debug log entries" class="debug-log-viewport" role="region" tabindex="0">
-            <Virtualize Context="line" ItemSize="@RowHeightPx" Items="_displayedView" OverscanCount="20">
+            <Virtualize Context="line" Items="_displayedView" ItemSize="@RowHeightPx" OverscanCount="20">
                 <ItemContent>
                     <div class="debug-log-row" title="@line">@line</div>
                 </ItemContent>
@@ -77,25 +77,21 @@
     <ExtraFooterContent>
         <div class="debug-log-footer">
             <div class="debug-log-footer-actions debug-log-footer-left">
-                <button class="button"
-                    disabled="@(!_hasLoaded || _filteredEntryCount == 0)"
-                    @onclick="HandleExportAsync"
-                    type="button">
+                <Button Disabled="@(!_hasLoaded || _filteredEntryCount == 0)"
+                    OnClick="HandleExportAsync">
                     Export
-                </button>
-                <button class="button"
-                    disabled="@(!_hasLoaded || _filteredEntryCount == 0)"
-                    @onclick="HandleCopyAsync"
-                    type="button">
+                </Button>
+                <Button Disabled="@(!_hasLoaded || _filteredEntryCount == 0)"
+                    OnClick="HandleCopyAsync">
                     Copy
-                </button>
+                </Button>
             </div>
             <span aria-atomic="true" aria-live="polite" class="debug-log-footer-counter" role="status">
                 @($"{_filteredEntryCount:N0} of {_entries.Count:N0} {(_entries.Count == 1 ? "entry" : "entries")}")
             </span>
             <div class="debug-log-footer-actions debug-log-footer-right">
-                <button class="button" @onclick="Refresh" type="button">Refresh</button>
-                <button class="button" @onclick="Clear" type="button">Clear</button>
+                <Button OnClick="Refresh">Refresh</Button>
+                <Button OnClick="Clear">Clear</Button>
             </div>
         </div>
     </ExtraFooterContent>
diff --git a/src/EventLogExpert.UI/FilterEditor/Editing/FilterEditPanel.razor b/src/EventLogExpert.UI/FilterEditor/Editing/FilterEditPanel.razor
index 13b1a3604..8a86a7394 100644
--- a/src/EventLogExpert.UI/FilterEditor/Editing/FilterEditPanel.razor
+++ b/src/EventLogExpert.UI/FilterEditor/Editing/FilterEditPanel.razor
@@ -3,15 +3,14 @@
     <div class="filter-edit-panel @CssClass">
         <div class="filter-edit-panel-row">
             <div class="filter-edit-panel-content">
-                <button aria-label="@(filter.IsExcluded ? "Filter is excluded; activate to include" : "Filter is included; activate to exclude")"
+                <Button aria-label="@(filter.IsExcluded ? "Filter is excluded; activate to include" : "Filter is included; activate to exclude")"
                     aria-pressed="@(filter.IsExcluded ? "true" : "false")"
-                    class="button filter-exclude-toggle icon-button"
+                    CssClass="filter-exclude-toggle"
                     data-excluded="@(filter.IsExcluded ? "true" : "false")"
-                    @onclick="@(() => OnExclusionChanged.InvokeAsync(!filter.IsExcluded))"
-                    title="@(filter.IsExcluded ? "Excluded \u2014 click to include" : "Included \u2014 click to exclude")"
-                    type="button">
-                    <i aria-hidden="true" class="@(filter.IsExcluded ? "bi bi-slash-circle-fill" : "bi bi-slash-circle")"></i>
-                </button>
+                    IconClass="@(filter.IsExcluded ? "bi bi-slash-circle-fill" : "bi bi-slash-circle")"
+                    IconOnly
+                    OnClick="@(() => OnExclusionChanged.InvokeAsync(!filter.IsExcluded))"
+                    title="@(filter.IsExcluded ? "Excluded \u2014 click to include" : "Included \u2014 click to exclude")" />
 
                 <div class="color-picker-wrapper" data-filter-excluded="@(filter.IsExcluded ? "true" : "false")">
                     <ValueSelect AriaDescribedBy="@(filter.IsExcluded ? _colorDescriptionId : null)"
@@ -40,27 +39,23 @@
             </div>
 
             <div class="filter-edit-panel-actions">
-                <button class="button button-green" @onclick="OnSave" type="button">
+                <PrimaryButton OnClick="OnSave">
                     <i aria-hidden="true" class="bi bi-check-circle"></i> Save
-                </button>
+                </PrimaryButton>
 
-                <button aria-label="Cancel edit"
-                    class="button icon-button"
-                    @onclick="OnCancel"
-                    title="Cancel edit"
-                    type="button">
-                    <i aria-hidden="true" class="bi bi-x-circle"></i>
-                </button>
+                <Button aria-label="Cancel edit"
+                    IconClass="bi bi-x-circle"
+                    IconOnly
+                    OnClick="OnCancel"
+                    title="Cancel edit" />
 
                 @if (!IsPending)
                 {
-                    <button aria-label="Remove filter"
-                        class="button button-red icon-button"
-                        @onclick="OnRemove"
-                        title="Remove filter"
-                        type="button">
-                        <i aria-hidden="true" class="bi bi-dash-circle"></i>
-                    </button>
+                    <DangerButton aria-label="Remove filter"
+                        IconClass="bi bi-dash-circle"
+                        IconOnly
+                        OnClick="OnRemove"
+                        title="Remove filter" />
                 }
             </div>
         </div>
diff --git a/src/EventLogExpert.UI/FilterEditor/Editing/FilterEditPanel.razor.css b/src/EventLogExpert.UI/FilterEditor/Editing/FilterEditPanel.razor.css
index c1f2f8dbb..6be3e4181 100644
--- a/src/EventLogExpert.UI/FilterEditor/Editing/FilterEditPanel.razor.css
+++ b/src/EventLogExpert.UI/FilterEditor/Editing/FilterEditPanel.razor.css
@@ -42,7 +42,7 @@
    so the whole action cluster appears vertically aligned. Scoped to
    FilterEditPanel actions only; other .button-green call sites elsewhere in
    the app stay ghost-styled. */
-.filter-edit-panel-actions button.button-green {
+.filter-edit-panel-actions ::deep button.button-green {
     display: inline-flex;
     align-items: center;
     gap: 0.25rem;
@@ -55,33 +55,33 @@
     border-radius: 4px;
 }
 
-.filter-edit-panel-actions button.button-green:hover {
+.filter-edit-panel-actions ::deep button.button-green:hover {
     filter: brightness(1.1);
 }
 
-.filter-edit-panel-actions button.button-green:focus-visible {
+.filter-edit-panel-actions ::deep button.button-green:focus-visible {
     outline: 2px solid var(--clr-green);
     outline-offset: 2px;
 }
 
 /* Leftmost icon toggle for include/exclude. Slash-circle icon = excluded state;
    muted gray = included. Uses aria-pressed for SR + visible color cue. */
-.filter-exclude-toggle {
+.filter-edit-panel-content ::deep .filter-exclude-toggle {
     color: var(--text-secondary);
     transition: color 0.1s ease-in-out;
 }
 
-.filter-exclude-toggle[data-excluded="true"] {
+.filter-edit-panel-content ::deep .filter-exclude-toggle[data-excluded="true"] {
     color: var(--clr-red);
 }
 
-.filter-exclude-toggle:focus-visible {
+.filter-edit-panel-content ::deep .filter-exclude-toggle:focus-visible {
     outline: 2px solid var(--toggle-accent);
     outline-offset: 2px;
 }
 
 @media (forced-colors: active) {
-    .filter-exclude-toggle[data-excluded="true"] {
+    .filter-edit-panel-content ::deep .filter-exclude-toggle[data-excluded="true"] {
         color: Highlight;
     }
 }
diff --git a/src/EventLogExpert.UI/FilterEditor/Editing/FilterPredicateEditor.razor b/src/EventLogExpert.UI/FilterEditor/Editing/FilterPredicateEditor.razor
index d1b67b576..43a051f86 100644
--- a/src/EventLogExpert.UI/FilterEditor/Editing/FilterPredicateEditor.razor
+++ b/src/EventLogExpert.UI/FilterEditor/Editing/FilterPredicateEditor.razor
@@ -15,22 +15,18 @@
             Id="@ComponentId.For(Value.Id, ComponentIdScope.Predicate).Value"
             OnChanged="OnComparisonChanged" />
 
-        <button aria-label="Done editing predicate"
-            class="button icon-button"
-            disabled="@(!Value.IsComplete)"
-            @onclick="OnDoneClick"
-            title="@(Value.IsComplete ? "Done" : "Complete the predicate before continuing")"
-            type="button">
-            <i aria-hidden="true" class="bi bi-check-circle"></i>
-        </button>
+        <Button aria-label="Done editing predicate"
+            Disabled="@(!Value.IsComplete)"
+            IconClass="bi bi-check-circle"
+            IconOnly
+            OnClick="OnDoneClick"
+            title="@(Value.IsComplete ? "Done" : "Complete the predicate before continuing")" />
 
-        <button aria-label="@($"Remove predicate: {SummaryText}")"
-            class="button button-red icon-button"
-            @onclick="OnRemoveChip"
-            title="Remove predicate"
-            type="button">
-            <i aria-hidden="true" class="bi bi-x-circle"></i>
-        </button>
+        <DangerButton aria-label="@($"Remove predicate: {SummaryText}")"
+            IconClass="bi bi-x-circle"
+            IconOnly
+            OnClick="OnRemoveChip"
+            title="Remove predicate" />
     </div>
 }
 else
diff --git a/src/EventLogExpert.UI/FilterEditor/Editing/FilterPredicateList.razor b/src/EventLogExpert.UI/FilterEditor/Editing/FilterPredicateList.razor
index e150b5d39..6518765d2 100644
--- a/src/EventLogExpert.UI/FilterEditor/Editing/FilterPredicateList.razor
+++ b/src/EventLogExpert.UI/FilterEditor/Editing/FilterPredicateList.razor
@@ -12,14 +12,13 @@
                 Value="predicate" />
         }
 
-        <button aria-label="@(CanAddPredicate ? "Add predicate" : "Complete the current predicate before adding another")"
-            class="add-filter-predicate-button button icon-button"
-            disabled="@(!CanAddPredicate)"
-            @onclick="AddPredicate"
-            @ref="_addButtonRef"
-            title="@(CanAddPredicate ? "Add predicate" : "Complete the current predicate before adding another")"
-            type="button">
-            <i aria-hidden="true" class="bi bi-plus-circle"></i>
-        </button>
+        <Button aria-label="@(CanAddPredicate ? "Add predicate" : "Complete the current predicate before adding another")"
+            CssClass="add-filter-predicate-button"
+            Disabled="@(!CanAddPredicate)"
+            IconClass="bi bi-plus-circle"
+            IconOnly
+            OnClick="AddPredicate"
+            @ref="_addButton"
+            title="@(CanAddPredicate ? "Add predicate" : "Complete the current predicate before adding another")" />
     </span>
 </div>
diff --git a/src/EventLogExpert.UI/FilterEditor/Editing/FilterPredicateList.razor.cs b/src/EventLogExpert.UI/FilterEditor/Editing/FilterPredicateList.razor.cs
index f883d7845..0d032d805 100644
--- a/src/EventLogExpert.UI/FilterEditor/Editing/FilterPredicateList.razor.cs
+++ b/src/EventLogExpert.UI/FilterEditor/Editing/FilterPredicateList.razor.cs
@@ -4,6 +4,7 @@
 using EventLogExpert.Filtering.Drafts;
 using EventLogExpert.Filtering.Persistence;
 using EventLogExpert.UI.Focus;
+using EventLogExpert.UI.Inputs;
 using Microsoft.AspNetCore.Components;
 
 namespace EventLogExpert.UI.FilterEditor.Editing;
@@ -12,7 +13,7 @@ public sealed partial class FilterPredicateList : ComponentBase
 {
     private readonly Dictionary<FilterId, FilterPredicateEditor?> _editorRefs = new();
 
-    private ElementReference _addButtonRef;
+    private Button? _addButton;
     private FilterId? _editingPredicateId;
     private bool _focusAddButtonAfterRender;
     private FilterId? _focusChipAfterRender;
@@ -55,7 +56,8 @@ protected override async Task OnAfterRenderAsync(bool firstRender)
         else if (_focusAddButtonAfterRender)
         {
             _focusAddButtonAfterRender = false;
-            await ElementFocus.SafelyAsync(_addButtonRef);
+
+            if (_addButton is { } button) { await ElementFocus.SafelyAsync(button.Element); }
         }
 
         await base.OnAfterRenderAsync(firstRender);
diff --git a/src/EventLogExpert.UI/FilterEditor/Editing/FilterPredicateList.razor.css b/src/EventLogExpert.UI/FilterEditor/Editing/FilterPredicateList.razor.css
index ca2c3d204..5046b80bd 100644
--- a/src/EventLogExpert.UI/FilterEditor/Editing/FilterPredicateList.razor.css
+++ b/src/EventLogExpert.UI/FilterEditor/Editing/FilterPredicateList.razor.css
@@ -17,10 +17,10 @@
     min-width: 0;
 }
 
-.add-filter-predicate-button {
+.filter-predicate-list ::deep .add-filter-predicate-button {
     color: var(--text-secondary);
 }
 
-.add-filter-predicate-button:hover {
+.filter-predicate-list ::deep .add-filter-predicate-button:hover {
     color: var(--clr-lightblue);
 }
diff --git a/src/EventLogExpert.UI/FilterEditor/Rows/FilterRowActions.razor b/src/EventLogExpert.UI/FilterEditor/Rows/FilterRowActions.razor
index f6572bf69..8f611b8a9 100644
--- a/src/EventLogExpert.UI/FilterEditor/Rows/FilterRowActions.razor
+++ b/src/EventLogExpert.UI/FilterEditor/Rows/FilterRowActions.razor
@@ -3,30 +3,24 @@
     <div class="filter-row-actions">
         @if (ShowScenarioCopy)
         {
-            <button aria-label="@($"Copy {DescribeFilter(savedFilter)} as scenario JSON")"
-                class="button icon-button"
-                @onclick="@(() => CopyScenarioJsonAsync(savedFilter))"
-                title="Copy as scenario JSON"
-                type="button">
-                <i aria-hidden="true" class="bi bi-filetype-json"></i>
-            </button>
+            <Button aria-label="@($"Copy {DescribeFilter(savedFilter)} as scenario JSON")"
+                IconClass="bi bi-filetype-json"
+                IconOnly
+                OnClick="@(() => CopyScenarioJsonAsync(savedFilter))"
+                title="Copy as scenario JSON" />
         }
-        <button aria-label="@($"Edit {DescribeFilter(savedFilter)}")"
-            class="button icon-button"
-            @onclick="OnEdit"
-            @ref="_editButtonRef"
-            title="Edit filter"
-            type="button">
-            <i aria-hidden="true" class="bi bi-funnel"></i>
-        </button>
+        <Button aria-label="@($"Edit {DescribeFilter(savedFilter)}")"
+            IconClass="bi bi-funnel"
+            IconOnly
+            OnClick="OnEdit"
+            @ref="_editButton"
+            title="Edit filter" />
 
-        <button aria-label="@($"Remove {DescribeFilter(savedFilter)}")"
-            class="button button-red icon-button"
-            @onclick="OnRemove"
-            title="Remove filter"
-            type="button">
-            <i aria-hidden="true" class="bi bi-dash-circle"></i>
-        </button>
+        <DangerButton aria-label="@($"Remove {DescribeFilter(savedFilter)}")"
+            IconClass="bi bi-dash-circle"
+            IconOnly
+            OnClick="OnRemove"
+            title="Remove filter" />
 
         <span class="visually-hidden" id="@_enableToggleLabelId">Enable filter</span>
 
diff --git a/src/EventLogExpert.UI/FilterEditor/Rows/FilterRowActions.razor.cs b/src/EventLogExpert.UI/FilterEditor/Rows/FilterRowActions.razor.cs
index 9616f343d..cb495c3bf 100644
--- a/src/EventLogExpert.UI/FilterEditor/Rows/FilterRowActions.razor.cs
+++ b/src/EventLogExpert.UI/FilterEditor/Rows/FilterRowActions.razor.cs
@@ -4,6 +4,7 @@
 using EventLogExpert.Filtering.Persistence;
 using EventLogExpert.UI.Common;
 using EventLogExpert.UI.Focus;
+using EventLogExpert.UI.Inputs;
 using Microsoft.AspNetCore.Components;
 
 namespace EventLogExpert.UI.FilterEditor.Rows;
@@ -12,7 +13,7 @@ public sealed partial class FilterRowActions : ComponentBase
 {
     private readonly string _enableToggleLabelId = ComponentId.NewUnique("filter-row-toggle").Value;
 
-    private ElementReference _editButtonRef;
+    private Button? _editButton;
 
     [CascadingParameter] public ScenarioAuthoringRowContext? AuthoringContext { get; set; }
 
@@ -33,7 +34,7 @@ public sealed partial class FilterRowActions : ComponentBase
 
     private bool ShowScenarioCopy => AuthoringContext is { Enabled: true };
 
-    internal ValueTask FocusEditAsync() => ElementFocus.SafelyAsync(_editButtonRef);
+    internal ValueTask FocusEditAsync() => _editButton is { } button ? ElementFocus.SafelyAsync(button.Element) : ValueTask.CompletedTask;
 
     private static string DescribeFilter(SavedFilter filter) =>
         string.IsNullOrWhiteSpace(filter.ComparisonText) ? "filter" : $"filter '{filter.ComparisonText}'";
diff --git a/src/EventLogExpert.UI/FilterEditor/Rows/FilterRowHeader.razor b/src/EventLogExpert.UI/FilterEditor/Rows/FilterRowHeader.razor
index 029cea9b7..196dda049 100644
--- a/src/EventLogExpert.UI/FilterEditor/Rows/FilterRowHeader.razor
+++ b/src/EventLogExpert.UI/FilterEditor/Rows/FilterRowHeader.razor
@@ -1,15 +1,14 @@
 @if (Value is { } savedFilter)
 {
     <div class="filter-row-header">
-        <button aria-label="@(savedFilter.IsExcluded ? $"Filter '{savedFilter.ComparisonText}' is excluded; activate to include" : $"Filter '{savedFilter.ComparisonText}' is included; activate to exclude")"
+        <Button aria-label="@(savedFilter.IsExcluded ? $"Filter '{savedFilter.ComparisonText}' is excluded; activate to include" : $"Filter '{savedFilter.ComparisonText}' is included; activate to exclude")"
             aria-pressed="@(savedFilter.IsExcluded ? "true" : "false")"
-            class="button filter-exclude-toggle icon-button"
+            CssClass="filter-exclude-toggle"
             data-excluded="@(savedFilter.IsExcluded ? "true" : "false")"
-            @onclick="@(() => OnExclusionChanged.InvokeAsync(!savedFilter.IsExcluded))"
-            title="@(savedFilter.IsExcluded ? "Excluded \u2014 click to include" : "Included \u2014 click to exclude")"
-            type="button">
-            <i aria-hidden="true" class="@(savedFilter.IsExcluded ? "bi bi-slash-circle-fill" : "bi bi-slash-circle")"></i>
-        </button>
+            IconClass="@(savedFilter.IsExcluded ? "bi bi-slash-circle-fill" : "bi bi-slash-circle")"
+            IconOnly
+            OnClick="@(() => OnExclusionChanged.InvokeAsync(!savedFilter.IsExcluded))"
+            title="@(savedFilter.IsExcluded ? "Excluded \u2014 click to include" : "Included \u2014 click to exclude")" />
 
         <div aria-hidden="true"
             class="color-box"
diff --git a/src/EventLogExpert.UI/FilterEditor/Rows/FilterRowHeader.razor.css b/src/EventLogExpert.UI/FilterEditor/Rows/FilterRowHeader.razor.css
index af981bdb2..b1d85fda4 100644
--- a/src/EventLogExpert.UI/FilterEditor/Rows/FilterRowHeader.razor.css
+++ b/src/EventLogExpert.UI/FilterEditor/Rows/FilterRowHeader.razor.css
@@ -17,22 +17,22 @@
    user sees the same control in the same position across saved + edit modes.
    Filled icon when excluded (works in forced-colors via SVG shape difference,
    not color). */
-.filter-exclude-toggle {
+.filter-row-header ::deep .filter-exclude-toggle {
     color: var(--text-secondary);
     transition: color 0.1s ease-in-out;
 }
 
-.filter-exclude-toggle[data-excluded="true"] {
+.filter-row-header ::deep .filter-exclude-toggle[data-excluded="true"] {
     color: var(--clr-red);
 }
 
-.filter-exclude-toggle:focus-visible {
+.filter-row-header ::deep .filter-exclude-toggle:focus-visible {
     outline: 2px solid var(--toggle-accent);
     outline-offset: 2px;
 }
 
 @media (forced-colors: active) {
-    .filter-exclude-toggle[data-excluded="true"] {
+    .filter-row-header ::deep .filter-exclude-toggle[data-excluded="true"] {
         color: Highlight;
     }
 }
diff --git a/src/EventLogExpert.UI/FilterLibrary/FilterLibraryModal.razor b/src/EventLogExpert.UI/FilterLibrary/FilterLibraryModal.razor
index 6777faa1d..12ad508d8 100644
--- a/src/EventLogExpert.UI/FilterLibrary/FilterLibraryModal.razor
+++ b/src/EventLogExpert.UI/FilterLibrary/FilterLibraryModal.razor
@@ -18,7 +18,7 @@
         {
             <div class="filter-library-error" role="alert">
                 <p>Could not load saved filters or filter sets. See trace log for details.</p>
-                <button class="button" @onclick="RetryLoad" type="button">Retry</button>
+                <Button OnClick="RetryLoad">Retry</Button>
             </div>
         }
         else if (!FilterLibraryState.Value.IsLoaded)
@@ -46,15 +46,14 @@
                                 @onkeydown="HandleTagFilterBarKeyDown"
                                 role="group">
                                 <span class="library-tag-filter-bar-label">Tags:</span>
-                                <button aria-controls="@(_isTagManagementExpanded ? tagManagementPanelId : null)"
+                                <Button aria-controls="@(_isTagManagementExpanded ? tagManagementPanelId : null)"
                                     aria-expanded="@(_isTagManagementExpanded ? "true" : "false")"
                                     aria-label="@(_isTagManagementExpanded ? "Hide tag management" : "Manage tags")"
-                                    class="button icon-button library-tag-management-trigger"
-                                    @onclick="ToggleTagManagement"
-                                    title="Manage tags"
-                                    type="button">
-                                    <i aria-hidden="true" class="bi bi-gear"></i>
-                                </button>
+                                    CssClass="library-tag-management-trigger"
+                                    IconClass="bi bi-gear"
+                                    IconOnly
+                                    OnClick="ToggleTagManagement"
+                                    title="Manage tags" />
                                 @{
                                     var visibleTags = AllLibraryTags.Take(TagFilterBarMaxVisible).ToList();
                                     var hiddenTagsCount = AllLibraryTags.Count - visibleTags.Count;
diff --git a/src/EventLogExpert.UI/FilterLibrary/LibraryEntryFilterEditor.razor b/src/EventLogExpert.UI/FilterLibrary/LibraryEntryFilterEditor.razor
index 6398497e6..e4d740364 100644
--- a/src/EventLogExpert.UI/FilterLibrary/LibraryEntryFilterEditor.razor
+++ b/src/EventLogExpert.UI/FilterLibrary/LibraryEntryFilterEditor.razor
@@ -27,11 +27,9 @@
                     PendingDraft="draft" />
             }
 
-            <button class="button library-entry-filter-editor-add-button"
-                @onclick="AddPendingDraft"
-                type="button">
+            <Button CssClass="library-entry-filter-editor-add-button" OnClick="AddPendingDraft">
                 <i aria-hidden="true" class="bi bi-plus"></i> Add filter
-            </button>
+            </Button>
         </div>
     }
 </div>
diff --git a/src/EventLogExpert.UI/FilterLibrary/LibraryEntryFilterEditor.razor.css b/src/EventLogExpert.UI/FilterLibrary/LibraryEntryFilterEditor.razor.css
index 4f00d463a..de6eb0d66 100644
--- a/src/EventLogExpert.UI/FilterLibrary/LibraryEntryFilterEditor.razor.css
+++ b/src/EventLogExpert.UI/FilterLibrary/LibraryEntryFilterEditor.razor.css
@@ -16,7 +16,7 @@
     font-style: italic;
 }
 
-.library-entry-filter-editor-add-button {
+::deep .library-entry-filter-editor-add-button {
     align-self: flex-start;
     margin-top: .25rem;
 }
diff --git a/src/EventLogExpert.UI/FilterLibrary/LibraryEntryRow.razor b/src/EventLogExpert.UI/FilterLibrary/LibraryEntryRow.razor
index b88fdbb46..13c200f41 100644
--- a/src/EventLogExpert.UI/FilterLibrary/LibraryEntryRow.razor
+++ b/src/EventLogExpert.UI/FilterLibrary/LibraryEntryRow.razor
@@ -4,14 +4,13 @@
 
         @if (Entry is LibraryEntryFilterSet)
         {
-            <button aria-controls="@_filterEditorRegionId"
+            <Button aria-controls="@_filterEditorRegionId"
                 aria-expanded="@(_isExpanded ? "true" : "false")"
                 aria-label="@($"Filters for {Entry.Name}")"
-                class="button icon-button library-entry-expand-toggle"
-                @onclick="ToggleExpand"
-                type="button">
-                <i aria-hidden="true" class="@(_isExpanded ? "bi bi-chevron-down" : "bi bi-chevron-right")"></i>
-            </button>
+                CssClass="library-entry-expand-toggle"
+                IconClass="@(_isExpanded ? "bi bi-chevron-down" : "bi bi-chevron-right")"
+                IconOnly
+                OnClick="ToggleExpand" />
         }
 
         <div class="library-entry-name">
@@ -63,54 +62,46 @@
 
                     @if (inlineHidden > 0)
                     {
-                        <button aria-label="@($"Show all {Entry.Tags.Count} tags")"
-                            class="button library-entry-tag-chip-more"
-                            @onclick="ToggleEditTagsMode"
-                            title="@string.Join(", ", Entry.Tags.Skip(inlineVisible))"
-                            type="button">
+                        <Button aria-label="@($"Show all {Entry.Tags.Count} tags")"
+                            CssClass="library-entry-tag-chip-more"
+                            OnClick="ToggleEditTagsMode"
+                            title="@string.Join(", ", Entry.Tags.Skip(inlineVisible))">
                             +@inlineHidden more
-                        </button>
+                        </Button>
                     }
                 }
-                <button aria-label="@(Entry.Tags.Count == 0 ? $"Add tags to {Entry.Name}" : $"Edit tags for {Entry.Name}")"
-                    class="button icon-button library-entry-tag-add-inline"
-                    @onclick="ToggleEditTagsMode"
-                    title="@(Entry.Tags.Count == 0 ? "Add tags" : "Edit tags")"
-                    type="button">
-                    <i aria-hidden="true" class="bi bi-plus-circle"></i>
-                </button>
+                <Button aria-label="@(Entry.Tags.Count == 0 ? $"Add tags to {Entry.Name}" : $"Edit tags for {Entry.Name}")"
+                    CssClass="library-entry-tag-add-inline"
+                    IconClass="bi bi-plus-circle"
+                    IconOnly
+                    OnClick="ToggleEditTagsMode"
+                    title="@(Entry.Tags.Count == 0 ? "Add tags" : "Edit tags")" />
             </div>
         }
 
-        <button aria-label="@($"Apply {Entry.Name} additively to current filters")"
-            class="button button-green"
-            @onclick="OnApplyAsync"
-            type="button">
+        <PrimaryButton aria-label="@($"Apply {Entry.Name} additively to current filters")"
+            OnClick="OnApplyAsync">
             <i aria-hidden="true" class="bi bi-plus-circle"></i> Apply
-        </button>
+        </PrimaryButton>
 
         @if (IsFavoritable)
         {
-            <button aria-label="@FavoriteAriaLabel"
+            <WarningButton aria-label="@FavoriteAriaLabel"
                 aria-pressed="@(Entry.IsFavorite ? "true" : "false")"
-                class="button button-yellow icon-button"
-                @onclick="OnToggleFavoriteAsync"
-                title="@FavoriteTitle"
-                type="button">
-                <i aria-hidden="true" class="@FavoriteIconClass"></i>
-            </button>
+                IconClass="@FavoriteIconClass"
+                IconOnly
+                OnClick="OnToggleFavoriteAsync"
+                title="@FavoriteTitle" />
         }
 
-        <button aria-expanded="@(IsMoreMenuOpen ? "true" : "false")"
+        <Button aria-expanded="@(IsMoreMenuOpen ? "true" : "false")"
             aria-haspopup="menu"
             aria-label="@($"More actions for {Entry.Name}")"
-            class="button icon-button"
-            @onclick="ToggleMoreMenuAsync"
-            @ref="_moreMenuButtonRef"
-            title="More actions"
-            type="button">
-            <i aria-hidden="true" class="bi bi-three-dots-vertical"></i>
-        </button>
+            IconClass="bi bi-three-dots-vertical"
+            IconOnly
+            OnClick="ToggleMoreMenuAsync"
+            @ref="_moreMenuButton"
+            title="More actions" />
     </div>
 
     @if (_isEditingTags)
@@ -121,13 +112,12 @@
                 Value="@Entry.Tags"
                 ValueChanged="@OnTagsChangedAsync" />
 
-            <button aria-label="Done editing tags"
-                class="button icon-button library-entry-tags-done"
-                @onclick="ToggleEditTagsMode"
-                title="Done"
-                type="button">
-                <i aria-hidden="true" class="bi bi-check2"></i>
-            </button>
+            <Button aria-label="Done editing tags"
+                CssClass="library-entry-tags-done"
+                IconClass="bi bi-check2"
+                IconOnly
+                OnClick="ToggleEditTagsMode"
+                title="Done" />
         </div>
     }
 
diff --git a/src/EventLogExpert.UI/FilterLibrary/LibraryEntryRow.razor.cs b/src/EventLogExpert.UI/FilterLibrary/LibraryEntryRow.razor.cs
index 4e00dac85..d7d4581a9 100644
--- a/src/EventLogExpert.UI/FilterLibrary/LibraryEntryRow.razor.cs
+++ b/src/EventLogExpert.UI/FilterLibrary/LibraryEntryRow.razor.cs
@@ -9,6 +9,7 @@
 using EventLogExpert.UI.Common;
 using EventLogExpert.UI.Common.Interop;
 using EventLogExpert.UI.Focus;
+using EventLogExpert.UI.Inputs;
 using Fluxor;
 using Microsoft.AspNetCore.Components;
 using Microsoft.JSInterop;
@@ -27,7 +28,7 @@ public sealed partial class LibraryEntryRow : ComponentBase, IAsyncDisposable
     private bool _isEditingTags;
     private bool _isExpanded;
     private IJSObjectReference? _menuAnchorModule;
-    private ElementReference _moreMenuButtonRef;
+    private Button? _moreMenuButton;
     private long _moreMenuId;
     private bool _pendingFocusMoreButton;
     private bool _pendingScrollEditIntoView;
@@ -113,7 +114,10 @@ public async ValueTask DisposeAsync()
         _menuAnchorModule = null;
     }
 
-    internal ValueTask<bool> FocusMoreActionsButtonAsync() => ElementFocus.TrySafelyAsync(_moreMenuButtonRef);
+    internal ValueTask<bool> FocusMoreActionsButtonAsync() =>
+        _moreMenuButton is { } button ?
+            ElementFocus.TrySafelyAsync(button.Element) :
+            ValueTask.FromResult(false);
 
     protected override async Task OnAfterRenderAsync(bool firstRender)
     {
@@ -410,12 +414,14 @@ private async Task ToggleMoreMenuAsync()
     {
         if (IsMoreMenuOpen) { MenuService.Close(); return; }
 
+        if (_moreMenuButton is not { } moreMenuButton) { return; }
+
         try
         {
             _menuAnchorModule ??= await JSRuntime.InvokeAsync<IJSObjectReference>(
                 "import", "./_content/EventLogExpert.UI/Menu/MenuAnchor.js");
 
-            var rect = await _menuAnchorModule.InvokeAsync<MenuAnchorRect>("getMenuElementRect", _moreMenuButtonRef);
+            var rect = await _menuAnchorModule.InvokeAsync<MenuAnchorRect>("getMenuElementRect", moreMenuButton.Element);
             MenuService.OpenAt(rect.Left, rect.Bottom, BuildMoreMenu(), focusFirst: true);
             _moreMenuId = MenuService.ActiveMenuId;
             StateHasChanged();
diff --git a/src/EventLogExpert.UI/FilterLibrary/LibraryEntryRow.razor.css b/src/EventLogExpert.UI/FilterLibrary/LibraryEntryRow.razor.css
index 441cb5d03..36611ddc1 100644
--- a/src/EventLogExpert.UI/FilterLibrary/LibraryEntryRow.razor.css
+++ b/src/EventLogExpert.UI/FilterLibrary/LibraryEntryRow.razor.css
@@ -22,7 +22,7 @@
     font-size: 1rem;
 }
 
-.library-entry-expand-toggle {
+::deep .library-entry-expand-toggle {
     flex-shrink: 0;
 }
 
@@ -137,7 +137,7 @@
     outline-offset: 1px;
 }
 
-.library-entry-tag-chip-more {
+::deep .library-entry-tag-chip-more {
     flex: 0 0 auto;
     padding: 0 .375rem;
     font-size: .75rem;
@@ -147,12 +147,12 @@
     border-radius: .2rem;
 }
 
-.library-entry-tag-chip-more:hover {
+::deep .library-entry-tag-chip-more:hover {
     color: var(--text-primary);
     background: color-mix(in srgb, var(--text-primary) 8%, transparent);
 }
 
-.library-entry-tag-add-inline {
+::deep .library-entry-tag-add-inline {
     display: inline-flex;
     align-items: center;
     justify-content: center;
@@ -169,23 +169,23 @@
     transition: background 120ms ease, color 120ms ease;
 }
 
-.library-entry-tag-add-inline > .bi {
+::deep .library-entry-tag-add-inline > .bi {
     font-size: 14px;
     line-height: 1;
 }
 
-.library-entry-tag-add-inline:hover,
-.library-entry-tag-add-inline:focus-visible {
+::deep .library-entry-tag-add-inline:hover,
+::deep .library-entry-tag-add-inline:focus-visible {
     color: var(--clr-statusbar);
     background: color-mix(in srgb, var(--clr-statusbar) 10%, transparent);
 }
 
-.library-entry-tag-add-inline:focus-visible {
+::deep .library-entry-tag-add-inline:focus-visible {
     outline: 2px solid var(--clr-statusbar);
     outline-offset: 1px;
 }
 
-.library-entry-tags-done {
+::deep .library-entry-tags-done {
     padding: 0 .25rem;
     flex-shrink: 0;
 }
diff --git a/src/EventLogExpert.UI/FilterLibrary/LibrarySavedTabHeader.razor b/src/EventLogExpert.UI/FilterLibrary/LibrarySavedTabHeader.razor
index 5b3fa3148..a9598ffea 100644
--- a/src/EventLogExpert.UI/FilterLibrary/LibrarySavedTabHeader.razor
+++ b/src/EventLogExpert.UI/FilterLibrary/LibrarySavedTabHeader.razor
@@ -1,10 +1,8 @@
 @if (!_isExpanded)
 {
-    <button class="button library-saved-tab-new-button"
-        @onclick="ExpandAsync"
-        type="button">
+    <Button CssClass="library-saved-tab-new-button" OnClick="ExpandAsync">
         <i aria-hidden="true" class="bi bi-plus-circle"></i> New saved filter
-    </button>
+    </Button>
 }
 else
 {
diff --git a/src/EventLogExpert.UI/FilterLibrary/LibrarySavedTabHeader.razor.css b/src/EventLogExpert.UI/FilterLibrary/LibrarySavedTabHeader.razor.css
index c1523c8ed..30de4df1b 100644
--- a/src/EventLogExpert.UI/FilterLibrary/LibrarySavedTabHeader.razor.css
+++ b/src/EventLogExpert.UI/FilterLibrary/LibrarySavedTabHeader.razor.css
@@ -1,18 +1,3 @@
-.library-saved-tab-new-button {
-    width: 100%;
-    height: var(--control-height);
-    padding: 0 .5rem;
-    text-align: left;
-    border: 1px solid var(--clr-statusbar);
-    border-radius: .25rem;
-    color: var(--text-primary);
-    background: transparent;
-}
-
-.library-saved-tab-new-button:hover {
-    background: color-mix(in srgb, var(--clr-statusbar) 10%, transparent);
-}
-
 .library-saved-tab-new-draft {
     display: flex;
     flex-direction: column;
diff --git a/src/EventLogExpert.UI/FilterLibrary/TagManagementPanel.razor b/src/EventLogExpert.UI/FilterLibrary/TagManagementPanel.razor
index 3962bc8c7..77133e522 100644
--- a/src/EventLogExpert.UI/FilterLibrary/TagManagementPanel.razor
+++ b/src/EventLogExpert.UI/FilterLibrary/TagManagementPanel.razor
@@ -32,67 +32,59 @@
                         @ref="_editInputRef"
                         type="text" />
                     <span class="library-tag-management-row-count">(@count)</span>
+
                     @if (_mergeTargetTag is not null)
                     {
-                        <button aria-label="@($"Merge tag {tag} into {_mergeTargetTag}, affects {count} entries")"
-                            class="button button-yellow"
-                            @onclick="ConfirmMergeAsync"
-                            type="button">
+                        <WarningButton aria-label="@($"Merge tag {tag} into {_mergeTargetTag}, affects {count} entries")"
+                            OnClick="ConfirmMergeAsync">
                             <i aria-hidden="true" class="bi bi-union"></i> Merge into '@_mergeTargetTag'
-                        </button>
+                        </WarningButton>
                     }
                     else
                     {
-                        <button aria-label="@($"Save renamed tag {tag}")"
-                            class="button button-green icon-button"
-                            @onclick="ConfirmRenameAsync"
-                            type="button">
-                            <i aria-hidden="true" class="bi bi-check2"></i>
-                        </button>
+                        <PrimaryButton aria-label="@($"Save renamed tag {tag}")"
+                            IconClass="bi bi-check2"
+                            IconOnly
+                            OnClick="ConfirmRenameAsync" />
                     }
-                    <button aria-label="Cancel rename"
-                        class="button icon-button"
-                        @onclick="CancelEdit"
-                        type="button">
-                        <i aria-hidden="true" class="bi bi-x"></i>
-                    </button>
+
+                    <Button aria-label="Cancel rename"
+                        IconClass="bi bi-x"
+                        IconOnly
+                        OnClick="CancelEdit" />
                 }
                 else if (_deleteConfirmTag == tag)
                 {
                     <span class="library-tag-management-row-name">@tag</span>
                     <span class="library-tag-management-row-count">(@count)</span>
                     <span class="library-tag-management-row-confirm">Remove from @count entries?</span>
-                    <button aria-label="@($"Confirm delete tag {tag}")"
-                        class="button button-red icon-button"
-                        @onclick="ConfirmDeleteAsync"
-                        type="button">
-                        <i aria-hidden="true" class="bi bi-check2"></i>
-                    </button>
-                    <button aria-label="Cancel delete"
-                        class="button icon-button"
-                        @onclick="CancelDelete"
-                        type="button">
-                        <i aria-hidden="true" class="bi bi-x"></i>
-                    </button>
+
+                    <DangerButton aria-label="@($"Confirm delete tag {tag}")"
+                        IconClass="bi bi-check2"
+                        IconOnly
+                        OnClick="ConfirmDeleteAsync" />
+
+                    <Button aria-label="Cancel delete"
+                        IconClass="bi bi-x"
+                        IconOnly
+                        OnClick="CancelDelete" />
                 }
                 else
                 {
                     <span class="library-tag-management-row-name">@tag</span>
                     <span class="library-tag-management-row-count">(@count)</span>
-                    <button aria-label="@($"Rename tag {tag}")"
-                        class="button icon-button"
-                        @onclick="@(() => BeginRename(tag))"
-                        title="Rename"
-                        type="button">
-                        <i aria-hidden="true" class="bi bi-pencil"></i>
-                    </button>
-                    <button aria-label="@($"Delete tag {tag}")"
-                        class="button button-red icon-button"
-                        @onclick="@(() => BeginDelete(tag))"
-                        title="Delete"
-                        type="button">
-                        <i aria-hidden="true" class="bi bi-trash"></i>
-                    </button>
+
+                    <Button aria-label="@($"Rename tag {tag}")"
+                        IconClass="bi bi-pencil"
+                        IconOnly
+                        OnClick="@(() => BeginRename(tag))"
+                        title="Rename" />
+
+                    <DangerButton aria-label="@($"Delete tag {tag}")"
+                        IconClass="bi bi-trash"
+                        IconOnly
+                        OnClick="@(() => BeginDelete(tag))"
+                        title="Delete" />
                 }
             </div>
         }
diff --git a/src/EventLogExpert.UI/FilterPane/FilterPane.razor b/src/EventLogExpert.UI/FilterPane/FilterPane.razor
index d70f012a8..14c8e51ed 100644
--- a/src/EventLogExpert.UI/FilterPane/FilterPane.razor
+++ b/src/EventLogExpert.UI/FilterPane/FilterPane.razor
@@ -25,30 +25,28 @@
             </button>
         </div>
 
-        <button class="button" @onclick="AddExclusion" type="button">
+        <Button OnClick="AddExclusion">
             <i class="bi bi-plus-circle"></i> Add Exclusion
-        </button>
+        </Button>
 
         @if (!IsDateFilterVisible)
         {
-            <button class="button" @onclick="AddDateFilter" type="button">
+            <Button OnClick="AddDateFilter">
                 <i class="bi bi-plus-circle"></i> Add Date Filter
-            </button>
+            </Button>
         }
 
-        <button class="button" @onclick="OpenFilterSetPicker" type="button">
+        <Button OnClick="OpenFilterSetPicker">
             <i class="bi bi-plus-circle"></i> Apply Filter Set
-        </button>
+        </Button>
 
         @if (OpenLogCount.Value > 0)
         {
-            <button aria-controls="scenario-picker"
+            <Button aria-controls="scenario-picker"
                 aria-expanded="@(IsScenarioPickerVisible ? "true" : "false")"
-                class="button"
-                @onclick="OpenScenarioPicker"
-                type="button">
+                OnClick="OpenScenarioPicker">
                 <i class="bi bi-plus-circle"></i> Apply Scenario
-            </button>
+            </Button>
         }
     </div>
 
@@ -64,57 +62,52 @@
     }
 
     <div class="filter-header-secondary">
-        <button aria-describedby="@(HasSavableFilters ? null : "save-filters-empty-hint")"
+        <Button aria-describedby="@(HasSavableFilters ? null : "save-filters-empty-hint")"
             aria-label="Save as Filter Set"
-            class="button icon-button"
-            disabled="@(!HasSavableFilters)"
-            @onclick="SaveFiltersAsFilterSetAsync"
-            title="@(HasSavableFilters ? "Save as Filter Set..." : "No filters to save")"
-            type="button">
+            Disabled="@(!HasSavableFilters)"
+            IconOnly
+            OnClick="SaveFiltersAsFilterSetAsync"
+            title="@(HasSavableFilters ? "Save as Filter Set..." : "No filters to save")">
             <i class="bi bi-bookmark-plus"></i>
-        </button>
+        </Button>
 
-        <button aria-describedby="@(HasClearableFilters ? null : "clear-filters-empty-hint")"
+        <Button aria-describedby="@(HasClearableFilters ? null : "clear-filters-empty-hint")"
             aria-label="Clear All Filters"
-            class="button icon-button"
-            disabled="@(!HasClearableFilters)"
-            @onclick="ClearAllFiltersAsync"
-            title="@(HasClearableFilters ? "Clear All Filters..." : "No filters to clear")"
-            type="button">
+            Disabled="@(!HasClearableFilters)"
+            IconOnly
+            OnClick="ClearAllFiltersAsync"
+            title="@(HasClearableFilters ? "Clear All Filters..." : "No filters to clear")">
             <i class="bi bi-trash"></i>
-        </button>
+        </Button>
 
-        <button aria-label="Open Filter Library"
-            class="button icon-button"
-            @onclick="OpenFilterLibraryAsync"
-            title="Open Filter Library"
-            type="button">
+        <Button aria-label="Open Filter Library"
+            IconOnly
+            OnClick="OpenFilterLibraryAsync"
+            title="Open Filter Library">
             <i class="bi bi-bookmarks"></i>
-        </button>
+        </Button>
 
         @if (ScenarioAuthoringEnabled)
         {
             var hasEnabledFilters = HasEnabledFilters;
 
-            <button aria-describedby="@(hasEnabledFilters ? null : "scenario-export-empty-hint")"
+            <Button aria-describedby="@(hasEnabledFilters ? null : "scenario-export-empty-hint")"
                 aria-label="Copy scenario JSON"
-                class="button icon-button"
-                disabled="@(!hasEnabledFilters)"
-                @onclick="CopyScenarioJsonAsync"
-                title="Copy current filter rows as scenario-catalog JSON"
-                type="button">
+                Disabled="@(!hasEnabledFilters)"
+                IconOnly
+                OnClick="CopyScenarioJsonAsync"
+                title="Copy current filter rows as scenario-catalog JSON">
                 <i aria-hidden="true" class="bi bi-clipboard-data"></i>
-            </button>
+            </Button>
 
-            <button aria-describedby="@(hasEnabledFilters ? null : "scenario-export-empty-hint")"
+            <Button aria-describedby="@(hasEnabledFilters ? null : "scenario-export-empty-hint")"
                 aria-label="Save scenario JSON"
-                class="button icon-button"
-                disabled="@(!hasEnabledFilters)"
-                @onclick="SaveScenarioJsonAsync"
-                title="Save current filter rows as scenario-catalog JSON..."
-                type="button">
+                Disabled="@(!hasEnabledFilters)"
+                IconOnly
+                OnClick="SaveScenarioJsonAsync"
+                title="Save current filter rows as scenario-catalog JSON...">
                 <i aria-hidden="true" class="bi bi-filetype-json"></i>
-            </button>
+            </Button>
 
             <span class="visually-hidden" id="scenario-export-empty-hint">
                 Enable a filter before exporting as a scenario.
@@ -163,35 +156,35 @@
                     <DateRangeQuickPick AriaLabel="Quick date range" CssClass="input filter-datetime" OnRangeSelected="SetQuickDateRange" />
                 </span>
 
-                <button class="button button-green" @onclick="ApplyDateFilter" type="button">
+                <PrimaryButton OnClick="ApplyDateFilter">
                     <i class="bi bi-check-circle"></i> Apply
-                </button>
+                </PrimaryButton>
 
-                <button class="button button-red" @onclick="RemoveDateFilter" type="button">
+                <DangerButton OnClick="RemoveDateFilter">
                     <i class="bi bi-dash-circle"></i> Remove
-                </button>
+                </DangerButton>
             }
             else
             {
-                <button class="button" @onclick="EditDateFilter" type="button">
+                <Button OnClick="EditDateFilter">
                     <i class="bi bi-funnel"></i> Edit
-                </button>
+                </Button>
 
-                <button class="button button-red" @onclick="RemoveDateFilter" type="button">
+                <DangerButton OnClick="RemoveDateFilter">
                     <i class="bi bi-dash-circle"></i> Remove
-                </button>
+                </DangerButton>
 
                 @if (FilterPaneState.Value.FilteredDateRange?.IsEnabled is true)
                 {
-                    <button class="button button-red" @onclick="ToggleDateFilter" type="button">
+                    <DangerButton OnClick="ToggleDateFilter">
                         <i class="bi bi-dash-circle"></i> Disable
-                    </button>
+                    </DangerButton>
                 }
                 else
                 {
-                    <button class="button button-green" @onclick="ToggleDateFilter" type="button">
+                    <PrimaryButton OnClick="ToggleDateFilter">
                         <i class="bi bi-plus-circle"></i> Enable
-                    </button>
+                    </PrimaryButton>
                 }
             }
         </EditForm>
@@ -242,17 +235,15 @@
                     </ValueSelect>
                 </span>
 
-                <button class="button button-green" disabled="@(SelectedFilterSetId == default)" @onclick="ApplyFilterSetSelection" type="button">
+                <PrimaryButton Disabled="@(SelectedFilterSetId == default)" OnClick="ApplyFilterSetSelection">
                     <i class="bi bi-check-circle"></i> Apply
-                </button>
+                </PrimaryButton>
 
-                <button aria-label="Replace filters with selected filter set"
-                    class="button"
-                    disabled="@(SelectedFilterSetId == default)"
-                    @onclick="ReplaceFilterSetSelection"
-                    type="button">
+                <Button aria-label="Replace filters with selected filter set"
+                    Disabled="@(SelectedFilterSetId == default)"
+                    OnClick="ReplaceFilterSetSelection">
                     <i class="bi bi-arrow-repeat"></i> Replace
-                </button>
+                </Button>
             }
             else
             {
@@ -270,9 +261,9 @@
                 </span>
             }
 
-            <button class="button button-red" @onclick="CancelFilterSetPicker" type="button">
+            <DangerButton OnClick="CancelFilterSetPicker">
                 <i class="bi bi-dash-circle"></i> Cancel
-            </button>
+            </DangerButton>
         </div>
     }
 
@@ -318,26 +309,24 @@
                     </ValueSelect>
                 </span>
 
-                <button class="button button-green" disabled="@(ResolvedScenario is null)" @onclick="ApplyScenarioSelection" type="button">
+                <PrimaryButton Disabled="@(ResolvedScenario is null)" OnClick="ApplyScenarioSelection">
                     <i class="bi bi-check-circle"></i> Apply
-                </button>
+                </PrimaryButton>
 
-                <button aria-label="Replace filters with selected scenario"
-                    class="button"
-                    disabled="@(ResolvedScenario is null)"
-                    @onclick="ReplaceScenarioSelection"
-                    type="button">
+                <Button aria-label="Replace filters with selected scenario"
+                    Disabled="@(ResolvedScenario is null)"
+                    OnClick="ReplaceScenarioSelection">
                     <i class="bi bi-arrow-repeat"></i> Replace
-                </button>
+                </Button>
             }
             else
             {
                 <span class="filter-empty-state" role="status">No scenarios match the loaded logs.</span>
             }
 
-            <button class="button button-red" @onclick="CancelScenarioPicker" type="button">
+            <DangerButton OnClick="CancelScenarioPicker">
                 <i class="bi bi-dash-circle"></i> Cancel
-            </button>
+            </DangerButton>
         </div>
     }
 
diff --git a/src/EventLogExpert.UI/FilterPane/FilterPane.razor.css b/src/EventLogExpert.UI/FilterPane/FilterPane.razor.css
index abf439612..a650c7c58 100644
--- a/src/EventLogExpert.UI/FilterPane/FilterPane.razor.css
+++ b/src/EventLogExpert.UI/FilterPane/FilterPane.razor.css
@@ -60,12 +60,12 @@
     text-align: center;
 }
 
-.icon-button:disabled {
+.filter-header-secondary ::deep .icon-button:disabled {
     opacity: 0.5;
     cursor: not-allowed;
 }
 
-.icon-button:disabled:hover { filter: none; }
+.filter-header-secondary ::deep .icon-button:disabled:hover { filter: none; }
 
 .filter-empty-state {
     color: var(--text-secondary);
diff --git a/src/EventLogExpert.UI/Inputs/Button.cs b/src/EventLogExpert.UI/Inputs/Button.cs
new file mode 100644
index 000000000..8a84577f2
--- /dev/null
+++ b/src/EventLogExpert.UI/Inputs/Button.cs
@@ -0,0 +1,9 @@
+// // Copyright (c) Microsoft Corporation.
+// // Licensed under the MIT License.
+
+namespace EventLogExpert.UI.Inputs;
+
+public sealed class Button : ButtonBase
+{
+    protected override string? VariantClass => null;
+}
diff --git a/src/EventLogExpert.UI/Inputs/ButtonBase.cs b/src/EventLogExpert.UI/Inputs/ButtonBase.cs
new file mode 100644
index 000000000..a8a64948a
--- /dev/null
+++ b/src/EventLogExpert.UI/Inputs/ButtonBase.cs
@@ -0,0 +1,75 @@
+// // Copyright (c) Microsoft Corporation.
+// // Licensed under the MIT License.
+
+using Microsoft.AspNetCore.Components;
+using Microsoft.AspNetCore.Components.Rendering;
+
+namespace EventLogExpert.UI.Inputs;
+
+public abstract class ButtonBase : ComponentBase
+{
+    private ElementReference _element;
+
+    [Parameter(CaptureUnmatchedValues = true)]
+    public IReadOnlyDictionary<string, object>? AdditionalAttributes { get; set; }
+
+    [Parameter] public RenderFragment? ChildContent { get; set; }
+
+    [Parameter] public string CssClass { get; set; } = string.Empty;
+
+    [Parameter] public bool Disabled { get; set; }
+
+    public ElementReference Element => _element;
+
+    [Parameter] public string? IconClass { get; set; }
+
+    [Parameter] public bool IconOnly { get; set; }
+
+    [Parameter] public EventCallback OnClick { get; set; }
+
+    [Parameter] public string Type { get; set; } = "button";
+
+    protected abstract string? VariantClass { get; }
+
+    public ValueTask FocusAsync(bool preventScroll = false) => _element.FocusAsync(preventScroll);
+
+    protected override void BuildRenderTree(RenderTreeBuilder builder)
+    {
+        builder.OpenElement(0, "button");
+
+        if (AdditionalAttributes is not null)
+        {
+            builder.AddMultipleAttributes(1, AdditionalAttributes);
+        }
+
+        builder.AddAttribute(2, "type", Type);
+        builder.AddAttribute(3, "class", BuildCssClass());
+        builder.AddAttribute(4, "disabled", Disabled);
+        builder.AddAttribute(5, "onclick", OnClick);
+        builder.AddElementReferenceCapture(6, capturedRef => _element = capturedRef);
+
+        if (!string.IsNullOrWhiteSpace(IconClass))
+        {
+            builder.OpenElement(7, "i");
+            builder.AddAttribute(8, "aria-hidden", "true");
+            builder.AddAttribute(9, "class", IconClass);
+            builder.CloseElement();
+        }
+
+        builder.AddContent(10, ChildContent);
+        builder.CloseElement();
+    }
+
+    private string BuildCssClass()
+    {
+        var classes = new List<string>(4) { "button" };
+
+        if (!string.IsNullOrWhiteSpace(VariantClass)) { classes.Add(VariantClass); }
+
+        if (IconOnly) { classes.Add("icon-button"); }
+
+        if (!string.IsNullOrWhiteSpace(CssClass)) { classes.Add(CssClass); }
+
+        return string.Join(' ', classes);
+    }
+}
diff --git a/src/EventLogExpert.UI/Inputs/DangerButton.cs b/src/EventLogExpert.UI/Inputs/DangerButton.cs
new file mode 100644
index 000000000..fd78d6883
--- /dev/null
+++ b/src/EventLogExpert.UI/Inputs/DangerButton.cs
@@ -0,0 +1,9 @@
+// // Copyright (c) Microsoft Corporation.
+// // Licensed under the MIT License.
+
+namespace EventLogExpert.UI.Inputs;
+
+public sealed class DangerButton : ButtonBase
+{
+    protected override string VariantClass => "button-red";
+}
diff --git a/src/EventLogExpert.UI/Inputs/PrimaryButton.cs b/src/EventLogExpert.UI/Inputs/PrimaryButton.cs
new file mode 100644
index 000000000..5e64505db
--- /dev/null
+++ b/src/EventLogExpert.UI/Inputs/PrimaryButton.cs
@@ -0,0 +1,9 @@
+// // Copyright (c) Microsoft Corporation.
+// // Licensed under the MIT License.
+
+namespace EventLogExpert.UI.Inputs;
+
+public sealed class PrimaryButton : ButtonBase
+{
+    protected override string VariantClass => "button-green";
+}
diff --git a/src/EventLogExpert.UI/Inputs/WarningButton.cs b/src/EventLogExpert.UI/Inputs/WarningButton.cs
new file mode 100644
index 000000000..d547339b8
--- /dev/null
+++ b/src/EventLogExpert.UI/Inputs/WarningButton.cs
@@ -0,0 +1,9 @@
+// // Copyright (c) Microsoft Corporation.
+// // Licensed under the MIT License.
+
+namespace EventLogExpert.UI.Inputs;
+
+public sealed class WarningButton : ButtonBase
+{
+    protected override string VariantClass => "button-yellow";
+}
diff --git a/src/EventLogExpert.UI/Modal/ModalChrome.razor b/src/EventLogExpert.UI/Modal/ModalChrome.razor
index f823c01ec..1e0fd9df4 100644
--- a/src/EventLogExpert.UI/Modal/ModalChrome.razor
+++ b/src/EventLogExpert.UI/Modal/ModalChrome.razor
@@ -22,13 +22,11 @@
 
                 @if (ShowCloseButton)
                 {
-                    <button aria-label="@(string.IsNullOrEmpty(CloseButtonAriaLabel) ? "Close" : CloseButtonAriaLabel)"
-                        class="button dialog-close"
-                        disabled="@HasInlineAlert"
-                        @onclick="HandleCloseButtonAsync"
-                        type="button">
-                        <i aria-hidden="true" class="bi bi-x"></i>
-                    </button>
+                    <Button aria-label="@(string.IsNullOrEmpty(CloseButtonAriaLabel) ? "Close" : CloseButtonAriaLabel)"
+                        CssClass="dialog-close"
+                        Disabled="@HasInlineAlert"
+                        IconClass="bi bi-x"
+                        OnClick="HandleCloseButtonAsync" />
                 }
             </header>
         }
@@ -48,81 +46,68 @@
             @switch (Footer)
             {
                 case FooterPreset.CloseOnly:
-                    <button autofocus
-                        class="button"
-                        disabled="@(HasInlineAlert || FooterDisabled)"
-                        @onclick="HandleCloseButtonAsync"
-                        type="button">
+                    <Button autofocus
+                        Disabled="@(HasInlineAlert || FooterDisabled)"
+                        OnClick="HandleCloseButtonAsync">
                         @CloseLabel
-                    </button>
+                    </Button>
+
                     break;
 
                 case FooterPreset.SaveCancel:
                     <div class="button-group">
-                        <button class="button button-green"
-                            disabled="@(HasInlineAlert || FooterDisabled)"
-                            @onclick="HandleSaveAsync"
-                            type="button">
+                        <PrimaryButton Disabled="@(HasInlineAlert || FooterDisabled)"
+                            OnClick="HandleSaveAsync">
                             @SaveLabel
-                        </button>
-                        <button class="button"
-                            disabled="@(HasInlineAlert || FooterDisabled)"
-                            @onclick="HandleCancelButtonAsync"
-                            type="button">
+                        </PrimaryButton>
+                        <Button Disabled="@(HasInlineAlert || FooterDisabled)"
+                            OnClick="HandleCancelButtonAsync">
                             @CancelLabel
-                        </button>
+                        </Button>
                     </div>
                     break;
 
                 case FooterPreset.ImportExportClose:
                     <div class="button-group">
-                        <button class="button"
-                            disabled="@(HasInlineAlert || FooterDisabled)"
-                            @onclick="HandleImportAsync"
-                            type="button">
+                        <Button Disabled="@(HasInlineAlert || FooterDisabled)"
+                            OnClick="HandleImportAsync">
                             @ImportLabel
-                        </button>
-                        <button class="button"
-                            disabled="@(HasInlineAlert || FooterDisabled)"
-                            @onclick="HandleExportAsync"
-                            type="button">
+                        </Button>
+                        <Button Disabled="@(HasInlineAlert || FooterDisabled)"
+                            OnClick="HandleExportAsync">
                             @ExportLabel
-                        </button>
+                        </Button>
                     </div>
 
-                    <button autofocus
-                        class="button"
-                        disabled="@(HasInlineAlert || FooterDisabled)"
-                        @onclick="HandleCloseButtonAsync"
-                        type="button">
+                    <Button autofocus
+                        Disabled="@(HasInlineAlert || FooterDisabled)"
+                        OnClick="HandleCloseButtonAsync">
                         @CloseLabel
-                    </button>
+                    </Button>
+
                     break;
 
                 case FooterPreset.Dismiss:
-                    <button autofocus
-                        class="button"
-                        disabled="@(HasInlineAlert || FooterDisabled)"
-                        @onclick="HandleAcceptAsync"
-                        type="button">
+                    <Button autofocus
+                        Disabled="@(HasInlineAlert || FooterDisabled)"
+                        OnClick="HandleAcceptAsync">
                         @AcceptLabel
-                    </button>
+                    </Button>
+
                     break;
 
                 case FooterPreset.AcceptCancel:
-                    <button autofocus
-                        class="button button-green"
-                        disabled="@(HasInlineAlert || FooterDisabled || AcceptDisabled)"
-                        @onclick="HandleAcceptAsync"
-                        type="button">
+                    <PrimaryButton autofocus
+                        Disabled="@(HasInlineAlert || FooterDisabled || AcceptDisabled)"
+                        OnClick="HandleAcceptAsync">
                         @AcceptLabel
-                    </button>
-                    <button class="button"
-                        disabled="@(HasInlineAlert || FooterDisabled)"
-                        @onclick="HandleCancelButtonAsync"
-                        type="button">
+                    </PrimaryButton>
+
+                    <Button Disabled="@(HasInlineAlert || FooterDisabled)"
+                        OnClick="HandleCancelButtonAsync">
                         @CancelLabel
-                    </button>
+                    </Button>
+
                     break;
 
                 case FooterPreset.None:
@@ -172,22 +157,18 @@
             <div class="inline-alert-buttons">
                 @if (!string.IsNullOrEmpty(InlineAlert.AcceptLabel))
                 {
-                    <button autofocus="@(!InlineAlert.IsPrompt)"
-                        class="button button-green"
-                        disabled="@(ValidationError is not null)"
-                        @onclick="HandleInlineAlertAcceptAsync"
-                        @ref="_inlineAlertAcceptButtonRef"
-                        type="button">
+                    <PrimaryButton autofocus="@(!InlineAlert.IsPrompt)"
+                        Disabled="@(ValidationError is not null)"
+                        OnClick="HandleInlineAlertAcceptAsync"
+                        @ref="_inlineAlertAcceptButton">
                         @InlineAlert.AcceptLabel
-                    </button>
+                    </PrimaryButton>
                 }
-                <button autofocus="@(string.IsNullOrEmpty(InlineAlert.AcceptLabel))"
-                    class="button"
-                    @onclick="HandleInlineAlertCancelAsync"
-                    @ref="_inlineAlertCancelButtonRef"
-                    type="button">
+                <Button autofocus="@(string.IsNullOrEmpty(InlineAlert.AcceptLabel))"
+                    OnClick="HandleInlineAlertCancelAsync"
+                    @ref="_inlineAlertCancelButton">
                     @InlineAlert.CancelLabel
-                </button>
+                </Button>
             </div>
         </section>
     }
diff --git a/src/EventLogExpert.UI/Modal/ModalChrome.razor.cs b/src/EventLogExpert.UI/Modal/ModalChrome.razor.cs
index 41022459c..371f1b218 100644
--- a/src/EventLogExpert.UI/Modal/ModalChrome.razor.cs
+++ b/src/EventLogExpert.UI/Modal/ModalChrome.razor.cs
@@ -19,8 +19,8 @@ public sealed partial class ModalChrome : ComponentBase, IAsyncDisposable
     private readonly string _titleId = ComponentId.NewUnique("modal-title").Value;
 
     private ElementReference _dialogRef;
-    private ElementReference _inlineAlertAcceptButtonRef;
-    private ElementReference _inlineAlertCancelButtonRef;
+    private PrimaryButton? _inlineAlertAcceptButton;
+    private Button? _inlineAlertCancelButton;
     private InlineAlertRequest? _inlineAlertInitializedFor;
     private TextInput? _inlineAlertInput;
     private string _inlineAlertPromptValue = string.Empty;
@@ -228,12 +228,12 @@ private async Task FocusInlineAlertElementAsync()
 
             if (!string.IsNullOrEmpty(InlineAlert.AcceptLabel))
             {
-                await _inlineAlertAcceptButtonRef.FocusAsync(true);
+                await (_inlineAlertAcceptButton?.FocusAsync(true) ?? ValueTask.CompletedTask);
 
                 return;
             }
 
-            await _inlineAlertCancelButtonRef.FocusAsync(true);
+            await (_inlineAlertCancelButton?.FocusAsync(true) ?? ValueTask.CompletedTask);
         }
         catch
         {
diff --git a/src/EventLogExpert.UI/Modal/ModalChrome.razor.css b/src/EventLogExpert.UI/Modal/ModalChrome.razor.css
index 6924bbe9b..0c5673b7b 100644
--- a/src/EventLogExpert.UI/Modal/ModalChrome.razor.css
+++ b/src/EventLogExpert.UI/Modal/ModalChrome.razor.css
@@ -47,7 +47,7 @@ dialog:not(:modal) {
     color: var(--clr-lightblue);
 }
 
-.dialog-close {
+::deep .dialog-close {
     padding: 0 .5rem;
 
     line-height: 1;
diff --git a/src/EventLogExpert.UI/wwwroot/app.css b/src/EventLogExpert.UI/wwwroot/app.css
index 09660239a..1ab7306e3 100644
--- a/src/EventLogExpert.UI/wwwroot/app.css
+++ b/src/EventLogExpert.UI/wwwroot/app.css
@@ -352,6 +352,21 @@ input[type="text"].input.dialog-input { padding: .25rem 0; }
 
 .button.fixed-width { width: 11ch; }
 
+.button.library-saved-tab-new-button {
+    width: 100%;
+    height: var(--control-height);
+    padding: 0 .5rem;
+    text-align: left;
+    border: 1px solid var(--clr-statusbar);
+    border-radius: .25rem;
+    color: var(--text-primary);
+    background: transparent;
+}
+
+.button.library-saved-tab-new-button:hover {
+    background: color-mix(in srgb, var(--clr-statusbar) 10%, transparent);
+}
+
 /* Compact icon-only buttons. Maintain WCAG 2.5.5 AA 24x24 hit target. */
 .button.icon-button {
     display: inline-flex;
diff --git a/tests/Unit/EventLogExpert.UI.Tests/Inputs/ButtonTests.cs b/tests/Unit/EventLogExpert.UI.Tests/Inputs/ButtonTests.cs
new file mode 100644
index 000000000..4a79fe695
--- /dev/null
+++ b/tests/Unit/EventLogExpert.UI.Tests/Inputs/ButtonTests.cs
@@ -0,0 +1,206 @@
+// // Copyright (c) Microsoft Corporation.
+// // Licensed under the MIT License.
+
+using Bunit;
+using EventLogExpert.UI.Inputs;
+using Microsoft.AspNetCore.Components.Web;
+
+namespace EventLogExpert.UI.Tests.Inputs;
+
+public sealed class ButtonTests : BunitContext
+{
+    [Fact]
+    public async Task Click_InvokesOnClick()
+    {
+        bool invoked = false;
+        var component = Render<Button>(parameters => parameters
+            .Add(p => p.OnClick, () => invoked = true));
+
+        await component.Find("button").ClickAsync(new MouseEventArgs());
+
+        Assert.True(invoked);
+    }
+
+    [Fact]
+    public void Render_AdditionalAttributes_SplattedToButton()
+    {
+        var component = Render<Button>(parameters => parameters
+            .AddUnmatched("id", "apply-button")
+            .AddUnmatched("aria-label", "Apply filter")
+            .AddUnmatched("aria-pressed", "true")
+            .AddUnmatched("data-state", "active"));
+
+        var button = component.Find("button");
+        Assert.Equal("apply-button", button.GetAttribute("id"));
+        Assert.Equal("Apply filter", button.GetAttribute("aria-label"));
+        Assert.Equal("true", button.GetAttribute("aria-pressed"));
+        Assert.Equal("active", button.GetAttribute("data-state"));
+    }
+
+    [Fact]
+    public void Render_ChildContent_RenderedInsideButton()
+    {
+        var component = Render<Button>(parameters => parameters
+            .AddChildContent("Apply"));
+
+        var button = component.Find("button");
+        Assert.Contains("Apply", button.TextContent);
+    }
+
+    [Fact]
+    public void Render_CssClass_AppendedAfterBaseAndVariant()
+    {
+        var component = Render<PrimaryButton>(parameters => parameters
+            .Add(p => p.CssClass, "banner-cycle-prev"));
+
+        var button = component.Find("button");
+        Assert.Contains("button", button.ClassList);
+        Assert.Contains("button-green", button.ClassList);
+        Assert.Contains("banner-cycle-prev", button.ClassList);
+    }
+
+    [Fact]
+    public void Render_DangerButton_HasButtonRedClass()
+    {
+        var component = Render<DangerButton>();
+
+        var button = component.Find("button");
+        Assert.Contains("button", button.ClassList);
+        Assert.Contains("button-red", button.ClassList);
+    }
+
+    [Fact]
+    public void Render_Default_EmitsNativeButtonWithBaseClass()
+    {
+        var component = Render<Button>();
+
+        var button = component.Find("button");
+        Assert.Equal("button", button.GetAttribute("class"));
+    }
+
+    [Fact]
+    public void Render_Default_TypeIsButton()
+    {
+        var component = Render<Button>();
+
+        var button = component.Find("button");
+        Assert.Equal("button", button.GetAttribute("type"));
+    }
+
+    [Fact]
+    public void Render_DisabledFalse_ButtonNotDisabled()
+    {
+        var component = Render<Button>(parameters => parameters
+            .Add(p => p.Disabled, false));
+
+        var button = component.Find("button");
+        Assert.False(button.HasAttribute("disabled"));
+    }
+
+    [Fact]
+    public void Render_DisabledTrue_ButtonDisabled()
+    {
+        var component = Render<Button>(parameters => parameters
+            .Add(p => p.Disabled, true));
+
+        var button = component.Find("button");
+        Assert.True(button.HasAttribute("disabled"));
+    }
+
+    [Fact]
+    public void Render_IconAndChildContent_BothRenderedInOrder()
+    {
+        var component = Render<PrimaryButton>(parameters => parameters
+            .Add(p => p.IconClass, "bi bi-check-circle")
+            .AddChildContent("Apply"));
+
+        var button = component.Find("button");
+        Assert.NotNull(button.QuerySelector("i.bi-check-circle"));
+        Assert.Contains("Apply", button.TextContent);
+    }
+
+    [Fact]
+    public void Render_IconClass_RendersIconWithAriaHidden()
+    {
+        var component = Render<Button>(parameters => parameters
+            .Add(p => p.IconClass, "bi bi-check-circle"));
+
+        var icon = component.Find("button > i");
+        Assert.Equal("bi bi-check-circle", icon.GetAttribute("class"));
+        Assert.Equal("true", icon.GetAttribute("aria-hidden"));
+    }
+
+    [Fact]
+    public void Render_IconOnly_AddsIconButtonClass()
+    {
+        var component = Render<Button>(parameters => parameters
+            .Add(p => p.IconOnly, true));
+
+        var button = component.Find("button");
+        Assert.Contains("icon-button", button.ClassList);
+    }
+
+    [Fact]
+    public void Render_NoIconClass_OmitsIconElement()
+    {
+        var component = Render<Button>(parameters => parameters
+            .AddChildContent("Apply"));
+
+        Assert.Empty(component.FindAll("button > i"));
+    }
+
+    [Fact]
+    public void Render_PrimaryButton_HasButtonGreenClass()
+    {
+        var component = Render<PrimaryButton>();
+
+        var button = component.Find("button");
+        Assert.Contains("button", button.ClassList);
+        Assert.Contains("button-green", button.ClassList);
+    }
+
+    [Theory]
+    [InlineData(true)]
+    [InlineData(false)]
+    public void Render_SplattedAutofocusBool_MatchesNativeBehavior(bool autofocus)
+    {
+        var component = Render<Button>(parameters => parameters
+            .AddUnmatched("autofocus", autofocus));
+
+        var button = component.Find("button");
+        Assert.Equal(autofocus, button.HasAttribute("autofocus"));
+    }
+
+    [Fact]
+    public void Render_SplattedClass_DoesNotOverrideComponentClass()
+    {
+        var component = Render<Button>(parameters => parameters
+            .Add(p => p.CssClass, "custom")
+            .AddUnmatched("class", "injected"));
+
+        var button = component.Find("button");
+        Assert.Contains("button", button.ClassList);
+        Assert.Contains("custom", button.ClassList);
+        Assert.DoesNotContain("injected", button.ClassList);
+    }
+
+    [Fact]
+    public void Render_TypeOverride_AppliesType()
+    {
+        var component = Render<Button>(parameters => parameters
+            .Add(p => p.Type, "submit"));
+
+        var button = component.Find("button");
+        Assert.Equal("submit", button.GetAttribute("type"));
+    }
+
+    [Fact]
+    public void Render_WarningButton_HasButtonYellowClass()
+    {
+        var component = Render<WarningButton>();
+
+        var button = component.Find("button");
+        Assert.Contains("button", button.ClassList);
+        Assert.Contains("button-yellow", button.ClassList);
+    }
+}

From 2f6a3c9ddcf5e53b0729aef9f93ed2e8d6a0abc5 Mon Sep 17 00:00:00 2001
From: jschick04 <jschick04@gmail.com>
Date: Fri, 19 Jun 2026 10:22:27 -0500
Subject: [PATCH 02/40] Route focus restoration through
 ElementFocus.SafelyAsync to drop duplicated catch blocks

---
 .../Database/DatabaseEntryRow.razor.cs        |  9 +--
 .../Tabs/ManageDatabasesTab.razor.cs          | 75 ++++++-------------
 src/EventLogExpert.UI/Focus/ElementFocus.cs   |  8 +-
 3 files changed, 28 insertions(+), 64 deletions(-)

diff --git a/src/EventLogExpert.UI/Database/DatabaseEntryRow.razor.cs b/src/EventLogExpert.UI/Database/DatabaseEntryRow.razor.cs
index c3d076155..541ae09dc 100644
--- a/src/EventLogExpert.UI/Database/DatabaseEntryRow.razor.cs
+++ b/src/EventLogExpert.UI/Database/DatabaseEntryRow.razor.cs
@@ -7,9 +7,9 @@
 using EventLogExpert.Runtime.Database.Upgrade;
 using EventLogExpert.Runtime.Menu;
 using EventLogExpert.UI.Common;
+using EventLogExpert.UI.Focus;
 using Microsoft.AspNetCore.Components;
 using Microsoft.AspNetCore.Components.Web;
-using Microsoft.JSInterop;
 
 namespace EventLogExpert.UI.Database;
 
@@ -110,7 +110,7 @@ UpgradeProgress is null &&
 
     [Inject] private ITraceLogger TraceLogger { get; init; } = null!;
 
-    public ValueTask FocusNameAsync() => _nameButtonRef.FocusAsync(preventScroll: true);
+    public ValueTask FocusNameAsync() => ElementFocus.SafelyAsync(_nameButtonRef, preventScroll: true);
 
     protected override async Task OnAfterRenderAsync(bool firstRender)
     {
@@ -118,10 +118,7 @@ protected override async Task OnAfterRenderAsync(bool firstRender)
 
         _shouldFocusNameAfterRender = false;
 
-        try { await _nameButtonRef.FocusAsync(preventScroll: true); }
-        catch (ObjectDisposedException) { }
-        catch (JSDisconnectedException) { }
-        catch (JSException) { }
+        await FocusNameAsync();
     }
 
     private static string PhaseVerb(UpgradePhase phase) => phase switch
diff --git a/src/EventLogExpert.UI/DatabaseTools/Tabs/ManageDatabasesTab.razor.cs b/src/EventLogExpert.UI/DatabaseTools/Tabs/ManageDatabasesTab.razor.cs
index d4c23cc84..6ccf3d5b5 100644
--- a/src/EventLogExpert.UI/DatabaseTools/Tabs/ManageDatabasesTab.razor.cs
+++ b/src/EventLogExpert.UI/DatabaseTools/Tabs/ManageDatabasesTab.razor.cs
@@ -10,9 +10,9 @@
 using EventLogExpert.Runtime.EventLog;
 using EventLogExpert.UI.Common;
 using EventLogExpert.UI.Database;
+using EventLogExpert.UI.Focus;
 using EventLogExpert.UI.Inputs;
 using Microsoft.AspNetCore.Components;
-using Microsoft.JSInterop;
 using System.Collections.Immutable;
 using System.Text;
 
@@ -127,11 +127,7 @@ public async Task ExitSelectionModeWithFocusAsync()
         ExitSelectionMode();
         StateHasChanged();
 
-        try { await (_selectButton?.FocusAsync(preventScroll: true) ?? ValueTask.CompletedTask); }
-        catch (ObjectDisposedException) { }
-        catch (JSDisconnectedException) { }
-        catch (JSException) { }
-        catch (TaskCanceledException) { }
+        await FocusRestoreAsync(_selectButton);
     }
 
     /// <summary>
@@ -176,22 +172,16 @@ protected override async Task OnAfterRenderAsync(bool firstRender)
         {
             _focusRestorationTarget = null;
 
-            try
+            await (target.Target switch
             {
-                await (target.Target switch
-                {
-                    FocusTarget.SameRowName when !string.IsNullOrEmpty(target.FileName) =>
-                        FocusEntryRowNameAsync(target.FileName),
-                    FocusTarget.BulkRemoveButton when HasBulkSelection =>
-                        _bulkRemoveButton?.FocusAsync(preventScroll: true) ?? ValueTask.CompletedTask,
-                    FocusTarget.ImportButton =>
-                        _importButton?.FocusAsync(preventScroll: true) ?? ValueTask.CompletedTask,
-                    _ => ValueTask.CompletedTask
-                });
-            }
-            catch (ObjectDisposedException) { }
-            catch (JSDisconnectedException) { }
-            catch (JSException) { }
+                FocusTarget.SameRowName when !string.IsNullOrEmpty(target.FileName) =>
+                    FocusEntryRowNameAsync(target.FileName),
+                FocusTarget.BulkRemoveButton when HasBulkSelection =>
+                    FocusRestoreAsync(_bulkRemoveButton),
+                FocusTarget.ImportButton =>
+                    FocusRestoreAsync(_importButton),
+                _ => ValueTask.CompletedTask
+            });
         }
 
         await base.OnAfterRenderAsync(firstRender);
@@ -223,6 +213,9 @@ private static string BuildBulkPlainMessage(IReadOnlyList<string> fileNames)
         return $"Are you sure you want to remove these {fileNames.Count} databases? ({list}{more})";
     }
 
+    private static ValueTask FocusRestoreAsync(ButtonBase? button) =>
+        button != null ? ElementFocus.SafelyAsync(button.Element, preventScroll: true) : ValueTask.CompletedTask;
+
     private static string GetSkipReason(DatabaseEntry entry, bool isUpgrading)
     {
         if (entry.BackupExists) { return "Restore from backup required"; }
@@ -557,49 +550,31 @@ private async Task FocusAfterBulkUpgradeAsync()
         // button so keyboard users have a stable anchor.
         if (!_isSelectionModeActive)
         {
-            try { await (_selectButton?.FocusAsync(preventScroll: true) ?? ValueTask.CompletedTask); }
-            catch (ObjectDisposedException) { }
-            catch (JSDisconnectedException) { }
-            catch (JSException) { }
-            catch (TaskCanceledException) { }
+            await FocusRestoreAsync(_selectButton);
 
             return;
         }
 
         if (_selectedForBulk.Count > 0)
         {
-            try { await _masterCheckboxRef.FocusAsync(preventScroll: true); }
-            catch (ObjectDisposedException) { }
-            catch (JSDisconnectedException) { }
-            catch (JSException) { }
-            catch (TaskCanceledException) { }
+            await ElementFocus.SafelyAsync(_masterCheckboxRef, preventScroll: true);
 
             return;
         }
 
-        try { await (_selectButton?.FocusAsync(preventScroll: true) ?? ValueTask.CompletedTask); }
-        catch (ObjectDisposedException) { }
-        catch (JSDisconnectedException) { }
-        catch (JSException) { }
-        catch (TaskCanceledException) { }
+        await FocusRestoreAsync(_selectButton);
     }
 
     private async ValueTask FocusEntryRowNameAsync(string fileName)
     {
         if (_rowRefs.TryGetValue(fileName, out var rowRef) && rowRef is not null)
         {
-            try { await rowRef.FocusNameAsync(); }
-            catch (ObjectDisposedException) { }
-            catch (JSDisconnectedException) { }
-            catch (JSException) { }
+            await rowRef.FocusNameAsync();
 
             return;
         }
 
-        try { await (_importButton?.FocusAsync(preventScroll: true) ?? ValueTask.CompletedTask); }
-        catch (ObjectDisposedException) { }
-        catch (JSDisconnectedException) { }
-        catch (JSException) { }
+        await FocusRestoreAsync(_importButton);
     }
 
     // Lookup by batch membership (active + queued) for the cancel-then-remove flow. Distinct from
@@ -783,11 +758,7 @@ private async Task OnBulkUpgradeClickAsync()
             {
                 if (_disposed) { return; }
 
-                try { await (_bulkUpgradeButton?.FocusAsync(preventScroll: true) ?? ValueTask.CompletedTask); }
-                catch (ObjectDisposedException) { }
-                catch (JSDisconnectedException) { }
-                catch (JSException) { }
-                catch (TaskCanceledException) { }
+                await FocusRestoreAsync(_bulkUpgradeButton);
 
                 return;
             }
@@ -887,11 +858,7 @@ private async Task OnMasterCheckboxClickAsync()
             SelectAll();
         }
 
-        try { await _masterCheckboxRef.FocusAsync(preventScroll: true); }
-        catch (ObjectDisposedException) { }
-        catch (JSDisconnectedException) { }
-        catch (JSException) { }
-        catch (TaskCanceledException) { }
+        await ElementFocus.SafelyAsync(_masterCheckboxRef, preventScroll: true);
     }
 
     private async Task OnSaveClickAsync()
diff --git a/src/EventLogExpert.UI/Focus/ElementFocus.cs b/src/EventLogExpert.UI/Focus/ElementFocus.cs
index 1a9caded6..a3cf07b18 100644
--- a/src/EventLogExpert.UI/Focus/ElementFocus.cs
+++ b/src/EventLogExpert.UI/Focus/ElementFocus.cs
@@ -8,11 +8,11 @@ namespace EventLogExpert.UI.Focus;
 
 internal static class ElementFocus
 {
-    public static async ValueTask SafelyAsync(ElementReference target)
+    public static async ValueTask SafelyAsync(ElementReference target, bool preventScroll = false)
     {
         try
         {
-            await target.FocusAsync();
+            await target.FocusAsync(preventScroll);
         }
         catch (ObjectDisposedException) { }
         catch (JSDisconnectedException) { }
@@ -20,11 +20,11 @@ public static async ValueTask SafelyAsync(ElementReference target)
         catch (TaskCanceledException) { }
     }
 
-    public static async ValueTask<bool> TrySafelyAsync(ElementReference target)
+    public static async ValueTask<bool> TrySafelyAsync(ElementReference target, bool preventScroll = false)
     {
         try
         {
-            await target.FocusAsync();
+            await target.FocusAsync(preventScroll);
 
             return true;
         }

From 69b16fa3a0caa65c938493e2fe7d5b51646dfe38 Mon Sep 17 00:00:00 2001
From: jschick04 <jschick04@gmail.com>
Date: Fri, 19 Jun 2026 11:19:00 -0500
Subject: [PATCH 03/40] Anchor scoped CSS ::deep button rules to their
 component roots

---
 .../Database/DatabaseEntryRow.razor.css        |  6 +++---
 .../Tabs/ManageDatabasesTab.razor.css          |  2 +-
 .../LibraryEntryFilterEditor.razor.css         |  2 +-
 .../FilterLibrary/LibraryEntryRow.razor.css    | 18 +++++++++---------
 .../Modal/ModalChrome.razor.css                |  2 +-
 5 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/EventLogExpert.UI/Database/DatabaseEntryRow.razor.css b/src/EventLogExpert.UI/Database/DatabaseEntryRow.razor.css
index 8488f7aa0..6839afa13 100644
--- a/src/EventLogExpert.UI/Database/DatabaseEntryRow.razor.css
+++ b/src/EventLogExpert.UI/Database/DatabaseEntryRow.razor.css
@@ -91,7 +91,7 @@
     gap: .5rem;
 }
 
-::deep .db-entry-upgrade-btn {
+.db-entry-row ::deep .db-entry-upgrade-btn {
     white-space: nowrap;
 }
 
@@ -128,7 +128,7 @@
     animation: db-entry-spin 1.5s linear infinite;
 }
 
-::deep .db-entry-cancel-btn {
+.db-entry-row ::deep .db-entry-cancel-btn {
     flex: 0 0 auto;
     padding: .15rem .65rem;
 
@@ -152,7 +152,7 @@
         transition: none;
     }
 
-    ::deep .db-entry-cancel-btn {
+    .db-entry-row ::deep .db-entry-cancel-btn {
         animation: none;
         transition: none;
     }
diff --git a/src/EventLogExpert.UI/DatabaseTools/Tabs/ManageDatabasesTab.razor.css b/src/EventLogExpert.UI/DatabaseTools/Tabs/ManageDatabasesTab.razor.css
index a153488e4..341e8abe8 100644
--- a/src/EventLogExpert.UI/DatabaseTools/Tabs/ManageDatabasesTab.razor.css
+++ b/src/EventLogExpert.UI/DatabaseTools/Tabs/ManageDatabasesTab.razor.css
@@ -14,7 +14,7 @@
     padding: .5rem 1rem;
 }
 
-::deep .manage-databases-import-btn {
+.manage-databases-tab ::deep .manage-databases-import-btn {
     margin-left: auto;
 }
 
diff --git a/src/EventLogExpert.UI/FilterLibrary/LibraryEntryFilterEditor.razor.css b/src/EventLogExpert.UI/FilterLibrary/LibraryEntryFilterEditor.razor.css
index de6eb0d66..3366fd625 100644
--- a/src/EventLogExpert.UI/FilterLibrary/LibraryEntryFilterEditor.razor.css
+++ b/src/EventLogExpert.UI/FilterLibrary/LibraryEntryFilterEditor.razor.css
@@ -16,7 +16,7 @@
     font-style: italic;
 }
 
-::deep .library-entry-filter-editor-add-button {
+.library-entry-filter-editor ::deep .library-entry-filter-editor-add-button {
     align-self: flex-start;
     margin-top: .25rem;
 }
diff --git a/src/EventLogExpert.UI/FilterLibrary/LibraryEntryRow.razor.css b/src/EventLogExpert.UI/FilterLibrary/LibraryEntryRow.razor.css
index 36611ddc1..723d3fda9 100644
--- a/src/EventLogExpert.UI/FilterLibrary/LibraryEntryRow.razor.css
+++ b/src/EventLogExpert.UI/FilterLibrary/LibraryEntryRow.razor.css
@@ -22,7 +22,7 @@
     font-size: 1rem;
 }
 
-::deep .library-entry-expand-toggle {
+.library-entry ::deep .library-entry-expand-toggle {
     flex-shrink: 0;
 }
 
@@ -137,7 +137,7 @@
     outline-offset: 1px;
 }
 
-::deep .library-entry-tag-chip-more {
+.library-entry ::deep .library-entry-tag-chip-more {
     flex: 0 0 auto;
     padding: 0 .375rem;
     font-size: .75rem;
@@ -147,12 +147,12 @@
     border-radius: .2rem;
 }
 
-::deep .library-entry-tag-chip-more:hover {
+.library-entry ::deep .library-entry-tag-chip-more:hover {
     color: var(--text-primary);
     background: color-mix(in srgb, var(--text-primary) 8%, transparent);
 }
 
-::deep .library-entry-tag-add-inline {
+.library-entry ::deep .library-entry-tag-add-inline {
     display: inline-flex;
     align-items: center;
     justify-content: center;
@@ -169,23 +169,23 @@
     transition: background 120ms ease, color 120ms ease;
 }
 
-::deep .library-entry-tag-add-inline > .bi {
+.library-entry ::deep .library-entry-tag-add-inline > .bi {
     font-size: 14px;
     line-height: 1;
 }
 
-::deep .library-entry-tag-add-inline:hover,
-::deep .library-entry-tag-add-inline:focus-visible {
+.library-entry ::deep .library-entry-tag-add-inline:hover,
+.library-entry ::deep .library-entry-tag-add-inline:focus-visible {
     color: var(--clr-statusbar);
     background: color-mix(in srgb, var(--clr-statusbar) 10%, transparent);
 }
 
-::deep .library-entry-tag-add-inline:focus-visible {
+.library-entry ::deep .library-entry-tag-add-inline:focus-visible {
     outline: 2px solid var(--clr-statusbar);
     outline-offset: 1px;
 }
 
-::deep .library-entry-tags-done {
+.library-entry ::deep .library-entry-tags-done {
     padding: 0 .25rem;
     flex-shrink: 0;
 }
diff --git a/src/EventLogExpert.UI/Modal/ModalChrome.razor.css b/src/EventLogExpert.UI/Modal/ModalChrome.razor.css
index 0c5673b7b..4a2724908 100644
--- a/src/EventLogExpert.UI/Modal/ModalChrome.razor.css
+++ b/src/EventLogExpert.UI/Modal/ModalChrome.razor.css
@@ -47,7 +47,7 @@ dialog:not(:modal) {
     color: var(--clr-lightblue);
 }
 
-::deep .dialog-close {
+.dialog-header ::deep .dialog-close {
     padding: 0 .5rem;
 
     line-height: 1;

From 3e2f13e6888970aeb0f973211d91fe91ce22cef7 Mon Sep 17 00:00:00 2001
From: jschick04 <jschick04@gmail.com>
Date: Fri, 19 Jun 2026 11:54:15 -0500
Subject: [PATCH 04/40] Separate the Button icon from its label with a space
 when both are present

---
 src/EventLogExpert.UI/Inputs/ButtonBase.cs    |  7 +++++-
 .../Inputs/ButtonTests.cs                     | 22 +++++++++++++++++++
 2 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/src/EventLogExpert.UI/Inputs/ButtonBase.cs b/src/EventLogExpert.UI/Inputs/ButtonBase.cs
index a8a64948a..b10ecf388 100644
--- a/src/EventLogExpert.UI/Inputs/ButtonBase.cs
+++ b/src/EventLogExpert.UI/Inputs/ButtonBase.cs
@@ -54,9 +54,14 @@ protected override void BuildRenderTree(RenderTreeBuilder builder)
             builder.AddAttribute(8, "aria-hidden", "true");
             builder.AddAttribute(9, "class", IconClass);
             builder.CloseElement();
+
+            if (ChildContent is not null)
+            {
+                builder.AddContent(10, " ");
+            }
         }
 
-        builder.AddContent(10, ChildContent);
+        builder.AddContent(11, ChildContent);
         builder.CloseElement();
     }
 
diff --git a/tests/Unit/EventLogExpert.UI.Tests/Inputs/ButtonTests.cs b/tests/Unit/EventLogExpert.UI.Tests/Inputs/ButtonTests.cs
index 4a79fe695..90b68837a 100644
--- a/tests/Unit/EventLogExpert.UI.Tests/Inputs/ButtonTests.cs
+++ b/tests/Unit/EventLogExpert.UI.Tests/Inputs/ButtonTests.cs
@@ -119,6 +119,17 @@ public void Render_IconAndChildContent_BothRenderedInOrder()
         Assert.Contains("Apply", button.TextContent);
     }
 
+    [Fact]
+    public void Render_IconAndChildContent_SeparatedBySpace()
+    {
+        var component = Render<PrimaryButton>(parameters => parameters
+            .Add(p => p.IconClass, "bi bi-check-circle")
+            .AddChildContent("Apply"));
+
+        var button = component.Find("button");
+        Assert.Contains("</i> Apply", button.InnerHtml);
+    }
+
     [Fact]
     public void Render_IconClass_RendersIconWithAriaHidden()
     {
@@ -140,6 +151,17 @@ public void Render_IconOnly_AddsIconButtonClass()
         Assert.Contains("icon-button", button.ClassList);
     }
 
+    [Fact]
+    public void Render_IconOnly_NoTrailingSpaceAfterIcon()
+    {
+        var component = Render<Button>(parameters => parameters
+            .Add(p => p.IconClass, "bi bi-x")
+            .Add(p => p.IconOnly, true));
+
+        var button = component.Find("button");
+        Assert.DoesNotContain("</i> ", button.InnerHtml);
+    }
+
     [Fact]
     public void Render_NoIconClass_OmitsIconElement()
     {

From fec5e474e054688e8edd088c6c1608ff7b9459a2 Mon Sep 17 00:00:00 2001
From: jschick04 <jschick04@gmail.com>
Date: Fri, 19 Jun 2026 13:12:05 -0500
Subject: [PATCH 05/40] Expose MouseEventArgs on the Button OnClick callback

---
 src/EventLogExpert.UI/Inputs/ButtonBase.cs         |  3 ++-
 .../EventLogExpert.UI.Tests/Inputs/ButtonTests.cs  | 14 ++++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/EventLogExpert.UI/Inputs/ButtonBase.cs b/src/EventLogExpert.UI/Inputs/ButtonBase.cs
index b10ecf388..ee5950210 100644
--- a/src/EventLogExpert.UI/Inputs/ButtonBase.cs
+++ b/src/EventLogExpert.UI/Inputs/ButtonBase.cs
@@ -3,6 +3,7 @@
 
 using Microsoft.AspNetCore.Components;
 using Microsoft.AspNetCore.Components.Rendering;
+using Microsoft.AspNetCore.Components.Web;
 
 namespace EventLogExpert.UI.Inputs;
 
@@ -25,7 +26,7 @@ public abstract class ButtonBase : ComponentBase
 
     [Parameter] public bool IconOnly { get; set; }
 
-    [Parameter] public EventCallback OnClick { get; set; }
+    [Parameter] public EventCallback<MouseEventArgs> OnClick { get; set; }
 
     [Parameter] public string Type { get; set; } = "button";
 
diff --git a/tests/Unit/EventLogExpert.UI.Tests/Inputs/ButtonTests.cs b/tests/Unit/EventLogExpert.UI.Tests/Inputs/ButtonTests.cs
index 90b68837a..ff9a885af 100644
--- a/tests/Unit/EventLogExpert.UI.Tests/Inputs/ButtonTests.cs
+++ b/tests/Unit/EventLogExpert.UI.Tests/Inputs/ButtonTests.cs
@@ -21,6 +21,20 @@ public async Task Click_InvokesOnClick()
         Assert.True(invoked);
     }
 
+    [Fact]
+    public async Task Click_InvokesOnClickWithMouseEventArgs()
+    {
+        MouseEventArgs? received = null;
+        var component = Render<Button>(parameters => parameters
+            .Add(p => p.OnClick, e => received = e));
+
+        await component.Find("button").ClickAsync(new MouseEventArgs { Button = 1, CtrlKey = true });
+
+        Assert.NotNull(received);
+        Assert.Equal(1, received!.Button);
+        Assert.True(received.CtrlKey);
+    }
+
     [Fact]
     public void Render_AdditionalAttributes_SplattedToButton()
     {

From 127dc8dbad315c199853610acab51a39b6264cd8 Mon Sep 17 00:00:00 2001
From: jschick04 <jschick04@gmail.com>
Date: Fri, 19 Jun 2026 14:26:28 -0500
Subject: [PATCH 06/40] Normalize a blank Button Type to "button" to prevent
 accidental form submits

---
 src/EventLogExpert.UI/Inputs/ButtonBase.cs          |  2 +-
 .../EventLogExpert.UI.Tests/Inputs/ButtonTests.cs   | 13 +++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/EventLogExpert.UI/Inputs/ButtonBase.cs b/src/EventLogExpert.UI/Inputs/ButtonBase.cs
index ee5950210..69bc39281 100644
--- a/src/EventLogExpert.UI/Inputs/ButtonBase.cs
+++ b/src/EventLogExpert.UI/Inputs/ButtonBase.cs
@@ -43,7 +43,7 @@ protected override void BuildRenderTree(RenderTreeBuilder builder)
             builder.AddMultipleAttributes(1, AdditionalAttributes);
         }
 
-        builder.AddAttribute(2, "type", Type);
+        builder.AddAttribute(2, "type", string.IsNullOrWhiteSpace(Type) ? "button" : Type);
         builder.AddAttribute(3, "class", BuildCssClass());
         builder.AddAttribute(4, "disabled", Disabled);
         builder.AddAttribute(5, "onclick", OnClick);
diff --git a/tests/Unit/EventLogExpert.UI.Tests/Inputs/ButtonTests.cs b/tests/Unit/EventLogExpert.UI.Tests/Inputs/ButtonTests.cs
index ff9a885af..3ef7649b5 100644
--- a/tests/Unit/EventLogExpert.UI.Tests/Inputs/ButtonTests.cs
+++ b/tests/Unit/EventLogExpert.UI.Tests/Inputs/ButtonTests.cs
@@ -51,6 +51,19 @@ public void Render_AdditionalAttributes_SplattedToButton()
         Assert.Equal("active", button.GetAttribute("data-state"));
     }
 
+    [Theory]
+    [InlineData("")]
+    [InlineData("   ")]
+    [InlineData(null)]
+    public void Render_BlankType_DefaultsToButton(string? type)
+    {
+        var component = Render<Button>(parameters => parameters
+            .Add(p => p.Type, type!));
+
+        var button = component.Find("button");
+        Assert.Equal("button", button.GetAttribute("type"));
+    }
+
     [Fact]
     public void Render_ChildContent_RenderedInsideButton()
     {

From f71e816b478db2bfed6a026f8d22b21942c86d53 Mon Sep 17 00:00:00 2001
From: jschick04 <jschick04@gmail.com>
Date: Fri, 19 Jun 2026 15:18:40 -0500
Subject: [PATCH 07/40] Assert Button icon ordering and spacing via DOM nodes
 instead of InnerHtml

---
 tests/Unit/EventLogExpert.UI.Tests/Inputs/ButtonTests.cs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/tests/Unit/EventLogExpert.UI.Tests/Inputs/ButtonTests.cs b/tests/Unit/EventLogExpert.UI.Tests/Inputs/ButtonTests.cs
index 3ef7649b5..00ba87684 100644
--- a/tests/Unit/EventLogExpert.UI.Tests/Inputs/ButtonTests.cs
+++ b/tests/Unit/EventLogExpert.UI.Tests/Inputs/ButtonTests.cs
@@ -154,7 +154,8 @@ public void Render_IconAndChildContent_SeparatedBySpace()
             .AddChildContent("Apply"));
 
         var button = component.Find("button");
-        Assert.Contains("</i> Apply", button.InnerHtml);
+        Assert.Equal("I", button.FirstChild?.NodeName);
+        Assert.Equal(" Apply", button.TextContent);
     }
 
     [Fact]
@@ -186,7 +187,7 @@ public void Render_IconOnly_NoTrailingSpaceAfterIcon()
             .Add(p => p.IconOnly, true));
 
         var button = component.Find("button");
-        Assert.DoesNotContain("</i> ", button.InnerHtml);
+        Assert.Empty(button.TextContent);
     }
 
     [Fact]

From f7f580ac5c5d071156b46b8b7f395bffe8758881 Mon Sep 17 00:00:00 2001
From: jschick04 <jschick04@gmail.com>
Date: Fri, 19 Jun 2026 15:58:34 -0500
Subject: [PATCH 08/40] Route CriticalBanner reload-button focus through
 ElementFocus.SafelyAsync

---
 src/EventLogExpert.UI/Banner/CriticalBanner.razor.cs | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/EventLogExpert.UI/Banner/CriticalBanner.razor.cs b/src/EventLogExpert.UI/Banner/CriticalBanner.razor.cs
index 1e676a8c9..86514d79f 100644
--- a/src/EventLogExpert.UI/Banner/CriticalBanner.razor.cs
+++ b/src/EventLogExpert.UI/Banner/CriticalBanner.razor.cs
@@ -5,9 +5,9 @@
 using EventLogExpert.Runtime.Banner;
 using EventLogExpert.Runtime.Common.Clipboard;
 using EventLogExpert.Runtime.Common.Restart;
+using EventLogExpert.UI.Focus;
 using EventLogExpert.UI.Inputs;
 using Microsoft.AspNetCore.Components;
-using Microsoft.JSInterop;
 
 namespace EventLogExpert.UI.Banner;
 
@@ -39,14 +39,9 @@ public void Dispose()
 
     protected override async Task OnAfterRenderAsync(bool firstRender)
     {
-        if (firstRender)
+        if (firstRender && _reloadButton is { } reloadButton)
         {
-            try
-            {
-                await (_reloadButton?.FocusAsync() ?? ValueTask.CompletedTask);
-            }
-            catch (JSDisconnectedException) { /* Circuit gone — nothing to focus. */ }
-            catch (TaskCanceledException) { /* Focus cancelled mid-render; harmless. */ }
+            await ElementFocus.SafelyAsync(reloadButton.Element);
         }
     }
 

From 18f7fc7ee1945a54ed7559fe4b442f61bc7459df Mon Sep 17 00:00:00 2001
From: jschick04 <jschick04@gmail.com>
Date: Fri, 19 Jun 2026 19:10:18 -0500
Subject: [PATCH 09/40] Standardize icon buttons on IconClass and fix
 rotating-caret centering

---
 .../Banner/BannerCycleStateService.cs         |   8 +-
 .../Banner/CriticalBanner.razor               |  12 +-
 .../Database/DatabaseEntryRow.razor           |  12 +-
 .../Database/DatabaseEntryRow.razor.cs        |   2 +-
 .../Database/DatabaseRecoveryModal.razor.cs   |   6 +-
 .../DatabaseTools/DatabaseToolsLogView.razor  |  12 +-
 .../DatabaseTools/DatabaseToolsModal.razor.cs |   2 +-
 .../Tabs/CreateDatabaseTab.razor              |  16 +--
 .../DatabaseTools/Tabs/DiffDatabasesTab.razor |  12 +-
 .../Tabs/ManageDatabasesTab.razor             |   5 +-
 .../Tabs/ManageDatabasesTab.razor.cs          |   2 +-
 .../DatabaseTools/Tabs/MergeDatabaseTab.razor |  16 +--
 .../DatabaseTools/Tabs/ShowProvidersTab.razor |  14 +-
 .../Tabs/UpgradeDatabaseTab.razor             |  12 +-
 .../Editing/FilterEditPanel.razor             |   4 +-
 .../FilterEditor/FilterEditorCore.razor.cs    |   4 +-
 .../LibraryEntryFilterEditor.razor            |   4 +-
 .../FilterLibrary/LibraryEntryRow.razor       |   3 +-
 .../FilterLibrary/LibrarySavedTabHeader.razor |   4 +-
 .../FilterLibrary/TagManagementPanel.razor    |   3 +-
 .../FilterPane/FilterPane.razor               | 123 +++++++++---------
 .../FilterPane/FilterPane.razor.cs            |  26 ++--
 src/EventLogExpert.UI/Inputs/ButtonBase.cs    |   2 +-
 .../LogTable/LogTablePane.razor.css           |   2 -
 src/EventLogExpert.UI/Modal/ModalBase.cs      |   8 +-
 src/EventLogExpert.UI/wwwroot/app.css         |  23 +++-
 .../Inputs/ButtonTests.cs                     |   2 +-
 27 files changed, 166 insertions(+), 173 deletions(-)

diff --git a/src/EventLogExpert.UI/Banner/BannerCycleStateService.cs b/src/EventLogExpert.UI/Banner/BannerCycleStateService.cs
index 0faac79d1..4e6b5d77d 100644
--- a/src/EventLogExpert.UI/Banner/BannerCycleStateService.cs
+++ b/src/EventLogExpert.UI/Banner/BannerCycleStateService.cs
@@ -217,7 +217,7 @@ private static bool ItemMatches(BannerCycleItem selected, BannerCycleItem candid
         return selected.EntryId == candidate.EntryId;
     }
 
-    // BannerView enum is ordered for display, not priority — use this rank for comparisons.
+    // BannerView enum is ordered for display, not priority - use this rank for comparisons.
     private static int PriorityRank(BannerView view) => view switch
     {
         BannerView.Critical => 6,
@@ -257,7 +257,7 @@ private void RebuildAndReselectLocked()
         bool attentionSuppressed =
             _modalCoordinator.ActiveSession?.ComponentType == typeof(DatabaseToolsModal);
 
-        // Capture each facet snapshot once — the same data drives BuildCycle AND the fingerprint.
+        // Capture each facet snapshot once - the same data drives BuildCycle AND the fingerprint.
         var critical = _critical.CurrentCritical;
         var errors = _errors.ErrorBanners;
         var attentionEntries = _attention.AttentionEntries;
@@ -276,7 +276,7 @@ private void RebuildAndReselectLocked()
             exportProgress,
             infos);
 
-        // Fingerprint is built from the UNFILTERED source — otherwise modal close would re-introduce
+        // Fingerprint is built from the UNFILTERED source - otherwise modal close would re-introduce
         // Attention and wrongly trigger priorityOverride on every reentry.
         var currentSourceFingerprint = ComputeSourceFingerprintFromSnapshot(
             critical,
@@ -329,7 +329,7 @@ private void RebuildAndReselectLocked()
 
         // Gate user-preferred restore against a still-active priority-stolen item only. This does NOT
         // block restore when a higher-priority item that COEXISTED with the user's preference is
-        // present — only blocks against a newly-arrived steal that is still in the cycle.
+        // present - only blocks against a newly-arrived steal that is still in the cycle.
         if (_priorityStolenSelection is null
             && TryApplySelection(_userPreferredItem, items))
         {
diff --git a/src/EventLogExpert.UI/Banner/CriticalBanner.razor b/src/EventLogExpert.UI/Banner/CriticalBanner.razor
index 337de69a8..ae453e16c 100644
--- a/src/EventLogExpert.UI/Banner/CriticalBanner.razor
+++ b/src/EventLogExpert.UI/Banner/CriticalBanner.razor
@@ -2,14 +2,14 @@
     <span class="banner-message">An unexpected error occurred: @Critical.GetType().Name: @Critical.Message</span>
 
     <div class="banner-actions">
-        <Button OnClick="OnReloadClickedAsync" @ref="_reloadButton">
-            <i aria-hidden="true" class="bi bi-arrow-clockwise"></i> Reload
+        <Button IconClass="bi bi-arrow-clockwise" OnClick="OnReloadClickedAsync" @ref="_reloadButton">
+            Reload
         </Button>
-        <Button OnClick="OnRelaunchClickedAsync">
-            <i aria-hidden="true" class="bi bi-power"></i> Relaunch
+        <Button IconClass="bi bi-power" OnClick="OnRelaunchClickedAsync">
+            Relaunch
         </Button>
-        <Button OnClick="() => OnCopyDetailsClickedAsync(Critical)">
-            <i aria-hidden="true" class="bi bi-clipboard"></i> Copy details
+        <Button IconClass="bi bi-clipboard" OnClick="() => OnCopyDetailsClickedAsync(Critical)">
+            Copy details
         </Button>
     </div>
 
diff --git a/src/EventLogExpert.UI/Database/DatabaseEntryRow.razor b/src/EventLogExpert.UI/Database/DatabaseEntryRow.razor
index abae970b4..7aa096c23 100644
--- a/src/EventLogExpert.UI/Database/DatabaseEntryRow.razor
+++ b/src/EventLogExpert.UI/Database/DatabaseEntryRow.razor
@@ -76,11 +76,12 @@
                     <Button aria-label="@($"Upgrade database {Entry.FileName}")"
                         CssClass="db-entry-upgrade-btn"
                         Disabled="@IsUpgradeBlocked"
+                        IconClass="bi bi-arrow-up-circle"
                         OnClick="@(async () =>
                                  {
                                      if (!IsUpgradeBlocked) { await OnUpgrade.InvokeAsync(); }
                                  })">
-                        <i aria-hidden="true" class="bi bi-arrow-up-circle"></i> Upgrade
+                        Upgrade
                     </Button>
 
                     break;
@@ -89,11 +90,12 @@
                     <DangerButton aria-label="@($"Retry upgrade of database {Entry.FileName}")"
                         CssClass="db-entry-upgrade-btn"
                         Disabled="@IsUpgradeBlocked"
+                        IconClass="bi bi-arrow-clockwise"
                         OnClick="@(async () =>
                                  {
                                      if (!IsUpgradeBlocked) { await OnUpgrade.InvokeAsync(); }
                                  })">
-                        <i aria-hidden="true" class="bi bi-arrow-clockwise"></i> Retry Upgrade
+                        Retry Upgrade
                     </DangerButton>
 
                     break;
@@ -102,11 +104,12 @@
                     <Button aria-label="@($"Restore database {Entry.FileName} from backup")"
                         CssClass="db-entry-restore-btn"
                         Disabled="@IsRestoreBlocked"
+                        IconClass="bi bi-arrow-counterclockwise"
                         OnClick="@(async () =>
                                  {
                                      if (!IsRestoreBlocked) { await OnRestoreFromBackup.InvokeAsync(); }
                                  })">
-                        <i aria-hidden="true" class="bi bi-arrow-counterclockwise"></i> Restore
+                        Restore
                     </Button>
 
                     break;
@@ -114,8 +117,9 @@
                 case ActionKind.RetryClassification:
                     <Button aria-label="@($"Retry classification of database {Entry.FileName}")"
                         CssClass="db-entry-retry-classification-btn"
+                        IconClass="bi bi-arrow-repeat"
                         OnClick="@(async () => await OnRetryClassification.InvokeAsync())">
-                        <i aria-hidden="true" class="bi bi-arrow-repeat"></i> Retry classification
+                        Retry classification
                     </Button>
 
                     break;
diff --git a/src/EventLogExpert.UI/Database/DatabaseEntryRow.razor.cs b/src/EventLogExpert.UI/Database/DatabaseEntryRow.razor.cs
index 541ae09dc..3527f791b 100644
--- a/src/EventLogExpert.UI/Database/DatabaseEntryRow.razor.cs
+++ b/src/EventLogExpert.UI/Database/DatabaseEntryRow.razor.cs
@@ -131,7 +131,7 @@ protected override async Task OnAfterRenderAsync(bool firstRender)
 
     private void HandleContextMenu(MouseEventArgs args)
     {
-        // Suppressed in selection mode — bulk strip is the action surface.
+        // Suppressed in selection mode - bulk strip is the action surface.
         if (IsSelectionModeActive) { return; }
 
         var items = new List<MenuItem>
diff --git a/src/EventLogExpert.UI/Database/DatabaseRecoveryModal.razor.cs b/src/EventLogExpert.UI/Database/DatabaseRecoveryModal.razor.cs
index bdb038cf6..4b204a390 100644
--- a/src/EventLogExpert.UI/Database/DatabaseRecoveryModal.razor.cs
+++ b/src/EventLogExpert.UI/Database/DatabaseRecoveryModal.razor.cs
@@ -27,10 +27,10 @@ private enum RecoveryAction
 
     protected override ModalScope Scope => ModalScope.Critical;
 
-    [Inject] private IErrorBannerService ErrorBannerService { get; init; } = null!;
-
     [Inject] private IDatabaseService DatabaseService { get; init; } = null!;
 
+    [Inject] private IErrorBannerService ErrorBannerService { get; init; } = null!;
+
     [Inject] private ITraceLogger TraceLogger { get; init; } = null!;
 
     protected override async ValueTask DisposeAsyncCore(bool disposing)
@@ -115,7 +115,7 @@ private async Task ApplyAsync()
                 catch (InvalidOperationException invalidOperation)
                 {
                     TraceLogger.Warning(
-                        $"{nameof(DatabaseRecoveryModal)}: skipped '{fileName}' ({action}) — {invalidOperation.Message}");
+                        $"{nameof(DatabaseRecoveryModal)}: skipped '{fileName}' ({action}) - {invalidOperation.Message}");
                     continue;
                 }
                 catch (Exception unexpected)
diff --git a/src/EventLogExpert.UI/DatabaseTools/DatabaseToolsLogView.razor b/src/EventLogExpert.UI/DatabaseTools/DatabaseToolsLogView.razor
index 988bcf102..799b3949b 100644
--- a/src/EventLogExpert.UI/DatabaseTools/DatabaseToolsLogView.razor
+++ b/src/EventLogExpert.UI/DatabaseTools/DatabaseToolsLogView.razor
@@ -17,18 +17,18 @@
         }
 
         <div class="toolbar-trailing">
-            <Button Disabled="@(Entries.Count == 0)" OnClick="CopyAllAsync">
-                <i aria-hidden="true" class="bi bi-clipboard"></i> Copy
+            <Button Disabled="@(Entries.Count == 0)" IconClass="bi bi-clipboard" OnClick="CopyAllAsync">
+                Copy
             </Button>
 
-            <Button Disabled="@(Entries.Count == 0)" OnClick="ExportAsync">
-                <i aria-hidden="true" class="bi bi-download"></i> Export
+            <Button Disabled="@(Entries.Count == 0)" IconClass="bi bi-download" OnClick="ExportAsync">
+                Export
             </Button>
 
             @if (_showJumpToLatest)
             {
-                <Button CssClass="jump-to-latest" OnClick="JumpToLatest">
-                    <i aria-hidden="true" class="bi bi-arrow-down"></i> Jump to latest
+                <Button CssClass="jump-to-latest" IconClass="bi bi-arrow-down" OnClick="JumpToLatest">
+                    Jump to latest
                 </Button>
             }
         </div>
diff --git a/src/EventLogExpert.UI/DatabaseTools/DatabaseToolsModal.razor.cs b/src/EventLogExpert.UI/DatabaseTools/DatabaseToolsModal.razor.cs
index 86b8a8bd5..3a1897fb1 100644
--- a/src/EventLogExpert.UI/DatabaseTools/DatabaseToolsModal.razor.cs
+++ b/src/EventLogExpert.UI/DatabaseTools/DatabaseToolsModal.razor.cs
@@ -110,7 +110,7 @@ protected override async Task<bool> OnRequestCloseAsync(ModalCloseRequest reques
             if (_manageTab is { IsUpgradeInFlight: true }) { return false; }
         }
 
-        // 3. Existing AnyTabIsRunning prompt — preserves current behavior.
+        // 3. Existing AnyTabIsRunning prompt - preserves current behavior.
         if (AnyTabIsRunning)
         {
             var confirm = await ShowInlineAlertAsync(
diff --git a/src/EventLogExpert.UI/DatabaseTools/Tabs/CreateDatabaseTab.razor b/src/EventLogExpert.UI/DatabaseTools/Tabs/CreateDatabaseTab.razor
index 2f1dc65da..b2c451331 100644
--- a/src/EventLogExpert.UI/DatabaseTools/Tabs/CreateDatabaseTab.razor
+++ b/src/EventLogExpert.UI/DatabaseTools/Tabs/CreateDatabaseTab.razor
@@ -70,7 +70,7 @@
                     disabled="@IsRunning"
                     id="create-skip-path"
                     @oninput="OnSkipPathInput"
-                    placeholder="Optional — path to .db or .evtx whose providers are excluded"
+                    placeholder="Optional - path to .db or .evtx whose providers are excluded"
                     type="text"
                     value="@_skipPath" />
                 <Button Disabled="@IsRunning" OnClick="PickSkipAsync">Browse…</Button>
@@ -82,7 +82,7 @@
             <div class="elevation-warning-slot">
                 <div class="elevation-warning" role="alert">
                     <i aria-hidden="true" class="bi bi-shield-exclamation"></i>
-                    <span>Running without elevation — some local providers (Security, etc.) will be skipped or return incomplete metadata.</span>
+                    <span>Running without elevation - some local providers (Security, etc.) will be skipped or return incomplete metadata.</span>
                     <Button Disabled="@IsRunning"
                         OnClick="RunElevatedAsync"
                         title="Run this operation in an elevated helper process; main app stays running.">
@@ -99,21 +99,21 @@
             {
                 @if (IsCancelling)
                 {
-                    <Button Disabled>
-                        <i aria-hidden="true" class="bi bi-hourglass-split"></i> Cancelling…
+                    <Button Disabled IconClass="bi bi-hourglass-split">
+                        Cancelling…
                     </Button>
                 }
                 else
                 {
-                    <DangerButton OnClick="CancelRun">
-                        <i aria-hidden="true" class="bi bi-x-circle"></i> Cancel
+                    <DangerButton IconClass="bi bi-x-circle" OnClick="CancelRun">
+                        Cancel
                     </DangerButton>
                 }
             }
             else
             {
-                <PrimaryButton Disabled="@(!CanRun)" OnClick="RunAsync">
-                    <i aria-hidden="true" class="bi bi-play-fill"></i> Run
+                <PrimaryButton Disabled="@(!CanRun)" IconClass="bi bi-play-fill" OnClick="RunAsync">
+                    Run
                 </PrimaryButton>
             }
         </ToolbarLeadingContent>
diff --git a/src/EventLogExpert.UI/DatabaseTools/Tabs/DiffDatabasesTab.razor b/src/EventLogExpert.UI/DatabaseTools/Tabs/DiffDatabasesTab.razor
index 3a06acf98..4f64f078e 100644
--- a/src/EventLogExpert.UI/DatabaseTools/Tabs/DiffDatabasesTab.razor
+++ b/src/EventLogExpert.UI/DatabaseTools/Tabs/DiffDatabasesTab.razor
@@ -63,22 +63,16 @@
             {
                 @if (IsCancelling)
                 {
-                    <Button Disabled>
-                        <i aria-hidden="true" class="bi bi-hourglass-split"></i> Cancelling…
-                    </Button>
+                    <Button Disabled IconClass="bi bi-hourglass-split">Cancelling…</Button>
                 }
                 else
                 {
-                    <DangerButton OnClick="CancelRun">
-                        <i aria-hidden="true" class="bi bi-x-circle"></i> Cancel
-                    </DangerButton>
+                    <DangerButton IconClass="bi bi-x-circle" OnClick="CancelRun">Cancel</DangerButton>
                 }
             }
             else
             {
-                <PrimaryButton Disabled="@(!CanRun)" OnClick="RunAsync">
-                    <i aria-hidden="true" class="bi bi-play-fill"></i> Run
-                </PrimaryButton>
+                <PrimaryButton Disabled="@(!CanRun)" IconClass="bi bi-play-fill" OnClick="RunAsync">Run</PrimaryButton>
             }
         </ToolbarLeadingContent>
     </DatabaseToolsLogView>
diff --git a/src/EventLogExpert.UI/DatabaseTools/Tabs/ManageDatabasesTab.razor b/src/EventLogExpert.UI/DatabaseTools/Tabs/ManageDatabasesTab.razor
index fc7910698..47f6b9499 100644
--- a/src/EventLogExpert.UI/DatabaseTools/Tabs/ManageDatabasesTab.razor
+++ b/src/EventLogExpert.UI/DatabaseTools/Tabs/ManageDatabasesTab.razor
@@ -16,18 +16,19 @@
         {
             <Button aria-pressed="@(_isSelectionModeActive ? "true" : "false")"
                 CssClass="manage-databases-select-btn"
+                IconClass="bi bi-check2-square"
                 id="manage-select-button"
                 OnClick="ToggleSelectionMode"
                 @ref="_selectButton">
-                <i aria-hidden="true" class="bi bi-check2-square"></i>
                 @(_isSelectionModeActive ? "Done" : "Select")
             </Button>
         }
         <Button CssClass="manage-databases-import-btn"
+            IconClass="bi bi-plus-circle"
             id="manage-import-button"
             OnClick="ImportDatabase"
             @ref="_importButton">
-            <i aria-hidden="true" class="bi bi-plus-circle"></i> Import database&hellip;
+            Import database&hellip;
         </Button>
     </div>
 
diff --git a/src/EventLogExpert.UI/DatabaseTools/Tabs/ManageDatabasesTab.razor.cs b/src/EventLogExpert.UI/DatabaseTools/Tabs/ManageDatabasesTab.razor.cs
index 6ccf3d5b5..908b018d2 100644
--- a/src/EventLogExpert.UI/DatabaseTools/Tabs/ManageDatabasesTab.razor.cs
+++ b/src/EventLogExpert.UI/DatabaseTools/Tabs/ManageDatabasesTab.razor.cs
@@ -394,7 +394,7 @@ void CompletionHandler(object? sender, UpgradeBatchCompletedEventArgs args)
             }
         }
 
-        // Coordinator-only — adding IsFileInAnyKnownBatch here would 30s-hang on background batches
+        // Coordinator-only - adding IsFileInAnyKnownBatch here would 30s-hang on background batches
         // (no UpgradeStateChanged event ever fires to re-trigger). pendingBatches + stillAlive below
         // already gate Remove via UpgradeBatchCompleted.
         void StateChangedHandler()
diff --git a/src/EventLogExpert.UI/DatabaseTools/Tabs/MergeDatabaseTab.razor b/src/EventLogExpert.UI/DatabaseTools/Tabs/MergeDatabaseTab.razor
index 7a7fd8889..8f189d0e4 100644
--- a/src/EventLogExpert.UI/DatabaseTools/Tabs/MergeDatabaseTab.razor
+++ b/src/EventLogExpert.UI/DatabaseTools/Tabs/MergeDatabaseTab.razor
@@ -44,8 +44,8 @@
                 CssClass="input filter-dropdown overwrite-mode-select"
                 T="bool"
                 ToStringFunc="@(v => v ? "Overwrite" : "Keep")">
-                <ValueSelectItem T="bool" Value="false">Keep — skip providers already in target</ValueSelectItem>
-                <ValueSelectItem T="bool" Value="true">Overwrite — replace providers already in target</ValueSelectItem>
+                <ValueSelectItem T="bool" Value="false">Keep - skip providers already in target</ValueSelectItem>
+                <ValueSelectItem T="bool" Value="true">Overwrite - replace providers already in target</ValueSelectItem>
             </ValueSelect>
         </div>
     </div>
@@ -56,22 +56,16 @@
             {
                 @if (IsCancelling)
                 {
-                    <Button Disabled>
-                        <i aria-hidden="true" class="bi bi-hourglass-split"></i> Cancelling…
-                    </Button>
+                    <Button Disabled IconClass="bi bi-hourglass-split">Cancelling…</Button>
                 }
                 else
                 {
-                    <DangerButton OnClick="CancelRun">
-                        <i aria-hidden="true" class="bi bi-x-circle"></i> Cancel
-                    </DangerButton>
+                    <DangerButton IconClass="bi bi-x-circle" OnClick="CancelRun">Cancel</DangerButton>
                 }
             }
             else
             {
-                <PrimaryButton Disabled="@(!CanRun)" OnClick="RunAsync">
-                    <i aria-hidden="true" class="bi bi-play-fill"></i> Run
-                </PrimaryButton>
+                <PrimaryButton Disabled="@(!CanRun)" IconClass="bi bi-play-fill" OnClick="RunAsync">Run</PrimaryButton>
             }
         </ToolbarLeadingContent>
     </DatabaseToolsLogView>
diff --git a/src/EventLogExpert.UI/DatabaseTools/Tabs/ShowProvidersTab.razor b/src/EventLogExpert.UI/DatabaseTools/Tabs/ShowProvidersTab.razor
index 1ccc2ef61..50bac3f35 100644
--- a/src/EventLogExpert.UI/DatabaseTools/Tabs/ShowProvidersTab.razor
+++ b/src/EventLogExpert.UI/DatabaseTools/Tabs/ShowProvidersTab.razor
@@ -50,7 +50,7 @@
             <div class="elevation-warning-slot">
                 <div class="elevation-warning" role="alert">
                     <i aria-hidden="true" class="bi bi-shield-exclamation"></i>
-                    <span>Running without elevation — some local providers (Security, etc.) will be skipped or return incomplete metadata.</span>
+                    <span>Running without elevation - some local providers (Security, etc.) will be skipped or return incomplete metadata.</span>
                     <Button Disabled="@IsRunning"
                         OnClick="RunElevatedAsync"
                         title="Run this operation in an elevated helper process; main app stays running.">
@@ -67,22 +67,16 @@
             {
                 @if (IsCancelling)
                 {
-                    <Button Disabled>
-                        <i aria-hidden="true" class="bi bi-hourglass-split"></i> Cancelling…
-                    </Button>
+                    <Button Disabled IconClass="bi bi-hourglass-split">Cancelling…</Button>
                 }
                 else
                 {
-                    <DangerButton OnClick="CancelRun">
-                        <i aria-hidden="true" class="bi bi-x-circle"></i> Cancel
-                    </DangerButton>
+                    <DangerButton IconClass="bi bi-x-circle" OnClick="CancelRun">Cancel</DangerButton>
                 }
             }
             else
             {
-                <PrimaryButton Disabled="@(!CanRun)" OnClick="RunAsync">
-                    <i aria-hidden="true" class="bi bi-play-fill"></i> Run
-                </PrimaryButton>
+                <PrimaryButton Disabled="@(!CanRun)" IconClass="bi bi-play-fill" OnClick="RunAsync">Run</PrimaryButton>
             }
         </ToolbarLeadingContent>
     </DatabaseToolsLogView>
diff --git a/src/EventLogExpert.UI/DatabaseTools/Tabs/UpgradeDatabaseTab.razor b/src/EventLogExpert.UI/DatabaseTools/Tabs/UpgradeDatabaseTab.razor
index 19bc719ba..f2720b6cf 100644
--- a/src/EventLogExpert.UI/DatabaseTools/Tabs/UpgradeDatabaseTab.razor
+++ b/src/EventLogExpert.UI/DatabaseTools/Tabs/UpgradeDatabaseTab.razor
@@ -26,22 +26,16 @@
             {
                 @if (IsCancelling)
                 {
-                    <Button Disabled>
-                        <i aria-hidden="true" class="bi bi-hourglass-split"></i> Cancelling…
-                    </Button>
+                    <Button Disabled IconClass="bi bi-hourglass-split">Cancelling…</Button>
                 }
                 else
                 {
-                    <DangerButton OnClick="CancelRun">
-                        <i aria-hidden="true" class="bi bi-x-circle"></i> Cancel
-                    </DangerButton>
+                    <DangerButton IconClass="bi bi-x-circle" OnClick="CancelRun">Cancel</DangerButton>
                 }
             }
             else
             {
-                <PrimaryButton Disabled="@(!CanRun)" OnClick="RunAsync">
-                    <i aria-hidden="true" class="bi bi-play-fill"></i> Run
-                </PrimaryButton>
+                <PrimaryButton Disabled="@(!CanRun)" IconClass="bi bi-play-fill" OnClick="RunAsync">Run</PrimaryButton>
             }
         </ToolbarLeadingContent>
     </DatabaseToolsLogView>
diff --git a/src/EventLogExpert.UI/FilterEditor/Editing/FilterEditPanel.razor b/src/EventLogExpert.UI/FilterEditor/Editing/FilterEditPanel.razor
index 8a86a7394..02da09b2c 100644
--- a/src/EventLogExpert.UI/FilterEditor/Editing/FilterEditPanel.razor
+++ b/src/EventLogExpert.UI/FilterEditor/Editing/FilterEditPanel.razor
@@ -39,9 +39,7 @@
             </div>
 
             <div class="filter-edit-panel-actions">
-                <PrimaryButton OnClick="OnSave">
-                    <i aria-hidden="true" class="bi bi-check-circle"></i> Save
-                </PrimaryButton>
+                <PrimaryButton IconClass="bi bi-check-circle" OnClick="OnSave">Save</PrimaryButton>
 
                 <Button aria-label="Cancel edit"
                     IconClass="bi bi-x-circle"
diff --git a/src/EventLogExpert.UI/FilterEditor/FilterEditorCore.razor.cs b/src/EventLogExpert.UI/FilterEditor/FilterEditorCore.razor.cs
index f411ba051..59b4e74a8 100644
--- a/src/EventLogExpert.UI/FilterEditor/FilterEditorCore.razor.cs
+++ b/src/EventLogExpert.UI/FilterEditor/FilterEditorCore.razor.cs
@@ -48,7 +48,9 @@ public sealed partial class FilterEditorCore : ComponentBase
         CachedOptions is null ? [] : AvailableTags(CachedOptions);
 
     private string CachedEmptyHint =>
-        _selectedTags.Count > 0 ? "No recent filters match the selected tags — clear tags to see all" : "No recent options available here";
+        _selectedTags.Count > 0 ?
+            "No recent filters match the selected tags - clear tags to see all" :
+            "No recent options available here";
 
     private string ErrorMessage { get; set; } = string.Empty;
 
diff --git a/src/EventLogExpert.UI/FilterLibrary/LibraryEntryFilterEditor.razor b/src/EventLogExpert.UI/FilterLibrary/LibraryEntryFilterEditor.razor
index e4d740364..a2329e23f 100644
--- a/src/EventLogExpert.UI/FilterLibrary/LibraryEntryFilterEditor.razor
+++ b/src/EventLogExpert.UI/FilterLibrary/LibraryEntryFilterEditor.razor
@@ -27,8 +27,8 @@
                     PendingDraft="draft" />
             }
 
-            <Button CssClass="library-entry-filter-editor-add-button" OnClick="AddPendingDraft">
-                <i aria-hidden="true" class="bi bi-plus"></i> Add filter
+            <Button CssClass="library-entry-filter-editor-add-button" IconClass="bi bi-plus" OnClick="AddPendingDraft">
+                Add filter
             </Button>
         </div>
     }
diff --git a/src/EventLogExpert.UI/FilterLibrary/LibraryEntryRow.razor b/src/EventLogExpert.UI/FilterLibrary/LibraryEntryRow.razor
index 13c200f41..b3d157431 100644
--- a/src/EventLogExpert.UI/FilterLibrary/LibraryEntryRow.razor
+++ b/src/EventLogExpert.UI/FilterLibrary/LibraryEntryRow.razor
@@ -80,8 +80,9 @@
         }
 
         <PrimaryButton aria-label="@($"Apply {Entry.Name} additively to current filters")"
+            IconClass="bi bi-plus-circle"
             OnClick="OnApplyAsync">
-            <i aria-hidden="true" class="bi bi-plus-circle"></i> Apply
+            Apply
         </PrimaryButton>
 
         @if (IsFavoritable)
diff --git a/src/EventLogExpert.UI/FilterLibrary/LibrarySavedTabHeader.razor b/src/EventLogExpert.UI/FilterLibrary/LibrarySavedTabHeader.razor
index a9598ffea..51a6621e3 100644
--- a/src/EventLogExpert.UI/FilterLibrary/LibrarySavedTabHeader.razor
+++ b/src/EventLogExpert.UI/FilterLibrary/LibrarySavedTabHeader.razor
@@ -1,7 +1,7 @@
 @if (!_isExpanded)
 {
-    <Button CssClass="library-saved-tab-new-button" OnClick="ExpandAsync">
-        <i aria-hidden="true" class="bi bi-plus-circle"></i> New saved filter
+    <Button CssClass="library-saved-tab-new-button" IconClass="bi bi-plus-circle" OnClick="ExpandAsync">
+        New saved filter
     </Button>
 }
 else
diff --git a/src/EventLogExpert.UI/FilterLibrary/TagManagementPanel.razor b/src/EventLogExpert.UI/FilterLibrary/TagManagementPanel.razor
index 77133e522..61c409d8b 100644
--- a/src/EventLogExpert.UI/FilterLibrary/TagManagementPanel.razor
+++ b/src/EventLogExpert.UI/FilterLibrary/TagManagementPanel.razor
@@ -36,8 +36,9 @@
                     @if (_mergeTargetTag is not null)
                     {
                         <WarningButton aria-label="@($"Merge tag {tag} into {_mergeTargetTag}, affects {count} entries")"
+                            IconClass="bi bi-union"
                             OnClick="ConfirmMergeAsync">
-                            <i aria-hidden="true" class="bi bi-union"></i> Merge into '@_mergeTargetTag'
+                            Merge into '@_mergeTargetTag'
                         </WarningButton>
                     }
                     else
diff --git a/src/EventLogExpert.UI/FilterPane/FilterPane.razor b/src/EventLogExpert.UI/FilterPane/FilterPane.razor
index 14c8e51ed..1e4feb316 100644
--- a/src/EventLogExpert.UI/FilterPane/FilterPane.razor
+++ b/src/EventLogExpert.UI/FilterPane/FilterPane.razor
@@ -5,47 +5,46 @@
 <div class="filter-header">
     <div class="filter-header-actions">
         <div class="split-button">
-            <button class="button split-button-primary"
-                @onclick="AddBasicFilter"
+            <Button CssClass="split-button-primary"
+                IconClass="bi bi-plus-circle"
+                OnClick="AddBasicFilter"
                 @ref="_addFilterButtonRef"
-                title="Add Basic filter (use chevron for Advanced or Recent)"
-                type="button">
-                <i aria-hidden="true" class="bi bi-plus-circle"></i> Add Filter
-            </button>
-            <button aria-controls="menu-host-popup"
+                title="Add Basic filter (use chevron for Advanced or Recent)">
+                Add Filter
+            </Button>
+            <Button aria-controls="menu-host-popup"
                 aria-expanded="@(IsAddFilterMenuOpen ? "true" : "false")"
                 aria-haspopup="menu"
                 aria-label="Choose filter mode"
-                class="button split-button-chevron"
-                @onclick="OpenAddFilterMenuAsync"
+                CssClass="split-button-chevron"
+                IconClass="bi bi-caret-down-fill"
+                OnClick="OpenAddFilterMenuAsync"
                 @onkeydown="HandleAddFilterChevronKeyDownAsync"
-                @ref="_addFilterChevronRef"
-                type="button">
-                <i class="bi bi-caret-down-fill"></i>
-            </button>
+                @ref="_addFilterChevronRef" />
         </div>
 
-        <Button OnClick="AddExclusion">
-            <i class="bi bi-plus-circle"></i> Add Exclusion
+        <Button IconClass="bi bi-plus-circle" OnClick="AddExclusion">
+            Add Exclusion
         </Button>
 
         @if (!IsDateFilterVisible)
         {
-            <Button OnClick="AddDateFilter">
-                <i class="bi bi-plus-circle"></i> Add Date Filter
+            <Button IconClass="bi bi-plus-circle" OnClick="AddDateFilter">
+                Add Date Filter
             </Button>
         }
 
-        <Button OnClick="OpenFilterSetPicker">
-            <i class="bi bi-plus-circle"></i> Apply Filter Set
+        <Button IconClass="bi bi-plus-circle" OnClick="OpenFilterSetPicker">
+            Apply Filter Set
         </Button>
 
         @if (OpenLogCount.Value > 0)
         {
             <Button aria-controls="scenario-picker"
                 aria-expanded="@(IsScenarioPickerVisible ? "true" : "false")"
+                IconClass="bi bi-plus-circle"
                 OnClick="OpenScenarioPicker">
-                <i class="bi bi-plus-circle"></i> Apply Scenario
+                Apply Scenario
             </Button>
         }
     </div>
@@ -65,27 +64,24 @@
         <Button aria-describedby="@(HasSavableFilters ? null : "save-filters-empty-hint")"
             aria-label="Save as Filter Set"
             Disabled="@(!HasSavableFilters)"
+            IconClass="bi bi-bookmark-plus"
             IconOnly
             OnClick="SaveFiltersAsFilterSetAsync"
-            title="@(HasSavableFilters ? "Save as Filter Set..." : "No filters to save")">
-            <i class="bi bi-bookmark-plus"></i>
-        </Button>
+            title="@(HasSavableFilters ? "Save as Filter Set..." : "No filters to save")" />
 
         <Button aria-describedby="@(HasClearableFilters ? null : "clear-filters-empty-hint")"
             aria-label="Clear All Filters"
             Disabled="@(!HasClearableFilters)"
+            IconClass="bi bi-trash"
             IconOnly
             OnClick="ClearAllFiltersAsync"
-            title="@(HasClearableFilters ? "Clear All Filters..." : "No filters to clear")">
-            <i class="bi bi-trash"></i>
-        </Button>
+            title="@(HasClearableFilters ? "Clear All Filters..." : "No filters to clear")" />
 
         <Button aria-label="Open Filter Library"
+            IconClass="bi bi-bookmarks"
             IconOnly
             OnClick="OpenFilterLibraryAsync"
-            title="Open Filter Library">
-            <i class="bi bi-bookmarks"></i>
-        </Button>
+            title="Open Filter Library" />
 
         @if (ScenarioAuthoringEnabled)
         {
@@ -94,20 +90,18 @@
             <Button aria-describedby="@(hasEnabledFilters ? null : "scenario-export-empty-hint")"
                 aria-label="Copy scenario JSON"
                 Disabled="@(!hasEnabledFilters)"
+                IconClass="bi bi-clipboard-data"
                 IconOnly
                 OnClick="CopyScenarioJsonAsync"
-                title="Copy current filter rows as scenario-catalog JSON">
-                <i aria-hidden="true" class="bi bi-clipboard-data"></i>
-            </Button>
+                title="Copy current filter rows as scenario-catalog JSON" />
 
             <Button aria-describedby="@(hasEnabledFilters ? null : "scenario-export-empty-hint")"
                 aria-label="Save scenario JSON"
                 Disabled="@(!hasEnabledFilters)"
+                IconClass="bi bi-filetype-json"
                 IconOnly
                 OnClick="SaveScenarioJsonAsync"
-                title="Save current filter rows as scenario-catalog JSON...">
-                <i aria-hidden="true" class="bi bi-filetype-json"></i>
-            </Button>
+                title="Save current filter rows as scenario-catalog JSON..." />
 
             <span class="visually-hidden" id="scenario-export-empty-hint">
                 Enable a filter before exporting as a scenario.
@@ -123,15 +117,12 @@
 
         @if (HasFilters || FilterProgressState.Value.IsLoading)
         {
-            <span aria-label="@(_isFilterListVisible ? "Filters Expanded" : "Filters Collapsed")"
-                class="menu-toggle"
+            <Button aria-label="@(_isFilterListVisible ? "Filters Expanded" : "Filters Collapsed")"
+                CssClass="menu-toggle"
                 data-rotate="@MenuState"
-                @onclick="ToggleMenu"
-                @onkeydown="HandleKeyDown"
-                role="button"
-                tabindex="0">
-                <i class="bi bi-caret-up"></i>
-            </span>
+                IconClass="bi bi-caret-up"
+                IconOnly
+                OnClick="ToggleMenu" />
         }
     </div>
 </div>
@@ -156,34 +147,34 @@
                     <DateRangeQuickPick AriaLabel="Quick date range" CssClass="input filter-datetime" OnRangeSelected="SetQuickDateRange" />
                 </span>
 
-                <PrimaryButton OnClick="ApplyDateFilter">
-                    <i class="bi bi-check-circle"></i> Apply
+                <PrimaryButton IconClass="bi bi-check-circle" OnClick="ApplyDateFilter">
+                    Apply
                 </PrimaryButton>
 
-                <DangerButton OnClick="RemoveDateFilter">
-                    <i class="bi bi-dash-circle"></i> Remove
+                <DangerButton IconClass="bi bi-dash-circle" OnClick="RemoveDateFilter">
+                    Remove
                 </DangerButton>
             }
             else
             {
-                <Button OnClick="EditDateFilter">
-                    <i class="bi bi-funnel"></i> Edit
+                <Button IconClass="bi bi-funnel" OnClick="EditDateFilter">
+                    Edit
                 </Button>
 
-                <DangerButton OnClick="RemoveDateFilter">
-                    <i class="bi bi-dash-circle"></i> Remove
+                <DangerButton IconClass="bi bi-dash-circle" OnClick="RemoveDateFilter">
+                    Remove
                 </DangerButton>
 
                 @if (FilterPaneState.Value.FilteredDateRange?.IsEnabled is true)
                 {
-                    <DangerButton OnClick="ToggleDateFilter">
-                        <i class="bi bi-dash-circle"></i> Disable
+                    <DangerButton IconClass="bi bi-dash-circle" OnClick="ToggleDateFilter">
+                        Disable
                     </DangerButton>
                 }
                 else
                 {
-                    <PrimaryButton OnClick="ToggleDateFilter">
-                        <i class="bi bi-plus-circle"></i> Enable
+                    <PrimaryButton IconClass="bi bi-plus-circle" OnClick="ToggleDateFilter">
+                        Enable
                     </PrimaryButton>
                 }
             }
@@ -235,14 +226,15 @@
                     </ValueSelect>
                 </span>
 
-                <PrimaryButton Disabled="@(SelectedFilterSetId == default)" OnClick="ApplyFilterSetSelection">
-                    <i class="bi bi-check-circle"></i> Apply
+                <PrimaryButton Disabled="@(SelectedFilterSetId == default)" IconClass="bi bi-check-circle" OnClick="ApplyFilterSetSelection">
+                    Apply
                 </PrimaryButton>
 
                 <Button aria-label="Replace filters with selected filter set"
                     Disabled="@(SelectedFilterSetId == default)"
+                    IconClass="bi bi-arrow-repeat"
                     OnClick="ReplaceFilterSetSelection">
-                    <i class="bi bi-arrow-repeat"></i> Replace
+                    Replace
                 </Button>
             }
             else
@@ -261,8 +253,8 @@
                 </span>
             }
 
-            <DangerButton OnClick="CancelFilterSetPicker">
-                <i class="bi bi-dash-circle"></i> Cancel
+            <DangerButton IconClass="bi bi-dash-circle" OnClick="CancelFilterSetPicker">
+                Cancel
             </DangerButton>
         </div>
     }
@@ -309,14 +301,15 @@
                     </ValueSelect>
                 </span>
 
-                <PrimaryButton Disabled="@(ResolvedScenario is null)" OnClick="ApplyScenarioSelection">
-                    <i class="bi bi-check-circle"></i> Apply
+                <PrimaryButton Disabled="@(ResolvedScenario is null)" IconClass="bi bi-check-circle" OnClick="ApplyScenarioSelection">
+                    Apply
                 </PrimaryButton>
 
                 <Button aria-label="Replace filters with selected scenario"
                     Disabled="@(ResolvedScenario is null)"
+                    IconClass="bi bi-arrow-repeat"
                     OnClick="ReplaceScenarioSelection">
-                    <i class="bi bi-arrow-repeat"></i> Replace
+                    Replace
                 </Button>
             }
             else
@@ -324,8 +317,8 @@
                 <span class="filter-empty-state" role="status">No scenarios match the loaded logs.</span>
             }
 
-            <DangerButton OnClick="CancelScenarioPicker">
-                <i class="bi bi-dash-circle"></i> Cancel
+            <DangerButton IconClass="bi bi-dash-circle" OnClick="CancelScenarioPicker">
+                Cancel
             </DangerButton>
         </div>
     }
diff --git a/src/EventLogExpert.UI/FilterPane/FilterPane.razor.cs b/src/EventLogExpert.UI/FilterPane/FilterPane.razor.cs
index 5adf05697..27610fe8a 100644
--- a/src/EventLogExpert.UI/FilterPane/FilterPane.razor.cs
+++ b/src/EventLogExpert.UI/FilterPane/FilterPane.razor.cs
@@ -21,6 +21,7 @@
 using EventLogExpert.UI.Common.Interop;
 using EventLogExpert.UI.FilterEditor;
 using EventLogExpert.UI.Focus;
+using EventLogExpert.UI.Inputs;
 using EventLogExpert.UI.Modal;
 using Fluxor;
 using Microsoft.AspNetCore.Components;
@@ -45,8 +46,8 @@ public sealed partial class FilterPane
     private readonly List<FilterDraft> _pendingDrafts = [];
     private readonly Dictionary<FilterId, FilterRow?> _rowRefs = new();
 
-    private ElementReference _addFilterButtonRef;
-    private ElementReference _addFilterChevronRef;
+    private Button? _addFilterButtonRef;
+    private Button? _addFilterChevronRef;
     private long _addFilterMenuId;
     private ScenarioAuthoringRowContext? _authoringContext;
     private bool _canEditDate;
@@ -379,8 +380,7 @@ await _scrollSuppressorModule.InvokeVoidAsync(
                     _filterPaneRootRef,
                     new[]
                     {
-                        new { selector = ".split-button-chevron", keys = new[] { "ArrowUp", "ArrowDown" } },
-                        new { selector = ".menu-toggle", keys = new[] { "Enter", " " } }
+                        new { selector = ".split-button-chevron", keys = new[] { "ArrowUp", "ArrowDown" } }
                     });
             }
             catch (JSDisconnectedException) { }
@@ -400,7 +400,11 @@ await _scrollSuppressorModule.InvokeVoidAsync(
         else if (_focusAddButtonAfterRemove)
         {
             _focusAddButtonAfterRemove = false;
-            await ElementFocus.SafelyAsync(_addFilterButtonRef);
+
+            if (_addFilterButtonRef is { } addFilterButton)
+            {
+                await ElementFocus.SafelyAsync(addFilterButton.Element);
+            }
         }
 
         await base.OnAfterRenderAsync(firstRender);
@@ -614,14 +618,6 @@ private async Task HandleAddFilterChevronKeyDownAsync(KeyboardEventArgs e)
         }
     }
 
-    private void HandleKeyDown(KeyboardEventArgs e)
-    {
-        if (e.Key is "Enter" or " ")
-        {
-            ToggleMenu();
-        }
-    }
-
     private void HandlePendingDiscard(FilterDraft draft)
     {
         _pendingDrafts.Remove(draft);
@@ -672,10 +668,12 @@ private void OnFilterSetTagsChanged(List<string> tags)
 
     private async Task OpenAddFilterMenuAtAsync(bool focusFirst)
     {
+        if (_addFilterChevronRef is not { } chevronButton) { return; }
+
         _menuAnchorModule ??= await JSRuntime.InvokeAsync<IJSObjectReference>(
             "import", "./_content/EventLogExpert.UI/Menu/MenuAnchor.js");
 
-        var rect = await _menuAnchorModule.InvokeAsync<MenuAnchorRect>("getMenuElementRect", _addFilterChevronRef);
+        var rect = await _menuAnchorModule.InvokeAsync<MenuAnchorRect>("getMenuElementRect", chevronButton.Element);
         MenuService.OpenAt(rect.Left, rect.Bottom, BuildAddFilterMenu(), focusFirst);
         _addFilterMenuId = MenuService.ActiveMenuId;
         StateHasChanged();
diff --git a/src/EventLogExpert.UI/Inputs/ButtonBase.cs b/src/EventLogExpert.UI/Inputs/ButtonBase.cs
index 69bc39281..ef2156e2e 100644
--- a/src/EventLogExpert.UI/Inputs/ButtonBase.cs
+++ b/src/EventLogExpert.UI/Inputs/ButtonBase.cs
@@ -28,7 +28,7 @@ public abstract class ButtonBase : ComponentBase
 
     [Parameter] public EventCallback<MouseEventArgs> OnClick { get; set; }
 
-    [Parameter] public string Type { get; set; } = "button";
+    [Parameter] public string? Type { get; set; } = "button";
 
     protected abstract string? VariantClass { get; }
 
diff --git a/src/EventLogExpert.UI/LogTable/LogTablePane.razor.css b/src/EventLogExpert.UI/LogTable/LogTablePane.razor.css
index b6ef4f392..2661b5a6c 100644
--- a/src/EventLogExpert.UI/LogTable/LogTablePane.razor.css
+++ b/src/EventLogExpert.UI/LogTable/LogTablePane.razor.css
@@ -27,8 +27,6 @@ th {
     & > span {
         position: absolute;
         right: 5px;
-
-        &[data-rotate="true"] { top: 25%; }
     }
 }
 
diff --git a/src/EventLogExpert.UI/Modal/ModalBase.cs b/src/EventLogExpert.UI/Modal/ModalBase.cs
index 396b42e04..514d351c6 100644
--- a/src/EventLogExpert.UI/Modal/ModalBase.cs
+++ b/src/EventLogExpert.UI/Modal/ModalBase.cs
@@ -124,7 +124,7 @@ protected override async ValueTask DisposeAsyncCore(bool disposing)
         await base.DisposeAsyncCore(disposing);
     }
 
-    /// <summary>UI button (Cancel/Close) entry point — routes through the coordinator's veto pipeline.</summary>
+    /// <summary>UI button (Cancel/Close) entry point - routes through the coordinator's veto pipeline.</summary>
     protected Task HandleCancelButtonClickAsync() =>
         ModalCoordinator.RequestCloseActiveAsync(ModalCloseReason.UserDismiss);
 
@@ -173,14 +173,14 @@ protected override void OnInitialized()
     /// <summary>Veto hook for modal close requests. Override to block close conditionally (return <see langword="false" />).</summary>
     /// <remarks>
     ///     Calling <see cref="IModalCoordinator.RequestCloseActiveAsync" /> from inside this method is unsupported and
-    ///     will deadlock on the coordinator's in-flight close TCS. Throwing <see cref="OperationCanceledException" />
-    ///     from this method is interpreted by the coordinator as accepting the close.
+    ///     will deadlock on the coordinator's in-flight close TCS. Throwing <see cref="OperationCanceledException" /> from
+    ///     this method is interpreted by the coordinator as accepting the close.
     /// </remarks>
     protected virtual Task<bool> OnRequestCloseAsync(ModalCloseRequest request) => Task.FromResult(true);
 
     protected virtual Task OnSaveAsync() => CompleteAsync(default);
 
-    // Sync dispose path for the cancellation callback (BCL Action delegate forces sync — see ShowInlineAlertAsync.Register).
+    // Sync dispose path for the cancellation callback (BCL Action delegate forces sync - see ShowInlineAlertAsync.Register).
     private void TryClearInlineAlertFromCallback(InlineAlertEntry expected, InlineAlertResult? result, bool cancel)
     {
         InlineAlertEntry? cleared;
diff --git a/src/EventLogExpert.UI/wwwroot/app.css b/src/EventLogExpert.UI/wwwroot/app.css
index 1ab7306e3..882a85921 100644
--- a/src/EventLogExpert.UI/wwwroot/app.css
+++ b/src/EventLogExpert.UI/wwwroot/app.css
@@ -331,7 +331,28 @@ input[type="text"].input.dialog-input { padding: .25rem 0; }
     }
 }
 
-.menu-toggle { cursor: pointer; }
+.menu-toggle {
+    cursor: pointer;
+    display: inline-flex;
+    align-items: center;
+    justify-content: center;
+    line-height: 1;
+}
+
+    .menu-toggle > .bi,
+    .menu-toggle > i {
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        line-height: 1;
+        vertical-align: 0;
+    }
+
+    .menu-toggle > .bi::before,
+    .menu-toggle > i::before {
+        vertical-align: 0;
+        line-height: 0;
+    }
 
     .menu-toggle[data-rotate="true"] { transform: rotate(-180deg); }
 
diff --git a/tests/Unit/EventLogExpert.UI.Tests/Inputs/ButtonTests.cs b/tests/Unit/EventLogExpert.UI.Tests/Inputs/ButtonTests.cs
index 00ba87684..97e58c6bb 100644
--- a/tests/Unit/EventLogExpert.UI.Tests/Inputs/ButtonTests.cs
+++ b/tests/Unit/EventLogExpert.UI.Tests/Inputs/ButtonTests.cs
@@ -58,7 +58,7 @@ public void Render_AdditionalAttributes_SplattedToButton()
     public void Render_BlankType_DefaultsToButton(string? type)
     {
         var component = Render<Button>(parameters => parameters
-            .Add(p => p.Type, type!));
+            .Add(p => p.Type, type));
 
         var button = component.Find("button");
         Assert.Equal("button", button.GetAttribute("type"));

From 5fbc5a119760d02f67f50aa0bdd57828a9105f7f Mon Sep 17 00:00:00 2001
From: jschick04 <jschick04@gmail.com>
Date: Fri, 19 Jun 2026 19:58:12 -0500
Subject: [PATCH 10/40] Rename FilterPane button component references to drop
 the misleading Ref suffix

---
 src/EventLogExpert.UI/FilterPane/FilterPane.razor    | 4 ++--
 src/EventLogExpert.UI/FilterPane/FilterPane.razor.cs | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/EventLogExpert.UI/FilterPane/FilterPane.razor b/src/EventLogExpert.UI/FilterPane/FilterPane.razor
index 1e4feb316..b37db1a81 100644
--- a/src/EventLogExpert.UI/FilterPane/FilterPane.razor
+++ b/src/EventLogExpert.UI/FilterPane/FilterPane.razor
@@ -8,7 +8,7 @@
             <Button CssClass="split-button-primary"
                 IconClass="bi bi-plus-circle"
                 OnClick="AddBasicFilter"
-                @ref="_addFilterButtonRef"
+                @ref="_addFilterButton"
                 title="Add Basic filter (use chevron for Advanced or Recent)">
                 Add Filter
             </Button>
@@ -20,7 +20,7 @@
                 IconClass="bi bi-caret-down-fill"
                 OnClick="OpenAddFilterMenuAsync"
                 @onkeydown="HandleAddFilterChevronKeyDownAsync"
-                @ref="_addFilterChevronRef" />
+                @ref="_addFilterChevron" />
         </div>
 
         <Button IconClass="bi bi-plus-circle" OnClick="AddExclusion">
diff --git a/src/EventLogExpert.UI/FilterPane/FilterPane.razor.cs b/src/EventLogExpert.UI/FilterPane/FilterPane.razor.cs
index 27610fe8a..7cdf98069 100644
--- a/src/EventLogExpert.UI/FilterPane/FilterPane.razor.cs
+++ b/src/EventLogExpert.UI/FilterPane/FilterPane.razor.cs
@@ -46,8 +46,8 @@ public sealed partial class FilterPane
     private readonly List<FilterDraft> _pendingDrafts = [];
     private readonly Dictionary<FilterId, FilterRow?> _rowRefs = new();
 
-    private Button? _addFilterButtonRef;
-    private Button? _addFilterChevronRef;
+    private Button? _addFilterButton;
+    private Button? _addFilterChevron;
     private long _addFilterMenuId;
     private ScenarioAuthoringRowContext? _authoringContext;
     private bool _canEditDate;
@@ -401,7 +401,7 @@ await _scrollSuppressorModule.InvokeVoidAsync(
         {
             _focusAddButtonAfterRemove = false;
 
-            if (_addFilterButtonRef is { } addFilterButton)
+            if (_addFilterButton is { } addFilterButton)
             {
                 await ElementFocus.SafelyAsync(addFilterButton.Element);
             }
@@ -668,7 +668,7 @@ private void OnFilterSetTagsChanged(List<string> tags)
 
     private async Task OpenAddFilterMenuAtAsync(bool focusFirst)
     {
-        if (_addFilterChevronRef is not { } chevronButton) { return; }
+        if (_addFilterChevron is not { } chevronButton) { return; }
 
         _menuAnchorModule ??= await JSRuntime.InvokeAsync<IJSObjectReference>(
             "import", "./_content/EventLogExpert.UI/Menu/MenuAnchor.js");

From 1f6cf65cec9f8e89679ee0e217e3809c17f1a2a8 Mon Sep 17 00:00:00 2001
From: jschick04 <jschick04@gmail.com>
Date: Fri, 19 Jun 2026 22:21:41 -0500
Subject: [PATCH 11/40] Exempt loading spinners from the reduced-motion
 animation reset

---
 src/EventLogExpert.UI/Banner/ExportProgressBanner.razor       | 2 +-
 src/EventLogExpert.UI/Banner/UpgradeProgressBanner.razor      | 2 +-
 src/EventLogExpert.UI/Database/DatabaseEntryRow.razor         | 4 ++--
 .../DatabaseTools/Tabs/ManageDatabasesTab.razor               | 2 +-
 src/EventLogExpert.UI/FilterPane/FilterPane.razor             | 2 +-
 src/EventLogExpert.UI/LogTable/LogTabBar.razor                | 4 ++--
 src/EventLogExpert.UI/wwwroot/app.css                         | 2 +-
 7 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/EventLogExpert.UI/Banner/ExportProgressBanner.razor b/src/EventLogExpert.UI/Banner/ExportProgressBanner.razor
index 4ccde8894..5ef368b16 100644
--- a/src/EventLogExpert.UI/Banner/ExportProgressBanner.razor
+++ b/src/EventLogExpert.UI/Banner/ExportProgressBanner.razor
@@ -1,5 +1,5 @@
 <aside class="banner banner-export-progress" role="status">
-    <i aria-hidden="true" class="banner-spinner bi bi-arrow-repeat"></i>
+    <i aria-hidden="true" class="banner-spinner bi bi-arrow-repeat loader-spin"></i>
 
     <span class="banner-message">@Export.Message</span>
 
diff --git a/src/EventLogExpert.UI/Banner/UpgradeProgressBanner.razor b/src/EventLogExpert.UI/Banner/UpgradeProgressBanner.razor
index 5faefc5c0..2a8ee7f10 100644
--- a/src/EventLogExpert.UI/Banner/UpgradeProgressBanner.razor
+++ b/src/EventLogExpert.UI/Banner/UpgradeProgressBanner.razor
@@ -1,5 +1,5 @@
 <aside class="banner banner-upgrade-progress" role="status">
-    <i aria-hidden="true" class="banner-spinner bi bi-arrow-repeat"></i>
+    <i aria-hidden="true" class="banner-spinner bi bi-arrow-repeat loader-spin"></i>
 
     @if (string.IsNullOrEmpty(Progress.CurrentEntryName))
     {
diff --git a/src/EventLogExpert.UI/Database/DatabaseEntryRow.razor b/src/EventLogExpert.UI/Database/DatabaseEntryRow.razor
index 7aa096c23..939ce2254 100644
--- a/src/EventLogExpert.UI/Database/DatabaseEntryRow.razor
+++ b/src/EventLogExpert.UI/Database/DatabaseEntryRow.razor
@@ -50,7 +50,7 @@
 
                         <span class="db-entry-upgrading">
                             <span class="db-entry-upgrading-status" role="status">
-                                <i aria-hidden="true" class="bi bi-arrow-repeat db-entry-spinner"></i>
+                                <i aria-hidden="true" class="bi bi-arrow-repeat db-entry-spinner loader-spin"></i>
                                 <span class="db-entry-upgrading-text" @key="verb">@displayText</span>
                                 @if (hasFile)
                                 {
@@ -65,7 +65,7 @@
                     else
                     {
                         <span class="db-entry-upgrading" role="status">
-                            <i aria-hidden="true" class="bi bi-arrow-repeat db-entry-spinner"></i>
+                            <i aria-hidden="true" class="bi bi-arrow-repeat db-entry-spinner loader-spin"></i>
                             <span>Upgrading&hellip;</span>
                         </span>
                     }
diff --git a/src/EventLogExpert.UI/DatabaseTools/Tabs/ManageDatabasesTab.razor b/src/EventLogExpert.UI/DatabaseTools/Tabs/ManageDatabasesTab.razor
index 47f6b9499..be0119fc5 100644
--- a/src/EventLogExpert.UI/DatabaseTools/Tabs/ManageDatabasesTab.razor
+++ b/src/EventLogExpert.UI/DatabaseTools/Tabs/ManageDatabasesTab.razor
@@ -4,7 +4,7 @@
     @if (IsClassificationPending)
     {
         <div class="manage-status-banner manage-status-banner--info" role="status">
-            <i aria-hidden="true" class="bi bi-arrow-repeat manage-status-banner__spinner"></i>
+            <i aria-hidden="true" class="bi bi-arrow-repeat manage-status-banner__spinner loader-spin"></i>
             <span class="manage-status-banner__message">Classifying databases&hellip;</span>
         </div>
     }
diff --git a/src/EventLogExpert.UI/FilterPane/FilterPane.razor b/src/EventLogExpert.UI/FilterPane/FilterPane.razor
index b37db1a81..a53e93072 100644
--- a/src/EventLogExpert.UI/FilterPane/FilterPane.razor
+++ b/src/EventLogExpert.UI/FilterPane/FilterPane.razor
@@ -52,7 +52,7 @@
     @if (FilterProgressState.Value.IsLoading)
     {
         <span class="filter-header-status">
-            [<i aria-label="Loading" class="spinner-border" role="status"></i> Applying Filters]
+            [<i aria-label="Loading" class="spinner-border loader-spin" role="status"></i> Applying Filters]
         </span>
     }
     else if (HasFilters && GetActiveFilters() > 0)
diff --git a/src/EventLogExpert.UI/LogTable/LogTabBar.razor b/src/EventLogExpert.UI/LogTable/LogTabBar.razor
index 08cbf5713..af3b0c741 100644
--- a/src/EventLogExpert.UI/LogTable/LogTabBar.razor
+++ b/src/EventLogExpert.UI/LogTable/LogTabBar.razor
@@ -59,7 +59,7 @@
                                 tabindex="@(member.IsLoading ? -1 : 0)">
                                 @if (member.IsLoading)
                                 {
-                                    <i aria-label="Loading" class="spinner-border" role="status"></i>
+                                    <i aria-label="Loading" class="spinner-border loader-spin" role="status"></i>
                                     @:&nbsp;
                                 }
                                 @GetTabName(member)
@@ -88,7 +88,7 @@
                         tabindex="@(standalone.Tab.IsLoading ? -1 : 0)">
                         @if (standalone.Tab.IsLoading)
                         {
-                            <i aria-label="Loading" class="spinner-border" role="status"></i>
+                            <i aria-label="Loading" class="spinner-border loader-spin" role="status"></i>
                             @:&nbsp;
                         }
                         @GetTabName(standalone.Tab)
diff --git a/src/EventLogExpert.UI/wwwroot/app.css b/src/EventLogExpert.UI/wwwroot/app.css
index 882a85921..b63a77cb8 100644
--- a/src/EventLogExpert.UI/wwwroot/app.css
+++ b/src/EventLogExpert.UI/wwwroot/app.css
@@ -141,7 +141,7 @@
 }
 
 @media (prefers-reduced-motion: reduce) {
-    *, *::before, *::after {
+    *:not(.loader-spin), *::before, *::after {
         animation-duration: 0.001ms !important;
         animation-iteration-count: 1 !important;
         transition-duration: 0.001ms !important;

From 491f9f0702a429155de0e98d188c01cdc50c3232 Mon Sep 17 00:00:00 2001
From: jschick04 <jschick04@gmail.com>
Date: Sat, 20 Jun 2026 09:29:28 -0500
Subject: [PATCH 12/40] Add ChromelessButton and migrate bespoke buttons with
 centralized disabled-guard

---
 .../Dashboard/EmptyStateDashboard.razor       | 48 +++++++++---------
 .../Dashboard/EmptyStateDashboard.razor.css   | 30 +++++------
 .../Dashboard/ScenarioDetail.razor            | 14 +++---
 .../Dashboard/ScenarioDetail.razor.css        | 14 +++---
 .../Database/DatabaseEntryRow.razor           | 10 +---
 .../Editing/FilterPredicateEditor.razor       | 38 +++++++-------
 .../Editing/FilterPredicateEditor.razor.cs    | 11 ++--
 .../Editing/FilterPredicateEditor.razor.css   | 34 ++++++-------
 .../FilterLibrary/LibraryEntryRow.razor       | 12 ++---
 .../FilterLibrary/LibraryEntryRow.razor.css   | 10 ++--
 src/EventLogExpert.UI/Inputs/Button.cs        |  2 +-
 src/EventLogExpert.UI/Inputs/ButtonBase.cs    | 50 ++++++++++---------
 .../Inputs/ChromelessButton.cs                |  9 ++++
 src/EventLogExpert.UI/Inputs/DangerButton.cs  |  2 +-
 src/EventLogExpert.UI/Inputs/PrimaryButton.cs |  2 +-
 .../Inputs/StyledButtonBase.cs                | 26 ++++++++++
 src/EventLogExpert.UI/Inputs/TagPicker.razor  | 10 ++--
 .../Inputs/TagPicker.razor.css                |  4 +-
 src/EventLogExpert.UI/Inputs/WarningButton.cs |  2 +-
 .../Inputs/ButtonTests.cs                     | 13 +++++
 .../Inputs/ChromelessButtonTests.cs           | 30 +++++++++++
 21 files changed, 220 insertions(+), 151 deletions(-)
 create mode 100644 src/EventLogExpert.UI/Inputs/ChromelessButton.cs
 create mode 100644 src/EventLogExpert.UI/Inputs/StyledButtonBase.cs
 create mode 100644 tests/Unit/EventLogExpert.UI.Tests/Inputs/ChromelessButtonTests.cs

diff --git a/src/EventLogExpert.UI/Dashboard/EmptyStateDashboard.razor b/src/EventLogExpert.UI/Dashboard/EmptyStateDashboard.razor
index 57a2370c3..f012596be 100644
--- a/src/EventLogExpert.UI/Dashboard/EmptyStateDashboard.razor
+++ b/src/EventLogExpert.UI/Dashboard/EmptyStateDashboard.razor
@@ -18,43 +18,43 @@
                     <Button Disabled="@_isBusy" OnClick="ClearFilter">Clear filter</Button>
                 </div>
             }
-            <button class="empty-dashboard__utility" disabled="@_isBusy" @onclick="OpenDatabaseToolsAsync" type="button">
-                <i aria-hidden="true" class="bi bi-database-gear"></i><span>Manage databases...</span>
-            </button>
+            <ChromelessButton CssClass="empty-dashboard__utility" Disabled="@_isBusy" IconClass="bi bi-database-gear" OnClick="OpenDatabaseToolsAsync">
+                <span>Manage databases...</span>
+            </ChromelessButton>
         </div>
     </header>
 
     <section aria-labelledby="empty-dashboard-quickstart-heading" class="empty-dashboard__section">
         <h2 class="empty-dashboard__heading" id="empty-dashboard-quickstart-heading">Quick Launch</h2>
         <div class="empty-dashboard__launchbar">
-            <button aria-label="Open Application + System (live)" class="empty-dashboard__launch empty-dashboard__launch--primary" disabled="@_isBusy" @onclick="OpenApplicationAndSystemAsync" type="button">
-                <i aria-hidden="true" class="bi bi-collection"></i><span>Application + System (live)</span>
-            </button>
-            <button aria-label="Open Application (live)" class="empty-dashboard__launch" disabled="@_isBusy" @onclick="OpenApplicationAsync" type="button">
-                <i aria-hidden="true" class="bi bi-window"></i><span>Application (live)</span>
-            </button>
-            <button aria-label="Open System (live)" class="empty-dashboard__launch" disabled="@_isBusy" @onclick="OpenSystemAsync" type="button">
-                <i aria-hidden="true" class="bi bi-pc-display"></i><span>System (live)</span>
-            </button>
+            <ChromelessButton aria-label="Open Application + System (live)" CssClass="empty-dashboard__launch empty-dashboard__launch--primary" Disabled="@_isBusy" IconClass="bi bi-collection" OnClick="OpenApplicationAndSystemAsync">
+                <span>Application + System (live)</span>
+            </ChromelessButton>
+            <ChromelessButton aria-label="Open Application (live)" CssClass="empty-dashboard__launch" Disabled="@_isBusy" IconClass="bi bi-window" OnClick="OpenApplicationAsync">
+                <span>Application (live)</span>
+            </ChromelessButton>
+            <ChromelessButton aria-label="Open System (live)" CssClass="empty-dashboard__launch" Disabled="@_isBusy" IconClass="bi bi-pc-display" OnClick="OpenSystemAsync">
+                <span>System (live)</span>
+            </ChromelessButton>
             @if (Version.IsAdmin)
             {
-                <button aria-label="Open Security (live)" class="empty-dashboard__launch" disabled="@_isBusy" @onclick="OpenSecurityAsync" type="button">
-                    <i aria-hidden="true" class="bi bi-shield-lock"></i><span>Security (live)</span>
-                </button>
+                <ChromelessButton aria-label="Open Security (live)" CssClass="empty-dashboard__launch" Disabled="@_isBusy" IconClass="bi bi-shield-lock" OnClick="OpenSecurityAsync">
+                    <span>Security (live)</span>
+                </ChromelessButton>
             }
             else
             {
-                <button aria-describedby="@ElevationReasonId" aria-disabled="true" aria-label="Open Security (live)" class="empty-dashboard__launch empty-dashboard__launch--disabled" type="button">
-                    <i aria-hidden="true" class="bi bi-shield-lock"></i><span>Security (live)</span>
-                </button>
+                <ChromelessButton aria-describedby="@ElevationReasonId" aria-disabled="true" aria-label="Open Security (live)" CssClass="empty-dashboard__launch empty-dashboard__launch--disabled" IconClass="bi bi-shield-lock">
+                    <span>Security (live)</span>
+                </ChromelessButton>
             }
             <span aria-hidden="true" class="empty-dashboard__launch-divider"></span>
-            <button aria-label="Open Log file..." class="empty-dashboard__launch" disabled="@_isBusy" @onclick="OpenFileAsync" type="button">
-                <i aria-hidden="true" class="bi bi-file-earmark-text"></i><span>Log file...</span>
-            </button>
-            <button aria-label="Open Folder..." class="empty-dashboard__launch" disabled="@_isBusy" @onclick="OpenFolderAsync" type="button">
-                <i aria-hidden="true" class="bi bi-folder2-open"></i><span>Folder...</span>
-            </button>
+            <ChromelessButton aria-label="Open Log file..." CssClass="empty-dashboard__launch" Disabled="@_isBusy" IconClass="bi bi-file-earmark-text" OnClick="OpenFileAsync">
+                <span>Log file...</span>
+            </ChromelessButton>
+            <ChromelessButton aria-label="Open Folder..." CssClass="empty-dashboard__launch" Disabled="@_isBusy" IconClass="bi bi-folder2-open" OnClick="OpenFolderAsync">
+                <span>Folder...</span>
+            </ChromelessButton>
         </div>
     </section>
 
diff --git a/src/EventLogExpert.UI/Dashboard/EmptyStateDashboard.razor.css b/src/EventLogExpert.UI/Dashboard/EmptyStateDashboard.razor.css
index 7e4e28a83..c108c372e 100644
--- a/src/EventLogExpert.UI/Dashboard/EmptyStateDashboard.razor.css
+++ b/src/EventLogExpert.UI/Dashboard/EmptyStateDashboard.razor.css
@@ -72,7 +72,7 @@
     gap: 0.75rem;
 }
 
-.empty-dashboard__utility {
+.empty-dashboard__masthead-actions ::deep .empty-dashboard__utility {
     display: inline-flex;
     align-items: center;
     gap: 0.4rem;
@@ -86,22 +86,22 @@
     transition: border-color 0.15s ease, color 0.15s ease, background-color 0.15s ease;
 }
 
-.empty-dashboard__utility > .bi {
+.empty-dashboard__masthead-actions ::deep .empty-dashboard__utility > .bi {
     color: var(--clr-lightblue);
 }
 
-.empty-dashboard__utility:hover:not(:disabled) {
+.empty-dashboard__masthead-actions ::deep .empty-dashboard__utility:hover:not(:disabled) {
     border-color: var(--clr-lightblue);
     color: var(--text-primary);
     background-color: var(--background-darkgray);
 }
 
-.empty-dashboard__utility:focus-visible {
+.empty-dashboard__masthead-actions ::deep .empty-dashboard__utility:focus-visible {
     outline: 2px solid var(--clr-lightblue);
     outline-offset: 2px;
 }
 
-.empty-dashboard__utility:disabled {
+.empty-dashboard__masthead-actions ::deep .empty-dashboard__utility:disabled {
     color: var(--clr-placeholder);
     cursor: default;
 }
@@ -144,7 +144,7 @@
     gap: 0.5rem;
 }
 
-.empty-dashboard__launch {
+.empty-dashboard__launchbar ::deep .empty-dashboard__launch {
     display: inline-flex;
     align-items: center;
     gap: 0.5rem;
@@ -158,16 +158,16 @@
     transition: border-color 0.15s ease, background-color 0.15s ease;
 }
 
-.empty-dashboard__launch > .bi {
+.empty-dashboard__launchbar ::deep .empty-dashboard__launch > .bi {
     color: var(--clr-lightblue);
 }
 
-.empty-dashboard__launch:hover:not(:disabled):not(.empty-dashboard__launch--disabled):not(.empty-dashboard__launch--primary) {
+.empty-dashboard__launchbar ::deep .empty-dashboard__launch:hover:not(:disabled):not(.empty-dashboard__launch--disabled):not(.empty-dashboard__launch--primary) {
     border-color: var(--clr-lightblue);
     background-color: var(--background-darkgray);
 }
 
-.empty-dashboard__launch--primary {
+.empty-dashboard__launchbar ::deep .empty-dashboard__launch--primary {
     flex-shrink: 0;
     border-color: var(--clr-lightblue);
     background-color: var(--clr-lightblue);
@@ -175,25 +175,25 @@
     font-weight: 600;
 }
 
-.empty-dashboard__launch--primary > .bi {
+.empty-dashboard__launchbar ::deep .empty-dashboard__launch--primary > .bi {
     color: var(--accent-on-fill);
 }
 
-.empty-dashboard__launch--primary:hover:not(:disabled) {
+.empty-dashboard__launchbar ::deep .empty-dashboard__launch--primary:hover:not(:disabled) {
     box-shadow: var(--shadow-menu);
 }
 
-.empty-dashboard__launch:disabled,
-.empty-dashboard__launch--disabled {
+.empty-dashboard__launchbar ::deep .empty-dashboard__launch:disabled,
+.empty-dashboard__launchbar ::deep .empty-dashboard__launch--disabled {
     color: var(--clr-placeholder);
     cursor: default;
 }
 
-.empty-dashboard__launch--disabled > .bi {
+.empty-dashboard__launchbar ::deep .empty-dashboard__launch--disabled > .bi {
     color: var(--clr-placeholder);
 }
 
-.empty-dashboard__launch:focus-visible {
+.empty-dashboard__launchbar ::deep .empty-dashboard__launch:focus-visible {
     outline: 2px solid var(--clr-lightblue);
     outline-offset: 2px;
 }
diff --git a/src/EventLogExpert.UI/Dashboard/ScenarioDetail.razor b/src/EventLogExpert.UI/Dashboard/ScenarioDetail.razor
index a3577a4ca..993ae5d9a 100644
--- a/src/EventLogExpert.UI/Dashboard/ScenarioDetail.razor
+++ b/src/EventLogExpert.UI/Dashboard/ScenarioDetail.razor
@@ -49,13 +49,13 @@
             type="button">
             <i aria-hidden="true" class="bi @(IsFavored ? "bi-star-fill" : "bi-star")"></i>
         </button>
-        <button aria-describedby="@(IsDisabled ? ElevationReasonId : null)"
+        <ChromelessButton aria-describedby="@(IsDisabled ? ElevationReasonId : null)"
             aria-disabled="@(IsDisabled ? "true" : "false")"
-            class="scenario-detail__launch"
-            disabled="@IsBusy"
-            @onclick="LaunchAsync"
-            type="button">
-            <i aria-hidden="true" class="bi bi-play-fill"></i><span>Launch</span>
-        </button>
+            CssClass="scenario-detail__launch"
+            Disabled="@IsBusy"
+            IconClass="bi bi-play-fill"
+            OnClick="LaunchAsync">
+            <span>Launch</span>
+        </ChromelessButton>
     </div>
 </div>
diff --git a/src/EventLogExpert.UI/Dashboard/ScenarioDetail.razor.css b/src/EventLogExpert.UI/Dashboard/ScenarioDetail.razor.css
index 910b2f882..7a1c049bd 100644
--- a/src/EventLogExpert.UI/Dashboard/ScenarioDetail.razor.css
+++ b/src/EventLogExpert.UI/Dashboard/ScenarioDetail.razor.css
@@ -144,7 +144,7 @@
     outline-offset: 2px;
 }
 
-.scenario-detail__launch {
+.scenario-detail__actions ::deep .scenario-detail__launch {
     display: inline-flex;
     align-items: center;
     gap: 0.4rem;
@@ -158,27 +158,27 @@
     cursor: pointer;
 }
 
-.scenario-detail__launch > .bi {
+.scenario-detail__actions ::deep .scenario-detail__launch > .bi {
     color: var(--accent-on-fill);
 }
 
-.scenario-detail__launch:hover:not(:disabled):not([aria-disabled="true"]) {
+.scenario-detail__actions ::deep .scenario-detail__launch:hover:not(:disabled):not([aria-disabled="true"]) {
     box-shadow: var(--shadow-menu);
 }
 
-.scenario-detail__launch:focus-visible {
+.scenario-detail__actions ::deep .scenario-detail__launch:focus-visible {
     outline: 2px solid var(--clr-lightblue);
     outline-offset: 2px;
 }
 
-.scenario-detail__launch:disabled,
-.scenario-detail__launch[aria-disabled="true"] {
+.scenario-detail__actions ::deep .scenario-detail__launch:disabled,
+.scenario-detail__actions ::deep .scenario-detail__launch[aria-disabled="true"] {
     border-color: var(--border-divider);
     background-color: var(--surface-inset);
     color: var(--text-secondary);
     cursor: default;
 }
 
-.scenario-detail__launch[aria-disabled="true"] > .bi {
+.scenario-detail__actions ::deep .scenario-detail__launch[aria-disabled="true"] > .bi {
     color: var(--text-secondary);
 }
diff --git a/src/EventLogExpert.UI/Database/DatabaseEntryRow.razor b/src/EventLogExpert.UI/Database/DatabaseEntryRow.razor
index 939ce2254..4dd48b8dc 100644
--- a/src/EventLogExpert.UI/Database/DatabaseEntryRow.razor
+++ b/src/EventLogExpert.UI/Database/DatabaseEntryRow.razor
@@ -77,10 +77,7 @@
                         CssClass="db-entry-upgrade-btn"
                         Disabled="@IsUpgradeBlocked"
                         IconClass="bi bi-arrow-up-circle"
-                        OnClick="@(async () =>
-                                 {
-                                     if (!IsUpgradeBlocked) { await OnUpgrade.InvokeAsync(); }
-                                 })">
+                        OnClick="@(() => OnUpgrade.InvokeAsync())">
                         Upgrade
                     </Button>
 
@@ -91,10 +88,7 @@
                         CssClass="db-entry-upgrade-btn"
                         Disabled="@IsUpgradeBlocked"
                         IconClass="bi bi-arrow-clockwise"
-                        OnClick="@(async () =>
-                                 {
-                                     if (!IsUpgradeBlocked) { await OnUpgrade.InvokeAsync(); }
-                                 })">
+                        OnClick="@(() => OnUpgrade.InvokeAsync())">
                         Retry Upgrade
                     </DangerButton>
 
diff --git a/src/EventLogExpert.UI/FilterEditor/Editing/FilterPredicateEditor.razor b/src/EventLogExpert.UI/FilterEditor/Editing/FilterPredicateEditor.razor
index 43a051f86..fab81ec5c 100644
--- a/src/EventLogExpert.UI/FilterEditor/Editing/FilterPredicateEditor.razor
+++ b/src/EventLogExpert.UI/FilterEditor/Editing/FilterPredicateEditor.razor
@@ -1,15 +1,14 @@
 @if (IsEditing)
 {
     <div class="filter-predicate-editing">
-        <button aria-label="@(Value.JoinWithAny ? "Joining with OR; click to switch to AND" : "Joining with AND; click to switch to OR")"
-            class="filter-predicate-and-or"
+        <ChromelessButton aria-label="@(Value.JoinWithAny ? "Joining with OR; click to switch to AND" : "Joining with AND; click to switch to OR")"
+            CssClass="filter-predicate-and-or"
             data-mode="@(Value.JoinWithAny ? "or" : "and")"
-            @onclick="OnAndOrClick"
-            @ref="_editorFirstInputRef"
-            title="@(Value.JoinWithAny ? "OR" : "AND")"
-            type="button">
+            OnClick="OnAndOrClick"
+            @ref="_editorFirstInput"
+            title="@(Value.JoinWithAny ? "OR" : "AND")">
             @(Value.JoinWithAny ? "OR" : "AND")
-        </button>
+        </ChromelessButton>
 
         <FilterComparisonEditor Comparison="Value.Comparison"
             Id="@ComponentId.For(Value.Id, ComponentIdScope.Predicate).Value"
@@ -32,22 +31,19 @@
 else
 {
     <div class="filter-predicate">
-        <button aria-label="@($"Edit predicate: {SummaryText}")"
-            class="filter-predicate-edit"
-            @onclick="OnEditChip"
-            @ref="_chipEditButtonRef"
-            title="Edit predicate"
-            type="button">
+        <ChromelessButton aria-label="@($"Edit predicate: {SummaryText}")"
+            CssClass="filter-predicate-edit"
+            OnClick="OnEditChip"
+            @ref="_chipEditButton"
+            title="Edit predicate">
             <span class="filter-predicate-joiner">@JoinerLabel</span>
             <span class="filter-predicate-summary">@SummaryText</span>
-        </button>
+        </ChromelessButton>
 
-        <button aria-label="@($"Remove predicate: {SummaryText}")"
-            class="filter-predicate-remove"
-            @onclick="OnRemoveChip"
-            title="Remove predicate"
-            type="button">
-            <i aria-hidden="true" class="bi bi-x-circle"></i>
-        </button>
+        <ChromelessButton aria-label="@($"Remove predicate: {SummaryText}")"
+            CssClass="filter-predicate-remove"
+            IconClass="bi bi-x-circle"
+            OnClick="OnRemoveChip"
+            title="Remove predicate" />
     </div>
 }
diff --git a/src/EventLogExpert.UI/FilterEditor/Editing/FilterPredicateEditor.razor.cs b/src/EventLogExpert.UI/FilterEditor/Editing/FilterPredicateEditor.razor.cs
index f80e91c37..89570769e 100644
--- a/src/EventLogExpert.UI/FilterEditor/Editing/FilterPredicateEditor.razor.cs
+++ b/src/EventLogExpert.UI/FilterEditor/Editing/FilterPredicateEditor.razor.cs
@@ -4,6 +4,7 @@
 using EventLogExpert.Filtering.Common.Filtering;
 using EventLogExpert.Filtering.Drafts;
 using EventLogExpert.UI.Focus;
+using EventLogExpert.UI.Inputs;
 using Microsoft.AspNetCore.Components;
 
 namespace EventLogExpert.UI.FilterEditor.Editing;
@@ -15,8 +16,8 @@ namespace EventLogExpert.UI.FilterEditor.Editing;
 /// </summary>
 public sealed partial class FilterPredicateEditor : ComponentBase
 {
-    private ElementReference _chipEditButtonRef;
-    private ElementReference _editorFirstInputRef;
+    private ChromelessButton? _chipEditButton;
+    private ChromelessButton? _editorFirstInput;
 
     [Parameter] public bool IsEditing { get; set; }
 
@@ -61,9 +62,11 @@ private string SummaryText
         }
     }
 
-    internal ValueTask FocusChipEditButtonAsync() => ElementFocus.SafelyAsync(_chipEditButtonRef);
+    internal ValueTask FocusChipEditButtonAsync() =>
+        _chipEditButton is { } button ? ElementFocus.SafelyAsync(button.Element) : ValueTask.CompletedTask;
 
-    internal ValueTask FocusEditorFirstInputAsync() => ElementFocus.SafelyAsync(_editorFirstInputRef);
+    internal ValueTask FocusEditorFirstInputAsync() =>
+        _editorFirstInput is { } button ? ElementFocus.SafelyAsync(button.Element) : ValueTask.CompletedTask;
 
     /// <summary>
     ///     AND/OR joiner click handler. Toggles <see cref="FilterPredicateDraft.JoinWithAny" /> and bubbles the change up
diff --git a/src/EventLogExpert.UI/FilterEditor/Editing/FilterPredicateEditor.razor.css b/src/EventLogExpert.UI/FilterEditor/Editing/FilterPredicateEditor.razor.css
index e3eb131ff..a1927aca5 100644
--- a/src/EventLogExpert.UI/FilterEditor/Editing/FilterPredicateEditor.razor.css
+++ b/src/EventLogExpert.UI/FilterEditor/Editing/FilterPredicateEditor.razor.css
@@ -7,13 +7,13 @@
     min-height: 24px;
 }
 
-.filter-predicate:hover .filter-predicate-edit,
-.filter-predicate:hover .filter-predicate-remove {
+.filter-predicate:hover ::deep .filter-predicate-edit,
+.filter-predicate:hover ::deep .filter-predicate-remove {
     border-color: var(--clr-lightblue);
 }
 
-.filter-predicate-edit,
-.filter-predicate-remove {
+.filter-predicate ::deep .filter-predicate-edit,
+.filter-predicate ::deep .filter-predicate-remove {
     display: inline-flex;
     align-items: center;
 
@@ -29,7 +29,7 @@
     transition: color 0.1s ease-in-out, background-color 0.1s ease-in-out, border-color 0.1s ease-in-out;
 }
 
-.filter-predicate-edit {
+.filter-predicate ::deep .filter-predicate-edit {
     gap: 0.25rem;
     padding: 2px 6px 2px 12px;
     border-right: none;
@@ -56,7 +56,7 @@
     text-overflow: ellipsis;
 }
 
-.filter-predicate-remove {
+.filter-predicate ::deep .filter-predicate-remove {
     min-width: 32px;
     padding: 2px 12px 2px 8px;
 
@@ -67,19 +67,19 @@
     border-bottom-right-radius: 999px;
 }
 
-.filter-predicate-remove .bi {
+.filter-predicate ::deep .filter-predicate-remove .bi {
     font-size: 0.9rem;
     line-height: 1;
 }
 
-.filter-predicate-remove:hover {
+.filter-predicate ::deep .filter-predicate-remove:hover {
     color: var(--clr-on-status-fill);
     background: var(--clr-red);
     border-color: var(--clr-red) !important;
 }
 
-.filter-predicate-edit:focus-visible,
-.filter-predicate-remove:focus-visible {
+.filter-predicate ::deep .filter-predicate-edit:focus-visible,
+.filter-predicate ::deep .filter-predicate-remove:focus-visible {
     outline: 2px solid var(--toggle-accent);
     outline-offset: -2px;
 }
@@ -88,10 +88,10 @@
     .filter-predicate {
         border: 1px solid ButtonText;
     }
-    .filter-predicate-remove {
+    .filter-predicate ::deep .filter-predicate-remove {
         border-left: 1px solid ButtonText;
     }
-    .filter-predicate-remove:hover {
+    .filter-predicate ::deep .filter-predicate-remove:hover {
         background: Highlight;
         color: HighlightText;
     }
@@ -112,7 +112,7 @@
 }
 
 /* AND/OR toggle in editing mode \u2014 neutral pill matching the chip aesthetic. */
-.filter-predicate-and-or {
+.filter-predicate-editing ::deep .filter-predicate-and-or {
     display: inline-flex;
     align-items: center;
     justify-content: center;
@@ -136,23 +136,23 @@
     transition: color 0.1s ease-in-out, border-color 0.1s ease-in-out;
 }
 
-.filter-predicate-and-or[data-mode="or"] {
+.filter-predicate-editing ::deep .filter-predicate-and-or[data-mode="or"] {
     color: var(--clr-lightblue);
     border-color: var(--clr-lightblue);
 }
 
-.filter-predicate-and-or:hover {
+.filter-predicate-editing ::deep .filter-predicate-and-or:hover {
     color: var(--clr-lightblue);
     border-color: var(--clr-lightblue);
 }
 
-.filter-predicate-and-or:focus-visible {
+.filter-predicate-editing ::deep .filter-predicate-and-or:focus-visible {
     outline: 2px solid var(--toggle-accent);
     outline-offset: 2px;
 }
 
 @media (forced-colors: active) {
-    .filter-predicate-and-or[data-mode="or"] {
+    .filter-predicate-editing ::deep .filter-predicate-and-or[data-mode="or"] {
         color: Highlight;
         border-color: Highlight;
     }
diff --git a/src/EventLogExpert.UI/FilterLibrary/LibraryEntryRow.razor b/src/EventLogExpert.UI/FilterLibrary/LibraryEntryRow.razor
index b3d157431..c8f5abc64 100644
--- a/src/EventLogExpert.UI/FilterLibrary/LibraryEntryRow.razor
+++ b/src/EventLogExpert.UI/FilterLibrary/LibraryEntryRow.razor
@@ -49,13 +49,11 @@
                             var tag = Entry.Tags[i];
                             <span class="library-entry-tag-chip" role="listitem">
                                 <span class="library-entry-tag-chip-label">@tag</span>
-                                <button aria-label="@($"Remove tag {tag}")"
-                                    class="library-entry-tag-chip-remove"
-                                    @onclick="@(() => OnRemoveTagAsync(tag))"
-                                    @onclick:stopPropagation="true"
-                                    type="button">
-                                    <i aria-hidden="true" class="bi bi-x"></i>
-                                </button>
+                                <ChromelessButton aria-label="@($"Remove tag {tag}")"
+                                    CssClass="library-entry-tag-chip-remove"
+                                    IconClass="bi bi-x"
+                                    OnClick="@(() => OnRemoveTagAsync(tag))"
+                                    StopPropagation="true" />
                             </span>
                         }
                     </div>
diff --git a/src/EventLogExpert.UI/FilterLibrary/LibraryEntryRow.razor.css b/src/EventLogExpert.UI/FilterLibrary/LibraryEntryRow.razor.css
index 723d3fda9..0f8a5aba7 100644
--- a/src/EventLogExpert.UI/FilterLibrary/LibraryEntryRow.razor.css
+++ b/src/EventLogExpert.UI/FilterLibrary/LibraryEntryRow.razor.css
@@ -100,7 +100,7 @@
     margin-right: .125rem;
 }
 
-.library-entry-tag-chip-remove {
+.library-entry-tag-chip ::deep .library-entry-tag-chip-remove {
     display: inline-flex;
     align-items: center;
     justify-content: center;
@@ -118,20 +118,20 @@
     transition: width 120ms ease, opacity 120ms ease, background 120ms ease, color 120ms ease;
 }
 
-.library-entry-tag-chip:hover .library-entry-tag-chip-remove,
-.library-entry-tag-chip:focus-within .library-entry-tag-chip-remove {
+.library-entry-tag-chip:hover ::deep .library-entry-tag-chip-remove,
+.library-entry-tag-chip:focus-within ::deep .library-entry-tag-chip-remove {
     width: 16px;
     opacity: 0.6;
     margin-left: 2px;
 }
 
-.library-entry-tag-chip-remove:hover {
+.library-entry-tag-chip ::deep .library-entry-tag-chip-remove:hover {
     opacity: 1;
     color: var(--clr-red);
     background: color-mix(in srgb, var(--clr-red) 14%, transparent);
 }
 
-.library-entry-tag-chip-remove:focus-visible {
+.library-entry-tag-chip ::deep .library-entry-tag-chip-remove:focus-visible {
     opacity: 1;
     outline: 2px solid var(--clr-statusbar);
     outline-offset: 1px;
diff --git a/src/EventLogExpert.UI/Inputs/Button.cs b/src/EventLogExpert.UI/Inputs/Button.cs
index 8a84577f2..49863d9b3 100644
--- a/src/EventLogExpert.UI/Inputs/Button.cs
+++ b/src/EventLogExpert.UI/Inputs/Button.cs
@@ -3,7 +3,7 @@
 
 namespace EventLogExpert.UI.Inputs;
 
-public sealed class Button : ButtonBase
+public sealed class Button : StyledButtonBase
 {
     protected override string? VariantClass => null;
 }
diff --git a/src/EventLogExpert.UI/Inputs/ButtonBase.cs b/src/EventLogExpert.UI/Inputs/ButtonBase.cs
index ef2156e2e..e2bbba62c 100644
--- a/src/EventLogExpert.UI/Inputs/ButtonBase.cs
+++ b/src/EventLogExpert.UI/Inputs/ButtonBase.cs
@@ -24,16 +24,16 @@ public abstract class ButtonBase : ComponentBase
 
     [Parameter] public string? IconClass { get; set; }
 
-    [Parameter] public bool IconOnly { get; set; }
-
     [Parameter] public EventCallback<MouseEventArgs> OnClick { get; set; }
 
-    [Parameter] public string? Type { get; set; } = "button";
+    [Parameter] public bool StopPropagation { get; set; }
 
-    protected abstract string? VariantClass { get; }
+    [Parameter] public string? Type { get; set; } = "button";
 
     public ValueTask FocusAsync(bool preventScroll = false) => _element.FocusAsync(preventScroll);
 
+    protected abstract string BuildCssClass();
+
     protected override void BuildRenderTree(RenderTreeBuilder builder)
     {
         builder.OpenElement(0, "button");
@@ -44,38 +44,40 @@ protected override void BuildRenderTree(RenderTreeBuilder builder)
         }
 
         builder.AddAttribute(2, "type", string.IsNullOrWhiteSpace(Type) ? "button" : Type);
-        builder.AddAttribute(3, "class", BuildCssClass());
+
+        var cssClass = BuildCssClass();
+
+        if (!string.IsNullOrWhiteSpace(cssClass))
+        {
+            builder.AddAttribute(3, "class", cssClass);
+        }
+
         builder.AddAttribute(4, "disabled", Disabled);
-        builder.AddAttribute(5, "onclick", OnClick);
-        builder.AddElementReferenceCapture(6, capturedRef => _element = capturedRef);
+        builder.AddAttribute(5, "onclick", EventCallback.Factory.Create<MouseEventArgs>(this, HandleClickAsync));
+
+        if (StopPropagation)
+        {
+            builder.AddEventStopPropagationAttribute(6, "onclick", true);
+        }
+
+        builder.AddElementReferenceCapture(7, capturedRef => _element = capturedRef);
 
         if (!string.IsNullOrWhiteSpace(IconClass))
         {
-            builder.OpenElement(7, "i");
-            builder.AddAttribute(8, "aria-hidden", "true");
-            builder.AddAttribute(9, "class", IconClass);
+            builder.OpenElement(8, "i");
+            builder.AddAttribute(9, "aria-hidden", "true");
+            builder.AddAttribute(10, "class", IconClass);
             builder.CloseElement();
 
             if (ChildContent is not null)
             {
-                builder.AddContent(10, " ");
+                builder.AddContent(11, " ");
             }
         }
 
-        builder.AddContent(11, ChildContent);
+        builder.AddContent(12, ChildContent);
         builder.CloseElement();
     }
 
-    private string BuildCssClass()
-    {
-        var classes = new List<string>(4) { "button" };
-
-        if (!string.IsNullOrWhiteSpace(VariantClass)) { classes.Add(VariantClass); }
-
-        if (IconOnly) { classes.Add("icon-button"); }
-
-        if (!string.IsNullOrWhiteSpace(CssClass)) { classes.Add(CssClass); }
-
-        return string.Join(' ', classes);
-    }
+    private Task HandleClickAsync(MouseEventArgs args) => Disabled ? Task.CompletedTask : OnClick.InvokeAsync(args);
 }
diff --git a/src/EventLogExpert.UI/Inputs/ChromelessButton.cs b/src/EventLogExpert.UI/Inputs/ChromelessButton.cs
new file mode 100644
index 000000000..7c4797fb8
--- /dev/null
+++ b/src/EventLogExpert.UI/Inputs/ChromelessButton.cs
@@ -0,0 +1,9 @@
+// // Copyright (c) Microsoft Corporation.
+// // Licensed under the MIT License.
+
+namespace EventLogExpert.UI.Inputs;
+
+public sealed class ChromelessButton : ButtonBase
+{
+    protected override string BuildCssClass() => CssClass;
+}
diff --git a/src/EventLogExpert.UI/Inputs/DangerButton.cs b/src/EventLogExpert.UI/Inputs/DangerButton.cs
index fd78d6883..b52a33270 100644
--- a/src/EventLogExpert.UI/Inputs/DangerButton.cs
+++ b/src/EventLogExpert.UI/Inputs/DangerButton.cs
@@ -3,7 +3,7 @@
 
 namespace EventLogExpert.UI.Inputs;
 
-public sealed class DangerButton : ButtonBase
+public sealed class DangerButton : StyledButtonBase
 {
     protected override string VariantClass => "button-red";
 }
diff --git a/src/EventLogExpert.UI/Inputs/PrimaryButton.cs b/src/EventLogExpert.UI/Inputs/PrimaryButton.cs
index 5e64505db..c0a476d01 100644
--- a/src/EventLogExpert.UI/Inputs/PrimaryButton.cs
+++ b/src/EventLogExpert.UI/Inputs/PrimaryButton.cs
@@ -3,7 +3,7 @@
 
 namespace EventLogExpert.UI.Inputs;
 
-public sealed class PrimaryButton : ButtonBase
+public sealed class PrimaryButton : StyledButtonBase
 {
     protected override string VariantClass => "button-green";
 }
diff --git a/src/EventLogExpert.UI/Inputs/StyledButtonBase.cs b/src/EventLogExpert.UI/Inputs/StyledButtonBase.cs
new file mode 100644
index 000000000..42c57e9de
--- /dev/null
+++ b/src/EventLogExpert.UI/Inputs/StyledButtonBase.cs
@@ -0,0 +1,26 @@
+// // Copyright (c) Microsoft Corporation.
+// // Licensed under the MIT License.
+
+using Microsoft.AspNetCore.Components;
+
+namespace EventLogExpert.UI.Inputs;
+
+public abstract class StyledButtonBase : ButtonBase
+{
+    [Parameter] public bool IconOnly { get; set; }
+
+    protected abstract string? VariantClass { get; }
+
+    protected override string BuildCssClass()
+    {
+        var classes = new List<string>(4) { "button" };
+
+        if (!string.IsNullOrWhiteSpace(VariantClass)) { classes.Add(VariantClass); }
+
+        if (IconOnly) { classes.Add("icon-button"); }
+
+        if (!string.IsNullOrWhiteSpace(CssClass)) { classes.Add(CssClass); }
+
+        return string.Join(' ', classes);
+    }
+}
diff --git a/src/EventLogExpert.UI/Inputs/TagPicker.razor b/src/EventLogExpert.UI/Inputs/TagPicker.razor
index 7d96e7ed7..746812ae4 100644
--- a/src/EventLogExpert.UI/Inputs/TagPicker.razor
+++ b/src/EventLogExpert.UI/Inputs/TagPicker.razor
@@ -7,12 +7,10 @@
 
             <span class="tag-picker-chip" role="listitem">
                 <span class="tag-picker-chip-label">@tag</span>
-                <button aria-label="@($"Remove {tag}")"
-                    class="tag-picker-chip-remove"
-                    @onclick="() => RemoveTagAsync(index)"
-                    type="button">
-                    <i aria-hidden="true" class="bi bi-x"></i>
-                </button>
+                <ChromelessButton aria-label="@($"Remove {tag}")"
+                    CssClass="tag-picker-chip-remove"
+                    IconClass="bi bi-x"
+                    OnClick="@(() => RemoveTagAsync(index))" />
             </span>
         }
 
diff --git a/src/EventLogExpert.UI/Inputs/TagPicker.razor.css b/src/EventLogExpert.UI/Inputs/TagPicker.razor.css
index 049919f37..7d8d7a36f 100644
--- a/src/EventLogExpert.UI/Inputs/TagPicker.razor.css
+++ b/src/EventLogExpert.UI/Inputs/TagPicker.razor.css
@@ -36,7 +36,7 @@
     white-space: nowrap;
 }
 
-.tag-picker-chip-remove {
+.tag-picker-chip ::deep .tag-picker-chip-remove {
     display: inline-flex;
     align-items: center;
     justify-content: center;
@@ -50,7 +50,7 @@
     line-height: 1;
 }
 
-.tag-picker-chip-remove:hover {
+.tag-picker-chip ::deep .tag-picker-chip-remove:hover {
     color: var(--clr-red);
 }
 
diff --git a/src/EventLogExpert.UI/Inputs/WarningButton.cs b/src/EventLogExpert.UI/Inputs/WarningButton.cs
index d547339b8..e09626e5a 100644
--- a/src/EventLogExpert.UI/Inputs/WarningButton.cs
+++ b/src/EventLogExpert.UI/Inputs/WarningButton.cs
@@ -3,7 +3,7 @@
 
 namespace EventLogExpert.UI.Inputs;
 
-public sealed class WarningButton : ButtonBase
+public sealed class WarningButton : StyledButtonBase
 {
     protected override string VariantClass => "button-yellow";
 }
diff --git a/tests/Unit/EventLogExpert.UI.Tests/Inputs/ButtonTests.cs b/tests/Unit/EventLogExpert.UI.Tests/Inputs/ButtonTests.cs
index 97e58c6bb..7b113c439 100644
--- a/tests/Unit/EventLogExpert.UI.Tests/Inputs/ButtonTests.cs
+++ b/tests/Unit/EventLogExpert.UI.Tests/Inputs/ButtonTests.cs
@@ -35,6 +35,19 @@ public async Task Click_InvokesOnClickWithMouseEventArgs()
         Assert.True(received.CtrlKey);
     }
 
+    [Fact]
+    public async Task Click_WhenDisabled_DoesNotInvokeOnClick()
+    {
+        bool invoked = false;
+        var component = Render<Button>(parameters => parameters
+            .Add(p => p.Disabled, true)
+            .Add(p => p.OnClick, () => invoked = true));
+
+        await component.Find("button").ClickAsync(new MouseEventArgs());
+
+        Assert.False(invoked);
+    }
+
     [Fact]
     public void Render_AdditionalAttributes_SplattedToButton()
     {
diff --git a/tests/Unit/EventLogExpert.UI.Tests/Inputs/ChromelessButtonTests.cs b/tests/Unit/EventLogExpert.UI.Tests/Inputs/ChromelessButtonTests.cs
new file mode 100644
index 000000000..d83e629f8
--- /dev/null
+++ b/tests/Unit/EventLogExpert.UI.Tests/Inputs/ChromelessButtonTests.cs
@@ -0,0 +1,30 @@
+// // Copyright (c) Microsoft Corporation.
+// // Licensed under the MIT License.
+
+using Bunit;
+using EventLogExpert.UI.Inputs;
+
+namespace EventLogExpert.UI.Tests.Inputs;
+
+public sealed class ChromelessButtonTests : BunitContext
+{
+    [Fact]
+    public void Render_EmptyCssClass_OmitsClassAttribute()
+    {
+        var component = Render<ChromelessButton>();
+
+        var button = component.Find("button");
+        Assert.False(button.HasAttribute("class"));
+    }
+
+    [Fact]
+    public void Render_WithCssClass_RendersCssClassWithoutButtonChrome()
+    {
+        var component = Render<ChromelessButton>(parameters => parameters
+            .Add(p => p.CssClass, "empty-dashboard__launch"));
+
+        var button = component.Find("button");
+        Assert.Contains("empty-dashboard__launch", button.ClassList);
+        Assert.DoesNotContain("button", button.ClassList);
+    }
+}

From 8371b4d1793540e255037d7da43ab019904e9fd4 Mon Sep 17 00:00:00 2001
From: jschick04 <jschick04@gmail.com>
Date: Sat, 20 Jun 2026 12:32:09 -0500
Subject: [PATCH 13/40] Extend ButtonBase with keyboard events and migrate
 remaining buttons to ChromelessButton

---
 .../Dashboard/ScenarioDetail.razor            | 10 ++---
 .../Dashboard/ScenarioDetail.razor.css        |  8 ++--
 .../Database/DatabaseEntryRow.razor           |  2 +-
 .../Database/DatabaseEntryRow.razor.cs        |  8 +++-
 .../Database/DatabaseEntryRow.razor.css       |  2 +-
 .../Tabs/ManageDatabasesTab.razor             | 16 ++++---
 .../Tabs/ManageDatabasesTab.razor.cs          |  6 +--
 .../Tabs/ManageDatabasesTab.razor.css         |  4 +-
 .../DetailsPane/DetailsPane.razor             | 28 +++++--------
 .../DetailsPane/DetailsPane.razor.cs          | 42 -------------------
 .../DetailsPane/DetailsPane.razor.css         | 22 ++++++++--
 .../FilterLibrary/FilterLibraryModal.razor    | 31 +++++++-------
 .../FilterLibraryModal.razor.css              | 12 +++---
 src/EventLogExpert.UI/Inputs/ButtonBase.cs    | 31 +++++++++++---
 .../LogTable/LogTablePane.razor               |  9 ++--
 .../LogTable/LogTablePane.razor.css           | 10 ++---
 src/EventLogExpert.UI/Menu/MenuBar.razor      | 17 ++++----
 src/EventLogExpert.UI/Menu/MenuBar.razor.cs   | 13 ++++--
 src/EventLogExpert.UI/Menu/MenuBar.razor.css  | 24 +++++------
 src/EventLogExpert.UI/Modal/SidebarTabs.razor | 13 +++---
 .../Modal/SidebarTabs.razor.cs                | 13 +++---
 .../Modal/SidebarTabs.razor.css               | 10 ++---
 src/EventLogExpert.UI/wwwroot/app.css         |  8 ++++
 .../Inputs/ButtonTests.cs                     | 37 ++++++++++++++++
 .../LogTable/LogTablePaneSelectionTests.cs    |  4 +-
 25 files changed, 208 insertions(+), 172 deletions(-)

diff --git a/src/EventLogExpert.UI/Dashboard/ScenarioDetail.razor b/src/EventLogExpert.UI/Dashboard/ScenarioDetail.razor
index 993ae5d9a..b8f644dc9 100644
--- a/src/EventLogExpert.UI/Dashboard/ScenarioDetail.razor
+++ b/src/EventLogExpert.UI/Dashboard/ScenarioDetail.razor
@@ -42,13 +42,11 @@
         }
     </div>
     <div class="scenario-detail__actions">
-        <button aria-label="@(IsFavored ? $"Remove {Scenario.Name} from favorites" : $"Add {Scenario.Name} to favorites")"
+        <ChromelessButton aria-label="@(IsFavored ? $"Remove {Scenario.Name} from favorites" : $"Add {Scenario.Name} to favorites")"
             aria-pressed="@(IsFavored ? "true" : "false")"
-            class="scenario-detail__star"
-            @onclick="OnToggleFavorite"
-            type="button">
-            <i aria-hidden="true" class="bi @(IsFavored ? "bi-star-fill" : "bi-star")"></i>
-        </button>
+            CssClass="scenario-detail__star"
+            IconClass="@(IsFavored ? "bi bi-star-fill" : "bi bi-star")"
+            OnClick="OnToggleFavorite" />
         <ChromelessButton aria-describedby="@(IsDisabled ? ElevationReasonId : null)"
             aria-disabled="@(IsDisabled ? "true" : "false")"
             CssClass="scenario-detail__launch"
diff --git a/src/EventLogExpert.UI/Dashboard/ScenarioDetail.razor.css b/src/EventLogExpert.UI/Dashboard/ScenarioDetail.razor.css
index 7a1c049bd..b869cbedd 100644
--- a/src/EventLogExpert.UI/Dashboard/ScenarioDetail.razor.css
+++ b/src/EventLogExpert.UI/Dashboard/ScenarioDetail.razor.css
@@ -116,7 +116,7 @@
     margin-top: 0.75rem;
 }
 
-.scenario-detail__star {
+.scenario-detail__actions ::deep .scenario-detail__star {
     display: inline-flex;
     align-items: center;
     justify-content: center;
@@ -131,15 +131,15 @@
     transition: color 0.15s ease, border-color 0.15s ease;
 }
 
-.scenario-detail__star[aria-pressed="true"] {
+.scenario-detail__actions ::deep .scenario-detail__star[aria-pressed="true"] {
     color: var(--clr-yellow);
 }
 
-.scenario-detail__star[aria-pressed="false"]:hover {
+.scenario-detail__actions ::deep .scenario-detail__star[aria-pressed="false"]:hover {
     border-color: var(--clr-lightblue);
 }
 
-.scenario-detail__star:focus-visible {
+.scenario-detail__actions ::deep .scenario-detail__star:focus-visible {
     outline: 2px solid var(--clr-lightblue);
     outline-offset: 2px;
 }
diff --git a/src/EventLogExpert.UI/Database/DatabaseEntryRow.razor b/src/EventLogExpert.UI/Database/DatabaseEntryRow.razor
index 4dd48b8dc..10124f38c 100644
--- a/src/EventLogExpert.UI/Database/DatabaseEntryRow.razor
+++ b/src/EventLogExpert.UI/Database/DatabaseEntryRow.razor
@@ -11,7 +11,7 @@
 
     <div class="db-entry-row-content">
         <div class="db-entry-info">
-            <button class="db-entry-name" id="@_nameButtonId" @ref="_nameButtonRef" type="button">@Entry.FileName</button>
+            <ChromelessButton CssClass="db-entry-name" id="@_nameButtonId" @ref="_nameButton">@Entry.FileName</ChromelessButton>
             @if (ShouldShowBadge)
             {
                 <span class="db-entry-badge" data-badge="@BadgeKind">@BadgeLabel</span>
diff --git a/src/EventLogExpert.UI/Database/DatabaseEntryRow.razor.cs b/src/EventLogExpert.UI/Database/DatabaseEntryRow.razor.cs
index 3527f791b..0ea52ffff 100644
--- a/src/EventLogExpert.UI/Database/DatabaseEntryRow.razor.cs
+++ b/src/EventLogExpert.UI/Database/DatabaseEntryRow.razor.cs
@@ -8,6 +8,7 @@
 using EventLogExpert.Runtime.Menu;
 using EventLogExpert.UI.Common;
 using EventLogExpert.UI.Focus;
+using EventLogExpert.UI.Inputs;
 using Microsoft.AspNetCore.Components;
 using Microsoft.AspNetCore.Components.Web;
 
@@ -21,7 +22,7 @@ public sealed partial class DatabaseEntryRow : ComponentBase
     private readonly string _nameButtonId = ComponentId.NewUnique("db-row-name").Value;
     private readonly string _pendingStatusId = ComponentId.NewUnique("db-row-pending").Value;
 
-    private ElementReference _nameButtonRef;
+    private ChromelessButton? _nameButton;
     private bool _shouldFocusNameAfterRender;
 
     private enum ActionKind
@@ -110,7 +111,10 @@ UpgradeProgress is null &&
 
     [Inject] private ITraceLogger TraceLogger { get; init; } = null!;
 
-    public ValueTask FocusNameAsync() => ElementFocus.SafelyAsync(_nameButtonRef, preventScroll: true);
+    public ValueTask FocusNameAsync() =>
+        _nameButton is { } button ?
+            ElementFocus.SafelyAsync(button.Element, preventScroll: true) :
+            ValueTask.CompletedTask;
 
     protected override async Task OnAfterRenderAsync(bool firstRender)
     {
diff --git a/src/EventLogExpert.UI/Database/DatabaseEntryRow.razor.css b/src/EventLogExpert.UI/Database/DatabaseEntryRow.razor.css
index 6839afa13..2cba15a24 100644
--- a/src/EventLogExpert.UI/Database/DatabaseEntryRow.razor.css
+++ b/src/EventLogExpert.UI/Database/DatabaseEntryRow.razor.css
@@ -42,7 +42,7 @@
     min-width: 0;
 }
 
-.db-entry-name {
+.db-entry-row ::deep .db-entry-name {
     flex: 1 1 auto;
     min-width: 0;
 
diff --git a/src/EventLogExpert.UI/DatabaseTools/Tabs/ManageDatabasesTab.razor b/src/EventLogExpert.UI/DatabaseTools/Tabs/ManageDatabasesTab.razor
index be0119fc5..fea0baccb 100644
--- a/src/EventLogExpert.UI/DatabaseTools/Tabs/ManageDatabasesTab.razor
+++ b/src/EventLogExpert.UI/DatabaseTools/Tabs/ManageDatabasesTab.razor
@@ -4,7 +4,7 @@
     @if (IsClassificationPending)
     {
         <div class="manage-status-banner manage-status-banner--info" role="status">
-            <i aria-hidden="true" class="bi bi-arrow-repeat manage-status-banner__spinner loader-spin"></i>
+            <i aria-hidden="true" class="bi bi-arrow-repeat loader-spin manage-status-banner__spinner"></i>
             <span class="manage-status-banner__message">Classifying databases&hellip;</span>
         </div>
     }
@@ -36,15 +36,13 @@
     {
         <div class="manage-databases-selection-header">
             <div class="manage-databases-master-checkbox">
-                <button aria-checked="@MasterCheckboxAriaChecked"
+                <ChromelessButton aria-checked="@MasterCheckboxAriaChecked"
                     aria-label="@MasterCheckboxAriaLabel"
-                    class="manage-databases-master-btn"
-                    @onclick="OnMasterCheckboxClickAsync"
-                    @ref="_masterCheckboxRef"
-                    role="checkbox"
-                    type="button">
-                    <i aria-hidden="true" class="bi @MasterCheckboxIconClass"></i>
-                </button>
+                    CssClass="manage-databases-master-btn"
+                    IconClass="@($"bi {MasterCheckboxIconClass}")"
+                    OnClick="OnMasterCheckboxClickAsync"
+                    @ref="_masterCheckbox"
+                    role="checkbox" />
             </div>
             <span class="manage-databases-selection-count">
                 @_selectedForBulk.Count of @DatabaseService.Entries.Count selected
diff --git a/src/EventLogExpert.UI/DatabaseTools/Tabs/ManageDatabasesTab.razor.cs b/src/EventLogExpert.UI/DatabaseTools/Tabs/ManageDatabasesTab.razor.cs
index 908b018d2..38b97030b 100644
--- a/src/EventLogExpert.UI/DatabaseTools/Tabs/ManageDatabasesTab.razor.cs
+++ b/src/EventLogExpert.UI/DatabaseTools/Tabs/ManageDatabasesTab.razor.cs
@@ -37,7 +37,7 @@ public sealed partial class ManageDatabasesTab : ComponentBase, IAsyncDisposable
     private Button? _importButton;
     private ImmutableHashSet<string> _initialActiveSnapshot = ImmutableHashSet<string>.Empty;
     private bool _isSelectionModeActive;
-    private ElementReference _masterCheckboxRef;
+    private ChromelessButton? _masterCheckbox;
     private bool _restorationOccurred;
     private bool _schemaUpgradeOccurred;
     private Button? _selectButton;
@@ -557,7 +557,7 @@ private async Task FocusAfterBulkUpgradeAsync()
 
         if (_selectedForBulk.Count > 0)
         {
-            await ElementFocus.SafelyAsync(_masterCheckboxRef, preventScroll: true);
+            await FocusRestoreAsync(_masterCheckbox);
 
             return;
         }
@@ -858,7 +858,7 @@ private async Task OnMasterCheckboxClickAsync()
             SelectAll();
         }
 
-        await ElementFocus.SafelyAsync(_masterCheckboxRef, preventScroll: true);
+        await FocusRestoreAsync(_masterCheckbox);
     }
 
     private async Task OnSaveClickAsync()
diff --git a/src/EventLogExpert.UI/DatabaseTools/Tabs/ManageDatabasesTab.razor.css b/src/EventLogExpert.UI/DatabaseTools/Tabs/ManageDatabasesTab.razor.css
index 341e8abe8..8df2a33e2 100644
--- a/src/EventLogExpert.UI/DatabaseTools/Tabs/ManageDatabasesTab.razor.css
+++ b/src/EventLogExpert.UI/DatabaseTools/Tabs/ManageDatabasesTab.razor.css
@@ -35,7 +35,7 @@
     animation: manage-databases-selection-header-fade-in 200ms ease-out;
 }
 
-.manage-databases-master-btn {
+.manage-databases-tab ::deep .manage-databases-master-btn {
     display: inline-flex;
     align-items: center;
     justify-content: center;
@@ -59,7 +59,7 @@
     overflow: hidden;
 }
 
-.manage-databases-master-btn:focus-visible {
+.manage-databases-tab ::deep .manage-databases-master-btn:focus-visible {
     outline: 2px solid var(--clr-lightblue);
     outline-offset: 2px;
     border-radius: 2px;
diff --git a/src/EventLogExpert.UI/DetailsPane/DetailsPane.razor b/src/EventLogExpert.UI/DetailsPane/DetailsPane.razor
index 79b196e95..dcbe238b5 100644
--- a/src/EventLogExpert.UI/DetailsPane/DetailsPane.razor
+++ b/src/EventLogExpert.UI/DetailsPane/DetailsPane.razor
@@ -1,22 +1,19 @@
 @inherits FluxorComponent
 
-<div class="details-pane" data-toggle="@IsVisible" hidden="@(_selectedEvent is null)" @ref="_detailsPaneRootRef">
+<div class="details-pane" data-toggle="@IsVisible" hidden="@(_selectedEvent is null)">
     <div class="details-resizer"></div>
 
-    <div aria-expanded="@_isVisible.ToString().ToLower()"
+    <ChromelessButton aria-expanded="@_isVisible.ToString().ToLower()"
         aria-label="@(_isVisible ? "Details Expanded" : "Details Collapsed")"
-        class="flex-space-between"
+        CssClass="flex-space-between"
         id="details-header"
-        @onclick="ToggleMenu"
-        @onkeydown="HandleKeyDown"
-        role="button"
-        tabindex="0">
-        <div>Details</div>
+        OnClick="ToggleMenu">
+        <span>Details</span>
 
         <span class="menu-toggle" data-rotate="@IsVisible">
             <i class="bi bi-caret-up"></i>
         </span>
-    </div>
+    </ChromelessButton>
 
     @if (_selectedEvent is not null)
     {
@@ -39,18 +36,15 @@
 
         <hr />
 
-        <div aria-expanded="@_isXmlVisible.ToString().ToLower()"
+        <ChromelessButton aria-expanded="@_isXmlVisible.ToString().ToLower()"
             aria-label="@(_isXmlVisible ? "XML Expanded" : "XML Collapsed")"
-            class="details-row-xml flex-space-between"
-            @onclick="ToggleXml"
-            @onkeydown="HandleKeyDownXml"
-            role="button"
-            tabindex="0">
-            <div>XML</div>
+            CssClass="details-row-xml flex-space-between"
+            OnClick="ToggleXml">
+            <span>XML</span>
             <span class="menu-toggle" data-rotate="@_isXmlVisible.ToString().ToLower()">
                 <i class="bi bi-caret-up"></i>
             </span>
-        </div>
+        </ChromelessButton>
 
         <p class="details-xml" data-toggle="@_isXmlVisible.ToString().ToLower()">
             @if (_resolvedXml is null)
diff --git a/src/EventLogExpert.UI/DetailsPane/DetailsPane.razor.cs b/src/EventLogExpert.UI/DetailsPane/DetailsPane.razor.cs
index 67462d545..48d704646 100644
--- a/src/EventLogExpert.UI/DetailsPane/DetailsPane.razor.cs
+++ b/src/EventLogExpert.UI/DetailsPane/DetailsPane.razor.cs
@@ -10,7 +10,6 @@
 using EventLogExpert.UI.Common.Interop;
 using Fluxor;
 using Microsoft.AspNetCore.Components;
-using Microsoft.AspNetCore.Components.Web;
 using Microsoft.JSInterop;
 using System.Xml;
 using System.Xml.Linq;
@@ -20,7 +19,6 @@ namespace EventLogExpert.UI.DetailsPane;
 public sealed partial class DetailsPane
 {
     private IJSObjectReference? _detailsPaneModule;
-    private ElementReference _detailsPaneRootRef;
     private DotNetObjectReference<DetailsPane>? _dotNetRef;
     private bool _hasOpened;
     private bool _isVisible;
@@ -31,7 +29,6 @@ public sealed partial class DetailsPane
     ///     failure); any other value is the rendered XML.
     /// </summary>
     private string? _resolvedXml;
-    private IJSObjectReference? _scrollSuppressorModule;
     private ResolvedEvent? _selectedEvent;
     /// <summary>Cancels any in-flight XML resolution when the selection changes again before completion.</summary>
     private CancellationTokenSource? _xmlResolveCts;
@@ -73,12 +70,7 @@ await JsModuleInterop.DisposeModuleSafelyAsync(
                 _detailsPaneModule,
                 static module => module.InvokeVoidAsync("disposeDetailsPaneResizer"));
 
-            await JsModuleInterop.DisposeModuleSafelyAsync(
-                _scrollSuppressorModule,
-                module => module.InvokeVoidAsync("release", _detailsPaneRootRef));
-
             _detailsPaneModule = null;
-            _scrollSuppressorModule = null;
 
             _dotNetRef?.Dispose();
         }
@@ -100,20 +92,6 @@ await _detailsPaneModule.InvokeVoidAsync(
                 "enableDetailsPaneResizer",
                 _dotNetRef,
                 PreferencesProvider.DetailsPaneHeightPreference);
-
-            try
-            {
-                _scrollSuppressorModule = await JSRuntime.InvokeAsync<IJSObjectReference>(
-                    "import",
-                    "./_content/EventLogExpert.UI/Common/keyboardScrollSuppressor.js");
-
-                await _scrollSuppressorModule.InvokeVoidAsync(
-                    "suppress",
-                    _detailsPaneRootRef,
-                    new[] { new { selector = "#details-header, .details-row-xml", keys = new[] { "Enter", " " } } });
-            }
-            catch (JSDisconnectedException) { }
-            catch (JSException) { }
         }
 
         await base.OnAfterRenderAsync(firstRender);
@@ -153,26 +131,6 @@ private string GetXmlForDisplay()
         }
     }
 
-    private void HandleKeyDown(KeyboardEventArgs e)
-    {
-        if (e.Repeat) { return; }
-
-        if (e.Key is "Enter" or " ")
-        {
-            ToggleMenu();
-        }
-    }
-
-    private void HandleKeyDownXml(KeyboardEventArgs e)
-    {
-        if (e.Repeat) { return; }
-
-        if (e.Key is "Enter" or " ")
-        {
-            ToggleXml();
-        }
-    }
-
     private async void OnSelectedEventChanged(object? sender, ResolvedEvent? selectedEvent)
     {
         try
diff --git a/src/EventLogExpert.UI/DetailsPane/DetailsPane.razor.css b/src/EventLogExpert.UI/DetailsPane/DetailsPane.razor.css
index 77e73f24f..bc2d67860 100644
--- a/src/EventLogExpert.UI/DetailsPane/DetailsPane.razor.css
+++ b/src/EventLogExpert.UI/DetailsPane/DetailsPane.razor.css
@@ -14,11 +14,11 @@
     &[data-toggle="false"] {
         height: auto;
         min-height: 0;
-
-        & > :not(#details-header) { display: none; }
     }
 }
 
+.details-pane[data-toggle="false"] ::deep > :not(#details-header) { display: none; }
+
 .details-resizer {
     height: 10px;
     width: 100%;
@@ -33,7 +33,14 @@
     cursor: n-resize;
 }
 
-#details-header {
+.details-pane ::deep #details-header {
+    appearance: none;
+    background: none;
+    border: 0;
+    padding: 0;
+    color: inherit;
+    font: inherit;
+    text-align: left;
     user-select: none;
     cursor: pointer;
 }
@@ -52,7 +59,14 @@
     white-space: pre-wrap;
 }
 
-.details-row-xml {
+.details-pane ::deep .details-row-xml {
+    appearance: none;
+    background: none;
+    border: 0;
+    padding: 0;
+    color: inherit;
+    font: inherit;
+    text-align: left;
     user-select: none;
     cursor: pointer;
 }
diff --git a/src/EventLogExpert.UI/FilterLibrary/FilterLibraryModal.razor b/src/EventLogExpert.UI/FilterLibrary/FilterLibraryModal.razor
index 12ad508d8..076d94419 100644
--- a/src/EventLogExpert.UI/FilterLibrary/FilterLibraryModal.razor
+++ b/src/EventLogExpert.UI/FilterLibrary/FilterLibraryModal.razor
@@ -61,23 +61,22 @@
                                 @foreach (var tag in visibleTags)
                                 {
                                     var isSelected = _selectedTagsByTab[tab].Contains(tag, StringComparer.OrdinalIgnoreCase);
-                                    <button aria-pressed="@(isSelected ? "true" : "false")"
-                                        class="library-tag-filter-chip"
-                                        @onclick="@(() => ToggleTagFilter(tag))"
-                                        type="button">
+
+                                    <ChromelessButton aria-pressed="@(isSelected ? "true" : "false")"
+                                        CssClass="library-tag-filter-chip"
+                                        OnClick="@(() => ToggleTagFilter(tag))">
                                         @tag
-                                    </button>
+                                    </ChromelessButton>
                                 }
                                 @if (hiddenTagsCount > 0)
                                 {
-                                    <button aria-controls="@(_isTagOverflowExpanded ? tagOverflowRegionId : null)"
+                                    <ChromelessButton aria-controls="@(_isTagOverflowExpanded ? tagOverflowRegionId : null)"
                                         aria-expanded="@(_isTagOverflowExpanded ? "true" : "false")"
                                         aria-label="@(_isTagOverflowExpanded ? "Hide additional tags" : $"Show {hiddenTagsCount} additional tags")"
-                                        class="library-tag-filter-chip-overflow"
-                                        @onclick="ToggleTagOverflowExpanded"
-                                        type="button">
-                                        @(_isTagOverflowExpanded ? "− less" : $"+{hiddenTagsCount} more")
-                                    </button>
+                                        CssClass="library-tag-filter-chip-overflow"
+                                        OnClick="ToggleTagOverflowExpanded">
+                                        @(_isTagOverflowExpanded ? "- less" : $"+{hiddenTagsCount} more")
+                                    </ChromelessButton>
                                 }
                                 @if (_isTagOverflowExpanded && hiddenTagsCount > 0)
                                 {
@@ -85,12 +84,12 @@
                                         @foreach (var tag in AllLibraryTags.Skip(TagFilterBarMaxVisible))
                                         {
                                             var isOverflowSelected = _selectedTagsByTab[tab].Contains(tag, StringComparer.OrdinalIgnoreCase);
-                                            <button aria-pressed="@(isOverflowSelected ? "true" : "false")"
-                                                class="library-tag-filter-chip"
-                                                @onclick="@(() => ToggleTagFilter(tag))"
-                                                type="button">
+
+                                            <ChromelessButton aria-pressed="@(isOverflowSelected ? "true" : "false")"
+                                                CssClass="library-tag-filter-chip"
+                                                OnClick="@(() => ToggleTagFilter(tag))">
                                                 @tag
-                                            </button>
+                                            </ChromelessButton>
                                         }
                                     </div>
                                 }
diff --git a/src/EventLogExpert.UI/FilterLibrary/FilterLibraryModal.razor.css b/src/EventLogExpert.UI/FilterLibrary/FilterLibraryModal.razor.css
index 100698ad3..9fe77c38d 100644
--- a/src/EventLogExpert.UI/FilterLibrary/FilterLibraryModal.razor.css
+++ b/src/EventLogExpert.UI/FilterLibrary/FilterLibraryModal.razor.css
@@ -32,7 +32,7 @@
     line-height: 1;
 }
 
-.library-tag-filter-chip {
+.library-tag-filter-bar ::deep .library-tag-filter-chip {
     padding: 0 .375rem;
     color: var(--text-primary);
     background: transparent;
@@ -43,25 +43,25 @@
     cursor: pointer;
 }
 
-.library-tag-filter-chip:hover {
+.library-tag-filter-bar ::deep .library-tag-filter-chip:hover {
     border-color: var(--clr-statusbar);
 }
 
-.library-tag-filter-chip[aria-pressed="true"] {
+.library-tag-filter-bar ::deep .library-tag-filter-chip[aria-pressed="true"] {
     background: var(--clr-statusbar);
     color: var(--clr-white);
     border-color: var(--clr-statusbar);
 }
 
-.library-tag-filter-chip[aria-pressed="true"]:hover,
-.library-tag-filter-chip[aria-pressed="true"]:focus-visible {
+.library-tag-filter-bar ::deep .library-tag-filter-chip[aria-pressed="true"]:hover,
+.library-tag-filter-bar ::deep .library-tag-filter-chip[aria-pressed="true"]:focus-visible {
     background: var(--clr-statusbar);
     color: var(--clr-white);
     border-color: var(--clr-statusbar);
     filter: brightness(0.95);
 }
 
-.library-tag-filter-chip-overflow {
+.library-tag-filter-bar ::deep .library-tag-filter-chip-overflow {
     padding: 0 .375rem;
     font-size: .75rem;
     color: var(--text-secondary);
diff --git a/src/EventLogExpert.UI/Inputs/ButtonBase.cs b/src/EventLogExpert.UI/Inputs/ButtonBase.cs
index e2bbba62c..0835d34a1 100644
--- a/src/EventLogExpert.UI/Inputs/ButtonBase.cs
+++ b/src/EventLogExpert.UI/Inputs/ButtonBase.cs
@@ -26,6 +26,12 @@ public abstract class ButtonBase : ComponentBase
 
     [Parameter] public EventCallback<MouseEventArgs> OnClick { get; set; }
 
+    [Parameter] public EventCallback<KeyboardEventArgs> OnKeyDown { get; set; }
+
+    [Parameter] public EventCallback<MouseEventArgs> OnMouseEnter { get; set; }
+
+    [Parameter] public bool StopKeyDownPropagation { get; set; }
+
     [Parameter] public bool StopPropagation { get; set; }
 
     [Parameter] public string? Type { get; set; } = "button";
@@ -60,24 +66,37 @@ protected override void BuildRenderTree(RenderTreeBuilder builder)
             builder.AddEventStopPropagationAttribute(6, "onclick", true);
         }
 
-        builder.AddElementReferenceCapture(7, capturedRef => _element = capturedRef);
+        if (OnKeyDown.HasDelegate)
+        {
+            builder.AddAttribute(7, "onkeydown", EventCallback.Factory.Create<KeyboardEventArgs>(this, HandleKeyDownAsync));
+        }
+
+        if (StopKeyDownPropagation)
+        {
+            builder.AddEventStopPropagationAttribute(8, "onkeydown", true);
+        }
+
+        builder.AddAttribute(9, "onmouseenter", OnMouseEnter);
+        builder.AddElementReferenceCapture(10, capturedRef => _element = capturedRef);
 
         if (!string.IsNullOrWhiteSpace(IconClass))
         {
-            builder.OpenElement(8, "i");
-            builder.AddAttribute(9, "aria-hidden", "true");
-            builder.AddAttribute(10, "class", IconClass);
+            builder.OpenElement(11, "i");
+            builder.AddAttribute(12, "aria-hidden", "true");
+            builder.AddAttribute(13, "class", IconClass);
             builder.CloseElement();
 
             if (ChildContent is not null)
             {
-                builder.AddContent(11, " ");
+                builder.AddContent(14, " ");
             }
         }
 
-        builder.AddContent(12, ChildContent);
+        builder.AddContent(15, ChildContent);
         builder.CloseElement();
     }
 
     private Task HandleClickAsync(MouseEventArgs args) => Disabled ? Task.CompletedTask : OnClick.InvokeAsync(args);
+
+    private Task HandleKeyDownAsync(KeyboardEventArgs args) => Disabled ? Task.CompletedTask : OnKeyDown.InvokeAsync(args);
 }
diff --git a/src/EventLogExpert.UI/LogTable/LogTablePane.razor b/src/EventLogExpert.UI/LogTable/LogTablePane.razor
index a6d1e957d..f70ac84ed 100644
--- a/src/EventLogExpert.UI/LogTable/LogTablePane.razor
+++ b/src/EventLogExpert.UI/LogTable/LogTablePane.razor
@@ -73,9 +73,12 @@
                     }
                     @if (_logTableState.OrderBy == columnHeader)
                     {
-                        <span class="menu-toggle" data-rotate="@_logTableState.IsDescending.ToString().ToLower()" @onclick="ToggleSorting">
-                            <i class="bi bi-caret-up"></i>
-                        </span>
+                        <ChromelessButton aria-label="Toggle sort direction"
+                            CssClass="menu-toggle"
+                            data-rotate="@_logTableState.IsDescending.ToString().ToLower()"
+                            IconClass="bi bi-caret-up"
+                            OnClick="ToggleSorting"
+                            StopKeyDownPropagation="true" />
                     }
                 </th>
             }
diff --git a/src/EventLogExpert.UI/LogTable/LogTablePane.razor.css b/src/EventLogExpert.UI/LogTable/LogTablePane.razor.css
index 2661b5a6c..5bc411ad8 100644
--- a/src/EventLogExpert.UI/LogTable/LogTablePane.razor.css
+++ b/src/EventLogExpert.UI/LogTable/LogTablePane.razor.css
@@ -23,11 +23,11 @@ th {
     background-color: var(--background-darkgray);
     cursor: default;
     user-select: none;
+}
 
-    & > span {
-        position: absolute;
-        right: 5px;
-    }
+th ::deep .menu-toggle {
+    position: absolute;
+    right: 5px;
 }
 
 th, td {
@@ -95,7 +95,7 @@ tr {
    forced-color-adjust: none below is LOAD-BEARING: per css-color-adjust-1
    §3.1, box-shadow computes to none in forced-colors mode whenever
    forced-color-adjust is auto, regardless of color value. Removing it
-   silently erases the inset stripe — the very non-color cue this rule
+   silently erases the inset stripe - the very non-color cue this rule
    exists to provide. */
 @media (forced-colors: active) {
     .table-row[data-highlight] {
diff --git a/src/EventLogExpert.UI/Menu/MenuBar.razor b/src/EventLogExpert.UI/Menu/MenuBar.razor
index a5186930b..aea02baea 100644
--- a/src/EventLogExpert.UI/Menu/MenuBar.razor
+++ b/src/EventLogExpert.UI/Menu/MenuBar.razor
@@ -8,19 +8,18 @@
         bool isActive = IsActive(bar);
         bool isFocused = capturedIndex == _focusedBarIndex;
 
-        <button aria-expanded="@isActive.ToString().ToLowerInvariant()"
+        <ChromelessButton aria-expanded="@isActive.ToString().ToLowerInvariant()"
             aria-haspopup="menu"
-            class="@($"menu-bar-item{(isActive ? " active" : string.Empty)}")"
+            CssClass="@($"menu-bar-item{(isActive ? " active" : string.Empty)}")"
             @key="bar.Label"
-            @onclick="async _ => await OnBarClick(bar, capturedIndex)"
-            @onclick:stopPropagation
-            @onkeydown="async args => await OnBarKeyDown(args, capturedIndex)"
-            @onmouseenter="async _ => await OnBarHover(bar, capturedIndex)"
+            OnClick="@(async _ => await OnBarClick(bar, capturedIndex))"
+            OnKeyDown="@(async args => await OnBarKeyDown(args, capturedIndex))"
+            OnMouseEnter="@(async _ => await OnBarHover(bar, capturedIndex))"
             @ref="_barElements[capturedIndex]"
             role="menuitem"
-            tabindex="@(isFocused ? 0 : -1)"
-            type="button">
+            StopPropagation="true"
+            tabindex="@(isFocused ? 0 : -1)">
             @bar.Label
-        </button>
+        </ChromelessButton>
     }
 </nav>
diff --git a/src/EventLogExpert.UI/Menu/MenuBar.razor.cs b/src/EventLogExpert.UI/Menu/MenuBar.razor.cs
index ccc91d122..19b4e7e59 100644
--- a/src/EventLogExpert.UI/Menu/MenuBar.razor.cs
+++ b/src/EventLogExpert.UI/Menu/MenuBar.razor.cs
@@ -13,6 +13,7 @@
 using EventLogExpert.Runtime.Settings;
 using EventLogExpert.UI.Common;
 using EventLogExpert.UI.Common.Interop;
+using EventLogExpert.UI.Inputs;
 using Fluxor;
 using Microsoft.AspNetCore.Components;
 using Microsoft.AspNetCore.Components.Web;
@@ -27,7 +28,7 @@ public sealed partial class MenuBar
 
     private readonly List<TopLevel> _bars = [];
 
-    private ElementReference[] _barElements = [];
+    private ChromelessButton[] _barElements = [];
     private int _focusedBarIndex;
     private IJSObjectReference? _menuAnchorModule;
     private ElementReference _menuBarRootRef;
@@ -121,7 +122,7 @@ protected override void OnInitialized()
         MenuService.NavigateBarRequested += OnNavigateBarRequested;
 
         _bars.AddRange(BuildTopLevel());
-        _barElements = new ElementReference[_bars.Count];
+        _barElements = new ChromelessButton[_bars.Count];
 
         _ = PrewarmOtherLogNamesAsync();
 
@@ -349,7 +350,9 @@ private async Task MoveBarFocusTo(int index, bool openIfMenuActive)
 
         StateHasChanged();
 
-        try { await _barElements[index].FocusAsync(); }
+        if (_barElements[index] is not { } barButton) { return; }
+
+        try { await barButton.FocusAsync(); }
         catch { /* element may not be in the DOM yet */ }
     }
 
@@ -437,9 +440,11 @@ private async Task OpenBarAsync(TopLevel bar, int index, bool focusFirst = true,
         _menuAnchorModule ??= await JSRuntime.InvokeAsync<IJSObjectReference>(
             "import", "./_content/EventLogExpert.UI/Menu/MenuAnchor.js");
 
+        if (_barElements[index] is not { } barButton) { return; }
+
         var rect = await _menuAnchorModule.InvokeAsync<MenuAnchorRect>(
             "getMenuElementRect",
-            _barElements[index]);
+            barButton.Element);
 
         if (requestId != Volatile.Read(ref _openRequestId)) { return; }
 
diff --git a/src/EventLogExpert.UI/Menu/MenuBar.razor.css b/src/EventLogExpert.UI/Menu/MenuBar.razor.css
index ab9e57358..866489bfe 100644
--- a/src/EventLogExpert.UI/Menu/MenuBar.razor.css
+++ b/src/EventLogExpert.UI/Menu/MenuBar.razor.css
@@ -7,7 +7,7 @@
     flex: 0 0 auto;
 }
 
-.menu-bar-item {
+.menu-bar ::deep .menu-bar-item {
     display: inline-flex;
     align-items: center;
     padding: 0 12px;
@@ -17,17 +17,17 @@
     font-size: 0.9rem;
     cursor: default;
     outline: none;
+}
 
-    &:hover,
-    &.active {
-        background-color: var(--menu-hover-overlay);
-        color: var(--text-on-statusbar);
-    }
+.menu-bar ::deep .menu-bar-item:hover,
+.menu-bar ::deep .menu-bar-item.active {
+    background-color: var(--menu-hover-overlay);
+    color: var(--text-on-statusbar);
+}
 
-    &:focus-visible {
-        background-color: var(--menu-hover-overlay);
-        color: var(--text-on-statusbar);
-        outline: 2px solid var(--clr-lightblue);
-        outline-offset: -2px;
-    }
+.menu-bar ::deep .menu-bar-item:focus-visible {
+    background-color: var(--menu-hover-overlay);
+    color: var(--text-on-statusbar);
+    outline: 2px solid var(--clr-lightblue);
+    outline-offset: -2px;
 }
diff --git a/src/EventLogExpert.UI/Modal/SidebarTabs.razor b/src/EventLogExpert.UI/Modal/SidebarTabs.razor
index 31bf275b0..b830cf982 100644
--- a/src/EventLogExpert.UI/Modal/SidebarTabs.razor
+++ b/src/EventLogExpert.UI/Modal/SidebarTabs.razor
@@ -8,19 +8,18 @@
         role="tablist">
         @foreach (var (tab, label) in Tabs)
         {
-            <button aria-controls="@($"sidebar-tabpanel-{TablistId}-{tab}")"
+            <ChromelessButton aria-controls="@($"sidebar-tabpanel-{TablistId}-{tab}")"
                 aria-selected="@(tab.Equals(ActiveTab) ? "true" : "false")"
-                class="@(tab.Equals(ActiveTab) ? "tab active" : "tab")"
+                CssClass="@(tab.Equals(ActiveTab) ? "tab active" : "tab")"
                 id="@($"sidebar-tab-{TablistId}-{tab}")"
                 @key="tab"
-                @onclick="() => SetActiveTabAsync(tab)"
-                @onkeydown="e => OnTabKeyDownAsync(e, tab)"
+                OnClick="@(() => SetActiveTabAsync(tab))"
+                OnKeyDown="@(e => OnTabKeyDownAsync(e, tab))"
                 @ref="_tabButtonRefs[tab]"
                 role="tab"
-                tabindex="@(tab.Equals(ActiveTab) ? "0" : "-1")"
-                type="button">
+                tabindex="@(tab.Equals(ActiveTab) ? "0" : "-1")">
                 <span class="sidebar-tabs-tab-label">@label</span>
-            </button>
+            </ChromelessButton>
         }
     </div>
 
diff --git a/src/EventLogExpert.UI/Modal/SidebarTabs.razor.cs b/src/EventLogExpert.UI/Modal/SidebarTabs.razor.cs
index b1c525719..dad2c58b1 100644
--- a/src/EventLogExpert.UI/Modal/SidebarTabs.razor.cs
+++ b/src/EventLogExpert.UI/Modal/SidebarTabs.razor.cs
@@ -3,6 +3,7 @@
 
 using EventLogExpert.UI.Common;
 using EventLogExpert.UI.Common.Interop;
+using EventLogExpert.UI.Inputs;
 using Microsoft.AspNetCore.Components;
 using Microsoft.AspNetCore.Components.Web;
 using Microsoft.JSInterop;
@@ -12,7 +13,7 @@ namespace EventLogExpert.UI.Modal;
 public sealed partial class SidebarTabs<TTab> : ComponentBase, IAsyncDisposable
     where TTab : struct, Enum
 {
-    private readonly Dictionary<TTab, ElementReference> _tabButtonRefs = new();
+    private readonly Dictionary<TTab, ChromelessButton> _tabButtonRefs = new();
     private readonly string _tablistId = ComponentId.NewUnique().Value;
 
     private TTab? _pendingFocusTab;
@@ -48,11 +49,11 @@ await JsModuleInterop.DisposeModuleSafelyAsync(
 
     public async ValueTask<bool> FocusActiveTabAsync()
     {
-        if (!_tabButtonRefs.TryGetValue(ActiveTab, out var elementRef)) { return false; }
+        if (!_tabButtonRefs.TryGetValue(ActiveTab, out var tabButton)) { return false; }
 
         try
         {
-            await elementRef.FocusAsync();
+            await tabButton.FocusAsync();
 
             return true;
         }
@@ -78,12 +79,12 @@ protected override async Task OnAfterRenderAsync(bool firstRender)
             catch (JSException) { }
         }
 
-        if (_pendingFocusTab is { } tab && _tabButtonRefs.TryGetValue(tab, out var elementRef))
+        if (_pendingFocusTab is { } tab && _tabButtonRefs.TryGetValue(tab, out var tabButton))
         {
             _pendingFocusTab = null;
 
-            try { await elementRef.FocusAsync(); }
-            catch { }
+            try { await tabButton.FocusAsync(); }
+            catch { /* Ignore focus errors */ }
         }
 
         await base.OnAfterRenderAsync(firstRender);
diff --git a/src/EventLogExpert.UI/Modal/SidebarTabs.razor.css b/src/EventLogExpert.UI/Modal/SidebarTabs.razor.css
index 7c82705fd..3ec9111ca 100644
--- a/src/EventLogExpert.UI/Modal/SidebarTabs.razor.css
+++ b/src/EventLogExpert.UI/Modal/SidebarTabs.razor.css
@@ -14,7 +14,7 @@
     padding: 8px 4px 8px 0;
 }
 
-.sidebar-tabs-list .tab {
+.sidebar-tabs-list ::deep .tab {
     text-align: left;
     padding: 8px 12px;
     background: transparent;
@@ -26,22 +26,22 @@
     font: inherit;
 }
 
-.sidebar-tabs-list .tab:hover {
+.sidebar-tabs-list ::deep .tab:hover {
     background: var(--background-darkgray);
 }
 
-.sidebar-tabs-list .tab.active {
+.sidebar-tabs-list ::deep .tab.active {
     background: transparent;
     border-left-color: var(--clr-lightblue);
     color: var(--clr-lightblue);
     font-weight: 600;
 }
 
-.sidebar-tabs-list .tab.active:hover {
+.sidebar-tabs-list ::deep .tab.active:hover {
     background: var(--background-darkgray);
 }
 
-.sidebar-tabs-list .tab:focus-visible {
+.sidebar-tabs-list ::deep .tab:focus-visible {
     outline: 2px solid var(--clr-lightblue);
     outline-offset: -2px;
 }
diff --git a/src/EventLogExpert.UI/wwwroot/app.css b/src/EventLogExpert.UI/wwwroot/app.css
index b63a77cb8..828f9e4ec 100644
--- a/src/EventLogExpert.UI/wwwroot/app.css
+++ b/src/EventLogExpert.UI/wwwroot/app.css
@@ -332,6 +332,12 @@ input[type="text"].input.dialog-input { padding: .25rem 0; }
 }
 
 .menu-toggle {
+    appearance: none;
+    background: none;
+    border: 0;
+    padding: 0;
+    color: inherit;
+    font: inherit;
     cursor: pointer;
     display: inline-flex;
     align-items: center;
@@ -344,6 +350,8 @@ input[type="text"].input.dialog-input { padding: .25rem 0; }
         display: flex;
         align-items: center;
         justify-content: center;
+        width: 1em;
+        height: 1em;
         line-height: 1;
         vertical-align: 0;
     }
diff --git a/tests/Unit/EventLogExpert.UI.Tests/Inputs/ButtonTests.cs b/tests/Unit/EventLogExpert.UI.Tests/Inputs/ButtonTests.cs
index 7b113c439..9a10277ae 100644
--- a/tests/Unit/EventLogExpert.UI.Tests/Inputs/ButtonTests.cs
+++ b/tests/Unit/EventLogExpert.UI.Tests/Inputs/ButtonTests.cs
@@ -48,6 +48,43 @@ public async Task Click_WhenDisabled_DoesNotInvokeOnClick()
         Assert.False(invoked);
     }
 
+    [Fact]
+    public async Task KeyDown_InvokesOnKeyDown()
+    {
+        bool invoked = false;
+        var component = Render<Button>(parameters => parameters
+            .Add(p => p.OnKeyDown, () => invoked = true));
+
+        await component.Find("button").KeyDownAsync(new KeyboardEventArgs());
+
+        Assert.True(invoked);
+    }
+
+    [Fact]
+    public async Task KeyDown_WhenDisabled_DoesNotInvokeOnKeyDown()
+    {
+        bool invoked = false;
+        var component = Render<Button>(parameters => parameters
+            .Add(p => p.Disabled, true)
+            .Add(p => p.OnKeyDown, () => invoked = true));
+
+        await component.Find("button").KeyDownAsync(new KeyboardEventArgs());
+
+        Assert.False(invoked);
+    }
+
+    [Fact]
+    public async Task MouseEnter_InvokesOnMouseEnter()
+    {
+        bool invoked = false;
+        var component = Render<Button>(parameters => parameters
+            .Add(p => p.OnMouseEnter, () => invoked = true));
+
+        await component.Find("button").MouseEnterAsync(new MouseEventArgs());
+
+        Assert.True(invoked);
+    }
+
     [Fact]
     public void Render_AdditionalAttributes_SplattedToButton()
     {
diff --git a/tests/Unit/EventLogExpert.UI.Tests/LogTable/LogTablePaneSelectionTests.cs b/tests/Unit/EventLogExpert.UI.Tests/LogTable/LogTablePaneSelectionTests.cs
index 5b1cbfdf4..0df564185 100644
--- a/tests/Unit/EventLogExpert.UI.Tests/LogTable/LogTablePaneSelectionTests.cs
+++ b/tests/Unit/EventLogExpert.UI.Tests/LogTable/LogTablePaneSelectionTests.cs
@@ -185,11 +185,11 @@ public void Header_ShowsSortIndicatorOnlyOnTheOrderByColumn()
 
         var sortedHeader = cut.Find("th[data-column='Source']");
         Assert.Equal("descending", sortedHeader.GetAttribute("aria-sort"));
-        Assert.NotNull(sortedHeader.QuerySelector("span.menu-toggle"));
+        Assert.NotNull(sortedHeader.QuerySelector(".menu-toggle"));
 
         var unsortedHeader = cut.Find("th[data-column='Level']");
         Assert.Equal("none", unsortedHeader.GetAttribute("aria-sort"));
-        Assert.Null(unsortedHeader.QuerySelector("span.menu-toggle"));
+        Assert.Null(unsortedHeader.QuerySelector(".menu-toggle"));
     }
 
     [Fact]

From e8a9ad8eabb1775d593d6aa55e253c93a3c676dd Mon Sep 17 00:00:00 2001
From: jschick04 <jschick04@gmail.com>
Date: Sat, 20 Jun 2026 13:02:52 -0500
Subject: [PATCH 14/40] Wire ButtonBase onclick and onmouseenter only when
 their handlers are set

---
 src/EventLogExpert.UI/Inputs/ButtonBase.cs | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/EventLogExpert.UI/Inputs/ButtonBase.cs b/src/EventLogExpert.UI/Inputs/ButtonBase.cs
index 0835d34a1..c11844135 100644
--- a/src/EventLogExpert.UI/Inputs/ButtonBase.cs
+++ b/src/EventLogExpert.UI/Inputs/ButtonBase.cs
@@ -59,7 +59,11 @@ protected override void BuildRenderTree(RenderTreeBuilder builder)
         }
 
         builder.AddAttribute(4, "disabled", Disabled);
-        builder.AddAttribute(5, "onclick", EventCallback.Factory.Create<MouseEventArgs>(this, HandleClickAsync));
+
+        if (OnClick.HasDelegate || StopPropagation)
+        {
+            builder.AddAttribute(5, "onclick", EventCallback.Factory.Create<MouseEventArgs>(this, HandleClickAsync));
+        }
 
         if (StopPropagation)
         {
@@ -76,7 +80,11 @@ protected override void BuildRenderTree(RenderTreeBuilder builder)
             builder.AddEventStopPropagationAttribute(8, "onkeydown", true);
         }
 
-        builder.AddAttribute(9, "onmouseenter", OnMouseEnter);
+        if (OnMouseEnter.HasDelegate)
+        {
+            builder.AddAttribute(9, "onmouseenter", OnMouseEnter);
+        }
+
         builder.AddElementReferenceCapture(10, capturedRef => _element = capturedRef);
 
         if (!string.IsNullOrWhiteSpace(IconClass))

From 51b73ba3d8ab86ef9d8026d6d0266f4178eb1f1b Mon Sep 17 00:00:00 2001
From: jschick04 <jschick04@gmail.com>
Date: Sat, 20 Jun 2026 13:43:29 -0500
Subject: [PATCH 15/40] Make @ref-populated button collections nullable to
 match runtime reality

---
 src/EventLogExpert.UI/Menu/MenuBar.razor.cs      | 4 ++--
 src/EventLogExpert.UI/Modal/SidebarTabs.razor.cs | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/EventLogExpert.UI/Menu/MenuBar.razor.cs b/src/EventLogExpert.UI/Menu/MenuBar.razor.cs
index 19b4e7e59..f5b277d62 100644
--- a/src/EventLogExpert.UI/Menu/MenuBar.razor.cs
+++ b/src/EventLogExpert.UI/Menu/MenuBar.razor.cs
@@ -28,7 +28,7 @@ public sealed partial class MenuBar
 
     private readonly List<TopLevel> _bars = [];
 
-    private ChromelessButton[] _barElements = [];
+    private ChromelessButton?[] _barElements = [];
     private int _focusedBarIndex;
     private IJSObjectReference? _menuAnchorModule;
     private ElementReference _menuBarRootRef;
@@ -122,7 +122,7 @@ protected override void OnInitialized()
         MenuService.NavigateBarRequested += OnNavigateBarRequested;
 
         _bars.AddRange(BuildTopLevel());
-        _barElements = new ChromelessButton[_bars.Count];
+        _barElements = new ChromelessButton?[_bars.Count];
 
         _ = PrewarmOtherLogNamesAsync();
 
diff --git a/src/EventLogExpert.UI/Modal/SidebarTabs.razor.cs b/src/EventLogExpert.UI/Modal/SidebarTabs.razor.cs
index dad2c58b1..8e9124b17 100644
--- a/src/EventLogExpert.UI/Modal/SidebarTabs.razor.cs
+++ b/src/EventLogExpert.UI/Modal/SidebarTabs.razor.cs
@@ -13,7 +13,7 @@ namespace EventLogExpert.UI.Modal;
 public sealed partial class SidebarTabs<TTab> : ComponentBase, IAsyncDisposable
     where TTab : struct, Enum
 {
-    private readonly Dictionary<TTab, ChromelessButton> _tabButtonRefs = new();
+    private readonly Dictionary<TTab, ChromelessButton?> _tabButtonRefs = new();
     private readonly string _tablistId = ComponentId.NewUnique().Value;
 
     private TTab? _pendingFocusTab;
@@ -49,7 +49,7 @@ await JsModuleInterop.DisposeModuleSafelyAsync(
 
     public async ValueTask<bool> FocusActiveTabAsync()
     {
-        if (!_tabButtonRefs.TryGetValue(ActiveTab, out var tabButton)) { return false; }
+        if (!_tabButtonRefs.TryGetValue(ActiveTab, out var tabButton) || tabButton is null) { return false; }
 
         try
         {
@@ -79,7 +79,7 @@ protected override async Task OnAfterRenderAsync(bool firstRender)
             catch (JSException) { }
         }
 
-        if (_pendingFocusTab is { } tab && _tabButtonRefs.TryGetValue(tab, out var tabButton))
+        if (_pendingFocusTab is { } tab && _tabButtonRefs.TryGetValue(tab, out var tabButton) && tabButton is not null)
         {
             _pendingFocusTab = null;
 

From 53106984527df5d4b2010b517a17412e039e6144 Mon Sep 17 00:00:00 2001
From: jschick04 <jschick04@gmail.com>
Date: Sat, 20 Jun 2026 14:06:44 -0500
Subject: [PATCH 16/40] Wire ButtonBase onkeydown when StopKeyDownPropagation
 is requested

---
 src/EventLogExpert.UI/Inputs/ButtonBase.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/EventLogExpert.UI/Inputs/ButtonBase.cs b/src/EventLogExpert.UI/Inputs/ButtonBase.cs
index c11844135..302fb8dfc 100644
--- a/src/EventLogExpert.UI/Inputs/ButtonBase.cs
+++ b/src/EventLogExpert.UI/Inputs/ButtonBase.cs
@@ -70,7 +70,7 @@ protected override void BuildRenderTree(RenderTreeBuilder builder)
             builder.AddEventStopPropagationAttribute(6, "onclick", true);
         }
 
-        if (OnKeyDown.HasDelegate)
+        if (OnKeyDown.HasDelegate || StopKeyDownPropagation)
         {
             builder.AddAttribute(7, "onkeydown", EventCallback.Factory.Create<KeyboardEventArgs>(this, HandleKeyDownAsync));
         }

From c6d2d5499ef16bacff7522479ce4ef8013a3e486 Mon Sep 17 00:00:00 2001
From: jschick04 <jschick04@gmail.com>
Date: Sat, 20 Jun 2026 02:07:32 -0500
Subject: [PATCH 17/40] Build the app separately from libraries and tests to
 drop the -m:1 build workaround

---
 .github/workflows/PullRequest.yml | 11 +++++++--
 LibrariesAndTests.slnf            | 40 +++++++++++++++++++++++++++++++
 2 files changed, 49 insertions(+), 2 deletions(-)
 create mode 100644 LibrariesAndTests.slnf

diff --git a/.github/workflows/PullRequest.yml b/.github/workflows/PullRequest.yml
index 9da775a57..ea0625423 100644
--- a/.github/workflows/PullRequest.yml
+++ b/.github/workflows/PullRequest.yml
@@ -25,8 +25,13 @@ jobs:
       run: dotnet workload restore EventLogExpert.slnx
     - name: Restore dependencies
       run: dotnet restore EventLogExpert.slnx
-    - name: Build
-      run: dotnet build EventLogExpert.slnx --no-restore -c Release -p:PublishReadyToRun=false -m:1
+    # Build the MAUI app in its own step (after the tests), NOT as one solution build.
+    # Building the app together with the test projects makes MSBuild compile the shared
+    # libraries twice concurrently - the app resolves win-x64 while the tests are AnyCPU -
+    # which races on the libs' obj/bin (CS2012 / MSB3030). The old -m:1 flag masked this by
+    # serializing; this split fixes the root cause. Don't recombine into one slnx build.
+    - name: Build libraries and tests
+      run: dotnet build LibrariesAndTests.slnf --no-restore -c Release -p:PublishReadyToRun=false
     - name: Test (unit)
       shell: pwsh
       run: |
@@ -51,3 +56,5 @@ jobs:
           if ($LASTEXITCODE -ne 0) { $failed = $true }
         }
         if ($failed) { throw 'One or more integration test projects failed.' }
+    - name: Build app
+      run: dotnet build src/EventLogExpert/EventLogExpert.csproj --no-restore -c Release -p:PublishReadyToRun=false
diff --git a/LibrariesAndTests.slnf b/LibrariesAndTests.slnf
new file mode 100644
index 000000000..852772bbc
--- /dev/null
+++ b/LibrariesAndTests.slnf
@@ -0,0 +1,40 @@
+{
+  "solution": {
+    "path": "EventLogExpert.slnx",
+    "projects": [
+      "src\\EventLogExpert.DatabaseTools\\EventLogExpert.DatabaseTools.csproj",
+      "src\\EventLogExpert.ElevationHelper\\EventLogExpert.ElevationHelper.csproj",
+      "src\\EventLogExpert.EventDbTool\\EventLogExpert.EventDbTool.csproj",
+      "src\\EventLogExpert.Eventing\\EventLogExpert.Eventing.csproj",
+      "src\\EventLogExpert.Filtering\\EventLogExpert.Filtering.csproj",
+      "src\\EventLogExpert.Logging\\EventLogExpert.Logging.csproj",
+      "src\\EventLogExpert.Provider\\EventLogExpert.Provider.csproj",
+      "src\\EventLogExpert.Provider.Database\\EventLogExpert.Provider.Database.csproj",
+      "src\\EventLogExpert.Runtime\\EventLogExpert.Runtime.csproj",
+      "src\\EventLogExpert.Scenarios\\EventLogExpert.Scenarios.csproj",
+      "src\\EventLogExpert.UI\\EventLogExpert.UI.csproj",
+      "src\\EventLogExpert.WindowsPlatform\\EventLogExpert.WindowsPlatform.csproj",
+      "tests\\Integration\\EventLogExpert.DatabaseTools.IntegrationTests\\EventLogExpert.DatabaseTools.IntegrationTests.csproj",
+      "tests\\Integration\\EventLogExpert.ElevationHelper.IntegrationTests\\EventLogExpert.ElevationHelper.IntegrationTests.csproj",
+      "tests\\Integration\\EventLogExpert.EventDbTool.IntegrationTests\\EventLogExpert.EventDbTool.IntegrationTests.csproj",
+      "tests\\Integration\\EventLogExpert.Eventing.IntegrationTests\\EventLogExpert.Eventing.IntegrationTests.csproj",
+      "tests\\Integration\\EventLogExpert.Filtering.IntegrationTests\\EventLogExpert.Filtering.IntegrationTests.csproj",
+      "tests\\Integration\\EventLogExpert.Provider.Database.IntegrationTests\\EventLogExpert.Provider.Database.IntegrationTests.csproj",
+      "tests\\Integration\\EventLogExpert.Runtime.IntegrationTests\\EventLogExpert.Runtime.IntegrationTests.csproj",
+      "tests\\Integration\\EventLogExpert.UI.IntegrationTests\\EventLogExpert.UI.IntegrationTests.csproj",
+      "tests\\Shared\\EventLogExpert.Eventing.TestUtils\\EventLogExpert.Eventing.TestUtils.csproj",
+      "tests\\Shared\\EventLogExpert.Filtering.TestUtils\\EventLogExpert.Filtering.TestUtils.csproj",
+      "tests\\Unit\\EventLogExpert.DatabaseTools.Tests\\EventLogExpert.DatabaseTools.Tests.csproj",
+      "tests\\Unit\\EventLogExpert.EventDbTool.Tests\\EventLogExpert.EventDbTool.Tests.csproj",
+      "tests\\Unit\\EventLogExpert.Eventing.Tests\\EventLogExpert.Eventing.Tests.csproj",
+      "tests\\Unit\\EventLogExpert.Filtering.Tests\\EventLogExpert.Filtering.Tests.csproj",
+      "tests\\Unit\\EventLogExpert.Logging.Tests\\EventLogExpert.Logging.Tests.csproj",
+      "tests\\Unit\\EventLogExpert.Provider.Database.Tests\\EventLogExpert.Provider.Database.Tests.csproj",
+      "tests\\Unit\\EventLogExpert.Provider.Tests\\EventLogExpert.Provider.Tests.csproj",
+      "tests\\Unit\\EventLogExpert.Runtime.Tests\\EventLogExpert.Runtime.Tests.csproj",
+      "tests\\Unit\\EventLogExpert.Scenarios.Tests\\EventLogExpert.Scenarios.Tests.csproj",
+      "tests\\Unit\\EventLogExpert.UI.Tests\\EventLogExpert.UI.Tests.csproj",
+      "tests\\Unit\\EventLogExpert.Windows.Tests\\EventLogExpert.Windows.Tests.csproj"
+    ]
+  }
+}

From 909b870633752bfcdc36dae98f156c99f2fdc17c Mon Sep 17 00:00:00 2001
From: jschick04 <jschick04@gmail.com>
Date: Sat, 20 Jun 2026 13:35:01 -0500
Subject: [PATCH 18/40] Enable native ARM64 builds for the explorer shell
 extension

---
 ...tLogExpert.ExplorerExtensionNative.vcxproj | 82 +++++++++++++++++++
 .../packages.config                           |  1 +
 src/EventLogExpert/EventLogExpert.csproj      | 24 ++++--
 3 files changed, 98 insertions(+), 9 deletions(-)

diff --git a/src/EventLogExpert.ExplorerExtensionNative/EventLogExpert.ExplorerExtensionNative.vcxproj b/src/EventLogExpert.ExplorerExtensionNative/EventLogExpert.ExplorerExtensionNative.vcxproj
index b9517012b..ea384e5fe 100644
--- a/src/EventLogExpert.ExplorerExtensionNative/EventLogExpert.ExplorerExtensionNative.vcxproj
+++ b/src/EventLogExpert.ExplorerExtensionNative/EventLogExpert.ExplorerExtensionNative.vcxproj
@@ -21,6 +21,9 @@
   -->
   <Import Project="..\packages\Microsoft.Windows.SDK.CPP.10.0.26100.8249\build\native\Microsoft.Windows.SDK.cpp.props" Condition="Exists('..\packages\Microsoft.Windows.SDK.CPP.10.0.26100.8249\build\native\Microsoft.Windows.SDK.cpp.props')" />
   <Import Project="..\packages\Microsoft.Windows.SDK.CPP.x64.10.0.26100.8249\build\native\Microsoft.Windows.SDK.cpp.x64.props" Condition="Exists('..\packages\Microsoft.Windows.SDK.CPP.x64.10.0.26100.8249\build\native\Microsoft.Windows.SDK.cpp.x64.props')" />
+  <!-- arm64 import libs (only when targeting ARM64). The per-arch SDK.CPP package self-gates by $(Platform), so
+       importing it is inert off-target; the explicit ARM64 condition keeps the x64 import path byte-identical. -->
+  <Import Project="..\packages\Microsoft.Windows.SDK.CPP.arm64.10.0.26100.8249\build\native\Microsoft.Windows.SDK.cpp.arm64.props" Condition="Exists('..\packages\Microsoft.Windows.SDK.CPP.arm64.10.0.26100.8249\build\native\Microsoft.Windows.SDK.cpp.arm64.props') AND '$(Platform)'=='ARM64'" />
   <Import Project="..\packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.props')" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|x64">
@@ -31,6 +34,14 @@
       <Configuration>Release</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|ARM64">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM64">
+      <Configuration>Release</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
   </ItemGroup>
 
   <PropertyGroup Label="Globals">
@@ -69,6 +80,23 @@
          load briefly from dllhost.exe and aren't a typical Spectre-sensitive surface. -->
   </PropertyGroup>
 
+  <!-- ARM64 mirrors x64 (settings are arch-agnostic). The only x64-only linker setting, CETCompat, is omitted from
+       Release|ARM64 below (CET is an Intel/x86-64 feature). -->
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings" />
   <ImportGroup Label="Shared" />
@@ -78,6 +106,12 @@
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
 
   <PropertyGroup Label="UserMacros" />
 
@@ -87,6 +121,12 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <IncludePath>$(IntDir)Generated Files;$(IncludePath)</IncludePath>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
+    <IncludePath>$(IntDir)Generated Files;$(IncludePath)</IncludePath>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
+    <IncludePath>$(IntDir)Generated Files;$(IncludePath)</IncludePath>
+  </PropertyGroup>
 
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
@@ -131,6 +171,48 @@
     </Link>
   </ItemDefinitionGroup>
 
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
+    <ClCompile>
+      <WarningLevel>Level4</WarningLevel>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>_DEBUG;EVENTLOGEXPERTEXPLOREREXTENSION_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
+      <LanguageStandard>stdcpp20</LanguageStandard>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableUAC>false</EnableUAC>
+      <ModuleDefinitionFile>Source.def</ModuleDefinitionFile>
+    </Link>
+  </ItemDefinitionGroup>
+
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
+    <ClCompile>
+      <WarningLevel>Level4</WarningLevel>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>NDEBUG;EVENTLOGEXPERTEXPLOREREXTENSION_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
+      <LanguageStandard>stdcpp20</LanguageStandard>
+      <ControlFlowGuard>Guard</ControlFlowGuard>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableUAC>false</EnableUAC>
+      <ModuleDefinitionFile>Source.def</ModuleDefinitionFile>
+    </Link>
+  </ItemDefinitionGroup>
+
   <ItemGroup>
     <ClInclude Include="framework.h" />
     <ClInclude Include="pch.h" />
diff --git a/src/EventLogExpert.ExplorerExtensionNative/packages.config b/src/EventLogExpert.ExplorerExtensionNative/packages.config
index bfdf2a6e6..11446b612 100644
--- a/src/EventLogExpert.ExplorerExtensionNative/packages.config
+++ b/src/EventLogExpert.ExplorerExtensionNative/packages.config
@@ -10,4 +10,5 @@
        See docs/Explorer-Context-Menu.md. -->
   <package id="Microsoft.Windows.SDK.CPP" version="10.0.26100.8249" targetFramework="native" />
   <package id="Microsoft.Windows.SDK.CPP.x64" version="10.0.26100.8249" targetFramework="native" />
+  <package id="Microsoft.Windows.SDK.CPP.arm64" version="10.0.26100.8249" targetFramework="native" />
 </packages>
diff --git a/src/EventLogExpert/EventLogExpert.csproj b/src/EventLogExpert/EventLogExpert.csproj
index db033d0ae..fdae17a73 100644
--- a/src/EventLogExpert/EventLogExpert.csproj
+++ b/src/EventLogExpert/EventLogExpert.csproj
@@ -77,14 +77,14 @@
     </ItemGroup>
 
     <!--
-      Derive the native vcxproj Platform from the current .NET RuntimeIdentifier. Only x64 is
-      supported today — the vcxproj only declares Debug|x64/Release|x64 configurations. Other
-      RIDs (win-arm64, win-x86) require matching ProjectConfiguration entries in the vcxproj
-      first; the BuildExplorerExtensionNative target fails fast with a clear message rather
-      than producing a confusing MSB4126 from VS MSBuild.
+      Derive the native vcxproj Platform from the current .NET RuntimeIdentifier. x64 and arm64
+      are supported (the vcxproj declares Debug|x64/Release|x64 + Debug|ARM64/Release|ARM64). Other
+      RIDs (e.g. win-x86) have no matching ProjectConfiguration; the BuildExplorerExtensionNative
+      target then fails fast with a clear message rather than a confusing MSB4126 from VS MSBuild.
     -->
     <PropertyGroup>
-      <ExplorerExtensionNativePlatform Condition="'$(RuntimeIdentifier)' == '' OR $(RuntimeIdentifier.Contains('-x64'))">x64</ExplorerExtensionNativePlatform>
+      <ExplorerExtensionNativePlatform Condition="'$(RuntimeIdentifier)' != '' AND $(RuntimeIdentifier.Contains('-arm64'))">ARM64</ExplorerExtensionNativePlatform>
+      <ExplorerExtensionNativePlatform Condition="'$(ExplorerExtensionNativePlatform)' == '' AND ('$(RuntimeIdentifier)' == '' OR $(RuntimeIdentifier.Contains('-x64')))">x64</ExplorerExtensionNativePlatform>
     </PropertyGroup>
 
     <!--
@@ -124,10 +124,16 @@
         <_VswherePath>$(MSBuildProgramFiles32)\Microsoft Visual Studio\Installer\vswhere.exe</_VswherePath>
       </PropertyGroup>
       <Error Condition="'$(ExplorerExtensionNativePlatform)' == ''"
-             Text="EventLogExpert.ExplorerExtensionNative.vcxproj only declares x64 ProjectConfiguration entries. RuntimeIdentifier=$(RuntimeIdentifier) does not map to a supported native platform. Build for win-x64 OR add matching arm64/Win32 ProjectConfiguration + ItemDefinitionGroup blocks to the vcxproj." />
+             Text="EventLogExpert.ExplorerExtensionNative.vcxproj declares x64 and ARM64 ProjectConfiguration entries. RuntimeIdentifier=$(RuntimeIdentifier) does not map to a supported native platform (win-x64 or win-arm64). Build for win-x64/win-arm64 OR add matching ProjectConfiguration + ItemDefinitionGroup blocks (e.g. Win32) to the vcxproj." />
       <!-- Locate VS MSBuild requiring the VC toolset specifically — bare Microsoft.Component.MSBuild
            can match a Build Tools install without the C++ workload, which can't process vcxproj. -->
-      <Exec Command="&quot;$(_VswherePath)&quot; -latest -products * -requires Microsoft.Component.MSBuild Microsoft.VisualStudio.Component.VC.Tools.x86.x64 -find MSBuild\Current\Bin\amd64\MSBuild.exe"
+      <PropertyGroup>
+        <!-- ARM64 cross-compile from an x64 host needs BOTH the x64 host toolset AND the arm64 target
+             toolset. x64 builds require only x86.x64, so x64-only dev/CI machines are unaffected. -->
+        <_ExplorerExtensionVcComponents>Microsoft.VisualStudio.Component.VC.Tools.x86.x64</_ExplorerExtensionVcComponents>
+        <_ExplorerExtensionVcComponents Condition="'$(ExplorerExtensionNativePlatform)' == 'ARM64'">Microsoft.VisualStudio.Component.VC.Tools.x86.x64 Microsoft.VisualStudio.Component.VC.Tools.ARM64</_ExplorerExtensionVcComponents>
+      </PropertyGroup>
+      <Exec Command="&quot;$(_VswherePath)&quot; -latest -products * -requires Microsoft.Component.MSBuild $(_ExplorerExtensionVcComponents) -find MSBuild\Current\Bin\amd64\MSBuild.exe"
             ConsoleToMSBuild="true"
             ContinueOnError="true">
         <Output TaskParameter="ConsoleOutput" PropertyName="VsMSBuildPath" />
@@ -138,7 +144,7 @@
         <VsMSBuildPath>$(VsMSBuildPath.Trim())</VsMSBuildPath>
       </PropertyGroup>
       <Error Condition="'$(VsMSBuildPath)' == '' OR !Exists('$(VsMSBuildPath)')"
-             Text="Could not locate Visual Studio MSBuild.exe with the C++ workload via vswhere ($(_VswherePath)). The native shell extension requires the Desktop Development with C++ workload (Microsoft.VisualStudio.Component.VC.Tools.x86.x64) AND the Windows 10/11 SDK. See docs/Explorer-Context-Menu.md for prereqs." />
+             Text="Could not locate Visual Studio MSBuild.exe with the required C++ workload components via vswhere ($(_VswherePath)). The native shell extension requires a VS install with $(_ExplorerExtensionVcComponents) AND the Windows 10/11 SDK. See docs/Explorer-Context-Menu.md for prereqs." />
       <Exec Command="where nuget.exe" ConsoleToMSBuild="true" ContinueOnError="true" IgnoreExitCode="true">
         <Output TaskParameter="ExitCode" PropertyName="_WhereNugetExitCode" />
         <Output TaskParameter="ConsoleOutput" PropertyName="_WhereNugetOutput" />

From 9a23d6f77ec9066b1d40e195dd540c2f5d68c9be Mon Sep 17 00:00:00 2001
From: jschick04 <jschick04@gmail.com>
Date: Sat, 20 Jun 2026 17:13:37 -0500
Subject: [PATCH 19/40] Derive the native shell-extension platform from
 Platform and guard against arch mismatch

---
 docs/Explorer-Context-Menu.md                 |  4 ++--
 .../packages.config                           |  5 +++--
 src/EventLogExpert/EventLogExpert.csproj      | 22 ++++++++++++++-----
 3 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/docs/Explorer-Context-Menu.md b/docs/Explorer-Context-Menu.md
index d87ae9059..1c12975ee 100644
--- a/docs/Explorer-Context-Menu.md
+++ b/docs/Explorer-Context-Menu.md
@@ -29,7 +29,7 @@ The MAUI receiving side:
 
 ## Build prerequisites
 
-The native shell extension requires the **MSVC C++ workload** to build. The **Windows 10/11 SDK (10.0.26100+)** it compiles against is delivered as NuGet packages (`Microsoft.Windows.SDK.CPP` + `Microsoft.Windows.SDK.CPP.x64`, restored to `src/packages`), so a machine-installed Windows SDK is **not** required on build agents — the OneBranch release container ships the C++ toolset but no SDK, and the packages supply the headers, import libs, winmd, and SDK tools (`rc.exe`, `mt.exe`, `midlrt.exe`). Specifically:
+The native shell extension requires the **MSVC C++ workload** to build. The **Windows 10/11 SDK (10.0.26100+)** it compiles against is delivered as NuGet packages (`Microsoft.Windows.SDK.CPP` + the per-architecture `Microsoft.Windows.SDK.CPP.x64` / `Microsoft.Windows.SDK.CPP.arm64`, restored to `src/packages`), so a machine-installed Windows SDK is **not** required on build agents - the OneBranch release container ships the C++ toolset but no SDK, and the packages supply the headers, import libs, winmd, and SDK tools (`rc.exe`, `mt.exe`, `midlrt.exe`). Specifically:
 
 - Visual Studio 2026 (or 2022) with the **Desktop development with C++** workload
 - The Windows SDK NuGet packages above (restored automatically by the `BuildExplorerExtensionNative` target; see below). A locally-installed Windows SDK 10.0.26100+ is still honored as a fallback when those packages are not restored — the vcxproj's `WindowsTargetPlatformVersion` then stays a bare `10.0` (latest installed SDK).
@@ -46,7 +46,7 @@ cd src/EventLogExpert.ExplorerExtensionNative
 nuget restore packages.config -PackagesDirectory ..\packages
 ```
 
-This populates `src/packages/` with `Microsoft.Windows.CppWinRT.*`, `Microsoft.Windows.ImplementationLibrary.*` (WIL), and the Windows SDK packages `Microsoft.Windows.SDK.CPP.*` + `Microsoft.Windows.SDK.CPP.x64.*` (the SDK packages are large — several hundred MB extracted). All are gitignored.
+This populates `src/packages/` with `Microsoft.Windows.CppWinRT.*`, `Microsoft.Windows.ImplementationLibrary.*` (WIL), and the Windows SDK packages `Microsoft.Windows.SDK.CPP.*` + the per-architecture `Microsoft.Windows.SDK.CPP.x64.*` / `Microsoft.Windows.SDK.CPP.arm64.*` (the SDK packages are large - several hundred MB extracted). All are gitignored.
 
 ## Local dev install (signed MSIX)
 
diff --git a/src/EventLogExpert.ExplorerExtensionNative/packages.config b/src/EventLogExpert.ExplorerExtensionNative/packages.config
index 11446b612..dbe931e25 100644
--- a/src/EventLogExpert.ExplorerExtensionNative/packages.config
+++ b/src/EventLogExpert.ExplorerExtensionNative/packages.config
@@ -6,8 +6,9 @@
        from the restore output instead of a machine-installed SDK. Required for CI containers
        that ship the VC++ toolset but no Windows SDK (e.g. the OneBranch vse2022 image). The base
        package provides headers/winmd + sets WindowsSdkDir/WindowsTargetPlatformVersion; the .x64
-       package provides the x64 import libraries. Both are required (no transitive dependency).
-       See docs/Explorer-Context-Menu.md. -->
+       and .arm64 packages provide the per-architecture import libraries (an x64 build uses .x64,
+       an arm64 build uses .arm64). The base + the matching per-arch package are required (no
+       transitive dependency). See docs/Explorer-Context-Menu.md. -->
   <package id="Microsoft.Windows.SDK.CPP" version="10.0.26100.8249" targetFramework="native" />
   <package id="Microsoft.Windows.SDK.CPP.x64" version="10.0.26100.8249" targetFramework="native" />
   <package id="Microsoft.Windows.SDK.CPP.arm64" version="10.0.26100.8249" targetFramework="native" />
diff --git a/src/EventLogExpert/EventLogExpert.csproj b/src/EventLogExpert/EventLogExpert.csproj
index fdae17a73..e3df10efc 100644
--- a/src/EventLogExpert/EventLogExpert.csproj
+++ b/src/EventLogExpert/EventLogExpert.csproj
@@ -77,13 +77,17 @@
     </ItemGroup>
 
     <!--
-      Derive the native vcxproj Platform from the current .NET RuntimeIdentifier. x64 and arm64
-      are supported (the vcxproj declares Debug|x64/Release|x64 + Debug|ARM64/Release|ARM64). Other
-      RIDs (e.g. win-x86) have no matching ProjectConfiguration; the BuildExplorerExtensionNative
-      target then fails fast with a clear message rather than a confusing MSB4126 from VS MSBuild.
+      Derive the native vcxproj Platform from the .NET RuntimeIdentifier, or from the MSBuild Platform when no
+      RID is set (mirrors the _ElevationHelperRid precedence below: RID wins, then Platform=ARM64, then x64). The
+      '$(RuntimeIdentifier)' == '' clause in the Platform=ARM64 branch is load-bearing - it keeps an explicit
+      -r win-x64 winning over /p:Platform=ARM64, so the native DLL and the ElevationHelper can never disagree.
+      x64 and arm64 are supported (the vcxproj declares Debug|x64/Release|x64 + Debug|ARM64/Release|ARM64). Other
+      RIDs (e.g. win-x86) have no matching ProjectConfiguration; the BuildExplorerExtensionNative target then
+      fails fast with a clear message rather than a confusing MSB4126 from VS MSBuild.
     -->
     <PropertyGroup>
       <ExplorerExtensionNativePlatform Condition="'$(RuntimeIdentifier)' != '' AND $(RuntimeIdentifier.Contains('-arm64'))">ARM64</ExplorerExtensionNativePlatform>
+      <ExplorerExtensionNativePlatform Condition="'$(ExplorerExtensionNativePlatform)' == '' AND '$(RuntimeIdentifier)' == '' AND '$(Platform)' == 'ARM64'">ARM64</ExplorerExtensionNativePlatform>
       <ExplorerExtensionNativePlatform Condition="'$(ExplorerExtensionNativePlatform)' == '' AND ('$(RuntimeIdentifier)' == '' OR $(RuntimeIdentifier.Contains('-x64')))">x64</ExplorerExtensionNativePlatform>
     </PropertyGroup>
 
@@ -124,7 +128,15 @@
         <_VswherePath>$(MSBuildProgramFiles32)\Microsoft Visual Studio\Installer\vswhere.exe</_VswherePath>
       </PropertyGroup>
       <Error Condition="'$(ExplorerExtensionNativePlatform)' == ''"
-             Text="EventLogExpert.ExplorerExtensionNative.vcxproj declares x64 and ARM64 ProjectConfiguration entries. RuntimeIdentifier=$(RuntimeIdentifier) does not map to a supported native platform (win-x64 or win-arm64). Build for win-x64/win-arm64 OR add matching ProjectConfiguration + ItemDefinitionGroup blocks (e.g. Win32) to the vcxproj." />
+             Text="EventLogExpert.ExplorerExtensionNative.vcxproj declares x64 and ARM64 ProjectConfiguration entries. RuntimeIdentifier=$(RuntimeIdentifier) (Platform=$(Platform)) does not map to a supported native platform (win-x64 or win-arm64). Build for win-x64/win-arm64 OR add matching ProjectConfiguration + ItemDefinitionGroup blocks (e.g. Win32) to the vcxproj." />
+      <!-- Consistency guard: the native shell-extension DLL and the ElevationHelper (see _ElevationHelperRid below)
+           must target the same architecture, or one MSIX would ship a mixed-arch payload. This fails the build for
+           any drift (e.g. if the two derivations are ever edited out of sync) instead of silently packaging a
+           mismatch. Never fires on a supported win-x64/win-arm64 path. -->
+      <Error Condition="'$(ExplorerExtensionNativePlatform)' == 'ARM64' AND !$(_ElevationHelperRid.Contains('-arm64'))"
+             Text="Architecture mismatch: the native ExplorerExtension resolved ARM64 but the ElevationHelper RID is '$(_ElevationHelperRid)' (RuntimeIdentifier=$(RuntimeIdentifier), Platform=$(Platform)). Both must target the same architecture within one MSIX." />
+      <Error Condition="'$(ExplorerExtensionNativePlatform)' == 'x64' AND !$(_ElevationHelperRid.Contains('-x64'))"
+             Text="Architecture mismatch: the native ExplorerExtension resolved x64 but the ElevationHelper RID is '$(_ElevationHelperRid)' (RuntimeIdentifier=$(RuntimeIdentifier), Platform=$(Platform)). Both must target the same architecture within one MSIX." />
       <!-- Locate VS MSBuild requiring the VC toolset specifically — bare Microsoft.Component.MSBuild
            can match a Build Tools install without the C++ workload, which can't process vcxproj. -->
       <PropertyGroup>

From e4a9bfc387fb09b094e8023ce43860bcfcffe5a9 Mon Sep 17 00:00:00 2001
From: jschick04 <jschick04@gmail.com>
Date: Sat, 20 Jun 2026 17:36:20 -0500
Subject: [PATCH 20/40] Update the SDK import and build-split comments to cover
 ARM64

---
 .github/workflows/PullRequest.yml                           | 6 +++---
 .../EventLogExpert.ExplorerExtensionNative.vcxproj          | 5 +++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/PullRequest.yml b/.github/workflows/PullRequest.yml
index ea0625423..9919d5ab5 100644
--- a/.github/workflows/PullRequest.yml
+++ b/.github/workflows/PullRequest.yml
@@ -27,9 +27,9 @@ jobs:
       run: dotnet restore EventLogExpert.slnx
     # Build the MAUI app in its own step (after the tests), NOT as one solution build.
     # Building the app together with the test projects makes MSBuild compile the shared
-    # libraries twice concurrently - the app resolves win-x64 while the tests are AnyCPU -
-    # which races on the libs' obj/bin (CS2012 / MSB3030). The old -m:1 flag masked this by
-    # serializing; this split fixes the root cause. Don't recombine into one slnx build.
+    # libraries twice concurrently - the app resolves a Windows RID (win-x64) while the tests
+    # are AnyCPU - which races on the libs' obj/bin (CS2012 / MSB3030). The old -m:1 flag masked
+    # this by serializing; this split fixes the root cause. Don't recombine into one slnx build.
     - name: Build libraries and tests
       run: dotnet build LibrariesAndTests.slnf --no-restore -c Release -p:PublishReadyToRun=false
     - name: Test (unit)
diff --git a/src/EventLogExpert.ExplorerExtensionNative/EventLogExpert.ExplorerExtensionNative.vcxproj b/src/EventLogExpert.ExplorerExtensionNative/EventLogExpert.ExplorerExtensionNative.vcxproj
index ea384e5fe..9d45251b4 100644
--- a/src/EventLogExpert.ExplorerExtensionNative/EventLogExpert.ExplorerExtensionNative.vcxproj
+++ b/src/EventLogExpert.ExplorerExtensionNative/EventLogExpert.ExplorerExtensionNative.vcxproj
@@ -15,8 +15,9 @@
     by the release pipeline) fail with `error MSB8036: The Windows SDK version ... was not found`
     because the bare WindowsTargetPlatformVersion '10.0' below resolves to "latest installed" and
     nothing is installed. The Exists() guards keep the build working when the packages are not
-    restored — it then falls back to the latest machine-installed SDK via the bare '10.0'. The
-    x64 package supplies only the x64 import libs (it carries no .targets). Versions are pinned in
+    restored, it then falls back to the latest machine-installed SDK via the bare '10.0'. The
+    per-architecture .x64 / .arm64 packages each supply only their own import libs (they carry no
+    .targets); the arm64 import below is gated to ARM64 builds. Versions are pinned in
     packages.config; bump in lockstep there. See docs/Explorer-Context-Menu.md.
   -->
   <Import Project="..\packages\Microsoft.Windows.SDK.CPP.10.0.26100.8249\build\native\Microsoft.Windows.SDK.cpp.props" Condition="Exists('..\packages\Microsoft.Windows.SDK.CPP.10.0.26100.8249\build\native\Microsoft.Windows.SDK.cpp.props')" />

From 9b20c404842881837764dfd2c3e49b36039e1e0d Mon Sep 17 00:00:00 2001
From: jschick04 <jschick04@gmail.com>
Date: Sat, 20 Jun 2026 17:41:21 -0500
Subject: [PATCH 21/40] Remove the empty placeholder integration test projects

---
 EventLogExpert.slnx                           |  3 ---
 LibrariesAndTests.slnf                        |  3 ---
 .../ContainerRequiredFixture.cs               | 17 --------------
 ...Expert.EventDbTool.IntegrationTests.csproj | 23 -------------------
 .../GlobalUsings.cs                           |  8 -------
 .../xunit.runner.json                         |  5 ----
 ...ogExpert.Filtering.IntegrationTests.csproj | 16 -------------
 .../xunit.runner.json                         |  5 ----
 .../EventLogExpert.UI.IntegrationTests.csproj | 16 -------------
 .../xunit.runner.json                         |  5 ----
 10 files changed, 101 deletions(-)
 delete mode 100644 tests/Integration/EventLogExpert.EventDbTool.IntegrationTests/ContainerRequiredFixture.cs
 delete mode 100644 tests/Integration/EventLogExpert.EventDbTool.IntegrationTests/EventLogExpert.EventDbTool.IntegrationTests.csproj
 delete mode 100644 tests/Integration/EventLogExpert.EventDbTool.IntegrationTests/GlobalUsings.cs
 delete mode 100644 tests/Integration/EventLogExpert.EventDbTool.IntegrationTests/xunit.runner.json
 delete mode 100644 tests/Integration/EventLogExpert.Filtering.IntegrationTests/EventLogExpert.Filtering.IntegrationTests.csproj
 delete mode 100644 tests/Integration/EventLogExpert.Filtering.IntegrationTests/xunit.runner.json
 delete mode 100644 tests/Integration/EventLogExpert.UI.IntegrationTests/EventLogExpert.UI.IntegrationTests.csproj
 delete mode 100644 tests/Integration/EventLogExpert.UI.IntegrationTests/xunit.runner.json

diff --git a/EventLogExpert.slnx b/EventLogExpert.slnx
index 6653bd557..7c20d77a0 100644
--- a/EventLogExpert.slnx
+++ b/EventLogExpert.slnx
@@ -48,14 +48,11 @@
     <Project Path="tests/Unit/EventLogExpert.Provider.Tests/EventLogExpert.Provider.Tests.csproj" />
   </Folder>
   <Folder Name="/tests/Integration/">
-    <Project Path="tests/Integration/EventLogExpert.EventDbTool.IntegrationTests/EventLogExpert.EventDbTool.IntegrationTests.csproj" />
     <Project Path="tests/Integration/EventLogExpert.Eventing.IntegrationTests/EventLogExpert.Eventing.IntegrationTests.csproj" />
-    <Project Path="tests/Integration/EventLogExpert.Filtering.IntegrationTests/EventLogExpert.Filtering.IntegrationTests.csproj" />
     <Project Path="tests/Integration/EventLogExpert.Runtime.IntegrationTests/EventLogExpert.Runtime.IntegrationTests.csproj" />
     <Project Path="tests/Integration/EventLogExpert.Provider.Database.IntegrationTests/EventLogExpert.Provider.Database.IntegrationTests.csproj" />
     <Project Path="tests/Integration/EventLogExpert.DatabaseTools.IntegrationTests/EventLogExpert.DatabaseTools.IntegrationTests.csproj" />
     <Project Path="tests/Integration/EventLogExpert.ElevationHelper.IntegrationTests/EventLogExpert.ElevationHelper.IntegrationTests.csproj" />
-    <Project Path="tests/Integration/EventLogExpert.UI.IntegrationTests/EventLogExpert.UI.IntegrationTests.csproj" />
   </Folder>
   <Folder Name="/tests/Shared/">
     <Project Path="tests/Shared/EventLogExpert.Eventing.TestUtils/EventLogExpert.Eventing.TestUtils.csproj" />
diff --git a/LibrariesAndTests.slnf b/LibrariesAndTests.slnf
index 852772bbc..4a8714da7 100644
--- a/LibrariesAndTests.slnf
+++ b/LibrariesAndTests.slnf
@@ -16,12 +16,9 @@
       "src\\EventLogExpert.WindowsPlatform\\EventLogExpert.WindowsPlatform.csproj",
       "tests\\Integration\\EventLogExpert.DatabaseTools.IntegrationTests\\EventLogExpert.DatabaseTools.IntegrationTests.csproj",
       "tests\\Integration\\EventLogExpert.ElevationHelper.IntegrationTests\\EventLogExpert.ElevationHelper.IntegrationTests.csproj",
-      "tests\\Integration\\EventLogExpert.EventDbTool.IntegrationTests\\EventLogExpert.EventDbTool.IntegrationTests.csproj",
       "tests\\Integration\\EventLogExpert.Eventing.IntegrationTests\\EventLogExpert.Eventing.IntegrationTests.csproj",
-      "tests\\Integration\\EventLogExpert.Filtering.IntegrationTests\\EventLogExpert.Filtering.IntegrationTests.csproj",
       "tests\\Integration\\EventLogExpert.Provider.Database.IntegrationTests\\EventLogExpert.Provider.Database.IntegrationTests.csproj",
       "tests\\Integration\\EventLogExpert.Runtime.IntegrationTests\\EventLogExpert.Runtime.IntegrationTests.csproj",
-      "tests\\Integration\\EventLogExpert.UI.IntegrationTests\\EventLogExpert.UI.IntegrationTests.csproj",
       "tests\\Shared\\EventLogExpert.Eventing.TestUtils\\EventLogExpert.Eventing.TestUtils.csproj",
       "tests\\Shared\\EventLogExpert.Filtering.TestUtils\\EventLogExpert.Filtering.TestUtils.csproj",
       "tests\\Unit\\EventLogExpert.DatabaseTools.Tests\\EventLogExpert.DatabaseTools.Tests.csproj",
diff --git a/tests/Integration/EventLogExpert.EventDbTool.IntegrationTests/ContainerRequiredFixture.cs b/tests/Integration/EventLogExpert.EventDbTool.IntegrationTests/ContainerRequiredFixture.cs
deleted file mode 100644
index 8a2f6a0ed..000000000
--- a/tests/Integration/EventLogExpert.EventDbTool.IntegrationTests/ContainerRequiredFixture.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-// // Copyright (c) Microsoft Corporation.
-// // Licensed under the MIT License.
-
-namespace EventLogExpert.EventDbTool.IntegrationTests;
-
-public sealed class ContainerRequiredFixture
-{
-    public ContainerRequiredFixture()
-    {
-        if (string.IsNullOrWhiteSpace(Environment.GetEnvironmentVariable("EVENTLOG_CONTAINER")))
-        {
-            throw new InvalidOperationException(
-                "Integration tests require EVENTLOG_CONTAINER to be set. " +
-                "Use scripts/run-tests.ps1 (recommended — runs in a container) or set the variable manually for host execution.");
-        }
-    }
-}
diff --git a/tests/Integration/EventLogExpert.EventDbTool.IntegrationTests/EventLogExpert.EventDbTool.IntegrationTests.csproj b/tests/Integration/EventLogExpert.EventDbTool.IntegrationTests/EventLogExpert.EventDbTool.IntegrationTests.csproj
deleted file mode 100644
index 607e3eda4..000000000
--- a/tests/Integration/EventLogExpert.EventDbTool.IntegrationTests/EventLogExpert.EventDbTool.IntegrationTests.csproj
+++ /dev/null
@@ -1,23 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <IsPackable>false</IsPackable>
-    <IsTestProject>true</IsTestProject>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\src\EventLogExpert.EventDbTool\EventLogExpert.EventDbTool.csproj" />
-    <ProjectReference Include="..\..\..\src\EventLogExpert.Eventing\EventLogExpert.Eventing.csproj" />
-    <ProjectReference Include="..\..\Shared\EventLogExpert.Eventing.TestUtils\EventLogExpert.Eventing.TestUtils.csproj" />
-  </ItemGroup>
-
-  <!--
-    Force xunit.runner.json next to the test assembly so the runner picks up the
-    serial-execution config; without CopyToOutputDirectory the file can be silently ignored
-    depending on the SDK / runner version.
-  -->
-  <ItemGroup>
-    <None Update="xunit.runner.json" CopyToOutputDirectory="PreserveNewest" />
-  </ItemGroup>
-
-</Project>
diff --git a/tests/Integration/EventLogExpert.EventDbTool.IntegrationTests/GlobalUsings.cs b/tests/Integration/EventLogExpert.EventDbTool.IntegrationTests/GlobalUsings.cs
deleted file mode 100644
index d6b475048..000000000
--- a/tests/Integration/EventLogExpert.EventDbTool.IntegrationTests/GlobalUsings.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-// // Copyright (c) Microsoft Corporation.
-// // Licensed under the MIT License.
-
-global using Xunit;
-
-using EventLogExpert.EventDbTool.IntegrationTests;
-
-[assembly: AssemblyFixture(typeof(ContainerRequiredFixture))]
diff --git a/tests/Integration/EventLogExpert.EventDbTool.IntegrationTests/xunit.runner.json b/tests/Integration/EventLogExpert.EventDbTool.IntegrationTests/xunit.runner.json
deleted file mode 100644
index 77778efd0..000000000
--- a/tests/Integration/EventLogExpert.EventDbTool.IntegrationTests/xunit.runner.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "$schema": "https://xunit.net/schema/v3/xunit.runner.schema.json",
-  "parallelizeAssembly": false,
-  "parallelizeTestCollections": false
-}
diff --git a/tests/Integration/EventLogExpert.Filtering.IntegrationTests/EventLogExpert.Filtering.IntegrationTests.csproj b/tests/Integration/EventLogExpert.Filtering.IntegrationTests/EventLogExpert.Filtering.IntegrationTests.csproj
deleted file mode 100644
index 2345249d3..000000000
--- a/tests/Integration/EventLogExpert.Filtering.IntegrationTests/EventLogExpert.Filtering.IntegrationTests.csproj
+++ /dev/null
@@ -1,16 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <IsPackable>false</IsPackable>
-    <IsTestProject>true</IsTestProject>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\src\EventLogExpert.Filtering\EventLogExpert.Filtering.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <None Update="xunit.runner.json" CopyToOutputDirectory="PreserveNewest" />
-  </ItemGroup>
-
-</Project>
diff --git a/tests/Integration/EventLogExpert.Filtering.IntegrationTests/xunit.runner.json b/tests/Integration/EventLogExpert.Filtering.IntegrationTests/xunit.runner.json
deleted file mode 100644
index 77778efd0..000000000
--- a/tests/Integration/EventLogExpert.Filtering.IntegrationTests/xunit.runner.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "$schema": "https://xunit.net/schema/v3/xunit.runner.schema.json",
-  "parallelizeAssembly": false,
-  "parallelizeTestCollections": false
-}
diff --git a/tests/Integration/EventLogExpert.UI.IntegrationTests/EventLogExpert.UI.IntegrationTests.csproj b/tests/Integration/EventLogExpert.UI.IntegrationTests/EventLogExpert.UI.IntegrationTests.csproj
deleted file mode 100644
index 170c99d53..000000000
--- a/tests/Integration/EventLogExpert.UI.IntegrationTests/EventLogExpert.UI.IntegrationTests.csproj
+++ /dev/null
@@ -1,16 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk.Razor">
-
-  <PropertyGroup>
-    <IsPackable>false</IsPackable>
-    <IsTestProject>true</IsTestProject>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\src\EventLogExpert.UI\EventLogExpert.UI.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <None Update="xunit.runner.json" CopyToOutputDirectory="PreserveNewest" />
-  </ItemGroup>
-
-</Project>
diff --git a/tests/Integration/EventLogExpert.UI.IntegrationTests/xunit.runner.json b/tests/Integration/EventLogExpert.UI.IntegrationTests/xunit.runner.json
deleted file mode 100644
index 77778efd0..000000000
--- a/tests/Integration/EventLogExpert.UI.IntegrationTests/xunit.runner.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "$schema": "https://xunit.net/schema/v3/xunit.runner.schema.json",
-  "parallelizeAssembly": false,
-  "parallelizeTestCollections": false
-}

From 18123ed4413c4c3d5ffbbb03fa7cd095423079f1 Mon Sep 17 00:00:00 2001
From: jschick04 <jschick04@gmail.com>
Date: Sat, 20 Jun 2026 17:51:58 -0500
Subject: [PATCH 22/40] Clarify the native-build error messages reference the
 SDK NuGet packages

---
 src/EventLogExpert/EventLogExpert.csproj | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/EventLogExpert/EventLogExpert.csproj b/src/EventLogExpert/EventLogExpert.csproj
index e3df10efc..2f61bcc82 100644
--- a/src/EventLogExpert/EventLogExpert.csproj
+++ b/src/EventLogExpert/EventLogExpert.csproj
@@ -156,7 +156,7 @@
         <VsMSBuildPath>$(VsMSBuildPath.Trim())</VsMSBuildPath>
       </PropertyGroup>
       <Error Condition="'$(VsMSBuildPath)' == '' OR !Exists('$(VsMSBuildPath)')"
-             Text="Could not locate Visual Studio MSBuild.exe with the required C++ workload components via vswhere ($(_VswherePath)). The native shell extension requires a VS install with $(_ExplorerExtensionVcComponents) AND the Windows 10/11 SDK. See docs/Explorer-Context-Menu.md for prereqs." />
+             Text="Could not locate Visual Studio MSBuild.exe with the required C++ workload components via vswhere ($(_VswherePath)). The native shell extension requires a VS install with $(_ExplorerExtensionVcComponents); the Windows 10/11 SDK is supplied by the restored Microsoft.Windows.SDK.CPP* NuGet packages (or a machine-installed SDK as a fallback). See docs/Explorer-Context-Menu.md for prereqs." />
       <Exec Command="where nuget.exe" ConsoleToMSBuild="true" ContinueOnError="true" IgnoreExitCode="true">
         <Output TaskParameter="ExitCode" PropertyName="_WhereNugetExitCode" />
         <Output TaskParameter="ConsoleOutput" PropertyName="_WhereNugetOutput" />
@@ -190,7 +190,7 @@
       <Exec Command="&quot;$(VsMSBuildPath)&quot; &quot;$(ExplorerExtensionNativeProject)&quot; /p:Configuration=$(Configuration) /p:Platform=$(ExplorerExtensionNativePlatform) /nologo /v:minimal"
             ContinueOnError="false" />
       <Error Condition="!Exists('$(ExplorerExtensionNativeDll)')"
-             Text="EventLogExpert.ExplorerExtension.dll native build did not produce output at $(ExplorerExtensionNativeDll). Check the C++ workload + Windows SDK install. See docs/Explorer-Context-Menu.md for prereqs." />
+             Text="EventLogExpert.ExplorerExtension.dll native build did not produce output at $(ExplorerExtensionNativeDll). Check the C++ workload and the restored Microsoft.Windows.SDK.CPP* packages (or a machine-installed Windows SDK). See docs/Explorer-Context-Menu.md for prereqs." />
     </Target>
 
     <!--

From 3f821339fa4808f93a07b262ea42e3fb200909e9 Mon Sep 17 00:00:00 2001
From: jschick04 <jschick04@gmail.com>
Date: Sat, 20 Jun 2026 18:27:34 -0500
Subject: [PATCH 23/40] Remove references to the deleted EventDbTool
 integration test project

---
 compose.yml                                               | 7 -------
 src/EventLogExpert.EventDbTool/Properties/AssemblyInfo.cs | 1 -
 2 files changed, 8 deletions(-)

diff --git a/compose.yml b/compose.yml
index d99da095b..c22a02e18 100644
--- a/compose.yml
+++ b/compose.yml
@@ -39,13 +39,6 @@ services:
       - --logger
       - "trx;LogFileName=runtime.trx"
 
-  eventdbtool:
-    <<: *base
-    command:
-      - tests/Integration/EventLogExpert.EventDbTool.IntegrationTests/EventLogExpert.EventDbTool.IntegrationTests.csproj
-      - --logger
-      - "trx;LogFileName=eventdbtool.trx"
-
   elevationhelper:
     <<: *base
     command:
diff --git a/src/EventLogExpert.EventDbTool/Properties/AssemblyInfo.cs b/src/EventLogExpert.EventDbTool/Properties/AssemblyInfo.cs
index fa5fabc58..6e18265ff 100644
--- a/src/EventLogExpert.EventDbTool/Properties/AssemblyInfo.cs
+++ b/src/EventLogExpert.EventDbTool/Properties/AssemblyInfo.cs
@@ -3,5 +3,4 @@
 
 using System.Runtime.CompilerServices;
 
-[assembly: InternalsVisibleTo("EventLogExpert.EventDbTool.IntegrationTests")]
 [assembly: InternalsVisibleTo("EventLogExpert.EventDbTool.Tests")]

From 723c2b5226709568f8ec3f357a74103c6de51880 Mon Sep 17 00:00:00 2001
From: jschick04 <jschick04@gmail.com>
Date: Sat, 20 Jun 2026 18:44:35 -0500
Subject: [PATCH 24/40] Reference elevationhelper instead of removed
 eventdbtool in test docs

---
 scripts/run-tests.ps1       | 2 +-
 tests/Integration/README.md | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/scripts/run-tests.ps1 b/scripts/run-tests.ps1
index f950eb364..9aeebc3e5 100644
--- a/scripts/run-tests.ps1
+++ b/scripts/run-tests.ps1
@@ -19,7 +19,7 @@
 .EXAMPLE
     ./scripts/run-tests.ps1
     ./scripts/run-tests.ps1 -Suite eventing
-    ./scripts/run-tests.ps1 -Suite runtime,eventdbtool
+    ./scripts/run-tests.ps1 -Suite runtime,elevationhelper
 #>
 [CmdletBinding()]
 param(
diff --git a/tests/Integration/README.md b/tests/Integration/README.md
index 91d113905..08f83b833 100644
--- a/tests/Integration/README.md
+++ b/tests/Integration/README.md
@@ -20,7 +20,7 @@ ensures tests fail loudly rather than silently polluting your local Application
 ### To run integration tests
 
 Use the provided script, which handles Docker daemon mode switching automatically.
-The script runs all services defined in `compose.yml` (eventing, runtime, eventdbtool):
+The script runs all services defined in `compose.yml` (eventing, runtime, elevationhelper):
 
 ```powershell
 # Run all container-gated suites
@@ -28,7 +28,7 @@ The script runs all services defined in `compose.yml` (eventing, runtime, eventd
 
 # Run a specific suite
 ./scripts/run-tests.ps1 -Suite eventing
-./scripts/run-tests.ps1 -Suite runtime,eventdbtool
+./scripts/run-tests.ps1 -Suite runtime,elevationhelper
 ```
 
 Integration test projects that do not require a Windows container (e.g., ProviderDatabase)
@@ -47,7 +47,7 @@ Or run Docker Compose directly:
 ```powershell
 docker compose run --rm eventing
 docker compose run --rm runtime
-docker compose run --rm eventdbtool
+docker compose run --rm elevationhelper
 ```
 
 Or opt in on host explicitly (accepts event log pollution):
@@ -93,7 +93,7 @@ Run each integration test project **serially**:
 ```powershell
 docker compose run --rm eventing
 docker compose run --rm runtime
-docker compose run --rm eventdbtool
+docker compose run --rm elevationhelper
 ```
 
 Do **not** use `docker compose up`. The three services share the `build-artifacts`

From 15ccb63aa8dcdf789d6cee25bc14c25b85919772 Mon Sep 17 00:00:00 2001
From: jschick04 <jschick04@gmail.com>
Date: Sat, 20 Jun 2026 19:50:54 -0500
Subject: [PATCH 25/40] Fix the force-kill disposition race and the helper
 connect harness

---
 .../Elevation/ElevatedDatabaseToolsRunner.cs  | 16 +++-
 .../TestElevatedHelperProcessHost.cs          | 80 +++++++++++++++++--
 2 files changed, 90 insertions(+), 6 deletions(-)

diff --git a/src/EventLogExpert.Runtime/DatabaseTools/Elevation/ElevatedDatabaseToolsRunner.cs b/src/EventLogExpert.Runtime/DatabaseTools/Elevation/ElevatedDatabaseToolsRunner.cs
index c35221023..ef85dab00 100644
--- a/src/EventLogExpert.Runtime/DatabaseTools/Elevation/ElevatedDatabaseToolsRunner.cs
+++ b/src/EventLogExpert.Runtime/DatabaseTools/Elevation/ElevatedDatabaseToolsRunner.cs
@@ -248,7 +248,7 @@ private void HandleCallerCancellation(Stream pipeStream, SemaphoreSlim writeLock
         var graceCts = new CancellationTokenSource();
         killState.SetGraceTimer(graceCts);
 
-        _ = Task.Run(async () =>
+        var killTask = Task.Run(async () =>
         {
             try
             {
@@ -276,6 +276,8 @@ private void HandleCallerCancellation(Stream pipeStream, SemaphoreSlim writeLock
                 _traceLogger.Warning($"{ElevatedHelperTag} kill-timer task threw {ex.GetType().Name}: {ex.Message}");
             }
         });
+
+        killState.SetKillTask(killTask);
     }
 
     private void MirrorMessageToDebugLog(DatabaseToolsIpcMessage message)
@@ -493,6 +495,13 @@ private async Task<DatabaseToolsResult> RunAsync(
             // Helper sent a terminal message (or pipe closed). Cancel the kill-timer so it doesn't fire on a clean finish.
             killState.CancelGraceTimer();
 
+            // Join the kill-timer so its disposition write happens-before the TranslateOutcome read.
+            try { await killState.KillTaskOrCompleted.WaitAsync(_exitGrace); }
+            catch (TimeoutException)
+            {
+                _traceLogger.Warning($"{ElevatedHelperTag} kill-timer did not settle within {_exitGrace.TotalSeconds:N0}s; proceeding with current disposition.");
+            }
+
             // 7) Wait for helper to exit (bounded by _exitGrace, then force-kill if it lingers and is killable).
             int exitCode;
             try
@@ -684,6 +693,7 @@ private sealed class KillState
         private int _cancelRequested;
         private int _disposition;
         private CancellationTokenSource? _graceTimerCts;
+        private Task? _killTask;
 
         public KillDisposition Disposition => (KillDisposition)Volatile.Read(ref _disposition);
 
@@ -711,5 +721,9 @@ public void MarkKillFailed() => Interlocked.CompareExchange(
         public void MarkKillSucceeded() => Interlocked.Exchange(ref _disposition, (int)KillDisposition.Succeeded);
 
         public void SetGraceTimer(CancellationTokenSource cts) => Volatile.Write(ref _graceTimerCts, cts);
+
+        public void SetKillTask(Task task) => Volatile.Write(ref _killTask, task);
+
+        public Task KillTaskOrCompleted => Volatile.Read(ref _killTask) ?? Task.CompletedTask;
     }
 }
diff --git a/tests/Integration/EventLogExpert.ElevationHelper.IntegrationTests/TestUtils/TestElevatedHelperProcessHost.cs b/tests/Integration/EventLogExpert.ElevationHelper.IntegrationTests/TestUtils/TestElevatedHelperProcessHost.cs
index 837869425..68d715d83 100644
--- a/tests/Integration/EventLogExpert.ElevationHelper.IntegrationTests/TestUtils/TestElevatedHelperProcessHost.cs
+++ b/tests/Integration/EventLogExpert.ElevationHelper.IntegrationTests/TestUtils/TestElevatedHelperProcessHost.cs
@@ -7,15 +7,17 @@
 using System.Diagnostics;
 using System.IO.Pipes;
 using System.Runtime.InteropServices;
+using System.Text;
 
 namespace EventLogExpert.ElevationHelper.IntegrationTests.TestUtils;
 
 internal sealed class TestElevatedHelperProcessHost(ITraceLogger logger) : IElevatedHelperProcessHost
 {
     private const int MaxClientPidRejections = 32;
+    private const int MaxStderrChars = 4096;
     private const int PipeBufferSize = 65536;
 
-    private static readonly TimeSpan s_connectTimeout = TimeSpan.FromSeconds(15);
+    private static readonly TimeSpan s_connectTimeout = TimeSpan.FromSeconds(60);
 
     internal enum PidVerifyResult
     {
@@ -67,24 +69,72 @@ public async Task<IElevatedHelperProcess> StartAsync(IReadOnlyList<string> extra
             helperProcess = Process.Start(psi) ?? throw new InvalidOperationException("Process.Start returned null without throwing.");
 
             var capturedPid = helperProcess.Id;
-            helperProcess.ErrorDataReceived += (_, e) => { if (e.Data is not null) { logger.Warning($"helper[{capturedPid}] stderr: {e.Data}"); } };
+            var stderrLock = new object();
+            var stderrBuffer = new StringBuilder();
+
+            helperProcess.ErrorDataReceived += (_, e) =>
+            {
+                if (e.Data is null) { return; }
+
+                logger.Warning($"helper[{capturedPid}] stderr: {e.Data}");
+
+                lock (stderrLock)
+                {
+                    var remaining = MaxStderrChars - stderrBuffer.Length;
+
+                    if (remaining <= 0) { return; }
+
+                    stderrBuffer.Append(e.Data.Length <= remaining ? e.Data : e.Data[..remaining]);
+
+                    if (stderrBuffer.Length < MaxStderrChars) { stderrBuffer.Append('\n'); }
+                }
+            };
             helperProcess.OutputDataReceived += (_, e) => { if (e.Data is not null) { logger.Information($"helper[{capturedPid}] stdout: {e.Data}"); } };
             helperProcess.BeginErrorReadLine();
             helperProcess.BeginOutputReadLine();
 
+            string SnapshotStderr() { lock (stderrLock) { return stderrBuffer.ToString(); } }
+
             logger.Information($"{nameof(TestElevatedHelperProcessHost)}: spawned helper PID {helperProcess.Id} (pipe={pipeName}, dotnet {helperDllPath})");
 
             using var connectCts = CancellationTokenSource.CreateLinkedTokenSource(cancellationToken);
             connectCts.CancelAfter(s_connectTimeout);
 
+            // Watch for early helper exit on its own source so a connect timeout cannot misreport it as an exit.
+            using var exitWatchCts = CancellationTokenSource.CreateLinkedTokenSource(cancellationToken);
+
+            var acceptTask = AcceptAndVerifyClientPidAsync(pipeServer, helperProcess.Id, logger, connectCts.Token);
+            var exitTask = WaitForExitOrCancelAsync(helperProcess, exitWatchCts.Token);
+
             try
             {
-                await AcceptAndVerifyClientPidAsync(pipeServer, helperProcess.Id, logger, connectCts.Token);
+                var winner = await Task.WhenAny(acceptTask, exitTask);
+
+                if (winner == exitTask && exitTask.Result && !acceptTask.IsCompletedSuccessfully)
+                {
+                    throw new InvalidOperationException(
+                        $"Elevated helper PID {helperProcess.Id} exited (exit code {helperProcess.ExitCode}) before connecting. stderr tail: {SnapshotStderr()}");
+                }
+
+                await acceptTask;
             }
-            catch (OperationCanceledException) when (!cancellationToken.IsCancellationRequested)
+            catch (OperationCanceledException) when (connectCts.IsCancellationRequested && !cancellationToken.IsCancellationRequested)
             {
+                if (helperProcess.HasExited)
+                {
+                    throw new InvalidOperationException(
+                        $"Elevated helper PID {helperProcess.Id} exited (exit code {helperProcess.ExitCode}) before connecting. stderr tail: {SnapshotStderr()}");
+                }
+
                 throw new TimeoutException(
-                    $"Elevated helper PID {helperProcess.Id} did not connect within {s_connectTimeout.TotalSeconds:N0}s.");
+                    $"Elevated helper PID {helperProcess.Id} did not connect within {s_connectTimeout.TotalSeconds:N0}s (helper still running). stderr tail: {SnapshotStderr()}");
+            }
+            finally
+            {
+                exitWatchCts.Cancel();
+                connectCts.Cancel();
+                await ObserveQuietly(acceptTask);
+                await ObserveQuietly(exitTask);
             }
 
             var handle = new TestElevatedHelperProcess(helperProcess, pipeServer, logger);
@@ -185,6 +235,12 @@ private static string BuildArgumentString(string runtimeConfigPath, string helpe
         return string.Join(' ', parts.Select(QuoteIfNeeded));
     }
 
+    private static async Task ObserveQuietly(Task task)
+    {
+        try { await task; }
+        catch { /* losing-race tasks throw on cleanup cancellation; observed and dropped */ }
+    }
+
     private static string QuoteIfNeeded(string arg)
     {
         if (string.IsNullOrEmpty(arg)) { return "\"\""; }
@@ -210,6 +266,20 @@ private static string ResolveTestRuntimeConfig()
         return testRuntimeConfig;
     }
 
+    private static async Task<bool> WaitForExitOrCancelAsync(Process process, CancellationToken cancellationToken)
+    {
+        try
+        {
+            await process.WaitForExitAsync(cancellationToken);
+
+            return true;
+        }
+        catch (OperationCanceledException)
+        {
+            return false;
+        }
+    }
+
     private static class NativeMethods
     {
         [DllImport("kernel32.dll", SetLastError = true)]

From a33ac938016134863cf5281b74d9388169dc4b9c Mon Sep 17 00:00:00 2001
From: jschick04 <jschick04@gmail.com>
Date: Sat, 20 Jun 2026 22:30:38 -0500
Subject: [PATCH 26/40] Build the solution in one pass and drop the slnf build
 split

---
 .github/workflows/PullRequest.yml | 11 ++-------
 Directory.Build.props             |  1 +
 Directory.Build.targets           |  7 ++++++
 LibrariesAndTests.slnf            | 37 -------------------------------
 4 files changed, 10 insertions(+), 46 deletions(-)
 create mode 100644 Directory.Build.targets
 delete mode 100644 LibrariesAndTests.slnf

diff --git a/.github/workflows/PullRequest.yml b/.github/workflows/PullRequest.yml
index 9919d5ab5..bc2f18fcb 100644
--- a/.github/workflows/PullRequest.yml
+++ b/.github/workflows/PullRequest.yml
@@ -25,13 +25,8 @@ jobs:
       run: dotnet workload restore EventLogExpert.slnx
     - name: Restore dependencies
       run: dotnet restore EventLogExpert.slnx
-    # Build the MAUI app in its own step (after the tests), NOT as one solution build.
-    # Building the app together with the test projects makes MSBuild compile the shared
-    # libraries twice concurrently - the app resolves a Windows RID (win-x64) while the tests
-    # are AnyCPU - which races on the libs' obj/bin (CS2012 / MSB3030). The old -m:1 flag masked
-    # this by serializing; this split fixes the root cause. Don't recombine into one slnx build.
-    - name: Build libraries and tests
-      run: dotnet build LibrariesAndTests.slnf --no-restore -c Release -p:PublishReadyToRun=false
+    - name: Build
+      run: dotnet build EventLogExpert.slnx --no-restore -c Release -p:PublishReadyToRun=false -p:WindowsPackageType=None
     - name: Test (unit)
       shell: pwsh
       run: |
@@ -56,5 +51,3 @@ jobs:
           if ($LASTEXITCODE -ne 0) { $failed = $true }
         }
         if ($failed) { throw 'One or more integration test projects failed.' }
-    - name: Build app
-      run: dotnet build src/EventLogExpert/EventLogExpert.csproj --no-restore -c Release -p:PublishReadyToRun=false
diff --git a/Directory.Build.props b/Directory.Build.props
index 64a91cc37..37a2d8332 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -3,6 +3,7 @@
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+        <DebugType>embedded</DebugType>
         <!-- CsWinRT1030 fires for List<T> of any public type because IT could theoretically cross the WinRT ABI in AOT/trimmed scenarios. We never marshal these collections across the ABI, so the warning is benign. -->
         <NoWarn>$(NoWarn);CsWinRT1030</NoWarn>
     </PropertyGroup>
diff --git a/Directory.Build.targets b/Directory.Build.targets
new file mode 100644
index 000000000..b7fb0e0b0
--- /dev/null
+++ b/Directory.Build.targets
@@ -0,0 +1,7 @@
+<Project>
+    <ItemGroup Condition="'$(OutputType)' == 'Exe' or '$(OutputType)' == 'WinExe'">
+        <ProjectReference Update="@(ProjectReference)">
+            <GlobalPropertiesToRemove>$(GlobalPropertiesToRemoveFromProjectReferences);RuntimeIdentifier;SelfContained</GlobalPropertiesToRemove>
+        </ProjectReference>
+    </ItemGroup>
+</Project>
diff --git a/LibrariesAndTests.slnf b/LibrariesAndTests.slnf
deleted file mode 100644
index 4a8714da7..000000000
--- a/LibrariesAndTests.slnf
+++ /dev/null
@@ -1,37 +0,0 @@
-{
-  "solution": {
-    "path": "EventLogExpert.slnx",
-    "projects": [
-      "src\\EventLogExpert.DatabaseTools\\EventLogExpert.DatabaseTools.csproj",
-      "src\\EventLogExpert.ElevationHelper\\EventLogExpert.ElevationHelper.csproj",
-      "src\\EventLogExpert.EventDbTool\\EventLogExpert.EventDbTool.csproj",
-      "src\\EventLogExpert.Eventing\\EventLogExpert.Eventing.csproj",
-      "src\\EventLogExpert.Filtering\\EventLogExpert.Filtering.csproj",
-      "src\\EventLogExpert.Logging\\EventLogExpert.Logging.csproj",
-      "src\\EventLogExpert.Provider\\EventLogExpert.Provider.csproj",
-      "src\\EventLogExpert.Provider.Database\\EventLogExpert.Provider.Database.csproj",
-      "src\\EventLogExpert.Runtime\\EventLogExpert.Runtime.csproj",
-      "src\\EventLogExpert.Scenarios\\EventLogExpert.Scenarios.csproj",
-      "src\\EventLogExpert.UI\\EventLogExpert.UI.csproj",
-      "src\\EventLogExpert.WindowsPlatform\\EventLogExpert.WindowsPlatform.csproj",
-      "tests\\Integration\\EventLogExpert.DatabaseTools.IntegrationTests\\EventLogExpert.DatabaseTools.IntegrationTests.csproj",
-      "tests\\Integration\\EventLogExpert.ElevationHelper.IntegrationTests\\EventLogExpert.ElevationHelper.IntegrationTests.csproj",
-      "tests\\Integration\\EventLogExpert.Eventing.IntegrationTests\\EventLogExpert.Eventing.IntegrationTests.csproj",
-      "tests\\Integration\\EventLogExpert.Provider.Database.IntegrationTests\\EventLogExpert.Provider.Database.IntegrationTests.csproj",
-      "tests\\Integration\\EventLogExpert.Runtime.IntegrationTests\\EventLogExpert.Runtime.IntegrationTests.csproj",
-      "tests\\Shared\\EventLogExpert.Eventing.TestUtils\\EventLogExpert.Eventing.TestUtils.csproj",
-      "tests\\Shared\\EventLogExpert.Filtering.TestUtils\\EventLogExpert.Filtering.TestUtils.csproj",
-      "tests\\Unit\\EventLogExpert.DatabaseTools.Tests\\EventLogExpert.DatabaseTools.Tests.csproj",
-      "tests\\Unit\\EventLogExpert.EventDbTool.Tests\\EventLogExpert.EventDbTool.Tests.csproj",
-      "tests\\Unit\\EventLogExpert.Eventing.Tests\\EventLogExpert.Eventing.Tests.csproj",
-      "tests\\Unit\\EventLogExpert.Filtering.Tests\\EventLogExpert.Filtering.Tests.csproj",
-      "tests\\Unit\\EventLogExpert.Logging.Tests\\EventLogExpert.Logging.Tests.csproj",
-      "tests\\Unit\\EventLogExpert.Provider.Database.Tests\\EventLogExpert.Provider.Database.Tests.csproj",
-      "tests\\Unit\\EventLogExpert.Provider.Tests\\EventLogExpert.Provider.Tests.csproj",
-      "tests\\Unit\\EventLogExpert.Runtime.Tests\\EventLogExpert.Runtime.Tests.csproj",
-      "tests\\Unit\\EventLogExpert.Scenarios.Tests\\EventLogExpert.Scenarios.Tests.csproj",
-      "tests\\Unit\\EventLogExpert.UI.Tests\\EventLogExpert.UI.Tests.csproj",
-      "tests\\Unit\\EventLogExpert.Windows.Tests\\EventLogExpert.Windows.Tests.csproj"
-    ]
-  }
-}

From e1cc293e3760a2dca047177a61b010dd8020f7de Mon Sep 17 00:00:00 2001
From: jschick04 <jschick04@gmail.com>
Date: Sat, 20 Jun 2026 16:12:53 -0500
Subject: [PATCH 27/40] Make the in-app updater select the multi-architecture
 bundle only

---
 .../Update/UpdateService.cs                   |  33 ++-
 .../Constants/Constants.GitHubRelease.cs      |   8 +-
 .../UpdateServiceAssetSelectionTests.cs       | 189 ++++++++++++++++++
 .../Update/UpdateServiceTests.cs              | 107 ++++++++--
 4 files changed, 317 insertions(+), 20 deletions(-)
 create mode 100644 tests/Unit/EventLogExpert.Runtime.Tests/Update/UpdateServiceAssetSelectionTests.cs

diff --git a/src/EventLogExpert.Runtime/Update/UpdateService.cs b/src/EventLogExpert.Runtime/Update/UpdateService.cs
index 6d937f14e..64640a7b6 100644
--- a/src/EventLogExpert.Runtime/Update/UpdateService.cs
+++ b/src/EventLogExpert.Runtime/Update/UpdateService.cs
@@ -8,6 +8,7 @@
 using EventLogExpert.Runtime.Settings;
 using EventLogExpert.Runtime.Update.Deployment;
 using EventLogExpert.Runtime.Update.ReleaseNotes;
+using System.Runtime.InteropServices;
 
 namespace EventLogExpert.Runtime.Update;
 
@@ -158,11 +159,23 @@ await alertDialogService.ShowAlert("Update Failure",
 
         try
         {
-            string downloadPath = latest.Value.Assets.First(x => x.Name.Contains(".msix")).Uri;
+            string? downloadPath = SelectUpdateDownloadUri(latest.Value.Assets);
 
             if (string.IsNullOrEmpty(downloadPath))
             {
-                traceLogger.Warning($"{nameof(CheckForUpdates)} Could not get asset download path.");
+                string availableAssets = latest.Value.Assets is null or { Count: 0 }
+                    ? "(none)"
+                    : string.Join(", ", latest.Value.Assets.Select(asset => string.IsNullOrEmpty(asset.Name) ? "(unnamed)" : asset.Name));
+
+                traceLogger.Warning($"{nameof(CheckForUpdates)} No update bundle (.msixbundle) was found in the " +
+                    $"latest release. OS architecture: {RuntimeInformation.OSArchitecture}. Available assets: {availableAssets}");
+
+                if (userInitiated)
+                {
+                    await alertDialogService.ShowAlert("Update Unavailable",
+                        "No compatible update package was found.",
+                        "OK");
+                }
 
                 return;
             }
@@ -216,4 +229,20 @@ await alertDialogService.ShowAlert("Release Notes Failure",
 
         return new ReleaseNotesContent(title, markdown);
     }
+
+    /// <summary>
+    ///     Selects the download URI of the multi-architecture app bundle (.msixbundle) from the release assets, or
+    ///     <see langword="null" /> when the release contains no bundle.
+    /// </summary>
+    internal static string? SelectUpdateDownloadUri(IReadOnlyList<GitHubReleaseAsset>? assets)
+    {
+        return assets?.Where(asset =>
+                asset.Name is not null &&
+                (asset.Name.StartsWith("EventLogExpert_", StringComparison.OrdinalIgnoreCase) ||
+                    asset.Name.StartsWith("EventLogExpert.", StringComparison.OrdinalIgnoreCase)) &&
+                asset.Name.EndsWith(".msixbundle", StringComparison.OrdinalIgnoreCase) &&
+                !string.IsNullOrWhiteSpace(asset.Uri))
+            .Select(asset => asset.Uri)
+            .FirstOrDefault();
+    }
 }
diff --git a/tests/Unit/EventLogExpert.Runtime.Tests/TestUtils/Constants/Constants.GitHubRelease.cs b/tests/Unit/EventLogExpert.Runtime.Tests/TestUtils/Constants/Constants.GitHubRelease.cs
index e4ef88b0b..e50c30d93 100644
--- a/tests/Unit/EventLogExpert.Runtime.Tests/TestUtils/Constants/Constants.GitHubRelease.cs
+++ b/tests/Unit/EventLogExpert.Runtime.Tests/TestUtils/Constants/Constants.GitHubRelease.cs
@@ -7,14 +7,14 @@ public sealed partial class Constants
 {
     public const string AppInstalledVersion = "23.1.1.1";
 
-    public const string GitHubLatestName = "EventLogExpert_23.1.1.2_x64.msix";
+    public const string GitHubLatestName = "EventLogExpert_23.1.1.2.msixbundle";
     public const string GitHubLatestUri =
-        "https://github.com/microsoft/EventLogExpert/releases/download/v23.1.1.2/EventLogExpert_23.1.1.2_x64.msix";
+        "https://github.com/microsoft/EventLogExpert/releases/download/v23.1.1.2/EventLogExpert_23.1.1.2.msixbundle";
     public const string GitHubLatestVersion = "v23.1.1.2";
 
-    public const string GitHubPrereleaseName = "EventLogExpert_23.1.1.3_x64.msix";
+    public const string GitHubPrereleaseName = "EventLogExpert_23.1.1.3.msixbundle";
     public const string GitHubPrereleaseUri =
-        "https://github.com/microsoft/EventLogExpert/releases/download/v23.1.1.3/EventLogExpert_23.1.1.3_x64.msix";
+        "https://github.com/microsoft/EventLogExpert/releases/download/v23.1.1.3/EventLogExpert_23.1.1.3.msixbundle";
     public const string GitHubPrereleaseVersion = "v23.1.1.3";
 
     public const string GitHubReleaseNotes =
diff --git a/tests/Unit/EventLogExpert.Runtime.Tests/Update/UpdateServiceAssetSelectionTests.cs b/tests/Unit/EventLogExpert.Runtime.Tests/Update/UpdateServiceAssetSelectionTests.cs
new file mode 100644
index 000000000..2d26b725d
--- /dev/null
+++ b/tests/Unit/EventLogExpert.Runtime.Tests/Update/UpdateServiceAssetSelectionTests.cs
@@ -0,0 +1,189 @@
+// // Copyright (c) Microsoft Corporation.
+// // Licensed under the MIT License.
+
+using EventLogExpert.Runtime.Update;
+
+namespace EventLogExpert.Runtime.Tests.Update;
+
+public sealed class UpdateServiceAssetSelectionTests
+{
+    private const string Arm64Name = "EventLogExpert_23.1.1.2_arm64.msix";
+    private const string Arm64Uri =
+        "https://github.com/microsoft/EventLogExpert/releases/download/v23.1.1.2/EventLogExpert_23.1.1.2_arm64.msix";
+
+    private const string BundleName = "EventLogExpert_23.1.1.2.msixbundle";
+    private const string BundleUri =
+        "https://github.com/microsoft/EventLogExpert/releases/download/v23.1.1.2/EventLogExpert_23.1.1.2.msixbundle";
+
+    private const string DotBundleName = "EventLogExpert.msixbundle";
+    private const string DotBundleUri =
+        "https://github.com/microsoft/EventLogExpert/releases/download/v23.1.1.2/EventLogExpert.msixbundle";
+
+    private const string RuntimeName = "Microsoft.WindowsAppRuntime.1.7.msix";
+    private const string RuntimeUri =
+        "https://github.com/microsoft/EventLogExpert/releases/download/v23.1.1.2/Microsoft.WindowsAppRuntime.1.7.msix";
+
+    private const string ToolsBundleName = "EventLogExpertTools_23.1.1.2.msixbundle";
+    private const string ToolsBundleUri =
+        "https://github.com/microsoft/EventLogExpert/releases/download/v23.1.1.2/EventLogExpertTools_23.1.1.2.msixbundle";
+
+    private const string X64Name = "EventLogExpert_23.1.1.2_x64.msix";
+    private const string X64Uri =
+        "https://github.com/microsoft/EventLogExpert/releases/download/v23.1.1.2/EventLogExpert_23.1.1.2_x64.msix";
+
+    [Fact]
+    public void SelectUpdateDownloadUri_BundleAmidFullReleaseAssetSet_ReturnsBundleUri()
+    {
+        List<GitHubReleaseAsset> assets =
+        [
+            Asset(BundleName, BundleUri),
+            Asset(X64Name, X64Uri),
+            Asset(Arm64Name, Arm64Uri),
+            Asset(RuntimeName, RuntimeUri)
+        ];
+
+        string? result = UpdateService.SelectUpdateDownloadUri(assets);
+
+        Assert.Equal(BundleUri, result);
+    }
+
+    [Fact]
+    public void SelectUpdateDownloadUri_BundleOnly_ReturnsBundleUri()
+    {
+        List<GitHubReleaseAsset> assets = [Asset(BundleName, BundleUri)];
+
+        string? result = UpdateService.SelectUpdateDownloadUri(assets);
+
+        Assert.Equal(BundleUri, result);
+    }
+
+    [Fact]
+    public void SelectUpdateDownloadUri_DifferentlyCasedBundleName_MatchesCaseInsensitively()
+    {
+        List<GitHubReleaseAsset> assets = [Asset("eventlogexpert_23.1.1.2.MSIXBUNDLE", BundleUri)];
+
+        string? result = UpdateService.SelectUpdateDownloadUri(assets);
+
+        Assert.Equal(BundleUri, result);
+    }
+
+    [Fact]
+    public void SelectUpdateDownloadUri_DotFormBundleName_ReturnsBundleUri()
+    {
+        List<GitHubReleaseAsset> assets =
+        [
+            Asset(DotBundleName, DotBundleUri),
+            Asset(X64Name, X64Uri),
+            Asset(Arm64Name, Arm64Uri)
+        ];
+
+        string? result = UpdateService.SelectUpdateDownloadUri(assets);
+
+        Assert.Equal(DotBundleUri, result);
+    }
+
+    [Fact]
+    public void SelectUpdateDownloadUri_EmptyAssets_ReturnsNull()
+    {
+        string? result = UpdateService.SelectUpdateDownloadUri([]);
+
+        Assert.Null(result);
+    }
+
+    [Fact]
+    public void SelectUpdateDownloadUri_MalformedNullNameAssetWithValidBundle_ReturnsBundleUriWithoutThrowing()
+    {
+        List<GitHubReleaseAsset> assets =
+        [
+            new GitHubReleaseAsset { Name = null!, Uri = "https://malformed" },
+            Asset(BundleName, BundleUri)
+        ];
+
+        string? result = UpdateService.SelectUpdateDownloadUri(assets);
+
+        Assert.Equal(BundleUri, result);
+    }
+
+    [Fact]
+    public void SelectUpdateDownloadUri_NoBundleOnlyPerArchAndRuntime_ReturnsNull()
+    {
+        List<GitHubReleaseAsset> assets =
+        [
+            Asset(X64Name, X64Uri),
+            Asset(Arm64Name, Arm64Uri),
+            Asset(RuntimeName, RuntimeUri)
+        ];
+
+        string? result = UpdateService.SelectUpdateDownloadUri(assets);
+
+        Assert.Null(result);
+    }
+
+    [Fact]
+    public void SelectUpdateDownloadUri_NullAssets_ReturnsNull()
+    {
+        string? result = UpdateService.SelectUpdateDownloadUri(null);
+
+        Assert.Null(result);
+    }
+
+    [Fact]
+    public void SelectUpdateDownloadUri_RuntimeAssetOnly_ReturnsNull()
+    {
+        List<GitHubReleaseAsset> assets = [Asset(RuntimeName, RuntimeUri)];
+
+        string? result = UpdateService.SelectUpdateDownloadUri(assets);
+
+        Assert.Null(result);
+    }
+
+    [Fact]
+    public void SelectUpdateDownloadUri_SiblingToolsBundleBeforeAppBundle_ReturnsAppBundleUri()
+    {
+        List<GitHubReleaseAsset> assets =
+        [
+            Asset(ToolsBundleName, ToolsBundleUri),
+            Asset(BundleName, BundleUri)
+        ];
+
+        string? result = UpdateService.SelectUpdateDownloadUri(assets);
+
+        Assert.Equal(BundleUri, result);
+    }
+
+    [Fact]
+    public void SelectUpdateDownloadUri_SiblingToolsBundleOnly_ReturnsNull()
+    {
+        List<GitHubReleaseAsset> assets = [Asset(ToolsBundleName, ToolsBundleUri)];
+
+        string? result = UpdateService.SelectUpdateDownloadUri(assets);
+
+        Assert.Null(result);
+    }
+
+    [Fact]
+    public void SelectUpdateDownloadUri_WhitespaceUriBundleBeforeValidBundle_ReturnsValidBundleUri()
+    {
+        List<GitHubReleaseAsset> assets =
+        [
+            Asset(BundleName, "   "),
+            Asset(BundleName, BundleUri)
+        ];
+
+        string? result = UpdateService.SelectUpdateDownloadUri(assets);
+
+        Assert.Equal(BundleUri, result);
+    }
+
+    [Fact]
+    public void SelectUpdateDownloadUri_WhitespaceUriBundleOnly_ReturnsNull()
+    {
+        List<GitHubReleaseAsset> assets = [Asset(BundleName, "   ")];
+
+        string? result = UpdateService.SelectUpdateDownloadUri(assets);
+
+        Assert.Null(result);
+    }
+
+    private static GitHubReleaseAsset Asset(string name, string uri) => new() { Name = name, Uri = uri };
+}
diff --git a/tests/Unit/EventLogExpert.Runtime.Tests/Update/UpdateServiceTests.cs b/tests/Unit/EventLogExpert.Runtime.Tests/Update/UpdateServiceTests.cs
index fa8bb4466..d2f52d26f 100644
--- a/tests/Unit/EventLogExpert.Runtime.Tests/Update/UpdateServiceTests.cs
+++ b/tests/Unit/EventLogExpert.Runtime.Tests/Update/UpdateServiceTests.cs
@@ -361,6 +361,64 @@ public async Task CheckForUpdates_ManualThenAutoScan_ShouldRunBoth()
         await mockGitHubService.Received(2).GetReleases();
     }
 
+    [Fact]
+    public async Task CheckForUpdates_NoCompatiblePackageAutoScan_ShouldStaySilentAndNotDeploy()
+    {
+        // Arrange
+        var mockCurrentVersionProvider = Substitute.For<ICurrentVersionProvider>();
+        mockCurrentVersionProvider.CurrentVersion.Returns(new Version(Constants.AppInstalledVersion));
+        mockCurrentVersionProvider.IsDevBuild.Returns(false);
+
+        var mockGitHubService = Substitute.For<IGitHubService>();
+        mockGitHubService.GetReleases().Returns(Task.FromResult(CreateRuntimeOnlyRelease()));
+
+        var mockDeploymentService = Substitute.For<IDeploymentService>();
+        var mockAlertDialogService = Substitute.For<IAlertDialogService>();
+
+        var updateService = CreateUpdateService(
+            mockCurrentVersionProvider,
+            gitHubService: mockGitHubService,
+            deploymentService: mockDeploymentService,
+            alertDialogService: mockAlertDialogService);
+
+        // Act
+        await updateService.CheckForUpdates(usePreRelease: false, userInitiated: false);
+
+        // Assert
+        await mockAlertDialogService.DidNotReceive().ShowAlert(Arg.Any<string>(), Arg.Any<string>(), Arg.Any<string>());
+        mockDeploymentService.DidNotReceive().RestartNowAndUpdate(Arg.Any<string>(), Arg.Any<bool>());
+        mockDeploymentService.DidNotReceive().UpdateOnNextRestart(Arg.Any<string>(), Arg.Any<bool>());
+    }
+
+    [Fact]
+    public async Task CheckForUpdates_NoCompatiblePackageUserInitiated_ShouldAlertAndNotDeploy()
+    {
+        // Arrange
+        var mockCurrentVersionProvider = Substitute.For<ICurrentVersionProvider>();
+        mockCurrentVersionProvider.CurrentVersion.Returns(new Version(Constants.AppInstalledVersion));
+        mockCurrentVersionProvider.IsDevBuild.Returns(false);
+
+        var mockGitHubService = Substitute.For<IGitHubService>();
+        mockGitHubService.GetReleases().Returns(Task.FromResult(CreateRuntimeOnlyRelease()));
+
+        var mockDeploymentService = Substitute.For<IDeploymentService>();
+        var mockAlertDialogService = Substitute.For<IAlertDialogService>();
+
+        var updateService = CreateUpdateService(
+            mockCurrentVersionProvider,
+            gitHubService: mockGitHubService,
+            deploymentService: mockDeploymentService,
+            alertDialogService: mockAlertDialogService);
+
+        // Act
+        await updateService.CheckForUpdates(usePreRelease: false, userInitiated: true);
+
+        // Assert
+        await mockAlertDialogService.Received(1).ShowAlert("Update Unavailable", Arg.Any<string>(), "OK");
+        mockDeploymentService.DidNotReceive().RestartNowAndUpdate(Arg.Any<string>(), Arg.Any<bool>());
+        mockDeploymentService.DidNotReceive().UpdateOnNextRestart(Arg.Any<string>(), Arg.Any<bool>());
+    }
+
     [Fact]
     public async Task CheckForUpdates_NoReleases_ShouldShowAlert()
     {
@@ -661,7 +719,7 @@ public async Task CheckForUpdates_WhenMalformedReleaseVersion_ShouldSkipAndLogWa
     }
 
     [Fact]
-    public async Task CheckForUpdates_WhenRunningPreReleaseAndChannelPreviouslyEnabledThenDisabled_ShouldPromptRollback()
+    public async Task CheckForUpdates_WhenRunningPreReleaseAndChannelNeverEnabled_ShouldEnableChannelAndSuppressRollbackPrompt()
     {
         // Arrange
         var mockCurrentVersionProvider = Substitute.For<ICurrentVersionProvider>();
@@ -672,17 +730,19 @@ public async Task CheckForUpdates_WhenRunningPreReleaseAndChannelPreviouslyEnabl
         mockGitHubService.GetReleases().Returns(Task.FromResult(GitHubUtils.CreateGitHubReleases()));
 
         var mockAppTitleService = Substitute.For<IAppTitleService>();
+        var mockAlertDialogService = Substitute.For<IAlertDialogService>();
         var mockDeploymentService = Substitute.For<IDeploymentService>();
 
         var mockSettings = Substitute.For<ISettingsService>();
         mockSettings.IsPreReleaseEnabled.Returns(false);
-        mockSettings.HasEverEnabledPreRelease.Returns(true);
+        mockSettings.HasEverEnabledPreRelease.Returns(false);
 
         var updateService = CreateUpdateService(
             mockCurrentVersionProvider,
             appTitleService: mockAppTitleService,
             gitHubService: mockGitHubService,
             deploymentService: mockDeploymentService,
+            alertDialogService: mockAlertDialogService,
             settings: mockSettings);
 
         // Act
@@ -690,13 +750,17 @@ public async Task CheckForUpdates_WhenRunningPreReleaseAndChannelPreviouslyEnabl
 
         // Assert
         mockAppTitleService.Received(1).SetIsPrerelease(true);
-        mockSettings.DidNotReceive().IsPreReleaseEnabled = Arg.Any<bool>();
+        mockSettings.Received(1).IsPreReleaseEnabled = true;
 
-        mockDeploymentService.Received(1).UpdateOnNextRestart(Constants.GitHubLatestUri);
+        await mockAlertDialogService.DidNotReceive()
+            .ShowAlert("Update Available", Arg.Any<string>(), Arg.Any<string>(), Arg.Any<string>());
+
+        mockDeploymentService.DidNotReceive().UpdateOnNextRestart(Arg.Any<string>(), Arg.Any<bool>());
+        mockDeploymentService.DidNotReceive().RestartNowAndUpdate(Arg.Any<string>(), Arg.Any<bool>());
     }
 
     [Fact]
-    public async Task CheckForUpdates_WhenRunningPreReleaseAndChannelNeverEnabled_ShouldEnableChannelAndSuppressRollbackPrompt()
+    public async Task CheckForUpdates_WhenRunningPreReleaseAndChannelPreviouslyEnabledThenDisabled_ShouldPromptRollback()
     {
         // Arrange
         var mockCurrentVersionProvider = Substitute.For<ICurrentVersionProvider>();
@@ -707,19 +771,17 @@ public async Task CheckForUpdates_WhenRunningPreReleaseAndChannelNeverEnabled_Sh
         mockGitHubService.GetReleases().Returns(Task.FromResult(GitHubUtils.CreateGitHubReleases()));
 
         var mockAppTitleService = Substitute.For<IAppTitleService>();
-        var mockAlertDialogService = Substitute.For<IAlertDialogService>();
         var mockDeploymentService = Substitute.For<IDeploymentService>();
 
         var mockSettings = Substitute.For<ISettingsService>();
         mockSettings.IsPreReleaseEnabled.Returns(false);
-        mockSettings.HasEverEnabledPreRelease.Returns(false);
+        mockSettings.HasEverEnabledPreRelease.Returns(true);
 
         var updateService = CreateUpdateService(
             mockCurrentVersionProvider,
             appTitleService: mockAppTitleService,
             gitHubService: mockGitHubService,
             deploymentService: mockDeploymentService,
-            alertDialogService: mockAlertDialogService,
             settings: mockSettings);
 
         // Act
@@ -727,13 +789,9 @@ public async Task CheckForUpdates_WhenRunningPreReleaseAndChannelNeverEnabled_Sh
 
         // Assert
         mockAppTitleService.Received(1).SetIsPrerelease(true);
-        mockSettings.Received(1).IsPreReleaseEnabled = true;
-
-        await mockAlertDialogService.DidNotReceive()
-            .ShowAlert("Update Available", Arg.Any<string>(), Arg.Any<string>(), Arg.Any<string>());
+        mockSettings.DidNotReceive().IsPreReleaseEnabled = Arg.Any<bool>();
 
-        mockDeploymentService.DidNotReceive().UpdateOnNextRestart(Arg.Any<string>(), Arg.Any<bool>());
-        mockDeploymentService.DidNotReceive().RestartNowAndUpdate(Arg.Any<string>(), Arg.Any<bool>());
+        mockDeploymentService.Received(1).UpdateOnNextRestart(Constants.GitHubLatestUri);
     }
 
     [Fact]
@@ -854,6 +912,27 @@ await mockAlertDialogService.DidNotReceive()
             .ShowAlert(Arg.Any<string>(), Arg.Any<string>(), Arg.Any<string>());
     }
 
+    // A release newer than the installed version whose only asset is the WindowsAppRuntime dependency (no
+    // EventLogExpert package or bundle), so the bundle-only selector finds no compatible package.
+    private static IEnumerable<GitHubRelease> CreateRuntimeOnlyRelease() =>
+    [
+        new()
+        {
+            Version = "v23.1.1.2",
+            IsPreRelease = false,
+            ReleaseDate = DateTime.Now,
+            Assets =
+            [
+                new GitHubReleaseAsset
+                {
+                    Name = "Microsoft.WindowsAppRuntime.1.7.msix",
+                    Uri = "https://github.com/microsoft/EventLogExpert/releases/download/v23.1.1.2/Microsoft.WindowsAppRuntime.1.7.msix"
+                }
+            ],
+            RawChanges = string.Empty
+        }
+    ];
+
     private static UpdateService CreateUpdateService(
         ICurrentVersionProvider? currentVersionProvider = null,
         IAppTitleService? appTitleService = null,

From 254ad7a306db33f15c2e1e9c7883f844595fd085 Mon Sep 17 00:00:00 2001
From: jschick04 <jschick04@gmail.com>
Date: Sat, 20 Jun 2026 02:28:16 -0500
Subject: [PATCH 28/40] Add reverse-read support and a direction-agnostic
 newest bookmark to EventLogReader

---
 .../Interop/NativeMethods.Evt.cs              |  13 ++
 .../Readers/EventLogReader.cs                 |  28 ++-
 .../Readers/EventLogReaderReverseTests.cs     | 179 ++++++++++++++++++
 3 files changed, 217 insertions(+), 3 deletions(-)
 create mode 100644 tests/Integration/EventLogExpert.Eventing.IntegrationTests/Readers/EventLogReaderReverseTests.cs

diff --git a/src/EventLogExpert.Eventing/Interop/NativeMethods.Evt.cs b/src/EventLogExpert.Eventing/Interop/NativeMethods.Evt.cs
index 7a121ad6d..8bd86f0b4 100644
--- a/src/EventLogExpert.Eventing/Interop/NativeMethods.Evt.cs
+++ b/src/EventLogExpert.Eventing/Interop/NativeMethods.Evt.cs
@@ -295,6 +295,19 @@ internal static partial EvtHandle EvtQuery(
         [MarshalAs(UnmanagedType.LPWStr)] string? query,
         LogPathType flags);
 
+    /// <summary>
+    ///     <c>EvtQuery</c> overload that takes the raw combined query-flags <see langword="int" /> (the path-type bits
+    ///     ORed with direction flags such as <c>EvtQueryReverseDirection</c> 0x200), so a caller can opt into newest-first
+    ///     reads. The typed <see cref="EvtQuery" /> binding remains the path for the default oldest-first reads and its other
+    ///     callers (the watcher and the XML resolver).
+    /// </summary>
+    [LibraryImport(EventLogApi, EntryPoint = "EvtQuery", SetLastError = true)]
+    internal static partial EvtHandle EvtQueryWithFlags(
+        EvtHandle session,
+        [MarshalAs(UnmanagedType.LPWStr)] string path,
+        [MarshalAs(UnmanagedType.LPWStr)] string? query,
+        int flags);
+
     /// <summary>Renders an XML fragment base on the render context that you specify</summary>
     [LibraryImport(EventLogApi, SetLastError = true)]
     [return: MarshalAs(UnmanagedType.Bool)]
diff --git a/src/EventLogExpert.Eventing/Readers/EventLogReader.cs b/src/EventLogExpert.Eventing/Readers/EventLogReader.cs
index 333f7b509..694d22a5b 100644
--- a/src/EventLogExpert.Eventing/Readers/EventLogReader.cs
+++ b/src/EventLogExpert.Eventing/Readers/EventLogReader.cs
@@ -8,13 +8,19 @@
 
 namespace EventLogExpert.Eventing.Readers;
 
-public sealed class EventLogReader(string path, LogPathType pathType, bool renderXml = false) : IDisposable
+public sealed class EventLogReader(string path, LogPathType pathType, bool renderXml = false, bool reverseDirection = false) : IDisposable
 {
+    private const int EvtQueryReverseDirection = 0x200;
+
     private readonly Lock _eventLock = new();
-    private readonly EvtHandle _handle =
-        NativeMethods.EvtQuery(EventLogSession.GlobalSession.Handle, path, null, pathType);
+    private readonly EvtHandle _handle = reverseDirection
+        ? NativeMethods.EvtQueryWithFlags(EventLogSession.GlobalSession.Handle, path, null,
+            (int)pathType | EvtQueryReverseDirection)
+        : NativeMethods.EvtQuery(EventLogSession.GlobalSession.Handle, path, null, pathType);
 
     private int _disposed;
+    private bool _newestCaptured;
+    private string? _newestReverseBookmark;
 
     /// <summary>
     ///     <see langword="true" /> when the underlying <c>EvtQuery</c> handle was opened successfully. When
@@ -32,6 +38,16 @@ public sealed class EventLogReader(string path, LogPathType pathType, bool rende
     /// </summary>
     public int? LastErrorCode { get; private set; }
 
+    /// <summary>
+    ///     The bookmark of the NEWEST event this reader has returned, irrespective of read direction. It is the correct
+    ///     resume point for a live-tail watcher, because the genuinely new events are the ones created after the newest one
+    ///     already loaded. For a forward (oldest-first) read this is the most recently returned event and aliases
+    ///     <see cref="LastBookmark" />; for a reverse (newest-first) read it is the FIRST event returned and is captured once.
+    ///     Unlike <see cref="LastBookmark" />, which is always the last event ENUMERATED (and therefore the OLDEST event under
+    ///     a reverse read), this never points at the wrong end of the log.
+    /// </summary>
+    public string? NewestBookmark => reverseDirection ? _newestReverseBookmark : LastBookmark;
+
     public void Dispose()
     {
         // Use Interlocked.CompareExchange for atomic check-and-set.
@@ -75,6 +91,12 @@ public bool TryGetEvents(out EventRecord[] events, int batchSize = 30)
             using (_eventLock.EnterScope())
             {
                 LastBookmark = CreateBookmark(new EvtHandle(buffer[count - 1], false));
+
+                if (reverseDirection && !_newestCaptured)
+                {
+                    _newestReverseBookmark = CreateBookmark(new EvtHandle(buffer[0], false));
+                    _newestCaptured = true;
+                }
             }
 
             events = new EventRecord[count];
diff --git a/tests/Integration/EventLogExpert.Eventing.IntegrationTests/Readers/EventLogReaderReverseTests.cs b/tests/Integration/EventLogExpert.Eventing.IntegrationTests/Readers/EventLogReaderReverseTests.cs
new file mode 100644
index 000000000..c33918833
--- /dev/null
+++ b/tests/Integration/EventLogExpert.Eventing.IntegrationTests/Readers/EventLogReaderReverseTests.cs
@@ -0,0 +1,179 @@
+// // Copyright (c) Microsoft Corporation.
+// // Licensed under the MIT License.
+
+using EventLogExpert.Eventing.Common.Channels;
+using EventLogExpert.Eventing.Readers;
+using EventLogExpert.Eventing.TestUtils.Constants;
+
+namespace EventLogExpert.Eventing.IntegrationTests.Readers;
+
+public sealed class EventLogReaderReverseTests
+{
+    [Fact]
+    public void ForwardRead_NewestBookmark_ShouldAliasLastBookmark()
+    {
+        using var fixture = new SmallEvtxFixture();
+        using var reader = new EventLogReader(fixture.FilePath, LogPathType.File);
+
+        while (reader.TryGetEvents(out _)) { }
+
+        Assert.NotNull(reader.LastBookmark);
+
+        // Forward never captures a separate newest bookmark; NewestBookmark returns LastBookmark directly.
+        Assert.Equal(reader.LastBookmark, reader.NewestBookmark);
+    }
+
+    [Fact]
+    public void ForwardRead_ShouldReturnRecordIdsAscending()
+    {
+        using var fixture = new SmallEvtxFixture();
+        using var reader = new EventLogReader(fixture.FilePath, LogPathType.File);
+
+        var ids = ReadAllRecordIds(reader, batchSize: 1);
+
+        Assert.True(ids.Count >= 2, "fixture should export at least two events");
+        AssertStrictlyOrdered(ids, ascending: true);
+    }
+
+    [Theory]
+    [InlineData(false)]
+    [InlineData(true)]
+    public void NewestBookmark_WhenInitialized_ShouldBeNull(bool reverseDirection)
+    {
+        using var reader = new EventLogReader(Constants.ApplicationLogName, LogPathType.Channel, reverseDirection: reverseDirection);
+
+        Assert.Null(reader.NewestBookmark);
+    }
+
+    [Fact]
+    public void NewestEvent_ShouldBeIdenticalRegardlessOfDirection()
+    {
+        using var fixture = new SmallEvtxFixture();
+        using var forward = new EventLogReader(fixture.FilePath, LogPathType.File);
+        using var reverse = new EventLogReader(fixture.FilePath, LogPathType.File, reverseDirection: true);
+
+        var forwardIds = ReadAllRecordIds(forward, batchSize: 30);
+        var reverseIds = ReadAllRecordIds(reverse, batchSize: 30);
+
+        Assert.NotEmpty(forwardIds);
+        Assert.NotEmpty(reverseIds);
+
+        // The newest event is the last one read forward and the first one read reverse (same RecordId).
+        Assert.Equal(forwardIds[^1], reverseIds[0]);
+        Assert.Equal(forwardIds.Max(), reverseIds.Max());
+        Assert.Equal(forwardIds.Min(), reverseIds.Min());
+    }
+
+    [Fact]
+    public void ReverseRead_NewestBookmark_ShouldBeStableAcrossBatches()
+    {
+        using var fixture = new SmallEvtxFixture();
+        using var reader = new EventLogReader(fixture.FilePath, LogPathType.File, reverseDirection: true);
+
+        Assert.True(reader.TryGetEvents(out var firstBatch, 1));
+        Assert.Single(firstBatch);
+
+        string? newestAfterFirstBatch = reader.NewestBookmark;
+        Assert.NotNull(newestAfterFirstBatch);
+
+        while (reader.TryGetEvents(out _, 1)) { }
+
+        // The newest bookmark is captured once on the first batch and must not drift to a later (older) batch.
+        Assert.Equal(newestAfterFirstBatch, reader.NewestBookmark);
+    }
+
+    [Fact]
+    public void ReverseRead_NewestBookmark_ShouldDifferFromLastBookmark()
+    {
+        using var fixture = new SmallEvtxFixture();
+        using var reader = new EventLogReader(fixture.FilePath, LogPathType.File, reverseDirection: true);
+
+        while (reader.TryGetEvents(out _, 1)) { }
+
+        Assert.NotNull(reader.NewestBookmark);
+        Assert.NotNull(reader.LastBookmark);
+
+        // For a multi-event log read newest-first, NewestBookmark (newest) and LastBookmark (oldest enumerated) differ.
+        Assert.NotEqual(reader.NewestBookmark, reader.LastBookmark);
+    }
+
+    [Fact]
+    public void ReverseRead_OnLiveChannel_FirstBatchShouldBeNewestFirst()
+    {
+        using var reader = new EventLogReader(Constants.ApplicationLogName, LogPathType.Channel, reverseDirection: true);
+
+        Assert.True(reader.TryGetEvents(out var batch, 10));
+
+        var ids = batch.Where(evt => evt.RecordId is not null).Select(evt => evt.RecordId!.Value).ToList();
+
+        Assert.NotEmpty(ids);
+        AssertStrictlyOrdered(ids, ascending: false);
+        Assert.NotNull(reader.NewestBookmark);
+    }
+
+    [Fact]
+    public void ReverseRead_ShouldReturnRecordIdsDescendingAcrossBatches()
+    {
+        using var fixture = new SmallEvtxFixture();
+        using var reader = new EventLogReader(fixture.FilePath, LogPathType.File, reverseDirection: true);
+
+        // batchSize 1 forces every event into its own batch, so this also proves cross-batch monotonicity
+        // (the last RecordId of batch N is greater than the first RecordId of batch N+1).
+        var ids = ReadAllRecordIds(reader, batchSize: 1);
+
+        Assert.True(ids.Count >= 2, "fixture should export at least two events");
+        AssertStrictlyOrdered(ids, ascending: false);
+    }
+
+    [Fact]
+    public void ReverseRead_SingleEventFirstBatch_ShouldCaptureNewestBookmarkWithoutCrashing()
+    {
+        using var fixture = new SmallEvtxFixture();
+        using var reader = new EventLogReader(fixture.FilePath, LogPathType.File, reverseDirection: true);
+
+        Assert.True(reader.TryGetEvents(out var batch, 1));
+        Assert.Single(batch);
+
+        // buffer[0] == buffer[count - 1] here: both bookmarks are taken from the same single (newest) handle,
+        // each wrapped non-owning, so the double-wrap must not double-free or crash.
+        Assert.NotNull(reader.NewestBookmark);
+        Assert.NotNull(reader.LastBookmark);
+    }
+
+    [Fact]
+    public void ReverseRead_WhenInvalidLog_ShouldFailWithoutBookmark()
+    {
+        using var reader = new EventLogReader("NonExistentLog_" + Guid.NewGuid(), LogPathType.Channel, reverseDirection: true);
+
+        Assert.False(reader.TryGetEvents(out var events));
+        Assert.Empty(events);
+        Assert.Null(reader.NewestBookmark);
+    }
+
+    private static void AssertStrictlyOrdered(IReadOnlyList<long> ids, bool ascending)
+    {
+        for (int i = 1; i < ids.Count; i++)
+        {
+            bool ordered = ascending ? ids[i] > ids[i - 1] : ids[i] < ids[i - 1];
+
+            Assert.True(
+                ordered,
+                $"RecordIds not strictly {(ascending ? "ascending" : "descending")} at index {i}: {ids[i - 1]} then {ids[i]}");
+        }
+    }
+
+    private static List<long> ReadAllRecordIds(EventLogReader reader, int batchSize)
+    {
+        var ids = new List<long>();
+
+        while (reader.TryGetEvents(out var batch, batchSize))
+        {
+            foreach (var evt in batch)
+            {
+                if (evt.RecordId is { } id) { ids.Add(id); }
+            }
+        }
+
+        return ids;
+    }
+}

From bf7401af46cf0d252938c64c1d45b1fe619a974a Mon Sep 17 00:00:00 2001
From: jschick04 <jschick04@gmail.com>
Date: Sat, 20 Jun 2026 09:59:20 -0500
Subject: [PATCH 29/40] Read logs newest-first and eagerly paint the first
 screenful

---
 .../Readers/EventLogReader.cs                 |  11 +-
 .../Readers/IEventLogReader.cs                |  43 +++
 .../RuntimeServiceCollectionExtensions.cs     |   1 +
 .../EventLog/EventLogReaderFactory.cs         |  13 +
 .../EventLog/IEventLogReaderFactory.cs        |  12 +
 .../EventLog/OpenLogEffects.cs                |  75 ++++-
 .../EventLog/EffectsTests.cs                  | 306 +++++++++++++++++-
 7 files changed, 443 insertions(+), 18 deletions(-)
 create mode 100644 src/EventLogExpert.Eventing/Readers/IEventLogReader.cs
 create mode 100644 src/EventLogExpert.Runtime/EventLog/EventLogReaderFactory.cs
 create mode 100644 src/EventLogExpert.Runtime/EventLog/IEventLogReaderFactory.cs

diff --git a/src/EventLogExpert.Eventing/Readers/EventLogReader.cs b/src/EventLogExpert.Eventing/Readers/EventLogReader.cs
index 694d22a5b..410f3d425 100644
--- a/src/EventLogExpert.Eventing/Readers/EventLogReader.cs
+++ b/src/EventLogExpert.Eventing/Readers/EventLogReader.cs
@@ -8,7 +8,7 @@
 
 namespace EventLogExpert.Eventing.Readers;
 
-public sealed class EventLogReader(string path, LogPathType pathType, bool renderXml = false, bool reverseDirection = false) : IDisposable
+public sealed class EventLogReader(string path, LogPathType pathType, bool renderXml = false, bool reverseDirection = false) : IEventLogReader
 {
     private const int EvtQueryReverseDirection = 0x200;
 
@@ -18,6 +18,8 @@ public sealed class EventLogReader(string path, LogPathType pathType, bool rende
             (int)pathType | EvtQueryReverseDirection)
         : NativeMethods.EvtQuery(EventLogSession.GlobalSession.Handle, path, null, pathType);
 
+    private readonly int _openError = Marshal.GetLastWin32Error();
+
     private int _disposed;
     private bool _newestCaptured;
     private string? _newestReverseBookmark;
@@ -48,6 +50,13 @@ public sealed class EventLogReader(string path, LogPathType pathType, bool rende
     /// </summary>
     public string? NewestBookmark => reverseDirection ? _newestReverseBookmark : LastBookmark;
 
+    /// <summary>
+    ///     The Win32 error from a failed <c>EvtQuery</c> open, or <see langword="null" /> when the log opened (
+    ///     <see cref="IsValid" /> is <see langword="true" />). Captured once at construction, so unlike the per-read
+    ///     <see cref="LastErrorCode" /> it is stable and reflects the open failure rather than a later read.
+    /// </summary>
+    public int? OpenErrorCode => IsValid ? null : _openError;
+
     public void Dispose()
     {
         // Use Interlocked.CompareExchange for atomic check-and-set.
diff --git a/src/EventLogExpert.Eventing/Readers/IEventLogReader.cs b/src/EventLogExpert.Eventing/Readers/IEventLogReader.cs
new file mode 100644
index 000000000..b5565658b
--- /dev/null
+++ b/src/EventLogExpert.Eventing/Readers/IEventLogReader.cs
@@ -0,0 +1,43 @@
+// // Copyright (c) Microsoft Corporation.
+// // Licensed under the MIT License.
+
+namespace EventLogExpert.Eventing.Readers;
+
+/// <summary>
+///     Reads event-log events in batches. Abstracts <see cref="EventLogReader" /> so the load pipeline can be driven
+///     with a substitute reader under test. Only the members the pipeline consumes are exposed.
+/// </summary>
+public interface IEventLogReader : IDisposable
+{
+    /// <summary>
+    ///     True when the underlying log opened successfully. False means the source could not be opened (the log does not
+    ///     exist, access was denied, etc.); the load pipeline should surface a failure rather than an empty log.
+    /// </summary>
+    bool IsValid { get; }
+
+    /// <summary>
+    ///     The Win32 error from the most recent <see cref="TryGetEvents" /> that returned false, or
+    ///     <see langword="null" /> when that false meant a clean end-of-results. A non-null value once the read loop ends
+    ///     signals a failed read, not an empty log.
+    /// </summary>
+    int? LastErrorCode { get; }
+
+    /// <summary>
+    ///     The bookmark of the NEWEST event returned so far, irrespective of read direction. This is the correct resume
+    ///     point for a live-tail watcher. <see langword="null" /> until the first event is returned.
+    /// </summary>
+    string? NewestBookmark { get; }
+
+    /// <summary>
+    ///     The Win32 error from a failed open, or <see langword="null" /> when <see cref="IsValid" />. Captured once at
+    ///     open so it is stable (distinct from the per-read <see cref="LastErrorCode" />); use it to report why a log could
+    ///     not be opened.
+    /// </summary>
+    int? OpenErrorCode { get; }
+
+    /// <summary>
+    ///     Reads the next batch of up to <paramref name="batchSize" /> events. Returns <see langword="false" /> when
+    ///     there are no more events (or the source could not be opened), leaving <paramref name="events" /> empty.
+    /// </summary>
+    bool TryGetEvents(out EventRecord[] events, int batchSize = 30);
+}
diff --git a/src/EventLogExpert.Runtime/DependencyInjection/RuntimeServiceCollectionExtensions.cs b/src/EventLogExpert.Runtime/DependencyInjection/RuntimeServiceCollectionExtensions.cs
index 7ed4d3b31..81db92888 100644
--- a/src/EventLogExpert.Runtime/DependencyInjection/RuntimeServiceCollectionExtensions.cs
+++ b/src/EventLogExpert.Runtime/DependencyInjection/RuntimeServiceCollectionExtensions.cs
@@ -159,6 +159,7 @@ public IServiceCollection AddEventLogRuntime()
             services.AddSingleton<LogCloseCoordinator>();
             services.AddSingleton<EventLogConcurrencyState>();
             services.AddSingleton<PartialLoadCoordinator>();
+            services.AddSingleton<IEventLogReaderFactory, EventLogReaderFactory>();
 
             // UI capabilities.
             services.AddSingleton<IHighlightSelector, HighlightSelector>();
diff --git a/src/EventLogExpert.Runtime/EventLog/EventLogReaderFactory.cs b/src/EventLogExpert.Runtime/EventLog/EventLogReaderFactory.cs
new file mode 100644
index 000000000..def5a60da
--- /dev/null
+++ b/src/EventLogExpert.Runtime/EventLog/EventLogReaderFactory.cs
@@ -0,0 +1,13 @@
+// // Copyright (c) Microsoft Corporation.
+// // Licensed under the MIT License.
+
+using EventLogExpert.Eventing.Common.Channels;
+using EventLogExpert.Eventing.Readers;
+
+namespace EventLogExpert.Runtime.EventLog;
+
+internal sealed class EventLogReaderFactory : IEventLogReaderFactory
+{
+    public IEventLogReader CreateReader(string path, LogPathType pathType, bool renderXml = false, bool reverseDirection = false) =>
+        new EventLogReader(path, pathType, renderXml, reverseDirection);
+}
diff --git a/src/EventLogExpert.Runtime/EventLog/IEventLogReaderFactory.cs b/src/EventLogExpert.Runtime/EventLog/IEventLogReaderFactory.cs
new file mode 100644
index 000000000..1a34bce65
--- /dev/null
+++ b/src/EventLogExpert.Runtime/EventLog/IEventLogReaderFactory.cs
@@ -0,0 +1,12 @@
+// // Copyright (c) Microsoft Corporation.
+// // Licensed under the MIT License.
+
+using EventLogExpert.Eventing.Common.Channels;
+using EventLogExpert.Eventing.Readers;
+
+namespace EventLogExpert.Runtime.EventLog;
+
+internal interface IEventLogReaderFactory
+{
+    IEventLogReader CreateReader(string path, LogPathType pathType, bool renderXml = false, bool reverseDirection = false);
+}
diff --git a/src/EventLogExpert.Runtime/EventLog/OpenLogEffects.cs b/src/EventLogExpert.Runtime/EventLog/OpenLogEffects.cs
index 7f21a9c11..cf77e2428 100644
--- a/src/EventLogExpert.Runtime/EventLog/OpenLogEffects.cs
+++ b/src/EventLogExpert.Runtime/EventLog/OpenLogEffects.cs
@@ -14,7 +14,9 @@
 using Fluxor;
 using Microsoft.Extensions.DependencyInjection;
 using System.Collections.Concurrent;
+using System.ComponentModel;
 using System.Diagnostics;
+using System.Runtime.InteropServices;
 using System.Security;
 using System.Threading.Channels;
 using IDispatcher = Fluxor.IDispatcher;
@@ -32,8 +34,13 @@ internal sealed class OpenLogEffects(
     ICriticalErrorService criticalErrorService,
     LogCloseCoordinator closeCoordinator,
     EventLogConcurrencyState concurrencyState,
-    PartialLoadCoordinator coordinator)
+    PartialLoadCoordinator coordinator,
+    IEventLogReaderFactory readerFactory)
 {
+    // A screenful of newest events: the eager first paint dispatches once this many are resolved so the newest rows
+    // render in ~1s instead of waiting for the 3-second partial timer.
+    private const int EagerFirstPaintThreshold = 200;
+
     private static readonly int s_maxGlobalConcurrency = Math.Max(1, Environment.ProcessorCount - 1);
     private static readonly SemaphoreSlim s_resolutionThrottle = new(s_maxGlobalConcurrency, s_maxGlobalConcurrency);
 
@@ -48,6 +55,7 @@ internal sealed class OpenLogEffects(
     private readonly ITraceLogger _logger = logger;
     private readonly ConcurrentDictionary<EventLogId, TaskCompletionSource> _logLoadCompletions = new();
     private readonly ILogWatcherService _logWatcherService = logWatcherService;
+    private readonly IEventLogReaderFactory _readerFactory = readerFactory;
     private readonly IEventResolverCache _resolverCache = resolverCache;
     private readonly IServiceScopeFactory _serviceScopeFactory = serviceScopeFactory;
     private readonly IEventXmlResolver _xmlResolver = xmlResolver;
@@ -289,6 +297,7 @@ private async Task LoadLogAsync(
         int resolved = 0;
         int lastPartialIndex = 0;
         int timerTick = 0;
+        int eagerFired = 0;
 
         dispatcher.Dispatch(new AddTableAction(logData));
 
@@ -307,19 +316,7 @@ private async Task LoadLogAsync(
 
                 if (Interlocked.Increment(ref timerTick) <= 1) { return; }
 
-                List<ResolvedEvent> delta;
-
-                lock (events)
-                {
-                    int fromIndex = Volatile.Read(ref lastPartialIndex);
-
-                    if (events.Count <= fromIndex) { return; }
-
-                    delta = events.GetRange(fromIndex, events.Count - fromIndex);
-                    Volatile.Write(ref lastPartialIndex, events.Count);
-                }
-
-                dispatcher.Dispatch(new LoadEventsPartialAction(logData, delta.AsReadOnly()));
+                TryDispatchPartial();
             },
             null,
             TimeSpan.Zero,
@@ -327,7 +324,7 @@ private async Task LoadLogAsync(
 
         bool renderXml = _eventLogState.Value.AppliedFilter.RequiresXml;
 
-        using var reader = new EventLogReader(action.LogName, action.LogPathType, renderXml);
+        using var reader = _readerFactory.CreateReader(action.LogName, action.LogPathType, renderXml, reverseDirection: true);
 
         var producerTask = Task.Run(async () =>
         {
@@ -354,6 +351,13 @@ private async Task LoadLogAsync(
 
         try
         {
+            if (!reader.IsValid)
+            {
+                int openError = reader.OpenErrorCode ?? 0;
+
+                throw new Win32Exception(openError, $"Opening '{action.LogName}' failed (Win32 {openError}: {Marshal.GetPInvokeErrorMessage(openError)}).");
+            }
+
             await Parallel.ForEachAsync(
                 channel.Reader.ReadAllAsync(token),
                 new ParallelOptions
@@ -399,6 +403,15 @@ await Parallel.ForEachAsync(
                             lock (events) { events.AddRange(localBatch); }
 
                             Interlocked.Add(ref resolved, localResolved);
+
+                            // Eager first paint: once the first screenful of (newest, because the read is reversed)
+                            // events is resolved, dispatch them immediately instead of waiting for the 3-second timer.
+                            // Fires exactly once across the resolve workers and reuses the shared partial cursor.
+                            if (Volatile.Read(ref resolved) >= EagerFirstPaintThreshold &&
+                                Interlocked.Exchange(ref eagerFired, 1) == 0)
+                            {
+                                TryDispatchPartial();
+                            }
                         }
                     }
                     finally
@@ -409,7 +422,12 @@ await Parallel.ForEachAsync(
 
             await producerTask;
 
-            lastEvent = reader.LastBookmark;
+            lastEvent = reader.NewestBookmark;
+
+            if (reader.LastErrorCode is { } readErrorCode)
+            {
+                throw new Win32Exception(readErrorCode, $"Reading '{action.LogName}' stopped (Win32 {readErrorCode}: {Marshal.GetPInvokeErrorMessage(readErrorCode)}).");
+            }
         }
         catch (OperationCanceledException)
         {
@@ -486,5 +504,30 @@ await Parallel.ForEachAsync(
         dispatcher.Dispatch(new SetResolverStatusAction(string.Empty));
 
         _logger.Information($"Loaded '{action.LogName}': {events.Count} events ({failed} failed) in {stopwatch.ElapsedMilliseconds}ms.");
+
+        return;
+
+        void TryDispatchPartial()
+        {
+            List<ResolvedEvent> delta;
+
+            lock (events)
+            {
+                int fromIndex = lastPartialIndex;
+
+                if (events.Count <= fromIndex) { return; }
+
+                delta = events.GetRange(fromIndex, events.Count - fromIndex);
+                lastPartialIndex = events.Count;
+            }
+
+            // Parallel resolution finishes batches out of order, so sort this delta newest-first (matching the final
+            // LoadEventsAction sort) before it is appended to the raw store. With the reverse newest-first read each
+            // delta covers an older range than the last, so the raw store stays index-0-is-newest for the
+            // date-range/endpoint queries that read it during load.
+            delta.Sort((a, b) => Comparer<long?>.Default.Compare(b.RecordId, a.RecordId));
+
+            dispatcher.Dispatch(new LoadEventsPartialAction(logData, delta.AsReadOnly()));
+        }
     }
 }
diff --git a/tests/Unit/EventLogExpert.Runtime.Tests/EventLog/EffectsTests.cs b/tests/Unit/EventLogExpert.Runtime.Tests/EventLog/EffectsTests.cs
index 5e3e4c67d..fe07f323f 100644
--- a/tests/Unit/EventLogExpert.Runtime.Tests/EventLog/EffectsTests.cs
+++ b/tests/Unit/EventLogExpert.Runtime.Tests/EventLog/EffectsTests.cs
@@ -1887,6 +1887,164 @@ public async Task HandleOpenLog_ResolverThrows_CallsReportCritical_DoesNotPropag
         mockDispatcher.DidNotReceive().Dispatch(Arg.Any<SetResolverStatusAction>());
     }
 
+    [Fact]
+    public async Task HandleOpenLog_ReverseEagerLoad_DispatchesExactlyOneEagerPartialBeforeFinal()
+    {
+        const int total = 250;
+        var fakeFactory = new FakeEventLogReaderFactory(
+            new FakeEventLogReader(BuildReverseBatches(total, batchSize: 30), newestBookmark: "NEWEST"));
+
+        var (openLog, dispatcher, _) = CreateEagerLoadEffects(fakeFactory);
+
+        await openLog.HandleOpenLog(new OpenLogAction(Constants.LogNameApplication, LogPathType.Channel), dispatcher);
+
+        // The in-memory load finishes well under the 3-second partial timer, so the eager dispatch is the only
+        // partial - asserting the eager path fires exactly once.
+        var partials = AllPartialActions(dispatcher);
+        Assert.Single(partials);
+        Assert.NotEmpty(partials[0].Events);
+    }
+
+    [Fact]
+    public async Task HandleOpenLog_ReverseEagerLoad_EmptyLog_SeedsWatcherWithNullBookmark()
+    {
+        var fakeFactory = new FakeEventLogReaderFactory(new FakeEventLogReader([], newestBookmark: null));
+
+        var (openLog, dispatcher, watcher) = CreateEagerLoadEffects(fakeFactory);
+
+        await openLog.HandleOpenLog(new OpenLogAction(Constants.LogNameApplication, LogPathType.Channel), dispatcher);
+
+        watcher.Received(1).AddLog(Constants.LogNameApplication, null, Arg.Any<bool>());
+        Assert.Empty(SingleFinalEvents(dispatcher));
+    }
+
+    [Fact]
+    public async Task HandleOpenLog_ReverseEagerLoad_FinalListContainsEveryEventOnceSortedDescending()
+    {
+        // 250 > the eager first-paint threshold (200), so the eager dispatch fires.
+        const int total = 250;
+        var fakeFactory = new FakeEventLogReaderFactory(
+            new FakeEventLogReader(BuildReverseBatches(total, batchSize: 30), newestBookmark: "NEWEST"));
+
+        // Delay the newest batch so older batches resolve and AddRange first, forcing the completion-order scramble
+        // that the final sort must correct.
+        var (openLog, dispatcher, _) = CreateEagerLoadEffects(
+            fakeFactory,
+            resolveDelayMs: recordId => recordId > total - 30 ? 15 : 0);
+
+        await openLog.HandleOpenLog(new OpenLogAction(Constants.LogNameApplication, LogPathType.Channel), dispatcher);
+
+        var finalIds = SingleFinalEvents(dispatcher).Select(resolved => resolved.RecordId).ToList();
+        Assert.Equal(total, finalIds.Count);
+        Assert.Equal(total, finalIds.Distinct().Count());
+        Assert.Equal(
+            Enumerable.Range(1, total).Select(id => (long?)id).OrderByDescending(id => id).ToList(),
+            finalIds);
+    }
+
+    [Fact]
+    public async Task HandleOpenLog_ReverseEagerLoad_PartialDeltasAreDisjointAndSubsetOfFinal()
+    {
+        const int total = 250;
+        var fakeFactory = new FakeEventLogReaderFactory(
+            new FakeEventLogReader(BuildReverseBatches(total, batchSize: 30), newestBookmark: "NEWEST"));
+
+        var (openLog, dispatcher, _) = CreateEagerLoadEffects(fakeFactory);
+
+        await openLog.HandleOpenLog(new OpenLogAction(Constants.LogNameApplication, LogPathType.Channel), dispatcher);
+
+        var partialIds = AllPartialEvents(dispatcher).Select(resolved => resolved.RecordId).ToList();
+        Assert.NotEmpty(partialIds);
+        Assert.Equal(partialIds.Count, partialIds.Distinct().Count());
+
+        var finalIds = SingleFinalEvents(dispatcher).Select(resolved => resolved.RecordId).ToHashSet();
+        Assert.All(partialIds, id => Assert.Contains(id, finalIds));
+    }
+
+    [Fact]
+    public async Task HandleOpenLog_ReverseEagerLoad_PartialDeltasAreSortedNewestFirstDespiteCompletionOrder()
+    {
+        const int total = 250; // > eager threshold (200) so a partial dispatches mid-load
+        var fakeFactory = new FakeEventLogReaderFactory(
+            new FakeEventLogReader(BuildReverseBatches(total, batchSize: 30), newestBookmark: "NEWEST"));
+
+        // Delay a second-newest batch so it resolves after older batches, scrambling completion order WITHIN the
+        // eager partial. Without the partial sort the dispatched delta would be out of newest-first order, breaking
+        // the raw-store index-0-is-newest invariant during load.
+        var (openLog, dispatcher, _) = CreateEagerLoadEffects(
+            fakeFactory,
+            resolveDelayMs: recordId => recordId is >= 191 and <= 220 ? 30 : 0);
+
+        await openLog.HandleOpenLog(new OpenLogAction(Constants.LogNameApplication, LogPathType.Channel), dispatcher);
+
+        var partials = dispatcher.ReceivedCalls()
+            .Select(call => call.GetArguments()[0])
+            .OfType<LoadEventsPartialAction>()
+            .ToList();
+
+        Assert.NotEmpty(partials);
+
+        foreach (var partial in partials)
+        {
+            var ids = partial.Events.Select(resolved => resolved.RecordId).ToList();
+            Assert.Equal(ids.OrderByDescending(id => id).ToList(), ids);
+        }
+    }
+
+    [Fact]
+    public async Task HandleOpenLog_ReverseEagerLoad_SeedsWatcherFromNewestBookmark()
+    {
+        var fakeFactory = new FakeEventLogReaderFactory(
+            new FakeEventLogReader(BuildReverseBatches(50, batchSize: 30), newestBookmark: "NEWEST_BOOKMARK"));
+
+        var (openLog, dispatcher, watcher) = CreateEagerLoadEffects(fakeFactory);
+
+        await openLog.HandleOpenLog(new OpenLogAction(Constants.LogNameApplication, LogPathType.Channel), dispatcher);
+
+        // Under a reverse read the watcher must resume from the newest event; the reader exposes only NewestBookmark.
+        watcher.Received(1).AddLog(Constants.LogNameApplication, "NEWEST_BOOKMARK", Arg.Any<bool>());
+
+        // Lock the activation contract: the load path requested a reverse (newest-first) read.
+        Assert.True(fakeFactory.ReverseDirectionRequested);
+    }
+
+    [Fact]
+    public async Task HandleOpenLog_ReverseEagerLoad_WhenReaderInvalid_SurfacesLoadFailureNotEmptyLog()
+    {
+        var fakeFactory = new FakeEventLogReaderFactory(
+            new FakeEventLogReader([], newestBookmark: null) { IsValid = false, OpenErrorCode = 5 });
+
+        var (openLog, dispatcher, watcher) = CreateEagerLoadEffects(fakeFactory);
+
+        await openLog.HandleOpenLog(new OpenLogAction(Constants.LogNameApplication, LogPathType.Channel), dispatcher);
+
+        // A log that fails to open surfaces an error instead of a misleading empty final load, and never seeds the watcher.
+        dispatcher.Received().Dispatch(Arg.Is<SetResolverStatusAction>(a =>
+            a.ResolverStatus.Contains("Error") && a.ResolverStatus.Contains(Constants.LogNameApplication)));
+        Assert.Empty(dispatcher.ReceivedCalls().Select(call => call.GetArguments()[0]).OfType<LoadEventsAction>());
+        watcher.DidNotReceive().AddLog(Arg.Any<string>(), Arg.Any<string>(), Arg.Any<bool>());
+    }
+
+    [Fact]
+    public async Task HandleOpenLog_ReverseEagerLoad_WhenReadStopsOnError_SurfacesLoadFailureNotFinalLoad()
+    {
+        const int total = 60;
+        var fakeFactory = new FakeEventLogReaderFactory(
+            new FakeEventLogReader(BuildReverseBatches(total, batchSize: 30), newestBookmark: "NEWEST")
+            {
+                LastErrorCode = 5 // a non-null error once the batches run out: a failed read, not a clean end-of-results
+            });
+
+        var (openLog, dispatcher, _) = CreateEagerLoadEffects(fakeFactory);
+
+        await openLog.HandleOpenLog(new OpenLogAction(Constants.LogNameApplication, LogPathType.Channel), dispatcher);
+
+        // A read that stops on a Win32 error is surfaced as a failure, not dispatched as a successful final load.
+        dispatcher.Received().Dispatch(Arg.Is<SetResolverStatusAction>(a =>
+            a.ResolverStatus.Contains("Error") && a.ResolverStatus.Contains(Constants.LogNameApplication)));
+        Assert.Empty(dispatcher.ReceivedCalls().Select(call => call.GetArguments()[0]).OfType<LoadEventsAction>());
+    }
+
     [Fact]
     public async Task HandleOpenLog_ShouldThreadOpenLogsIdIntoDispatchedAddTableAction()
     {
@@ -2265,6 +2423,15 @@ public void ReopenAfterDatabaseRemoval_DispatchesOpenLogPerSnapshotEntry()
                 a.LogName == Constants.LogNameLog2 && a.LogPathType == LogPathType.File));
     }
 
+    private static List<LoadEventsPartialAction> AllPartialActions(IDispatcher dispatcher) =>
+        dispatcher.ReceivedCalls()
+            .Select(call => call.GetArguments()[0])
+            .OfType<LoadEventsPartialAction>()
+            .ToList();
+
+    private static IEnumerable<ResolvedEvent> AllPartialEvents(IDispatcher dispatcher) =>
+        AllPartialActions(dispatcher).SelectMany(partial => partial.Events);
+
     private static EffectsHarness BuildHarness(
         IState<EventLogState> eventLogState,
         IState<RawEventStoreState> rawEventStore,
@@ -2307,7 +2474,8 @@ private static EffectsHarness BuildHarness(
             criticalErrorService,
             closeCoordinator,
             concurrencyState,
-            coordinator);
+            coordinator,
+            new EventLogReaderFactory());
 
         var logReload = new LogReloadEffects(
             eventLogState,
@@ -2350,6 +2518,93 @@ private static (ImmutableDictionary<string, OpenLogInfo> OpenLogs, IState<RawEve
         return (openLogs, rawStore);
     }
 
+    private static IReadOnlyList<EventRecord[]> BuildReverseBatches(int total, int batchSize)
+    {
+        var batches = new List<EventRecord[]>();
+
+        // Newest first (descending RecordId), mirroring a reverse read.
+        for (int start = total; start >= 1; start -= batchSize)
+        {
+            int count = Math.Min(batchSize, start);
+            var batch = new EventRecord[count];
+
+            for (int offset = 0; offset < count; offset++)
+            {
+                batch[offset] = new EventRecord { RecordId = start - offset };
+            }
+
+            batches.Add(batch);
+        }
+
+        return batches;
+    }
+
+    private static (OpenLogEffects openLog, IDispatcher dispatcher, ILogWatcherService watcher) CreateEagerLoadEffects(
+        IEventLogReaderFactory readerFactory,
+        Func<long?, int>? resolveDelayMs = null)
+    {
+        var logData = new EventLogData(Constants.LogNameApplication, LogPathType.Channel);
+
+        var openLogs = ImmutableDictionary<string, OpenLogInfo>.Empty
+            .SetItem(Constants.LogNameApplication, new OpenLogInfo(logData.Id, logData.Type));
+
+        var eventLogState = Substitute.For<IState<EventLogState>>();
+        eventLogState.Value.Returns(new EventLogState
+        {
+            OpenLogs = openLogs,
+            AppliedFilter = new Filter(null, [])
+        });
+
+        var resolver = Substitute.For<IEventResolver>();
+        resolver.ResolveEvent(Arg.Any<EventRecord>()).Returns(callInfo =>
+        {
+            var record = callInfo.Arg<EventRecord>();
+
+            if (resolveDelayMs is not null)
+            {
+                int delay = resolveDelayMs(record.RecordId);
+
+                if (delay > 0) { Thread.Sleep(delay); }
+            }
+
+            return FilterEventBuilder.CreateTestEvent(recordId: record.RecordId);
+        });
+
+        var serviceProvider = Substitute.For<IServiceProvider>();
+        serviceProvider.GetService(typeof(IEventResolver)).Returns(resolver);
+
+        var serviceScope = Substitute.For<IServiceScope>();
+        serviceScope.ServiceProvider.Returns(serviceProvider);
+
+        var serviceScopeFactory = Substitute.For<IServiceScopeFactory>();
+        serviceScopeFactory.CreateScope().Returns(serviceScope);
+
+        var databaseService = Substitute.For<IDatabaseService>();
+        databaseService.InitialClassificationTask.Returns(Task.CompletedTask);
+
+        var watcher = Substitute.For<ILogWatcherService>();
+        watcher.RemoveLogAsync(Arg.Any<string>()).Returns(Task.CompletedTask);
+        watcher.RemoveAllAsync().Returns(Task.CompletedTask);
+
+        var dispatcher = Substitute.For<IDispatcher>();
+
+        var openLog = new OpenLogEffects(
+            eventLogState,
+            Substitute.For<ITraceLogger>(),
+            watcher,
+            Substitute.For<IEventResolverCache>(),
+            Substitute.For<IEventXmlResolver>(),
+            serviceScopeFactory,
+            databaseService,
+            Substitute.For<ICriticalErrorService>(),
+            new LogCloseCoordinator(),
+            new EventLogConcurrencyState(),
+            new PartialLoadCoordinator(dispatcher, Timeout.InfiniteTimeSpan),
+            readerFactory);
+
+        return (openLog, dispatcher, watcher);
+    }
+
     private static (EffectsHarness effects, IDispatcher mockDispatcher) CreateEffects(
         bool continuouslyUpdate = false,
         ImmutableDictionary<string, EventLogData>? activeLogs = null,
@@ -2604,6 +2859,13 @@ private static IState<RawEventStoreState> EmptyRawStore()
         return rawStore;
     }
 
+    private static IReadOnlyList<ResolvedEvent> SingleFinalEvents(IDispatcher dispatcher) =>
+        dispatcher.ReceivedCalls()
+            .Select(call => call.GetArguments()[0])
+            .OfType<LoadEventsAction>()
+            .Single()
+            .Events;
+
     // Wrapper that bundles the post-split effects classes together with their
     // shared singletons so existing tests keep their `effects.HandleXxx(...)`
     // call shape. Each method delegates to the appropriate split class.
@@ -2652,4 +2914,46 @@ public Task HandleOpenLog(OpenLogAction action, IDispatcher dispatcher) =>
         public Task HandleSetContinuouslyUpdate(SetContinuouslyUpdateAction action, IDispatcher dispatcher) =>
             Filtering.HandleSetContinuouslyUpdate(action, dispatcher);
     }
+
+    private sealed class FakeEventLogReader(IReadOnlyList<EventRecord[]> batches, string? newestBookmark)
+        : IEventLogReader
+    {
+        private int _index;
+
+        public bool IsValid { get; init; } = true;
+
+        public int? LastErrorCode { get; init; }
+
+        public string? NewestBookmark { get; } = newestBookmark;
+
+        public int? OpenErrorCode { get; init; }
+
+        public void Dispose() { }
+
+        public bool TryGetEvents(out EventRecord[] events, int batchSize = 30)
+        {
+            if (_index >= batches.Count)
+            {
+                events = [];
+
+                return false;
+            }
+
+            events = batches[_index++];
+
+            return true;
+        }
+    }
+
+    private sealed class FakeEventLogReaderFactory(IEventLogReader reader) : IEventLogReaderFactory
+    {
+        public bool ReverseDirectionRequested { get; private set; }
+
+        public IEventLogReader CreateReader(string path, LogPathType pathType, bool renderXml = false, bool reverseDirection = false)
+        {
+            ReverseDirectionRequested = reverseDirection;
+
+            return reader;
+        }
+    }
 }

From 1c26000322019ba9c4db6130d7b7125c7e69c323 Mon Sep 17 00:00:00 2001
From: jschick04 <jschick04@gmail.com>
Date: Sat, 20 Jun 2026 11:25:48 -0500
Subject: [PATCH 30/40] Read event variants via pointer and match EvtVariant to
 MSDN

---
 .../Interop/EvtVariant.cs                     |  56 ++++++----
 .../Interop/NativeMethods.Evt.cs              |  82 +++++++-------
 .../PublisherMetadata/ProviderMetadata.cs     |   4 +-
 .../Interop/NativeMethodsEvtTests.cs          | 103 ++++++++++++++++--
 4 files changed, 176 insertions(+), 69 deletions(-)

diff --git a/src/EventLogExpert.Eventing/Interop/EvtVariant.cs b/src/EventLogExpert.Eventing/Interop/EvtVariant.cs
index 813b08196..5402f7475 100644
--- a/src/EventLogExpert.Eventing/Interop/EvtVariant.cs
+++ b/src/EventLogExpert.Eventing/Interop/EvtVariant.cs
@@ -8,28 +8,46 @@ namespace EventLogExpert.Eventing.Interop;
 [StructLayout(LayoutKind.Explicit)]
 internal readonly record struct EvtVariant
 {
-    [FieldOffset(0)] internal readonly uint UInteger;
-    [FieldOffset(0)] internal readonly int Integer;
-    [FieldOffset(0)] internal readonly byte UInt8;
-    [FieldOffset(0)] internal readonly short Short;
-    [FieldOffset(0)] internal readonly ushort UShort;
-    [FieldOffset(0)] internal readonly uint Bool;
+    [FieldOffset(0)] internal readonly int BooleanVal;
+    [FieldOffset(0)] internal readonly sbyte SByteVal;
+    [FieldOffset(0)] internal readonly short Int16Val;
+    [FieldOffset(0)] internal readonly int Int32Val;
+    [FieldOffset(0)] internal readonly long Int64Val;
     [FieldOffset(0)] internal readonly byte ByteVal;
-    [FieldOffset(0)] internal readonly byte SByte;
-    [FieldOffset(0)] internal readonly ulong ULong;
-    [FieldOffset(0)] internal readonly long Long;
-    [FieldOffset(0)] internal readonly float Single;
-    [FieldOffset(0)] internal readonly double Double;
+    [FieldOffset(0)] internal readonly ushort UInt16Val;
+    [FieldOffset(0)] internal readonly uint UInt32Val;
+    [FieldOffset(0)] internal readonly ulong UInt64Val;
+    [FieldOffset(0)] internal readonly float SingleVal;
+    [FieldOffset(0)] internal readonly double DoubleVal;
+    [FieldOffset(0)] internal readonly ulong FileTimeVal;
+    [FieldOffset(0)] internal readonly nint SysTimeVal;
+    [FieldOffset(0)] internal readonly nint GuidVal;
     [FieldOffset(0)] internal readonly nint StringVal;
-    [FieldOffset(0)] internal readonly nint AnsiString;
+    [FieldOffset(0)] internal readonly nint AnsiStringVal;
+    [FieldOffset(0)] internal readonly nint BinaryVal;
     [FieldOffset(0)] internal readonly nint SidVal;
-    [FieldOffset(0)] internal readonly nint Binary;
-    [FieldOffset(0)] internal readonly nint Reference;
-    [FieldOffset(0)] internal readonly nint Handle;
-    [FieldOffset(0)] internal readonly nint GuidReference;
-    [FieldOffset(0)] internal readonly ulong FileTime;
-    [FieldOffset(0)] internal readonly nint SystemTime;
-    [FieldOffset(0)] internal readonly nint SizeT;
+    [FieldOffset(0)] internal readonly nuint SizeTVal;
+    [FieldOffset(0)] internal readonly nint BooleanArr;
+    [FieldOffset(0)] internal readonly nint SByteArr;
+    [FieldOffset(0)] internal readonly nint Int16Arr;
+    [FieldOffset(0)] internal readonly nint Int32Arr;
+    [FieldOffset(0)] internal readonly nint Int64Arr;
+    [FieldOffset(0)] internal readonly nint ByteArr;
+    [FieldOffset(0)] internal readonly nint UInt16Arr;
+    [FieldOffset(0)] internal readonly nint UInt32Arr;
+    [FieldOffset(0)] internal readonly nint UInt64Arr;
+    [FieldOffset(0)] internal readonly nint SingleArr;
+    [FieldOffset(0)] internal readonly nint DoubleArr;
+    [FieldOffset(0)] internal readonly nint FileTimeArr;
+    [FieldOffset(0)] internal readonly nint SysTimeArr;
+    [FieldOffset(0)] internal readonly nint GuidArr;
+    [FieldOffset(0)] internal readonly nint StringArr;
+    [FieldOffset(0)] internal readonly nint AnsiStringArr;
+    [FieldOffset(0)] internal readonly nint SidArr;
+    [FieldOffset(0)] internal readonly nint SizeTArr;
+    [FieldOffset(0)] internal readonly nint EvtHandleVal;
+    [FieldOffset(0)] internal readonly nint XmlVal;
+    [FieldOffset(0)] internal readonly nint XmlValArr;
     [FieldOffset(8)] internal readonly uint Count;
     [FieldOffset(12)] internal readonly uint Type;
 }
diff --git a/src/EventLogExpert.Eventing/Interop/NativeMethods.Evt.cs b/src/EventLogExpert.Eventing/Interop/NativeMethods.Evt.cs
index 8bd86f0b4..67c471644 100644
--- a/src/EventLogExpert.Eventing/Interop/NativeMethods.Evt.cs
+++ b/src/EventLogExpert.Eventing/Interop/NativeMethods.Evt.cs
@@ -24,29 +24,29 @@ internal static partial class NativeMethods
             case (int)EvtVariantType.String:
                 return Marshal.PtrToStringUni(variant.StringVal);
             case (int)EvtVariantType.AnsiString:
-                return Marshal.PtrToStringAnsi(variant.AnsiString);
+                return Marshal.PtrToStringAnsi(variant.AnsiStringVal);
             case (int)EvtVariantType.SByte:
-                return variant.SByte;
+                return variant.SByteVal;
             case (int)EvtVariantType.Byte:
-                return variant.UInt8;
+                return variant.ByteVal;
             case (int)EvtVariantType.Int16:
-                return variant.Short;
+                return variant.Int16Val;
             case (int)EvtVariantType.UInt16:
-                return variant.UShort;
+                return variant.UInt16Val;
             case (int)EvtVariantType.Int32:
-                return variant.Integer;
+                return variant.Int32Val;
             case (int)EvtVariantType.UInt32:
-                return variant.UInteger;
+                return variant.UInt32Val;
             case (int)EvtVariantType.Int64:
-                return variant.Long;
+                return variant.Int64Val;
             case (int)EvtVariantType.UInt64:
-                return variant.ULong;
+                return variant.UInt64Val;
             case (int)EvtVariantType.Single:
-                return variant.Single;
+                return variant.SingleVal;
             case (int)EvtVariantType.Double:
-                return variant.Double;
+                return variant.DoubleVal;
             case (int)EvtVariantType.Boolean:
-                return variant.Bool != 0;
+                return variant.BooleanVal != 0;
             case (int)EvtVariantType.Binary:
                 if (variant.Count == 0)
                 {
@@ -55,23 +55,23 @@ internal static partial class NativeMethods
 
                 int byteCount = CheckedCount(variant.Count, EvtVariantType.Binary);
 
-                if (variant.Binary == IntPtr.Zero)
+                if (variant.BinaryVal == IntPtr.Zero)
                 {
                     throw new InvalidDataException(
                         $"Null reference with non-zero count {variant.Count} for {nameof(EvtVariantType)}.{EvtVariantType.Binary}");
                 }
 
                 byte[] bytes = new byte[byteCount];
-                Marshal.Copy(variant.Binary, bytes, 0, byteCount);
+                Marshal.Copy(variant.BinaryVal, bytes, 0, byteCount);
                 return bytes;
             case (int)EvtVariantType.Guid:
-                return Marshal.PtrToStructure<Guid>(variant.GuidReference);
+                return Marshal.PtrToStructure<Guid>(variant.GuidVal);
             case (int)EvtVariantType.SizeT:
-                return variant.SizeT;
+                return variant.SizeTVal;
             case (int)EvtVariantType.FileTime:
-                return DateTime.FromFileTimeUtc((long)variant.FileTime);
+                return DateTime.FromFileTimeUtc((long)variant.FileTimeVal);
             case (int)EvtVariantType.SysTime:
-                var sysTime = Marshal.PtrToStructure<SystemTime>(variant.SystemTime);
+                var sysTime = Marshal.PtrToStructure<SystemTime>(variant.SysTimeVal);
 
                 return new DateTime(
                     sysTime.Year,
@@ -85,13 +85,13 @@ internal static partial class NativeMethods
             case (int)EvtVariantType.Sid:
                 return variant.SidVal == IntPtr.Zero ? null : new SecurityIdentifier(variant.SidVal);
             case (int)EvtVariantType.HexInt32:
-                return variant.Integer;
+                return variant.Int32Val;
             case (int)EvtVariantType.HexInt64:
-                return variant.ULong;
+                return variant.UInt64Val;
             case (int)EvtVariantType.Handle:
-                return new EvtHandle(variant.Handle);
+                return new EvtHandle(variant.EvtHandleVal);
             case (int)EvtVariantType.Xml:
-                return Marshal.PtrToStringUni(variant.StringVal);
+                return Marshal.PtrToStringUni(variant.XmlVal);
             case (int)EvtVariantType.StringArray:
                 if (variant.Count == 0)
                 {
@@ -100,7 +100,7 @@ internal static partial class NativeMethods
 
                 int stringCount = CheckedCount(variant.Count, EvtVariantType.StringArray);
 
-                if (variant.Reference == IntPtr.Zero)
+                if (variant.StringArr == IntPtr.Zero)
                 {
                     throw new InvalidDataException(
                         $"Null reference with non-zero count {variant.Count} for {nameof(EvtVariantType)}.{EvtVariantType.StringArray}");
@@ -110,20 +110,20 @@ internal static partial class NativeMethods
 
                 for (int i = 0; i < stringCount; i++)
                 {
-                    IntPtr stringRef = Marshal.ReadIntPtr(variant.Reference, i * IntPtr.Size);
+                    IntPtr stringRef = Marshal.ReadIntPtr(variant.StringArr, i * IntPtr.Size);
 
                     stringArray[i] = Marshal.PtrToStringAuto(stringRef) ?? string.Empty;
                 }
 
                 return stringArray;
             case (int)EvtVariantType.ByteArray:
-                return ReadBlittableArray<byte>(variant.Reference, variant.Count, EvtVariantType.ByteArray);
+                return ReadBlittableArray<byte>(variant.ByteArr, variant.Count, EvtVariantType.ByteArray);
             case (int)EvtVariantType.UInt16Array:
-                return ReadBlittableArray<ushort>(variant.Reference, variant.Count, EvtVariantType.UInt16Array);
+                return ReadBlittableArray<ushort>(variant.UInt16Arr, variant.Count, EvtVariantType.UInt16Array);
             case (int)EvtVariantType.UInt32Array:
-                return ReadBlittableArray<uint>(variant.Reference, variant.Count, EvtVariantType.UInt32Array);
+                return ReadBlittableArray<uint>(variant.UInt32Arr, variant.Count, EvtVariantType.UInt32Array);
             case (int)EvtVariantType.HexInt32Array:
-                return ReadBlittableArray<int>(variant.Reference, variant.Count, EvtVariantType.HexInt32Array);
+                return ReadBlittableArray<int>(variant.Int32Arr, variant.Count, EvtVariantType.HexInt32Array);
             default:
                 throw new InvalidDataException($"Invalid {nameof(EvtVariantType)}: {variant.Type}");
         }
@@ -454,7 +454,7 @@ internal static object GetObjectArrayProperty(
             {
                 fixed (char* bufferPtr = buffer)
                 {
-                    var variant = Marshal.PtrToStructure<EvtVariant>((IntPtr)bufferPtr);
+                    var variant = *(EvtVariant*)bufferPtr;
 
                     return ConvertVariant(variant) ??
                         throw new InvalidDataException($"Invalid Object Array for Property: {propertyId}");
@@ -594,15 +594,15 @@ internal static IReadOnlyList<object> RenderEventProperties(EvtHandle eventHandl
 
             var properties = new object[propertyCount];
 
-            for (int i = 0; i < propertyCount; i++)
+            unsafe
             {
-                unsafe
+                fixed (char* bufferPtr = buffer)
                 {
-                    fixed (char* bufferPtr = buffer)
-                    {
-                        var property = Marshal.PtrToStructure<EvtVariant>((IntPtr)bufferPtr + (i * Marshal.SizeOf<EvtVariant>()));
+                    var variants = (EvtVariant*)bufferPtr;
 
-                        properties[i] = ConvertVariant(property) ?? throw new InvalidDataException();
+                    for (int i = 0; i < propertyCount; i++)
+                    {
+                        properties[i] = ConvertVariant(variants[i]) ?? throw new InvalidDataException();
                     }
                 }
             }
@@ -712,17 +712,21 @@ private static int CheckedCount(uint count, EvtVariantType type)
     }
 
     /// <summary>Converts a buffer that was returned from <see cref="EvtRender" /> to an <see cref="EventRecord" /></summary>
-    /// <param name="eventBuffer">Pointer to a buffer returned from <see cref="EvtRender" /></param>
+    /// <param name="eventBuffer">
+    ///     Pointer to a buffer returned from <see cref="EvtRender" />. Must stay pinned and valid for
+    ///     the duration of the call; the variants are read directly through this pointer.
+    /// </param>
     /// <param name="propertyCount">Number of properties returned from <see cref="EvtRender" /></param>
     /// <returns></returns>
-    private static EventRecord GetEventRecord(IntPtr eventBuffer, int propertyCount)
+    private static unsafe EventRecord GetEventRecord(IntPtr eventBuffer, int propertyCount)
     {
         EventRecord properties = new();
 
+        var variants = (EvtVariant*)eventBuffer;
+
         for (int i = 0; i < propertyCount; i++)
         {
-            var property = Marshal.PtrToStructure<EvtVariant>(eventBuffer + (i * Marshal.SizeOf<EvtVariant>()));
-            var variant = ConvertVariant(property);
+            var variant = ConvertVariant(variants[i]);
 
             // Properties are returned in the order defined in EVT_SYSTEM_PROPERTY_ID enum
             switch (i)
diff --git a/src/EventLogExpert.Eventing/PublisherMetadata/ProviderMetadata.cs b/src/EventLogExpert.Eventing/PublisherMetadata/ProviderMetadata.cs
index 7043b5d42..395ffe7fb 100644
--- a/src/EventLogExpert.Eventing/PublisherMetadata/ProviderMetadata.cs
+++ b/src/EventLogExpert.Eventing/PublisherMetadata/ProviderMetadata.cs
@@ -465,9 +465,9 @@ private EvtHandle GetPublisherMetadataPropertyHandle(EvtPublisherMetadataPropert
 
             var variant = Marshal.PtrToStructure<EvtVariant>(buffer);
 
-            return variant.Handle == IntPtr.Zero ?
+            return variant.EvtHandleVal == IntPtr.Zero ?
                 EvtHandle.Zero :
-                new EvtHandle(variant.Handle);
+                new EvtHandle(variant.EvtHandleVal);
         }
         finally
         {
diff --git a/tests/Unit/EventLogExpert.Eventing.Tests/Interop/NativeMethodsEvtTests.cs b/tests/Unit/EventLogExpert.Eventing.Tests/Interop/NativeMethodsEvtTests.cs
index 36658b29c..1d41e33a9 100644
--- a/tests/Unit/EventLogExpert.Eventing.Tests/Interop/NativeMethodsEvtTests.cs
+++ b/tests/Unit/EventLogExpert.Eventing.Tests/Interop/NativeMethodsEvtTests.cs
@@ -402,10 +402,11 @@ public void ConvertVariant_WhenNull_ShouldReturnNull()
     }
 
     [Fact]
-    public void ConvertVariant_WhenSByte_ShouldReturnByte()
+    public void ConvertVariant_WhenSByte_ShouldReturnSByte()
     {
-        // Arrange
-        byte expectedValue = 127;
+        // Arrange - a negative value distinguishes the signed INT8 result from the prior byte
+        // return (the same 0xFF byte reads as -1 via SByteVal, but 255 if read as a byte).
+        sbyte expectedValue = -1;
         var variant = CreateVariant(EvtVariantType.SByte, expectedValue);
 
         // Act
@@ -413,7 +414,7 @@ public void ConvertVariant_WhenSByte_ShouldReturnByte()
 
         // Assert
         Assert.NotNull(result);
-        Assert.IsType<byte>(result);
+        Assert.IsType<sbyte>(result);
         Assert.Equal(expectedValue, result);
     }
 
@@ -447,10 +448,10 @@ public void ConvertVariant_WhenSingle_ShouldReturnFloat()
     }
 
     [Fact]
-    public void ConvertVariant_WhenSizeT_ShouldReturnIntPtr()
+    public void ConvertVariant_WhenSizeT_ShouldReturnUIntPtr()
     {
         // Arrange
-        nint expectedValue = 12345;
+        nuint expectedValue = 12345;
         var variant = CreateVariant(EvtVariantType.SizeT, expectedValue);
 
         // Act
@@ -458,7 +459,7 @@ public void ConvertVariant_WhenSizeT_ShouldReturnIntPtr()
 
         // Assert
         Assert.NotNull(result);
-        Assert.IsType<nint>(result);
+        Assert.IsType<nuint>(result);
         Assert.Equal(expectedValue, result);
     }
 
@@ -745,6 +746,81 @@ public void ConvertVariant_WhenXml_ShouldReturnString()
         }
     }
 
+    [Fact]
+    public void EvtVariant_PointerIndexedRead_ShouldMatchMarshalledRead_ForInteriorPointerTypes()
+    {
+        // RenderEventProperties / GetEventRecord now read contiguous EvtVariant buffers via
+        // ((EvtVariant*)ptr)[i] instead of Marshal.PtrToStructure. Verify the pointer-indexed read
+        // is equivalent to the marshalled read at non-zero indices (stride-sensitive) and that
+        // ConvertVariant dereferences each variant's interior pointer (string/systime) correctly.
+        // String and SysTime are interior-pointer types, exercised at indices 0, 1 and 2.
+        const string firstString = "First property value";
+        const string thirdString = "Third property value";
+        var expectedDateTime = new DateTime(2024, 3, 15, 14, 30, 45, 123, DateTimeKind.Utc);
+
+        IntPtr firstStringPtr = Marshal.StringToHGlobalUni(firstString);
+        IntPtr thirdStringPtr = Marshal.StringToHGlobalUni(thirdString);
+        IntPtr sysTimePtr = Marshal.AllocHGlobal(Marshal.SizeOf<SystemTime>());
+        int variantSize = Marshal.SizeOf<EvtVariant>();
+        IntPtr buffer = Marshal.AllocHGlobal(variantSize * 3);
+
+        try
+        {
+            unsafe
+            {
+                short* sysTime = (short*)sysTimePtr;
+                sysTime[0] = 2024; // Year
+                sysTime[1] = 3;    // Month
+                sysTime[2] = 5;    // DayOfWeek
+                sysTime[3] = 15;   // Day
+                sysTime[4] = 14;   // Hour
+                sysTime[5] = 30;   // Minute
+                sysTime[6] = 45;   // Second
+                sysTime[7] = 123;  // Milliseconds
+
+                Unsafe.InitBlock((void*)buffer, 0, (uint)(variantSize * 3));
+                WriteVariantSlot(buffer, 0, variantSize, EvtVariantType.String, firstStringPtr);
+                WriteVariantSlot(buffer, 1, variantSize, EvtVariantType.SysTime, sysTimePtr);
+                WriteVariantSlot(buffer, 2, variantSize, EvtVariantType.String, thirdStringPtr);
+
+                for (int i = 0; i < 3; i++)
+                {
+                    var pointerRead = ((EvtVariant*)buffer)[i];
+                    var marshalledRead = Marshal.PtrToStructure<EvtVariant>(buffer + (i * variantSize));
+
+                    Assert.Equal(NativeMethods.ConvertVariant(marshalledRead), NativeMethods.ConvertVariant(pointerRead));
+                }
+
+                Assert.Equal(firstString, NativeMethods.ConvertVariant(((EvtVariant*)buffer)[0]));
+                Assert.Equal(expectedDateTime, NativeMethods.ConvertVariant(((EvtVariant*)buffer)[1]));
+                Assert.Equal(thirdString, NativeMethods.ConvertVariant(((EvtVariant*)buffer)[2]));
+            }
+        }
+        finally
+        {
+            Marshal.FreeHGlobal(buffer);
+            Marshal.FreeHGlobal(sysTimePtr);
+            Marshal.FreeHGlobal(thirdStringPtr);
+            Marshal.FreeHGlobal(firstStringPtr);
+        }
+    }
+
+    [Fact]
+    public void EvtVariant_ShouldRemainBlittableWithStableLayout()
+    {
+        // The render path reads contiguous EvtVariant buffers directly through a pointer
+        // (((EvtVariant*)ptr)[i]), so the struct must stay blittable and keep the native
+        // EVT_VARIANT layout: no managed references, a managed pointer stride (Unsafe.SizeOf)
+        // equal to the native marshalled stride (Marshal.SizeOf), and Count/Type at offsets 8/12.
+        // A future field that breaks any of these fails here instead of mis-indexing at runtime.
+        Assert.False(RuntimeHelpers.IsReferenceOrContainsReferences<EvtVariant>());
+        Assert.Equal(16, Unsafe.SizeOf<EvtVariant>());
+        Assert.Equal(16, Marshal.SizeOf<EvtVariant>());
+        Assert.Equal(Marshal.SizeOf<EvtVariant>(), Unsafe.SizeOf<EvtVariant>());
+        Assert.Equal(8, (int)Marshal.OffsetOf<EvtVariant>(nameof(EvtVariant.Count)));
+        Assert.Equal(12, (int)Marshal.OffsetOf<EvtVariant>(nameof(EvtVariant.Type)));
+    }
+
     [Fact]
     public void ThrowEventLogException_WhenAccessDenied_ShouldThrowUnauthorizedAccessException()
     {
@@ -875,7 +951,6 @@ public void ThrowEventLogException_WhenUnknownError_ShouldThrowException()
         Assert.Throws<Exception>(() => NativeMethods.ThrowEventLogException(error));
     }
 
-    // Helper methods to create EvtVariant instances
     private static EvtVariant CreateVariant(EvtVariantType type, object? value = null)
     {
         return CreateVariantWithCount(type, value, 0);
@@ -921,6 +996,8 @@ private static EvtVariant CreateVariantWithCount(EvtVariantType type, object? va
                         *(nint*)buffer = (IntPtr)value;
                         break;
                     case EvtVariantType.SByte:
+                        *(sbyte*)buffer = (sbyte)value;
+                        break;
                     case EvtVariantType.Byte:
                         *(byte*)buffer = (byte)value;
                         break;
@@ -953,7 +1030,7 @@ private static EvtVariant CreateVariantWithCount(EvtVariantType type, object? va
                         *(double*)buffer = (double)value;
                         break;
                     case EvtVariantType.SizeT:
-                        *(nint*)buffer = (nint)value;
+                        *(nuint*)buffer = (nuint)value;
                         break;
                 }
 
@@ -965,4 +1042,12 @@ private static EvtVariant CreateVariantWithCount(EvtVariantType type, object? va
             Marshal.FreeHGlobal(buffer);
         }
     }
+
+    // Helper methods to create EvtVariant instances
+    private static unsafe void WriteVariantSlot(IntPtr buffer, int index, int variantSize, EvtVariantType type, IntPtr value)
+    {
+        IntPtr slot = buffer + (index * variantSize);
+        *(nint*)slot = value;             // interior pointer (union) at offset 0
+        *(uint*)(slot + 12) = (uint)type; // Type at offset 12
+    }
 }

From 44ee2dfc8e877a892455191093c8c152f58fc5a8 Mon Sep 17 00:00:00 2001
From: jschick04 <jschick04@gmail.com>
Date: Sat, 20 Jun 2026 12:31:59 -0500
Subject: [PATCH 31/40] Read value-type system properties without boxing in
 GetEventRecord

---
 .../Interop/NativeMethods.Evt.cs              | 201 +++++++++++-------
 .../Interop/NativeMethodsEvtTests.cs          |  95 +++++++++
 2 files changed, 225 insertions(+), 71 deletions(-)

diff --git a/src/EventLogExpert.Eventing/Interop/NativeMethods.Evt.cs b/src/EventLogExpert.Eventing/Interop/NativeMethods.Evt.cs
index 67c471644..c796d4790 100644
--- a/src/EventLogExpert.Eventing/Interop/NativeMethods.Evt.cs
+++ b/src/EventLogExpert.Eventing/Interop/NativeMethods.Evt.cs
@@ -5,6 +5,7 @@
 using EventLogExpert.Eventing.Readers;
 using Microsoft.Win32.SafeHandles;
 using System.Buffers;
+using System.Diagnostics;
 using System.Runtime.InteropServices;
 using System.Security.Principal;
 
@@ -408,6 +409,81 @@ internal static string FormatMessage(EvtHandle publisherMetadataHandle, uint mes
         }
     }
 
+    /// <summary>Converts a buffer that was returned from <see cref="EvtRender" /> to an <see cref="EventRecord" /></summary>
+    /// <param name="eventBuffer">
+    ///     Pointer to a buffer returned from <see cref="EvtRender" />. Must stay pinned and valid for
+    ///     the duration of the call; the variants are read directly through this pointer.
+    /// </param>
+    /// <param name="propertyCount">Number of properties returned from <see cref="EvtRender" /></param>
+    /// <returns></returns>
+    internal static unsafe EventRecord GetEventRecord(IntPtr eventBuffer, int propertyCount)
+    {
+        EventRecord properties = new();
+
+        var variants = (EvtVariant*)eventBuffer;
+
+        for (int i = 0; i < propertyCount; i++)
+        {
+            ref readonly var variant = ref variants[i];
+
+            // Properties are returned in the order defined in EVT_SYSTEM_PROPERTY_ID enum. Value-type
+            // properties are read straight from the typed union field (no boxing); the string, SID and
+            // time properties stay on ConvertVariant (no boxing benefit, and it handles the
+            // FileTime/SysTime split for TimeCreated). Unmapped indices are intentionally skipped.
+            switch (i)
+            {
+                case (int)EvtSystemPropertyId.ProviderName:
+                    properties.ProviderName = (string)ConvertVariant(variant)!;
+                    break;
+                case (int)EvtSystemPropertyId.EventId:
+                    Debug.Assert(variant.Type == (uint)EvtVariantType.UInt16);
+                    properties.Id = variant.UInt16Val;
+                    break;
+                case (int)EvtSystemPropertyId.Qualifiers:
+                    properties.Qualifiers = ReadOptionalUInt16(variant);
+                    break;
+                case (int)EvtSystemPropertyId.Level:
+                    properties.Level = ReadOptionalByte(variant);
+                    break;
+                case (int)EvtSystemPropertyId.Task:
+                    properties.Task = ReadOptionalUInt16(variant);
+                    break;
+                case (int)EvtSystemPropertyId.Keywords:
+                    properties.Keywords = ReadOptionalInt64(variant);
+                    break;
+                case (int)EvtSystemPropertyId.TimeCreated:
+                    properties.TimeCreated = (DateTime)ConvertVariant(variant)!;
+                    break;
+                case (int)EvtSystemPropertyId.EventRecordId:
+                    properties.RecordId = ReadOptionalInt64(variant);
+                    break;
+                case (int)EvtSystemPropertyId.ActivityId:
+                    properties.ActivityId = ReadGuidOrNull(variant);
+                    break;
+                case (int)EvtSystemPropertyId.ProcessID:
+                    properties.ProcessId = ReadOptionalInt32(variant);
+                    break;
+                case (int)EvtSystemPropertyId.ThreadID:
+                    properties.ThreadId = ReadOptionalInt32(variant);
+                    break;
+                case (int)EvtSystemPropertyId.Channel:
+                    properties.LogName = (string)ConvertVariant(variant)!;
+                    break;
+                case (int)EvtSystemPropertyId.Computer:
+                    properties.ComputerName = (string)ConvertVariant(variant)!;
+                    break;
+                case (int)EvtSystemPropertyId.UserID:
+                    properties.UserId = (SecurityIdentifier?)ConvertVariant(variant);
+                    break;
+                case (int)EvtSystemPropertyId.Version:
+                    properties.Version = ReadOptionalByte(variant);
+                    break;
+            }
+        }
+
+        return properties;
+    }
+
     internal static object GetObjectArrayProperty(
         EvtHandle array,
         int index,
@@ -711,77 +787,6 @@ private static int CheckedCount(uint count, EvtVariantType type)
         }
     }
 
-    /// <summary>Converts a buffer that was returned from <see cref="EvtRender" /> to an <see cref="EventRecord" /></summary>
-    /// <param name="eventBuffer">
-    ///     Pointer to a buffer returned from <see cref="EvtRender" />. Must stay pinned and valid for
-    ///     the duration of the call; the variants are read directly through this pointer.
-    /// </param>
-    /// <param name="propertyCount">Number of properties returned from <see cref="EvtRender" /></param>
-    /// <returns></returns>
-    private static unsafe EventRecord GetEventRecord(IntPtr eventBuffer, int propertyCount)
-    {
-        EventRecord properties = new();
-
-        var variants = (EvtVariant*)eventBuffer;
-
-        for (int i = 0; i < propertyCount; i++)
-        {
-            var variant = ConvertVariant(variants[i]);
-
-            // Properties are returned in the order defined in EVT_SYSTEM_PROPERTY_ID enum
-            switch (i)
-            {
-                case (int)EvtSystemPropertyId.ActivityId:
-                    properties.ActivityId = (Guid?)variant;
-                    break;
-                case (int)EvtSystemPropertyId.Computer:
-                    properties.ComputerName = (string)variant!;
-                    break;
-                case (int)EvtSystemPropertyId.EventId:
-                    properties.Id = (ushort)variant!;
-                    break;
-                case (int)EvtSystemPropertyId.Qualifiers:
-                    properties.Qualifiers = (ushort?)variant;
-                    break;
-                case (int)EvtSystemPropertyId.Keywords:
-                    properties.Keywords = (long?)(ulong?)variant;
-                    break;
-                case (int)EvtSystemPropertyId.Level:
-                    properties.Level = (byte?)variant;
-                    break;
-                case (int)EvtSystemPropertyId.Channel:
-                    properties.LogName = (string)variant!;
-                    break;
-                case (int)EvtSystemPropertyId.ProcessID:
-                    properties.ProcessId = (int?)(uint?)variant;
-                    break;
-                case (int)EvtSystemPropertyId.EventRecordId:
-                    properties.RecordId = (long?)(ulong?)variant;
-                    break;
-                case (int)EvtSystemPropertyId.ProviderName:
-                    properties.ProviderName = (string)variant!;
-                    break;
-                case (int)EvtSystemPropertyId.Task:
-                    properties.Task = (ushort?)variant;
-                    break;
-                case (int)EvtSystemPropertyId.ThreadID:
-                    properties.ThreadId = (int?)(uint?)variant;
-                    break;
-                case (int)EvtSystemPropertyId.TimeCreated:
-                    properties.TimeCreated = (DateTime)variant!;
-                    break;
-                case (int)EvtSystemPropertyId.UserID:
-                    properties.UserId = (SecurityIdentifier?)variant;
-                    break;
-                case (int)EvtSystemPropertyId.Version:
-                    properties.Version = (byte?)variant;
-                    break;
-            }
-        }
-
-        return properties;
-    }
-
     private static unsafe T[] ReadBlittableArray<T>(IntPtr reference, uint count, EvtVariantType type) where T : unmanaged
     {
         if (count == 0)
@@ -802,4 +807,58 @@ private static unsafe T[] ReadBlittableArray<T>(IntPtr reference, uint count, Ev
 
         return result;
     }
+
+    private static unsafe Guid? ReadGuidOrNull(in EvtVariant variant)
+    {
+        if (variant.Type == (uint)EvtVariantType.Null) { return null; }
+
+        if (variant.Type != (uint)EvtVariantType.Guid)
+        {
+            throw new InvalidDataException(
+                $"Expected {nameof(EvtVariantType)}.{EvtVariantType.Guid} for the activity id, got type {variant.Type}");
+        }
+
+        if (variant.GuidVal == 0)
+        {
+            throw new InvalidDataException($"Null {nameof(EvtVariantType)}.{EvtVariantType.Guid} pointer for the activity id");
+        }
+
+        return *(Guid*)variant.GuidVal;
+    }
+
+    private static byte? ReadOptionalByte(in EvtVariant variant)
+    {
+        if (variant.Type == (uint)EvtVariantType.Null) { return null; }
+
+        Debug.Assert(variant.Type == (uint)EvtVariantType.Byte);
+
+        return variant.ByteVal;
+    }
+
+    private static int? ReadOptionalInt32(in EvtVariant variant)
+    {
+        if (variant.Type == (uint)EvtVariantType.Null) { return null; }
+
+        Debug.Assert(variant.Type == (uint)EvtVariantType.UInt32);
+
+        return unchecked((int)variant.UInt32Val);
+    }
+
+    private static long? ReadOptionalInt64(in EvtVariant variant)
+    {
+        if (variant.Type == (uint)EvtVariantType.Null) { return null; }
+
+        Debug.Assert(variant.Type is (uint)EvtVariantType.UInt64 or (uint)EvtVariantType.HexInt64);
+
+        return unchecked((long)variant.UInt64Val);
+    }
+
+    private static ushort? ReadOptionalUInt16(in EvtVariant variant)
+    {
+        if (variant.Type == (uint)EvtVariantType.Null) { return null; }
+
+        Debug.Assert(variant.Type == (uint)EvtVariantType.UInt16);
+
+        return variant.UInt16Val;
+    }
 }
diff --git a/tests/Unit/EventLogExpert.Eventing.Tests/Interop/NativeMethodsEvtTests.cs b/tests/Unit/EventLogExpert.Eventing.Tests/Interop/NativeMethodsEvtTests.cs
index 1d41e33a9..277ad319b 100644
--- a/tests/Unit/EventLogExpert.Eventing.Tests/Interop/NativeMethodsEvtTests.cs
+++ b/tests/Unit/EventLogExpert.Eventing.Tests/Interop/NativeMethodsEvtTests.cs
@@ -2,6 +2,7 @@
 // // Licensed under the MIT License.
 
 using EventLogExpert.Eventing.Interop;
+using EventLogExpert.Eventing.Readers;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
@@ -821,6 +822,58 @@ public void EvtVariant_ShouldRemainBlittableWithStableLayout()
         Assert.Equal(12, (int)Marshal.OffsetOf<EvtVariant>(nameof(EvtVariant.Type)));
     }
 
+    [Fact]
+    public void GetEventRecord_WhenActivityIdNullVsPresent_ShouldPreserveDistinction()
+    {
+        var expected = Guid.NewGuid();
+        IntPtr guidPtr = Marshal.AllocHGlobal(Marshal.SizeOf<Guid>());
+
+        try
+        {
+            Marshal.StructureToPtr(expected, guidPtr, false);
+
+            var absent = BuildAndReadSystemRecord((buffer, size) =>
+                SetSlotType(buffer, (int)EvtSystemPropertyId.ActivityId, size, EvtVariantType.Null));
+            var present = BuildAndReadSystemRecord((buffer, size) =>
+                WriteVariantSlot(buffer, (int)EvtSystemPropertyId.ActivityId, size, EvtVariantType.Guid, guidPtr));
+
+            Assert.Null(absent.ActivityId);
+            Assert.Equal(expected, present.ActivityId);
+        }
+        finally
+        {
+            Marshal.FreeHGlobal(guidPtr);
+        }
+    }
+
+    [Fact]
+    public void GetEventRecord_WhenKeywordsHighBitSet_ShouldReinterpretAsNegativeLong()
+    {
+        // Keywords renders as HexInt64; the unchecked (long) reinterpret must preserve the bits, so a
+        // high-bit-set UInt64 becomes a negative long rather than throwing or clamping.
+        const ulong highBit = 0x8000_0000_0000_0001;
+        var record = BuildAndReadSystemRecord((buffer, size) =>
+            SetSlotScalarUInt64(buffer, (int)EvtSystemPropertyId.Keywords, size, EvtVariantType.HexInt64, highBit));
+
+        Assert.Equal(unchecked((long)highBit), record.Keywords);
+        Assert.True(record.Keywords < 0);
+    }
+
+    [Fact]
+    public void GetEventRecord_WhenNullableTaskNullVsZero_ShouldPreserveDistinction()
+    {
+        // The absent-vs-zero distinction is load-bearing: Type=Null means the property is absent (-> null);
+        // Type=UInt16 value 0 means present-and-zero (-> 0). Reading the field without the Null guard would
+        // collapse both to 0.
+        var absent = BuildAndReadSystemRecord((buffer, size) =>
+            SetSlotType(buffer, (int)EvtSystemPropertyId.Task, size, EvtVariantType.Null));
+        var zero = BuildAndReadSystemRecord((buffer, size) =>
+            SetSlotScalarUInt16(buffer, (int)EvtSystemPropertyId.Task, size, 0));
+
+        Assert.Null(absent.Task);
+        Assert.Equal((ushort)0, zero.Task);
+    }
+
     [Fact]
     public void ThrowEventLogException_WhenAccessDenied_ShouldThrowUnauthorizedAccessException()
     {
@@ -951,6 +1004,33 @@ public void ThrowEventLogException_WhenUnknownError_ShouldThrowException()
         Assert.Throws<Exception>(() => NativeMethods.ThrowEventLogException(error));
     }
 
+    // Builds an 18-slot EVT_VARIANT system-property buffer (every slot Null), pre-sets the required EventId +
+    // TimeCreated slots to valid values so GetEventRecord's asserted/dereferenced required reads don't fire,
+    // applies the per-test configuration, then reads it back through GetEventRecord.
+    private static unsafe EventRecord BuildAndReadSystemRecord(Action<IntPtr, int> configure)
+    {
+        int variantSize = Marshal.SizeOf<EvtVariant>();
+        const int count = 18;
+        IntPtr buffer = Marshal.AllocHGlobal(variantSize * count);
+
+        try
+        {
+            Unsafe.InitBlock((void*)buffer, 0, (uint)(variantSize * count));
+
+            SetSlotScalarUInt16(buffer, (int)EvtSystemPropertyId.EventId, variantSize, 1000);
+            SetSlotScalarUInt64(buffer, (int)EvtSystemPropertyId.TimeCreated, variantSize, EvtVariantType.FileTime,
+                (ulong)new DateTime(2024, 1, 1, 0, 0, 0, DateTimeKind.Utc).ToFileTimeUtc());
+
+            configure(buffer, variantSize);
+
+            return NativeMethods.GetEventRecord(buffer, count);
+        }
+        finally
+        {
+            Marshal.FreeHGlobal(buffer);
+        }
+    }
+
     private static EvtVariant CreateVariant(EvtVariantType type, object? value = null)
     {
         return CreateVariantWithCount(type, value, 0);
@@ -1043,6 +1123,21 @@ private static EvtVariant CreateVariantWithCount(EvtVariantType type, object? va
         }
     }
 
+    private static unsafe void SetSlotScalarUInt16(IntPtr buffer, int index, int variantSize, ushort value)
+    {
+        *(ushort*)(buffer + (index * variantSize)) = value;
+        SetSlotType(buffer, index, variantSize, EvtVariantType.UInt16);
+    }
+
+    private static unsafe void SetSlotScalarUInt64(IntPtr buffer, int index, int variantSize, EvtVariantType type, ulong value)
+    {
+        *(ulong*)(buffer + (index * variantSize)) = value;
+        SetSlotType(buffer, index, variantSize, type);
+    }
+
+    private static unsafe void SetSlotType(IntPtr buffer, int index, int variantSize, EvtVariantType type) =>
+        *(uint*)(buffer + (index * variantSize) + 12) = (uint)type;
+
     // Helper methods to create EvtVariant instances
     private static unsafe void WriteVariantSlot(IntPtr buffer, int index, int variantSize, EvtVariantType type, IntPtr value)
     {

From 98c904aed06d7422ffb3f5f4ac6be869e1feabfd Mon Sep 17 00:00:00 2001
From: jschick04 <jschick04@gmail.com>
Date: Sat, 20 Jun 2026 14:32:37 -0500
Subject: [PATCH 32/40] Prioritize a newly-opened log's first screenful over
 bulk resolution

---
 .../Concurrency/PrioritySemaphore.cs          |  82 +++++++
 .../Concurrency/ResolutionPriority.cs         |  14 ++
 .../EventLog/OpenLogEffects.cs                |  20 +-
 .../Concurrency/PrioritySemaphoreTests.cs     | 204 ++++++++++++++++++
 4 files changed, 317 insertions(+), 3 deletions(-)
 create mode 100644 src/EventLogExpert.Runtime/Concurrency/PrioritySemaphore.cs
 create mode 100644 src/EventLogExpert.Runtime/Concurrency/ResolutionPriority.cs
 create mode 100644 tests/Unit/EventLogExpert.Runtime.Tests/Concurrency/PrioritySemaphoreTests.cs

diff --git a/src/EventLogExpert.Runtime/Concurrency/PrioritySemaphore.cs b/src/EventLogExpert.Runtime/Concurrency/PrioritySemaphore.cs
new file mode 100644
index 000000000..0e162f321
--- /dev/null
+++ b/src/EventLogExpert.Runtime/Concurrency/PrioritySemaphore.cs
@@ -0,0 +1,82 @@
+// // Copyright (c) Microsoft Corporation.
+// // Licensed under the MIT License.
+
+namespace EventLogExpert.Runtime.Concurrency;
+
+/// <summary>
+///     An async semaphore with two priority classes. On release a <see cref="ResolutionPriority.FirstScreenful" />
+///     waiter is woken before any <see cref="ResolutionPriority.Bulk" /> waiter, so a newly-opened log's first screenful
+///     preempts in-flight bulk resolution instead of queuing behind it. A single static instance shares permits across all
+///     loads; the gate is work-conserving (a lone load uses every permit for both phases).
+/// </summary>
+internal sealed class PrioritySemaphore
+{
+    private readonly Queue<TaskCompletionSource> _high = new();
+    private readonly Lock _lock = new();
+    private readonly Queue<TaskCompletionSource> _low = new();
+    private int _available;
+
+    internal PrioritySemaphore(int permits) => _available = permits;
+
+    /// <summary>Available permits. Test-only observability for deterministic permit-conservation assertions.</summary>
+    internal int CurrentCount { get { lock (_lock) { return _available; } } }
+
+    /// <summary>Queued (high, low) waiter counts. Test-only; canceled waiters linger until a release skips them.</summary>
+    internal (int High, int Low) WaiterCounts { get { lock (_lock) { return (_high.Count, _low.Count); } } }
+
+    internal void Release()
+    {
+        lock (_lock)
+        {
+            // Wake the next live waiter, high priority first; canceled waiters are skipped (TrySetResult false)
+            // and dropped from the queue, so a released permit is never lost to a waiter that will never run.
+            while (_high.Count > 0)
+            {
+                if (_high.Dequeue().TrySetResult()) { return; }
+            }
+
+            while (_low.Count > 0)
+            {
+                if (_low.Dequeue().TrySetResult()) { return; }
+            }
+
+            _available++;
+        }
+    }
+
+    internal Task WaitAsync(ResolutionPriority priority, CancellationToken token)
+    {
+        if (token.IsCancellationRequested) { return Task.FromCanceled(token); }
+
+        lock (_lock)
+        {
+            if (_available > 0)
+            {
+                _available--;
+
+                return Task.CompletedTask;
+            }
+
+            var waiter = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
+            (priority == ResolutionPriority.FirstScreenful ? _high : _low).Enqueue(waiter);
+
+            if (!token.CanBeCanceled) { return waiter.Task; }
+
+            // On cancellation, complete the waiter as canceled. Release skips already-canceled waiters
+            // (TrySetResult returns false), so the permit is never lost to a waiter that will never run.
+            var registration = token.Register(static (state, cancellationToken) =>
+                    ((TaskCompletionSource)state!).TrySetCanceled(cancellationToken),
+                waiter);
+
+            // Dispose the registration once the wait settles (granted or canceled) so it isn't retained.
+            waiter.Task.ContinueWith(
+                static (_, state) => ((CancellationTokenRegistration)state!).Dispose(),
+                registration,
+                CancellationToken.None,
+                TaskContinuationOptions.ExecuteSynchronously,
+                TaskScheduler.Default);
+
+            return waiter.Task;
+        }
+    }
+}
diff --git a/src/EventLogExpert.Runtime/Concurrency/ResolutionPriority.cs b/src/EventLogExpert.Runtime/Concurrency/ResolutionPriority.cs
new file mode 100644
index 000000000..b3533e30e
--- /dev/null
+++ b/src/EventLogExpert.Runtime/Concurrency/ResolutionPriority.cs
@@ -0,0 +1,14 @@
+// // Copyright (c) Microsoft Corporation.
+// // Licensed under the MIT License.
+
+namespace EventLogExpert.Runtime.Concurrency;
+
+/// <summary>Priority class for a <see cref="PrioritySemaphore" /> waiter.</summary>
+internal enum ResolutionPriority
+{
+    /// <summary>A load's first screenful of newest events; preempts in-flight <see cref="Bulk" /> work.</summary>
+    FirstScreenful,
+
+    /// <summary>Background bulk resolution; yields to <see cref="FirstScreenful" /> waiters.</summary>
+    Bulk
+}
diff --git a/src/EventLogExpert.Runtime/EventLog/OpenLogEffects.cs b/src/EventLogExpert.Runtime/EventLog/OpenLogEffects.cs
index cf77e2428..ed7d8fd8f 100644
--- a/src/EventLogExpert.Runtime/EventLog/OpenLogEffects.cs
+++ b/src/EventLogExpert.Runtime/EventLog/OpenLogEffects.cs
@@ -8,6 +8,7 @@
 using EventLogExpert.Eventing.Resolvers;
 using EventLogExpert.Logging.Abstractions;
 using EventLogExpert.Runtime.Banner;
+using EventLogExpert.Runtime.Concurrency;
 using EventLogExpert.Runtime.Database;
 using EventLogExpert.Runtime.LogTable;
 using EventLogExpert.Runtime.StatusBar;
@@ -42,7 +43,7 @@ internal sealed class OpenLogEffects(
     private const int EagerFirstPaintThreshold = 200;
 
     private static readonly int s_maxGlobalConcurrency = Math.Max(1, Environment.ProcessorCount - 1);
-    private static readonly SemaphoreSlim s_resolutionThrottle = new(s_maxGlobalConcurrency, s_maxGlobalConcurrency);
+    private static readonly PrioritySemaphore s_resolutionGate = new(s_maxGlobalConcurrency);
 
     private readonly LogCloseCoordinator _closeCoordinator = closeCoordinator;
     private readonly EventLogConcurrencyState _concurrencyState = concurrencyState;
@@ -298,6 +299,7 @@ private async Task LoadLogAsync(
         int lastPartialIndex = 0;
         int timerTick = 0;
         int eagerFired = 0;
+        long highAdmitted = 0;
 
         dispatcher.Dispatch(new AddTableAction(logData));
 
@@ -367,7 +369,19 @@ await Parallel.ForEachAsync(
                 },
                 async (batch, innerToken) =>
                 {
-                    await s_resolutionThrottle.WaitAsync(innerToken);
+                    // First-screenful resolution preempts in-flight bulk across all loads. Classify by ADMITTED
+                    // (not completed) events so a slow-resolving load still demotes to Bulk after its first
+                    // screenful instead of monopolizing the high-priority lane.
+                    var priority = Volatile.Read(ref highAdmitted) < EagerFirstPaintThreshold
+                        ? ResolutionPriority.FirstScreenful
+                        : ResolutionPriority.Bulk;
+
+                    if (priority == ResolutionPriority.FirstScreenful)
+                    {
+                        Interlocked.Add(ref highAdmitted, batch.Length);
+                    }
+
+                    await s_resolutionGate.WaitAsync(priority, innerToken);
 
                     try
                     {
@@ -416,7 +430,7 @@ await Parallel.ForEachAsync(
                     }
                     finally
                     {
-                        s_resolutionThrottle.Release();
+                        s_resolutionGate.Release();
                     }
                 });
 
diff --git a/tests/Unit/EventLogExpert.Runtime.Tests/Concurrency/PrioritySemaphoreTests.cs b/tests/Unit/EventLogExpert.Runtime.Tests/Concurrency/PrioritySemaphoreTests.cs
new file mode 100644
index 000000000..255902598
--- /dev/null
+++ b/tests/Unit/EventLogExpert.Runtime.Tests/Concurrency/PrioritySemaphoreTests.cs
@@ -0,0 +1,204 @@
+// // Copyright (c) Microsoft Corporation.
+// // Licensed under the MIT License.
+
+using EventLogExpert.Runtime.Concurrency;
+
+namespace EventLogExpert.Runtime.Tests.Concurrency;
+
+public sealed class PrioritySemaphoreTests
+{
+    [Fact]
+    public void PermitCount_IsConserved_AcrossCancellationAndRelease()
+    {
+        var semaphore = new PrioritySemaphore(1);
+        semaphore.WaitAsync(ResolutionPriority.Bulk, CancellationToken.None);
+
+        using var cts = new CancellationTokenSource();
+        semaphore.WaitAsync(ResolutionPriority.FirstScreenful, cts.Token);
+        var live = semaphore.WaitAsync(ResolutionPriority.FirstScreenful, CancellationToken.None);
+        cts.Cancel();
+
+        semaphore.Release(); // serves the live waiter (skipping the canceled one)
+        Assert.True(live.IsCompletedSuccessfully);
+
+        semaphore.Release(); // the live waiter's permit returns
+        Assert.Equal(1, semaphore.CurrentCount);
+
+        // Exactly `permits` (1) uncontended acquire succeeds; the next blocks.
+        Assert.True(semaphore.WaitAsync(ResolutionPriority.Bulk, CancellationToken.None).IsCompletedSuccessfully);
+        Assert.False(semaphore.WaitAsync(ResolutionPriority.Bulk, CancellationToken.None).IsCompleted);
+    }
+
+    [Fact]
+    public void Release_DrainsAccumulatedCanceledWaiters_AndRestoresPermit()
+    {
+        const int permits = 1;
+        var semaphore = new PrioritySemaphore(permits);
+        semaphore.WaitAsync(ResolutionPriority.Bulk, CancellationToken.None); // consume the permit
+
+        using var cts = new CancellationTokenSource();
+        var waiters = new List<Task>();
+        for (int i = 0; i < 5; i++)
+        {
+            waiters.Add(semaphore.WaitAsync(ResolutionPriority.FirstScreenful, cts.Token));
+        }
+
+        cts.Cancel();
+        Assert.All(waiters, waiter => Assert.True(waiter.IsCanceled));
+
+        semaphore.Release(); // scans past every canceled waiter, finds no live one, restores the permit
+
+        Assert.Equal(permits, semaphore.CurrentCount);
+        Assert.Equal((0, 0), semaphore.WaiterCounts); // the release scan dequeued the canceled waiters
+    }
+
+    [Fact]
+    public void Release_IsFifoWithinAPriorityClass()
+    {
+        var semaphore = new PrioritySemaphore(1);
+        semaphore.WaitAsync(ResolutionPriority.FirstScreenful, CancellationToken.None); // consume the permit
+
+        var first = semaphore.WaitAsync(ResolutionPriority.FirstScreenful, CancellationToken.None);
+        var second = semaphore.WaitAsync(ResolutionPriority.FirstScreenful, CancellationToken.None);
+
+        semaphore.Release();
+        Assert.True(first.IsCompletedSuccessfully);
+        Assert.False(second.IsCompleted);
+
+        semaphore.Release();
+        Assert.True(second.IsCompletedSuccessfully);
+    }
+
+    [Fact]
+    public void Release_PrefersFirstScreenfulOverBulk()
+    {
+        var semaphore = new PrioritySemaphore(1);
+        semaphore.WaitAsync(ResolutionPriority.Bulk, CancellationToken.None); // consume the only permit
+
+        var bulk = semaphore.WaitAsync(ResolutionPriority.Bulk, CancellationToken.None);
+        var firstScreenful = semaphore.WaitAsync(ResolutionPriority.FirstScreenful, CancellationToken.None);
+        Assert.False(bulk.IsCompleted);
+        Assert.False(firstScreenful.IsCompleted);
+        Assert.Equal((1, 1), semaphore.WaiterCounts);
+
+        semaphore.Release();
+
+        Assert.True(firstScreenful.IsCompletedSuccessfully);
+        Assert.False(bulk.IsCompleted);
+        Assert.Equal(0, semaphore.CurrentCount);
+    }
+
+    [Fact]
+    public void Release_SkipsCanceledWaiter_AndServesLiveWaiterWithoutLosingThePermit()
+    {
+        var semaphore = new PrioritySemaphore(1);
+        semaphore.WaitAsync(ResolutionPriority.Bulk, CancellationToken.None); // consume the permit
+
+        using var cts = new CancellationTokenSource();
+        var canceled = semaphore.WaitAsync(ResolutionPriority.FirstScreenful, cts.Token);
+        var live = semaphore.WaitAsync(ResolutionPriority.FirstScreenful, CancellationToken.None);
+        cts.Cancel();
+        Assert.True(canceled.IsCanceled);
+
+        semaphore.Release();
+
+        Assert.True(live.IsCompletedSuccessfully);
+        Assert.Equal(0, semaphore.CurrentCount); // permit transferred to the live waiter, not lost
+    }
+
+    [Fact]
+    public void Release_SkipsManyCanceledHighs_AndServesLiveLow()
+    {
+        var semaphore = new PrioritySemaphore(1);
+        semaphore.WaitAsync(ResolutionPriority.Bulk, CancellationToken.None); // consume the permit
+
+        using var cts = new CancellationTokenSource();
+        var canceledHighs = new List<Task>();
+        for (int i = 0; i < 3; i++)
+        {
+            canceledHighs.Add(semaphore.WaitAsync(ResolutionPriority.FirstScreenful, cts.Token));
+        }
+
+        var liveLow = semaphore.WaitAsync(ResolutionPriority.Bulk, CancellationToken.None);
+        cts.Cancel();
+        Assert.All(canceledHighs, high => Assert.True(high.IsCanceled));
+
+        semaphore.Release(); // skip the canceled highs, then serve the live low
+
+        Assert.True(liveLow.IsCompletedSuccessfully);
+        Assert.Equal(0, semaphore.CurrentCount);
+    }
+
+    [Fact]
+    public void Release_WithNoWaiters_RestoresPermit()
+    {
+        var semaphore = new PrioritySemaphore(1);
+        semaphore.WaitAsync(ResolutionPriority.Bulk, CancellationToken.None);
+        Assert.Equal(0, semaphore.CurrentCount);
+
+        semaphore.Release();
+        Assert.Equal(1, semaphore.CurrentCount);
+
+        Assert.True(semaphore.WaitAsync(ResolutionPriority.Bulk, CancellationToken.None).IsCompletedSuccessfully);
+    }
+
+    [Fact]
+    public async Task Stress_ConcurrentAcquireReleaseWithCancellation_NeverOverGrantsAndConservesPermits()
+    {
+        const int permits = 4;
+        var semaphore = new PrioritySemaphore(permits);
+        int concurrentlyHeld = 0;
+        int maxObserved = 0;
+
+        async Task Worker(int seed)
+        {
+            var seededRandom = new Random(seed);
+
+            for (int i = 0; i < 2000; i++)
+            {
+                var priority = seededRandom.Next(2) == 0 ? ResolutionPriority.FirstScreenful : ResolutionPriority.Bulk;
+                using var cts = new CancellationTokenSource();
+
+                if (seededRandom.Next(5) == 0) { cts.CancelAfter(TimeSpan.FromMilliseconds(seededRandom.Next(3))); }
+
+                try { await semaphore.WaitAsync(priority, cts.Token); }
+                catch (OperationCanceledException) { continue; }
+
+                try
+                {
+                    int held = Interlocked.Increment(ref concurrentlyHeld);
+                    int observed;
+                    while (held > (observed = Volatile.Read(ref maxObserved)) &&
+                        Interlocked.CompareExchange(ref maxObserved, held, observed) != observed) { }
+
+                    await Task.Yield();
+                    Interlocked.Decrement(ref concurrentlyHeld);
+                }
+                finally { semaphore.Release(); }
+            }
+        }
+
+        await Task.WhenAll(Enumerable.Range(0, 8).Select(seed => Task.Run(() => Worker(seed))));
+
+        Assert.True(maxObserved <= permits, $"concurrent grants {maxObserved} exceeded permits {permits}");
+        Assert.Equal(permits, semaphore.CurrentCount); // no permit leaked at quiescence
+    }
+
+    [Fact]
+    public async Task WaitAsync_WhenPermitsAvailable_CompletesSynchronouslyAndTracksCount()
+    {
+        var semaphore = new PrioritySemaphore(2);
+        Assert.Equal(2, semaphore.CurrentCount);
+
+        var first = semaphore.WaitAsync(ResolutionPriority.Bulk, CancellationToken.None);
+        Assert.True(first.IsCompletedSuccessfully);
+        Assert.Equal(1, semaphore.CurrentCount);
+
+        await semaphore.WaitAsync(ResolutionPriority.FirstScreenful, CancellationToken.None);
+        Assert.Equal(0, semaphore.CurrentCount);
+
+        semaphore.Release();
+        semaphore.Release();
+        Assert.Equal(2, semaphore.CurrentCount);
+    }
+}

From 095017df51de1ec84b0a60a4d315a0df99c30afd Mon Sep 17 00:00:00 2001
From: jschick04 <jschick04@gmail.com>
Date: Sat, 20 Jun 2026 16:44:24 -0500
Subject: [PATCH 33/40] Enable Server GC for faster parallel event resolution

---
 src/EventLogExpert/EventLogExpert.csproj | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/EventLogExpert/EventLogExpert.csproj b/src/EventLogExpert/EventLogExpert.csproj
index 2f61bcc82..fb0f0bf89 100644
--- a/src/EventLogExpert/EventLogExpert.csproj
+++ b/src/EventLogExpert/EventLogExpert.csproj
@@ -34,6 +34,8 @@
     <PropertyGroup Condition="$(TargetFramework.Contains('-windows'))">
         <DefineConstants>$(DefineConstants);DISABLE_XAML_GENERATED_MAIN</DefineConstants>
         <ApplicationManifest>app.manifest</ApplicationManifest>
+        <!-- Server GC: the parallel event-resolve path negative-scales under the default Workstation GC. Windows-only (per-core heaps are wrong for mobile). -->
+        <ServerGarbageCollection>true</ServerGarbageCollection>
     </PropertyGroup>
 
     <ItemGroup>

From d3a2cae0114e353380e59892d860bff2b412a6bb Mon Sep 17 00:00:00 2001
From: jschick04 <jschick04@gmail.com>
Date: Sat, 20 Jun 2026 17:44:11 -0500
Subject: [PATCH 34/40] Read event batches of 256 and release handles on a
 failed read

---
 .../Readers/EventLogReader.cs                 | 30 ++++++++++++++-----
 .../EventLog/OpenLogEffects.cs                |  5 +++-
 2 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/src/EventLogExpert.Eventing/Readers/EventLogReader.cs b/src/EventLogExpert.Eventing/Readers/EventLogReader.cs
index 410f3d425..72a64f8f2 100644
--- a/src/EventLogExpert.Eventing/Readers/EventLogReader.cs
+++ b/src/EventLogExpert.Eventing/Readers/EventLogReader.cs
@@ -77,7 +77,10 @@ public void Dispose()
     // With a maximum event size of 64 KB, the maximum batchSize that won't exceed the maximum buffer
     // size is 30 (32 minus some overhead; refer to MS-EVEN6 for details).
     // Windows 11 and later will stop filling out the buffer when the maximum size is reached, regardless
-    // of whether the requested batchSize was reached (but it will not exceed the requested count).
+    // of whether the requested batchSize was reached (but it will not exceed the requested count). The 30
+    // ceiling is a pre-Windows 11 constraint; on supported Windows 11+ deployments a larger batchSize is
+    // safe and faster (EvtNext just returns fewer when the 2 MB buffer fills first), so the log-load path
+    // requests more.
     public bool TryGetEvents(out EventRecord[] events, int batchSize = 30)
     {
         var buffer = ArrayPool<IntPtr>.Shared.Rent(batchSize);
@@ -97,18 +100,29 @@ public bool TryGetEvents(out EventRecord[] events, int batchSize = 30)
 
             LastErrorCode = null;
 
-            using (_eventLock.EnterScope())
+            try
             {
-                LastBookmark = CreateBookmark(new EvtHandle(buffer[count - 1], false));
-
-                if (reverseDirection && !_newestCaptured)
+                using (_eventLock.EnterScope())
                 {
-                    _newestReverseBookmark = CreateBookmark(new EvtHandle(buffer[0], false));
-                    _newestCaptured = true;
+                    LastBookmark = CreateBookmark(new EvtHandle(buffer[count - 1], false));
+
+                    if (reverseDirection && !_newestCaptured)
+                    {
+                        _newestReverseBookmark = CreateBookmark(new EvtHandle(buffer[0], false));
+                        _newestCaptured = true;
+                    }
                 }
+
+                events = new EventRecord[count];
             }
+            catch
+            {
+                // Bookmark capture (or the result allocation) threw before the render loop disposed the
+                // batch handles; close them here so a failed read never leaks up to batchSize native event handles.
+                for (int i = 0; i < count; i++) { new EvtHandle(buffer[i]).Dispose(); }
 
-            events = new EventRecord[count];
+                throw;
+            }
 
             for (int i = 0; i < count; i++)
             {
diff --git a/src/EventLogExpert.Runtime/EventLog/OpenLogEffects.cs b/src/EventLogExpert.Runtime/EventLog/OpenLogEffects.cs
index ed7d8fd8f..33b62cc00 100644
--- a/src/EventLogExpert.Runtime/EventLog/OpenLogEffects.cs
+++ b/src/EventLogExpert.Runtime/EventLog/OpenLogEffects.cs
@@ -42,6 +42,9 @@ internal sealed class OpenLogEffects(
     // render in ~1s instead of waiting for the 3-second partial timer.
     private const int EagerFirstPaintThreshold = 200;
 
+    // EvtNext batch: benchmarked Win11 throughput sweet spot; 512 regresses.
+    private const int ReadBatchSize = 256;
+
     private static readonly int s_maxGlobalConcurrency = Math.Max(1, Environment.ProcessorCount - 1);
     private static readonly PrioritySemaphore s_resolutionGate = new(s_maxGlobalConcurrency);
 
@@ -332,7 +335,7 @@ private async Task LoadLogAsync(
         {
             try
             {
-                while (reader.TryGetEvents(out EventRecord[] batch))
+                while (reader.TryGetEvents(out EventRecord[] batch, ReadBatchSize))
                 {
                     token.ThrowIfCancellationRequested();
 

From 1cd32f522ddff0614df20e4eac714a9160180937 Mon Sep 17 00:00:00 2001
From: jschick04 <jschick04@gmail.com>
Date: Sat, 20 Jun 2026 20:13:23 -0500
Subject: [PATCH 35/40] Store provider messages compactly to cut resolver
 memory

---
 .../Resolution/CompactMessageStore.cs         | 156 ++++++++++++++++++
 .../Resolution/ProviderDetails.cs             |  81 ++-------
 .../Resolution/ProviderDetailsTests.cs        |  63 +++++++
 3 files changed, 237 insertions(+), 63 deletions(-)
 create mode 100644 src/EventLogExpert.Provider/Resolution/CompactMessageStore.cs

diff --git a/src/EventLogExpert.Provider/Resolution/CompactMessageStore.cs b/src/EventLogExpert.Provider/Resolution/CompactMessageStore.cs
new file mode 100644
index 000000000..e70bf8165
--- /dev/null
+++ b/src/EventLogExpert.Provider/Resolution/CompactMessageStore.cs
@@ -0,0 +1,156 @@
+// // Copyright (c) Microsoft Corporation.
+// // Licensed under the MIT License.
+
+using System.Collections;
+using System.Collections.Concurrent;
+
+namespace EventLogExpert.Provider.Resolution;
+
+internal sealed class CompactMessageStore
+{
+    private static readonly IReadOnlyList<MessageModel> s_empty = [];
+
+    private readonly ConcurrentDictionary<int, IReadOnlyList<MessageModel>> _byShortIdCache = new();
+    private readonly MessageEntry[] _entries;
+    private readonly Lazy<Dictionary<long, int>> _firstIndexByRawId;
+    private readonly string _providerName;
+    private readonly IReadOnlyDictionary<int, MessageModel>? _rareByIndex;
+    private readonly ConcurrentDictionary<long, MessageModel?> _rawIdCache = new();
+    private readonly int[] _sortedByShortId;
+
+    private CompactMessageStore(
+        MessageEntry[] entries,
+        int[] sortedByShortId,
+        IReadOnlyDictionary<int, MessageModel>? rareByIndex,
+        string providerName)
+    {
+        _entries = entries;
+        _sortedByShortId = sortedByShortId;
+        _rareByIndex = rareByIndex;
+        _providerName = providerName;
+        _firstIndexByRawId = new Lazy<Dictionary<long, int>>(BuildRawIdLookup);
+    }
+
+    public int Count => _entries.Length;
+
+    public static CompactMessageStore Build(IReadOnlyList<MessageModel> messages)
+    {
+        int count = messages.Count;
+        var entries = new MessageEntry[count];
+        Dictionary<int, MessageModel>? rare = null;
+        string providerName = count > 0 ? messages[0].ProviderName : string.Empty;
+
+        for (int i = 0; i < count; i++)
+        {
+            var m = messages[i];
+            entries[i] = new MessageEntry(m.ShortId, m.RawId, m.Text);
+
+            // An entry is "rare" when materializing it from (ShortId, RawId, Text) + the shared provider name would
+            // not reproduce the original byte-for-byte: any non-null LogLink/Tag/Template, or a differing ProviderName.
+            if (m.LogLink is not null ||
+                m.Tag is not null ||
+                m.Template is not null ||
+                !string.Equals(m.ProviderName, providerName, StringComparison.Ordinal))
+            {
+                (rare ??= [])[i] = m;
+            }
+        }
+
+        // Stable sort of indices by unsigned ShortId; ties keep ascending original ordinal so the per-ShortId run
+        // preserves insertion order (load-bearing for legacy-message disambiguation).
+        var sorted = new int[count];
+        for (int i = 0; i < count; i++) { sorted[i] = i; }
+        Array.Sort(sorted, (a, b) =>
+        {
+            int ka = (ushort)entries[a].ShortId, kb = (ushort)entries[b].ShortId;
+            return ka != kb ? ka.CompareTo(kb) : a.CompareTo(b);
+        });
+
+        return new CompactMessageStore(entries, sorted, rare, providerName);
+    }
+
+    public IReadOnlyList<MessageModel> AsView() => new MessageView(this);
+
+    public MessageModel? GetByRawIdFirst(long rawId) =>
+        _rawIdCache.GetOrAdd(rawId, static (id, store) => store.MaterializeByRawId(id), this);
+
+    public IReadOnlyList<MessageModel> GetByShortId(int shortId) =>
+        // The arg is NOT cast to ushort: a >65535 arg must not wrap and false-match (matches the prior
+        // Dictionary keyed by (ushort)ShortId and looked up by the raw int id).
+        _byShortIdCache.GetOrAdd(shortId, static (id, store) => store.MaterializeByShortId(id), this);
+
+    private Dictionary<long, int> BuildRawIdLookup()
+    {
+        var lookup = new Dictionary<long, int>(_entries.Length);
+
+        for (int i = 0; i < _entries.Length; i++) { lookup.TryAdd(_entries[i].RawId, i); }
+
+        return lookup;
+    }
+
+    private int LowerBound(int key)
+    {
+        int lo = 0, hi = _sortedByShortId.Length;
+
+        while (lo < hi)
+        {
+            int mid = lo + ((hi - lo) >> 1);
+
+            if ((ushort)_entries[_sortedByShortId[mid]].ShortId < key) { lo = mid + 1; }
+            else { hi = mid; }
+        }
+
+        return lo;
+    }
+
+    private MessageModel Materialize(int index)
+    {
+        if (_rareByIndex is not null && _rareByIndex.TryGetValue(index, out var full)) { return full; }
+
+        var entry = _entries[index];
+
+        return new MessageModel
+        {
+            Text = entry.Text,
+            ShortId = entry.ShortId,
+            ProviderName = _providerName,
+            RawId = entry.RawId
+        };
+    }
+
+    private MessageModel? MaterializeByRawId(long rawId) =>
+        _firstIndexByRawId.Value.TryGetValue(rawId, out int index) ? Materialize(index) : null;
+
+    private IReadOnlyList<MessageModel> MaterializeByShortId(int key)
+    {
+        // The sorted index groups all entries with a given unsigned ShortId contiguously; binary-search the run.
+        int lo = LowerBound(key);
+
+        if (lo == _sortedByShortId.Length || (ushort)_entries[_sortedByShortId[lo]].ShortId != key) { return s_empty; }
+
+        var result = new List<MessageModel>();
+
+        for (int i = lo; i < _sortedByShortId.Length && (ushort)_entries[_sortedByShortId[i]].ShortId == key; i++)
+        {
+            result.Add(Materialize(_sortedByShortId[i]));
+        }
+
+        return result;
+    }
+
+    private sealed class MessageView(CompactMessageStore store) : IReadOnlyList<MessageModel>
+    {
+        public int Count => store._entries.Length;
+
+        public MessageModel this[int index] => store.Materialize(index);
+
+        public IEnumerator<MessageModel> GetEnumerator()
+        {
+            for (int i = 0; i < store._entries.Length; i++) { yield return store.Materialize(i); }
+        }
+
+        IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
+    }
+
+    internal readonly record struct MessageEntry(short ShortId, long RawId, string Text);
+}
diff --git a/src/EventLogExpert.Provider/Resolution/ProviderDetails.cs b/src/EventLogExpert.Provider/Resolution/ProviderDetails.cs
index 9a23a2397..eec577d39 100644
--- a/src/EventLogExpert.Provider/Resolution/ProviderDetails.cs
+++ b/src/EventLogExpert.Provider/Resolution/ProviderDetails.cs
@@ -7,10 +7,10 @@ public sealed class ProviderDetails
 {
     private IReadOnlyList<EventModel> _events = [];
     private Dictionary<long, List<EventModel>>? _eventsByIdLookup;
-    private IReadOnlyList<MessageModel> _messages = [];
-    private Dictionary<int, List<MessageModel>>? _messagesByShortIdLookup;
-    private IReadOnlyList<MessageModel> _parameters = [];
-    private Dictionary<long, MessageModel>? _parametersByRawIdLookup;
+    private CompactMessageStore? _messageStore;
+    private IReadOnlyList<MessageModel>? _messagesView;
+    private CompactMessageStore? _parameterStore;
+    private IReadOnlyList<MessageModel>? _parametersView;
 
     /// <summary>Events and related items from modern provider</summary>
     public IReadOnlyList<EventModel> Events
@@ -25,36 +25,34 @@ public IReadOnlyList<EventModel> Events
 
     public bool IsEmpty =>
         Events.Count == 0 &&
-        Messages.Count == 0 &&
+        (_messageStore?.Count ?? 0) == 0 &&
         Keywords.Count == 0 &&
         Opcodes.Count == 0 &&
         Tasks.Count == 0 &&
-        Parameters.Count == 0 &&
+        (_parameterStore?.Count ?? 0) == 0 &&
         ResolvedFromOwningPublisher is null;
 
     public IDictionary<long, string> Keywords { get; set; } = new Dictionary<long, string>();
 
-    /// <summary>Messages from legacy provider</summary>
     public IReadOnlyList<MessageModel> Messages
     {
-        get => _messages;
+        get => _messagesView ?? [];
         set
         {
-            _messages = value;
-            _messagesByShortIdLookup = null;
+            _messageStore = CompactMessageStore.Build(value);
+            _messagesView = _messageStore.AsView();
         }
     }
 
     public IDictionary<int, string> Opcodes { get; set; } = new Dictionary<int, string>();
 
-    /// <summary>Parameter strings from legacy provider</summary>
     public IReadOnlyList<MessageModel> Parameters
     {
-        get => _parameters;
+        get => _parametersView ?? [];
         set
         {
-            _parameters = value;
-            _parametersByRawIdLookup = null;
+            _parameterStore = CompactMessageStore.Build(value);
+            _parametersView = _parameterStore.AsView();
         }
     }
 
@@ -73,26 +71,17 @@ public IReadOnlyList<EventModel> GetEventsById(long id)
     }
 
     /// <summary>
-    ///     Gets messages matching the given ShortId using a pre-built lookup dictionary. The lookup uses int keys derived
-    ///     from unsigned reinterpretation of ShortId, matching the implicit ushort-to-int promotion used by callers.
+    ///     Gets messages matching the given ShortId (compared as unsigned, matching the implicit ushort-to-int promotion
+    ///     used by callers). Materialized on demand from the compact store and cached.
     /// </summary>
-    public IReadOnlyList<MessageModel> GetMessagesByShortId(int shortId)
-    {
-        _messagesByShortIdLookup ??= BuildMessagesByShortIdLookup();
-
-        return _messagesByShortIdLookup.TryGetValue(shortId, out var list) ? list : [];
-    }
+    public IReadOnlyList<MessageModel> GetMessagesByShortId(int shortId) =>
+        _messageStore?.GetByShortId(shortId) ?? [];
 
     /// <summary>
     ///     Gets the first parameter message with the given RawId, or null when none matches. Duplicate RawIds resolve
-    ///     first-wins.
+    ///     first-wins. Materialized on demand from the compact store and cached.
     /// </summary>
-    public MessageModel? GetParameterByRawId(long rawId)
-    {
-        _parametersByRawIdLookup ??= BuildParametersByRawIdLookup();
-
-        return _parametersByRawIdLookup.GetValueOrDefault(rawId);
-    }
+    public MessageModel? GetParameterByRawId(long rawId) => _parameterStore?.GetByRawIdFirst(rawId);
 
     private Dictionary<long, List<EventModel>> BuildEventsByIdLookup()
     {
@@ -111,38 +100,4 @@ private Dictionary<long, List<EventModel>> BuildEventsByIdLookup()
 
         return lookup;
     }
-
-    private Dictionary<int, List<MessageModel>> BuildMessagesByShortIdLookup()
-    {
-        var lookup = new Dictionary<int, List<MessageModel>>();
-
-        foreach (var m in _messages)
-        {
-            // Reinterpret ShortId as unsigned to match ushort-to-int promotion
-            // used by callers (EventRecord.Id and Task are ushort).
-            int key = (ushort)m.ShortId;
-
-            if (!lookup.TryGetValue(key, out var list))
-            {
-                list = [];
-                lookup[key] = list;
-            }
-
-            list.Add(m);
-        }
-
-        return lookup;
-    }
-
-    private Dictionary<long, MessageModel> BuildParametersByRawIdLookup()
-    {
-        var lookup = new Dictionary<long, MessageModel>(_parameters.Count);
-
-        foreach (var p in _parameters)
-        {
-            lookup.TryAdd(p.RawId, p);
-        }
-
-        return lookup;
-    }
 }
diff --git a/tests/Unit/EventLogExpert.Provider.Tests/Resolution/ProviderDetailsTests.cs b/tests/Unit/EventLogExpert.Provider.Tests/Resolution/ProviderDetailsTests.cs
index 15ee18672..93ba9570d 100644
--- a/tests/Unit/EventLogExpert.Provider.Tests/Resolution/ProviderDetailsTests.cs
+++ b/tests/Unit/EventLogExpert.Provider.Tests/Resolution/ProviderDetailsTests.cs
@@ -100,6 +100,45 @@ public void GetMessagesByShortId_WhenIdDoesNotExist_ReturnsEmptyList()
         Assert.Empty(result);
     }
 
+    [Fact]
+    public void GetMessagesByShortId_WhenMessageHasRareFields_PreservesThemByteIdentical()
+    {
+        // Arrange
+        var details = EventUtils.CreateProvider(
+            Constants.TestProviderLongName,
+            [new MessageModel { ShortId = 9, RawId = 9, Text = "rare", LogLink = "System", Tag = "t", Template = "<tmpl/>" }]);
+
+        // Act
+        var message = Assert.Single(details.GetMessagesByShortId(9));
+
+        // Assert
+        Assert.Equal("rare", message.Text);
+        Assert.Equal("System", message.LogLink);
+        Assert.Equal("t", message.Tag);
+        Assert.Equal("<tmpl/>", message.Template);
+        Assert.Equal(9, message.RawId);
+    }
+
+    [Fact]
+    public void GetMessagesByShortId_WhenMultipleShareShortId_PreservesOriginalOrder()
+    {
+        // Arrange
+        var details = EventUtils.CreateProvider(
+            Constants.TestProviderLongName,
+            [
+                new MessageModel { ShortId = 7, RawId = 0x00010007, Text = "first" },
+                new MessageModel { ShortId = 7, RawId = 0x00020007, Text = "second" },
+                new MessageModel { ShortId = 7, RawId = 0x00030007, Text = "third" }
+            ]);
+
+        // Act
+        var result = details.GetMessagesByShortId(7);
+
+        // Assert
+        Assert.Equal(["first", "second", "third"], result.Select(m => m.Text));
+        Assert.Equal([0x00010007, 0x00020007, 0x00030007], result.Select(m => m.RawId));
+    }
+
     [Fact]
     public void GetMessagesByShortId_WhenNegativeShortId_MatchesViaUnsignedPromotion()
     {
@@ -248,6 +287,30 @@ public void IsEmpty_WhenTasksPopulated_ReturnsFalse()
         Assert.False(details.IsEmpty);
     }
 
+    [Fact]
+    public void Messages_ViewEnumeration_PreservesEveryFieldForCommonAndRareEntries()
+    {
+        // Arrange
+        var details = EventUtils.CreateProvider(
+            Constants.TestProviderLongName,
+            [
+                new MessageModel { ShortId = 1, RawId = 1, Text = "common", ProviderName = Constants.TestProviderLongName },
+                new MessageModel { ShortId = 2, RawId = 2, Text = "rare", LogLink = "Application", Tag = "x", ProviderName = Constants.TestProviderLongName }
+            ]);
+
+        // Act
+        var all = details.Messages.ToList();
+
+        // Assert
+        Assert.Equal(2, details.Messages.Count);
+        Assert.Equal("common", all[0].Text);
+        Assert.Null(all[0].LogLink);
+        Assert.Equal(Constants.TestProviderLongName, all[0].ProviderName);
+        Assert.Equal("rare", all[1].Text);
+        Assert.Equal("Application", all[1].LogLink);
+        Assert.Equal("x", all[1].Tag);
+    }
+
     [Fact]
     public void MessagesSetter_InvalidatesCachedLookup()
     {

From 19fd77c6c339f95b6a3414a6bfcb4a574020f372 Mon Sep 17 00:00:00 2001
From: jschick04 <jschick04@gmail.com>
Date: Sun, 21 Jun 2026 00:16:55 -0500
Subject: [PATCH 36/40] Load provider message-table entries on demand to cut
 resolver memory

---
 .../Interop/NativeMethods.cs                  |   3 +
 .../PublisherMetadata/EventMessageProvider.cs | 269 +++-------------
 .../LegacyMessageFileSource.cs                | 102 ++++++
 .../PublisherMetadata/MessageTableReader.cs   | 293 ++++++++++++++++++
 .../Resolution/CompactMessageStore.cs         |   4 +-
 .../Resolution/ILazyMessageSource.cs          |  17 +
 .../Resolution/ProviderDetails.cs             |  20 +-
 .../MessageTableReaderTests.cs                | 200 ++++++++++++
 8 files changed, 682 insertions(+), 226 deletions(-)
 create mode 100644 src/EventLogExpert.Eventing/PublisherMetadata/LegacyMessageFileSource.cs
 create mode 100644 src/EventLogExpert.Eventing/PublisherMetadata/MessageTableReader.cs
 create mode 100644 src/EventLogExpert.Provider/Resolution/ILazyMessageSource.cs
 create mode 100644 tests/Unit/EventLogExpert.Eventing.Tests/PublisherMetadata/MessageTableReaderTests.cs

diff --git a/src/EventLogExpert.Eventing/Interop/NativeMethods.cs b/src/EventLogExpert.Eventing/Interop/NativeMethods.cs
index ddcde71ca..cdd674dd9 100644
--- a/src/EventLogExpert.Eventing/Interop/NativeMethods.cs
+++ b/src/EventLogExpert.Eventing/Interop/NativeMethods.cs
@@ -115,6 +115,9 @@ internal static partial LibraryHandle LoadLibraryExW(
     [LibraryImport(Kernel32Api)]
     internal static partial IntPtr LockResource(IntPtr hResData);
 
+    [LibraryImport(Kernel32Api, SetLastError = true)]
+    internal static partial uint SizeofResource(LibraryHandle hModule, IntPtr hResInfo);
+
     private static string? FormatMessageFromModule(IntPtr moduleHandle, uint messageId) =>
         FormatMessageWithRetry(
             FORMAT_MESSAGE_FROM_HMODULE | FORMAT_MESSAGE_IGNORE_INSERTS,
diff --git a/src/EventLogExpert.Eventing/PublisherMetadata/EventMessageProvider.cs b/src/EventLogExpert.Eventing/PublisherMetadata/EventMessageProvider.cs
index fbc9ce2e0..5ba74a26c 100644
--- a/src/EventLogExpert.Eventing/PublisherMetadata/EventMessageProvider.cs
+++ b/src/EventLogExpert.Eventing/PublisherMetadata/EventMessageProvider.cs
@@ -39,197 +39,40 @@ internal static List<MessageModel> LoadMessagesFromFiles(
 
         foreach (var file in legacyProviderFiles)
         {
-            using LibraryHandle hModule = LoadMessageModule(file, logger);
+            if (!MessageTableReader.TryOpen(file, logger, out var handle, out nint memTable, out uint size)) { continue; }
 
-            if (hModule.IsInvalid)
-            {
-                continue;
-            }
-
-            // FindResourceEx returns an HRSRC that points into the already-loaded module's
-            // resource section. It is owned by the module handle and must NOT be FreeLibrary'd.
-            IntPtr msgTableInfo = NativeMethods.FindResourceExA(hModule, NativeMethods.RT_MESSAGETABLE, 1);
-            int error = Marshal.GetLastWin32Error();
-
-            if (msgTableInfo == IntPtr.Zero)
-            {
-                logger?.Debug(
-                    $"No message table found. Returning 0 messages from file:\n{file}\nFindResourceEx error: {error} ({NativeMethods.FormatSystemMessage((uint)error) ?? "unknown"}). Error 1813 (ERROR_RESOURCE_TYPE_NOT_FOUND) commonly means the message table lives in a localized .mui satellite the loader could not locate, but it can also indicate a missing message table, a non-default resource id, or an unavailable language fallback.");
-
-                continue;
-            }
-
-            var msgTable = NativeMethods.LoadResource(hModule, msgTableInfo);
-            int loadResourceError = Marshal.GetLastWin32Error();
-
-            if (msgTable == IntPtr.Zero)
-            {
-                logger?.Debug(
-                    $"LoadResource returned NULL for message table in file:\n{file}\nError: {loadResourceError} ({NativeMethods.FormatSystemMessage((uint)loadResourceError) ?? "unknown"}).");
-
-                continue;
-            }
-
-            var memTable = NativeMethods.LockResource(msgTable);
-
-            if (memTable == IntPtr.Zero)
-            {
-                logger?.Debug($"LockResource returned NULL for message table in file:\n{file}");
-
-                continue;
-            }
-
-            var numberOfBlocks = Marshal.ReadInt32(memTable);
-            var blockPtr = IntPtr.Add(memTable, 4);
-            var blockSize = Marshal.SizeOf<MessageResourceBlock>();
-
-            for (var i = 0; i < numberOfBlocks; i++)
-            {
-                var block = Marshal.PtrToStructure<MessageResourceBlock>(blockPtr);
-                var entryPtr = IntPtr.Add(memTable, block.OffsetToEntries);
-
-                for (var id = block.LowId; id <= block.HighId; id++)
-                {
-                    var length = Marshal.ReadInt16(entryPtr);
-                    var flags = Marshal.ReadInt16(entryPtr, 2);
-                    var textPtr = IntPtr.Add(entryPtr, 4);
-
-                    string? text = flags switch
-                    {
-                        0 => Marshal.PtrToStringAnsi(textPtr),
-                        1 => Marshal.PtrToStringUni(textPtr),
-                        2 => Marshal.PtrToStringAnsi(textPtr),
-                        // All the ESE messages are a single-byte character set
-                        // but have flags of 2, which is not defined. So just
-                        // treat it as ANSI I guess?
-                        _ => "Error: Bad flags. Could not get text.",
-                    };
-
-                    // This is an event
-                    messages.Add(new MessageModel
-                    {
-                        Text = text ?? string.Empty,
-                        ShortId = (short)id,
-                        ProviderName = providerName,
-                        RawId = id
-                    });
-
-                    // Advance to the next id
-                    entryPtr = IntPtr.Add(entryPtr, length);
-                }
-
-                // Advance to the next block
-                blockPtr = IntPtr.Add(blockPtr, blockSize);
-            }
+            try { MessageTableReader.AppendMatches(memTable, size, providerName, -1, messages); }
+            finally { handle.Dispose(); }
         }
 
         return messages;
     }
 
-    /// <summary>
-    ///     Loads a message-resource module using flags that honor MUI satellite resolution, with fallbacks for older
-    ///     binaries and unresolved paths. Returns an invalid handle on failure (the caller is expected to skip).
-    /// </summary>
-    /// <remarks>
-    ///     <para>
-    ///         <c>LOAD_LIBRARY_AS_DATAFILE</c> alone does NOT trigger MUI satellite loading. Modern Windows binaries (e.g.,
-    ///         DriverStore-installed services, in-box system EXEs/DLLs) keep their <c>RT_MESSAGETABLE</c> resources in
-    ///         <c>&lt;binary&gt;.mui</c> files under language subfolders rather than in the binary itself. <c>FindResource</c>
-    ///         on a module loaded with only <c>LOAD_LIBRARY_AS_DATAFILE</c> then returns 1813 (
-    ///         <c>ERROR_RESOURCE_TYPE_NOT_FOUND</c>). Combining <c>LOAD_LIBRARY_AS_IMAGE_RESOURCE</c> with
-    ///         <c>LOAD_LIBRARY_AS_DATAFILE_EXCLUSIVE</c> causes the loader to follow the MUI fallback chain — the same path
-    ///         <c>EvtFormatMessage</c> (and Event Viewer MMC) uses.
-    ///     </para>
-    /// </remarks>
-    private static LibraryHandle LoadMessageModule(string file, ITraceLogger? logger)
+    private LegacyMessageFileSource? BuildLazySource(IReadOnlyList<string> files)
     {
-        // LoadLibraryEx does not expand environment variables. Publisher manifests typically
-        // store paths like %SystemRoot%\System32\foo.dll, so normalize at the loader as the
-        // last chokepoint before the P/Invoke. Idempotent on already-expanded paths.
-        file = Environment.ExpandEnvironmentVariables(file);
-
-        // Primary attempt: MUI-aware load using the path as given. Mirrors EvtFormatMessage behavior.
-        const LoadLibraryFlags MuiAwareFlags =
-            LoadLibraryFlags.LOAD_LIBRARY_AS_IMAGE_RESOURCE |
-            LoadLibraryFlags.LOAD_LIBRARY_AS_DATAFILE_EXCLUSIVE;
+        if (files.Count == 0) { return null; }
 
-        var hModule = NativeMethods.LoadLibraryExW(file, IntPtr.Zero, MuiAwareFlags);
-        int error = Marshal.GetLastWin32Error();
+        var walkable = new List<string>();
+        int total = 0;
 
-        if (!hModule.IsInvalid)
+        foreach (var file in files)
         {
-            logger?.Debug(
-                $"LoadLibraryEx succeeded for {file} with flags LOAD_LIBRARY_AS_IMAGE_RESOURCE | LOAD_LIBRARY_AS_DATAFILE_EXCLUSIVE.");
+            if (!MessageTableReader.TryOpen(file, _logger, out var handle, out nint memTable, out uint size)) { continue; }
 
-            return hModule;
-        }
-
-        hModule.Dispose();
-
-        var primaryFailureMessage =
-            $"LoadLibraryEx failed for {file} with flags LOAD_LIBRARY_AS_IMAGE_RESOURCE | LOAD_LIBRARY_AS_DATAFILE_EXCLUSIVE. Error: {error} ({NativeMethods.FormatSystemMessage((uint)error) ?? "unknown"}).";
-
-        // Legacy fallback: re-attempt the load using the leaf filename only, resolved under the
-        // trusted system directory. Restrict this to inputs that are already pure leaf filenames
-        // (no directory information of any kind). Both rooted inputs (e.g., "C:\foo.dll",
-        // "C:foo.dll", "\Windows\foo.dll") and unrooted inputs that include a subdirectory
-        // (e.g., "subdir\foo.dll") would have their directory portion stripped here and the bare
-        // leaf name resolved against the default DLL search order, which could load a different
-        // same-named binary and produce wrong message text. Path.IsPathRooted alone does NOT
-        // catch the "subdir\foo.dll" case, so compare against Path.GetFileName instead.
-        if (!string.Equals(file, Path.GetFileName(file), StringComparison.Ordinal))
-        {
-            logger?.Debug($"{primaryFailureMessage} Skipping leaf-name fallback because the input contains directory information.");
-
-            return LibraryHandle.Zero;
-        }
-
-        var leafName = Path.GetFileName(file);
-
-        if (string.IsNullOrEmpty(leafName))
-        {
-            logger?.Debug($"{primaryFailureMessage} Skipping leaf-name fallback because no leaf filename could be extracted.");
-
-            return LibraryHandle.Zero;
-        }
-
-        // Constrain leaf-name resolution to the trusted system directory. Letting LoadLibraryEx
-        // resolve a bare leaf name through the default DLL search order would search the
-        // application directory first, which is a DLL planting / hijacking risk and could load
-        // a same-named binary with bogus message text. Historically this fallback existed for
-        // legacy registry values that named system binaries by leaf only (e.g., "wevtsvc.dll");
-        // pinning resolution to %SystemRoot%\System32 preserves that behavior safely.
-        var systemPath = Path.Combine(Environment.SystemDirectory, leafName);
-
-        if (!File.Exists(systemPath))
-        {
-            logger?.Debug(
-                $"{primaryFailureMessage} Skipping leaf-name fallback because '{leafName}' does not exist under {Environment.SystemDirectory}.");
-
-            return LibraryHandle.Zero;
-        }
-
-        logger?.Debug(
-            $"{primaryFailureMessage} Falling back to leaf-name resolution against the system directory: {systemPath}.");
-
-        hModule = NativeMethods.LoadLibraryExW(systemPath, IntPtr.Zero, MuiAwareFlags);
-
-        error = Marshal.GetLastWin32Error();
-
-        if (!hModule.IsInvalid)
-        {
-            logger?.Debug(
-                $"LoadLibraryEx succeeded for {systemPath} (leaf-name fallback) with flags LOAD_LIBRARY_AS_IMAGE_RESOURCE | LOAD_LIBRARY_AS_DATAFILE_EXCLUSIVE.");
+            try
+            {
+                int count = MessageTableReader.CountEntries(memTable, size);
 
-            return hModule;
+                if (count > 0)
+                {
+                    walkable.Add(file);
+                    total += count;
+                }
+            }
+            finally { handle.Dispose(); }
         }
 
-        hModule.Dispose();
-
-        logger?.Debug(
-            $"LoadLibraryEx failed for {systemPath} (leaf-name fallback) with flags LOAD_LIBRARY_AS_IMAGE_RESOURCE | LOAD_LIBRARY_AS_DATAFILE_EXCLUSIVE. Error: {error} ({NativeMethods.FormatSystemMessage((uint)error) ?? "unknown"}). Original requested file was: {file}.");
-
-        return LibraryHandle.Zero;
+        return total > 0 ? new LegacyMessageFileSource(walkable, _providerName, total, _logger) : null;
     }
 
     /// <summary>
@@ -320,48 +163,25 @@ private ProviderDetails LoadProviderDetailsCore(HashSet<string>? visited)
 
         var legacyProviderFiles = _registryProvider.GetMessageFilesForLegacyProvider(_providerName);
 
-        if (legacyProviderFiles.Count > 0 &&
-            TryLoadMessages(legacyProviderFiles, out var legacyMessages) &&
-            legacyMessages.Count > 0)
+        if (!TrySetLazyMessages(provider, legacyProviderFiles))
         {
-            provider.Messages = legacyMessages;
-        }
-        else if (!string.IsNullOrEmpty(providerMetadata?.MessageFilePath))
-        {
-            if (TryLoadMessages([providerMetadata.MessageFilePath], out var modernMessages) && modernMessages.Count > 0)
+            if (!string.IsNullOrEmpty(providerMetadata?.MessageFilePath) &&
+                TrySetLazyMessages(provider, [providerMetadata.MessageFilePath]))
             {
                 _logger?.Debug(
                     $"No legacy messages loaded for provider {_providerName}. Using message file from modern provider.");
-
-                provider.Messages = modernMessages;
             }
             else
             {
                 _logger?.Debug(
-                    $"No legacy messages loaded for provider {_providerName} and modern message file fallback produced no messages. Returning empty provider details.");
+                    $"No message table loaded for provider {_providerName}. Returning empty provider details.");
             }
         }
-        else if (legacyProviderFiles.Count > 0)
-        {
-            _logger?.Debug(
-                $"Legacy message files for provider {_providerName} produced no messages and no modern fallback is available. Returning empty provider details.");
-        }
-        else
-        {
-            _logger?.Debug($"No message files found for provider {_providerName}. Returning empty provider details.");
-        }
 
-        if (!string.IsNullOrEmpty(providerMetadata?.ParameterFilePath))
+        if (!string.IsNullOrEmpty(providerMetadata?.ParameterFilePath) &&
+            !TrySetLazyParameters(provider, [providerMetadata.ParameterFilePath]))
         {
-            if (TryLoadMessages([providerMetadata.ParameterFilePath], out var parameterMessages) && parameterMessages.Count > 0)
-            {
-                provider.Parameters = parameterMessages;
-            }
-            else
-            {
-                _logger?.Debug(
-                    $"Parameter file fallback for provider {_providerName} produced no messages.");
-            }
+            _logger?.Debug($"Parameter file for provider {_providerName} produced no messages.");
         }
 
         if (provider.IsEmpty)
@@ -425,8 +245,11 @@ private void TryFallbackToOwningPublisher(ProviderDetails target, HashSet<string
         }
 
         target.Events = ownerDetails.Events;
-        target.Messages = ownerDetails.Messages;
-        target.Parameters = ownerDetails.Parameters;
+
+        if (ownerDetails.MessageSource is not null) { target.SetLazyMessageSource(ownerDetails.MessageSource); }
+
+        if (ownerDetails.ParameterSource is not null) { target.SetLazyParameterSource(ownerDetails.ParameterSource); }
+
         target.Keywords = ownerDetails.Keywords;
         target.Opcodes = ownerDetails.Opcodes;
         target.Tasks = ownerDetails.Tasks;
@@ -523,25 +346,25 @@ and not StackOverflowException
         }
     }
 
-    private bool TryLoadMessages(IEnumerable<string> messageFilePaths, out List<MessageModel> messages)
+    private bool TrySetLazyMessages(ProviderDetails provider, IReadOnlyList<string> files)
     {
-        _logger?.Debug($"{nameof(TryLoadMessages)} called for files {string.Join(", ", messageFilePaths)}");
+        var source = BuildLazySource(files);
 
-        try
-        {
-            messages = LoadMessagesFromFiles(messageFilePaths, _providerName, _logger);
+        if (source is null) { return false; }
 
-            _logger?.Debug($"Returning {messages.Count} messages for provider {_providerName}");
+        provider.SetLazyMessageSource(source);
 
-            return true;
-        }
-        catch (Exception ex)
-        {
-            _logger?.Debug($"Failed to load provider data for {_providerName}.\n{ex}");
+        return true;
+    }
 
-            messages = [];
+    private bool TrySetLazyParameters(ProviderDetails provider, IReadOnlyList<string> files)
+    {
+        var source = BuildLazySource(files);
 
-            return false;
-        }
+        if (source is null) { return false; }
+
+        provider.SetLazyParameterSource(source);
+
+        return true;
     }
 }
diff --git a/src/EventLogExpert.Eventing/PublisherMetadata/LegacyMessageFileSource.cs b/src/EventLogExpert.Eventing/PublisherMetadata/LegacyMessageFileSource.cs
new file mode 100644
index 000000000..edd925610
--- /dev/null
+++ b/src/EventLogExpert.Eventing/PublisherMetadata/LegacyMessageFileSource.cs
@@ -0,0 +1,102 @@
+// // Copyright (c) Microsoft Corporation.
+// // Licensed under the MIT License.
+
+using EventLogExpert.Logging.Abstractions;
+using EventLogExpert.Provider.Resolution;
+using System.Collections;
+using System.Collections.Concurrent;
+
+namespace EventLogExpert.Eventing.PublisherMetadata;
+
+internal sealed class LegacyMessageFileSource : ILazyMessageSource
+{
+    private static readonly IReadOnlyList<MessageModel> s_empty = [];
+
+    private readonly Lazy<IReadOnlyList<MessageModel>> _all;
+    private readonly ConcurrentDictionary<long, MessageModel?> _byRawId = new();
+    private readonly ConcurrentDictionary<int, IReadOnlyList<MessageModel>> _byShortId = new();
+    private readonly int _count;
+    private readonly IReadOnlyList<string> _files;
+    private readonly ITraceLogger? _logger;
+    private readonly string _providerName;
+    private IReadOnlyList<MessageModel>? _view;
+
+    internal LegacyMessageFileSource(IReadOnlyList<string> files, string providerName, int count, ITraceLogger? logger)
+    {
+        _files = files;
+        _providerName = providerName;
+        _count = count;
+        _logger = logger;
+        _all = new Lazy<IReadOnlyList<MessageModel>>(MaterializeAllCore);
+    }
+
+    public int Count => _count;
+
+    public IReadOnlyList<MessageModel> AsView() => _view ??= new LazyMessageView(_count, this);
+
+    public MessageModel? GetByRawIdFirst(long rawId) =>
+        _byRawId.GetOrAdd(rawId, static (id, self) => self.ExtractByRawId(id), this);
+
+    public IReadOnlyList<MessageModel> GetByShortId(int shortId) =>
+        _byShortId.GetOrAdd(shortId, static (id, self) => self.ExtractByShortId(id), this);
+
+    public IReadOnlyList<MessageModel> MaterializeAll() => _all.Value;
+
+    private MessageModel? ExtractByRawId(long rawId)
+    {
+        foreach (var file in _files)
+        {
+            if (!MessageTableReader.TryOpen(file, _logger, out var handle, out var memTable, out uint size)) { continue; }
+
+            try
+            {
+                var match = MessageTableReader.FindFirstByRawId(memTable, size, rawId, _providerName);
+                if (match is not null) { return match; }
+            }
+            finally { handle.Dispose(); }
+        }
+
+        return null;
+    }
+
+    private IReadOnlyList<MessageModel> ExtractByShortId(int shortId)
+    {
+        var result = new List<MessageModel>();
+
+        foreach (var file in _files)
+        {
+            if (!MessageTableReader.TryOpen(file, _logger, out var handle, out var memTable, out uint size)) { continue; }
+
+            try { MessageTableReader.AppendMatches(memTable, size, _providerName, shortId, result); }
+            finally { handle.Dispose(); }
+        }
+
+        return result.Count == 0 ? s_empty : result;
+    }
+
+    private IReadOnlyList<MessageModel> MaterializeAllCore()
+    {
+        var result = new List<MessageModel>(_count);
+
+        foreach (var file in _files)
+        {
+            if (!MessageTableReader.TryOpen(file, _logger, out var handle, out var memTable, out uint size)) { continue; }
+
+            try { MessageTableReader.AppendMatches(memTable, size, _providerName, -1, result); }
+            finally { handle.Dispose(); }
+        }
+
+        return result;
+    }
+
+    private sealed class LazyMessageView(int count, LegacyMessageFileSource source) : IReadOnlyList<MessageModel>
+    {
+        public int Count => count;
+
+        public MessageModel this[int index] => source.MaterializeAll()[index];
+
+        public IEnumerator<MessageModel> GetEnumerator() => source.MaterializeAll().GetEnumerator();
+
+        IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
+    }
+}
diff --git a/src/EventLogExpert.Eventing/PublisherMetadata/MessageTableReader.cs b/src/EventLogExpert.Eventing/PublisherMetadata/MessageTableReader.cs
new file mode 100644
index 000000000..180a01fbf
--- /dev/null
+++ b/src/EventLogExpert.Eventing/PublisherMetadata/MessageTableReader.cs
@@ -0,0 +1,293 @@
+// // Copyright (c) Microsoft Corporation.
+// // Licensed under the MIT License.
+
+using EventLogExpert.Eventing.Interop;
+using EventLogExpert.Logging.Abstractions;
+using EventLogExpert.Provider.Resolution;
+using System.Runtime.InteropServices;
+
+namespace EventLogExpert.Eventing.PublisherMetadata;
+
+/// <summary>
+///     Reads a provider DLL's RT_MESSAGETABLE. Every walk is bounds-checked against the resource size from
+///     <see cref="NativeMethods.SizeofResource" /> so a malformed offset/length can never read outside the mapped
+///     resource: CountEntries returns -1 when the table is malformed anywhere (callers treat it as no table), while
+///     per-id extraction stops at the first malformed region and returns only the matches from the well-formed prefix,
+///     never an access violation. Modules are loaded MUI-aware and freed immediately - no handle is held across calls.
+/// </summary>
+internal static class MessageTableReader
+{
+    /// <summary>
+    ///     Appends entries to <paramref name="into" /> in walk order (file -> block -> id). When
+    ///     <paramref name="shortIdFilter" /> is -1 every entry is appended; otherwise only entries whose unsigned low-16
+    ///     ShortId equals the filter (matching the eager store's <c>(ushort)ShortId</c> keying).
+    /// </summary>
+    internal static void AppendMatches(nint memTable, uint size, string providerName, int shortIdFilter, List<MessageModel> into)
+    {
+        if (!InBounds(0, 4, size)) { return; }
+
+        int numberOfBlocks = Marshal.ReadInt32(memTable);
+
+        if (numberOfBlocks < 0) { return; }
+
+        int blockOffset = 4;
+
+        for (int block = 0; block < numberOfBlocks; block++)
+        {
+            if (!InBounds(blockOffset, 12, size)) { return; }
+
+            int lowId = Marshal.ReadInt32(memTable, blockOffset);
+            int highId = Marshal.ReadInt32(memTable, blockOffset + 4);
+            int entryOffset = Marshal.ReadInt32(memTable, blockOffset + 8);
+
+            if (lowId > highId) { return; }
+
+            for (long id = lowId; id <= highId; id++)
+            {
+                if (!InBounds(entryOffset, 4, size)) { return; }
+
+                short length = Marshal.ReadInt16(memTable, entryOffset);
+                short flags = Marshal.ReadInt16(memTable, entryOffset + 2);
+
+                if (length < 4 || !InBounds(entryOffset, length, size)) { return; }
+
+                if (shortIdFilter < 0 || (ushort)(short)id == shortIdFilter)
+                {
+                    into.Add(new MessageModel
+                    {
+                        Text = ReadText(memTable + entryOffset + 4, length - 4, flags),
+                        ShortId = (short)id,
+                        ProviderName = providerName,
+                        RawId = id
+                    });
+                }
+
+                entryOffset += length;
+            }
+
+            blockOffset += 12;
+        }
+    }
+
+    /// <summary>Counts entries with a fully bounds-checked structural walk (no string materialization). -1 if malformed.</summary>
+    internal static int CountEntries(nint memTable, uint size)
+    {
+        if (!InBounds(0, 4, size)) { return -1; }
+
+        int numberOfBlocks = Marshal.ReadInt32(memTable);
+
+        if (numberOfBlocks < 0) { return -1; }
+
+        int count = 0;
+        int blockOffset = 4;
+
+        for (int block = 0; block < numberOfBlocks; block++)
+        {
+            if (!InBounds(blockOffset, 12, size)) { return -1; }
+
+            int lowId = Marshal.ReadInt32(memTable, blockOffset);
+            int highId = Marshal.ReadInt32(memTable, blockOffset + 4);
+            int entryOffset = Marshal.ReadInt32(memTable, blockOffset + 8);
+
+            if (lowId > highId) { return -1; }
+
+            for (long id = lowId; id <= highId; id++)
+            {
+                if (!InBounds(entryOffset, 4, size)) { return -1; }
+
+                short length = Marshal.ReadInt16(memTable, entryOffset);
+
+                if (length < 4 || !InBounds(entryOffset, length, size)) { return -1; }
+
+                count++;
+                entryOffset += length;
+            }
+
+            blockOffset += 12;
+        }
+
+        return count;
+    }
+
+    /// <summary>Returns the first entry whose RawId equals <paramref name="rawId" /> (first-wins), or null.</summary>
+    internal static MessageModel? FindFirstByRawId(nint memTable, uint size, long rawId, string providerName)
+    {
+        if (!InBounds(0, 4, size)) { return null; }
+
+        int numberOfBlocks = Marshal.ReadInt32(memTable);
+
+        if (numberOfBlocks < 0) { return null; }
+
+        int blockOffset = 4;
+
+        for (int block = 0; block < numberOfBlocks; block++)
+        {
+            if (!InBounds(blockOffset, 12, size)) { return null; }
+
+            int lowId = Marshal.ReadInt32(memTable, blockOffset);
+            int highId = Marshal.ReadInt32(memTable, blockOffset + 4);
+            int entryOffset = Marshal.ReadInt32(memTable, blockOffset + 8);
+
+            if (lowId > highId) { return null; }
+
+            for (long id = lowId; id <= highId; id++)
+            {
+                if (!InBounds(entryOffset, 4, size)) { return null; }
+
+                short length = Marshal.ReadInt16(memTable, entryOffset);
+                short flags = Marshal.ReadInt16(memTable, entryOffset + 2);
+
+                if (length < 4 || !InBounds(entryOffset, length, size)) { return null; }
+
+                if (id == rawId)
+                {
+                    return new MessageModel
+                    {
+                        Text = ReadText(memTable + entryOffset + 4, length - 4, flags),
+                        ShortId = (short)id,
+                        ProviderName = providerName,
+                        RawId = id
+                    };
+                }
+
+                entryOffset += length;
+            }
+
+            blockOffset += 12;
+        }
+
+        return null;
+    }
+
+    internal static bool TryOpen(string file, ITraceLogger? logger, out LibraryHandle handle, out nint memTable, out uint size)
+    {
+        memTable = nint.Zero;
+        size = 0;
+        handle = LoadMessageModule(file, logger);
+
+        if (handle.IsInvalid)
+        {
+            handle.Dispose();
+
+            return false;
+        }
+
+        nint info = NativeMethods.FindResourceExA(handle, NativeMethods.RT_MESSAGETABLE, 1);
+
+        if (info == nint.Zero)
+        {
+            handle.Dispose();
+
+            return false;
+        }
+
+        size = NativeMethods.SizeofResource(handle, info);
+        nint resource = NativeMethods.LoadResource(handle, info);
+
+        if (resource == nint.Zero || size == 0)
+        {
+            handle.Dispose();
+
+            return false;
+        }
+
+        memTable = NativeMethods.LockResource(resource);
+
+        if (memTable != nint.Zero) { return true; }
+
+        handle.Dispose();
+
+        return false;
+    }
+
+    private static bool InBounds(int offset, int length, uint size) =>
+        offset >= 0 && length >= 0 && (long)offset + length <= size;
+
+    private static LibraryHandle LoadMessageModule(string file, ITraceLogger? logger)
+    {
+        file = Environment.ExpandEnvironmentVariables(file);
+
+        const LoadLibraryFlags MuiAwareFlags =
+            LoadLibraryFlags.LOAD_LIBRARY_AS_IMAGE_RESOURCE |
+            LoadLibraryFlags.LOAD_LIBRARY_AS_DATAFILE_EXCLUSIVE;
+
+        var module = NativeMethods.LoadLibraryExW(file, nint.Zero, MuiAwareFlags);
+        int error = Marshal.GetLastWin32Error();
+
+        if (!module.IsInvalid) { return module; }
+
+        module.Dispose();
+
+        string primaryFailure =
+            $"LoadLibraryEx failed for {file} with flags LOAD_LIBRARY_AS_IMAGE_RESOURCE | " +
+            $"LOAD_LIBRARY_AS_DATAFILE_EXCLUSIVE. Error: {error} ({NativeMethods.FormatSystemMessage((uint)error) ?? "unknown"}).";
+
+        // Legacy fallback: re-attempt with the leaf filename resolved under the trusted system directory, but only for
+        // pure leaf inputs (no directory information) so a "subdir\foo.dll" can never be hijacked to a system binary.
+        if (!string.Equals(file, Path.GetFileName(file), StringComparison.Ordinal))
+        {
+            logger?.Debug($"{primaryFailure} Skipping leaf-name fallback because the input contains directory information.");
+
+            return LibraryHandle.Zero;
+        }
+
+        string leafName = Path.GetFileName(file);
+
+        if (string.IsNullOrEmpty(leafName))
+        {
+            logger?.Debug($"{primaryFailure} Skipping leaf-name fallback because no leaf filename could be extracted.");
+
+            return LibraryHandle.Zero;
+        }
+
+        string systemPath = Path.Combine(Environment.SystemDirectory, leafName);
+
+        if (!File.Exists(systemPath))
+        {
+            logger?.Debug($"{primaryFailure} Skipping leaf-name fallback because '{leafName}' does not exist under {Environment.SystemDirectory}.");
+
+            return LibraryHandle.Zero;
+        }
+
+        logger?.Debug($"{primaryFailure} Falling back to leaf-name resolution against the system directory: {systemPath}.");
+
+        module = NativeMethods.LoadLibraryExW(systemPath, nint.Zero, MuiAwareFlags);
+        error = Marshal.GetLastWin32Error();
+
+        if (!module.IsInvalid) { return module; }
+
+        module.Dispose();
+
+        logger?.Debug(
+            $"LoadLibraryEx failed for {systemPath} (leaf-name fallback) with flags LOAD_LIBRARY_AS_IMAGE_RESOURCE | " +
+            $"LOAD_LIBRARY_AS_DATAFILE_EXCLUSIVE. Error: {error} ({NativeMethods.FormatSystemMessage((uint)error) ?? "unknown"}). " +
+            $"Original requested file was: {file}.");
+
+        return LibraryHandle.Zero;
+    }
+
+    // Reads the entry text up to the first null, bounded by the entry length. flags: 1 = Unicode, 0 and 2 = single-byte
+    // (2 is undefined but ESE message tables use it for ANSI); any other value keeps the legacy parser's sentinel
+    // instead of decoding arbitrary bytes.
+    private static string ReadText(nint textPtr, int maxBytes, short flags)
+    {
+        if (flags is not (0 or 1 or 2)) { return "Error: Bad flags. Could not get text."; }
+
+        if (maxBytes <= 0) { return string.Empty; }
+
+        if (flags == 1)
+        {
+            int chars = 0;
+            int maxChars = maxBytes / 2;
+            while (chars < maxChars && Marshal.ReadInt16(textPtr, chars * 2) != 0) { chars++; }
+
+            return Marshal.PtrToStringUni(textPtr, chars);
+        }
+
+        int bytes = 0;
+
+        while (bytes < maxBytes && Marshal.ReadByte(textPtr, bytes) != 0) { bytes++; }
+
+        return Marshal.PtrToStringAnsi(textPtr, bytes);
+    }
+}
diff --git a/src/EventLogExpert.Provider/Resolution/CompactMessageStore.cs b/src/EventLogExpert.Provider/Resolution/CompactMessageStore.cs
index e70bf8165..98feb0ac4 100644
--- a/src/EventLogExpert.Provider/Resolution/CompactMessageStore.cs
+++ b/src/EventLogExpert.Provider/Resolution/CompactMessageStore.cs
@@ -6,7 +6,7 @@
 
 namespace EventLogExpert.Provider.Resolution;
 
-internal sealed class CompactMessageStore
+internal sealed class CompactMessageStore : ILazyMessageSource
 {
     private static readonly IReadOnlyList<MessageModel> s_empty = [];
 
@@ -79,6 +79,8 @@ public IReadOnlyList<MessageModel> GetByShortId(int shortId) =>
         // Dictionary keyed by (ushort)ShortId and looked up by the raw int id).
         _byShortIdCache.GetOrAdd(shortId, static (id, store) => store.MaterializeByShortId(id), this);
 
+    public IReadOnlyList<MessageModel> MaterializeAll() => [.. new MessageView(this)];
+
     private Dictionary<long, int> BuildRawIdLookup()
     {
         var lookup = new Dictionary<long, int>(_entries.Length);
diff --git a/src/EventLogExpert.Provider/Resolution/ILazyMessageSource.cs b/src/EventLogExpert.Provider/Resolution/ILazyMessageSource.cs
new file mode 100644
index 000000000..7077f2ba5
--- /dev/null
+++ b/src/EventLogExpert.Provider/Resolution/ILazyMessageSource.cs
@@ -0,0 +1,17 @@
+// // Copyright (c) Microsoft Corporation.
+// // Licensed under the MIT License.
+
+namespace EventLogExpert.Provider.Resolution;
+
+public interface ILazyMessageSource
+{
+    int Count { get; }
+
+    IReadOnlyList<MessageModel> AsView();
+
+    MessageModel? GetByRawIdFirst(long rawId);
+
+    IReadOnlyList<MessageModel> GetByShortId(int shortId);
+
+    IReadOnlyList<MessageModel> MaterializeAll();
+}
diff --git a/src/EventLogExpert.Provider/Resolution/ProviderDetails.cs b/src/EventLogExpert.Provider/Resolution/ProviderDetails.cs
index eec577d39..51f68d9d6 100644
--- a/src/EventLogExpert.Provider/Resolution/ProviderDetails.cs
+++ b/src/EventLogExpert.Provider/Resolution/ProviderDetails.cs
@@ -7,9 +7,9 @@ public sealed class ProviderDetails
 {
     private IReadOnlyList<EventModel> _events = [];
     private Dictionary<long, List<EventModel>>? _eventsByIdLookup;
-    private CompactMessageStore? _messageStore;
+    private ILazyMessageSource? _messageStore;
     private IReadOnlyList<MessageModel>? _messagesView;
-    private CompactMessageStore? _parameterStore;
+    private ILazyMessageSource? _parameterStore;
     private IReadOnlyList<MessageModel>? _parametersView;
 
     /// <summary>Events and related items from modern provider</summary>
@@ -44,6 +44,8 @@ public IReadOnlyList<MessageModel> Messages
         }
     }
 
+    public ILazyMessageSource? MessageSource => _messageStore;
+
     public IDictionary<int, string> Opcodes { get; set; } = new Dictionary<int, string>();
 
     public IReadOnlyList<MessageModel> Parameters
@@ -56,6 +58,8 @@ public IReadOnlyList<MessageModel> Parameters
         }
     }
 
+    public ILazyMessageSource? ParameterSource => _parameterStore;
+
     public string ProviderName { get; set; } = string.Empty;
 
     public string? ResolvedFromOwningPublisher { get; set; }
@@ -83,6 +87,18 @@ public IReadOnlyList<MessageModel> GetMessagesByShortId(int shortId) =>
     /// </summary>
     public MessageModel? GetParameterByRawId(long rawId) => _parameterStore?.GetByRawIdFirst(rawId);
 
+    public void SetLazyMessageSource(ILazyMessageSource source)
+    {
+        _messageStore = source;
+        _messagesView = source.AsView();
+    }
+
+    public void SetLazyParameterSource(ILazyMessageSource source)
+    {
+        _parameterStore = source;
+        _parametersView = source.AsView();
+    }
+
     private Dictionary<long, List<EventModel>> BuildEventsByIdLookup()
     {
         var lookup = new Dictionary<long, List<EventModel>>();
diff --git a/tests/Unit/EventLogExpert.Eventing.Tests/PublisherMetadata/MessageTableReaderTests.cs b/tests/Unit/EventLogExpert.Eventing.Tests/PublisherMetadata/MessageTableReaderTests.cs
new file mode 100644
index 000000000..75f74bf05
--- /dev/null
+++ b/tests/Unit/EventLogExpert.Eventing.Tests/PublisherMetadata/MessageTableReaderTests.cs
@@ -0,0 +1,200 @@
+// // Copyright (c) Microsoft Corporation.
+// // Licensed under the MIT License.
+
+using EventLogExpert.Eventing.PublisherMetadata;
+using EventLogExpert.Provider.Resolution;
+using System.Runtime.InteropServices;
+using System.Text;
+
+namespace EventLogExpert.Eventing.Tests.PublisherMetadata;
+
+public sealed class MessageTableReaderTests
+{
+    [Fact]
+    public void AppendMatches_AppendsEveryEntryInWalkOrder_WhenFilterIsNegative()
+    {
+        byte[] table = BuildTable((5, [("five", false), ("six", true)]));
+
+        WithTable(table, (memTable, size) =>
+        {
+            var into = new List<MessageModel>();
+            MessageTableReader.AppendMatches(memTable, size, "P", -1, into);
+
+            Assert.Equal(2, into.Count);
+            Assert.Equal("five", into[0].Text);
+            Assert.Equal(5, into[0].RawId);
+            Assert.Equal("six", into[1].Text);
+            Assert.Equal(6, into[1].RawId);
+        });
+    }
+
+    [Fact]
+    public void AppendMatches_ReturnsAllLow16Collisions_InBlockOrder()
+    {
+        // Two ids whose low 16 bits are both 5 (5 and 0x10005), in separate blocks - the qualifier/severity case the
+        // eager store keys by (ushort)ShortId. GetByShortId(5) must return both, in walk order.
+        byte[] table = BuildTable(
+            (5, [("low", false)]),
+            (0x10005, [("high", false)]));
+
+        WithTable(table, (memTable, size) =>
+        {
+            var into = new List<MessageModel>();
+            MessageTableReader.AppendMatches(memTable, size, "P", 5, into);
+
+            Assert.Equal(["low", "high"], into.Select(m => m.Text));
+            Assert.Equal([5L, 0x10005L], into.Select(m => m.RawId));
+        });
+    }
+
+    [Fact]
+    public void CountEntries_CountsEveryEntryAcrossBlocks()
+    {
+        byte[] table = BuildTable(
+            (10, [("ten", false), ("eleven", false)]),
+            (100, [("hundred", false)]));
+
+        WithTable(table, (memTable, size) => Assert.Equal(3, MessageTableReader.CountEntries(memTable, size)));
+    }
+
+    [Fact]
+    public void CountEntries_ReturnsNegative_WhenOffsetIsOutOfBounds()
+    {
+        byte[] table = BuildTable((1, [("one", false)]));
+
+        // Corrupt the first block's OffsetToEntries (bytes 12-15) to point past the resource.
+        BitConverter.GetBytes(0x7FFF_FFFF).CopyTo(table, 12);
+
+        WithTable(table, (memTable, size) => Assert.Equal(-1, MessageTableReader.CountEntries(memTable, size)));
+    }
+
+    [Fact]
+    public void FindFirstByRawId_ReturnsExactRawIdMatch()
+    {
+        byte[] table = BuildTable((5, [("five", false)]), (0x10005, [("high", false)]));
+
+        WithTable(table, (memTable, size) =>
+        {
+            Assert.Equal("high", MessageTableReader.FindFirstByRawId(memTable, size, 0x10005, "P")?.Text);
+            Assert.Null(MessageTableReader.FindFirstByRawId(memTable, size, 7, "P"));
+        });
+    }
+
+    [Fact]
+    public void LazySource_MaterializeAll_MatchesEagerLoadOnRealProviderDll()
+    {
+        string dll = Path.Combine(Environment.SystemDirectory, "netmsg.dll");
+        Assert.True(File.Exists(dll));
+
+        var eager = EventMessageProvider.LoadMessagesFromFiles([dll], "TestProvider");
+        Assert.NotEmpty(eager);
+
+        var lazy = new LegacyMessageFileSource([dll], "TestProvider", eager.Count, null);
+
+        Assert.Equal(eager.Count, lazy.Count);
+
+        var materialized = lazy.MaterializeAll();
+        Assert.Equal(eager.Count, materialized.Count);
+        for (int i = 0; i < eager.Count; i++)
+        {
+            Assert.Equal(eager[i].ShortId, materialized[i].ShortId);
+            Assert.Equal(eager[i].RawId, materialized[i].RawId);
+            Assert.Equal(eager[i].Text, materialized[i].Text);
+        }
+
+        // Per-id extraction must reproduce the eager store's by-ShortId and first-by-RawId lookups exactly.
+        foreach (var shortId in eager.Select(m => (int)(ushort)m.ShortId).Distinct().Take(50))
+        {
+            var expected = eager.Where(m => (ushort)m.ShortId == shortId).Select(m => m.Text);
+            Assert.Equal(expected, lazy.GetByShortId(shortId).Select(m => m.Text));
+        }
+
+        foreach (var rawId in eager.Select(m => m.RawId).Distinct().Take(50))
+        {
+            var expected = eager.First(m => m.RawId == rawId);
+            Assert.Equal(expected.Text, lazy.GetByRawIdFirst(rawId)?.Text);
+        }
+    }
+
+    [Fact]
+    public void LegacyMessageFileSource_SkipsUnloadableFiles_AndConcatenatesFilesInOrder()
+    {
+        string dll = Path.Combine(Environment.SystemDirectory, "netmsg.dll");
+        string missing = Path.Combine(Path.GetTempPath(), $"does-not-exist-{Guid.NewGuid():N}.dll");
+
+        var single = EventMessageProvider.LoadMessagesFromFiles([dll], "P");
+        Assert.NotEmpty(single);
+
+        // An unloadable file is skipped, not fatal.
+        var skipped = new LegacyMessageFileSource([missing, dll], "P", single.Count, null).MaterializeAll();
+        Assert.Equal(single.Select(m => m.Text), skipped.Select(m => m.Text));
+
+        // Multiple files concatenate in order: the same file twice yields its entries twice, file1 before file2.
+        var doubled = new LegacyMessageFileSource([dll, dll], "P", single.Count * 2, null).MaterializeAll();
+        Assert.Equal(single.Count * 2, doubled.Count);
+        Assert.Equal(single[0].Text, doubled[0].Text);
+        Assert.Equal(single[0].Text, doubled[single.Count].Text);
+    }
+
+    [Fact]
+    public void TryOpen_ReturnsFalse_WhenFileIsNotAResourceModule()
+    {
+        string temp = Path.Combine(Path.GetTempPath(), $"not-a-dll-{Guid.NewGuid():N}.txt");
+        File.WriteAllText(temp, "not a PE file");
+
+        try
+        {
+            Assert.False(MessageTableReader.TryOpen(temp, null, out var handle, out _, out _));
+            handle.Dispose();
+        }
+        finally { File.Delete(temp); }
+    }
+
+    // Builds a MESSAGE_RESOURCE_DATA blob: a block count, then one MESSAGE_RESOURCE_BLOCK per block (LowId, HighId,
+    // OffsetToEntries), then the variable-length entries. Each block's ids run lowId..lowId+entries.Length-1.
+    private static byte[] BuildTable(params (int lowId, (string text, bool unicode)[] entries)[] blocks)
+    {
+        int headerSize = 4 + (12 * blocks.Length);
+        var entryBytes = new List<byte>();
+        var offsets = new int[blocks.Length];
+
+        for (int b = 0; b < blocks.Length; b++)
+        {
+            offsets[b] = headerSize + entryBytes.Count;
+
+            foreach (var (text, unicode) in blocks[b].entries)
+            {
+                byte[] encoded = unicode
+                    ? Encoding.Unicode.GetBytes(text + '\0')
+                    : Encoding.ASCII.GetBytes(text + '\0');
+
+                short length = (short)(4 + encoded.Length);
+                entryBytes.AddRange(BitConverter.GetBytes(length));
+                entryBytes.AddRange(BitConverter.GetBytes((short)(unicode ? 1 : 0)));
+                entryBytes.AddRange(encoded);
+            }
+        }
+
+        var result = new List<byte>();
+        result.AddRange(BitConverter.GetBytes(blocks.Length));
+
+        for (int b = 0; b < blocks.Length; b++)
+        {
+            result.AddRange(BitConverter.GetBytes(blocks[b].lowId));
+            result.AddRange(BitConverter.GetBytes(blocks[b].lowId + blocks[b].entries.Length - 1));
+            result.AddRange(BitConverter.GetBytes(offsets[b]));
+        }
+
+        result.AddRange(entryBytes);
+
+        return [.. result];
+    }
+
+    private static void WithTable(byte[] table, Action<nint, uint> action)
+    {
+        var handle = GCHandle.Alloc(table, GCHandleType.Pinned);
+
+        try { action(handle.AddrOfPinnedObject(), (uint)table.Length); }
+        finally { handle.Free(); }
+    }
+}

From 8436a1f20e46183b1a6793b9edad052e65b5d9b0 Mon Sep 17 00:00:00 2001
From: jschick04 <jschick04@gmail.com>
Date: Sun, 21 Jun 2026 15:18:19 -0500
Subject: [PATCH 37/40] Harden EVT_VARIANT type checks and order partial load
 newest-first

---
 .../Interop/NativeMethods.Evt.cs              | 29 ++++++---
 .../EventLog/OpenLogEffects.cs                | 63 ++++++++++++-------
 .../EventLog/EffectsTests.cs                  | 23 +++++++
 3 files changed, 81 insertions(+), 34 deletions(-)

diff --git a/src/EventLogExpert.Eventing/Interop/NativeMethods.Evt.cs b/src/EventLogExpert.Eventing/Interop/NativeMethods.Evt.cs
index c796d4790..f0d7d3a3e 100644
--- a/src/EventLogExpert.Eventing/Interop/NativeMethods.Evt.cs
+++ b/src/EventLogExpert.Eventing/Interop/NativeMethods.Evt.cs
@@ -5,7 +5,6 @@
 using EventLogExpert.Eventing.Readers;
 using Microsoft.Win32.SafeHandles;
 using System.Buffers;
-using System.Diagnostics;
 using System.Runtime.InteropServices;
 using System.Security.Principal;
 
@@ -436,7 +435,11 @@ internal static unsafe EventRecord GetEventRecord(IntPtr eventBuffer, int proper
                     properties.ProviderName = (string)ConvertVariant(variant)!;
                     break;
                 case (int)EvtSystemPropertyId.EventId:
-                    Debug.Assert(variant.Type == (uint)EvtVariantType.UInt16);
+                    if (variant.Type != (uint)EvtVariantType.UInt16)
+                    {
+                        throw new InvalidDataException($"Expected EVT_VARIANT type UInt16 for EventId, got {variant.Type}.");
+                    }
+
                     properties.Id = variant.UInt16Val;
                     break;
                 case (int)EvtSystemPropertyId.Qualifiers:
@@ -830,16 +833,19 @@ private static unsafe T[] ReadBlittableArray<T>(IntPtr reference, uint count, Ev
     {
         if (variant.Type == (uint)EvtVariantType.Null) { return null; }
 
-        Debug.Assert(variant.Type == (uint)EvtVariantType.Byte);
-
-        return variant.ByteVal;
+        return variant.Type != (uint)EvtVariantType.Byte ?
+            throw new InvalidDataException($"Expected EVT_VARIANT type Byte, got {variant.Type}.") :
+            variant.ByteVal;
     }
 
     private static int? ReadOptionalInt32(in EvtVariant variant)
     {
         if (variant.Type == (uint)EvtVariantType.Null) { return null; }
 
-        Debug.Assert(variant.Type == (uint)EvtVariantType.UInt32);
+        if (variant.Type != (uint)EvtVariantType.UInt32)
+        {
+            throw new InvalidDataException($"Expected EVT_VARIANT type UInt32, got {variant.Type}.");
+        }
 
         return unchecked((int)variant.UInt32Val);
     }
@@ -848,7 +854,10 @@ private static unsafe T[] ReadBlittableArray<T>(IntPtr reference, uint count, Ev
     {
         if (variant.Type == (uint)EvtVariantType.Null) { return null; }
 
-        Debug.Assert(variant.Type is (uint)EvtVariantType.UInt64 or (uint)EvtVariantType.HexInt64);
+        if (variant.Type is not ((uint)EvtVariantType.UInt64 or (uint)EvtVariantType.HexInt64))
+        {
+            throw new InvalidDataException($"Expected EVT_VARIANT type UInt64 or HexInt64, got {variant.Type}.");
+        }
 
         return unchecked((long)variant.UInt64Val);
     }
@@ -857,8 +866,8 @@ private static unsafe T[] ReadBlittableArray<T>(IntPtr reference, uint count, Ev
     {
         if (variant.Type == (uint)EvtVariantType.Null) { return null; }
 
-        Debug.Assert(variant.Type == (uint)EvtVariantType.UInt16);
-
-        return variant.UInt16Val;
+        return variant.Type != (uint)EvtVariantType.UInt16 ?
+            throw new InvalidDataException($"Expected EVT_VARIANT type UInt16, got {variant.Type}.") :
+            variant.UInt16Val;
     }
 }
diff --git a/src/EventLogExpert.Runtime/EventLog/OpenLogEffects.cs b/src/EventLogExpert.Runtime/EventLog/OpenLogEffects.cs
index 33b62cc00..459409428 100644
--- a/src/EventLogExpert.Runtime/EventLog/OpenLogEffects.cs
+++ b/src/EventLogExpert.Runtime/EventLog/OpenLogEffects.cs
@@ -306,7 +306,7 @@ private async Task LoadLogAsync(
 
         dispatcher.Dispatch(new AddTableAction(logData));
 
-        var channel = Channel.CreateBounded<EventRecord[]>(new BoundedChannelOptions(s_maxGlobalConcurrency * 2)
+        var channel = Channel.CreateBounded<(long Seq, EventRecord[] Batch)>(new BoundedChannelOptions(s_maxGlobalConcurrency * 2)
         {
             SingleWriter = true,
             FullMode = BoundedChannelFullMode.Wait
@@ -314,6 +314,11 @@ private async Task LoadLogAsync(
 
         List<ResolvedEvent> events = [];
 
+        var resolvedBySeq = new Dictionary<long, List<ResolvedEvent>>();
+        long nextDrainSeq = 0;
+
+        var partialDispatchGate = new object();
+
         await using var timer = new Timer(
             _ =>
             {
@@ -333,6 +338,8 @@ private async Task LoadLogAsync(
 
         var producerTask = Task.Run(async () =>
         {
+            long sequence = 0;
+
             try
             {
                 while (reader.TryGetEvents(out EventRecord[] batch, ReadBatchSize))
@@ -341,7 +348,7 @@ private async Task LoadLogAsync(
 
                     if (batch.Length == 0) { continue; }
 
-                    await channel.Writer.WriteAsync(batch, token);
+                    await channel.Writer.WriteAsync((sequence++, batch), token);
                 }
             }
             catch (Exception ex)
@@ -370,8 +377,10 @@ await Parallel.ForEachAsync(
                     CancellationToken = token,
                     MaxDegreeOfParallelism = s_maxGlobalConcurrency
                 },
-                async (batch, innerToken) =>
+                async (item, innerToken) =>
                 {
+                    EventRecord[] batch = item.Batch;
+
                     // First-screenful resolution preempts in-flight bulk across all loads. Classify by ADMITTED
                     // (not completed) events so a slow-resolving load still demotes to Bulk after its first
                     // screenful instead of monopolizing the high-priority lane.
@@ -415,21 +424,30 @@ await Parallel.ForEachAsync(
                             }
                         }
 
-                        if (localBatch.Count > 0)
+                        bool dispatchEager = false;
+
+                        lock (events)
                         {
-                            lock (events) { events.AddRange(localBatch); }
+                            resolvedBySeq[item.Seq] = localBatch;
 
-                            Interlocked.Add(ref resolved, localResolved);
+                            while (resolvedBySeq.Remove(nextDrainSeq, out var ready))
+                            {
+                                events.AddRange(ready);
+                                nextDrainSeq++;
+                            }
 
                             // Eager first paint: once the first screenful of (newest, because the read is reversed)
-                            // events is resolved, dispatch them immediately instead of waiting for the 3-second timer.
+                            // events has drained in order, dispatch immediately instead of waiting for the 3s timer.
                             // Fires exactly once across the resolve workers and reuses the shared partial cursor.
-                            if (Volatile.Read(ref resolved) >= EagerFirstPaintThreshold &&
-                                Interlocked.Exchange(ref eagerFired, 1) == 0)
+                            if (events.Count >= EagerFirstPaintThreshold && Interlocked.Exchange(ref eagerFired, 1) == 0)
                             {
-                                TryDispatchPartial();
+                                dispatchEager = true;
                             }
                         }
+
+                        Interlocked.Add(ref resolved, localResolved);
+
+                        if (dispatchEager) { TryDispatchPartial(); }
                     }
                     finally
                     {
@@ -526,25 +544,22 @@ await Parallel.ForEachAsync(
 
         void TryDispatchPartial()
         {
-            List<ResolvedEvent> delta;
-
-            lock (events)
+            lock (partialDispatchGate)
             {
-                int fromIndex = lastPartialIndex;
+                List<ResolvedEvent> delta;
 
-                if (events.Count <= fromIndex) { return; }
+                lock (events)
+                {
+                    int fromIndex = lastPartialIndex;
 
-                delta = events.GetRange(fromIndex, events.Count - fromIndex);
-                lastPartialIndex = events.Count;
-            }
+                    if (events.Count <= fromIndex) { return; }
 
-            // Parallel resolution finishes batches out of order, so sort this delta newest-first (matching the final
-            // LoadEventsAction sort) before it is appended to the raw store. With the reverse newest-first read each
-            // delta covers an older range than the last, so the raw store stays index-0-is-newest for the
-            // date-range/endpoint queries that read it during load.
-            delta.Sort((a, b) => Comparer<long?>.Default.Compare(b.RecordId, a.RecordId));
+                    delta = events.GetRange(fromIndex, events.Count - fromIndex);
+                    lastPartialIndex = events.Count;
+                }
 
-            dispatcher.Dispatch(new LoadEventsPartialAction(logData, delta.AsReadOnly()));
+                dispatcher.Dispatch(new LoadEventsPartialAction(logData, delta.AsReadOnly()));
+            }
         }
     }
 }
diff --git a/tests/Unit/EventLogExpert.Runtime.Tests/EventLog/EffectsTests.cs b/tests/Unit/EventLogExpert.Runtime.Tests/EventLog/EffectsTests.cs
index fe07f323f..8b9a8fccc 100644
--- a/tests/Unit/EventLogExpert.Runtime.Tests/EventLog/EffectsTests.cs
+++ b/tests/Unit/EventLogExpert.Runtime.Tests/EventLog/EffectsTests.cs
@@ -1991,6 +1991,29 @@ public async Task HandleOpenLog_ReverseEagerLoad_PartialDeltasAreSortedNewestFir
         }
     }
 
+    [Fact]
+    public async Task HandleOpenLog_ReverseEagerLoad_PartialDeltasStayNewestFirstAcrossDeltasDespiteLateNewestBatch()
+    {
+        const int Total = 250;
+        var fakeFactory = new FakeEventLogReaderFactory(
+            new FakeEventLogReader(BuildReverseBatches(Total, batchSize: 30), newestBookmark: "NEWEST"));
+
+        var (openLog, dispatcher, _) = CreateEagerLoadEffects(
+            fakeFactory,
+            resolveDelayMs: recordId => recordId > Total - 30 ? 25 : 0);
+
+        await openLog.HandleOpenLog(new OpenLogAction(Constants.LogNameApplication, LogPathType.Channel), dispatcher);
+
+        var partialIds = AllPartialEvents(dispatcher).Select(resolved => resolved.RecordId).ToList();
+        Assert.NotEmpty(partialIds);
+
+        // Strictly newest-first across every delta (no cross-delta inversion).
+        Assert.Equal(partialIds.OrderByDescending(id => id).ToList(), partialIds);
+
+        var finalIds = SingleFinalEvents(dispatcher).Select(resolved => resolved.RecordId).ToList();
+        Assert.Equal(finalIds.Take(partialIds.Count).ToList(), partialIds);
+    }
+
     [Fact]
     public async Task HandleOpenLog_ReverseEagerLoad_SeedsWatcherFromNewestBookmark()
     {

From 0559fee92f9b3e608e0166fe3d3fbf300dd38b18 Mon Sep 17 00:00:00 2001
From: jschick04 <jschick04@gmail.com>
Date: Sun, 21 Jun 2026 17:03:02 -0500
Subject: [PATCH 38/40] Document the self-contained multi-arch bundle install
 and update

---
 README.md                       | 14 ++++----------
 docs/Updates-And-Diagnostics.md |  2 +-
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/README.md b/README.md
index a1fd7005a..d35b5cab1 100644
--- a/README.md
+++ b/README.md
@@ -21,20 +21,14 @@ For more information, check our [docs](docs/Home.md).
 
 ## Quick Start
 
-Download the `EventLogExpert_{version}_x64.appinstaller` (or the matching `EventLogExpert_{version}_x64.msix`) from the latest release and run it: <https://github.com/microsoft/EventLogExpert/releases/latest>.
+Download `EventLogExpert_{version}.msixbundle` from the latest release and double-click it to install: <https://github.com/microsoft/EventLogExpert/releases/latest>.
 
-The `.appinstaller` declares its dependency on the Windows App Runtime (currently `Microsoft.WindowsAppRuntime.1.7.msix`, also published in the same release) so App Installer fetches the runtime automatically on a clean machine. Updates are checked on launch.
+The bundle runs natively on both x64 and ARM64, and Windows installs the matching architecture automatically. It is self-contained (the Windows App Runtime ships inside the package), so there is no separate runtime to install. Updates are checked on launch.
 
-If you'd rather install the runtime manually first, grab `Microsoft.WindowsAppRuntime.1.7.msix` from the release and install it with:
+Prefer the command line? Install the same bundle with:
 
 ```
-Add-AppxPackage $home\Downloads\Microsoft.WindowsAppRuntime.1.7.msix
-```
-
-Then install the app:
-
-```
-Add-AppxPackage $home\Downloads\EventLogExpert_{version}_x64.msix
+Add-AppxPackage $home\Downloads\EventLogExpert_{version}.msixbundle
 ```
 
 ### First time setup
diff --git a/docs/Updates-And-Diagnostics.md b/docs/Updates-And-Diagnostics.md
index 3e92af55a..de37b3a35 100644
--- a/docs/Updates-And-Diagnostics.md
+++ b/docs/Updates-And-Diagnostics.md
@@ -29,7 +29,7 @@ The check ends with one of four user-facing alerts:
 
 Background checks (the automatic check that runs on app start) surface `Update Available` so a fresh release is offered as soon as the app launches. The other three alerts are suppressed on background checks so a missing network at startup does not produce a popup. `Update Failure` does fire on a background check, but only after you've accepted the `Update Available` prompt and the resulting installer attempt fails; pre-prompt failures (e.g., feed unreachable, or you click `No` on the prompt and the queued-for-next-restart scheduling fails) stay silent and only land in the debug log.
 
-The `.appinstaller` distributed with each release also wires up app-installer-driven background update checks on every launch, so this entry is mostly for "what's the latest right now" — the app finds new releases on its own.
+Because the app already runs that background check on launch, the `Check for Updates` entry is mostly a manual "what's the latest right now" lookup; the app finds new releases on its own.
 
 ### Release Notes
 

From 563732d17e02dc96cc9ecaf7d35f7af16ac24cc2 Mon Sep 17 00:00:00 2001
From: jschick04 <jschick04@gmail.com>
Date: Sun, 21 Jun 2026 17:34:41 -0500
Subject: [PATCH 39/40] Fix doc screenshots hidden by a same-line HTML comment

---
 docs/Filtering.md               | 3 ++-
 docs/Saved-Filters.md           | 3 ++-
 docs/Settings.md                | 3 ++-
 docs/Updates-And-Diagnostics.md | 3 ++-
 docs/Viewing-Events.md          | 3 ++-
 5 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/docs/Filtering.md b/docs/Filtering.md
index 69ece4dce..801070076 100644
--- a/docs/Filtering.md
+++ b/docs/Filtering.md
@@ -4,7 +4,8 @@
 
 The Filter pane sits above the event table. Every event in the active log set is evaluated against the applied filters; non-matches are hidden.
 
-<!-- screenshot: filter-pane --> ![Filter pane header showing the left-side action buttons, active-filter indicator, and right-side icon trio](.images/filter-pane.png)
+<!-- screenshot: filter-pane -->
+![Filter pane header showing the left-side action buttons, active-filter indicator, and right-side icon trio](.images/filter-pane.png)
 
 The pane header carries the row-adding actions on the left and the persistence / management actions on the right:
 
diff --git a/docs/Saved-Filters.md b/docs/Saved-Filters.md
index 3b7921a92..41ef2a4ed 100644
--- a/docs/Saved-Filters.md
+++ b/docs/Saved-Filters.md
@@ -6,7 +6,8 @@ The Filter Library is the single persisted surface for filter reuse. It replaces
 
 Open it from the [Filter pane](Filtering.md) header — the bookmarks icon labeled `Open Filter Library`. When the library fails to load or is still loading, the filter pane's `Recent` menu item and the `Apply Filter Set` picker surface guidance pointing back to this same button (the library does not auto-open from those flows).
 
-<!-- screenshot: filter-library-saved --> ![Filter Library modal, Saved tab](.images/filter-library-saved.png)
+<!-- screenshot: filter-library-saved -->
+![Filter Library modal, Saved tab](.images/filter-library-saved.png)
 
 ### Modal layout
 
diff --git a/docs/Settings.md b/docs/Settings.md
index 4b7f407b3..b7f3fd91a 100644
--- a/docs/Settings.md
+++ b/docs/Settings.md
@@ -6,7 +6,8 @@
 
 `Save` writes the form fields and any pending enable/disable toggles you've made on database rows; `Exit` discards them. `Remove` and `Upgrade` are immediate side effects that persist regardless of `Save` / `Exit`. `Import Database` is also immediate, but a successful import additionally applies any pending form fields and toggles and closes the modal — make any other changes you want to keep before clicking it.
 
-<!-- screenshot: settings-modal --> ![Settings modal](.images/settings-modal.png)
+<!-- screenshot: settings-modal -->
+![Settings modal](.images/settings-modal.png)
 
 ### Time Zone
 
diff --git a/docs/Updates-And-Diagnostics.md b/docs/Updates-And-Diagnostics.md
index de37b3a35..31fd2f1c0 100644
--- a/docs/Updates-And-Diagnostics.md
+++ b/docs/Updates-And-Diagnostics.md
@@ -39,7 +39,8 @@ Opens the Release Notes modal, which renders the markdown body of the published
 
 Opens the Debug Log modal — the in-app view of the rolling diagnostic log written by the running session. The same log is also accessible as a file under the per-user app data directory; `View Logs` is the in-app surface.
 
-<!-- screenshot: debug-log-modal --> ![Debug Log modal](.images/debug-log-modal.png)
+<!-- screenshot: debug-log-modal -->
+![Debug Log modal](.images/debug-log-modal.png)
 
 Filter bar:
 
diff --git a/docs/Viewing-Events.md b/docs/Viewing-Events.md
index 3ae1b300b..b9a03aa12 100644
--- a/docs/Viewing-Events.md
+++ b/docs/Viewing-Events.md
@@ -4,7 +4,8 @@
 
 The main view has three regions: the **tab strip** (one tab per open log, plus a `Combined` tab when more than one log is open), the **event table**, and the **Details pane** (collapsible, bottom). The status bar runs along the very bottom — see [Opening Logs](Opening-Logs.md#live-log-behavior) for what it shows for live logs.
 
-<!-- screenshot: main-view --> ![Main view: tabs, event table, Details pane](.images/EventLogExpert-CombinedView.png)
+<!-- screenshot: main-view -->
+![Main view: tabs, event table, Details pane](.images/EventLogExpert-CombinedView.png)
 
 ### Tab strip
 

From e4c460db687fdb68fa8ff5d0c297e84cab3ea815 Mon Sep 17 00:00:00 2001
From: jschick04 <jschick04@gmail.com>
Date: Sun, 21 Jun 2026 17:35:00 -0500
Subject: [PATCH 40/40] Use the dashboard splash as the README hero and note
 requirements

---
 README.md                                 |   4 +++-
 docs/.images/EventLogExpert-Dashboard.png | Bin 0 -> 86408 bytes
 2 files changed, 3 insertions(+), 1 deletion(-)
 create mode 100644 docs/.images/EventLogExpert-Dashboard.png

diff --git a/README.md b/README.md
index d35b5cab1..8cab9bac7 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 A Windows Event Log viewer for tech support and IT professionals.
 
-![Screenshot showing a filtered combined view of three event logs](docs/.images/EventLogExpert-CombinedView.png)
+![EventLogExpert dashboard: Quick Launch live-log buttons and a categorized library of common investigations](docs/.images/EventLogExpert-Dashboard.png)
 
 ## Key features
 
@@ -25,6 +25,8 @@ Download `EventLogExpert_{version}.msixbundle` from the latest release and doubl
 
 The bundle runs natively on both x64 and ARM64, and Windows installs the matching architecture automatically. It is self-contained (the Windows App Runtime ships inside the package), so there is no separate runtime to install. Updates are checked on launch.
 
+**Requirements:** Windows 11, Windows Server 2022, or Windows Server 2025 (x64 or ARM64).
+
 Prefer the command line? Install the same bundle with:
 
 ```
diff --git a/docs/.images/EventLogExpert-Dashboard.png b/docs/.images/EventLogExpert-Dashboard.png
new file mode 100644
index 0000000000000000000000000000000000000000..4ea6a2d8f54bfe6bad1be38628a8b68623f6e8d9
GIT binary patch
literal 86408
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
B3NHWv

literal 0
HcmV?d00001