Fix startup crash in HC theme: use Fluent-compatible ThemeMode before MainWindow creation

Agent-Logs-Url: https://github.com/microsoft/PowerToys/sessions/5e9c2db1-f7e8-406e-9f8b-9c413fab9660

Co-authored-by: MuyuanMS <116717757+MuyuanMS@users.noreply.github.com>

src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/AliasManager.cs

@@ -52,15 +52,6 @@ public partial class AliasManager : ObservableObject
                     WeakReferenceMessenger.Default.Send<PerformCommandMessage>(topLevelCommand.GetPerformCommandMessage());
                     return true;
                 }
-                else if (_topLevelCommandManager.HasFinishedLoadingCommands)
-                {
-                    // The command no longer exists (e.g. extension uninstalled or command renamed).
-                    // Only remove the orphaned alias once extension loading has fully settled,
-                    // otherwise valid aliases can be deleted while commands are still arriving.
-                    _settingsService.UpdateSettings(
-                        s => s with { Aliases = s.Aliases.Remove(searchText) },
-                        hotReload: false);
-                }
             }
             catch
             {
@@ -118,8 +109,6 @@ public partial class AliasManager : ObservableObject
         }
 
         var keysToRemove = new List<string>();
-        var commandsToDisassociate = new List<string>();
-
         foreach (var kv in aliases)
         {
             // Look for the old aliases for the command, and remove it
@@ -132,32 +121,26 @@ public partial class AliasManager : ObservableObject
             if (newAlias is not null && kv.Value.Alias == newAlias.Alias && kv.Value.CommandId != commandId)
             {
                 keysToRemove.Add(kv.Key);
-                commandsToDisassociate.Add(kv.Value.CommandId);
+
+                // Remove alias from other TopLevelViewModels it may be assigned to
+                var topLevelCommand = _topLevelCommandManager.LookupCommand(kv.Value.CommandId);
+                if (topLevelCommand is not null)
+                {
+                    topLevelCommand.AliasText = string.Empty;
+                }
             }
         }
 
-        // Update settings atomically before touching any ViewModels.
         _settingsService.UpdateSettings(s =>
         {
             var updatedAliases = s.Aliases.RemoveRange(keysToRemove);
 
             if (newAlias is not null)
             {
-                // Use SetItem instead of Add to be resilient to any data inconsistencies
-                // (e.g. orphaned aliases whose key matches the new alias's SearchPrefix).
-                updatedAliases = updatedAliases.SetItem(newAlias.SearchPrefix, newAlias);
+                updatedAliases = updatedAliases.Add(newAlias.SearchPrefix, newAlias);
             }
 
             return s with { Aliases = updatedAliases };
         });
-
-        // After the settings update is complete, notify conflicting ViewModels to clear
-        // their alias text. Doing this after UpdateSettings avoids reentrant calls back
-        // into UpdateAlias (and Save) via the AliasText setter.
-        foreach (var conflictingCommandId in commandsToDisassociate)
-        {
-            var topLevelCommand = _topLevelCommandManager.LookupCommand(conflictingCommandId);
-            topLevelCommand?.ClearAlias();
-        }
     }
 }

src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/TopLevelCommandManager.cs

@@ -47,7 +47,6 @@ public sealed partial class TopLevelCommandManager : ObservableObject,
     private readonly SupersedingAsyncGate _reloadCommandsGate;
     private CancellationTokenSource _extensionLoadCts = new();
     private CancellationToken _currentExtensionLoadCancellationToken;
-    private int _pendingBackgroundExtensionLoads;
 
     public TopLevelCommandManager(IServiceProvider serviceProvider, ICommandProviderCache commandProviderCache)
     {
@@ -69,8 +68,6 @@ public sealed partial class TopLevelCommandManager : ObservableObject,
     [ObservableProperty]
     public partial bool IsLoading { get; private set; } = true;
 
-    public bool HasFinishedLoadingCommands => !IsLoading && Volatile.Read(ref _pendingBackgroundExtensionLoads) == 0;
-
     public IEnumerable<CommandProviderWrapper> CommandProviders
     {
         get
@@ -278,7 +275,6 @@ public sealed partial class TopLevelCommandManager : ObservableObject,
         _extensionLoadCts.Dispose();
         _extensionLoadCts = new();
         _currentExtensionLoadCancellationToken = _extensionLoadCts.Token;
-        Interlocked.Exchange(ref _pendingBackgroundExtensionLoads, 0);
 
         var extensionService = _serviceProvider.GetService<IExtensionService>()!;
         await extensionService.SignalStopExtensionsAsync().ConfigureAwait(false);
@@ -365,7 +361,6 @@ public sealed partial class TopLevelCommandManager : ObservableObject,
             }
             else if (r.IsTimedOut)
             {
-                TrackBackgroundExtensionLoad(ct);
                 _ = StartExtensionWhenReadyAsync(r.Extension, r.PendingStartTask, r.Stopwatch, ct);
             }
         }
@@ -445,7 +440,6 @@ public sealed partial class TopLevelCommandManager : ObservableObject,
             // It's weird to repeat the condition here, but it allows the compiler to track nullability of other properties
             if (r.IsTimedOut)
             {
-                TrackBackgroundExtensionLoad(ct);
                 _ = AppendCommandsWhenReadyAsync(r.Wrapper, r.PendingLoadTask, r.Stopwatch, ct);
             }
         }
@@ -505,10 +499,6 @@ public sealed partial class TopLevelCommandManager : ObservableObject,
         {
             Logger.LogError($"Background start/load of extension {extension.PackageFullName} failed after {sw.ElapsedMilliseconds} ms: {ex}");
         }
-        finally
-        {
-            CompleteBackgroundExtensionLoad(ct);
-        }
     }
 
     private async Task<CommandLoadResult> TryLoadCommandsAsync(CommandProviderWrapper wrapper, CancellationToken ct)
@@ -584,26 +574,6 @@ public sealed partial class TopLevelCommandManager : ObservableObject,
         {
             Logger.LogError($"Background loading of commands and bands from {wrapper.ExtensionHost?.Extension?.PackageFullName} failed after {sw.ElapsedMilliseconds} ms: {ex}");
         }
-        finally
-        {
-            CompleteBackgroundExtensionLoad(ct);
-        }
-    }
-
-    private void TrackBackgroundExtensionLoad(CancellationToken ct)
-    {
-        if (ct == _currentExtensionLoadCancellationToken)
-        {
-            Interlocked.Increment(ref _pendingBackgroundExtensionLoads);
-        }
-    }
-
-    private void CompleteBackgroundExtensionLoad(CancellationToken ct)
-    {
-        if (ct == _currentExtensionLoadCancellationToken)
-        {
-            Interlocked.Decrement(ref _pendingBackgroundExtensionLoads);
-        }
     }
 
     private void ExtensionService_OnExtensionRemoved(IExtensionService sender, IEnumerable<IExtensionWrapper> extensions)

src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/TopLevelViewModel.cs

@@ -331,22 +331,6 @@ public sealed partial class TopLevelViewModel : ObservableObject, IListItem, IEx
         UpdateTags();
     }
 
-    /// <summary>
-    /// Clears the alias for this command without triggering a recursive save back to settings.
-    /// Called by <see cref="AliasManager"/> after it has already updated settings atomically,
-    /// to avoid reentrant calls into <see cref="AliasManager.UpdateAlias"/> via the <see cref="AliasText"/> setter.
-    /// </summary>
-    internal void ClearAlias()
-    {
-        if (Alias is not null)
-        {
-            Alias = null;
-            OnPropertyChanged(nameof(AliasText));
-            OnPropertyChanged(nameof(IsDirectAlias));
-            UpdateTags();
-        }
-    }
-
     private void FetchAliasFromAliasManager()
     {
         var am = _serviceProvider.GetService<AliasManager>();

src/modules/cmdpal/Tests/Microsoft.CmdPal.UI.ViewModels.UnitTests/AliasManagerTests.cs

@@ -1,148 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using System.Collections.Immutable;
-using System.Reflection;
-using System.Threading.Tasks;
-using CommunityToolkit.Mvvm.Messaging;
-using Microsoft.CmdPal.UI.ViewModels.Services;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-using Moq;
-
-namespace Microsoft.CmdPal.UI.ViewModels.UnitTests;
-
-[TestClass]
-public class AliasManagerTests
-{
-    [TestMethod]
-    public void CheckAlias_DoesNotRemoveAliasWhileInitialLoadIsStillRunning()
-    {
-        var manager = CreateTopLevelCommandManager();
-        try
-        {
-            SetIsLoading(manager, true);
-            SetPendingBackgroundExtensionLoads(manager, 0);
-
-            var alias = new CommandAlias("test", "test.command", true);
-            var settingsService = CreateSettingsService(alias, out var state);
-            var aliasManager = new AliasManager(manager, settingsService.Object);
-
-            var handled = aliasManager.CheckAlias(alias.SearchPrefix);
-
-            Assert.IsFalse(handled);
-            Assert.IsTrue(state.Current.Aliases.ContainsKey(alias.SearchPrefix));
-            settingsService.Verify(s => s.UpdateSettings(It.IsAny<Func<SettingsModel, SettingsModel>>(), false), Times.Never);
-        }
-        finally
-        {
-            Cleanup(manager);
-        }
-    }
-
-    [TestMethod]
-    public void CheckAlias_DoesNotRemoveAliasWhileBackgroundExtensionLoadsArePending()
-    {
-        var manager = CreateTopLevelCommandManager();
-        try
-        {
-            SetIsLoading(manager, false);
-            SetPendingBackgroundExtensionLoads(manager, 1);
-
-            var alias = new CommandAlias("test", "test.command", true);
-            var settingsService = CreateSettingsService(alias, out var state);
-            var aliasManager = new AliasManager(manager, settingsService.Object);
-
-            var handled = aliasManager.CheckAlias(alias.SearchPrefix);
-
-            Assert.IsFalse(handled);
-            Assert.IsTrue(state.Current.Aliases.ContainsKey(alias.SearchPrefix));
-            settingsService.Verify(s => s.UpdateSettings(It.IsAny<Func<SettingsModel, SettingsModel>>(), false), Times.Never);
-        }
-        finally
-        {
-            Cleanup(manager);
-        }
-    }
-
-    [TestMethod]
-    public void CheckAlias_RemovesAliasAfterAllCommandsFinishLoading()
-    {
-        var manager = CreateTopLevelCommandManager();
-        try
-        {
-            SetIsLoading(manager, false);
-            SetPendingBackgroundExtensionLoads(manager, 0);
-
-            var alias = new CommandAlias("test", "test.command", true);
-            var settingsService = CreateSettingsService(alias, out var state);
-            var aliasManager = new AliasManager(manager, settingsService.Object);
-
-            var handled = aliasManager.CheckAlias(alias.SearchPrefix);
-
-            Assert.IsFalse(handled);
-            Assert.IsFalse(state.Current.Aliases.ContainsKey(alias.SearchPrefix));
-            settingsService.Verify(s => s.UpdateSettings(It.IsAny<Func<SettingsModel, SettingsModel>>(), false), Times.Once);
-        }
-        finally
-        {
-            Cleanup(manager);
-        }
-    }
-
-    private static TopLevelCommandManager CreateTopLevelCommandManager()
-    {
-        var serviceProvider = new Mock<IServiceProvider>();
-        serviceProvider.Setup(p => p.GetService(typeof(TaskScheduler))).Returns(TaskScheduler.Default);
-
-        var commandProviderCache = new Mock<ICommandProviderCache>();
-        return new TopLevelCommandManager(serviceProvider.Object, commandProviderCache.Object);
-    }
-
-    private static Mock<ISettingsService> CreateSettingsService(CommandAlias alias, out SettingsState state)
-    {
-        state = new SettingsState
-        {
-            Current = new SettingsModel
-            {
-                Aliases = ImmutableDictionary<string, CommandAlias>.Empty.Add(alias.SearchPrefix, alias),
-            },
-        };
-
-        var settingsService = new Mock<ISettingsService>();
-        var settingsState = state;
-        settingsService.SetupGet(s => s.Settings).Returns(() => settingsState.Current);
-        settingsService
-            .Setup(s => s.UpdateSettings(It.IsAny<Func<SettingsModel, SettingsModel>>(), It.IsAny<bool>()))
-            .Callback((Func<SettingsModel, SettingsModel> transform, bool _) => settingsState.Current = transform(settingsState.Current));
-
-        return settingsService;
-    }
-
-    private sealed class SettingsState
-    {
-        public SettingsModel Current { get; set; } = new();
-    }
-
-    private static void SetIsLoading(TopLevelCommandManager manager, bool isLoading)
-    {
-        var setter = typeof(TopLevelCommandManager)
-            .GetProperty(nameof(TopLevelCommandManager.IsLoading))!
-            .GetSetMethod(nonPublic: true)!;
-        setter.Invoke(manager, [isLoading]);
-    }
-
-    private static void SetPendingBackgroundExtensionLoads(TopLevelCommandManager manager, int count)
-    {
-        typeof(TopLevelCommandManager)
-            .GetField("_pendingBackgroundExtensionLoads", BindingFlags.Instance | BindingFlags.NonPublic)!
-            .SetValue(manager, count);
-    }
-
-    private static void Cleanup(TopLevelCommandManager manager)
-    {
-        WeakReferenceMessenger.Default.UnregisterAll(manager);
-        manager.Dispose();
-    }
-}

src/modules/launcher/PowerLauncher/App.xaml

@@ -7,7 +7,6 @@
     <Application.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
-                <ResourceDictionary Source="pack://application:,,,/PresentationFramework.Fluent;component/Themes/Fluent.xaml" />
                 <ResourceDictionary Source="pack://application:,,,/Styles/Styles.xaml" />
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>

src/modules/launcher/PowerLauncher/App.xaml.cs

@@ -153,6 +153,23 @@ namespace PowerLauncher
                 _stringMatcher.UserSettingSearchPrecision = _settings.QuerySearchPrecision;
 
                 _mainVM = new MainViewModel(_settings, NativeThreadCTS.Token);
+
+                // Set ThemeMode before MainWindow creation so Fluent static resources
+                // (e.g. DefaultTextBoxStyle, CaptionTextBlockStyle referenced via BasedOn)
+                // are available for XAML parsing. ThemeMode.None cannot be used here even for
+                // high-contrast themes, because WPF's BasedOn StaticResource lookups require
+                // the named Fluent resources to exist at parse time.
+                // HighContrastWhite → Light (visually closer); other HC → Dark fallback.
+                // ThemeManager.SetSystemTheme will apply the correct ThemeMode (None for HC)
+                // once the window is ready.
+                var themeHelper = new ThemeHelper();
+                var initialTheme = themeHelper.DetermineTheme(_settings.Theme);
+#pragma warning disable WPF0001
+                Application.Current.ThemeMode = initialTheme is Theme.Light or Theme.HighContrastWhite
+                    ? ThemeMode.Light
+                    : ThemeMode.Dark;
+#pragma warning restore WPF0001
+
                 _mainWindow = new MainWindow(_settings, _mainVM, NativeThreadCTS.Token);
                 _themeManager = new ThemeManager(_settings, _mainWindow);
                 API = new PublicAPIInstance(_settingsVM, _mainVM, _alphabet, _themeManager);

src/modules/launcher/PowerLauncher/Helper/ThemeManager.cs

@@ -23,6 +23,7 @@ namespace PowerLauncher.Helper
         private readonly ThemeHelper _themeHelper = new();
 
         private bool _disposed;
+        private bool _isHighContrastMode;
         private CancellationTokenSource _themeUpdateTokenSource;
         private const int MaxRetries = 5;
         private const int InitialDelayMs = 2000;
@@ -31,6 +32,15 @@ namespace PowerLauncher.Helper
 
         public event Common.UI.ThemeChangedHandler ThemeChanged;
 
+        internal static ThemeMode GetThemeMode(Theme theme) => theme switch
+        {
+            Theme.Light => ThemeMode.Light,
+            Theme.Dark => ThemeMode.Dark,
+            Theme.HighContrastBlack or Theme.HighContrastWhite or Theme.HighContrastOne or
+                Theme.HighContrastTwo => ThemeMode.None,
+            _ => ThemeMode.Dark,
+        };
+
         public ThemeManager(PowerToysRunSettings settings, MainWindow mainWindow)
         {
             _settings = settings;
@@ -51,14 +61,22 @@ namespace PowerLauncher.Helper
         {
             _mainWindow.Background = !OSVersionHelper.IsWindows11() ? SystemColors.WindowBrush : null;
 
-            // Need to disable WPF0001 since setting Application.Current.ThemeMode is experimental
-            // https://learn.microsoft.com/en-us/dotnet/desktop/wpf/whats-new/net90#set-in-code
-#pragma warning disable WPF0001
-            Application.Current.ThemeMode = theme == Theme.Light ? ThemeMode.Light : ThemeMode.Dark;
-#pragma warning restore WPF0001
-
             if (theme is Theme.Dark or Theme.Light)
             {
+                // When returning from a high-contrast theme, clear the high-contrast resource
+                // dictionaries that were applied to the window.
+                if (_isHighContrastMode)
+                {
+                    _mainWindow.Resources.MergedDictionaries.Clear();
+                    _isHighContrastMode = false;
+                }
+
+                // Need to disable WPF0001 since setting Application.Current.ThemeMode is experimental
+                // https://learn.microsoft.com/en-us/dotnet/desktop/wpf/whats-new/net90#set-in-code
+#pragma warning disable WPF0001
+                Application.Current.ThemeMode = GetThemeMode(theme);
+#pragma warning restore WPF0001
+
                 if (!OSVersionHelper.IsWindows11())
                 {
                     // Apply background only on Windows 10
@@ -71,6 +89,14 @@ namespace PowerLauncher.Helper
             }
             else
             {
+                // For high-contrast themes, disable WPF's Fluent theme manager to avoid conflicts
+                // with the custom high-contrast resource dictionaries.
+#pragma warning disable WPF0001
+                Application.Current.ThemeMode = GetThemeMode(theme);
+#pragma warning restore WPF0001
+
+                _isHighContrastMode = true;
+
                 string styleThemeString = theme switch
                 {
                     Theme.HighContrastOne => "Themes/HighContrast1.xaml",

src/modules/launcher/PowerLauncher/Styles/Styles.xaml

@@ -50,7 +50,7 @@
     </Style>
 
     <Style x:Key="SubtleButtonStyle" TargetType="{x:Type Button}">
-        <Setter Property="FocusVisualStyle" Value="{StaticResource FocusVisual}" />
+        <Setter Property="FocusVisualStyle" Value="{DynamicResource FocusVisual}" />
         <Setter Property="Foreground" Value="{DynamicResource TextFillColorPrimaryBrush}" />
         <Setter Property="BorderThickness" Value="0" />
         <Setter Property="Focusable" Value="False" />

src/modules/launcher/Wox.Test/ThemeManagerTest.cs

@@ -0,0 +1,26 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System.Windows;
+using ManagedCommon;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using PowerLauncher.Helper;
+
+namespace Wox.Test;
+
+[TestClass]
+public class ThemeManagerTest
+{
+    [DataTestMethod]
+    [DataRow(Theme.Light, ThemeMode.Light)]
+    [DataRow(Theme.Dark, ThemeMode.Dark)]
+    [DataRow(Theme.HighContrastBlack, ThemeMode.None)]
+    [DataRow(Theme.HighContrastWhite, ThemeMode.None)]
+    [DataRow(Theme.HighContrastOne, ThemeMode.None)]
+    [DataRow(Theme.HighContrastTwo, ThemeMode.None)]
+    public void GetThemeMode_ReturnsExpectedThemeMode(Theme theme, ThemeMode expectedThemeMode)
+    {
+        Assert.AreEqual(expectedThemeMode, ThemeManager.GetThemeMode(theme));
+    }
+}