a better error handle when foundry is not available

<!-- Enter a brief description/summary of your PR here. What does it
fix/what does it change/how was it tested (even manually, if necessary)?
-->
## Fixes regressions introduced with GIF support:
- Switches default recording format back to MP4
- Fixes framerate issues between the two formats
- Fixes file path names

<!-- Please review the items on the PR checklist before submitting-->
## PR Checklist

- [ ] Closes: #xxx
<!-- - [ ] Closes: #yyy (add separate lines for additional resolved
issues) -->
- [x ] **Communication:** I've discussed this with core contributors
already. If the work hasn't been agreed, this work might be rejected
- [ ] **Tests:** Added/updated and all pass
- [ ] **Localization:** All end-user-facing strings can be localized
- [ ] **Dev docs:** Added/updated
- [ ] **New binaries:** Added on the required places
- [ ] [JSON for
signing](https://github.com/microsoft/PowerToys/blob/main/.pipelines/ESRPSigning_core.json)
for new binaries
- [ ] [WXS for
installer](https://github.com/microsoft/PowerToys/blob/main/installer/PowerToysSetup/Product.wxs)
for new binaries and localization folder
- [ ] [YML for CI
pipeline](https://github.com/microsoft/PowerToys/blob/main/.pipelines/ci/templates/build-powertoys-steps.yml)
for new test projects
- [ ] [YML for signed
pipeline](https://github.com/microsoft/PowerToys/blob/main/.pipelines/release.yml)
- [ ] **Documentation updated:** If checked, please file a pull request
on [our docs
repo](https://github.com/MicrosoftDocs/windows-uwp/tree/docs/hub/powertoys)
and link it here: #xxx

<!-- Provide a more detailed description of the PR, other things fixed,
or any additional comments/features here -->
## Detailed Description of the Pull Request / Additional comments
- Switches default recording format back to MP4
- Fixes framerate issues between the two formats
- Fixes file path names
- 
<!-- Describe how you validated the behavior. Add automated tests
wherever possible, but list manual validation steps taken as well -->
## Validation Steps Performed
Manual testing

.github/pull_request_template.md

@@ -5,6 +5,7 @@
 ## PR Checklist
 
 - [ ] Closes: #xxx
+<!--  - [ ] Closes: #yyy (add separate lines for additional resolved issues) -->
 - [ ] **Communication:** I've discussed this with core contributors already. If the work hasn't been agreed, this work might be rejected
 - [ ] **Tests:** Added/updated and all pass
 - [ ] **Localization:** All end-user-facing strings can be localized

.github/workflows/msstore-submissions.yml

@@ -40,7 +40,7 @@ jobs:
           echo powerToysInstallerArm64Url=$(jq -n "$powerToysSetup" | jq -r '[.[]|select(.name | contains("arm64"))][0].browser_download_url') >> $GITHUB_OUTPUT
 
       - name: Setup .NET 9.0
-        uses: actions/setup-dotnet@v4
+        uses: actions/setup-dotnet@v5
         with:
           dotnet-version: '9.0.x'
 

.gitmodules

@@ -4,6 +4,3 @@
 [submodule "deps/expected-lite"]
 	path = deps/expected-lite
 	url = https://github.com/martinmoene/expected-lite.git
-[submodule "deps/cziplib"]
-	path = deps/cziplib
-	url = https://github.com/kuba--/zip.git

.pipelines/ESRPSigning_core.json

@@ -291,7 +291,6 @@
                 "Mono.Cecil.Rocks.dll",
                 "Newtonsoft.Json.dll",
                 "CommunityToolkit.WinUI.Controls.TitleBar.dll",
-                "CommunityToolkit.WinUI.Controls.OpacityMaskView.dll",
 
                 "NLog.dll",
                 "HtmlAgilityPack.dll",

Cpp.Build.props

@@ -26,6 +26,7 @@
   <PropertyGroup Condition="'$(SkipCppCodeAnalysis)' == ''">
     <RunCodeAnalysis>true</RunCodeAnalysis>
     <CodeAnalysisRuleSet>$(MsbuildThisFileDirectory)\CppRuleSet.ruleset</CodeAnalysisRuleSet>
+    <CAExcludePath>$(MSBuildThisFileDirectory)deps;$(MSBuildThisFileDirectory)packages;$(CAExcludePath)</CAExcludePath>
   </PropertyGroup>
 
   <!-- C++ source compile-specific things for all configurations -->
@@ -34,7 +35,7 @@
     <PreferredToolArchitecture Condition="'$(PROCESSOR_ARCHITECTURE)' == 'ARM64' or '$(PROCESSOR_ARCHITEW6432)' == 'ARM64'">arm64</PreferredToolArchitecture>
     <VcpkgEnabled>false</VcpkgEnabled>
     <ReplaceWildcardsInProjectItems>true</ReplaceWildcardsInProjectItems>
-    <ExternalIncludePath>$(MSBuildThisFileFullPath)\..\deps\;$(MSBuildThisFileFullPath)\..\packages\;$(ExternalIncludePath)</ExternalIncludePath>
+    <ExternalIncludePath>$(MSBuildThisFileDirectory)deps;$(MSBuildThisFileDirectory)packages;$(ExternalIncludePath)</ExternalIncludePath>
     <!-- Enable control flow guard for C++ projects that don't consume any C++ files -->
     <!-- This covers the case where a .dll exports a .lib, but doesn't have any ClCompile entries. -->
     <LinkControlFlowGuard>Guard</LinkControlFlowGuard>

Directory.Packages.props

@@ -7,7 +7,6 @@
     <PackageVersion Include="AdaptiveCards.ObjectModel.WinUI3" Version="2.0.0-beta" />
     <PackageVersion Include="AdaptiveCards.Rendering.WinUI3" Version="2.1.0-beta" />
     <PackageVersion Include="AdaptiveCards.Templating" Version="2.0.5" />
-    <PackageVersion Include="CommunityToolkit.Labs.WinUI.Controls.OpacityMaskView" Version="0.1.251101-build.2372" />
     <PackageVersion Include="Microsoft.Bot.AdaptiveExpressions.Core" Version="4.23.0" />
     <PackageVersion Include="Appium.WebDriver" Version="4.4.5" />
     <PackageVersion Include="CoenM.ImageSharp.ImageHash" Version="1.3.6" />

NOTICE.md

@@ -1498,7 +1498,6 @@ SOFTWARE.
 - CoenM.ImageSharp.ImageHash
 - CommunityToolkit.Common
 - CommunityToolkit.Labs.WinUI.Controls.MarkdownTextBlock
-- CommunityToolkit.Labs.WinUI.Controls.OpacityMaskView
 - CommunityToolkit.Mvvm
 - CommunityToolkit.WinUI.Animations
 - CommunityToolkit.WinUI.Collections

src/PackageIdentity/AppxManifest.xml

@@ -42,8 +42,7 @@
         Description="PowerToys OCR Module"
         BackgroundColor="transparent"
         Square150x150Logo="Images\Square150x150Logo.png"
-        Square44x44Logo="Images\Square44x44Logo.png"
-        AppListEntry="none">
+        Square44x44Logo="Images\Square44x44Logo.png">
       </uap:VisualElements>
     </Application>
     <Application Id="PowerToys.SettingsUI" Executable="WinUI3Apps\PowerToys.Settings.exe" EntryPoint="Windows.FullTrustApplication">
@@ -52,8 +51,7 @@
         Description="PowerToys Settings UI"
         BackgroundColor="transparent"
         Square150x150Logo="Images\Square150x150Logo.png"
-        Square44x44Logo="Images\Square44x44Logo.png"
-        AppListEntry="none">
+        Square44x44Logo="Images\Square44x44Logo.png">
       </uap:VisualElements>
     </Application>
     <Application Id="PowerToys.ImageResizerUI" Executable="WinUI3Apps\PowerToys.ImageResizer.exe" EntryPoint="Windows.FullTrustApplication">
@@ -62,8 +60,7 @@
         Description="PowerToys Image Resizer UI"
         BackgroundColor="transparent"
         Square150x150Logo="Images\Square150x150Logo.png"
-        Square44x44Logo="Images\Square44x44Logo.png"
-        AppListEntry="none">
+        Square44x44Logo="Images\Square44x44Logo.png">
       </uap:VisualElements>
     </Application>
   </Applications>

src/common/LanguageModelProvider/FoundryLocal/FoundryClient.cs

@@ -10,23 +10,6 @@ namespace LanguageModelProvider.FoundryLocal;
 internal sealed class FoundryClient
 {
     public static async Task<FoundryClient?> CreateAsync()
-    {
-        // First attempt with current environment
-        var client = await TryCreateClientAsync().ConfigureAwait(false);
-        if (client != null)
-        {
-            return client;
-        }
-
-        // If failed, refresh PATH from registry and retry once
-        // This handles cases where PowerToys was launched by MSI installer.
-        Logger.LogInfo("[FoundryClient] First attempt failed, refreshing PATH and retrying");
-        RefreshEnvironmentPath();
-
-        return await TryCreateClientAsync().ConfigureAwait(false);
-    }
-
-    private static async Task<FoundryClient?> TryCreateClientAsync()
     {
         try
         {
@@ -212,68 +195,4 @@ internal sealed class FoundryClient
             await _foundryManager.StartServiceAsync();
         }
     }
-
-    /// <summary>
-    /// Refreshes the PATH environment variable from the system registry.
-    /// This is necessary when tools are installed while PowerToys is running,
-    /// as the installer updates the system PATH but running processes don't see the change.
-    /// </summary>
-    private static void RefreshEnvironmentPath()
-    {
-        try
-        {
-            Logger.LogInfo("[FoundryClient] Refreshing PATH environment variable from system");
-
-            var currentPath = Environment.GetEnvironmentVariable("PATH", EnvironmentVariableTarget.Process) ?? string.Empty;
-            var machinePath = Environment.GetEnvironmentVariable("PATH", EnvironmentVariableTarget.Machine) ?? string.Empty;
-            var userPath = Environment.GetEnvironmentVariable("PATH", EnvironmentVariableTarget.User) ?? string.Empty;
-
-            var pathsToAdd = new List<string>();
-
-            if (!string.IsNullOrWhiteSpace(currentPath))
-            {
-                pathsToAdd.AddRange(currentPath.Split(Path.PathSeparator, StringSplitOptions.RemoveEmptyEntries));
-            }
-
-            if (!string.IsNullOrWhiteSpace(userPath))
-            {
-                var userPaths = userPath.Split(Path.PathSeparator, StringSplitOptions.RemoveEmptyEntries);
-                foreach (var path in userPaths)
-                {
-                    if (!pathsToAdd.Contains(path, StringComparer.OrdinalIgnoreCase))
-                    {
-                        pathsToAdd.Add(path);
-                    }
-                }
-            }
-
-            if (!string.IsNullOrWhiteSpace(machinePath))
-            {
-                var machinePaths = machinePath.Split(Path.PathSeparator, StringSplitOptions.RemoveEmptyEntries);
-                foreach (var path in machinePaths)
-                {
-                    if (!pathsToAdd.Contains(path, StringComparer.OrdinalIgnoreCase))
-                    {
-                        pathsToAdd.Add(path);
-                    }
-                }
-            }
-
-            var newPath = string.Join(Path.PathSeparator.ToString(), pathsToAdd);
-
-            if (currentPath != newPath)
-            {
-                Logger.LogInfo("[FoundryClient] Updating process PATH with latest system values");
-                Environment.SetEnvironmentVariable("PATH", newPath, EnvironmentVariableTarget.Process);
-            }
-            else
-            {
-                Logger.LogInfo("[FoundryClient] PATH is already up to date");
-            }
-        }
-        catch (Exception ex)
-        {
-            Logger.LogError($"[FoundryClient] Failed to refresh PATH: {ex.Message}");
-        }
-    }
 }

src/common/LanguageModelProvider/FoundryLocalModelProvider.cs

@@ -12,8 +12,9 @@ namespace LanguageModelProvider;
 
 public sealed class FoundryLocalModelProvider : ILanguageModelProvider
 {
-    private FoundryClient? _foundryClient;
+    private IEnumerable<ModelDetails>? _downloadedModels;
     private IEnumerable<FoundryCatalogModel>? _catalogModels;
+    private FoundryClient? _foundryClient;
     private string? _serviceUrl;
 
     public static FoundryLocalModelProvider Instance { get; } = new();
@@ -42,6 +43,15 @@ public sealed class FoundryLocalModelProvider : ILanguageModelProvider
             throw new InvalidOperationException(errorMessage);
         }
 
+        // Check if model is cached
+        var isInCache = _downloadedModels?.Any(m => m.ProviderModelDetails is FoundryCachedModel cached && cached.Name == modelId) ?? false;
+        if (!isInCache)
+        {
+            var errorMessage = $"The requested model '{modelId}' is not cached. Please download it using Foundry Local.";
+            Logger.LogError($"[FoundryLocal] {errorMessage}");
+            throw new InvalidOperationException(errorMessage);
+        }
+
         // Ensure the model is loaded before returning chat client
         var isLoaded = _foundryClient!.EnsureModelLoaded(modelId).GetAwaiter().GetResult();
         if (!isLoaded)
@@ -64,7 +74,7 @@ public sealed class FoundryLocalModelProvider : ILanguageModelProvider
 
         return new OpenAIClient(
             new ApiKeyCredential("none"),
-            new OpenAIClientOptions { Endpoint = endpointUri, NetworkTimeout = TimeSpan.FromMinutes(5) })
+            new OpenAIClientOptions { Endpoint = endpointUri })
             .GetChatClient(modelId)
             .AsIChatClient();
     }
@@ -90,38 +100,30 @@ public sealed class FoundryLocalModelProvider : ILanguageModelProvider
         return $"new OpenAIClient(new ApiKeyCredential(\"none\"), new OpenAIClientOptions{{ Endpoint = new Uri(\"{_serviceUrl}/v1\") }}).GetChatClient(\"{modelId}\").AsIChatClient()";
     }
 
-    public async Task<IEnumerable<ModelDetails>> GetModelsAsync(CancellationToken cancelationToken = default)
+    public async Task<IEnumerable<ModelDetails>> GetModelsAsync(bool ignoreCached = false, CancellationToken cancelationToken = default)
     {
+        if (ignoreCached)
+        {
+            Logger.LogInfo("[FoundryLocal] Ignoring cached models, resetting");
+            Reset();
+        }
+
         await InitializeAsync(cancelationToken);
 
-        if (_foundryClient == null)
-        {
-            return Array.Empty<ModelDetails>();
-        }
+        Logger.LogInfo($"[FoundryLocal] Returning {_downloadedModels?.Count() ?? 0} downloaded models");
+        return _downloadedModels ?? [];
+    }
 
-        var cachedModels = await _foundryClient.ListCachedModels();
-        List<ModelDetails> downloadedModels = [];
-
-        foreach (var model in cachedModels)
-        {
-            Logger.LogInfo($"[FoundryLocal] Adding unmatched cached model: {model.Name}");
-            downloadedModels.Add(new ModelDetails
-            {
-                Id = $"fl-{model.Name}",
-                Name = model.Name,
-                Url = $"fl://{model.Name}",
-                Description = $"{model.Name} running locally with Foundry Local",
-                HardwareAccelerators = [HardwareAccelerator.FOUNDRYLOCAL],
-                ProviderModelDetails = model,
-            });
-        }
-
-        return downloadedModels;
+    private void Reset()
+    {
+        _downloadedModels = null;
+        _catalogModels = null;
+        _ = InitializeAsync();
     }
 
     private async Task InitializeAsync(CancellationToken cancelationToken = default)
     {
-        if (_foundryClient != null && _catalogModels != null && _catalogModels.Any())
+        if (_foundryClient != null && _downloadedModels != null && _downloadedModels.Any() && _catalogModels != null && _catalogModels.Any())
         {
             await _foundryClient.EnsureRunning().ConfigureAwait(false);
             return;
@@ -143,6 +145,29 @@ public sealed class FoundryLocalModelProvider : ILanguageModelProvider
         var catalogModels = await _foundryClient.ListCatalogModels();
         Logger.LogInfo($"[FoundryLocal] Found {catalogModels.Count} catalog models");
         _catalogModels = catalogModels;
+
+        var cachedModels = await _foundryClient.ListCachedModels();
+        Logger.LogInfo($"[FoundryLocal] Found {cachedModels.Count} cached models");
+
+        List<ModelDetails> downloadedModels = [];
+
+        foreach (var model in cachedModels)
+        {
+            Logger.LogInfo($"[FoundryLocal] Adding unmatched cached model: {model.Name}");
+            downloadedModels.Add(new ModelDetails
+            {
+                Id = $"fl-{model.Name}",
+                Name = model.Name,
+                Url = $"fl://{model.Name}",
+                Description = $"{model.Name} running locally with Foundry Local",
+                HardwareAccelerators = [HardwareAccelerator.FOUNDRYLOCAL],
+                SupportedOnQualcomm = true,
+                ProviderModelDetails = model,
+            });
+        }
+
+        _downloadedModels = downloadedModels;
+        Logger.LogInfo($"[FoundryLocal] Initialization complete. Total downloaded models: {downloadedModels.Count}");
     }
 
     public async Task<bool> IsAvailable()

src/common/LanguageModelProvider/ILanguageModelProvider.cs

@@ -12,7 +12,7 @@ public interface ILanguageModelProvider
 
     string ProviderDescription { get; }
 
-    Task<IEnumerable<ModelDetails>> GetModelsAsync(CancellationToken cancelationToken = default);
+    Task<IEnumerable<ModelDetails>> GetModelsAsync(bool ignoreCached = false, CancellationToken cancelationToken = default);
 
     IChatClient? GetIChatClient(string modelId);
 

src/common/LanguageModelProvider/ModelDetails.cs

@@ -24,6 +24,8 @@ public class ModelDetails
 
     public List<HardwareAccelerator> HardwareAccelerators { get; set; } = [];
 
+    public bool SupportedOnQualcomm { get; set; }
+
     public string License { get; set; } = string.Empty;
 
     public object? ProviderModelDetails { get; set; }

src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/Controls/PromptBox.xaml

@@ -558,7 +558,7 @@
                                 <TextBlock
                                     x:Uid="AIProvidersFlyoutHeader"
                                     Grid.Row="0"
-                                    Foreground="{ThemeResource TextFillColorSecondaryBrush}" />
+                                    Style="{StaticResource BodyStrongTextBlockStyle}" />
                                 <ListView
                                     x:Name="AIProviderListView"
                                     Grid.Row="1"

src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/Pages/MainPage.xaml

@@ -299,49 +299,47 @@
                 </StackPanel>
             </controls:PromptBox.Footer>
         </controls:PromptBox>
-        <ScrollViewer Grid.Row="2">
-            <Grid RowSpacing="4">
-                <Grid.RowDefinitions>
-                    <RowDefinition Height="{x:Bind ViewModel.StandardPasteFormats.Count, Mode=OneWay, Converter={StaticResource standardPasteFormatsToHeightConverter}}" />
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition Height="*" MinHeight="{x:Bind ViewModel.CustomActionPasteFormats.Count, Mode=OneWay, Converter={StaticResource customActionsToMinHeightConverter}}" />
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition Height="Auto" />
-                </Grid.RowDefinitions>
-                <ListView
-                    x:Name="PasteOptionsListView"
-                    Grid.Row="0"
-                    VerticalAlignment="Bottom"
-                    IsItemClickEnabled="True"
-                    ItemClick="PasteFormat_ItemClick"
-                    ItemContainerTransitions="{x:Null}"
-                    ItemTemplateSelector="{StaticResource PasteFormatTemplateSelector}"
-                    ItemsSource="{x:Bind ViewModel.StandardPasteFormats, Mode=OneWay}"
-                    ScrollViewer.VerticalScrollBarVisibility="Disabled"
-                    ScrollViewer.VerticalScrollMode="Disabled"
-                    SelectionMode="None"
-                    TabIndex="1" />
-                <Rectangle
-                    Grid.Row="1"
-                    Height="1"
-                    HorizontalAlignment="Stretch"
-                    Fill="{ThemeResource DividerStrokeColorDefaultBrush}"
-                    Visibility="{x:Bind ViewModel.CustomActionPasteFormats.Count, Mode=OneWay, Converter={StaticResource countToVisibilityConverter}}" />
+        <Grid Grid.Row="2" RowSpacing="4">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="{x:Bind ViewModel.StandardPasteFormats.Count, Mode=OneWay, Converter={StaticResource standardPasteFormatsToHeightConverter}}" />
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="*" MinHeight="{x:Bind ViewModel.CustomActionPasteFormats.Count, Mode=OneWay, Converter={StaticResource customActionsToMinHeightConverter}}" />
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+            </Grid.RowDefinitions>
+            <ListView
+                x:Name="PasteOptionsListView"
+                Grid.Row="0"
+                VerticalAlignment="Bottom"
+                IsItemClickEnabled="True"
+                ItemClick="PasteFormat_ItemClick"
+                ItemContainerTransitions="{x:Null}"
+                ItemTemplateSelector="{StaticResource PasteFormatTemplateSelector}"
+                ItemsSource="{x:Bind ViewModel.StandardPasteFormats, Mode=OneWay}"
+                ScrollViewer.VerticalScrollBarVisibility="Visible"
+                ScrollViewer.VerticalScrollMode="Auto"
+                SelectionMode="None"
+                TabIndex="1" />
+            <Rectangle
+                Grid.Row="1"
+                Height="1"
+                HorizontalAlignment="Stretch"
+                Fill="{ThemeResource DividerStrokeColorDefaultBrush}"
+                Visibility="{x:Bind ViewModel.CustomActionPasteFormats.Count, Mode=OneWay, Converter={StaticResource countToVisibilityConverter}}" />
 
-                <ListView
-                    x:Name="CustomActionsListView"
-                    Grid.Row="2"
-                    VerticalAlignment="Top"
-                    IsItemClickEnabled="True"
-                    ItemClick="PasteFormat_ItemClick"
-                    ItemContainerTransitions="{x:Null}"
-                    ItemTemplateSelector="{StaticResource PasteFormatTemplateSelector}"
-                    ItemsSource="{x:Bind ViewModel.CustomActionPasteFormats, Mode=OneWay}"
-                    ScrollViewer.VerticalScrollBarVisibility="Disabled"
-                    ScrollViewer.VerticalScrollMode="Disabled"
-                    SelectionMode="None"
-                    TabIndex="2" />
-            </Grid>
-        </ScrollViewer>
+            <ListView
+                x:Name="CustomActionsListView"
+                Grid.Row="2"
+                VerticalAlignment="Top"
+                IsItemClickEnabled="True"
+                ItemClick="PasteFormat_ItemClick"
+                ItemContainerTransitions="{x:Null}"
+                ItemTemplateSelector="{StaticResource PasteFormatTemplateSelector}"
+                ItemsSource="{x:Bind ViewModel.CustomActionPasteFormats, Mode=OneWay}"
+                ScrollViewer.VerticalScrollBarVisibility="Visible"
+                ScrollViewer.VerticalScrollMode="Auto"
+                SelectionMode="None"
+                TabIndex="2" />
+        </Grid>
     </Grid>
 </Page>

src/modules/AdvancedPaste/AdvancedPaste/Services/AdvancedAIKernelService.cs

@@ -215,6 +215,7 @@ public sealed class AdvancedAIKernelService : KernelServiceBase
         return new OpenAIPromptExecutionSettings
         {
             FunctionChoiceBehavior = FunctionChoiceBehavior.Auto(),
+            Temperature = 0.01,
         };
     }
 }

src/modules/AdvancedPaste/AdvancedPaste/Services/CustomActions/FoundryLocalPasteProvider.cs

@@ -146,7 +146,6 @@ public sealed class FoundryLocalPasteProvider : IPasteAIProvider
         var options = new ChatOptions
         {
             ModelId = modelReference,
-            MaxOutputTokens = 2048,
         };
 
         if (!string.IsNullOrWhiteSpace(systemPrompt))

src/modules/AdvancedPaste/AdvancedPaste/Services/CustomActions/SemanticKernelPasteProvider.cs

@@ -157,6 +157,8 @@ namespace AdvancedPaste.Services.CustomActions
             {
                 AIServiceType.OpenAI or AIServiceType.AzureOpenAI => new OpenAIPromptExecutionSettings
                 {
+                    Temperature = 0.01,
+                    MaxTokens = 2000,
                     FunctionChoiceBehavior = null,
                 },
                 _ => new PromptExecutionSettings(),

src/modules/AdvancedPaste/AdvancedPaste/Strings/en-us/Resources.resw

@@ -160,10 +160,10 @@
     <value>Active provider: {0}</value>
   </data>
   <data name="AIProvidersFlyoutHeader.Text" xml:space="preserve">
-    <value>Configured models</value>
+    <value>AI providers</value>
   </data>
   <data name="AIProvidersEmptyText.Text" xml:space="preserve">
-    <value>No models configured</value>
+    <value>No AI providers configured</value>
   </data>
   <data name="AIProvidersManageButtonContent.Content" xml:space="preserve">
     <value>Configure models in Settings</value>
@@ -364,7 +364,7 @@
   <data name="CustomEndpointWarning" xml:space="preserve">
     <value>You are using a custom endpoint. Verify all answers.</value>
   </data>
-  <data name="LocalModelBadge.Text" xml:space="preserve">
+  <data name="LocalModelBadge" xml:space="preserve">
     <value>Local</value>
     <comment>Badge label displayed next to local AI model providers (e.g., Ollama, Foundry Local) to indicate the model runs locally</comment>
   </data>

src/modules/LightSwitch/LightSwitchService/LightSwitchService.cpp

@@ -271,6 +271,7 @@ DWORD WINAPI ServiceWorkerThread(LPVOID lpParam)
 
         if (wait == WAIT_OBJECT_0 + (hParent ? (hManualOverride ? 3 : 2) : 2))
         {
+            Logger::info(L"[LightSwitchService] Settings file changed event detected.");
             ResetEvent(hSettingsChanged);
             LightSwitchSettings::instance().LoadSettings();
             stateManager.OnSettingsChanged();

src/modules/LightSwitch/LightSwitchService/LightSwitchStateManager.cpp

@@ -17,10 +17,12 @@ LightSwitchStateManager::LightSwitchStateManager()
 void LightSwitchStateManager::OnSettingsChanged()
 {
     std::lock_guard<std::mutex> lock(_stateMutex);
+    Logger::info(L"[LightSwitchStateManager] Settings changed event received");
 
     // If manual override was active, clear it so new settings take effect
     if (_state.isManualOverride)
     {
+        Logger::info(L"[LightSwitchStateManager] Clearing manual override due to settings update.");
         _state.isManualOverride = false;
     }
 
@@ -31,6 +33,7 @@ void LightSwitchStateManager::OnSettingsChanged()
 void LightSwitchStateManager::OnTick(int currentMinutes)
 {
     std::lock_guard<std::mutex> lock(_stateMutex);
+    Logger::debug(L"[LightSwitchStateManager] Tick received: {}", currentMinutes);
     EvaluateAndApplyIfNeeded();
 }
 
@@ -48,7 +51,7 @@ void LightSwitchStateManager::OnManualOverride()
 
         _state.isAppsLightActive = GetCurrentAppsTheme();
 
-        Logger::debug(L"[LightSwitchStateManager] Synced internal theme state to current system theme ({}) and apps theme ({}).",
+        Logger::info(L"[LightSwitchStateManager] Synced internal theme state to current system theme ({}) and apps theme ({}).",
                      (_state.isSystemLightActive ? L"light" : L"dark"),
                      (_state.isAppsLightActive ? L"light" : L"dark"));
     }
@@ -76,9 +79,9 @@ void LightSwitchStateManager::SyncInitialThemeState()
     std::lock_guard<std::mutex> lock(_stateMutex);
     _state.isSystemLightActive = GetCurrentSystemTheme();
     _state.isAppsLightActive = GetCurrentAppsTheme();
-    Logger::debug(L"[LightSwitchStateManager] Synced initial state to current system theme ({})",
+    Logger::info(L"[LightSwitchStateManager] Synced initial state to current system theme ({})",
                  _state.isSystemLightActive ? L"light" : L"dark");
-    Logger::debug(L"[LightSwitchStateManager] Synced initial state to current apps theme ({})",
+    Logger::info(L"[LightSwitchStateManager] Synced initial state to current apps theme ({})",
                  _state.isAppsLightActive ? L"light" : L"dark");
 }
 
@@ -124,6 +127,7 @@ void LightSwitchStateManager::EvaluateAndApplyIfNeeded()
     // Early exit: OFF mode just pauses activity
     if (_currentSettings.scheduleMode == ScheduleMode::Off)
     {
+        Logger::debug(L"[LightSwitchStateManager] Mode is OFF — pausing service logic.");
         _state.lastTickMinutes = now;
         return;
     }
@@ -141,6 +145,7 @@ void LightSwitchStateManager::EvaluateAndApplyIfNeeded()
 
         if (newDay || modeChangedToSun)
         {
+            Logger::info(L"[LightSwitchStateManager] Recalculating sun times (mode/day change).");
             auto [newLightTime, newDarkTime] = update_sun_times(_currentSettings);
             _state.lastEvaluatedDay = st.wDay;
             _state.effectiveLightMinutes = newLightTime + _currentSettings.sunrise_offset;
@@ -183,10 +188,12 @@ void LightSwitchStateManager::EvaluateAndApplyIfNeeded()
 
         if (crossedBoundary)
         {
+            Logger::info(L"[LightSwitchStateManager] Manual override cleared after crossing boundary.");
             _state.isManualOverride = false;
         }
         else
         {
+            Logger::debug(L"[LightSwitchStateManager] Manual override active — skipping auto apply.");
             _state.lastTickMinutes = now;
             return;
         }
@@ -199,7 +206,7 @@ void LightSwitchStateManager::EvaluateAndApplyIfNeeded()
     bool appsNeedsToChange = _currentSettings.changeApps && (_state.isAppsLightActive != shouldBeLight);
     bool systemNeedsToChange = _currentSettings.changeSystem && (_state.isSystemLightActive != shouldBeLight);
 
-    /* Logger::debug(
+    Logger::debug(
         L"[LightSwitchStateManager] now = {:02d}:{:02d}, light boundary = {:02d}:{:02d} ({}), dark boundary = {:02d}:{:02d} ({})",
         now / 60,
         now % 60,
@@ -208,12 +215,12 @@ void LightSwitchStateManager::EvaluateAndApplyIfNeeded()
         _state.effectiveLightMinutes,
         _state.effectiveDarkMinutes / 60,
         _state.effectiveDarkMinutes % 60,
-        _state.effectiveDarkMinutes); */
+        _state.effectiveDarkMinutes);
 
-    /* Logger::debug("should be light = {}, apps needs change = {}, system needs change = {}",
+    Logger::debug("should be light = {}, apps needs change = {}, system needs change = {}",
                   shouldBeLight ? "true" : "false",
                   appsNeedsToChange ? "true" : "false",
-                  systemNeedsToChange ? "true" : "false"); */
+                  systemNeedsToChange ? "true" : "false");
 
     // Only apply theme if there's a change or no override active
     if (!_state.isManualOverride && (appsNeedsToChange || systemNeedsToChange))
@@ -223,6 +230,10 @@ void LightSwitchStateManager::EvaluateAndApplyIfNeeded()
 
         _state.isSystemLightActive = GetCurrentSystemTheme();
         _state.isAppsLightActive = GetCurrentAppsTheme();
+
+        Logger::debug(L"[LightSwitchStateManager] Synced post-apply theme state — System: {}, Apps: {}",
+                      _state.isSystemLightActive ? L"light" : L"dark",
+                      _state.isAppsLightActive ? L"light" : L"dark");
     }
 
     _state.lastTickMinutes = now;

src/modules/awake/Awake/Core/Manager.cs

@@ -350,7 +350,7 @@ namespace Awake.Core
                             TrayHelper.TimedIcon,
                             TrayIconAction.Update);
                     },
-                    () => HandleTimerCompletion("timed"),
+                    _ => HandleTimerCompletion("timed"),
                     _tokenSource.Token);
         }
 

src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/PageViewModel.cs

@@ -64,8 +64,6 @@ public partial class PageViewModel : ExtensionObjectViewModel, IPageContext
 
     public string Title { get => string.IsNullOrEmpty(field) ? Name : field; protected set; } = string.Empty;
 
-    public string Id { get; protected set; } = string.Empty;
-
     // This property maps to `IPage.IsLoading`, but we want to expose our own
     // `IsLoading` property as a combo of this value and `IsInitialized`
     public bool ModelIsLoading { get; protected set; } = true;
@@ -144,7 +142,6 @@ public partial class PageViewModel : ExtensionObjectViewModel, IPageContext
             return; // throw?
         }
 
-        Id = page.Id;
         Name = page.Name;
         ModelIsLoading = page.IsLoading;
         Title = page.Title;

src/modules/cmdpal/Microsoft.CmdPal.UI/Events/OpenPage.cs

@@ -15,12 +15,9 @@ public class OpenPage : EventBase, IEvent
 {
     public int PageDepth { get; set; }
 
-    public string Id { get; set; }
-
-    public OpenPage(int pageDepth, string id)
+    public OpenPage(int pageDepth)
     {
         PageDepth = pageDepth;
-        Id = id;
 
         EventName = "CmdPal_OpenPage";
     }

src/modules/cmdpal/Microsoft.CmdPal.UI/Pages/ShellPage.xaml.cs

@@ -21,6 +21,7 @@ using Microsoft.PowerToys.Telemetry;
 using Microsoft.UI.Dispatching;
 using Microsoft.UI.Input;
 using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Automation.Peers;
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Input;
 using Microsoft.UI.Xaml.Media.Animation;
@@ -159,7 +160,7 @@ public sealed partial class ShellPage : Microsoft.UI.Xaml.Controls.Page,
                 new AsyncNavigationRequest(message.Page, message.CancellationToken),
                 message.WithAnimation ? DefaultPageAnimation : _noAnimation);
 
-            PowerToysTelemetry.Log.WriteEvent(new OpenPage(RootFrame.BackStackDepth, message.Page.Id));
+            PowerToysTelemetry.Log.WriteEvent(new OpenPage(RootFrame.BackStackDepth));
 
             if (!ViewModel.IsNested)
             {
@@ -654,15 +655,15 @@ public sealed partial class ShellPage : Microsoft.UI.Xaml.Controls.Page,
                 e.Handled = true;
                 break;
             default:
-                {
-                    // The CommandBar is responsible for handling all the item keybindings,
-                    // since the bound context item may need to then show another
-                    // context menu
-                    TryCommandKeybindingMessage msg = new(ctrlPressed, altPressed, shiftPressed, winPressed, e.Key);
-                    WeakReferenceMessenger.Default.Send(msg);
-                    e.Handled = msg.Handled;
-                    break;
-                }
+            {
+                // The CommandBar is responsible for handling all the item keybindings,
+                // since the bound context item may need to then show another
+                // context menu
+                TryCommandKeybindingMessage msg = new(ctrlPressed, altPressed, shiftPressed, winPressed, e.Key);
+                WeakReferenceMessenger.Default.Send(msg);
+                e.Handled = msg.Handled;
+                break;
+            }
         }
     }
 

src/modules/cmdpal/extensionsdk/Microsoft.CommandPalette.Extensions.Toolkit/JsonSerializationContext.cs

@@ -15,6 +15,7 @@ namespace Microsoft.CommandPalette.Extensions.Toolkit;
 [JsonSerializable(typeof(List<Choice>))]
 [JsonSerializable(typeof(List<ChoiceSetSetting>))]
 [JsonSerializable(typeof(Dictionary<string, object>), TypeInfoPropertyName = "Dictionary")]
+[JsonSerializable(typeof(List<Dictionary<string, object>>))]
 [JsonSourceGenerationOptions(UseStringEnumConverter = true, WriteIndented = true)]
 internal sealed partial class JsonSerializationContext : JsonSerializerContext
 {

src/modules/cmdpal/extensionsdk/Microsoft.CommandPalette.Extensions.Toolkit/ToggleSetting.cs

@@ -26,15 +26,69 @@ public sealed class ToggleSetting : Setting<bool>
 
     public override Dictionary<string, object> ToDictionary()
     {
-        return new Dictionary<string, object>
+        var items = new List<Dictionary<string, object>>();
+
+        if (!string.IsNullOrEmpty(Label))
         {
-            { "type", "Input.Toggle" },
-            { "title", Label },
-            { "id", Key },
-            { "label", Description },
-            { "value", JsonSerializer.Serialize(Value, JsonSerializationContext.Default.Boolean) },
-            { "isRequired", IsRequired },
-            { "errorMessage", ErrorMessage },
+            items.Add(
+                new()
+                {
+                    { "type", "TextBlock" },
+                    { "text", Label },
+                    { "wrap", true },
+                });
+        }
+
+        if (!(string.IsNullOrEmpty(Description) || string.Equals(Description, Label, StringComparison.OrdinalIgnoreCase)))
+        {
+            items.Add(
+                new()
+                {
+                    { "type", "TextBlock" },
+                    { "text", Description },
+                    { "isSubtle", true },
+                    { "size", "Small" },
+                    { "spacing", "Small" },
+                    { "wrap", true },
+                });
+        }
+
+        return new()
+        {
+            { "type", "ColumnSet" },
+            {
+                "columns", new List<Dictionary<string, object>>
+                {
+                    new()
+                    {
+                        { "type", "Column" },
+                        { "width", "20px" },
+                        {
+                            "items", new List<Dictionary<string, object>>
+                            {
+                                new()
+                                {
+                                    { "type", "Input.Toggle" },
+                                    { "title", " " },
+                                    { "id", Key },
+                                    { "value", JsonSerializer.Serialize(Value, JsonSerializationContext.Default.Boolean) },
+                                    { "isRequired", IsRequired },
+                                    { "errorMessage", ErrorMessage },
+                                },
+                            }
+                        },
+                        { "verticalContentAlignment", "Center" },
+                    },
+                    new()
+                    {
+                        { "type", "Column" },
+                        { "width", "stretch" },
+                        { "items", items },
+                        { "verticalContentAlignment", "Center" },
+                    },
+                }
+            },
+            { "spacing", "Medium" },
         };
     }
 

src/modules/imageresizer/ui/ImageResizerUI.csproj

@@ -24,13 +24,13 @@
     <ApplicationIcon>Resources\ImageResizer.ico</ApplicationIcon>
   </PropertyGroup>
 
-  <!-- <PropertyGroup>
+  <PropertyGroup>
     <ApplicationManifest>ImageResizerUI.dev.manifest</ApplicationManifest>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(CIBuild)'=='true'">
     <ApplicationManifest>ImageResizerUI.prod.manifest</ApplicationManifest>
-  </PropertyGroup> -->
+  </PropertyGroup>
 
   <ItemGroup>
     <EmbeddedResource Update="Properties\Resources.resx">

src/runner/main.cpp

@@ -161,7 +161,7 @@ int runner(bool isProcessElevated, bool openSettings, std::string settingsWindow
             L"PowerToys.MouseJump.dll",
             L"PowerToys.AlwaysOnTopModuleInterface.dll",
             L"PowerToys.MousePointerCrosshairs.dll",
-            // L"PowerToys.CursorWrap.dll",
+            L"PowerToys.CursorWrap.dll",
             L"PowerToys.PowerAccentModuleInterface.dll",
             L"PowerToys.PowerOCRModuleInterface.dll",
             L"PowerToys.AdvancedPasteModuleInterface.dll",

src/settings-ui/Settings.UI.Library/AIServiceTypeRegistry.cs

@@ -19,7 +19,7 @@ public static class AIServiceTypeRegistry
         {
             ServiceType = AIServiceType.AzureAIInference,
             DisplayName = "Azure AI Inference",
-            IconPath = "ms-appx:///Assets/Settings/Icons/Models/Azure.svg",
+            IconPath = "ms-appx:///Assets/Settings/Icons/Models/FoundryLocal.svg", // No icon for Azure AI Inference, use Foundry Local temporarily
             IsOnlineService = true,
             LegalDescription = "AdvancedPaste_AzureAIInference_LegalDescription",
             TermsLabel = "AdvancedPaste_AzureAIInference_TermsLabel",

src/settings-ui/Settings.UI/Assets/Settings/Icons/Models/FoundryLocal.svg

@@ -1,34 +1,59 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M10.2663 0H0.231885C0.103572 0 0 0.10358 0 0.231885V2.55072C0 2.67904 0.103572 2.78261 0.231885 2.78261H12.5217C12.9059 2.78261 13.2174 3.09411 13.2174 3.47826V3.18995C13.2174 1.53971 11.9861 0 10.2663 0Z" fill="url(#paint0_linear_178_3940)"/>
-<path d="M12.2334 0.81543C12.8633 1.44693 13.2174 2.29872 13.2174 3.19069V15.7689C13.2174 15.8972 13.3209 16.0007 13.4492 16.0007H15.7681C15.8964 16.0007 16 15.8972 16 15.7689V5.73524C16 4.99707 15.707 4.28983 15.1853 3.76732L12.2334 0.81543Z" fill="url(#paint1_linear_178_3940)"/>
-<path d="M6.78804 3.47852H0.231885C0.103572 3.47852 0 3.58209 0 3.71039V6.02921C0 6.1575 0.103572 6.26112 0.231885 6.26112H9.04346C9.42759 6.26112 9.7391 6.57263 9.7391 6.95676V6.6685C9.7391 5.01822 8.50778 3.47852 6.78804 3.47852Z" fill="url(#paint2_linear_178_3940)"/>
-<path d="M8.75537 4.29297C9.38531 4.92446 9.73928 5.77628 9.73928 6.6682V15.7681C9.73928 15.8964 9.8429 16 9.97119 16H12.29C12.4183 16 12.5219 15.8964 12.5219 15.7681V9.21281C12.5219 8.47462 12.229 7.76735 11.7072 7.24482L8.75537 4.29297Z" fill="url(#paint3_linear_178_3940)"/>
-<path d="M3.30975 6.95703H0.231885C0.103572 6.95703 0 7.06056 0 7.18886V9.50771C0 9.63609 0.103572 9.73962 0.231885 9.73962H5.56521C5.94936 9.73962 6.26087 10.0511 6.26087 10.4353V10.147C6.26087 8.49675 5.02956 6.95703 3.30975 6.95703Z" fill="url(#paint4_linear_178_3940)"/>
-<path d="M5.27686 7.77148C5.90677 8.40302 6.26083 9.25477 6.26083 10.1468V15.7684C6.26083 15.8967 6.36436 16.0003 6.49274 16.0003H8.8115C8.93988 16.0003 9.04341 15.8967 9.04341 15.7684V12.6913C9.04341 11.9531 8.75051 11.2459 8.22874 10.7234L5.27686 7.77148Z" fill="url(#paint5_linear_178_3940)"/>
+<svg width="17" height="16" viewBox="0 0 17 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_2092_1741)">
+<mask id="mask0_2092_1741" style="mask-type:luminance" maskUnits="userSpaceOnUse" x="0" y="0" width="17" height="16">
+<path d="M16.5 0H0.5V16H16.5V0Z" fill="white"/>
+</mask>
+<g mask="url(#mask0_2092_1741)">
+<mask id="mask1_2092_1741" style="mask-type:luminance" maskUnits="userSpaceOnUse" x="-1" y="-2" width="19" height="20">
+<path d="M17.8337 -1.33337H-0.833008V17.3333H17.8337V-1.33337Z" fill="white"/>
+</mask>
+<g mask="url(#mask1_2092_1741)">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M11.1137 0.315668C11.57 0.315668 11.9744 0.657891 12.1196 1.15567C12.2648 1.65345 13.1152 4.73345 13.1152 4.73345V10.852H10.0352L10.0974 0.305298H11.1137V0.315668Z" fill="url(#paint0_linear_2092_1741)"/>
+<path d="M15.6352 5.09586C15.6352 4.87808 15.4589 4.71216 15.2515 4.71216H13.4366C12.1611 4.71216 11.124 5.7492 11.124 7.02472V10.8618H13.3226C14.5982 10.8618 15.6352 9.82472 15.6352 8.54919V5.09586Z" fill="url(#paint1_linear_2092_1741)"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M11.1133 0.315674C10.7607 0.315674 10.4807 0.595674 10.4807 0.948265L10.4185 12.5942C10.4185 14.2949 9.0392 15.6742 7.33847 15.6742H1.74885C1.47921 15.6742 1.30292 15.4149 1.38589 15.1661L5.86589 2.37938C6.30144 1.14531 7.46293 0.315674 8.7696 0.315674H11.1237H11.1133Z" fill="url(#paint2_linear_2092_1741)"/>
+</g>
+</g>
+</g>
 <defs>
-<linearGradient id="paint0_linear_178_3940" x1="13.2174" y1="3.15349" x2="0" y2="3.15349" gradientUnits="userSpaceOnUse">
-<stop stop-color="#2C08AC"/>
-<stop offset="0.8" stop-color="#4F42FD"/>
+<linearGradient id="paint0_linear_2092_1741" x1="12.3996" y1="11.0801" x2="9.80702" y2="0.699373" gradientUnits="userSpaceOnUse">
+<stop stop-color="#712575"/>
+<stop offset="0.09" stop-color="#9A2884"/>
+<stop offset="0.18" stop-color="#BF2C92"/>
+<stop offset="0.27" stop-color="#DA2E9C"/>
+<stop offset="0.34" stop-color="#EB30A2"/>
+<stop offset="0.4" stop-color="#F131A5"/>
+<stop offset="0.5" stop-color="#EC30A3"/>
+<stop offset="0.61" stop-color="#DF2F9E"/>
+<stop offset="0.72" stop-color="#C92D96"/>
+<stop offset="0.83" stop-color="#AA2A8A"/>
+<stop offset="0.95" stop-color="#83267C"/>
+<stop offset="1" stop-color="#712575"/>
 </linearGradient>
-<linearGradient id="paint1_linear_178_3940" x1="14.2303" y1="0.81543" x2="23.44" y2="11.9747" gradientUnits="userSpaceOnUse">
-<stop offset="0.3" stop-color="#7274FF"/>
-<stop offset="1" stop-color="#4F42FD"/>
+<linearGradient id="paint1_linear_2092_1741" x1="13.3848" y1="0.532897" x2="13.3848" y2="15.1759" gradientUnits="userSpaceOnUse">
+<stop stop-color="#DA7ED0"/>
+<stop offset="0.08" stop-color="#B17BD5"/>
+<stop offset="0.19" stop-color="#8778DB"/>
+<stop offset="0.3" stop-color="#6276E1"/>
+<stop offset="0.41" stop-color="#4574E5"/>
+<stop offset="0.54" stop-color="#2E72E8"/>
+<stop offset="0.67" stop-color="#1D71EB"/>
+<stop offset="0.81" stop-color="#1471EC"/>
+<stop offset="1" stop-color="#1171ED"/>
 </linearGradient>
-<linearGradient id="paint2_linear_178_3940" x1="9.7391" y1="6.63202" x2="0" y2="6.63202" gradientUnits="userSpaceOnUse">
-<stop stop-color="#2C08AC"/>
-<stop offset="0.8" stop-color="#4F42FD"/>
-</linearGradient>
-<linearGradient id="paint3_linear_178_3940" x1="10.7523" y1="4.29297" x2="17.3026" y2="14.5881" gradientUnits="userSpaceOnUse">
-<stop offset="0.3" stop-color="#7274FF"/>
-<stop offset="1" stop-color="#4F42FD"/>
-</linearGradient>
-<linearGradient id="paint4_linear_178_3940" x1="6.26087" y1="9.91172" x2="0" y2="9.91172" gradientUnits="userSpaceOnUse">
-<stop stop-color="#2C08AC"/>
-<stop offset="0.8" stop-color="#4F42FD"/>
-</linearGradient>
-<linearGradient id="paint5_linear_178_3940" x1="7.2738" y1="7.77148" x2="11.0624" y2="16.243" gradientUnits="userSpaceOnUse">
-<stop offset="0.3" stop-color="#7274FF"/>
-<stop offset="1" stop-color="#4F42FD"/>
+<linearGradient id="paint2_linear_2092_1741" x1="12.5029" y1="0.865306" x2="2.79625" y2="16.4313" gradientUnits="userSpaceOnUse">
+<stop stop-color="#DA7ED0"/>
+<stop offset="0.05" stop-color="#B77BD4"/>
+<stop offset="0.11" stop-color="#9079DA"/>
+<stop offset="0.18" stop-color="#6E77DF"/>
+<stop offset="0.25" stop-color="#5175E3"/>
+<stop offset="0.33" stop-color="#3973E7"/>
+<stop offset="0.42" stop-color="#2772E9"/>
+<stop offset="0.54" stop-color="#1A71EB"/>
+<stop offset="0.68" stop-color="#1371EC"/>
+<stop offset="1" stop-color="#1171ED"/>
 </linearGradient>
+<clipPath id="clip0_2092_1741">
+<rect width="16" height="16" fill="white" transform="translate(0.5)"/>
+</clipPath>
 </defs>
 </svg>

src/settings-ui/Settings.UI/PowerToys.Settings.csproj

@@ -28,8 +28,6 @@
 		<None Remove="Assets\Settings\Icons\Models\WindowsML.svg" />
 		<None Remove="Assets\Settings\Modules\APDialog.dark.png" />
 		<None Remove="Assets\Settings\Modules\APDialog.light.png" />
-		<None Remove="Assets\Settings\Modules\CmdPal_Background.png" />
-		<None Remove="Assets\Settings\Modules\CmdPal_Hero.png" />
 		<None Remove="Assets\Settings\Modules\LightSwitch.png" />
 		<None Remove="SettingsXAML\Controls\Dashboard\CheckUpdateControl.xaml" />
 		<None Remove="SettingsXAML\Controls\Dashboard\ShortcutConflictControl.xaml" />
@@ -73,7 +71,6 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="CommunityToolkit.Labs.WinUI.Controls.OpacityMaskView" />
 		<PackageReference Include="CommunityToolkit.WinUI.Controls.Segmented" />
 		<PackageReference Include="CommunityToolkit.WinUI.Controls.SettingsControls" />
 		<PackageReference Include="CommunityToolkit.WinUI.Controls.Primitives" />

src/settings-ui/Settings.UI/SettingsXAML/Controls/ModelPicker/FoundryLocalModelPicker.xaml

@@ -30,24 +30,6 @@
     </UserControl.Resources>
 
     <Grid>
-        <Grid.RowDefinitions>
-            <RowDefinition Height="*" />
-            <RowDefinition Height="Auto" />
-        </Grid.RowDefinitions>
-        <InfoBar
-            x:Uid="AdvancedPaste_FL_PreviewMessage"
-            Grid.Row="1"
-            Padding="4"
-            IsClosable="False"
-            IsOpen="True"
-            Message="Foundry Local is still in Public Preview">
-            <InfoBar.ActionButton>
-                <HyperlinkButton
-                    x:Uid="AdvancedPaste_FL_LearnMoreFoundryLocal"
-                    Content="Learn more"
-                    NavigateUri="https://learn.microsoft.com/azure/ai-foundry/foundry-local/what-is-foundry-local" />
-            </InfoBar.ActionButton>
-        </InfoBar>
         <StackPanel
             x:Name="LoadingPanel"
             HorizontalAlignment="Center"
@@ -87,12 +69,12 @@
                         FontSize="24"
                         Glyph="&#xF158;" />
                     <TextBlock
-                        x:Uid="AdvancedPaste_FL_NoModelsDownloaded"
+                        x:Uid="AdvancedPaste_FL_NoModelsDownloaded."
                         HorizontalAlignment="Center"
                         Style="{StaticResource BodyStrongTextBlockStyle}"
                         TextAlignment="Center" />
                     <TextBlock
-                        x:Uid="AdvancedPaste_FL_RunFoundryLocalText"
+                        x:Uid="AdvancedPaste_FL_RunFoundryLocalText.Text"
                         HorizontalAlignment="Center"
                         FontSize="12"
                         Foreground="{ThemeResource TextFillColorSecondaryBrush}"

src/settings-ui/Settings.UI/SettingsXAML/Controls/ModelPicker/FoundryLocalModelPicker.xaml.cs

@@ -30,7 +30,7 @@ public sealed partial class FoundryLocalModelPicker : UserControl
 
     public delegate void DownloadRequestedEventHandler(object sender, object payload);
 
-    public delegate void LoadRequestedEventHandler(object sender);
+    public delegate void LoadRequestedEventHandler(object sender, FoundryLoadRequestedEventArgs args);
 
     public event ModelSelectionChangedEventHandler SelectionChanged;
 
@@ -94,7 +94,7 @@ public sealed partial class FoundryLocalModelPicker : UserControl
 
     public bool HasDownloadableModels => DownloadableModels?.Cast<object>().Any() ?? false;
 
-    public void RequestLoad()
+    public void RequestLoad(bool refresh)
     {
         if (IsLoading)
         {
@@ -107,7 +107,7 @@ public sealed partial class FoundryLocalModelPicker : UserControl
 
         IsAvailable = false;
         StatusText = "Loading Foundry Local status...";
-        LoadRequested?.Invoke(this);
+        LoadRequested?.Invoke(this, new FoundryLoadRequestedEventArgs(refresh));
     }
 
     private static void OnCachedModelsChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
@@ -310,7 +310,7 @@ public sealed partial class FoundryLocalModelPicker : UserControl
 
     private void RefreshModelsButton_Click(object sender, RoutedEventArgs e)
     {
-        RequestLoad();
+        RequestLoad(refresh: true);
     }
 
     private void UpdateVisualStates()
@@ -444,4 +444,14 @@ public sealed partial class FoundryLocalModelPicker : UserControl
     {
         return string.IsNullOrWhiteSpace(license) ? Visibility.Collapsed : Visibility.Visible;
     }
+
+    public sealed class FoundryLoadRequestedEventArgs : EventArgs
+    {
+        public FoundryLoadRequestedEventArgs(bool refresh)
+        {
+            Refresh = refresh;
+        }
+
+        public bool Refresh { get; }
+    }
 }

src/settings-ui/Settings.UI/SettingsXAML/Views/AdvancedPastePage.xaml.cs

@@ -82,7 +82,7 @@ namespace Microsoft.PowerToys.Settings.UI.Views
         {
             ViewModel.RefreshEnabledState();
             UpdatePasteAIUIVisibility();
-            _ = UpdateFoundryLocalUIAsync();
+            _ = UpdateFoundryLocalUIAsync(refreshFoundry: true);
         }
 
         private void EnableAdvancedPasteAI() => ViewModel.EnableAI();
@@ -384,7 +384,7 @@ namespace Microsoft.PowerToys.Settings.UI.Views
             }
         }
 
-        private Task UpdateFoundryLocalUIAsync()
+        private Task UpdateFoundryLocalUIAsync(bool refreshFoundry = false)
         {
             string selectedType = ViewModel?.PasteAIProviderDraft?.ServiceType ?? string.Empty;
             bool isFoundryLocal = string.Equals(selectedType, "FoundryLocal", StringComparison.OrdinalIgnoreCase);
@@ -419,12 +419,12 @@ namespace Microsoft.PowerToys.Settings.UI.Views
                 PasteAIProviderConfigurationDialog.IsPrimaryButtonEnabled = false;
             }
 
-            FoundryLocalPicker?.RequestLoad();
+            FoundryLocalPicker?.RequestLoad(refreshFoundry);
 
             return Task.CompletedTask;
         }
 
-        private async Task LoadFoundryLocalModelsAsync()
+        private async Task LoadFoundryLocalModelsAsync(bool refresh = false)
         {
             if (FoundryLocalPanel is null)
             {
@@ -456,7 +456,9 @@ namespace Microsoft.PowerToys.Settings.UI.Views
                     return;
                 }
 
-                IEnumerable<ModelDetails> cachedModelsEnumerable = await provider.GetModelsAsync(cancelationToken: cancellationToken).ConfigureAwait(false);
+                IEnumerable<ModelDetails> cachedModelsEnumerable = refresh
+                    ? await provider.GetModelsAsync(ignoreCached: true, cancelationToken: cancellationToken)
+                    : await provider.GetModelsAsync(cancelationToken: cancellationToken);
 
                 if (cancellationToken.IsCancellationRequested)
                 {
@@ -465,12 +467,9 @@ namespace Microsoft.PowerToys.Settings.UI.Views
 
                 var cachedModels = cachedModelsEnumerable?.ToList() ?? new List<ModelDetails>();
 
-                DispatcherQueue.TryEnqueue(() =>
-                {
-                    UpdateFoundryCollections(cachedModels);
-                    ShowFoundryAvailableState();
-                    RestoreFoundrySelection(cachedModels);
-                });
+                UpdateFoundryCollections(cachedModels);
+                ShowFoundryAvailableState();
+                RestoreFoundrySelection(cachedModels);
             }
             catch (OperationCanceledException)
             {
@@ -479,18 +478,12 @@ namespace Microsoft.PowerToys.Settings.UI.Views
             catch (Exception ex)
             {
                 var errorMessage = $"Unable to load Foundry Local models. {ex.Message}";
+                ShowFoundryUnavailableState(errorMessage);
                 System.Diagnostics.Debug.WriteLine($"[AdvancedPastePage] Failed to load Foundry Local models: {ex}");
-                DispatcherQueue.TryEnqueue(() =>
-                {
-                    ShowFoundryUnavailableState(errorMessage);
-                });
             }
             finally
             {
-                DispatcherQueue.TryEnqueue(() =>
-                {
-                    UpdateFoundrySaveButtonState();
-                });
+                UpdateFoundrySaveButtonState();
             }
         }
 
@@ -679,9 +672,9 @@ namespace Microsoft.PowerToys.Settings.UI.Views
             UpdateFoundrySaveButtonState();
         }
 
-        private async void FoundryLocalPicker_LoadRequested(object sender)
+        private async void FoundryLocalPicker_LoadRequested(object sender, FoundryLocalModelPicker.FoundryLoadRequestedEventArgs args)
         {
-            await LoadFoundryLocalModelsAsync();
+            await LoadFoundryLocalModelsAsync(args?.Refresh ?? false);
         }
 
         private sealed class FoundryDownloadableModel : INotifyPropertyChanged
@@ -1096,7 +1089,7 @@ namespace Microsoft.PowerToys.Settings.UI.Views
                 PasteAIProviderConfigurationDialog.Title = $"{displayName} provider configuration";
             }
 
-            await UpdateFoundryLocalUIAsync();
+            await UpdateFoundryLocalUIAsync(refreshFoundry: true);
             UpdatePasteAIUIVisibility();
             RefreshDialogBindings();
 
@@ -1125,7 +1118,7 @@ namespace Microsoft.PowerToys.Settings.UI.Views
                 : $"{titlePrefix} provider configuration";
 
             UpdatePasteAIUIVisibility();
-            await UpdateFoundryLocalUIAsync();
+            await UpdateFoundryLocalUIAsync(refreshFoundry: false);
             RefreshDialogBindings();
             PasteAIApiKeyPasswordBox.Password = ViewModel.GetPasteAIApiKey(provider.Id, provider.ServiceType);
             await PasteAIProviderConfigurationDialog.ShowAsync();

src/settings-ui/Settings.UI/SettingsXAML/Views/CmdPalPage.xaml

@@ -10,202 +10,40 @@
     xmlns:ui="using:CommunityToolkit.WinUI"
     AutomationProperties.LandmarkType="Main"
     mc:Ignorable="d">
-    <Grid>
-        <ScrollViewer AutomationProperties.AutomationId="PageScrollViewer">
-            <Grid
-                MaxWidth="1000"
-                Padding="16,0,16,0"
-                VerticalAlignment="Top"
-                Background="{ThemeResource CardBackgroundFillColorDefaultBrush}"
-                BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}"
-                BorderThickness="1"
-                CornerRadius="16"
-                RowSpacing="8">
-                <Grid.RowDefinitions>
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition Height="Auto" />
-                </Grid.RowDefinitions>
-                <tkcontrols:OpacityMaskView Margin="-16,0,-16,0" HorizontalAlignment="Stretch">
-                    <tkcontrols:OpacityMaskView.OpacityMask>
-                        <Rectangle>
-                            <Rectangle.Fill>
-                                <LinearGradientBrush StartPoint="0.5,0" EndPoint="0.5,1">
-                                    <GradientStop Offset="0.50" Color="Black" />
-                                    <GradientStop Offset="0.75" Color="#80000000" />
-                                    <GradientStop Offset="0.95" Color="Transparent" />
-                                </LinearGradientBrush>
-                            </Rectangle.Fill>
-                        </Rectangle>
-                    </tkcontrols:OpacityMaskView.OpacityMask>
-                    <Grid Height="560">
-                        <Grid.RowDefinitions>
-                            <RowDefinition Height="Auto" />
-                            <RowDefinition Height="Auto" />
-                            <RowDefinition Height="*" />
-                        </Grid.RowDefinitions>
-                        <Image
-                            Grid.RowSpan="3"
-                            HorizontalAlignment="Stretch"
-                            Source="/Assets/Settings/Modules/CmdPal_Background.png"
-                            Stretch="UniformToFill" />
-                        <TextBlock
-                            Margin="0,24,0,12"
-                            HorizontalAlignment="Center"
-                            FontSize="36"
-                            FontWeight="Bold"
-                            Text="Command Palette">
-                            <TextBlock.Foreground>
-                                <LinearGradientBrush StartPoint="0,0" EndPoint="1,1">
-                                    <GradientStop Offset="0.0" Color="#FFB9EBFF" />
-                                    <GradientStop Offset="0.49" Color="#FF86CBFF" />
-                                    <GradientStop Offset="1.0" Color="#FFA1E7FF" />
-                                </LinearGradientBrush>
-                            </TextBlock.Foreground>
-                        </TextBlock>
-                        <TextBlock
-                            Grid.Row="1"
-                            HorizontalAlignment="Center"
-                            Foreground="White"
-                            TextAlignment="Center"
-                            TextWrapping="Wrap">
-                            <Run x:Uid="CmdPal_Description" />
-                            <Hyperlink NavigateUri="">
-                                <Run x:Uid="LearnMore_CmdPal.Text" Foreground="White" />
-                            </Hyperlink>
-                        </TextBlock>
-                        <Image
-                            Grid.Row="2"
-                            Margin="0,16,0,0"
-                            HorizontalAlignment="Center"
-                            VerticalAlignment="Top"
-                            Source="/Assets/Settings/Modules/CmdPal_Hero.png"
-                            Stretch="Uniform" />
-                    </Grid>
-                </tkcontrols:OpacityMaskView>
 
-                <Grid
-                    Grid.Row="1"
-                    Margin="0,-12,0,24"
-                    ColumnSpacing="32"
-                    RowSpacing="8">
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                    </Grid.RowDefinitions>
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="*" />
-                        <ColumnDefinition Width="*" />
-                        <ColumnDefinition Width="*" />
-                    </Grid.ColumnDefinitions>
-                    <FontIcon
-                        HorizontalAlignment="Center"
-                        Foreground="{ThemeResource TextFillColorSecondaryBrush}"
-                        Glyph="&#xEB3B;" />
-                    <TextBlock
-                        Grid.Row="1"
-                        HorizontalAlignment="Center"
-                        TextAlignment="Center"
-                        TextWrapping="Wrap">
-                        <Run x:Uid="CmdPal_ExtensibleHeader" FontWeight="SemiBold" /> <LineBreak />
-                        <Run
-                            x:Uid="CmdPal_ExtensibleDescription"
-                            FontSize="12"
-                            Foreground="{ThemeResource TextFillColorSecondaryBrush}" />
-                    </TextBlock>
-
-                    <FontIcon
-                        Grid.Column="1"
-                        HorizontalAlignment="Center"
-                        Foreground="{ThemeResource TextFillColorSecondaryBrush}"
-                        Glyph="&#xE945;" />
-                    <TextBlock
-                        Grid.Row="1"
-                        Grid.Column="1"
-                        HorizontalAlignment="Center"
-                        TextAlignment="Center"
-                        TextWrapping="Wrap">
-                        <Run x:Uid="CmdPal_FastHeader" FontWeight="SemiBold" /> <LineBreak />
-                        <Run
-                            x:Uid="CmdPal_FastDescription"
-                            FontSize="12"
-                            Foreground="{ThemeResource TextFillColorSecondaryBrush}" />
-                    </TextBlock>
-
-                    <FontIcon
-                        Grid.Column="2"
-                        HorizontalAlignment="Center"
-                        Foreground="{ThemeResource TextFillColorSecondaryBrush}"
-                        Glyph="&#xE790;" />
-                    <TextBlock
-                        Grid.Row="1"
-                        Grid.Column="2"
-                        HorizontalAlignment="Center"
-                        TextAlignment="Center"
-                        TextWrapping="Wrap">
-                        <Run x:Uid="CmdPal_ModernHeader" FontWeight="SemiBold" /> <LineBreak />
-                        <Run
-                            x:Uid="CmdPal_ModernDescription"
-                            FontSize="12"
-                            Foreground="{ThemeResource TextFillColorSecondaryBrush}" />
-                    </TextBlock>
-                </Grid>
-                <StackPanel
-                    Grid.Row="2"
-                    Margin="0,8,0,0"
-                    Orientation="Vertical"
-                    Spacing="{StaticResource SettingsCardSpacing}">
-                    <controls:GPOInfoControl ShowWarning="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay}">
-                        <tkcontrols:SettingsCard
-                            Name="CmdPalEnableCmdPal"
-                            x:Uid="CmdPal_Enable_CmdPal"
-                            HorizontalAlignment="Stretch"
-                            HeaderIcon="{ui:BitmapIcon Source=/Assets/Settings/Icons/CmdPal.png}">
-                            <ToggleSwitch IsOn="{x:Bind ViewModel.IsEnabled, Mode=TwoWay}" />
-                        </tkcontrols:SettingsCard>
-                    </controls:GPOInfoControl>
+    <controls:SettingsPageControl x:Uid="CmdPal" ModuleImageSource="ms-appx:///Assets/Settings/Modules/CmdPal.png">
+        <controls:SettingsPageControl.ModuleContent>
+            <StackPanel ChildrenTransitions="{StaticResource SettingsCardsAnimations}" Orientation="Vertical">
+                <controls:GPOInfoControl ShowWarning="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay}">
                     <tkcontrols:SettingsCard
-                        x:Uid="CmdPal_Launch"
-                        Grid.Row="3"
-                        ActionIcon="{ui:FontIcon Glyph=&#xE8A7;}"
-                        Click="LaunchCard_Click"
-                        Header="Launch Command Palette"
-                        HeaderIcon="{ui:FontIcon Glyph=&#xE945;}"
-                        IsClickEnabled="True"
-                        IsEnabled="{x:Bind ViewModel.IsEnabled, Mode=OneWay}">
-                        <ItemsControl
-                            AutomationProperties.AccessibilityView="Raw"
-                            IsTabStop="False"
-                            ItemsSource="{x:Bind Path=ViewModel.Hotkey.GetKeysList(), Mode=OneWay}">
-                            <ItemsControl.ItemsPanel>
-                                <ItemsPanelTemplate>
-                                    <StackPanel Orientation="Horizontal" Spacing="4" />
-                                </ItemsPanelTemplate>
-                            </ItemsControl.ItemsPanel>
-                            <ItemsControl.ItemTemplate>
-                                <DataTemplate>
-                                    <controls:KeyVisual
-                                        Padding="8,8,8,8"
-                                        VerticalAlignment="Center"
-                                        AutomationProperties.AccessibilityView="Raw"
-                                        Content="{Binding}"
-                                        Style="{StaticResource AccentKeyVisualStyle}" />
-                                </DataTemplate>
-                            </ItemsControl.ItemTemplate>
-                        </ItemsControl>
+                        Name="CmdPalEnableCmdPal"
+                        x:Uid="CmdPal_Enable_CmdPal"
+                        HeaderIcon="{ui:BitmapIcon Source=/Assets/Settings/Icons/CmdPal.png}">
+                        <ToggleSwitch IsOn="{x:Bind ViewModel.IsEnabled, Mode=TwoWay}" />
                     </tkcontrols:SettingsCard>
+                </controls:GPOInfoControl>
+                <controls:SettingsGroup x:Uid="CmdPal_Activation_GroupSettings" IsEnabled="{x:Bind ViewModel.IsEnabled, Mode=OneWay}">
                     <tkcontrols:SettingsCard
-                        x:Uid="CmdPal_Settings"
-                        Grid.Row="4"
-                        ActionIcon="{ui:FontIcon Glyph=&#xE8A7;}"
-                        Click="SettingsCard_Click"
-                        HeaderIcon="{ui:FontIcon Glyph=&#xE713;}"
-                        IsClickEnabled="True"
-                        IsEnabled="{x:Bind ViewModel.IsEnabled, Mode=OneWay}" />
-                </StackPanel>
-            </Grid>
-        </ScrollViewer>
-    </Grid>
+                        Name="CmdPalActivationShortcut"
+                        x:Uid="CmdPal_ActivationShortcut"
+                        HeaderIcon="{ui:FontIcon Glyph=&#xEDA7;}">
+                        <controls:ShortcutControl
+                            MinWidth="{StaticResource SettingActionControlMinWidth}"
+                            HotkeySettings="{x:Bind Path=ViewModel.Hotkey, Mode=OneWay}"
+                            IsEnabled="False" />
+                        <tkcontrols:SettingsCard.Description>
+                            <HyperlinkButton
+                                x:Name="CmdPalSettingsDeeplink"
+                                x:Uid="CmdPal_DeeplinkContent"
+                                Click="CmdPalSettingsDeeplink_Click" />
+                        </tkcontrols:SettingsCard.Description>
+                    </tkcontrols:SettingsCard>
+                </controls:SettingsGroup>
+            </StackPanel>
+        </controls:SettingsPageControl.ModuleContent>
+
+        <controls:SettingsPageControl.PrimaryLinks>
+            <controls:PageLink x:Uid="LearnMore_CmdPal" Link="https://aka.ms/PowerToysOverview_CmdPal" />
+        </controls:SettingsPageControl.PrimaryLinks>
+    </controls:SettingsPageControl>
 </local:NavigablePage>

src/settings-ui/Settings.UI/SettingsXAML/Views/CmdPalPage.xaml.cs

@@ -63,20 +63,12 @@ namespace Microsoft.PowerToys.Settings.UI.Views
             }
         }
 
-        private void SettingsCard_Click(object sender, Microsoft.UI.Xaml.RoutedEventArgs e)
+        private void CmdPalSettingsDeeplink_Click(object sender, Microsoft.UI.Xaml.RoutedEventArgs e)
         {
             // Launch CmdPal settings window as normal user using explorer
             string launchPath = "explorer.exe";
             string launchArgs = "x-cmdpal://settings";
             LaunchApp(launchPath, launchArgs);
         }
-
-        private void LaunchCard_Click(object sender, Microsoft.UI.Xaml.RoutedEventArgs e)
-        {
-            // Launch CmdPal window as normal user using explorer
-            string launchPath = "explorer.exe";
-            string launchArgs = "x-cmdpal:";
-            LaunchApp(launchPath, launchArgs);
-        }
     }
 }

src/settings-ui/Settings.UI/SettingsXAML/Views/MouseUtilsPage.xaml

@@ -273,7 +273,6 @@
 
                 <panels:MouseJumpPanel x:Name="MouseUtils_MouseJump_Panel" x:Uid="MouseUtils_MouseJump_Panel" />
 
-                <!--
                 <controls:SettingsGroup x:Uid="MouseUtils_CursorWrap" AutomationProperties.AutomationId="MouseUtils_CursorWrapTestId">
                     <controls:GPOInfoControl ShowWarning="{x:Bind ViewModel.IsCursorWrapEnabledGpoConfigured, Mode=OneWay}">
                         <tkcontrols:SettingsCard
@@ -301,7 +300,7 @@
                             </tkcontrols:SettingsCard>
                         </tkcontrols:SettingsExpander.Items>
                     </tkcontrols:SettingsExpander>
-                </controls:SettingsGroup>-->
+                </controls:SettingsGroup>
                 <controls:SettingsGroup x:Uid="MouseUtils_MousePointerCrosshairs" AutomationProperties.AutomationId="MouseUtils_MousePointerCrosshairsTestId">
                     <controls:GPOInfoControl ShowWarning="{x:Bind ViewModel.IsMousePointerCrosshairsEnabledGpoConfigured, Mode=OneWay}">
                         <tkcontrols:SettingsCard

src/settings-ui/Settings.UI/SettingsXAML/Views/ShellPage.xaml

@@ -285,6 +285,9 @@
                     AutomationProperties.AutomationId="InputOutputNavItem"
                     Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/InputOutput.png}"
                     SelectsOnInvoked="False">
+                    <NavigationViewItem.InfoBadge>
+                        <InfoBadge Style="{StaticResource NewInfoBadge}" />
+                    </NavigationViewItem.InfoBadge>
                     <NavigationViewItem.MenuItems>
                         <NavigationViewItem
                             x:Name="KeyboardManagerNavigationItem"
@@ -299,7 +302,11 @@
                             x:Uid="Shell_MouseUtilities"
                             helpers:NavHelper.NavigateTo="views:MouseUtilsPage"
                             AutomationProperties.AutomationId="MouseUtilitiesNavItem"
-                            Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/MouseUtils.png}" />
+                            Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/MouseUtils.png}">
+                            <NavigationViewItem.InfoBadge>
+                                <InfoBadge Style="{StaticResource NewInfoBadge}" />
+                            </NavigationViewItem.InfoBadge>
+                        </NavigationViewItem>
                         <NavigationViewItem
                             x:Name="MouseWithoutBordersNavigationItem"
                             x:Uid="Shell_MouseWithoutBorders"

src/settings-ui/Settings.UI/Strings/en-us/Resources.resw

@@ -2703,7 +2703,7 @@ From there, simply click on one of the supported files in the File Explorer and
     <value>Mouse Pointer Crosshairs</value>
     <comment>Mouse as in the hardware peripheral.</comment>
   </data>
-  <data name="Oobe_MouseUtils_MousePointerCrosshairs_Description.Text" xml:space="preserve">
+  <data name="Oobe_MouseUtils_MousePointerCrosshairs.Description" xml:space="preserve">
     <value>Draw crosshairs centered around the mouse pointer.</value>
     <comment>Mouse as in the hardware peripheral.</comment>
   </data>
@@ -5159,12 +5159,25 @@ To record a specific window, enter the hotkey with the Alt key in the opposite m
   <data name="Shell_TopLevelSystemTools.Content" xml:space="preserve">
     <value>System Tools</value>
   </data>
+  <data name="CmdPal.ModuleTitle" xml:space="preserve">
+    <value>Command Palette</value>
+  </data>
+  <data name="CmdPal_ShortDescription" xml:space="preserve">
+    <value>A better quick launcher</value>
+  </data>
+  <data name="CmdPal_ActivationDescription" xml:space="preserve">
+    <value>Open Command Palette</value>
+  </data>
   <data name="CmdPal_Enable_CmdPal.Header" xml:space="preserve">
     <value>Enable Command Palette</value>
-    <comment>Command Palette is a product name, do not loc</comment>
+    <comment>"Command Palette" is the name of the utility.</comment>
+  </data>
+  <data name="CmdPal.ModuleDescription" xml:space="preserve">
+    <value>A fully extensible quick launcher with a richer display and additional capabilities without sacrificing performance.</value>
   </data>
   <data name="LearnMore_CmdPal.Text" xml:space="preserve">
-    <value>Learn more</value>
+    <value>Learn more about Command Palette</value>
+    <comment>Command Palette is a product name, do not loc</comment>
   </data>
   <data name="Shell_CmdPal.Content" xml:space="preserve">
     <value>Command Palette</value>
@@ -5172,11 +5185,11 @@ To record a specific window, enter the hotkey with the Alt key in the opposite m
   </data>
   <data name="Oobe_CmdPal.Description" xml:space="preserve">
     <value>A fully extensible quick launcher with a richer display and additional capabilities without sacrificing performance.</value>
-    <comment>Command Palette is a product name, do not loc</comment>
+    <comment>"Command Palette" is a product name</comment>
   </data>
   <data name="Oobe_CmdPal.Title" xml:space="preserve">
     <value>Command Palette</value>
-    <comment>Command Palette is a product name, do not loc</comment>
+    <comment>"Command Palette" is a product name</comment>
   </data>
   <data name="Oobe_CmdPal_HowToUse.Text" xml:space="preserve">
     <value>and start typing!</value>
@@ -5209,8 +5222,14 @@ To record a specific window, enter the hotkey with the Alt key in the opposite m
   <data name="RetryLabel.Text" xml:space="preserve">
     <value>Retry</value>
   </data>
-  <data name="CmdPal_Settings.Header" xml:space="preserve">
-    <value>Settings</value>
+  <data name="CmdPal_Activation_GroupSettings.Header" xml:space="preserve">
+    <value>Activation</value>
+  </data>
+  <data name="CmdPal_ActivationShortcut.Header" xml:space="preserve">
+    <value>Activation shortcut</value>
+  </data>
+  <data name="CmdPal_DeeplinkContent.Content" xml:space="preserve">
+    <value>Open Command Palette settings to customize the activation shortcut</value>
   </data>
   <data name="Help_chromaCIE" xml:space="preserve">
     <value>chroma (CIE LCh)</value>
@@ -5734,51 +5753,4 @@ To record a specific window, enter the hotkey with the Alt key in the opposite m
   <data name="AdvancedPaste_EnableClipboardPreview.Description" xml:space="preserve">
     <value>Display a preview of the current clipboard content</value>
   </data>
-  <data name="AdvancedPaste_FL_LearnMoreFoundryLocal.Content" xml:space="preserve">
-    <value>Learn more</value>
-  </data>
-  <data name="AdvancedPaste_FL_PreviewMessage.Message" xml:space="preserve">
-    <value>Foundry Local is still in public preview</value>
-    <comment>Do not loc "Foundry Local"</comment>
-  </data>
-  <data name="CmdPal_Settings.Description" xml:space="preserve">
-    <value>Configure the activation shortcut, extensions, behavior and much more</value>
-  </data>
-  <data name="CmdPal_Launch.Header" xml:space="preserve">
-    <value>Open Command Palette</value>
-    <comment>Command Palette is a product name, do not loc</comment>
-  </data>
-  <data name="CmdPal_ShortDescription" xml:space="preserve">
-    <value>A better quick launcher</value>
-  </data>
-  <data name="CmdPal_Description.Text" xml:space="preserve">
-    <value>Find files, launch apps, and do so much more with the most extensible quick launcher.</value>
-  </data>
-  <data name="CmdPal.ModuleTitle" xml:space="preserve">
-    <value>Command Palette</value>
-    <comment>Command Palette is a product name, do not loc</comment>
-  </data>
-  <data name="CmdPal_ActivationDescription" xml:space="preserve">
-    <value>Open Command Palette</value>
-    <comment>Command Palette is a product name, do not loc</comment>
-  </data>
-  <data name="CmdPal_ExtensibleDescription.Text" xml:space="preserve">
-    <value>Powerful extensions help you do more</value>
-  </data>
-  <data name="CmdPal_ExtensibleHeader.Text" xml:space="preserve">
-    <value>Extensible</value>
-  </data>
-  <data name="CmdPal_FastDescription.Text" xml:space="preserve">
-    <value>Find files and launch apps in an instant</value>
-  </data>
-  <data name="CmdPal_FastHeader.Text" xml:space="preserve">
-    <value>Fast</value>
-  </data>
-  <data name="CmdPal_ModernHeader.Text" xml:space="preserve">
-    <value>Beautiful</value>
-  </data>
-  <data name="CmdPal_ModernDescription.Text" xml:space="preserve">
-    <value>A modern UI built with Fluent Design</value>
-    <comment>Fluent Design is a product name, do not loc</comment>
-  </data>
 </root>

src/settings-ui/Settings.UI/ViewModels/DashboardViewModel.cs

@@ -40,12 +40,6 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
 
         public ObservableCollection<DashboardListItem> ActionModules { get; set; } = new ObservableCollection<DashboardListItem>();
 
-        // Master list of module items that is sorted and projected into AllModules.
-        private List<DashboardListItem> _moduleItems = new List<DashboardListItem>();
-
-        // Flag to prevent circular updates when a UI toggle triggers settings changes.
-        private bool _isUpdatingFromUI;
-
         private AllHotkeyConflictsData _allHotkeyConflictsData = new AllHotkeyConflictsData();
 
         public AllHotkeyConflictsData AllHotkeyConflictsData
@@ -80,7 +74,7 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
                     generalSettingsConfig.DashboardSortOrder = value;
                     OutGoingGeneralSettings outgoing = new OutGoingGeneralSettings(generalSettingsConfig);
                     SendConfigMSG(outgoing.ToString());
-                    SortModuleList();
+                    RefreshModuleList();
                 }
             }
         }
@@ -102,9 +96,8 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
             // set the callback functions value to handle outgoing IPC message.
             SendConfigMSG = ipcMSGCallBackFunc;
 
-            BuildModuleList();
-            SortModuleList();
-            RefreshShortcutModules();
+            RefreshModuleList();
+            GetShortcutModules();
         }
 
         protected override void OnConflictsUpdated(object sender, AllHotkeyConflictsEventArgs e)
@@ -136,22 +129,14 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
             GlobalHotkeyConflictManager.Instance?.RequestAllConflicts();
         }
 
-        /// <summary>
-        /// Builds the master list of module items. Called once during initialization.
-        /// Each module item contains its configuration, enabled state, and GPO lock status.
-        /// </summary>
-        private void BuildModuleList()
+        private void RefreshModuleList()
         {
-            _moduleItems.Clear();
+            AllModules.Clear();
+
+            var moduleItems = new List<DashboardListItem>();
 
             foreach (ModuleType moduleType in Enum.GetValues<ModuleType>())
             {
-                // Hide CursorWrap from Dashboard
-                if (moduleType == ModuleType.CursorWrap)
-                {
-                    continue;
-                }
-
                 GpoRuleConfigured gpo = ModuleHelper.GetModuleGpoConfiguration(moduleType);
                 var newItem = new DashboardListItem()
                 {
@@ -160,148 +145,51 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
                     IsEnabled = gpo == GpoRuleConfigured.Enabled || (gpo != GpoRuleConfigured.Disabled && ModuleHelper.GetIsModuleEnabled(generalSettingsConfig, moduleType)),
                     IsLocked = gpo == GpoRuleConfigured.Enabled || gpo == GpoRuleConfigured.Disabled,
                     Icon = ModuleHelper.GetModuleTypeFluentIconName(moduleType),
-
-                    // IsNew = moduleType == ModuleType.CursorWrap,
+                    IsNew = moduleType == ModuleType.CursorWrap,
                     DashboardModuleItems = GetModuleItems(moduleType),
                 };
                 newItem.EnabledChangedCallback = EnabledChangedOnUI;
-                _moduleItems.Add(newItem);
+                moduleItems.Add(newItem);
+            }
+
+            // Sort based on current sort order
+            var sortedItems = DashboardSortOrder switch
+            {
+                DashboardSortOrder.ByStatus => moduleItems.OrderByDescending(x => x.IsEnabled).ThenBy(x => x.Label),
+                _ => moduleItems.OrderBy(x => x.Label), // Default alphabetical
+            };
+
+            foreach (var item in sortedItems)
+            {
+                AllModules.Add(item);
             }
         }
 
-        /// <summary>
-        /// Sorts the module list according to the current sort order and updates the AllModules collection.
-        /// On first call, populates AllModules. On subsequent calls, uses Move() to reorder items in-place
-        /// to avoid destroying and recreating UI elements.
-        /// </summary>
-        private void SortModuleList()
-        {
-            var sortedItems = (DashboardSortOrder switch
-            {
-                DashboardSortOrder.ByStatus => _moduleItems.OrderByDescending(x => x.IsEnabled).ThenBy(x => x.Label),
-                _ => _moduleItems.OrderBy(x => x.Label), // Default alphabetical
-            }).ToList();
-
-            // If AllModules is empty (first load), just populate it.
-            if (AllModules.Count == 0)
-            {
-                foreach (var item in sortedItems)
-                {
-                    AllModules.Add(item);
-                }
-
-                return;
-            }
-
-            // Otherwise, update the collection in place using Move to avoid UI glitches.
-            for (int i = 0; i < sortedItems.Count; i++)
-            {
-                var currentItem = sortedItems[i];
-                var currentIndex = AllModules.IndexOf(currentItem);
-
-                if (currentIndex != -1 && currentIndex != i)
-                {
-                    AllModules.Move(currentIndex, i);
-                }
-            }
-
-            // Notify that DashboardSortOrder changed to update menu check mark.
-            OnPropertyChanged(nameof(DashboardSortOrder));
-        }
-
-        /// <summary>
-        /// Refreshes module enabled/locked states by re-reading GPO configuration. Only
-        /// updates properties that have actually changed to minimize UI notifications
-        /// then re-sorts the list according to the current sort order.
-        /// </summary>
-        private void RefreshModuleList()
-        {
-            foreach (var item in _moduleItems)
-            {
-                GpoRuleConfigured gpo = ModuleHelper.GetModuleGpoConfiguration(item.Tag);
-
-                // GPO can force-enable (Enabled) or force-disable (Disabled) a module.
-                // If Enabled: module is on and the user cannot disable it.
-                // If Disabled: module is off and the user cannot enable it.
-                // Otherwise, the setting is unlocked and the user can enable/disable it.
-                bool newEnabledState = gpo == GpoRuleConfigured.Enabled || (gpo != GpoRuleConfigured.Disabled && ModuleHelper.GetIsModuleEnabled(generalSettingsConfig, item.Tag));
-
-                // Lock the toggle when GPO is controlling the module.
-                bool newLockedState = gpo == GpoRuleConfigured.Enabled || gpo == GpoRuleConfigured.Disabled;
-
-                // Only update if there's an actual change to minimize UI notifications.
-                if (item.IsEnabled != newEnabledState)
-                {
-                    item.IsEnabled = newEnabledState;
-                }
-
-                if (item.IsLocked != newLockedState)
-                {
-                    item.IsLocked = newLockedState;
-                }
-            }
-
-            SortModuleList();
-        }
-
-        /// <summary>
-        /// Callback invoked when a user toggles a module's enabled state in the UI.
-        /// Sets the _isUpdatingFromUI flag to prevent circular updates, then updates
-        /// settings, re-sorts if needed, and refreshes dependent collections.
-        /// </summary>
         private void EnabledChangedOnUI(DashboardListItem dashboardListItem)
         {
-            _isUpdatingFromUI = true;
-            try
+            Views.ShellPage.UpdateGeneralSettingsCallback(dashboardListItem.Tag, dashboardListItem.IsEnabled);
+
+            if (dashboardListItem.Tag == ModuleType.NewPlus && dashboardListItem.IsEnabled == true)
             {
-                Views.ShellPage.UpdateGeneralSettingsCallback(dashboardListItem.Tag, dashboardListItem.IsEnabled);
-
-                if (dashboardListItem.Tag == ModuleType.NewPlus && dashboardListItem.IsEnabled == true)
-                {
-                    var settingsUtils = new SettingsUtils();
-                    var settings = NewPlusViewModel.LoadSettings(settingsUtils);
-                    NewPlusViewModel.CopyTemplateExamples(settings.Properties.TemplateLocation.Value);
-                }
-
-                // Re-sort only required if sorting by enabled status.
-                if (DashboardSortOrder == DashboardSortOrder.ByStatus)
-                {
-                    SortModuleList();
-                }
-
-                // Always refresh shortcuts/actions to reflect enabled state changes.
-                RefreshShortcutModules();
-
-                // Request updated conflicts after module state change.
-                RequestConflictData();
-            }
-            finally
-            {
-                _isUpdatingFromUI = false;
+                var settingsUtils = new SettingsUtils();
+                var settings = NewPlusViewModel.LoadSettings(settingsUtils);
+                NewPlusViewModel.CopyTemplateExamples(settings.Properties.TemplateLocation.Value);
             }
+
+            // Request updated conflicts after module state change
+            RequestConflictData();
         }
 
-        /// <summary>
-        /// Callback invoked when module enabled state changes from other parts of the
-        /// settings UI. Ignores the notification if it was triggered by a UI toggle
-        /// we're already handling, to prevent circular updates.
-        /// </summary>
         public void ModuleEnabledChangedOnSettingsPage()
         {
-            // Ignore if this was triggered by a UI change that we're already handling.
-            if (_isUpdatingFromUI)
-            {
-                return;
-            }
-
             try
             {
                 RefreshModuleList();
-                RefreshShortcutModules();
+                GetShortcutModules();
 
                 OnPropertyChanged(nameof(ShortcutModules));
 
-                // Request updated conflicts after module state change.
+                // Request updated conflicts after module state change
                 RequestConflictData();
             }
             catch (Exception ex)
@@ -310,11 +198,7 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
             }
         }
 
-        /// <summary>
-        /// Rebuilds ShortcutModules and ActionModules collections by filtering AllModules
-        /// to only include enabled modules and their respective shortcut/action items.
-        /// </summary>
-        private void RefreshShortcutModules()
+        private void GetShortcutModules()
         {
             ShortcutModules.Clear();
             ActionModules.Clear();

src/settings-ui/Settings.UI/ViewModels/Flyout/AllAppsViewModel.cs

@@ -36,12 +36,6 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
 
             foreach (ModuleType moduleType in Enum.GetValues<ModuleType>())
             {
-                // Hide CursorWrap from All Apps flyout
-                if (moduleType == ModuleType.CursorWrap)
-                {
-                    continue;
-                }
-
                 AddFlyoutMenuItem(moduleType);
             }
 

tools/BugReportTool/BugReportTool/BugReportTool.vcxproj

@@ -30,6 +30,7 @@
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <AdditionalIncludeDirectories>../../../src/</AdditionalIncludeDirectories>
+      <TreatAngleIncludeAsExternal>true</TreatAngleIncludeAsExternal>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -37,10 +38,6 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\..\deps\cziplib\src\zip.c">
-      <!-- Disabling warnings for external code -->
-      <DisableSpecificWarnings>4706;26451;4267;4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
     <ClCompile Include="EventViewer.cpp" />
     <ClCompile Include="InstallationFolder.cpp" />
     <ClCompile Include="Package.cpp" />
@@ -61,8 +58,6 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\..\deps\cziplib\src\miniz.h" />
-    <ClInclude Include="..\..\..\deps\cziplib\src\zip.h" />
     <ClInclude Include="EventViewer.h" />
     <ClInclude Include="InstallationFolder.h" />
     <ClInclude Include="Package.h" />

tools/BugReportTool/BugReportTool/BugReportTool.vcxproj.filters

@@ -8,7 +8,6 @@
     <ClCompile Include="ZipTools\ZipFolder.cpp">
       <Filter>ZipTools</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\deps\cziplib\src\zip.c" />
     <ClCompile Include="ReportMonitorInfo.cpp" />
     <ClCompile Include="RegistryUtils.cpp" />
     <ClCompile Include="EventViewer.cpp" />
@@ -28,8 +27,6 @@
       <Filter>ZipTools</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\common\utils\json.h" />
-    <ClInclude Include="..\..\..\deps\cziplib\src\miniz.h" />
-    <ClInclude Include="..\..\..\deps\cziplib\src\zip.h" />
     <ClInclude Include="ReportMonitorInfo.h" />
     <ClInclude Include="RegistryUtils.h" />
     <ClInclude Include="EventViewer.h" />

tools/BugReportTool/BugReportTool/ZipTools/zipfolder.cpp

@@ -1,50 +1,53 @@
 #include "ZipFolder.h"
-#include "..\..\..\..\deps\cziplib\src\zip.h"
 #include <common/utils/timeutil.h>
 
+#define WIN32_LEAN_AND_MEAN
+#include <Windows.h>
+
+#include <format>
+#include <wil/stl.h>
+#include <wil/win32_helpers.h>
+
 void ZipFolder(std::filesystem::path zipPath, std::filesystem::path folderPath)
 {
-    std::string reportFilename{ "PowerToysReport_" };
-    reportFilename += timeutil::format_as_local("%F-%H-%M-%S", timeutil::now());
-    reportFilename += ".zip";
+    const auto reportFilename{
+        std::format("PowerToysReport_{0}.zip",
+                    timeutil::format_as_local("%F-%H-%M-%S", timeutil::now()))
+    };
+    const auto finalReportFullPath{ zipPath / reportFilename };
 
-    auto tmpZipPath = std::filesystem::temp_directory_path();
-    tmpZipPath /= reportFilename;
+    const auto tempReportFilename{ reportFilename + ".tmp" };
+    const auto tempReportFullPath{ zipPath / tempReportFilename };
 
-    struct zip_t* zip = zip_open(tmpZipPath.string().c_str(), ZIP_DEFAULT_COMPRESSION_LEVEL, 'w');
-    if (!zip)
+    // tar -c --format=zip -f "ReportFile.zip" *
+    const auto executable{ wil::ExpandEnvironmentStringsW<std::wstring>(LR"(%WINDIR%\System32\tar.exe)") };
+    auto commandline{ std::format(LR"("{0}" -c --format=zip -f "{1}" *)", executable, tempReportFullPath.wstring()) };
+
+    const auto folderPathAsString{ folderPath.lexically_normal().wstring() };
+
+    wil::unique_process_information pi;
+    STARTUPINFOW si{ .cb = sizeof(STARTUPINFOW) };
+    if (!CreateProcessW(executable.c_str(),
+                        commandline.data() /* must be mutable */,
+                        nullptr,
+                        nullptr,
+                        FALSE,
+                        DETACHED_PROCESS,
+                        nullptr,
+                        folderPathAsString.c_str(),
+                        &si,
+                        &pi))
     {
         printf("Cannot open zip.");
         throw -1;
     }
 
-    using recursive_directory_iterator = std::filesystem::recursive_directory_iterator;
-    const size_t rootSize = folderPath.wstring().size();
-    for (const auto& dirEntry : recursive_directory_iterator(folderPath))
-    {
-        if (dirEntry.is_regular_file())
-        {
-            auto path = dirEntry.path().string();
-            auto relativePath = path.substr(rootSize, path.size());
-            zip_entry_open(zip, relativePath.c_str());
-            zip_entry_fwrite(zip, path.c_str());
-            zip_entry_close(zip);
-        }
-    }
+    WaitForSingleObject(pi.hProcess, INFINITE);
 
-    zip_close(zip);
-
-    std::error_code err;
-    std::filesystem::copy(tmpZipPath, zipPath, err);
+    std::error_code err{};
+    std::filesystem::rename(tempReportFullPath, finalReportFullPath, err);
     if (err.value() != 0)
     {
-        wprintf_s(L"Failed to copy %s. Error code: %d\n", tmpZipPath.c_str(), err.value());
+        wprintf_s(L"Failed to rename %s. Error code: %d\n", tempReportFullPath.native().c_str(), err.value());
     }
-
-    err = {};
-    std::filesystem::remove_all(tmpZipPath, err);
-    if (err.value() != 0)
-    {
-        wprintf_s(L"Failed to delete %s. Error code: %d\n", tmpZipPath.c_str(), err.value());
-    }
-}
+}