update

Signed-off-by: Shawn Yuan (from Dev Box) <shuaiyuan@microsoft.com>

.github/actions/spell-check/expect.txt

@@ -141,7 +141,7 @@ bla
 BLACKFRAME
 BLENDFUNCTION
 Blockquotes
-blt
+Blt
 BLURBEHIND
 BLURREGION
 bmi
@@ -1873,7 +1873,6 @@ UPDATENOW
 UPDATEREGISTRY
 updown
 UPGRADINGPRODUCTCODE
-upscaling
 Uptool
 urld
 Usb

.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",

DATA_AND_PRIVACY.md

@@ -147,18 +147,6 @@ _If you want to find diagnostic data events in the source code, these two links
     <td>Microsoft.PowerToys.AdvancedPasteSemanticKernelFormatEvent</td>
     <td>Triggered when Advanced Paste leverages the Semantic Kernel.</td>
   </tr> 
-  <tr>
-    <td>Microsoft.PowerToys.AdvancedPasteSemanticKernelErrorEvent</td>
-    <td>Occurs when the Semantic Kernel workflow encounters an error.</td>
-  </tr>
-  <tr>
-    <td>Microsoft.PowerToys.AdvancedPasteEndpointUsageEvent</td>
-    <td>Logs the AI provider, model, and processing duration for each endpoint call.</td>
-  </tr>
-  <tr>
-    <td>Microsoft.PowerToys.AdvancedPasteCustomActionErrorEvent</td>
-    <td>Records provider, model, and status details when a custom action fails.</td>
-  </tr>
 </table>
 
 ### Always on Top

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

README.md

@@ -7,9 +7,7 @@
 <h1 align="center">
   <span>Microsoft PowerToys</span>
 </h1>
-<p align="center">
-  <span align="center">Microsoft PowerToys is a collection of utilities that help you customize Windows and streamline everyday tasks.</span>
-</p>
+
 <h3 align="center">
   <a href="#-installation">Installation</a>
   <span> · </span>
@@ -20,10 +18,8 @@
   <a href="#-whats-new">Release notes</a>
 </h3>
 <br/><br/>
-
-## 🔨 Utilities
-
-PowerToys includes over 25 utilities to help you customize and optimize your Windows experience:
+Microsoft PowerToys is a collection of utilities that help you customize Windows and streamline everyday tasks.
+<br/><br/>
 
 |   |   |   |
 |---|---|---|
@@ -41,13 +37,20 @@ PowerToys includes over 25 utilities to help you customize and optimize your Win
 
 ## 📋 Installation
 
-For detailed installation instructions and system requirements, visit the [installation docs](https://learn.microsoft.com/windows/powertoys/install). 
+For detailed installation instructions, visit the [installation docs](https://learn.microsoft.com/windows/powertoys/install). 
+
+Before you begin, make sure your device meets the system requirements:
+
+> [!NOTE]
+> - Windows 11 or Windows 10 version 2004 (20H1 / build 19041) or newer
+> - 64-bit processor: x64 or ARM64
+> - Latest stable version of [Microsoft Edge WebView2 Runtime](https://go.microsoft.com/fwlink/p/?LinkId=2124703) is installed via the bootstrapper during setup
+
+Choose one of the installation methods below:
 
-But to get started quickly, choose one of the installation methods below:
-<br/><br/>
 <details open>
-<summary><strong>Download .exe from GitHub</strong></summary>
-<br/>
+<summary>Download .exe from GitHub</summary>
+
 Go to the [PowerToys GitHub releases][github-release-link], click Assets to reveal the downloads, and choose the installer that matches your architecture and install scope. For most devices, that's the x64 per-user installer.
 
 <!-- items that need to be updated release to release -->
@@ -64,11 +67,11 @@ Go to the [PowerToys GitHub releases][github-release-link], click Assets to reve
 | Per user - ARM64     | [PowerToysUserSetup-0.95.1-arm64.exe][ptUserArm64] |
 | Machine wide - x64   | [PowerToysSetup-0.95.1-x64.exe][ptMachineX64] |
 | Machine wide - ARM64 | [PowerToysSetup-0.95.1-arm64.exe][ptMachineArm64] |
+
 </details>
 
 <details>
-<summary><strong>Microsoft Store</strong></summary>
-<br/>
+<summary>Microsoft Store</summary>
 You can easily install PowerToys from the Microsoft Store:
 <p>
   <a style="text-decoration:none" href="https://aka.ms/getPowertoys">
@@ -79,9 +82,10 @@ You can easily install PowerToys from the Microsoft Store:
 </p>
 </details>
 
+
 <details>
-<summary><strong>WinGet</strong></summary>
-<br/>
+<summary>WinGet</summary>
+
 Download PowerToys from [WinGet][winget-link]. Updating PowerToys via winget will respect the current PowerToys installation scope. To install PowerToys, run the following command from the command line / PowerShell:
 
 *User scope installer [default]*
@@ -96,8 +100,8 @@ winget install --scope machine Microsoft.PowerToys -s winget
 </details>
 
 <details>
-<summary><strong>Other methods</strong></summary>
-<br/>
+<summary>Other methods</summary>
+
 There are [community driven install methods](./doc/unofficialInstallMethods.md) such as Chocolatey and Scoop. If these are your preferred install solutions, you can find the install instructions there.
 </details>
 

installer/PowerToysSetupCustomActionsVNext/CustomAction.cpp

@@ -4,7 +4,6 @@
 #include <ProjectTelemetry.h>
 #include <spdlog/sinks/base_sink.h>
 #include <filesystem>
-#include <string_view>
 
 #include "../../src/common/logger/logger.h"
 #include "../../src/common/utils/gpo.h"
@@ -857,69 +856,14 @@ UINT __stdcall UnsetAdvancedPasteAPIKeyCA(MSIHANDLE hInstall)
 
     try
     {
+        winrt::Windows::Security::Credentials::PasswordVault vault;
+        winrt::Windows::Security::Credentials::PasswordCredential cred;
+
         hr = WcaInitialize(hInstall, "UnsetAdvancedPasteAPIKey");
         ExitOnFailure(hr, "Failed to initialize");
 
-        winrt::Windows::Security::Credentials::PasswordVault vault;
-
-        auto hasPrefix = [](std::wstring_view value, wchar_t const* prefix) {
-            std::wstring_view prefixView{ prefix };
-            return value.compare(0, prefixView.size(), prefixView) == 0;
-        };
-
-        const wchar_t* resourcePrefixes[] = {
-            L"https://platform.openai.com/api-keys",
-            L"https://azure.microsoft.com/products/ai-services/openai-service",
-            L"https://azure.microsoft.com/products/ai-services/ai-inference",
-            L"https://console.mistral.ai/account/api-keys",
-            L"https://ai.google.dev/",
-        };
-
-        const wchar_t* usernamePrefixes[] = {
-            L"PowerToys_AdvancedPaste_",
-        };
-
-        auto credentials = vault.RetrieveAll();
-        for (auto const& credential : credentials)
-        {
-            bool shouldRemove = false;
-
-            std::wstring resource{ credential.Resource() };
-            for (auto const prefix : resourcePrefixes)
-            {
-                if (hasPrefix(resource, prefix))
-                {
-                    shouldRemove = true;
-                    break;
-                }
-            }
-
-            if (!shouldRemove)
-            {
-                std::wstring username{ credential.UserName() };
-                for (auto const prefix : usernamePrefixes)
-                {
-                    if (hasPrefix(username, prefix))
-                    {
-                        shouldRemove = true;
-                        break;
-                    }
-                }
-            }
-
-            if (!shouldRemove)
-            {
-                continue;
-            }
-
-            try
-            {
-                vault.Remove(credential);
-            }
-            catch (...)
-            {
-            }
-        }
+        cred = vault.Retrieve(L"https://platform.openai.com/api-keys", L"PowerToys_AdvancedPaste_OpenAIKey");
+        vault.Remove(cred);
     }
     catch (...)
     {

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
         {
@@ -185,95 +168,41 @@ internal sealed class FoundryClient
     }
 
     public async Task<bool> EnsureModelLoaded(string modelId)
-    {
-        Logger.LogInfo($"[FoundryClient] EnsureModelLoaded called with: {modelId}");
-
-        // Check if already loaded
-        if (await IsModelLoaded(modelId).ConfigureAwait(false))
-        {
-            Logger.LogInfo($"[FoundryClient] Model already loaded: {modelId}");
-            return true;
-        }
-
-        // Load the model
-        Logger.LogInfo($"[FoundryClient] Loading model: {modelId}");
-        await _foundryManager.LoadModelAsync(modelId).ConfigureAwait(false);
-
-        // Verify it's loaded
-        var loaded = await IsModelLoaded(modelId).ConfigureAwait(false);
-        Logger.LogInfo($"[FoundryClient] Model load result: {loaded}");
-        return loaded;
-    }
-
-    public async Task EnsureRunning()
-    {
-        if (!_foundryManager.IsServiceRunning)
-        {
-            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");
+            Logger.LogInfo($"[FoundryClient] EnsureModelLoaded called with: {modelId}");
 
-            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))
+            // Check if already loaded
+            if (await IsModelLoaded(modelId).ConfigureAwait(false))
             {
-                pathsToAdd.AddRange(currentPath.Split(Path.PathSeparator, StringSplitOptions.RemoveEmptyEntries));
+                Logger.LogInfo($"[FoundryClient] Model already loaded: {modelId}");
+                return true;
             }
 
-            if (!string.IsNullOrWhiteSpace(userPath))
+            // Check if model exists in cache
+            var cachedModels = await ListCachedModels().ConfigureAwait(false);
+            Logger.LogInfo($"[FoundryClient] Cached models: {string.Join(", ", cachedModels.Select(m => m.Name))}");
+
+            if (!cachedModels.Any(m => m.Name == modelId))
             {
-                var userPaths = userPath.Split(Path.PathSeparator, StringSplitOptions.RemoveEmptyEntries);
-                foreach (var path in userPaths)
-                {
-                    if (!pathsToAdd.Contains(path, StringComparer.OrdinalIgnoreCase))
-                    {
-                        pathsToAdd.Add(path);
-                    }
-                }
+                Logger.LogWarning($"[FoundryClient] Model not found in cache: {modelId}");
+                return false;
             }
 
-            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);
-                    }
-                }
-            }
+            // Load the model
+            Logger.LogInfo($"[FoundryClient] Loading model: {modelId}");
+            await _foundryManager.LoadModelAsync(modelId).ConfigureAwait(false);
 
-            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");
-            }
+            // Verify it's loaded
+            var loaded = await IsModelLoaded(modelId).ConfigureAwait(false);
+            Logger.LogInfo($"[FoundryClient] Model load result: {loaded}");
+            return loaded;
         }
         catch (Exception ex)
         {
-            Logger.LogError($"[FoundryClient] Failed to refresh PATH: {ex.Message}");
+            Logger.LogError($"[FoundryClient] EnsureModelLoaded exception: {ex.Message}");
+            return false;
         }
     }
 }

src/common/LanguageModelProvider/FoundryLocalModelProvider.cs

@@ -12,8 +12,8 @@ namespace LanguageModelProvider;
 
 public sealed class FoundryLocalModelProvider : ILanguageModelProvider
 {
-    private FoundryClient? _foundryClient;
-    private IEnumerable<FoundryCatalogModel>? _catalogModels;
+    private IEnumerable<ModelDetails>? _downloadedModels;
+    private FoundryClient? _foundryManager;
     private string? _serviceUrl;
 
     public static FoundryLocalModelProvider Instance { get; } = new();
@@ -22,49 +22,70 @@ public sealed class FoundryLocalModelProvider : ILanguageModelProvider
 
     public string ProviderDescription => "The model will run locally via Foundry Local";
 
-    public IChatClient? GetIChatClient(string modelId)
-    {
-        Logger.LogInfo($"[FoundryLocal] GetIChatClient called with url: {modelId}");
-        InitializeAsync().GetAwaiter().GetResult();
+    public string UrlPrefix => "fl://";
 
+    public IChatClient? GetIChatClient(string url)
+    {
+        try
+        {
+            Logger.LogInfo($"[FoundryLocal] GetIChatClient called with url: {url}");
+            InitializeAsync().GetAwaiter().GetResult();
+        }
+        catch (Exception ex)
+        {
+            Logger.LogError($"[FoundryLocal] Failed to initialize: {ex.Message}");
+            return null;
+        }
+
+        if (string.IsNullOrWhiteSpace(_serviceUrl) || _foundryManager == null)
+        {
+            Logger.LogError("[FoundryLocal] Service URL or manager is null");
+            return null;
+        }
+
+        // Extract model ID from URL (format: fl://modelname)
+        var modelId = url.Replace(UrlPrefix, string.Empty).Trim('/');
         if (string.IsNullOrWhiteSpace(modelId))
         {
             Logger.LogError("[FoundryLocal] Model ID is empty after extraction");
             return null;
         }
 
-        // Check if model is in catalog
-        var isInCatalog = _catalogModels?.Any(m => m.Name == modelId) ?? false;
-        if (!isInCatalog)
-        {
-            var errorMessage = $"{modelId} is not supported in Foundry Local. Please configure supported models in Settings.";
-            Logger.LogError($"[FoundryLocal] {errorMessage}");
-            throw new InvalidOperationException(errorMessage);
-        }
+        Logger.LogInfo($"[FoundryLocal] Extracted model ID: {modelId}");
 
         // Ensure the model is loaded before returning chat client
-        var isLoaded = _foundryClient!.EnsureModelLoaded(modelId).GetAwaiter().GetResult();
-        if (!isLoaded)
+        try
         {
-            Logger.LogError($"[FoundryLocal] Failed to load model: {modelId}");
-            throw new InvalidOperationException($"Failed to load the model '{modelId}'.");
+            var isLoaded = _foundryManager.EnsureModelLoaded(modelId).GetAwaiter().GetResult();
+            if (!isLoaded)
+            {
+                Logger.LogError($"[FoundryLocal] Failed to load model: {modelId}");
+                return null;
+            }
+
+            Logger.LogInfo($"[FoundryLocal] Model is loaded: {modelId}");
+        }
+        catch (Exception ex)
+        {
+            Logger.LogError($"[FoundryLocal] Exception ensuring model loaded: {ex.Message}");
+            return null;
         }
 
         // Use ServiceUri instead of Endpoint since Endpoint already includes /v1
-        var baseUri = _foundryClient.GetServiceUri();
+        var baseUri = _foundryManager.GetServiceUri();
         if (baseUri == null)
         {
-            const string message = "Foundry Local service URL is not available. Please make sure Foundry Local is installed and running.";
-            Logger.LogError($"[FoundryLocal] {message}");
-            throw new InvalidOperationException(message);
+            Logger.LogError("[FoundryLocal] Service URI is null");
+            return null;
         }
 
         var endpointUri = new Uri($"{baseUri.ToString().TrimEnd('/')}/v1");
         Logger.LogInfo($"[FoundryLocal] Creating OpenAI client with endpoint: {endpointUri}");
+        Logger.LogInfo($"[FoundryLocal] Model ID for chat client: {modelId}");
 
         return new OpenAIClient(
             new ApiKeyCredential("none"),
-            new OpenAIClientOptions { Endpoint = endpointUri, NetworkTimeout = TimeSpan.FromMinutes(5) })
+            new OpenAIClientOptions { Endpoint = endpointUri })
             .GetChatClient(modelId)
             .AsIChatClient();
     }
@@ -90,16 +111,48 @@ 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)
     {
-        await InitializeAsync(cancelationToken);
-
-        if (_foundryClient == null)
+        if (ignoreCached)
         {
-            return Array.Empty<ModelDetails>();
+            Logger.LogInfo("[FoundryLocal] Ignoring cached models, resetting");
+            Reset();
         }
 
-        var cachedModels = await _foundryClient.ListCachedModels();
+        await InitializeAsync(cancelationToken);
+
+        Logger.LogInfo($"[FoundryLocal] Returning {_downloadedModels?.Count() ?? 0} downloaded models");
+        return _downloadedModels ?? [];
+    }
+
+    private void Reset()
+    {
+        _downloadedModels = null;
+        _ = InitializeAsync();
+    }
+
+    private async Task InitializeAsync(CancellationToken cancelationToken = default)
+    {
+        if (_foundryManager != null && _downloadedModels != null && _downloadedModels.Any())
+        {
+            return;
+        }
+
+        Logger.LogInfo("[FoundryLocal] Initializing provider");
+        _foundryManager ??= await FoundryClient.CreateAsync();
+
+        if (_foundryManager == null)
+        {
+            Logger.LogError("[FoundryLocal] Failed to create Foundry client");
+            return;
+        }
+
+        _serviceUrl ??= await _foundryManager.GetServiceUrl();
+        Logger.LogInfo($"[FoundryLocal] Service URL: {_serviceUrl}");
+
+        var cachedModels = await _foundryManager.ListCachedModels();
+        Logger.LogInfo($"[FoundryLocal] Found {cachedModels.Count} cached models");
+
         List<ModelDetails> downloadedModels = [];
 
         foreach (var model in cachedModels)
@@ -109,47 +162,23 @@ public sealed class FoundryLocalModelProvider : ILanguageModelProvider
             {
                 Id = $"fl-{model.Name}",
                 Name = model.Name,
-                Url = $"fl://{model.Name}",
+                Url = $"{UrlPrefix}{model.Name}",
                 Description = $"{model.Name} running locally with Foundry Local",
                 HardwareAccelerators = [HardwareAccelerator.FOUNDRYLOCAL],
+                SupportedOnQualcomm = true,
                 ProviderModelDetails = model,
             });
         }
 
-        return downloadedModels;
-    }
-
-    private async Task InitializeAsync(CancellationToken cancelationToken = default)
-    {
-        if (_foundryClient != null && _catalogModels != null && _catalogModels.Any())
-        {
-            await _foundryClient.EnsureRunning().ConfigureAwait(false);
-            return;
-        }
-
-        Logger.LogInfo("[FoundryLocal] Initializing provider");
-        _foundryClient ??= await FoundryClient.CreateAsync();
-
-        if (_foundryClient == null)
-        {
-            const string message = "Foundry Local client could not be created. Please make sure Foundry Local is installed and running.";
-            Logger.LogError($"[FoundryLocal] {message}");
-            throw new InvalidOperationException(message);
-        }
-
-        _serviceUrl ??= await _foundryClient.GetServiceUrl();
-        Logger.LogInfo($"[FoundryLocal] Service URL: {_serviceUrl}");
-
-        var catalogModels = await _foundryClient.ListCatalogModels();
-        Logger.LogInfo($"[FoundryLocal] Found {catalogModels.Count} catalog models");
-        _catalogModels = catalogModels;
+        _downloadedModels = downloadedModels;
+        Logger.LogInfo($"[FoundryLocal] Initialization complete. Total downloaded models: {downloadedModels.Count}");
     }
 
     public async Task<bool> IsAvailable()
     {
         Logger.LogInfo("[FoundryLocal] Checking availability");
         await InitializeAsync();
-        var available = _foundryClient != null;
+        var available = _foundryManager != null;
         Logger.LogInfo($"[FoundryLocal] Available: {available}");
         return available;
     }

src/common/LanguageModelProvider/ILanguageModelProvider.cs

@@ -10,11 +10,13 @@ public interface ILanguageModelProvider
 {
     string Name { get; }
 
+    string UrlPrefix { get; }
+
     string ProviderDescription { get; }
 
-    Task<IEnumerable<ModelDetails>> GetModelsAsync(CancellationToken cancelationToken = default);
+    Task<IEnumerable<ModelDetails>> GetModelsAsync(bool ignoreCached = false, CancellationToken cancelationToken = default);
 
-    IChatClient? GetIChatClient(string modelId);
+    IChatClient? GetIChatClient(string url);
 
     string GetIChatClientString(string url);
 }

src/common/LanguageModelProvider/LanguageModelService.cs

@@ -0,0 +1,106 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System.Collections.Concurrent;
+using Microsoft.Extensions.AI;
+
+namespace LanguageModelProvider;
+
+public sealed class LanguageModelService
+{
+    private readonly ConcurrentDictionary<string, ILanguageModelProvider> _providersByPrefix;
+
+    public LanguageModelService(IEnumerable<ILanguageModelProvider> providers)
+    {
+        ArgumentNullException.ThrowIfNull(providers);
+
+        _providersByPrefix = new ConcurrentDictionary<string, ILanguageModelProvider>(StringComparer.OrdinalIgnoreCase);
+
+        foreach (var provider in providers)
+        {
+            if (!string.IsNullOrWhiteSpace(provider.UrlPrefix))
+            {
+                _providersByPrefix[provider.UrlPrefix] = provider;
+            }
+        }
+    }
+
+    public static LanguageModelService CreateDefault()
+    {
+        return new LanguageModelService(new[]
+        {
+            FoundryLocalModelProvider.Instance,
+        });
+    }
+
+    public IReadOnlyCollection<ILanguageModelProvider> Providers => _providersByPrefix.Values.ToArray();
+
+    public bool RegisterProvider(ILanguageModelProvider provider)
+    {
+        ArgumentNullException.ThrowIfNull(provider);
+
+        if (string.IsNullOrWhiteSpace(provider.UrlPrefix))
+        {
+            throw new ArgumentException("Provider must supply a URL prefix.", nameof(provider));
+        }
+
+        _providersByPrefix[provider.UrlPrefix] = provider;
+        return true;
+    }
+
+    public ILanguageModelProvider? GetProviderFor(string? modelReference)
+    {
+        if (string.IsNullOrWhiteSpace(modelReference))
+        {
+            return null;
+        }
+
+        foreach (var provider in _providersByPrefix.Values)
+        {
+            if (modelReference.StartsWith(provider.UrlPrefix, StringComparison.OrdinalIgnoreCase))
+            {
+                return provider;
+            }
+        }
+
+        return null;
+    }
+
+    public async Task<IReadOnlyList<ModelDetails>> GetModelsAsync(bool refresh = false, CancellationToken cancellationToken = default)
+    {
+        List<ModelDetails> models = [];
+
+        foreach (var provider in _providersByPrefix.Values)
+        {
+            cancellationToken.ThrowIfCancellationRequested();
+            var providerModels = await provider.GetModelsAsync(refresh, cancellationToken).ConfigureAwait(false);
+            models.AddRange(providerModels);
+        }
+
+        return models;
+    }
+
+    public IChatClient? GetClient(ModelDetails model)
+    {
+        if (model is null)
+        {
+            return null;
+        }
+
+        var reference = !string.IsNullOrWhiteSpace(model.Url) ? model.Url : model.Id;
+        return GetClient(reference);
+    }
+
+    public IChatClient? GetClient(string? modelReference)
+    {
+        if (string.IsNullOrWhiteSpace(modelReference))
+        {
+            return null;
+        }
+
+        var provider = GetProviderFor(modelReference);
+
+        return provider?.GetIChatClient(modelReference);
+    }
+}

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.UnitTests/Mocks/IntegrationTestUserSettings.cs

@@ -49,8 +49,6 @@ internal sealed class IntegrationTestUserSettings : IUserSettings
 
     public bool CloseAfterLosingFocus => false;
 
-    public bool EnableClipboardPreview => true;
-
     public IReadOnlyList<AdvancedPasteCustomAction> CustomActions => _customActions;
 
     public IReadOnlyList<PasteFormats> AdditionalActions => _additionalActions;

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"
@@ -611,10 +611,10 @@
                                                     CornerRadius="{StaticResource ControlCornerRadius}"
                                                     Visibility="{x:Bind IsLocalModel, Mode=OneWay}">
                                                     <TextBlock
-                                                        x:Uid="LocalModelBadge"
                                                         AutomationProperties.AccessibilityView="Raw"
                                                         FontSize="10"
-                                                        Foreground="{ThemeResource TextFillColorSecondaryBrush}" />
+                                                        Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                                                        Text="Local" />
                                                 </Border>
                                                 <!--<Border
                                                     Grid.Column="2"

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

@@ -156,7 +156,7 @@
             BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}"
             BorderThickness="1"
             CornerRadius="20"
-            Visibility="{x:Bind ViewModel.ShowClipboardPreview, Converter={StaticResource BoolToVisibilityConverter}, Mode=OneWay}">
+            Visibility="{x:Bind ViewModel.ClipboardHasData, Converter={StaticResource BoolToVisibilityConverter}, Mode=OneWay}">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="*" />
                 <ColumnDefinition Width="Auto" />
@@ -168,8 +168,7 @@
                 Margin="0,0,4,0"
                 VerticalAlignment="Center"
                 IsEnabled="{x:Bind ViewModel.ClipboardHistoryEnabled, Mode=TwoWay}"
-                Style="{StaticResource SubtleButtonStyle}"
-                Visibility="{x:Bind ViewModel.ShowClipboardHistoryButton, Converter={StaticResource BoolToVisibilityConverter}, Mode=OneWay}">
+                Style="{StaticResource SubtleButtonStyle}">
                 <ToolTipService.ToolTip>
                     <TextBlock x:Uid="ClipboardHistoryButtonToolTip" />
                 </ToolTipService.ToolTip>
@@ -264,17 +263,16 @@
                     <Button
                         Padding="0"
                         VerticalAlignment="Center"
-                        Style="{StaticResource SubtleButtonStyle}"
-                        Visibility="{x:Bind ViewModel.HasLegalLinks, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}">
+                        Style="{StaticResource SubtleButtonStyle}">
                         <FontIcon FontSize="12" Glyph="&#xE946;" />
                         <Button.Flyout>
                             <Flyout>
                                 <StackPanel Spacing="8">
                                     <TextBlock TextWrapping="Wrap">
                                         <Run x:Uid="AIMistakeNote" /><LineBreak /><Run
-                                            x:Uid="CustomEndpointWarning"
                                             FontSize="12"
-                                            Foreground="{ThemeResource TextFillColorSecondaryBrush}" />
+                                            Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                                            Text="You are using a custom endpoint. Verify all answers." />
                                     </TextBlock>
                                     <StackPanel Orientation="Horizontal" Spacing="8">
                                         <HyperlinkButton
@@ -299,49 +297,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/Helpers/AIServiceFormatEvent.cs

@@ -18,7 +18,6 @@ namespace AdvancedPaste.Helpers
             PromptTokens = semanticKernelFormatEvent.PromptTokens;
             CompletionTokens = semanticKernelFormatEvent.CompletionTokens;
             ModelName = semanticKernelFormatEvent.ModelName;
-            ProviderType = semanticKernelFormatEvent.ProviderType;
             ActionChain = semanticKernelFormatEvent.ActionChain;
         }
 
@@ -39,8 +38,6 @@ namespace AdvancedPaste.Helpers
 
         public string ModelName { get; set; }
 
-        public string ProviderType { get; set; }
-
         public string ActionChain { get; set; }
 
         public string ToJsonString() => JsonSerializer.Serialize(this, SourceGenerationContext.Default.AIServiceFormatEvent);

src/modules/AdvancedPaste/AdvancedPaste/Helpers/IUserSettings.cs

@@ -19,8 +19,6 @@ namespace AdvancedPaste.Settings
 
         public bool CloseAfterLosingFocus { get; }
 
-        public bool EnableClipboardPreview { get; }
-
         public IReadOnlyList<AdvancedPasteCustomAction> CustomActions { get; }
 
         public IReadOnlyList<PasteFormats> AdditionalActions { get; }

src/modules/AdvancedPaste/AdvancedPaste/Helpers/UserSettings.cs

@@ -40,8 +40,6 @@ namespace AdvancedPaste.Settings
 
         public bool CloseAfterLosingFocus { get; private set; }
 
-        public bool EnableClipboardPreview { get; private set; }
-
         public IReadOnlyList<PasteFormats> AdditionalActions => _additionalActions;
 
         public IReadOnlyList<AdvancedPasteCustomAction> CustomActions => _customActions;
@@ -55,7 +53,6 @@ namespace AdvancedPaste.Settings
             IsAIEnabled = false;
             ShowCustomPreview = true;
             CloseAfterLosingFocus = false;
-            EnableClipboardPreview = true;
             PasteAIConfiguration = new PasteAIConfiguration();
             _additionalActions = [];
             _customActions = [];
@@ -110,7 +107,6 @@ namespace AdvancedPaste.Settings
                                 IsAIEnabled = properties.IsAIEnabled;
                                 ShowCustomPreview = properties.ShowCustomPreview;
                                 CloseAfterLosingFocus = properties.CloseAfterLosingFocus;
-                                EnableClipboardPreview = properties.EnableClipboardPreview;
                                 PasteAIConfiguration = properties.PasteAIConfiguration ?? new PasteAIConfiguration();
 
                                 var sourceAdditionalActions = properties.AdditionalActions;
@@ -167,134 +163,28 @@ namespace AdvancedPaste.Settings
                 return false;
             }
 
-            var properties = settings.Properties;
-            bool legacyAdvancedAIConsumed = properties.TryConsumeLegacyAdvancedAIEnabled(out var advancedFlag);
-            bool legacyAdvancedAIEnabled = legacyAdvancedAIConsumed && advancedFlag;
-            PasswordCredential legacyCredential = TryGetLegacyOpenAICredential();
-
-            if (legacyCredential is null)
+            if (settings.Properties.IsAIEnabled || !LegacyOpenAIKeyExists())
             {
-                return legacyAdvancedAIConsumed;
+                return false;
             }
 
-            var configuration = properties.PasteAIConfiguration;
-
-            if (configuration is null)
-            {
-                configuration = new PasteAIConfiguration();
-                properties.PasteAIConfiguration = configuration;
-            }
-
-            bool configurationUpdated = false;
-
-            var ensureResult = AdvancedPasteMigrationHelper.EnsureOpenAIProvider(configuration);
-            PasteAIProviderDefinition openAIProvider = ensureResult.Provider;
-            configurationUpdated |= ensureResult.Updated;
-
-            if (legacyAdvancedAIConsumed && openAIProvider is not null && openAIProvider.EnableAdvancedAI != legacyAdvancedAIEnabled)
-            {
-                openAIProvider.EnableAdvancedAI = legacyAdvancedAIEnabled;
-                configurationUpdated = true;
-            }
-
-            if (openAIProvider is not null)
-            {
-                StoreMigratedOpenAICredential(openAIProvider.Id, openAIProvider.ServiceType, legacyCredential.Password);
-                RemoveLegacyOpenAICredential();
-            }
-
-            const bool shouldEnableAI = true;
-            bool enabledUpdated = false;
-            if (properties.IsAIEnabled != shouldEnableAI)
-            {
-                properties.IsAIEnabled = shouldEnableAI;
-                enabledUpdated = true;
-            }
-
-            return configurationUpdated || enabledUpdated || legacyAdvancedAIConsumed;
+            settings.Properties.IsAIEnabled = true;
+            return true;
         }
 
-        private static PasswordCredential TryGetLegacyOpenAICredential()
+        private static bool LegacyOpenAIKeyExists()
         {
             try
             {
                 PasswordVault vault = new();
-                var credential = vault.Retrieve("https://platform.openai.com/api-keys", "PowerToys_AdvancedPaste_OpenAIKey");
-                credential?.RetrievePassword();
-                return credential;
+                return vault.Retrieve("https://platform.openai.com/api-keys", "PowerToys_AdvancedPaste_OpenAIKey") is not null;
             }
             catch (Exception)
             {
-                return null;
+                return false;
             }
         }
 
-        private static void RemoveLegacyOpenAICredential()
-        {
-            try
-            {
-                PasswordVault vault = new();
-                TryRemoveCredential(vault, "https://platform.openai.com/api-keys", "PowerToys_AdvancedPaste_OpenAIKey");
-            }
-            catch (Exception)
-            {
-            }
-        }
-
-        private static void StoreMigratedOpenAICredential(string providerId, string serviceType, string password)
-        {
-            if (string.IsNullOrWhiteSpace(password))
-            {
-                return;
-            }
-
-            try
-            {
-                var serviceKind = serviceType.ToAIServiceType();
-                if (serviceKind != AIServiceType.OpenAI)
-                {
-                    return;
-                }
-
-                string resource = "https://platform.openai.com/api-keys";
-                string username = $"PowerToys_AdvancedPaste_PasteAI_openai_{NormalizeProviderIdentifier(providerId)}";
-
-                PasswordVault vault = new();
-                TryRemoveCredential(vault, resource, username);
-
-                PasswordCredential credential = new(resource, username, password);
-                vault.Add(credential);
-            }
-            catch (Exception ex)
-            {
-                Logger.LogError("Failed to migrate legacy OpenAI credential", ex);
-            }
-        }
-
-        private static void TryRemoveCredential(PasswordVault vault, string credentialResource, string credentialUserName)
-        {
-            try
-            {
-                PasswordCredential existingCred = vault.Retrieve(credentialResource, credentialUserName);
-                vault.Remove(existingCred);
-            }
-            catch (Exception)
-            {
-                // Credential doesn't exist, which is fine
-            }
-        }
-
-        private static string NormalizeProviderIdentifier(string providerId)
-        {
-            if (string.IsNullOrWhiteSpace(providerId))
-            {
-                return "default";
-            }
-
-            var filtered = new string(providerId.Where(char.IsLetterOrDigit).ToArray());
-            return string.IsNullOrWhiteSpace(filtered) ? "default" : filtered.ToLowerInvariant();
-        }
-
         public async Task SetActiveAIProviderAsync(string providerId)
         {
             if (string.IsNullOrWhiteSpace(providerId))

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/CustomActionTransformService.cs

@@ -83,39 +83,32 @@ namespace AdvancedPaste.Services.CustomActions
                     SystemPrompt = systemPrompt,
                 };
 
-                var operationStart = DateTime.UtcNow;
-
                 var providerContent = await provider.ProcessPasteAsync(
                     request,
                     cancellationToken,
                     progress);
 
-                var durationMs = (int)Math.Round((DateTime.UtcNow - operationStart).TotalMilliseconds);
-
                 var usage = request.Usage;
                 var content = providerContent ?? string.Empty;
 
-                // Log endpoint usage (custom action pipeline is not the advanced SK flow)
-                var endpointEvent = new AdvancedPasteEndpointUsageEvent(providerConfig.ProviderType, providerConfig.Model ?? string.Empty, isAdvanced: false, durationMs: durationMs);
+                // Log endpoint usage
+                var endpointEvent = new AdvancedPasteEndpointUsageEvent(providerConfig.ProviderType);
                 PowerToysTelemetry.Log.WriteEvent(endpointEvent);
 
-                Logger.LogDebug($"{nameof(CustomActionTransformService)}.{nameof(TransformAsync)} complete; ModelName={providerConfig.Model ?? string.Empty}, PromptTokens={usage.PromptTokens}, CompletionTokens={usage.CompletionTokens}, DurationMs={durationMs}");
+                Logger.LogDebug($"{nameof(CustomActionTransformService)}.{nameof(TransformAsync)} complete; ModelName={providerConfig.Model ?? string.Empty}, PromptTokens={usage.PromptTokens}, CompletionTokens={usage.CompletionTokens}");
 
                 return new CustomActionTransformResult(content, usage);
             }
             catch (Exception ex)
             {
                 Logger.LogError($"{nameof(CustomActionTransformService)}.{nameof(TransformAsync)} failed", ex);
-                var statusCode = ExtractStatusCode(ex);
-                var modelName = providerConfig.Model ?? string.Empty;
-                AdvancedPasteCustomActionErrorEvent errorEvent = new(providerConfig.ProviderType, modelName, statusCode, ex is PasteActionModeratedException ? PasteActionModeratedException.ErrorDescription : ex.Message);
-                PowerToysTelemetry.Log.WriteEvent(errorEvent);
 
                 if (ex is PasteActionException or OperationCanceledException)
                 {
                     throw;
                 }
 
+                var statusCode = ExtractStatusCode(ex);
                 var failureMessage = providerConfig.ProviderType switch
                 {
                     AIServiceType.OpenAI or AIServiceType.AzureOpenAI => ErrorHelpers.TranslateErrorText(statusCode),

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

@@ -7,7 +7,6 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
-using AdvancedPaste.Helpers;
 using AdvancedPaste.Models;
 using LanguageModelProvider;
 using Microsoft.Extensions.AI;
@@ -24,7 +23,7 @@ public sealed class FoundryLocalPasteProvider : IPasteAIProvider
 
     public static PasteAIProviderRegistration Registration { get; } = new(SupportedTypes, config => new FoundryLocalPasteProvider(config));
 
-    private static readonly FoundryLocalModelProvider _modelProvider = FoundryLocalModelProvider.Instance;
+    private static readonly LanguageModelService LanguageModels = LanguageModelService.CreateDefault();
 
     private readonly PasteAIConfig _config;
 
@@ -34,6 +33,10 @@ public sealed class FoundryLocalPasteProvider : IPasteAIProvider
         _config = config;
     }
 
+    public string ProviderName => AIServiceType.FoundryLocal.ToNormalizedKey();
+
+    public string DisplayName => string.IsNullOrWhiteSpace(_config?.Model) ? "Foundry Local" : _config.Model;
+
     public async Task<bool> IsAvailableAsync(CancellationToken cancellationToken)
     {
         cancellationToken.ThrowIfCancellationRequested();
@@ -69,26 +72,22 @@ public sealed class FoundryLocalPasteProvider : IPasteAIProvider
                 throw new PasteActionException(
                     "No Foundry Local model selected",
                     new InvalidOperationException("Model identifier is required"),
-                    aiServiceMessage: "Please select a model in the AI provider settings.");
+                    aiServiceMessage: "Please select a model in the AI provider settings. Model identifier should be in the format 'fl://model-name'.");
             }
 
             cancellationToken.ThrowIfCancellationRequested();
-
-            IChatClient chatClient;
-            try
+            var chatClient = LanguageModels.GetClient(modelReference);
+            if (chatClient is null)
             {
-                chatClient = _modelProvider.GetIChatClient(modelReference);
-            }
-            catch (InvalidOperationException ex)
-            {
-                // GetIChatClient throws InvalidOperationException for user-facing errors
-                var errorMessage = string.Format(System.Globalization.CultureInfo.CurrentCulture, ResourceLoaderInstance.ResourceLoader.GetString("FoundryLocal_UnableToLoadModel"), modelReference);
                 throw new PasteActionException(
-                    errorMessage,
-                    ex,
-                    aiServiceMessage: ex.Message);
+                    $"Unable to load Foundry Local model: {modelReference}",
+                    new InvalidOperationException("Chat client resolution failed"),
+                    aiServiceMessage: "The model may not be downloaded or the Foundry Local service may not be running. Please check the model status in settings.");
             }
 
+            // Extract actual model ID from the URL (format: fl://modelId)
+            var actualModelId = modelReference.Replace("fl://", string.Empty).Trim('/');
+
             var userMessageContent = $"""
                 User instructions:
                 {prompt}
@@ -105,7 +104,7 @@ public sealed class FoundryLocalPasteProvider : IPasteAIProvider
                 new(ChatRole.User, userMessageContent),
             };
 
-            var chatOptions = CreateChatOptions(_config?.SystemPrompt, modelReference);
+            var chatOptions = CreateChatOptions(_config?.SystemPrompt, actualModelId);
 
             progress?.Report(0.1);
 
@@ -146,7 +145,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/Services/KernelServiceBase.cs

@@ -29,7 +29,6 @@ public abstract class KernelServiceBase(
     ICustomActionTransformService customActionTransformService) : IKernelService
 {
     private const string PromptParameterName = "prompt";
-    private const string DefaultSystemPrompt = "You are an agent who is tasked with helping users paste their clipboard data. You have functions available to help you with this task. Call function when necessary to help user finish the transformation task. You never need to ask permission, always try to do as the user asks. The user will only input one message and will not be available for further questions, so try your best. The user will put in a request to format their clipboard data and you will fulfill it. Do not output anything else besides the reformatted clipboard content.";
 
     private readonly IKernelQueryCacheService _queryCacheService = queryCacheService;
     private readonly IPromptModerationService _promptModerationService = promptModerationService;
@@ -145,8 +144,7 @@ public abstract class KernelServiceBase(
 
         ChatHistory chatHistory = [];
 
-        var systemPrompt = string.IsNullOrWhiteSpace(runtimeConfig.SystemPrompt) ? DefaultSystemPrompt : runtimeConfig.SystemPrompt;
-        chatHistory.AddSystemMessage(systemPrompt);
+        chatHistory.AddSystemMessage(runtimeConfig.SystemPrompt);
         chatHistory.AddSystemMessage($"Available clipboard formats: {await kernel.GetDataFormatsAsync()}");
         chatHistory.AddUserMessage(prompt);
 
@@ -188,20 +186,12 @@ public abstract class KernelServiceBase(
 
     private void LogResult(bool cacheUsed, bool isSavedQuery, IEnumerable<ActionChainItem> actionChain, AIServiceUsage usage)
     {
-        var runtimeConfig = GetRuntimeConfiguration();
-
-        AdvancedPasteSemanticKernelFormatEvent telemetryEvent = new(
-            cacheUsed,
-            isSavedQuery,
-            usage.PromptTokens,
-            usage.CompletionTokens,
-            AdvancedAIModelName,
-            runtimeConfig.ServiceType.ToString(),
-            AdvancedPasteSemanticKernelFormatEvent.FormatActionChain(actionChain));
+        AdvancedPasteSemanticKernelFormatEvent telemetryEvent = new(cacheUsed, isSavedQuery, usage.PromptTokens, usage.CompletionTokens, AdvancedAIModelName, AdvancedPasteSemanticKernelFormatEvent.FormatActionChain(actionChain));
         PowerToysTelemetry.Log.WriteEvent(telemetryEvent);
 
         // Log endpoint usage
-        var endpointEvent = new AdvancedPasteEndpointUsageEvent(runtimeConfig.ServiceType, AdvancedAIModelName, isAdvanced: true);
+        var runtimeConfig = GetRuntimeConfiguration();
+        var endpointEvent = new AdvancedPasteEndpointUsageEvent(runtimeConfig.ServiceType);
         PowerToysTelemetry.Log.WriteEvent(endpointEvent);
 
         var logEvent = new AIServiceFormatEvent(telemetryEvent);

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>
@@ -359,17 +359,6 @@
   </data>
   <data name="Relative_Date_TimeFormat" xml:space="preserve">
     <value>{0}, {1}</value>
-    <comment>(e.g., "10/20/2025, 17:05" in the user's locale)</comment>
-  </data>
-  <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">
-    <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>
-  <data name="FoundryLocal_UnableToLoadModel" xml:space="preserve">
-    <value>Unable to load Foundry Local model: {0}</value>
-    <comment>{0} is the model identifier. Do not translate {0}.</comment>
+    <comment>(e.g., “10/20/2025, 17:05” in the user’s locale)</comment>
   </data>
 </root>

src/modules/AdvancedPaste/AdvancedPaste/Telemetry/AdvancedPasteCustomActionErrorEvent.cs

@@ -1,34 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System.Diagnostics.CodeAnalysis;
-using System.Diagnostics.Tracing;
-using Microsoft.PowerToys.Settings.UI.Library;
-using Microsoft.PowerToys.Telemetry;
-using Microsoft.PowerToys.Telemetry.Events;
-
-namespace AdvancedPaste.Telemetry;
-
-[EventData]
-[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicProperties)]
-public sealed class AdvancedPasteCustomActionErrorEvent : EventBase, IEvent
-{
-    public AdvancedPasteCustomActionErrorEvent(AIServiceType providerType, string modelName, int statusCode, string error)
-    {
-        ProviderType = providerType.ToString();
-        ModelName = modelName;
-        StatusCode = statusCode;
-        Error = error;
-    }
-
-    public string ProviderType { get; set; }
-
-    public string ModelName { get; set; }
-
-    public int StatusCode { get; set; }
-
-    public string Error { get; set; }
-
-    public PartA_PrivTags PartA_PrivTags => PartA_PrivTags.ProductAndServiceUsage;
-}

src/modules/AdvancedPaste/AdvancedPaste/Telemetry/AdvancedPasteEndpointUsageEvent.cs

@@ -19,27 +19,9 @@ public class AdvancedPasteEndpointUsageEvent : EventBase, IEvent
     /// </summary>
     public string ProviderType { get; set; }
 
-    /// <summary>
-    /// Gets or sets the configured model name.
-    /// </summary>
-    public string ModelName { get; set; }
-
-    /// <summary>
-    /// Gets or sets a value indicating whether the advanced AI pipeline was used.
-    /// </summary>
-    public bool IsAdvanced { get; set; }
-
-    /// <summary>
-    /// Gets or sets the total duration in milliseconds, or -1 if unavailable.
-    /// </summary>
-    public int DurationMs { get; set; }
-
-    public AdvancedPasteEndpointUsageEvent(AIServiceType providerType, string modelName, bool isAdvanced, int durationMs = -1)
+    public AdvancedPasteEndpointUsageEvent(AIServiceType providerType)
     {
         ProviderType = providerType.ToString();
-        ModelName = modelName;
-        IsAdvanced = isAdvanced;
-        DurationMs = durationMs;
     }
 
     public PartA_PrivTags PartA_PrivTags => PartA_PrivTags.ProductAndServiceUsage;

src/modules/AdvancedPaste/AdvancedPaste/Telemetry/AdvancedPasteSemanticKernelFormatEvent.cs

@@ -14,7 +14,7 @@ namespace AdvancedPaste.Telemetry;
 
 [EventData]
 [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicProperties)]
-public class AdvancedPasteSemanticKernelFormatEvent(bool cacheUsed, bool isSavedQuery, int promptTokens, int completionTokens, string modelName, string providerType, string actionChain) : EventBase, IEvent
+public class AdvancedPasteSemanticKernelFormatEvent(bool cacheUsed, bool isSavedQuery, int promptTokens, int completionTokens, string modelName, string actionChain) : EventBase, IEvent
 {
     public static string FormatActionChain(IEnumerable<ActionChainItem> actionChain) => FormatActionChain(actionChain.Select(item => item.Format));
 
@@ -30,8 +30,6 @@ public class AdvancedPasteSemanticKernelFormatEvent(bool cacheUsed, bool isSaved
 
     public string ModelName { get; set; } = modelName;
 
-    public string ProviderType { get; set; } = providerType;
-
     /// <summary>
     /// Gets or sets a comma-separated list of paste formats used - in the same order they were executed.
     /// Conceptually an array but formatted this way to work around https://github.com/dotnet/runtime/issues/10428

src/modules/AdvancedPaste/AdvancedPaste/ViewModels/OptionsViewModel.cs

@@ -63,7 +63,6 @@ namespace AdvancedPaste.ViewModels
         private ClipboardFormat _availableClipboardFormats;
 
         [ObservableProperty]
-        [NotifyPropertyChangedFor(nameof(ShowClipboardHistoryButton))]
         private bool _clipboardHistoryEnabled;
 
         [ObservableProperty]
@@ -77,7 +76,6 @@ namespace AdvancedPaste.ViewModels
         [NotifyPropertyChangedFor(nameof(PrivacyLinkUri))]
         [NotifyPropertyChangedFor(nameof(HasTermsLink))]
         [NotifyPropertyChangedFor(nameof(HasPrivacyLink))]
-        [NotifyPropertyChangedFor(nameof(HasLegalLinks))]
         private bool _isAllowedByGPO;
 
         [ObservableProperty]
@@ -223,16 +221,10 @@ namespace AdvancedPaste.ViewModels
 
         public bool HasPrivacyLink => GetActiveProviderMetadata().HasPrivacyLink;
 
-        public bool HasLegalLinks => HasTermsLink || HasPrivacyLink;
-
         public bool ClipboardHasData => AvailableClipboardFormats != ClipboardFormat.None;
 
         public bool ClipboardHasDataForCustomAI => PasteFormat.SupportsClipboardFormats(CustomAIFormat, AvailableClipboardFormats);
 
-        public bool ShowClipboardPreview => _userSettings.EnableClipboardPreview;
-
-        public bool ShowClipboardHistoryButton => ClipboardHistoryEnabled;
-
         public bool HasIndeterminateTransformProgress => double.IsNaN(TransformProgress);
 
         private PasteFormats CustomAIFormat =>
@@ -318,7 +310,6 @@ namespace AdvancedPaste.ViewModels
             OnPropertyChanged(nameof(IsAdvancedAIEnabled));
             OnPropertyChanged(nameof(AIProviders));
             OnPropertyChanged(nameof(AllowedAIProviders));
-            OnPropertyChanged(nameof(ShowClipboardPreview));
 
             NotifyActiveProviderChanged();
 
@@ -370,7 +361,6 @@ namespace AdvancedPaste.ViewModels
             OnPropertyChanged(nameof(PrivacyLinkUri));
             OnPropertyChanged(nameof(HasTermsLink));
             OnPropertyChanged(nameof(HasPrivacyLink));
-            OnPropertyChanged(nameof(HasLegalLinks));
         }
 
         private void RefreshPasteFormats()

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/MouseUtils/CursorWrap/dllmain.cpp

@@ -196,10 +196,10 @@ public:
         m_enabled = true;
         Trace::EnableCursorWrap(true);
         
-        // Always start the mouse hook when the module is enabled
-        // This ensures cursor wrapping is active immediately after enabling
-        StartMouseHook();
-        Logger::info("CursorWrap enabled - mouse hook started");
+        if (m_autoActivate)
+        {
+            StartMouseHook();
+        }
     }
 
     // Disable the powertoy
@@ -208,7 +208,6 @@ public:
         m_enabled = false;
         Trace::EnableCursorWrap(false);
         StopMouseHook();
-        Logger::info("CursorWrap disabled - mouse hook stopped");
     }
 
     // Returns if the powertoys is enabled

src/modules/ZoomIt/ZoomIt/ZoomIt.h

@@ -39,10 +39,6 @@ type_pEnableThemeDialogTexture    pEnableThemeDialogTexture;
 #define WIN7_VERSION		0x106
 #define WIN10_VERSION		0x206
 
-// Default recording format frame rates
-#define RECORDING_FORMAT_GIF_DEFAULT_FRAMERATE 15
-#define RECORDING_FORMAT_MP4_DEFAULT_FRAMERATE 30
-
 // Time that we'll cache live zoom window to avoid flicker
 // of live zooming on Vista/ws2k8
 #define LIVEZOOM_WINDOW_TIMEOUT	2*3600*1000

src/modules/ZoomIt/ZoomIt/ZoomItSettings.h

@@ -44,11 +44,11 @@ LOGFONT	g_LogFont;
 BOOLEAN g_DemoTypeUserDriven = false;
 TCHAR   g_DemoTypeFile[MAX_PATH] = {0};
 DWORD	g_DemoTypeSpeedSlider = static_cast<int>(((MIN_TYPING_SPEED - MAX_TYPING_SPEED) / 2) + MAX_TYPING_SPEED);
-DWORD   g_RecordFrameRate = 30; // We default to 30 here, but g_RecordFrameRate can be different depending on recording format and gets set accordingly
+DWORD	g_RecordFrameRate = 30;
 DWORD	g_RecordScaling = 100;
 DWORD	g_RecordScalingGIF = 50;
 DWORD	g_RecordScalingMP4 = 100;
-RecordingFormat g_RecordingFormat = RecordingFormat::MP4;
+RecordingFormat g_RecordingFormat = RecordingFormat::GIF;
 BOOLEAN g_CaptureAudio = FALSE;
 TCHAR	g_MicrophoneDeviceId[MAX_PATH] = {0};
 
@@ -87,7 +87,8 @@ REG_SETTING RegSettings[] = {
     { L"SnapToGrid", SETTING_TYPE_BOOLEAN, 0, &g_SnapToGrid, static_cast<DOUBLE>(g_SnapToGrid) },
     { L"ZoominSliderLevel", SETTING_TYPE_DWORD, 0, &g_SliderZoomLevel, static_cast<DOUBLE>(g_SliderZoomLevel) },
     { L"Font", SETTING_TYPE_BINARY, sizeof g_LogFont, &g_LogFont, static_cast<DOUBLE>(0) },
-    { L"RecordingFormat", SETTING_TYPE_DWORD, 0, &g_RecordingFormat, static_cast<DOUBLE>(g_RecordingFormat) },
+    { L"RecordFrameRate", SETTING_TYPE_DWORD, 0, &g_RecordFrameRate, static_cast<DOUBLE>(g_RecordFrameRate) },
+    { L"RecordingFormat", SETTING_TYPE_DWORD, 0, &g_RecordingFormat, static_cast<DOUBLE>(0) },
     { L"RecordScalingGIF", SETTING_TYPE_DWORD, 0, &g_RecordScalingGIF, static_cast<DOUBLE>(g_RecordScalingGIF) },
     { L"RecordScalingMP4", SETTING_TYPE_DWORD, 0, &g_RecordScalingMP4, static_cast<DOUBLE>(g_RecordScalingMP4) },
     { L"CaptureAudio", SETTING_TYPE_BOOLEAN, 0, &g_CaptureAudio, static_cast<DOUBLE>(g_CaptureAudio) },

src/modules/ZoomIt/ZoomIt/Zoomit.cpp

@@ -168,7 +168,6 @@ BOOL	g_RecordToggle = FALSE;
 BOOL	g_RecordCropping = FALSE;
 SelectRectangle g_SelectRectangle;
 std::wstring	g_RecordingSaveLocation;
-std::wstring	g_RecordingSaveLocationGIF;
 winrt::IDirect3DDevice	g_RecordDevice{ nullptr };
 std::shared_ptr<VideoRecordingSession> g_RecordingSession = nullptr;
 std::shared_ptr<GifRecordingSession> g_GifRecordingSession = nullptr;
@@ -1813,7 +1812,7 @@ INT_PTR CALLBACK OptionsTabProc( HWND hDlg, UINT message,
                 // Check if GIF is selected by comparing the text
                 bool isGifSelected = (wcscmp(selectedText, L"GIF") == 0);
 
-                // If GIF is selected, set the scaling to the g_RecordScalingGIF value; otherwise to the g_RecordScalingMP4 value
+                // if gif is selected set the scaling to the g_recordScaleGIF value otherwise to the g_recordScaleMP4 value
                 if (isGifSelected) {
                     g_RecordScaling = g_RecordScalingGIF;
 
@@ -2174,10 +2173,7 @@ INT_PTR CALLBACK OptionsProc( HWND hDlg, UINT message,
         CheckDlgButton( g_OptionsTabs[RECORD_PAGE].hPage, IDC_CAPTURE_AUDIO,
             g_CaptureAudio ? BST_CHECKED: BST_UNCHECKED );
 
-        //
-        // The framerate drop down list is not used in the current version (might be added in the future)
-        //
-        /*for (int i = 0; i < _countof(g_FramerateOptions); i++) {
+        for (int i = 0; i < _countof(g_FramerateOptions); i++) {
 
             _stprintf(text, L"%d", g_FramerateOptions[i]);
             SendMessage(GetDlgItem(g_OptionsTabs[RECORD_PAGE].hPage, IDC_RECORD_FRAME_RATE), static_cast<UINT>(CB_ADDSTRING),
@@ -2186,7 +2182,7 @@ INT_PTR CALLBACK OptionsProc( HWND hDlg, UINT message,
 
                 SendMessage(GetDlgItem(g_OptionsTabs[RECORD_PAGE].hPage, IDC_RECORD_FRAME_RATE), CB_SETCURSEL, static_cast<WPARAM>(i), static_cast<LPARAM>(0));
             }
-        }*/
+        }
 
         // Add the recording format to the combo box and set the current selection
         size_t selection = 0;
@@ -2349,8 +2345,17 @@ INT_PTR CALLBACK OptionsProc( HWND hDlg, UINT message,
             text[2] = 0;
             newTimeout = _tstoi( text );
 
+            if( g_RecordingFormat == RecordingFormat::GIF )
+            {
+                // Hardcode lower frame rate for GIFs
+                g_RecordFrameRate = 15;
+            }
+            else
+            {
+                g_RecordFrameRate = g_FramerateOptions[SendMessage(GetDlgItem(g_OptionsTabs[RECORD_PAGE].hPage, IDC_RECORD_FRAME_RATE), static_cast<UINT>(CB_GETCURSEL), static_cast<WPARAM>(0), static_cast<LPARAM>(0))];
+            }
+
             g_RecordingFormat = static_cast<RecordingFormat>(SendMessage(GetDlgItem(g_OptionsTabs[RECORD_PAGE].hPage, IDC_RECORD_FORMAT), static_cast<UINT>(CB_GETCURSEL), static_cast<WPARAM>(0), static_cast<LPARAM>(0)));
-            g_RecordFrameRate = (g_RecordingFormat == RecordingFormat::GIF) ? RECORDING_FORMAT_GIF_DEFAULT_FRAMERATE : RECORDING_FORMAT_MP4_DEFAULT_FRAMERATE;
             g_RecordScaling = static_cast<int>(SendMessage(GetDlgItem(g_OptionsTabs[RECORD_PAGE].hPage, IDC_RECORD_SCALING), static_cast<UINT>(CB_GETCURSEL), static_cast<WPARAM>(0), static_cast<LPARAM>(0)) * 10 + 10);
 
             // Get the selected microphone
@@ -3531,16 +3536,7 @@ void StopRecording()
 //----------------------------------------------------------------------------
 auto GetUniqueRecordingFilename()
 {
-    std::filesystem::path path;
-
-    if (g_RecordingFormat == RecordingFormat::GIF)
-    {
-        path = g_RecordingSaveLocationGIF;
-    }
-    else
-    {
-        path = g_RecordingSaveLocation;
-    }
+    std::filesystem::path path{ g_RecordingSaveLocation };
 
     // Chop off index if it's there
     auto base = std::regex_replace( path.stem().wstring(), std::wregex( L" [(][0-9]+[)]$" ), L"" );
@@ -3595,7 +3591,6 @@ winrt::fire_and_forget StartRecordingAsync( HWND hWnd, LPRECT rcCrop, HWND hWndR
     auto stream = co_await file.OpenAsync( winrt::FileAccessMode::ReadWrite );
 
     // Create the appropriate recording session based on format
-    OutputDebugStringW((L"Starting recording session. Framerate:  " + std::to_wstring(g_RecordFrameRate) + L" scaling: " + std::to_wstring(g_RecordScaling) + L" Format: " + (g_RecordingFormat == RecordingFormat::GIF ? L"GIF" : L"MP4") + L"\n").c_str());
     if (g_RecordingFormat == RecordingFormat::GIF)
     {
         g_GifRecordingSession = GifRecordingSession::Create(
@@ -3662,44 +3657,18 @@ winrt::fire_and_forget StartRecordingAsync( HWND hWnd, LPRECT rcCrop, HWND hWndR
                 saveDialog->SetFileTypes( _countof( fileTypes ), fileTypes );
             }
 
-            // Peek the folder Windows has chosen to display
-            static std::filesystem::path lastSaveFolder;
-            wil::unique_cotaskmem_string chosenFolderPath;
-            wil::com_ptr<IShellItem> currentSelectedFolder;
-            bool bFolderChanged = false; 
-            if (SUCCEEDED(saveDialog->GetFolder(currentSelectedFolder.put())))
-            {
-                if (SUCCEEDED(currentSelectedFolder->GetDisplayName(SIGDN_FILESYSPATH, chosenFolderPath.put())))
-                {
-                    if (lastSaveFolder != chosenFolderPath.get())
-                    {
-                        lastSaveFolder = chosenFolderPath.get() ? chosenFolderPath.get() : std::filesystem::path{};
-                        bFolderChanged = true;
-                    }
-                }
-            }
-
-            if( (g_RecordingFormat == RecordingFormat::GIF && g_RecordingSaveLocationGIF.size() == 0) || (g_RecordingFormat == RecordingFormat::MP4 && g_RecordingSaveLocation.size() == 0) || (bFolderChanged)) {
+            if( g_RecordingSaveLocation.size() == 0) {
 
                 wil::com_ptr<IShellItem> shellItem;
                 wil::unique_cotaskmem_string folderPath;
-                if (SUCCEEDED(saveDialog->GetFolder(shellItem.put())) && SUCCEEDED(shellItem->GetDisplayName(SIGDN_FILESYSPATH, folderPath.put()))) {
-                    if (g_RecordingFormat == RecordingFormat::GIF) {
-                        g_RecordingSaveLocationGIF = folderPath.get();
-                        std::filesystem::path currentPath{ g_RecordingSaveLocationGIF };
-                        g_RecordingSaveLocationGIF = currentPath / DEFAULT_GIF_RECORDING_FILE;
-                    }
-                    else {
-                        g_RecordingSaveLocation = folderPath.get();
-                        if (g_RecordingFormat == RecordingFormat::MP4) {
-                            std::filesystem::path currentPath{ g_RecordingSaveLocation };
-                            g_RecordingSaveLocation = currentPath / DEFAULT_RECORDING_FILE;
-                        }
-                    }
-                }
+                if (SUCCEEDED(saveDialog->GetFolder(shellItem.put())) && SUCCEEDED(shellItem->GetDisplayName(SIGDN_FILESYSPATH, folderPath.put())))
+                    g_RecordingSaveLocation = folderPath.get();
             }
 
             // Always use appropriate default filename based on current format
+            std::filesystem::path currentPath{ g_RecordingSaveLocation };
+            const wchar_t* defaultFile = (g_RecordingFormat == RecordingFormat::GIF) ? DEFAULT_GIF_RECORDING_FILE : DEFAULT_RECORDING_FILE;
+            g_RecordingSaveLocation = currentPath.parent_path() / defaultFile;
             auto suggestedName = GetUniqueRecordingFilename();
             saveDialog->SetFileName( suggestedName.c_str() );
 
@@ -3727,15 +3696,9 @@ winrt::fire_and_forget StartRecordingAsync( HWND hWnd, LPRECT rcCrop, HWND hWndR
         }
         else {
 
-            co_await file.MoveAndReplaceAsync(destFile);
-            if (g_RecordingFormat == RecordingFormat::GIF) {
-                g_RecordingSaveLocationGIF = file.Path();
-                SaveToClipboard(g_RecordingSaveLocationGIF.c_str(), hWnd);
-            }
-            else {
-                g_RecordingSaveLocation = file.Path();
-                SaveToClipboard(g_RecordingSaveLocation.c_str(), hWnd);
-            }
+            co_await file.MoveAndReplaceAsync( destFile );
+            g_RecordingSaveLocation = file.Path();
+            SaveToClipboard(g_RecordingSaveLocation.c_str(), hWnd);
         }
         g_bSaveInProgress = false;
 
@@ -4076,10 +4039,8 @@ LRESULT APIENTRY MainWndProc(
         // Set g_RecordScaling based on the current recording format
         if (g_RecordingFormat == RecordingFormat::GIF) {
             g_RecordScaling = g_RecordScalingGIF;
-            g_RecordFrameRate = RECORDING_FORMAT_GIF_DEFAULT_FRAMERATE;
         } else {
             g_RecordScaling = g_RecordScalingMP4;
-            g_RecordFrameRate = RECORDING_FORMAT_MP4_DEFAULT_FRAMERATE;
         }
 
         // to support migrating from
@@ -6371,17 +6332,6 @@ LRESULT APIENTRY MainWndProc(
     {
         // Reload the settings. This message is called from PowerToys after a setting is changed by the user.
         reg.ReadRegSettings(RegSettings);
-        
-        if (g_RecordingFormat == RecordingFormat::GIF)
-        {
-            g_RecordScaling = g_RecordScalingGIF;
-            g_RecordFrameRate = RECORDING_FORMAT_GIF_DEFAULT_FRAMERATE; 
-        }
-        else
-        {
-            g_RecordScaling = g_RecordScalingMP4;
-            g_RecordFrameRate = RECORDING_FORMAT_MP4_DEFAULT_FRAMERATE;
-        }
 
         // Apply tray icon setting
         EnableDisableTrayIcon(hWnd, g_ShowTrayIcon);
@@ -6490,10 +6440,12 @@ LRESULT APIENTRY MainWndProc(
                 GetCursorPos(&local_savedCursorPos);
             }
 
-            // Determine the user's desired save area in zoomed viewport coordinates.
-            // This will be the entire viewport if the user does not select a crop
-            // rectangle.
-            int copyX = 0, copyY = 0, copyWidth = width, copyHeight = height;
+            HBITMAP     hInterimSaveBitmap;
+            HDC         hInterimSaveDc;
+            HBITMAP     hSaveBitmap;
+            HDC         hSaveDc;
+            int         copyX, copyY;
+            int         copyWidth, copyHeight;
 
             if ( LOWORD( wParam ) == IDC_SAVE_CROP )
             {
@@ -6508,51 +6460,55 @@ LRESULT APIENTRY MainWndProc(
                     }
                     break;
                 }
-
                 auto copyRc = selectRectangle.SelectedRect();
                 selectRectangle.Stop();
                 g_RecordCropping = FALSE;
-
                 copyX = copyRc.left;
                 copyY = copyRc.top;
                 copyWidth = copyRc.right - copyRc.left;
                 copyHeight = copyRc.bottom - copyRc.top;
             }
+            else
+            {
+                copyX = 0;
+                copyY = 0;
+                copyWidth = width;
+                copyHeight = height;
+            }
             OutputDebug( L"***x: %d, y: %d, width: %d, height: %d\n", copyX, copyY, copyWidth, copyHeight );
 
             RECT oldClipRect{};
             GetClipCursor( &oldClipRect );
             ClipCursor( NULL );
 
-            // Translate the viewport selection into coordinates for the 1:1 source
-            // bitmap hdcScreenCompat.
-            int viewportX, viewportY;
-            GetZoomedTopLeftCoordinates(
-                zoomLevel, &cursorPos, &viewportX, width, &viewportY, height );
+            // Capture the screen before displaying the save dialog
+            hInterimSaveDc = CreateCompatibleDC( hdcScreen );
+            hInterimSaveBitmap = CreateCompatibleBitmap( hdcScreen, copyWidth, copyHeight );
+            SelectObject( hInterimSaveDc, hInterimSaveBitmap );
 
-            int saveX = viewportX + static_cast<int>( copyX / zoomLevel );
-            int saveY = viewportY + static_cast<int>( copyY / zoomLevel );
-            int saveWidth = static_cast<int>( copyWidth / zoomLevel );
-            int saveHeight = static_cast<int>( copyHeight / zoomLevel );
+            hSaveDc = CreateCompatibleDC( hdcScreen );
+#if SCALE_HALFTONE
+            SetStretchBltMode( hInterimSaveDc, HALFTONE );
+            SetStretchBltMode( hSaveDc, HALFTONE );
+#else
+            // Use HALFTONE for better quality when smooth image is enabled
+            if (g_SmoothImage) {
+                SetStretchBltMode( hInterimSaveDc, HALFTONE );
+                SetStretchBltMode( hSaveDc, HALFTONE );
+            } else {
+                SetStretchBltMode( hInterimSaveDc, COLORONCOLOR );
+                SetStretchBltMode( hSaveDc, COLORONCOLOR );
+            }
+#endif
+            StretchBlt( hInterimSaveDc,
+                        0, 0,
+                        copyWidth, copyHeight,
+                        hdcScreen,
+                        monInfo.rcMonitor.left + copyX,
+                        monInfo.rcMonitor.top + copyY,
+                        copyWidth, copyHeight,
+                        SRCCOPY|CAPTUREBLT );
 
-            // Create a pixel-accurate copy of the desired area from the source bitmap.
-            wil::unique_hdc hdcActualSize( CreateCompatibleDC( hdcScreen ) );
-            wil::unique_hbitmap hbmActualSize(
-                CreateCompatibleBitmap( hdcScreen, saveWidth, saveHeight ) );
-            // Note: we do not need to restore the existing context later. The objects
-            // are transient and not reused.
-            SelectObject( hdcActualSize.get(), hbmActualSize.get() );
-
-            // Perform a direct 1:1 copy from the backing bitmap.
-            BitBlt( hdcActualSize.get(),
-                    0, 0,
-                    saveWidth, saveHeight,
-                    hdcScreenCompat,
-                    saveX, saveY,
-                    SRCCOPY | CAPTUREBLT );
-
-            // Open the Save As dialog and capture the desired file path and whether to
-            // save the zoomed display or the source bitmap pixels.
             g_bSaveInProgress = true;
             memset( &openFileName, 0, sizeof(openFileName ));
             openFileName.lStructSize       = OPENFILENAME_SIZE_VERSION_400;
@@ -6568,7 +6524,6 @@ LRESULT APIENTRY MainWndProc(
                                              "Actual size PNG\0*.png\0\0";
                                              //"Actual size BMP\0*.bmp\0\0";
             openFileName.lpstrFile			= filePath;
-
             if( GetSaveFileName( &openFileName ) )
             {
                 TCHAR targetFilePath[MAX_PATH];
@@ -6578,47 +6533,42 @@ LRESULT APIENTRY MainWndProc(
                     _tcscat( targetFilePath, L".png" );
                 }
 
-                if( openFileName.nFilterIndex == 2 )
+                // Save image at screen size
+                if( openFileName.nFilterIndex == 1 )
                 {
-                    // Save at actual size.
-                    SavePng( targetFilePath, hbmActualSize.get() );
+                    SavePng( targetFilePath, hInterimSaveBitmap );
                 }
+                // Save image scaled down to actual size
                 else
                 {
-                    // Save zoomed-in image at screen resolution.
-#if SCALE_HALFTONE
-                    const int bltMode = HALFTONE;
-#else
-                    // Use HALFTONE for better quality when smooth image is enabled
-                    const int bltMode = g_SmoothImage ? HALFTONE : COLORONCOLOR;
-#endif
-                    // Recreate the zoomed-in view by upscaling from our source bitmap.
-                    wil::unique_hdc hdcZoomed( CreateCompatibleDC(hdcScreen) );
-                    wil::unique_hbitmap hbmZoomed(
-                        CreateCompatibleBitmap( hdcScreen, copyWidth, copyHeight ) );
-                    SelectObject( hdcZoomed.get(), hbmZoomed.get() );
+                    int saveWidth = static_cast<int>( copyWidth / zoomLevel );
+                    int saveHeight = static_cast<int>( copyHeight / zoomLevel );
 
-                    SetStretchBltMode( hdcZoomed.get(), bltMode );
+                    hSaveBitmap = CreateCompatibleBitmap( hdcScreen, saveWidth, saveHeight );
+                    SelectObject( hSaveDc, hSaveBitmap );
 
-                    StretchBlt( hdcZoomed.get(),
-                                0, 0,
-                                copyWidth, copyHeight,
-                                hdcActualSize.get(),
+                    StretchBlt( hSaveDc,
                                 0, 0,
                                 saveWidth, saveHeight,
+                                hInterimSaveDc,
+                                0,
+                                0,
+                                copyWidth, copyHeight,
                                 SRCCOPY | CAPTUREBLT );
 
-                    SavePng( targetFilePath, hbmZoomed.get() );
+                    SavePng( targetFilePath, hSaveBitmap );
                 }
             }
             g_bSaveInProgress = false;
 
+            DeleteDC( hInterimSaveDc );
+            DeleteDC( hSaveDc );
+
             if( lParam != SHALLOW_ZOOM )
             {
-                SetCursorPos( local_savedCursorPos.x, local_savedCursorPos.y );
+                SetCursorPos(local_savedCursorPos.x, local_savedCursorPos.y);
             }
             ClipCursor( &oldClipRect );
-
             break;
         }
 

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/Microsoft.CmdPal.UI/Strings/en-us/Resources.resw

@@ -429,7 +429,7 @@ Right-click to remove the key combination, thereby deactivating the shortcut.</v
     <value>More</value>
   </data>
   <data name="Run_Radio_Position_LastPosition.Content" xml:space="preserve">
-    <value>Last position</value>
+    <value>Last Position</value>
     <comment>Reopen the window where it was last closed</comment>
   </data>
   <data name="TrayMenu_Settings" xml:space="preserve">

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/AIProviderConfigurationSnapshot.cs

@@ -0,0 +1,35 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System.Text.Json.Serialization;
+
+namespace Microsoft.PowerToys.Settings.UI.Library
+{
+    /// <summary>
+    /// Stores provider-specific configuration overrides so each AI service can keep distinct settings.
+    /// </summary>
+    public class AIProviderConfigurationSnapshot
+    {
+        [JsonPropertyName("model-name")]
+        public string ModelName { get; set; } = string.Empty;
+
+        [JsonPropertyName("endpoint-url")]
+        public string EndpointUrl { get; set; } = string.Empty;
+
+        [JsonPropertyName("api-version")]
+        public string ApiVersion { get; set; } = string.Empty;
+
+        [JsonPropertyName("deployment-name")]
+        public string DeploymentName { get; set; } = string.Empty;
+
+        [JsonPropertyName("model-path")]
+        public string ModelPath { get; set; } = string.Empty;
+
+        [JsonPropertyName("system-prompt")]
+        public string SystemPrompt { get; set; } = string.Empty;
+
+        [JsonPropertyName("moderation-enabled")]
+        public bool ModerationEnabled { get; set; } = true;
+    }
+}

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.Library/AdvancedPasteMigrationHelper.cs

@@ -1,105 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using System.Collections.ObjectModel;
-using System.Linq;
-
-namespace Microsoft.PowerToys.Settings.UI.Library
-{
-    /// <summary>
-    /// Helper methods for migrating legacy Advanced Paste settings to the updated schema.
-    /// </summary>
-    public static class AdvancedPasteMigrationHelper
-    {
-        /// <summary>
-        /// Ensures an OpenAI provider exists in the configuration, creating one if necessary.
-        /// </summary>
-        /// <param name="configuration">The configuration instance.</param>
-        /// <returns>The ensured provider and a flag indicating whether changes were made.</returns>
-        public static (PasteAIProviderDefinition Provider, bool Updated) EnsureOpenAIProvider(PasteAIConfiguration configuration)
-        {
-            if (configuration is null)
-            {
-                return (null, false);
-            }
-
-            configuration.Providers ??= new ObservableCollection<PasteAIProviderDefinition>();
-
-            const string serviceTypeKey = "OpenAI";
-            var existingProvider = configuration.Providers.FirstOrDefault(provider => string.Equals(provider.ServiceType, serviceTypeKey, StringComparison.OrdinalIgnoreCase));
-            bool updated = false;
-
-            if (existingProvider is null)
-            {
-                existingProvider = CreateProvider(serviceTypeKey);
-                configuration.Providers.Add(existingProvider);
-                updated = true;
-            }
-
-            updated |= EnsureActiveProviderIsValid(configuration, existingProvider);
-
-            return (existingProvider, updated);
-        }
-
-        /// <summary>
-        /// Creates a provider with default values for the requested service type.
-        /// </summary>
-        private static PasteAIProviderDefinition CreateProvider(string serviceTypeKey)
-        {
-            var serviceType = serviceTypeKey.ToAIServiceType();
-            var metadata = AIServiceTypeRegistry.GetMetadata(serviceType);
-            var provider = new PasteAIProviderDefinition
-            {
-                ServiceType = serviceTypeKey,
-                ModelName = PasteAIProviderDefaults.GetDefaultModelName(serviceType),
-                EndpointUrl = string.Empty,
-                ApiVersion = string.Empty,
-                DeploymentName = string.Empty,
-                ModelPath = string.Empty,
-                SystemPrompt = string.Empty,
-                ModerationEnabled = serviceType == AIServiceType.OpenAI,
-                IsLocalModel = metadata.IsLocalModel,
-            };
-
-            return provider;
-        }
-
-        private static bool EnsureActiveProviderIsValid(PasteAIConfiguration configuration, PasteAIProviderDefinition preferredProvider = null)
-        {
-            if (configuration?.Providers is null || configuration.Providers.Count == 0)
-            {
-                if (!string.IsNullOrWhiteSpace(configuration?.ActiveProviderId))
-                {
-                    configuration.ActiveProviderId = string.Empty;
-                    return true;
-                }
-
-                return false;
-            }
-
-            bool updated = false;
-
-            var activeProvider = configuration.Providers.FirstOrDefault(provider => string.Equals(provider.Id, configuration.ActiveProviderId, StringComparison.OrdinalIgnoreCase));
-            if (activeProvider is null)
-            {
-                activeProvider = preferredProvider ?? configuration.Providers.First();
-                configuration.ActiveProviderId = activeProvider.Id;
-                updated = true;
-            }
-
-            foreach (var provider in configuration.Providers)
-            {
-                bool shouldBeActive = string.Equals(provider.Id, configuration.ActiveProviderId, StringComparison.OrdinalIgnoreCase);
-                if (provider.IsActive != shouldBeActive)
-                {
-                    provider.IsActive = shouldBeActive;
-                    updated = true;
-                }
-            }
-
-            return updated;
-        }
-    }
-}

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

@@ -27,48 +27,35 @@ namespace Microsoft.PowerToys.Settings.UI.Library
             IsAIEnabled = false;
             ShowCustomPreview = true;
             CloseAfterLosingFocus = false;
-            EnableClipboardPreview = true;
             PasteAIConfiguration = new();
         }
 
         [JsonConverter(typeof(BoolPropertyJsonConverter))]
         public bool IsAIEnabled { get; set; }
 
-        private bool? _legacyAdvancedAIEnabled;
-
-        [JsonPropertyName("IsAdvancedAIEnabled")]
-        [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-        public BoolProperty LegacyAdvancedAIEnabledProperty
+        [JsonExtensionData]
+        public Dictionary<string, JsonElement> ExtensionData
         {
-            get => null;
+            get => _extensionData;
             set
             {
-                if (value is not null)
+                _extensionData = value;
+
+                if (_extensionData != null && _extensionData.TryGetValue("IsOpenAIEnabled", out var legacyElement) && legacyElement.ValueKind == JsonValueKind.Object && legacyElement.TryGetProperty("value", out var valueElement))
                 {
-                    LegacyAdvancedAIEnabled = value.Value;
+                    IsAIEnabled = valueElement.ValueKind switch
+                    {
+                        JsonValueKind.True => true,
+                        JsonValueKind.False => false,
+                        _ => IsAIEnabled,
+                    };
+
+                    _extensionData.Remove("IsOpenAIEnabled");
                 }
             }
         }
 
-        [JsonIgnore]
-        public bool? LegacyAdvancedAIEnabled
-        {
-            get => _legacyAdvancedAIEnabled;
-            private set => _legacyAdvancedAIEnabled = value;
-        }
-
-        public bool TryConsumeLegacyAdvancedAIEnabled(out bool value)
-        {
-            if (_legacyAdvancedAIEnabled is bool flag)
-            {
-                value = flag;
-                _legacyAdvancedAIEnabled = null;
-                return true;
-            }
-
-            value = default;
-            return false;
-        }
+        private Dictionary<string, JsonElement> _extensionData;
 
         [JsonConverter(typeof(BoolPropertyJsonConverter))]
         public bool ShowCustomPreview { get; set; }
@@ -76,9 +63,6 @@ namespace Microsoft.PowerToys.Settings.UI.Library
         [JsonConverter(typeof(BoolPropertyJsonConverter))]
         public bool CloseAfterLosingFocus { get; set; }
 
-        [JsonConverter(typeof(BoolPropertyJsonConverter))]
-        public bool EnableClipboardPreview { get; set; }
-
         [JsonPropertyName("advanced-paste-ui-hotkey")]
         public HotkeySettings AdvancedPasteUIShortcut { get; set; }
 

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

@@ -20,6 +20,8 @@ namespace Microsoft.PowerToys.Settings.UI.Library
     {
         private string _activeProviderId = string.Empty;
         private ObservableCollection<PasteAIProviderDefinition> _providers = new();
+        private bool _useSharedCredentials = true;
+        private Dictionary<string, AIProviderConfigurationSnapshot> _legacyProviderConfigurations;
 
         public event PropertyChangedEventHandler PropertyChanged;
 
@@ -37,6 +39,21 @@ namespace Microsoft.PowerToys.Settings.UI.Library
             set => SetProperty(ref _providers, value ?? new ObservableCollection<PasteAIProviderDefinition>());
         }
 
+        [JsonPropertyName("use-shared-credentials")]
+        public bool UseSharedCredentials
+        {
+            get => _useSharedCredentials;
+            set => SetProperty(ref _useSharedCredentials, value);
+        }
+
+        [JsonPropertyName("provider-configurations")]
+        [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+        public Dictionary<string, AIProviderConfigurationSnapshot> LegacyProviderConfigurations
+        {
+            get => _legacyProviderConfigurations;
+            set => _legacyProviderConfigurations = value;
+        }
+
         [JsonIgnore]
         public PasteAIProviderDefinition ActiveProvider
         {

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

@@ -1,29 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-namespace Microsoft.PowerToys.Settings.UI.Library
-{
-    /// <summary>
-    /// Provides default values for Paste AI provider definitions.
-    /// </summary>
-    public static class PasteAIProviderDefaults
-    {
-        /// <summary>
-        /// Gets the default model name for a given AI service type.
-        /// </summary>
-        public static string GetDefaultModelName(AIServiceType serviceType)
-        {
-            return serviceType switch
-            {
-                AIServiceType.OpenAI => "gpt-4o",
-                AIServiceType.AzureOpenAI => "gpt-4o",
-                AIServiceType.Mistral => "mistral-large-latest",
-                AIServiceType.Google => "gemini-1.5-pro",
-                AIServiceType.AzureAIInference => "gpt-4o-mini",
-                AIServiceType.Ollama => "llama3",
-                _ => string.Empty,
-            };
-        }
-    }
-}

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"
@@ -60,9 +42,8 @@
                 HorizontalAlignment="Center" />
             <TextBlock
                 x:Name="LoadingStatusTextBlock"
-                x:Uid="AdvancedPaste_FL_LoadingStatus"
-                HorizontalAlignment="Center"
                 Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                Text="Loading Foundry Local status..."
                 TextAlignment="Center"
                 TextWrapping="Wrap" />
         </StackPanel>
@@ -75,6 +56,7 @@
                     <RowDefinition Height="Auto" />
                     <RowDefinition Height="Auto" />
                 </Grid.RowDefinitions>
+
                 <StackPanel
                     x:Name="NoModelsPanel"
                     Grid.Row="0"
@@ -82,28 +64,24 @@
                     HorizontalAlignment="Center"
                     Orientation="Vertical"
                     Spacing="4">
-                    <FontIcon
-                        AutomationProperties.AccessibilityView="Raw"
-                        FontSize="24"
-                        Glyph="&#xF158;" />
+                    <FontIcon FontSize="24" Glyph="&#xE74E;" />
                     <TextBlock
-                        x:Uid="AdvancedPaste_FL_NoModelsDownloaded"
                         HorizontalAlignment="Center"
                         Style="{StaticResource BodyStrongTextBlockStyle}"
+                        Text="No models downloaded"
                         TextAlignment="Center" />
                     <TextBlock
-                        x:Uid="AdvancedPaste_FL_RunFoundryLocalText"
                         HorizontalAlignment="Center"
                         FontSize="12"
                         Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                        Text="Run Foundry Local to download or add a local model below."
                         TextAlignment="Center"
                         TextWrapping="Wrap" />
                     <Button
                         x:Name="LaunchFoundryModelListButton"
-                        x:Uid="AdvancedPaste_FL_OpenFoundryModelList"
-                        Margin="0,8,0,0"
                         HorizontalAlignment="Center"
                         Click="LaunchFoundryModelListButton_Click"
+                        Content="Open Foundry model list"
                         Style="{StaticResource AccentButtonStyle}" />
                 </StackPanel>
 
@@ -123,10 +101,10 @@
                             SelectionChanged="CachedModelsComboBox_SelectionChanged">
                             <ComboBox.Header>
                                 <TextBlock>
-                                    <Run x:Uid="AdvancedPaste_FL_LocalModel" /><LineBreak /><Run
-                                        x:Uid="AdvancedPaste_FL_UseCliToDownloadModels"
+                                    <Run Text="Foundry Local model" /><LineBreak /><Run
                                         FontSize="12"
-                                        Foreground="{ThemeResource TextFillColorSecondaryBrush}" />
+                                        Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                                        Text="Use the Foundry Local CLI to download models that run locally on-device. They'll appear here." />
                                 </TextBlock>
                             </ComboBox.Header>
                         </ComboBox>
@@ -136,11 +114,9 @@
                             MinHeight="32"
                             VerticalAlignment="Bottom"
                             Click="RefreshModelsButton_Click"
-                            Style="{StaticResource SubtleButtonStyle}">
+                            Style="{StaticResource SubtleButtonStyle}"
+                            ToolTipService.ToolTip="Refresh model list">
                             <FontIcon FontSize="16" Glyph="&#xE72C;" />
-                            <ToolTipService.ToolTip>
-                                <TextBlock x:Uid="AdvancedPaste_FL_RefreshModelList" />
-                            </ToolTipService.ToolTip>
                         </Button>
                     </Grid>
                     <StackPanel
@@ -170,28 +146,24 @@
                 Spacing="8">
                 <Image Width="36" Source="ms-appx:///Assets/Settings/Icons/Models/FoundryLocal.svg" />
                 <TextBlock
-                    x:Uid="AdvancedPaste_FL_FLNotAvailableYet"
-                    HorizontalAlignment="Center"
                     FontWeight="SemiBold"
+                    Text="Foundry Local is not available on this device yet."
                     TextAlignment="Center"
                     TextWrapping="Wrap" />
                 <TextBlock
-                    x:Uid="AdvancedPaste_FL_StartService"
-                    HorizontalAlignment="Center"
                     FontSize="12"
                     Foreground="{ThemeResource TextFillColorSecondaryBrush}"
                     IsTextSelectionEnabled="True"
                     TextAlignment="Center"
-                    TextWrapping="Wrap" />
-                <HyperlinkButton
-                    x:Uid="AdvancedPaste_FL_CLIGuide"
-                    HorizontalAlignment="Center"
-                    NavigateUri="https://learn.microsoft.com/azure/ai-foundry/foundry-local/get-started" />
+                    TextWrapping="Wrap">
+                    <Run Text="Start the Foundry Local service before returning to PowerToys." />
+                </TextBlock>
+                <HyperlinkButton Content="Follow the Foundry Local CLI guide" NavigateUri="https://learn.microsoft.com/en-us/azure/ai-foundry/foundry-local/get-started" />
                 <TextBlock
                     x:Uid="FoundryLocal_RestartRequiredNote"
-                    HorizontalAlignment="Center"
                     FontSize="12"
                     Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                    Text="Note: After installing the Foundry Local CLI, restart PowerToys to use it."
                     TextAlignment="Center"
                     TextWrapping="Wrap" />
             </StackPanel>

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

@@ -103,7 +103,10 @@
                                 </StackPanel>
                             </tkcontrols:SettingsExpander.Description>
                             <tkcontrols:SettingsExpander.ItemsHeader>
-                                <tkcontrols:SettingsCard x:Uid="AdvancedPaste_ModelProviders" Style="{StaticResource DefaultSettingsExpanderItemStyle}">
+                                <tkcontrols:SettingsCard
+                                    Description="Add online or local models"
+                                    Header="Model providers"
+                                    Style="{StaticResource DefaultSettingsExpanderItemStyle}">
                                     <Button Content="Add model" Style="{StaticResource AccentButtonStyle}">
                                         <Button.Flyout>
                                             <MenuFlyout x:Name="AddProviderMenuFlyout" Opening="AddProviderMenuFlyout_Opening" />
@@ -127,16 +130,16 @@
                                                 <Button.Flyout>
                                                     <MenuFlyout>
                                                         <MenuFlyoutItem
-                                                            x:Uid="AdvancedPaste_Edit"
                                                             Click="EditPasteAIProviderButton_Click"
                                                             Icon="{ui:FontIcon Glyph=&#xE70F;}"
-                                                            Tag="{x:Bind}" />
+                                                            Tag="{x:Bind}"
+                                                            Text="Edit" />
                                                         <MenuFlyoutSeparator />
                                                         <MenuFlyoutItem
-                                                            x:Uid="AdvancedPaste_Remove"
                                                             Click="RemovePasteAIProviderButton_Click"
                                                             Icon="{ui:FontIcon Glyph=&#xE74D;}"
-                                                            Tag="{x:Bind}" />
+                                                            Tag="{x:Bind}"
+                                                            Text="Remove" />
                                                     </MenuFlyout>
                                                 </Button.Flyout>
                                             </Button>
@@ -168,9 +171,6 @@
                                 </InfoBar>
                             </tkcontrols:SettingsExpander.ItemsHeader>
                             <tkcontrols:SettingsExpander.Items>
-                                <tkcontrols:SettingsCard Name="AdvancedPasteEnableClipboardPreview" ContentAlignment="Left">
-                                    <controls:CheckBoxWithDescriptionControl x:Uid="AdvancedPaste_EnableClipboardPreview" IsChecked="{x:Bind ViewModel.EnableClipboardPreview, Mode=TwoWay}" />
-                                </tkcontrols:SettingsCard>
                                 <tkcontrols:SettingsCard
                                     Name="AdvancedPasteClipboardHistoryEnabledSettingsCard"
                                     ContentAlignment="Left"
@@ -429,11 +429,12 @@
         <!--  Paste AI provider dialog  -->
         <ContentDialog
             x:Name="PasteAIProviderConfigurationDialog"
-            x:Uid="AdvancedPaste_EndpointDialog"
             Title="Paste with AI provider configuration"
             Closed="PasteAIProviderConfigurationDialog_Closed"
             PrimaryButtonClick="PasteAIProviderConfigurationDialog_PrimaryButtonClick"
-            PrimaryButtonStyle="{ThemeResource AccentButtonStyle}">
+            PrimaryButtonStyle="{ThemeResource AccentButtonStyle}"
+            PrimaryButtonText="Save"
+            SecondaryButtonText="Cancel">
             <ContentDialog.Resources>
                 <x:Double x:Key="ContentDialogMaxWidth">900</x:Double>
                 <x:Double x:Key="ContentDialogMaxHeight">700</x:Double>
@@ -495,44 +496,46 @@
                         Spacing="16">
                         <TextBox
                             x:Name="PasteAIModelNameTextBox"
-                            x:Uid="AdvancedPaste_ModelName"
                             MinWidth="200"
                             HorizontalAlignment="Stretch"
-                            PlaceholderText="gpt-4o"
+                            Header="Model name"
+                            PlaceholderText="gpt-4"
                             Text="{x:Bind ViewModel.PasteAIProviderDraft.ModelName, Mode=TwoWay}" />
                         <TextBox
                             x:Name="PasteAIEndpointUrlTextBox"
-                            x:Uid="AdvancedPaste_EndpointURL"
                             MinWidth="200"
                             HorizontalAlignment="Stretch"
+                            Header="Endpoint URL"
                             PlaceholderText="https://your-resource.openai.azure.com/"
                             Text="{x:Bind ViewModel.PasteAIProviderDraft.EndpointUrl, Mode=TwoWay}" />
+
                         <PasswordBox
                             x:Name="PasteAIApiKeyPasswordBox"
-                            x:Uid="AdvancedPaste_APIKey"
-                            MinWidth="200" />
+                            MinWidth="200"
+                            Header="API key"
+                            PlaceholderText="Enter API Key" />
                         <TextBox
                             x:Name="PasteAIApiVersionTextBox"
-                            x:Uid="AdvancedPaste_APIVersion"
                             MinWidth="200"
                             HorizontalAlignment="Stretch"
+                            Header="API version"
                             PlaceholderText="2024-10-01"
                             Text="{x:Bind ViewModel.PasteAIProviderDraft.ApiVersion, Mode=TwoWay}"
                             Visibility="Collapsed" />
                         <TextBox
                             x:Name="PasteAIDeploymentNameTextBox"
-                            x:Uid="AdvancedPaste_DeploymentName"
                             MinWidth="200"
-                            PlaceholderText="gpt-4o"
+                            Header="Deployment name"
+                            PlaceholderText="gpt-4"
                             Text="{x:Bind ViewModel.PasteAIProviderDraft.DeploymentName, Mode=TwoWay}" />
                         <TextBox
                             x:Name="PasteAISystemPromptTextBox"
-                            x:Uid="AdvancedPaste_SystemPrompt"
                             MinWidth="200"
                             MinHeight="76"
                             HorizontalAlignment="Stretch"
                             AcceptsReturn="True"
                             Header="System prompt"
+                            PlaceholderText="You are tasked with reformatting user's clipboard data. Use the user's instructions, and the content of their clipboard below to edit their clipboard content as they have requested it. Do not output anything else besides the reformatted clipboard content."
                             Text="{x:Bind ViewModel.PasteAIProviderDraft.SystemPrompt, Mode=TwoWay}"
                             TextWrapping="Wrap" />
                         <Grid
@@ -572,10 +575,13 @@
                             IsOn="{x:Bind ViewModel.PasteAIProviderDraft.EnableAdvancedAI, Mode=TwoWay}"
                             Toggled="PasteAIEnableAdvancedAICheckBox_Toggled"
                             Visibility="Collapsed">
+                            <ToolTipService.ToolTip>
+                                <TextBlock Text="" TextWrapping="Wrap" />
+                            </ToolTipService.ToolTip>
                             <ToggleSwitch.Header>
                                 <TextBlock>
-                                    <Run x:Uid="AdvancedPaste_EnableAdvancedAI" /> <LineBreak />
-                                    <Run x:Uid="AdvancedPaste_EnableAdvancedAIDescription" Foreground="{ThemeResource TextFillColorSecondaryBrush}" />
+                                    <Run Text="Enable Advanced AI" /> <LineBreak />
+                                    <Run Foreground="{ThemeResource TextFillColorSecondaryBrush}" Text="Use built-in functions to handle complex tasks. Token consumption may increase." />
                                 </TextBlock>
                             </ToggleSwitch.Header>
                         </ToggleSwitch>

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

@@ -27,6 +27,7 @@ namespace Microsoft.PowerToys.Settings.UI.Views
     public sealed partial class AdvancedPastePage : NavigablePage, IRefreshablePage, IDisposable
     {
         private readonly ObservableCollection<ModelDetails> _foundryCachedModels = new();
+        private readonly ObservableCollection<FoundryDownloadableModel> _foundryDownloadableModels = new();
         private CancellationTokenSource _foundryModelLoadCts;
         private bool _suppressFoundrySelectionChanged;
         private bool _isFoundryLocalAvailable;
@@ -35,8 +36,6 @@ namespace Microsoft.PowerToys.Settings.UI.Views
 
         private const string AdvancedAISystemPrompt = "You are an agent who is tasked with helping users paste their clipboard data. You have functions available to help you with this task. Call function when necessary to help user finish the transformation task. You never need to ask permission, always try to do as the user asks. The user will only input one message and will not be available for further questions, so try your best. The user will put in a request to format their clipboard data and you will fulfill it. Do not output anything else besides the reformatted clipboard content.";
         private const string SimpleAISystemPrompt = "You are tasked with reformatting user's clipboard data. Use the user's instructions, and the content of their clipboard below to edit their clipboard content as they have requested it. Do not output anything else besides the reformatted clipboard content.";
-        private static readonly string AdvancedAISystemPromptNormalized = AdvancedAISystemPrompt.Trim();
-        private static readonly string SimpleAISystemPromptNormalized = SimpleAISystemPrompt.Trim();
 
         private AdvancedPasteViewModel ViewModel { get; set; }
 
@@ -56,6 +55,7 @@ namespace Microsoft.PowerToys.Settings.UI.Views
             if (FoundryLocalPicker is not null)
             {
                 FoundryLocalPicker.CachedModels = _foundryCachedModels;
+                FoundryLocalPicker.DownloadableModels = _foundryDownloadableModels;
                 FoundryLocalPicker.SelectionChanged += FoundryLocalPicker_SelectionChanged;
                 FoundryLocalPicker.LoadRequested += FoundryLocalPicker_LoadRequested;
             }
@@ -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();
             }
         }
 
@@ -543,7 +536,7 @@ namespace Microsoft.PowerToys.Settings.UI.Views
             UpdateFoundrySaveButtonState();
         }
 
-        private void UpdateFoundryCollections(IReadOnlyCollection<ModelDetails> cachedModels)
+        private void UpdateFoundryCollections(IReadOnlyCollection<ModelDetails> cachedModels, IReadOnlyCollection<ModelDetails> catalogModels)
         {
             _foundryCachedModels.Clear();
 
@@ -552,7 +545,20 @@ namespace Microsoft.PowerToys.Settings.UI.Views
                 _foundryCachedModels.Add(model);
             }
 
-            var cachedReferences = new HashSet<string>(_foundryCachedModels.Select(m => m.Name), StringComparer.OrdinalIgnoreCase);
+            var cachedReferences = new HashSet<string>(_foundryCachedModels.Select(m => NormalizeFoundryModelReference(m.Url ?? m.Name)), StringComparer.OrdinalIgnoreCase);
+
+            _foundryDownloadableModels.Clear();
+
+            foreach (var model in catalogModels.OrderBy(m => m.Name, StringComparer.OrdinalIgnoreCase))
+            {
+                var reference = NormalizeFoundryModelReference(model.Url ?? model.Name);
+                if (cachedReferences.Contains(reference))
+                {
+                    continue;
+                }
+
+                _foundryDownloadableModels.Add(new FoundryDownloadableModel(model));
+            }
         }
 
         private void RestoreFoundrySelection(IReadOnlyCollection<ModelDetails> cachedModels)
@@ -568,8 +574,9 @@ namespace Microsoft.PowerToys.Settings.UI.Views
 
             if (!string.IsNullOrWhiteSpace(currentModelReference))
             {
+                var normalizedReference = NormalizeFoundryModelReference(currentModelReference);
                 matchingModel = cachedModels.FirstOrDefault(model =>
-                    string.Equals(model.Name, currentModelReference, StringComparison.OrdinalIgnoreCase));
+                    string.Equals(NormalizeFoundryModelReference(model.Url ?? model.Name), normalizedReference, StringComparison.OrdinalIgnoreCase));
             }
 
             if (FoundryLocalPicker is null)
@@ -599,7 +606,7 @@ namespace Microsoft.PowerToys.Settings.UI.Views
             {
                 if (ViewModel?.PasteAIProviderDraft is not null)
                 {
-                    ViewModel.PasteAIProviderDraft.ModelName = matchingModel.Name;
+                    ViewModel.PasteAIProviderDraft.ModelName = NormalizeFoundryModelReference(matchingModel.Url ?? matchingModel.Name);
                 }
 
                 if (FoundryLocalPicker is not null)
@@ -611,6 +618,19 @@ namespace Microsoft.PowerToys.Settings.UI.Views
             UpdateFoundrySaveButtonState();
         }
 
+        private static string NormalizeFoundryModelReference(string modelReference)
+        {
+            if (string.IsNullOrWhiteSpace(modelReference))
+            {
+                return string.Empty;
+            }
+
+            var prefix = FoundryLocalModelProvider.Instance.UrlPrefix;
+            return modelReference.StartsWith(prefix, StringComparison.OrdinalIgnoreCase)
+                ? modelReference
+                : $"{prefix}{modelReference}";
+        }
+
         private void UpdateFoundrySaveButtonState()
         {
             if (PasteAIProviderConfigurationDialog is null)
@@ -634,7 +654,7 @@ namespace Microsoft.PowerToys.Settings.UI.Views
                 return;
             }
 
-            if (!_isFoundryLocalAvailable)
+            if (!_isFoundryLocalAvailable || _foundryDownloadableModels.Any(model => model.IsDownloading))
             {
                 PasteAIProviderConfigurationDialog.IsPrimaryButtonEnabled = false;
                 return;
@@ -655,7 +675,7 @@ namespace Microsoft.PowerToys.Settings.UI.Views
             {
                 if (ViewModel?.PasteAIProviderDraft is not null)
                 {
-                    ViewModel.PasteAIProviderDraft.ModelName = selectedModel.Name;
+                    ViewModel.PasteAIProviderDraft.ModelName = NormalizeFoundryModelReference(selectedModel.Url ?? selectedModel.Name);
                 }
 
                 if (FoundryLocalPicker is not null)
@@ -679,9 +699,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
@@ -784,7 +804,6 @@ namespace Microsoft.PowerToys.Settings.UI.Views
                 return;
             }
 
-            NormalizeSystemPrompt(draft);
             string serviceType = draft.ServiceType ?? "OpenAI";
             string apiKey = PasteAIApiKeyPasswordBox.Password;
             string trimmedApiKey = apiKey?.Trim() ?? string.Empty;
@@ -815,8 +834,22 @@ namespace Microsoft.PowerToys.Settings.UI.Views
                 return;
             }
 
-            NormalizeSystemPrompt(draft);
-            UpdateSystemPromptPlaceholder();
+            bool isEmptyOrDefault = string.IsNullOrWhiteSpace(draft.SystemPrompt) ||
+                                     draft.SystemPrompt.Trim() == AdvancedAISystemPrompt.Trim() ||
+                                     draft.SystemPrompt.Trim() == SimpleAISystemPrompt.Trim();
+
+            if (isEmptyOrDefault)
+            {
+                if (!draft.EnableAdvancedAI)
+                {
+                    // Now we'll switch
+                    draft.SystemPrompt = AdvancedAISystemPrompt;
+                }
+                else
+                {
+                    draft.SystemPrompt = SimpleAISystemPrompt;
+                }
+            }
         }
 
         private static bool RequiresApiKeyForService(string serviceType)
@@ -917,47 +950,15 @@ namespace Microsoft.PowerToys.Settings.UI.Views
 
         private Visibility GetServicePrivacyVisibility(string serviceType) => HasServicePrivacyLink(serviceType) ? Visibility.Visible : Visibility.Collapsed;
 
-        private static bool IsPlaceholderSystemPrompt(string prompt)
-        {
-            if (string.IsNullOrWhiteSpace(prompt))
-            {
-                return true;
-            }
-
-            string trimmedPrompt = prompt.Trim();
-            return string.Equals(trimmedPrompt, AdvancedAISystemPromptNormalized, StringComparison.Ordinal)
-                || string.Equals(trimmedPrompt, SimpleAISystemPromptNormalized, StringComparison.Ordinal);
-        }
-
-        private static void NormalizeSystemPrompt(PasteAIProviderDefinition draft)
-        {
-            if (draft is null)
-            {
-                return;
-            }
-
-            if (IsPlaceholderSystemPrompt(draft.SystemPrompt))
-            {
-                draft.SystemPrompt = string.Empty;
-            }
-        }
-
         private void UpdateSystemPromptPlaceholder()
         {
             var draft = ViewModel?.PasteAIProviderDraft;
-            if (draft is null)
+            if (draft is null || PasteAISystemPromptTextBox is null)
             {
                 return;
             }
 
-            NormalizeSystemPrompt(draft);
-            if (PasteAISystemPromptTextBox is null)
-            {
-                return;
-            }
-
-            bool useAdvancedPlaceholder = PasteAIEnableAdvancedAICheckBox?.IsOn ?? draft.EnableAdvancedAI;
-            PasteAISystemPromptTextBox.PlaceholderText = useAdvancedPlaceholder
+            PasteAISystemPromptTextBox.PlaceholderText = draft.EnableAdvancedAI
                 ? AdvancedAISystemPrompt
                 : SimpleAISystemPrompt;
         }
@@ -1096,7 +1097,7 @@ namespace Microsoft.PowerToys.Settings.UI.Views
                 PasteAIProviderConfigurationDialog.Title = $"{displayName} provider configuration";
             }
 
-            await UpdateFoundryLocalUIAsync();
+            await UpdateFoundryLocalUIAsync(refreshFoundry: true);
             UpdatePasteAIUIVisibility();
             RefreshDialogBindings();
 
@@ -1125,7 +1126,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/LightSwitchPage.xaml

@@ -199,8 +199,10 @@
                         <ContentDialog
                             x:Name="LocationDialog"
                             x:Uid="LightSwitch_LocationDialog"
+                            Closed="LocationDialog_Closed"
                             IsPrimaryButtonEnabled="False"
                             IsSecondaryButtonEnabled="True"
+                            Opened="LocationDialog_Opened"
                             PrimaryButtonClick="LocationDialog_PrimaryButtonClick"
                             PrimaryButtonStyle="{StaticResource AccentButtonStyle}">
                             <Grid RowSpacing="16">

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

@@ -35,6 +35,9 @@ namespace Microsoft.PowerToys.Settings.UI.Views
         private readonly IFileSystemWatcher fileSystemWatcher;
         private readonly DispatcherQueue dispatcherQueue;
         private bool suppressViewModelUpdates;
+        private bool suppressLatLonChange = true;
+        private bool latBoxLoaded;
+        private bool lonBoxLoaded;
 
         private LightSwitchViewModel ViewModel { get; set; }
 
@@ -129,6 +132,8 @@ namespace Microsoft.PowerToys.Settings.UI.Views
                 // Since we use this mode, we can remove the selected city data.
                 this.ViewModel.SelectedCity = null;
 
+                this.suppressLatLonChange = false;
+
                 // ViewModel.CityTimesText = $"Sunrise: {result.SunriseHour}:{result.SunriseMinute:D2}\n" + $"Sunset: {result.SunsetHour}:{result.SunsetMinute:D2}";
                 this.SyncButton.IsEnabled = true;
                 this.SyncLoader.IsActive = false;
@@ -152,10 +157,23 @@ namespace Microsoft.PowerToys.Settings.UI.Views
 
         private void LatLonBox_ValueChanged(NumberBox sender, NumberBoxValueChangedEventArgs args)
         {
+            if (this.suppressLatLonChange)
+            {
+                return;
+            }
+
             double latitude = this.LatitudeBox.Value;
             double longitude = this.LongitudeBox.Value;
 
-            if (double.IsNaN(latitude) || double.IsNaN(longitude) || (latitude == 0 && longitude == 0))
+            if (double.IsNaN(latitude) || double.IsNaN(longitude))
+            {
+                return;
+            }
+
+            double viewModelLatitude = double.TryParse(this.ViewModel.Latitude, out var lat) ? lat : 0.0;
+            double viewModelLongitude = double.TryParse(this.ViewModel.Longitude, out var lon) ? lon : 0.0;
+
+            if (Math.Abs(latitude - viewModelLatitude) < 0.0001 && Math.Abs(longitude - viewModelLongitude) < 0.0001)
             {
                 return;
             }
@@ -165,6 +183,7 @@ namespace Microsoft.PowerToys.Settings.UI.Views
             this.ViewModel.LocationPanelLightTimeMinutes = (result.SunriseHour * 60) + result.SunriseMinute;
             this.ViewModel.LocationPanelDarkTimeMinutes = (result.SunsetHour * 60) + result.SunsetMinute;
 
+            // Show the panel with these values
             this.LocationResultPanel.Visibility = Visibility.Visible;
             if (this.LocationDialog != null)
             {
@@ -195,6 +214,37 @@ namespace Microsoft.PowerToys.Settings.UI.Views
             this.SunriseModeChartState();
         }
 
+        private void LocationDialog_Opened(ContentDialog sender, ContentDialogOpenedEventArgs args)
+        {
+            this.LatitudeBox.Loaded += LatLonBox_Loaded;
+            this.LongitudeBox.Loaded += LatLonBox_Loaded;
+        }
+
+        private void LocationDialog_Closed(ContentDialog sender, ContentDialogClosedEventArgs args)
+        {
+            this.LatitudeBox.Loaded -= LatLonBox_Loaded;
+            this.LongitudeBox.Loaded -= LatLonBox_Loaded;
+            this.latBoxLoaded = false;
+            this.lonBoxLoaded = false;
+        }
+
+        private void LatLonBox_Loaded(object sender, RoutedEventArgs e)
+        {
+            if (sender is NumberBox numberBox && numberBox == this.LatitudeBox && this.LatitudeBox.IsLoaded)
+            {
+                this.latBoxLoaded = true;
+            }
+            else if (sender is NumberBox numberBox2 && numberBox2 == this.LongitudeBox && this.LongitudeBox.IsLoaded)
+            {
+                this.lonBoxLoaded = true;
+            }
+
+            if (this.latBoxLoaded && this.lonBoxLoaded)
+            {
+                this.suppressLatLonChange = false;
+            }
+        }
+
         private void ViewModel_PropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e)
         {
             if (this.suppressViewModelUpdates)

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
@@ -284,7 +283,6 @@
                             <ToggleSwitch x:Uid="ToggleSwitch" IsOn="{x:Bind ViewModel.IsCursorWrapEnabled, Mode=TwoWay}" />
                         </tkcontrols:SettingsCard>
                     </controls:GPOInfoControl>
-
                     <tkcontrols:SettingsExpander
                         Name="MouseUtilsCursorWrapSettingsExpander"
                         x:Uid="MouseUtils_CursorWrap_ActivationShortcut"
@@ -296,12 +294,23 @@
                             <tkcontrols:SettingsCard ContentAlignment="Left">
                                 <CheckBox x:Uid="MouseUtils_AutoActivate" IsChecked="{x:Bind ViewModel.CursorWrapAutoActivate, Mode=TwoWay}" />
                             </tkcontrols:SettingsCard>
-                            <tkcontrols:SettingsCard ContentAlignment="Left" IsEnabled="{x:Bind ViewModel.IsCursorWrapEnabled, Mode=OneWay}">
+                        </tkcontrols:SettingsExpander.Items>
+                    </tkcontrols:SettingsExpander>
+
+                    <tkcontrols:SettingsExpander
+                        Name="CursorWrapAppearanceBehavior"
+                        x:Uid="Appearance_Behavior"
+                        AutomationProperties.AutomationId="MouseUtils_CursorWrapAppearanceBehaviorId"
+                        HeaderIcon="{ui:FontIcon Glyph=&#xEB3C;}"
+                        IsEnabled="{x:Bind ViewModel.IsCursorWrapEnabled, Mode=OneWay}"
+                        IsExpanded="False">
+                        <tkcontrols:SettingsExpander.Items>
+                            <tkcontrols:SettingsCard ContentAlignment="Left">
                                 <CheckBox x:Uid="MouseUtils_CursorWrap_DisableWrapDuringDrag" IsChecked="{x:Bind ViewModel.CursorWrapDisableWrapDuringDrag, Mode=TwoWay}" />
                             </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/Strings/en-us/Resources.resw

@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <root>
-  <!-- 
-    Microsoft ResX Schema 
-    
+  <!--
+    Microsoft ResX Schema
+
     Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
+
+    The primary goals of this format is to allow a simple XML format
+    that is mostly human readable. The generation and parsing of the
+    various data types are done through the TypeConverter classes
     associated with the data types.
-    
+
     Example:
-    
+
     ... ado.net/XML headers & schema ...
     <resheader name="resmimetype">text/microsoft-resx</resheader>
     <resheader name="version">2.0</resheader>
@@ -26,36 +26,36 @@
         <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
         <comment>This is a comment</comment>
     </data>
-                
-    There are any number of "resheader" rows that contain simple 
+
+    There are any number of "resheader" rows that contain simple
     name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
+
+    Each data row contains a name, and value. The row also contains a
+    type or mimetype. Type corresponds to a .NET class that support
+    text/value conversion through the TypeConverter architecture.
+    Classes that don't support this are serialized and stored with the
     mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
+
+    The mimetype is used for serialized objects, and tells the
+    ResXResourceReader how to depersist the object. This is currently not
     extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
+
+    Note - application/x-microsoft.net.object.binary.base64 is the format
+    that the ResXResourceWriter will generate, however the reader can
     read any of the formats listed below.
-    
+
     mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
+    value   : The object must be serialized with
             : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
             : and then encoded with base64 encoding.
-    
+
     mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
+    value   : The object must be serialized with
             : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
             : and then encoded with base64 encoding.
 
     mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
+    value   : The object must be serialized into a byte array
             : using a System.ComponentModel.TypeConverter
             : and then encoded with base64 encoding.
     -->
@@ -644,14 +644,17 @@ Please review the placeholder content that represents the final terms and usage
   <data name="AdvancedPaste_EnablePasteAIModerationToggle.Header" xml:space="preserve">
     <value>Enable OpenAI content moderation</value>
   </data>
-  <data name="AdvancedPaste_EnableAdvancedAIDescription.Text" xml:space="preserve">
+  <data name="AdvancedPaste_EnableAdvancedAI_SettingsCard.Header" xml:space="preserve">
+    <value>Enable Advanced AI</value>
+  </data>
+  <data name="AdvancedPaste_EnableAdvancedAI_SettingsCard.Description" xml:space="preserve">
     <value>Use built-in functions to handle complex tasks. Token consumption may increase.</value>
   </data>
   <data name="AdvancedPaste_Clipboard_History_Enabled_SettingsCard.Header" xml:space="preserve">
     <value>Access Clipboard History</value>
   </data>
   <data name="AdvancedPaste_Clipboard_History_Enabled_SettingsCard.Description" xml:space="preserve">
-    <value>View and select previously copied items</value>
+    <value>Clipboard History shows a list of previously copied items.</value>
   </data>
   <data name="AdvancedPaste_Direct_Access_Hotkeys_GroupSettings.Header" xml:space="preserve">
     <value>Actions</value>
@@ -2685,7 +2688,10 @@ From there, simply click on one of the supported files in the File Explorer and
     <value>Wrap the mouse cursor between monitor edges</value>
   </data>
   <data name="MouseUtils_CursorWrap_ActivationShortcut.Header" xml:space="preserve">
-    <value>Activation and behavior</value>
+    <value>Activation shortcut</value>
+  </data>
+  <data name="MouseUtils_CursorWrap_ActivationShortcut_Description.Text" xml:space="preserve">
+    <value>Hotkey to toggle cursor wrapping on/off</value>
   </data>
   <data name="MouseUtils_CursorWrap_ActivationShortcut_Button.Content" xml:space="preserve">
     <value>Set shortcut</value>
@@ -2703,7 +2709,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>
@@ -4052,8 +4058,11 @@ Activate by holding the key for the character you want to add an accent to, then
   <data name="AdvancedPaste_ShowCustomPreviewSettingsCard.Description" xml:space="preserve">
     <value>Preview the output of AI formats and Image to text before pasting</value>
   </data>
-  <data name="AdvancedPaste_EnableAdvancedAI.Text" xml:space="preserve">
-    <value>Enable Advanced AI</value>
+  <data name="AdvancedPaste_EnableAdvancedAI.Header" xml:space="preserve">
+    <value>Advanced AI</value>
+  </data>
+  <data name="AdvancedPaste_EnableAdvancedAI.Description" xml:space="preserve">
+    <value>Supports advanced workflows by chaining transformations and working with files and images. May use additional API credits.</value>
   </data>
   <data name="Oobe_AdvancedPaste.Description" xml:space="preserve">
     <value>Advanced Paste is a tool to put your clipboard content into any format you need, focused towards developer workflows. It can paste as plain text, markdown, or json directly with the UX or with a direct keystroke invoke. These are fully locally executed. In addition, it has an AI powered option that is 100% opt-in and requires an Open AI key. Note: this will replace the formatted text in your clipboard with the selected format.</value>
@@ -4595,13 +4604,9 @@ Activate by holding the key for the character you want to add an accent to, then
     <value>If you do not have credits you will see an 'API key quota exceeded' error</value>
   </data>
   <data name="AdvancedPaste_CloseAfterLosingFocus.Content" xml:space="preserve">
-    <value>Automatically close the window after it loses focus</value>
+    <value>Automatically close the Advanced Paste window after it loses focus</value>
     <comment>Advanced Paste is a product name, do not loc</comment>
   </data>
-  <data name="AdvancedPaste_EnableClipboardPreview.Header" xml:space="preserve">
-    <value>Show clipboard preview</value>
-    <comment>Enables display of clipboard contents preview in the Advanced Paste window</comment>
-  </data>
   <data name="GPO_CommandNotFound_ForceDisabled.Title" xml:space="preserve">
     <value>The Command Not Found module is disabled by your organization.</value>
     <comment>"Command Not Found" is a product name</comment>
@@ -5159,12 +5164,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 +5190,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 +5227,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>
@@ -5655,130 +5679,4 @@ To record a specific window, enter the hotkey with the Alt key in the opposite m
   <data name="LightSwitch_SetLocationButton.Content" xml:space="preserve">
     <value>Set Location</value>
   </data>
-  <data name="AdvancedPaste_FL_OpenFoundryModelList.Content" xml:space="preserve">
-    <value>Open Foundry Local model list</value>
-    <comment>Do not localize "Foundry Local", it's a product name</comment>
-  </data>
-  <data name="AdvancedPaste_FL_RunFoundryLocalText.Text" xml:space="preserve">
-    <value>Run Foundry Local to download or add a local model</value>
-    <comment>Do not localize "Foundry Local", it's a product name</comment>
-  </data>
-  <data name="AdvancedPaste_FL_NoModelsDownloaded.Text" xml:space="preserve">
-    <value>No models downloaded</value>
-  </data>
-  <data name="AdvancedPaste_FL_LoadingStatus.Text" xml:space="preserve">
-    <value>Loading Foundry Local status..</value>
-    <comment>Do not localize "Foundry Local", it's a product name</comment>
-  </data>
-  <data name="AdvancedPaste_FL_LocalModel.Text" xml:space="preserve">
-    <value>Foundry Local model</value>
-    <comment>Do not localize "Foundry Local", it's a product name</comment>
-  </data>
-  <data name="AdvancedPaste_FL_UseCliToDownloadModels.Text" xml:space="preserve">
-    <value>Use the Foundry Local CLI to download models that run locally on-device. They'll appear here.</value>
-    <comment>Do not localize "Foundry Local", it's a product name</comment>
-  </data>
-  <data name="AdvancedPaste_FL_RefreshModelList.Text" xml:space="preserve">
-    <value>Refresh model list</value>
-  </data>
-  <data name="AdvancedPaste_FL_FLNotAvailableYet.Text" xml:space="preserve">
-    <value>Foundry Local is not available on this device yet.</value>
-    <comment>Do not localize "Foundry Local", it's a product name</comment>
-  </data>
-  <data name="AdvancedPaste_FL_StartService.Text" xml:space="preserve">
-    <value>Start the Foundry Local service before returning to PowerToys.</value>
-  </data>
-  <data name="AdvancedPaste_FL_CLIGuide.Content" xml:space="preserve">
-    <value>Follow the Foundry Local CLI guide</value>
-    <comment>Do not localize "Foundry Local", it's a product name</comment>
-  </data>
-  <data name="AdvancedPaste_ModelProviders.Header" xml:space="preserve">
-    <value>Model providers</value>
-  </data>
-  <data name="AdvancedPaste_ModelProviders.Description" xml:space="preserve">
-    <value>Add online or local models</value>
-  </data>
-  <data name="AdvancedPaste_Edit.Text" xml:space="preserve">
-    <value>Edit</value>
-  </data>
-  <data name="AdvancedPaste_Remove.Text" xml:space="preserve">
-    <value>Remove</value>
-  </data>
-  <data name="AdvancedPaste_ModelName.Header" xml:space="preserve">
-    <value>Model name</value>
-  </data>
-  <data name="AdvancedPaste_EndpointURL.Header" xml:space="preserve">
-    <value>Endpoint URL</value>
-  </data>
-  <data name="AdvancedPaste_APIKey.Header" xml:space="preserve">
-    <value>API key</value>
-  </data>
-  <data name="AdvancedPaste_APIKey.PlaceholderText" xml:space="preserve">
-    <value>Enter API key</value>
-  </data>
-  <data name="AdvancedPaste_APIVersion.Header" xml:space="preserve">
-    <value>API version</value>
-  </data>
-  <data name="AdvancedPaste_DeploymentName.Header" xml:space="preserve">
-    <value>Deployment name</value>
-  </data>
-  <data name="AdvancedPaste_SystemPrompt.Header" xml:space="preserve">
-    <value>System prompt</value>
-  </data>
-  <data name="AdvancedPaste_EndpointDialog.PrimaryButtonText" xml:space="preserve">
-    <value>Save</value>
-  </data>
-  <data name="AdvancedPaste_EndpointDialog.SecondaryButtonText" xml:space="preserve">
-    <value>Cancel</value>
-  </data>
-  <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/AdvancedPasteViewModel.cs

@@ -172,86 +172,19 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
 
         private void MigrateLegacyAIEnablement()
         {
-            var properties = _advancedPasteSettings?.Properties;
-            if (properties is null)
+            if (_advancedPasteSettings.Properties.IsAIEnabled || IsOnlineAIModelsDisallowedByGPO)
             {
                 return;
             }
 
-            bool legacyAdvancedAIConsumed = properties.TryConsumeLegacyAdvancedAIEnabled(out var advancedFlag);
-            bool legacyAdvancedAIEnabled = legacyAdvancedAIConsumed && advancedFlag;
-
-            if (IsOnlineAIModelsDisallowedByGPO)
+            if (!LegacyOpenAIKeyExists())
             {
-                if (legacyAdvancedAIConsumed)
-                {
-                    SaveAndNotifySettings();
-                }
-
                 return;
             }
 
-            PasswordCredential legacyCredential = TryGetLegacyOpenAICredential();
-
-            if (legacyCredential is null)
-            {
-                if (legacyAdvancedAIConsumed)
-                {
-                    SaveAndNotifySettings();
-                }
-
-                return;
-            }
-
-            var configuration = properties.PasteAIConfiguration;
-            if (configuration is null)
-            {
-                configuration = new PasteAIConfiguration();
-                properties.PasteAIConfiguration = configuration;
-            }
-
-            bool configurationUpdated = false;
-
-            var ensureResult = AdvancedPasteMigrationHelper.EnsureOpenAIProvider(configuration);
-            PasteAIProviderDefinition openAIProvider = ensureResult.Provider;
-            configurationUpdated |= ensureResult.Updated;
-
-            if (legacyAdvancedAIConsumed && openAIProvider is not null && openAIProvider.EnableAdvancedAI != legacyAdvancedAIEnabled)
-            {
-                openAIProvider.EnableAdvancedAI = legacyAdvancedAIEnabled;
-                configurationUpdated = true;
-            }
-
-            if (legacyCredential is not null && openAIProvider is not null)
-            {
-                SavePasteAIApiKey(openAIProvider.Id, openAIProvider.ServiceType, legacyCredential.Password);
-                RemoveLegacyOpenAICredential();
-            }
-
-            const bool shouldEnableAI = true;
-            bool enabledChanged = false;
-            if (properties.IsAIEnabled != shouldEnableAI)
-            {
-                properties.IsAIEnabled = shouldEnableAI;
-                enabledChanged = true;
-            }
-
-            bool shouldPersist = configurationUpdated || enabledChanged || legacyAdvancedAIConsumed;
-
-            if (shouldPersist)
-            {
-                SaveAndNotifySettings();
-
-                if (configurationUpdated)
-                {
-                    OnPropertyChanged(nameof(PasteAIConfiguration));
-                }
-
-                if (enabledChanged)
-                {
-                    OnPropertyChanged(nameof(IsAIEnabled));
-                }
-            }
+            _advancedPasteSettings.Properties.IsAIEnabled = true;
+            SaveAndNotifySettings();
+            OnPropertyChanged(nameof(IsAIEnabled));
         }
 
         public bool IsEnabled
@@ -296,30 +229,34 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
 
         public bool IsAIEnabled => _advancedPasteSettings.Properties.IsAIEnabled && !IsOnlineAIModelsDisallowedByGPO;
 
-        private PasswordCredential TryGetLegacyOpenAICredential()
+        private bool LegacyOpenAIKeyExists()
         {
             try
             {
                 PasswordVault vault = new();
-                var credential = vault.Retrieve("https://platform.openai.com/api-keys", "PowerToys_AdvancedPaste_OpenAIKey");
-                credential?.RetrievePassword();
-                return credential;
-            }
-            catch (Exception)
-            {
-                return null;
-            }
-        }
 
-        private void RemoveLegacyOpenAICredential()
-        {
-            try
-            {
-                PasswordVault vault = new();
-                TryRemoveCredential(vault, "https://platform.openai.com/api-keys", "PowerToys_AdvancedPaste_OpenAIKey");
+                // return vault.Retrieve("https://platform.openai.com/api-keys", "PowerToys_AdvancedPaste_OpenAIKey") is not null;
+                var legacyOpenAIKey = vault.Retrieve("https://platform.openai.com/api-keys", "PowerToys_AdvancedPaste_OpenAIKey");
+                if (legacyOpenAIKey != null)
+                {
+                    string credentialResource = GetAICredentialResource("OpenAI");
+                    var targetProvider = PasteAIConfiguration?.ActiveProvider ?? PasteAIConfiguration?.Providers?.FirstOrDefault();
+                    string providerId = targetProvider?.Id ?? string.Empty;
+                    string serviceType = targetProvider?.ServiceType ?? "OpenAI";
+                    string credentialUserName = GetPasteAICredentialUserName(providerId, serviceType);
+                    PasswordCredential cred = new(credentialResource, credentialUserName, legacyOpenAIKey.Password);
+                    vault.Add(cred);
+
+                    // delete old key
+                    TryRemoveCredential(vault, "https://platform.openai.com/api-keys", "PowerToys_AdvancedPaste_OpenAIKey");
+                    return true;
+                }
+
+                return false;
             }
             catch (Exception)
             {
+                return false;
             }
         }
 
@@ -542,19 +479,6 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
             }
         }
 
-        public bool EnableClipboardPreview
-        {
-            get => _advancedPasteSettings.Properties.EnableClipboardPreview;
-            set
-            {
-                if (value != _advancedPasteSettings.Properties.EnableClipboardPreview)
-                {
-                    _advancedPasteSettings.Properties.EnableClipboardPreview = value;
-                    NotifySettingsChanged();
-                }
-            }
-        }
-
         public bool IsConflictingCopyShortcut =>
             _customActions.Select(customAction => customAction.Shortcut)
                           .Concat([PasteAsPlainTextShortcut, AdvancedPasteUIShortcut, PasteAsMarkdownShortcut, PasteAsJsonShortcut])
@@ -595,7 +519,7 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
             var provider = new PasteAIProviderDefinition
             {
                 ServiceType = persistedServiceType,
-                ModelName = PasteAIProviderDefaults.GetDefaultModelName(normalizedServiceType),
+                ModelName = GetDefaultModelName(normalizedServiceType),
                 EndpointUrl = string.Empty,
                 ApiVersion = string.Empty,
                 DeploymentName = string.Empty,
@@ -635,6 +559,20 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
             return serviceTypeKind;
         }
 
+        private static string GetDefaultModelName(AIServiceType serviceType)
+        {
+            return serviceType switch
+            {
+                AIServiceType.OpenAI => "gpt-4",
+                AIServiceType.AzureOpenAI => "gpt-4",
+                AIServiceType.Mistral => "mistral-large-latest",
+                AIServiceType.Google => "gemini-2.5-pro",
+                AIServiceType.AzureAIInference => "gpt-4o-mini",
+                AIServiceType.Ollama => "llama3",
+                _ => string.Empty,
+            };
+        }
+
         public bool IsServiceTypeAllowedByGPO(AIServiceType serviceType)
         {
             var metadata = AIServiceTypeRegistry.GetMetadata(serviceType);
@@ -1213,12 +1151,6 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
                 OnPropertyChanged(nameof(CloseAfterLosingFocus));
             }
 
-            if (target.EnableClipboardPreview != source.EnableClipboardPreview)
-            {
-                target.EnableClipboardPreview = source.EnableClipboardPreview;
-                OnPropertyChanged(nameof(EnableClipboardPreview));
-            }
-
             var incomingConfig = source.PasteAIConfiguration ?? new PasteAIConfiguration();
             if (ShouldReplacePasteAIConfiguration(target.PasteAIConfiguration, incomingConfig))
             {
@@ -1243,6 +1175,11 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
                 return true;
             }
 
+            if (current.UseSharedCredentials != incoming.UseSharedCredentials)
+            {
+                return true;
+            }
+
             var currentProviders = current.Providers ?? new ObservableCollection<PasteAIProviderDefinition>();
             var incomingProviders = incoming.Providers ?? new ObservableCollection<PasteAIProviderDefinition>();
 
@@ -1398,7 +1335,8 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
                 return;
             }
 
-            if (string.Equals(e.PropertyName, nameof(PasteAIConfiguration.ActiveProviderId), StringComparison.Ordinal))
+            if (string.Equals(e.PropertyName, nameof(PasteAIConfiguration.ActiveProviderId), StringComparison.Ordinal)
+                || string.Equals(e.PropertyName, nameof(PasteAIConfiguration.UseSharedCredentials), StringComparison.Ordinal))
             {
                 SaveAndNotifySettings();
             }
@@ -1414,7 +1352,6 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
             }
 
             pasteConfig.Providers ??= new ObservableCollection<PasteAIProviderDefinition>();
-
             SubscribeToPasteAIProviders(pasteConfig);
         }
 

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,50 @@ 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,
                     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 +197,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);
             }
 

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

@@ -562,7 +562,7 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
 
                 SyncButtonInformation = SelectedCity != null
                     ? SelectedCity.City
-                    : $"{Latitude}°,{Longitude}°";
+                    : $"{Latitude},{Longitude}";
 
                 double lat = double.Parse(ModuleSettings.Properties.Latitude.Value, CultureInfo.InvariantCulture);
                 double lon = double.Parse(ModuleSettings.Properties.Longitude.Value, CultureInfo.InvariantCulture);

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

@@ -1000,13 +1000,6 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
                     GeneralSettingsConfig.Enabled.CursorWrap = value;
                     OnPropertyChanged(nameof(IsCursorWrapEnabled));
 
-                    // Auto-enable the AutoActivate setting when CursorWrap is enabled
-                    // This ensures cursor wrapping is active immediately after enabling
-                    if (value && !_cursorWrapAutoActivate)
-                    {
-                        CursorWrapAutoActivate = true;
-                    }
-
                     OutGoingGeneralSettings outgoing = new OutGoingGeneralSettings(GeneralSettingsConfig);
                     SendConfigMSG(outgoing.ToString());
 

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

@@ -24,9 +24,6 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
 {
     public class ZoomItViewModel : Observable
     {
-        private const string FormatGif = "GIF";
-        private const string FormatMp4 = "MP4";
-
         private ISettingsUtils SettingsUtils { get; set; }
 
         private GeneralSettings GeneralSettingsConfig { get; set; }
@@ -659,12 +656,12 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
         {
             get
             {
-                if (_zoomItSettings.Properties.RecordFormat.Value == FormatGif)
+                if (_zoomItSettings.Properties.RecordFormat.Value == "GIF")
                 {
                     return 0;
                 }
 
-                if (_zoomItSettings.Properties.RecordFormat.Value == FormatMp4)
+                if (_zoomItSettings.Properties.RecordFormat.Value == "MP4")
                 {
                     return 1;
                 }
@@ -675,19 +672,19 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
             set
             {
                 int format = 0;
-                if (_zoomItSettings.Properties.RecordFormat.Value == FormatGif)
+                if (_zoomItSettings.Properties.RecordFormat.Value == "GIF")
                 {
                     format = 0;
                 }
 
-                if (_zoomItSettings.Properties.RecordFormat.Value == FormatMp4)
+                if (_zoomItSettings.Properties.RecordFormat.Value == "MP4")
                 {
                     format = 1;
                 }
 
                 if (format != value)
                 {
-                    _zoomItSettings.Properties.RecordFormat.Value = value == 0 ? FormatGif : FormatMp4;
+                    _zoomItSettings.Properties.RecordFormat.Value = value == 0 ? "GIF" : "MP4";
                     OnPropertyChanged(nameof(RecordFormatIndex));
                     NotifySettingsChanged();