From 7a54198af5fc498d784e5c87c3e9971f3ec41147 Mon Sep 17 00:00:00 2001
From: Ari Sulistiono <ari.sulistiono@gmail.com>
Date: Mon, 17 Aug 2026 03:43:40 +0700
Subject: [PATCH 01/10] Add deterministic global search clear UI patch

---
 scripts/patch-modern-global-search-clear.py | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 scripts/patch-modern-global-search-clear.py

diff --git a/scripts/patch-modern-global-search-clear.py b/scripts/patch-modern-global-search-clear.py
new file mode 100644
index 000000000..839e3cc9a
--- /dev/null
+++ b/scripts/patch-modern-global-search-clear.py
@@ -0,0 +1,19 @@
+from pathlib import Path
+
+path = Path("SignalSelectionWizardWindow.xaml")
+text = path.read_text(encoding="utf-8")
+
+resources_anchor = '''        </Style>\n    </Window.Resources>'''
+style = '''        </Style>\n\n        <!-- Modern search-field clear affordance: quiet at rest, obvious on hover/focus,\n             and large enough to hit without looking like a separate toolbar button. -->\n        <Style x:Key="GlobalSearchClearButton" TargetType="Button">\n            <Setter Property="Width" Value="28"/>\n            <Setter Property="Height" Value="28"/>\n            <Setter Property="Padding" Value="0"/>\n            <Setter Property="Margin" Value="2,0,3,0"/>\n            <Setter Property="Background" Value="Transparent"/>\n            <Setter Property="BorderBrush" Value="Transparent"/>\n            <Setter Property="BorderThickness" Value="1"/>\n            <Setter Property="Foreground" Value="#667085"/>\n            <Setter Property="Cursor" Value="Hand"/>\n            <Setter Property="HorizontalContentAlignment" Value="Center"/>\n            <Setter Property="VerticalContentAlignment" Value="Center"/>\n            <Setter Property="FocusVisualStyle" Value="{x:Null}"/>\n            <Setter Property="ClipToBounds" Value="False"/>\n            <Setter Property="Template">\n                <Setter.Value>\n                    <ControlTemplate TargetType="Button">\n                        <Border x:Name="Chrome"\n                                Width="28" Height="28"\n                                CornerRadius="8"\n                                Background="{TemplateBinding Background}"\n                                BorderBrush="{TemplateBinding BorderBrush}"\n                                BorderThickness="{TemplateBinding BorderThickness}"\n                                SnapsToDevicePixels="True">\n                            <ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center"/>\n                        </Border>\n                        <ControlTemplate.Triggers>\n                            <Trigger Property="IsMouseOver" Value="True">\n                                <Setter TargetName="Chrome" Property="Background" Value="#EEF3F8"/>\n                                <Setter TargetName="Chrome" Property="BorderBrush" Value="#D8E2EC"/>\n                                <Setter Property="Foreground" Value="#475467"/>\n                            </Trigger>\n                            <Trigger Property="IsPressed" Value="True">\n                                <Setter TargetName="Chrome" Property="Background" Value="#E3EBF4"/>\n                                <Setter TargetName="Chrome" Property="BorderBrush" Value="#C9D7E5"/>\n                            </Trigger>\n                            <Trigger Property="IsKeyboardFocused" Value="True">\n                                <Setter TargetName="Chrome" Property="Background" Value="#EEF4FF"/>\n                                <Setter TargetName="Chrome" Property="BorderBrush" Value="#7AA7F7"/>\n                                <Setter Property="Foreground" Value="#2563EB"/>\n                            </Trigger>\n                            <Trigger Property="IsEnabled" Value="False">\n                                <Setter TargetName="Chrome" Property="Opacity" Value="0.45"/>\n                            </Trigger>\n                        </ControlTemplate.Triggers>\n                    </ControlTemplate>\n                </Setter.Value>\n            </Setter>\n        </Style>\n    </Window.Resources>'''
+if text.count(resources_anchor) != 1:
+    raise SystemExit(f"Window.Resources anchor count={text.count(resources_anchor)}")
+text = text.replace(resources_anchor, style, 1)
+
+old_button = '''                        <Button Grid.Column="2"\n                                Content="×"\n                                Style="{StaticResource MiniChipButton}"\n                                Padding="8,2"\n                                Margin="3"\n                                Click="ClearGlobalFilter_Click"\n                                ToolTip="Clear global search"/>'''
+new_button = '''                        <Button x:Name="GlobalSearchClearButton"\n                                Grid.Column="2"\n                                Style="{StaticResource GlobalSearchClearButton}"\n                                Click="ClearGlobalFilter_Click"\n                                ToolTip="Clear search"\n                                AutomationProperties.Name="Clear global search">\n                            <Button.Style>\n                                <Style TargetType="Button" BasedOn="{StaticResource GlobalSearchClearButton}">\n                                    <Style.Triggers>\n                                        <DataTrigger Binding="{Binding Text, ElementName=GlobalSearchTextBox}" Value="">\n                                            <Setter Property="Visibility" Value="Collapsed"/>\n                                        </DataTrigger>\n                                    </Style.Triggers>\n                                </Style>\n                            </Button.Style>\n                            <Viewbox Width="14" Height="14"\n                                     HorizontalAlignment="Center" VerticalAlignment="Center"\n                                     Stretch="Uniform" SnapsToDevicePixels="True">\n                                <Path Data="{StaticResource LucideX}"\n                                      Fill="Transparent"\n                                      Stroke="{Binding Foreground, RelativeSource={RelativeSource AncestorType={x:Type Button}}}"\n                                      StrokeThickness="1.9"\n                                      StrokeStartLineCap="Round" StrokeEndLineCap="Round"\n                                      StrokeLineJoin="Round"/>\n                            </Viewbox>\n                        </Button>'''
+if text.count(old_button) != 1:
+    raise SystemExit(f"Legacy clear button anchor count={text.count(old_button)}")
+text = text.replace(old_button, new_button, 1)
+
+path.write_text(text, encoding="utf-8", newline="\n")
+print("Applied modern Lucide global-search clear control.")

From a346abb628319c161dd48c41c508983bf9efe951 Mon Sep 17 00:00:00 2001
From: Ari Sulistiono <ari.sulistiono@gmail.com>
Date: Mon, 17 Aug 2026 03:43:48 +0700
Subject: [PATCH 02/10] Run deterministic global search clear UI patch

---
 .../temp-apply-modern-global-search-clear.yml | 33 +++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 .github/workflows/temp-apply-modern-global-search-clear.yml

diff --git a/.github/workflows/temp-apply-modern-global-search-clear.yml b/.github/workflows/temp-apply-modern-global-search-clear.yml
new file mode 100644
index 000000000..480b5acb2
--- /dev/null
+++ b/.github/workflows/temp-apply-modern-global-search-clear.yml
@@ -0,0 +1,33 @@
+name: Temporary modern global search clear patch
+
+on:
+  push:
+    branches:
+      - ui/modern-global-search-clear
+
+permissions:
+  contents: write
+
+jobs:
+  patch:
+    if: github.actor != 'github-actions[bot]'
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          ref: ui/modern-global-search-clear
+          fetch-depth: 0
+      - run: python scripts/patch-modern-global-search-clear.py
+      - run: git diff --check
+      - name: Commit patched XAML
+        shell: bash
+        run: |
+          if git diff --quiet; then
+            echo "Patch already applied."
+            exit 0
+          fi
+          git config user.name "github-actions[bot]"
+          git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
+          git add SignalSelectionWizardWindow.xaml
+          git commit -m "Use modern Lucide clear control in global search"
+          git push origin HEAD:ui/modern-global-search-clear

From bdcbc512074ab44a7db31f98a165996cbeb489ee Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sun, 16 Aug 2026 20:43:58 +0000
Subject: [PATCH 03/10] Use modern Lucide clear control in global search

---
 SignalSelectionWizardWindow.xaml | 83 +++++++++++++++++++++++++++++---
 1 file changed, 77 insertions(+), 6 deletions(-)

diff --git a/SignalSelectionWizardWindow.xaml b/SignalSelectionWizardWindow.xaml
index 3bbf58f31..a4a40a187 100644
--- a/SignalSelectionWizardWindow.xaml
+++ b/SignalSelectionWizardWindow.xaml
@@ -180,6 +180,58 @@
                 </Setter.Value>
             </Setter>
         </Style>
+
+        <!-- Modern search-field clear affordance: quiet at rest, obvious on hover/focus,
+             and large enough to hit without looking like a separate toolbar button. -->
+        <Style x:Key="GlobalSearchClearButton" TargetType="Button">
+            <Setter Property="Width" Value="28"/>
+            <Setter Property="Height" Value="28"/>
+            <Setter Property="Padding" Value="0"/>
+            <Setter Property="Margin" Value="2,0,3,0"/>
+            <Setter Property="Background" Value="Transparent"/>
+            <Setter Property="BorderBrush" Value="Transparent"/>
+            <Setter Property="BorderThickness" Value="1"/>
+            <Setter Property="Foreground" Value="#667085"/>
+            <Setter Property="Cursor" Value="Hand"/>
+            <Setter Property="HorizontalContentAlignment" Value="Center"/>
+            <Setter Property="VerticalContentAlignment" Value="Center"/>
+            <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
+            <Setter Property="ClipToBounds" Value="False"/>
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate TargetType="Button">
+                        <Border x:Name="Chrome"
+                                Width="28" Height="28"
+                                CornerRadius="8"
+                                Background="{TemplateBinding Background}"
+                                BorderBrush="{TemplateBinding BorderBrush}"
+                                BorderThickness="{TemplateBinding BorderThickness}"
+                                SnapsToDevicePixels="True">
+                            <ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                        </Border>
+                        <ControlTemplate.Triggers>
+                            <Trigger Property="IsMouseOver" Value="True">
+                                <Setter TargetName="Chrome" Property="Background" Value="#EEF3F8"/>
+                                <Setter TargetName="Chrome" Property="BorderBrush" Value="#D8E2EC"/>
+                                <Setter Property="Foreground" Value="#475467"/>
+                            </Trigger>
+                            <Trigger Property="IsPressed" Value="True">
+                                <Setter TargetName="Chrome" Property="Background" Value="#E3EBF4"/>
+                                <Setter TargetName="Chrome" Property="BorderBrush" Value="#C9D7E5"/>
+                            </Trigger>
+                            <Trigger Property="IsKeyboardFocused" Value="True">
+                                <Setter TargetName="Chrome" Property="Background" Value="#EEF4FF"/>
+                                <Setter TargetName="Chrome" Property="BorderBrush" Value="#7AA7F7"/>
+                                <Setter Property="Foreground" Value="#2563EB"/>
+                            </Trigger>
+                            <Trigger Property="IsEnabled" Value="False">
+                                <Setter TargetName="Chrome" Property="Opacity" Value="0.45"/>
+                            </Trigger>
+                        </ControlTemplate.Triggers>
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
+        </Style>
     </Window.Resources>
 
     <Grid Margin="12">
@@ -246,13 +298,32 @@
                                 </Style>
                             </TextBlock.Style>
                         </TextBlock>
-                        <Button Grid.Column="2"
-                                Content="×"
-                                Style="{StaticResource MiniChipButton}"
-                                Padding="8,2"
-                                Margin="3"
+                        <Button x:Name="GlobalSearchClearButton"
+                                Grid.Column="2"
+                                Style="{StaticResource GlobalSearchClearButton}"
                                 Click="ClearGlobalFilter_Click"
-                                ToolTip="Clear global search"/>
+                                ToolTip="Clear search"
+                                AutomationProperties.Name="Clear global search">
+                            <Button.Style>
+                                <Style TargetType="Button" BasedOn="{StaticResource GlobalSearchClearButton}">
+                                    <Style.Triggers>
+                                        <DataTrigger Binding="{Binding Text, ElementName=GlobalSearchTextBox}" Value="">
+                                            <Setter Property="Visibility" Value="Collapsed"/>
+                                        </DataTrigger>
+                                    </Style.Triggers>
+                                </Style>
+                            </Button.Style>
+                            <Viewbox Width="14" Height="14"
+                                     HorizontalAlignment="Center" VerticalAlignment="Center"
+                                     Stretch="Uniform" SnapsToDevicePixels="True">
+                                <Path Data="{StaticResource LucideX}"
+                                      Fill="Transparent"
+                                      Stroke="{Binding Foreground, RelativeSource={RelativeSource AncestorType={x:Type Button}}}"
+                                      StrokeThickness="1.9"
+                                      StrokeStartLineCap="Round" StrokeEndLineCap="Round"
+                                      StrokeLineJoin="Round"/>
+                            </Viewbox>
+                        </Button>
                     </Grid>
                 </Border>
 

From f9890ad61b1d3935ec075ce6473053674c4a837d Mon Sep 17 00:00:00 2001
From: Ari Sulistiono <ari.sulistiono@gmail.com>
Date: Mon, 17 Aug 2026 03:44:25 +0700
Subject: [PATCH 04/10] Make global search clear patch XAML-safe

---
 scripts/patch-modern-global-search-clear.py | 26 ++++++++++++---------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/scripts/patch-modern-global-search-clear.py b/scripts/patch-modern-global-search-clear.py
index 839e3cc9a..ff919fa4f 100644
--- a/scripts/patch-modern-global-search-clear.py
+++ b/scripts/patch-modern-global-search-clear.py
@@ -3,17 +3,21 @@
 path = Path("SignalSelectionWizardWindow.xaml")
 text = path.read_text(encoding="utf-8")
 
-resources_anchor = '''        </Style>\n    </Window.Resources>'''
-style = '''        </Style>\n\n        <!-- Modern search-field clear affordance: quiet at rest, obvious on hover/focus,\n             and large enough to hit without looking like a separate toolbar button. -->\n        <Style x:Key="GlobalSearchClearButton" TargetType="Button">\n            <Setter Property="Width" Value="28"/>\n            <Setter Property="Height" Value="28"/>\n            <Setter Property="Padding" Value="0"/>\n            <Setter Property="Margin" Value="2,0,3,0"/>\n            <Setter Property="Background" Value="Transparent"/>\n            <Setter Property="BorderBrush" Value="Transparent"/>\n            <Setter Property="BorderThickness" Value="1"/>\n            <Setter Property="Foreground" Value="#667085"/>\n            <Setter Property="Cursor" Value="Hand"/>\n            <Setter Property="HorizontalContentAlignment" Value="Center"/>\n            <Setter Property="VerticalContentAlignment" Value="Center"/>\n            <Setter Property="FocusVisualStyle" Value="{x:Null}"/>\n            <Setter Property="ClipToBounds" Value="False"/>\n            <Setter Property="Template">\n                <Setter.Value>\n                    <ControlTemplate TargetType="Button">\n                        <Border x:Name="Chrome"\n                                Width="28" Height="28"\n                                CornerRadius="8"\n                                Background="{TemplateBinding Background}"\n                                BorderBrush="{TemplateBinding BorderBrush}"\n                                BorderThickness="{TemplateBinding BorderThickness}"\n                                SnapsToDevicePixels="True">\n                            <ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center"/>\n                        </Border>\n                        <ControlTemplate.Triggers>\n                            <Trigger Property="IsMouseOver" Value="True">\n                                <Setter TargetName="Chrome" Property="Background" Value="#EEF3F8"/>\n                                <Setter TargetName="Chrome" Property="BorderBrush" Value="#D8E2EC"/>\n                                <Setter Property="Foreground" Value="#475467"/>\n                            </Trigger>\n                            <Trigger Property="IsPressed" Value="True">\n                                <Setter TargetName="Chrome" Property="Background" Value="#E3EBF4"/>\n                                <Setter TargetName="Chrome" Property="BorderBrush" Value="#C9D7E5"/>\n                            </Trigger>\n                            <Trigger Property="IsKeyboardFocused" Value="True">\n                                <Setter TargetName="Chrome" Property="Background" Value="#EEF4FF"/>\n                                <Setter TargetName="Chrome" Property="BorderBrush" Value="#7AA7F7"/>\n                                <Setter Property="Foreground" Value="#2563EB"/>\n                            </Trigger>\n                            <Trigger Property="IsEnabled" Value="False">\n                                <Setter TargetName="Chrome" Property="Opacity" Value="0.45"/>\n                            </Trigger>\n                        </ControlTemplate.Triggers>\n                    </ControlTemplate>\n                </Setter.Value>\n            </Setter>\n        </Style>\n    </Window.Resources>'''
-if text.count(resources_anchor) != 1:
-    raise SystemExit(f"Window.Resources anchor count={text.count(resources_anchor)}")
-text = text.replace(resources_anchor, style, 1)
+old = '''                        <Button x:Name="GlobalSearchClearButton"\n                                Grid.Column="2"\n                                Style="{StaticResource GlobalSearchClearButton}"\n                                Click="ClearGlobalFilter_Click"'''
+new = '''                        <Button x:Name="GlobalSearchClearButton"\n                                Grid.Column="2"\n                                Click="ClearGlobalFilter_Click"'''
 
-old_button = '''                        <Button Grid.Column="2"\n                                Content="×"\n                                Style="{StaticResource MiniChipButton}"\n                                Padding="8,2"\n                                Margin="3"\n                                Click="ClearGlobalFilter_Click"\n                                ToolTip="Clear global search"/>'''
-new_button = '''                        <Button x:Name="GlobalSearchClearButton"\n                                Grid.Column="2"\n                                Style="{StaticResource GlobalSearchClearButton}"\n                                Click="ClearGlobalFilter_Click"\n                                ToolTip="Clear search"\n                                AutomationProperties.Name="Clear global search">\n                            <Button.Style>\n                                <Style TargetType="Button" BasedOn="{StaticResource GlobalSearchClearButton}">\n                                    <Style.Triggers>\n                                        <DataTrigger Binding="{Binding Text, ElementName=GlobalSearchTextBox}" Value="">\n                                            <Setter Property="Visibility" Value="Collapsed"/>\n                                        </DataTrigger>\n                                    </Style.Triggers>\n                                </Style>\n                            </Button.Style>\n                            <Viewbox Width="14" Height="14"\n                                     HorizontalAlignment="Center" VerticalAlignment="Center"\n                                     Stretch="Uniform" SnapsToDevicePixels="True">\n                                <Path Data="{StaticResource LucideX}"\n                                      Fill="Transparent"\n                                      Stroke="{Binding Foreground, RelativeSource={RelativeSource AncestorType={x:Type Button}}}"\n                                      StrokeThickness="1.9"\n                                      StrokeStartLineCap="Round" StrokeEndLineCap="Round"\n                                      StrokeLineJoin="Round"/>\n                            </Viewbox>\n                        </Button>'''
-if text.count(old_button) != 1:
-    raise SystemExit(f"Legacy clear button anchor count={text.count(old_button)}")
-text = text.replace(old_button, new_button, 1)
+if old in text:
+    text = text.replace(old, new, 1)
+elif new not in text:
+    raise SystemExit("Modern global-search clear button was not found in expected shape.")
+
+# The local style inherits the reusable visual style and owns only the visibility trigger.
+if '<Button.Style>' not in text or 'BasedOn="{StaticResource GlobalSearchClearButton}"' not in text:
+    raise SystemExit("Expected local Button.Style/visibility trigger is missing.")
+if 'Data="{StaticResource LucideX}"' not in text:
+    raise SystemExit("Expected LucideX vector icon is missing.")
+if 'Content="×"' in text:
+    raise SystemExit("Legacy text multiplication-sign clear glyph is still present.")
 
 path.write_text(text, encoding="utf-8", newline="\n")
-print("Applied modern Lucide global-search clear control.")
+print("Validated modern Lucide clear button and removed duplicate Style assignment.")

From a26f3ee533db5f2d9b112ecdd5b722806c99ffa6 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sun, 16 Aug 2026 20:44:35 +0000
Subject: [PATCH 05/10] Use modern Lucide clear control in global search

---
 SignalSelectionWizardWindow.xaml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/SignalSelectionWizardWindow.xaml b/SignalSelectionWizardWindow.xaml
index a4a40a187..5a5c8b46c 100644
--- a/SignalSelectionWizardWindow.xaml
+++ b/SignalSelectionWizardWindow.xaml
@@ -300,7 +300,6 @@
                         </TextBlock>
                         <Button x:Name="GlobalSearchClearButton"
                                 Grid.Column="2"
-                                Style="{StaticResource GlobalSearchClearButton}"
                                 Click="ClearGlobalFilter_Click"
                                 ToolTip="Clear search"
                                 AutomationProperties.Name="Clear global search">

From d064c33d6cfeccdc9b6c1865045442b37006b4da Mon Sep 17 00:00:00 2001
From: Ari Sulistiono <ari.sulistiono@gmail.com>
Date: Mon, 17 Aug 2026 03:44:49 +0700
Subject: [PATCH 06/10] Re-run XAML-safe clear button patch

---
 .github/workflows/temp-apply-modern-global-search-clear.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/temp-apply-modern-global-search-clear.yml b/.github/workflows/temp-apply-modern-global-search-clear.yml
index 480b5acb2..46e4c302f 100644
--- a/.github/workflows/temp-apply-modern-global-search-clear.yml
+++ b/.github/workflows/temp-apply-modern-global-search-clear.yml
@@ -29,5 +29,5 @@ jobs:
           git config user.name "github-actions[bot]"
           git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
           git add SignalSelectionWizardWindow.xaml
-          git commit -m "Use modern Lucide clear control in global search"
+          git commit -m "Make modern Lucide clear control XAML-safe"
           git push origin HEAD:ui/modern-global-search-clear

From 23ba20405a2208d317eee047639447366d1b2af7 Mon Sep 17 00:00:00 2001
From: Ari Sulistiono <ari.sulistiono@gmail.com>
Date: Mon, 17 Aug 2026 03:45:15 +0700
Subject: [PATCH 07/10] Add regression guard for modern global search clear
 control

---
 ...lectionGlobalSearchClearRegressionTests.cs | 76 +++++++++++++++++++
 1 file changed, 76 insertions(+)
 create mode 100644 tests/ARSAS.Tests/SignalSelectionGlobalSearchClearRegressionTests.cs

diff --git a/tests/ARSAS.Tests/SignalSelectionGlobalSearchClearRegressionTests.cs b/tests/ARSAS.Tests/SignalSelectionGlobalSearchClearRegressionTests.cs
new file mode 100644
index 000000000..0260dbd14
--- /dev/null
+++ b/tests/ARSAS.Tests/SignalSelectionGlobalSearchClearRegressionTests.cs
@@ -0,0 +1,76 @@
+using System.Xml.Linq;
+
+namespace ARSAS.Tests;
+
+public sealed class SignalSelectionGlobalSearchClearRegressionTests
+{
+    [Fact]
+    public void GlobalSearchClear_UsesLucideVectorModernHitTargetAndHidesWhenEmpty()
+    {
+        var source = File.ReadAllText(FindRepoFile("SignalSelectionWizardWindow.xaml"));
+        var document = XDocument.Parse(source);
+        XNamespace presentation = "http://schemas.microsoft.com/winfx/2006/xaml/presentation";
+        XNamespace x = "http://schemas.microsoft.com/winfx/2006/xaml";
+
+        var reusableStyle = document.Descendants(presentation + "Style")
+            .Single(style => (string?)style.Attribute(x + "Key") == "GlobalSearchClearButton");
+        var reusableSetters = reusableStyle.Elements(presentation + "Setter").ToArray();
+
+        string? SetterValue(string property)
+            => reusableSetters.Single(setter => (string?)setter.Attribute("Property") == property)
+                .Attribute("Value")?.Value;
+
+        Assert.Equal("28", SetterValue("Width"));
+        Assert.Equal("28", SetterValue("Height"));
+        Assert.Equal("Transparent", SetterValue("Background"));
+        Assert.Equal("{x:Null}", SetterValue("FocusVisualStyle"));
+        Assert.Equal("False", SetterValue("ClipToBounds"));
+
+        var clearButton = document.Descendants(presentation + "Button")
+            .Single(button => (string?)button.Attribute(x + "Name") == "GlobalSearchClearButton");
+
+        Assert.Equal("ClearGlobalFilter_Click", (string?)clearButton.Attribute("Click"));
+        Assert.Equal("Clear search", (string?)clearButton.Attribute("ToolTip"));
+        Assert.Equal("Clear global search", (string?)clearButton.Attribute(presentation + "AutomationProperties.Name"));
+        Assert.Null(clearButton.Attribute("Content"));
+        Assert.Null(clearButton.Attribute("Style"));
+
+        var icon = clearButton.Descendants(presentation + "Path").Single();
+        Assert.Equal("{StaticResource LucideX}", (string?)icon.Attribute("Data"));
+        Assert.Equal("1.9", (string?)icon.Attribute("StrokeThickness"));
+
+        var viewbox = clearButton.Descendants(presentation + "Viewbox").Single();
+        Assert.Equal("14", (string?)viewbox.Attribute("Width"));
+        Assert.Equal("14", (string?)viewbox.Attribute("Height"));
+
+        var localStyle = clearButton.Element(presentation + "Button.Style")?
+            .Element(presentation + "Style")
+            ?? throw new Xunit.Sdk.XunitException("Global search clear button local style is missing.");
+        Assert.Equal("{StaticResource GlobalSearchClearButton}", (string?)localStyle.Attribute("BasedOn"));
+
+        var emptyTextTrigger = localStyle.Descendants(presentation + "DataTrigger")
+            .Single(trigger => (string?)trigger.Attribute("Value") == string.Empty);
+        Assert.Contains("ElementName=GlobalSearchTextBox", (string?)emptyTextTrigger.Attribute("Binding") ?? string.Empty, StringComparison.Ordinal);
+        Assert.Contains(emptyTextTrigger.Elements(presentation + "Setter"), setter =>
+            (string?)setter.Attribute("Property") == "Visibility" &&
+            (string?)setter.Attribute("Value") == "Collapsed");
+
+        Assert.DoesNotContain("Content=\"×\"", source, StringComparison.Ordinal);
+        Assert.DoesNotContain("Style=\"{StaticResource MiniChipButton}\"", clearButton.ToString(), StringComparison.Ordinal);
+    }
+
+    private static string FindRepoFile(string relativePath)
+    {
+        DirectoryInfo? directory = new(AppContext.BaseDirectory);
+        while (directory != null)
+        {
+            var candidate = Path.Combine(directory.FullName, relativePath);
+            if (File.Exists(candidate))
+                return candidate;
+            directory = directory.Parent;
+        }
+
+        throw new FileNotFoundException(
+            $"Could not locate repository file '{relativePath}' from '{AppContext.BaseDirectory}'.");
+    }
+}

From 95204fc1a29c485a5db77dd65f035ab7aad956c1 Mon Sep 17 00:00:00 2001
From: Ari Sulistiono <ari.sulistiono@gmail.com>
Date: Mon, 17 Aug 2026 03:45:36 +0700
Subject: [PATCH 08/10] Fix search clear accessibility regression assertion

---
 .../SignalSelectionGlobalSearchClearRegressionTests.cs          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/ARSAS.Tests/SignalSelectionGlobalSearchClearRegressionTests.cs b/tests/ARSAS.Tests/SignalSelectionGlobalSearchClearRegressionTests.cs
index 0260dbd14..2f5ce2275 100644
--- a/tests/ARSAS.Tests/SignalSelectionGlobalSearchClearRegressionTests.cs
+++ b/tests/ARSAS.Tests/SignalSelectionGlobalSearchClearRegressionTests.cs
@@ -31,7 +31,7 @@ public void GlobalSearchClear_UsesLucideVectorModernHitTargetAndHidesWhenEmpty()
 
         Assert.Equal("ClearGlobalFilter_Click", (string?)clearButton.Attribute("Click"));
         Assert.Equal("Clear search", (string?)clearButton.Attribute("ToolTip"));
-        Assert.Equal("Clear global search", (string?)clearButton.Attribute(presentation + "AutomationProperties.Name"));
+        Assert.Equal("Clear global search", (string?)clearButton.Attribute("AutomationProperties.Name"));
         Assert.Null(clearButton.Attribute("Content"));
         Assert.Null(clearButton.Attribute("Style"));
 

From 7307282d78173cc2608086ae63bbcf88afdb3b86 Mon Sep 17 00:00:00 2001
From: Ari Sulistiono <ari.sulistiono@gmail.com>
Date: Mon, 17 Aug 2026 03:45:52 +0700
Subject: [PATCH 09/10] Remove temporary global search clear patch script

---
 scripts/patch-modern-global-search-clear.py | 23 ---------------------
 1 file changed, 23 deletions(-)
 delete mode 100644 scripts/patch-modern-global-search-clear.py

diff --git a/scripts/patch-modern-global-search-clear.py b/scripts/patch-modern-global-search-clear.py
deleted file mode 100644
index ff919fa4f..000000000
--- a/scripts/patch-modern-global-search-clear.py
+++ /dev/null
@@ -1,23 +0,0 @@
-from pathlib import Path
-
-path = Path("SignalSelectionWizardWindow.xaml")
-text = path.read_text(encoding="utf-8")
-
-old = '''                        <Button x:Name="GlobalSearchClearButton"\n                                Grid.Column="2"\n                                Style="{StaticResource GlobalSearchClearButton}"\n                                Click="ClearGlobalFilter_Click"'''
-new = '''                        <Button x:Name="GlobalSearchClearButton"\n                                Grid.Column="2"\n                                Click="ClearGlobalFilter_Click"'''
-
-if old in text:
-    text = text.replace(old, new, 1)
-elif new not in text:
-    raise SystemExit("Modern global-search clear button was not found in expected shape.")
-
-# The local style inherits the reusable visual style and owns only the visibility trigger.
-if '<Button.Style>' not in text or 'BasedOn="{StaticResource GlobalSearchClearButton}"' not in text:
-    raise SystemExit("Expected local Button.Style/visibility trigger is missing.")
-if 'Data="{StaticResource LucideX}"' not in text:
-    raise SystemExit("Expected LucideX vector icon is missing.")
-if 'Content="×"' in text:
-    raise SystemExit("Legacy text multiplication-sign clear glyph is still present.")
-
-path.write_text(text, encoding="utf-8", newline="\n")
-print("Validated modern Lucide clear button and removed duplicate Style assignment.")

From 00f2adf02027102ee1f66994a3f7c075fab70f0e Mon Sep 17 00:00:00 2001
From: Ari Sulistiono <ari.sulistiono@gmail.com>
Date: Mon, 17 Aug 2026 03:45:59 +0700
Subject: [PATCH 10/10] Remove temporary global search clear patch workflow

---
 .../temp-apply-modern-global-search-clear.yml | 33 -------------------
 1 file changed, 33 deletions(-)
 delete mode 100644 .github/workflows/temp-apply-modern-global-search-clear.yml

diff --git a/.github/workflows/temp-apply-modern-global-search-clear.yml b/.github/workflows/temp-apply-modern-global-search-clear.yml
deleted file mode 100644
index 46e4c302f..000000000
--- a/.github/workflows/temp-apply-modern-global-search-clear.yml
+++ /dev/null
@@ -1,33 +0,0 @@
-name: Temporary modern global search clear patch
-
-on:
-  push:
-    branches:
-      - ui/modern-global-search-clear
-
-permissions:
-  contents: write
-
-jobs:
-  patch:
-    if: github.actor != 'github-actions[bot]'
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          ref: ui/modern-global-search-clear
-          fetch-depth: 0
-      - run: python scripts/patch-modern-global-search-clear.py
-      - run: git diff --check
-      - name: Commit patched XAML
-        shell: bash
-        run: |
-          if git diff --quiet; then
-            echo "Patch already applied."
-            exit 0
-          fi
-          git config user.name "github-actions[bot]"
-          git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
-          git add SignalSelectionWizardWindow.xaml
-          git commit -m "Make modern Lucide clear control XAML-safe"
-          git push origin HEAD:ui/modern-global-search-clear