Potential fix for pull request finding

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>

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

@@ -135,6 +135,7 @@ BITMAPINFO
 BITMAPINFOHEADER
 BITSPERPEL
 BITSPIXEL
+Blackmagic
 bla
 BLENDFUNCTION
 blittable
@@ -539,6 +540,7 @@ EXTRINSICPROPERTIES
 eyetracker
 FANCYZONESDRAWLAYOUTTEST
 FANCYZONESEDITOR
+Fairlight
 FARPROC
 fdw
 fdx
@@ -2178,6 +2180,7 @@ xclip
 xcopy
 xdf
 xfd
+xhair
 xmp
 Xoshiro
 xsi

.github/copilot-instructions.md

@@ -30,6 +30,12 @@ These are auto-applied based on file location:
 - [Runner & Settings UI](.github/instructions/runner-settings-ui.instructions.md)
 - [Common Libraries](.github/instructions/common-libraries.instructions.md)
 
+## Shortcut Guide V2 Manifests
+
+When creating or editing Shortcut Guide keyboard shortcut manifest files, follow the schema and naming conventions in the spec:
+
+- [WinGet Manifest Keyboard Shortcuts schema](<../doc/specs/WinGet Manifest Keyboard Shortcuts schema.md>) – manifest file format, field definitions, file naming, and the `+` prefix convention for apps without a WinGet package
+
 ## Detailed Documentation
 
 - [Architecture](../doc/devdocs/core/architecture.md)

.github/workflows/auto-labeler.yml

@@ -73,6 +73,13 @@ jobs:
 
               const itemType = issue.pull_request ? 'Pull request' : 'Issue';
 
+              // Skip pull requests that already have labels applied.
+              if (issue.pull_request && issue.labels && issue.labels.length > 0) {
+                const existingLabels = issue.labels.map(l => l.name).join(', ');
+                console.log(`${itemType} #${issueNumber} already has labels (${existingLabels}); skipping.`);
+                return;
+              }
+
               const title = issue.title ?? '';
               const body  = issue.body  ?? '';
 

NOTICE.md

@@ -12,6 +12,7 @@ This software incorporates material from third parties.
 - Peek
 - PowerDisplay
 - Registry Preview
+- ZoomIt
 
 ## Utility: Color Picker
 
@@ -1549,6 +1550,69 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
+## Utility: ZoomIt
+
+### libwebp
+
+ZoomIt uses libwebp to encode screenshots in the WebP image format.
+
+**Source**: <https://github.com/webmproject/libwebp>
+
+BSD-3-Clause License
+
+Copyright (c) 2010, Google Inc. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+  * Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+
+  * Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in
+    the documentation and/or other materials provided with the
+    distribution.
+
+  * Neither the name of Google nor the names of its contributors may
+    be used to endorse or promote products derived from this software
+    without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+Additional IP Rights Grant (Patents)
+
+"These implementations" means the copyrightable works that implement the WebM
+codecs distributed by Google as part of the WebM Project.
+
+Google hereby grants to you a perpetual, worldwide, non-exclusive, no-charge,
+royalty-free, irrevocable (except as stated in this section) patent license to
+make, have made, use, offer to sell, sell, import, transfer, and otherwise
+run, modify and propagate the contents of these implementations of WebM, where
+such license applies only to those patent claims, both currently owned by
+Google and acquired in the future, licensable by Google that are necessarily
+infringed by these implementations of WebM. This grant does not include claims
+that would be infringed only as a consequence of further modification of these
+implementations. If you or your agent or exclusive licensee institute or order
+or agree to the institution of patent litigation or any other patent
+enforcement activity against any entity (including a cross-claim or
+counterclaim in a lawsuit) alleging that any of these implementations of WebM
+or any code incorporated within any of these implementations of WebM
+constitute direct or contributory patent infringement, or inducement of
+patent infringement, then any patent rights granted to you under this License
+for these implementations of WebM shall terminate as of the date such
+litigation is filed.
+
 ## NuGet Packages used by PowerToys
 
 - AdaptiveCards.ObjectModel.WinUI3

src/common/Common.UI.Controls/Backdrops/AlwaysActiveDesktopAcrylicBackdrop.cs

@@ -29,8 +29,30 @@ namespace Microsoft.PowerToys.Common.UI.Controls.Backdrops;
 /// </remarks>
 public sealed partial class AlwaysActiveDesktopAcrylicBackdrop : SystemBackdrop
 {
+    /// <summary>
+    /// Identifies the <see cref="Kind"/> dependency property.
+    /// </summary>
+    public static readonly DependencyProperty KindProperty = DependencyProperty.Register(
+        nameof(Kind),
+        typeof(DesktopAcrylicKind),
+        typeof(AlwaysActiveDesktopAcrylicBackdrop),
+        new PropertyMetadata(DesktopAcrylicKind.Default, OnKindChanged));
+
     private readonly Dictionary<ICompositionSupportsSystemBackdrop, BackdropTarget> _targets = new();
 
+    /// <summary>
+    /// Gets or sets the desktop acrylic material variant to render. Defaults to
+    /// <see cref="DesktopAcrylicKind.Default"/> (the standard, more opaque
+    /// acrylic); <see cref="DesktopAcrylicKind.Thin"/> renders a lighter, more
+    /// translucent material and <see cref="DesktopAcrylicKind.Base"/> the base
+    /// material. Changing this updates any live backdrop targets immediately.
+    /// </summary>
+    public DesktopAcrylicKind Kind
+    {
+        get => (DesktopAcrylicKind)GetValue(KindProperty);
+        set => SetValue(KindProperty, value);
+    }
+
     protected override void OnTargetConnected(ICompositionSupportsSystemBackdrop connectedTarget, XamlRoot xamlRoot)
     {
         base.OnTargetConnected(connectedTarget, xamlRoot);
@@ -41,7 +63,10 @@ public sealed partial class AlwaysActiveDesktopAcrylicBackdrop : SystemBackdrop
             Theme = ResolveTheme(xamlRoot),
         };
 
-        var controller = new DesktopAcrylicController();
+        var controller = new DesktopAcrylicController
+        {
+            Kind = Kind,
+        };
         controller.SetSystemBackdropConfiguration(configuration);
         controller.AddSystemBackdropTarget(connectedTarget);
 
@@ -70,6 +95,17 @@ public sealed partial class AlwaysActiveDesktopAcrylicBackdrop : SystemBackdrop
         }
     }
 
+    private static void OnKindChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        var self = (AlwaysActiveDesktopAcrylicBackdrop)d;
+        var kind = (DesktopAcrylicKind)e.NewValue;
+
+        foreach (var target in self._targets.Values)
+        {
+            target.Controller.Kind = kind;
+        }
+    }
+
     private static SystemBackdropTheme ResolveTheme(XamlRoot xamlRoot) =>
         xamlRoot.Content is FrameworkElement rootElement
             ? rootElement.ActualTheme switch

src/common/Common.UI.Controls/Controls/TransientSurface/TransientSurface.xaml

@@ -5,9 +5,9 @@
     xmlns:backdrops="using:Microsoft.PowerToys.Common.UI.Controls.Backdrops"
     xmlns:local="using:Microsoft.PowerToys.Common.UI.Controls">
 
-    <Style BasedOn="{StaticResource DefaultTransparentCardStyle}" TargetType="local:TransparentCard" />
+    <Style BasedOn="{StaticResource DefaultTransientSurfaceStyle}" TargetType="local:TransientSurface" />
 
-    <Style x:Key="DefaultTransparentCardStyle" TargetType="local:TransparentCard">
+    <Style x:Key="DefaultTransientSurfaceStyle" TargetType="local:TransientSurface">
         <Setter Property="BorderBrush" Value="{ThemeResource SurfaceStrokeColorDefaultBrush}" />
         <Setter Property="BorderThickness" Value="1" />
         <Setter Property="CornerRadius" Value="8" />
@@ -16,7 +16,7 @@
         <Setter Property="VerticalContentAlignment" Value="Stretch" />
         <Setter Property="Template">
             <Setter.Value>
-                <ControlTemplate TargetType="local:TransparentCard">
+                <ControlTemplate TargetType="local:TransientSurface">
                     <Grid
                         BorderBrush="{TemplateBinding BorderBrush}"
                         BorderThickness="{TemplateBinding BorderThickness}"
@@ -27,7 +27,7 @@
                         </Grid.Shadow>
                         <SystemBackdropElement CornerRadius="{TemplateBinding CornerRadius}">
                             <SystemBackdropElement.SystemBackdrop>
-                                <backdrops:AlwaysActiveDesktopAcrylicBackdrop />
+                                <backdrops:AlwaysActiveDesktopAcrylicBackdrop Kind="{TemplateBinding AcrylicKind}" />
                             </SystemBackdropElement.SystemBackdrop>
                         </SystemBackdropElement>
                         <ContentPresenter
@@ -41,5 +41,4 @@
             </Setter.Value>
         </Setter>
     </Style>
-
 </ResourceDictionary>

src/common/Common.UI.Controls/Controls/TransientSurface/TransientSurface.xaml.cs

@@ -0,0 +1,467 @@
+// 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 CommunityToolkit.WinUI;
+using CommunityToolkit.WinUI.Animations;
+using Microsoft.PowerToys.Common.UI.Controls.Window;
+using Microsoft.UI.Composition.SystemBackdrops;
+using Microsoft.UI.Dispatching;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Hosting;
+
+namespace Microsoft.PowerToys.Common.UI.Controls;
+
+/// <summary>
+/// A floating, self-animating "pseudo window" surface for transient PowerToys
+/// overlays (toasts, banners, indicators). It looks like a control but behaves
+/// like a lightweight window: it provides the PowerToys-standard chrome — 1 px
+/// border in <c>SurfaceStrokeColorDefaultBrush</c>, 8 px corner radius, a
+/// <c>ThemeShadow</c>, and an always-active desktop acrylic backdrop — and owns
+/// its own show/hide animations.
+/// </summary>
+/// <remarks>
+/// <para>Designed to be declared as the root content of a
+/// <see cref="TransparentWindow"/>, which stays animation-agnostic. Call
+/// <see cref="SubscribeTo"/> once (e.g. from the hosting window's constructor)
+/// to wire this surface to the window's <see cref="TransparentWindow.Showing"/> /
+/// <see cref="TransparentWindow.Hiding"/> events. From then on the surface
+/// animates itself in/out whenever the window is shown or hidden, and uses the
+/// <see cref="TransparentWindow.Hiding"/> deferral to keep the window visible
+/// until its out-animation finishes.</para>
+/// <para>The show transition comes from the window's
+/// <see cref="TransparentWindow.Show(Transition)"/> call (or from
+/// <see cref="ShowTransition"/> when shown without one); the hide transition
+/// always comes from <see cref="HideTransition"/>. Animations target the
+/// surface itself, so the entire surface (border, acrylic, shadow, inner
+/// content) animates as one. Apps that want a different look supply their own
+/// <c>Style TargetType="TransientSurface"</c> in resources — the standard WinUI
+/// restyle path.</para>
+/// </remarks>
+public sealed partial class TransientSurface : ContentControl
+{
+    private const float ShadowDepth = 32f;
+    private const double SlideInOffset = 24;
+    private const double SlideOutOffset = 12;
+
+    // "Pop" transition: scale between 96% and 100% (a subtle 4% grow). Following
+    // Fluent motion guidance the scale uses a decelerate (EaseOut) curve; the
+    // fade is kept fast so the surface reads as an instant, light pop.
+    //
+    // The fade must run at least as long as the scale: if the scale outlasted the
+    // fade, the surface would reach full opacity while still visibly growing,
+    // which reads as a "resize" rather than a pop. Keeping the fade >= the scale
+    // hides the growth under the opacity ramp, so by the time it is fully opaque
+    // it is already at 100% size.
+    private const float PopScaleFrom = 0.96f;
+    private const double PopFadeShowMs = 180;
+    private const double PopScaleShowMs = 150;
+    private const double PopFadeHideMs = 120;
+    private const double PopScaleHideMs = 120;
+
+    public static readonly DependencyProperty ShowTransitionProperty = DependencyProperty.Register(
+        nameof(ShowTransition),
+        typeof(Transition),
+        typeof(TransientSurface),
+        new PropertyMetadata(Transition.None, OnTransitionChanged));
+
+    public static readonly DependencyProperty HideTransitionProperty = DependencyProperty.Register(
+        nameof(HideTransition),
+        typeof(Transition),
+        typeof(TransientSurface),
+        new PropertyMetadata(Transition.None, OnTransitionChanged));
+
+    public static readonly DependencyProperty AcrylicKindProperty = DependencyProperty.Register(
+        nameof(AcrylicKind),
+        typeof(DesktopAcrylicKind),
+        typeof(TransientSurface),
+        new PropertyMetadata(DesktopAcrylicKind.Thin));
+
+    private readonly DispatcherQueueTimer _hideCompletedTimer = DispatcherQueue.GetForCurrentThread().CreateTimer();
+
+    private readonly ImplicitAnimationSet _noAnimations = new();
+
+    private ImplicitAnimationSet _showAnimations = new();
+    private ImplicitAnimationSet _hideAnimations = new();
+    private bool _hasCustomShowAnimations;
+    private bool _hasCustomHideAnimations;
+    private Action? _abandonPendingHide;
+
+    public TransientSurface()
+    {
+        DefaultStyleKey = typeof(TransientSurface);
+
+        RebuildDefaultAnimations();
+
+        // Pin the scale center to the surface's center so the "Pop" transition
+        // grows/shrinks from the middle, not the top-left corner. An expression
+        // animation bound to the visual's own size keeps the center correct from
+        // the very first frame (a SizeChanged handler would race the show
+        // animation and let the first pop scale from 0,0).
+        PinScaleCenter();
+
+        // Start hidden so the first Show() animates in from the configured pose.
+        Visibility = Visibility.Collapsed;
+    }
+
+    /// <summary>
+    /// Raised after <see cref="Hide"/> once the longest animation in
+    /// <see cref="HideAnimations"/> (delay + duration) has completed.
+    /// </summary>
+    public event EventHandler? HideCompleted;
+
+    /// <summary>
+    /// Gets or sets the transition played when the surface is shown without an
+    /// explicit one (see <see cref="Show()"/>). Defaults to
+    /// <see cref="Transition.None"/>, which plays no animation at all (the
+    /// surface appears instantly); a directional value adds a fade plus a slide
+    /// in from that edge, and <see cref="Transition.Pop"/> a fade plus a subtle
+    /// scale-up. Changing this regenerates the default <see cref="ShowAnimations"/>
+    /// unless it has been set explicitly.
+    /// </summary>
+    public Transition ShowTransition
+    {
+        get => (Transition)GetValue(ShowTransitionProperty);
+        set => SetValue(ShowTransitionProperty, value);
+    }
+
+    /// <summary>
+    /// Gets or sets the transition played when the surface is hidden (see
+    /// <see cref="Hide"/>). Defaults to <see cref="Transition.None"/>, which
+    /// plays no animation at all (the surface disappears instantly); a
+    /// directional value adds a fade plus a slide out toward that edge, and
+    /// <see cref="Transition.Pop"/> a fade plus a subtle scale-down. Changing
+    /// this regenerates the default <see cref="HideAnimations"/> unless it has
+    /// been set explicitly.
+    /// </summary>
+    public Transition HideTransition
+    {
+        get => (Transition)GetValue(HideTransitionProperty);
+        set => SetValue(HideTransitionProperty, value);
+    }
+
+    /// <summary>
+    /// Gets or sets the desktop acrylic material variant painted behind the
+    /// surface. Defaults to <see cref="DesktopAcrylicKind.Thin"/> (a lighter,
+    /// more translucent material); set <see cref="DesktopAcrylicKind.Default"/>
+    /// for the standard, more opaque acrylic or <see cref="DesktopAcrylicKind.Base"/>
+    /// for the base material. Has no effect when a custom template without the
+    /// default acrylic backdrop is applied.
+    /// </summary>
+    public DesktopAcrylicKind AcrylicKind
+    {
+        get => (DesktopAcrylicKind)GetValue(AcrylicKindProperty);
+        set => SetValue(AcrylicKindProperty, value);
+    }
+
+    /// <summary>
+    /// Gets or sets the animations played when <see cref="Show()"/> flips the
+    /// surface to <see cref="Visibility.Visible"/>. Defaults to the animation
+    /// derived from <see cref="ShowTransition"/>. Assigning a value marks the set
+    /// as custom so <see cref="ShowTransition"/> no longer overwrites it.
+    /// </summary>
+    public ImplicitAnimationSet ShowAnimations
+    {
+        get => _showAnimations;
+        set
+        {
+            _showAnimations = value ?? new ImplicitAnimationSet();
+            _hasCustomShowAnimations = true;
+        }
+    }
+
+    /// <summary>
+    /// Gets or sets the animations played when <see cref="Hide"/> flips the
+    /// surface to <see cref="Visibility.Collapsed"/>. Defaults to the animation
+    /// derived from <see cref="HideTransition"/>. Assigning a value marks the set
+    /// as custom so <see cref="HideTransition"/> no longer overwrites it.
+    /// </summary>
+    public ImplicitAnimationSet HideAnimations
+    {
+        get => _hideAnimations;
+        set
+        {
+            _hideAnimations = value ?? new ImplicitAnimationSet();
+            _hasCustomHideAnimations = true;
+        }
+    }
+
+    /// <summary>
+    /// Wires this surface to a hosting <see cref="TransparentWindow"/> so it
+    /// animates itself in and out in response to the window's
+    /// <see cref="TransparentWindow.Showing"/> / <see cref="TransparentWindow.Hiding"/>
+    /// events. Call this once after the surface has been set as (or placed within)
+    /// the window's content.
+    /// </summary>
+    /// <param name="host">The window whose show/hide transitions drive this surface.</param>
+    public void SubscribeTo(TransparentWindow host)
+    {
+        ArgumentNullException.ThrowIfNull(host);
+
+        host.Showing += OnHostShowing;
+        host.Hiding += OnHostHiding;
+    }
+
+    /// <summary>
+    /// Resets the surface to its hidden pose and flips it to
+    /// <see cref="Visibility.Visible"/> so <see cref="ShowAnimations"/> plays,
+    /// using <paramref name="transition"/> as the show transition.
+    /// </summary>
+    /// <param name="transition">The transition to play when showing.</param>
+    public void Show(Transition transition)
+    {
+        ShowTransition = transition;
+        Show();
+    }
+
+    /// <summary>
+    /// Resets the surface to its hidden pose and flips it to
+    /// <see cref="Visibility.Visible"/> so <see cref="ShowAnimations"/> plays.
+    /// Repeated calls re-trigger the show animation cleanly and cancel any
+    /// pending <see cref="HideCompleted"/> notification.
+    /// </summary>
+    public void Show()
+    {
+        _hideCompletedTimer.Stop();
+
+        // If a hide from a previous cycle is still in flight, abandon it: drop its
+        // pending HideCompleted handler so the outstanding deferral is never
+        // completed. We are showing again, so the host must keep the window
+        // visible instead of later hiding it for this interrupted cycle.
+        _abandonPendingHide?.Invoke();
+        _abandonPendingHide = null;
+
+        // Attach the show animation and detach any hide animation: when Show() is
+        // called while the surface is still visible, the Collapsed -> Visible
+        // restart below would otherwise play the hide animation (a fade/scale out)
+        // immediately before the show, producing a visible flash. The real hide
+        // animation is re-attached just-in-time in Hide().
+        Implicit.SetShowAnimations(this, _showAnimations);
+        Implicit.SetHideAnimations(this, _noAnimations);
+
+        // Reset to the hidden pose so the show animation always animates from the
+        // configured starting frame.
+        Visibility = Visibility.Collapsed;
+        Visibility = Visibility.Visible;
+    }
+
+    /// <summary>
+    /// Flips the surface to <see cref="Visibility.Collapsed"/> so
+    /// <see cref="HideAnimations"/> plays, then raises <see cref="HideCompleted"/>
+    /// once the longest animation in <see cref="HideAnimations"/> (delay +
+    /// duration) has completed.
+    /// </summary>
+    public void Hide()
+    {
+        // Attach the hide animation just before collapsing (Show() detaches it to
+        // avoid a flash when re-showing an already-visible surface).
+        Implicit.SetHideAnimations(this, _hideAnimations);
+
+        Visibility = Visibility.Collapsed;
+
+        _hideCompletedTimer.Debounce(
+            () => HideCompleted?.Invoke(this, EventArgs.Empty),
+            interval: GetAnimationSetTotalDuration(_hideAnimations),
+            immediate: false);
+    }
+
+    private static void OnTransitionChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        ((TransientSurface)d).RebuildDefaultAnimations();
+    }
+
+    private static TimeSpan GetAnimationSetTotalDuration(ImplicitAnimationSet set)
+    {
+        TimeSpan longest = TimeSpan.Zero;
+        foreach (var animation in set)
+        {
+            if (animation is Animation anim)
+            {
+                var total = (anim.Delay ?? TimeSpan.Zero) + (anim.Duration ?? TimeSpan.Zero);
+                if (total > longest)
+                {
+                    longest = total;
+                }
+            }
+        }
+
+        return longest;
+    }
+
+    private static (string? ShowFrom, string? HideTo) GetSlideOffsets(Transition transition) => transition switch
+    {
+        Transition.Bottom => ($"0,{SlideInOffset},{ShadowDepth}", $"0,{SlideOutOffset},{ShadowDepth}"),
+        Transition.Top => ($"0,{-SlideInOffset},{ShadowDepth}", $"0,{-SlideOutOffset},{ShadowDepth}"),
+        Transition.Left => ($"{-SlideInOffset},0,{ShadowDepth}", $"{-SlideOutOffset},0,{ShadowDepth}"),
+        Transition.Right => ($"{SlideInOffset},0,{ShadowDepth}", $"{SlideOutOffset},0,{ShadowDepth}"),
+        _ => (null, null),
+    };
+
+    private void OnHostShowing(TransparentWindow sender, ShowingEventArgs e)
+    {
+        if (e.Transition is Transition transition)
+        {
+            Show(transition);
+        }
+        else
+        {
+            Show();
+        }
+    }
+
+    private void OnHostHiding(TransparentWindow sender, HidingEventArgs e)
+    {
+        // Take a deferral so the host keeps its window visible until our
+        // out-animation has finished, then complete it from HideCompleted.
+        var deferral = e.GetDeferral();
+
+        void OnHideCompleted(object? s, EventArgs args)
+        {
+            HideCompleted -= OnHideCompleted;
+            _abandonPendingHide = null;
+            deferral.Complete();
+        }
+
+        // Let a subsequent Show() cancel this hide cleanly: unsubscribe the
+        // handler so the deferral is never completed (the window stays visible)
+        // rather than firing AppWindow.Hide for an interrupted cycle.
+        _abandonPendingHide = () => HideCompleted -= OnHideCompleted;
+
+        HideCompleted += OnHideCompleted;
+        Hide();
+    }
+
+    private void RebuildDefaultAnimations()
+    {
+        if (!_hasCustomShowAnimations)
+        {
+            _showAnimations = BuildShowAnimations(ShowTransition);
+        }
+
+        if (!_hasCustomHideAnimations)
+        {
+            _hideAnimations = BuildHideAnimations(HideTransition);
+        }
+    }
+
+    private void PinScaleCenter()
+    {
+        var visual = ElementCompositionPreview.GetElementVisual(this);
+        var center = visual.Compositor.CreateExpressionAnimation("Vector3(this.Target.Size.X * 0.5, this.Target.Size.Y * 0.5, 0)");
+        visual.StartAnimation("CenterPoint", center);
+    }
+
+    private static ImplicitAnimationSet BuildShowAnimations(Transition transition)
+    {
+        var animations = new ImplicitAnimationSet();
+
+        if (transition == Transition.None)
+        {
+            // No animation at all.
+            return animations;
+        }
+
+        if (transition == Transition.Pop)
+        {
+            animations.Add(new OpacityAnimation
+            {
+                From = 0,
+                To = 1.0,
+                Duration = TimeSpan.FromMilliseconds(PopFadeShowMs),
+                EasingMode = Microsoft.UI.Xaml.Media.Animation.EasingMode.EaseOut,
+                EasingType = EasingType.Cubic,
+            });
+
+            animations.Add(new ScaleAnimation
+            {
+                From = $"{PopScaleFrom},{PopScaleFrom},1",
+                To = "1,1,1",
+                Duration = TimeSpan.FromMilliseconds(PopScaleShowMs),
+                EasingMode = Microsoft.UI.Xaml.Media.Animation.EasingMode.EaseOut,
+                EasingType = EasingType.Cubic,
+            });
+
+            return animations;
+        }
+
+        var (slideFrom, _) = GetSlideOffsets(transition);
+
+        animations.Add(new OpacityAnimation
+        {
+            From = 0,
+            To = 1.0,
+            Duration = TimeSpan.FromMilliseconds(200),
+            EasingMode = Microsoft.UI.Xaml.Media.Animation.EasingMode.EaseOut,
+            EasingType = EasingType.Cubic,
+        });
+
+        animations.Add(new TranslationAnimation
+        {
+            From = slideFrom,
+            To = $"0,0,{ShadowDepth}",
+            Duration = TimeSpan.FromMilliseconds(250),
+            EasingMode = Microsoft.UI.Xaml.Media.Animation.EasingMode.EaseOut,
+            EasingType = EasingType.Cubic,
+        });
+
+        return animations;
+    }
+
+    private static ImplicitAnimationSet BuildHideAnimations(Transition transition)
+    {
+        var animations = new ImplicitAnimationSet();
+
+        if (transition == Transition.None)
+        {
+            // No animation at all.
+            return animations;
+        }
+
+        if (transition == Transition.Pop)
+        {
+            animations.Add(new OpacityAnimation
+            {
+                From = 1.0,
+                To = 0,
+                Duration = TimeSpan.FromMilliseconds(PopFadeHideMs),
+                EasingMode = Microsoft.UI.Xaml.Media.Animation.EasingMode.EaseIn,
+                EasingType = EasingType.Cubic,
+            });
+
+            animations.Add(new ScaleAnimation
+            {
+                From = "1,1,1",
+                To = $"{PopScaleFrom},{PopScaleFrom},1",
+                Duration = TimeSpan.FromMilliseconds(PopScaleHideMs),
+                EasingMode = Microsoft.UI.Xaml.Media.Animation.EasingMode.EaseIn,
+                EasingType = EasingType.Cubic,
+            });
+
+            return animations;
+        }
+
+        var (_, slideTo) = GetSlideOffsets(transition);
+
+        animations.Add(new OpacityAnimation
+        {
+            From = 1.0,
+            To = 0,
+            Duration = TimeSpan.FromMilliseconds(180),
+            EasingMode = Microsoft.UI.Xaml.Media.Animation.EasingMode.EaseIn,
+            EasingType = EasingType.Cubic,
+        });
+
+        animations.Add(new TranslationAnimation
+        {
+            From = $"0,0,{ShadowDepth}",
+            To = slideTo,
+            Duration = TimeSpan.FromMilliseconds(180),
+            EasingMode = Microsoft.UI.Xaml.Media.Animation.EasingMode.EaseIn,
+            EasingType = EasingType.Cubic,
+        });
+
+        return animations;
+    }
+}

src/common/Common.UI.Controls/Controls/TransientSurface/Transition.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.
+
+namespace Microsoft.PowerToys.Common.UI.Controls;
+
+/// <summary>
+/// A show or hide transition a surface (e.g. <see cref="TransientSurface"/>)
+/// plays when it is shown or hidden. The directional values describe an edge —
+/// interpreted as <em>in from</em> that edge on show and <em>out toward</em> it
+/// on hide — while <see cref="None"/> and <see cref="Pop"/> are non-directional.
+/// </summary>
+public enum Transition
+{
+    /// <summary>No animation; the surface appears and disappears instantly.</summary>
+    None,
+
+    /// <summary>Slide from the left edge (in from on show, out toward on hide).</summary>
+    Left,
+
+    /// <summary>Slide from the top edge (in from on show, out toward on hide).</summary>
+    Top,
+
+    /// <summary>Slide from the right edge (in from on show, out toward on hide).</summary>
+    Right,
+
+    /// <summary>Slide from the bottom edge (in from on show, out toward on hide).</summary>
+    Bottom,
+
+    /// <summary>
+    /// A subtle "pop": a quick fade combined with a small scale between 96% and
+    /// 100% from the surface's center. Stays in place — no slide.
+    /// </summary>
+    Pop,
+}

src/common/Common.UI.Controls/Controls/TransparentCard/TransparentCard.cs

@@ -1,27 +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 Microsoft.UI.Xaml.Controls;
-
-namespace Microsoft.PowerToys.Common.UI.Controls;
-
-/// <summary>
-/// A floating "card" surface for transient PowerToys overlays (toasts,
-/// banners, indicators). Provides the PowerToys-standard chrome — 1 px
-/// border in <c>SurfaceStrokeColorDefaultBrush</c>, 8 px corner radius,
-/// a <c>ThemeShadow</c>, and an always-active desktop acrylic backdrop —
-/// via a default <see cref="Microsoft.UI.Xaml.Controls.ControlTemplate"/>.
-/// </summary>
-/// <remarks>
-/// Lives inside a <see cref="Window.TransparentWindow"/>. Apps that want a
-/// different look supply their own <c>Style TargetType="TransparentCard"</c>
-/// in resources — the standard WinUI restyle path.
-/// </remarks>
-public sealed partial class TransparentCard : ContentControl
-{
-    public TransparentCard()
-    {
-        DefaultStyleKey = typeof(TransparentCard);
-    }
-}

src/common/Common.UI.Controls/Themes/Generic.xaml

@@ -4,6 +4,6 @@
         <ResourceDictionary Source="ms-appx:///PowerToys.Common.UI.Controls/Controls/KeyVisual/KeyCharPresenter.xaml" />
         <ResourceDictionary Source="ms-appx:///PowerToys.Common.UI.Controls/Controls/IsEnabledTextBlock/IsEnabledTextBlock.xaml" />
         <ResourceDictionary Source="ms-appx:///PowerToys.Common.UI.Controls/Controls/ShortcutWithTextLabelControl/ShortcutWithTextLabelControl.xaml" />
-        <ResourceDictionary Source="ms-appx:///PowerToys.Common.UI.Controls/Controls/TransparentCard/TransparentCard.xaml" />
+        <ResourceDictionary Source="ms-appx:///PowerToys.Common.UI.Controls/Controls/TransientSurface/TransientSurface.xaml" />
     </ResourceDictionary.MergedDictionaries>
 </ResourceDictionary>

src/common/Common.UI.Controls/Window/FlyoutWindowHelper.cs

@@ -9,7 +9,7 @@ using Microsoft.UI.Windowing;
 using Windows.Graphics;
 using WinUIEx;
 
-namespace Microsoft.PowerToys.Common.UI.Controls.Flyout;
+namespace Microsoft.PowerToys.Common.UI.Controls.Window;
 
 /// <summary>
 /// Shared helper for positioning and sizing flyout-style WinUI 3 windows
@@ -187,16 +187,13 @@ public static partial class FlyoutWindowHelper
     }
 
     /// <summary>
-    /// Two-step move that avoids WM_DPICHANGED double-scaling. First teleports a 1×1
-    /// window into the target display (which may trigger an auto-rescale, but on a 1×1
-    /// rect the effect is invisible). Then sets the real position+size while the window
-    /// is already on the target monitor — no DPI boundary crossing, so WinUI's auto
-    /// handler doesn't fire and overwrite our computed rect.
-    ///
-    /// Skips the teleport when the window is already on the target display, since there
-    /// is no boundary to cross.
+    /// Move and resize <paramref name="window"/> to <paramref name="finalRect"/> (absolute
+    /// screen physical-pixel coordinates) on <paramref name="targetDisplay"/>. Performs a
+    /// two-step move that avoids WM_DPICHANGED double-scaling: first a 1×1 teleport into the
+    /// target display (invisible at that size), then the real position+size while the window
+    /// is already on that monitor. Skips the teleport when already on the target display.
     /// </summary>
-    private static void MoveAndResizeOnDisplay(WindowEx window, DisplayArea targetDisplay, RectInt32 finalRect)
+    public static void MoveAndResizeOnDisplay(WindowEx window, DisplayArea targetDisplay, RectInt32 finalRect)
     {
         var currentDisplay = DisplayArea.GetFromWindowId(window.AppWindow.Id, DisplayAreaFallback.Nearest);
         bool needsTeleport = currentDisplay is null || currentDisplay.DisplayId.Value != targetDisplay.DisplayId.Value;

src/common/Common.UI.Controls/Window/TransparentWindow.cs

@@ -1,290 +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.Runtime.InteropServices;
-using CommunityToolkit.WinUI;
-using CommunityToolkit.WinUI.Animations;
-using Microsoft.UI.Dispatching;
-using Microsoft.UI.Windowing;
-using Microsoft.UI.Xaml;
-using Microsoft.UI.Xaml.Markup;
-using WinUIEx;
-
-namespace Microsoft.PowerToys.Common.UI.Controls.Window;
-
-/// <summary>
-/// Reusable transparent host window for transient overlays
-/// (toasts, banners, indicators) that should not steal foreground.
-/// </summary>
-/// <remarks>
-/// <para>The constructor applies all of the boilerplate that PowerToys overlays
-/// currently hand-roll:</para>
-/// <list type="bullet">
-///   <item>Strip the native frame and caption (<c>WS_THICKFRAME</c> etc.).</item>
-///   <item>Disable the Win11 1-pixel DWM border and corner rounding.</item>
-///   <item>Mark the window as a tool window so it stays out of the taskbar and Alt-Tab.</item>
-///   <item>Extend content into the title bar and collapse the title bar.</item>
-/// </list>
-/// <para>The visible chrome (acrylic + border + corner radius + shadow) lives
-/// in a <see cref="TransparentCard"/> that the constructor assigns to
-/// <see cref="Microsoft.UI.Xaml.Window.Content"/>. Consumers supply their own
-/// UI via <see cref="InnerContent"/> — which is the XAML default-content slot
-/// thanks to <see cref="ContentPropertyAttribute"/> — so a derived window can
-/// be written as <c>&lt;common:TransparentWindow&gt;&lt;TextBlock/&gt;&lt;/common:TransparentWindow&gt;</c>.</para>
-/// <para>Transparency is achieved with a <see cref="TransparentTintBackdrop"/>
-/// system backdrop so the area outside the <see cref="TransparentCard"/> is
-/// fully see-through. That buffer area is NOT click-through, so consumers
-/// should keep it as small as possible (just enough to give the card's
-/// shadow + slide animation room to breathe — roughly 24 px on each side).</para>
-/// <para><see cref="Show"/> and <see cref="Hide"/> coordinate <c>SW_SHOWNA</c>
-/// (no-activate), the <see cref="Microsoft.UI.Xaml.UIElement.Visibility"/>
-/// toggle on the card, and a debounced
-/// <see cref="Microsoft.UI.Windowing.AppWindow.Hide"/> sized from the longest
-/// animation in <see cref="HideAnimations"/>. Animations target the card so
-/// the entire surface (border, acrylic, shadow, inner content) slides as one.</para>
-/// </remarks>
-[ContentProperty(Name = nameof(InnerContent))]
-public partial class TransparentWindow : WinUIEx.WindowEx
-{
-    private const uint DwmwaColorNone = 0xFFFFFFFE;
-    private const int DwmwaWindowCornerPreference = 33;
-    private const int DwmwaBorderColor = 34;
-    private const int DwmwcpDoNotRound = 1;
-
-    private const int GwlExStyle = -20;
-    private const int WsExToolWindow = 0x00000080;
-
-    private const int SwShowNa = 8;
-
-    private readonly DispatcherQueueTimer _hideCloseTimer = DispatcherQueue.GetForCurrentThread().CreateTimer();
-    private readonly nint _hwnd;
-    private readonly TransparentCard _card;
-
-    private ImplicitAnimationSet _showAnimations;
-    private ImplicitAnimationSet _hideAnimations;
-
-    public TransparentWindow()
-    {
-        AppWindow.Hide();
-        ExtendsContentIntoTitleBar = true;
-        AppWindow.TitleBar.PreferredHeightOption = TitleBarHeightOption.Collapsed;
-
-        _hwnd = WinRT.Interop.WindowNative.GetWindowHandle(this);
-
-        HwndExtensions.ToggleWindowStyle(_hwnd, false, WindowStyle.TiledWindow);
-
-        unsafe
-        {
-            uint borderColor = DwmwaColorNone;
-            _ = DwmSetWindowAttribute(_hwnd, DwmwaBorderColor, &borderColor, sizeof(uint));
-
-            int cornerPref = DwmwcpDoNotRound;
-            _ = DwmSetWindowAttribute(_hwnd, DwmwaWindowCornerPreference, &cornerPref, sizeof(int));
-        }
-
-        ApplyExStyleBit(WsExToolWindow, true);
-
-        _showAnimations = BuildDefaultShowAnimations();
-        _hideAnimations = BuildDefaultHideAnimations();
-
-        _card = new TransparentCard();
-        Content = _card;
-
-        SystemBackdrop = new TransparentTintBackdrop();
-    }
-
-    /// <summary>
-    /// Gets the <see cref="TransparentCard"/> that provides the window's
-    /// visible chrome (acrylic + border + shadow). Consumers can configure
-    /// its layout (e.g. <c>HorizontalAlignment</c>, <c>VerticalAlignment</c>,
-    /// <c>MaxWidth</c>, <c>Margin</c>) to position the card inside the
-    /// window, or apply a custom <c>Style</c> to change its look.
-    /// </summary>
-    public TransparentCard Card => _card;
-
-    /// <summary>
-    /// Gets or sets the visual hosted inside the window's
-    /// <see cref="TransparentCard"/>. This is the XAML default-content slot:
-    /// child elements declared between the opening and closing
-    /// <c>TransparentWindow</c> tags in a derived .xaml are routed here.
-    /// </summary>
-    public object? InnerContent
-    {
-        get => _card.Content;
-        set => _card.Content = value;
-    }
-
-    /// <summary>
-    /// Gets or sets the animations played against
-    /// <see cref="Microsoft.UI.Xaml.Window.Content"/> when <see cref="Show"/>
-    /// flips it to <see cref="Visibility.Visible"/>. Defaults to a 200 ms
-    /// fade-in plus a 250 ms slide-up of 24 px.
-    /// </summary>
-    public ImplicitAnimationSet ShowAnimations
-    {
-        get => _showAnimations;
-        set => _showAnimations = value ?? new ImplicitAnimationSet();
-    }
-
-    /// <summary>
-    /// Gets or sets the animations played against
-    /// <see cref="Microsoft.UI.Xaml.Window.Content"/> when <see cref="Hide"/>
-    /// flips it to <see cref="Visibility.Collapsed"/>. Defaults to a 180 ms
-    /// fade-out plus a 180 ms slide-down of 12 px.
-    /// </summary>
-    public ImplicitAnimationSet HideAnimations
-    {
-        get => _hideAnimations;
-        set => _hideAnimations = value ?? new ImplicitAnimationSet();
-    }
-
-    /// <summary>
-    /// Shows the window without activation (<c>SW_SHOWNA</c>) and flips
-    /// <see cref="Microsoft.UI.Xaml.Window.Content"/> to
-    /// <see cref="Visibility.Visible"/> so <see cref="ShowAnimations"/> plays.
-    /// Repeated calls reset the content to its hidden pose first so the show
-    /// animation re-triggers cleanly. Any pending hide is cancelled.
-    /// </summary>
-    public void Show()
-    {
-        DispatcherQueue.TryEnqueue(
-            DispatcherQueuePriority.Low,
-            () =>
-            {
-                _hideCloseTimer.Stop();
-
-                if (Content is UIElement content)
-                {
-                    // Re-apply each call so swapping animation collections at
-                    // runtime takes effect on the next show/hide cycle.
-                    Implicit.SetShowAnimations(content, _showAnimations);
-                    Implicit.SetHideAnimations(content, _hideAnimations);
-
-                    // Reset to the hidden pose so the show animation always
-                    // animates from the configured starting frame.
-                    content.Visibility = Visibility.Collapsed;
-                }
-
-                _ = ShowWindow(_hwnd, SwShowNa);
-
-                if (Content is UIElement c2)
-                {
-                    c2.Visibility = Visibility.Visible;
-                }
-            });
-    }
-
-    /// <summary>
-    /// Flips <see cref="Microsoft.UI.Xaml.Window.Content"/> to
-    /// <see cref="Visibility.Collapsed"/> so <see cref="HideAnimations"/>
-    /// plays, then hides the underlying
-    /// <see cref="Microsoft.UI.Windowing.AppWindow"/> once the longest
-    /// animation in <see cref="HideAnimations"/> (delay + duration) has
-    /// completed.
-    /// </summary>
-    public void Hide()
-    {
-        DispatcherQueue.TryEnqueue(
-            DispatcherQueuePriority.Low,
-            () =>
-            {
-                if (Content is UIElement content)
-                {
-                    content.Visibility = Visibility.Collapsed;
-                }
-
-                _hideCloseTimer.Debounce(
-                    AppWindow.Hide,
-                    interval: GetAnimationSetTotalDuration(_hideAnimations),
-                    immediate: false);
-            });
-    }
-
-    private static TimeSpan GetAnimationSetTotalDuration(ImplicitAnimationSet set)
-    {
-        TimeSpan longest = TimeSpan.Zero;
-        foreach (var animation in set)
-        {
-            if (animation is Animation anim)
-            {
-                var total = (anim.Delay ?? TimeSpan.Zero) + (anim.Duration ?? TimeSpan.Zero);
-                if (total > longest)
-                {
-                    longest = total;
-                }
-            }
-        }
-
-        return longest;
-    }
-
-    private void ApplyExStyleBit(int bit, bool set)
-    {
-        if (_hwnd == 0)
-        {
-            return;
-        }
-
-        nint exStyle = GetWindowLongPtr(_hwnd, GwlExStyle);
-        nint updated = set ? exStyle | bit : exStyle & ~(nint)bit;
-        if (updated != exStyle)
-        {
-            _ = SetWindowLongPtr(_hwnd, GwlExStyle, updated);
-        }
-    }
-
-    private static ImplicitAnimationSet BuildDefaultShowAnimations() => new()
-    {
-        new OpacityAnimation
-        {
-            From = 0,
-            To = 1.0,
-            Duration = TimeSpan.FromMilliseconds(200),
-            EasingMode = Microsoft.UI.Xaml.Media.Animation.EasingMode.EaseOut,
-            EasingType = EasingType.Cubic,
-        },
-        new TranslationAnimation
-        {
-            From = "0,24,32",
-            To = "0,0,32",
-            Duration = TimeSpan.FromMilliseconds(250),
-            EasingMode = Microsoft.UI.Xaml.Media.Animation.EasingMode.EaseOut,
-            EasingType = EasingType.Cubic,
-        },
-    };
-
-    private static ImplicitAnimationSet BuildDefaultHideAnimations() => new()
-    {
-        new OpacityAnimation
-        {
-            From = 1.0,
-            To = 0,
-            Duration = TimeSpan.FromMilliseconds(180),
-            EasingMode = Microsoft.UI.Xaml.Media.Animation.EasingMode.EaseIn,
-            EasingType = EasingType.Cubic,
-        },
-        new TranslationAnimation
-        {
-            From = "0,0,32",
-            To = "0,12,32",
-            Duration = TimeSpan.FromMilliseconds(180),
-            EasingMode = Microsoft.UI.Xaml.Media.Animation.EasingMode.EaseIn,
-            EasingType = EasingType.Cubic,
-        },
-    };
-
-    [LibraryImport("user32.dll", EntryPoint = "GetWindowLongPtrW")]
-    private static partial nint GetWindowLongPtr(nint hWnd, int nIndex);
-
-    [LibraryImport("user32.dll", EntryPoint = "SetWindowLongPtrW")]
-    private static partial nint SetWindowLongPtr(nint hWnd, int nIndex, nint dwNewLong);
-
-    [LibraryImport("user32.dll")]
-    [return: MarshalAs(UnmanagedType.Bool)]
-    private static partial bool ShowWindow(nint hWnd, int nCmdShow);
-
-    [LibraryImport("dwmapi.dll")]
-    private static unsafe partial int DwmSetWindowAttribute(nint hwnd, int dwAttribute, void* pvAttribute, int cbAttribute);
-}

src/common/Common.UI.Controls/Window/TransparentWindow/HidingEventArgs.cs

@@ -0,0 +1,61 @@
+// 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.Threading;
+using Deferral = global::Windows.Foundation.Deferral;
+
+namespace Microsoft.PowerToys.Common.UI.Controls.Window;
+
+/// <summary>
+/// Data for <see cref="TransparentWindow.Hiding"/>. Supports deferrals so an
+/// animated surface can keep the window visible until its out-animation has
+/// finished. If no handler takes a deferral, the window hides immediately.
+/// </summary>
+public sealed class HidingEventArgs : EventArgs
+{
+    private int _outstanding;
+    private bool _raised;
+    private Action? _continuation;
+
+    /// <summary>
+    /// Requests that the window stay visible until the returned deferral is
+    /// completed. Call <see cref="Deferral.Complete"/> once the out-animation
+    /// has finished.
+    /// </summary>
+    /// <returns>A deferral that must be completed to allow the window to hide.</returns>
+    public Deferral GetDeferral()
+    {
+        Interlocked.Increment(ref _outstanding);
+        return new Deferral(OnDeferralCompleted);
+    }
+
+    /// <summary>
+    /// Called by the window after raising the event to register what should run
+    /// once every outstanding deferral has completed (or immediately if none
+    /// were taken).
+    /// </summary>
+    internal void RunWhenComplete(Action continuation)
+    {
+        _continuation = continuation;
+        _raised = true;
+        TryComplete();
+    }
+
+    private void OnDeferralCompleted()
+    {
+        Interlocked.Decrement(ref _outstanding);
+        TryComplete();
+    }
+
+    private void TryComplete()
+    {
+        if (_raised && Volatile.Read(ref _outstanding) == 0)
+        {
+            var continuation = _continuation;
+            _continuation = null;
+            continuation?.Invoke();
+        }
+    }
+}

src/common/Common.UI.Controls/Window/TransparentWindow/ShowingEventArgs.cs

@@ -0,0 +1,26 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+
+namespace Microsoft.PowerToys.Common.UI.Controls.Window;
+
+/// <summary>
+/// Data for <see cref="TransparentWindow.Showing"/>. Carries the transition the
+/// content should play, or <see langword="null"/> to let the content use its own
+/// configured show transition.
+/// </summary>
+public sealed class ShowingEventArgs : EventArgs
+{
+    public ShowingEventArgs(Transition? transition)
+    {
+        Transition = transition;
+    }
+
+    /// <summary>
+    /// Gets the transition the content should play, or <see langword="null"/> to
+    /// use the content's own configured show transition.
+    /// </summary>
+    public Transition? Transition { get; }
+}

src/common/Common.UI.Controls/Window/TransparentWindow/TransparentWindow.cs

@@ -0,0 +1,164 @@
+// 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.Runtime.InteropServices;
+using Microsoft.UI.Dispatching;
+using Microsoft.UI.Windowing;
+using Windows.Foundation;
+using WinUIEx;
+
+namespace Microsoft.PowerToys.Common.UI.Controls.Window;
+
+/// <summary>
+/// Reusable transparent host window for transient overlays
+/// (toasts, banners, indicators) that should not steal foreground.
+/// </summary>
+/// <remarks>
+/// <para>The constructor applies all of the boilerplate that PowerToys overlays
+/// currently hand-roll:</para>
+/// <list type="bullet">
+///   <item>Strip the native frame and caption (<c>WS_THICKFRAME</c> etc.).</item>
+///   <item>Disable the Win11 1-pixel DWM border and corner rounding.</item>
+///   <item>Mark the window as a tool window so it stays out of the taskbar and Alt-Tab.</item>
+///   <item>Extend content into the title bar and collapse the title bar.</item>
+///   <item>Apply a <see cref="TransparentTintBackdrop"/> so the HWND is fully
+///   see-through and the visible chrome can be drawn by the content.</item>
+/// </list>
+/// <para>This window is intentionally animation-agnostic: it does not own any
+/// chrome or motion. Consumers supply their own content (typically a
+/// <see cref="TransientSurface"/>) which draws the acrylic, border, corners and
+/// shadow, and animates itself. <see cref="Show()"/> and <see cref="Hide"/>
+/// coordinate <c>SW_SHOWNA</c> (no-activate) with the
+/// <see cref="Showing"/> / <see cref="Hiding"/> events: a content surface
+/// subscribes to those (e.g. via <see cref="TransientSurface.SubscribeTo"/>)
+/// and plays its in/out animation. The <see cref="Hiding"/> event supports
+/// deferrals, so the underlying
+/// <see cref="Microsoft.UI.Windowing.AppWindow.Hide"/> is delayed until the
+/// content has finished animating out. With no listener the window simply shows
+/// or hides immediately.</para>
+/// </remarks>
+public partial class TransparentWindow : WinUIEx.WindowEx
+{
+    private const uint DwmwaColorNone = 0xFFFFFFFE;
+    private const int DwmwaWindowCornerPreference = 33;
+    private const int DwmwaBorderColor = 34;
+    private const int DwmwcpDoNotRound = 1;
+
+    private const int GwlExStyle = -20;
+    private const int WsExToolWindow = 0x00000080;
+
+    private const int SwShowNa = 8;
+
+    private readonly nint _hwnd;
+
+    public TransparentWindow()
+    {
+        AppWindow.Hide();
+        ExtendsContentIntoTitleBar = true;
+        AppWindow.TitleBar.PreferredHeightOption = TitleBarHeightOption.Collapsed;
+
+        _hwnd = WinRT.Interop.WindowNative.GetWindowHandle(this);
+
+        HwndExtensions.ToggleWindowStyle(_hwnd, false, WindowStyle.TiledWindow);
+
+        unsafe
+        {
+            uint borderColor = DwmwaColorNone;
+            _ = DwmSetWindowAttribute(_hwnd, DwmwaBorderColor, &borderColor, sizeof(uint));
+
+            int cornerPref = DwmwcpDoNotRound;
+            _ = DwmSetWindowAttribute(_hwnd, DwmwaWindowCornerPreference, &cornerPref, sizeof(int));
+        }
+
+        ApplyExStyleBit(WsExToolWindow, true);
+
+        SystemBackdrop = new TransparentTintBackdrop();
+    }
+
+    /// <summary>
+    /// Raised (without activation) when <see cref="Show()"/> makes the window
+    /// visible. A content surface subscribes to this to play its in-animation,
+    /// using <see cref="ShowingEventArgs.Transition"/>.
+    /// </summary>
+    public event TypedEventHandler<TransparentWindow, ShowingEventArgs>? Showing;
+
+    /// <summary>
+    /// Raised when <see cref="Hide"/> begins dismissing the window. A content
+    /// surface subscribes to this to play its out-animation, taking a deferral
+    /// (<see cref="HidingEventArgs.GetDeferral"/>) so the underlying window stays
+    /// visible until the animation completes.
+    /// </summary>
+    public event TypedEventHandler<TransparentWindow, HidingEventArgs>? Hiding;
+
+    /// <summary>
+    /// Shows the window without activation (<c>SW_SHOWNA</c>) and raises
+    /// <see cref="Showing"/> without a transition, so subscribed content animates
+    /// in using its own configured show transition.
+    /// </summary>
+    public void Show() => RaiseShow(null);
+
+    /// <summary>
+    /// Shows the window without activation (<c>SW_SHOWNA</c>) and raises
+    /// <see cref="Showing"/> so subscribed content animates in using
+    /// <paramref name="transition"/>, overriding its configured show transition.
+    /// </summary>
+    /// <param name="transition">The transition the content should play.</param>
+    public void Show(Transition transition) => RaiseShow(transition);
+
+    private void RaiseShow(Transition? transition)
+    {
+        DispatcherQueue.TryEnqueue(
+            DispatcherQueuePriority.Low,
+            () =>
+            {
+                _ = ShowWindow(_hwnd, SwShowNa);
+                Showing?.Invoke(this, new ShowingEventArgs(transition));
+            });
+    }
+
+    /// <summary>
+    /// Raises <see cref="Hiding"/> so subscribed content animates out, then hides
+    /// the underlying <see cref="Microsoft.UI.Windowing.AppWindow"/> once every
+    /// deferral taken by a handler has completed (immediately if none were taken).
+    /// </summary>
+    public void Hide()
+    {
+        DispatcherQueue.TryEnqueue(
+            DispatcherQueuePriority.Low,
+            () =>
+            {
+                var args = new HidingEventArgs();
+                Hiding?.Invoke(this, args);
+                args.RunWhenComplete(AppWindow.Hide);
+            });
+    }
+
+    private void ApplyExStyleBit(int bit, bool set)
+    {
+        if (_hwnd == 0)
+        {
+            return;
+        }
+
+        nint exStyle = GetWindowLongPtr(_hwnd, GwlExStyle);
+        nint updated = set ? exStyle | bit : exStyle & ~(nint)bit;
+        if (updated != exStyle)
+        {
+            _ = SetWindowLongPtr(_hwnd, GwlExStyle, updated);
+        }
+    }
+
+    [LibraryImport("user32.dll", EntryPoint = "GetWindowLongPtrW")]
+    private static partial nint GetWindowLongPtr(nint hWnd, int nIndex);
+
+    [LibraryImport("user32.dll", EntryPoint = "SetWindowLongPtrW")]
+    private static partial nint SetWindowLongPtr(nint hWnd, int nIndex, nint dwNewLong);
+
+    [LibraryImport("user32.dll")]
+    [return: MarshalAs(UnmanagedType.Bool)]
+    private static partial bool ShowWindow(nint hWnd, int nCmdShow);
+
+    [LibraryImport("dwmapi.dll")]
+    private static unsafe partial int DwmSetWindowAttribute(nint hwnd, int dwAttribute, void* pvAttribute, int cbAttribute);
+}

src/common/ManagedCommon/ModuleType.cs

@@ -38,7 +38,6 @@ namespace ManagedCommon
         Workspaces,
         GrabAndMove,
         ZoomIt,
-        PowerScripts,
         GeneralSettings,
     }
 }

src/modules/MouseUtils/MouseHighlighter/MouseHighlighter.cpp

@@ -6,6 +6,8 @@
 #include "trace.h"
 #include <cmath>
 #include <algorithm>
+#include <memory>
+#include <vector>
 
 #ifdef COMPOSITION
 namespace winrt
@@ -48,6 +50,18 @@ private:
     void ClearDrawingPoint();
     void ClearDrawing();
     void BringToFront();
+    // Ripple mode: spawn the press/hold ring + glow at the click point and
+    // continue the animation into a fade-out on release. The held ring may
+    // optionally follow the cursor while held (gated by m_rippleShowDragTrail).
+    void SpawnRippleHoldDot(MouseButton button);
+    void FadeRippleHoldDot(MouseButton button);
+    // Ripple mode: emit a single self-contained ripple (grow + fade) for a quick
+    // click, independent of any held indicator.
+    void EmitSingleRipple(MouseButton button);
+    // Spotlight mode: pressed-state animation that shrinks the mask while
+    // a mouse button is held and restores it on release.
+    void SpotlightAnimatePress();
+    void SpotlightAnimateRelease();
     HHOOK m_mouseHook = NULL;
     static LRESULT CALLBACK MouseHookProc(int nCode, WPARAM wParam, LPARAM lParam) noexcept;
     // Helpers for spotlight overlay
@@ -71,6 +85,16 @@ private:
     winrt::CompositionSpriteShape m_leftPointer{ nullptr };
     winrt::CompositionSpriteShape m_rightPointer{ nullptr };
     winrt::CompositionSpriteShape m_alwaysPointer{ nullptr };
+    // Ellipse geometries kept alongside the pointer shapes so press-down /
+    // release animations can target the radius directly.
+    winrt::CompositionEllipseGeometry m_leftGeometry{ nullptr };
+    winrt::CompositionEllipseGeometry m_rightGeometry{ nullptr };
+    // Ripple-mode held glow (the soft halo behind the ring) — paired with
+    // m_left/rightPointer (which holds the ring shape) while a button is held.
+    winrt::CompositionSpriteShape m_leftRippleGlow{ nullptr };
+    winrt::CompositionSpriteShape m_rightRippleGlow{ nullptr };
+    winrt::CompositionEllipseGeometry m_leftGlowGeometry{ nullptr };
+    winrt::CompositionEllipseGeometry m_rightGlowGeometry{ nullptr };
     // Spotlight overlay (mask with soft feathered edge)
     winrt::SpriteVisual m_overlay{ nullptr };
     winrt::CompositionMaskBrush m_spotlightMask{ nullptr };
@@ -84,9 +108,22 @@ private:
     bool m_rightPointerEnabled = true;
     bool m_alwaysPointerEnabled = true;
     bool m_spotlightMode = false;
+    bool m_spotlightPressed = false;
+    bool m_rippleMode = true;
+    bool m_rippleShowDragTrail = MOUSE_HIGHLIGHTER_DEFAULT_RIPPLE_SHOW_DRAG_TRAIL;
+    bool m_rippleShowReleasePulse = MOUSE_HIGHLIGHTER_DEFAULT_RIPPLE_SHOW_RELEASE_PULSE;
+    float m_rippleSize = static_cast<float>(MOUSE_HIGHLIGHTER_DEFAULT_RIPPLE_SIZE);
+    float m_rippleIntensity = static_cast<float>(MOUSE_HIGHLIGHTER_DEFAULT_RIPPLE_INTENSITY);
+    int m_rippleDurationMs = MOUSE_HIGHLIGHTER_DEFAULT_RIPPLE_DURATION_MS;
 
     bool m_leftButtonPressed = false;
     bool m_rightButtonPressed = false;
+    // Pending hold-detection timers. A ripple "held indicator" is only spawned
+    // once the button has been held past a short threshold; a quick click that
+    // releases before then emits a single self-contained ripple instead. This
+    // prevents a single click from rendering two ripples (press + release).
+    UINT_PTR m_leftHoldTimer = 0;
+    UINT_PTR m_rightHoldTimer = 0;
     UINT_PTR m_timer_id = 0;
 
     bool m_visible = false;
@@ -102,6 +139,11 @@ private:
     winrt::Windows::UI::Color m_alwaysColor = MOUSE_HIGHLIGHTER_DEFAULT_ALWAYS_COLOR;
 };
 static const uint32_t BRING_TO_FRONT_TIMER_ID = 123;
+static const uint32_t HOLD_RIPPLE_TIMER_LEFT = 124;
+static const uint32_t HOLD_RIPPLE_TIMER_RIGHT = 125;
+// How long a ripple button must be held before the persistent "held indicator"
+// is shown. Releasing before this is treated as a quick click (single ripple).
+static const uint32_t HOLD_RIPPLE_THRESHOLD_MS = 180;
 Highlighter* Highlighter::instance = nullptr;
 
 bool Highlighter::CreateHighlighter()
@@ -194,11 +236,34 @@ void Highlighter::AddDrawingPoint(MouseButton button)
     {
         circleShape.FillBrush(m_compositor.CreateColorBrush(m_leftClickColor));
         m_leftPointer = circleShape;
+        m_leftGeometry = circleGeometry;
+
+        // Niels-style press-down shrink: holding the button squeezes the
+        // circle to 70% over 180ms after a 150ms delay so quick clicks skip
+        // it. StartDrawingPointFading stops this animation on release.
+        const float pressedRadius = m_radius * 0.70f;
+        auto ease = m_compositor.CreateCubicBezierEasingFunction({ 0.2f, 0.0f }, { 0.4f, 1.0f });
+        auto anim = m_compositor.CreateVector2KeyFrameAnimation();
+        anim.InsertKeyFrame(0.0f, { m_radius, m_radius });
+        anim.InsertKeyFrame(1.0f, { pressedRadius, pressedRadius }, ease);
+        anim.Duration(std::chrono::milliseconds(180));
+        anim.DelayTime(std::chrono::milliseconds(150));
+        circleGeometry.StartAnimation(L"Radius", anim);
     }
     else if (button == MouseButton::Right)
     {
         circleShape.FillBrush(m_compositor.CreateColorBrush(m_rightClickColor));
         m_rightPointer = circleShape;
+        m_rightGeometry = circleGeometry;
+
+        const float pressedRadius = m_radius * 0.70f;
+        auto ease = m_compositor.CreateCubicBezierEasingFunction({ 0.2f, 0.0f }, { 0.4f, 1.0f });
+        auto anim = m_compositor.CreateVector2KeyFrameAnimation();
+        anim.InsertKeyFrame(0.0f, { m_radius, m_radius });
+        anim.InsertKeyFrame(1.0f, { pressedRadius, pressedRadius }, ease);
+        anim.Duration(std::chrono::milliseconds(180));
+        anim.DelayTime(std::chrono::milliseconds(150));
+        circleGeometry.StartAnimation(L"Radius", anim);
     }
     else
     {
@@ -238,17 +303,36 @@ void Highlighter::UpdateDrawingPointPosition(MouseButton button)
     if (button == MouseButton::Left)
     {
         m_leftPointer.Offset({ static_cast<float>(pt.x), static_cast<float>(pt.y) });
+        if (m_leftRippleGlow)
+        {
+            m_leftRippleGlow.Offset({ static_cast<float>(pt.x), static_cast<float>(pt.y) });
+        }
     }
     else if (button == MouseButton::Right)
     {
         m_rightPointer.Offset({ static_cast<float>(pt.x), static_cast<float>(pt.y) });
+        if (m_rightRippleGlow)
+        {
+            m_rightRippleGlow.Offset({ static_cast<float>(pt.x), static_cast<float>(pt.y) });
+        }
     }
     else
     {
         // always / spotlight idle
         if (m_spotlightMode)
         {
-            UpdateSpotlightMask(static_cast<float>(pt.x), static_cast<float>(pt.y), m_radius, true);
+            if (m_spotlightPressed)
+            {
+                // Only update position while pressed — radius is being animated
+                if (m_spotlightMaskGradient)
+                {
+                    m_spotlightMaskGradient.EllipseCenter({ static_cast<float>(pt.x), static_cast<float>(pt.y) });
+                }
+            }
+            else
+            {
+                UpdateSpotlightMask(static_cast<float>(pt.x), static_cast<float>(pt.y), m_radius, true);
+            }
         }
         else if (m_alwaysPointer)
         {
@@ -259,14 +343,24 @@ void Highlighter::UpdateDrawingPointPosition(MouseButton button)
 void Highlighter::StartDrawingPointFading(MouseButton button)
 {
     winrt::Windows::UI::Composition::CompositionSpriteShape circleShape{ nullptr };
+    winrt::Windows::UI::Composition::CompositionEllipseGeometry geom{ nullptr };
     if (button == MouseButton::Left)
     {
         circleShape = m_leftPointer;
+        geom = m_leftGeometry;
     }
     else
     {
         // right
         circleShape = m_rightPointer;
+        geom = m_rightGeometry;
+    }
+
+    // Stop any in-flight press-down shrink so the geometry doesn't keep
+    // animating while the fill is being faded out.
+    if (geom && m_compositor)
+    {
+        geom.StopAnimation(L"Radius");
     }
 
     auto brushColor = circleShape.FillBrush().as<winrt::Windows::UI::Composition::CompositionColorBrush>().Color();
@@ -329,6 +423,30 @@ LRESULT CALLBACK Highlighter::MouseHookProc(int nCode, WPARAM wParam, LPARAM lPa
         switch (wParam)
         {
         case WM_LBUTTONDOWN:
+            if (instance->m_spotlightMode)
+            {
+                instance->SpotlightAnimatePress();
+                break;
+            }
+            if (instance->m_rippleMode)
+            {
+                if (instance->m_leftPointerEnabled)
+                {
+                    // Defer the held indicator: only spawn it if the button is
+                    // still down after the hold threshold. A quick click handled
+                    // on button-up emits a single ripple instead.
+                    instance->m_leftButtonPressed = true;
+                    if (instance->m_leftHoldTimer == 0)
+                    {
+                        instance->m_leftHoldTimer = SetTimer(instance->m_hwnd, HOLD_RIPPLE_TIMER_LEFT, HOLD_RIPPLE_THRESHOLD_MS, nullptr);
+                    }
+                    if (instance->m_timer_id == 0)
+                    {
+                        instance->m_timer_id = SetTimer(instance->m_hwnd, BRING_TO_FRONT_TIMER_ID, 10, nullptr);
+                    }
+                }
+                break;
+            }
             if (instance->m_leftPointerEnabled)
             {
                 if (instance->m_alwaysPointerEnabled && !instance->m_rightButtonPressed)
@@ -354,6 +472,28 @@ LRESULT CALLBACK Highlighter::MouseHookProc(int nCode, WPARAM wParam, LPARAM lPa
             }
             break;
         case WM_RBUTTONDOWN:
+            if (instance->m_spotlightMode)
+            {
+                instance->SpotlightAnimatePress();
+                break;
+            }
+            if (instance->m_rippleMode)
+            {
+                if (instance->m_rightPointerEnabled)
+                {
+                    // Defer the held indicator (see WM_LBUTTONDOWN).
+                    instance->m_rightButtonPressed = true;
+                    if (instance->m_rightHoldTimer == 0)
+                    {
+                        instance->m_rightHoldTimer = SetTimer(instance->m_hwnd, HOLD_RIPPLE_TIMER_RIGHT, HOLD_RIPPLE_THRESHOLD_MS, nullptr);
+                    }
+                    if (instance->m_timer_id == 0)
+                    {
+                        instance->m_timer_id = SetTimer(instance->m_hwnd, BRING_TO_FRONT_TIMER_ID, 10, nullptr);
+                    }
+                }
+                break;
+            }
             if (instance->m_rightPointerEnabled)
             {
                 if (instance->m_alwaysPointerEnabled && !instance->m_leftButtonPressed)
@@ -376,6 +516,24 @@ LRESULT CALLBACK Highlighter::MouseHookProc(int nCode, WPARAM wParam, LPARAM lPa
             }
             break;
         case WM_MOUSEMOVE:
+            if (instance->m_rippleMode)
+            {
+                // Held ripple ring follows the cursor while a button is down,
+                // gated by the "follow cursor while held" setting. When the
+                // setting is off, the ring stays anchored at the click point.
+                if (instance->m_rippleShowDragTrail)
+                {
+                    if (instance->m_leftButtonPressed && instance->m_leftPointer)
+                    {
+                        instance->UpdateDrawingPointPosition(MouseButton::Left);
+                    }
+                    if (instance->m_rightButtonPressed && instance->m_rightPointer)
+                    {
+                        instance->UpdateDrawingPointPosition(MouseButton::Right);
+                    }
+                }
+                break;
+            }
             if (instance->m_leftButtonPressed)
             {
                 instance->UpdateDrawingPointPosition(MouseButton::Left);
@@ -390,11 +548,33 @@ LRESULT CALLBACK Highlighter::MouseHookProc(int nCode, WPARAM wParam, LPARAM lPa
             }
             break;
         case WM_LBUTTONUP:
+            if (instance->m_spotlightPressed)
+            {
+                instance->SpotlightAnimateRelease();
+            }
             if (instance->m_leftButtonPressed)
             {
-                instance->StartDrawingPointFading(MouseButton::Left);
+                if (instance->m_rippleMode)
+                {
+                    if (instance->m_leftHoldTimer != 0)
+                    {
+                        // Released before the hold threshold => quick click.
+                        KillTimer(instance->m_hwnd, instance->m_leftHoldTimer);
+                        instance->m_leftHoldTimer = 0;
+                        instance->EmitSingleRipple(MouseButton::Left);
+                    }
+                    else
+                    {
+                        // Held indicator was already shown; expand + fade it.
+                        instance->FadeRippleHoldDot(MouseButton::Left);
+                    }
+                }
+                else
+                {
+                    instance->StartDrawingPointFading(MouseButton::Left);
+                }
                 instance->m_leftButtonPressed = false;
-                if (instance->m_alwaysPointerEnabled && !instance->m_rightButtonPressed)
+                if (!instance->m_rippleMode && instance->m_alwaysPointerEnabled && !instance->m_rightButtonPressed)
                 {
                     // Add AlwaysPointer only when it's enabled and RightPointer is not active
                     instance->AddDrawingPoint(MouseButton::None);
@@ -402,11 +582,32 @@ LRESULT CALLBACK Highlighter::MouseHookProc(int nCode, WPARAM wParam, LPARAM lPa
             }
             break;
         case WM_RBUTTONUP:
+            if (instance->m_spotlightPressed)
+            {
+                instance->SpotlightAnimateRelease();
+            }
             if (instance->m_rightButtonPressed)
             {
-                instance->StartDrawingPointFading(MouseButton::Right);
+                if (instance->m_rippleMode)
+                {
+                    if (instance->m_rightHoldTimer != 0)
+                    {
+                        // Released before the hold threshold => quick click.
+                        KillTimer(instance->m_hwnd, instance->m_rightHoldTimer);
+                        instance->m_rightHoldTimer = 0;
+                        instance->EmitSingleRipple(MouseButton::Right);
+                    }
+                    else
+                    {
+                        instance->FadeRippleHoldDot(MouseButton::Right);
+                    }
+                }
+                else
+                {
+                    instance->StartDrawingPointFading(MouseButton::Right);
+                }
                 instance->m_rightButtonPressed = false;
-                if (instance->m_alwaysPointerEnabled && !instance->m_leftButtonPressed)
+                if (!instance->m_rippleMode && instance->m_alwaysPointerEnabled && !instance->m_leftButtonPressed)
                 {
                     // Add AlwaysPointer only when it's enabled and LeftPointer is not active
                     instance->AddDrawingPoint(MouseButton::None);
@@ -448,9 +649,16 @@ void Highlighter::StopDrawing()
     m_visible = false;
     m_leftButtonPressed = false;
     m_rightButtonPressed = false;
+    m_spotlightPressed = false;
     m_leftPointer = nullptr;
     m_rightPointer = nullptr;
     m_alwaysPointer = nullptr;
+    m_leftGeometry = nullptr;
+    m_rightGeometry = nullptr;
+    m_leftRippleGlow = nullptr;
+    m_rightRippleGlow = nullptr;
+    m_leftGlowGeometry = nullptr;
+    m_rightGlowGeometry = nullptr;
     if (m_overlay)
     {
         m_overlay.IsVisible(false);
@@ -478,6 +686,16 @@ void Highlighter::ApplySettings(MouseHighlighterSettings settings)
     m_rightPointerEnabled = settings.rightButtonColor.A != 0;
     m_alwaysPointerEnabled = settings.alwaysColor.A != 0;
     m_spotlightMode = settings.spotlightMode && settings.alwaysColor.A != 0;
+    m_rippleMode = settings.rippleMode && !m_spotlightMode;
+    m_rippleSize = (settings.rippleSize > 0) ? static_cast<float>(settings.rippleSize) : static_cast<float>(MOUSE_HIGHLIGHTER_DEFAULT_RIPPLE_SIZE);
+    m_rippleIntensity = (settings.rippleIntensity > 0.0) ? static_cast<float>(settings.rippleIntensity) : static_cast<float>(MOUSE_HIGHLIGHTER_DEFAULT_RIPPLE_INTENSITY);
+    m_rippleDurationMs = (settings.rippleDurationMs > 0) ? settings.rippleDurationMs : MOUSE_HIGHLIGHTER_DEFAULT_RIPPLE_DURATION_MS;
+    m_rippleShowDragTrail = settings.rippleShowDragTrail;
+    m_rippleShowReleasePulse = settings.rippleShowReleasePulse;
+
+    // Reset transient pressed-state flag so a settings change while a button
+    // happens to be down doesn't leave the spotlight stuck at a shrunken size.
+    m_spotlightPressed = false;
 
     if (m_spotlightMode)
     {
@@ -548,6 +766,7 @@ LRESULT CALLBACK Highlighter::WndProc(HWND hWnd, UINT message, WPARAM wParam, LP
             // If we would use a timer with a 50 ms period, there would be a flickering on the UI, as in most of the cases
             // the pinned window hides our window in a few milliseconds.
         case BRING_TO_FRONT_TIMER_ID:
+        {
             static int fireCount = 0;
             if (fireCount++ >= 4)
             {
@@ -558,6 +777,24 @@ LRESULT CALLBACK Highlighter::WndProc(HWND hWnd, UINT message, WPARAM wParam, LP
             instance->BringToFront();
             break;
         }
+        case HOLD_RIPPLE_TIMER_LEFT:
+            // Button held past the threshold: show the persistent held indicator.
+            KillTimer(instance->m_hwnd, instance->m_leftHoldTimer);
+            instance->m_leftHoldTimer = 0;
+            if (instance->m_leftButtonPressed)
+            {
+                instance->SpawnRippleHoldDot(MouseButton::Left);
+            }
+            break;
+        case HOLD_RIPPLE_TIMER_RIGHT:
+            KillTimer(instance->m_hwnd, instance->m_rightHoldTimer);
+            instance->m_rightHoldTimer = 0;
+            if (instance->m_rightButtonPressed)
+            {
+                instance->SpawnRippleHoldDot(MouseButton::Right);
+            }
+            break;
+        }
         break;
     }
     default:
@@ -643,6 +880,548 @@ void Highlighter::UpdateSpotlightMask(float cx, float cy, float radius, bool sho
     }
 }
 
+// Spotlight press-down: shrink the mask radius briefly while a button is held.
+void Highlighter::SpotlightAnimatePress()
+{
+    if (!m_spotlightMode || !m_spotlightMaskGradient)
+    {
+        return;
+    }
+
+    m_spotlightPressed = true;
+    const float pressedRadius = m_radius * 0.85f;
+
+    auto ease = m_compositor.CreateCubicBezierEasingFunction({ 0.2f, 0.0f }, { 0.4f, 1.0f });
+    auto anim = m_compositor.CreateVector2KeyFrameAnimation();
+    anim.InsertKeyFrame(0.0f, { m_radius, m_radius });
+    anim.InsertKeyFrame(1.0f, { pressedRadius, pressedRadius }, ease);
+    anim.Duration(std::chrono::milliseconds(120));
+    m_spotlightMaskGradient.StartAnimation(L"EllipseRadius", anim);
+}
+
+// Spotlight release: animate the mask back to the configured radius.
+void Highlighter::SpotlightAnimateRelease()
+{
+    m_spotlightPressed = false;
+
+    if (!m_spotlightMode || !m_spotlightMaskGradient)
+    {
+        return;
+    }
+
+    auto ease = m_compositor.CreateCubicBezierEasingFunction({ 0.215f, 0.61f }, { 0.355f, 1.0f });
+    auto current = m_spotlightMaskGradient.EllipseRadius();
+    auto anim = m_compositor.CreateVector2KeyFrameAnimation();
+    anim.InsertKeyFrame(0.0f, current);
+    anim.InsertKeyFrame(1.0f, { m_radius, m_radius }, ease);
+    anim.Duration(std::chrono::milliseconds(200));
+    m_spotlightMaskGradient.StartAnimation(L"EllipseRadius", anim);
+}
+
+// Spawn the press/hold ring + glow at the click point. The shapes persist
+// until FadeRippleHoldDot is called (button-up). While held they can be
+// re-positioned to follow the cursor (UpdateDrawingPointPosition).
+void Highlighter::SpawnRippleHoldDot(MouseButton button)
+{
+    if (!m_compositor || !m_shape)
+    {
+        return;
+    }
+
+    winrt::Windows::UI::Color color = (button == MouseButton::Left) ? m_leftClickColor : m_rightClickColor;
+    if (color.A == 0)
+    {
+        return;
+    }
+
+    POINT pt{};
+    if (!GetCursorPos(&pt))
+    {
+        return;
+    }
+    ScreenToClient(m_hwnd, &pt);
+    const float fx = static_cast<float>(pt.x);
+    const float fy = static_cast<float>(pt.y);
+
+    // Resolve sizing/intensity from the ripple-specific settings so they're
+    // independent of the legacy "always-on dot" controls.
+    const float baseSize = (m_rippleSize > 1.0f) ? m_rippleSize : 1.0f;
+    float intensity = m_rippleIntensity;
+    if (intensity < 0.15f) intensity = 0.15f;
+    if (intensity > 1.35f) intensity = 1.35f;
+
+    const float ringHeld = baseSize * 0.55f;
+    const float glowHeld = baseSize * 0.65f;
+    const float lineWidth = (std::max)(2.25f, baseSize * (0.035f + intensity * 0.045f));
+
+    auto ease = m_compositor.CreateCubicBezierEasingFunction({ 0.215f, 0.61f }, { 0.355f, 1.0f });
+    // Held indicator: appears once the button has been held past the hold
+    // threshold and sits at the held radius until release. It must NOT expand
+    // outward on appearance — it only FADES IN at the held size. The single
+    // outward "ripple" expansion happens exclusively on release
+    // (FadeRippleHoldDot). If this grew outward, a slow single click (release
+    // shortly after the threshold) would show grow-to-held + release as two
+    // expansions — the double-ripple bug.
+    auto dur = std::chrono::milliseconds(120);
+
+    auto clampByte = [](float v) -> uint8_t {
+        if (v < 0.0f) v = 0.0f;
+        if (v > 255.0f) v = 255.0f;
+        return static_cast<uint8_t>(v);
+    };
+
+    // Glow color is the click color, lower alpha (×0.30), scaled by intensity.
+    const float glowAlpha = static_cast<float>(color.A) * 0.30f * intensity;
+    auto glowColor = winrt::Windows::UI::ColorHelper::FromArgb(clampByte(glowAlpha), color.R, color.G, color.B);
+    auto glowTransparent = winrt::Windows::UI::ColorHelper::FromArgb(0, color.R, color.G, color.B);
+
+    // Ring color uses full base alpha (alphaMul like the press recipe).
+    const float alphaMul = 0.18f + intensity * 0.78f;
+    auto ringColor = winrt::Windows::UI::ColorHelper::FromArgb(clampByte(static_cast<float>(color.A) * alphaMul), color.R, color.G, color.B);
+    auto ringTransparent = winrt::Windows::UI::ColorHelper::FromArgb(0, color.R, color.G, color.B);
+
+    // Clean up any stray "still held" shapes for this button — guards against
+    // stray button-down without matching button-up (e.g. focus loss).
+    winrt::CompositionSpriteShape& heldRing = (button == MouseButton::Left) ? m_leftPointer : m_rightPointer;
+    winrt::CompositionSpriteShape& heldGlow = (button == MouseButton::Left) ? m_leftRippleGlow : m_rightRippleGlow;
+    winrt::CompositionEllipseGeometry& heldGeom = (button == MouseButton::Left) ? m_leftGeometry : m_rightGeometry;
+    winrt::CompositionEllipseGeometry& heldGlowGeom = (button == MouseButton::Left) ? m_leftGlowGeometry : m_rightGlowGeometry;
+
+    if (m_shape && m_shape.Shapes())
+    {
+        auto shapes = m_shape.Shapes();
+        uint32_t idx = 0;
+        if (heldRing && shapes.IndexOf(heldRing, idx))
+        {
+            shapes.RemoveAt(idx);
+        }
+        if (heldGlow && shapes.IndexOf(heldGlow, idx))
+        {
+            shapes.RemoveAt(idx);
+        }
+    }
+
+    // Glow (filled) — added first so the ring renders on top. Sits at the held
+    // radius and fades its alpha in (no outward size growth).
+    auto glowGeom = m_compositor.CreateEllipseGeometry();
+    glowGeom.Radius({ glowHeld, glowHeld });
+    auto glowBrush = m_compositor.CreateColorBrush(glowTransparent);
+    auto glowShape = m_compositor.CreateSpriteShape(glowGeom);
+    glowShape.Offset({ fx, fy });
+    glowShape.FillBrush(glowBrush);
+    m_shape.Shapes().Append(glowShape);
+
+    auto glowFadeIn = m_compositor.CreateColorKeyFrameAnimation();
+    glowFadeIn.InsertKeyFrame(0.0f, glowTransparent);
+    glowFadeIn.InsertKeyFrame(1.0f, glowColor, ease);
+    glowFadeIn.Duration(dur);
+    glowBrush.StartAnimation(L"Color", glowFadeIn);
+
+    // Ring (stroked) — same: fixed at held radius, alpha fade-in only.
+    auto ringGeom = m_compositor.CreateEllipseGeometry();
+    ringGeom.Radius({ ringHeld, ringHeld });
+    auto ringBrush = m_compositor.CreateColorBrush(ringTransparent);
+    auto ringShape = m_compositor.CreateSpriteShape(ringGeom);
+    ringShape.Offset({ fx, fy });
+    ringShape.StrokeBrush(ringBrush);
+    ringShape.StrokeThickness(lineWidth);
+    ringShape.IsStrokeNonScaling(true);
+    m_shape.Shapes().Append(ringShape);
+
+    auto ringFadeIn = m_compositor.CreateColorKeyFrameAnimation();
+    ringFadeIn.InsertKeyFrame(0.0f, ringTransparent);
+    ringFadeIn.InsertKeyFrame(1.0f, ringColor, ease);
+    ringFadeIn.Duration(dur);
+    ringBrush.StartAnimation(L"Color", ringFadeIn);
+
+    heldRing = ringShape;
+    heldGlow = glowShape;
+    heldGeom = ringGeom;
+    heldGlowGeom = glowGeom;
+}
+
+// Continue the held-ring/glow animation outward and fade both to transparent.
+// For right-click, optionally spawn the expanding crosshair lines.
+void Highlighter::FadeRippleHoldDot(MouseButton button)
+{
+    if (!m_compositor || !m_shape)
+    {
+        return;
+    }
+
+    winrt::CompositionSpriteShape& heldRing = (button == MouseButton::Left) ? m_leftPointer : m_rightPointer;
+    winrt::CompositionSpriteShape& heldGlow = (button == MouseButton::Left) ? m_leftRippleGlow : m_rightRippleGlow;
+    winrt::CompositionEllipseGeometry& heldGeom = (button == MouseButton::Left) ? m_leftGeometry : m_rightGeometry;
+    winrt::CompositionEllipseGeometry& heldGlowGeom = (button == MouseButton::Left) ? m_leftGlowGeometry : m_rightGlowGeometry;
+
+    if (!heldRing && !heldGlow)
+    {
+        return;
+    }
+
+    winrt::Windows::UI::Color color = (button == MouseButton::Left) ? m_leftClickColor : m_rightClickColor;
+
+    const float baseSize = (m_rippleSize > 1.0f) ? m_rippleSize : 1.0f;
+    float intensity = m_rippleIntensity;
+    if (intensity < 0.15f) intensity = 0.15f;
+    if (intensity > 1.35f) intensity = 1.35f;
+
+    int durationMs = m_rippleDurationMs;
+    if (durationMs < 60) durationMs = 60;
+    if (durationMs > 2000) durationMs = 2000;
+    auto dur = std::chrono::milliseconds(durationMs);
+
+    const float ringHeld = baseSize * 0.55f;
+    const float ringEnd = baseSize * 1.05f;
+    const float glowHeld = baseSize * 0.65f;
+    const float glowEnd = baseSize * 1.40f;
+
+    auto clampByte = [](float v) -> uint8_t {
+        if (v < 0.0f) v = 0.0f;
+        if (v > 255.0f) v = 255.0f;
+        return static_cast<uint8_t>(v);
+    };
+
+    auto ease = m_compositor.CreateCubicBezierEasingFunction({ 0.215f, 0.61f }, { 0.355f, 1.0f });
+    auto transparent = winrt::Windows::UI::ColorHelper::FromArgb(0, color.R, color.G, color.B);
+
+    // Track everything spawned by this fade (and the held shapes themselves)
+    // so the completion callback can remove them in one pass.
+    auto spawned = std::make_shared<std::vector<winrt::CompositionSpriteShape>>();
+
+    auto batch = m_compositor.CreateScopedBatch(winrt::CompositionBatchTypes::Animation);
+
+    if (heldGlow && heldGlowGeom)
+    {
+        // The held indicator has settled at the held radius; expand it outward
+        // from there and fade it to transparent.
+        heldGlowGeom.StopAnimation(L"Radius");
+        auto glowAnim = m_compositor.CreateVector2KeyFrameAnimation();
+        glowAnim.InsertKeyFrame(0.0f, { glowHeld, glowHeld });
+        glowAnim.InsertKeyFrame(1.0f, { glowEnd, glowEnd }, ease);
+        glowAnim.Duration(dur);
+        heldGlowGeom.StartAnimation(L"Radius", glowAnim);
+
+        auto brush = heldGlow.FillBrush().as<winrt::Windows::UI::Composition::CompositionColorBrush>();
+        auto startColor = brush.Color();
+        auto colorAnim = m_compositor.CreateColorKeyFrameAnimation();
+        colorAnim.InsertKeyFrame(0.0f, startColor);
+        colorAnim.InsertKeyFrame(1.0f, transparent, ease);
+        colorAnim.Duration(dur);
+        brush.StartAnimation(L"Color", colorAnim);
+
+        spawned->push_back(heldGlow);
+    }
+
+    if (heldRing && heldGeom)
+    {
+        heldGeom.StopAnimation(L"Radius");
+        auto ringAnim = m_compositor.CreateVector2KeyFrameAnimation();
+        ringAnim.InsertKeyFrame(0.0f, { ringHeld, ringHeld });
+        ringAnim.InsertKeyFrame(1.0f, { ringEnd, ringEnd }, ease);
+        ringAnim.Duration(dur);
+        heldGeom.StartAnimation(L"Radius", ringAnim);
+
+        auto brush = heldRing.StrokeBrush().as<winrt::Windows::UI::Composition::CompositionColorBrush>();
+        auto startColor = brush.Color();
+        auto colorAnim = m_compositor.CreateColorKeyFrameAnimation();
+        colorAnim.InsertKeyFrame(0.0f, startColor);
+        colorAnim.InsertKeyFrame(1.0f, transparent, ease);
+        colorAnim.Duration(dur);
+        brush.StartAnimation(L"Color", colorAnim);
+
+        spawned->push_back(heldRing);
+    }
+
+    // Right-click only: spawn expanding crosshair lines centered on the ring.
+    // Gated by the "show crosshairs on right-click release" toggle.
+    if (button == MouseButton::Right && m_rippleShowReleasePulse && heldRing)
+    {
+        const float xhairAlphaMul = 0.18f + intensity * 0.78f;
+        auto xhairColor = winrt::Windows::UI::ColorHelper::FromArgb(clampByte(static_cast<float>(color.A) * xhairAlphaMul), color.R, color.G, color.B);
+        const float xhairThickness = (std::max)(1.25f, baseSize * (0.025f + intensity * 0.03f));
+
+        auto center = heldRing.Offset();
+        const float startSpan = ringHeld * 0.85f;
+        const float endSpan = ringEnd * 0.85f;
+
+        auto makeLine = [&](float ax1, float ay1, float ax2, float ay2,
+                            float bx1, float by1, float bx2, float by2) {
+            auto lineGeom = m_compositor.CreateLineGeometry();
+            lineGeom.Start({ ax1, ay1 });
+            lineGeom.End({ ax2, ay2 });
+
+            auto lineBrush = m_compositor.CreateColorBrush(xhairColor);
+            auto lineShape = m_compositor.CreateSpriteShape(lineGeom);
+            lineShape.StrokeBrush(lineBrush);
+            lineShape.StrokeThickness(xhairThickness);
+            lineShape.IsStrokeNonScaling(true);
+            m_shape.Shapes().Append(lineShape);
+            spawned->push_back(lineShape);
+
+            auto startAnim = m_compositor.CreateVector2KeyFrameAnimation();
+            startAnim.InsertKeyFrame(0.0f, { ax1, ay1 });
+            startAnim.InsertKeyFrame(1.0f, { bx1, by1 }, ease);
+            startAnim.Duration(dur);
+            lineGeom.StartAnimation(L"Start", startAnim);
+
+            auto endAnim = m_compositor.CreateVector2KeyFrameAnimation();
+            endAnim.InsertKeyFrame(0.0f, { ax2, ay2 });
+            endAnim.InsertKeyFrame(1.0f, { bx2, by2 }, ease);
+            endAnim.Duration(dur);
+            lineGeom.StartAnimation(L"End", endAnim);
+
+            auto colorAnim = m_compositor.CreateColorKeyFrameAnimation();
+            colorAnim.InsertKeyFrame(0.0f, xhairColor);
+            colorAnim.InsertKeyFrame(1.0f, transparent, ease);
+            colorAnim.Duration(dur);
+            lineBrush.StartAnimation(L"Color", colorAnim);
+        };
+
+        // Horizontal line (left half, right half).
+        makeLine(center.x - startSpan, center.y, center.x - startSpan * 0.30f, center.y,
+                 center.x - endSpan,   center.y, center.x - endSpan   * 0.30f, center.y);
+        makeLine(center.x + startSpan * 0.30f, center.y, center.x + startSpan, center.y,
+                 center.x + endSpan   * 0.30f, center.y, center.x + endSpan,   center.y);
+        // Vertical line (top half, bottom half).
+        makeLine(center.x, center.y - startSpan, center.x, center.y - startSpan * 0.30f,
+                 center.x, center.y - endSpan,   center.x, center.y - endSpan   * 0.30f);
+        makeLine(center.x, center.y + startSpan * 0.30f, center.x, center.y + startSpan,
+                 center.x, center.y + endSpan   * 0.30f, center.x, center.y + endSpan);
+    }
+
+    // Detach our member handles BEFORE the batch completes so subsequent
+    // press events on this button create fresh shapes rather than racing.
+    heldRing = nullptr;
+    heldGlow = nullptr;
+    heldGeom = nullptr;
+    heldGlowGeom = nullptr;
+
+    batch.End();
+
+    if (spawned->empty())
+    {
+        return;
+    }
+
+    auto dispatcher = m_dispatcherQueueController.DispatcherQueue();
+    batch.Completed([dispatcher, spawned](auto&&, auto&&) {
+        dispatcher.TryEnqueue([spawned]() {
+            try
+            {
+                if (Highlighter::instance == nullptr || Highlighter::instance->m_shape == nullptr)
+                {
+                    return;
+                }
+                auto shapes = Highlighter::instance->m_shape.Shapes();
+                for (auto const& s : *spawned)
+                {
+                    uint32_t index = 0;
+                    if (shapes.IndexOf(s, index))
+                    {
+                        shapes.RemoveAt(index);
+                    }
+                }
+            }
+            catch (...)
+            {
+                // Highlighter may have torn down between batch completion and dispatch — ignore.
+            }
+        });
+    });
+}
+
+// Self-contained single ripple for a quick click (press + release before the
+// hold threshold). Spawns a fresh ring + glow that grow from the click point
+// outward and fade to transparent in one continuous animation — no held
+// indicator, so a single click produces exactly one ripple. For right-click,
+// optionally spawns the expanding crosshair lines too.
+void Highlighter::EmitSingleRipple(MouseButton button)
+{
+    if (!m_compositor || !m_shape)
+    {
+        return;
+    }
+
+    winrt::Windows::UI::Color color = (button == MouseButton::Left) ? m_leftClickColor : m_rightClickColor;
+    if (color.A == 0)
+    {
+        return;
+    }
+
+    POINT pt{};
+    if (!GetCursorPos(&pt))
+    {
+        return;
+    }
+    ScreenToClient(m_hwnd, &pt);
+    const float fx = static_cast<float>(pt.x);
+    const float fy = static_cast<float>(pt.y);
+
+    const float baseSize = (m_rippleSize > 1.0f) ? m_rippleSize : 1.0f;
+    float intensity = m_rippleIntensity;
+    if (intensity < 0.15f) intensity = 0.15f;
+    if (intensity > 1.35f) intensity = 1.35f;
+
+    int durationMs = m_rippleDurationMs;
+    if (durationMs < 60) durationMs = 60;
+    if (durationMs > 2000) durationMs = 2000;
+    auto dur = std::chrono::milliseconds(durationMs);
+
+    const float ringStart = baseSize * 0.20f;
+    const float ringEnd = baseSize * 1.05f;
+    const float glowStart = baseSize * 0.30f;
+    const float glowEnd = baseSize * 1.40f;
+    const float lineWidth = (std::max)(2.25f, baseSize * (0.035f + intensity * 0.045f));
+
+    auto clampByte = [](float v) -> uint8_t {
+        if (v < 0.0f) v = 0.0f;
+        if (v > 255.0f) v = 255.0f;
+        return static_cast<uint8_t>(v);
+    };
+
+    const float glowAlpha = static_cast<float>(color.A) * 0.30f * intensity;
+    auto glowColor = winrt::Windows::UI::ColorHelper::FromArgb(clampByte(glowAlpha), color.R, color.G, color.B);
+    const float alphaMul = 0.18f + intensity * 0.78f;
+    auto ringColor = winrt::Windows::UI::ColorHelper::FromArgb(clampByte(static_cast<float>(color.A) * alphaMul), color.R, color.G, color.B);
+
+    auto ease = m_compositor.CreateCubicBezierEasingFunction({ 0.215f, 0.61f }, { 0.355f, 1.0f });
+    auto transparent = winrt::Windows::UI::ColorHelper::FromArgb(0, color.R, color.G, color.B);
+
+    auto spawned = std::make_shared<std::vector<winrt::CompositionSpriteShape>>();
+
+    auto batch = m_compositor.CreateScopedBatch(winrt::CompositionBatchTypes::Animation);
+
+    // Glow (filled) — added first so the ring renders on top.
+    auto glowGeom = m_compositor.CreateEllipseGeometry();
+    glowGeom.Radius({ glowStart, glowStart });
+    auto glowBrush = m_compositor.CreateColorBrush(glowColor);
+    auto glowShape = m_compositor.CreateSpriteShape(glowGeom);
+    glowShape.Offset({ fx, fy });
+    glowShape.FillBrush(glowBrush);
+    m_shape.Shapes().Append(glowShape);
+    spawned->push_back(glowShape);
+
+    auto glowAnim = m_compositor.CreateVector2KeyFrameAnimation();
+    glowAnim.InsertKeyFrame(0.0f, { glowStart, glowStart });
+    glowAnim.InsertKeyFrame(1.0f, { glowEnd, glowEnd }, ease);
+    glowAnim.Duration(dur);
+    glowGeom.StartAnimation(L"Radius", glowAnim);
+
+    auto glowColorAnim = m_compositor.CreateColorKeyFrameAnimation();
+    glowColorAnim.InsertKeyFrame(0.0f, glowColor);
+    glowColorAnim.InsertKeyFrame(1.0f, transparent, ease);
+    glowColorAnim.Duration(dur);
+    glowBrush.StartAnimation(L"Color", glowColorAnim);
+
+    // Ring (stroked).
+    auto ringGeom = m_compositor.CreateEllipseGeometry();
+    ringGeom.Radius({ ringStart, ringStart });
+    auto ringBrush = m_compositor.CreateColorBrush(ringColor);
+    auto ringShape = m_compositor.CreateSpriteShape(ringGeom);
+    ringShape.Offset({ fx, fy });
+    ringShape.StrokeBrush(ringBrush);
+    ringShape.StrokeThickness(lineWidth);
+    ringShape.IsStrokeNonScaling(true);
+    m_shape.Shapes().Append(ringShape);
+    spawned->push_back(ringShape);
+
+    auto ringAnim = m_compositor.CreateVector2KeyFrameAnimation();
+    ringAnim.InsertKeyFrame(0.0f, { ringStart, ringStart });
+    ringAnim.InsertKeyFrame(1.0f, { ringEnd, ringEnd }, ease);
+    ringAnim.Duration(dur);
+    ringGeom.StartAnimation(L"Radius", ringAnim);
+
+    auto ringColorAnim = m_compositor.CreateColorKeyFrameAnimation();
+    ringColorAnim.InsertKeyFrame(0.0f, ringColor);
+    ringColorAnim.InsertKeyFrame(1.0f, transparent, ease);
+    ringColorAnim.Duration(dur);
+    ringBrush.StartAnimation(L"Color", ringColorAnim);
+
+    // Right-click only: spawn expanding crosshair lines centered on the click
+    // point. Gated by the "show crosshairs on right-click release" toggle.
+    if (button == MouseButton::Right && m_rippleShowReleasePulse)
+    {
+        auto xhairColor = ringColor;
+        const float xhairThickness = (std::max)(1.25f, baseSize * (0.025f + intensity * 0.03f));
+
+        const float startSpan = (baseSize * 0.55f) * 0.85f;
+        const float endSpan = ringEnd * 0.85f;
+
+        auto makeLine = [&](float ax1, float ay1, float ax2, float ay2,
+                            float bx1, float by1, float bx2, float by2) {
+            auto lineGeom = m_compositor.CreateLineGeometry();
+            lineGeom.Start({ ax1, ay1 });
+            lineGeom.End({ ax2, ay2 });
+
+            auto lineBrush = m_compositor.CreateColorBrush(xhairColor);
+            auto lineShape = m_compositor.CreateSpriteShape(lineGeom);
+            lineShape.StrokeBrush(lineBrush);
+            lineShape.StrokeThickness(xhairThickness);
+            lineShape.IsStrokeNonScaling(true);
+            m_shape.Shapes().Append(lineShape);
+            spawned->push_back(lineShape);
+
+            auto startAnim = m_compositor.CreateVector2KeyFrameAnimation();
+            startAnim.InsertKeyFrame(0.0f, { ax1, ay1 });
+            startAnim.InsertKeyFrame(1.0f, { bx1, by1 }, ease);
+            startAnim.Duration(dur);
+            lineGeom.StartAnimation(L"Start", startAnim);
+
+            auto endAnim = m_compositor.CreateVector2KeyFrameAnimation();
+            endAnim.InsertKeyFrame(0.0f, { ax2, ay2 });
+            endAnim.InsertKeyFrame(1.0f, { bx2, by2 }, ease);
+            endAnim.Duration(dur);
+            lineGeom.StartAnimation(L"End", endAnim);
+
+            auto colorAnim = m_compositor.CreateColorKeyFrameAnimation();
+            colorAnim.InsertKeyFrame(0.0f, xhairColor);
+            colorAnim.InsertKeyFrame(1.0f, transparent, ease);
+            colorAnim.Duration(dur);
+            lineBrush.StartAnimation(L"Color", colorAnim);
+        };
+
+        // Horizontal line (left half, right half).
+        makeLine(fx - startSpan, fy, fx - startSpan * 0.30f, fy,
+                 fx - endSpan,   fy, fx - endSpan   * 0.30f, fy);
+        makeLine(fx + startSpan * 0.30f, fy, fx + startSpan, fy,
+                 fx + endSpan   * 0.30f, fy, fx + endSpan,   fy);
+        // Vertical line (top half, bottom half).
+        makeLine(fx, fy - startSpan, fx, fy - startSpan * 0.30f,
+                 fx, fy - endSpan,   fx, fy - endSpan   * 0.30f);
+        makeLine(fx, fy + startSpan * 0.30f, fx, fy + startSpan,
+                 fx, fy + endSpan   * 0.30f, fx, fy + endSpan);
+    }
+
+    batch.End();
+
+    auto dispatcher = m_dispatcherQueueController.DispatcherQueue();
+    batch.Completed([dispatcher, spawned](auto&&, auto&&) {
+        dispatcher.TryEnqueue([spawned]() {
+            try
+            {
+                if (Highlighter::instance == nullptr || Highlighter::instance->m_shape == nullptr)
+                {
+                    return;
+                }
+                auto shapes = Highlighter::instance->m_shape.Shapes();
+                for (auto const& s : *spawned)
+                {
+                    uint32_t index = 0;
+                    if (shapes.IndexOf(s, index))
+                    {
+                        shapes.RemoveAt(index);
+                    }
+                }
+            }
+            catch (...)
+            {
+                // Highlighter may have torn down between batch completion and dispatch — ignore.
+            }
+        });
+    });
+}
+
 #pragma region MouseHighlighter_API
 
 void MouseHighlighterApplySettings(MouseHighlighterSettings settings)

src/modules/MouseUtils/MouseHighlighter/MouseHighlighter.h

@@ -4,10 +4,16 @@
 const winrt::Windows::UI::Color MOUSE_HIGHLIGHTER_DEFAULT_LEFT_BUTTON_COLOR = winrt::Windows::UI::ColorHelper::FromArgb(166, 255, 255, 0);
 const winrt::Windows::UI::Color MOUSE_HIGHLIGHTER_DEFAULT_RIGHT_BUTTON_COLOR = winrt::Windows::UI::ColorHelper::FromArgb(166, 0, 0, 255);
 const winrt::Windows::UI::Color MOUSE_HIGHLIGHTER_DEFAULT_ALWAYS_COLOR = winrt::Windows::UI::ColorHelper::FromArgb(0, 255, 0, 0);
-constexpr int MOUSE_HIGHLIGHTER_DEFAULT_RADIUS = 20;
-constexpr int MOUSE_HIGHLIGHTER_DEFAULT_DELAY_MS = 500;
-constexpr int MOUSE_HIGHLIGHTER_DEFAULT_DURATION_MS = 250;
+constexpr int MOUSE_HIGHLIGHTER_DEFAULT_RADIUS = 30;
+constexpr int MOUSE_HIGHLIGHTER_DEFAULT_DELAY_MS = 400;
+constexpr int MOUSE_HIGHLIGHTER_DEFAULT_DURATION_MS = 400;
 constexpr bool MOUSE_HIGHLIGHTER_DEFAULT_AUTO_ACTIVATE = false;
+// Ripple-specific defaults (independent of the always-on circle settings above).
+constexpr int MOUSE_HIGHLIGHTER_DEFAULT_RIPPLE_SIZE = 60;
+constexpr double MOUSE_HIGHLIGHTER_DEFAULT_RIPPLE_INTENSITY = 0.7;
+constexpr int MOUSE_HIGHLIGHTER_DEFAULT_RIPPLE_DURATION_MS = 480;
+constexpr bool MOUSE_HIGHLIGHTER_DEFAULT_RIPPLE_SHOW_DRAG_TRAIL = true;
+constexpr bool MOUSE_HIGHLIGHTER_DEFAULT_RIPPLE_SHOW_RELEASE_PULSE = true;
 
 struct MouseHighlighterSettings
 {
@@ -19,6 +25,12 @@ struct MouseHighlighterSettings
     int fadeDurationMs = MOUSE_HIGHLIGHTER_DEFAULT_DURATION_MS;
     bool autoActivate = MOUSE_HIGHLIGHTER_DEFAULT_AUTO_ACTIVATE;
     bool spotlightMode = false;
+    bool rippleMode = true;
+    int rippleSize = MOUSE_HIGHLIGHTER_DEFAULT_RIPPLE_SIZE;
+    double rippleIntensity = MOUSE_HIGHLIGHTER_DEFAULT_RIPPLE_INTENSITY;
+    int rippleDurationMs = MOUSE_HIGHLIGHTER_DEFAULT_RIPPLE_DURATION_MS;
+    bool rippleShowDragTrail = MOUSE_HIGHLIGHTER_DEFAULT_RIPPLE_SHOW_DRAG_TRAIL;
+    bool rippleShowReleasePulse = MOUSE_HIGHLIGHTER_DEFAULT_RIPPLE_SHOW_RELEASE_PULSE;
 };
 
 int MouseHighlighterMain(HINSTANCE hinst, MouseHighlighterSettings settings);

src/modules/MouseUtils/MouseHighlighter/dllmain.cpp

@@ -21,6 +21,12 @@ namespace
     const wchar_t JSON_KEY_HIGHLIGHT_FADE_DURATION_MS[] = L"highlight_fade_duration_ms";
     const wchar_t JSON_KEY_AUTO_ACTIVATE[] = L"auto_activate";
     const wchar_t JSON_KEY_SPOTLIGHT_MODE[] = L"spotlight_mode";
+    const wchar_t JSON_KEY_RIPPLE_MODE[] = L"ripple_mode";
+    const wchar_t JSON_KEY_RIPPLE_SIZE[] = L"ripple_size";
+    const wchar_t JSON_KEY_RIPPLE_INTENSITY[] = L"ripple_intensity";
+    const wchar_t JSON_KEY_RIPPLE_DURATION_MS[] = L"ripple_duration_ms";
+    const wchar_t JSON_KEY_RIPPLE_SHOW_DRAG_TRAIL[] = L"ripple_show_drag_trail";
+    const wchar_t JSON_KEY_RIPPLE_SHOW_RELEASE_PULSE[] = L"ripple_show_release_pulse";
 }
 
 extern "C" IMAGE_DOS_HEADER __ImageBase;
@@ -392,6 +398,90 @@ public:
             {
                 Logger::warn("Failed to initialize spotlight mode settings. Will use default value");
             }
+            try
+            {
+                // Parse ripple mode
+                auto jsonPropertiesObject = settingsObject.GetNamedObject(JSON_KEY_PROPERTIES).GetNamedObject(JSON_KEY_RIPPLE_MODE);
+                highlightSettings.rippleMode = jsonPropertiesObject.GetNamedBoolean(JSON_KEY_VALUE);
+            }
+            catch (...)
+            {
+                Logger::warn("Failed to initialize ripple mode settings. Will use default value");
+            }
+            try
+            {
+                // Parse ripple size
+                auto jsonPropertiesObject = settingsObject.GetNamedObject(JSON_KEY_PROPERTIES).GetNamedObject(JSON_KEY_RIPPLE_SIZE);
+                int value = static_cast<int>(jsonPropertiesObject.GetNamedNumber(JSON_KEY_VALUE));
+                if (value > 0)
+                {
+                    highlightSettings.rippleSize = value;
+                }
+                else
+                {
+                    throw std::runtime_error("Invalid ripple size value");
+                }
+            }
+            catch (...)
+            {
+                Logger::warn("Failed to initialize ripple size from settings. Will use default value");
+            }
+            try
+            {
+                // Parse ripple intensity
+                auto jsonPropertiesObject = settingsObject.GetNamedObject(JSON_KEY_PROPERTIES).GetNamedObject(JSON_KEY_RIPPLE_INTENSITY);
+                double value = jsonPropertiesObject.GetNamedNumber(JSON_KEY_VALUE);
+                if (value > 0.0)
+                {
+                    highlightSettings.rippleIntensity = value;
+                }
+                else
+                {
+                    throw std::runtime_error("Invalid ripple intensity value");
+                }
+            }
+            catch (...)
+            {
+                Logger::warn("Failed to initialize ripple intensity from settings. Will use default value");
+            }
+            try
+            {
+                // Parse ripple duration
+                auto jsonPropertiesObject = settingsObject.GetNamedObject(JSON_KEY_PROPERTIES).GetNamedObject(JSON_KEY_RIPPLE_DURATION_MS);
+                int value = static_cast<int>(jsonPropertiesObject.GetNamedNumber(JSON_KEY_VALUE));
+                if (value > 0)
+                {
+                    highlightSettings.rippleDurationMs = value;
+                }
+                else
+                {
+                    throw std::runtime_error("Invalid ripple duration value");
+                }
+            }
+            catch (...)
+            {
+                Logger::warn("Failed to initialize ripple duration from settings. Will use default value");
+            }
+            try
+            {
+                // Parse ripple show drag trail
+                auto jsonPropertiesObject = settingsObject.GetNamedObject(JSON_KEY_PROPERTIES).GetNamedObject(JSON_KEY_RIPPLE_SHOW_DRAG_TRAIL);
+                highlightSettings.rippleShowDragTrail = jsonPropertiesObject.GetNamedBoolean(JSON_KEY_VALUE);
+            }
+            catch (...)
+            {
+                Logger::warn("Failed to initialize ripple show drag trail from settings. Will use default value");
+            }
+            try
+            {
+                // Parse ripple show release pulse
+                auto jsonPropertiesObject = settingsObject.GetNamedObject(JSON_KEY_PROPERTIES).GetNamedObject(JSON_KEY_RIPPLE_SHOW_RELEASE_PULSE);
+                highlightSettings.rippleShowReleasePulse = jsonPropertiesObject.GetNamedBoolean(JSON_KEY_VALUE);
+            }
+            catch (...)
+            {
+                Logger::warn("Failed to initialize ripple show release pulse from settings. Will use default value");
+            }
         }
         else
         {

src/modules/PowerScripts/Directory.Build.props

@@ -1,17 +0,0 @@
-<Project>
-  <!--
-    PROTOTYPE-ONLY build props for the PowerScripts module.
-    Intentionally does NOT import the repo-root Directory.Build.props so the
-    prototype stays isolated from StyleCop / TreatWarningsAsErrors / Central
-    Package Management while we iterate. Before promoting PowerScripts out of
-    prototype status, delete this file so the projects inherit the standard
-    PowerToys build configuration and analyzers.
-  -->
-  <PropertyGroup>
-    <ManagePackageVersionsCentrally>false</ManagePackageVersionsCentrally>
-    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
-    <Nullable>enable</Nullable>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <LangVersion>latest</LangVersion>
-  </PropertyGroup>
-</Project>

src/modules/PowerScripts/Directory.Build.targets

@@ -1,3 +0,0 @@
-<Project>
-  <!-- Empty: stops MSBuild from walking up to the repo-root targets for the prototype. -->
-</Project>

src/modules/PowerScripts/Directory.Packages.props

@@ -1,11 +0,0 @@
-<Project>
-  <!--
-    PROTOTYPE-ONLY: stops NuGet from discovering the repo-root Directory.Packages.props and
-    disables Central Package Management so the prototype projects can pin their own PackageReference
-    versions in isolation. Remove together with the local Directory.Build.props when promoting the
-    module to the standard PowerToys build.
-  -->
-  <PropertyGroup>
-    <ManagePackageVersionsCentrally>false</ManagePackageVersionsCentrally>
-  </PropertyGroup>
-</Project>

src/modules/PowerScripts/PowerScripts.Core.Tests/ManifestTests.cs

@@ -1,77 +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 Microsoft.VisualStudio.TestTools.UnitTesting;
-using PowerScripts.Core.Manifest;
-
-namespace PowerScripts.Core.Tests;
-
-[TestClass]
-public class ManifestTests
-{
-    [TestMethod]
-    public void Serializer_RoundTrips_WithCamelCaseEnums()
-    {
-        var manifest = new PowerScriptManifest
-        {
-            Id = "demo",
-            Name = "Demo",
-            Kind = ScriptKind.File,
-            Runtime = ScriptRuntime.PowerShell,
-            Entry = "run.ps1",
-            Input = new ScriptInput { Extensions = { ".png" }, MinFiles = 1, MaxFiles = 0 },
-            Output = new ScriptOutput { Type = ScriptOutputType.SideEffect },
-            Surfaces = { "contextMenu" },
-        };
-
-        var json = ManifestSerializer.Serialize(manifest);
-        StringAssert.Contains(json, "\"kind\": \"file\"");
-        StringAssert.Contains(json, "\"runtime\": \"powerShell\"");
-
-        var back = ManifestSerializer.Deserialize(json);
-        Assert.IsNotNull(back);
-        Assert.AreEqual(ScriptKind.File, back!.Kind);
-        Assert.AreEqual(ScriptOutputType.SideEffect, back.Output!.Type);
-        Assert.AreEqual(".png", back.Input!.Extensions[0]);
-    }
-
-    [TestMethod]
-    public void Validator_Flags_IdFolderMismatch()
-    {
-        var manifest = new PowerScriptManifest { Id = "abc", Name = "x", Entry = "run.ps1" };
-        var errors = ManifestValidator.Validate(manifest, folderName: "different");
-        Assert.IsTrue(errors.Any(e => e.Contains("must match the folder name")));
-    }
-
-    [TestMethod]
-    public void Validator_Flags_FileKind_WithoutExtensions()
-    {
-        var manifest = new PowerScriptManifest
-        {
-            Id = "abc",
-            Name = "x",
-            Entry = "run.ps1",
-            Kind = ScriptKind.File,
-        };
-
-        var errors = ManifestValidator.Validate(manifest, "abc");
-        Assert.IsTrue(errors.Any(e => e.Contains("input.extensions")));
-    }
-
-    [TestMethod]
-    public void Validator_Flags_MaxFiles_LessThanMin()
-    {
-        var manifest = new PowerScriptManifest
-        {
-            Id = "abc",
-            Name = "x",
-            Entry = "run.ps1",
-            Kind = ScriptKind.File,
-            Input = new ScriptInput { Extensions = { ".png" }, MinFiles = 3, MaxFiles = 2 },
-        };
-
-        var errors = ManifestValidator.Validate(manifest, "abc");
-        Assert.IsTrue(errors.Any(e => e.Contains("maxFiles")));
-    }
-}

src/modules/PowerScripts/PowerScripts.Core.Tests/PowerScripts.Core.Tests.csproj

@@ -1,19 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net10.0</TargetFramework>
-    <RootNamespace>PowerScripts.Core.Tests</RootNamespace>
-    <AssemblyName>PowerScripts.Core.Tests</AssemblyName>
-    <IsPackable>false</IsPackable>
-    <IsTestProject>true</IsTestProject>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
-    <PackageReference Include="MSTest.TestAdapter" Version="3.8.3" />
-    <PackageReference Include="MSTest.TestFramework" Version="3.8.3" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\PowerScripts.Core\PowerScripts.Core.csproj" />
-  </ItemGroup>
-</Project>

src/modules/PowerScripts/PowerScripts.Core.Tests/ScriptRegistryTests.cs

@@ -1,130 +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 Microsoft.VisualStudio.TestTools.UnitTesting;
-using PowerScripts.Core.Manifest;
-using PowerScripts.Core.Registry;
-
-namespace PowerScripts.Core.Tests;
-
-[TestClass]
-public class ScriptRegistryTests
-{
-    private string _root = string.Empty;
-
-    [TestInitialize]
-    public void Setup()
-    {
-        _root = Path.Combine(Path.GetTempPath(), "powerscripts-tests-" + Guid.NewGuid().ToString("N"));
-        Directory.CreateDirectory(_root);
-    }
-
-    [TestCleanup]
-    public void Cleanup()
-    {
-        if (Directory.Exists(_root))
-        {
-            Directory.Delete(_root, recursive: true);
-        }
-    }
-
-    private void WriteScript(string id, string manifestJson, string entryFile = "run.ps1")
-    {
-        var folder = Path.Combine(_root, id);
-        Directory.CreateDirectory(folder);
-        File.WriteAllText(Path.Combine(folder, "manifest.json"), manifestJson);
-        File.WriteAllText(Path.Combine(folder, entryFile), "# noop");
-    }
-
-    [TestMethod]
-    public void Load_Skips_Invalid_And_Records_Error()
-    {
-        WriteScript("good", """
-            { "id": "good", "name": "Good", "kind": "system", "entry": "run.ps1" }
-            """);
-
-        // id does not match the folder name -> should be rejected.
-        WriteScript("bad", """
-            { "id": "mismatch", "name": "Bad", "kind": "system", "entry": "run.ps1" }
-            """);
-
-        var registry = new ScriptRegistry(_root);
-        registry.Load();
-
-        Assert.AreEqual(1, registry.Scripts.Count);
-        Assert.AreEqual("good", registry.Scripts[0].Id);
-        Assert.AreEqual(1, registry.Errors.Count);
-    }
-
-    [TestMethod]
-    public void FileScriptsFor_Matches_Extension_And_Wildcard()
-    {
-        WriteScript("png-only", """
-            { "id": "png-only", "name": "PNG", "kind": "file", "entry": "run.ps1",
-              "input": { "extensions": [".png"], "minFiles": 1, "maxFiles": 0 } }
-            """);
-
-        WriteScript("any-file", """
-            { "id": "any-file", "name": "Any", "kind": "file", "entry": "run.ps1",
-              "input": { "extensions": ["*"], "minFiles": 1, "maxFiles": 0 } }
-            """);
-
-        var registry = new ScriptRegistry(_root);
-        registry.Load();
-
-        var forPng = registry.FileScriptsFor(".PNG").Select(s => s.Id).OrderBy(x => x).ToList();
-        CollectionAssert.AreEqual(new[] { "any-file", "png-only" }, forPng);
-
-        var forTxt = registry.FileScriptsFor(".txt").Select(s => s.Id).ToList();
-        CollectionAssert.AreEqual(new[] { "any-file" }, forTxt);
-    }
-
-    [TestMethod]
-    public void FileScriptsForSelection_Respects_MinMax_And_MixedExtensions()
-    {
-        WriteScript("single-png", """
-            { "id": "single-png", "name": "Single PNG", "kind": "file", "entry": "run.ps1",
-              "input": { "extensions": [".png"], "minFiles": 1, "maxFiles": 1 } }
-            """);
-
-        var registry = new ScriptRegistry(_root);
-        registry.Load();
-
-        // Two files exceeds maxFiles=1.
-        Assert.AreEqual(0, registry.FileScriptsForSelection(new[] { "a.png", "b.png" }).Count());
-
-        // One file is fine.
-        Assert.AreEqual(1, registry.FileScriptsForSelection(new[] { "a.png" }).Count());
-
-        // Mixed extensions: not all match .png.
-        Assert.AreEqual(0, registry.FileScriptsForSelection(new[] { "a.txt" }).Count());
-    }
-
-    [TestMethod]
-    public void SystemScripts_Filters_ByKind()
-    {
-        WriteScript("sys", """
-            { "id": "sys", "name": "Sys", "kind": "system", "entry": "run.ps1" }
-            """);
-        WriteScript("file", """
-            { "id": "file", "name": "File", "kind": "file", "entry": "run.ps1",
-              "input": { "extensions": ["*"] } }
-            """);
-
-        var registry = new ScriptRegistry(_root);
-        registry.Load();
-
-        var system = registry.SystemScripts.Select(s => s.Id).ToList();
-        CollectionAssert.AreEqual(new[] { "sys" }, system);
-    }
-
-    [TestMethod]
-    public void Load_EmptyRoot_YieldsNoScripts()
-    {
-        var registry = new ScriptRegistry(_root);
-        registry.Load();
-        Assert.AreEqual(0, registry.Scripts.Count);
-        Assert.AreEqual(0, registry.Errors.Count);
-    }
-}

src/modules/PowerScripts/PowerScripts.Core/Execution/ScriptExecutor.cs

@@ -1,137 +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;
-using PowerScripts.Core.Manifest;
-
-namespace PowerScripts.Core.Execution;
-
-/// <summary>
-/// The outcome of running a PowerScript.
-/// </summary>
-public sealed class ScriptExecutionResult
-{
-    public int ExitCode { get; init; }
-
-    public bool Succeeded => ExitCode == 0;
-
-    public string StdOut { get; init; } = string.Empty;
-
-    public string StdErr { get; init; } = string.Empty;
-}
-
-/// <summary>
-/// Runs a PowerScript. This is the single execution path shared by every surface (context menu,
-/// Keyboard Manager, Command Palette, agents) so behavior and security posture stay consistent.
-///
-/// Prototype security posture: always runs non-elevated under the invoking user's token, with the
-/// PowerShell profile disabled and a per-run execution policy of Bypass scoped to the launched
-/// process only. Signing / capability enforcement is intentionally out of scope for the prototype.
-/// </summary>
-public sealed class ScriptExecutor
-{
-    /// <summary>Environment variable the script can read to get the newline-separated input files.</summary>
-    public const string FilesEnvironmentVariable = "POWERSCRIPTS_FILES";
-
-    public ScriptExecutionResult Execute(
-        PowerScriptManifest manifest,
-        IReadOnlyList<string>? files = null,
-        IReadOnlyDictionary<string, string?>? parameters = null)
-    {
-        if (manifest.Runtime != ScriptRuntime.PowerShell)
-        {
-            throw new NotSupportedException($"Runtime '{manifest.Runtime}' is not supported in the prototype.");
-        }
-
-        if (!File.Exists(manifest.EntryFullPath))
-        {
-            throw new FileNotFoundException("Script entry file not found.", manifest.EntryFullPath);
-        }
-
-        files ??= Array.Empty<string>();
-
-        var psi = new ProcessStartInfo
-        {
-            FileName = ResolvePowerShellExecutable(),
-            UseShellExecute = false,
-            RedirectStandardOutput = true,
-            RedirectStandardError = true,
-            CreateNoWindow = true,
-            WorkingDirectory = manifest.FolderPath,
-        };
-
-        psi.ArgumentList.Add("-NoProfile");
-        psi.ArgumentList.Add("-NonInteractive");
-        psi.ArgumentList.Add("-ExecutionPolicy");
-        psi.ArgumentList.Add("Bypass");
-        psi.ArgumentList.Add("-File");
-        psi.ArgumentList.Add(manifest.EntryFullPath);
-
-        // Files are passed both as a -Files parameter (array binding) and via an environment
-        // variable so scripts can consume whichever is convenient.
-        if (files.Count > 0)
-        {
-            psi.ArgumentList.Add("-Files");
-            foreach (var file in files)
-            {
-                psi.ArgumentList.Add(file);
-            }
-
-            psi.Environment[FilesEnvironmentVariable] = string.Join('\n', files);
-        }
-
-        if (parameters is not null)
-        {
-            foreach (var (name, value) in parameters)
-            {
-                psi.ArgumentList.Add("-" + name);
-                psi.ArgumentList.Add(value ?? string.Empty);
-            }
-        }
-
-        using var process = new Process { StartInfo = psi };
-        process.Start();
-
-        // Read both streams concurrently to avoid pipe deadlock on large output.
-        var stdOutTask = process.StandardOutput.ReadToEndAsync();
-        var stdErrTask = process.StandardError.ReadToEndAsync();
-        process.WaitForExit();
-
-        return new ScriptExecutionResult
-        {
-            ExitCode = process.ExitCode,
-            StdOut = stdOutTask.GetAwaiter().GetResult(),
-            StdErr = stdErrTask.GetAwaiter().GetResult(),
-        };
-    }
-
-    /// <summary>
-    /// Prefers PowerShell 7+ (<c>pwsh</c>); falls back to Windows PowerShell (<c>powershell</c>).
-    /// </summary>
-    private static string ResolvePowerShellExecutable()
-    {
-        return ExistsOnPath("pwsh.exe") ? "pwsh.exe" : "powershell.exe";
-    }
-
-    private static bool ExistsOnPath(string fileName)
-    {
-        var pathVar = Environment.GetEnvironmentVariable("PATH") ?? string.Empty;
-        foreach (var dir in pathVar.Split(Path.PathSeparator, StringSplitOptions.RemoveEmptyEntries))
-        {
-            try
-            {
-                if (File.Exists(Path.Combine(dir.Trim(), fileName)))
-                {
-                    return true;
-                }
-            }
-            catch
-            {
-                // Ignore malformed PATH entries.
-            }
-        }
-
-        return false;
-    }
-}

src/modules/PowerScripts/PowerScripts.Core/Manifest/ManifestSerializer.cs

@@ -1,38 +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.Text.Json;
-using System.Text.Json.Serialization;
-
-namespace PowerScripts.Core.Manifest;
-
-/// <summary>
-/// Centralized JSON options and (de)serialization helpers for PowerScript manifests.
-/// </summary>
-public static class ManifestSerializer
-{
-    public static JsonSerializerOptions Options { get; } = CreateOptions();
-
-    private static JsonSerializerOptions CreateOptions()
-    {
-        var options = new JsonSerializerOptions
-        {
-            PropertyNamingPolicy = JsonNamingPolicy.CamelCase,
-            PropertyNameCaseInsensitive = true,
-            ReadCommentHandling = JsonCommentHandling.Skip,
-            AllowTrailingCommas = true,
-            WriteIndented = true,
-            DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull,
-        };
-
-        options.Converters.Add(new JsonStringEnumConverter(JsonNamingPolicy.CamelCase));
-        return options;
-    }
-
-    public static PowerScriptManifest? Deserialize(string json) =>
-        JsonSerializer.Deserialize<PowerScriptManifest>(json, Options);
-
-    public static string Serialize(PowerScriptManifest manifest) =>
-        JsonSerializer.Serialize(manifest, Options);
-}

src/modules/PowerScripts/PowerScripts.Core/Manifest/ManifestValidator.cs

@@ -1,60 +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 PowerScripts.Core.Manifest;
-
-/// <summary>
-/// Validates a parsed manifest. Returns human-readable errors rather than throwing so the registry
-/// can skip a single bad script without failing the whole catalogue.
-/// </summary>
-public static class ManifestValidator
-{
-    public static IReadOnlyList<string> Validate(PowerScriptManifest manifest, string folderName)
-    {
-        var errors = new List<string>();
-
-        if (string.IsNullOrWhiteSpace(manifest.Id))
-        {
-            errors.Add("'id' is required.");
-        }
-        else if (!string.Equals(manifest.Id, folderName, StringComparison.OrdinalIgnoreCase))
-        {
-            errors.Add($"'id' ('{manifest.Id}') must match the folder name ('{folderName}').");
-        }
-
-        if (string.IsNullOrWhiteSpace(manifest.Name))
-        {
-            errors.Add("'name' is required.");
-        }
-
-        if (string.IsNullOrWhiteSpace(manifest.Entry))
-        {
-            errors.Add("'entry' is required.");
-        }
-        else if (!string.IsNullOrEmpty(manifest.FolderPath) && !File.Exists(manifest.EntryFullPath))
-        {
-            errors.Add($"entry script not found: '{manifest.Entry}'.");
-        }
-
-        if (manifest.Kind == ScriptKind.File)
-        {
-            if (manifest.Input is null || manifest.Input.Extensions.Count == 0)
-            {
-                errors.Add("file scripts must declare 'input.extensions'.");
-            }
-
-            if (manifest.Input is { MinFiles: < 1 })
-            {
-                errors.Add("'input.minFiles' must be at least 1.");
-            }
-
-            if (manifest.Input is { MaxFiles: > 0 } input && input.MaxFiles < input.MinFiles)
-            {
-                errors.Add("'input.maxFiles' must be 0 (unbounded) or >= minFiles.");
-            }
-        }
-
-        return errors;
-    }
-}

src/modules/PowerScripts/PowerScripts.Core/Manifest/PowerScriptManifest.cs

@@ -1,142 +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.Text.Json.Serialization;
-
-namespace PowerScripts.Core.Manifest;
-
-/// <summary>
-/// What a PowerScript operates on.
-/// </summary>
-public enum ScriptKind
-{
-    /// <summary>Acts on the PC; no file input. Surfaced via hotkey / Command Palette.</summary>
-    System,
-
-    /// <summary>Acts on one or more input files of a declared type. Surfaced in the right-click menu.</summary>
-    File,
-}
-
-/// <summary>
-/// The runtime used to execute a PowerScript. Only PowerShell is supported in the prototype;
-/// the field exists so Python / Node can be added without a schema break.
-/// </summary>
-public enum ScriptRuntime
-{
-    PowerShell,
-}
-
-/// <summary>
-/// The kind of result a file PowerScript produces.
-/// </summary>
-public enum ScriptOutputType
-{
-    None,
-
-    /// <summary>Produces a converted file (e.g. HEIC -> JPG).</summary>
-    ConvertedFile,
-
-    /// <summary>Performs a side effect (e.g. checksum, OCR, strip metadata).</summary>
-    SideEffect,
-}
-
-/// <summary>
-/// Declares the file input contract for a <see cref="ScriptKind.File"/> script.
-/// </summary>
-public sealed class ScriptInput
-{
-    /// <summary>File extensions this script accepts (e.g. ".heic"). "*" means any extension.</summary>
-    public List<string> Extensions { get; set; } = new();
-
-    /// <summary>Minimum number of files required.</summary>
-    public int MinFiles { get; set; } = 1;
-
-    /// <summary>Maximum number of files; 0 means unbounded.</summary>
-    public int MaxFiles { get; set; }
-}
-
-/// <summary>
-/// Declares the output contract for a <see cref="ScriptKind.File"/> script.
-/// </summary>
-public sealed class ScriptOutput
-{
-    public ScriptOutputType Type { get; set; } = ScriptOutputType.None;
-
-    /// <summary>For <see cref="ScriptOutputType.ConvertedFile"/>: the produced extension (e.g. ".jpg").</summary>
-    public string? Extension { get; set; }
-}
-
-/// <summary>
-/// A typed, user-editable parameter passed to the script.
-/// </summary>
-public sealed class ScriptParameter
-{
-    public string Name { get; set; } = string.Empty;
-
-    /// <summary>One of: "string", "int", "bool".</summary>
-    public string Type { get; set; } = "string";
-
-    public string? Default { get; set; }
-
-    public int? Min { get; set; }
-
-    public int? Max { get; set; }
-}
-
-/// <summary>
-/// The on-disk description of a single PowerScript. One script lives in its own folder containing
-/// a <c>manifest.json</c> (this type) plus the script body referenced by <see cref="Entry"/>.
-/// </summary>
-public sealed class PowerScriptManifest
-{
-    public int SchemaVersion { get; set; } = 1;
-
-    /// <summary>Stable identifier; must match the containing folder name.</summary>
-    public string Id { get; set; } = string.Empty;
-
-    public string Name { get; set; } = string.Empty;
-
-    public string Description { get; set; } = string.Empty;
-
-    /// <summary>Optional icon file name, relative to the script folder.</summary>
-    public string? Icon { get; set; }
-
-    public ScriptKind Kind { get; set; }
-
-    public ScriptRuntime Runtime { get; set; } = ScriptRuntime.PowerShell;
-
-    /// <summary>Script body file name, relative to the script folder (e.g. "run.ps1").</summary>
-    public string Entry { get; set; } = string.Empty;
-
-    /// <summary>File input contract; required for <see cref="ScriptKind.File"/>.</summary>
-    public ScriptInput? Input { get; set; }
-
-    public ScriptOutput? Output { get; set; }
-
-    public List<ScriptParameter> Parameters { get; set; } = new();
-
-    /// <summary>Where the script appears, e.g. "contextMenu", "keyboardManager", "commandPalette".</summary>
-    public List<string> Surfaces { get; set; } = new();
-
-    /// <summary>
-    /// Declared capabilities (e.g. "fileRead", "fileWrite", "process"). Doubles as the user-consent
-    /// string and the permission contract an agent / MCP server must respect.
-    /// </summary>
-    public List<string> Capabilities { get; set; } = new();
-
-    /// <summary>Prototype always runs "asInvoker" (non-elevated).</summary>
-    public string Elevation { get; set; } = "asInvoker";
-
-    /// <summary>Absolute path to the folder that contains this manifest. Populated by the registry.</summary>
-    [JsonIgnore]
-    public string FolderPath { get; set; } = string.Empty;
-
-    /// <summary>Absolute path to the script body file.</summary>
-    [JsonIgnore]
-    public string EntryFullPath => string.IsNullOrEmpty(FolderPath) ? Entry : Path.Combine(FolderPath, Entry);
-
-    /// <summary>True if this script declares the given surface (case-insensitive).</summary>
-    public bool HasSurface(string surface) =>
-        Surfaces.Any(s => string.Equals(s, surface, StringComparison.OrdinalIgnoreCase));
-}

src/modules/PowerScripts/PowerScripts.Core/PowerScripts.Core.csproj

@@ -1,7 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net10.0</TargetFramework>
-    <RootNamespace>PowerScripts.Core</RootNamespace>
-    <AssemblyName>PowerScripts.Core</AssemblyName>
-  </PropertyGroup>
-</Project>

src/modules/PowerScripts/PowerScripts.Core/PowerScriptsPaths.cs

@@ -1,108 +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.Text.Json;
-
-namespace PowerScripts.Core;
-
-/// <summary>
-/// Well-known filesystem locations for the PowerScripts module. The scripts root can be overridden
-/// (explicit path, environment variable, or a persisted user setting) which keeps tests and ad-hoc
-/// runs hermetic and lets the user point PowerScripts at their own folder from Settings.
-/// </summary>
-public static class PowerScriptsPaths
-{
-    /// <summary>Environment variable that overrides the default scripts root.</summary>
-    public const string RootEnvironmentVariable = "POWERSCRIPTS_ROOT";
-
-    /// <summary>The folder a single script lives in must contain a file with this name.</summary>
-    public const string ManifestFileName = "manifest.json";
-
-    /// <summary>The user-settings file name persisted next to the module data.</summary>
-    public const string ConfigFileName = "config.json";
-
-    /// <summary>
-    /// The module's data directory: <c>%LOCALAPPDATA%\Microsoft\PowerToys\PowerScripts</c>.
-    /// </summary>
-    public static string ModuleDirectory
-    {
-        get
-        {
-            var localAppData = Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData);
-            return Path.Combine(localAppData, "Microsoft", "PowerToys", "PowerScripts");
-        }
-    }
-
-    /// <summary>The user-settings file that persists the chosen scripts root.</summary>
-    public static string ConfigFilePath => Path.Combine(ModuleDirectory, ConfigFileName);
-
-    /// <summary>
-    /// Default scripts root:
-    /// <c>%LOCALAPPDATA%\Microsoft\PowerToys\PowerScripts\scripts</c>.
-    /// </summary>
-    public static string DefaultScriptsRoot => Path.Combine(ModuleDirectory, "scripts");
-
-    /// <summary>
-    /// Resolves the scripts root, honoring (in order): an explicit path, the environment override,
-    /// the persisted user setting, then the default.
-    /// </summary>
-    public static string ResolveScriptsRoot(string? explicitRoot = null)
-    {
-        if (!string.IsNullOrWhiteSpace(explicitRoot))
-        {
-            return explicitRoot;
-        }
-
-        var fromEnv = Environment.GetEnvironmentVariable(RootEnvironmentVariable);
-        if (!string.IsNullOrWhiteSpace(fromEnv))
-        {
-            return fromEnv;
-        }
-
-        var fromConfig = ReadConfiguredScriptsRoot();
-        return string.IsNullOrWhiteSpace(fromConfig) ? DefaultScriptsRoot : fromConfig;
-    }
-
-    /// <summary>
-    /// Reads the user-chosen scripts root from <see cref="ConfigFilePath"/>, or <c>null</c> if it is
-    /// missing, empty, or unreadable.
-    /// </summary>
-    public static string? ReadConfiguredScriptsRoot()
-    {
-        try
-        {
-            if (!File.Exists(ConfigFilePath))
-            {
-                return null;
-            }
-
-            using var stream = File.OpenRead(ConfigFilePath);
-            using var document = JsonDocument.Parse(stream);
-            if (document.RootElement.TryGetProperty("scriptsRoot", out var value) &&
-                value.ValueKind == JsonValueKind.String)
-            {
-                var root = value.GetString();
-                return string.IsNullOrWhiteSpace(root) ? null : root;
-            }
-        }
-        catch (Exception)
-        {
-            // A corrupt or unreadable config simply falls back to the default.
-        }
-
-        return null;
-    }
-
-    /// <summary>
-    /// Persists the user-chosen scripts root to <see cref="ConfigFilePath"/>. Passing <c>null</c> or
-    /// whitespace clears the override so the default is used again.
-    /// </summary>
-    public static void SaveConfiguredScriptsRoot(string? root)
-    {
-        Directory.CreateDirectory(ModuleDirectory);
-        var normalized = string.IsNullOrWhiteSpace(root) ? string.Empty : root.Trim();
-        var json = JsonSerializer.Serialize(new { scriptsRoot = normalized }, new JsonSerializerOptions { WriteIndented = true });
-        File.WriteAllText(ConfigFilePath, json);
-    }
-}

src/modules/PowerScripts/PowerScripts.Core/Registry/ScriptRegistry.cs

@@ -1,145 +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 PowerScripts.Core.Manifest;
-
-namespace PowerScripts.Core.Registry;
-
-/// <summary>
-/// A manifest that failed to load or validate, kept so the UI can surface problems.
-/// </summary>
-public sealed record ScriptLoadError(string FolderPath, string Message);
-
-/// <summary>
-/// The single source of truth for installed PowerScripts. Every surface (context menu, Keyboard
-/// Manager editor, Command Palette, agents) reads from this registry rather than defining scripts
-/// of its own. The registry only reads the filesystem; it never executes anything.
-/// </summary>
-public sealed class ScriptRegistry
-{
-    private readonly List<PowerScriptManifest> _scripts = new();
-    private readonly List<ScriptLoadError> _errors = new();
-
-    public ScriptRegistry(string? root = null)
-    {
-        Root = PowerScriptsPaths.ResolveScriptsRoot(root);
-    }
-
-    /// <summary>Absolute path to the scanned scripts root.</summary>
-    public string Root { get; }
-
-    public IReadOnlyList<PowerScriptManifest> Scripts => _scripts;
-
-    public IReadOnlyList<ScriptLoadError> Errors => _errors;
-
-    /// <summary>
-    /// Scans <see cref="Root"/> for <c>&lt;id&gt;/manifest.json</c> folders, parses and validates each,
-    /// and rebuilds the in-memory catalogue. Bad scripts are recorded in <see cref="Errors"/> and skipped.
-    /// </summary>
-    public void Load()
-    {
-        _scripts.Clear();
-        _errors.Clear();
-
-        if (!Directory.Exists(Root))
-        {
-            return;
-        }
-
-        foreach (var folder in Directory.EnumerateDirectories(Root))
-        {
-            var manifestPath = Path.Combine(folder, PowerScriptsPaths.ManifestFileName);
-            if (!File.Exists(manifestPath))
-            {
-                continue;
-            }
-
-            PowerScriptManifest? manifest;
-            try
-            {
-                manifest = ManifestSerializer.Deserialize(File.ReadAllText(manifestPath));
-            }
-            catch (Exception ex)
-            {
-                _errors.Add(new ScriptLoadError(folder, $"failed to parse manifest.json: {ex.Message}"));
-                continue;
-            }
-
-            if (manifest is null)
-            {
-                _errors.Add(new ScriptLoadError(folder, "manifest.json deserialized to null."));
-                continue;
-            }
-
-            manifest.FolderPath = folder;
-
-            var folderName = new DirectoryInfo(folder).Name;
-            var validationErrors = ManifestValidator.Validate(manifest, folderName);
-            if (validationErrors.Count > 0)
-            {
-                _errors.Add(new ScriptLoadError(folder, string.Join(" ", validationErrors)));
-                continue;
-            }
-
-            _scripts.Add(manifest);
-        }
-
-        _scripts.Sort((a, b) => string.Compare(a.Name, b.Name, StringComparison.OrdinalIgnoreCase));
-    }
-
-    public PowerScriptManifest? Get(string id) =>
-        _scripts.FirstOrDefault(s => string.Equals(s.Id, id, StringComparison.OrdinalIgnoreCase));
-
-    /// <summary>System scripts (no file input) — candidates for Keyboard Manager / Command Palette.</summary>
-    public IEnumerable<PowerScriptManifest> SystemScripts =>
-        _scripts.Where(s => s.Kind == ScriptKind.System);
-
-    /// <summary>
-    /// File scripts whose declared input extensions match the given file extension (e.g. ".png").
-    /// A declared extension of "*" matches anything. Used to build the right-click submenu.
-    /// </summary>
-    public IEnumerable<PowerScriptManifest> FileScriptsFor(string extension)
-    {
-        var ext = NormalizeExtension(extension);
-        return _scripts.Where(s =>
-            s.Kind == ScriptKind.File &&
-            s.Input is not null &&
-            s.Input.Extensions.Any(e => MatchesExtension(e, ext)));
-    }
-
-    /// <summary>
-    /// File scripts that accept <em>all</em> of the given files (every extension matches and the
-    /// count is within the declared min/max). Used when a multi-file selection is right-clicked.
-    /// </summary>
-    public IEnumerable<PowerScriptManifest> FileScriptsForSelection(IReadOnlyCollection<string> files)
-    {
-        var extensions = files.Select(f => NormalizeExtension(Path.GetExtension(f))).Distinct().ToList();
-        return _scripts.Where(s =>
-            s.Kind == ScriptKind.File &&
-            s.Input is not null &&
-            extensions.All(ext => s.Input.Extensions.Any(e => MatchesExtension(e, ext))) &&
-            files.Count >= s.Input.MinFiles &&
-            (s.Input.MaxFiles == 0 || files.Count <= s.Input.MaxFiles));
-    }
-
-    private static string NormalizeExtension(string extension)
-    {
-        if (string.IsNullOrEmpty(extension))
-        {
-            return string.Empty;
-        }
-
-        return extension.StartsWith('.') ? extension.ToLowerInvariant() : "." + extension.ToLowerInvariant();
-    }
-
-    private static bool MatchesExtension(string declared, string normalizedTarget)
-    {
-        if (declared == "*")
-        {
-            return true;
-        }
-
-        return string.Equals(NormalizeExtension(declared), normalizedTarget, StringComparison.OrdinalIgnoreCase);
-    }
-}

src/modules/PowerScripts/PowerScripts.Host/PowerScripts.Host.csproj

@@ -1,13 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <TargetFramework>net10.0-windows</TargetFramework>
-    <RootNamespace>PowerScripts.Host</RootNamespace>
-    <AssemblyName>PowerScripts.Host</AssemblyName>
-    <InvariantGlobalization>true</InvariantGlobalization>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\PowerScripts.Core\PowerScripts.Core.csproj" />
-  </ItemGroup>
-</Project>

src/modules/PowerScripts/PowerScripts.Host/Program.cs

@@ -1,361 +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.Text.Json;
-using PowerScripts.Core;
-using PowerScripts.Core.Execution;
-using PowerScripts.Core.Manifest;
-using PowerScripts.Core.Registry;
-
-namespace PowerScripts.Host;
-
-/// <summary>
-/// The shared PowerScripts executor / catalogue CLI.
-///
-/// This is the single invocation entry point every surface points at:
-///   - Keyboard Manager maps a hotkey to:        PowerScripts.Host.exe run &lt;id&gt;
-///   - The Explorer context menu invokes:         PowerScripts.Host.exe run &lt;id&gt; --files &lt;paths&gt;
-///   - The KBM editor / agents enumerate via:     PowerScripts.Host.exe list --json
-///
-/// Usage:
-///   PowerScripts.Host list [--json] [--root &lt;dir&gt;]
-///   PowerScripts.Host run &lt;id&gt; [--files &lt;f1&gt; &lt;f2&gt; ...] [--set name=value ...] [--root &lt;dir&gt;]
-/// </summary>
-internal static class Program
-{
-    private static int Main(string[] args)
-    {
-        try
-        {
-            if (args.Length == 0)
-            {
-                PrintUsage();
-                return 1;
-            }
-
-            var (positional, options) = ParseArgs(args.Skip(1).ToArray());
-            var root = options.TryGetValue("root", out var r) ? r.FirstOrDefault() : null;
-
-            var registry = new ScriptRegistry(root);
-            registry.Load();
-
-            return args[0].ToLowerInvariant() switch
-            {
-                "list" => RunList(registry, options.ContainsKey("json")),
-                "run" => RunScript(registry, positional, options),
-                "kbm" => RunKbm(registry, positional, options.ContainsKey("json")),
-                "set-extensions" => RunSetExtensions(registry, positional, options),
-                "shell-menu" => RunShellMenu(registry, options),
-                "shell-install" => ShellRegistration.Install(registry, Environment.ProcessPath ?? "PowerScripts.Host.exe"),
-                "shell-uninstall" => ShellRegistration.Uninstall(registry),
-                "-h" or "--help" or "help" => PrintUsage(),
-                _ => Unknown(args[0]),
-            };
-        }
-        catch (Exception ex)
-        {
-            Console.Error.WriteLine($"PowerScripts error: {ex.Message}");
-            return 2;
-        }
-    }
-
-    private static int RunList(ScriptRegistry registry, bool asJson)
-    {
-        if (asJson)
-        {
-            // Structured, permissioned capability list — also the shape the KBM editor picker and
-            // future agents/MCP servers consume.
-            var projection = registry.Scripts.Select(s => new
-            {
-                s.Id,
-                s.Name,
-                s.Description,
-                kind = s.Kind.ToString(),
-                runtime = s.Runtime.ToString(),
-                s.Surfaces,
-                s.Capabilities,
-                input = s.Input,
-                parameters = s.Parameters,
-            });
-
-            Console.WriteLine(JsonSerializer.Serialize(
-                projection,
-                new JsonSerializerOptions
-                {
-                    WriteIndented = true,
-                    PropertyNamingPolicy = JsonNamingPolicy.CamelCase,
-                }));
-            return 0;
-        }
-
-        Console.WriteLine($"Scripts root: {registry.Root}");
-        if (registry.Scripts.Count == 0)
-        {
-            Console.WriteLine("(no scripts found)");
-        }
-
-        foreach (var s in registry.Scripts)
-        {
-            Console.WriteLine($"  {s.Id,-24} [{s.Kind,-6}] {s.Name}");
-        }
-
-        foreach (var e in registry.Errors)
-        {
-            Console.Error.WriteLine($"  ! {e.FolderPath}: {e.Message}");
-        }
-
-        return 0;
-    }
-
-    private static int RunScript(
-        ScriptRegistry registry,
-        IReadOnlyList<string> positional,
-        IReadOnlyDictionary<string, List<string>> options)
-    {
-        if (positional.Count == 0)
-        {
-            Console.Error.WriteLine("run: missing <id>.");
-            return 1;
-        }
-
-        var id = positional[0];
-        var manifest = registry.Get(id);
-        if (manifest is null)
-        {
-            Console.Error.WriteLine($"run: no script with id '{id}'. Try 'list'.");
-            return 1;
-        }
-
-        var files = options.TryGetValue("files", out var f) ? f : new List<string>();
-
-        var parameters = new Dictionary<string, string?>();
-        if (options.TryGetValue("set", out var sets))
-        {
-            foreach (var kv in sets)
-            {
-                var idx = kv.IndexOf('=');
-                if (idx <= 0)
-                {
-                    Console.Error.WriteLine($"run: --set expects name=value, got '{kv}'.");
-                    return 1;
-                }
-
-                parameters[kv[..idx]] = kv[(idx + 1)..];
-            }
-        }
-
-        var executor = new ScriptExecutor();
-        var result = executor.Execute(manifest, files, parameters);
-
-        if (!string.IsNullOrEmpty(result.StdOut))
-        {
-            Console.Out.Write(result.StdOut);
-        }
-
-        if (!string.IsNullOrEmpty(result.StdErr))
-        {
-            Console.Error.Write(result.StdErr);
-        }
-
-        return result.ExitCode;
-    }
-
-    /// <summary>
-    /// Emits the Keyboard Manager "Run Program" mapping for a system PowerScript so a user (or the
-    /// future KBM editor picker) can bind a hotkey to it. KBM's existing RunProgram action already
-    /// supports this — no KBM engine change is needed. The app path + args go straight into the
-    /// editor's "Run Program" fields; <c>--json</c> emits the on-disk mapping shape (the user still
-    /// chooses the trigger keys, so <c>originalKeys</c> is left as a placeholder).
-    /// </summary>
-    private static int RunKbm(ScriptRegistry registry, IReadOnlyList<string> positional, bool asJson)
-    {
-        if (positional.Count == 0)
-        {
-            Console.Error.WriteLine("kbm: missing <id>.");
-            return 1;
-        }
-
-        var manifest = registry.Get(positional[0]);
-        if (manifest is null)
-        {
-            Console.Error.WriteLine($"kbm: no script with id '{positional[0]}'. Try 'list'.");
-            return 1;
-        }
-
-        var hostPath = Environment.ProcessPath ?? "PowerScripts.Host.exe";
-        var programArgs = $"run {manifest.Id}";
-
-        if (asJson)
-        {
-            // Field names match the KBM engine (see common/KeyboardManagerConstants.h /
-            // MappingConfiguration.cpp). Append this to remapShortcutsToRunProgram and set
-            // originalKeys to your chosen trigger (e.g. "162;91;83" for Ctrl+Win+S).
-            var mapping = new Dictionary<string, object>
-            {
-                ["originalKeys"] = "<set-your-trigger-keys>",
-                ["operationType"] = 1,
-                ["runProgramFilePath"] = hostPath,
-                ["runProgramArgs"] = programArgs,
-                ["runProgramStartInDir"] = string.Empty,
-                ["runProgramElevationLevel"] = 0,
-                ["runProgramAlreadyRunningAction"] = 0,
-                ["runProgramStartWindowType"] = 0,
-                ["unicodeText"] = "*Unsupported*",
-            };
-
-            Console.WriteLine(JsonSerializer.Serialize(mapping, new JsonSerializerOptions { WriteIndented = true }));
-            return 0;
-        }
-
-        Console.WriteLine($"PowerScript '{manifest.Id}' ({manifest.Name}) — Keyboard Manager 'Run Program' action:");
-        Console.WriteLine($"  Program:    {hostPath}");
-        Console.WriteLine($"  Arguments:  {programArgs}");
-        Console.WriteLine();
-        Console.WriteLine("In Keyboard Manager: Remap a shortcut -> action 'Run Program', paste the values above,");
-        Console.WriteLine("then pick the trigger shortcut. (Use 'kbm <id> --json' for the raw mapping object.)");
-        return 0;
-    }
-
-    /// <summary>
-    /// Emits the file scripts that match a right-clicked selection as tab-separated
-    /// <c>&lt;id&gt;\t&lt;name&gt;</c> lines (one per script). This is the machine-readable feed the
-    /// Windows 11 modern context-menu handler (IExplorerCommand) consumes to build its submenu; a
-    /// line-based format keeps the native handler free of a JSON parser.
-    /// </summary>
-    private static int RunShellMenu(ScriptRegistry registry, IReadOnlyDictionary<string, List<string>> options)
-    {
-        var files = options.TryGetValue("files", out var f) ? f : new List<string>();
-        if (files.Count == 0)
-        {
-            return 0;
-        }
-
-        foreach (var script in registry.FileScriptsForSelection(files))
-        {
-            Console.WriteLine($"{script.Id}\t{script.Name}");
-        }
-
-        return 0;
-    }
-
-    /// <summary>
-    /// Rewrites a file script's declared input extensions in its manifest.json. This is the write
-    /// side of the Settings "trigger on these file types" editor; the user picks the extensions and
-    /// every surface (context menu, selection matching) then reflects them. System scripts have no
-    /// file input, so they are rejected.
-    /// </summary>
-    private static int RunSetExtensions(
-        ScriptRegistry registry,
-        IReadOnlyList<string> positional,
-        IReadOnlyDictionary<string, List<string>> options)
-    {
-        if (positional.Count == 0)
-        {
-            Console.Error.WriteLine("set-extensions: missing <id>.");
-            return 1;
-        }
-
-        var manifest = registry.Get(positional[0]);
-        if (manifest is null)
-        {
-            Console.Error.WriteLine($"set-extensions: no script with id '{positional[0]}'. Try 'list'.");
-            return 1;
-        }
-
-        if (manifest.Kind != ScriptKind.File)
-        {
-            Console.Error.WriteLine($"set-extensions: '{manifest.Id}' is a {manifest.Kind} script; extensions only apply to File scripts.");
-            return 1;
-        }
-
-        var raw = options.TryGetValue("ext", out var values) ? values : new List<string>();
-        var normalized = raw
-            .SelectMany(v => v.Split(new[] { ',', ';', ' ' }, StringSplitOptions.RemoveEmptyEntries))
-            .Select(NormalizeExtension)
-            .Where(e => !string.IsNullOrEmpty(e))
-            .Distinct(StringComparer.OrdinalIgnoreCase)
-            .ToList();
-
-        if (normalized.Count == 0)
-        {
-            Console.Error.WriteLine("set-extensions: at least one extension is required (e.g. --ext .md .txt).");
-            return 1;
-        }
-
-        manifest.Input ??= new ScriptInput();
-        manifest.Input.Extensions = normalized;
-
-        var manifestPath = Path.Combine(manifest.FolderPath, PowerScriptsPaths.ManifestFileName);
-        File.WriteAllText(manifestPath, ManifestSerializer.Serialize(manifest));
-
-        Console.WriteLine($"set-extensions: {manifest.Id} -> [{string.Join(", ", normalized)}]");
-        return 0;
-    }
-
-    /// <summary>Normalizes a user-typed extension to lower-case with a leading dot ("md" -> ".md").</summary>
-    private static string NormalizeExtension(string raw)
-    {
-        var e = raw.Trim().ToLowerInvariant();
-        if (string.IsNullOrEmpty(e) || e == "*")
-        {
-            return e;
-        }
-
-        return e.StartsWith('.') ? e : "." + e;
-    }
-
-    /// <summary>
-    /// Minimal parser. Recognizes <c>--name value [value ...]</c> (multi-value, e.g. --files) and
-    /// <c>--flag</c> (no value, e.g. --json). Everything else is positional.
-    /// </summary>
-    private static (List<string> Positional, Dictionary<string, List<string>> Options) ParseArgs(string[] args)
-    {
-        var positional = new List<string>();
-        var options = new Dictionary<string, List<string>>(StringComparer.OrdinalIgnoreCase);
-
-        string? current = null;
-        foreach (var arg in args)
-        {
-            if (arg.StartsWith("--", StringComparison.Ordinal))
-            {
-                current = arg[2..];
-                if (!options.ContainsKey(current))
-                {
-                    options[current] = new List<string>();
-                }
-            }
-            else if (current is not null)
-            {
-                options[current].Add(arg);
-            }
-            else
-            {
-                positional.Add(arg);
-            }
-        }
-
-        return (positional, options);
-    }
-
-    private static int Unknown(string command)
-    {
-        Console.Error.WriteLine($"Unknown command '{command}'.");
-        PrintUsage();
-        return 1;
-    }
-
-    private static int PrintUsage()
-    {
-        Console.WriteLine("PowerScripts.Host — run and enumerate PowerScripts.");
-        Console.WriteLine();
-        Console.WriteLine("  list [--json] [--root <dir>]");
-        Console.WriteLine("  run <id> [--files <f1> <f2> ...] [--set name=value ...] [--root <dir>]");
-        Console.WriteLine("  kbm <id> [--json] [--root <dir>]    (Keyboard Manager 'Run Program' mapping)");
-        Console.WriteLine("  set-extensions <id> --ext <.md .txt ...>  (set a file script's trigger extensions)");
-        Console.WriteLine("  shell-menu --files <f1> <f2> ...    (tab-separated id/name of matching file scripts)");
-        Console.WriteLine("  shell-install [--root <dir>]        (register the Explorer right-click submenu)");
-        Console.WriteLine("  shell-uninstall [--root <dir>]      (remove the Explorer right-click submenu)");
-        return 0;
-    }
-}

src/modules/PowerScripts/PowerScripts.Host/ShellRegistration.cs

@@ -1,134 +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 Microsoft.Win32;
-using PowerScripts.Core.Manifest;
-using PowerScripts.Core.Registry;
-
-namespace PowerScripts.Host;
-
-/// <summary>
-/// Registers / unregisters the Explorer right-click "PowerScript" cascading submenu for file
-/// PowerScripts. For each file extension declared by a script, it writes a per-user shell verb under
-/// <c>HKCU\Software\Classes\SystemFileAssociations\&lt;ext&gt;\shell\PowerScripts</c> whose nested
-/// sub-verbs (one per matching script) invoke <c>PowerScripts.Host.exe run &lt;id&gt; --files "%1"</c>.
-///
-/// This is the prototype's context-menu surface: it needs no COM DLL and is driven entirely by the
-/// script registry, so right-click works immediately and reflects the installed scripts. The
-/// PowerScripts module (runner) calls <c>shell-install</c> on enable and <c>shell-uninstall</c> on
-/// disable.
-/// </summary>
-internal static class ShellRegistration
-{
-    private const string RootVerb = "PowerScripts";
-    private const string MenuLabel = "PowerScript";
-    private const string ClassesRoot = @"Software\Classes\SystemFileAssociations";
-
-    /// <summary>Marker value so uninstall only removes keys this tool created.</summary>
-    private const string OwnerMarkerName = "PowerScriptsOwned";
-
-    public static int Install(ScriptRegistry registry, string hostExePath)
-    {
-        // Group file scripts by each declared extension (skip the "*" wildcard for the static menu).
-        var byExtension = new Dictionary<string, List<PowerScriptManifest>>(StringComparer.OrdinalIgnoreCase);
-        foreach (var script in registry.Scripts.Where(s => s.Kind == ScriptKind.File && s.Input is not null))
-        {
-            foreach (var rawExt in script.Input!.Extensions)
-            {
-                if (rawExt == "*")
-                {
-                    continue;
-                }
-
-                var ext = rawExt.StartsWith('.') ? rawExt : "." + rawExt;
-                if (!byExtension.TryGetValue(ext, out var list))
-                {
-                    list = new List<PowerScriptManifest>();
-                    byExtension[ext] = list;
-                }
-
-                list.Add(script);
-            }
-        }
-
-        if (byExtension.Count == 0)
-        {
-            Console.WriteLine("shell-install: no file scripts with concrete extensions to register.");
-            return 0;
-        }
-
-        foreach (var (ext, scripts) in byExtension)
-        {
-            RemoveVerbForExtension(ext);
-
-            var verbPath = $@"{ClassesRoot}\{ext}\shell\{RootVerb}";
-            using var verbKey = Microsoft.Win32.Registry.CurrentUser.CreateSubKey(verbPath)!;
-            verbKey.SetValue("MUIVerb", MenuLabel);
-            verbKey.SetValue(OwnerMarkerName, 1, RegistryValueKind.DWord);
-
-            // Presence of "SubCommands" makes Explorer render the nested \shell verbs as a submenu.
-            verbKey.SetValue("SubCommands", string.Empty);
-
-            using var subShell = verbKey.CreateSubKey("shell")!;
-            foreach (var script in scripts)
-            {
-                using var item = subShell.CreateSubKey(script.Id)!;
-                item.SetValue("MUIVerb", script.Name);
-                using var command = item.CreateSubKey("command")!;
-                command.SetValue(null, $"\"{hostExePath}\" run {script.Id} --files \"%1\"");
-            }
-
-            Console.WriteLine($"  registered {scripts.Count} script(s) for {ext}");
-        }
-
-        Console.WriteLine($"shell-install: done ({byExtension.Count} extension(s)).");
-        return 0;
-    }
-
-    public static int Uninstall(ScriptRegistry registry)
-    {
-        // Remove for every extension currently declared, plus best-effort sweep is unnecessary since
-        // we only ever create owned keys.
-        var extensions = registry.Scripts
-            .Where(s => s.Kind == ScriptKind.File && s.Input is not null)
-            .SelectMany(s => s.Input!.Extensions)
-            .Where(e => e != "*")
-            .Select(e => e.StartsWith('.') ? e : "." + e)
-            .Distinct(StringComparer.OrdinalIgnoreCase);
-
-        foreach (var ext in extensions)
-        {
-            RemoveVerbForExtension(ext);
-        }
-
-        Console.WriteLine("shell-uninstall: done.");
-        return 0;
-    }
-
-    private static void RemoveVerbForExtension(string ext)
-    {
-        var verbParent = $@"{ClassesRoot}\{ext}\shell";
-        using var shellKey = Microsoft.Win32.Registry.CurrentUser.OpenSubKey(verbParent, writable: true);
-        if (shellKey is null)
-        {
-            return;
-        }
-
-        // Only delete the verb if we own it.
-        using (var verbKey = shellKey.OpenSubKey(RootVerb))
-        {
-            if (verbKey is null)
-            {
-                return;
-            }
-
-            if (verbKey.GetValue(OwnerMarkerName) is null)
-            {
-                return;
-            }
-        }
-
-        shellKey.DeleteSubKeyTree(RootVerb, throwOnMissingSubKey: false);
-    }
-}

src/modules/PowerScripts/PowerScriptsContextMenu/.gitignore

@@ -1,9 +0,0 @@
-# Native handler build artifacts
-*.dll
-*.lib
-*.exp
-*.obj
-*.pdb
-*.ilk
-# Host publish output used by register.ps1
-hostpublish/

src/modules/PowerScripts/PowerScriptsContextMenu/AppxManifest.xml

@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Package
-  xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10"
-  xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10"
-  xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities"
-  xmlns:desktop4="http://schemas.microsoft.com/appx/manifest/desktop/windows10/4"
-  xmlns:desktop5="http://schemas.microsoft.com/appx/manifest/desktop/windows10/5"
-  xmlns:uap10="http://schemas.microsoft.com/appx/manifest/uap/windows10/10"
-  xmlns:com="http://schemas.microsoft.com/appx/manifest/com/windows10"
-  IgnorableNamespaces="uap rescap desktop4 desktop5 uap10 com">
-  <Identity Name="Microsoft.PowerToys.PowerScriptsContextMenu" ProcessorArchitecture="neutral" Publisher="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US" Version="1.0.0.0" />
-  <Properties>
-    <DisplayName>PowerToys PowerScripts Context Menu</DisplayName>
-    <PublisherDisplayName>Microsoft</PublisherDisplayName>
-    <Logo>Assets\storelogo.png</Logo>
-  </Properties>
-  <Resources>
-    <Resource Language="en-us" />
-  </Resources>
-  <Dependencies>
-    <TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.18950.0" MaxVersionTested="10.0.19000.0" />
-  </Dependencies>
-  <Capabilities>
-    <rescap:Capability Name="runFullTrust" />
-    <rescap:Capability Name="unvirtualizedResources" />
-  </Capabilities>
-  <Applications>
-    <Application Id="PowerScriptsContextMenu" Executable="PowerScripts.Host.exe" uap10:TrustLevel="mediumIL" uap10:RuntimeBehavior="win32App">
-      <uap:VisualElements AppListEntry="none" DisplayName="PowerToys PowerScripts Context Menu" Description="PowerScripts context menu handler" BackgroundColor="transparent" Square150x150Logo="Assets\Square150x150Logo.png" Square44x44Logo="Assets\Square44x44Logo.png">
-        <uap:DefaultTile Wide310x150Logo="Assets\Wide310x150Logo.png" Square310x310Logo="Assets\LargeTile.png" Square71x71Logo="Assets\SmallTile.png"></uap:DefaultTile>
-        <uap:SplashScreen Image="Assets\SplashScreen.png" />
-      </uap:VisualElements>
-      <Extensions>
-        <desktop4:Extension Category="windows.fileExplorerContextMenus">
-          <desktop4:FileExplorerContextMenus>
-            <desktop5:ItemType Type="*">
-              <desktop5:Verb Id="PowerScriptsCommand" Clsid="9FF7C126-9562-4F16-A6FB-9622B26E0D62" />
-            </desktop5:ItemType>
-          </desktop4:FileExplorerContextMenus>
-        </desktop4:Extension>
-        <com:Extension Category="windows.comServer" uap10:RuntimeBehavior="packagedClassicApp">
-          <com:ComServer>
-            <com:SurrogateServer DisplayName="PowerScripts context menu verb handler">
-              <com:Class Id="9FF7C126-9562-4F16-A6FB-9622B26E0D62" Path="PowerToys.PowerScriptsContextMenu.dll" ThreadingModel="STA" />
-            </com:SurrogateServer>
-          </com:ComServer>
-        </com:Extension>
-      </Extensions>
-    </Application>
-  </Applications>
-</Package>

src/modules/PowerScripts/PowerScriptsContextMenu/build.cmd

@@ -1,15 +0,0 @@
-@echo off
-rem Builds the PowerScripts Windows 11 context-menu handler DLL (self-contained, no PowerToys deps).
-setlocal
-set "VCVARS=C:\Program Files\Microsoft Visual Studio\18\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
-if not exist "%VCVARS%" (
-    echo Could not find vcvars64.bat at "%VCVARS%". Edit build.cmd to point at your VS install.
-    exit /b 1
-)
-call "%VCVARS%" >nul || exit /b 1
-cd /d "%~dp0"
-cl /nologo /std:c++17 /EHsc /O2 /MT /DUNICODE /D_UNICODE /LD dllmain.cpp ^
-    /Fe:PowerToys.PowerScriptsContextMenu.dll ^
-    /link /DEF:dll.def shlwapi.lib runtimeobject.lib ole32.lib || exit /b 1
-echo Built PowerToys.PowerScriptsContextMenu.dll
-endlocal

src/modules/PowerScripts/PowerScriptsContextMenu/dll.def

@@ -1,4 +0,0 @@
-EXPORTS
-    DllCanUnloadNow PRIVATE
-    DllGetClassObject PRIVATE
-    DllGetActivationFactory PRIVATE

src/modules/PowerScripts/PowerScriptsContextMenu/dllmain.cpp

@@ -1,388 +0,0 @@
-// PowerScripts Windows 11 modern context-menu handler.
-//
-// A self-contained IExplorerCommand COM server (no PowerToys common dependencies). It surfaces a
-// top-level "PowerScript" entry with a dynamic submenu of the file scripts that match the current
-// selection. The actual matching/running logic lives in PowerScripts.Host.exe (deployed next to
-// this DLL); the handler is a thin shell that:
-//   * GetState  -> runs "Host shell-menu --files <paths>", caches the id/name lines, hides itself
-//                  when nothing matches.
-//   * EnumSubCommands -> turns each cached line into a submenu item.
-//   * Invoke (item) -> runs "Host run <id> --files <paths>".
-
-#include <windows.h>
-#include <shobjidl_core.h>
-#include <shlwapi.h>
-#include <wrl/module.h>
-#include <wrl/implements.h>
-#include <wrl/client.h>
-
-#include <string>
-#include <vector>
-
-using namespace Microsoft::WRL;
-
-namespace
-{
-    HMODULE g_hModule = nullptr;
-    long g_refModule = 0;
-
-    // Full path to PowerScripts.Host.exe, assumed to sit next to this DLL.
-    std::wstring FindHostExe()
-    {
-        wchar_t path[MAX_PATH] = {};
-        GetModuleFileNameW(g_hModule, path, ARRAYSIZE(path));
-        std::wstring dir(path);
-        const size_t slash = dir.find_last_of(L"\\/");
-        if (slash != std::wstring::npos)
-        {
-            dir.erase(slash + 1);
-        }
-        return dir + L"PowerScripts.Host.exe";
-    }
-
-    // Extracts the filesystem paths from a shell selection.
-    std::vector<std::wstring> ExtractPaths(IShellItemArray* selection)
-    {
-        std::vector<std::wstring> result;
-        if (selection == nullptr)
-        {
-            return result;
-        }
-
-        DWORD count = 0;
-        if (FAILED(selection->GetCount(&count)))
-        {
-            return result;
-        }
-
-        for (DWORD i = 0; i < count; ++i)
-        {
-            ComPtr<IShellItem> item;
-            if (FAILED(selection->GetItemAt(i, &item)))
-            {
-                continue;
-            }
-
-            PWSTR pszPath = nullptr;
-            if (SUCCEEDED(item->GetDisplayName(SIGDN_FILESYSPATH, &pszPath)) && pszPath != nullptr)
-            {
-                result.emplace_back(pszPath);
-                CoTaskMemFree(pszPath);
-            }
-        }
-
-        return result;
-    }
-
-    // Quotes a single command-line argument.
-    std::wstring Quote(const std::wstring& value)
-    {
-        return L"\"" + value + L"\"";
-    }
-
-    std::wstring BuildFilesArguments(const std::vector<std::wstring>& files)
-    {
-        std::wstring args;
-        for (const auto& file : files)
-        {
-            args += L" " + Quote(file);
-        }
-        return args;
-    }
-
-    // Runs a Host command and returns its stdout. Used only for the (small) shell-menu listing.
-    std::wstring RunHostCapture(const std::wstring& arguments)
-    {
-        std::wstring output;
-
-        SECURITY_ATTRIBUTES sa = {};
-        sa.nLength = sizeof(sa);
-        sa.bInheritHandle = TRUE;
-
-        HANDLE readPipe = nullptr;
-        HANDLE writePipe = nullptr;
-        if (!CreatePipe(&readPipe, &writePipe, &sa, 0))
-        {
-            return output;
-        }
-        SetHandleInformation(readPipe, HANDLE_FLAG_INHERIT, 0);
-
-        std::wstring commandLine = Quote(FindHostExe()) + L" " + arguments;
-
-        STARTUPINFOW si = {};
-        si.cb = sizeof(si);
-        si.dwFlags = STARTF_USESTDHANDLES | STARTF_USESHOWWINDOW;
-        si.wShowWindow = SW_HIDE;
-        si.hStdOutput = writePipe;
-        si.hStdError = writePipe;
-
-        PROCESS_INFORMATION pi = {};
-        std::vector<wchar_t> mutableCmd(commandLine.begin(), commandLine.end());
-        mutableCmd.push_back(L'\0');
-
-        if (!CreateProcessW(nullptr, mutableCmd.data(), nullptr, nullptr, TRUE, CREATE_NO_WINDOW, nullptr, nullptr, &si, &pi))
-        {
-            CloseHandle(readPipe);
-            CloseHandle(writePipe);
-            return output;
-        }
-
-        CloseHandle(writePipe);
-
-        char buffer[4096];
-        DWORD read = 0;
-        std::string raw;
-        while (ReadFile(readPipe, buffer, sizeof(buffer), &read, nullptr) && read > 0)
-        {
-            raw.append(buffer, read);
-        }
-
-        CloseHandle(readPipe);
-        WaitForSingleObject(pi.hProcess, 15000);
-        CloseHandle(pi.hProcess);
-        CloseHandle(pi.hThread);
-
-        if (!raw.empty())
-        {
-            const int needed = MultiByteToWideChar(CP_UTF8, 0, raw.c_str(), static_cast<int>(raw.size()), nullptr, 0);
-            if (needed > 0)
-            {
-                output.resize(needed);
-                MultiByteToWideChar(CP_UTF8, 0, raw.c_str(), static_cast<int>(raw.size()), output.data(), needed);
-            }
-        }
-
-        return output;
-    }
-
-    // Runs a Host command fire-and-forget (used to actually execute a script).
-    void RunHostDetached(const std::wstring& arguments)
-    {
-        std::wstring commandLine = Quote(FindHostExe()) + L" " + arguments;
-
-        STARTUPINFOW si = {};
-        si.cb = sizeof(si);
-        si.dwFlags = STARTF_USESHOWWINDOW;
-        si.wShowWindow = SW_HIDE;
-
-        PROCESS_INFORMATION pi = {};
-        std::vector<wchar_t> mutableCmd(commandLine.begin(), commandLine.end());
-        mutableCmd.push_back(L'\0');
-
-        if (CreateProcessW(nullptr, mutableCmd.data(), nullptr, nullptr, FALSE, CREATE_NO_WINDOW, nullptr, nullptr, &si, &pi))
-        {
-            CloseHandle(pi.hProcess);
-            CloseHandle(pi.hThread);
-        }
-    }
-
-    struct ScriptEntry
-    {
-        std::wstring Id;
-        std::wstring Name;
-    };
-
-    // Parses "id\tname" lines into entries.
-    std::vector<ScriptEntry> ParseMenu(const std::wstring& text)
-    {
-        std::vector<ScriptEntry> entries;
-        size_t start = 0;
-        while (start < text.size())
-        {
-            size_t end = text.find(L'\n', start);
-            std::wstring line = (end == std::wstring::npos) ? text.substr(start) : text.substr(start, end - start);
-            start = (end == std::wstring::npos) ? text.size() : end + 1;
-
-            if (!line.empty() && line.back() == L'\r')
-            {
-                line.pop_back();
-            }
-            if (line.empty())
-            {
-                continue;
-            }
-
-            const size_t tab = line.find(L'\t');
-            if (tab == std::wstring::npos)
-            {
-                continue;
-            }
-
-            ScriptEntry entry;
-            entry.Id = line.substr(0, tab);
-            entry.Name = line.substr(tab + 1);
-            if (!entry.Id.empty())
-            {
-                entries.push_back(std::move(entry));
-            }
-        }
-        return entries;
-    }
-}
-
-// A single submenu item: "Convert Markdown to Text", etc.
-class PowerScriptSubCommand : public RuntimeClass<RuntimeClassFlags<ClassicCom>, IExplorerCommand>
-{
-public:
-    PowerScriptSubCommand(std::wstring id, std::wstring name, std::vector<std::wstring> files) :
-        m_id(std::move(id)), m_name(std::move(name)), m_files(std::move(files))
-    {
-    }
-
-    IFACEMETHODIMP GetTitle(IShellItemArray*, PWSTR* name) override { return SHStrDupW(m_name.c_str(), name); }
-    IFACEMETHODIMP GetIcon(IShellItemArray*, PWSTR* icon) override { *icon = nullptr; return E_NOTIMPL; }
-    IFACEMETHODIMP GetToolTip(IShellItemArray*, PWSTR* tip) override { *tip = nullptr; return E_NOTIMPL; }
-    IFACEMETHODIMP GetCanonicalName(GUID* guid) override { *guid = GUID_NULL; return S_OK; }
-    IFACEMETHODIMP GetState(IShellItemArray*, BOOL, EXPCMDSTATE* state) override { *state = ECS_ENABLED; return S_OK; }
-    IFACEMETHODIMP GetFlags(EXPCMDFLAGS* flags) override { *flags = ECF_DEFAULT; return S_OK; }
-    IFACEMETHODIMP EnumSubCommands(IEnumExplorerCommand** enumerator) override { *enumerator = nullptr; return E_NOTIMPL; }
-
-    IFACEMETHODIMP Invoke(IShellItemArray* selection, IBindCtx*) override
-    {
-        std::vector<std::wstring> files = m_files;
-        if (files.empty())
-        {
-            files = ExtractPaths(selection);
-        }
-
-        RunHostDetached(L"run " + m_id + L" --files" + BuildFilesArguments(files));
-        return S_OK;
-    }
-
-private:
-    std::wstring m_id;
-    std::wstring m_name;
-    std::vector<std::wstring> m_files;
-};
-
-// IEnumExplorerCommand over the submenu items.
-class PowerScriptEnum : public RuntimeClass<RuntimeClassFlags<ClassicCom>, IEnumExplorerCommand>
-{
-public:
-    explicit PowerScriptEnum(std::vector<ComPtr<IExplorerCommand>> commands) :
-        m_commands(std::move(commands))
-    {
-    }
-
-    IFACEMETHODIMP Next(ULONG count, IExplorerCommand** commands, ULONG* fetched) override
-    {
-        ULONG produced = 0;
-        for (; produced < count && m_index < m_commands.size(); ++produced, ++m_index)
-        {
-            m_commands[m_index].CopyTo(&commands[produced]);
-        }
-        if (fetched != nullptr)
-        {
-            *fetched = produced;
-        }
-        return (produced == count) ? S_OK : S_FALSE;
-    }
-
-    IFACEMETHODIMP Skip(ULONG count) override
-    {
-        m_index += count;
-        return (m_index <= m_commands.size()) ? S_OK : S_FALSE;
-    }
-
-    IFACEMETHODIMP Reset() override
-    {
-        m_index = 0;
-        return S_OK;
-    }
-
-    IFACEMETHODIMP Clone(IEnumExplorerCommand** out) override
-    {
-        *out = nullptr;
-        return E_NOTIMPL;
-    }
-
-private:
-    std::vector<ComPtr<IExplorerCommand>> m_commands;
-    size_t m_index = 0;
-};
-
-// Top-level "PowerScript" command with a dynamic submenu.
-class __declspec(uuid("9FF7C126-9562-4F16-A6FB-9622B26E0D62")) PowerScriptCommand :
-    public RuntimeClass<RuntimeClassFlags<ClassicCom>, IExplorerCommand, IObjectWithSite>
-{
-public:
-    IFACEMETHODIMP GetTitle(IShellItemArray*, PWSTR* name) override { return SHStrDupW(L"PowerScript", name); }
-    IFACEMETHODIMP GetIcon(IShellItemArray*, PWSTR* icon) override { *icon = nullptr; return E_NOTIMPL; }
-    IFACEMETHODIMP GetToolTip(IShellItemArray*, PWSTR* tip) override { *tip = nullptr; return E_NOTIMPL; }
-    IFACEMETHODIMP GetCanonicalName(GUID* guid) override { *guid = GUID_NULL; return S_OK; }
-
-    // Called before EnumSubCommands on the same instance; we use it to compute (and cache) the
-    // matching scripts and to hide the entry when nothing matches.
-    IFACEMETHODIMP GetState(IShellItemArray* selection, BOOL, EXPCMDSTATE* state) override
-    {
-        m_files = ExtractPaths(selection);
-        m_entries.clear();
-
-        if (!m_files.empty())
-        {
-            const std::wstring output = RunHostCapture(L"shell-menu --files" + BuildFilesArguments(m_files));
-            m_entries = ParseMenu(output);
-        }
-
-        *state = m_entries.empty() ? ECS_HIDDEN : ECS_ENABLED;
-        return S_OK;
-    }
-
-    IFACEMETHODIMP GetFlags(EXPCMDFLAGS* flags) override { *flags = ECF_HASSUBCOMMANDS; return S_OK; }
-
-    IFACEMETHODIMP EnumSubCommands(IEnumExplorerCommand** enumerator) override
-    {
-        *enumerator = nullptr;
-
-        std::vector<ComPtr<IExplorerCommand>> commands;
-        for (const auto& entry : m_entries)
-        {
-            commands.push_back(Make<PowerScriptSubCommand>(entry.Id, entry.Name, m_files));
-        }
-
-        auto enumObject = Make<PowerScriptEnum>(std::move(commands));
-        return enumObject.CopyTo(enumerator);
-    }
-
-    IFACEMETHODIMP Invoke(IShellItemArray*, IBindCtx*) override { return S_OK; }
-
-    // IObjectWithSite
-    IFACEMETHODIMP SetSite(IUnknown* site) override { m_site = site; return S_OK; }
-    IFACEMETHODIMP GetSite(REFIID riid, void** ppv) override { return m_site.CopyTo(riid, ppv); }
-
-private:
-    ComPtr<IUnknown> m_site;
-    std::vector<std::wstring> m_files;
-    std::vector<ScriptEntry> m_entries;
-};
-
-CoCreatableClass(PowerScriptCommand);
-
-STDAPI DllGetActivationFactory(_In_ HSTRING activatableClassId, _COM_Outptr_ IActivationFactory** factory)
-{
-    return Module<ModuleType::InProc>::GetModule().GetActivationFactory(activatableClassId, factory);
-}
-
-STDAPI DllCanUnloadNow()
-{
-    return (Module<InProc>::GetModule().GetObjectCount() == 0 && g_refModule == 0) ? S_OK : S_FALSE;
-}
-
-STDAPI DllGetClassObject(_In_ REFCLSID rclsid, _In_ REFIID riid, _COM_Outptr_ void** ppv)
-{
-    return Module<InProc>::GetModule().GetClassObject(rclsid, riid, ppv);
-}
-
-BOOL APIENTRY DllMain(HMODULE hModule, DWORD reason, LPVOID)
-{
-    switch (reason)
-    {
-    case DLL_PROCESS_ATTACH:
-        g_hModule = hModule;
-        DisableThreadLibraryCalls(hModule);
-        break;
-    default:
-        break;
-    }
-    return TRUE;
-}

src/modules/PowerScripts/PowerScriptsContextMenu/register.ps1

@@ -1,75 +0,0 @@
-<#
-.SYNOPSIS
-    Builds and registers the PowerScripts Windows 11 modern context-menu handler as an
-    unsigned sparse (loose-file) MSIX package. Requires Developer Mode.
-
-.DESCRIPTION
-    1. Builds the native handler DLL (build.cmd).
-    2. Publishes PowerScripts.Host.exe (framework-dependent) next to the DLL.
-    3. Copies the manifest + logo assets into a deploy folder.
-    4. Registers the package in place via Add-AppxPackage -Register.
-
-    Run register.ps1 -Unregister to remove it.
-#>
-[CmdletBinding()]
-param(
-    [switch]$Unregister,
-    [ValidateSet('Debug', 'Release')]
-    [string]$Configuration = 'Debug'
-)
-
-$ErrorActionPreference = 'Stop'
-$PackageName = 'Microsoft.PowerToys.PowerScriptsContextMenu'
-$here = Split-Path -Parent $MyInvocation.MyCommand.Definition
-$deployDir = Join-Path $env:LOCALAPPDATA 'Microsoft\PowerToys\PowerScriptsContextMenu'
-
-if ($Unregister)
-{
-    $pkg = Get-AppxPackage -Name $PackageName -ErrorAction SilentlyContinue
-    if ($pkg)
-    {
-        Remove-AppxPackage -Package $pkg.PackageFullName
-        Write-Host "Unregistered $($pkg.PackageFullName)"
-    }
-    else
-    {
-        Write-Host "Package $PackageName is not registered."
-    }
-    return
-}
-
-Write-Host '== Building handler DLL =='
-& cmd /c "`"$here\build.cmd`""
-if ($LASTEXITCODE -ne 0) { throw 'DLL build failed.' }
-
-Write-Host '== Publishing PowerScripts.Host =='
-$hostProj = Join-Path $here '..\PowerScripts.Host\PowerScripts.Host.csproj'
-$hostPublish = Join-Path $here 'hostpublish'
-& dotnet publish $hostProj -c $Configuration -o $hostPublish --nologo | Out-Null
-if ($LASTEXITCODE -ne 0) { throw 'Host publish failed.' }
-
-Write-Host '== Staging deploy folder =='
-# Re-register cleanly: remove any prior registration before overwriting files.
-$existing = Get-AppxPackage -Name $PackageName -ErrorAction SilentlyContinue
-if ($existing) { Remove-AppxPackage -Package $existing.PackageFullName }
-
-if (Test-Path $deployDir) { Remove-Item $deployDir -Recurse -Force }
-New-Item -ItemType Directory -Force -Path $deployDir | Out-Null
-New-Item -ItemType Directory -Force -Path (Join-Path $deployDir 'Assets') | Out-Null
-
-Copy-Item (Join-Path $here 'PowerToys.PowerScriptsContextMenu.dll') $deployDir -Force
-Copy-Item (Join-Path $here 'AppxManifest.xml') $deployDir -Force
-Copy-Item (Join-Path $hostPublish '*') $deployDir -Recurse -Force
-
-# Reuse the ImageResizer context-menu logo assets for the required tile slots.
-$assetSrc = Join-Path $here '..\..\..\modules\imageresizer\ImageResizerContextMenu\Assets\ImageResizer'
-foreach ($asset in 'storelogo.png', 'Square150x150Logo.png', 'Square44x44Logo.png', 'Wide310x150Logo.png', 'LargeTile.png', 'SmallTile.png', 'SplashScreen.png')
-{
-    Copy-Item (Join-Path $assetSrc $asset) (Join-Path $deployDir 'Assets') -Force
-}
-
-Write-Host '== Registering package =='
-Add-AppxPackage -Register (Join-Path $deployDir 'AppxManifest.xml')
-
-Write-Host "Registered. Deploy folder: $deployDir"
-Write-Host 'Right-click a matching file (e.g. a .md) to see the PowerScript submenu (restart Explorer if needed).'

src/modules/PowerScripts/README.md

@@ -1,165 +0,0 @@
-# PowerScripts (prototype)
-
-> **Status: prototype.** Write a small script once and surface it across PowerToys.
-> This folder contains the **working core** (manifest schema, registry, shared executor
-> `PowerScripts.Host.exe`) plus sample scripts, and three **implemented surfaces**:
-> a Settings module page, the Explorer right-click menu, and the Keyboard Manager editor.
-
-## Implemented surfaces (prototype)
-
-| Surface | What it does | How |
-| --- | --- | --- |
-| **Settings module** | New "PowerScripts" page in the Settings app that lists installed scripts and has an enable toggle. Enabling/disabling installs/removes the Explorer context-menu entries. | `src/settings-ui/.../Views/PowerScriptsPage.xaml(.cs)` + `PowerScriptsViewModel`; reads `Host.exe list --json`; toggle runs `Host.exe shell-install`/`shell-uninstall`. |
-| **Explorer right-click** | Right-click a file → "PowerScript" submenu lists scripts whose manifest declares that extension; clicking runs the script on the file. | `Host.exe shell-install` writes `HKCU\Software\Classes\SystemFileAssociations\<ext>\shell\PowerScripts` cascading verbs → `Host.exe run <id> --files "%1"`. |
-| **Keyboard Manager** | A new "PowerScript" action in the KBM editor; pick a system script and assign it to a hotkey. | `KeyboardManagerEditorUI` action picker saves an ordinary `RunProgram` mapping → `Host.exe run <id>`. |
-
-### End-to-end demo
-
-1. **Settings**: open Settings → PowerScripts → see `convert_md_to_txt`, `volume_up`, etc.; toggle on.
-2. **Context menu**: right-click a `.md` file → PowerScript → "Convert Markdown to Text" → a `.txt` is written next to it.
-3. **Keyboard Manager**: KBM editor → add mapping → action "PowerScript" → pick "Volume Up" → assign a shortcut.
-
-
-## The idea
-
-A **PowerScript** is a script plus a manifest, living in its own folder. Two flavours:
-
-- **System** (`kind: "system"`) — "do something on my PC". No file input. Triggered by a Keyboard
-  Manager hotkey (and later the Command Palette).
-- **File** (`kind: "file"`) — "do something with this file". Input is one or more files of declared
-  types. Surfaced in the Explorer right-click menu.
-
-Every surface is a thin consumer of one **registry** and invokes one **executor** — so a script is
-authored once and appears everywhere it's declared.
-
-## Architecture
-
-```
- Registry (PowerScripts.Core)  ──read──►  surfaces:
-   scans <root>/<id>/manifest.json          • Explorer context menu  (file actions)
-                                            • Keyboard Manager editor (system actions)
-                                            • Command Palette / Advanced Paste (later)
-        ▲                                          │ invoke
-        └──────────── all surfaces ────────────────┘
-                          ▼
-            PowerScripts.Host.exe (executor)
-              list [--json] | run <id> [--files ...] [--set k=v ...]
-```
-
-- **`PowerScripts.Core`** — manifest model + JSON (`Manifest/`), validation, registry (`Registry/`),
-  executor (`Execution/`).
-- **`PowerScripts.Host`** — the CLI every surface points at. `list --json` is the structured catalogue
-  the KBM editor picker and future agents/MCP consume; `run <id>` executes.
-- **`samples/`** — `system-snapshot` & `volume_up` (system), `sha256-checksum` & `convert_md_to_txt` (file).
-
-### Scripts root
-
-`%LOCALAPPDATA%\Microsoft\PowerToys\PowerScripts\scripts\<id>\manifest.json`
-(override with the `POWERSCRIPTS_ROOT` env var or `--root`).
-
-## Manifest schema (v1)
-
-```jsonc
-{
-  "schemaVersion": 1,
-  "id": "heic-to-jpg",            // must match the folder name
-  "name": "Convert HEIC to JPG",
-  "description": "…",
-  "kind": "file",                 // "system" | "file"
-  "runtime": "powershell",        // prototype: powershell only
-  "entry": "run.ps1",
-  "input": { "extensions": [".heic"], "minFiles": 1, "maxFiles": 0 }, // file kind
-  "output": { "type": "convertedFile", "extension": ".jpg" },
-  "parameters": [ { "name": "quality", "type": "int", "default": "90", "min": 1, "max": 100 } ],
-  "surfaces": ["contextMenu", "keyboardManager"],
-  "capabilities": ["fileWrite"],  // consent string + agent permission contract
-  "elevation": "asInvoker"        // prototype always runs non-elevated
-}
-```
-
-## Build & run
-
-```powershell
-cd src\modules\PowerScripts
-dotnet build PowerScripts.Host\PowerScripts.Host.csproj -c Debug
-
-$env:POWERSCRIPTS_ROOT = "$PWD\samples"
-$exe = "PowerScripts.Host\bin\Debug\net10.0\PowerScripts.Host.exe"
-& $exe list
-& $exe run system-snapshot
-& $exe run sha256-checksum --files C:\some\file.png
-```
-
-> The prototype projects are isolated from the repo build via local `Directory.Build.props`,
-> `Directory.Packages.props` and `nuget.config` (no StyleCop / warnings-as-errors / central package
-> management; restores from public nuget.org). Delete these three files when promoting the module to
-> follow standard PowerToys build rules.
-
-## Tests
-
-```powershell
-cd src\modules\PowerScripts
-dotnet test PowerScripts.Core.Tests\PowerScripts.Core.Tests.csproj
-```
-
-`PowerScripts.Core.Tests` (MSTest) covers manifest serialization/validation and the registry
-(extension + wildcard matching, multi-file selection min/max, kind filtering, invalid-script
-skipping). 9 tests, all passing.
-
-## Surface integration plans
-
-### 1. Keyboard Manager (system actions) — first priority
-
-KBM already has a `RunProgram` action, so a hotkey → PowerScript works **today**. Get the exact
-mapping for a system script:
-
-```powershell
-& $exe kbm system-snapshot          # prints Program path + Arguments for the editor
-& $exe kbm system-snapshot --json   # prints the raw remapShortcutsToRunProgram object
-```
-
-Then in Keyboard Manager → *Remap a shortcut* → action **Run Program**, paste the Program path and
-`run <id>` arguments and choose the trigger keys. The mapping persists as the existing engine shape
-(verified against `common/KeyboardManagerConstants.h`):
-
-```json
-{ "operationType": 1, "runProgramFilePath": "…\\PowerScripts.Host.exe", "runProgramArgs": "run system-snapshot", "unicodeText": "*Unsupported*" }
-```
-
-**Prototype goal — pick a PowerScript inside the editor** (instead of typing a path). The editor is
-**C# WinUI 3** (`PowerToys.KeyboardManagerEditorUI.exe`), a separate process that already reads JSON
-at runtime, so it can call `Host.exe list --json` to populate a script dropdown. Additive change-list
-(verified against the current source):
-
-- `Controls/UnifiedMappingControl.xaml.cs` — the nested `enum ActionType` (KeyOrShortcut, Text,
-  OpenUrl, OpenApp, MouseClick, Disable): add a `PowerScript` value; extend `CurrentActionType`,
-  `SetActionType`, `IsInputComplete`.
-- `Controls/UnifiedMappingControl.xaml` — add a `ComboBoxItem` (Tag `PowerScript`) to
-  `ActionTypeComboBox` and a `SwitchPresenter` `Case` hosting a script-picker ComboBox.
-- `Pages/MainPage.xaml.cs` — add a `UnifiedMappingControl.ActionType.PowerScript` arm to the save
-  `switch` (~line 390) that reuses the `SaveProgramMapping` path with
-  `ProgramPath = <PowerScripts.Host.exe>` and `ProgramArgs = "run <id>"`.
-- A small helper in `KeyboardManagerEditorUI` to load the script list (shell out to `Host.exe
-  list --json`, like `Settings/SettingsManager.cs` reads its JSON).
-- **No KBM engine change** — it stays a `RunProgram` mapping.
-
-> The editor-picker edits live in the shared KBM WinUI project, which needs the full PowerToys build
-> (VS + internal NuGet feeds) to compile — do them in that environment. The `kbm` command above is
-> the verifiable, build-free path that already delivers hotkey → PowerScript.
-
-### 2. Explorer right-click (file actions)
-
-A single compiled `IExplorerCommand` COM handler (pattern: `src/modules/NewPlus/NewShellExtensionContextMenu`)
-reads the registry, filters `kind:"file"` scripts whose `input.extensions` match the selection, and
-shows a dynamic submenu. Invoking an item runs `Host.exe run <id> --files <paths>`.
-
-### Deferred (kept easy by the registry design)
-
-Command Palette (one `ICommandProvider` extension enumerating system scripts) and Advanced Paste —
-both become additional registry-reading adapters. No core changes expected.
-
-## Agent / AI tie-in (designed-for)
-
-`Host.exe list --json` already yields a structured, permissioned capability list and `run <id>` is
-the invoke — so an MCP server can expose installed PowerScripts as user-consented tools. AI authoring
-("generate a PowerScript that…") emits a manifest + script folder the user reviews once.

src/modules/PowerScripts/kbm-e2e.ps1

@@ -1,97 +0,0 @@
-<#
-.SYNOPSIS
-    End-to-end test helper for invoking a PowerScript from Keyboard Manager (new editor).
-
-.DESCRIPTION
-    Self-contained KBM e2e that doesn't require the full PowerToys runner:
-
-      1. Forces the *new* Keyboard Manager editor (useNewEditor = true).
-      2. Launches PowerToys.KeyboardManagerEditorUI.exe so you can add a shortcut whose
-         action is "PowerScript" -> pick a system script (e.g. "Volume Up") -> Save.
-      3. Starts PowerToys.KeyboardManagerEngine.exe standalone, which reads the saved
-         default.json and installs the keyboard hook. Press your shortcut and the engine
-         runs PowerScripts.Host.exe run <id>.
-
-    Defaults assume a Debug build under <repo>\x64\Debug. Use -Configuration Release for a
-    release layout.
-
-.EXAMPLE
-    # Configure a hotkey, then start the engine and test:
-    pwsh -File kbm-e2e.ps1
-
-.EXAMPLE
-    # Skip the editor; just (re)start the engine to apply the current mappings:
-    pwsh -File kbm-e2e.ps1 -EngineOnly
-#>
-[CmdletBinding()]
-param(
-    [switch]$EngineOnly,
-    [ValidateSet('Debug', 'Release')]
-    [string]$Configuration = 'Debug'
-)
-
-$ErrorActionPreference = 'Stop'
-
-# Repo root = four levels up from src\modules\PowerScripts.
-$repoRoot = (Resolve-Path (Join-Path $PSScriptRoot '..\..\..')).Path
-$binRoot = Join-Path $repoRoot "x64\$Configuration"
-$editorExe = Join-Path $binRoot 'WinUI3Apps\PowerToys.KeyboardManagerEditorUI.exe'
-$engineExe = Join-Path $binRoot 'KeyboardManagerEngine\PowerToys.KeyboardManagerEngine.exe'
-$kbmDir = Join-Path $env:LOCALAPPDATA 'Microsoft\PowerToys\Keyboard Manager'
-$settings = Join-Path $kbmDir 'settings.json'
-
-function Stop-ProcessesByName([string[]]$names)
-{
-    $ids = Get-Process -ErrorAction SilentlyContinue | Where-Object { $names -contains $_.Name } | Select-Object -ExpandProperty Id
-    foreach ($id in $ids) { try { Stop-Process -Id $id -Force } catch { } }
-}
-
-if (-not (Test-Path $engineExe)) { throw "Engine not found: $engineExe. Build KeyboardManagerEngine first." }
-
-# 1. Force the new editor.
-if (Test-Path $settings)
-{
-    $json = Get-Content $settings -Raw | ConvertFrom-Json
-    if ($json.properties.PSObject.Properties.Name -contains 'useNewEditor')
-    {
-        $json.properties.useNewEditor = $true
-    }
-    ($json | ConvertTo-Json -Depth 10) | Set-Content $settings -Encoding UTF8
-    Write-Host 'Set useNewEditor = true.'
-}
-
-# 2. Launch the new editor (unless engine-only) and wait for the user to finish.
-if (-not $EngineOnly)
-{
-    if (-not (Test-Path $editorExe)) { throw "Editor not found: $editorExe. Build KeyboardManagerEditorUI first." }
-
-    Write-Host ''
-    Write-Host 'Opening the NEW Keyboard Manager editor.' -ForegroundColor Cyan
-    Write-Host '  - Click "Add shortcut", set a trigger (e.g. Ctrl+Alt+U).'
-    Write-Host '  - Action type -> PowerScript -> pick a System script (e.g. Volume Up).'
-    Write-Host '  - Save, then CLOSE the editor window to continue.'
-    Write-Host ''
-
-    # Pass this process id as the parent so the editor stays open until you close it.
-    $editor = Start-Process -FilePath $editorExe -ArgumentList "$PID" -PassThru
-    $editor.WaitForExit()
-    Write-Host 'Editor closed.'
-}
-
-# 3. (Re)start the engine standalone so it applies the saved mappings.
-Stop-ProcessesByName @('PowerToys.KeyboardManagerEngine')
-Start-Sleep -Milliseconds 500
-$engine = Start-Process -FilePath $engineExe -PassThru
-Start-Sleep -Seconds 1
-
-if (Get-Process -Id $engine.Id -ErrorAction SilentlyContinue)
-{
-    Write-Host ''
-    Write-Host "KBM engine running (pid $($engine.Id))." -ForegroundColor Green
-    Write-Host 'Press your configured shortcut now — the PowerScript should run.'
-    Write-Host "Stop the engine when done:  Stop-Process -Id $($engine.Id)"
-}
-else
-{
-    throw 'Engine exited immediately. Check the KBM logs under the Keyboard Manager\Logs folder.'
-}

src/modules/PowerScripts/nuget.config

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  PROTOTYPE-ONLY: restore the isolated PowerScripts prototype projects from public nuget.org instead
-  of the repo's auth-gated internal feed. Remove when promoting the module to the standard build.
--->
-<configuration>
-  <packageSources>
-    <clear />
-    <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
-  </packageSources>
-</configuration>

src/modules/PowerScripts/samples/convert_md_to_txt/manifest.json

@@ -1,21 +0,0 @@
-{
-  "schemaVersion": 1,
-  "id": "convert_md_to_txt",
-  "name": "Convert Markdown to Text",
-  "description": "Convert the selected Markdown file(s) to a plain .txt file next to the original.",
-  "kind": "file",
-  "runtime": "powershell",
-  "entry": "run.ps1",
-  "input": {
-    "extensions": [".md"],
-    "minFiles": 1,
-    "maxFiles": 0
-  },
-  "output": {
-    "type": "convertedFile",
-    "extension": ".txt"
-  },
-  "surfaces": ["contextMenu"],
-  "capabilities": ["fileRead", "fileWrite"],
-  "elevation": "asInvoker"
-}

src/modules/PowerScripts/samples/convert_md_to_txt/run.ps1

@@ -1,35 +0,0 @@
-# Convert Markdown to Text — a "file" PowerScript surfaced on .md right-click.
-# Writes a plain .txt next to each selected .md file (light Markdown stripping).
-
-param(
-    [string[]]$Files
-)
-
-if (-not $Files -or $Files.Count -eq 0) {
-    if ($env:POWERSCRIPTS_FILES) {
-        $Files = $env:POWERSCRIPTS_FILES -split "`n"
-    }
-}
-
-if (-not $Files -or $Files.Count -eq 0) {
-    Write-Error 'No files provided.'
-    exit 1
-}
-
-foreach ($f in $Files) {
-    $path = $f.Trim()
-    if (-not $path) { continue }
-    if (-not (Test-Path -LiteralPath $path)) {
-        Write-Warning "Not found: $path"
-        continue
-    }
-
-    $text = Get-Content -LiteralPath $path -Raw
-    # Light Markdown stripping: headings, emphasis markers, inline code backticks.
-    $text = $text -replace '(?m)^\s{0,3}#{1,6}\s*', ''
-    $text = $text -replace '(\*\*|__|\*|_|`)', ''
-
-    $out = [System.IO.Path]::ChangeExtension($path, '.txt')
-    Set-Content -LiteralPath $out -Value $text -Encoding UTF8
-    "Converted: $out"
-}

src/modules/PowerScripts/samples/sha256-checksum/manifest.json

@@ -1,20 +0,0 @@
-{
-  "schemaVersion": 1,
-  "id": "sha256-checksum",
-  "name": "Compute SHA-256",
-  "description": "Compute the SHA-256 checksum of the selected file(s).",
-  "kind": "file",
-  "runtime": "powershell",
-  "entry": "run.ps1",
-  "input": {
-    "extensions": ["*"],
-    "minFiles": 1,
-    "maxFiles": 0
-  },
-  "output": {
-    "type": "sideEffect"
-  },
-  "surfaces": ["contextMenu"],
-  "capabilities": ["fileRead"],
-  "elevation": "asInvoker"
-}

src/modules/PowerScripts/samples/sha256-checksum/run.ps1

@@ -1,30 +0,0 @@
-# Compute SHA-256 — a "file" PowerScript.
-# Surfaced in the Explorer right-click menu for the selected file(s).
-# Files arrive both as -Files and via the POWERSCRIPTS_FILES environment variable.
-
-param(
-    [string[]]$Files
-)
-
-if (-not $Files -or $Files.Count -eq 0) {
-    if ($env:POWERSCRIPTS_FILES) {
-        $Files = $env:POWERSCRIPTS_FILES -split "`n"
-    }
-}
-
-if (-not $Files -or $Files.Count -eq 0) {
-    Write-Error 'No files provided.'
-    exit 1
-}
-
-foreach ($f in $Files) {
-    $path = $f.Trim()
-    if (-not $path) { continue }
-    if (-not (Test-Path -LiteralPath $path)) {
-        Write-Warning "Not found: $path"
-        continue
-    }
-
-    $hash = Get-FileHash -LiteralPath $path -Algorithm SHA256
-    '{0}  {1}' -f $hash.Hash, $path
-}

src/modules/PowerScripts/samples/system-snapshot/manifest.json

@@ -1,12 +0,0 @@
-{
-  "schemaVersion": 1,
-  "id": "system-snapshot",
-  "name": "System Snapshot",
-  "description": "Show computer name, OS and uptime.",
-  "kind": "system",
-  "runtime": "powershell",
-  "entry": "run.ps1",
-  "surfaces": ["keyboardManager", "commandPalette"],
-  "capabilities": ["systemInfo"],
-  "elevation": "asInvoker"
-}

src/modules/PowerScripts/samples/system-snapshot/run.ps1

@@ -1,12 +0,0 @@
-# System Snapshot — a "system" PowerScript (no file input).
-# Surfaced via a Keyboard Manager hotkey or the Command Palette.
-
-$os = Get-CimInstance Win32_OperatingSystem -ErrorAction SilentlyContinue
-
-[pscustomobject]@{
-    Computer = $env:COMPUTERNAME
-    User     = $env:USERNAME
-    OS       = if ($os) { $os.Caption } else { [System.Environment]::OSVersion.VersionString }
-    Uptime   = if ($os) { (Get-Date) - $os.LastBootUpTime } else { 'n/a' }
-    Time     = (Get-Date).ToString('s')
-} | Format-List

src/modules/PowerScripts/samples/volume_up/manifest.json

@@ -1,12 +0,0 @@
-{
-  "schemaVersion": 1,
-  "id": "volume_up",
-  "name": "Volume Up",
-  "description": "Raise the system volume a few steps.",
-  "kind": "system",
-  "runtime": "powershell",
-  "entry": "run.ps1",
-  "surfaces": ["keyboardManager", "commandPalette"],
-  "capabilities": ["systemControl"],
-  "elevation": "asInvoker"
-}

src/modules/PowerScripts/samples/volume_up/run.ps1

@@ -1,11 +0,0 @@
-# Volume Up — a "system" PowerScript (no file input).
-# Assign it to a hotkey in Keyboard Manager. Sends the system "Volume Up" media key a few times.
-
-$wsh = New-Object -ComObject WScript.Shell
-for ($i = 0; $i -lt 4; $i++) {
-    # 0xAF (175) is the Volume Up virtual key.
-    $wsh.SendKeys([char]175)
-    Start-Sleep -Milliseconds 40
-}
-
-'Volume raised.'

src/modules/ShortcutGuide/ShortcutGuide.Ui/Assets/ShortcutGuide/Manifests/BlackmagicDesign.DaVinciResolve.en-US.yml

@@ -0,0 +1,821 @@
+PackageName: BlackmagicDesign.DaVinciResolve
+Name: DaVinci Resolve
+WindowFilter: "Resolve.exe"
+BackgroundProcess: false
+Shortcuts:
+  - SectionName: Popular shortcuts
+    Properties:
+      - Name: Edit
+        Shortcut:
+        - Win: false
+          Ctrl: false
+          Shift: false
+          Alt: false
+          Keys:
+            - F5
+      - Name: Color
+        Shortcut:
+        - Win: false
+          Ctrl: false
+          Shift: false
+          Alt: false
+          Keys:
+            - F6
+      - Name: Fairlight
+        Shortcut:
+        - Win: false
+          Ctrl: false
+          Shift: false
+          Alt: false
+          Keys:
+            - F7
+      - Name: Deliver
+        Shortcut:
+        - Win: false
+          Ctrl: false
+          Shift: false
+          Alt: false
+          Keys:
+            - F8
+      - Name: Play / Pause
+        Shortcut:
+        - Win: false
+          Ctrl: false
+          Shift: false
+          Alt: false
+          Keys:
+            - Space
+      - Name: Play Reverse
+        Shortcut:
+        - Win: false
+          Ctrl: false
+          Shift: false
+          Alt: false
+          Keys:
+            - J
+      - Name: Stop
+        Shortcut:
+        - Win: false
+          Ctrl: false
+          Shift: false
+          Alt: false
+          Keys:
+            - K
+      - Name: Play Forward
+        Shortcut:
+        - Win: false
+          Ctrl: false
+          Shift: false
+          Alt: false
+          Keys:
+            - L
+      - Name: Import Media
+        Shortcut:
+        - Win: false
+          Ctrl: true
+          Shift: false
+          Alt: false
+          Keys:
+            - I
+      - Name: Export / Deliver
+        Shortcut:
+        - Win: false
+          Ctrl: true
+          Shift: true
+          Alt: false
+          Keys:
+            - E
+      - Name: Save Project
+        Shortcut:
+        - Win: false
+          Ctrl: true
+          Shift: false
+          Alt: false
+          Keys:
+            - S
+      - Name: Cut Clip
+        Shortcut:
+        - Win: false
+          Ctrl: true
+          Shift: false
+          Alt: false
+          Keys:
+            - B
+      - Name: Blade Edit
+        Shortcut:
+        - Win: false
+          Ctrl: true
+          Shift: false
+          Alt: false
+          Keys:
+            - Backslash
+      - Name: Ripple Delete
+        Shortcut:
+        - Win: false
+          Ctrl: false
+          Shift: true
+          Alt: false
+          Keys:
+            - Delete
+      - Name: Undo
+        Shortcut:
+        - Win: false
+          Ctrl: true
+          Shift: false
+          Alt: false
+          Keys:
+            - Z
+      - Name: Redo
+        Shortcut:
+        - Win: false
+          Ctrl: true
+          Shift: true
+          Alt: false
+          Keys:
+            - Z
+      - Name: Mark In
+        Shortcut:
+        - Win: false
+          Ctrl: false
+          Shift: false
+          Alt: false
+          Keys:
+            - I
+      - Name: Mark Out
+        Shortcut:
+        - Win: false
+          Ctrl: false
+          Shift: false
+          Alt: false
+          Keys:
+            - O
+      - Name: Marker
+        Shortcut:
+        - Win: false
+          Ctrl: false
+          Shift: false
+          Alt: false
+          Keys:
+            - M
+      - Name: Select All
+        Shortcut:
+        - Win: false
+          Ctrl: true
+          Shift: false
+          Alt: false
+          Keys:
+            - A
+      - Name: Go to Beginning
+        Shortcut:
+        - Win: false
+          Ctrl: false
+          Shift: false
+          Alt: false
+          Keys:
+            - Home
+      - Name: Go to End
+        Shortcut:
+        - Win: false
+          Ctrl: false
+          Shift: false
+          Alt: false
+          Keys:
+            - End
+      - Name: Snapping
+        Shortcut:
+        - Win: false
+          Ctrl: false
+          Shift: false
+          Alt: false
+          Keys:
+            - N
+      - Name: Selection Mode
+        Shortcut:
+        - Win: false
+          Ctrl: false
+          Shift: false
+          Alt: false
+          Keys:
+            - A
+      - Name: Trim Mode
+        Shortcut:
+        - Win: false
+          Ctrl: false
+          Shift: false
+          Alt: false
+          Keys:
+            - T
+      - Name: Change Clip Speed
+        Shortcut:
+        - Win: false
+          Ctrl: true
+          Shift: false
+          Alt: false
+          Keys:
+            - R
+  - SectionName: Timeline navigation
+    Properties:
+      - Name: Go to Next Frame
+        Shortcut:
+        - Win: false
+          Ctrl: false
+          Shift: false
+          Alt: false
+          Keys:
+            - Right
+      - Name: Go to Previous Frame
+        Shortcut:
+        - Win: false
+          Ctrl: false
+          Shift: false
+          Alt: false
+          Keys:
+            - Left
+      - Name: Jump Forward 5 Frames
+        Shortcut:
+        - Win: false
+          Ctrl: false
+          Shift: true
+          Alt: false
+          Keys:
+            - Right
+      - Name: Jump Back 5 Frames
+        Shortcut:
+        - Win: false
+          Ctrl: false
+          Shift: true
+          Alt: false
+          Keys:
+            - Left
+      - Name: Go to Next Clip
+        Shortcut:
+        - Win: false
+          Ctrl: false
+          Shift: true
+          Alt: false
+          Keys:
+            - Up
+      - Name: Go to Previous Clip
+        Shortcut:
+        - Win: false
+          Ctrl: false
+          Shift: true
+          Alt: false
+          Keys:
+            - Down
+      - Name: Go to Next Track
+        Shortcut:
+        - Win: false
+          Ctrl: false
+          Shift: false
+          Alt: false
+          Keys:
+            - Down
+      - Name: Go to Previous Track
+        Shortcut:
+        - Win: false
+          Ctrl: false
+          Shift: false
+          Alt: false
+          Keys:
+            - Up
+      - Name: Zoom In Timeline
+        Shortcut:
+        - Win: false
+          Ctrl: false
+          Shift: false
+          Alt: false
+          Keys:
+            - Equals
+      - Name: Zoom Out Timeline
+        Shortcut:
+        - Win: false
+          Ctrl: false
+          Shift: false
+          Alt: false
+          Keys:
+            - Minus
+      - Name: Full Screen Playback
+        Shortcut:
+        - Win: false
+          Ctrl: false
+          Shift: true
+          Alt: false
+          Keys:
+            - Space
+      - Name: Go to Previous Edit Point
+        Shortcut:
+        - Win: false
+          Ctrl: false
+          Shift: false
+          Alt: false
+          Keys:
+            - PageUp
+      - Name: Go to Next Edit Point
+        Shortcut:
+        - Win: false
+          Ctrl: false
+          Shift: false
+          Alt: false
+          Keys:
+            - PageDown
+  - SectionName: Edit
+    Properties:
+      - Name: Delete
+        Shortcut:
+        - Win: false
+          Ctrl: false
+          Shift: false
+          Alt: false
+          Keys:
+            - Delete
+      - Name: Copy
+        Shortcut:
+        - Win: false
+          Ctrl: true
+          Shift: false
+          Alt: false
+          Keys:
+            - C
+      - Name: Paste
+        Shortcut:
+        - Win: false
+          Ctrl: true
+          Shift: false
+          Alt: false
+          Keys:
+            - V
+      - Name: Cut
+        Shortcut:
+        - Win: false
+          Ctrl: true
+          Shift: false
+          Alt: false
+          Keys:
+            - X
+      - Name: Duplicate Clip
+        Shortcut:
+        - Win: false
+          Ctrl: true
+          Shift: false
+          Alt: false
+          Keys:
+            - D
+      - Name: Render in Place
+        Shortcut:
+        - Win: false
+          Ctrl: true
+          Shift: true
+          Alt: false
+          Keys:
+            - X
+      - Name: Add Edit
+        Shortcut:
+        - Win: false
+          Ctrl: true
+          Shift: false
+          Alt: false
+          Keys:
+            - Backslash
+      - Name: Append to End of Timeline
+        Shortcut:
+        - Win: false
+          Ctrl: false
+          Shift: false
+          Alt: false
+          Keys:
+            - End
+      - Name: Replace Clip
+        Shortcut:
+        - Win: false
+          Ctrl: false
+          Shift: false
+          Alt: false
+          Keys:
+            - R
+      - Name: Move Clip Up One Track
+        Shortcut:
+        - Win: false
+          Ctrl: true
+          Shift: true
+          Alt: false
+          Keys:
+            - Up
+      - Name: Move Clip Down One Track
+        Shortcut:
+        - Win: false
+          Ctrl: true
+          Shift: true
+          Alt: false
+          Keys:
+            - Down
+      - Name: Split Clip
+        Shortcut:
+        - Win: false
+          Ctrl: true
+          Shift: false
+          Alt: false
+          Keys:
+            - B
+      - Name: Link Clips
+        Shortcut:
+        - Win: false
+          Ctrl: true
+          Shift: false
+          Alt: false
+          Keys:
+            - L
+      - Name: Create Compound Clip
+        Shortcut:
+        - Win: false
+          Ctrl: true
+          Shift: false
+          Alt: false
+          Keys:
+            - G
+  - SectionName: Color
+    Properties:
+      - Name: Add Serial Node
+        Shortcut:
+        - Win: false
+          Ctrl: false
+          Shift: false
+          Alt: true
+          Keys:
+            - S
+      - Name: Add Parallel Node
+        Shortcut:
+        - Win: false
+          Ctrl: false
+          Shift: false
+          Alt: true
+          Keys:
+            - P
+      - Name: Add Layer Node
+        Shortcut:
+        - Win: false
+          Ctrl: false
+          Shift: false
+          Alt: true
+          Keys:
+            - L
+      - Name: Select Node 1
+        Shortcut:
+        - Win: false
+          Ctrl: false
+          Shift: false
+          Alt: false
+          Keys:
+            - "1"
+      - Name: Select Node 2
+        Shortcut:
+        - Win: false
+          Ctrl: false
+          Shift: false
+          Alt: false
+          Keys:
+            - "2"
+      - Name: Select Node 3
+        Shortcut:
+        - Win: false
+          Ctrl: false
+          Shift: false
+          Alt: false
+          Keys:
+            - "3"
+      - Name: Select Node 4
+        Shortcut:
+        - Win: false
+          Ctrl: false
+          Shift: false
+          Alt: false
+          Keys:
+            - "4"
+      - Name: Select Node 5
+        Shortcut:
+        - Win: false
+          Ctrl: false
+          Shift: false
+          Alt: false
+          Keys:
+            - "5"
+      - Name: Enable/Disable Current Grade
+        Shortcut:
+        - Win: false
+          Ctrl: false
+          Shift: false
+          Alt: false
+          Keys:
+            - D
+      - Name: Preview Mode
+        Shortcut:
+        - Win: false
+          Ctrl: false
+          Shift: true
+          Alt: false
+          Keys:
+            - W
+      - Name: Grade All Frames in Clip
+        Shortcut:
+        - Win: false
+          Ctrl: true
+          Shift: false
+          Alt: false
+          Keys:
+            - D
+      - Name: Keyframe Mode
+        Shortcut:
+        - Win: false
+          Ctrl: false
+          Shift: false
+          Alt: false
+          Keys:
+            - K
+      - Name: Select Color Wheels
+        Shortcut:
+        - Win: false
+          Ctrl: false
+          Shift: false
+          Alt: false
+          Keys:
+            - "1"
+      - Name: Select Curves
+        Shortcut:
+        - Win: false
+          Ctrl: false
+          Shift: false
+          Alt: false
+          Keys:
+            - "2"
+      - Name: Select Qualifier
+        Shortcut:
+        - Win: false
+          Ctrl: false
+          Shift: false
+          Alt: false
+          Keys:
+            - "3"
+      - Name: Select Power Window
+        Shortcut:
+        - Win: false
+          Ctrl: false
+          Shift: false
+          Alt: false
+          Keys:
+            - "4"
+      - Name: Select Tracking
+        Shortcut:
+        - Win: false
+          Ctrl: false
+          Shift: false
+          Alt: false
+          Keys:
+            - "5"
+      - Name: Reset Color Grade
+        Shortcut:
+        - Win: false
+          Ctrl: true
+          Shift: false
+          Alt: false
+          Keys:
+            - U
+  - SectionName: Fairlight
+    Properties:
+      - Name: Mute Track
+        Shortcut:
+        - Win: false
+          Ctrl: false
+          Shift: false
+          Alt: false
+          Keys:
+            - M
+      - Name: Solo Track
+        Shortcut:
+        - Win: false
+          Ctrl: false
+          Shift: false
+          Alt: false
+          Keys:
+            - S
+      - Name: Automation Mode
+        Shortcut:
+        - Win: false
+          Ctrl: false
+          Shift: false
+          Alt: false
+          Keys:
+            - F
+      - Name: Record Arm Selected Track
+        Shortcut:
+        - Win: false
+          Ctrl: false
+          Shift: false
+          Alt: false
+          Keys:
+            - R
+      - Name: Headphones Solo
+        Shortcut:
+        - Win: false
+          Ctrl: false
+          Shift: false
+          Alt: false
+          Keys:
+            - H
+      - Name: Add Marker
+        Shortcut:
+        - Win: false
+          Ctrl: false
+          Shift: false
+          Alt: false
+          Keys:
+            - Insert
+      - Name: Add Audio Track
+        Shortcut:
+        - Win: false
+          Ctrl: true
+          Shift: true
+          Alt: false
+          Keys:
+            - A
+      - Name: Bounce Mix
+        Shortcut:
+        - Win: false
+          Ctrl: true
+          Shift: true
+          Alt: false
+          Keys:
+            - X
+  - SectionName: Fusion
+    Properties:
+      - Name: Switch Between Spline and Keyframes
+        Shortcut:
+        - Win: false
+          Ctrl: false
+          Shift: false
+          Alt: false
+          Keys:
+            - K
+      - Name: Add Keyframe
+        Shortcut:
+        - Win: false
+          Ctrl: false
+          Shift: false
+          Alt: false
+          Keys:
+            - Shift
+      - Name: View Current Tool
+        Shortcut:
+        - Win: false
+          Ctrl: false
+          Shift: false
+          Alt: false
+          Keys:
+            - "1"
+      - Name: View Node Flow
+        Shortcut:
+        - Win: false
+          Ctrl: false
+          Shift: false
+          Alt: false
+          Keys:
+            - "2"
+      - Name: View Keyframes
+        Shortcut:
+        - Win: false
+          Ctrl: false
+          Shift: false
+          Alt: false
+          Keys:
+            - "3"
+      - Name: View Spline
+        Shortcut:
+        - Win: false
+          Ctrl: false
+          Shift: false
+          Alt: false
+          Keys:
+            - "4"
+      - Name: Merge Selected Tools
+        Shortcut:
+        - Win: false
+          Ctrl: true
+          Shift: false
+          Alt: false
+          Keys:
+            - N
+      - Name: Bypass Selected Tool
+        Shortcut:
+        - Win: false
+          Ctrl: false
+          Shift: false
+          Alt: false
+          Keys:
+            - "1"
+  - SectionName: Media
+    Properties:
+      - Name: Reveal in Explorer
+        Shortcut:
+        - Win: false
+          Ctrl: true
+          Shift: false
+          Alt: false
+          Keys:
+            - E
+      - Name: Smart Bin
+        Shortcut:
+        - Win: false
+          Ctrl: true
+          Shift: true
+          Alt: false
+          Keys:
+            - S
+      - Name: Rename Clip
+        Shortcut:
+        - Win: false
+          Ctrl: false
+          Shift: false
+          Alt: false
+          Keys:
+            - F2
+      - Name: Import XML / AAF
+        Shortcut:
+        - Win: false
+          Ctrl: true
+          Shift: true
+          Alt: false
+          Keys:
+            - I
+      - Name: Create New Bin
+        Shortcut:
+        - Win: false
+          Ctrl: true
+          Shift: false
+          Alt: false
+          Keys:
+            - N
+      - Name: Add Clip to Timeline
+        Shortcut:
+        - Win: false
+          Ctrl: false
+          Shift: false
+          Alt: false
+          Keys:
+            - Enter
+      - Name: Viewer Zoom In
+        Shortcut:
+        - Win: false
+          Ctrl: true
+          Shift: false
+          Alt: false
+          Keys:
+            - Equals
+      - Name: Viewer Zoom Out
+        Shortcut:
+        - Win: false
+          Ctrl: true
+          Shift: false
+          Alt: false
+          Keys:
+            - Minus
+  - SectionName: Deliver
+    Properties:
+      - Name: Add to Render Queue
+        Shortcut:
+        - Win: false
+          Ctrl: true
+          Shift: false
+          Alt: false
+          Keys:
+            - Enter
+      - Name: Start Render
+        Shortcut:
+        - Win: false
+          Ctrl: true
+          Shift: true
+          Alt: false
+          Keys:
+            - Enter
+      - Name: Select Preset
+        Shortcut:
+        - Win: false
+          Ctrl: false
+          Shift: false
+          Alt: false
+          Keys:
+            - F2
+      - Name: Render Settings
+        Shortcut:
+        - Win: false
+          Ctrl: true
+          Shift: false
+          Alt: false
+          Keys:
+            - E
+      - Name: Browse Output Location
+        Shortcut:
+        - Win: false
+          Ctrl: true
+          Shift: false
+          Alt: false
+          Keys:
+            - B

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

@@ -443,7 +443,7 @@ public sealed partial class MainListPage : DynamicListPage,
                 {
                     specialFallbacks.Add(s);
                 }
-                else
+                else if (s.IsEnabled)
                 {
                     commonFallbacks.Add(s);
                 }

src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Gallery/ExtensionGalleryItemViewModel.cs

@@ -105,6 +105,13 @@ public sealed partial class ExtensionGalleryItemViewModel : ObservableObject
 
     public string? Homepage => _entry.Homepage;
 
+    // Validated, browser-openable homepage uri. Null when the entry has no
+    // homepage or it is not a web uri. NavigateUri bindings must use this
+    // (a Uri) rather than the raw Homepage string: x:Bind evaluates bindings
+    // regardless of element visibility, and converting a null/invalid string
+    // to Uri throws and crashes the page.
+    public Uri? HomepageUri => _homepageHttpUri;
+
     public Uri IconUri { get; }
 
     public ImageSource IconSource

src/modules/cmdpal/Microsoft.CmdPal.UI/Settings/ExtensionGalleryItemPage.xaml

@@ -232,7 +232,7 @@
                                 Grid.Row="3"
                                 Padding="0"
                                 AutomationProperties.AutomationId="CmdPal_GalleryItemPage_ViewRepository"
-                                NavigateUri="{x:Bind ViewModel.Homepage, Mode=OneWay}"
+                                NavigateUri="{x:Bind ViewModel.HomepageUri, Mode=OneWay}"
                                 ToolTipService.ToolTip="{x:Bind ViewModel.Homepage, Mode=OneWay}"
                                 Visibility="{x:Bind help:BindTransformers.BoolToVisibility(ViewModel.HasHomepage), Mode=OneWay, FallbackValue=Collapsed}">
                                 <StackPanel Orientation="Horizontal" Spacing="4">
@@ -332,7 +332,7 @@
                             <Grid.RowDefinitions>
                                 <RowDefinition Height="Auto" />
                                 <RowDefinition Height="Auto" />
-                                <RowDefinition Height="Auto" />
+                                <RowDefinition Height="232" />
                             </Grid.RowDefinitions>
 
                             <TextBlock
@@ -365,6 +365,7 @@
                                                 <SolidColorBrush x:Key="ItemContainerBackgroundPressed" Color="Transparent" />
                                             </ItemContainer.Resources>
                                             <Border
+                                                Width="356"
                                                 Height="200"
                                                 Background="{ThemeResource CardBackgroundFillColorDefaultBrush}"
                                                 BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}"

src/modules/cmdpal/Microsoft.CmdPal.UI/Settings/SettingsWindow.xaml.cs

@@ -160,20 +160,24 @@ public sealed partial class SettingsWindow : WindowEx,
                 break;
         }
 
-        if (pageType is not null)
+        if (pageType is null)
         {
-            NavFrame.Navigate(pageType);
+            return;
+        }
 
-            // Now, make sure to actually select the correct menu item too
-            foreach (var obj in NavView.MenuItems)
+        if (NavFrame.Content?.GetType() == pageType)
+        {
+            return;
+        }
+
+        NavFrame.Navigate(pageType);
+
+        // Now, make sure to actually select the correct menu item too
+        foreach (var obj in NavView.MenuItems)
+        {
+            if (obj is NavigationViewItem item && item.Tag is string s && s == page)
             {
-                if (obj is NavigationViewItem item)
-                {
-                    if (item.Tag is string s && s == page)
-                    {
-                        NavView.SelectedItem = item;
-                    }
-                }
+                NavView.SelectedItem = item;
             }
         }
     }

src/modules/cmdpal/Microsoft.CmdPal.UI/ToastWindow.xaml

@@ -4,13 +4,23 @@
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:common="using:Microsoft.PowerToys.Common.UI.Controls.Window"
+    xmlns:controls="using:Microsoft.PowerToys.Common.UI.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:local="using:Microsoft.CmdPal.UI"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     mc:Ignorable="d">
-    <TextBlock
-        Margin="16,10,20,12"
-        Text="{x:Bind ViewModel.ToastMessage, Mode=OneWay}"
-        TextAlignment="Center"
-        TextWrapping="Wrap" />
+    <controls:TransientSurface
+        x:Name="Surface"
+        MaxWidth="560"
+        Margin="24,24,24,16"
+        HorizontalAlignment="Center"
+        VerticalAlignment="Bottom"
+        HideTransition="Bottom"
+        ShowTransition="Bottom">
+        <TextBlock
+            Margin="16,10,20,12"
+            Text="{x:Bind ViewModel.ToastMessage, Mode=OneWay}"
+            TextAlignment="Center"
+            TextWrapping="Wrap" />
+    </controls:TransientSurface>
 </common:TransparentWindow>

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

@@ -17,11 +17,14 @@ using RS_ = Microsoft.CmdPal.UI.Helpers.ResourceLoaderInstance;
 namespace Microsoft.CmdPal.UI;
 
 /// <summary>
-/// CmdPal's transient toast banner. Inherits all of its chrome, click-through,
-/// acrylic, and fade/slide animations from
-/// <see cref="TransparentWindow"/>; adds only the bits that are bespoke to
-/// CmdPal toasts: a bound message <c>TextBlock</c>, a 2.5 s auto-dismiss timer,
-/// bottom-center positioning, and <see cref="QuitMessage"/> handling.
+/// CmdPal's transient toast notification. It is a bare
+/// <see cref="TransparentWindow"/> host whose content is a
+/// <see cref="Microsoft.PowerToys.Common.UI.Controls.TransientSurface"/> — the
+/// surface supplies the acrylic, border, corners, shadow, and the fade/slide
+/// animation, driven automatically off the window's show/hide events. This class
+/// adds only the bits bespoke to CmdPal toasts: a bound message <c>TextBlock</c>,
+/// a 2.5 s auto-dismiss timer, bottom-center positioning, and
+/// <see cref="QuitMessage"/> handling.
 /// </summary>
 public sealed partial class ToastWindow : TransparentWindow,
     IRecipient<QuitMessage>
@@ -39,13 +42,10 @@ public sealed partial class ToastWindow : TransparentWindow,
         AppWindow.Title = RS_.GetString("ToastWindowTitle");
         this.SetWindowSize(600, 180);
 
-        // Pin the chrome card to bottom-center with the toast's classic 560-wide
-        // pill shape. The window itself stays 600x180 so the slide animations
-        // have headroom and we don't have to chase SizeToContent.
-        Card.HorizontalAlignment = Microsoft.UI.Xaml.HorizontalAlignment.Center;
-        Card.VerticalAlignment = Microsoft.UI.Xaml.VerticalAlignment.Bottom;
-        Card.MaxWidth = 560;
-        Card.Margin = new Microsoft.UI.Xaml.Thickness(24, 24, 24, 16);
+        // Let the surface animate itself in/out in response to this window's
+        // Show()/Hide(). The 600x180 window leaves the bottom-center 560-wide
+        // pill (positioned in XAML) room for its slide + shadow.
+        Surface.SubscribeTo(this);
 
         WeakReferenceMessenger.Default.Register<QuitMessage>(this);
     }

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

@@ -119,6 +119,7 @@ public class ExtensionGalleryItemViewModelTests
         var viewModel = CreateViewModel(entry);
 
         Assert.IsFalse(viewModel.HasHomepage);
+        Assert.IsNull(viewModel.HomepageUri);
         Assert.IsFalse(viewModel.HasAuthorUrl);
         Assert.IsFalse(viewModel.HasUrlSource);
         Assert.IsFalse(viewModel.HasActionableSourceDetails);
@@ -131,6 +132,32 @@ public class ExtensionGalleryItemViewModelTests
         Assert.IsFalse(viewModel.OpenInstallUrlCommand.CanExecute(null));
     }
 
+    [TestMethod]
+    public void Constructor_SetsHomepageUri_WhenHomepageIsWebUri()
+    {
+        var entry = CreateEntry(iconUrl: null);
+        entry.Homepage = "https://example.com/extension";
+
+        var viewModel = CreateViewModel(entry);
+
+        Assert.IsTrue(viewModel.HasHomepage);
+        Assert.AreEqual(new Uri("https://example.com/extension"), viewModel.HomepageUri);
+        Assert.IsTrue(viewModel.OpenHomepageCommand.CanExecute(null));
+    }
+
+    [TestMethod]
+    public void Constructor_LeavesHomepageUriNull_WhenHomepageIsMissing()
+    {
+        var entry = CreateEntry(iconUrl: null);
+        entry.Homepage = null;
+
+        var viewModel = CreateViewModel(entry);
+
+        Assert.IsFalse(viewModel.HasHomepage);
+        Assert.IsNull(viewModel.HomepageUri);
+        Assert.IsFalse(viewModel.OpenHomepageCommand.CanExecute(null));
+    }
+
     [TestMethod]
     public void Constructor_EnablesCopyCommand_WhenWinGetIdIsAvailable()
     {

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.PerformanceMonitor/PerformanceWidgetsPage.cs

@@ -134,6 +134,25 @@ internal sealed partial class PerformanceWidgetsPage : OnLoadStaticListPage, IDi
                 MoreCommands = _networkPage.Commands,
             };
 
+            if (isBandPage)
+            {
+                _networkUpItem = new ListItem(_networkPage)
+                {
+                    Title = $"{_networkUpSpeed}",
+                    Subtitle = Resources.GetResource("Network_Send_Subtitle"),
+                    Icon = Icons.NetworkUpIcon,
+                    MoreCommands = _networkPage.Commands,
+                };
+
+                _networkDownItem = new ListItem(_networkPage)
+                {
+                    Title = $"{_networkDownSpeed}",
+                    Subtitle = Resources.GetResource("Network_Receive_Subtitle"),
+                    Icon = Icons.NetworkDownIcon,
+                    MoreCommands = _networkPage.Commands,
+                };
+            }
+
             _networkPage.Updated += (s, e) =>
             {
                 _networkItem.Title = _networkPage.GetItemTitle(isBandPage);
@@ -253,22 +272,6 @@ internal sealed partial class PerformanceWidgetsPage : OnLoadStaticListPage, IDi
         }
         else
         {
-            _networkUpItem = new ListItem(_networkPage!)
-            {
-                Title = $"{_networkUpSpeed}",
-                Subtitle = Resources.GetResource("Network_Send_Subtitle"),
-                Icon = Icons.NetworkUpIcon,
-                MoreCommands = _networkPage!.Commands,
-            };
-
-            _networkDownItem = new ListItem(_networkPage!)
-            {
-                Title = $"{_networkDownSpeed}",
-                Subtitle = Resources.GetResource("Network_Receive_Subtitle"),
-                Icon = Icons.NetworkDownIcon,
-                MoreCommands = _networkPage!.Commands,
-            };
-
             return _batteryItem is not null
                 ? new[] { _cpuItem!, _memoryItem!, _networkUpItem!, _networkDownItem!, _gpuItem!, _batteryItem! }
                 : new[] { _cpuItem!, _memoryItem!, _networkUpItem!, _networkDownItem!, _gpuItem! };

src/modules/keyboardmanager/KeyboardManagerEditorUI/Controls/UnifiedMappingControl.xaml

@@ -212,12 +212,6 @@
                         <TextBlock x:Uid="ActionType_Disable_Text" />
                     </StackPanel>
                 </ComboBoxItem>
-                <ComboBoxItem Tag="PowerScript">
-                    <StackPanel Orientation="Horizontal" Spacing="8">
-                        <FontIcon FontSize="14" Glyph="&#xE756;" />
-                        <TextBlock Text="PowerScript" />
-                    </StackPanel>
-                </ComboBoxItem>
                 <!--
                 <ComboBoxItem x:Uid="ActionType_MouseClick" Tag="MouseClick">
                     <StackPanel Orientation="Horizontal" Spacing="8">
@@ -404,27 +398,6 @@
                         Foreground="{ThemeResource TextFillColorSecondaryBrush}"
                         TextWrapping="Wrap" />
                 </tkcontrols:Case>
-                <!--  PowerScript Action  -->
-                <tkcontrols:Case Value="PowerScript">
-                    <StackPanel Orientation="Vertical" Spacing="8">
-                        <TextBlock
-                            Foreground="{ThemeResource TextFillColorSecondaryBrush}"
-                            Text="Run a PowerScript when this shortcut is pressed."
-                            TextWrapping="Wrap" />
-                        <ComboBox
-                            x:Name="PowerScriptComboBox"
-                            HorizontalAlignment="Stretch"
-                            DisplayMemberPath="Name"
-                            PlaceholderText="Select a PowerScript"
-                            SelectionChanged="PowerScriptComboBox_SelectionChanged" />
-                        <TextBlock
-                            x:Name="PowerScriptEmptyHint"
-                            Foreground="{ThemeResource TextFillColorSecondaryBrush}"
-                            Text="No PowerScripts found. Enable the PowerScripts module and add a system script."
-                            TextWrapping="Wrap"
-                            Visibility="Collapsed" />
-                    </StackPanel>
-                </tkcontrols:Case>
             </tkcontrols:SwitchPresenter>
         </StackPanel>
         <!--  Validation InfoBar spanning all columns  -->

src/modules/keyboardmanager/KeyboardManagerEditorUI/Controls/UnifiedMappingControl.xaml.cs

@@ -34,8 +34,6 @@ namespace KeyboardManagerEditorUI.Controls
         private readonly ObservableCollection<string> _triggerKeys = new();
         private readonly ObservableCollection<string> _actionKeys = new();
 
-        private readonly ObservableCollection<Helpers.PowerScriptInfo> _powerScripts = new();
-
         private bool _disposed;
         private bool _internalUpdate;
 
@@ -81,7 +79,6 @@ namespace KeyboardManagerEditorUI.Controls
             OpenApp,
             MouseClick,
             Disable,
-            PowerScript,
         }
 
         /// <summary>
@@ -135,7 +132,6 @@ namespace KeyboardManagerEditorUI.Controls
                         "OpenApp" => ActionType.OpenApp,
                         "MouseClick" => ActionType.MouseClick,
                         "Disable" => ActionType.Disable,
-                        "PowerScript" => ActionType.PowerScript,
                         _ => ActionType.KeyOrShortcut,
                     };
                 }
@@ -155,14 +151,6 @@ namespace KeyboardManagerEditorUI.Controls
             TriggerKeys.ItemsSource = _triggerKeys;
             ActionKeys.ItemsSource = _actionKeys;
 
-            // Populate the PowerScripts picker (system scripts). Empty when PowerScripts isn't installed.
-            foreach (var script in Helpers.PowerScriptsCatalog.GetSystemScripts())
-            {
-                _powerScripts.Add(script);
-            }
-
-            PowerScriptComboBox.ItemsSource = _powerScripts;
-
             _triggerKeys.CollectionChanged += (_, _) =>
             {
                 UpdatePlaceholderVisibility();
@@ -279,18 +267,6 @@ namespace KeyboardManagerEditorUI.Controls
             RaiseValidationStateChanged();
         }
 
-        private void PowerScriptComboBox_SelectionChanged(object sender, SelectionChangedEventArgs e)
-        {
-            if (PowerScriptEmptyHint != null)
-            {
-                PowerScriptEmptyHint.Visibility = _powerScripts.Count == 0
-                    ? Microsoft.UI.Xaml.Visibility.Visible
-                    : Microsoft.UI.Xaml.Visibility.Collapsed;
-            }
-
-            RaiseValidationStateChanged();
-        }
-
         private void ActionKeyToggleBtn_Checked(object sender, RoutedEventArgs e)
         {
             if (ActionKeyToggleBtn.IsChecked == true)
@@ -776,26 +752,6 @@ namespace KeyboardManagerEditorUI.Controls
         /// </summary>
         public string GetUrl() => UrlPathInput?.Text ?? string.Empty;
 
-        /// <summary>
-        /// Gets the selected PowerScript (for the PowerScript action type), or null if none selected.
-        /// </summary>
-        public Helpers.PowerScriptInfo? GetSelectedPowerScript() => PowerScriptComboBox?.SelectedItem as Helpers.PowerScriptInfo;
-
-        /// <summary>
-        /// Selects the PowerScript with the given id in the picker, if present.
-        /// </summary>
-        public void SelectPowerScript(string id)
-        {
-            foreach (var script in _powerScripts)
-            {
-                if (string.Equals(script.Id, id, StringComparison.OrdinalIgnoreCase))
-                {
-                    PowerScriptComboBox.SelectedItem = script;
-                    return;
-                }
-            }
-        }
-
         /// <summary>
         /// Gets the program path (for OpenApp action type).
         /// </summary>

src/modules/keyboardmanager/KeyboardManagerEditorUI/Helpers/PowerScriptInfo.cs

@@ -1,22 +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 KeyboardManagerEditorUI.Helpers
-{
-    /// <summary>
-    /// A single PowerScript entry as surfaced to the Keyboard Manager editor's "PowerScript" action picker.
-    /// </summary>
-    public sealed class PowerScriptInfo
-    {
-        public string Id { get; init; } = string.Empty;
-
-        public string Name { get; init; } = string.Empty;
-
-        public string Description { get; init; } = string.Empty;
-
-        public string Kind { get; init; } = string.Empty;
-
-        public override string ToString() => Name;
-    }
-}

src/modules/keyboardmanager/KeyboardManagerEditorUI/Helpers/PowerScriptsCatalog.cs

@@ -1,147 +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.Generic;
-using System.Diagnostics;
-using System.IO;
-using System.Linq;
-using System.Text.Json;
-
-namespace KeyboardManagerEditorUI.Helpers
-{
-    /// <summary>
-    /// Bridges the Keyboard Manager editor to the PowerScripts module.
-    ///
-    /// PowerScripts are surfaced through the shared executor <c>PowerScripts.Host.exe</c>. To keep the
-    /// editor decoupled from the PowerScripts assemblies, we shell out to <c>Host.exe list --json</c>
-    /// and parse the result. Selecting a "system" PowerScript in the editor then saves an ordinary
-    /// Keyboard Manager "Run Program" mapping whose target is <c>Host.exe run &lt;id&gt;</c>.
-    /// </summary>
-    public static class PowerScriptsCatalog
-    {
-        private const string HostExeName = "PowerScripts.Host.exe";
-
-        private static readonly JsonSerializerOptions JsonOptions = new() { PropertyNameCaseInsensitive = true };
-
-        /// <summary>
-        /// Resolves the full path to <c>PowerScripts.Host.exe</c>, or null if it can't be found.
-        /// Search order: explicit override env var, next to the editor, then the default install root.
-        /// </summary>
-        public static string? ResolveHostPath()
-        {
-            var overridePath = Environment.GetEnvironmentVariable("POWERSCRIPTS_HOST");
-            if (!string.IsNullOrWhiteSpace(overridePath) && File.Exists(overridePath))
-            {
-                return overridePath;
-            }
-
-            var candidates = new List<string>
-            {
-                Path.Combine(AppContext.BaseDirectory, HostExeName),
-                Path.Combine(AppContext.BaseDirectory, "PowerScripts", HostExeName),
-                Path.Combine(
-                    Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData),
-                    "Microsoft",
-                    "PowerToys",
-                    "PowerScripts",
-                    HostExeName),
-            };
-
-            // Prototype dev fallback: in an in-repo build the Host isn't copied next to the editor,
-            // so walk up from the base directory and probe the Host project's bin output. This keeps
-            // the PowerScript action usable for end-to-end testing from a Debug build.
-            var dir = new DirectoryInfo(AppContext.BaseDirectory);
-            while (dir is not null)
-            {
-                foreach (var config in new[] { "Debug", "Release" })
-                {
-                    var hostBin = Path.Combine(
-                        dir.FullName,
-                        "src",
-                        "modules",
-                        "PowerScripts",
-                        "PowerScripts.Host",
-                        "bin",
-                        config);
-
-                    if (Directory.Exists(hostBin))
-                    {
-                        var found = Directory
-                            .EnumerateFiles(hostBin, HostExeName, SearchOption.AllDirectories)
-                            .FirstOrDefault();
-                        if (!string.IsNullOrEmpty(found))
-                        {
-                            candidates.Add(found);
-                        }
-                    }
-                }
-
-                dir = dir.Parent;
-            }
-
-            foreach (var candidate in candidates)
-            {
-                if (File.Exists(candidate))
-                {
-                    return candidate;
-                }
-            }
-
-            return null;
-        }
-
-        /// <summary>
-        /// Returns the list of system PowerScripts available for hotkey assignment, or an empty list
-        /// when PowerScripts isn't installed or no system scripts exist.
-        /// </summary>
-        public static IReadOnlyList<PowerScriptInfo> GetSystemScripts()
-        {
-            var hostPath = ResolveHostPath();
-            if (hostPath is null)
-            {
-                return Array.Empty<PowerScriptInfo>();
-            }
-
-            try
-            {
-                var psi = new ProcessStartInfo
-                {
-                    FileName = hostPath,
-                    Arguments = "list --json",
-                    RedirectStandardOutput = true,
-                    UseShellExecute = false,
-                    CreateNoWindow = true,
-                };
-
-                using var process = Process.Start(psi);
-                if (process is null)
-                {
-                    return Array.Empty<PowerScriptInfo>();
-                }
-
-                string json = process.StandardOutput.ReadToEnd();
-                process.WaitForExit(5000);
-
-                var all = JsonSerializer.Deserialize<List<PowerScriptInfo>>(json, JsonOptions) ?? new List<PowerScriptInfo>();
-
-                var systemScripts = new List<PowerScriptInfo>();
-                foreach (var script in all)
-                {
-                    if (string.Equals(script.Kind, "system", StringComparison.OrdinalIgnoreCase))
-                    {
-                        systemScripts.Add(script);
-                    }
-                }
-
-                return systemScripts;
-            }
-            catch (Exception)
-            {
-                // Prototype: a missing/failed PowerScripts host simply yields no scripts to pick.
-                return Array.Empty<PowerScriptInfo>();
-            }
-        }
-    }
-}

src/modules/keyboardmanager/KeyboardManagerEditorUI/Pages/MainPage.xaml.cs

@@ -394,7 +394,6 @@ namespace KeyboardManagerEditorUI.Pages
                     UnifiedMappingControl.ActionType.OpenUrl => SaveUrlMapping(triggerKeys),
                     UnifiedMappingControl.ActionType.OpenApp => SaveProgramMapping(triggerKeys),
                     UnifiedMappingControl.ActionType.Disable => SaveDisableMapping(triggerKeys),
-                    UnifiedMappingControl.ActionType.PowerScript => SavePowerScriptMapping(triggerKeys),
                     UnifiedMappingControl.ActionType.MouseClick => throw new NotImplementedException("Mouse click remapping is not yet supported."),
                     _ => false,
                 };
@@ -440,10 +439,6 @@ namespace KeyboardManagerEditorUI.Pages
                     triggerKeys, UnifiedMappingControl.GetProgramPath(), isAppSpecific, appName, _mappingService!, _isEditMode),
                 UnifiedMappingControl.ActionType.Disable => ValidationHelper.ValidateDisableMapping(
                     triggerKeys, isAppSpecific, appName, _mappingService!, _isEditMode, editingRemapping),
-                UnifiedMappingControl.ActionType.PowerScript => UnifiedMappingControl.GetSelectedPowerScript() is null
-                    ? ValidationErrorType.EmptyProgramPath
-                    : ValidationHelper.ValidateAppMapping(
-                        triggerKeys, PowerScriptsCatalog.ResolveHostPath() ?? string.Empty, isAppSpecific, appName, _mappingService!, _isEditMode),
                 _ => ValidationErrorType.NoError,
             };
         }
@@ -688,47 +683,6 @@ namespace KeyboardManagerEditorUI.Pages
             return saved;
         }
 
-        private bool SavePowerScriptMapping(List<string> triggerKeys)
-        {
-            var script = UnifiedMappingControl.GetSelectedPowerScript();
-            if (script is null)
-            {
-                return false;
-            }
-
-            string hostPath = PowerScriptsCatalog.ResolveHostPath() ?? string.Empty;
-            if (string.IsNullOrEmpty(hostPath))
-            {
-                return false;
-            }
-
-            string originalKeysString = string.Join(";", triggerKeys.Select(k => _mappingService!.GetKeyCodeFromName(k).ToString(CultureInfo.InvariantCulture)));
-
-            // A PowerScript hotkey is an ordinary "Run Program" mapping that invokes the shared executor.
-            var shortcutKeyMapping = new ShortcutKeyMapping
-            {
-                OperationType = ShortcutOperationType.RunProgram,
-                OriginalKeys = originalKeysString,
-                TargetKeys = originalKeysString,
-                ProgramPath = hostPath,
-                ProgramArgs = $"run {script.Id}",
-                StartInDirectory = string.Empty,
-                IfRunningAction = ProgramAlreadyRunningAction.StartAnother,
-                Visibility = StartWindowType.Hidden,
-                Elevation = ElevationLevel.NonElevated,
-                TargetApp = string.Empty,
-            };
-
-            bool saved = _mappingService!.AddShortcutMapping(shortcutKeyMapping);
-            if (saved)
-            {
-                _mappingService.SaveSettings();
-                SettingsManager.AddShortcutKeyMappingToSettings(shortcutKeyMapping);
-            }
-
-            return saved;
-        }
-
         #endregion
 
         #region Delete Handlers

src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.VSCodeWorkspaces/WorkspacesHelper/VSCodeWorkspacesApi.cs

@@ -33,16 +33,40 @@ namespace Community.PowerToys.Run.Plugin.VSCodeWorkspaces.WorkspacesHelper
                 return null;
             }
 
-            var (workspaceEnv, machineName) = ParseVSCodeAuthority.GetWorkspaceEnvironment(authority ?? rfc3986Uri.Authority);
+            var isFileUri = string.Equals(
+                rfc3986Uri.Scheme,
+                Uri.UriSchemeFile,
+                StringComparison.OrdinalIgnoreCase);
+
+            var isUncFileUri =
+                isFileUri &&
+                string.IsNullOrEmpty(authority) &&
+                !string.IsNullOrEmpty(rfc3986Uri.Authority) &&
+                !string.Equals(
+                    rfc3986Uri.Authority,
+                    "localhost",
+                    StringComparison.OrdinalIgnoreCase);
+
+            // file://server/share is a local Windows UNC path, not a VS Code remote URI.
+            var effectiveAuthority =
+                isFileUri && string.IsNullOrEmpty(authority)
+                    ? string.Empty
+                    : authority ?? rfc3986Uri.Authority;
+
+            var (workspaceEnv, machineName) =
+                ParseVSCodeAuthority.GetWorkspaceEnvironment(effectiveAuthority);
+
             if (workspaceEnv is null)
             {
                 return null;
             }
 
-            var path = rfc3986Uri.Path;
+            var path = isUncFileUri
+                ? $@"\\{rfc3986Uri.Authority}{rfc3986Uri.Path.Replace('/', '\\')}"
+                : rfc3986Uri.Path;
 
-            // Remove preceding '/' from local (Windows) path
-            if (workspaceEnv == WorkspaceEnvironment.Local)
+            // file:///C:/... becomes C:/...
+            if (workspaceEnv == WorkspaceEnvironment.Local && !isUncFileUri)
             {
                 path = path[1..];
             }

src/modules/powerdisplay/PowerDisplay/Helpers/WindowHelper.cs

@@ -8,7 +8,7 @@ namespace PowerDisplay.Helpers
 {
     /// <summary>
     /// PowerDisplay-local window helpers. Flyout positioning/sizing now lives in
-    /// <c>Microsoft.PowerToys.Common.UI.Flyout.FlyoutWindowHelper</c> (Common.UI.Controls).
+    /// <c>Microsoft.PowerToys.Common.UI.Controls.Window.FlyoutWindowHelper</c> (Common.UI.Controls).
     /// </summary>
     internal static partial class WindowHelper
     {

src/modules/powerdisplay/PowerDisplay/PowerDisplayXAML/IdentifyWindow.xaml.cs

@@ -3,7 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
-using Microsoft.PowerToys.Common.UI.Controls.Flyout;
+using Microsoft.PowerToys.Common.UI.Controls.Window;
 using Microsoft.UI.Dispatching;
 using Microsoft.UI.Windowing;
 using PowerDisplay.Configuration;

src/modules/powerdisplay/PowerDisplay/PowerDisplayXAML/MainWindow.xaml.cs

@@ -5,7 +5,6 @@
 using System;
 using System.Diagnostics.CodeAnalysis;
 using ManagedCommon;
-using Microsoft.PowerToys.Common.UI.Controls.Flyout;
 using Microsoft.PowerToys.Common.UI.Controls.Window;
 using Microsoft.PowerToys.Settings.UI.Library;
 using Microsoft.UI.Windowing;

src/runner/Resources.resx

@@ -186,6 +186,34 @@
   <data name="BUGREPORT_SUCCESS" xml:space="preserve">
     <value>Bug report .zip file has been created on your Desktop.</value>
   </data>
+  <data name="BUGREPORT_DIALOG_TITLE" xml:space="preserve">
+    <value>PowerToys Bug Report</value>
+  </data>
+  <data name="BUGREPORT_GENERATING" xml:space="preserve">
+    <value>Generating bug report</value>
+    <comment>Shown while the bug report is being created. A few animated dots are appended at runtime.</comment>
+  </data>
+  <data name="BUGREPORT_GENERATING_HINT" xml:space="preserve">
+    <value>Collecting logs and diagnostics. This can take up to a minute.</value>
+  </data>
+  <data name="BUGREPORT_DONE_HEADER" xml:space="preserve">
+    <value>Your bug report is ready.</value>
+  </data>
+  <data name="BUGREPORT_DONE_HINT" xml:space="preserve">
+    <value>After the GitHub issue page opens, drag the highlighted .zip file into the report to attach it.</value>
+  </data>
+  <data name="BUGREPORT_FAILED" xml:space="preserve">
+    <value>Could not create the bug report. Please try again.</value>
+  </data>
+  <data name="BUGREPORT_OPEN_FOLDER" xml:space="preserve">
+    <value>Open folder</value>
+  </data>
+  <data name="BUGREPORT_CREATE_ISSUE" xml:space="preserve">
+    <value>Report on GitHub</value>
+  </data>
+  <data name="BUGREPORT_CLOSE" xml:space="preserve">
+    <value>Close</value>
+  </data>
   <data name="PT_VERSION_CHANGE_ASK_FOR_COMPUTER_RESTART" xml:space="preserve">
     <value>A new PowerToys version has been installed. Please restart the computer, when possible, to fully reload File Explorer extensions.</value>
     <comment>File Explorer refers to the Windows File Explorer application.</comment>

src/runner/bug_report.cpp

@@ -1,5 +1,6 @@
 #include "pch.h"
 #include "bug_report.h"
+#include "bug_report_dialog.h"
 #include "Generated files/resource.h"
 #include <common/utils/process_path.h>
 #include <common/utils/resources.h>
@@ -50,21 +51,14 @@ void BugReportManager::launch_bug_report() noexcept
         notify_observers(true);
 
         std::thread([this, bug_report_path]() {
-            SHELLEXECUTEINFOW sei{ sizeof(sei) };
-            sei.fMask = { SEE_MASK_FLAG_NO_UI | SEE_MASK_NOASYNC | SEE_MASK_NOCLOSEPROCESS | SEE_MASK_NO_CONSOLE };
-            sei.lpFile = bug_report_path.c_str();
-            sei.nShow = SW_HIDE;
-            if (ShellExecuteExW(&sei))
-            {
-                WaitForSingleObject(sei.hProcess, INFINITE);
-                CloseHandle(sei.hProcess);
-                static const std::wstring bugreport_success = GET_RESOURCE_STRING(IDS_BUGREPORT_SUCCESS);
-                MessageBoxW(nullptr, bugreport_success.c_str(), L"PowerToys", MB_OK);
-            }
-
-            m_isBugReportRunning.store(false);
-            // Notify observers that bug report has finished
-            notify_observers(false);
+            // Shows the progress/result window and runs the tool. The running
+            // state is cleared as soon as the tool process exits, so the window
+            // with the result and "Report on GitHub" action can stay open
+            // afterwards without keeping the UI in a "running" state.
+            run_bug_report_dialog(bug_report_path, [this]() {
+                m_isBugReportRunning.store(false);
+                notify_observers(false);
+            });
         }).detach();
     }
     else

src/runner/bug_report_dialog.cpp

@@ -0,0 +1,507 @@
+#include "pch.h"
+#include "bug_report_dialog.h"
+#include "Generated files/resource.h"
+
+#include <common/utils/resources.h>
+#include <common/version/version.h>
+
+#include <ShlObj.h>
+#include <shellapi.h>
+
+#include <atomic>
+#include <filesystem>
+#include <mutex>
+#include <string>
+
+namespace
+{
+    constexpr UINT WM_BUGREPORT_DONE = WM_APP + 1;
+    constexpr UINT WM_BUGREPORT_FAILED = WM_APP + 2;
+
+    constexpr int ID_BTN_OPEN_FOLDER = 1001;
+    constexpr int ID_BTN_CREATE_ISSUE = 1002;
+    constexpr int ID_BTN_CLOSE = 1003;
+    constexpr UINT_PTR ANIM_TIMER_ID = 1;
+
+    const wchar_t* kWindowClass = L"PowerToysBugReportDialog";
+
+    // Only one bug report dialog can be open at a time.
+    std::atomic<HWND> g_dialogWnd{ nullptr };
+
+    struct DialogState
+    {
+        UINT dpi = 96;
+        HWND hStatus = nullptr; // header text (generating / done / failed)
+        HWND hPath = nullptr; // read-only edit showing the .zip path
+        HWND hHint = nullptr; // secondary explanatory text
+        HWND hOpenFolder = nullptr;
+        HWND hCreateIssue = nullptr;
+        HWND hClose = nullptr;
+        HFONT hFont = nullptr;
+        HFONT hHeaderFont = nullptr;
+        std::wstring zipPath;
+        int animDots = 0;
+        bool done = false;
+    };
+
+    int Scale(int value, UINT dpi)
+    {
+        return MulDiv(value, static_cast<int>(dpi), 96);
+    }
+
+    HFONT MakeFont(UINT dpi, bool header)
+    {
+        NONCLIENTMETRICSW ncm{ sizeof(ncm) };
+        SystemParametersInfoW(SPI_GETNONCLIENTMETRICS, sizeof(ncm), &ncm, 0);
+        LOGFONTW lf = ncm.lfMessageFont;
+        const int pointSize = header ? 14 : 9;
+        lf.lfHeight = -MulDiv(pointSize, static_cast<int>(dpi), 72);
+        lf.lfWeight = header ? FW_SEMIBOLD : FW_NORMAL;
+        return CreateFontIndirectW(&lf);
+    }
+
+    void ShowCtl(HWND ctl, bool show)
+    {
+        ShowWindow(ctl, show ? SW_SHOW : SW_HIDE);
+    }
+
+    std::wstring GetDesktopPath()
+    {
+        PWSTR raw = nullptr;
+        std::wstring result;
+        if (SUCCEEDED(SHGetKnownFolderPath(FOLDERID_Desktop, KF_FLAG_DEFAULT, nullptr, &raw)))
+        {
+            result = raw;
+        }
+        if (raw)
+        {
+            CoTaskMemFree(raw);
+        }
+        return result;
+    }
+
+    // The tool names its output PowerToysReport_<timestamp>.zip, so pick the most
+    // recently written matching file in the destination folder.
+    std::wstring FindNewestReport(const std::wstring& folder)
+    {
+        namespace fs = std::filesystem;
+        if (folder.empty())
+        {
+            return {};
+        }
+
+        std::wstring best;
+        fs::file_time_type bestTime{};
+        std::error_code ec;
+        for (const auto& entry : fs::directory_iterator(folder, ec))
+        {
+            if (ec)
+            {
+                break;
+            }
+            std::error_code itemEc;
+            if (!entry.is_regular_file(itemEc))
+            {
+                continue;
+            }
+            const auto name = entry.path().filename().wstring();
+            if (name.rfind(L"PowerToysReport_", 0) != 0 || entry.path().extension() != L".zip")
+            {
+                continue;
+            }
+            const auto writeTime = fs::last_write_time(entry, itemEc);
+            if (itemEc)
+            {
+                continue;
+            }
+            if (best.empty() || writeTime > bestTime)
+            {
+                best = entry.path().wstring();
+                bestTime = writeTime;
+            }
+        }
+        return best;
+    }
+
+    // The dialog is created from the runner (a background process). When the
+    // request comes from Settings, Settings owns the foreground, so a plain
+    // SetForegroundWindow would leave the dialog hidden behind it. Use the
+    // canonical AttachThreadInput recipe to reliably bring it to the front.
+    void ForceForeground(HWND hwnd)
+    {
+        const HWND foreground = GetForegroundWindow();
+        const DWORD targetThread = GetWindowThreadProcessId(hwnd, nullptr);
+        const DWORD foregroundThread = foreground ? GetWindowThreadProcessId(foreground, nullptr) : 0;
+        const bool attach = foregroundThread != 0 && foregroundThread != targetThread;
+        if (attach)
+        {
+            AttachThreadInput(foregroundThread, targetThread, TRUE);
+        }
+        BringWindowToTop(hwnd);
+        SetForegroundWindow(hwnd);
+        SetActiveWindow(hwnd);
+        if (attach)
+        {
+            AttachThreadInput(foregroundThread, targetThread, FALSE);
+        }
+    }
+
+    void RevealZip(const std::wstring& path)    {
+        if (path.empty())
+        {
+            return;
+        }
+        const std::wstring args = L"/select,\"" + path + L"\"";
+        ShellExecuteW(nullptr, L"open", L"explorer.exe", args.c_str(), nullptr, SW_SHOWNORMAL);
+    }
+
+    void OpenIssuePage(const std::wstring& zipPath)
+    {
+        const std::wstring url =
+            L"https://github.com/microsoft/PowerToys/issues/new?template=bug_report.yml&labels=Issue-Bug%2CTriage-Needed&version=" +
+            get_product_version();
+        ShellExecuteW(nullptr, L"open", url.c_str(), nullptr, nullptr, SW_SHOWNORMAL);
+
+        // Reveal the .zip so the user can drag it into the freshly opened issue page.
+        RevealZip(zipPath);
+    }
+
+    HWND CreateButton(HWND parent, int id, const std::wstring& text, int x, int y, int w, int h, HFONT font, HINSTANCE inst, bool visible)
+    {
+        HWND btn = CreateWindowExW(0,
+                                   L"BUTTON",
+                                   text.c_str(),
+                                   WS_CHILD | WS_TABSTOP | BS_PUSHBUTTON | (visible ? WS_VISIBLE : 0),
+                                   x,
+                                   y,
+                                   w,
+                                   h,
+                                   parent,
+                                   reinterpret_cast<HMENU>(static_cast<INT_PTR>(id)),
+                                   inst,
+                                   nullptr);
+        SendMessageW(btn, WM_SETFONT, reinterpret_cast<WPARAM>(font), TRUE);
+        return btn;
+    }
+
+    void CreateControls(HWND hwnd, DialogState* st)
+    {
+        const HINSTANCE inst = reinterpret_cast<HINSTANCE>(&__ImageBase);
+        const UINT dpi = st->dpi;
+
+        RECT cr{};
+        GetClientRect(hwnd, &cr);
+        const int margin = Scale(20, dpi);
+        const int contentW = cr.right - 2 * margin;
+        int y = margin;
+
+        st->hStatus = CreateWindowExW(0, L"STATIC", L"", WS_CHILD | WS_VISIBLE | SS_LEFT | SS_NOPREFIX, margin, y, contentW, Scale(58, dpi), hwnd, nullptr, inst, nullptr);
+        SendMessageW(st->hStatus, WM_SETFONT, reinterpret_cast<WPARAM>(st->hHeaderFont), TRUE);
+        y += Scale(64, dpi);
+
+        st->hPath = CreateWindowExW(0, L"EDIT", L"", WS_CHILD | ES_READONLY | ES_AUTOHSCROLL | WS_TABSTOP, margin, y, contentW, Scale(24, dpi), hwnd, nullptr, inst, nullptr);
+        SendMessageW(st->hPath, WM_SETFONT, reinterpret_cast<WPARAM>(st->hFont), TRUE);
+        ShowCtl(st->hPath, false);
+        y += Scale(34, dpi);
+
+        st->hHint = CreateWindowExW(0, L"STATIC", GET_RESOURCE_STRING(IDS_BUGREPORT_GENERATING_HINT).c_str(), WS_CHILD | WS_VISIBLE | SS_LEFT | SS_NOPREFIX, margin, y, contentW, Scale(48, dpi), hwnd, nullptr, inst, nullptr);
+        SendMessageW(st->hHint, WM_SETFONT, reinterpret_cast<WPARAM>(st->hFont), TRUE);
+
+        const int btnH = Scale(30, dpi);
+        const int btnY = cr.bottom - margin - btnH;
+        const int gap = Scale(10, dpi);
+        const int wOpen = Scale(110, dpi);
+        const int wIssue = Scale(150, dpi);
+        const int wClose = Scale(90, dpi);
+
+        st->hOpenFolder = CreateButton(hwnd, ID_BTN_OPEN_FOLDER, GET_RESOURCE_STRING(IDS_BUGREPORT_OPEN_FOLDER), margin, btnY, wOpen, btnH, st->hFont, inst, false);
+        st->hCreateIssue = CreateButton(hwnd, ID_BTN_CREATE_ISSUE, GET_RESOURCE_STRING(IDS_BUGREPORT_CREATE_ISSUE), margin + wOpen + gap, btnY, wIssue, btnH, st->hFont, inst, false);
+        st->hClose = CreateButton(hwnd, ID_BTN_CLOSE, GET_RESOURCE_STRING(IDS_BUGREPORT_CLOSE), cr.right - margin - wClose, btnY, wClose, btnH, st->hFont, inst, true);
+    }
+
+    void SetDoneState(DialogState* st)
+    {
+        st->done = true;
+        SetWindowTextW(st->hStatus, GET_RESOURCE_STRING(IDS_BUGREPORT_DONE_HEADER).c_str());
+        SetWindowTextW(st->hPath, st->zipPath.c_str());
+        SetWindowTextW(st->hHint, GET_RESOURCE_STRING(IDS_BUGREPORT_DONE_HINT).c_str());
+        ShowCtl(st->hPath, true);
+        ShowCtl(st->hOpenFolder, true);
+        ShowCtl(st->hCreateIssue, true);
+        SetFocus(st->hCreateIssue);
+    }
+
+    void SetFailedState(DialogState* st)
+    {
+        st->done = true;
+        SetWindowTextW(st->hStatus, GET_RESOURCE_STRING(IDS_BUGREPORT_FAILED).c_str());
+        ShowCtl(st->hPath, false);
+        ShowCtl(st->hHint, false);
+        ShowCtl(st->hOpenFolder, false);
+        ShowCtl(st->hCreateIssue, false);
+        SetFocus(st->hClose);
+    }
+
+    LRESULT CALLBACK DlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
+    {
+        DialogState* st = reinterpret_cast<DialogState*>(GetWindowLongPtrW(hwnd, GWLP_USERDATA));
+        switch (msg)
+        {
+        case WM_CREATE:
+        {
+            auto* cs = reinterpret_cast<CREATESTRUCTW*>(lParam);
+            st = static_cast<DialogState*>(cs->lpCreateParams);
+            SetWindowLongPtrW(hwnd, GWLP_USERDATA, reinterpret_cast<LONG_PTR>(st));
+            CreateControls(hwnd, st);
+            SetWindowTextW(st->hStatus, GET_RESOURCE_STRING(IDS_BUGREPORT_GENERATING).c_str());
+            SetTimer(hwnd, ANIM_TIMER_ID, 400, nullptr);
+            return 0;
+        }
+        case WM_TIMER:
+            if (st && wParam == ANIM_TIMER_ID && !st->done)
+            {
+                st->animDots = (st->animDots + 1) % 4;
+                std::wstring text = GET_RESOURCE_STRING(IDS_BUGREPORT_GENERATING);
+                text.append(static_cast<size_t>(st->animDots), L'.');
+                SetWindowTextW(st->hStatus, text.c_str());
+            }
+            return 0;
+        case WM_BUGREPORT_DONE:
+            if (st)
+            {
+                KillTimer(hwnd, ANIM_TIMER_ID);
+                SetDoneState(st);
+            }
+            return 0;
+        case WM_BUGREPORT_FAILED:
+            if (st)
+            {
+                KillTimer(hwnd, ANIM_TIMER_ID);
+                SetFailedState(st);
+            }
+            return 0;
+        case WM_CTLCOLORSTATIC:
+            SetBkColor(reinterpret_cast<HDC>(wParam), GetSysColor(COLOR_WINDOW));
+            SetTextColor(reinterpret_cast<HDC>(wParam), GetSysColor(COLOR_WINDOWTEXT));
+            return reinterpret_cast<LRESULT>(GetSysColorBrush(COLOR_WINDOW));
+        case WM_COMMAND:
+            if (st)
+            {
+                switch (LOWORD(wParam))
+                {
+                case ID_BTN_OPEN_FOLDER:
+                    RevealZip(st->zipPath);
+                    return 0;
+                case ID_BTN_CREATE_ISSUE:
+                    OpenIssuePage(st->zipPath);
+                    return 0;
+                case ID_BTN_CLOSE:
+                    DestroyWindow(hwnd);
+                    return 0;
+                }
+            }
+            return 0;
+        case WM_CLOSE:
+            DestroyWindow(hwnd);
+            return 0;
+        case WM_DESTROY:
+            PostQuitMessage(0);
+            return 0;
+        }
+        return DefWindowProcW(hwnd, msg, wParam, lParam);
+    }
+
+    void RegisterDialogClass()
+    {
+        static std::once_flag flag;
+        std::call_once(flag, []() {
+            WNDCLASSEXW wc{ sizeof(wc) };
+            wc.lpfnWndProc = DlgProc;
+            wc.hInstance = reinterpret_cast<HINSTANCE>(&__ImageBase);
+            wc.hCursor = LoadCursorW(nullptr, IDC_ARROW);
+            wc.hbrBackground = reinterpret_cast<HBRUSH>(COLOR_WINDOW + 1);
+            wc.lpszClassName = kWindowClass;
+            wc.hIcon = LoadIconW(reinterpret_cast<HINSTANCE>(&__ImageBase), MAKEINTRESOURCEW(APPICON));
+            RegisterClassExW(&wc);
+        });
+    }
+}
+
+void run_bug_report_dialog(const std::wstring& toolPath, const std::function<void()>& onProcessFinished)
+{
+    // If a result window from a previous run is still open, just focus it
+    // instead of starting a second report.
+    if (HWND existing = g_dialogWnd.load())
+    {
+        if (IsWindow(existing))
+        {
+            ForceForeground(existing);
+            if (onProcessFinished)
+            {
+                onProcessFinished();
+            }
+            return;
+        }
+
+        g_dialogWnd.store(nullptr);
+    }
+
+    RegisterDialogClass();
+
+    DialogState st;
+    st.dpi = GetDpiForSystem();
+    st.hFont = MakeFont(st.dpi, false);
+    st.hHeaderFont = MakeFont(st.dpi, true);
+
+    const DWORD style = WS_OVERLAPPED | WS_CAPTION | WS_SYSMENU;
+    const DWORD exStyle = WS_EX_DLGMODALFRAME | WS_EX_APPWINDOW;
+
+    RECT rc{ 0, 0, Scale(480, st.dpi), Scale(270, st.dpi) };
+    AdjustWindowRectExForDpi(&rc, style, FALSE, exStyle, st.dpi);
+    const int w = rc.right - rc.left;
+    const int h = rc.bottom - rc.top;
+
+    RECT work{};
+    SystemParametersInfoW(SPI_GETWORKAREA, 0, &work, 0);
+    const int x = work.left + ((work.right - work.left) - w) / 2;
+    const int y = work.top + ((work.bottom - work.top) - h) / 2;
+
+    HWND hwnd = CreateWindowExW(exStyle,
+                                kWindowClass,
+                                GET_RESOURCE_STRING(IDS_BUGREPORT_DIALOG_TITLE).c_str(),
+                                style,
+                                x,
+                                y,
+                                w,
+                                h,
+                                nullptr,
+                                nullptr,
+                                reinterpret_cast<HINSTANCE>(&__ImageBase),
+                                &st);
+
+    bool finishedNotified = false;
+    auto notifyFinished = [&]() {
+        if (!finishedNotified)
+        {
+            finishedNotified = true;
+            if (onProcessFinished)
+            {
+                onProcessFinished();
+            }
+        }
+    };
+
+    if (!hwnd)
+    {
+        // Fall back to running the tool without UI so a report is still produced.
+        SHELLEXECUTEINFOW sei{ sizeof(sei) };
+        sei.fMask = SEE_MASK_NOCLOSEPROCESS | SEE_MASK_NO_CONSOLE;
+        sei.lpFile = toolPath.c_str();
+        sei.nShow = SW_HIDE;
+        if (ShellExecuteExW(&sei) && sei.hProcess)
+        {
+            WaitForSingleObject(sei.hProcess, INFINITE);
+            CloseHandle(sei.hProcess);
+        }
+        notifyFinished();
+        if (st.hFont)
+        {
+            DeleteObject(st.hFont);
+        }
+        if (st.hHeaderFont)
+        {
+            DeleteObject(st.hHeaderFont);
+        }
+        return;
+    }
+
+    g_dialogWnd.store(hwnd);
+    ShowWindow(hwnd, SW_SHOW);
+    ForceForeground(hwnd);
+
+    const std::wstring desktop = GetDesktopPath();
+
+    STARTUPINFOW si{ sizeof(si) };
+    PROCESS_INFORMATION pi{};
+    std::wstring cmd = L"\"" + toolPath + L"\"";
+    const BOOL started = CreateProcessW(nullptr, cmd.data(), nullptr, nullptr, FALSE, CREATE_NO_WINDOW, nullptr, nullptr, &si, &pi);
+
+    bool processHandled = !started;
+    if (!started)
+    {
+        PostMessageW(hwnd, WM_BUGREPORT_FAILED, 0, 0);
+        notifyFinished();
+    }
+
+    MSG msg;
+    bool running = true;
+    while (running)
+    {
+        const DWORD count = processHandled ? 0 : 1;
+        HANDLE handles[1] = { pi.hProcess };
+        const DWORD result = MsgWaitForMultipleObjects(count, count ? handles : nullptr, FALSE, INFINITE, QS_ALLINPUT);
+
+        if (count == 1 && result == WAIT_OBJECT_0)
+        {
+            DWORD exitCode = 1;
+            GetExitCodeProcess(pi.hProcess, &exitCode);
+            processHandled = true;
+            CloseHandle(pi.hProcess);
+            CloseHandle(pi.hThread);
+            pi.hProcess = nullptr;
+            pi.hThread = nullptr;
+
+            const std::wstring zip = (exitCode == 0) ? FindNewestReport(desktop) : std::wstring{};
+            if (exitCode == 0 && !zip.empty())
+            {
+                st.zipPath = zip;
+                PostMessageW(hwnd, WM_BUGREPORT_DONE, 0, 0);
+            }
+            else
+            {
+                PostMessageW(hwnd, WM_BUGREPORT_FAILED, 0, 0);
+            }
+            notifyFinished();
+            continue;
+        }
+
+        while (PeekMessageW(&msg, nullptr, 0, 0, PM_REMOVE))
+        {
+            if (msg.message == WM_QUIT)
+            {
+                running = false;
+                break;
+            }
+            if (!IsDialogMessageW(hwnd, &msg))
+            {
+                TranslateMessage(&msg);
+                DispatchMessageW(&msg);
+            }
+        }
+    }
+
+    g_dialogWnd.store(nullptr);
+
+    // If the window was closed before the tool finished, keep waiting for the tool
+    // so we only clear the "running" state once the process actually exits.
+    if (pi.hProcess)
+    {
+        WaitForSingleObject(pi.hProcess, INFINITE);
+        CloseHandle(pi.hProcess);
+        pi.hProcess = nullptr;
+    }
+    if (pi.hThread)
+    {
+        CloseHandle(pi.hThread);
+        pi.hThread = nullptr;
+    }
+    notifyFinished();
+    if (st.hFont)
+    {
+        DeleteObject(st.hFont);
+    }
+    if (st.hHeaderFont)
+    {
+        DeleteObject(st.hHeaderFont);
+    }
+}

src/runner/bug_report_dialog.h

@@ -0,0 +1,15 @@
+#pragma once
+
+#include <functional>
+#include <string>
+
+// Shows a small native progress/result window while the Bug Report tool runs.
+// - Displays an animated "Generating bug report..." state while toolPath executes.
+// - When the tool finishes, switches to a result state that shows where the
+//   .zip was saved and offers "Open folder" and "Report on GitHub" actions.
+//
+// This function blocks until the user closes the window, so it must be called
+// from a dedicated worker thread. onProcessFinished is invoked exactly once,
+// as soon as the tool process exits (before the window is closed), so callers
+// can clear any "running" state independently of the result window lifetime.
+void run_bug_report_dialog(const std::wstring& toolPath, const std::function<void()>& onProcessFinished);

src/runner/runner.vcxproj

@@ -61,6 +61,7 @@
     <ClCompile Include="..\common\interop\two_way_pipe_message_ipc.cpp" />
     <ClCompile Include="auto_start_helper.cpp" />
     <ClCompile Include="bug_report.cpp" />
+    <ClCompile Include="bug_report_dialog.cpp" />
     <ClCompile Include="centralized_hotkeys.cpp" />
     <ClCompile Include="general_settings.cpp" />
     <ClCompile Include="hotkey_conflict_detector.cpp" />
@@ -84,6 +85,7 @@
     <ClInclude Include="ai_detection.h" />
     <ClInclude Include="auto_start_helper.h" />
     <ClInclude Include="bug_report.h" />
+    <ClInclude Include="bug_report_dialog.h" />
     <ClInclude Include="centralized_hotkeys.h" />
   <ClInclude Include="quick_access_host.h" />
     <ClInclude Include="general_settings.h" />

src/runner/runner.vcxproj.filters

@@ -45,6 +45,9 @@
     <ClCompile Include="bug_report.cpp">
       <Filter>Utils</Filter>
     </ClCompile>
+    <ClCompile Include="bug_report_dialog.cpp">
+      <Filter>Utils</Filter>
+    </ClCompile>
     <ClCompile Include="hotkey_conflict_detector.cpp">
       <Filter>Utils</Filter>
     </ClCompile>
@@ -102,6 +105,9 @@
     <ClInclude Include="bug_report.h">
       <Filter>Utils</Filter>
     </ClInclude>
+    <ClInclude Include="bug_report_dialog.h">
+      <Filter>Utils</Filter>
+    </ClInclude>
     <ClInclude Include="hotkey_conflict_detector.h">
       <Filter>Utils</Filter>
     </ClInclude>

src/settings-ui/QuickAccess.UI/QuickAccessXAML/MainWindow.xaml.cs

@@ -7,7 +7,7 @@ using System.Runtime.InteropServices;
 using System.Threading;
 using System.Threading.Tasks;
 using ManagedCommon;
-using Microsoft.PowerToys.Common.UI.Controls.Flyout;
+using Microsoft.PowerToys.Common.UI.Controls.Window;
 using Microsoft.PowerToys.QuickAccess.Services;
 using Microsoft.PowerToys.QuickAccess.ViewModels;
 using Microsoft.UI.Dispatching;

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

@@ -218,22 +218,6 @@ namespace Microsoft.PowerToys.Settings.UI.Library
             }
         }
 
-        private bool powerScripts; // defaulting to off
-
-        [JsonPropertyName("PowerScripts")]
-        public bool PowerScripts
-        {
-            get => powerScripts;
-            set
-            {
-                if (powerScripts != value)
-                {
-                    LogTelemetryEvent(value);
-                    powerScripts = value;
-                }
-            }
-        }
-
         private bool mouseHighlighter = true;
 
         [JsonPropertyName("MouseHighlighter")]

src/settings-ui/Settings.UI.Library/Helpers/ModuleHelper.cs

@@ -37,7 +37,6 @@ namespace Microsoft.PowerToys.Settings.UI.Library.Helpers
                 ModuleType.MeasureTool => "ms-appx:///Assets/Settings/Icons/ScreenRuler.png",
                 ModuleType.PowerLauncher => "ms-appx:///Assets/Settings/Icons/PowerToysRun.png",
                 ModuleType.GeneralSettings => "ms-appx:///Assets/Settings/Icons/PowerToys.png",
-                ModuleType.PowerScripts => "ms-appx:///Assets/Settings/Icons/PowerToys.png",
                 _ => $"ms-appx:///Assets/Settings/Icons/{moduleType}.png",
             };
         }
@@ -78,7 +77,6 @@ namespace Microsoft.PowerToys.Settings.UI.Library.Helpers
                 ModuleType.Workspaces => generalSettingsConfig.Enabled.Workspaces,
                 ModuleType.GrabAndMove => generalSettingsConfig.Enabled.GrabAndMove,
                 ModuleType.ZoomIt => generalSettingsConfig.Enabled.ZoomIt,
-                ModuleType.PowerScripts => generalSettingsConfig.Enabled.PowerScripts,
                 ModuleType.GeneralSettings => generalSettingsConfig.EnableQuickAccess,
                 _ => false,
             };
@@ -120,7 +118,6 @@ namespace Microsoft.PowerToys.Settings.UI.Library.Helpers
                 case ModuleType.Workspaces: generalSettingsConfig.Enabled.Workspaces = isEnabled; break;
                 case ModuleType.GrabAndMove: generalSettingsConfig.Enabled.GrabAndMove = isEnabled; break;
                 case ModuleType.ZoomIt: generalSettingsConfig.Enabled.ZoomIt = isEnabled; break;
-                case ModuleType.PowerScripts: generalSettingsConfig.Enabled.PowerScripts = isEnabled; break;
                 case ModuleType.GeneralSettings: generalSettingsConfig.EnableQuickAccess = isEnabled; break;
             }
         }
@@ -165,7 +162,6 @@ namespace Microsoft.PowerToys.Settings.UI.Library.Helpers
                 ModuleType.Workspaces => WorkspacesSettings.ModuleName,
                 ModuleType.GrabAndMove => GrabAndMoveSettings.ModuleName,
                 ModuleType.ZoomIt => ZoomItSettings.ModuleName,
-                ModuleType.PowerScripts => "PowerScripts", // Prototype: no dedicated settings class
                 _ => moduleType.ToString(),
             };
         }

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

@@ -44,6 +44,24 @@ namespace Microsoft.PowerToys.Settings.UI.Library
         [JsonPropertyName("spotlight_mode")]
         public BoolProperty SpotlightMode { get; set; }
 
+        [JsonPropertyName("ripple_mode")]
+        public BoolProperty RippleMode { get; set; }
+
+        [JsonPropertyName("ripple_size")]
+        public IntProperty RippleSize { get; set; }
+
+        [JsonPropertyName("ripple_intensity")]
+        public DoubleProperty RippleIntensity { get; set; }
+
+        [JsonPropertyName("ripple_duration_ms")]
+        public IntProperty RippleDurationMs { get; set; }
+
+        [JsonPropertyName("ripple_show_drag_trail")]
+        public BoolProperty RippleShowDragTrail { get; set; }
+
+        [JsonPropertyName("ripple_show_release_pulse")]
+        public BoolProperty RippleShowReleasePulse { get; set; }
+
         public MouseHighlighterProperties()
         {
             ActivationShortcut = DefaultActivationShortcut;
@@ -51,11 +69,17 @@ namespace Microsoft.PowerToys.Settings.UI.Library
             RightButtonClickColor = new StringProperty("#a60000FF");
             AlwaysColor = new StringProperty("#00FF0000");
             HighlightOpacity = new IntProperty(166); // for migration from <=1.1 to 1.2
-            HighlightRadius = new IntProperty(20);
-            HighlightFadeDelayMs = new IntProperty(500);
-            HighlightFadeDurationMs = new IntProperty(250);
+            HighlightRadius = new IntProperty(30);
+            HighlightFadeDelayMs = new IntProperty(400);
+            HighlightFadeDurationMs = new IntProperty(400);
             AutoActivate = new BoolProperty(false);
             SpotlightMode = new BoolProperty(false);
+            RippleMode = new BoolProperty(true);
+            RippleSize = new IntProperty(60);
+            RippleIntensity = new DoubleProperty(0.7);
+            RippleDurationMs = new IntProperty(480);
+            RippleShowDragTrail = new BoolProperty(true);
+            RippleShowReleasePulse = new BoolProperty(true);
         }
     }
 }

src/settings-ui/Settings.UI/Helpers/ModuleGpoHelper.cs

@@ -59,7 +59,6 @@ namespace Microsoft.PowerToys.Settings.UI.Helpers
                 ModuleType.AdvancedPaste => typeof(AdvancedPastePage),
                 ModuleType.AlwaysOnTop => typeof(AlwaysOnTopPage),
                 ModuleType.Awake => typeof(AwakePage),
-                ModuleType.PowerScripts => typeof(PowerScriptsPage),
                 ModuleType.CmdPal => typeof(CmdPalPage),
                 ModuleType.ColorPicker => typeof(ColorPickerPage),
                 ModuleType.CropAndLock => typeof(CropAndLockPage),

src/settings-ui/Settings.UI/SettingsXAML/App.xaml.cs

@@ -418,7 +418,6 @@ namespace Microsoft.PowerToys.Settings.UI
                 case "AdvancedPaste": return typeof(AdvancedPastePage);
                 case "AlwaysOnTop": return typeof(AlwaysOnTopPage);
                 case "Awake": return typeof(AwakePage);
-                case "PowerScripts": return typeof(PowerScriptsPage);
                 case "CmdNotFound": return typeof(CmdNotFoundPage);
                 case "ColorPicker": return typeof(ColorPickerPage);
                 case "LightSwitch": return typeof(LightSwitchPage);

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

@@ -8,6 +8,7 @@
     xmlns:local="using:Microsoft.PowerToys.Settings.UI.Helpers"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:panels="using:Microsoft.PowerToys.Settings.UI.Panels"
+    xmlns:ptcontrols="using:Microsoft.PowerToys.Common.UI.Controls"
     xmlns:tkcontrols="using:CommunityToolkit.WinUI.Controls"
     xmlns:tkconverters="using:CommunityToolkit.WinUI.Converters"
     xmlns:ui="using:CommunityToolkit.WinUI"
@@ -265,30 +266,32 @@
                     </tkcontrols:SettingsExpander>
                     <tkcontrols:SettingsExpander
                         Name="MouseHighlighterAppearanceBehavior"
-                        x:Uid="Appearance_Behavior"
+                        x:Uid="MouseUtils_MouseHighlighter_Appearance"
                         AutomationProperties.AutomationId="MouseUtils_MouseHighlighterAppearanceBehaviorId"
-                        HeaderIcon="{ui:FontIcon Glyph=&#xEB3C;}"
+                        HeaderIcon="{ui:FontIcon Glyph=&#xE790;}"
                         IsEnabled="{x:Bind ViewModel.IsMouseHighlighterEnabled, Mode=OneWay}">
+                        <ComboBox
+                            x:Uid="MouseUtils_MouseHighlighter_SpotlightModeType"
+                            MinWidth="{StaticResource SettingActionControlMinWidth}"
+                            SelectedIndex="{x:Bind ViewModel.HighlightModeIndex, Mode=TwoWay}">
+                            <ComboBoxItem x:Uid="HighlightMode_Spotlight_Mode" />
+                            <ComboBoxItem x:Uid="HighlightMode_Circle_Highlight_Mode" />
+                            <ComboBoxItem x:Uid="HighlightMode_Ripple_Mode" />
+                        </ComboBox>
                         <tkcontrols:SettingsExpander.Items>
-                            <tkcontrols:SettingsCard x:Uid="MouseUtils_MouseHighlighter_PrimaryButtonClickColor" IsEnabled="{x:Bind ViewModel.IsSpotlightModeEnabled, Mode=OneWay, Converter={StaticResource BoolNegationConverter}}">
+                            <tkcontrols:SettingsCard x:Uid="MouseUtils_MouseHighlighter_PrimaryButtonClickColor" Visibility="{x:Bind ViewModel.HighlightModeIndex, Mode=OneWay, Converter={StaticResource IndexBitFieldToVisibilityConverter}, ConverterParameter=0x6}">
                                 <controls:ColorPickerButton IsAlphaEnabled="True" SelectedColor="{x:Bind Path=ViewModel.MouseHighlighterLeftButtonClickColor, Mode=TwoWay}" />
                             </tkcontrols:SettingsCard>
-                            <tkcontrols:SettingsCard x:Uid="MouseUtils_MouseHighlighter_SecondaryButtonClickColor" IsEnabled="{x:Bind ViewModel.IsSpotlightModeEnabled, Mode=OneWay, Converter={StaticResource BoolNegationConverter}}">
+                            <tkcontrols:SettingsCard x:Uid="MouseUtils_MouseHighlighter_SecondaryButtonClickColor" Visibility="{x:Bind ViewModel.HighlightModeIndex, Mode=OneWay, Converter={StaticResource IndexBitFieldToVisibilityConverter}, ConverterParameter=0x6}">
                                 <controls:ColorPickerButton IsAlphaEnabled="True" SelectedColor="{x:Bind Path=ViewModel.MouseHighlighterRightButtonClickColor, Mode=TwoWay}" />
                             </tkcontrols:SettingsCard>
-                            <tkcontrols:SettingsCard Name="MouseUtilsMouseHighlighterAlwaysColor" x:Uid="MouseUtils_MouseHighlighter_AlwaysColor">
+                            <tkcontrols:SettingsCard
+                                Name="MouseUtilsMouseHighlighterAlwaysColor"
+                                x:Uid="MouseUtils_MouseHighlighter_AlwaysColor"
+                                Visibility="{x:Bind ViewModel.HighlightModeIndex, Mode=OneWay, Converter={StaticResource IndexBitFieldToVisibilityConverter}, ConverterParameter=0x3}">
                                 <controls:ColorPickerButton IsAlphaEnabled="True" SelectedColor="{x:Bind Path=ViewModel.MouseHighlighterAlwaysColor, Mode=TwoWay}" />
                             </tkcontrols:SettingsCard>
-                            <tkcontrols:SettingsCard x:Uid="HighlightMode">
-                                <ComboBox
-                                    x:Uid="MouseUtils_MouseHighlighter_SpotlightModeType"
-                                    MinWidth="{StaticResource SettingActionControlMinWidth}"
-                                    SelectedIndex="{x:Bind ViewModel.IsSpotlightModeEnabled, Converter={StaticResource ReverseBoolToComboBoxIndexConverter}, Mode=TwoWay}">
-                                    <ComboBoxItem x:Uid="HighlightMode_Spotlight_Mode" />
-                                    <ComboBoxItem x:Uid="HighlightMode_Circle_Highlight_Mode" />
-                                </ComboBox>
-                            </tkcontrols:SettingsCard>
-                            <tkcontrols:SettingsCard x:Uid="MouseUtils_MouseHighlighter_HighlightRadius">
+                            <tkcontrols:SettingsCard x:Uid="MouseUtils_MouseHighlighter_HighlightRadius" Visibility="{x:Bind ViewModel.HighlightModeIndex, Mode=OneWay, Converter={StaticResource IndexBitFieldToVisibilityConverter}, ConverterParameter=0x3}">
                                 <NumberBox
                                     MinWidth="{StaticResource SettingActionControlMinWidth}"
                                     LargeChange="10"
@@ -297,7 +300,10 @@
                                     SpinButtonPlacementMode="Compact"
                                     Value="{x:Bind ViewModel.MouseHighlighterRadius, Mode=TwoWay}" />
                             </tkcontrols:SettingsCard>
-                            <tkcontrols:SettingsCard Name="MouseUtilsMouseHighlighterFadeDelayMs" x:Uid="MouseUtils_MouseHighlighter_FadeDelayMs">
+                            <tkcontrols:SettingsCard
+                                Name="MouseUtilsMouseHighlighterFadeDelayMs"
+                                x:Uid="MouseUtils_MouseHighlighter_FadeDelayMs"
+                                Visibility="{x:Bind ViewModel.HighlightModeIndex, Mode=OneWay, Converter={StaticResource IndexBitFieldToVisibilityConverter}, ConverterParameter=0x3}">
                                 <NumberBox
                                     MinWidth="{StaticResource SettingActionControlMinWidth}"
                                     LargeChange="100"
@@ -306,7 +312,10 @@
                                     SpinButtonPlacementMode="Compact"
                                     Value="{x:Bind ViewModel.MouseHighlighterFadeDelayMs, Mode=TwoWay}" />
                             </tkcontrols:SettingsCard>
-                            <tkcontrols:SettingsCard Name="MouseUtilsMouseHighlighterFadeDurationMs" x:Uid="MouseUtils_MouseHighlighter_FadeDurationMs">
+                            <tkcontrols:SettingsCard
+                                Name="MouseUtilsMouseHighlighterFadeDurationMs"
+                                x:Uid="MouseUtils_MouseHighlighter_FadeDurationMs"
+                                Visibility="{x:Bind ViewModel.HighlightModeIndex, Mode=OneWay, Converter={StaticResource IndexBitFieldToVisibilityConverter}, ConverterParameter=0x3}">
                                 <NumberBox
                                     MinWidth="{StaticResource SettingActionControlMinWidth}"
                                     LargeChange="100"
@@ -315,6 +324,42 @@
                                     SpinButtonPlacementMode="Compact"
                                     Value="{x:Bind ViewModel.MouseHighlighterFadeDurationMs, Mode=TwoWay}" />
                             </tkcontrols:SettingsCard>
+                            <tkcontrols:SettingsCard x:Uid="MouseUtils_MouseHighlighter_RippleSize" Visibility="{x:Bind ViewModel.HighlightModeIndex, Mode=OneWay, Converter={StaticResource IndexBitFieldToVisibilityConverter}, ConverterParameter=0x4}">
+                                <NumberBox
+                                    MinWidth="{StaticResource SettingActionControlMinWidth}"
+                                    LargeChange="10"
+                                    Maximum="300"
+                                    Minimum="10"
+                                    SmallChange="1"
+                                    SpinButtonPlacementMode="Compact"
+                                    Value="{x:Bind ViewModel.RippleSize, Mode=TwoWay}" />
+                            </tkcontrols:SettingsCard>
+                            <tkcontrols:SettingsCard x:Uid="MouseUtils_MouseHighlighter_RippleIntensity" Visibility="{x:Bind ViewModel.HighlightModeIndex, Mode=OneWay, Converter={StaticResource IndexBitFieldToVisibilityConverter}, ConverterParameter=0x4}">
+                                <Slider
+                                    MinWidth="{StaticResource SettingActionControlMinWidth}"
+                                    LargeChange="0.1"
+                                    Maximum="1.35"
+                                    Minimum="0.15"
+                                    SmallChange="0.05"
+                                    StepFrequency="0.05"
+                                    Value="{x:Bind ViewModel.RippleIntensity, Mode=TwoWay}" />
+                            </tkcontrols:SettingsCard>
+                            <tkcontrols:SettingsCard x:Uid="MouseUtils_MouseHighlighter_RippleDurationMs" Visibility="{x:Bind ViewModel.HighlightModeIndex, Mode=OneWay, Converter={StaticResource IndexBitFieldToVisibilityConverter}, ConverterParameter=0x4}">
+                                <NumberBox
+                                    MinWidth="{StaticResource SettingActionControlMinWidth}"
+                                    LargeChange="100"
+                                    Maximum="2000"
+                                    Minimum="60"
+                                    SmallChange="10"
+                                    SpinButtonPlacementMode="Compact"
+                                    Value="{x:Bind ViewModel.RippleDurationMs, Mode=TwoWay}" />
+                            </tkcontrols:SettingsCard>
+                            <tkcontrols:SettingsCard ContentAlignment="Left" Visibility="{x:Bind ViewModel.HighlightModeIndex, Mode=OneWay, Converter={StaticResource IndexBitFieldToVisibilityConverter}, ConverterParameter=0x4}">
+                                <ptcontrols:CheckBoxWithDescriptionControl x:Uid="MouseUtils_MouseHighlighter_RippleShowDragTrail" IsChecked="{x:Bind ViewModel.RippleShowDragTrail, Mode=TwoWay}" />
+                            </tkcontrols:SettingsCard>
+                            <tkcontrols:SettingsCard ContentAlignment="Left" Visibility="{x:Bind ViewModel.HighlightModeIndex, Mode=OneWay, Converter={StaticResource IndexBitFieldToVisibilityConverter}, ConverterParameter=0x4}">
+                                <ptcontrols:CheckBoxWithDescriptionControl x:Uid="MouseUtils_MouseHighlighter_RippleShowReleasePulse" IsChecked="{x:Bind ViewModel.RippleShowReleasePulse, Mode=TwoWay}" />
+                            </tkcontrols:SettingsCard>
                         </tkcontrols:SettingsExpander.Items>
                     </tkcontrols:SettingsExpander>
                 </controls:SettingsGroup>

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

@@ -1,113 +0,0 @@
-<local:NavigablePage
-    x:Class="Microsoft.PowerToys.Settings.UI.Views.PowerScriptsPage"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:local="using:Microsoft.PowerToys.Settings.UI.Helpers"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:tkcontrols="using:CommunityToolkit.WinUI.Controls"
-    xmlns:ui="using:CommunityToolkit.WinUI"
-    xmlns:viewModels="using:Microsoft.PowerToys.Settings.UI.ViewModels"
-    d:DataContext="{d:DesignInstance Type=viewModels:PowerScriptsViewModel}"
-    AutomationProperties.LandmarkType="Main"
-    mc:Ignorable="d">
-
-    <controls:SettingsPageControl
-        x:Name="PowerScriptsSettingsPage"
-        ModuleDescription="Write a small script once and surface it everywhere — the Explorer right-click menu and Keyboard Manager. This is an experimental prototype."
-        ModuleTitle="PowerScripts"
-        IsTabStop="False">
-        <controls:SettingsPageControl.ModuleContent>
-            <StackPanel ChildrenTransitions="{StaticResource SettingsCardsAnimations}" Orientation="Vertical">
-                <tkcontrols:SettingsCard
-                    Name="PowerScriptsEnableSettingsCard"
-                    Description="Enable PowerScripts"
-                    Header="PowerScripts"
-                    HeaderIcon="{ui:FontIcon Glyph=&#xE756;}">
-                    <ToggleSwitch IsOn="{x:Bind ViewModel.IsEnabled, Mode=TwoWay}" />
-                </tkcontrols:SettingsCard>
-
-                <tkcontrols:SettingsCard
-                    Name="PowerScriptsFolderSettingsCard"
-                    Description="{x:Bind ViewModel.ScriptsFolder, Mode=OneWay}"
-                    Header="Scripts folder"
-                    HeaderIcon="{ui:FontIcon Glyph=&#xE8B7;}"
-                    IsEnabled="{x:Bind ViewModel.IsEnabled, Mode=OneWay}">
-                    <StackPanel Orientation="Horizontal" Spacing="8">
-                        <Button
-                            x:Name="BrowseScriptsFolderButton"
-                            Click="BrowseScriptsFolderButton_Click"
-                            Content="Browse..." />
-                        <Button
-                            x:Name="ResetScriptsFolderButton"
-                            Click="ResetScriptsFolderButton_Click"
-                            Content="Reset"
-                            IsEnabled="{x:Bind ViewModel.IsCustomFolder, Mode=OneWay}" />
-                    </StackPanel>
-                </tkcontrols:SettingsCard>
-
-                <controls:SettingsGroup Header="Installed scripts" IsEnabled="{x:Bind ViewModel.IsEnabled, Mode=OneWay}">
-                    <InfoBar
-                        IsClosable="False"
-                        IsOpen="{x:Bind ViewModel.HasScripts, Mode=OneWay, Converter={StaticResource BoolNegationConverter}}"
-                        Message="No PowerScripts found. Pick a scripts folder above (or use the default) that contains script subfolders, each with a manifest.json."
-                        Severity="Informational" />
-
-                    <ItemsControl ItemsSource="{x:Bind ViewModel.Scripts, Mode=OneWay}">
-                        <ItemsControl.ItemTemplate>
-                            <DataTemplate x:DataType="viewModels:PowerScriptListItem">
-                                <tkcontrols:SettingsExpander
-                                    Margin="0,2,0,2"
-                                    Description="{x:Bind Description}"
-                                    Header="{x:Bind Name}"
-                                    IsExpanded="False">
-                                    <tkcontrols:SettingsExpander.HeaderIcon>
-                                        <FontIcon Glyph="{x:Bind KindGlyph}" />
-                                    </tkcontrols:SettingsExpander.HeaderIcon>
-                                    <TextBlock
-                                        VerticalAlignment="Center"
-                                        Foreground="{ThemeResource TextFillColorSecondaryBrush}"
-                                        Text="{x:Bind Kind}" />
-                                    <tkcontrols:SettingsExpander.Items>
-                                        <tkcontrols:SettingsCard
-                                            ContentAlignment="Right"
-                                            Header="Trigger on file types"
-                                            Visibility="{x:Bind IsFileScript, Converter={StaticResource BoolToVisibilityConverter}}">
-                                            <TextBlock
-                                                VerticalAlignment="Center"
-                                                Foreground="{ThemeResource TextFillColorSecondaryBrush}"
-                                                Text="{x:Bind ExtensionsDisplay}" />
-                                        </tkcontrols:SettingsCard>
-                                        <tkcontrols:SettingsCard ContentAlignment="Right" Header="Runtime">
-                                            <TextBlock
-                                                VerticalAlignment="Center"
-                                                Foreground="{ThemeResource TextFillColorSecondaryBrush}"
-                                                Text="{x:Bind RuntimeDisplay}" />
-                                        </tkcontrols:SettingsCard>
-                                        <tkcontrols:SettingsCard ContentAlignment="Right" Header="Surfaces">
-                                            <TextBlock
-                                                VerticalAlignment="Center"
-                                                Foreground="{ThemeResource TextFillColorSecondaryBrush}"
-                                                Text="{x:Bind SurfacesDisplay}" />
-                                        </tkcontrols:SettingsCard>
-                                        <tkcontrols:SettingsCard ContentAlignment="Right" Header="Capabilities">
-                                            <TextBlock
-                                                VerticalAlignment="Center"
-                                                Foreground="{ThemeResource TextFillColorSecondaryBrush}"
-                                                Text="{x:Bind CapabilitiesDisplay}" />
-                                        </tkcontrols:SettingsCard>
-                                    </tkcontrols:SettingsExpander.Items>
-                                </tkcontrols:SettingsExpander>
-                            </DataTemplate>
-                        </ItemsControl.ItemTemplate>
-                    </ItemsControl>
-                </controls:SettingsGroup>
-            </StackPanel>
-        </controls:SettingsPageControl.ModuleContent>
-
-        <controls:SettingsPageControl.PrimaryLinks>
-            <controls:PageLink Link="https://aka.ms/PowerToysOverview" Text="Documentation" />
-        </controls:SettingsPageControl.PrimaryLinks>
-    </controls:SettingsPageControl>
-</local:NavigablePage>

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

@@ -1,61 +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.Threading.Tasks;
-
-using ManagedCommon;
-using Microsoft.PowerToys.Settings.UI.Helpers;
-using Microsoft.PowerToys.Settings.UI.Library;
-using Microsoft.PowerToys.Settings.UI.Library.Interfaces;
-using Microsoft.PowerToys.Settings.UI.ViewModels;
-using Microsoft.UI.Xaml;
-
-namespace Microsoft.PowerToys.Settings.UI.Views
-{
-    public sealed partial class PowerScriptsPage : NavigablePage, IRefreshablePage
-    {
-        private readonly SettingsUtils _settingsUtils;
-        private readonly SettingsRepository<GeneralSettings> _generalSettingsRepository;
-
-        private PowerScriptsViewModel ViewModel { get; set; }
-
-        public PowerScriptsPage()
-        {
-            _settingsUtils = SettingsUtils.Default;
-            _generalSettingsRepository = SettingsRepository<GeneralSettings>.GetInstance(_settingsUtils);
-
-            ViewModel = new PowerScriptsViewModel(_generalSettingsRepository, ShellPage.SendDefaultIPCMessage);
-            DataContext = ViewModel;
-
-            InitializeComponent();
-        }
-
-        public void RefreshEnabledState()
-        {
-            ViewModel.ReloadScripts();
-        }
-
-        private async void BrowseScriptsFolderButton_Click(object sender, RoutedEventArgs e)
-        {
-            var folder = await PickSingleFolderDialog();
-            if (!string.IsNullOrWhiteSpace(folder))
-            {
-                ViewModel.SetScriptsFolder(folder);
-            }
-        }
-
-        private void ResetScriptsFolderButton_Click(object sender, RoutedEventArgs e)
-        {
-            ViewModel.ResetScriptsFolder();
-        }
-
-        private async Task<string> PickSingleFolderDialog()
-        {
-            // Use the shell32 folder dialog (works even when Settings runs elevated), matching GeneralPage.
-            var hwnd = WinRT.Interop.WindowNative.GetWindowHandle(App.GetSettingsWindow());
-            return await Task.FromResult(ShellGetFolder.GetFolderDialog(hwnd));
-        }
-    }
-}