fix migration issue

Signed-off-by: Shawn Yuan <shuai.yuan.zju@gmail.com>

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

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

DATA_AND_PRIVACY.md

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

src/modules/AdvancedPaste/AdvancedPaste.UnitTests/Mocks/IntegrationTestUserSettings.cs

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

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

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

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

@@ -156,7 +156,7 @@
             BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}"
             BorderThickness="1"
             CornerRadius="20"
-            Visibility="{x:Bind ViewModel.ClipboardHasData, Converter={StaticResource BoolToVisibilityConverter}, Mode=OneWay}">
+            Visibility="{x:Bind ViewModel.ShowClipboardPreview, Converter={StaticResource BoolToVisibilityConverter}, Mode=OneWay}">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="*" />
                 <ColumnDefinition Width="Auto" />
@@ -168,7 +168,8 @@
                 Margin="0,0,4,0"
                 VerticalAlignment="Center"
                 IsEnabled="{x:Bind ViewModel.ClipboardHistoryEnabled, Mode=TwoWay}"
-                Style="{StaticResource SubtleButtonStyle}">
+                Style="{StaticResource SubtleButtonStyle}"
+                Visibility="{x:Bind ViewModel.ShowClipboardHistoryButton, Converter={StaticResource BoolToVisibilityConverter}, Mode=OneWay}">
                 <ToolTipService.ToolTip>
                     <TextBlock x:Uid="ClipboardHistoryButtonToolTip" />
                 </ToolTipService.ToolTip>
@@ -270,9 +271,9 @@
                                 <StackPanel Spacing="8">
                                     <TextBlock TextWrapping="Wrap">
                                         <Run x:Uid="AIMistakeNote" /><LineBreak /><Run
+                                            x:Uid="CustomEndpointWarning"
                                             FontSize="12"
-                                            Foreground="{ThemeResource TextFillColorSecondaryBrush}"
-                                            Text="You are using a custom endpoint. Verify all answers." />
+                                            Foreground="{ThemeResource TextFillColorSecondaryBrush}" />
                                     </TextBlock>
                                     <StackPanel Orientation="Horizontal" Spacing="8">
                                         <HyperlinkButton

src/modules/AdvancedPaste/AdvancedPaste/Helpers/AIServiceFormatEvent.cs

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

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

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

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

@@ -40,6 +40,8 @@ namespace AdvancedPaste.Settings
 
         public bool CloseAfterLosingFocus { get; private set; }
 
+        public bool EnableClipboardPreview { get; private set; }
+
         public IReadOnlyList<PasteFormats> AdditionalActions => _additionalActions;
 
         public IReadOnlyList<AdvancedPasteCustomAction> CustomActions => _customActions;
@@ -53,6 +55,7 @@ namespace AdvancedPaste.Settings
             IsAIEnabled = false;
             ShowCustomPreview = true;
             CloseAfterLosingFocus = false;
+            EnableClipboardPreview = true;
             PasteAIConfiguration = new PasteAIConfiguration();
             _additionalActions = [];
             _customActions = [];
@@ -107,6 +110,7 @@ namespace AdvancedPaste.Settings
                                 IsAIEnabled = properties.IsAIEnabled;
                                 ShowCustomPreview = properties.ShowCustomPreview;
                                 CloseAfterLosingFocus = properties.CloseAfterLosingFocus;
+                                EnableClipboardPreview = properties.EnableClipboardPreview;
                                 PasteAIConfiguration = properties.PasteAIConfiguration ?? new PasteAIConfiguration();
 
                                 var sourceAdditionalActions = properties.AdditionalActions;
@@ -209,10 +213,11 @@ namespace AdvancedPaste.Settings
                 RemoveLegacyOpenAICredential();
             }
 
+            bool shouldEnableAI = legacyCredential is not null;
             bool enabledUpdated = false;
-            if (!properties.IsAIEnabled && legacyCredential is not null)
+            if (properties.IsAIEnabled != shouldEnableAI)
             {
-                properties.IsAIEnabled = true;
+                properties.IsAIEnabled = shouldEnableAI;
                 enabledUpdated = true;
             }
 

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

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

src/modules/AdvancedPaste/AdvancedPaste/Services/KernelServiceBase.cs

@@ -186,12 +186,20 @@ public abstract class KernelServiceBase(
 
     private void LogResult(bool cacheUsed, bool isSavedQuery, IEnumerable<ActionChainItem> actionChain, AIServiceUsage usage)
     {
-        AdvancedPasteSemanticKernelFormatEvent telemetryEvent = new(cacheUsed, isSavedQuery, usage.PromptTokens, usage.CompletionTokens, AdvancedAIModelName, AdvancedPasteSemanticKernelFormatEvent.FormatActionChain(actionChain));
+        var runtimeConfig = GetRuntimeConfiguration();
+
+        AdvancedPasteSemanticKernelFormatEvent telemetryEvent = new(
+            cacheUsed,
+            isSavedQuery,
+            usage.PromptTokens,
+            usage.CompletionTokens,
+            AdvancedAIModelName,
+            runtimeConfig.ServiceType.ToString(),
+            AdvancedPasteSemanticKernelFormatEvent.FormatActionChain(actionChain));
         PowerToysTelemetry.Log.WriteEvent(telemetryEvent);
 
         // Log endpoint usage
-        var runtimeConfig = GetRuntimeConfiguration();
-        var endpointEvent = new AdvancedPasteEndpointUsageEvent(runtimeConfig.ServiceType);
+        var endpointEvent = new AdvancedPasteEndpointUsageEvent(runtimeConfig.ServiceType, AdvancedAIModelName, isAdvanced: true);
         PowerToysTelemetry.Log.WriteEvent(endpointEvent);
 
         var logEvent = new AIServiceFormatEvent(telemetryEvent);

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

@@ -359,6 +359,13 @@
   </data>
   <data name="Relative_Date_TimeFormat" xml:space="preserve">
     <value>{0}, {1}</value>
-    <comment>(e.g., “10/20/2025, 17:05” in the user’s locale)</comment>
+    <comment>(e.g., "10/20/2025, 17:05" in the user's locale)</comment>
+  </data>
+  <data name="CustomEndpointWarning" xml:space="preserve">
+    <value>You are using a custom endpoint. Verify all answers.</value>
+  </data>
+  <data name="LocalModelBadge" xml:space="preserve">
+    <value>Local</value>
+    <comment>Badge label displayed next to local AI model providers (e.g., Ollama, Foundry Local) to indicate the model runs locally</comment>
   </data>
 </root>

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

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

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

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

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

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

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

@@ -63,6 +63,7 @@ namespace AdvancedPaste.ViewModels
         private ClipboardFormat _availableClipboardFormats;
 
         [ObservableProperty]
+        [NotifyPropertyChangedFor(nameof(ShowClipboardHistoryButton))]
         private bool _clipboardHistoryEnabled;
 
         [ObservableProperty]
@@ -225,6 +226,10 @@ namespace AdvancedPaste.ViewModels
 
         public bool ClipboardHasDataForCustomAI => PasteFormat.SupportsClipboardFormats(CustomAIFormat, AvailableClipboardFormats);
 
+        public bool ShowClipboardPreview => _userSettings.EnableClipboardPreview;
+
+        public bool ShowClipboardHistoryButton => ClipboardHistoryEnabled;
+
         public bool HasIndeterminateTransformProgress => double.IsNaN(TransformProgress);
 
         private PasteFormats CustomAIFormat =>
@@ -310,6 +315,7 @@ namespace AdvancedPaste.ViewModels
             OnPropertyChanged(nameof(IsAdvancedAIEnabled));
             OnPropertyChanged(nameof(AIProviders));
             OnPropertyChanged(nameof(AllowedAIProviders));
+            OnPropertyChanged(nameof(ShowClipboardPreview));
 
             NotifyActiveProviderChanged();
 

src/modules/ZoomIt/ZoomIt/Zoomit.cpp

@@ -6440,12 +6440,10 @@ LRESULT APIENTRY MainWndProc(
                 GetCursorPos(&local_savedCursorPos);
             }
 
-            HBITMAP     hInterimSaveBitmap;
-            HDC         hInterimSaveDc;
-            HBITMAP     hSaveBitmap;
-            HDC         hSaveDc;
-            int         copyX, copyY;
-            int         copyWidth, copyHeight;
+            // Determine the user's desired save area in zoomed viewport coordinates.
+            // This will be the entire viewport if the user does not select a crop
+            // rectangle.
+            int copyX = 0, copyY = 0, copyWidth = width, copyHeight = height;
 
             if ( LOWORD( wParam ) == IDC_SAVE_CROP )
             {
@@ -6460,55 +6458,51 @@ LRESULT APIENTRY MainWndProc(
                     }
                     break;
                 }
+
                 auto copyRc = selectRectangle.SelectedRect();
                 selectRectangle.Stop();
                 g_RecordCropping = FALSE;
+
                 copyX = copyRc.left;
                 copyY = copyRc.top;
                 copyWidth = copyRc.right - copyRc.left;
                 copyHeight = copyRc.bottom - copyRc.top;
             }
-            else
-            {
-                copyX = 0;
-                copyY = 0;
-                copyWidth = width;
-                copyHeight = height;
-            }
             OutputDebug( L"***x: %d, y: %d, width: %d, height: %d\n", copyX, copyY, copyWidth, copyHeight );
 
             RECT oldClipRect{};
             GetClipCursor( &oldClipRect );
             ClipCursor( NULL );
 
-            // Capture the screen before displaying the save dialog
-            hInterimSaveDc = CreateCompatibleDC( hdcScreen );
-            hInterimSaveBitmap = CreateCompatibleBitmap( hdcScreen, copyWidth, copyHeight );
-            SelectObject( hInterimSaveDc, hInterimSaveBitmap );
+            // Translate the viewport selection into coordinates for the 1:1 source
+            // bitmap hdcScreenCompat.
+            int viewportX, viewportY;
+            GetZoomedTopLeftCoordinates(
+                zoomLevel, &cursorPos, &viewportX, width, &viewportY, height );
 
-            hSaveDc = CreateCompatibleDC( hdcScreen );
-#if SCALE_HALFTONE
-            SetStretchBltMode( hInterimSaveDc, HALFTONE );
-            SetStretchBltMode( hSaveDc, HALFTONE );
-#else
-            // Use HALFTONE for better quality when smooth image is enabled
-            if (g_SmoothImage) {
-                SetStretchBltMode( hInterimSaveDc, HALFTONE );
-                SetStretchBltMode( hSaveDc, HALFTONE );
-            } else {
-                SetStretchBltMode( hInterimSaveDc, COLORONCOLOR );
-                SetStretchBltMode( hSaveDc, COLORONCOLOR );
-            }
-#endif
-            StretchBlt( hInterimSaveDc,
-                        0, 0,
-                        copyWidth, copyHeight,
-                        hdcScreen,
-                        monInfo.rcMonitor.left + copyX,
-                        monInfo.rcMonitor.top + copyY,
-                        copyWidth, copyHeight,
-                        SRCCOPY|CAPTUREBLT );
+            int saveX = viewportX + static_cast<int>( copyX / zoomLevel );
+            int saveY = viewportY + static_cast<int>( copyY / zoomLevel );
+            int saveWidth = static_cast<int>( copyWidth / zoomLevel );
+            int saveHeight = static_cast<int>( copyHeight / zoomLevel );
 
+            // Create a pixel-accurate copy of the desired area from the source bitmap.
+            wil::unique_hdc hdcActualSize( CreateCompatibleDC( hdcScreen ) );
+            wil::unique_hbitmap hbmActualSize(
+                CreateCompatibleBitmap( hdcScreen, saveWidth, saveHeight ) );
+            // Note: we do not need to restore the existing context later. The objects
+            // are transient and not reused.
+            SelectObject( hdcActualSize.get(), hbmActualSize.get() );
+
+            // Perform a direct 1:1 copy from the backing bitmap.
+            BitBlt( hdcActualSize.get(),
+                    0, 0,
+                    saveWidth, saveHeight,
+                    hdcScreenCompat,
+                    saveX, saveY,
+                    SRCCOPY | CAPTUREBLT );
+
+            // Open the Save As dialog and capture the desired file path and whether to
+            // save the zoomed display or the source bitmap pixels.
             g_bSaveInProgress = true;
             memset( &openFileName, 0, sizeof(openFileName ));
             openFileName.lStructSize       = OPENFILENAME_SIZE_VERSION_400;
@@ -6524,6 +6518,7 @@ LRESULT APIENTRY MainWndProc(
                                              "Actual size PNG\0*.png\0\0";
                                              //"Actual size BMP\0*.bmp\0\0";
             openFileName.lpstrFile			= filePath;
+
             if( GetSaveFileName( &openFileName ) )
             {
                 TCHAR targetFilePath[MAX_PATH];
@@ -6533,42 +6528,47 @@ LRESULT APIENTRY MainWndProc(
                     _tcscat( targetFilePath, L".png" );
                 }
 
-                // Save image at screen size
-                if( openFileName.nFilterIndex == 1 )
+                if( openFileName.nFilterIndex == 2 )
                 {
-                    SavePng( targetFilePath, hInterimSaveBitmap );
+                    // Save at actual size.
+                    SavePng( targetFilePath, hbmActualSize.get() );
                 }
-                // Save image scaled down to actual size
                 else
                 {
-                    int saveWidth = static_cast<int>( copyWidth / zoomLevel );
-                    int saveHeight = static_cast<int>( copyHeight / zoomLevel );
+                    // Save zoomed-in image at screen resolution.
+#if SCALE_HALFTONE
+                    const int bltMode = HALFTONE;
+#else
+                    // Use HALFTONE for better quality when smooth image is enabled
+                    const int bltMode = g_SmoothImage ? HALFTONE : COLORONCOLOR;
+#endif
+                    // Recreate the zoomed-in view by upscaling from our source bitmap.
+                    wil::unique_hdc hdcZoomed( CreateCompatibleDC(hdcScreen) );
+                    wil::unique_hbitmap hbmZoomed(
+                        CreateCompatibleBitmap( hdcScreen, copyWidth, copyHeight ) );
+                    SelectObject( hdcZoomed.get(), hbmZoomed.get() );
 
-                    hSaveBitmap = CreateCompatibleBitmap( hdcScreen, saveWidth, saveHeight );
-                    SelectObject( hSaveDc, hSaveBitmap );
+                    SetStretchBltMode( hdcZoomed.get(), bltMode );
 
-                    StretchBlt( hSaveDc,
+                    StretchBlt( hdcZoomed.get(),
+                                0, 0,
+                                copyWidth, copyHeight,
+                                hdcActualSize.get(),
                                 0, 0,
                                 saveWidth, saveHeight,
-                                hInterimSaveDc,
-                                0,
-                                0,
-                                copyWidth, copyHeight,
                                 SRCCOPY | CAPTUREBLT );
 
-                    SavePng( targetFilePath, hSaveBitmap );
+                    SavePng( targetFilePath, hbmZoomed.get() );
                 }
             }
             g_bSaveInProgress = false;
 
-            DeleteDC( hInterimSaveDc );
-            DeleteDC( hSaveDc );
-
             if( lParam != SHALLOW_ZOOM )
             {
-                SetCursorPos(local_savedCursorPos.x, local_savedCursorPos.y);
+                SetCursorPos( local_savedCursorPos.x, local_savedCursorPos.y );
             }
             ClipCursor( &oldClipRect );
+
             break;
         }
 

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

@@ -27,58 +27,13 @@ namespace Microsoft.PowerToys.Settings.UI.Library
             IsAIEnabled = false;
             ShowCustomPreview = true;
             CloseAfterLosingFocus = false;
+            EnableClipboardPreview = true;
             PasteAIConfiguration = new();
         }
 
         [JsonConverter(typeof(BoolPropertyJsonConverter))]
         public bool IsAIEnabled { get; set; }
 
-        [JsonExtensionData]
-        public Dictionary<string, JsonElement> ExtensionData
-        {
-            get => _extensionData;
-            set
-            {
-                _extensionData = value;
-
-                if (_extensionData != null && _extensionData.TryGetValue("IsOpenAIEnabled", out var legacyElement) && legacyElement.ValueKind == JsonValueKind.Object && legacyElement.TryGetProperty("value", out var valueElement))
-                {
-                    IsAIEnabled = valueElement.ValueKind switch
-                    {
-                        JsonValueKind.True => true,
-                        JsonValueKind.False => false,
-                        _ => IsAIEnabled,
-                    };
-
-                    _extensionData.Remove("IsOpenAIEnabled");
-                }
-
-                if (_extensionData != null && _extensionData.TryGetValue("IsAdvancedAIEnabled", out var legacyAdvancedElement))
-                {
-                    bool? legacyValue = legacyAdvancedElement.ValueKind switch
-                    {
-                        JsonValueKind.True => true,
-                        JsonValueKind.False => false,
-                        JsonValueKind.Object when legacyAdvancedElement.TryGetProperty("value", out var advancedValueElement) => advancedValueElement.ValueKind switch
-                        {
-                            JsonValueKind.True => true,
-                            JsonValueKind.False => false,
-                            _ => null,
-                        },
-                        _ => null,
-                    };
-
-                    if (legacyValue.HasValue)
-                    {
-                        LegacyAdvancedAIEnabled = legacyValue.Value;
-                    }
-
-                    _extensionData.Remove("IsAdvancedAIEnabled");
-                }
-            }
-        }
-
-        private Dictionary<string, JsonElement> _extensionData;
         private bool? _legacyAdvancedAIEnabled;
 
         [JsonPropertyName("IsAdvancedAIEnabled")]
@@ -121,6 +76,9 @@ namespace Microsoft.PowerToys.Settings.UI.Library
         [JsonConverter(typeof(BoolPropertyJsonConverter))]
         public bool CloseAfterLosingFocus { get; set; }
 
+        [JsonConverter(typeof(BoolPropertyJsonConverter))]
+        public bool EnableClipboardPreview { get; set; }
+
         [JsonPropertyName("advanced-paste-ui-hotkey")]
         public HotkeySettings AdvancedPasteUIShortcut { get; set; }
 

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

@@ -177,6 +177,9 @@
                                 <tkcontrols:SettingsCard Name="AdvancedPasteCloseAfterLosingFocus" ContentAlignment="Left">
                                     <CheckBox x:Uid="AdvancedPaste_CloseAfterLosingFocus" IsChecked="{x:Bind ViewModel.CloseAfterLosingFocus, Mode=TwoWay}" />
                                 </tkcontrols:SettingsCard>
+                                <tkcontrols:SettingsCard Name="AdvancedPasteEnableClipboardPreview" ContentAlignment="Left">
+                                    <CheckBox x:Uid="AdvancedPaste_EnableClipboardPreview" IsChecked="{x:Bind ViewModel.EnableClipboardPreview, Mode=TwoWay}" />
+                                </tkcontrols:SettingsCard>
                                 <tkcontrols:SettingsCard Name="AdvancedPasteShowCustomPreviewSettingsCard" ContentAlignment="Left">
                                     <controls:CheckBoxWithDescriptionControl x:Uid="AdvancedPaste_ShowCustomPreviewSettingsCard" IsChecked="{x:Bind ViewModel.ShowCustomPreview, Mode=TwoWay}" />
                                 </tkcontrols:SettingsCard>

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

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

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

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

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

@@ -275,41 +275,23 @@
 
                 <controls:SettingsGroup x:Uid="MouseUtils_CursorWrap" AutomationProperties.AutomationId="MouseUtils_CursorWrapTestId">
                     <controls:GPOInfoControl ShowWarning="{x:Bind ViewModel.IsCursorWrapEnabledGpoConfigured, Mode=OneWay}">
-                        <tkcontrols:SettingsCard
+                        <tkcontrols:SettingsExpander
                             Name="MouseUtilsEnableCursorWrap"
                             x:Uid="MouseUtils_Enable_CursorWrap"
                             HeaderIcon="{ui:BitmapIcon Source=/Assets/Settings/Icons/CursorWrap.png}"
-                            IsEnabled="{x:Bind ViewModel.IsCursorWrapEnabledGpoConfigured, Mode=OneWay, Converter={StaticResource BoolNegationConverter}}">
+                            IsEnabled="{x:Bind ViewModel.IsCursorWrapEnabledGpoConfigured, Mode=OneWay, Converter={StaticResource BoolNegationConverter}}"
+                            IsExpanded="{x:Bind ViewModel.IsCursorWrapEnabled, Mode=OneWay}">
                             <ToggleSwitch x:Uid="ToggleSwitch" IsOn="{x:Bind ViewModel.IsCursorWrapEnabled, Mode=TwoWay}" />
-                        </tkcontrols:SettingsCard>
+                            <tkcontrols:SettingsExpander.Items>
+                                <tkcontrols:SettingsCard ContentAlignment="Left" IsEnabled="{x:Bind ViewModel.IsCursorWrapEnabled, Mode=OneWay}">
+                                    <CheckBox x:Uid="MouseUtils_AutoActivate" IsChecked="{x:Bind ViewModel.CursorWrapAutoActivate, Mode=TwoWay}" />
+                                </tkcontrols:SettingsCard>
+                                <tkcontrols:SettingsCard ContentAlignment="Left" IsEnabled="{x:Bind ViewModel.IsCursorWrapEnabled, Mode=OneWay}">
+                                    <CheckBox x:Uid="MouseUtils_CursorWrap_DisableWrapDuringDrag" IsChecked="{x:Bind ViewModel.CursorWrapDisableWrapDuringDrag, Mode=TwoWay}" />
+                                </tkcontrols:SettingsCard>
+                            </tkcontrols:SettingsExpander.Items>
+                        </tkcontrols:SettingsExpander>
                     </controls:GPOInfoControl>
-                    <tkcontrols:SettingsExpander
-                        Name="MouseUtilsCursorWrapSettingsExpander"
-                        x:Uid="MouseUtils_CursorWrap_ActivationShortcut"
-                        HeaderIcon="{ui:FontIcon Glyph=&#xEDA7;}"
-                        IsEnabled="{x:Bind ViewModel.IsCursorWrapEnabled, Mode=OneWay}"
-                        IsExpanded="True">
-                        <controls:ShortcutControl MinWidth="{StaticResource SettingActionControlMinWidth}" HotkeySettings="{x:Bind Path=ViewModel.CursorWrapActivationShortcut, Mode=TwoWay}" />
-                        <tkcontrols:SettingsExpander.Items>
-                            <tkcontrols:SettingsCard ContentAlignment="Left">
-                                <CheckBox x:Uid="MouseUtils_AutoActivate" IsChecked="{x:Bind ViewModel.CursorWrapAutoActivate, Mode=TwoWay}" />
-                            </tkcontrols:SettingsCard>
-                        </tkcontrols:SettingsExpander.Items>
-                    </tkcontrols:SettingsExpander>
-
-                    <tkcontrols:SettingsExpander
-                        Name="CursorWrapAppearanceBehavior"
-                        x:Uid="Appearance_Behavior"
-                        AutomationProperties.AutomationId="MouseUtils_CursorWrapAppearanceBehaviorId"
-                        HeaderIcon="{ui:FontIcon Glyph=&#xEB3C;}"
-                        IsEnabled="{x:Bind ViewModel.IsCursorWrapEnabled, Mode=OneWay}"
-                        IsExpanded="False">
-                        <tkcontrols:SettingsExpander.Items>
-                            <tkcontrols:SettingsCard ContentAlignment="Left">
-                                <CheckBox x:Uid="MouseUtils_CursorWrap_DisableWrapDuringDrag" IsChecked="{x:Bind ViewModel.CursorWrapDisableWrapDuringDrag, Mode=TwoWay}" />
-                            </tkcontrols:SettingsCard>
-                        </tkcontrols:SettingsExpander.Items>
-                    </tkcontrols:SettingsExpander>
                 </controls:SettingsGroup>
                 <controls:SettingsGroup x:Uid="MouseUtils_MousePointerCrosshairs" AutomationProperties.AutomationId="MouseUtils_MousePointerCrosshairsTestId">
                     <controls:GPOInfoControl ShowWarning="{x:Bind ViewModel.IsMousePointerCrosshairsEnabledGpoConfigured, Mode=OneWay}">

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

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

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

@@ -4601,6 +4601,10 @@ Activate by holding the key for the character you want to add an accent to, then
     <value>Automatically close the window after it loses focus</value>
     <comment>Advanced Paste is a product name, do not loc</comment>
   </data>
+  <data name="AdvancedPaste_EnableClipboardPreview.Content" xml:space="preserve">
+    <value>Show clipboard preview</value>
+    <comment>Enables display of clipboard contents preview in the Advanced Paste window</comment>
+  </data>
   <data name="GPO_CommandNotFound_ForceDisabled.Title" xml:space="preserve">
     <value>The Command Not Found module is disabled by your organization.</value>
     <comment>"Command Not Found" is a product name</comment>

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

@@ -233,10 +233,11 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
                 RemoveLegacyOpenAICredential();
             }
 
+            bool shouldEnableAI = legacyCredential is not null;
             bool enabledChanged = false;
-            if (!properties.IsAIEnabled && legacyCredential is not null)
+            if (properties.IsAIEnabled != shouldEnableAI)
             {
-                properties.IsAIEnabled = true;
+                properties.IsAIEnabled = shouldEnableAI;
                 enabledChanged = true;
             }
 
@@ -546,6 +547,19 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
             }
         }
 
+        public bool EnableClipboardPreview
+        {
+            get => _advancedPasteSettings.Properties.EnableClipboardPreview;
+            set
+            {
+                if (value != _advancedPasteSettings.Properties.EnableClipboardPreview)
+                {
+                    _advancedPasteSettings.Properties.EnableClipboardPreview = value;
+                    NotifySettingsChanged();
+                }
+            }
+        }
+
         public bool IsConflictingCopyShortcut =>
             _customActions.Select(customAction => customAction.Shortcut)
                           .Concat([PasteAsPlainTextShortcut, AdvancedPasteUIShortcut, PasteAsMarkdownShortcut, PasteAsJsonShortcut])
@@ -1204,6 +1218,12 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
                 OnPropertyChanged(nameof(CloseAfterLosingFocus));
             }
 
+            if (target.EnableClipboardPreview != source.EnableClipboardPreview)
+            {
+                target.EnableClipboardPreview = source.EnableClipboardPreview;
+                OnPropertyChanged(nameof(EnableClipboardPreview));
+            }
+
             var incomingConfig = source.PasteAIConfiguration ?? new PasteAIConfiguration();
             if (ShouldReplacePasteAIConfiguration(target.PasteAIConfiguration, incomingConfig))
             {

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

@@ -145,6 +145,7 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
                     IsEnabled = gpo == GpoRuleConfigured.Enabled || (gpo != GpoRuleConfigured.Disabled && ModuleHelper.GetIsModuleEnabled(generalSettingsConfig, moduleType)),
                     IsLocked = gpo == GpoRuleConfigured.Enabled || gpo == GpoRuleConfigured.Disabled,
                     Icon = ModuleHelper.GetModuleTypeFluentIconName(moduleType),
+                    IsNew = moduleType == ModuleType.CursorWrap,
                     DashboardModuleItems = GetModuleItems(moduleType),
                 };
                 newItem.EnabledChangedCallback = EnabledChangedOnUI;

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

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