Mouse highlighter spotlight mode, fix the gpu perf issue (#41079)

<!-- Enter a brief description/summary of your PR here. What does it
fix/what does it change/how was it tested (even manually, if necessary)?
-->
## Summary of the Pull Request
The big border solution for implementing the spotlight mode is gpu
consuming, switch to a resource friendly implementation.

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

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

<!-- Provide a more detailed description of the PR, other things fixed,
or any additional comments/features here -->
## Detailed Description of the Pull Request / Additional comments

<!-- Describe how you validated the behavior. Add automated tests
wherever possible, but list manual validation steps taken as well -->
## Validation Steps Performed

| Before | After | 
|----------|----------|
| <img width="739" height="263" alt="image"
src="https://github.com/user-attachments/assets/b369801a-4cda-44e8-968b-d76586931c8c"
/>| <img width="1031" height="319" alt="image"
src="https://github.com/user-attachments/assets/9b21c96d-f5ce-4ff7-8662-0c4e6e075976"
/>|

Directory.Packages.props

@@ -34,22 +34,22 @@
     <!-- Including MessagePack to force version, since it's used by StreamJsonRpc but contains vulnerabilities. After StreamJsonRpc updates the version of MessagePack, we can upgrade StreamJsonRpc instead. -->
     <PackageVersion Include="MessagePack" Version="3.1.3" />
     <PackageVersion Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="9.0.0" />
-    <PackageVersion Include="Microsoft.Data.Sqlite" Version="9.0.7" />
+    <PackageVersion Include="Microsoft.Data.Sqlite" Version="9.0.8" />
     <!-- Including Microsoft.Bcl.AsyncInterfaces to force version, since it's used by Microsoft.SemanticKernel. -->
-    <PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="9.0.7" />
+    <PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="9.0.8" />
     <PackageVersion Include="Microsoft.Diagnostics.Tracing.TraceEvent" Version="3.1.16" />
-    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="9.0.7" />
-    <PackageVersion Include="Microsoft.Extensions.Logging" Version="9.0.7" />
-    <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.7" />
-    <PackageVersion Include="Microsoft.Extensions.Hosting" Version="9.0.7" />
-    <PackageVersion Include="Microsoft.Extensions.Hosting.WindowsServices" Version="9.0.7" />
+    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="9.0.8" />
+    <PackageVersion Include="Microsoft.Extensions.Logging" Version="9.0.8" />
+    <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.8" />
+    <PackageVersion Include="Microsoft.Extensions.Hosting" Version="9.0.8" />
+    <PackageVersion Include="Microsoft.Extensions.Hosting.WindowsServices" Version="9.0.8" />
     <PackageVersion Include="Microsoft.SemanticKernel" Version="1.15.0" />
     <PackageVersion Include="Microsoft.Toolkit.Uwp.Notifications" Version="7.1.2" />
     <PackageVersion Include="Microsoft.Web.WebView2" Version="1.0.2903.40" />
     <!-- Package Microsoft.Win32.SystemEvents added as a hack for being able to exclude the runtime assets so they don't conflict with 8.0.1. This is a dependency of System.Drawing.Common but the 8.0.1 version wasn't published to nuget. -->
-    <PackageVersion Include="Microsoft.Win32.SystemEvents" Version="9.0.7" />
+    <PackageVersion Include="Microsoft.Win32.SystemEvents" Version="9.0.8" />
     <PackageVersion Include="Microsoft.WindowsPackageManager.ComInterop" Version="1.10.340" />
-    <PackageVersion Include="Microsoft.Windows.Compatibility" Version="9.0.7" />
+    <PackageVersion Include="Microsoft.Windows.Compatibility" Version="9.0.8" />
     <PackageVersion Include="Microsoft.Windows.CsWin32" Version="0.3.183" />
     <!-- CsWinRT version needs to be set to have a WinRT.Runtime.dll at the same version contained inside the NET SDK we're currently building on CI. -->
     <!-- 
@@ -78,28 +78,28 @@
     <PackageVersion Include="StreamJsonRpc" Version="2.21.69" />
     <PackageVersion Include="StyleCop.Analyzers" Version="1.2.0-beta.556" />
     <!-- Package System.CodeDom added as a hack for being able to exclude the runtime assets so they don't conflict with 8.0.1. This is a dependency of System.Management but the 8.0.1 version wasn't published to nuget. -->
-    <PackageVersion Include="System.CodeDom" Version="9.0.7" />
+    <PackageVersion Include="System.CodeDom" Version="9.0.8" />
     <PackageVersion Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
-    <PackageVersion Include="System.ComponentModel.Composition" Version="9.0.7" />
-    <PackageVersion Include="System.Configuration.ConfigurationManager" Version="9.0.7" />
-    <PackageVersion Include="System.Data.OleDb" Version="9.0.7" />
+    <PackageVersion Include="System.ComponentModel.Composition" Version="9.0.8" />
+    <PackageVersion Include="System.Configuration.ConfigurationManager" Version="9.0.8" />
+    <PackageVersion Include="System.Data.OleDb" Version="9.0.8" />
     <!-- Package System.Data.SqlClient added to force it as a dependency of Microsoft.Windows.Compatibility to the latest version available at this time. -->
     <PackageVersion Include="System.Data.SqlClient" Version="4.9.0" />
     <!-- Package System.Diagnostics.EventLog added as a hack for being able to exclude the runtime assets so they don't conflict with 8.0.1. This is a dependency of System.Data.OleDb but the 8.0.1 version wasn't published to nuget. -->
-    <PackageVersion Include="System.Diagnostics.EventLog" Version="9.0.7" />
+    <PackageVersion Include="System.Diagnostics.EventLog" Version="9.0.8" />
     <!-- Package System.Diagnostics.PerformanceCounter added as a hack for being able to exclude the runtime assets so they don't conflict with 8.0.11. -->
-    <PackageVersion Include="System.Diagnostics.PerformanceCounter" Version="9.0.7" />
-    <PackageVersion Include="System.Drawing.Common" Version="9.0.7" />
+    <PackageVersion Include="System.Diagnostics.PerformanceCounter" Version="9.0.8" />
+    <PackageVersion Include="System.Drawing.Common" Version="9.0.8" />
     <PackageVersion Include="System.IO.Abstractions" Version="22.0.13" />
     <PackageVersion Include="System.IO.Abstractions.TestingHelpers" Version="22.0.13" />
-    <PackageVersion Include="System.Management" Version="9.0.7" />
+    <PackageVersion Include="System.Management" Version="9.0.8" />
     <PackageVersion Include="System.Net.Http" Version="4.3.4" />
     <PackageVersion Include="System.Private.Uri" Version="4.3.2" />
     <PackageVersion Include="System.Reactive" Version="6.0.1" />
-    <PackageVersion Include="System.Runtime.Caching" Version="9.0.7" />
-    <PackageVersion Include="System.ServiceProcess.ServiceController" Version="9.0.7" />
-    <PackageVersion Include="System.Text.Encoding.CodePages" Version="9.0.7" />
-    <PackageVersion Include="System.Text.Json" Version="9.0.7" />
+    <PackageVersion Include="System.Runtime.Caching" Version="9.0.8" />
+    <PackageVersion Include="System.ServiceProcess.ServiceController" Version="9.0.8" />
+    <PackageVersion Include="System.Text.Encoding.CodePages" Version="9.0.8" />
+    <PackageVersion Include="System.Text.Json" Version="9.0.8" />
     <PackageVersion Include="System.Text.RegularExpressions" Version="4.3.1" />
     <PackageVersion Include="UnicodeInformation" Version="2.6.0" />
     <PackageVersion Include="UnitsNet" Version="5.56.0" />

NOTICE.md

@@ -1519,23 +1519,23 @@ SOFTWARE.
 - Mages 3.0.0
 - Markdig.Signed 0.34.0
 - MessagePack 3.1.3
-- Microsoft.Bcl.AsyncInterfaces 9.0.7
+- Microsoft.Bcl.AsyncInterfaces 9.0.8
 - Microsoft.Bot.AdaptiveExpressions.Core 4.23.0
 - Microsoft.CodeAnalysis.NetAnalyzers 9.0.0
-- Microsoft.Data.Sqlite 9.0.7
+- Microsoft.Data.Sqlite 9.0.8
 - Microsoft.Diagnostics.Tracing.TraceEvent 3.1.16
 - Microsoft.DotNet.ILCompiler (A)
-- Microsoft.Extensions.DependencyInjection 9.0.7
-- Microsoft.Extensions.Hosting 9.0.7
-- Microsoft.Extensions.Hosting.WindowsServices 9.0.7
-- Microsoft.Extensions.Logging 9.0.7
-- Microsoft.Extensions.Logging.Abstractions 9.0.7
+- Microsoft.Extensions.DependencyInjection 9.0.8
+- Microsoft.Extensions.Hosting 9.0.8
+- Microsoft.Extensions.Hosting.WindowsServices 9.0.8
+- Microsoft.Extensions.Logging 9.0.8
+- Microsoft.Extensions.Logging.Abstractions 9.0.8
 - Microsoft.NET.ILLink.Tasks (A)
 - Microsoft.SemanticKernel 1.15.0
 - Microsoft.Toolkit.Uwp.Notifications 7.1.2
 - Microsoft.Web.WebView2 1.0.2903.40
-- Microsoft.Win32.SystemEvents 9.0.7
-- Microsoft.Windows.Compatibility 9.0.7
+- Microsoft.Win32.SystemEvents 9.0.8
+- Microsoft.Windows.Compatibility 9.0.8
 - Microsoft.Windows.CsWin32 0.3.183
 - Microsoft.Windows.CsWinRT 2.2.0
 - Microsoft.Windows.SDK.BuildTools 10.0.26100.4188
@@ -1555,25 +1555,25 @@ SOFTWARE.
 - SkiaSharp.Views.WinUI 2.88.9
 - StreamJsonRpc 2.21.69
 - StyleCop.Analyzers 1.2.0-beta.556
-- System.CodeDom 9.0.7
+- System.CodeDom 9.0.8
 - System.CommandLine 2.0.0-beta4.22272.1
-- System.ComponentModel.Composition 9.0.7
-- System.Configuration.ConfigurationManager 9.0.7
-- System.Data.OleDb 9.0.7
+- System.ComponentModel.Composition 9.0.8
+- System.Configuration.ConfigurationManager 9.0.8
+- System.Data.OleDb 9.0.8
 - System.Data.SqlClient 4.9.0
-- System.Diagnostics.EventLog 9.0.7
-- System.Diagnostics.PerformanceCounter 9.0.7
-- System.Drawing.Common 9.0.7
+- System.Diagnostics.EventLog 9.0.8
+- System.Diagnostics.PerformanceCounter 9.0.8
+- System.Drawing.Common 9.0.8
 - System.IO.Abstractions 22.0.13
 - System.IO.Abstractions.TestingHelpers 22.0.13
-- System.Management 9.0.7
+- System.Management 9.0.8
 - System.Net.Http 4.3.4
 - System.Private.Uri 4.3.2
 - System.Reactive 6.0.1
-- System.Runtime.Caching 9.0.7
-- System.ServiceProcess.ServiceController 9.0.7
-- System.Text.Encoding.CodePages 9.0.7
-- System.Text.Json 9.0.7
+- System.Runtime.Caching 9.0.8
+- System.ServiceProcess.ServiceController 9.0.8
+- System.Text.Encoding.CodePages 9.0.8
+- System.Text.Json 9.0.8
 - System.Text.RegularExpressions 4.3.1
 - UnicodeInformation 2.6.0
 - UnitsNet 5.56.0

src/modules/MouseUtils/MouseHighlighter/MouseHighlighter.cpp

@@ -5,6 +5,7 @@
 #include "MouseHighlighter.h"
 #include "trace.h"
 #include <cmath>
+#include <algorithm>
 
 #ifdef COMPOSITION
 namespace winrt
@@ -49,6 +50,9 @@ private:
     void BringToFront();
     HHOOK m_mouseHook = NULL;
     static LRESULT CALLBACK MouseHookProc(int nCode, WPARAM wParam, LPARAM lParam) noexcept;
+    // Helpers for spotlight overlay
+    float GetDpiScale() const;
+    void UpdateSpotlightMask(float cx, float cy, float radius, bool show);
 
     static constexpr auto m_className = L"MouseHighlighter";
     static constexpr auto m_windowTitle = L"PowerToys Mouse Highlighter";
@@ -67,7 +71,14 @@ private:
     winrt::CompositionSpriteShape m_leftPointer{ nullptr };
     winrt::CompositionSpriteShape m_rightPointer{ nullptr };
     winrt::CompositionSpriteShape m_alwaysPointer{ nullptr };
-    winrt::CompositionSpriteShape m_spotlightPointer{ nullptr };
+    // Spotlight overlay (mask with soft feathered edge)
+    winrt::SpriteVisual m_overlay{ nullptr };
+    winrt::CompositionMaskBrush m_spotlightMask{ nullptr };
+    winrt::CompositionRadialGradientBrush m_spotlightMaskGradient{ nullptr };
+    winrt::CompositionColorBrush m_spotlightSource{ nullptr };
+    winrt::CompositionColorGradientStop m_maskStopCenter{ nullptr };
+    winrt::CompositionColorGradientStop m_maskStopInner{ nullptr };
+    winrt::CompositionColorGradientStop m_maskStopOuter{ nullptr };
 
     bool m_leftPointerEnabled = true;
     bool m_rightPointerEnabled = true;
@@ -123,6 +134,35 @@ bool Highlighter::CreateHighlighter()
         m_shape.RelativeSizeAdjustment({ 1.0f, 1.0f });
         m_root.Children().InsertAtTop(m_shape);
 
+        // Create spotlight overlay (soft feather, DPI-aware)
+        m_overlay = m_compositor.CreateSpriteVisual();
+        m_overlay.RelativeSizeAdjustment({ 1.0f, 1.0f });
+        m_spotlightSource = m_compositor.CreateColorBrush(m_alwaysColor);
+        m_spotlightMaskGradient = m_compositor.CreateRadialGradientBrush();
+        m_spotlightMaskGradient.MappingMode(winrt::CompositionMappingMode::Absolute);
+        // Center region fully transparent
+        m_maskStopCenter = m_compositor.CreateColorGradientStop();
+        m_maskStopCenter.Offset(0.0f);
+        m_maskStopCenter.Color(winrt::Windows::UI::ColorHelper::FromArgb(0, 0, 0, 0));
+        // Inner edge of feather (still transparent)
+        m_maskStopInner = m_compositor.CreateColorGradientStop();
+        m_maskStopInner.Offset(0.995f); // will be updated per-radius
+        m_maskStopInner.Color(winrt::Windows::UI::ColorHelper::FromArgb(0, 0, 0, 0));
+        // Outer edge (opaque mask -> overlay visible)
+        m_maskStopOuter = m_compositor.CreateColorGradientStop();
+        m_maskStopOuter.Offset(1.0f);
+        m_maskStopOuter.Color(winrt::Windows::UI::ColorHelper::FromArgb(255, 255, 255, 255));
+        m_spotlightMaskGradient.ColorStops().Append(m_maskStopCenter);
+        m_spotlightMaskGradient.ColorStops().Append(m_maskStopInner);
+        m_spotlightMaskGradient.ColorStops().Append(m_maskStopOuter);
+
+        m_spotlightMask = m_compositor.CreateMaskBrush();
+        m_spotlightMask.Source(m_spotlightSource);
+        m_spotlightMask.Mask(m_spotlightMaskGradient);
+        m_overlay.Brush(m_spotlightMask);
+        m_overlay.IsVisible(false);
+        m_root.Children().InsertAtTop(m_overlay);
+
         return true;
     }
     catch (...)
@@ -165,12 +205,8 @@ void Highlighter::AddDrawingPoint(MouseButton button)
         // always
         if (m_spotlightMode)
         {
-            float borderThickness = static_cast<float>(std::hypot(GetSystemMetrics(SM_CXVIRTUALSCREEN), GetSystemMetrics(SM_CYVIRTUALSCREEN)));
-            circleGeometry.Radius({ static_cast<float>(borderThickness / 2.0 + m_radius), static_cast<float>(borderThickness / 2.0 + m_radius) });
-            circleShape.FillBrush(nullptr);
-            circleShape.StrokeBrush(m_compositor.CreateColorBrush(m_alwaysColor));
-            circleShape.StrokeThickness(borderThickness);
-            m_spotlightPointer = circleShape;
+            UpdateSpotlightMask(static_cast<float>(pt.x), static_cast<float>(pt.y), m_radius, true);
+            return;
         }
         else
         {
@@ -209,20 +245,14 @@ void Highlighter::UpdateDrawingPointPosition(MouseButton button)
     }
     else
     {
-        // always
+        // always / spotlight idle
         if (m_spotlightMode)
         {
-            if (m_spotlightPointer)
-            {
-                m_spotlightPointer.Offset({ static_cast<float>(pt.x), static_cast<float>(pt.y) });
-            }
+            UpdateSpotlightMask(static_cast<float>(pt.x), static_cast<float>(pt.y), m_radius, true);
         }
-        else
+        else if (m_alwaysPointer)
         {
-            if (m_alwaysPointer)
-            {
-                m_alwaysPointer.Offset({ static_cast<float>(pt.x), static_cast<float>(pt.y) });
-            }
+            m_alwaysPointer.Offset({ static_cast<float>(pt.x), static_cast<float>(pt.y) });
         }
     }
 }
@@ -266,9 +296,9 @@ void Highlighter::ClearDrawingPoint()
 {
     if (m_spotlightMode)
     {
-        if (m_spotlightPointer)
+        if (m_overlay)
         {
-            m_spotlightPointer.StrokeBrush().as<winrt::Windows::UI::Composition::CompositionColorBrush>().Color(winrt::Windows::UI::ColorHelper::FromArgb(0, 0, 0, 0));
+            m_overlay.IsVisible(false);
         }
     }
     else
@@ -421,7 +451,10 @@ void Highlighter::StopDrawing()
     m_leftPointer = nullptr;
     m_rightPointer = nullptr;
     m_alwaysPointer = nullptr;
-    m_spotlightPointer = nullptr;
+    if (m_overlay)
+    {
+        m_overlay.IsVisible(false);
+    }
     ShowWindow(m_hwnd, SW_HIDE);
     UnhookWindowsHookEx(m_mouseHook);
     ClearDrawing();
@@ -452,6 +485,16 @@ void Highlighter::ApplySettings(MouseHighlighterSettings settings)
         m_rightPointerEnabled = false;
     }
 
+    // Keep spotlight overlay color updated
+    if (m_spotlightSource)
+    {
+        m_spotlightSource.Color(m_alwaysColor);
+    }
+    if (!m_spotlightMode && m_overlay)
+    {
+        m_overlay.IsVisible(false);
+    }
+
     if (instance->m_visible)
     {
         instance->StopDrawing();
@@ -563,6 +606,43 @@ void Highlighter::Terminate()
     }
 }
 
+float Highlighter::GetDpiScale() const
+{
+    return static_cast<float>(GetDpiForWindow(m_hwnd)) / 96.0f;
+}
+
+// Update spotlight radial mask center/radius with DPI-aware feather
+void Highlighter::UpdateSpotlightMask(float cx, float cy, float radius, bool show)
+{
+    if (!m_spotlightMaskGradient)
+    {
+        return;
+    }
+
+    m_spotlightMaskGradient.EllipseCenter({ cx, cy });
+    m_spotlightMaskGradient.EllipseRadius({ radius, radius });
+
+    const float dpiScale = GetDpiScale();
+    // Target a very fine edge: ~1 physical pixel, convert to DIPs: 1 / dpiScale
+    const float featherDip = 1.0f / (dpiScale > 0.0f ? dpiScale : 1.0f);
+    const float safeRadius = (std::max)(radius, 1.0f);
+    const float featherRel = (std::min)(0.25f, featherDip / safeRadius);
+
+    if (m_maskStopInner)
+    {
+        m_maskStopInner.Offset((std::max)(0.0f, 1.0f - featherRel));
+    }
+
+    if (m_spotlightSource)
+    {
+        m_spotlightSource.Color(m_alwaysColor);
+    }
+    if (m_overlay)
+    {
+        m_overlay.IsVisible(show);
+    }
+}
+
 #pragma region MouseHighlighter_API
 
 void MouseHighlighterApplySettings(MouseHighlighterSettings settings)

src/modules/cmdpal/ExtensionTemplate/TemplateCmdPalExtension/Directory.Packages.props

@@ -12,6 +12,6 @@
     <PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.7.250513003" />
     <PackageVersion Include="Shmuelie.WinRTServer" Version="2.1.1" />
     <PackageVersion Include="StyleCop.Analyzers" Version="1.2.0-beta.556" />
-    <PackageVersion Include="System.Text.Json" Version="9.0.7" />
+    <PackageVersion Include="System.Text.Json" Version="9.0.8" />
   </ItemGroup>
 </Project>

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

@@ -2,11 +2,14 @@
 // 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 Microsoft.CmdPal.Core.ViewModels.Models;
 using Microsoft.CommandPalette.Extensions;
+using Microsoft.CommandPalette.Extensions.Toolkit;
 
 namespace Microsoft.CmdPal.Core.ViewModels;
 
+[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)]
 public partial class CommandContextItemViewModel(ICommandContextItem contextItem, WeakReference<IPageContext> context) : CommandItemViewModel(new(contextItem), context), IContextItemViewModel
 {
     private readonly KeyChord nullKeyChord = new(0, 0, 0);

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

@@ -2,6 +2,7 @@
 // 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 Microsoft.CmdPal.Core.ViewModels.Messages;
 using Microsoft.CmdPal.Core.ViewModels.Models;
 using Microsoft.CommandPalette.Extensions;
@@ -9,6 +10,7 @@ using Microsoft.CommandPalette.Extensions.Toolkit;
 
 namespace Microsoft.CmdPal.Core.ViewModels;
 
+[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)]
 public partial class CommandItemViewModel : ExtensionObjectViewModel, ICommandBarContext
 {
     public ExtensionObject<ICommandItem> Model => _commandItemModel;

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

@@ -4,12 +4,14 @@
 
 using System;
 using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
 namespace Microsoft.CmdPal.Core.ViewModels;
 
+[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)]
 public interface IContextItemViewModel
 {
 }

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

@@ -2,11 +2,13 @@
 // 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 Microsoft.CmdPal.Core.ViewModels;
 using Microsoft.CommandPalette.Extensions;
 
 namespace Microsoft.CmdPal.Core.ViewModels;
 
+[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)]
 public partial class SeparatorContextItemViewModel() : IContextItemViewModel, ISeparatorContextItem
 {
 }

src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Commands/MainListPage.cs

@@ -60,6 +60,7 @@ public partial class MainListPage : DynamicListPage,
         var settings = _serviceProvider.GetService<SettingsModel>()!;
         settings.SettingsChanged += SettingsChangedHandler;
         HotReloadSettings(settings);
+        _includeApps = _tlcManager.IsProviderActive(AllAppsCommandProvider.WellKnownId);
 
         IsLoading = true;
     }

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

@@ -98,35 +98,107 @@ public partial class ContentFormViewModel(IFormContent _form, WeakReference<IPag
 
     public void HandleSubmit(IAdaptiveActionElement action, JsonObject inputs)
     {
-        if (action is AdaptiveOpenUrlAction openUrlAction)
-        {
-            WeakReferenceMessenger.Default.Send<LaunchUriMessage>(new(openUrlAction.Url));
-            return;
-        }
+        // BODGY circa GH #40979
+        // Usually, you're supposed to try to cast the action to a specific
+        // type, and use those objects to get the data you need.
+        // However, there's something weird with AdaptiveCards and the way it
+        // works when we consume it when built in Release, with AOT (and
+        // trimming) enabled. Any sort of `action.As<IAdaptiveSubmitAction>()`
+        // or similar will throw a System.InvalidCastException.
+        //
+        // Instead we have this horror show.
+        //
+        // The `action.ToJson()` blob ACTUALLY CONTAINS THE `type` field, which
+        // we can use to determine what kind of action it is. Then we can parse
+        // the JSON manually based on the type.
+        var actionJson = action.ToJson();
 
-        if (action is AdaptiveSubmitAction or AdaptiveExecuteAction)
+        if (actionJson.TryGetValue("type", out var actionTypeValue))
         {
-            // Get the data and inputs
-            var dataString = (action as AdaptiveSubmitAction)?.DataJson.Stringify() ?? string.Empty;
-            var inputString = inputs.Stringify();
+            var actionTypeString = actionTypeValue.GetString();
+            Logger.LogTrace($"atString={actionTypeString}");
 
-            _ = Task.Run(() =>
+            var actionType = actionTypeString switch
             {
-                try
-                {
-                    var model = _formModel.Unsafe!;
-                    if (model != null)
+                "Action.Submit" => ActionType.Submit,
+                "Action.Execute" => ActionType.Execute,
+                "Action.OpenUrl" => ActionType.OpenUrl,
+                _ => ActionType.Unsupported,
+            };
+
+            Logger.LogDebug($"{actionTypeString}->{actionType}");
+
+            switch (actionType)
+            {
+                case ActionType.OpenUrl:
                     {
-                        var result = model.SubmitForm(inputString, dataString);
-                        WeakReferenceMessenger.Default.Send<HandleCommandResultMessage>(new(new(result)));
+                        HandleOpenUrlAction(action, actionJson);
                     }
-                }
-                catch (Exception ex)
-                {
-                    ShowException(ex);
-                }
-            });
+
+                    break;
+                case ActionType.Submit:
+                case ActionType.Execute:
+                    {
+                        HandleSubmitAction(action, actionJson, inputs);
+                    }
+
+                    break;
+                default:
+                    Logger.LogError($"{actionType} was an unexpected action `type`");
+                    break;
+            }
         }
+        else
+        {
+            Logger.LogError($"actionJson.TryGetValue(type) failed");
+        }
+    }
+
+    private void HandleOpenUrlAction(IAdaptiveActionElement action, JsonObject actionJson)
+    {
+        if (actionJson.TryGetValue("url", out var actionUrlValue))
+        {
+            var actionUrl = actionUrlValue.GetString() ?? string.Empty;
+            if (Uri.TryCreate(actionUrl, default(UriCreationOptions), out var uri))
+            {
+                WeakReferenceMessenger.Default.Send<LaunchUriMessage>(new(uri));
+            }
+            else
+            {
+                Logger.LogError($"Failed to produce URI for {actionUrlValue}");
+            }
+        }
+    }
+
+    private void HandleSubmitAction(
+        IAdaptiveActionElement action,
+        JsonObject actionJson,
+        JsonObject inputs)
+    {
+        var dataString = string.Empty;
+        if (actionJson.TryGetValue("data", out var actionDataValue))
+        {
+            dataString = actionDataValue.Stringify() ?? string.Empty;
+        }
+
+        var inputString = inputs.Stringify();
+        _ = Task.Run(() =>
+        {
+            try
+            {
+                var model = _formModel.Unsafe!;
+                if (model != null)
+                {
+                    var result = model.SubmitForm(inputString, dataString);
+                    Logger.LogDebug($"SubmitForm() returned {result}");
+                    WeakReferenceMessenger.Default.Send<HandleCommandResultMessage>(new(new(result)));
+                }
+            }
+            catch (Exception ex)
+            {
+                ShowException(ex);
+            }
+        });
     }
 
     private static readonly string ErrorCardJson = """

src/modules/cmdpal/Microsoft.CmdPal.UI/App.xaml.cs

@@ -64,6 +64,9 @@ public partial class App : Application
 
         this.InitializeComponent();
 
+        // Ensure types used in XAML are preserved for AOT compilation
+        TypePreservation.PreserveTypes();
+
         NativeEventWaiter.WaitForEventLoop(
             "Local\\PowerToysCmdPal-ExitEvent-eb73f6be-3f22-4b36-aee3-62924ba40bfd", () =>
             {

src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/CommandBar.xaml

@@ -59,8 +59,24 @@
                     <Setter Property="BorderBrush" Value="{ThemeResource DividerStrokeColorDefaultBrush}" />
                     <Setter Property="BorderThickness" Value="1" />
                     <Setter Property="CornerRadius" Value="6" />
+                    <Setter Property="MinWidth" Value="20" />
                 </Style.Setters>
             </Style>
+
+            <Style x:Key="HotkeyTextBlockStyle" TargetType="TextBlock">
+                <Setter Property="FontSize" Value="10" />
+                <Setter Property="CharacterSpacing" Value="4" />
+                <Setter Property="Foreground" Value="{ThemeResource TextFillColorPrimaryBrush}" />
+                <Setter Property="HorizontalAlignment" Value="Center" />
+                <Setter Property="VerticalAlignment" Value="Center" />
+            </Style>
+
+            <Style x:Key="HotkeyFontIconStyle" TargetType="FontIcon">
+                <Setter Property="FontSize" Value="10" />
+                <Setter Property="Foreground" Value="{ThemeResource TextFillColorPrimaryBrush}" />
+                <Setter Property="HorizontalAlignment" Value="Center" />
+                <Setter Property="VerticalAlignment" Value="Center" />
+            </Style>
         </ResourceDictionary>
     </UserControl.Resources>
 
@@ -155,12 +171,7 @@
                         Style="{StaticResource CaptionTextBlockStyle}"
                         Text="{x:Bind ViewModel.PrimaryCommand.Name, Mode=OneWay}" />
                     <Border Style="{StaticResource HotkeyStyle}">
-                        <FontIcon
-                            HorizontalAlignment="Left"
-                            VerticalAlignment="Center"
-                            FontSize="10"
-                            Foreground="{ThemeResource TextFillColorPrimaryBrush}"
-                            Glyph="&#xE751;" />
+                        <FontIcon Glyph="&#xE751;" Style="{StaticResource HotkeyFontIconStyle}" />
                     </Border>
                 </StackPanel>
             </Button>
@@ -179,19 +190,10 @@
                         Text="{x:Bind ViewModel.SecondaryCommand.Name, Mode=OneWay}" />
                     <StackPanel Orientation="Horizontal" Spacing="4">
                         <Border Padding="4,2,4,2" Style="{StaticResource HotkeyStyle}">
-                            <TextBlock
-                                CharacterSpacing="4"
-                                FontSize="10"
-                                Foreground="{ThemeResource TextFillColorPrimaryBrush}"
-                                Text="Ctrl" />
+                            <TextBlock Style="{StaticResource HotkeyTextBlockStyle}" Text="Ctrl" />
                         </Border>
                         <Border Style="{StaticResource HotkeyStyle}">
-                            <FontIcon
-                                HorizontalAlignment="Left"
-                                VerticalAlignment="Center"
-                                FontSize="10"
-                                Foreground="{ThemeResource TextFillColorPrimaryBrush}"
-                                Glyph="&#xE751;" />
+                            <FontIcon Glyph="&#xE751;" Style="{StaticResource HotkeyFontIconStyle}" />
                         </Border>
                     </StackPanel>
                 </StackPanel>
@@ -199,7 +201,7 @@
             <Button
                 x:Name="MoreCommandsButton"
                 x:Uid="MoreCommandsButton"
-                Padding="4"
+                Padding="6,4,4,4"
                 Click="MoreCommandsButton_Clicked"
                 Style="{StaticResource SubtleButtonStyle}"
                 ToolTipService.ToolTip="Ctrl+K"
@@ -209,32 +211,12 @@
                         VerticalAlignment="Center"
                         Style="{StaticResource CaptionTextBlockStyle}"
                         Text="More" />
-                    <StackPanel Orientation="Horizontal" Spacing="2">
-                        <Border
-                            Padding="4,2,4,2"
-                            VerticalAlignment="Center"
-                            Background="{ThemeResource SubtleFillColorSecondaryBrush}"
-                            BorderBrush="{ThemeResource DividerStrokeColorDefaultBrush}"
-                            BorderThickness="1"
-                            CornerRadius="4">
-                            <TextBlock
-                                CharacterSpacing="4"
-                                FontSize="10"
-                                Foreground="{ThemeResource TextFillColorSecondaryBrush}"
-                                Text="Ctrl" />
+                    <StackPanel Orientation="Horizontal" Spacing="4">
+                        <Border Padding="4,2,4,2" Style="{StaticResource HotkeyStyle}">
+                            <TextBlock Style="{StaticResource HotkeyTextBlockStyle}" Text="Ctrl" />
                         </Border>
-                        <Border
-                            Padding="4,2,4,2"
-                            VerticalAlignment="Center"
-                            Background="{ThemeResource SubtleFillColorSecondaryBrush}"
-                            BorderBrush="{ThemeResource DividerStrokeColorDefaultBrush}"
-                            BorderThickness="1"
-                            CornerRadius="4">
-                            <TextBlock
-                                VerticalAlignment="Center"
-                                FontSize="10"
-                                Foreground="{ThemeResource TextFillColorSecondaryBrush}"
-                                Text="K" />
+                        <Border Padding="4,2,4,2" Style="{StaticResource HotkeyStyle}">
+                            <TextBlock Style="{StaticResource HotkeyTextBlockStyle}" Text="K" />
                         </Border>
                     </StackPanel>
                 </StackPanel>

src/modules/cmdpal/Microsoft.CmdPal.UI/Converters/ContextItemTemplateSelector.cs

@@ -2,6 +2,7 @@
 // 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 Microsoft.CmdPal.Core.ViewModels;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
@@ -10,6 +11,7 @@ using Microsoft.UI.Xaml.Data;
 
 namespace Microsoft.CmdPal.UI;
 
+[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)]
 internal sealed partial class ContextItemTemplateSelector : DataTemplateSelector
 {
     public DataTemplate? Default { get; set; }

src/modules/cmdpal/Microsoft.CmdPal.UI/Microsoft.CmdPal.UI.csproj

@@ -109,10 +109,6 @@
     <ProjectCapability Include="Msix" />
   </ItemGroup>
 
-  <ItemGroup>
-	<RdXmlFile Include="rd.xml" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\..\..\common\ManagedTelemetry\Telemetry\ManagedTelemetry.csproj" />
     <ProjectReference Include="..\ext\Microsoft.CmdPal.Ext.ClipboardHistory\Microsoft.CmdPal.Ext.ClipboardHistory.csproj" />

src/modules/cmdpal/Microsoft.CmdPal.UI/TypePreservation.cs

@@ -0,0 +1,40 @@
+// 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 Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+
+namespace Microsoft.CmdPal.UI;
+
+/// <summary>
+/// This class ensures types used in XAML are preserved during AOT compilation.
+/// Framework types cannot have attributes added directly to their definitions since they're external types.
+/// Application types that require runtime type checking should also be preserved here if needed.
+/// </summary>
+internal static class TypePreservation
+{
+    /// <summary>
+    /// This method ensures critical types are preserved for AOT compilation.
+    /// These types are used dynamically in XAML and would otherwise be trimmed.
+    /// </summary>
+    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(Microsoft.UI.Xaml.Controls.FontIconSource))]
+    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(Microsoft.UI.Xaml.Controls.PathIcon))]
+    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(Microsoft.UI.Xaml.DataTemplate))]
+    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(Microsoft.UI.Xaml.Controls.DataTemplateSelector))]
+    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(Microsoft.UI.Xaml.Controls.ListViewItem))]
+    public static void PreserveTypes()
+    {
+        // This method exists only to hold the DynamicDependency attributes above.
+        // It must be called to ensure the types are not trimmed during AOT compilation.
+
+        // Note: We cannot add [DynamicallyAccessedMembers] directly to framework types
+        // since we don't own their source code. DynamicDependency is the correct approach
+        // for preserving external types that are used dynamically (e.g., in XAML).
+
+        // For application types that require runtime type checking (e.g., in template selectors),
+        // prefer adding [DynamicallyAccessedMembers] attributes directly on the type definitions.
+        // Only use DynamicDependency here for types we cannot modify directly.
+    }
+}

src/modules/cmdpal/Microsoft.CmdPal.UI/rd.xml

@@ -1,23 +0,0 @@
-<Directives xmlns="http://schemas.microsoft.com/netfx/2013/01/metadata">
-	<Application>
-		<Assembly Name="Microsoft.WinUI">
-			<Type Name="Microsoft.UI.Xaml.Controls.FontIconSource" Dynamic="Required All" />
-			<Type Name="Microsoft.UI.Xaml.DataTemplate" Dynamic="Required All" />
-			<Type Name="Microsoft.UI.Xaml.Controls.DataTemplateSelector" Dynamic="Required All" />
-			<Type Name="Microsoft.UI.Xaml.Controls.ListViewItem" Dynamic="Required All" />
-		</Assembly>
-
-		<!-- Add ViewModel types for AOT compatibility -->
-		<Assembly Name="Microsoft.CmdPal.Core.ViewModels">
-			<Type Name="Microsoft.CmdPal.Core.ViewModels.CommandContextItemViewModel" Dynamic="Required All" />
-			<Type Name="Microsoft.CmdPal.Core.ViewModels.SeparatorContextItemViewModel" Dynamic="Required All" />
-			<Type Name="Microsoft.CmdPal.Core.ViewModels.IContextItemViewModel" Dynamic="Required All" />
-			<Type Name="Microsoft.CmdPal.Core.ViewModels.CommandItemViewModel" Dynamic="Required All" />
-		</Assembly>
-
-		<!-- Add UI types for AOT compatibility -->
-		<Assembly Name="Microsoft.CmdPal.UI">
-			<Type Name="Microsoft.CmdPal.UI.ContextItemTemplateSelector" Dynamic="Required All" />
-		</Assembly>
-	</Application>
-</Directives>

src/modules/cmdpal/ext/SamplePagesExtension/Pages/SampleContentPage.cs

@@ -225,6 +225,11 @@ internal sealed partial class SampleContentForm : FormContent
                     }
                 ]
             }
+        },
+        {
+            "type": "Action.OpenUrl",
+            "title": "Action.OpenUrl",
+            "url": "https://adaptivecards.microsoft.com/"
         }
     ]
 }

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

@@ -149,7 +149,7 @@
                         IsClosable="False"
                         IsOpen="True"
                         Severity="Informational"
-                        Visibility="{x:Bind ViewModel.IsAnimationEnabledBySystem, Mode=OneWay, Converter={StaticResource BoolToReverseVisibilityConverter}}">
+                        Visibility="{x:Bind ViewModel.IsAnimationEnabledBySystem, Mode=OneWay, Converter={StaticResource ReverseBoolToVisibilityConverter}}">
                         <InfoBar.ActionButton>
                             <HyperlinkButton x:Uid="OpenSettings" Click="OpenAnimationsSettings_Click" />
                         </InfoBar.ActionButton>

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

@@ -69,16 +69,18 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
         private void AddDashboardListItem(ModuleType moduleType)
         {
             GpoRuleConfigured gpo = ModuleHelper.GetModuleGpoConfiguration(moduleType);
-            AllModules.Add(new DashboardListItem()
+            var newItem = new DashboardListItem()
             {
                 Tag = moduleType,
                 Label = resourceLoader.GetString(ModuleHelper.GetModuleLabelResourceName(moduleType)),
                 IsEnabled = gpo == GpoRuleConfigured.Enabled || (gpo != GpoRuleConfigured.Disabled && ModuleHelper.GetIsModuleEnabled(generalSettingsConfig, moduleType)),
                 IsLocked = gpo == GpoRuleConfigured.Enabled || gpo == GpoRuleConfigured.Disabled,
                 Icon = ModuleHelper.GetModuleTypeFluentIconName(moduleType),
-                EnabledChangedCallback = EnabledChangedOnUI,
                 DashboardModuleItems = GetModuleItems(moduleType),
-            });
+            };
+
+            AllModules.Add(newItem);
+            newItem.EnabledChangedCallback = EnabledChangedOnUI;
         }
 
         private void EnabledChangedOnUI(DashboardListItem dashboardListItem)
@@ -120,16 +122,18 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
 
                 if (filteredItems.Count != 0)
                 {
-                    ShortcutModules.Add(new DashboardListItem
+                    var newItem = new DashboardListItem
                     {
-                        EnabledChangedCallback = x.EnabledChangedCallback,
                         Icon = x.Icon,
                         IsLocked = x.IsLocked,
                         Label = x.Label,
                         Tag = x.Tag,
                         IsEnabled = x.IsEnabled,
                         DashboardModuleItems = new ObservableCollection<DashboardModuleItem>(filteredItems),
-                    });
+                    };
+
+                    ShortcutModules.Add(newItem);
+                    newItem.EnabledChangedCallback = x.EnabledChangedCallback;
                 }
             }
 
@@ -141,16 +145,18 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
 
                 if (filteredItems.Count != 0)
                 {
-                    ActionModules.Add(new DashboardListItem
+                    var newItem = new DashboardListItem
                     {
-                        EnabledChangedCallback = x.EnabledChangedCallback,
                         Icon = x.Icon,
                         IsLocked = x.IsLocked,
                         Label = x.Label,
                         Tag = x.Tag,
                         IsEnabled = x.IsEnabled,
                         DashboardModuleItems = new ObservableCollection<DashboardModuleItem>(filteredItems),
-                    });
+                    };
+
+                    ActionModules.Add(newItem);
+                    newItem.EnabledChangedCallback = x.EnabledChangedCallback;
                 }
             }
         }