More refreshing

More service stuff
2026-01-05 11:57:00 +01:00 · 2025-12-01 10:20:10 -06:00 · 2025-11-25 15:15:31 -06:00 · 2025-11-24 22:48:27 -06:00 · 2025-11-20 21:52:02 -06:00 · 2025-11-20 17:28:05 -06:00
194 changed files with 2874 additions and 2343 deletions
--- a/.github/actions/spell-check/expect.txt
+++ b/.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
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -5,6 +5,7 @@
 ## PR Checklist

 - [ ] Closes: #xxx
+<!--  - [ ] Closes: #yyy (add separate lines for additional resolved issues) -->
 - [ ] **Communication:** I've discussed this with core contributors already. If the work hasn't been agreed, this work might be rejected
 - [ ] **Tests:** Added/updated and all pass
 - [ ] **Localization:** All end-user-facing strings can be localized
--- a/.github/workflows/msstore-submissions.yml
+++ b/.github/workflows/msstore-submissions.yml
@@ -40,7 +40,7 @@ jobs:
          echo powerToysInstallerArm64Url=$(jq -n "$powerToysSetup" | jq -r '[.[]|select(.name | contains("arm64"))][0].browser_download_url') >> $GITHUB_OUTPUT

      - name: Setup .NET 9.0
-        uses: actions/setup-dotnet@v4
+        uses: actions/setup-dotnet@v5
        with:
          dotnet-version: '9.0.x'

--- a/.gitmodules
+++ b/.gitmodules
@@ -4,6 +4,3 @@
 [submodule "deps/expected-lite"]
 	path = deps/expected-lite
 	url = https://github.com/martinmoene/expected-lite.git
-[submodule "deps/cziplib"]
-	path = deps/cziplib
-	url = https://github.com/kuba--/zip.git
--- a/.pipelines/ESRPSigning_core.json
+++ b/.pipelines/ESRPSigning_core.json
@@ -291,6 +291,7 @@
                "Mono.Cecil.Rocks.dll",
                "Newtonsoft.Json.dll",
                "CommunityToolkit.WinUI.Controls.TitleBar.dll",
+                "CommunityToolkit.WinUI.Controls.OpacityMaskView.dll",

                "NLog.dll",
                "HtmlAgilityPack.dll",
--- a/Cpp.Build.props
+++ b/Cpp.Build.props
@@ -26,6 +26,7 @@
  <PropertyGroup Condition="'$(SkipCppCodeAnalysis)' == ''">
    <RunCodeAnalysis>true</RunCodeAnalysis>
    <CodeAnalysisRuleSet>$(MsbuildThisFileDirectory)\CppRuleSet.ruleset</CodeAnalysisRuleSet>
+    <CAExcludePath>$(MSBuildThisFileDirectory)deps;$(MSBuildThisFileDirectory)packages;$(CAExcludePath)</CAExcludePath>
  </PropertyGroup>

  <!-- C++ source compile-specific things for all configurations -->
@@ -34,7 +35,7 @@
    <PreferredToolArchitecture Condition="'$(PROCESSOR_ARCHITECTURE)' == 'ARM64' or '$(PROCESSOR_ARCHITEW6432)' == 'ARM64'">arm64</PreferredToolArchitecture>
    <VcpkgEnabled>false</VcpkgEnabled>
    <ReplaceWildcardsInProjectItems>true</ReplaceWildcardsInProjectItems>
-    <ExternalIncludePath>$(MSBuildThisFileFullPath)\..\deps\;$(MSBuildThisFileFullPath)\..\packages\;$(ExternalIncludePath)</ExternalIncludePath>
+    <ExternalIncludePath>$(MSBuildThisFileDirectory)deps;$(MSBuildThisFileDirectory)packages;$(ExternalIncludePath)</ExternalIncludePath>
    <!-- Enable control flow guard for C++ projects that don't consume any C++ files -->
    <!-- This covers the case where a .dll exports a .lib, but doesn't have any ClCompile entries. -->
    <LinkControlFlowGuard>Guard</LinkControlFlowGuard>
--- a/DATA_AND_PRIVACY.md
+++ b/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
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -7,6 +7,7 @@
    <PackageVersion Include="AdaptiveCards.ObjectModel.WinUI3" Version="2.0.0-beta" />
    <PackageVersion Include="AdaptiveCards.Rendering.WinUI3" Version="2.1.0-beta" />
    <PackageVersion Include="AdaptiveCards.Templating" Version="2.0.5" />
+    <PackageVersion Include="CommunityToolkit.Labs.WinUI.Controls.OpacityMaskView" Version="0.1.251101-build.2372" />
    <PackageVersion Include="Microsoft.Bot.AdaptiveExpressions.Core" Version="4.23.0" />
    <PackageVersion Include="Appium.WebDriver" Version="4.4.5" />
    <PackageVersion Include="CoenM.ImageSharp.ImageHash" Version="1.3.6" />
--- a/NOTICE.md
+++ b/NOTICE.md
@@ -1498,6 +1498,7 @@ SOFTWARE.
 - CoenM.ImageSharp.ImageHash
 - CommunityToolkit.Common
 - CommunityToolkit.Labs.WinUI.Controls.MarkdownTextBlock
+- CommunityToolkit.Labs.WinUI.Controls.OpacityMaskView
 - CommunityToolkit.Mvvm
 - CommunityToolkit.WinUI.Animations
 - CommunityToolkit.WinUI.Collections
--- a/README.md
+++ b/README.md
@@ -51,19 +51,20 @@ But to get started quickly, choose one of the installation methods below:
 Go to the [PowerToys GitHub releases][github-release-link], click Assets to reveal the downloads, and choose the installer that matches your architecture and install scope. For most devices, that's the x64 per-user installer.

 <!-- items that need to be updated release to release -->
-[github-next-release-work]: https://github.com/microsoft/PowerToys/issues?q=is%3Aissue+milestone%3A%22PowerToys+0.96%22
-[github-current-release-work]: https://github.com/microsoft/PowerToys/issues?q=is%3Aissue+milestone%3A%22PowerToys+0.95%22
-[ptUserX64]: https://github.com/microsoft/PowerToys/releases/download/v0.95.1/PowerToysUserSetup-0.95.1-x64.exe 
-[ptUserArm64]: https://github.com/microsoft/PowerToys/releases/download/v0.95.1/PowerToysUserSetup-0.95.1-arm64.exe 
-[ptMachineX64]: https://github.com/microsoft/PowerToys/releases/download/v0.95.1/PowerToysSetup-0.95.1-x64.exe 
-[ptMachineArm64]: https://github.com/microsoft/PowerToys/releases/download/v0.95.1/PowerToysSetup-0.95.1-arm64.exe
+[github-next-release-work]: https://github.com/microsoft/PowerToys/issues?q=is%3Aissue+milestone%3A%22PowerToys+0.97%22
+[github-current-release-work]: https://github.com/microsoft/PowerToys/issues?q=is%3Aissue+milestone%3A%22PowerToys+0.96%22
+[ptUserX64]: https://github.com/microsoft/PowerToys/releases/download/v0.96.0/PowerToysUserSetup-0.96.0-x64.exe 
+[ptUserArm64]: https://github.com/microsoft/PowerToys/releases/download/v0.96.0/PowerToysUserSetup-0.96.0-arm64.exe 
+[ptMachineX64]: https://github.com/microsoft/PowerToys/releases/download/v0.96.0/PowerToysSetup-0.96.0-x64.exe 
+[ptMachineArm64]: https://github.com/microsoft/PowerToys/releases/download/v0.96.0/PowerToysSetup-0.96.0-arm64.exe
 
 |  Description   | Filename |
 |----------------|----------|
-| Per user - x64       | [PowerToysUserSetup-0.95.1-x64.exe][ptUserX64] |
-| Per user - ARM64     | [PowerToysUserSetup-0.95.1-arm64.exe][ptUserArm64] |
-| Machine wide - x64   | [PowerToysSetup-0.95.1-x64.exe][ptMachineX64] |
-| Machine wide - ARM64 | [PowerToysSetup-0.95.1-arm64.exe][ptMachineArm64] |
+| Per user - x64       | [PowerToysUserSetup-0.96.0-x64.exe][ptUserX64] |
+| Per user - ARM64     | [PowerToysUserSetup-0.96.0-arm64.exe][ptUserArm64] |
+| Machine wide - x64   | [PowerToysSetup-0.96.0-x64.exe][ptMachineX64] |
+| Machine wide - ARM64 | [PowerToysSetup-0.96.0-arm64.exe][ptMachineArm64] |
+
 </details>

 <details>
@@ -102,156 +103,131 @@ There are [community driven install methods](./doc/unofficialInstallMethods.md)
 </details>

 ## ✨ What's new
-**Version 0.95 (October 2025)**
+**Version 0.96 (November 2025)**

 For an in-depth look at the latest changes, visit the [Windows Command Line blog](https://aka.ms/powertoys-releaseblog).

 **✨ Highlights**
- - **NEW:** The **Light Switch** utility in PowerToys allows you to automatically switch between light and dark themes in Windows based on the time of day.
- - Command Palette delivered major search performance gains (new fuzzy matcher and smarter fallbacks) improving relevance and speed.
- - Peek can now be activated using just the Spacebar!
- - Find My Mouse added transparent spotlight with independent backdrop opacity, boosting focus and accessibility.
- - Settings now lets you delete shortcuts entirely and ignore conflicts.
- - Mouse Pointer Crosshairs gained orientation options (vertical / horizontal / both) for customizable accessibility. Thanks [@mikehall-ms](https://github.com/mikehall-ms)!
- - PowerRename fixed enumeration counter skipping ensuring reliable batch renames. Thanks [@daverayment](https://github.com/daverayment)!
- - ZoomIt restored legacy draw and snipping behaviors, and fixed recording issues, improving reliability. Thanks [@chakrik73](https://github.com/chakrik73)!
+ - Advanced Paste now supports multiple online and on-device AI model providers: Azure OpenAI, OpenAI, Google Gemini, Mistral, Foundry Local and Ollama.
+ - Command Palette received extensive improvements including file search filters, better clipboard history metadata, context-menu styling, and dozens of bug fixes and enhancements.
+ - PowerRename can now extract and use photo metadata (EXIF, XMP) in renaming patterns like `%Camera`, `%Lens`, and `%ExposureTime`.
+
+### Advanced Paste
+ - Advanced Paste now lets you connect to multiple AI providers instead of being limited to a single OpenAI provider. See [Advanced Paste documentation](https://learn.microsoft.com/windows/powertoys/advanced-paste) for usage.
+
+### Awake
+ - The Awake countdown timer now stays accurate over long periods. Thanks [@daverayment](https://github.com/daverayment)!
+ - Fixed Awake context menu positioning. The fix removed the conversion of the mouse cursor from screen to client-window coordinates, instead using the raw screen coordinates returned by GetCursorPos; the context menu now appears at the correct screen position. Thanks [@lzandman](https://github.com/lzandman)!

 ### Command Palette
- - Applied conditional margin for icon-only tags to tighten layout. Thanks [@samrueby](https://github.com/samrueby)
- - Improved the reliability of accessing Command Palette settings through PowerToys Settings and executing other x-cmdpal:// protocol commands. Thanks [@jiripolasek](https://github.com/jiripolasek)
- - Enabled AOT by default for improved performance while simplifying publish configs.
- - Replaced service state color dots with play/pause/stop icons for enhanced accessibility. Thanks [@samrueby](https://github.com/samrueby)
- - Fixed filter dropdown sync and crash by binding SelectedValue and raising UI-thread notifications. Thanks [@jiripolasek](https://github.com/jiripolasek)
- - Ensured long links wrap correctly in details view.
- - Removed animation and enforced minimum width on filter dropdown for clarity. Thanks [@jiripolasek](https://github.com/jiripolasek)
- - Restored focus to More button after ESC closes context menu, improving keyboard flow. Thanks [@chatasweetie](https://github.com/chatasweetie)
- - Marked main and toast windows as tool windows to keep them out of Alt+Tab while preserving style. Thanks [@jiripolasek](https://github.com/jiripolasek)
- - Fixed AOT template and theming issues for filter separators. Thanks [@jiripolasek](https://github.com/jiripolasek)
- - Introduced grid layouts (small, medium, gallery) for richer page presentation.
- - Materialized result lists to avoid rescoring overhead.
- - Disabled problematic selection TextToSuggest behind environment flag.
- - Major search performance improvements (new fuzzy matcher, smarter fallbacks, fewer exceptions).
- - Added context menu "Show Details" command when details pane is hidden.
- - Reduced window flicker by avoiding unnecessary cloaking. Thanks [@jiripolasek](https://github.com/jiripolasek)
- - Restored EmptyContent rendering for blank states. Thanks [@DevLGuilherme](https://github.com/DevLGuilherme)
- - Saved new state even if prior app state file was corrupt (better resilience). Thanks [@jiripolasek](https://github.com/jiripolasek)
- - Migrated settings window to WinUI TitleBar control. Thanks [@jiripolasek](https://github.com/jiripolasek)
- - Prevented crash on duplicate keybindings and simplified matching. Thanks [@jiripolasek](https://github.com/jiripolasek)
- - Hotkeys now always respect the “Ignore shortcut in fullscreen” setting. Thanks [@jiripolasek](https://github.com/jiripolasek)
- - Hid search box on content pages, improving focus and accessibility, and added Home title. Thanks [@jiripolasek](https://github.com/jiripolasek)
- - Blocked Ctrl+I from inserting stray tabs in search box.
- - Logged HRESULT codes in error logs for deeper diagnostics. Thanks [@jiripolasek](https://github.com/jiripolasek)
- - Advanced font and emoji icon classification and alignment improvements. Thanks [@jiripolasek](https://github.com/jiripolasek)
- - Ensured that fallback command icons are visible on the extension settings page. Thanks [@jiripolasek](https://github.com/jiripolasek)
- - Fixed breadcrumb margin misalignment (visual polish). Thanks [@jiripolasek](https://github.com/jiripolasek)
- - Truncated overly long command labels with ellipsis to prevent overflow.
- - Added a setting to configure the page transition animation.
- - Collection of small improvements and nits for Run Commands.
- - Improved bookmarks performance and experience. Thanks [@jiripolasek](https://github.com/jiripolasek)
- - Added Ctrl+O shortcut in Clipboard History to open links directly.
- - Resolved conflict with external software that blocked Command Palette from hiding.
- - Updated context menu items to reflect name and icon changes, and ensured application icons are displayed correctly. Thanks [@jiripolasek](https://github.com/jiripolasek)
- - Added Alt+Home shortcut to return immediately to the Command Palette home page. Thanks [@jiripolasek](https://github.com/jiripolasek)
- - Fixed a crash when displaying code blocks in markdown on detail or content pages. Thanks [@jiripolasek](https://github.com/jiripolasek)
- - Fixed an issue where the search bar icon and title were not updated when rapidly switching pages. Thanks [@jiripolasek](https://github.com/jiripolasek)
- - Improved the appearance of the search box in the context menu.
-
+ - The search field in context menus now matches the look of the Command Palette, with a smoke backdrop and improved padding.
+ - Fallback items such as math calculations or the Run command now appear in results more quickly. Thanks [@jiripolasek](https://github.com/jiripolasek)!
+ - Ensured the command bar updates correctly after navigating to another page and commands are displayed correctly. Thanks [@jiripolasek](https://github.com/jiripolasek)!
+ - The Command Palette settings page has been reorganized. Activation-key options are grouped under an expander and extension settings are framed for improved readability.
+ - When you modify a command, its alias, hotkey, and tags now update in the top-level list, keeping the displayed information in sync. Thanks [@jiripolasek](https://github.com/jiripolasek)!
+ - Press `Ctrl + ,` to open Command Palette settings from anywhere. Thanks [@jiripolasek](https://github.com/jiripolasek)!
+ - You can use `Page Up` and `Page Down` to navigate the list while focus is in the search box. Thanks [@samrueby](https://github.com/samrueby)!
+ - Fixed an issue where the search box could disappear when navigating pages. Thanks [@jiripolasek](https://github.com/jiripolasek)!
+ - Ensured search text is selected when *Go home when activated* and *Highlight search on activate* are both enabled. Thanks [@jiripolasek](https://github.com/jiripolasek)!
+ - Fixed an issue where Command Palette window occasionally appeared on the taskbar under certain Windows settings. Thanks [@jiripolasek](https://github.com/jiripolasek)!
+ - Ensured that labels and icons of list items and menu items update when they change. Thanks [@jiripolasek](https://github.com/jiripolasek)!
+ - Fixed visibility of list filters when navigating to a content page. Thanks [@DevLGuilherme](https://github.com/DevLGuilherme)!
+ - Added search to the extension list and a link to extensions on the Microsoft Store. Thanks [@jiripolasek](https://github.com/jiripolasek)!
+ - Added options to open the Command Palette window at its last position or re-center it.
+ - The Command Palette now remembers its window size after restarting.
+ - Added a global error handler that logs fatal errors and provides feedback when unexpected failures force Command Palette to close. Thanks [@jiripolasek](https://github.com/jiripolasek)!
+ - Fixed forms and extension settings not showing on some machines due to a missing VC++ runtime.
+ - Restored ranking of fallback commands for built-in extensions (Sleep, Shutdown, Windows settings, Web search, etc.). Thanks [@jiripolasek](https://github.com/jiripolasek).
+ - Improved and unified labels and texts across the application!
+ - Maintainance: Resolved numerous build warnings in Command Palette projects; no user-visible impact. Thanks [@jiripolasek](https://github.com/jiripolasek)!
+ - Maintainance: Fixed a logging issue so exception messages are properly recorded instead of placeholder text, improving troubleshooting. Thanks [@jiripolasek](https://github.com/jiripolasek)!

 ### Command Palette Extensions
- - Replaced localized WebSearch setting keys with stable literals and numeric history count. Thanks [@jiripolasek](https://github.com/jiripolasek)!
- - Enabled advanced markdown tables and emphasis extensions. Thanks [@jiripolasek](https://github.com/jiripolasek)!
- - Added setting to choose Clipboard History primary action (Paste vs Copy). Thanks [@jiripolasek](https://github.com/jiripolasek)
- - Added actionable empty-state hints for File Search (search PC / open indexing settings). Thanks [@jiripolasek](https://github.com/jiripolasek)!
- - Ensured all WinGet extension assets copy reliably to output. Thanks [@jiripolasek](https://github.com/jiripolasek)!
- - Improved Run command line parsing for paths with spaces; sped up related tests.
- - Updated WebSearch extension icon set for enhanced clarity and contrast. Thanks [@jiripolasek](https://github.com/jiripolasek)!
- - Added Terminal profile sort order setting including MRU tracking. Thanks [@jiripolasek](https://github.com/jiripolasek)!
- - Added Uninstall Application command (UWP direct, Win32 via Settings). Thanks [@mKpwnz](https://github.com/mKpwnz)!
- - Deferred WinGet details loading and added timing logs.
- - Removed LINQ from All Apps extension for performance.
- - Added standardized key chord system + shortcuts to File Search commands. Thanks [@jiripolasek](https://github.com/jiripolasek)!
- - Added Terminal channel filter & remembered selection option. Thanks [@jiripolasek](https://github.com/jiripolasek)!
- - Enabled loading local/data/app images in markdown with sizing hints. Thanks [@jiripolasek](https://github.com/jiripolasek)!
- - Added external extension reload via x-cmdpal://reload (configurable). Thanks [@jiripolasek](https://github.com/jiripolasek)!
- - Instant WebSearch history updates with in-memory store & events. Thanks [@jiripolasek](https://github.com/jiripolasek)!
- - Added keep-after-paste option and safe delete with confirmation for Clipboard History. Thanks [@jiripolasek](https://github.com/jiripolasek)!
-
-### Environment Variables
- - Replaced custom window chrome with WinUI TitleBar for cleaner, maintainable Environment Variables UI.
-
-### File Locksmith
- - Adopted WinUI TitleBar to simplify window chrome while preserving appearance.
+ - Bookmarks: Added hints about bookmark placeholders to the Add/Edit Bookmark form. — Thanks [@jiripolasek](https://github.com/jiripolasek)!
+ - Bookmarks: Improved migration of bookmarks from older versions and fixed an issue where aliases or keyboard shortcuts could be lost after restart. Thanks [@jiripolasek](https://github.com/jiripolasek)!
+ - Clipboard history: Items shown in Command Palette’s clipboard history now include helpful metadata. For example, image items show dimensions, text files show names and sizes, web links include page titles, and text entries display word counts. Thanks [@jiripolasek](https://github.com/jiripolasek)!
+ - File search: Added filter buttons to show *all items*, *files only*, or *folders only*. Selecting a filter adds `kind:folders` or `kind:not folders` to narrow results.
+ - System commands: Replaced the `:red_circle:` placeholder with an actual red-circle emoji so the correct icon appears in the UI. Thanks [@samrueby](https://github.com/samrueby)!
+ - WinGet: Search performance feels more responsive because typed input is now processed via a task queue rather than complex cancellation tokens!
+ - Window Walker: UWP apps no longer show a "not responding" label when suspended. Thanks [@jiripolasek](https://github.com/jiripolasek)!
+ - Window Walker: Now displays the actual icon of each window rather than using the process icon, improving recognition of PWAs and Python GUIs. Thanks [@Lee-WonJun](https://github.com/Lee-WonJun)!
+- Windows Terminal profiles: Fixed a rare crash in the Windows Terminal extension when the `LOCALAPPDATA` environment variable was missing. The path is now retrieved via a reliable API. Thanks [@jiripolasek](https://github.com/jiripolasek)!

 ### Find My Mouse
- - Added transparent spotlight support with separate backdrop opacity; migrated to Windows App SDK composition APIs.
+ - Activating Find My Mouse no longer makes the cursor change to the busy (hourglass) icon or steals focus from your active application.

 ### Hosts File Editor
- - Migrated to native WinUI TitleBar for cleaner, maintainable window chrome.
+ - Added customizable backup settings allowing users to configure backup frequency, location, and auto-deletion policies. Thanks [@davidegiacometti](https://github.com/davidegiacometti)!
+
+### Image Resizer
+ - Fixed settings consistency during batch resize operations by capturing settings once before processing. Thanks [@daverayment](https://github.com/daverayment)!

 ### Light Switch
- - Introduced as a brand-new PowerToy module.
- - Automatically switches between light and dark themes.
- - Supports time-based scheduling or location-based sunrise/sunset switching.
- - Supports using a keyboard shortcut to force a change.
- - Supports filtering changes for Apps and/or System Theme.
+- Introduced new UI to allow users to manually enter their latitude and longitude in Sunrise to Sunset mode.
+- Refactored service with cleaner state management for stability.
+- Removed logs from every tick, only logging key events to largely reduce log size.

 ### Mouse Pointer Crosshairs
- - Added Esc key to cancel active gliding cursor sequence. Thanks [@mikehall-ms](https://github.com/mikehall-ms)!
- - Added orientation option (vertical / horizontal / both) for crosshairs customization. Thanks [@mikehall-ms](https://github.com/mikehall-ms)!
+ - Enabled switching between Mouse Pointer Crosshairs and Gliding Cursor modes. Thanks [@mikehall-ms](https://github.com/mikehall-ms)!

 ### Mouse Without Borders
- - Continued Common class refactor (part 5/7) by extracting clipboard and init/cleanup logic into focused classes. Thanks [@mikeclayton](https://github.com/mikeclayton)!
-
- - Fix connection failures caused by conflicting MachineId across machines.  Thanks [@noraa-junker](https://github.com/noraa-junker) for troubleshooting!
+ - Added horizontal scrolling support. Thanks [@MasonBergstrom](https://github.com/MasonBergstrom)!

 ### Peek
- - Added the option to activate Peek with just the Spacebar.
+- Fixed media files remaining locked after preview window closes. Thanks [@daverayment](https://github.com/daverayment)!
+- Added a command-line interface for file previewing. See the [Peek documentation](https://learn.microsoft.com/windows/powertoys/peek) for usage. Thanks [@prochan2](https://github.com/prochan2)!

 ### PowerRename
- - Fixed enumeration counter skipping when regex replacement equals original filename (counters now advance reliably). Thanks [@daverayment](https://github.com/daverayment)!
+- PowerRename no longer crashes due to a missing resources file.
+- Added photo metadata extraction support using EXIF and XMP for pattern-based renaming with camera info, GPS coordinates, and date taken. See [PowerRename Documentation](https://learn.microsoft.com/en-us/windows/powertoys/powerrename).

-### Quick Accent
- - Expanded Welsh layout with acute, grave, and dieresis variants for vowels (consistent ordering). Thanks [@PesBandi](https://github.com/PesBandi)!
+### PowerToys Run
+ - Added retry logic with exponential backoff to handle DWM composition errors during theme changes. Thanks [@jiripolasek](https://github.com/jiripolasek)!
+ - Updated OneNote icons to reflect new Microsoft 365 design. Thanks [@trevorNgo](https://github.com/trevorNgo)!

-### Registry Preview
- - Migrated to native TitleBar and AppWindow APIs for cleaner window chrome.
+ ### Quick Accent
+ - Added diameter symbol (⌀) for Shift+O in Special Characters mode, thanks to [@anselumjuju](https://github.com/anselumjuju)!

-### Screen Ruler
- - Fixed ARM64 crash by aligning cursor position structure to 8-byte boundary.
+### Zoomit
+ - Smoothed out zoom-animation in ZoomIt by coalescing mouse-move and timer events, thanks to [@foxmsft](https://github.com/foxmsft)!
+ - Enabled GIF support for ZoomIt, thanks to [@MarioHewardt](https://github.com/MarioHewardt)!
+ - Fixed spelling mistakes, and refactored some literal strings to string constants, thanks to [@lzandman](https://github.com/lzandman)!
+ - Fixed inaccurate "actual size" screenshots in ZoomIt and resolves a GDI handle leak, improving capture fidelity and long-session stability. thanks to [@daverayment](https://github.com/daverayment)!

 ### Settings
- - Added ability to ignore specific hotkey conflicts to reduce noise.
- - Stopped creating backup directory during dry-run status checks (cleaner first-run). 
- - Standardized casing and localization for ZoomIt and modules header.
- - Improved search results page accessibility and conditional module grouping.
+- Fixed title bar overlapping issue at smaller window sizes.
+- Refined shortcut control visual design with improved consistency and spacing.
+- Added dashboard utilities sorting by name or status.
+- Made update notification InfoBar in flyout clickable for direct navigation to update page.
+- Expanded installation instructions by default in README.
+- Improved accessibility for shortcut conflict button with static resource-based automation properties.
+- Added ScrollViewer to Command Palette page in PowerToys Settings. Thanks [@jiripolasek](https://github.com/jiripolasek)!
+- Fixed module list glitches and Sort Status checkmark issue. Thanks [@daverayment](https://github.com/daverayment)!

-### ZoomIt
- - Updated resource file to reflect standalone v9.01 and current copyright year. Thanks [@foxmsft](https://github.com/foxmsft)!
- - Restored legacy draw/snipping behaviors and fixed recording race conditions. Thanks [@chakrik73](https://github.com/chakrik73)!
- - Added smooth image option for improved zoom quality using GDI+ for static zoom and Magnifier API for live zoom. Thanks [@markrussinovich](https://github.com/markrussinovich)!
-
- ### Documentation
- - New Microsoft Learn documentation for the Light Switch module.
- - New dev docs for the Light Switch module.
-
-### Development (Area-Build & Area-Tests) 
- Allowed debug launches to continue when modules fail to load, speeding developer iteration. 
- Fixed spell checker dictionary entry (advapi) to eliminate false error. 
- Added VS Code development guide and launch configs to streamline cross-editor workflows. 
- Upgraded Windows App SDK and related dependencies to 1.8 for newer platform features. 
- Rewrote YAML comment to resolve new spell checker forbidden pattern. Thanks [@jiripolasek](https://github.com/jiripolasek)! 
- Corrected solution structure by returning misplaced Common project, reducing build confusion. 
- Modernized build scripts with shared helpers and VS environment autodetection for simpler CLI builds. 
- Standardized build scripts and platform detection to improve reliability and reuse. 
- Added missing Command Palette version bump to align module release cadence. 
- Added EXECUTEDEFAULT term to dictionary to prevent regression build failures. Thanks [@jiripolasek](https://github.com/jiripolasek)! 
- Introduced nightly pre-warm pipeline and configurable MSBuild cache mode to improve CI performance. 
- Resolved CI forbidden pattern spelling complaint to keep pipelines green. 
- Added AI contributor instruction set to clarify code area expectations. 
- Added accessibility IDs to settings and FancyZones toggles, stabilizing UI tests. 
- Added automatic log collection on UI test failures to speed root cause analysis. 
- Stabilized Mouse Utils tests by switching to AccessibilityId selectors. 
- Added Screen Ruler UI test coverage to validate core measurement workflows. 
+### Development
+- Fixed accessibility by associating controls with labels for screen readers.
+- Added accessible name to Shortcut Conflicts button for screen readers.
+- Excluded TitleBars from tab navigation across multiple utilities. Thanks [@jiripolasek](https://github.com/jiripolasek)!
+- Migrated build infrastructure from Windows Server 2019 to Server 2022 with improved failure logging and predictable NuGet package paths.
+- Configured build agents to use larger P: drive for release builds to address disk space constraints.
+- Enhanced DSC v3 support by organizing resource manifests in a dedicated subfolder with PATH configuration.
+- Reduced installer bundle size by 6-7MB through centralized Hybrid CRT configuration across all C++ projects.
+- Updated .NET packages to version 9.0.10 for security fixes. Thanks [@snickler](https://github.com/snickler)!
+- Fixed spell check dictionary entries for consistency.
+- Restored accidentally deleted NuGet configuration file for Command Palette extensions.
+- Fixed package identity build by updating AppxManifest entry points to use PowerShell Core.
+- Optimized CI pipeline by replacing file copy operations with hard links and moves, reducing build time and disk usage by 10-15GB.
+- Updated Copilot guidance and PR prompt workflow.
+- Included high-volume bugs in issue template header. Thanks [@daverayment](https://github.com/daverayment)!
+- Fixed incorrect HRESULT logging for inner exceptions. Thanks [@jiripolasek](https://github.com/jiripolasek)!
+- Introduced shared sparse package identity for PowerToys Win32 components to enable access to Windows platform APIs.
+- Consolidated installer builds to produce both machine and user installers simultaneously, reducing build time and complexity.
+- Migrated exclusively to WiX v5 installer infrastructure, removing legacy WiX v3 support.
+- Temporarily removed PowerToys installer path from PATH environment variable to prevent application crashes.
+- Added complete OCR UI test coverage with automated tests for activation, settings, language selection, and text extraction.
+- Fixed test input for drive path normalization in bookmark resolver unit tests.
+- Fixed Peek UI tests by restoring Ctrl+Space activation shortcut for test scenarios.
+- Hided apps in PowerToys.SpareApps package from Start Menu. Thanks [@jiripolasek](https://github.com/jiripolasek)!

 ## 🛣️ Roadmap 
 We are planning some nice new features and improvements for the next releases – a revamped Keyboard Manager UI, custom endpoint and local model support for Advanced Paste, Command Palette improvements and a brand-new Shortcut Guide experience! Stay tuned for [v0.96][github-next-release-work]!
--- a/deps/cziplib
+++ b/deps/cziplib
--- a/installer/PowerToysSetupCustomActionsVNext/CustomAction.cpp
+++ b/installer/PowerToysSetupCustomActionsVNext/CustomAction.cpp
@@ -4,6 +4,7 @@
 #include <ProjectTelemetry.h>
 #include <spdlog/sinks/base_sink.h>
 #include <filesystem>
+#include <string_view>

 #include "../../src/common/logger/logger.h"
 #include "../../src/common/utils/gpo.h"
@@ -856,14 +857,69 @@ UINT __stdcall UnsetAdvancedPasteAPIKeyCA(MSIHANDLE hInstall)

    try
    {
-        winrt::Windows::Security::Credentials::PasswordVault vault;
-        winrt::Windows::Security::Credentials::PasswordCredential cred;
-
        hr = WcaInitialize(hInstall, "UnsetAdvancedPasteAPIKey");
        ExitOnFailure(hr, "Failed to initialize");

-        cred = vault.Retrieve(L"https://platform.openai.com/api-keys", L"PowerToys_AdvancedPaste_OpenAIKey");
-        vault.Remove(cred);
+        winrt::Windows::Security::Credentials::PasswordVault vault;
+
+        auto hasPrefix = [](std::wstring_view value, wchar_t const* prefix) {
+            std::wstring_view prefixView{ prefix };
+            return value.compare(0, prefixView.size(), prefixView) == 0;
+        };
+
+        const wchar_t* resourcePrefixes[] = {
+            L"https://platform.openai.com/api-keys",
+            L"https://azure.microsoft.com/products/ai-services/openai-service",
+            L"https://azure.microsoft.com/products/ai-services/ai-inference",
+            L"https://console.mistral.ai/account/api-keys",
+            L"https://ai.google.dev/",
+        };
+
+        const wchar_t* usernamePrefixes[] = {
+            L"PowerToys_AdvancedPaste_",
+        };
+
+        auto credentials = vault.RetrieveAll();
+        for (auto const& credential : credentials)
+        {
+            bool shouldRemove = false;
+
+            std::wstring resource{ credential.Resource() };
+            for (auto const prefix : resourcePrefixes)
+            {
+                if (hasPrefix(resource, prefix))
+                {
+                    shouldRemove = true;
+                    break;
+                }
+            }
+
+            if (!shouldRemove)
+            {
+                std::wstring username{ credential.UserName() };
+                for (auto const prefix : usernamePrefixes)
+                {
+                    if (hasPrefix(username, prefix))
+                    {
+                        shouldRemove = true;
+                        break;
+                    }
+                }
+            }
+
+            if (!shouldRemove)
+            {
+                continue;
+            }
+
+            try
+            {
+                vault.Remove(credential);
+            }
+            catch (...)
+            {
+            }
+        }
    }
    catch (...)
    {
--- a/src/PackageIdentity/AppxManifest.xml
+++ b/src/PackageIdentity/AppxManifest.xml
@@ -42,7 +42,8 @@
        Description="PowerToys OCR Module"
        BackgroundColor="transparent"
        Square150x150Logo="Images\Square150x150Logo.png"
-        Square44x44Logo="Images\Square44x44Logo.png">
+        Square44x44Logo="Images\Square44x44Logo.png"
+        AppListEntry="none">
      </uap:VisualElements>
    </Application>
    <Application Id="PowerToys.SettingsUI" Executable="WinUI3Apps\PowerToys.Settings.exe" EntryPoint="Windows.FullTrustApplication">
@@ -51,7 +52,8 @@
        Description="PowerToys Settings UI"
        BackgroundColor="transparent"
        Square150x150Logo="Images\Square150x150Logo.png"
-        Square44x44Logo="Images\Square44x44Logo.png">
+        Square44x44Logo="Images\Square44x44Logo.png"
+        AppListEntry="none">
      </uap:VisualElements>
    </Application>
    <Application Id="PowerToys.ImageResizerUI" Executable="WinUI3Apps\PowerToys.ImageResizer.exe" EntryPoint="Windows.FullTrustApplication">
@@ -60,7 +62,8 @@
        Description="PowerToys Image Resizer UI"
        BackgroundColor="transparent"
        Square150x150Logo="Images\Square150x150Logo.png"
-        Square44x44Logo="Images\Square44x44Logo.png">
+        Square44x44Logo="Images\Square44x44Logo.png"
+        AppListEntry="none">
      </uap:VisualElements>
    </Application>
  </Applications>
--- a/src/common/LanguageModelProvider/FoundryLocal/FoundryClient.cs
+++ b/src/common/LanguageModelProvider/FoundryLocal/FoundryClient.cs
@@ -10,6 +10,23 @@ namespace LanguageModelProvider.FoundryLocal;
 internal sealed class FoundryClient
 {
    public static async Task<FoundryClient?> CreateAsync()
+    {
+        // First attempt with current environment
+        var client = await TryCreateClientAsync().ConfigureAwait(false);
+        if (client != null)
+        {
+            return client;
+        }
+
+        // If failed, refresh PATH from registry and retry once
+        // This handles cases where PowerToys was launched by MSI installer.
+        Logger.LogInfo("[FoundryClient] First attempt failed, refreshing PATH and retrying");
+        RefreshEnvironmentPath();
+
+        return await TryCreateClientAsync().ConfigureAwait(false);
+    }
+
+    private static async Task<FoundryClient?> TryCreateClientAsync()
    {
        try
        {
@@ -168,41 +185,95 @@ internal sealed class FoundryClient
    }

    public async Task<bool> EnsureModelLoaded(string modelId)
+    {
+        Logger.LogInfo($"[FoundryClient] EnsureModelLoaded called with: {modelId}");
+
+        // Check if already loaded
+        if (await IsModelLoaded(modelId).ConfigureAwait(false))
+        {
+            Logger.LogInfo($"[FoundryClient] Model already loaded: {modelId}");
+            return true;
+        }
+
+        // Load the model
+        Logger.LogInfo($"[FoundryClient] Loading model: {modelId}");
+        await _foundryManager.LoadModelAsync(modelId).ConfigureAwait(false);
+
+        // Verify it's loaded
+        var loaded = await IsModelLoaded(modelId).ConfigureAwait(false);
+        Logger.LogInfo($"[FoundryClient] Model load result: {loaded}");
+        return loaded;
+    }
+
+    public async Task EnsureRunning()
+    {
+        if (!_foundryManager.IsServiceRunning)
+        {
+            await _foundryManager.StartServiceAsync();
+        }
+    }
+
+    /// <summary>
+    /// Refreshes the PATH environment variable from the system registry.
+    /// This is necessary when tools are installed while PowerToys is running,
+    /// as the installer updates the system PATH but running processes don't see the change.
+    /// </summary>
+    private static void RefreshEnvironmentPath()
    {
        try
        {
-            Logger.LogInfo($"[FoundryClient] EnsureModelLoaded called with: {modelId}");
+            Logger.LogInfo("[FoundryClient] Refreshing PATH environment variable from system");

-            // Check if already loaded
-            if (await IsModelLoaded(modelId).ConfigureAwait(false))
+            var currentPath = Environment.GetEnvironmentVariable("PATH", EnvironmentVariableTarget.Process) ?? string.Empty;
+            var machinePath = Environment.GetEnvironmentVariable("PATH", EnvironmentVariableTarget.Machine) ?? string.Empty;
+            var userPath = Environment.GetEnvironmentVariable("PATH", EnvironmentVariableTarget.User) ?? string.Empty;
+
+            var pathsToAdd = new List<string>();
+
+            if (!string.IsNullOrWhiteSpace(currentPath))
            {
-                Logger.LogInfo($"[FoundryClient] Model already loaded: {modelId}");
-                return true;
+                pathsToAdd.AddRange(currentPath.Split(Path.PathSeparator, StringSplitOptions.RemoveEmptyEntries));
            }

-            // Check if model exists in cache
-            var cachedModels = await ListCachedModels().ConfigureAwait(false);
-            Logger.LogInfo($"[FoundryClient] Cached models: {string.Join(", ", cachedModels.Select(m => m.Name))}");
-
-            if (!cachedModels.Any(m => m.Name == modelId))
+            if (!string.IsNullOrWhiteSpace(userPath))
            {
-                Logger.LogWarning($"[FoundryClient] Model not found in cache: {modelId}");
-                return false;
+                var userPaths = userPath.Split(Path.PathSeparator, StringSplitOptions.RemoveEmptyEntries);
+                foreach (var path in userPaths)
+                {
+                    if (!pathsToAdd.Contains(path, StringComparer.OrdinalIgnoreCase))
+                    {
+                        pathsToAdd.Add(path);
+                    }
+                }
            }

-            // Load the model
-            Logger.LogInfo($"[FoundryClient] Loading model: {modelId}");
-            await _foundryManager.LoadModelAsync(modelId).ConfigureAwait(false);
+            if (!string.IsNullOrWhiteSpace(machinePath))
+            {
+                var machinePaths = machinePath.Split(Path.PathSeparator, StringSplitOptions.RemoveEmptyEntries);
+                foreach (var path in machinePaths)
+                {
+                    if (!pathsToAdd.Contains(path, StringComparer.OrdinalIgnoreCase))
+                    {
+                        pathsToAdd.Add(path);
+                    }
+                }
+            }

-            // Verify it's loaded
-            var loaded = await IsModelLoaded(modelId).ConfigureAwait(false);
-            Logger.LogInfo($"[FoundryClient] Model load result: {loaded}");
-            return loaded;
+            var newPath = string.Join(Path.PathSeparator.ToString(), pathsToAdd);
+
+            if (currentPath != newPath)
+            {
+                Logger.LogInfo("[FoundryClient] Updating process PATH with latest system values");
+                Environment.SetEnvironmentVariable("PATH", newPath, EnvironmentVariableTarget.Process);
+            }
+            else
+            {
+                Logger.LogInfo("[FoundryClient] PATH is already up to date");
+            }
        }
        catch (Exception ex)
        {
-            Logger.LogError($"[FoundryClient] EnsureModelLoaded exception: {ex.Message}");
-            return false;
+            Logger.LogError($"[FoundryClient] Failed to refresh PATH: {ex.Message}");
        }
    }
 }
--- a/src/common/LanguageModelProvider/FoundryLocalModelProvider.cs
+++ b/src/common/LanguageModelProvider/FoundryLocalModelProvider.cs
@@ -12,8 +12,8 @@ namespace LanguageModelProvider;

 public sealed class FoundryLocalModelProvider : ILanguageModelProvider
 {
-    private IEnumerable<ModelDetails>? _downloadedModels;
-    private FoundryClient? _foundryManager;
+    private FoundryClient? _foundryClient;
+    private IEnumerable<FoundryCatalogModel>? _catalogModels;
    private string? _serviceUrl;

    public static FoundryLocalModelProvider Instance { get; } = new();
@@ -22,66 +22,45 @@ public sealed class FoundryLocalModelProvider : ILanguageModelProvider

    public string ProviderDescription => "The model will run locally via Foundry Local";

-    public string UrlPrefix => "fl://";
-
-    public IChatClient? GetIChatClient(string url)
+    public IChatClient? GetIChatClient(string modelId)
    {
-        try
-        {
-            Logger.LogInfo($"[FoundryLocal] GetIChatClient called with url: {url}");
-            InitializeAsync().GetAwaiter().GetResult();
-        }
-        catch (Exception ex)
-        {
-            Logger.LogError($"[FoundryLocal] Failed to initialize: {ex.Message}");
-            return null;
-        }
+        Logger.LogInfo($"[FoundryLocal] GetIChatClient called with url: {modelId}");
+        InitializeAsync().GetAwaiter().GetResult();

-        if (string.IsNullOrWhiteSpace(_serviceUrl) || _foundryManager == null)
-        {
-            Logger.LogError("[FoundryLocal] Service URL or manager is null");
-            return null;
-        }
-
-        // Extract model ID from URL (format: fl://modelname)
-        var modelId = url.Replace(UrlPrefix, string.Empty).Trim('/');
        if (string.IsNullOrWhiteSpace(modelId))
        {
            Logger.LogError("[FoundryLocal] Model ID is empty after extraction");
            return null;
        }

-        Logger.LogInfo($"[FoundryLocal] Extracted model ID: {modelId}");
+        // Check if model is in catalog
+        var isInCatalog = _catalogModels?.Any(m => m.Name == modelId) ?? false;
+        if (!isInCatalog)
+        {
+            var errorMessage = $"{modelId} is not supported in Foundry Local. Please configure supported models in Settings.";
+            Logger.LogError($"[FoundryLocal] {errorMessage}");
+            throw new InvalidOperationException(errorMessage);
+        }

        // Ensure the model is loaded before returning chat client
-        try
+        var isLoaded = _foundryClient!.EnsureModelLoaded(modelId).GetAwaiter().GetResult();
+        if (!isLoaded)
        {
-            var isLoaded = _foundryManager.EnsureModelLoaded(modelId).GetAwaiter().GetResult();
-            if (!isLoaded)
-            {
-                Logger.LogError($"[FoundryLocal] Failed to load model: {modelId}");
-                return null;
-            }
-
-            Logger.LogInfo($"[FoundryLocal] Model is loaded: {modelId}");
-        }
-        catch (Exception ex)
-        {
-            Logger.LogError($"[FoundryLocal] Exception ensuring model loaded: {ex.Message}");
-            return null;
+            Logger.LogError($"[FoundryLocal] Failed to load model: {modelId}");
+            throw new InvalidOperationException($"Failed to load the model '{modelId}'.");
        }

        // Use ServiceUri instead of Endpoint since Endpoint already includes /v1
-        var baseUri = _foundryManager.GetServiceUri();
+        var baseUri = _foundryClient.GetServiceUri();
        if (baseUri == null)
        {
-            Logger.LogError("[FoundryLocal] Service URI is null");
-            return null;
+            const string message = "Foundry Local service URL is not available. Please make sure Foundry Local is installed and running.";
+            Logger.LogError($"[FoundryLocal] {message}");
+            throw new InvalidOperationException(message);
        }

        var endpointUri = new Uri($"{baseUri.ToString().TrimEnd('/')}/v1");
        Logger.LogInfo($"[FoundryLocal] Creating OpenAI client with endpoint: {endpointUri}");
-        Logger.LogInfo($"[FoundryLocal] Model ID for chat client: {modelId}");

        return new OpenAIClient(
            new ApiKeyCredential("none"),
@@ -111,48 +90,16 @@ public sealed class FoundryLocalModelProvider : ILanguageModelProvider
        return $"new OpenAIClient(new ApiKeyCredential(\"none\"), new OpenAIClientOptions{{ Endpoint = new Uri(\"{_serviceUrl}/v1\") }}).GetChatClient(\"{modelId}\").AsIChatClient()";
    }

-    public async Task<IEnumerable<ModelDetails>> GetModelsAsync(bool ignoreCached = false, CancellationToken cancelationToken = default)
+    public async Task<IEnumerable<ModelDetails>> GetModelsAsync(CancellationToken cancelationToken = default)
    {
-        if (ignoreCached)
-        {
-            Logger.LogInfo("[FoundryLocal] Ignoring cached models, resetting");
-            Reset();
-        }
-
        await InitializeAsync(cancelationToken);

-        Logger.LogInfo($"[FoundryLocal] Returning {_downloadedModels?.Count() ?? 0} downloaded models");
-        return _downloadedModels ?? [];
-    }
-
-    private void Reset()
-    {
-        _downloadedModels = null;
-        _ = InitializeAsync();
-    }
-
-    private async Task InitializeAsync(CancellationToken cancelationToken = default)
-    {
-        if (_foundryManager != null && _downloadedModels != null && _downloadedModels.Any())
+        if (_foundryClient == null)
        {
-            return;
+            return Array.Empty<ModelDetails>();
        }

-        Logger.LogInfo("[FoundryLocal] Initializing provider");
-        _foundryManager ??= await FoundryClient.CreateAsync();
-
-        if (_foundryManager == null)
-        {
-            Logger.LogError("[FoundryLocal] Failed to create Foundry client");
-            return;
-        }
-
-        _serviceUrl ??= await _foundryManager.GetServiceUrl();
-        Logger.LogInfo($"[FoundryLocal] Service URL: {_serviceUrl}");
-
-        var cachedModels = await _foundryManager.ListCachedModels();
-        Logger.LogInfo($"[FoundryLocal] Found {cachedModels.Count} cached models");
-
+        var cachedModels = await _foundryClient.ListCachedModels();
        List<ModelDetails> downloadedModels = [];

        foreach (var model in cachedModels)
@@ -162,23 +109,47 @@ public sealed class FoundryLocalModelProvider : ILanguageModelProvider
            {
                Id = $"fl-{model.Name}",
                Name = model.Name,
-                Url = $"{UrlPrefix}{model.Name}",
+                Url = $"fl://{model.Name}",
                Description = $"{model.Name} running locally with Foundry Local",
                HardwareAccelerators = [HardwareAccelerator.FOUNDRYLOCAL],
-                SupportedOnQualcomm = true,
                ProviderModelDetails = model,
            });
        }

-        _downloadedModels = downloadedModels;
-        Logger.LogInfo($"[FoundryLocal] Initialization complete. Total downloaded models: {downloadedModels.Count}");
+        return downloadedModels;
+    }
+
+    private async Task InitializeAsync(CancellationToken cancelationToken = default)
+    {
+        if (_foundryClient != null && _catalogModels != null && _catalogModels.Any())
+        {
+            await _foundryClient.EnsureRunning().ConfigureAwait(false);
+            return;
+        }
+
+        Logger.LogInfo("[FoundryLocal] Initializing provider");
+        _foundryClient ??= await FoundryClient.CreateAsync();
+
+        if (_foundryClient == null)
+        {
+            const string message = "Foundry Local client could not be created. Please make sure Foundry Local is installed and running.";
+            Logger.LogError($"[FoundryLocal] {message}");
+            throw new InvalidOperationException(message);
+        }
+
+        _serviceUrl ??= await _foundryClient.GetServiceUrl();
+        Logger.LogInfo($"[FoundryLocal] Service URL: {_serviceUrl}");
+
+        var catalogModels = await _foundryClient.ListCatalogModels();
+        Logger.LogInfo($"[FoundryLocal] Found {catalogModels.Count} catalog models");
+        _catalogModels = catalogModels;
    }

    public async Task<bool> IsAvailable()
    {
        Logger.LogInfo("[FoundryLocal] Checking availability");
        await InitializeAsync();
-        var available = _foundryManager != null;
+        var available = _foundryClient != null;
        Logger.LogInfo($"[FoundryLocal] Available: {available}");
        return available;
    }
--- a/src/common/LanguageModelProvider/ILanguageModelProvider.cs
+++ b/src/common/LanguageModelProvider/ILanguageModelProvider.cs
@@ -10,13 +10,11 @@ public interface ILanguageModelProvider
 {
    string Name { get; }

-    string UrlPrefix { get; }
-
    string ProviderDescription { get; }

-    Task<IEnumerable<ModelDetails>> GetModelsAsync(bool ignoreCached = false, CancellationToken cancelationToken = default);
+    Task<IEnumerable<ModelDetails>> GetModelsAsync(CancellationToken cancelationToken = default);

-    IChatClient? GetIChatClient(string url);
+    IChatClient? GetIChatClient(string modelId);

    string GetIChatClientString(string url);
 }
--- a/src/common/LanguageModelProvider/LanguageModelService.cs
+++ b/src/common/LanguageModelProvider/LanguageModelService.cs
@@ -1,106 +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.Collections.Concurrent;
-using Microsoft.Extensions.AI;
-
-namespace LanguageModelProvider;
-
-public sealed class LanguageModelService
-{
-    private readonly ConcurrentDictionary<string, ILanguageModelProvider> _providersByPrefix;
-
-    public LanguageModelService(IEnumerable<ILanguageModelProvider> providers)
-    {
-        ArgumentNullException.ThrowIfNull(providers);
-
-        _providersByPrefix = new ConcurrentDictionary<string, ILanguageModelProvider>(StringComparer.OrdinalIgnoreCase);
-
-        foreach (var provider in providers)
-        {
-            if (!string.IsNullOrWhiteSpace(provider.UrlPrefix))
-            {
-                _providersByPrefix[provider.UrlPrefix] = provider;
-            }
-        }
-    }
-
-    public static LanguageModelService CreateDefault()
-    {
-        return new LanguageModelService(new[]
-        {
-            FoundryLocalModelProvider.Instance,
-        });
-    }
-
-    public IReadOnlyCollection<ILanguageModelProvider> Providers => _providersByPrefix.Values.ToArray();
-
-    public bool RegisterProvider(ILanguageModelProvider provider)
-    {
-        ArgumentNullException.ThrowIfNull(provider);
-
-        if (string.IsNullOrWhiteSpace(provider.UrlPrefix))
-        {
-            throw new ArgumentException("Provider must supply a URL prefix.", nameof(provider));
-        }
-
-        _providersByPrefix[provider.UrlPrefix] = provider;
-        return true;
-    }
-
-    public ILanguageModelProvider? GetProviderFor(string? modelReference)
-    {
-        if (string.IsNullOrWhiteSpace(modelReference))
-        {
-            return null;
-        }
-
-        foreach (var provider in _providersByPrefix.Values)
-        {
-            if (modelReference.StartsWith(provider.UrlPrefix, StringComparison.OrdinalIgnoreCase))
-            {
-                return provider;
-            }
-        }
-
-        return null;
-    }
-
-    public async Task<IReadOnlyList<ModelDetails>> GetModelsAsync(bool refresh = false, CancellationToken cancellationToken = default)
-    {
-        List<ModelDetails> models = [];
-
-        foreach (var provider in _providersByPrefix.Values)
-        {
-            cancellationToken.ThrowIfCancellationRequested();
-            var providerModels = await provider.GetModelsAsync(refresh, cancellationToken).ConfigureAwait(false);
-            models.AddRange(providerModels);
-        }
-
-        return models;
-    }
-
-    public IChatClient? GetClient(ModelDetails model)
-    {
-        if (model is null)
-        {
-            return null;
-        }
-
-        var reference = !string.IsNullOrWhiteSpace(model.Url) ? model.Url : model.Id;
-        return GetClient(reference);
-    }
-
-    public IChatClient? GetClient(string? modelReference)
-    {
-        if (string.IsNullOrWhiteSpace(modelReference))
-        {
-            return null;
-        }
-
-        var provider = GetProviderFor(modelReference);
-
-        return provider?.GetIChatClient(modelReference);
-    }
-}
--- a/src/common/LanguageModelProvider/ModelDetails.cs
+++ b/src/common/LanguageModelProvider/ModelDetails.cs
@@ -24,8 +24,6 @@ public class ModelDetails

    public List<HardwareAccelerator> HardwareAccelerators { get; set; } = [];

-    public bool SupportedOnQualcomm { get; set; }
-
    public string License { get; set; } = string.Empty;

    public object? ProviderModelDetails { get; set; }
--- a/src/modules/AdvancedPaste/AdvancedPaste.UnitTests/Mocks/IntegrationTestUserSettings.cs
+++ b/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;
--- a/src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/Controls/PromptBox.xaml
+++ b/src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/Controls/PromptBox.xaml
@@ -558,7 +558,7 @@
                                <TextBlock
                                    x:Uid="AIProvidersFlyoutHeader"
                                    Grid.Row="0"
-                                    Style="{StaticResource BodyStrongTextBlockStyle}" />
+                                    Foreground="{ThemeResource TextFillColorSecondaryBrush}" />
                                <ListView
                                    x:Name="AIProviderListView"
                                    Grid.Row="1"
@@ -611,10 +611,10 @@
                                                    CornerRadius="{StaticResource ControlCornerRadius}"
                                                    Visibility="{x:Bind IsLocalModel, Mode=OneWay}">
                                                    <TextBlock
+                                                        x:Uid="LocalModelBadge"
                                                        AutomationProperties.AccessibilityView="Raw"
                                                        FontSize="10"
-                                                        Foreground="{ThemeResource TextFillColorSecondaryBrush}"
-                                                        Text="Local" />
+                                                        Foreground="{ThemeResource TextFillColorSecondaryBrush}" />
                                                </Border>
                                                <!--<Border
                                                    Grid.Column="2"
--- a/src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/Pages/MainPage.xaml
+++ b/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>
@@ -263,16 +264,17 @@
                    <Button
                        Padding="0"
                        VerticalAlignment="Center"
-                        Style="{StaticResource SubtleButtonStyle}">
+                        Style="{StaticResource SubtleButtonStyle}"
+                        Visibility="{x:Bind ViewModel.HasLegalLinks, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}">
                        <FontIcon FontSize="12" Glyph="&#xE946;" />
                        <Button.Flyout>
                            <Flyout>
                                <StackPanel Spacing="8">
                                    <TextBlock TextWrapping="Wrap">
                                        <Run x:Uid="AIMistakeNote" /><LineBreak /><Run
+                                            x:Uid="CustomEndpointWarning"
                                            FontSize="12"
-                                            Foreground="{ThemeResource TextFillColorSecondaryBrush}"
-                                            Text="You are using a custom endpoint. Verify all answers." />
+                                            Foreground="{ThemeResource TextFillColorSecondaryBrush}" />
                                    </TextBlock>
                                    <StackPanel Orientation="Horizontal" Spacing="8">
                                        <HyperlinkButton
@@ -297,47 +299,49 @@
                </StackPanel>
            </controls:PromptBox.Footer>
        </controls:PromptBox>
-        <Grid Grid.Row="2" RowSpacing="4">
-            <Grid.RowDefinitions>
-                <RowDefinition Height="{x:Bind ViewModel.StandardPasteFormats.Count, Mode=OneWay, Converter={StaticResource standardPasteFormatsToHeightConverter}}" />
-                <RowDefinition Height="Auto" />
-                <RowDefinition Height="*" MinHeight="{x:Bind ViewModel.CustomActionPasteFormats.Count, Mode=OneWay, Converter={StaticResource customActionsToMinHeightConverter}}" />
-                <RowDefinition Height="Auto" />
-                <RowDefinition Height="Auto" />
-            </Grid.RowDefinitions>
-            <ListView
-                x:Name="PasteOptionsListView"
-                Grid.Row="0"
-                VerticalAlignment="Bottom"
-                IsItemClickEnabled="True"
-                ItemClick="PasteFormat_ItemClick"
-                ItemContainerTransitions="{x:Null}"
-                ItemTemplateSelector="{StaticResource PasteFormatTemplateSelector}"
-                ItemsSource="{x:Bind ViewModel.StandardPasteFormats, Mode=OneWay}"
-                ScrollViewer.VerticalScrollBarVisibility="Visible"
-                ScrollViewer.VerticalScrollMode="Auto"
-                SelectionMode="None"
-                TabIndex="1" />
-            <Rectangle
-                Grid.Row="1"
-                Height="1"
-                HorizontalAlignment="Stretch"
-                Fill="{ThemeResource DividerStrokeColorDefaultBrush}"
-                Visibility="{x:Bind ViewModel.CustomActionPasteFormats.Count, Mode=OneWay, Converter={StaticResource countToVisibilityConverter}}" />
+        <ScrollViewer Grid.Row="2">
+            <Grid RowSpacing="4">
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="{x:Bind ViewModel.StandardPasteFormats.Count, Mode=OneWay, Converter={StaticResource standardPasteFormatsToHeightConverter}}" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="*" MinHeight="{x:Bind ViewModel.CustomActionPasteFormats.Count, Mode=OneWay, Converter={StaticResource customActionsToMinHeightConverter}}" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                </Grid.RowDefinitions>
+                <ListView
+                    x:Name="PasteOptionsListView"
+                    Grid.Row="0"
+                    VerticalAlignment="Bottom"
+                    IsItemClickEnabled="True"
+                    ItemClick="PasteFormat_ItemClick"
+                    ItemContainerTransitions="{x:Null}"
+                    ItemTemplateSelector="{StaticResource PasteFormatTemplateSelector}"
+                    ItemsSource="{x:Bind ViewModel.StandardPasteFormats, Mode=OneWay}"
+                    ScrollViewer.VerticalScrollBarVisibility="Disabled"
+                    ScrollViewer.VerticalScrollMode="Disabled"
+                    SelectionMode="None"
+                    TabIndex="1" />
+                <Rectangle
+                    Grid.Row="1"
+                    Height="1"
+                    HorizontalAlignment="Stretch"
+                    Fill="{ThemeResource DividerStrokeColorDefaultBrush}"
+                    Visibility="{x:Bind ViewModel.CustomActionPasteFormats.Count, Mode=OneWay, Converter={StaticResource countToVisibilityConverter}}" />

-            <ListView
-                x:Name="CustomActionsListView"
-                Grid.Row="2"
-                VerticalAlignment="Top"
-                IsItemClickEnabled="True"
-                ItemClick="PasteFormat_ItemClick"
-                ItemContainerTransitions="{x:Null}"
-                ItemTemplateSelector="{StaticResource PasteFormatTemplateSelector}"
-                ItemsSource="{x:Bind ViewModel.CustomActionPasteFormats, Mode=OneWay}"
-                ScrollViewer.VerticalScrollBarVisibility="Visible"
-                ScrollViewer.VerticalScrollMode="Auto"
-                SelectionMode="None"
-                TabIndex="2" />
-        </Grid>
+                <ListView
+                    x:Name="CustomActionsListView"
+                    Grid.Row="2"
+                    VerticalAlignment="Top"
+                    IsItemClickEnabled="True"
+                    ItemClick="PasteFormat_ItemClick"
+                    ItemContainerTransitions="{x:Null}"
+                    ItemTemplateSelector="{StaticResource PasteFormatTemplateSelector}"
+                    ItemsSource="{x:Bind ViewModel.CustomActionPasteFormats, Mode=OneWay}"
+                    ScrollViewer.VerticalScrollBarVisibility="Disabled"
+                    ScrollViewer.VerticalScrollMode="Disabled"
+                    SelectionMode="None"
+                    TabIndex="2" />
+            </Grid>
+        </ScrollViewer>
    </Grid>
 </Page>
--- a/src/modules/AdvancedPaste/AdvancedPaste/Helpers/AIServiceFormatEvent.cs
+++ b/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);
--- a/src/modules/AdvancedPaste/AdvancedPaste/Helpers/IUserSettings.cs
+++ b/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; }
--- a/src/modules/AdvancedPaste/AdvancedPaste/Helpers/UserSettings.cs
+++ b/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;
@@ -164,6 +168,15 @@ namespace AdvancedPaste.Settings
            }

            var properties = settings.Properties;
+            bool legacyAdvancedAIConsumed = properties.TryConsumeLegacyAdvancedAIEnabled(out var advancedFlag);
+            bool legacyAdvancedAIEnabled = legacyAdvancedAIConsumed && advancedFlag;
+            PasswordCredential legacyCredential = TryGetLegacyOpenAICredential();
+
+            if (legacyCredential is null)
+            {
+                return legacyAdvancedAIConsumed;
+            }
+
            var configuration = properties.PasteAIConfiguration;

            if (configuration is null)
@@ -172,30 +185,11 @@ namespace AdvancedPaste.Settings
                properties.PasteAIConfiguration = configuration;
            }

-            bool hasLegacyProviders = configuration.LegacyProviderConfigurations is { Count: > 0 };
-            bool legacyAdvancedAIConsumed = properties.TryConsumeLegacyAdvancedAIEnabled(out var advancedFlag);
-            bool legacyAdvancedAIEnabled = legacyAdvancedAIConsumed && advancedFlag;
-            PasswordCredential legacyCredential = TryGetLegacyOpenAICredential();
-
-            if (!hasLegacyProviders && legacyCredential is null && !legacyAdvancedAIConsumed)
-            {
-                return false;
-            }
-
            bool configurationUpdated = false;

-            if (hasLegacyProviders)
-            {
-                configurationUpdated |= AdvancedPasteMigrationHelper.MigrateLegacyProviderConfigurations(configuration);
-            }
-
-            PasteAIProviderDefinition openAIProvider = null;
-            if (legacyCredential is not null || hasLegacyProviders || legacyAdvancedAIConsumed)
-            {
-                var ensureResult = AdvancedPasteMigrationHelper.EnsureOpenAIProvider(configuration);
-                openAIProvider = ensureResult.Provider;
-                configurationUpdated |= ensureResult.Updated;
-            }
+            var ensureResult = AdvancedPasteMigrationHelper.EnsureOpenAIProvider(configuration);
+            PasteAIProviderDefinition openAIProvider = ensureResult.Provider;
+            configurationUpdated |= ensureResult.Updated;

            if (legacyAdvancedAIConsumed && openAIProvider is not null && openAIProvider.EnableAdvancedAI != legacyAdvancedAIEnabled)
            {
@@ -203,16 +197,17 @@ namespace AdvancedPaste.Settings
                configurationUpdated = true;
            }

-            if (legacyCredential is not null && openAIProvider is not null)
+            if (openAIProvider is not null)
            {
                StoreMigratedOpenAICredential(openAIProvider.Id, openAIProvider.ServiceType, legacyCredential.Password);
                RemoveLegacyOpenAICredential();
            }

+            const bool shouldEnableAI = true;
            bool enabledUpdated = false;
-            if (!properties.IsAIEnabled && legacyCredential is not null)
+            if (properties.IsAIEnabled != shouldEnableAI)
            {
-                properties.IsAIEnabled = true;
+                properties.IsAIEnabled = shouldEnableAI;
                enabledUpdated = true;
            }

--- a/src/modules/AdvancedPaste/AdvancedPaste/Services/CustomActions/CustomActionTransformService.cs
+++ b/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),
--- a/src/modules/AdvancedPaste/AdvancedPaste/Services/CustomActions/FoundryLocalPasteProvider.cs
+++ b/src/modules/AdvancedPaste/AdvancedPaste/Services/CustomActions/FoundryLocalPasteProvider.cs
@@ -7,6 +7,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using AdvancedPaste.Helpers;
 using AdvancedPaste.Models;
 using LanguageModelProvider;
 using Microsoft.Extensions.AI;
@@ -23,7 +24,7 @@ public sealed class FoundryLocalPasteProvider : IPasteAIProvider

    public static PasteAIProviderRegistration Registration { get; } = new(SupportedTypes, config => new FoundryLocalPasteProvider(config));

-    private static readonly LanguageModelService LanguageModels = LanguageModelService.CreateDefault();
+    private static readonly FoundryLocalModelProvider _modelProvider = FoundryLocalModelProvider.Instance;

    private readonly PasteAIConfig _config;

@@ -33,10 +34,6 @@ public sealed class FoundryLocalPasteProvider : IPasteAIProvider
        _config = config;
    }

-    public string ProviderName => AIServiceType.FoundryLocal.ToNormalizedKey();
-
-    public string DisplayName => string.IsNullOrWhiteSpace(_config?.Model) ? "Foundry Local" : _config.Model;
-
    public async Task<bool> IsAvailableAsync(CancellationToken cancellationToken)
    {
        cancellationToken.ThrowIfCancellationRequested();
@@ -72,21 +69,25 @@ public sealed class FoundryLocalPasteProvider : IPasteAIProvider
                throw new PasteActionException(
                    "No Foundry Local model selected",
                    new InvalidOperationException("Model identifier is required"),
-                    aiServiceMessage: "Please select a model in the AI provider settings. Model identifier should be in the format 'fl://model-name'.");
+                    aiServiceMessage: "Please select a model in the AI provider settings.");
            }

            cancellationToken.ThrowIfCancellationRequested();
-            var chatClient = LanguageModels.GetClient(modelReference);
-            if (chatClient is null)
-            {
-                throw new PasteActionException(
-                    $"Unable to load Foundry Local model: {modelReference}",
-                    new InvalidOperationException("Chat client resolution failed"),
-                    aiServiceMessage: "The model may not be downloaded or the Foundry Local service may not be running. Please check the model status in settings.");
-            }

-            // Extract actual model ID from the URL (format: fl://modelId)
-            var actualModelId = modelReference.Replace("fl://", string.Empty).Trim('/');
+            IChatClient chatClient;
+            try
+            {
+                chatClient = _modelProvider.GetIChatClient(modelReference);
+            }
+            catch (InvalidOperationException ex)
+            {
+                // GetIChatClient throws InvalidOperationException for user-facing errors
+                var errorMessage = string.Format(System.Globalization.CultureInfo.CurrentCulture, ResourceLoaderInstance.ResourceLoader.GetString("FoundryLocal_UnableToLoadModel"), modelReference);
+                throw new PasteActionException(
+                    errorMessage,
+                    ex,
+                    aiServiceMessage: ex.Message);
+            }

            var userMessageContent = $"""
                User instructions:
@@ -104,7 +105,7 @@ public sealed class FoundryLocalPasteProvider : IPasteAIProvider
                new(ChatRole.User, userMessageContent),
            };

-            var chatOptions = CreateChatOptions(_config?.SystemPrompt, actualModelId);
+            var chatOptions = CreateChatOptions(_config?.SystemPrompt, modelReference);

            progress?.Report(0.1);

--- a/src/modules/AdvancedPaste/AdvancedPaste/Services/KernelServiceBase.cs
+++ b/src/modules/AdvancedPaste/AdvancedPaste/Services/KernelServiceBase.cs
@@ -29,6 +29,7 @@ public abstract class KernelServiceBase(
    ICustomActionTransformService customActionTransformService) : IKernelService
 {
    private const string PromptParameterName = "prompt";
+    private const string DefaultSystemPrompt = "You are an agent who is tasked with helping users paste their clipboard data. You have functions available to help you with this task. Call function when necessary to help user finish the transformation task. You never need to ask permission, always try to do as the user asks. The user will only input one message and will not be available for further questions, so try your best. The user will put in a request to format their clipboard data and you will fulfill it. Do not output anything else besides the reformatted clipboard content.";

    private readonly IKernelQueryCacheService _queryCacheService = queryCacheService;
    private readonly IPromptModerationService _promptModerationService = promptModerationService;
@@ -144,7 +145,8 @@ public abstract class KernelServiceBase(

        ChatHistory chatHistory = [];

-        chatHistory.AddSystemMessage(runtimeConfig.SystemPrompt);
+        var systemPrompt = string.IsNullOrWhiteSpace(runtimeConfig.SystemPrompt) ? DefaultSystemPrompt : runtimeConfig.SystemPrompt;
+        chatHistory.AddSystemMessage(systemPrompt);
        chatHistory.AddSystemMessage($"Available clipboard formats: {await kernel.GetDataFormatsAsync()}");
        chatHistory.AddUserMessage(prompt);

@@ -186,12 +188,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);
--- a/src/modules/AdvancedPaste/AdvancedPaste/Strings/en-us/Resources.resw
+++ b/src/modules/AdvancedPaste/AdvancedPaste/Strings/en-us/Resources.resw
@@ -160,10 +160,10 @@
    <value>Active provider: {0}</value>
  </data>
  <data name="AIProvidersFlyoutHeader.Text" xml:space="preserve">
-    <value>AI providers</value>
+    <value>Configured models</value>
  </data>
  <data name="AIProvidersEmptyText.Text" xml:space="preserve">
-    <value>No AI providers configured</value>
+    <value>No models configured</value>
  </data>
  <data name="AIProvidersManageButtonContent.Content" xml:space="preserve">
    <value>Configure models in Settings</value>
@@ -359,6 +359,17 @@
  </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.Text" xml:space="preserve">
+    <value>Local</value>
+    <comment>Badge label displayed next to local AI model providers (e.g., Ollama, Foundry Local) to indicate the model runs locally</comment>
+  </data>
+  <data name="FoundryLocal_UnableToLoadModel" xml:space="preserve">
+    <value>Unable to load Foundry Local model: {0}</value>
+    <comment>{0} is the model identifier. Do not translate {0}.</comment>
  </data>
 </root>
--- a/src/modules/AdvancedPaste/AdvancedPaste/Telemetry/AdvancedPasteCustomActionErrorEvent.cs
+++ b/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;
+}
--- a/src/modules/AdvancedPaste/AdvancedPaste/Telemetry/AdvancedPasteEndpointUsageEvent.cs
+++ b/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;
--- a/src/modules/AdvancedPaste/AdvancedPaste/Telemetry/AdvancedPasteSemanticKernelFormatEvent.cs
+++ b/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
--- a/src/modules/AdvancedPaste/AdvancedPaste/ViewModels/OptionsViewModel.cs
+++ b/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]
@@ -76,6 +77,7 @@ namespace AdvancedPaste.ViewModels
        [NotifyPropertyChangedFor(nameof(PrivacyLinkUri))]
        [NotifyPropertyChangedFor(nameof(HasTermsLink))]
        [NotifyPropertyChangedFor(nameof(HasPrivacyLink))]
+        [NotifyPropertyChangedFor(nameof(HasLegalLinks))]
        private bool _isAllowedByGPO;

        [ObservableProperty]
@@ -221,10 +223,16 @@ namespace AdvancedPaste.ViewModels

        public bool HasPrivacyLink => GetActiveProviderMetadata().HasPrivacyLink;

+        public bool HasLegalLinks => HasTermsLink || HasPrivacyLink;
+
        public bool ClipboardHasData => AvailableClipboardFormats != ClipboardFormat.None;

        public bool ClipboardHasDataForCustomAI => PasteFormat.SupportsClipboardFormats(CustomAIFormat, AvailableClipboardFormats);

+        public bool ShowClipboardPreview => _userSettings.EnableClipboardPreview;
+
+        public bool ShowClipboardHistoryButton => ClipboardHistoryEnabled;
+
        public bool HasIndeterminateTransformProgress => double.IsNaN(TransformProgress);

        private PasteFormats CustomAIFormat =>
@@ -310,6 +318,7 @@ namespace AdvancedPaste.ViewModels
            OnPropertyChanged(nameof(IsAdvancedAIEnabled));
            OnPropertyChanged(nameof(AIProviders));
            OnPropertyChanged(nameof(AllowedAIProviders));
+            OnPropertyChanged(nameof(ShowClipboardPreview));

            NotifyActiveProviderChanged();

@@ -361,6 +370,7 @@ namespace AdvancedPaste.ViewModels
            OnPropertyChanged(nameof(PrivacyLinkUri));
            OnPropertyChanged(nameof(HasTermsLink));
            OnPropertyChanged(nameof(HasPrivacyLink));
+            OnPropertyChanged(nameof(HasLegalLinks));
        }

        private void RefreshPasteFormats()
--- a/src/modules/LightSwitch/LightSwitchService/LightSwitchService.cpp
+++ b/src/modules/LightSwitch/LightSwitchService/LightSwitchService.cpp
@@ -271,7 +271,6 @@ DWORD WINAPI ServiceWorkerThread(LPVOID lpParam)

        if (wait == WAIT_OBJECT_0 + (hParent ? (hManualOverride ? 3 : 2) : 2))
        {
-            Logger::info(L"[LightSwitchService] Settings file changed event detected.");
            ResetEvent(hSettingsChanged);
            LightSwitchSettings::instance().LoadSettings();
            stateManager.OnSettingsChanged();
--- a/src/modules/LightSwitch/LightSwitchService/LightSwitchStateManager.cpp
+++ b/src/modules/LightSwitch/LightSwitchService/LightSwitchStateManager.cpp
@@ -17,12 +17,10 @@ LightSwitchStateManager::LightSwitchStateManager()
 void LightSwitchStateManager::OnSettingsChanged()
 {
    std::lock_guard<std::mutex> lock(_stateMutex);
-    Logger::info(L"[LightSwitchStateManager] Settings changed event received");

    // If manual override was active, clear it so new settings take effect
    if (_state.isManualOverride)
    {
-        Logger::info(L"[LightSwitchStateManager] Clearing manual override due to settings update.");
        _state.isManualOverride = false;
    }

@@ -33,7 +31,6 @@ void LightSwitchStateManager::OnSettingsChanged()
 void LightSwitchStateManager::OnTick(int currentMinutes)
 {
    std::lock_guard<std::mutex> lock(_stateMutex);
-    Logger::debug(L"[LightSwitchStateManager] Tick received: {}", currentMinutes);
    EvaluateAndApplyIfNeeded();
 }

@@ -51,7 +48,7 @@ void LightSwitchStateManager::OnManualOverride()

        _state.isAppsLightActive = GetCurrentAppsTheme();

-        Logger::info(L"[LightSwitchStateManager] Synced internal theme state to current system theme ({}) and apps theme ({}).",
+        Logger::debug(L"[LightSwitchStateManager] Synced internal theme state to current system theme ({}) and apps theme ({}).",
                     (_state.isSystemLightActive ? L"light" : L"dark"),
                     (_state.isAppsLightActive ? L"light" : L"dark"));
    }
@@ -79,9 +76,9 @@ void LightSwitchStateManager::SyncInitialThemeState()
    std::lock_guard<std::mutex> lock(_stateMutex);
    _state.isSystemLightActive = GetCurrentSystemTheme();
    _state.isAppsLightActive = GetCurrentAppsTheme();
-    Logger::info(L"[LightSwitchStateManager] Synced initial state to current system theme ({})",
+    Logger::debug(L"[LightSwitchStateManager] Synced initial state to current system theme ({})",
                 _state.isSystemLightActive ? L"light" : L"dark");
-    Logger::info(L"[LightSwitchStateManager] Synced initial state to current apps theme ({})",
+    Logger::debug(L"[LightSwitchStateManager] Synced initial state to current apps theme ({})",
                 _state.isAppsLightActive ? L"light" : L"dark");
 }

@@ -127,7 +124,6 @@ void LightSwitchStateManager::EvaluateAndApplyIfNeeded()
    // Early exit: OFF mode just pauses activity
    if (_currentSettings.scheduleMode == ScheduleMode::Off)
    {
-        Logger::debug(L"[LightSwitchStateManager] Mode is OFF — pausing service logic.");
        _state.lastTickMinutes = now;
        return;
    }
@@ -145,7 +141,6 @@ void LightSwitchStateManager::EvaluateAndApplyIfNeeded()

        if (newDay || modeChangedToSun)
        {
-            Logger::info(L"[LightSwitchStateManager] Recalculating sun times (mode/day change).");
            auto [newLightTime, newDarkTime] = update_sun_times(_currentSettings);
            _state.lastEvaluatedDay = st.wDay;
            _state.effectiveLightMinutes = newLightTime + _currentSettings.sunrise_offset;
@@ -188,12 +183,10 @@ void LightSwitchStateManager::EvaluateAndApplyIfNeeded()

        if (crossedBoundary)
        {
-            Logger::info(L"[LightSwitchStateManager] Manual override cleared after crossing boundary.");
            _state.isManualOverride = false;
        }
        else
        {
-            Logger::debug(L"[LightSwitchStateManager] Manual override active — skipping auto apply.");
            _state.lastTickMinutes = now;
            return;
        }
@@ -206,7 +199,7 @@ void LightSwitchStateManager::EvaluateAndApplyIfNeeded()
    bool appsNeedsToChange = _currentSettings.changeApps && (_state.isAppsLightActive != shouldBeLight);
    bool systemNeedsToChange = _currentSettings.changeSystem && (_state.isSystemLightActive != shouldBeLight);

-    Logger::debug(
+    /* Logger::debug(
        L"[LightSwitchStateManager] now = {:02d}:{:02d}, light boundary = {:02d}:{:02d} ({}), dark boundary = {:02d}:{:02d} ({})",
        now / 60,
        now % 60,
@@ -215,12 +208,12 @@ void LightSwitchStateManager::EvaluateAndApplyIfNeeded()
        _state.effectiveLightMinutes,
        _state.effectiveDarkMinutes / 60,
        _state.effectiveDarkMinutes % 60,
-        _state.effectiveDarkMinutes);
+        _state.effectiveDarkMinutes); */

-    Logger::debug("should be light = {}, apps needs change = {}, system needs change = {}",
+    /* Logger::debug("should be light = {}, apps needs change = {}, system needs change = {}",
                  shouldBeLight ? "true" : "false",
                  appsNeedsToChange ? "true" : "false",
-                  systemNeedsToChange ? "true" : "false");
+                  systemNeedsToChange ? "true" : "false"); */

    // Only apply theme if there's a change or no override active
    if (!_state.isManualOverride && (appsNeedsToChange || systemNeedsToChange))
@@ -230,10 +223,6 @@ void LightSwitchStateManager::EvaluateAndApplyIfNeeded()

        _state.isSystemLightActive = GetCurrentSystemTheme();
        _state.isAppsLightActive = GetCurrentAppsTheme();
-
-        Logger::debug(L"[LightSwitchStateManager] Synced post-apply theme state — System: {}, Apps: {}",
-                      _state.isSystemLightActive ? L"light" : L"dark",
-                      _state.isAppsLightActive ? L"light" : L"dark");
    }

    _state.lastTickMinutes = now;
--- a/src/modules/ZoomIt/ZoomIt/ZoomIt.h
+++ b/src/modules/ZoomIt/ZoomIt/ZoomIt.h
@@ -39,6 +39,10 @@ type_pEnableThemeDialogTexture    pEnableThemeDialogTexture;
 #define WIN7_VERSION		0x106
 #define WIN10_VERSION		0x206

+// Default recording format frame rates
+#define RECORDING_FORMAT_GIF_DEFAULT_FRAMERATE 15
+#define RECORDING_FORMAT_MP4_DEFAULT_FRAMERATE 30
+
 // Time that we'll cache live zoom window to avoid flicker
 // of live zooming on Vista/ws2k8
 #define LIVEZOOM_WINDOW_TIMEOUT	2*3600*1000
--- a/src/modules/ZoomIt/ZoomIt/ZoomIt.rc
+++ b/src/modules/ZoomIt/ZoomIt/ZoomIt.rc
@@ -121,7 +121,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
    DEFPUSHBUTTON   "OK",IDOK,166,306,50,14
    PUSHBUTTON      "Cancel",IDCANCEL,223,306,50,14
-    LTEXT           "ZoomIt v9.20",IDC_VERSION,42,7,73,10
+    LTEXT           "ZoomIt v9.21",IDC_VERSION,42,7,73,10
    LTEXT           "Copyright © 2006-2025 Mark Russinovich",IDC_COPYRIGHT,42,17,231,8
    CONTROL         "<a HREF=""https://www.sysinternals.com"">Sysinternals - www.sysinternals.com</a>",IDC_LINK,
                    "SysLink",WS_TABSTOP,42,26,150,9
--- a/src/modules/ZoomIt/ZoomIt/ZoomItSettings.h
+++ b/src/modules/ZoomIt/ZoomIt/ZoomItSettings.h
@@ -44,11 +44,11 @@ LOGFONT	g_LogFont;
 BOOLEAN g_DemoTypeUserDriven = false;
 TCHAR   g_DemoTypeFile[MAX_PATH] = {0};
 DWORD	g_DemoTypeSpeedSlider = static_cast<int>(((MIN_TYPING_SPEED - MAX_TYPING_SPEED) / 2) + MAX_TYPING_SPEED);
-DWORD	g_RecordFrameRate = 30;
+DWORD   g_RecordFrameRate = 30; // We default to 30 here, but g_RecordFrameRate can be different depending on recording format and gets set accordingly
 DWORD	g_RecordScaling = 100;
 DWORD	g_RecordScalingGIF = 50;
 DWORD	g_RecordScalingMP4 = 100;
-RecordingFormat g_RecordingFormat = RecordingFormat::GIF;
+RecordingFormat g_RecordingFormat = RecordingFormat::MP4;
 BOOLEAN g_CaptureAudio = FALSE;
 TCHAR	g_MicrophoneDeviceId[MAX_PATH] = {0};

@@ -87,8 +87,7 @@ REG_SETTING RegSettings[] = {
    { L"SnapToGrid", SETTING_TYPE_BOOLEAN, 0, &g_SnapToGrid, static_cast<DOUBLE>(g_SnapToGrid) },
    { L"ZoominSliderLevel", SETTING_TYPE_DWORD, 0, &g_SliderZoomLevel, static_cast<DOUBLE>(g_SliderZoomLevel) },
    { L"Font", SETTING_TYPE_BINARY, sizeof g_LogFont, &g_LogFont, static_cast<DOUBLE>(0) },
-    { L"RecordFrameRate", SETTING_TYPE_DWORD, 0, &g_RecordFrameRate, static_cast<DOUBLE>(g_RecordFrameRate) },
-    { L"RecordingFormat", SETTING_TYPE_DWORD, 0, &g_RecordingFormat, static_cast<DOUBLE>(0) },
+    { L"RecordingFormat", SETTING_TYPE_DWORD, 0, &g_RecordingFormat, static_cast<DOUBLE>(g_RecordingFormat) },
    { L"RecordScalingGIF", SETTING_TYPE_DWORD, 0, &g_RecordScalingGIF, static_cast<DOUBLE>(g_RecordScalingGIF) },
    { L"RecordScalingMP4", SETTING_TYPE_DWORD, 0, &g_RecordScalingMP4, static_cast<DOUBLE>(g_RecordScalingMP4) },
    { L"CaptureAudio", SETTING_TYPE_BOOLEAN, 0, &g_CaptureAudio, static_cast<DOUBLE>(g_CaptureAudio) },
--- a/src/modules/ZoomIt/ZoomIt/Zoomit.cpp
+++ b/src/modules/ZoomIt/ZoomIt/Zoomit.cpp
@@ -168,6 +168,7 @@ BOOL	g_RecordToggle = FALSE;
 BOOL	g_RecordCropping = FALSE;
 SelectRectangle g_SelectRectangle;
 std::wstring	g_RecordingSaveLocation;
+std::wstring	g_RecordingSaveLocationGIF;
 winrt::IDirect3DDevice	g_RecordDevice{ nullptr };
 std::shared_ptr<VideoRecordingSession> g_RecordingSession = nullptr;
 std::shared_ptr<GifRecordingSession> g_GifRecordingSession = nullptr;
@@ -2173,7 +2174,10 @@ INT_PTR CALLBACK OptionsProc( HWND hDlg, UINT message,
        CheckDlgButton( g_OptionsTabs[RECORD_PAGE].hPage, IDC_CAPTURE_AUDIO,
            g_CaptureAudio ? BST_CHECKED: BST_UNCHECKED );

-        for (int i = 0; i < _countof(g_FramerateOptions); i++) {
+        //
+        // The framerate drop down list is not used in the current version (might be added in the future)
+        //
+        /*for (int i = 0; i < _countof(g_FramerateOptions); i++) {

            _stprintf(text, L"%d", g_FramerateOptions[i]);
            SendMessage(GetDlgItem(g_OptionsTabs[RECORD_PAGE].hPage, IDC_RECORD_FRAME_RATE), static_cast<UINT>(CB_ADDSTRING),
@@ -2182,7 +2186,7 @@ INT_PTR CALLBACK OptionsProc( HWND hDlg, UINT message,

                SendMessage(GetDlgItem(g_OptionsTabs[RECORD_PAGE].hPage, IDC_RECORD_FRAME_RATE), CB_SETCURSEL, static_cast<WPARAM>(i), static_cast<LPARAM>(0));
            }
-        }
+        }*/

        // Add the recording format to the combo box and set the current selection
        size_t selection = 0;
@@ -2345,17 +2349,8 @@ INT_PTR CALLBACK OptionsProc( HWND hDlg, UINT message,
            text[2] = 0;
            newTimeout = _tstoi( text );

-            if( g_RecordingFormat == RecordingFormat::GIF )
-            {
-                // Hardcode lower frame rate for GIFs
-                g_RecordFrameRate = 15;
-            }
-            else
-            {
-                g_RecordFrameRate = g_FramerateOptions[SendMessage(GetDlgItem(g_OptionsTabs[RECORD_PAGE].hPage, IDC_RECORD_FRAME_RATE), static_cast<UINT>(CB_GETCURSEL), static_cast<WPARAM>(0), static_cast<LPARAM>(0))];
-            }
-
            g_RecordingFormat = static_cast<RecordingFormat>(SendMessage(GetDlgItem(g_OptionsTabs[RECORD_PAGE].hPage, IDC_RECORD_FORMAT), static_cast<UINT>(CB_GETCURSEL), static_cast<WPARAM>(0), static_cast<LPARAM>(0)));
+            g_RecordFrameRate = (g_RecordingFormat == RecordingFormat::GIF) ? RECORDING_FORMAT_GIF_DEFAULT_FRAMERATE : RECORDING_FORMAT_MP4_DEFAULT_FRAMERATE;
            g_RecordScaling = static_cast<int>(SendMessage(GetDlgItem(g_OptionsTabs[RECORD_PAGE].hPage, IDC_RECORD_SCALING), static_cast<UINT>(CB_GETCURSEL), static_cast<WPARAM>(0), static_cast<LPARAM>(0)) * 10 + 10);

            // Get the selected microphone
@@ -3536,7 +3531,16 @@ void StopRecording()
 //----------------------------------------------------------------------------
 auto GetUniqueRecordingFilename()
 {
-    std::filesystem::path path{ g_RecordingSaveLocation };
+    std::filesystem::path path;
+
+    if (g_RecordingFormat == RecordingFormat::GIF)
+    {
+        path = g_RecordingSaveLocationGIF;
+    }
+    else
+    {
+        path = g_RecordingSaveLocation;
+    }

    // Chop off index if it's there
    auto base = std::regex_replace( path.stem().wstring(), std::wregex( L" [(][0-9]+[)]$" ), L"" );
@@ -3591,6 +3595,7 @@ winrt::fire_and_forget StartRecordingAsync( HWND hWnd, LPRECT rcCrop, HWND hWndR
    auto stream = co_await file.OpenAsync( winrt::FileAccessMode::ReadWrite );

    // Create the appropriate recording session based on format
+    OutputDebugStringW((L"Starting recording session. Framerate:  " + std::to_wstring(g_RecordFrameRate) + L" scaling: " + std::to_wstring(g_RecordScaling) + L" Format: " + (g_RecordingFormat == RecordingFormat::GIF ? L"GIF" : L"MP4") + L"\n").c_str());
    if (g_RecordingFormat == RecordingFormat::GIF)
    {
        g_GifRecordingSession = GifRecordingSession::Create(
@@ -3657,18 +3662,44 @@ winrt::fire_and_forget StartRecordingAsync( HWND hWnd, LPRECT rcCrop, HWND hWndR
                saveDialog->SetFileTypes( _countof( fileTypes ), fileTypes );
            }

-            if( g_RecordingSaveLocation.size() == 0) {
+            // Peek the folder Windows has chosen to display
+            static std::filesystem::path lastSaveFolder;
+            wil::unique_cotaskmem_string chosenFolderPath;
+            wil::com_ptr<IShellItem> currentSelectedFolder;
+            bool bFolderChanged = false; 
+            if (SUCCEEDED(saveDialog->GetFolder(currentSelectedFolder.put())))
+            {
+                if (SUCCEEDED(currentSelectedFolder->GetDisplayName(SIGDN_FILESYSPATH, chosenFolderPath.put())))
+                {
+                    if (lastSaveFolder != chosenFolderPath.get())
+                    {
+                        lastSaveFolder = chosenFolderPath.get() ? chosenFolderPath.get() : std::filesystem::path{};
+                        bFolderChanged = true;
+                    }
+                }
+            }
+
+            if( (g_RecordingFormat == RecordingFormat::GIF && g_RecordingSaveLocationGIF.size() == 0) || (g_RecordingFormat == RecordingFormat::MP4 && g_RecordingSaveLocation.size() == 0) || (bFolderChanged)) {

                wil::com_ptr<IShellItem> shellItem;
                wil::unique_cotaskmem_string folderPath;
-                if (SUCCEEDED(saveDialog->GetFolder(shellItem.put())) && SUCCEEDED(shellItem->GetDisplayName(SIGDN_FILESYSPATH, folderPath.put())))
-                    g_RecordingSaveLocation = folderPath.get();
+                if (SUCCEEDED(saveDialog->GetFolder(shellItem.put())) && SUCCEEDED(shellItem->GetDisplayName(SIGDN_FILESYSPATH, folderPath.put()))) {
+                    if (g_RecordingFormat == RecordingFormat::GIF) {
+                        g_RecordingSaveLocationGIF = folderPath.get();
+                        std::filesystem::path currentPath{ g_RecordingSaveLocationGIF };
+                        g_RecordingSaveLocationGIF = currentPath / DEFAULT_GIF_RECORDING_FILE;
+                    }
+                    else {
+                        g_RecordingSaveLocation = folderPath.get();
+                        if (g_RecordingFormat == RecordingFormat::MP4) {
+                            std::filesystem::path currentPath{ g_RecordingSaveLocation };
+                            g_RecordingSaveLocation = currentPath / DEFAULT_RECORDING_FILE;
+                        }
+                    }
+                }
            }

            // Always use appropriate default filename based on current format
-            std::filesystem::path currentPath{ g_RecordingSaveLocation };
-            const wchar_t* defaultFile = (g_RecordingFormat == RecordingFormat::GIF) ? DEFAULT_GIF_RECORDING_FILE : DEFAULT_RECORDING_FILE;
-            g_RecordingSaveLocation = currentPath.parent_path() / defaultFile;
            auto suggestedName = GetUniqueRecordingFilename();
            saveDialog->SetFileName( suggestedName.c_str() );

@@ -3696,9 +3727,15 @@ winrt::fire_and_forget StartRecordingAsync( HWND hWnd, LPRECT rcCrop, HWND hWndR
        }
        else {

-            co_await file.MoveAndReplaceAsync( destFile );
-            g_RecordingSaveLocation = file.Path();
-            SaveToClipboard(g_RecordingSaveLocation.c_str(), hWnd);
+            co_await file.MoveAndReplaceAsync(destFile);
+            if (g_RecordingFormat == RecordingFormat::GIF) {
+                g_RecordingSaveLocationGIF = file.Path();
+                SaveToClipboard(g_RecordingSaveLocationGIF.c_str(), hWnd);
+            }
+            else {
+                g_RecordingSaveLocation = file.Path();
+                SaveToClipboard(g_RecordingSaveLocation.c_str(), hWnd);
+            }
        }
        g_bSaveInProgress = false;

@@ -4039,8 +4076,10 @@ LRESULT APIENTRY MainWndProc(
        // Set g_RecordScaling based on the current recording format
        if (g_RecordingFormat == RecordingFormat::GIF) {
            g_RecordScaling = g_RecordScalingGIF;
+            g_RecordFrameRate = RECORDING_FORMAT_GIF_DEFAULT_FRAMERATE;
        } else {
            g_RecordScaling = g_RecordScalingMP4;
+            g_RecordFrameRate = RECORDING_FORMAT_MP4_DEFAULT_FRAMERATE;
        }

        // to support migrating from
@@ -6332,6 +6371,17 @@ LRESULT APIENTRY MainWndProc(
    {
        // Reload the settings. This message is called from PowerToys after a setting is changed by the user.
        reg.ReadRegSettings(RegSettings);
+        
+        if (g_RecordingFormat == RecordingFormat::GIF)
+        {
+            g_RecordScaling = g_RecordScalingGIF;
+            g_RecordFrameRate = RECORDING_FORMAT_GIF_DEFAULT_FRAMERATE; 
+        }
+        else
+        {
+            g_RecordScaling = g_RecordScalingMP4;
+            g_RecordFrameRate = RECORDING_FORMAT_MP4_DEFAULT_FRAMERATE;
+        }

        // Apply tray icon setting
        EnableDisableTrayIcon(hWnd, g_ShowTrayIcon);
@@ -6440,12 +6490,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 +6508,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 +6568,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 +6578,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;
        }

--- a/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.Common/CoreLogger.cs
+++ b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.Common/CoreLogger.cs
@@ -1,62 +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;
-
-namespace Microsoft.CmdPal.Core.Common;
-
-public static class CoreLogger
-{
-    public static void InitializeLogger(ILogger implementation)
-    {
-        _logger = implementation;
-    }
-
-    private static ILogger? _logger;
-
-    public static void LogError(string message, Exception ex, [System.Runtime.CompilerServices.CallerMemberName] string memberName = "", [System.Runtime.CompilerServices.CallerFilePath] string sourceFilePath = "", [System.Runtime.CompilerServices.CallerLineNumber] int sourceLineNumber = 0)
-    {
-        _logger?.LogError(message, ex, memberName, sourceFilePath, sourceLineNumber);
-    }
-
-    public static void LogError(string message, [System.Runtime.CompilerServices.CallerMemberName] string memberName = "", [System.Runtime.CompilerServices.CallerFilePath] string sourceFilePath = "", [System.Runtime.CompilerServices.CallerLineNumber] int sourceLineNumber = 0)
-    {
-        _logger?.LogError(message, memberName, sourceFilePath, sourceLineNumber);
-    }
-
-    public static void LogWarning(string message, [System.Runtime.CompilerServices.CallerMemberName] string memberName = "", [System.Runtime.CompilerServices.CallerFilePath] string sourceFilePath = "", [System.Runtime.CompilerServices.CallerLineNumber] int sourceLineNumber = 0)
-    {
-        _logger?.LogWarning(message, memberName, sourceFilePath, sourceLineNumber);
-    }
-
-    public static void LogInfo(string message, [System.Runtime.CompilerServices.CallerMemberName] string memberName = "", [System.Runtime.CompilerServices.CallerFilePath] string sourceFilePath = "", [System.Runtime.CompilerServices.CallerLineNumber] int sourceLineNumber = 0)
-    {
-        _logger?.LogInfo(message, memberName, sourceFilePath, sourceLineNumber);
-    }
-
-    public static void LogDebug(string message, [System.Runtime.CompilerServices.CallerMemberName] string memberName = "", [System.Runtime.CompilerServices.CallerFilePath] string sourceFilePath = "", [System.Runtime.CompilerServices.CallerLineNumber] int sourceLineNumber = 0)
-    {
-        _logger?.LogDebug(message, memberName, sourceFilePath, sourceLineNumber);
-    }
-
-    public static void LogTrace([System.Runtime.CompilerServices.CallerMemberName] string memberName = "", [System.Runtime.CompilerServices.CallerFilePath] string sourceFilePath = "", [System.Runtime.CompilerServices.CallerLineNumber] int sourceLineNumber = 0)
-    {
-        _logger?.LogTrace(memberName, sourceFilePath, sourceLineNumber);
-    }
-}
-
-public interface ILogger
-{
-    void LogError(string message, [System.Runtime.CompilerServices.CallerMemberName] string memberName = "", [System.Runtime.CompilerServices.CallerFilePath] string sourceFilePath = "", [System.Runtime.CompilerServices.CallerLineNumber] int sourceLineNumber = 0);
-
-    void LogError(string message, Exception ex, [System.Runtime.CompilerServices.CallerMemberName] string memberName = "", [System.Runtime.CompilerServices.CallerFilePath] string sourceFilePath = "", [System.Runtime.CompilerServices.CallerLineNumber] int sourceLineNumber = 0);
-
-    void LogWarning(string message, [System.Runtime.CompilerServices.CallerMemberName] string memberName = "", [System.Runtime.CompilerServices.CallerFilePath] string sourceFilePath = "", [System.Runtime.CompilerServices.CallerLineNumber] int sourceLineNumber = 0);
-
-    void LogInfo(string message, [System.Runtime.CompilerServices.CallerMemberName] string memberName = "", [System.Runtime.CompilerServices.CallerFilePath] string sourceFilePath = "", [System.Runtime.CompilerServices.CallerLineNumber] int sourceLineNumber = 0);
-
-    void LogDebug(string message, [System.Runtime.CompilerServices.CallerMemberName] string memberName = "", [System.Runtime.CompilerServices.CallerFilePath] string sourceFilePath = "", [System.Runtime.CompilerServices.CallerLineNumber] int sourceLineNumber = 0);
-
-    void LogTrace([System.Runtime.CompilerServices.CallerMemberName] string memberName = "", [System.Runtime.CompilerServices.CallerFilePath] string sourceFilePath = "", [System.Runtime.CompilerServices.CallerLineNumber] int sourceLineNumber = 0);
-}
--- a/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.Common/Microsoft.CmdPal.Core.Common.csproj
+++ b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.Common/Microsoft.CmdPal.Core.Common.csproj
@@ -9,4 +9,8 @@
    <PackageReference Include="Microsoft.Extensions.Hosting" />
  </ItemGroup>

+  <ItemGroup>
+    <ProjectReference Include="..\..\..\..\common\ManagedTelemetry\Telemetry\ManagedTelemetry.csproj" />
+  </ItemGroup>
+
 </Project>
--- a/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.Common/Services/IExtensionService.cs
+++ b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.Common/Services/IExtensionService.cs
@@ -2,8 +2,6 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.

-using System.Collections.Generic;
-using System.Threading.Tasks;
 using Windows.Foundation;

 namespace Microsoft.CmdPal.Core.Common.Services;
@@ -26,12 +24,4 @@ public interface IExtensionService
    void EnableExtension(string extensionUniqueId);

    void DisableExtension(string extensionUniqueId);
-
-    ///// <summary>
-    ///// Gets a boolean indicating whether the extension was disabled due to the corresponding Windows optional feature
-    ///// being absent from the machine or in an unknown state.
-    ///// </summary>
-    ///// <param name="extension">The out of proc extension object</param>
-    ///// <returns>True only if the extension was disabled. False otherwise.</returns>
-    // public Task<bool> DisableExtensionIfWindowsFeatureNotAvailable(IExtensionWrapper extension);
 }
--- a/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.Common/Services/IRunHistoryService.cs
+++ b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.Common/Services/IRunHistoryService.cs
@@ -23,12 +23,3 @@ public interface IRunHistoryService
    /// <param name="item">The run history item to add.</param>
    void AddRunHistoryItem(string item);
 }
-
-public interface ITelemetryService
-{
-    void LogRunQuery(string query, int resultCount, ulong durationMs);
-
-    void LogRunCommand(string command, bool asAdmin, bool success);
-
-    void LogOpenUri(string uri, bool isWeb, bool success);
-}
--- a/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.Common/Services/Telemetry/ITelemetryService.cs
+++ b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.Common/Services/Telemetry/ITelemetryService.cs
@@ -0,0 +1,10 @@
+// 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.CmdPal.Core.Common.Services.Telemetry;
+
+public interface ITelemetryService
+{
+    void WriteEvent(TelemetryEventBase telemetryEvent);
+}
--- a/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.Common/Services/Telemetry/TelemetryEventBase.cs
+++ b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.Common/Services/Telemetry/TelemetryEventBase.cs
@@ -0,0 +1,14 @@
+// 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.PowerToys.Telemetry;
+using Microsoft.PowerToys.Telemetry.Events;
+
+namespace Microsoft.CmdPal.Core.Common.Services.Telemetry;
+
+public abstract class TelemetryEventBase : EventBase, IEvent
+{
+    // Overridden in derived classes
+    public abstract PartA_PrivTags PartA_PrivTags { get; }
+}
--- a/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/AppExtensionHost.cs
+++ b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/AppExtensionHost.cs
@@ -4,9 +4,9 @@

 using System.Collections.ObjectModel;
 using System.Diagnostics;
-using Microsoft.CmdPal.Core.Common;
 using Microsoft.CommandPalette.Extensions;
 using Microsoft.CommandPalette.Extensions.Toolkit;
+using Microsoft.Extensions.Logging;
 using Windows.Foundation;

 namespace Microsoft.CmdPal.Core.ViewModels;
@@ -14,6 +14,7 @@ namespace Microsoft.CmdPal.Core.ViewModels;
 public abstract partial class AppExtensionHost : IExtensionHost
 {
    private static readonly GlobalLogPageContext _globalLogPageContext = new();
+    private readonly ILogger _logger;

    private static ulong _hostingHwnd;

@@ -27,6 +28,11 @@ public abstract partial class AppExtensionHost : IExtensionHost

    public static void SetHostHwnd(ulong hostHwnd) => _hostingHwnd = hostHwnd;

+    public AppExtensionHost(ILogger logger)
+    {
+        _logger = logger;
+    }
+
    public void DebugLog(string message)
    {
 #if DEBUG
@@ -60,7 +66,7 @@ public abstract partial class AppExtensionHost : IExtensionHost
            return Task.CompletedTask.AsAsyncAction();
        }

-        CoreLogger.LogDebug(message.Message);
+        Log_DebugMessage(message.Message);

        _ = Task.Run(() =>
        {
@@ -96,7 +102,7 @@ public abstract partial class AppExtensionHost : IExtensionHost

    public void ProcessLogMessage(ILogMessage message)
    {
-        var vm = new LogMessageViewModel(message, _globalLogPageContext);
+        var vm = new LogMessageViewModel(message, _globalLogPageContext, _logger);
        vm.SafeInitializePropertiesSynchronous();

        Task.Factory.StartNew(
@@ -127,7 +133,7 @@ public abstract partial class AppExtensionHost : IExtensionHost
            return;
        }

-        var vm = new StatusMessageViewModel(message, new(_globalLogPageContext));
+        var vm = new StatusMessageViewModel(message, new(_globalLogPageContext), _logger);
        vm.SafeInitializePropertiesSynchronous();

        Task.Factory.StartNew(
@@ -158,6 +164,11 @@ public abstract partial class AppExtensionHost : IExtensionHost
    }

    public abstract string? GetExtensionDisplayName();
+
+    public abstract AppExtensionHost GetHostForCommand(object? context, AppExtensionHost? currentHost);
+
+    [LoggerMessage(Level = LogLevel.Debug, Message = "{Message}")]
+    partial void Log_DebugMessage(string message);
 }

 public interface IAppHostService
--- a/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/CommandBarViewModel.cs
+++ b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/CommandBarViewModel.cs
@@ -6,6 +6,7 @@ using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Messaging;
 using Microsoft.CmdPal.Core.ViewModels.Messages;
 using Microsoft.CommandPalette.Extensions.Toolkit;
+using Microsoft.Extensions.Logging;
 using Windows.System;

 namespace Microsoft.CmdPal.Core.ViewModels;
@@ -13,6 +14,8 @@ namespace Microsoft.CmdPal.Core.ViewModels;
 public partial class CommandBarViewModel : ObservableObject,
    IRecipient<UpdateCommandBarMessage>
 {
+    private readonly ILogger _logger;
+
    public ICommandBarContext? SelectedItem
    {
        get => field;
@@ -48,8 +51,9 @@ public partial class CommandBarViewModel : ObservableObject,
    [ObservableProperty]
    public partial PageViewModel? CurrentPage { get; set; }

-    public CommandBarViewModel()
+    public CommandBarViewModel(ILogger logger)
    {
+        _logger = logger;
        WeakReferenceMessenger.Default.Register<UpdateCommandBarMessage>(this);
    }

--- a/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/CommandContextItemViewModel.cs
+++ b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/CommandContextItemViewModel.cs
@@ -5,12 +5,12 @@
 using System.Diagnostics.CodeAnalysis;
 using Microsoft.CmdPal.Core.ViewModels.Models;
 using Microsoft.CommandPalette.Extensions;
-using Microsoft.CommandPalette.Extensions.Toolkit;
+using Microsoft.Extensions.Logging;

 namespace Microsoft.CmdPal.Core.ViewModels;

 [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)]
-public partial class CommandContextItemViewModel(ICommandContextItem contextItem, WeakReference<IPageContext> context) : CommandItemViewModel(new(contextItem), context), IContextItemViewModel
+public partial class CommandContextItemViewModel(ICommandContextItem contextItem, WeakReference<IPageContext> context, ILogger logger) : CommandItemViewModel(new(contextItem), context, logger), IContextItemViewModel
 {
    private readonly KeyChord nullKeyChord = new(0, 0, 0);

--- a/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/CommandItemViewModel.cs
+++ b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/CommandItemViewModel.cs
@@ -3,11 +3,11 @@
 // See the LICENSE file in the project root for more information.

 using System.Diagnostics.CodeAnalysis;
-using Microsoft.CmdPal.Core.Common;
 using Microsoft.CmdPal.Core.ViewModels.Messages;
 using Microsoft.CmdPal.Core.ViewModels.Models;
 using Microsoft.CommandPalette.Extensions;
 using Microsoft.CommandPalette.Extensions.Toolkit;
+using Microsoft.Extensions.Logging;

 namespace Microsoft.CmdPal.Core.ViewModels;

@@ -86,11 +86,11 @@ public partial class CommandItemViewModel : ExtensionObjectViewModel, ICommandBa
        _errorIcon.InitializeProperties();
    }

-    public CommandItemViewModel(ExtensionObject<ICommandItem> item, WeakReference<IPageContext> errorContext)
-        : base(errorContext)
+    public CommandItemViewModel(ExtensionObject<ICommandItem> item, WeakReference<IPageContext> errorContext, ILogger logger)
+        : base(errorContext, logger)
    {
        _commandItemModel = item;
-        Command = new(null, errorContext);
+        Command = new(null, errorContext, Logger);
    }

    public void FastInitializeProperties()
@@ -106,7 +106,7 @@ public partial class CommandItemViewModel : ExtensionObjectViewModel, ICommandBa
            return;
        }

-        Command = new(model.Command, PageContext);
+        Command = new(model.Command, PageContext, Logger);
        Command.FastInitializeProperties();

        _itemTitle = model.Title;
@@ -184,7 +184,7 @@ public partial class CommandItemViewModel : ExtensionObjectViewModel, ICommandBa
            MoreCommands = more
                .Select<IContextItem, IContextItemViewModel>(item =>
                {
-                    return item is ICommandContextItem contextItem ? new CommandContextItemViewModel(contextItem, PageContext) : new SeparatorViewModel();
+                    return item is ICommandContextItem contextItem ? new CommandContextItemViewModel(contextItem, PageContext, Logger) : new SeparatorViewModel();
                })
                .ToList();
        }
@@ -201,7 +201,7 @@ public partial class CommandItemViewModel : ExtensionObjectViewModel, ICommandBa

        if (!string.IsNullOrEmpty(model.Command?.Name))
        {
-            _defaultCommandContextItemViewModel = new CommandContextItemViewModel(new CommandContextItem(model.Command!), PageContext)
+            _defaultCommandContextItemViewModel = new CommandContextItemViewModel(new CommandContextItem(model.Command!), PageContext, Logger)
            {
                _itemTitle = Name,
                Subtitle = Subtitle,
@@ -231,8 +231,8 @@ public partial class CommandItemViewModel : ExtensionObjectViewModel, ICommandBa
        }
        catch (Exception ex)
        {
-            CoreLogger.LogError("error fast initializing CommandItemViewModel", ex);
-            Command = new(null, PageContext);
+            Log_ErrorFastInitializingCommandItemViewModel(Logger, ex);
+            Command = new(null, PageContext, Logger);
            _itemTitle = "Error";
            Subtitle = "Item failed to load";
            MoreCommands = [];
@@ -253,7 +253,7 @@ public partial class CommandItemViewModel : ExtensionObjectViewModel, ICommandBa
        catch (Exception ex)
        {
            Initialized |= InitializedState.Error;
-            CoreLogger.LogError("error slow initializing CommandItemViewModel", ex);
+            Log_ErrorSlowInitializingCommandItemViewModel(Logger, ex);
        }

        return false;
@@ -268,8 +268,8 @@ public partial class CommandItemViewModel : ExtensionObjectViewModel, ICommandBa
        }
        catch (Exception ex)
        {
-            CoreLogger.LogError("error initializing CommandItemViewModel", ex);
-            Command = new(null, PageContext);
+            Log_ErrorSlowInitializingCommandItemViewModel(Logger, ex);
+            Command = new(null, PageContext, Logger);
            _itemTitle = "Error";
            Subtitle = "Item failed to load";
            MoreCommands = [];
@@ -304,7 +304,7 @@ public partial class CommandItemViewModel : ExtensionObjectViewModel, ICommandBa
        {
            case nameof(Command):
                Command.PropertyChanged -= Command_PropertyChanged;
-                Command = new(model.Command, PageContext);
+                Command = new(model.Command, PageContext, Logger);
                Command.InitializeProperties();
                Command.PropertyChanged += Command_PropertyChanged;

@@ -351,7 +351,7 @@ public partial class CommandItemViewModel : ExtensionObjectViewModel, ICommandBa
                    var newContextMenu = more
                        .Select<IContextItem, IContextItemViewModel>(item =>
                        {
-                            return item is ICommandContextItem contextItem ? new CommandContextItemViewModel(contextItem, PageContext) : new SeparatorViewModel();
+                            return item is ICommandContextItem contextItem ? new CommandContextItemViewModel(contextItem, PageContext, Logger) : new SeparatorViewModel();
                        })
                        .ToList();
                    lock (MoreCommands)
@@ -464,6 +464,15 @@ public partial class CommandItemViewModel : ExtensionObjectViewModel, ICommandBa
        base.SafeCleanup();
        Initialized |= InitializedState.CleanedUp;
    }
+
+    [LoggerMessage(level: LogLevel.Error, message: "error fast initializing CommandItemViewModel")]
+    static partial void Log_ErrorFastInitializingCommandItemViewModel(ILogger logger, Exception ex);
+
+    [LoggerMessage(level: LogLevel.Error, message: "error slow initializing CommandItemViewModel")]
+    static partial void Log_ErrorSlowInitializingCommandItemViewModel(ILogger logger, Exception ex);
+
+    [LoggerMessage(level: LogLevel.Error, message: "error initializing CommandItemViewModel")]
+    static partial void Log_ErrorInitializingCommandItemViewModel(ILogger logger, Exception ex);
 }

 [Flags]
--- a/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/CommandViewModel.cs
+++ b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/CommandViewModel.cs
@@ -4,6 +4,7 @@

 using Microsoft.CmdPal.Core.ViewModels.Models;
 using Microsoft.CommandPalette.Extensions;
+using Microsoft.Extensions.Logging;

 namespace Microsoft.CmdPal.Core.ViewModels;

@@ -38,8 +39,8 @@ public partial class CommandViewModel : ExtensionObjectViewModel

    public IReadOnlyDictionary<string, ExtensionObject<object>>? Properties => _properties?.AsReadOnly();

-    public CommandViewModel(ICommand? command, WeakReference<IPageContext> pageContext)
-        : base(pageContext)
+    public CommandViewModel(ICommand? command, WeakReference<IPageContext> pageContext, ILogger logger)
+        : base(pageContext, logger)
    {
        Model = new(command);
        Icon = new(null);
--- a/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/ConfirmResultViewModel.cs
+++ b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/ConfirmResultViewModel.cs
@@ -4,13 +4,14 @@

 using Microsoft.CmdPal.Core.ViewModels.Models;
 using Microsoft.CommandPalette.Extensions;
+using Microsoft.Extensions.Logging;

 namespace Microsoft.CmdPal.Core.ViewModels;

-public partial class ConfirmResultViewModel(IConfirmationArgs _args, WeakReference<IPageContext> context) :
-    ExtensionObjectViewModel(context)
+public partial class ConfirmResultViewModel(IConfirmationArgs? args, WeakReference<IPageContext> context, ILogger logger)
+        : ExtensionObjectViewModel(context, logger)
 {
-    public ExtensionObject<IConfirmationArgs> Model { get; } = new(_args);
+    public ExtensionObject<IConfirmationArgs> Model { get; private set; } = new(args);

    // Remember - "observable" properties from the model (via PropChanged)
    // cannot be marked [ObservableProperty]
@@ -20,7 +21,7 @@ public partial class ConfirmResultViewModel(IConfirmationArgs _args, WeakReferen

    public bool IsPrimaryCommandCritical { get; private set; }

-    public CommandViewModel PrimaryCommand { get; private set; } = new(null, context);
+    public CommandViewModel PrimaryCommand { get; private set; } = new(null, context, logger);

    public override void InitializeProperties()
    {
@@ -33,7 +34,7 @@ public partial class ConfirmResultViewModel(IConfirmationArgs _args, WeakReferen
        Title = model.Title;
        Description = model.Description;
        IsPrimaryCommandCritical = model.IsPrimaryCommandCritical;
-        PrimaryCommand = new(model.PrimaryCommand, PageContext);
+        PrimaryCommand = new(model.PrimaryCommand, PageContext, Logger);
        PrimaryCommand.InitializeProperties();

        UpdateProperty(nameof(Title));
--- a/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/ContentPageViewModel.cs
+++ b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/ContentPageViewModel.cs
@@ -11,12 +11,14 @@ using Microsoft.CmdPal.Core.ViewModels.Messages;
 using Microsoft.CmdPal.Core.ViewModels.Models;
 using Microsoft.CommandPalette.Extensions;
 using Microsoft.CommandPalette.Extensions.Toolkit;
+using Microsoft.Extensions.Logging;

 namespace Microsoft.CmdPal.Core.ViewModels;

 public partial class ContentPageViewModel : PageViewModel, ICommandBarContext
 {
    private readonly ExtensionObject<IContentPage> _model;
+    private readonly ILogger _logger;

    [ObservableProperty]
    public partial ObservableCollection<ContentViewModel> Content { get; set; } = [];
@@ -47,10 +49,11 @@ public partial class ContentPageViewModel : PageViewModel, ICommandBarContext

    // Remember - "observable" properties from the model (via PropChanged)
    // cannot be marked [ObservableProperty]
-    public ContentPageViewModel(IContentPage model, TaskScheduler scheduler, AppExtensionHost host)
-        : base(model, scheduler, host)
+    public ContentPageViewModel(IContentPage model, AppExtensionHost host, ILogger logger)
+        : base(model, host, logger)
    {
        _model = new(model);
+        _logger = logger;
    }

    // TODO: Does this need to hop to a _different_ thread, so that we don't block the extension while we're fetching?
@@ -115,7 +118,7 @@ public partial class ContentPageViewModel : PageViewModel, ICommandBarContext
                {
                    if (item is ICommandContextItem contextItem)
                    {
-                        return new CommandContextItemViewModel(contextItem, PageContext);
+                        return new CommandContextItemViewModel(contextItem, PageContext, _logger);
                    }
                    else
                    {
@@ -135,7 +138,7 @@ public partial class ContentPageViewModel : PageViewModel, ICommandBarContext
        var extensionDetails = model.Details;
        if (extensionDetails is not null)
        {
-            Details = new(extensionDetails, PageContext);
+            Details = new(extensionDetails, PageContext, _logger);
            Details.InitializeProperties();
        }

@@ -174,7 +177,7 @@ public partial class ContentPageViewModel : PageViewModel, ICommandBarContext
                            {
                                if (item is ICommandContextItem contextItem)
                                {
-                                    return new CommandContextItemViewModel(contextItem, PageContext) as IContextItemViewModel;
+                                    return new CommandContextItemViewModel(contextItem, PageContext, _logger) as IContextItemViewModel;
                                }
                                else
                                {
@@ -216,7 +219,7 @@ public partial class ContentPageViewModel : PageViewModel, ICommandBarContext
                break;
            case nameof(Details):
                var extensionDetails = model.Details;
-                Details = extensionDetails is not null ? new(extensionDetails, PageContext) : null;
+                Details = extensionDetails is not null ? new(extensionDetails, PageContext, _logger) : null;
                UpdateDetails();
                break;
        }
--- a/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/ContentViewModel.cs
+++ b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/ContentViewModel.cs
@@ -2,10 +2,12 @@
 // 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.Extensions.Logging;
+
 namespace Microsoft.CmdPal.Core.ViewModels;

-public abstract partial class ContentViewModel(WeakReference<IPageContext> context) :
-    ExtensionObjectViewModel(context)
+public abstract partial class ContentViewModel(WeakReference<IPageContext> context, ILogger logger) :
+    ExtensionObjectViewModel(context, logger)
 {
    public bool OnlyControlOnPage { get; internal set; }
 }
--- a/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/ContextMenuViewModel.cs
+++ b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/ContextMenuViewModel.cs
@@ -5,7 +5,6 @@
 using System.Collections.ObjectModel;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Messaging;
-using Microsoft.CmdPal.Core.Common;
 using Microsoft.CmdPal.Core.ViewModels.Messages;
 using Microsoft.CommandPalette.Extensions;
 using Microsoft.CommandPalette.Extensions.Toolkit;
@@ -138,11 +137,7 @@ public partial class ContextMenuViewModel : ObservableObject,
            if (item is CommandContextItemViewModel cmd && cmd.HasRequestedShortcut)
            {
                var key = cmd.RequestedShortcut ?? new KeyChord(0, 0, 0);
-                var added = result.TryAdd(key, cmd);
-                if (!added)
-                {
-                    CoreLogger.LogWarning($"Ignoring duplicate keyboard shortcut {KeyChordHelpers.FormatForDebug(key)} on command '{cmd.Title ?? cmd.Name ?? "(unknown)"}'");
-                }
+                _ = result.TryAdd(key, cmd);
            }
        }

--- a/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/DetailsCommandsViewModel.cs
+++ b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/DetailsCommandsViewModel.cs
@@ -4,19 +4,26 @@

 using Microsoft.CmdPal.Core.ViewModels.Models;
 using Microsoft.CommandPalette.Extensions;
+using Microsoft.Extensions.Logging;

 namespace Microsoft.CmdPal.Core.ViewModels;

-public partial class DetailsCommandsViewModel(
-    IDetailsElement _detailsElement,
-    WeakReference<IPageContext> context) : DetailsElementViewModel(_detailsElement, context)
+public partial class DetailsCommandsViewModel : DetailsElementViewModel
 {
+    private readonly ILogger _logger;
+
    public List<CommandViewModel> Commands { get; private set; } = [];

    public bool HasCommands => Commands.Count > 0;

-    private readonly ExtensionObject<IDetailsCommands> _dataModel =
-        new(_detailsElement.Data as IDetailsCommands);
+    private readonly ExtensionObject<IDetailsCommands> _dataModel;
+
+    public DetailsCommandsViewModel(IDetailsElement _detailsElement, WeakReference<IPageContext> context, ILogger logger)
+        : base(_detailsElement, context, logger)
+    {
+        _logger = logger;
+        _dataModel = new(_detailsElement.Data as IDetailsCommands);
+    }

    public override void InitializeProperties()
    {
@@ -31,7 +38,7 @@ public partial class DetailsCommandsViewModel(
            .Commands?
            .Select(c =>
            {
-                var vm = new CommandViewModel(c, PageContext);
+                var vm = new CommandViewModel(c, PageContext, _logger);
                vm.InitializeProperties();
                return vm;
            })
--- a/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/DetailsDataViewModel.cs
+++ b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/DetailsDataViewModel.cs
@@ -2,11 +2,10 @@
 // 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.CmdPal.Core.ViewModels.Models;
-using Microsoft.CommandPalette.Extensions;
+using Microsoft.Extensions.Logging;

 namespace Microsoft.CmdPal.Core.ViewModels;

-public abstract partial class DetailsDataViewModel(IPageContext context) : ExtensionObjectViewModel(context)
+public abstract partial class DetailsDataViewModel(IPageContext context, ILogger logger) : ExtensionObjectViewModel(context, logger)
 {
 }
--- a/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/DetailsElementViewModel.cs
+++ b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/DetailsElementViewModel.cs
@@ -4,10 +4,11 @@

 using Microsoft.CmdPal.Core.ViewModels.Models;
 using Microsoft.CommandPalette.Extensions;
+using Microsoft.Extensions.Logging;

 namespace Microsoft.CmdPal.Core.ViewModels;

-public abstract partial class DetailsElementViewModel(IDetailsElement _detailsElement, WeakReference<IPageContext> context) : ExtensionObjectViewModel(context)
+public abstract partial class DetailsElementViewModel(IDetailsElement _detailsElement, WeakReference<IPageContext> context, ILogger logger) : ExtensionObjectViewModel(context, logger)
 {
    private readonly ExtensionObject<IDetailsElement> _model = new(_detailsElement);

--- a/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/DetailsLinkViewModel.cs
+++ b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/DetailsLinkViewModel.cs
@@ -6,12 +6,12 @@ using CommunityToolkit.Mvvm.Input;
 using Microsoft.CmdPal.Core.ViewModels.Models;
 using Microsoft.CommandPalette.Extensions;
 using Microsoft.CommandPalette.Extensions.Toolkit;
+using Microsoft.Extensions.Logging;

 namespace Microsoft.CmdPal.Core.ViewModels;

-public partial class DetailsLinkViewModel(
-    IDetailsElement _detailsElement,
-    WeakReference<IPageContext> context) : DetailsElementViewModel(_detailsElement, context)
+public partial class DetailsLinkViewModel(IDetailsElement _detailsElement, WeakReference<IPageContext> context, ILogger logger)
+    : DetailsElementViewModel(_detailsElement, context, logger)
 {
    private static readonly string[] _initProperties = [
        nameof(Text),
--- a/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/DetailsSeparatorViewModel.cs
+++ b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/DetailsSeparatorViewModel.cs
@@ -4,12 +4,13 @@

 using Microsoft.CmdPal.Core.ViewModels.Models;
 using Microsoft.CommandPalette.Extensions;
+using Microsoft.Extensions.Logging;

 namespace Microsoft.CmdPal.Core.ViewModels;

 public partial class DetailsSeparatorViewModel(
    IDetailsElement _detailsElement,
-    WeakReference<IPageContext> context) : DetailsElementViewModel(_detailsElement, context)
+    WeakReference<IPageContext> context, ILogger logger) : DetailsElementViewModel(_detailsElement, context, logger)
 {
    private readonly ExtensionObject<IDetailsSeparator> _dataModel =
        new(_detailsElement.Data as IDetailsSeparator);
--- a/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/DetailsTagsViewModel.cs
+++ b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/DetailsTagsViewModel.cs
@@ -4,19 +4,25 @@

 using Microsoft.CmdPal.Core.ViewModels.Models;
 using Microsoft.CommandPalette.Extensions;
+using Microsoft.Extensions.Logging;

 namespace Microsoft.CmdPal.Core.ViewModels;

-public partial class DetailsTagsViewModel(
-    IDetailsElement _detailsElement,
-    WeakReference<IPageContext> context) : DetailsElementViewModel(_detailsElement, context)
+public partial class DetailsTagsViewModel : DetailsElementViewModel
 {
    public List<TagViewModel> Tags { get; private set; } = [];

    public bool HasTags => Tags.Count > 0;

-    private readonly ExtensionObject<IDetailsTags> _dataModel =
-        new(_detailsElement.Data as IDetailsTags);
+    private readonly ExtensionObject<IDetailsTags> _dataModel;
+    private readonly ILogger _logger;
+
+    public DetailsTagsViewModel(IDetailsElement _detailsElement, WeakReference<IPageContext> context, ILogger logger)
+        : base(_detailsElement, context, logger)
+    {
+        _logger = logger;
+        _dataModel = new(_detailsElement.Data as IDetailsTags);
+    }

    public override void InitializeProperties()
    {
@@ -31,7 +37,7 @@ public partial class DetailsTagsViewModel(
            .Tags?
            .Select(t =>
        {
-            var vm = new TagViewModel(t, PageContext);
+            var vm = new TagViewModel(t, PageContext, _logger);
            vm.InitializeProperties();
            return vm;
        })
--- a/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/DetailsViewModel.cs
+++ b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/DetailsViewModel.cs
@@ -4,10 +4,11 @@

 using Microsoft.CmdPal.Core.ViewModels.Models;
 using Microsoft.CommandPalette.Extensions;
+using Microsoft.Extensions.Logging;

 namespace Microsoft.CmdPal.Core.ViewModels;

-public partial class DetailsViewModel(IDetails _details, WeakReference<IPageContext> context) : ExtensionObjectViewModel(context)
+public partial class DetailsViewModel(IDetails _details, WeakReference<IPageContext> context, ILogger logger) : ExtensionObjectViewModel(context, logger)
 {
    private readonly ExtensionObject<IDetails> _detailsModel = new(_details);

@@ -47,10 +48,10 @@ public partial class DetailsViewModel(IDetails _details, WeakReference<IPageCont
            {
                DetailsElementViewModel? vm = element.Data switch
                {
-                    IDetailsSeparator => new DetailsSeparatorViewModel(element, this.PageContext),
-                    IDetailsLink => new DetailsLinkViewModel(element, this.PageContext),
-                    IDetailsCommands => new DetailsCommandsViewModel(element, this.PageContext),
-                    IDetailsTags => new DetailsTagsViewModel(element, this.PageContext),
+                    IDetailsSeparator => new DetailsSeparatorViewModel(element, this.PageContext, Logger),
+                    IDetailsLink => new DetailsLinkViewModel(element, this.PageContext, Logger),
+                    IDetailsCommands => new DetailsCommandsViewModel(element, this.PageContext, Logger),
+                    IDetailsTags => new DetailsTagsViewModel(element, this.PageContext, Logger),
                    _ => null,
                };
                if (vm is not null)
--- a/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/ExtensionObjectViewModel.cs
+++ b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/ExtensionObjectViewModel.cs
@@ -3,23 +3,29 @@
 // See the LICENSE file in the project root for more information.

 using CommunityToolkit.Mvvm.ComponentModel;
-using Microsoft.CmdPal.Core.Common;
+using Microsoft.Extensions.Logging;

 namespace Microsoft.CmdPal.Core.ViewModels;

 public abstract partial class ExtensionObjectViewModel : ObservableObject
 {
+    private readonly ILogger _logger;
+
+    public ILogger Logger => _logger;
+
    public WeakReference<IPageContext> PageContext { get; set; }

-    internal ExtensionObjectViewModel(IPageContext? context)
+    internal ExtensionObjectViewModel(IPageContext? context, ILogger logger)
    {
        var realContext = context ?? (this is IPageContext c ? c : throw new ArgumentException("You need to pass in an IErrorContext"));
+        _logger = logger;
        PageContext = new(realContext);
    }

-    internal ExtensionObjectViewModel(WeakReference<IPageContext> context)
+    internal ExtensionObjectViewModel(WeakReference<IPageContext> context, ILogger logger)
    {
        PageContext = context;
+        _logger = logger;
    }

    public async virtual Task InitializePropertiesAsync()
@@ -114,7 +120,10 @@ public abstract partial class ExtensionObjectViewModel : ObservableObject
        }
        catch (Exception ex)
        {
-            CoreLogger.LogDebug(ex.ToString());
+            Log_CleanupException(ex);
        }
    }
+
+    [LoggerMessage(Level = LogLevel.Debug)]
+    partial void Log_CleanupException(Exception exception);
 }
--- a/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/FilterItemViewModel.cs
+++ b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/FilterItemViewModel.cs
@@ -4,6 +4,7 @@

 using Microsoft.CmdPal.Core.ViewModels.Models;
 using Microsoft.CommandPalette.Extensions;
+using Microsoft.Extensions.Logging;

 namespace Microsoft.CmdPal.Core.ViewModels;

@@ -23,8 +24,8 @@ public partial class FilterItemViewModel : ExtensionObjectViewModel, IFilterItem

    public bool IsInErrorState => Initialized.HasFlag(InitializedState.Error);

-    public FilterItemViewModel(IFilter filter, WeakReference<IPageContext> context)
-        : base(context)
+    public FilterItemViewModel(IFilter filter, WeakReference<IPageContext> context, ILogger logger)
+        : base(context, logger)
    {
        _model = new(filter);
    }
--- a/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/FiltersViewModel.cs
+++ b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/FiltersViewModel.cs
@@ -2,10 +2,9 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.

-using System.Collections.Generic;
 using Microsoft.CmdPal.Core.ViewModels.Models;
 using Microsoft.CommandPalette.Extensions;
-using Microsoft.CommandPalette.Extensions.Toolkit;
+using Microsoft.Extensions.Logging;

 namespace Microsoft.CmdPal.Core.ViewModels;

@@ -21,8 +20,8 @@ public partial class FiltersViewModel : ExtensionObjectViewModel

    public bool ShouldShowFilters => Filters.Length > 0;

-    public FiltersViewModel(ExtensionObject<IFilters> filters, WeakReference<IPageContext> context)
-        : base(context)
+    public FiltersViewModel(ExtensionObject<IFilters> filters, WeakReference<IPageContext> context, ILogger logger)
+        : base(context, logger)
    {
        _filtersModel = filters;
    }
@@ -71,7 +70,7 @@ public partial class FiltersViewModel : ExtensionObjectViewModel
        {
            if (filter is IFilter filterItem)
            {
-                var filterItemViewModel = new FilterItemViewModel(filterItem, PageContext);
+                var filterItemViewModel = new FilterItemViewModel(filterItem, PageContext, Logger);
                filterItemViewModel.InitializeProperties();

                if (firstFilterItem is null)
--- a/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/ICommandBarContext.cs
+++ b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/ICommandBarContext.cs
@@ -0,0 +1,21 @@
+// 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.CmdPal.Core.ViewModels.Messages;
+
+namespace Microsoft.CmdPal.Core.ViewModels;
+
+// Represents everything the command bar needs to know about to show command
+// buttons at the bottom.
+//
+// This is implemented by both ListItemViewModel and ContentPageViewModel,
+// the two things with sub-commands.
+public interface ICommandBarContext : IContextMenuContext
+{
+    public string SecondaryCommandName { get; }
+
+    public CommandItemViewModel? PrimaryCommand { get; }
+
+    public CommandItemViewModel? SecondaryCommand { get; }
+}
--- a/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/IPageContext.cs
+++ b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/IPageContext.cs
@@ -0,0 +1,12 @@
+// 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.CmdPal.Core.ViewModels;
+
+public interface IPageContext
+{
+    void ShowException(Exception ex, string? extensionHint = null);
+
+    TaskScheduler Scheduler { get; }
+}
--- a/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/IPageViewModelFactoryService.cs
+++ b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/IPageViewModelFactoryService.cs
@@ -0,0 +1,19 @@
+// 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.CommandPalette.Extensions;
+
+namespace Microsoft.CmdPal.Core.ViewModels;
+
+public interface IPageViewModelFactoryService
+{
+    /// <summary>
+    /// Creates a new instance of the page view model for the given page type.
+    /// </summary>
+    /// <param name="page">The page for which to create the view model.</param>
+    /// <param name="nested">Indicates whether the page is not the top-level page.</param>
+    /// <param name="host">The command palette host that will host the page (for status messages)</param>
+    /// <returns>A new instance of the page view model.</returns>
+    PageViewModel? TryCreatePageViewModel(IPage page, bool nested, AppExtensionHost host);
+}
--- a/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/ListItemViewModel.cs
+++ b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/ListItemViewModel.cs
@@ -7,13 +7,14 @@ using Microsoft.CmdPal.Core.ViewModels.Commands;
 using Microsoft.CmdPal.Core.ViewModels.Models;
 using Microsoft.CommandPalette.Extensions;
 using Microsoft.CommandPalette.Extensions.Toolkit;
+using Microsoft.Extensions.Logging;

 namespace Microsoft.CmdPal.Core.ViewModels;

-public partial class ListItemViewModel(IListItem model, WeakReference<IPageContext> context)
-    : CommandItemViewModel(new(model), context)
+// Fix for CS9107: Do not capture 'logger' in the primary constructor; use a regular constructor instead.
+public partial class ListItemViewModel : CommandItemViewModel
 {
-    public new ExtensionObject<IListItem> Model { get; } = new(model);
+    public new ExtensionObject<IListItem> Model { get; }

    public List<TagViewModel>? Tags { get; set; }

@@ -32,6 +33,15 @@ public partial class ListItemViewModel(IListItem model, WeakReference<IPageConte

    public string AccessibleName { get; private set; } = string.Empty;

+    private readonly ILogger _logger;
+
+    public ListItemViewModel(IListItem model, WeakReference<IPageContext> context, ILogger logger)
+        : base(new(model), context, logger)
+    {
+        Model = new(model);
+        _logger = logger;
+    }
+
    public override void InitializeProperties()
    {
        if (IsInitialized)
@@ -69,7 +79,7 @@ public partial class ListItemViewModel(IListItem model, WeakReference<IPageConte
        var extensionDetails = model.Details;
        if (extensionDetails is not null)
        {
-            Details = new(extensionDetails, PageContext);
+            Details = new(extensionDetails, PageContext, Logger);
            Details.InitializeProperties();
            UpdateProperty(nameof(Details));
            UpdateProperty(nameof(HasDetails));
@@ -104,7 +114,7 @@ public partial class ListItemViewModel(IListItem model, WeakReference<IPageConte
                break;
            case nameof(Details):
                var extensionDetails = model.Details;
-                Details = extensionDetails is not null ? new(extensionDetails, PageContext) : null;
+                Details = extensionDetails is not null ? new(extensionDetails, PageContext, Logger) : null;
                Details?.InitializeProperties();
                UpdateProperty(nameof(Details));
                UpdateProperty(nameof(HasDetails));
@@ -146,7 +156,7 @@ public partial class ListItemViewModel(IListItem model, WeakReference<IPageConte
                // Create the view model for the show details command
                var showDetailsCommand = new ShowDetailsCommand(Details);
                var showDetailsContextItem = new CommandContextItem(showDetailsCommand);
-                var showDetailsContextItemViewModel = new CommandContextItemViewModel(showDetailsContextItem, PageContext);
+                var showDetailsContextItemViewModel = new CommandContextItemViewModel(showDetailsContextItem, PageContext, _logger);
                showDetailsContextItemViewModel.SlowInitializeProperties();
                MoreCommands.Add(showDetailsContextItemViewModel);
            }
@@ -180,7 +190,7 @@ public partial class ListItemViewModel(IListItem model, WeakReference<IPageConte
            // Create the view model for the show details command
            var showDetailsCommand = new ShowDetailsCommand(Details);
            var showDetailsContextItem = new CommandContextItem(showDetailsCommand);
-            var showDetailsContextItemViewModel = new CommandContextItemViewModel(showDetailsContextItem, PageContext);
+            var showDetailsContextItemViewModel = new CommandContextItemViewModel(showDetailsContextItem, PageContext, _logger);
            showDetailsContextItemViewModel.SlowInitializeProperties();
            MoreCommands.Add(showDetailsContextItemViewModel);

@@ -193,7 +203,7 @@ public partial class ListItemViewModel(IListItem model, WeakReference<IPageConte
    {
        var newTags = newTagsFromModel?.Select(t =>
        {
-            var vm = new TagViewModel(t, PageContext);
+            var vm = new TagViewModel(t, PageContext, Logger);
            vm.InitializeProperties();
            return vm;
        })
--- a/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/ListViewModel.cs
+++ b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/ListViewModel.cs
@@ -11,6 +11,7 @@ using Microsoft.CmdPal.Core.ViewModels.Messages;
 using Microsoft.CmdPal.Core.ViewModels.Models;
 using Microsoft.CommandPalette.Extensions;
 using Microsoft.CommandPalette.Extensions.Toolkit;
+using Microsoft.Extensions.Logging;
 using Windows.Foundation;

 namespace Microsoft.CmdPal.Core.ViewModels;
@@ -19,6 +20,7 @@ public partial class ListViewModel : PageViewModel, IDisposable
 {
    // private readonly HashSet<ListItemViewModel> _itemCache = [];
    private readonly TaskFactory filterTaskFactory = new(new ConcurrentExclusiveSchedulerPair().ExclusiveScheduler);
+    private readonly ILogger _logger;

    // TODO: Do we want a base "ItemsPageViewModel" for anything that's going to have items?

@@ -90,11 +92,12 @@ public partial class ListViewModel : PageViewModel, IDisposable
        }
    }

-    public ListViewModel(IListPage model, TaskScheduler scheduler, AppExtensionHost host)
-        : base(model, scheduler, host)
+    public ListViewModel(IListPage model, TaskScheduler scheduler, AppExtensionHost host, ILogger logger)
+        : base(model, host, logger)
    {
        _model = new(model);
-        EmptyContent = new(new(null), PageContext);
+        EmptyContent = new(new(null), PageContext, logger);
+        _logger = logger;
    }

    private void FiltersPropertyChanged(object? sender, System.ComponentModel.PropertyChangedEventArgs e)
@@ -232,7 +235,7 @@ public partial class ListViewModel : PageViewModel, IDisposable
                    return;
                }

-                ListItemViewModel viewModel = new(item, new(this));
+                ListItemViewModel viewModel = new(item, new(this), _logger);

                // If an item fails to load, silently ignore it.
                if (viewModel.SafeFastInit())
@@ -594,11 +597,11 @@ public partial class ListViewModel : PageViewModel, IDisposable
        UpdateProperty(nameof(SearchText));
        UpdateProperty(nameof(InitialSearchText));

-        EmptyContent = new(new(model.EmptyContent), PageContext);
+        EmptyContent = new(new(model.EmptyContent), PageContext, _logger);
        EmptyContent.SlowInitializeProperties();

        Filters?.PropertyChanged -= FiltersPropertyChanged;
-        Filters = new(new(model.Filters), PageContext);
+        Filters = new(new(model.Filters), PageContext, _logger);
        Filters?.PropertyChanged += FiltersPropertyChanged;

        Filters?.InitializeProperties();
@@ -696,12 +699,12 @@ public partial class ListViewModel : PageViewModel, IDisposable
                SearchText = model.SearchText;
                break;
            case nameof(EmptyContent):
-                EmptyContent = new(new(model.EmptyContent), PageContext);
+                EmptyContent = new(new(model.EmptyContent), PageContext, _logger);
                EmptyContent.SlowInitializeProperties();
                break;
            case nameof(Filters):
                Filters?.PropertyChanged -= FiltersPropertyChanged;
-                Filters = new(new(model.Filters), PageContext);
+                Filters = new(new(model.Filters), PageContext, _logger);
                Filters?.PropertyChanged += FiltersPropertyChanged;
                Filters?.InitializeProperties();
                break;
@@ -751,7 +754,7 @@ public partial class ListViewModel : PageViewModel, IDisposable
        base.UnsafeCleanup();

        EmptyContent?.SafeCleanup();
-        EmptyContent = new(new(null), PageContext); // necessary?
+        EmptyContent = new(new(null), PageContext, _logger); // necessary?

        _cancellationTokenSource?.Cancel();
        filterCancellationTokenSource?.Cancel();
--- a/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/LoadingPageViewModel.cs
+++ b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/LoadingPageViewModel.cs
@@ -3,13 +3,14 @@
 // See the LICENSE file in the project root for more information.

 using Microsoft.CommandPalette.Extensions;
+using Microsoft.Extensions.Logging;

 namespace Microsoft.CmdPal.Core.ViewModels;

 public partial class LoadingPageViewModel : PageViewModel
 {
-    public LoadingPageViewModel(IPage? model, TaskScheduler scheduler, AppExtensionHost host)
-        : base(model, scheduler, host)
+    public LoadingPageViewModel(IPage? model, AppExtensionHost host, ILogger logger)
+        : base(model, host, logger)
    {
        ModelIsLoading = true;
        IsInitialized = false;
--- a/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/LogMessageViewModel.cs
+++ b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/LogMessageViewModel.cs
@@ -4,6 +4,7 @@

 using Microsoft.CmdPal.Core.ViewModels.Models;
 using Microsoft.CommandPalette.Extensions;
+using Microsoft.Extensions.Logging;

 namespace Microsoft.CmdPal.Core.ViewModels;

@@ -13,8 +14,8 @@ public partial class LogMessageViewModel : ExtensionObjectViewModel

    public string Message { get; private set; } = string.Empty;

-    public LogMessageViewModel(ILogMessage message, IPageContext context)
-        : base(context)
+    public LogMessageViewModel(ILogMessage message, IPageContext context, ILogger logger)
+        : base(context, logger)
    {
        _model = new(message);
    }
--- a/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/Messages/ActivateSecondaryCommandMessage.cs
+++ b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/Messages/ActivateSecondaryCommandMessage.cs
@@ -7,6 +7,4 @@ namespace Microsoft.CmdPal.Core.ViewModels.Messages;
 /// <summary>
 /// Used to perform a list item's secondary command when the user presses ctrl+enter in the search box
 /// </summary>
-public record ActivateSecondaryCommandMessage
-{
-}
+public record ActivateSecondaryCommandMessage;
--- a/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/Messages/ActivateSelectedListItemMessage.cs
+++ b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/Messages/ActivateSelectedListItemMessage.cs
@@ -7,6 +7,4 @@ namespace Microsoft.CmdPal.Core.ViewModels.Messages;
 /// <summary>
 /// Used to perform a list item's command when the user presses enter in the search box
 /// </summary>
-public record ActivateSelectedListItemMessage
-{
-}
+public record ActivateSelectedListItemMessage;
--- a/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/Messages/ClearSearchMessage.cs
+++ b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/Messages/ClearSearchMessage.cs
@@ -4,6 +4,4 @@

 namespace Microsoft.CmdPal.Core.ViewModels.Messages;

-public record ClearSearchMessage()
-{
-}
+public record ClearSearchMessage();
--- a/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/Messages/CloseContextMenuMessage.cs
+++ b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/Messages/CloseContextMenuMessage.cs
@@ -7,6 +7,4 @@ namespace Microsoft.CmdPal.Core.ViewModels.Messages;
 /// <summary>
 /// Used to announce that a context menu should close
 /// </summary>
-public record CloseContextMenuMessage
-{
-}
+public record CloseContextMenuMessage;
--- a/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/Messages/DismissMessage.cs
+++ b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/Messages/DismissMessage.cs
@@ -4,6 +4,4 @@

 namespace Microsoft.CmdPal.Core.ViewModels.Messages;

-public record DismissMessage()
-{
-}
+public record DismissMessage();
--- a/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/Messages/FocusSearchBoxMessage.cs
+++ b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/Messages/FocusSearchBoxMessage.cs
@@ -4,6 +4,4 @@

 namespace Microsoft.CmdPal.Core.ViewModels.Messages;

-public record FocusSearchBoxMessage()
-{
-}
+public record FocusSearchBoxMessage();
--- a/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/Messages/GoBackMessage.cs
+++ b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/Messages/GoBackMessage.cs
@@ -4,7 +4,5 @@

 namespace Microsoft.CmdPal.Core.ViewModels.Messages;

-public record GoBackMessage(bool WithAnimation = true, bool FocusSearch = true)
-{
-    // TODO! sticking these properties here feels like leaking the UI into the models
-}
+// TODO! sticking these properties here feels like leaking the UI into the models
+public record GoBackMessage(bool WithAnimation = true, bool FocusSearch = true);
--- a/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/Messages/GoHomeMessage.cs
+++ b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/Messages/GoHomeMessage.cs
@@ -5,6 +5,4 @@
 namespace Microsoft.CmdPal.Core.ViewModels.Messages;

 // TODO! sticking these properties here feels like leaking the UI into the models
-public record GoHomeMessage(bool WithAnimation = true, bool FocusSearch = true)
-{
-}
+public record GoHomeMessage(bool WithAnimation = true, bool FocusSearch = true);
--- a/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/Messages/HandleCommandResultMessage.cs
+++ b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/Messages/HandleCommandResultMessage.cs
@@ -7,6 +7,4 @@ using Microsoft.CommandPalette.Extensions;

 namespace Microsoft.CmdPal.Core.ViewModels.Messages;

-public record HandleCommandResultMessage(ExtensionObject<ICommandResult> Result)
-{
-}
+public record HandleCommandResultMessage(ExtensionObject<ICommandResult> Result);
--- a/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/Messages/HideDetailsMessage.cs
+++ b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/Messages/HideDetailsMessage.cs
@@ -2,11 +2,6 @@
 // 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.CmdPal.Core.ViewModels.Models;
-using Microsoft.CommandPalette.Extensions;
-
 namespace Microsoft.CmdPal.Core.ViewModels.Messages;

-public record HideDetailsMessage()
-{
-}
+public record HideDetailsMessage();
--- a/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/Messages/IContextMenuContext.cs
+++ b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/Messages/IContextMenuContext.cs
@@ -0,0 +1,47 @@
+// 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.ComponentModel;
+using Microsoft.CommandPalette.Extensions;
+
+namespace Microsoft.CmdPal.Core.ViewModels.Messages;
+
+public interface IContextMenuContext : INotifyPropertyChanged
+{
+    public IEnumerable<IContextItemViewModel> MoreCommands { get; }
+
+    public bool HasMoreCommands { get; }
+
+    public List<IContextItemViewModel> AllCommands { get; }
+
+    /// <summary>
+    /// Generates a mapping of key -> command item for this particular item's
+    /// MoreCommands. (This won't include the primary Command, but it will
+    /// include the secondary one). This map can be used to quickly check if a
+    /// shortcut key was pressed
+    /// </summary>
+    /// <returns>a dictionary of KeyChord -> Context commands, for all commands
+    /// that have a shortcut key set.</returns>
+    public Dictionary<KeyChord, CommandContextItemViewModel> Keybindings()
+    {
+        var result = new Dictionary<KeyChord, CommandContextItemViewModel>();
+
+        var menu = MoreCommands;
+        if (menu is null)
+        {
+            return result;
+        }
+
+        foreach (var item in menu)
+        {
+            if (item is CommandContextItemViewModel cmd && cmd.HasRequestedShortcut)
+            {
+                var key = cmd.RequestedShortcut ?? new KeyChord(0, 0, 0);
+                var added = result.TryAdd(key, cmd);
+            }
+        }
+
+        return result;
+    }
+}
--- a/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/Messages/LaunchUriMessage.cs
+++ b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/Messages/LaunchUriMessage.cs
@@ -2,11 +2,6 @@
 // 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.CmdPal.Core.ViewModels.Models;
-using Microsoft.CommandPalette.Extensions;
-
 namespace Microsoft.CmdPal.Core.ViewModels.Messages;

-public record LaunchUriMessage(Uri Uri)
-{
-}
+public record LaunchUriMessage(Uri Uri);
--- a/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/Messages/NavigateBackMessage.cs
+++ b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/Messages/NavigateBackMessage.cs
@@ -4,6 +4,4 @@

 namespace Microsoft.CmdPal.Core.ViewModels.Messages;

-public record NavigateBackMessage(bool FromBackspace = false)
-{
-}
+public record NavigateBackMessage(bool FromBackspace = false);
--- a/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/Messages/NavigateNextCommand.cs
+++ b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/Messages/NavigateNextCommand.cs
@@ -7,6 +7,4 @@ namespace Microsoft.CmdPal.Core.ViewModels.Commands;
 /// <summary>
 /// Used to navigate to the next command in the page when pressing the Down key in the SearchBox.
 /// </summary>
-public record NavigateNextCommand
-{
-}
+public record NavigateNextCommand;
--- a/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/Messages/NavigatePageDownCommand.cs
+++ b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/Messages/NavigatePageDownCommand.cs
@@ -7,6 +7,4 @@ namespace Microsoft.CmdPal.Core.ViewModels.Messages;
 /// <summary>
 /// Used to navigate down one page in the page when pressing the PageDown key in the SearchBox.
 /// </summary>
-public record NavigatePageDownCommand
-{
-}
+public record NavigatePageDownCommand;
--- a/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/Messages/NavigatePageUpCommand.cs
+++ b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/Messages/NavigatePageUpCommand.cs
@@ -7,6 +7,4 @@ namespace Microsoft.CmdPal.Core.ViewModels.Messages;
 /// <summary>
 /// Used to navigate up one page in the page when pressing the PageUp key in the SearchBox.
 /// </summary>
-public record NavigatePageUpCommand
-{
-}
+public record NavigatePageUpCommand;
--- a/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/Messages/NavigatePreviousCommand.cs
+++ b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/Messages/NavigatePreviousCommand.cs
@@ -7,6 +7,4 @@ namespace Microsoft.CmdPal.Core.ViewModels.Messages;
 /// <summary>
 /// Used to navigate to the previous command in the page when pressing the Down key in the SearchBox.
 /// </summary>
-public record NavigatePreviousCommand
-{
-}
+public record NavigatePreviousCommand;
--- a/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/Messages/ShowConfirmationMessage.cs
+++ b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/Messages/ShowConfirmationMessage.cs
@@ -4,6 +4,4 @@

 namespace Microsoft.CmdPal.Core.ViewModels.Messages;

-public record ShowConfirmationMessage(Microsoft.CommandPalette.Extensions.IConfirmationArgs? Args)
-{
-}
+public record ShowConfirmationMessage(Microsoft.CommandPalette.Extensions.IConfirmationArgs? Args);
--- a/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/Messages/ShowDetailsMessage.cs
+++ b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/Messages/ShowDetailsMessage.cs
@@ -2,11 +2,6 @@
 // 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.CmdPal.Core.ViewModels.Models;
-using Microsoft.CommandPalette.Extensions;
-
 namespace Microsoft.CmdPal.Core.ViewModels.Messages;

-public record ShowDetailsMessage(DetailsViewModel Details)
-{
-}
+public record ShowDetailsMessage(DetailsViewModel Details);
--- a/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/Messages/ShowToastMessage.cs
+++ b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/Messages/ShowToastMessage.cs
@@ -4,6 +4,4 @@

 namespace Microsoft.CmdPal.Core.ViewModels.Messages;

-public record ShowToastMessage(string Message)
-{
-}
+public record ShowToastMessage(string Message);
--- a/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/Messages/ShowWindowMessage.cs
+++ b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/Messages/ShowWindowMessage.cs
@@ -4,6 +4,4 @@

 namespace Microsoft.CmdPal.Core.ViewModels.Messages;

-public record ShowWindowMessage(IntPtr Hwnd)
-{
-}
+public record ShowWindowMessage(IntPtr Hwnd);
--- a/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/Messages/UpdateCommandBarMessage.cs
+++ b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/Messages/UpdateCommandBarMessage.cs
@@ -2,73 +2,9 @@
 // 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.ComponentModel;
-using Microsoft.CmdPal.Core.Common;
-using Microsoft.CommandPalette.Extensions;
-using Microsoft.CommandPalette.Extensions.Toolkit;
-
 namespace Microsoft.CmdPal.Core.ViewModels.Messages;

 /// <summary>
 /// Used to update the command bar at the bottom to reflect the commands for a list item
 /// </summary>
-public record UpdateCommandBarMessage(ICommandBarContext? ViewModel)
-{
-}
-
-public interface IContextMenuContext : INotifyPropertyChanged
-{
-    public IEnumerable<IContextItemViewModel> MoreCommands { get; }
-
-    public bool HasMoreCommands { get; }
-
-    public List<IContextItemViewModel> AllCommands { get; }
-
-    /// <summary>
-    /// Generates a mapping of key -> command item for this particular item's
-    /// MoreCommands. (This won't include the primary Command, but it will
-    /// include the secondary one). This map can be used to quickly check if a
-    /// shortcut key was pressed
-    /// </summary>
-    /// <returns>a dictionary of KeyChord -> Context commands, for all commands
-    /// that have a shortcut key set.</returns>
-    public Dictionary<KeyChord, CommandContextItemViewModel> Keybindings()
-    {
-        var result = new Dictionary<KeyChord, CommandContextItemViewModel>();
-
-        var menu = MoreCommands;
-        if (menu is null)
-        {
-            return result;
-        }
-
-        foreach (var item in menu)
-        {
-            if (item is CommandContextItemViewModel cmd && cmd.HasRequestedShortcut)
-            {
-                var key = cmd.RequestedShortcut ?? new KeyChord(0, 0, 0);
-                var added = result.TryAdd(key, cmd);
-                if (!added)
-                {
-                    CoreLogger.LogWarning($"Ignoring duplicate keyboard shortcut {KeyChordHelpers.FormatForDebug(key)} on command '{cmd.Title ?? cmd.Name ?? "(unknown)"}'");
-                }
-            }
-        }
-
-        return result;
-    }
-}
-
-// Represents everything the command bar needs to know about to show command
-// buttons at the bottom.
-//
-// This is implemented by both ListItemViewModel and ContentPageViewModel,
-// the two things with sub-commands.
-public interface ICommandBarContext : IContextMenuContext
-{
-    public string SecondaryCommandName { get; }
-
-    public CommandItemViewModel? PrimaryCommand { get; }
-
-    public CommandItemViewModel? SecondaryCommand { get; }
-}
+public record UpdateCommandBarMessage(ICommandBarContext? ViewModel);
--- a/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/Messages/UpdateSuggestionMessage.cs
+++ b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/Messages/UpdateSuggestionMessage.cs
@@ -4,6 +4,4 @@

 namespace Microsoft.CmdPal.Core.ViewModels.Messages;

-public record UpdateSuggestionMessage(string TextToSuggest)
-{
-}
+public record UpdateSuggestionMessage(string TextToSuggest);
--- a/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/NullPageViewModel.cs
+++ b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/NullPageViewModel.cs
@@ -2,7 +2,9 @@
 // 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.Extensions.Logging;
+
 namespace Microsoft.CmdPal.Core.ViewModels;

-internal sealed partial class NullPageViewModel(TaskScheduler scheduler, AppExtensionHost extensionHost)
-    : PageViewModel(null, scheduler, extensionHost);
+internal sealed partial class NullPageViewModel(AppExtensionHost extensionHost, ILogger logger)
+    : PageViewModel(null, extensionHost, logger);
--- a/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/PageViewModel.cs
+++ b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/PageViewModel.cs
@@ -8,15 +8,16 @@ using CommunityToolkit.Mvvm.Input;
 using Microsoft.CmdPal.Core.Common.Helpers;
 using Microsoft.CmdPal.Core.ViewModels.Models;
 using Microsoft.CommandPalette.Extensions;
+using Microsoft.Extensions.Logging;

 namespace Microsoft.CmdPal.Core.ViewModels;

 public partial class PageViewModel : ExtensionObjectViewModel, IPageContext
 {
-    public TaskScheduler Scheduler { get; private set; }
-
    private readonly ExtensionObject<IPage> _pageModel;

+    public TaskScheduler Scheduler { get; private set; } = TaskScheduler.FromCurrentSynchronizationContext();
+
    public bool IsLoading => ModelIsLoading || (!IsInitialized);

    [ObservableProperty]
@@ -64,6 +65,8 @@ public partial class PageViewModel : ExtensionObjectViewModel, IPageContext

    public string Title { get => string.IsNullOrEmpty(field) ? Name : field; protected set; } = string.Empty;

+    public string Id { get; protected set; } = string.Empty;
+
    // This property maps to `IPage.IsLoading`, but we want to expose our own
    // `IsLoading` property as a combo of this value and `IsInitialized`
    public bool ModelIsLoading { get; protected set; } = true;
@@ -74,11 +77,10 @@ public partial class PageViewModel : ExtensionObjectViewModel, IPageContext

    public IconInfoViewModel Icon { get; protected set; }

-    public PageViewModel(IPage? model, TaskScheduler scheduler, AppExtensionHost extensionHost)
-        : base((IPageContext?)null)
+    public PageViewModel(IPage? model, AppExtensionHost extensionHost, ILogger logger)
+        : base((IPageContext?)null, logger)
    {
        _pageModel = new(model);
-        Scheduler = scheduler;
        PageContext = new(this);
        ExtensionHost = extensionHost;
        Icon = new(null);
@@ -142,6 +144,7 @@ public partial class PageViewModel : ExtensionObjectViewModel, IPageContext
            return; // throw?
        }

+        Id = page.Id;
        Name = page.Name;
        ModelIsLoading = page.IsLoading;
        Title = page.Title;
@@ -255,22 +258,3 @@ public partial class PageViewModel : ExtensionObjectViewModel, IPageContext
        }
    }
 }
-
-public interface IPageContext
-{
-    void ShowException(Exception ex, string? extensionHint = null);
-
-    TaskScheduler Scheduler { get; }
-}
-
-public interface IPageViewModelFactoryService
-{
-    /// <summary>
-    /// Creates a new instance of the page view model for the given page type.
-    /// </summary>
-    /// <param name="page">The page for which to create the view model.</param>
-    /// <param name="nested">Indicates whether the page is not the top-level page.</param>
-    /// <param name="host">The command palette host that will host the page (for status messages)</param>
-    /// <returns>A new instance of the page view model.</returns>
-    PageViewModel? TryCreatePageViewModel(IPage page, bool nested, AppExtensionHost host);
-}
--- a/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/ProgressViewModel.cs
+++ b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/ProgressViewModel.cs
@@ -4,6 +4,7 @@

 using Microsoft.CmdPal.Core.ViewModels.Models;
 using Microsoft.CommandPalette.Extensions;
+using Microsoft.Extensions.Logging;

 namespace Microsoft.CmdPal.Core.ViewModels;

@@ -15,8 +16,8 @@ public partial class ProgressViewModel : ExtensionObjectViewModel

    public uint ProgressPercent { get; private set; }

-    public ProgressViewModel(IProgressState progress, WeakReference<IPageContext> context)
-        : base(context)
+    public ProgressViewModel(IProgressState progress, WeakReference<IPageContext> context, ILogger logger)
+        : base(context, logger)
    {
        Model = new(progress);
    }
--- a/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/ShellViewModel.cs
+++ b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/ShellViewModel.cs
@@ -6,10 +6,10 @@ using System.ComponentModel;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 using CommunityToolkit.Mvvm.Messaging;
-using Microsoft.CmdPal.Core.Common;
 using Microsoft.CmdPal.Core.ViewModels.Messages;
 using Microsoft.CmdPal.Core.ViewModels.Models;
 using Microsoft.CommandPalette.Extensions;
+using Microsoft.Extensions.Logging;

 namespace Microsoft.CmdPal.Core.ViewModels;

@@ -18,9 +18,10 @@ public partial class ShellViewModel : ObservableObject,
    IRecipient<HandleCommandResultMessage>
 {
    private readonly IRootPageService _rootPageService;
-    private readonly IAppHostService _appHostService;
-    private readonly TaskScheduler _scheduler;
+    private readonly AppExtensionHost _appHost;
+    private readonly TaskScheduler _scheduler = TaskScheduler.FromCurrentSynchronizationContext();
    private readonly IPageViewModelFactoryService _pageViewModelFactory;
+    private readonly ILogger _logger;
    private readonly Lock _invokeLock = new();
    private Task? _handleInvokeTask;

@@ -60,7 +61,7 @@ public partial class ShellViewModel : ObservableObject,
                    }
                    catch (Exception ex)
                    {
-                        CoreLogger.LogError(ex.ToString());
+                        Log_Exception(ex);
                    }
                }
            }
@@ -84,18 +85,18 @@ public partial class ShellViewModel : ObservableObject,
    public PageViewModel NullPage { get; private set; }

    public ShellViewModel(
-        TaskScheduler scheduler,
        IRootPageService rootPageService,
        IPageViewModelFactoryService pageViewModelFactory,
-        IAppHostService appHostService)
+        AppExtensionHost appHost,
+        ILogger<ShellViewModel> logger)
    {
        _pageViewModelFactory = pageViewModelFactory;
-        _scheduler = scheduler;
        _rootPageService = rootPageService;
-        _appHostService = appHostService;
+        _appHost = appHost;
+        _logger = logger;

-        NullPage = new NullPageViewModel(_scheduler, appHostService.GetDefaultHost());
-        _currentPage = new LoadingPageViewModel(null, _scheduler, appHostService.GetDefaultHost());
+        NullPage = new NullPageViewModel(_appHost, _logger);
+        _currentPage = new LoadingPageViewModel(null, _appHost, _logger);

        // Register to receive messages
        WeakReferenceMessenger.Default.Register<PerformCommandMessage>(this);
@@ -162,7 +163,7 @@ public partial class ShellViewModel : ObservableObject,
                    {
                        if (viewModel.InitializeCommand.ExecutionTask.Exception is AggregateException ex)
                        {
-                            CoreLogger.LogError(ex.ToString());
+                            Log_Exception(ex);
                        }
                    }
                    else
@@ -180,7 +181,7 @@ public partial class ShellViewModel : ObservableObject,
                                        }
                                        catch (Exception ex)
                                        {
-                                            CoreLogger.LogError(ex.ToString());
+                                            Log_Exception(ex);
                                        }
                                    }

@@ -210,7 +211,7 @@ public partial class ShellViewModel : ObservableObject,
                    }
                    catch (Exception ex)
                    {
-                        CoreLogger.LogError(ex.ToString());
+                        Log_Exception(ex);
                    }
                }

@@ -240,7 +241,7 @@ public partial class ShellViewModel : ObservableObject,
            }
            catch (Exception ex)
            {
-                CoreLogger.LogError(ex.ToString());
+                Log_Exception(ex);
            }
            finally
            {
@@ -256,7 +257,7 @@ public partial class ShellViewModel : ObservableObject,
            return;
        }

-        var host = _appHostService.GetHostForCommand(message.Context, CurrentPage.ExtensionHost);
+        var host = _appHost.GetHostForCommand(message.Context, CurrentPage.ExtensionHost);

        _rootPageService.OnPerformCommand(message.Context, !CurrentPage.IsNested, host);

@@ -264,7 +265,7 @@ public partial class ShellViewModel : ObservableObject,
        {
            if (command is IPage page)
            {
-                CoreLogger.LogDebug($"Navigating to page");
+                Log_NavigateToPage();

                var isMainPage = command == _rootPage;
                _isNested = !isMainPage;
@@ -273,7 +274,7 @@ public partial class ShellViewModel : ObservableObject,
                var pageViewModel = _pageViewModelFactory.TryCreatePageViewModel(page, _isNested, host);
                if (pageViewModel is null)
                {
-                    CoreLogger.LogError($"Failed to create ViewModel for page {page.GetType().Name}");
+                    Log_FailedToCreateViewModel(page.GetType().Name);
                    throw new NotSupportedException();
                }

@@ -303,7 +304,7 @@ public partial class ShellViewModel : ObservableObject,
            }
            else if (command is IInvokableCommand invokable)
            {
-                CoreLogger.LogDebug($"Invoking command");
+                Log_InvokingCommand();

                WeakReferenceMessenger.Default.Send<BeginInvokeMessage>();
                StartInvoke(message, invokable, host);
@@ -369,7 +370,7 @@ public partial class ShellViewModel : ObservableObject,
        }

        var kind = result.Kind;
-        CoreLogger.LogDebug($"handling {kind.ToString()}");
+        Log_HandlingCommandResult(kind.ToString());

        WeakReferenceMessenger.Default.Send<CmdPalInvokeResultMessage>(new(kind));
        switch (kind)
@@ -460,4 +461,19 @@ public partial class ShellViewModel : ObservableObject,
    {
        _navigationCts?.Cancel();
    }
+
+    [LoggerMessage(Level = LogLevel.Error)]
+    partial void Log_Exception(Exception exception);
+
+    [LoggerMessage(Level = LogLevel.Debug, Message = "Navigating to page")]
+    partial void Log_NavigateToPage();
+
+    [LoggerMessage(Level = LogLevel.Error, Message = "Failed to create ViewModel for page {PageTypeName}")]
+    partial void Log_FailedToCreateViewModel(string pageTypeName);
+
+    [LoggerMessage(Level = LogLevel.Debug, Message = "Invoking command")]
+    partial void Log_InvokingCommand();
+
+    [LoggerMessage(Level = LogLevel.Debug, Message = "Handling {CommandResultKind}")]
+    partial void Log_HandlingCommandResult(string commandResultKind);
 }
--- a/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/StatusMessageViewModel.cs
+++ b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/StatusMessageViewModel.cs
@@ -4,6 +4,7 @@

 using Microsoft.CmdPal.Core.ViewModels.Models;
 using Microsoft.CommandPalette.Extensions;
+using Microsoft.Extensions.Logging;

 namespace Microsoft.CmdPal.Core.ViewModels;

@@ -19,8 +20,8 @@ public partial class StatusMessageViewModel : ExtensionObjectViewModel

    public bool HasProgress => Progress is not null;

-    public StatusMessageViewModel(IStatusMessage message, WeakReference<IPageContext> context)
-        : base(context)
+    public StatusMessageViewModel(IStatusMessage message, WeakReference<IPageContext> context, ILogger logger)
+        : base(context, logger)
    {
        Model = new(message);
    }
@@ -38,7 +39,7 @@ public partial class StatusMessageViewModel : ExtensionObjectViewModel
        var modelProgress = model.Progress;
        if (modelProgress is not null)
        {
-            Progress = new(modelProgress, this.PageContext);
+            Progress = new(modelProgress, this.PageContext, Logger);
            Progress.InitializeProperties();
            UpdateProperty(nameof(HasProgress));
        }
@@ -78,7 +79,7 @@ public partial class StatusMessageViewModel : ExtensionObjectViewModel
                var modelProgress = model.Progress;
                if (modelProgress is not null)
                {
-                    Progress = new(modelProgress, this.PageContext);
+                    Progress = new(modelProgress, this.PageContext, Logger);
                    Progress.InitializeProperties();
                }
                else
--- a/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/TagViewModel.cs
+++ b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/TagViewModel.cs
@@ -4,10 +4,11 @@

 using Microsoft.CmdPal.Core.ViewModels.Models;
 using Microsoft.CommandPalette.Extensions;
+using Microsoft.Extensions.Logging;

 namespace Microsoft.CmdPal.Core.ViewModels;

-public partial class TagViewModel(ITag _tag, WeakReference<IPageContext> context) : ExtensionObjectViewModel(context)
+public partial class TagViewModel(ITag _tag, WeakReference<IPageContext> context, ILogger logger) : ExtensionObjectViewModel(context, logger)
 {
    private readonly ExtensionObject<ITag> _tagModel = new(_tag);

--- a/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/CommandPaletteContentPageViewModel.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/CommandPaletteContentPageViewModel.cs
@@ -4,23 +4,20 @@

 using Microsoft.CmdPal.Core.ViewModels;
 using Microsoft.CommandPalette.Extensions;
+using Microsoft.Extensions.Logging;

 namespace Microsoft.CmdPal.UI.ViewModels;

-public partial class CommandPaletteContentPageViewModel : ContentPageViewModel
+public partial class CommandPaletteContentPageViewModel(IContentPage model, AppExtensionHost host, ILogger logger)
+        : ContentPageViewModel(model, host, logger)
 {
-    public CommandPaletteContentPageViewModel(IContentPage model, TaskScheduler scheduler, AppExtensionHost host)
-        : base(model, scheduler, host)
-    {
-    }
-
    public override ContentViewModel? ViewModelFromContent(IContent content, WeakReference<IPageContext> context)
    {
        ContentViewModel? viewModel = content switch
        {
-            IFormContent form => new ContentFormViewModel(form, context),
-            IMarkdownContent markdown => new ContentMarkdownViewModel(markdown, context),
-            ITreeContent tree => new ContentTreeViewModel(tree, context),
+            IFormContent form => new ContentFormViewModel(form, context, Logger),
+            IMarkdownContent markdown => new ContentMarkdownViewModel(markdown, context, Logger),
+            ITreeContent tree => new ContentTreeViewModel(tree, context, Logger),
            _ => null,
        };
        return viewModel;
--- a/Show More
+++ b/Show More