Merge pull request #26 from carterscode/fix/silent-apply-popup-and-race

fix: silent-apply popup + race-write + notification header

Author: carterscode

src/GamerGuardian/Monitors/SettingsSearchAiMonitor.cs

@@ -52,7 +52,18 @@ public IEnumerable<DriftItem> CheckDrift(AppConfig config)
             using var advanced = Registry.CurrentUser.OpenSubKey(AdvancedKey, writable: false);
             var disable = policy?.GetValue(PolicyVal) as int?;
             var companion = advanced?.GetValue(TaskbarCompanionVal) as int?;
-            bool off = disable == 1 && companion == 0;
+
+            // The PolicyVal (DisableSearchBoxSuggestions) is the primary signal
+            // and authoritative. The TaskbarCompanion value is a belt-and-
+            // suspenders write -- on many Windows builds the value name isn't
+            // recognized by Explorer and the write silently doesn't stick. We
+            // treat companion as "off" when it's absent OR explicitly 0; only
+            // companion == 1 counts as "companion still on". Without this,
+            // ReadCurrent would forever report "on" after Apply even though
+            // the user-visible search box AI suggestions are actually off.
+            bool searchSuggestionsOff = disable == 1;
+            bool companionOff = companion != 1;
+            bool off = searchSuggestionsOff && companionOff;
             return !off;
         }
         catch { return null; }

src/GamerGuardian/Services/MonitorService.cs

@@ -138,7 +138,14 @@ private async Task TickAsync()
                 try { drifted.AddRange(m.CheckDrift(config).Where(d => d.IsMonitored)); }
                 catch { /* swallow per-monitor failure to keep loop alive */ }
             }
-            _store.Save(config);
+            // NOTE: do NOT _store.Save(config) here. The tick's `config` is a
+            // local snapshot loaded at the top of TickAsync; writing it back
+            // races with the user's Settings-window Apply: if the user saves
+            // a new draft between our Load and Save, our save overwrites the
+            // user's just-saved prefs (silently dropping any newly-added
+            // properties -- e.g. the v0.1.39 Windows AI prefs). CheckDrift
+            // doesn't mutate config anyway, so the save was a no-op except
+            // for triggering this race. Removed in v0.1.40.
 
             // External-reset detection happens BEFORE auto-apply so we log the
             // cause (EXTRESET) and the effect (the corrective apply) as two

src/GamerGuardian/Services/NotificationHeader.cs

@@ -0,0 +1,50 @@
+using GamerGuardian.Models;
+
+namespace GamerGuardian.Services;
+
+/// <summary>
+/// Picks the notification window's header text based on what's actually in
+/// the drift report. Replaces the old hard-coded "Display settings have
+/// drifted" string that appeared even when no displays were involved (e.g.
+/// a Windows-AI policy drifting). The drift item's DisplayKey is the
+/// grouping signal; if a single category dominates the report we name it,
+/// otherwise we use a category-agnostic "Monitored settings" header.
+/// </summary>
+public static class NotificationHeader
+{
+    public static string For(DriftReport report)
+    {
+        if (report is null || report.Items.Count == 0)
+            return "Monitored settings have drifted";
+
+        var keys = report.Items.Select(i => i.DisplayKey).Distinct().ToList();
+        if (keys.Count == 1)
+        {
+            var single = report.Items.Count == 1;
+            var noun = keys[0] switch
+            {
+                "global"  => "Global gaming setting",
+                "ai"      => "Windows AI setting",
+                "ai-app"  => "Windows AI app",
+                "service" => "Windows service",
+                "display" => "Display setting",
+                _         => "Monitored setting"
+            };
+            // Pluralize the noun when there are multiple items, except for
+            // proper-noun "Windows AI app" which we'll just leave as singular
+            // since multiples are rare.
+            var pluralNoun = single ? noun
+                : keys[0] switch
+                {
+                    "service" => "Windows services",
+                    "display" => "Display settings",
+                    "global"  => "Global gaming settings",
+                    "ai"      => "Windows AI settings",
+                    "ai-app"  => "Windows AI apps",
+                    _         => "Monitored settings"
+                };
+            return $"{(single ? noun : pluralNoun)} {(single ? "has" : "have")} drifted";
+        }
+        return $"{report.Items.Count} monitored settings have drifted";
+    }
+}

src/GamerGuardian/UI/NotificationWindow.xaml

@@ -25,7 +25,8 @@
         </ui:TitleBar>
 
         <StackPanel Grid.Row="1" Margin="20,8,20,16">
-            <TextBlock Text="Display settings have drifted"
+            <TextBlock x:Name="HeaderText"
+                       Text="Monitored settings have drifted"
                        FontSize="16" FontWeight="SemiBold"
                        Margin="0,0,0,12"/>
             <ItemsControl x:Name="ItemsList" Margin="0,0,0,12">

src/GamerGuardian/UI/NotificationWindow.xaml.cs

@@ -13,6 +13,7 @@ public NotificationWindow(DriftReport report)
         InitializeComponent();
         _report = report;
         ItemsList.ItemsSource = report.Items;
+        HeaderText.Text = Services.NotificationHeader.For(report);
         Loaded += OnLoaded;
     }
 

tests/GamerGuardian.Tests/NotificationHeaderTests.cs

@@ -0,0 +1,95 @@
+using GamerGuardian.Models;
+using GamerGuardian.Services;
+using Xunit;
+
+namespace GamerGuardian.Tests;
+
+public class NotificationHeaderTests
+{
+    private static DriftItem Item(string displayKey, string label = "x") => new(
+        SettingId: $"{displayKey}:test",
+        DisplayKey: displayKey,
+        DisplayLabel: label,
+        Description: $"{label} -- test",
+        CurrentValue: "On",
+        DesiredValue: "Off",
+        AutoApply: false,
+        Apply: () => Task.CompletedTask);
+
+    [Fact]
+    public void EmptyReport_GenericHeader()
+    {
+        var h = NotificationHeader.For(new DriftReport(Array.Empty<DriftItem>()));
+        Assert.Equal("Monitored settings have drifted", h);
+    }
+
+    [Fact]
+    public void NullReport_GenericHeader()
+    {
+        Assert.Equal("Monitored settings have drifted", NotificationHeader.For(null!));
+    }
+
+    [Fact]
+    public void SingleAiPolicy_SaysWindowsAi()
+    {
+        // The bug we're fixing: this used to say "Display settings have drifted"
+        // even for an AI policy drift. Verify the AI category is named correctly.
+        var h = NotificationHeader.For(new DriftReport(new[] { Item("ai") }));
+        Assert.Equal("Windows AI setting has drifted", h);
+        Assert.DoesNotContain("Display", h);
+    }
+
+    [Fact]
+    public void MultipleAiPolicies_PluralForm()
+    {
+        var h = NotificationHeader.For(new DriftReport(new[] { Item("ai"), Item("ai") }));
+        Assert.Equal("Windows AI settings have drifted", h);
+    }
+
+    [Fact]
+    public void SingleService_SingularForm()
+    {
+        var h = NotificationHeader.For(new DriftReport(new[] { Item("service") }));
+        Assert.Equal("Windows service has drifted", h);
+    }
+
+    [Fact]
+    public void MultipleServices_PluralForm()
+    {
+        var h = NotificationHeader.For(new DriftReport(new[] { Item("service"), Item("service") }));
+        Assert.Equal("Windows services have drifted", h);
+    }
+
+    [Fact]
+    public void SingleDisplay_SingularForm()
+    {
+        var h = NotificationHeader.For(new DriftReport(new[] { Item("display") }));
+        Assert.Equal("Display setting has drifted", h);
+    }
+
+    [Fact]
+    public void GlobalGaming_KnownLabel()
+    {
+        var h = NotificationHeader.For(new DriftReport(new[] { Item("global") }));
+        Assert.Equal("Global gaming setting has drifted", h);
+    }
+
+    [Fact]
+    public void MixedCategories_GenericCountHeader()
+    {
+        var h = NotificationHeader.For(new DriftReport(new[]
+        {
+            Item("ai"), Item("service"), Item("display")
+        }));
+        Assert.Equal("3 monitored settings have drifted", h);
+    }
+
+    [Fact]
+    public void UnknownCategory_FallsBackGracefully()
+    {
+        var h = NotificationHeader.For(new DriftReport(new[] { Item("madeup") }));
+        Assert.Contains("drifted", h);
+        // Doesn't crash or say "Display"
+        Assert.DoesNotContain("Display", h);
+    }
+}