Update VSCode task for streamline build + fix prompts syntax error

This uses IVirtualDesktopManagerInternal*, which is an undocumented
Windows Shell internal API.
These interfaces are not stable and can change across Windows updates,
so using them in PowerToys carries some long-term risk

.github/actions/spell-check/allow/code.txt

@@ -330,6 +330,9 @@ HHH
 riday
 YYY
 
+# Unicode
+precomposed
+
 # GitHub issue/PR commands
 azp
 feedbackhub

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

@@ -216,6 +216,7 @@ CImage
 cla
 CLASSDC
 CLASSNOTAVAILABLE
+CLEARTYPE
 clickable
 clickonce
 CLIENTEDGE
@@ -253,6 +254,7 @@ colorhistory
 colorhistorylimit
 COLORKEY
 colorref
+Convs
 comctl
 comdlg
 comexp
@@ -363,6 +365,7 @@ DEFAULTICON
 defaultlib
 DEFAULTONLY
 DEFAULTTONEAREST
+Defaulttonearest
 DEFAULTTONULL
 DEFAULTTOPRIMARY
 DEFERERASE
@@ -529,9 +532,12 @@ eyetracker
 FANCYZONESDRAWLAYOUTTEST
 FANCYZONESEDITOR
 FARPROC
+fdw
 fdx
+FErase
 fesf
 FFFF
+FInc
 Figma
 FILEEXPLORER
 fileexploreraddons
@@ -573,6 +579,7 @@ formatetc
 FORPARSING
 foundrylocal
 FRAMECHANGED
+FRestore
 frm
 FROMTOUCH
 fsanitize
@@ -607,6 +614,7 @@ GETSCREENSAVERRUNNING
 GETSECKEY
 GETSTICKYKEYS
 GETTEXTLENGTH
+gfx
 GHND
 gitmodules
 GMEM
@@ -657,6 +665,7 @@ hdwwiz
 Helpline
 helptext
 HGFE
+hgdiobj
 hglobal
 hhk
 HHmmssfff
@@ -704,7 +713,7 @@ hotlight
 hotspot
 HPAINTBUFFER
 HRAWINPUT
-HREDRAW
+hredraw
 hres
 hresult
 hrgn
@@ -857,6 +866,7 @@ lastcodeanalysissucceeded
 LASTEXITCODE
 LAYOUTRTL
 lbl
+Lbuttondown
 LCh
 lcid
 LCIDTo
@@ -882,7 +892,7 @@ LINKOVERLAY
 LINQTo
 listview
 LIVEDRAW
-LIVEZOOM
+livezoom
 LLKH
 llkhf
 LMEM
@@ -911,6 +921,7 @@ LPBITMAPINFOHEADER
 LPCFHOOKPROC
 LPCITEMIDLIST
 LPCLSID
+lpch
 lpcmi
 LPCMINVOKECOMMANDINFO
 LPCREATESTRUCT
@@ -935,6 +946,7 @@ lptpm
 LPTR
 LPTSTR
 lpv
+LPrivate
 LPW
 lpwcx
 lpwndpl
@@ -977,6 +989,7 @@ maxversiontested
 mber
 MBM
 MBR
+Mbuttondown
 MDICHILD
 MDL
 mdtext
@@ -1349,6 +1362,7 @@ ppv
 ppwsz
 prc
 Prefixer
+Premul
 prependpath
 prepopulate
 prevhost
@@ -1434,6 +1448,7 @@ RAWINPUTHEADER
 RAWMODE
 RAWPATH
 rbhid
+Rbuttondown
 rclsid
 RCZOOMIT
 remotedesktop
@@ -1469,6 +1484,7 @@ remoteip
 Removelnk
 renamable
 RENAMEONCOLLISION
+RENDERFULLCONTENT
 reparented
 reparenting
 reportfileaccesses
@@ -1735,6 +1751,7 @@ svgz
 SVSI
 SWFO
 SWP
+Swp
 SWPNOSIZE
 SWPNOZORDER
 SWRESTORE
@@ -1754,6 +1771,7 @@ syskeydown
 SYSKEYUP
 SYSLIB
 SYSMENU
+Sysmenu
 systemai
 SYSTEMAPPS
 SYSTEMMODAL
@@ -1799,7 +1817,6 @@ TILEDWINDOW
 TILLSON
 timedate
 timediff
-timeunion
 timeutil
 TITLEBARINFO
 Titlecase
@@ -1904,7 +1921,7 @@ valuegenerator
 variantassignment
 VARTYPE
 vcamp
-VCENTER
+vcenter
 vcgtq
 VCINSTALLDIR
 Vcpkg
@@ -1936,7 +1953,7 @@ vorrq
 VOS
 vpaddlq
 vqsubq
-VREDRAW
+vredraw
 vreinterpretq
 VSC
 VSCBD
@@ -2079,6 +2096,7 @@ Wwanpp
 xap
 XAxis
 XButton
+Xbuttondown
 xclip
 xcopy
 XDeployment

.github/copilot-instructions.md

@@ -48,9 +48,9 @@ This is the top-level guide for AI changes. Keep edits small, follow existing pa
 - `doc/devdocs/modules/readme.md`
 
 # Language style rules
-- Always enforce repo analyzers: root `.editorconfig` plus any `stylecop.json`.
+- Always enforce repo analyzers: `src/.editorconfig` plus any `stylecop.json`.
 - C# code follows StyleCop.Analyzers and Microsoft.CodeAnalysis.NetAnalyzers.
-- C++ code honors `.clang-format` plus `.clang-tidy` (modernize/cppcoreguidelines/readability).
+- C++ code honors `src/.clang-format` for formatting.
 - Markdown files wrap at 80 characters and use ATX headers with fenced code blocks that include language tags.
 - YAML files indent two spaces and add comments for complex settings while keeping keys clear.
 - PowerShell scripts use Verb-Noun names and prefer single-quoted literals while documenting parameters and satisfying PSScriptAnalyzer.

.github/prompts/create-commit-title.prompt.md

@@ -1,6 +1,5 @@
----
-mode: 'agent'
-model: Claude Sonnet 4.5
+agent: 'agent'
+model: GPT-5.1-Codex-Max
 description: 'Generate an 80-character git commit title for the local diff.'
 ---
 

.github/prompts/create-pr-summary.prompt.md

@@ -1,6 +1,5 @@
----
-mode: 'agent'
-model: Claude Sonnet 4.5
+agent: 'agent'
+model: GPT-5.1-Codex-Max
 description: 'Generate a PowerToys-ready pull request description from the local diff.'
 ---
 

.github/prompts/fix-issue.prompt.md

@@ -1,7 +1,6 @@
----
-mode: 'agent'
-model: GPT-5-Codex (Preview)
-description: "  Execute the fix for a GitHub issue using the previously generated implementation plan. Apply code & tests directly in the repo. Output only a PR description (and optional manual steps)."
+agent: 'agent'
+model: GPT-5.1-Codex-Max
+description: "Execute the fix for a GitHub issue using the previously generated implementation plan. Apply code & tests directly in the repo. Output only a PR description (and optional manual steps)."
 ---
 
 # DEPENDENCY

.github/prompts/fix-spelling.prompt.md

@@ -1,6 +1,5 @@
----
-mode: 'agent'
-model: GPT-5-Codex (Preview)
+agent: 'agent'
+model: GPT-5.1-Codex-Max
 description: 'Resolve Code scanning / check-spelling comments on the active PR.'
 ---
 

.github/prompts/review-issue.prompt.md

@@ -1,7 +1,6 @@
----
-mode: 'agent'
-model: Claude Sonnet 4.5
-description: "You are github issue review and planning expertise, Score (0–100) and write one Implementation Plan. Outputs: overview.md, implementation-plan.md."
+agent: 'agent'
+model: GPT-5.1-Codex-Max
+description: "You are a GitHub issue review and planning expert; score (0-100) and write one implementation plan. Outputs: overview.md, implementation-plan.md."
 ---
 
 # GOAL
@@ -10,11 +9,11 @@ For **#{{issue_number}}** produce:
 2) `Generated Files/issueReview/{{issue_number}}/implementation-plan.md`
 
 ## Inputs
-  figure out from the prompt on the 
+Figure out required inputs {{issue_number}} from the invocation context; if anything is missing, ask for the value or note it as a gap.
 
 # CONTEXT (brief)
-Ground evidence using `gh issue view {{issue_number}} --json number,title,body,author,createdAt,updatedAt,state,labels,milestone,reactions,comments,linkedPullRequests`, and download the image for understand the context of the issue more.
-Locate source code in current workspace, but also free feel to use via `rg`/`git grep`. Link related issues/PRs.
+Ground evidence using `gh issue view {{issue_number}} --json number,title,body,author,createdAt,updatedAt,state,labels,milestone,reactions,comments,linkedPullRequests`, and download images to better understand the issue context.
+Locate source code in the current workspace; feel free to use `rg`/`git grep`. Link related issues and PRs.
 
 # OVERVIEW.MD
 ## Summary

.github/prompts/review-pr.prompt.md

@@ -1,6 +1,5 @@
----
-mode: 'agent'
-model: Claude Sonnet 4.5
+agent: 'agent'
+model: GPT-5.1-Codex-Max
 description: "gh-driven PR review; per-step Markdown + machine-readable outputs"
 ---
 

.gitignore

@@ -358,4 +358,4 @@ src/common/Telemetry/*.etl
 /src/settings-ui/Settings.UI/Assets/Settings/search.index.json
 
 # PowerToysInstaller Build Temp Files
-installer/*/*.wxs.bk
+installer/*/*.wxs.bk

.pipelines/ESRPSigning_core.json

@@ -117,6 +117,7 @@
             "WinUI3Apps\\PowerToys.FileLocksmithUI.dll",
             "WinUI3Apps\\PowerToys.FileLocksmithContextMenu.dll",
             "FileLocksmithContextMenuPackage.msix",
+            "FileLocksmithCLI.exe",
 
             "WinUI3Apps\\Peek.Common.dll",
             "WinUI3Apps\\Peek.FilePreviewer.dll",
@@ -131,6 +132,8 @@
 
             "PowerToys.ImageResizer.exe",
             "PowerToys.ImageResizer.dll",
+            "WinUI3Apps\\PowerToys.ImageResizerCLI.exe",
+            "WinUI3Apps\\PowerToys.ImageResizerCLI.dll",
             "PowerToys.ImageResizerExt.dll",
             "PowerToys.ImageResizerContextMenu.dll",
             "ImageResizerContextMenuPackage.msix",
@@ -235,6 +238,14 @@
 
             "PowerToys.CmdPalModuleInterface.dll",
             "CmdPalKeyboardService.dll",
+            "PowerToys.ModuleContracts.dll",
+            "Awake.ModuleServices.dll",
+            "ColorPicker.ModuleServices.dll",
+            "Workspaces.ModuleServices.dll",
+            "Microsoft.CommandPalette.Extensions.dll",
+            "Microsoft.CommandPalette.Extensions.Toolkit.dll",
+            "Microsoft.CmdPal.Ext.PowerToys.dll",
+            "Microsoft.CmdPal.Ext.PowerToys.exe",
             "*Microsoft.CmdPal.UI_*.msix",
 
             "PowerToys.DSC.dll",
@@ -358,9 +369,13 @@
                 "boost_regex-vc143-mt-x32-1_87.dll",
                 "boost_regex-vc143-mt-x64-1_87.dll",
 
+                "Microsoft.ML.OnnxRuntime.dll",
+
                 "UnitsNet.dll",
                 "UtfUnknown.dll",
-                "Wpf.Ui.dll"
+                "Wpf.Ui.dll",
+                "Shmuelie.WinRTServer.dll",
+                "ToolGood.Words.Pinyin.dll"
             ],
             "SigningInfo": {
                 "Operations": [

.pipelines/v2/templates/job-build-project.yml

@@ -624,4 +624,4 @@ jobs:
     - publish: $(JobOutputDirectory)
       artifact: $(JobOutputArtifactName)-failure-$(System.JobAttempt)
       displayName: Publish failure logs
-      condition: or(failed(), canceled())
+      condition: or(failed(), canceled())

.pipelines/v2/templates/job-build-ui-tests.yml

@@ -68,14 +68,13 @@ jobs:
 
   - template: .\steps-restore-nuget.yml
 
-  - task: NuGetCommand@2
+  - task: MSBuild@1
     displayName: Restore solution-level NuGet packages
     inputs:
-      command: restore
-      feedsToUse: config
-      configPath: nuget.config
-      restoreSolution: PowerToys.slnx
-      restoreDirectory: '$(Build.SourcesDirectory)\packages'
+      solution: PowerToys.slnx
+      msbuildArguments: '/t:restore /p:RestorePackagesConfig=true'
+      platform: $(BuildPlatform)
+      configuration: $(BuildConfiguration)
 
   # Build all UI test projects if no specific modules are specified
   - ${{ if eq(length(parameters.uiTestModules), 0) }}:

.pipelines/versionAndSignCheck.ps1

@@ -104,4 +104,4 @@ if ($totalFailure -gt 0) {
     exit 1
 }
 
-exit 0
+exit 0

.vscode/tasks.json

@@ -0,0 +1,106 @@
+{
+  "version": "2.0.0",
+  "windows": {
+    "options": {
+      "shell": {
+        "executable": "cmd.exe",
+        "args": ["/d", "/c"]
+      }
+    }
+  },
+
+  "inputs": [
+    {
+      "id": "config",
+      "type": "pickString",
+      "description": "Configuration",
+      "options": ["Debug", "Release"],
+      "default": "Debug"
+    },
+    {
+      "id": "platform",
+      "type": "pickString",
+      "description": "Platform (leave empty to auto-detect host platform)",
+      "options": ["", "X64", "ARM64"],
+      "default": "X64"
+    },
+    {
+      "id": "msbuildExtra",
+      "type": "promptString",
+      "description": "Extra MSBuild args (optional). Example: /p:CIBuild=true /m",
+      "default": ""
+    }
+  ],
+
+  "tasks": [
+    {
+      "label": "PT: Build (quick)",
+      "type": "shell",
+      "command": "\"${workspaceFolder}\\tools\\build\\build.cmd\"",
+      "args": [
+        "-Path",
+        "${fileDirname}"
+      ],
+      "group": { "kind": "build", "isDefault": true },
+      "presentation": {
+        "reveal": "always",
+        "panel": "dedicated",
+        "clear": true
+      },
+      "problemMatcher": "$msCompile"
+    },
+
+    {
+      "label": "PT: Build (with options)",
+      "type": "shell",
+      "command": "\"${workspaceFolder}\\tools\\build\\build.cmd\"",
+      "args": [
+        "-Path",
+        "${fileDirname}",
+        "-Platform",
+        "${input:platform}",
+        "-Configuration",
+        "${input:config}",
+        "${input:msbuildExtra}"
+      ],
+      "presentation": {
+        "reveal": "always",
+        "panel": "dedicated",
+        "clear": true
+      },
+      "problemMatcher": "$msCompile"
+    },
+
+    {
+      "label": "PT: Build Essentials (quick)",
+      "type": "shell",
+      "command": "\"${workspaceFolder}\\tools\\build\\build-essentials.cmd\"",
+      "args": [],
+      "presentation": {
+        "reveal": "always",
+        "panel": "dedicated",
+        "clear": true
+      },
+      "problemMatcher": "$msCompile"
+    },
+
+    {
+      "label": "PT: Build Essentials (with options)",
+      "type": "shell",
+      "command": "\"${workspaceFolder}\\tools\\build\\build-essentials.cmd\"",
+      "args": [
+        "-Platform",
+        "${input:platform}",
+        "-Configuration",
+        "${input:config}",
+        "${input:msbuildExtra}"
+      ],
+      "presentation": {
+        "reveal": "always",
+        "panel": "dedicated",
+        "clear": true
+      },
+      "problemMatcher": "$msCompile"
+    }
+  ]
+}

COMMUNITY.md

@@ -6,9 +6,6 @@ Names are in alphabetical order based on first name.
 
 ## High impact community members
 
-### [@Noraa-Junker](https://github.com/Noraa-Junker) - [Noraa Junker](https://noraajunker.ch)
-Noraa has helped triaging, discussing, and creating a substantial number of issues and contributed features/fixes. Noraa was the primary person for helping build the File Explorer preview pane handler for developer files.
-
 ### [@cgaarden](https://github.com/cgaarden) - [Christian Gaarden Gaardmark](https://www.onegreatworld.com) 
 Christian contributed New+ utility
 
@@ -42,6 +39,12 @@ Jay has helped triaging, discussing, creating a substantial number of issues and
 ### [@jefflord](https://github.com/Jjefflord) - Jeff Lord
 Jeff added in multiple new features into Keyboard manager, such as key chord support and launching apps. He also contributed multiple features/fixes to PowerToys.
 
+### [@snickler](https://github.com/snickler) - [Jeremy Sinclair](http://sinclairinat0r.com)
+Jeremy has helped drive large sums of the ARM64 support inside PowerToys
+
+### [@jiripolasek](https://github.com/jiripolasek) - [Jiří Polášek](https://github.com/jiripolasek)
+Jiří has contributed a massive number of features and improvements to Command Palette, including drag & drop support, custom themes, Web Search enhancements, Remote Desktop extension fixes, and many UX improvements.
+
 ### [@TheJoeFin](https://github.com/TheJoeFin) - [Joe Finney](https://joefinapps.com)
 Joe has helped triaging, discussing, issues as well as fixing bugs and building features for Text Extractor.
 
@@ -57,6 +60,9 @@ Color Picker is from Martin.
 ### [@mikeclayton](https://github.com/mikeclayton) - [Michael Clayton](https://michael-clayton.com)
 Michael contributed the [initial version](https://github.com/microsoft/PowerToys/issues/23216) of the Mouse Jump tool and [a number of updates](https://github.com/microsoft/PowerToys/pulls?q=is%3Apr+author%3Amikeclayton) based on his FancyMouse utility.
 
+### [@Noraa-Junker](https://github.com/Noraa-Junker) - [Noraa Junker](https://noraajunker.ch)
+Noraa has helped triaging, discussing, and creating a substantial number of issues and contributed features/fixes. Noraa was the primary person for helping build the File Explorer preview pane handler for developer files.
+
 ### [@pedrolamas](https://github.com/pedrolamas/) - Pedro Lamas
 Pedro helped create the thumbnail and File Explorer previewers for 3D files like STL and GCode.  If you like 3D printing, these are very helpful.
 
@@ -69,15 +75,12 @@ Rafael has helped do the [upgrade from CppWinRT 1.x to 2.0](https://github.com/m
 ### [@royvou](https://github.com/royvou)
 Roy has helped out contributing multiple features to PowerToys Run
 
-### [@snickler](https://github.com/snickler) - [Jeremy Sinclair](http://sinclairinat0r.com)
-Jeremy has helped drive large sums of the ARM64 support inside PowerToys
+### [@ThiefZero](https://github.com/ThiefZero)
+ThiefZero has helped out contributing a features to PowerToys Run such as the unit converter plugin
 
 ### [@TobiasSekan](https://github.com/TobiasSekan) - Tobias Sekan
 Tobias Sekan has helped out contributing features to PowerToys Run such as Settings plugin, Registry plugin
 
-### [@ThiefZero](https://github.com/ThiefZero)
-ThiefZero has helped out contributing a features to PowerToys Run such as the unit converter plugin
-
 ## Open source projects
 
 As PowerToys creates new utilities, some will be based off existing technology. We'll continue to do our best to contribute back to these projects but their efforts were the base of some of our projects. We want to be sure their work is directly recognized.
@@ -187,18 +190,10 @@ ZoomIt source code was originally implemented by [Sysinternals](https://sysinter
 - [@niels9001](https://github.com/niels9001/) - Niels Laute - Product Manager
 - [@dhowett](https://github.com/dhowett) - Dustin Howett - Dev Lead
 - [@yeelam-gordon](https://github.com/yeelam-gordon) - Gordon Lam - Dev Lead
-- [@jamrobot](https://github.com/jamrobot) - Jerry Xu - Dev Lead
 - [@lei9444](https://github.com/lei9444) - Leilei Zhang - Dev
 - [@shuaiyuanxx](https://github.com/shuaiyuanxx) - Shawn Yuan - Dev
 - [@moooyo](https://github.com/moooyo) - Yu Leng - Dev
 - [@haoliuu](https://github.com/haoliuu) - Hao Liu - Dev
-- [@chenmy77](https://github.com/chenmy77) - Mengyuan Chen - Dev
-- [@chemwolf6922](https://github.com/chemwolf6922) - Feng Wang - Dev
-- [@yaqingmi](https://github.com/yaqingmi) - Yaqing Mi - Dev
-- [@zhaoqpcn](https://github.com/zhaoqpcn) - Qingpeng Zhao - Dev
-- [@urnotdfs](https://github.com/urnotdfs) - Xiaofeng Wang - Dev
-- [@zhaopy536](https://github.com/zhaopy536) - Peiyao Zhao - Dev
-- [@wang563681252](https://github.com/wang563681252) - Zhaopeng Wang - Dev
 - [@vanzue](https://github.com/vanzue) - Kai Tao - Dev
 - [@zadjii-msft](https://github.com/zadjii-msft) - Mike Griese - Dev
 - [@khmyznikov](https://github.com/khmyznikov) - Gleb Khmyznikov - Dev
@@ -229,3 +224,12 @@ ZoomIt source code was originally implemented by [Sysinternals](https://sysinter
 - [@SeraphimaZykova](https://github.com/SeraphimaZykova) - Seraphima Zykova - Dev
 - [@stefansjfw](https://github.com/stefansjfw) - Stefan Markovic - Dev
 - [@jaimecbernardo](https://github.com/jaimecbernardo) - Jaime Bernardo - Dev Lead
+- [@haoliuu](https://github.com/haoliuu) - Hao Liu - Dev
+- [@chenmy77](https://github.com/chenmy77) - Mengyuan Chen - Dev
+- [@chemwolf6922](https://github.com/chemwolf6922) - Feng Wang - Dev
+- [@yaqingmi](https://github.com/yaqingmi) - Yaqing Mi - Dev
+- [@zhaoqpcn](https://github.com/zhaoqpcn) - Qingpeng Zhao - Dev
+- [@urnotdfs](https://github.com/urnotdfs) - Xiaofeng Wang - Dev
+- [@zhaopy536](https://github.com/zhaopy536) - Peiyao Zhao - Dev
+- [@wang563681252](https://github.com/wang563681252) - Zhaopeng Wang - Dev
+- [@jamrobot](https://github.com/jamrobot) - Jerry Xu - Dev Lead

DATA_AND_PRIVACY.md

@@ -444,6 +444,10 @@ _If you want to find diagnostic data events in the source code, these two links
     <td>Microsoft.PowerToys.FancyZones_ZoneWindowKeyUp</td>
     <td>Occurs when a key is released while interacting with zones.</td>
   </tr>
+  <tr>
+    <td>Microsoft.PowerToys.FancyZones_CLICommand</td>
+    <td>Triggered when a FancyZones CLI command is executed, logging the command name and success status.</td>
+  </tr>
 </table>
 
 ### FileExplorerAddOns
@@ -690,6 +694,30 @@ _If you want to find diagnostic data events in the source code, these two links
   </tr>
 </table>
 
+### Light Switch
+<table style="width:100%">
+  <tr>
+    <th>Event Name</th>
+    <th>Description</th>
+  </tr>
+  <tr>
+    <td>Microsoft.PowerToys.LightSwitch_EnableLightSwitch</td>
+    <td>Triggered when Light Switch is enabled or disabled.</td>
+  </tr>
+  <tr>
+    <td>Microsoft.PowerToys.LightSwitch_ShortcutInvoked</td>
+    <td>Occurs when the shortcut for Light Switch is invoked.</td>
+  </tr>
+  <tr>
+    <td>Microsoft.PowerToys.LightSwitch_ScheduleModeToggled</td>
+    <td>Occurs when a new schedule mode is selected for Light Switch.</td>
+  </tr>
+  <tr>
+    <td>Microsoft.PowerToys.LightSwitch_ThemeTargetChanged</td>
+    <td>Occurs when the options for targeting the system or apps is updated.</td>
+  </tr>
+</table>
+
 ### Mouse Highlighter
 <table style="width:100%">
   <tr>

Directory.Packages.props

@@ -37,6 +37,7 @@
     <!-- Including MessagePack to force version, since it's used by StreamJsonRpc but contains vulnerabilities. After StreamJsonRpc updates the version of MessagePack, we can upgrade StreamJsonRpc instead. -->
     <PackageVersion Include="MessagePack" Version="3.1.3" />
     <PackageVersion Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="9.0.0" />
+    <PackageVersion Include="Microsoft.CommandPalette.Extensions" Version="0.5.250829002" />
     <PackageVersion Include="Microsoft.Data.Sqlite" Version="9.0.10" />
     <!-- Including Microsoft.Bcl.AsyncInterfaces to force version, since it's used by Microsoft.SemanticKernel. -->
     <PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="9.0.10" />
@@ -94,6 +95,7 @@
     <PackageVersion Include="RtfPipe" Version="2.0.7677.4303" />
     <PackageVersion Include="ScipBe.Common.Office.OneNote" Version="3.0.1" />
     <PackageVersion Include="SharpCompress" Version="0.37.2" />
+    <PackageVersion Include="Shmuelie.WinRTServer" Version="2.1.1" />
     <!-- Don't update SkiaSharp.Views.WinUI to version 3.* branch as this brakes the HexBox control in Registry Preview. -->
     <PackageVersion Include="SkiaSharp.Views.WinUI" Version="2.88.9" />
     <PackageVersion Include="StreamJsonRpc" Version="2.21.69" />
@@ -145,4 +147,4 @@
     <PackageVersion Include="Microsoft.VariantAssignment.Client" Version="2.4.17140001" />
     <PackageVersion Include="Microsoft.VariantAssignment.Contract" Version="3.0.16990001" />
   </ItemGroup>
-</Project>
+</Project>

NOTICE.md

@@ -1560,6 +1560,7 @@ SOFTWARE.
 - ReverseMarkdown
 - ScipBe.Common.Office.OneNote
 - SharpCompress
+- Shmuelie.WinRTServer
 - SkiaSharp.Views.WinUI
 - StreamJsonRpc
 - StyleCop.Analyzers

PowerToys.slnx

@@ -44,6 +44,10 @@
       <Platform Solution="*|ARM64" Project="ARM64" />
       <Platform Solution="*|x64" Project="x64" />
     </Project>
+    <Project Path="src/common/PowerToys.ModuleContracts/PowerToys.ModuleContracts.csproj">
+      <Platform Solution="*|ARM64" Project="ARM64" />
+      <Platform Solution="*|x64" Project="x64" />
+    </Project>
     <Project Path="src/common/SettingsAPI/SettingsAPI.vcxproj" Id="6955446d-23f7-4023-9bb3-8657f904af99" />
     <Project Path="src/common/Themes/Themes.vcxproj" Id="98537082-0fdb-40de-abd8-0dc5a4269bab" />
     <Project Path="src/common/UITestAutomation/UITestAutomation.csproj">
@@ -156,6 +160,10 @@
     <Project Path="src/modules/alwaysontop/AlwaysOnTopModuleInterface/AlwaysOnTopModuleInterface.vcxproj" Id="48a0a19e-a0be-4256-acf8-cc3b80291af9" />
   </Folder>
   <Folder Name="/modules/awake/">
+    <Project Path="src/modules/awake/Awake.ModuleServices/Awake.ModuleServices.csproj">
+      <Platform Solution="*|ARM64" Project="ARM64" />
+      <Platform Solution="*|x64" Project="x64" />
+    </Project>
     <Project Path="src/modules/awake/Awake/Awake.csproj">
       <Platform Solution="*|ARM64" Project="ARM64" />
       <Platform Solution="*|x64" Project="x64" />
@@ -166,6 +174,10 @@
     <Project Path="src/modules/cmdNotFound/CmdNotFoundModuleInterface/CmdNotFoundModuleInterface.vcxproj" Id="0014d652-901f-4456-8d65-06fc5f997fb0" />
   </Folder>
   <Folder Name="/modules/colorpicker/">
+    <Project Path="src/modules/colorPicker/ColorPicker.ModuleServices/ColorPicker.ModuleServices.csproj">
+      <Platform Solution="*|ARM64" Project="ARM64" />
+      <Platform Solution="*|x64" Project="x64" />
+    </Project>
     <Project Path="src/modules/colorPicker/ColorPicker/ColorPicker.vcxproj" Id="655c9af2-18d3-4da6-80e4-85504a7722ba">
       <BuildDependency Project="src/common/logger/logger.vcxproj" />
     </Project>
@@ -206,6 +218,11 @@
       <Platform Solution="*|x64" Project="x64" />
       <Deploy />
     </Project>
+    <Project Path="src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.PowerToys/Microsoft.CmdPal.Ext.PowerToys.csproj">
+      <Platform Solution="*|ARM64" Project="ARM64" />
+      <Platform Solution="*|x64" Project="x64" />
+      <Deploy />
+    </Project>
     <Project Path="src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Registry/Microsoft.CmdPal.Ext.Registry.csproj">
       <Platform Solution="*|ARM64" Project="ARM64" />
       <Platform Solution="*|x64" Project="x64" />
@@ -403,6 +420,7 @@
     </Project>
   </Folder>
   <Folder Name="/modules/FileLocksmith/">
+    <Project Path="src/modules/FileLocksmith/FileLocksmithCLI/FileLocksmithCLI.vcxproj" Id="49D456D3-F485-45AF-8875-45B44F193DDC" />
     <Project Path="src/modules/FileLocksmith/FileLocksmithContextMenu/FileLocksmithContextMenu.vcxproj" Id="799a50d8-de89-4ed1-8ff8-ad5a9ed8c0ca" />
     <Project Path="src/modules/FileLocksmith/FileLocksmithExt/FileLocksmithExt.vcxproj" Id="57175ec7-92a5-4c1e-8244-e3fbca2a81de" />
     <Project Path="src/modules/FileLocksmith/FileLocksmithLib/FileLocksmithLib.vcxproj" Id="9d52fd25-ef90-4f9a-a015-91efc5daf54f" />
@@ -412,6 +430,9 @@
       <Platform Solution="*|x64" Project="x64" />
     </Project>
   </Folder>
+  <Folder Name="/modules/FileLocksmith/Tests/">
+    <Project Path="src/modules/FileLocksmith/FileLocksmithCLI/tests/FileLocksmithCLIUnitTests.vcxproj" Id="A1B2C3D4-E5F6-7890-1234-567890ABCDEF" />
+  </Folder>
   <Folder Name="/modules/Hosts/">
     <Project Path="src/modules/Hosts/Hosts/Hosts.csproj">
       <Platform Solution="*|ARM64" Project="ARM64" />
@@ -442,6 +463,10 @@
       <Platform Solution="*|ARM64" Project="ARM64" />
       <Platform Solution="*|x64" Project="x64" />
     </Project>
+    <Project Path="src/modules/imageresizer/ImageResizerCLI/ImageResizerCLI.csproj">
+      <Platform Solution="*|ARM64" Project="ARM64" />
+      <Platform Solution="*|x64" Project="x64" />
+    </Project>
   </Folder>
   <Folder Name="/modules/imageresizer/Tests/">
     <Project Path="src/modules/imageresizer/tests/ImageResizer.UnitTests.csproj">
@@ -932,6 +957,10 @@
     <Project Path="src/modules/ShortcutGuide/ShortcutGuideModuleInterface/ShortcutGuideModuleInterface.vcxproj" Id="2d604c07-51fc-46bb-9eb7-75aecc7f5e81" />
   </Folder>
   <Folder Name="/modules/Workspaces/">
+    <Project Path="src/modules/Workspaces/Workspaces.ModuleServices/Workspaces.ModuleServices.csproj">
+      <Platform Solution="*|ARM64" Project="ARM64" />
+      <Platform Solution="*|x64" Project="x64" />
+    </Project>
     <Project Path="src/modules/Workspaces/WorkspacesCsharpLibrary/WorkspacesCsharpLibrary.csproj">
       <Platform Solution="*|ARM64" Project="ARM64" />
       <Platform Solution="*|x64" Project="x64" />
@@ -976,6 +1005,14 @@
     <Project Path="src/modules/ZoomIt/ZoomItSettingsInterop/ZoomItSettingsInterop.vcxproj" Id="ca7d8106-30b9-4aec-9d05-b69b31b8c461" />
   </Folder>
   <Folder Name="/settings-ui/">
+    <Project Path="src/settings-ui/QuickAccess.UI/PowerToys.QuickAccess.csproj">
+      <Platform Solution="*|ARM64" Project="ARM64" />
+      <Platform Solution="*|x64" Project="x64" />
+    </Project>
+    <Project Path="src/settings-ui/Settings.UI.Controls/Settings.UI.Controls.csproj">
+      <Platform Solution="*|ARM64" Project="ARM64" />
+      <Platform Solution="*|x64" Project="x64" />
+    </Project>
     <Project Path="src/settings-ui/Settings.UI.Library/Settings.UI.Library.csproj">
       <Platform Solution="*|ARM64" Project="ARM64" />
       <Platform Solution="*|x64" Project="x64" />

doc/devdocs/cli-conventions.md

@@ -0,0 +1,93 @@
+# CLI Conventions
+
+This document describes the conventions for implementing command-line interfaces (CLI) in PowerToys modules.
+
+## Library
+
+Use the **System.CommandLine** library for CLI argument parsing. This is already defined in `Directory.Packages.props`:
+
+```xml
+<PackageReference Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
+```
+
+Add the reference to your project:
+
+```xml
+<PackageReference Include="System.CommandLine" />
+```
+
+## Option Naming and Definition
+
+- Use `--kebab-case` for long form (e.g., `--shrink-only`).
+- Use single `-x` for short form (e.g., `-s`, `-w`).
+- Define aliases as static readonly arrays: `["--silent", "-s"]`.
+- Create options using `Option<T>` with descriptive help text.
+- Add validators for options that require range or format checking.
+
+## RootCommand Setup
+
+- Create a `RootCommand` with a brief description.
+- Add all options and arguments to the command.
+
+## Parsing
+
+- Use `Parser(rootCommand).Parse(args)` to parse CLI arguments.
+- Extract option values using `parseResult.GetValueForOption()`.
+- Note: Use `Parser` directly; `RootCommand.Parse()` may not be available with the pinned System.CommandLine version.
+
+### Parse/Validation Errors
+
+- On parse/validation errors, print error messages and usage, then exit with non-zero code.
+
+## Examples
+
+Reference implementations:
+- Awake: `src/modules/Awake/Awake/Program.cs`
+- ImageResizer: `src/modules/imageresizer/ui/Cli/`
+
+## Help Output
+
+- Provide a `PrintUsage()` method for custom help formatting if needed.
+
+## Best Practices
+
+1. **Consistency**: Follow existing module patterns.
+2. **Documentation**: Always provide help text for each option.
+3. **Validation**: Validate input and provide clear error messages.
+4. **Atomicity**: Make one logical change per PR; avoid drive-by refactors.
+5. **Build/Test Discipline**: Build and test synchronously, one terminal per operation.
+6. **Style**: Follow repo analyzers (`.editorconfig`, StyleCop) and formatting rules.
+
+## Logging Requirements
+
+- Use `ManagedCommon.Logger` for consistent logging.
+- Initialize logging early in `Main()`.
+- Use dual output (console + log file) for errors and warnings to ensure visibility.
+- Reference: `src/modules/imageresizer/ui/Cli/CliLogger.cs`
+
+## Error Handling
+
+### Exit Codes
+
+- `0`: Success
+- `1`: General error (parsing, validation, runtime)
+- `2`: Invalid arguments (optional)
+
+### Exception Handling
+
+- Always wrap `Main()` in try-catch for unhandled exceptions.
+- Log exceptions before exiting with non-zero code.
+- Display user-friendly error messages to stderr.
+- Preserve detailed stack traces in log files only.
+
+## Testing Requirements
+
+- Include tests for argument parsing, validation, and edge cases.
+- Place CLI tests in module-specific test projects (e.g., `src/modules/[module]/tests/*CliTests.cs`).
+
+## Signing and Deployment
+
+- CLI executables are signed automatically in CI/CD.
+- **New CLI tools**: Add your executable and dll to `.pipelines/ESRPSigning_core.json` in the signing list.
+- CLI executables are deployed alongside their parent module (e.g., `C:\Program Files\PowerToys\modules\[ModuleName]\`).
+- Use self-contained deployment (import `Common.SelfContained.props`).

doc/devdocs/guidance.md

@@ -58,8 +58,8 @@ string validUIDisplayString = Resources.ValidUIDisplayString;
 ## More On Coding Guidance
 Please review these brief docs below relating to our coding standards, etc.
 
-* [Coding Style](./style.md)
-* [Code Organization](./readme.md)
+* [Coding Style](development/style.md)
+* [Code Organization](readme.md)
 
 
 [VS Resource Editor]: https://learn.microsoft.com/cpp/windows/resource-editors?view=vs-2019

doc/devdocs/modules/cropandlock.md

@@ -20,6 +20,9 @@ Creates a window showing the selected area of the original window. Changes in th
 ### Reparent Mode
 Creates a window that replaces the original window, showing only the selected area. The application is controlled through the cropped window.
 
+### Screenshot Mode
+Creates a window showing a freezed snapshot of the original window. 
+
 ## Code Structure
 
 ### Project Layout
@@ -30,6 +33,7 @@ The Crop and Lock module is part of the PowerToys solution. All the logic-relate
 - **OverlayWindow.cpp**: Thumbnail module type's window concrete implementation.
 - **ReparentCropAndLockWindow.cpp**: Defines the UI for the reparent mode.
 - **ChildWindow.cpp**: Reparent module type's window concrete implementation.
+- **ScreenshotCropAndLockWindow.cpp**: Defines the UI for the screenshot mode.
 
 ## Known Issues
 

doc/devdocs/readme.md

@@ -57,7 +57,7 @@ Once you've discussed your proposed feature/fix/etc. with a team member, and an
 ## Rules
 
 - **Follow the pattern of what you already see in the code.**
-- [Coding style](style.md).
+- [Coding style](development/style.md).
 - Try to package new functionality/components into libraries that have nicely defined interfaces.
 - Package new functionality into classes or refactor existing functionality into a class as you extend the code.
 - When adding new classes/methods/changing existing code, add new unit tests or update the existing tests.

doc/thirdPartyRunPlugins.md

@@ -50,6 +50,8 @@ Contact the developers of a plugin directly for assistance with a specific plugi
 | [Hotkeys](https://github.com/ruslanlap/PowerToysRun-Hotkeys) | [ruslanlap](https://github.com/ruslanlap) | Create, manage, and trigger custom keyboard shortcuts directly from PowerToys Run. |
 | [RandomGen](https://github.com/ruslanlap/PowerToysRun-RandomGen) | [ruslanlap](https://github.com/ruslanlap) | 🎲 Generate random data instantly with a single keystroke. Perfect for developers, testers, designers, and anyone who needs quick access to random data. Features include secure passwords, PINs, names, business data, dates, numbers, GUIDs, color codes, and more. Especially useful for designers who need random color codes and placeholder content. |
 | [Open With Cursor](https://github.com/VictorNoxx/PowerToys-Run-Cursor/) | [VictorNoxx](https://github.com/VictorNoxx) | Open Visual Studio, VS Code recents with Cursor AI |
+| [Open With Antigravity](https://github.com/artickc/PowerToys-Run-Antygravity) | [artickc](https://github.com/artickc) | Open Visual Studio, VS Code recents with Antigravity AI |
+| [Project Launcher Plugin](https://github.com/artickc/ProjectLauncherPowerToysPlugin) | [artickc](https://github.com/artickc) | Access your projects using Project Launcher and PowerToys Run |
 | [CheatSheets](https://github.com/ruslanlap/PowerToysRun-CheatSheets) | [ruslanlap](https://github.com/ruslanlap) | 📚 Find cheat sheets and command examples instantly from tldr pages, cheat.sh, and devhints.io. Features include favorites system, categories, offline mode, and smart caching. |
 | [QuickAI](https://github.com/ruslanlap/PowerToysRun-QuickAi) | [ruslanlap](https://github.com/ruslanlap) | AI-powered assistance with instant, smart responses from multiple providers (Groq, Together, Fireworks, OpenRouter, Cohere) |
 

installer/PowerToysSetupVNext/BaseApplications.wxs

@@ -7,11 +7,18 @@
 
   <Fragment>
     <DirectoryRef Id="INSTALLFOLDER">
+      <Component Id="Microsoft_CommandPalette_Extensions_winmd" Guid="304AD25A-A986-4058-940E-61DB79EBD78C" Bitness="always64">
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+          <RegistryValue Type="string" Name="Microsoft_CommandPalette_Extensions_winmd" Value="" KeyPath="yes" />
+        </RegistryKey>
+        <File Id="Microsoft.CommandPalette.Extensions.winmd" Source="$(var.BinDir)Microsoft.CommandPalette.Extensions.winmd" />
+      </Component>
     <!-- Generated by generateFileComponents.ps1 -->
     <!--BaseApplicationsFiles_Component_Def-->
     </DirectoryRef>
 
     <ComponentGroup Id="BaseApplicationsComponentGroup">
+      <ComponentRef Id="Microsoft_CommandPalette_Extensions_winmd" />
     </ComponentGroup>
 
   </Fragment>

installer/PowerToysSetupVNext/PowerToysInstallerVNext.wixproj

@@ -173,4 +173,4 @@ call powershell.exe -NonInteractive -executionpolicy Unrestricted -File $(MSBuil
     </ItemGroup>
   </Target>
   <Target Name="Restore" />
-</Project>
+</Project>

src/PackageIdentity/AppxManifest.xml

@@ -10,7 +10,8 @@
   xmlns:desktop="http://schemas.microsoft.com/appx/manifest/desktop/windows10"
   xmlns:uap10="http://schemas.microsoft.com/appx/manifest/uap/windows10/10"
   xmlns:systemai="http://schemas.microsoft.com/appx/manifest/systemai/windows10"
-  IgnorableNamespaces="uap uap2 uap3 rescap desktop uap10 systemai">
+  xmlns:com="http://schemas.microsoft.com/appx/manifest/com/windows10"
+  IgnorableNamespaces="uap uap2 uap3 rescap desktop uap10 systemai com">
   <Identity
     Name="Microsoft.PowerToys.SparseApp"
     Publisher="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US"
@@ -30,6 +31,7 @@
     <TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.19000.0" MaxVersionTested="10.0.26226.0" />
   </Dependencies>
   <Capabilities>
+    <Capability Name="internetClient" />
     <rescap:Capability Name="runFullTrust" />
     <systemai:Capability Name="systemAIModels"/>
     <rescap:Capability Name="unvirtualizedResources"/>
@@ -66,5 +68,42 @@
         AppListEntry="none">
       </uap:VisualElements>
     </Application>
+    <Application Id="PowerToys.CmdPalExtension" Executable="Microsoft.CmdPal.Ext.PowerToys.exe" EntryPoint="Windows.FullTrustApplication">
+      <uap:VisualElements
+        DisplayName="PowerToys.CommandPaletteExtension"
+        Description="PowerToys Command Palette Extension"
+        BackgroundColor="transparent"
+        Square150x150Logo="Images\Square150x150Logo.png"
+        Square44x44Logo="Images\Square44x44Logo.png"
+        AppListEntry="none">
+      </uap:VisualElements>
+      <Extensions>
+        <com:Extension Category="windows.comServer">
+          <com:ComServer>
+            <com:ExeServer Executable="Microsoft.CmdPal.Ext.PowerToys.exe" Arguments="-RegisterProcessAsComServer" DisplayName="PowerToys Command Palette Extension">
+              <com:Class Id="7EC02C7D-8F98-4A2E-9F23-B58C2C2F2B17" DisplayName="PowerToys Command Palette Extension" />
+            </com:ExeServer>
+          </com:ComServer>
+        </com:Extension>
+        <uap3:Extension Category="windows.appExtension">
+          <uap3:AppExtension Name="com.microsoft.commandpalette"
+            Id="PowerToys"
+            PublicFolder="Public"
+            DisplayName="PowerToys"
+            Description="Surface PowerToys commands inside Command Palette">
+            <uap3:Properties>
+              <CmdPalProvider>
+                <Activation>
+                  <CreateInstance ClassId="7EC02C7D-8F98-4A2E-9F23-B58C2C2F2B17" />
+                </Activation>
+                <SupportedInterfaces>
+                  <Commands/>
+                </SupportedInterfaces>
+              </CmdPalProvider>
+            </uap3:Properties>
+          </uap3:AppExtension>
+        </uap3:Extension>
+      </Extensions>
+    </Application>
   </Applications>
-</Package>
+</Package>

src/common/Common.UI/SettingsDeepLink.cs

@@ -2,8 +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 System;
 using System.Diagnostics;
 using System.IO;
+using ManagedCommon;
 
 namespace Common.UI
 {
@@ -120,28 +122,33 @@ namespace Common.UI
             }
         }
 
-        public static void OpenSettings(SettingsWindow window, bool mainExecutableIsOnTheParentFolder)
+        // What about debug build? Should also consider debug build, maybe tray window message?
+        public static void OpenSettings(SettingsWindow window)
         {
             try
             {
-                var directoryPath = System.AppContext.BaseDirectory;
-                if (mainExecutableIsOnTheParentFolder)
+                var exePath = Path.Combine(
+                    PowerToysPathResolver.GetPowerToysInstallPath(),
+                    "PowerToys.exe");
+
+                if (exePath == null || !File.Exists(exePath))
                 {
-                    // Need to go into parent folder for PowerToys.exe. Likely a WinUI3 App SDK application.
-                    directoryPath = Path.Combine(directoryPath, "..");
-                    directoryPath = Path.Combine(directoryPath, "PowerToys.exe");
-                }
-                else
-                {
-                    // PowerToys.exe is in the same path as the application.
-                    directoryPath = Path.Combine(directoryPath, "PowerToys.exe");
+                    Logger.LogError($"Failed to find powertoys exe path, {exePath}");
+                    return;
                 }
 
-                Process.Start(new ProcessStartInfo(directoryPath) { Arguments = "--open-settings=" + SettingsWindowNameToString(window) });
+                var args = "--open-settings=" + SettingsWindowNameToString(window);
+
+                Process.Start(new ProcessStartInfo
+                {
+                    FileName = exePath,
+                    Arguments = args,
+                    UseShellExecute = false,
+                });
             }
-            catch
+            catch (Exception ex)
             {
-                // TODO(stefan): Log exception once unified logging is implemented
+                Logger.LogError(ex.Message);
             }
         }
     }

src/common/FilePreviewCommon/MarkdownHelper.cs

@@ -39,7 +39,7 @@ namespace Microsoft.PowerToys.FilePreviewCommon
             var softlineBreak = new Markdig.Extensions.Hardlines.SoftlineBreakAsHardlineExtension();
 
             MarkdownPipelineBuilder pipelineBuilder;
-            pipelineBuilder = new MarkdownPipelineBuilder().UseAdvancedExtensions().UseEmojiAndSmiley().UseYamlFrontMatter().UseMathematics();
+            pipelineBuilder = new MarkdownPipelineBuilder().UseAdvancedExtensions().UseEmojiAndSmiley().UseYamlFrontMatter().UseMathematics().DisableHtml();
             pipelineBuilder.Extensions.Add(extension);
             pipelineBuilder.Extensions.Add(softlineBreak);
 

src/common/ManagedCommon/ModuleType.cs

@@ -36,5 +36,6 @@ namespace ManagedCommon
         PowerOCR,
         Workspaces,
         ZoomIt,
+        GeneralSettings,
     }
 }

src/common/ManagedCommon/PowerToysPathResolver.cs

@@ -0,0 +1,168 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Diagnostics;
+using System.IO;
+using System.Runtime.Versioning;
+using Microsoft.Win32;
+
+namespace ManagedCommon
+{
+    [SupportedOSPlatform("windows")]
+    public class PowerToysPathResolver
+    {
+        private const string PowerToysRegistryKey = @"Software\Classes\powertoys";
+        private const string PowerToysExe = "PowerToys.exe";
+
+        /// <summary>
+        /// Gets the PowerToys installation path by checking registry entries
+        /// </summary>
+        /// <returns>The path to PowerToys installation directory, or null if not found</returns>
+        public static string GetPowerToysInstallPath()
+        {
+#if DEBUG
+            // In debug builds, resolve directly from the running process (no installer/registry involved).
+            return GetPathFromCurrentProcess();
+#else
+            // Try to get path from Per-User installation first
+            string path = GetPathFromRegistry(RegistryHive.CurrentUser);
+            if (!string.IsNullOrEmpty(path))
+            {
+                return path;
+            }
+
+            // Fall back to Per-Machine installation
+            path = GetPathFromRegistry(RegistryHive.LocalMachine);
+            if (!string.IsNullOrEmpty(path))
+            {
+                return path;
+            }
+
+            return null;
+#endif
+        }
+
+        private static string GetPathFromRegistry(RegistryHive hive)
+        {
+            try
+            {
+                using var baseKey = RegistryKey.OpenBaseKey(hive, RegistryView.Registry64);
+
+                // First try to get path from the powertoys protocol registration
+                string path = GetPathFromProtocolRegistration(baseKey);
+                if (!string.IsNullOrEmpty(path))
+                {
+                    return path;
+                }
+            }
+            catch (Exception)
+            {
+                // Ignore registry access errors
+            }
+
+            return null;
+        }
+
+        private static string GetPathFromProtocolRegistration(RegistryKey baseKey)
+        {
+            try
+            {
+                using var key = baseKey.OpenSubKey($@"{PowerToysRegistryKey}\shell\open\command");
+
+                if (key != null)
+                {
+                    string command = key.GetValue(string.Empty)?.ToString();
+                    if (!string.IsNullOrEmpty(command))
+                    {
+                        // Parse command like: "C:\Program Files\PowerToys\PowerToys.exe" "%1"
+                        return ExtractPathFromCommand(command);
+                    }
+                }
+            }
+            catch (Exception)
+            {
+                // Ignore registry access errors
+            }
+
+            return null;
+        }
+
+        private static string GetPathFromCurrentProcess()
+        {
+            try
+            {
+                // If we're running inside PowerToys.exe (dev/debug builds), use the executable location.
+                var processPath = Process.GetCurrentProcess().MainModule?.FileName;
+                if (!string.IsNullOrEmpty(processPath))
+                {
+                    var processDir = Path.GetDirectoryName(processPath);
+                    if (!string.IsNullOrEmpty(processDir) && File.Exists(Path.Combine(processDir, PowerToysExe)))
+                    {
+                        return processDir;
+                    }
+                }
+
+                // As a fallback, walk up from AppContext.BaseDirectory to find PowerToys.exe.
+                var directory = new DirectoryInfo(AppContext.BaseDirectory);
+                while (directory != null)
+                {
+                    var candidate = Path.Combine(directory.FullName, PowerToysExe);
+                    if (File.Exists(candidate))
+                    {
+                        return directory.FullName;
+                    }
+
+                    directory = directory.Parent;
+                }
+            }
+            catch
+            {
+                // Ignore reflection/process permission errors; caller will see null and handle accordingly.
+            }
+
+            return null;
+        }
+
+        private static string ExtractPathFromCommand(string command)
+        {
+            if (string.IsNullOrEmpty(command))
+            {
+                return null;
+            }
+
+            try
+            {
+                // Handle quoted paths: "C:\Program Files\PowerToys\PowerToys.exe" "%1"
+                if (command.StartsWith('\"'))
+                {
+                    int endQuote = command.IndexOf('\"', 1);
+                    if (endQuote > 1)
+                    {
+                        string exePath = command.Substring(1, endQuote - 1);
+                        if (File.Exists(exePath))
+                        {
+                            return Path.GetDirectoryName(exePath);
+                        }
+                    }
+                }
+                else
+                {
+                    // Handle unquoted paths (less common)
+                    string[] parts = command.Split(' ');
+                    if (parts.Length > 0 && File.Exists(parts[0]))
+                    {
+                        return Path.GetDirectoryName(parts[0]);
+                    }
+                }
+            }
+            catch (Exception)
+            {
+                // Ignore path parsing errors
+            }
+
+            return null;
+        }
+    }
+}

src/common/PowerToys.ModuleContracts/IModuleService.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 Common.UI;
+
+namespace PowerToys.ModuleContracts;
+
+/// <summary>
+/// Base contract for PowerToys modules exposed to the Command Palette.
+/// </summary>
+public interface IModuleService
+{
+    /// <summary>
+    /// Gets module identifier (e.g., Workspaces, Awake).
+    /// </summary>
+    string Key { get; }
+
+    Task<OperationResult> LaunchAsync(CancellationToken cancellationToken = default);
+
+    Task<OperationResult> OpenSettingsAsync(CancellationToken cancellationToken = default);
+}
+
+/// <summary>
+/// Helper base to reduce duplication for simple modules.
+/// </summary>
+public abstract class ModuleServiceBase : IModuleService
+{
+    public abstract string Key { get; }
+
+    protected abstract SettingsDeepLink.SettingsWindow SettingsWindow { get; }
+
+    public abstract Task<OperationResult> LaunchAsync(CancellationToken cancellationToken = default);
+
+    public virtual Task<OperationResult> OpenSettingsAsync(CancellationToken cancellationToken = default)
+    {
+        try
+        {
+            SettingsDeepLink.OpenSettings(SettingsWindow);
+            return Task.FromResult(OperationResult.Ok());
+        }
+        catch (Exception ex)
+        {
+            return Task.FromResult(OperationResult.Fail($"Failed to open settings for {Key}: {ex.Message}"));
+        }
+    }
+}

src/common/PowerToys.ModuleContracts/OperationResult.cs

@@ -0,0 +1,30 @@
+// 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 PowerToys.ModuleContracts;
+
+/// <summary>
+/// Lightweight result type for module operations.
+/// </summary>
+public readonly record struct OperationResult(bool Success, string? Error = null)
+{
+    public static OperationResult Ok() => new(true, null);
+
+    public static OperationResult Fail(string error) => new(false, error);
+}
+
+/// <summary>
+/// Result type with a payload.
+/// </summary>
+public readonly record struct OperationResult<T>(bool Success, T? Value, string? Error = null);
+
+/// <summary>
+/// Factory helpers for creating operation results.
+/// </summary>
+public static class OperationResults
+{
+    public static OperationResult<T> Ok<T>(T value) => new(true, value, null);
+
+    public static OperationResult<T> Fail<T>(string error) => new(false, default, error);
+}

src/common/PowerToys.ModuleContracts/PowerToys.ModuleContracts.csproj

@@ -0,0 +1,16 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <!-- Look at Directory.Build.props in root for common stuff as well -->
+  <Import Project="..\..\Common.Dotnet.CsWinRT.props" />
+  <Import Project="..\..\Common.Dotnet.AotCompatibility.props" />
+
+  <PropertyGroup>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+    <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Common.UI\Common.UI.csproj" />
+  </ItemGroup>
+</Project>

src/common/SettingsAPI/settings_objects.h

@@ -119,6 +119,16 @@ namespace PowerToysSettings
     class HotkeyObject
     {
     public:
+        HotkeyObject() :
+            m_json(json::JsonObject())
+        {
+            m_json.SetNamedValue(L"win", json::value(false));
+            m_json.SetNamedValue(L"ctrl", json::value(false));
+            m_json.SetNamedValue(L"alt", json::value(false));
+            m_json.SetNamedValue(L"shift", json::value(false));
+            m_json.SetNamedValue(L"code", json::value(0));
+            m_json.SetNamedValue(L"key", json::value(L""));
+        }
         static HotkeyObject from_json(json::JsonObject json)
         {
             return HotkeyObject(std::move(json));

src/common/interop/Constants.cpp

@@ -75,10 +75,62 @@ namespace winrt::PowerToys::Interop::implementation
     {
         return CommonSharedConstants::ADVANCED_PASTE_CUSTOM_ACTION_MESSAGE;
     }
+    hstring Constants::AdvancedPasteShowUIEvent()
+    {
+        return CommonSharedConstants::ADVANCED_PASTE_SHOW_UI_EVENT;
+    }
     hstring Constants::AdvancedPasteTerminateAppMessage()
     {
         return CommonSharedConstants::ADVANCED_PASTE_TERMINATE_APP_MESSAGE;
     }
+    hstring Constants::AlwaysOnTopPinEvent()
+    {
+        return CommonSharedConstants::ALWAYS_ON_TOP_PIN_EVENT;
+    }
+    hstring Constants::FindMyMouseTriggerEvent()
+    {
+        return CommonSharedConstants::FIND_MY_MOUSE_TRIGGER_EVENT;
+    }
+    hstring Constants::MouseHighlighterTriggerEvent()
+    {
+        return CommonSharedConstants::MOUSE_HIGHLIGHTER_TRIGGER_EVENT;
+    }
+    hstring Constants::MouseCrosshairsTriggerEvent()
+    {
+        return CommonSharedConstants::MOUSE_CROSSHAIRS_TRIGGER_EVENT;
+    }
+    hstring Constants::CursorWrapTriggerEvent()
+    {
+        return CommonSharedConstants::CURSOR_WRAP_TRIGGER_EVENT;
+    }
+    hstring Constants::LightSwitchToggleEvent()
+    {
+        return CommonSharedConstants::LIGHTSWITCH_TOGGLE_EVENT;
+    }
+    hstring Constants::ZoomItZoomEvent()
+    {
+        return CommonSharedConstants::ZOOMIT_ZOOM_EVENT;
+    }
+    hstring Constants::ZoomItDrawEvent()
+    {
+        return CommonSharedConstants::ZOOMIT_DRAW_EVENT;
+    }
+    hstring Constants::ZoomItBreakEvent()
+    {
+        return CommonSharedConstants::ZOOMIT_BREAK_EVENT;
+    }
+    hstring Constants::ZoomItLiveZoomEvent()
+    {
+        return CommonSharedConstants::ZOOMIT_LIVEZOOM_EVENT;
+    }
+    hstring Constants::ZoomItSnipEvent()
+    {
+        return CommonSharedConstants::ZOOMIT_SNIP_EVENT;
+    }
+    hstring Constants::ZoomItRecordEvent()
+    {
+        return CommonSharedConstants::ZOOMIT_RECORD_EVENT;
+    }
     hstring Constants::ShowPowerOCRSharedEvent()
     {
         return CommonSharedConstants::SHOW_POWEROCR_SHARED_EVENT;
@@ -171,6 +223,10 @@ namespace winrt::PowerToys::Interop::implementation
     {
         return CommonSharedConstants::CROP_AND_LOCK_REPARENT_EVENT;
     }
+    hstring Constants::CropAndLockScreenshotEvent()
+    {
+        return CommonSharedConstants::CROP_AND_LOCK_SCREENSHOT_EVENT;
+    }
     hstring Constants::ShowEnvironmentVariablesSharedEvent()
     {
         return CommonSharedConstants::SHOW_ENVIRONMENT_VARIABLES_EVENT;

src/common/interop/Constants.h

@@ -23,6 +23,20 @@ namespace winrt::PowerToys::Interop::implementation
         static hstring AdvancedPasteAdditionalActionMessage();
         static hstring AdvancedPasteCustomActionMessage();
         static hstring AdvancedPasteTerminateAppMessage();
+        static hstring AdvancedPasteShowUIEvent();
+        static hstring AlwaysOnTopPinEvent();
+        static hstring MeasureToolTriggerEvent();
+        static hstring FindMyMouseTriggerEvent();
+        static hstring MouseHighlighterTriggerEvent();
+        static hstring MouseCrosshairsTriggerEvent();
+        static hstring CursorWrapTriggerEvent();
+        static hstring LightSwitchToggleEvent();
+        static hstring ZoomItZoomEvent();
+        static hstring ZoomItDrawEvent();
+        static hstring ZoomItBreakEvent();
+        static hstring ZoomItLiveZoomEvent();
+        static hstring ZoomItSnipEvent();
+        static hstring ZoomItRecordEvent();
         static hstring ShowPowerOCRSharedEvent();
         static hstring TerminatePowerOCRSharedEvent();
         static hstring MouseJumpShowPreviewEvent();
@@ -33,7 +47,6 @@ namespace winrt::PowerToys::Interop::implementation
         static hstring PowerAccentExitEvent();
         static hstring ShortcutGuideTriggerEvent();
         static hstring RegistryPreviewTriggerEvent();
-        static hstring MeasureToolTriggerEvent();
         static hstring GcodePreviewResizeEvent();
         static hstring BgcodePreviewResizeEvent();
         static hstring QoiPreviewResizeEvent();
@@ -46,6 +59,7 @@ namespace winrt::PowerToys::Interop::implementation
         static hstring TerminateHostsSharedEvent();
         static hstring CropAndLockThumbnailEvent();
         static hstring CropAndLockReparentEvent();
+        static hstring CropAndLockScreenshotEvent();
         static hstring ShowEnvironmentVariablesSharedEvent();
         static hstring ShowEnvironmentVariablesAdminSharedEvent();
         static hstring WorkspacesLaunchEditorEvent();

src/common/interop/Constants.idl

@@ -20,6 +20,19 @@ namespace PowerToys
             static String AdvancedPasteAdditionalActionMessage();
             static String AdvancedPasteCustomActionMessage();
             static String AdvancedPasteTerminateAppMessage();
+            static String AdvancedPasteShowUIEvent();
+            static String AlwaysOnTopPinEvent();
+            static String FindMyMouseTriggerEvent();
+            static String MouseHighlighterTriggerEvent();
+            static String MouseCrosshairsTriggerEvent();
+            static String CursorWrapTriggerEvent();
+            static String LightSwitchToggleEvent();
+            static String ZoomItZoomEvent();
+            static String ZoomItDrawEvent();
+            static String ZoomItBreakEvent();
+            static String ZoomItLiveZoomEvent();
+            static String ZoomItSnipEvent();
+            static String ZoomItRecordEvent();
             static String ShowPowerOCRSharedEvent();
             static String TerminatePowerOCRSharedEvent();
             static String MouseJumpShowPreviewEvent();
@@ -43,6 +56,7 @@ namespace PowerToys
             static String TerminateHostsSharedEvent();
             static String CropAndLockThumbnailEvent();
             static String CropAndLockReparentEvent();
+            static String CropAndLockScreenshotEvent();
             static String ShowEnvironmentVariablesSharedEvent();
             static String ShowEnvironmentVariablesAdminSharedEvent();
             static String WorkspacesLaunchEditorEvent();
@@ -51,4 +65,4 @@ namespace PowerToys
             static String ShowCmdPalEvent();
         }
     }
-}
+}

src/common/interop/shared_constants.h

@@ -40,6 +40,8 @@ namespace CommonSharedConstants
     const wchar_t ADVANCED_PASTE_CUSTOM_ACTION_MESSAGE[] = L"CustomAction";
 
     const wchar_t ADVANCED_PASTE_TERMINATE_APP_MESSAGE[] = L"TerminateApp";
+    
+    const wchar_t ADVANCED_PASTE_SHOW_UI_EVENT[] = L"Local\\PowerToys_AdvancedPaste_ShowUI";
 
     // Path to the event used to show Color Picker
     const wchar_t SHOW_COLOR_PICKER_SHARED_EVENT[] = L"Local\\ShowColorPickerEvent-8c46be2a-3e05-4186-b56b-4ae986ef2525";
@@ -83,12 +85,21 @@ namespace CommonSharedConstants
 
     const wchar_t TERMINATE_MOUSE_JUMP_SHARED_EVENT[] = L"Local\\TerminateMouseJumpEvent-252fa337-317f-4c37-a61f-99464c3f9728";
 
+    // Paths to the events used by other Mouse Utilities
+    const wchar_t FIND_MY_MOUSE_TRIGGER_EVENT[] = L"Local\\FindMyMouseTriggerEvent-5a9dc5f4-1c74-4f2f-a66f-1b9b6a2f9b23";
+    const wchar_t MOUSE_HIGHLIGHTER_TRIGGER_EVENT[] = L"Local\\MouseHighlighterTriggerEvent-1e3c9c3d-3fdf-4f9a-9a52-31c9b3c3a8f4";
+    const wchar_t MOUSE_CROSSHAIRS_TRIGGER_EVENT[] = L"Local\\MouseCrosshairsTriggerEvent-0d4c7f92-0a5c-4f5c-b64b-8a2a2f7e0b21";
+    const wchar_t CURSOR_WRAP_TRIGGER_EVENT[] = L"Local\\CursorWrapTriggerEvent-1f8452b5-4e6e-45b3-8b09-13f14a5900c9";
+
     // Path to the event used by RegistryPreview
     const wchar_t REGISTRY_PREVIEW_TRIGGER_EVENT[] = L"Local\\RegistryPreviewEvent-4C559468-F75A-4E7F-BC4F-9C9688316687";
 
     // Path to the event used by MeasureTool
     const wchar_t MEASURE_TOOL_TRIGGER_EVENT[] = L"Local\\MeasureToolEvent-3d46745f-09b3-4671-a577-236be7abd199";
 
+    // Path to the event used by LightSwitch
+    const wchar_t LIGHTSWITCH_TOGGLE_EVENT[] = L"Local\\PowerToys-LightSwitch-ToggleEvent-d8dc2f29-8c94-4ca1-8c5f-3e2b1e3c4f5a";
+
     // Path to the event used by GcodePreviewHandler
     const wchar_t GCODE_PREVIEW_RESIZE_EVENT[] = L"Local\\PowerToysGcodePreviewResizeEvent-6ff1f9bd-ccbd-4b24-a79f-40a34fb0317d";
 
@@ -121,6 +132,7 @@ namespace CommonSharedConstants
     // Path to the events used by CropAndLock
     const wchar_t CROP_AND_LOCK_REPARENT_EVENT[] = L"Local\\PowerToysCropAndLockReparentEvent-6060860a-76a1-44e8-8d0e-6355785e9c36";
     const wchar_t CROP_AND_LOCK_THUMBNAIL_EVENT[] = L"Local\\PowerToysCropAndLockThumbnailEvent-1637be50-da72-46b2-9220-b32b206b2434";
+    const wchar_t CROP_AND_LOCK_SCREENSHOT_EVENT[] = L"Local\\PowerToysCropAndLockScreenshotEvent-ff077ab2-8360-4bd1-864a-637389d35593";
     const wchar_t CROP_AND_LOCK_EXIT_EVENT[] = L"Local\\PowerToysCropAndLockExitEvent-d995d409-7b70-482b-bad6-e7c8666f375a";
 
     // Path to the events used by EnvironmentVariables
@@ -130,6 +142,12 @@ namespace CommonSharedConstants
     // Path to the events used by ZoomIt
     const wchar_t ZOOMIT_REFRESH_SETTINGS_EVENT[] = L"Local\\PowerToysZoomIt-RefreshSettingsEvent-f053a563-d519-4b0d-8152-a54489c13324";
     const wchar_t ZOOMIT_EXIT_EVENT[] = L"Local\\PowerToysZoomIt-ExitEvent-36641ce6-df02-4eac-abea-a3fbf9138220";
+    const wchar_t ZOOMIT_ZOOM_EVENT[] = L"Local\\PowerToysZoomIt-ZoomEvent-1e4190d7-94bc-4ad5-adc0-9a8fd07cb393";
+    const wchar_t ZOOMIT_DRAW_EVENT[] = L"Local\\PowerToysZoomIt-DrawEvent-56338997-404d-4549-bd9a-d132b6766975";
+    const wchar_t ZOOMIT_BREAK_EVENT[] = L"Local\\PowerToysZoomIt-BreakEvent-17f2e63c-4c56-41dd-90a0-2d12f9f50c6b";
+    const wchar_t ZOOMIT_LIVEZOOM_EVENT[] = L"Local\\PowerToysZoomIt-LiveZoomEvent-390bf0c7-616f-47dc-bafe-a2d228add20d";
+    const wchar_t ZOOMIT_SNIP_EVENT[] = L"Local\\PowerToysZoomIt-SnipEvent-2fd9c211-436d-4f17-a902-2528aaae3e30";
+    const wchar_t ZOOMIT_RECORD_EVENT[] = L"Local\\PowerToysZoomIt-RecordEvent-74539344-eaad-4711-8e83-23946e424512";
 
     // used from quick access window
     const wchar_t CMDPAL_SHOW_EVENT[] = L"Local\\PowerToysCmdPal-ShowEvent-62336fcd-8611-4023-9b30-091a6af4cc5a";

src/common/utils/EventWaiter.h

@@ -3,78 +3,128 @@
 #include <functional>
 #include <thread>
 #include <string>
+#include <atomic>
 #include <windows.h>
 
+/// <summary>
+/// A reusable utility class that listens for a named Windows event and invokes a callback when triggered.
+/// Provides RAII-based resource management for event handles and the listener thread.
+/// The thread is properly joined on destruction to ensure clean shutdown.
+/// </summary>
 class EventWaiter
 {
 public:
-    EventWaiter() {}
-    EventWaiter(const std::wstring& name, std::function<void(DWORD)> callback)
+    EventWaiter() = default;
+
+    EventWaiter(const EventWaiter&) = delete;
+    EventWaiter& operator=(const EventWaiter&) = delete;
+    EventWaiter(EventWaiter&&) = delete;
+    EventWaiter& operator=(EventWaiter&&) = delete;
+
+    ~EventWaiter()
     {
-        // Create localExitThreadEvent and localWaitingEvent for capturing. We cannot capture 'this' as we implement move constructor.
-        auto localExitThreadEvent = exitThreadEvent = CreateEvent(nullptr, false, false, nullptr);
-        HANDLE localWaitingEvent = waitingEvent = CreateEvent(nullptr, false, false, name.c_str());
-        std::thread([=]() {
-            HANDLE events[2] = { localWaitingEvent, localExitThreadEvent };
-            while (true)
+        stop();
+    }
+
+    /// <summary>
+    /// Starts listening for the specified named event. When the event is signaled, the callback is invoked.
+    /// </summary>
+    /// <param name="name">The name of the Windows event to listen for.</param>
+    /// <param name="callback">The callback function to invoke when the event is triggered. Receives ERROR_SUCCESS on success.</param>
+    /// <returns>true if listening started successfully, false otherwise.</returns>
+    bool start(const std::wstring& name, std::function<void(DWORD)> callback)
+    {
+        if (m_listening)
+        {
+            return false;
+        }
+
+        m_exitThreadEvent = CreateEventW(nullptr, false, false, nullptr);
+        m_waitingEvent = CreateEventW(nullptr, false, false, name.c_str());
+
+        if (!m_exitThreadEvent || !m_waitingEvent)
+        {
+            cleanup();
+            return false;
+        }
+
+        m_listening = true;
+        m_eventThread = std::thread([this, cb = std::move(callback)]() {
+            HANDLE events[2] = { m_waitingEvent, m_exitThreadEvent };
+            while (m_listening)
             {
                 auto waitResult = WaitForMultipleObjects(2, events, false, INFINITE);
+                if (!m_listening)
+                {
+                    break;
+                }
+
                 if (waitResult == WAIT_OBJECT_0 + 1)
                 {
+                    // Exit event signaled
                     break;
                 }
 
                 if (waitResult == WAIT_FAILED)
                 {
-                    callback(GetLastError());
+                    cb(GetLastError());
                     continue;
                 }
 
                 if (waitResult == WAIT_OBJECT_0)
                 {
-                    callback(ERROR_SUCCESS);
+                    cb(ERROR_SUCCESS);
                 }
             }
-        }).detach();
+        });
+
+        return true;
     }
 
-    EventWaiter(EventWaiter&) = delete;
-    EventWaiter& operator=(EventWaiter&) = delete;
-
-    EventWaiter(EventWaiter&& a) noexcept
+    /// <summary>
+    /// Stops listening for the event and cleans up resources.
+    /// Waits for the listener thread to finish before returning.
+    /// Safe to call multiple times.
+    /// </summary>
+    void stop()
     {
-        this->exitThreadEvent = a.exitThreadEvent;
-        this->waitingEvent = a.waitingEvent;
-
-        a.exitThreadEvent = nullptr;
-        a.waitingEvent = nullptr;
-    }
-
-    EventWaiter& operator=(EventWaiter&& a) noexcept
-    {
-        this->exitThreadEvent = a.exitThreadEvent;
-        this->waitingEvent = a.waitingEvent;
-
-        a.exitThreadEvent = nullptr;
-        a.waitingEvent = nullptr;
-        return *this;
-    }
-
-    ~EventWaiter()
-    {
-        if (exitThreadEvent)
+        m_listening = false;
+        if (m_exitThreadEvent)
         {
-            SetEvent(exitThreadEvent);
-            CloseHandle(exitThreadEvent);
+            SetEvent(m_exitThreadEvent);
         }
-
-        if (waitingEvent)
+        if (m_eventThread.joinable())
         {
-            CloseHandle(waitingEvent);
+            m_eventThread.join();
         }
+        cleanup();
+    }
+
+    /// <summary>
+    /// Returns whether the listener is currently active.
+    /// </summary>
+    bool is_listening() const
+    {
+        return m_listening;
     }
 
 private:
-    HANDLE exitThreadEvent = nullptr;
-    HANDLE waitingEvent = nullptr;
+    void cleanup()
+    {
+        if (m_exitThreadEvent)
+        {
+            CloseHandle(m_exitThreadEvent);
+            m_exitThreadEvent = nullptr;
+        }
+        if (m_waitingEvent)
+        {
+            CloseHandle(m_waitingEvent);
+            m_waitingEvent = nullptr;
+        }
+    }
+
+    HANDLE m_exitThreadEvent = nullptr;
+    HANDLE m_waitingEvent = nullptr;
+    std::thread m_eventThread;
+    std::atomic_bool m_listening{ false };
 };

src/dsc/v3/PowerToys.DSC/PowerToys.DSC.csproj

@@ -45,6 +45,7 @@
   <Target Name="GenerateDscResourceJsonFiles" AfterTargets="Build" Condition="'$(CIBuild)' != 'true'">
     <Message Text="Generating DSC resource JSON files to DSCModules subfolder..." Importance="high" />
     <MakeDir Directories="$(TargetDir)DSCModules" />
+    
     <Exec Command="dotnet &quot;$(TargetPath)&quot; manifest --resource settings --outputDir &quot;$(TargetDir)DSCModules&quot;" />
   </Target>
 </Project>

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

@@ -335,7 +335,6 @@
             <converters:CountToVisibilityConverter x:Key="CountToVisibilityConverter" />
             <converters:CountToInvertedVisibilityConverter x:Key="CountToInvertedVisibilityConverter" />
             <converters:ServiceTypeToIconConverter x:Key="ServiceTypeToIconConverter" />
-            <converters:PasteAIUsageToStringConverter x:Key="PasteAIUsageToStringConverter" />
         </ResourceDictionary>
     </UserControl.Resources>
     <Grid x:Name="PromptBoxGrid" Loaded="Grid_Loaded">
@@ -431,20 +430,12 @@
                                         Grid.Row="1"
                                         MinHeight="104"
                                         MaxHeight="320">
-                                        <StackPanel>
-                                            <TextBlock
-                                                Foreground="{ThemeResource TextFillColorSecondaryBrush}"
-                                                IsTextSelectionEnabled="True"
-                                                Style="{StaticResource CaptionTextBlockStyle}"
-                                                Text="{x:Bind ViewModel.CustomFormatResult, Mode=OneWay}"
-                                                TextWrapping="Wrap"
-                                                Visibility="{x:Bind ViewModel.HasCustomFormatText, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}" />
-                                            <Image
-                                                HorizontalAlignment="Left"
-                                                Source="{x:Bind ViewModel.CustomFormatImageResult, Mode=OneWay}"
-                                                Stretch="Uniform"
-                                                Visibility="{x:Bind ViewModel.HasCustomFormatImage, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}" />
-                                        </StackPanel>
+                                        <TextBlock
+                                            Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                                            IsTextSelectionEnabled="True"
+                                            Style="{StaticResource CaptionTextBlockStyle}"
+                                            Text="{x:Bind ViewModel.CustomFormatResult, Mode=OneWay}"
+                                            TextWrapping="Wrap" />
                                     </ScrollViewer>
                                 </Grid>
                                 <Rectangle
@@ -611,37 +602,20 @@
                                                         Style="{StaticResource CaptionTextBlockStyle}"
                                                         Text="{x:Bind ServiceType, Mode=OneWay}" />
                                                 </StackPanel>
-                                                <StackPanel
+                                                <Border
                                                     Grid.Column="2"
+                                                    Padding="2,0,2,0"
                                                     VerticalAlignment="Center"
-                                                    Orientation="Horizontal"
-                                                    Spacing="4">
-                                                    <Border
-                                                        Padding="2,0,2,0"
-                                                        VerticalAlignment="Center"
-                                                        BorderBrush="{ThemeResource ControlStrokeColorSecondary}"
-                                                        BorderThickness="1"
-                                                        CornerRadius="{StaticResource ControlCornerRadius}">
-                                                        <TextBlock
-                                                            AutomationProperties.AccessibilityView="Raw"
-                                                            FontSize="10"
-                                                            Foreground="{ThemeResource TextFillColorSecondaryBrush}"
-                                                            Text="{x:Bind Usage, Mode=OneWay, Converter={StaticResource PasteAIUsageToStringConverter}}" />
-                                                    </Border>
-                                                    <Border
-                                                        Padding="2,0,2,0"
-                                                        VerticalAlignment="Center"
-                                                        BorderBrush="{ThemeResource ControlStrokeColorSecondary}"
-                                                        BorderThickness="1"
-                                                        CornerRadius="{StaticResource ControlCornerRadius}"
-                                                        Visibility="{x:Bind IsLocalModel, Mode=OneWay}">
-                                                        <TextBlock
-                                                            x:Uid="LocalModelBadge"
-                                                            AutomationProperties.AccessibilityView="Raw"
-                                                            FontSize="10"
-                                                            Foreground="{ThemeResource TextFillColorSecondaryBrush}" />
-                                                    </Border>
-                                                </StackPanel>
+                                                    BorderBrush="{ThemeResource ControlStrokeColorSecondary}"
+                                                    BorderThickness="1"
+                                                    CornerRadius="{StaticResource ControlCornerRadius}"
+                                                    Visibility="{x:Bind IsLocalModel, Mode=OneWay}">
+                                                    <TextBlock
+                                                        x:Uid="LocalModelBadge"
+                                                        AutomationProperties.AccessibilityView="Raw"
+                                                        FontSize="10"
+                                                        Foreground="{ThemeResource TextFillColorSecondaryBrush}" />
+                                                </Border>
                                                 <!--<Border
                                                     Grid.Column="2"
                                                     Padding="2,0,2,0"

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

@@ -164,7 +164,7 @@ namespace AdvancedPaste.Controls
                 return;
             }
 
-            var flyout = AIProviderButton.Flyout;
+            var flyout = FlyoutBase.GetAttachedFlyout(AIProviderButton);
 
             if (AIProviderListView.SelectedItem is not PasteAIProviderDefinition provider)
             {
@@ -180,6 +180,7 @@ namespace AdvancedPaste.Controls
             if (ViewModel.SetActiveProviderCommand.CanExecute(provider))
             {
                 await ViewModel.SetActiveProviderCommand.ExecuteAsync(provider);
+                SyncProviderSelection();
             }
 
             flyout?.Hide();

src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/Converters/PasteAIUsageToStringConverter.cs

@@ -1,30 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using AdvancedPaste.Helpers;
-using Microsoft.PowerToys.Settings.UI.Library;
-using Microsoft.UI.Xaml.Data;
-
-namespace AdvancedPaste.Converters;
-
-public sealed partial class PasteAIUsageToStringConverter : IValueConverter
-{
-    public object Convert(object value, Type targetType, object parameter, string language)
-    {
-        var usage = value switch
-        {
-            string s => PasteAIUsageExtensions.FromConfigString(s),
-            PasteAIUsage u => u,
-            _ => PasteAIUsage.ChatCompletion,
-        };
-
-        return ResourceLoaderInstance.ResourceLoader.GetString($"PasteAIUsage_{usage}");
-    }
-
-    public object ConvertBack(object value, Type targetType, object parameter, string language)
-    {
-        throw new NotImplementedException();
-    }
-}

src/modules/AdvancedPaste/AdvancedPaste/Helpers/DataPackageHelpers.cs

@@ -46,13 +46,6 @@ internal static class DataPackageHelpers
         return dataPackage;
     }
 
-    internal static DataPackage CreateFromImage(RandomAccessStreamReference imageStreamRef)
-    {
-        DataPackage dataPackage = new();
-        dataPackage.SetBitmap(imageStreamRef);
-        return dataPackage;
-    }
-
     internal static async Task<DataPackage> CreateFromFileAsync(string fileName)
     {
         var storageFile = await StorageFile.GetFileFromPathAsync(fileName);

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

@@ -168,9 +168,6 @@ namespace AdvancedPaste.Services.CustomActions
                 ModelPath = provider.ModelPath,
                 SystemPrompt = systemPrompt,
                 ModerationEnabled = provider.ModerationEnabled,
-                Usage = provider.UsageKind,
-                ImageWidth = provider.ImageWidth,
-                ImageHeight = provider.ImageHeight,
             };
 
             return providerConfig;

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

@@ -28,11 +28,5 @@ namespace AdvancedPaste.Services.CustomActions
         public string SystemPrompt { get; set; }
 
         public bool ModerationEnabled { get; set; }
-
-        public PasteAIUsage Usage { get; set; }
-
-        public int ImageWidth { get; set; }
-
-        public int ImageHeight { get; set; }
     }
 }

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

@@ -4,7 +4,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Net.Http;
 using System.Threading;
 using System.Threading.Tasks;
 using AdvancedPaste.Helpers;
@@ -17,7 +16,6 @@ using Microsoft.SemanticKernel.Connectors.Google;
 using Microsoft.SemanticKernel.Connectors.MistralAI;
 using Microsoft.SemanticKernel.Connectors.Ollama;
 using Microsoft.SemanticKernel.Connectors.OpenAI;
-using Microsoft.SemanticKernel.TextToImage;
 
 namespace AdvancedPaste.Services.CustomActions
 {
@@ -75,69 +73,6 @@ namespace AdvancedPaste.Services.CustomActions
 
             var executionSettings = CreateExecutionSettings();
             var kernel = CreateKernel();
-
-            switch (_config.Usage)
-            {
-                case PasteAIUsage.TextToImage:
-                    var imageDescription = string.IsNullOrWhiteSpace(prompt) ? inputText : $"{inputText}. {prompt}";
-                    return await ProcessTextToImageAsync(kernel, imageDescription, cancellationToken);
-                case PasteAIUsage.ChatCompletion:
-                default:
-                    var userMessageContent = $"""
-                        User instructions:
-                        {prompt}
-
-                        Clipboard Content:
-                        {inputText}
-
-                        Output:
-                        """;
-                    return await ProcessChatCompletionAsync(kernel, request, userMessageContent, systemPrompt, cancellationToken);
-            }
-        }
-
-        private async Task<string> ProcessTextToImageAsync(Kernel kernel, string userMessageContent, CancellationToken cancellationToken)
-        {
-#pragma warning disable SKEXP0001
-            var imageService = kernel.GetRequiredService<ITextToImageService>();
-            var width = _config.ImageWidth > 0 ? _config.ImageWidth : 1024;
-            var height = _config.ImageHeight > 0 ? _config.ImageHeight : 1024;
-            var settings = new OpenAITextToImageExecutionSettings
-            {
-                Size = (width, height),
-            };
-
-            var generatedImages = await imageService.GetImageContentsAsync(new TextContent(userMessageContent), settings, cancellationToken: cancellationToken);
-
-            if (generatedImages.Count == 0)
-            {
-                throw new InvalidOperationException("No image generated.");
-            }
-
-            var imageContent = generatedImages[0];
-
-            if (imageContent.Data.HasValue)
-            {
-                var base64 = Convert.ToBase64String(imageContent.Data.Value.ToArray());
-                return $"data:{imageContent.MimeType ?? "image/png"};base64,{base64}";
-            }
-            else if (imageContent.Uri != null)
-            {
-                using var client = new HttpClient();
-                var imageBytes = await client.GetByteArrayAsync(imageContent.Uri, cancellationToken);
-                var base64 = Convert.ToBase64String(imageBytes);
-                return $"data:image/png;base64,{base64}";
-            }
-            else
-            {
-                throw new InvalidOperationException("Generated image contains no data.");
-            }
-#pragma warning restore SKEXP0001
-        }
-
-        private async Task<string> ProcessChatCompletionAsync(Kernel kernel, PasteAIRequest request, string userMessageContent, string systemPrompt, CancellationToken cancellationToken)
-        {
-            var executionSettings = CreateExecutionSettings();
             var modelId = _config.Model;
 
             IChatCompletionService chatService;
@@ -160,20 +95,29 @@ namespace AdvancedPaste.Services.CustomActions
             var chatHistory = new ChatHistory();
             chatHistory.AddSystemMessage(systemPrompt);
 
-            if (request.ImageBytes != null)
+            if (imageBytes != null)
             {
                 var collection = new ChatMessageContentItemCollection();
-                if (!string.IsNullOrWhiteSpace(request.InputText))
+                if (!string.IsNullOrWhiteSpace(inputText))
                 {
-                    collection.Add(new TextContent($"Clipboard Content:\n{request.InputText}"));
+                    collection.Add(new TextContent($"Clipboard Content:\n{inputText}"));
                 }
 
-                collection.Add(new ImageContent(request.ImageBytes, request.ImageMimeType ?? "image/png"));
-                collection.Add(new TextContent($"User instructions:\n{request.Prompt}\n\nOutput:"));
+                collection.Add(new ImageContent(imageBytes, request.ImageMimeType ?? "image/png"));
+                collection.Add(new TextContent($"User instructions:\n{prompt}\n\nOutput:"));
                 chatHistory.AddUserMessage(collection);
             }
             else
             {
+                var userMessageContent = $"""
+                    User instructions:
+                    {prompt}
+
+                    Clipboard Content:
+                    {inputText}
+
+                    Output:
+                    """;
                 chatHistory.AddUserMessage(userMessageContent);
             }
 
@@ -198,31 +142,11 @@ namespace AdvancedPaste.Services.CustomActions
             switch (_serviceType)
             {
                 case AIServiceType.OpenAI:
-                    if (_config.Usage == PasteAIUsage.TextToImage)
-                    {
-#pragma warning disable SKEXP0010
-                        kernelBuilder.AddOpenAITextToImage(apiKey, modelId: _config.Model);
-#pragma warning restore SKEXP0010
-                    }
-                    else
-                    {
-                        kernelBuilder.AddOpenAIChatCompletion(_config.Model, apiKey, serviceId: _config.Model);
-                    }
-
+                    kernelBuilder.AddOpenAIChatCompletion(_config.Model, apiKey, serviceId: _config.Model);
                     break;
                 case AIServiceType.AzureOpenAI:
                     var deploymentName = string.IsNullOrWhiteSpace(_config.DeploymentName) ? _config.Model : _config.DeploymentName;
-                    if (_config.Usage == PasteAIUsage.TextToImage)
-                    {
-#pragma warning disable SKEXP0010
-                        kernelBuilder.AddAzureOpenAITextToImage(deploymentName, RequireEndpoint(endpoint, _serviceType), apiKey);
-#pragma warning restore SKEXP0010
-                    }
-                    else
-                    {
-                        kernelBuilder.AddAzureOpenAIChatCompletion(deploymentName, RequireEndpoint(endpoint, _serviceType), apiKey, serviceId: _config.Model);
-                    }
-
+                    kernelBuilder.AddAzureOpenAIChatCompletion(deploymentName, RequireEndpoint(endpoint, _serviceType), apiKey, serviceId: _config.Model);
                     break;
                 case AIServiceType.Mistral:
                     kernelBuilder.AddMistralChatCompletion(_config.Model, apiKey: apiKey);

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

@@ -372,10 +372,4 @@
     <value>Unable to load Foundry Local model: {0}</value>
     <comment>{0} is the model identifier. Do not translate {0}.</comment>
   </data>
-  <data name="PasteAIUsage_ChatCompletion" xml:space="preserve">
-    <value>Chat completion</value>
-  </data>
-  <data name="PasteAIUsage_TextToImage" xml:space="preserve">
-    <value>Text to image</value>
-  </data>
 </root>

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

@@ -7,7 +7,6 @@ using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Diagnostics;
 using System.Globalization;
-using System.IO;
 using System.IO.Abstractions;
 using System.Linq;
 using System.Runtime.InteropServices;
@@ -615,40 +614,8 @@ namespace AdvancedPaste.ViewModels
         }
 
         [ObservableProperty]
-        [NotifyPropertyChangedFor(nameof(HasCustomFormatImage))]
-        [NotifyPropertyChangedFor(nameof(HasCustomFormatText))]
-        [NotifyPropertyChangedFor(nameof(CustomFormatImageResult))]
         private string _customFormatResult;
 
-        public bool HasCustomFormatImage => CustomFormatResult?.StartsWith("data:image", StringComparison.OrdinalIgnoreCase) ?? false;
-
-        public bool HasCustomFormatText => !HasCustomFormatImage;
-
-        public ImageSource CustomFormatImageResult
-        {
-            get
-            {
-                if (HasCustomFormatImage && !string.IsNullOrEmpty(CustomFormatResult))
-                {
-                    try
-                    {
-                        var base64Data = CustomFormatResult.Split(',')[1];
-                        var bytes = Convert.FromBase64String(base64Data);
-                        var stream = new System.IO.MemoryStream(bytes);
-                        var image = new BitmapImage();
-                        image.SetSource(stream.AsRandomAccessStream());
-                        return image;
-                    }
-                    catch (Exception ex)
-                    {
-                        Logger.LogError("Failed to create image source from data URI", ex);
-                    }
-                }
-
-                return null;
-            }
-        }
-
         [RelayCommand]
         public async Task PasteCustomAsync()
         {
@@ -656,25 +623,7 @@ namespace AdvancedPaste.ViewModels
 
             if (!string.IsNullOrEmpty(text))
             {
-                if (text.StartsWith("data:image", StringComparison.OrdinalIgnoreCase))
-                {
-                    try
-                    {
-                        var base64Data = text.Split(',')[1];
-                        var bytes = Convert.FromBase64String(base64Data);
-                        var stream = new System.IO.MemoryStream(bytes);
-                        var dataPackage = DataPackageHelpers.CreateFromImage(Windows.Storage.Streams.RandomAccessStreamReference.CreateFromStream(stream.AsRandomAccessStream()));
-                        await CopyPasteAndHideAsync(dataPackage);
-                    }
-                    catch (Exception ex)
-                    {
-                        Logger.LogError("Failed to paste image from data URI", ex);
-                    }
-                }
-                else
-                {
-                    await CopyPasteAndHideAsync(DataPackageHelpers.CreateFromText(text));
-                }
+                await CopyPasteAndHideAsync(DataPackageHelpers.CreateFromText(text));
             }
         }
 
@@ -712,7 +661,7 @@ namespace AdvancedPaste.ViewModels
         [RelayCommand]
         public void OpenSettings()
         {
-            SettingsDeepLink.OpenSettings(SettingsDeepLink.SettingsWindow.AdvancedPaste, true);
+            SettingsDeepLink.OpenSettings(SettingsDeepLink.SettingsWindow.AdvancedPaste);
             GetMainWindow()?.Close();
         }
 
@@ -946,6 +895,11 @@ namespace AdvancedPaste.ViewModels
                 Logger.LogError("Failed to activate AI provider", ex);
                 return;
             }
+
+            UpdateAIProviderActiveFlags();
+            OnPropertyChanged(nameof(AIProviders));
+            NotifyActiveProviderChanged();
+            EnqueueRefreshPasteFormats();
         }
 
         public async Task CancelPasteActionAsync()

src/modules/AdvancedPaste/AdvancedPasteModuleInterface/dllmain.cpp

@@ -15,9 +15,11 @@
 #include <common/utils/logger_helper.h>
 #include <common/utils/winapi_error.h>
 #include <common/utils/gpo.h>
+#include <common/utils/EventWaiter.h>
 
 #include <algorithm>
 #include <cwctype>
+#include <thread>
 #include <vector>
 
 BOOL APIENTRY DllMain(HMODULE /*hModule*/, DWORD ul_reason_for_call, LPVOID /*lpReserved*/)
@@ -101,6 +103,9 @@ private:
     bool m_is_advanced_ai_enabled = false;
     bool m_preview_custom_format_output = true;
 
+    // Event listening for external triggers (e.g., from CmdPal extension)
+    EventWaiter m_triggerEventWaiter;
+
     Hotkey parse_single_hotkey(const wchar_t* keyName, const winrt::Windows::Data::Json::JsonObject& settingsObject)
     {
         try
@@ -779,6 +784,17 @@ public:
         Trace::AdvancedPaste_Enable(true);
         m_enabled = true;
         m_process_manager.start();
+
+        // Start listening for external trigger event so we can invoke the same logic as the hotkey.
+        // Note: Use start() directly instead of constructor + move assignment to avoid dangling this pointer in the thread.
+        m_triggerEventWaiter.start(CommonSharedConstants::ADVANCED_PASTE_SHOW_UI_EVENT, [this](DWORD) {
+            // Same logic as hotkeyId == 1 (m_advanced_paste_ui_hotkey)
+            Logger::trace(L"AdvancedPaste ShowUI event triggered");
+            m_process_manager.start();
+            m_process_manager.bring_to_front();
+            m_process_manager.send_message(CommonSharedConstants::ADVANCED_PASTE_SHOW_UI_MESSAGE);
+            Trace::AdvancedPaste_Invoked(L"AdvancedPasteUIEvent");
+        });
     };
 
     void Disable(bool traceEvent)
@@ -787,6 +803,9 @@ public:
         {
             m_process_manager.stop();
 
+            // Stop event listening
+            m_triggerEventWaiter.stop();
+
             if (traceEvent)
             {
                 Trace::AdvancedPaste_Enable(false);

src/modules/CropAndLock/CropAndLock/CropAndLock.vcxproj

@@ -112,6 +112,7 @@
     <ClCompile Include="ChildWindow.cpp" />
     <ClCompile Include="main.cpp" />
     <ClCompile Include="ReparentCropAndLockWindow.cpp" />
+    <ClCompile Include="ScreenshotCropAndLockWindow.cpp" />
     <ClCompile Include="ThumbnailCropAndLockWindow.cpp" />
     <ClCompile Include="OverlayWindow.cpp" />
     <ClCompile Include="pch.cpp">
@@ -126,6 +127,7 @@
     <ClInclude Include="DisplaysUtil.h" />
     <ClInclude Include="ModuleConstants.h" />
     <ClInclude Include="ReparentCropAndLockWindow.h" />
+    <ClInclude Include="ScreenshotCropAndLockWindow.h" />
     <ClInclude Include="ThumbnailCropAndLockWindow.h" />
     <ClInclude Include="SettingsWindow.h" />
     <ClInclude Include="OverlayWindow.h" />

src/modules/CropAndLock/CropAndLock/CropAndLock.vcxproj.filters

@@ -12,6 +12,7 @@
     <ClCompile Include="ReparentCropAndLockWindow.cpp" />
     <ClCompile Include="ChildWindow.cpp" />
     <ClCompile Include="trace.cpp" />
+    <ClCompile Include="ScreenshotCropAndLockWindow.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="pch.h" />
@@ -28,6 +29,7 @@
     <ClInclude Include="trace.h" />
     <ClInclude Include="ModuleConstants.h" />
     <ClInclude Include="DispatcherQueue.desktop.interop.h" />
+    <ClInclude Include="ScreenshotCropAndLockWindow.h" />
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="CropAndLock.rc" />

src/modules/CropAndLock/CropAndLock/ScreenshotCropAndLockWindow.cpp

@@ -0,0 +1,178 @@
+#include "pch.h"
+#include "ScreenshotCropAndLockWindow.h"
+
+const std::wstring ScreenshotCropAndLockWindow::ClassName = L"CropAndLock.ScreenshotCropAndLockWindow";
+std::once_flag ScreenshotCropAndLockWindowClassRegistration;
+
+void ScreenshotCropAndLockWindow::RegisterWindowClass()
+{
+    auto instance = winrt::check_pointer(GetModuleHandleW(nullptr));
+    WNDCLASSEXW wcex = {};
+    wcex.cbSize = sizeof(wcex);
+    wcex.style = CS_HREDRAW | CS_VREDRAW;
+    wcex.lpfnWndProc = WndProc;
+    wcex.hInstance = instance;
+    wcex.hIcon = LoadIconW(instance, IDI_APPLICATION);
+    wcex.hCursor = LoadCursorW(nullptr, IDC_ARROW);
+    wcex.hbrBackground = static_cast<HBRUSH>(GetStockObject(BLACK_BRUSH));
+    wcex.lpszClassName = ClassName.c_str();
+    wcex.hIconSm = LoadIconW(wcex.hInstance, IDI_APPLICATION);
+    winrt::check_bool(RegisterClassExW(&wcex));
+}
+
+ScreenshotCropAndLockWindow::ScreenshotCropAndLockWindow(std::wstring const& titleString, int width, int height)
+{
+    auto instance = winrt::check_pointer(GetModuleHandleW(nullptr));
+
+    std::call_once(ScreenshotCropAndLockWindowClassRegistration, []() { RegisterWindowClass(); });
+
+    auto exStyle = 0;
+    auto style = WS_OVERLAPPEDWINDOW | WS_CLIPCHILDREN;
+
+    RECT rect = { 0, 0, width, height };
+    winrt::check_bool(AdjustWindowRectEx(&rect, style, false, exStyle));
+    auto adjustedWidth = rect.right - rect.left;
+    auto adjustedHeight = rect.bottom - rect.top;
+
+    winrt::check_bool(CreateWindowExW(exStyle, ClassName.c_str(), titleString.c_str(), style, CW_USEDEFAULT, CW_USEDEFAULT, adjustedWidth, adjustedHeight, nullptr, nullptr, instance, this));
+    WINRT_ASSERT(m_window);
+}
+
+ScreenshotCropAndLockWindow::~ScreenshotCropAndLockWindow()
+{
+    DestroyWindow(m_window);
+}
+
+LRESULT ScreenshotCropAndLockWindow::MessageHandler(UINT const message, WPARAM const wparam, LPARAM const lparam)
+{
+    switch (message)
+    {
+    case WM_DESTROY:
+        if (m_closedCallback != nullptr && !m_destroyed)
+        {
+            m_destroyed = true;
+            m_closedCallback(m_window);
+        }
+        break;
+    case WM_PAINT:
+        if (m_captured && m_bitmap)
+        {
+            PAINTSTRUCT ps;
+            HDC hdc = BeginPaint(m_window, &ps);
+            HDC memDC = CreateCompatibleDC(hdc);
+            SelectObject(memDC, m_bitmap.get());
+
+            RECT clientRect = {};
+            GetClientRect(m_window, &clientRect);
+            int clientWidth = clientRect.right - clientRect.left;
+            int clientHeight = clientRect.bottom - clientRect.top;
+
+            int srcWidth = m_destRect.right - m_destRect.left;
+            int srcHeight = m_destRect.bottom - m_destRect.top;
+
+            float srcAspect = static_cast<float>(srcWidth) / srcHeight;
+            float dstAspect = static_cast<float>(clientWidth) / clientHeight;
+
+            int drawWidth = clientWidth;
+            int drawHeight = static_cast<int>(clientWidth / srcAspect);
+            if (dstAspect > srcAspect)
+            {
+                drawHeight = clientHeight;
+                drawWidth = static_cast<int>(clientHeight * srcAspect);
+            }
+
+            int offsetX = (clientWidth - drawWidth) / 2;
+            int offsetY = (clientHeight - drawHeight) / 2;
+
+            SetStretchBltMode(hdc, HALFTONE);
+            StretchBlt(hdc, offsetX, offsetY, drawWidth, drawHeight, memDC, 0, 0, srcWidth, srcHeight, SRCCOPY);
+            DeleteDC(memDC);
+            EndPaint(m_window, &ps);
+        }
+        break;
+    default:
+        return base_type::MessageHandler(message, wparam, lparam);
+    }
+    return 0;
+}
+
+void ScreenshotCropAndLockWindow::CropAndLock(HWND windowToCrop, RECT cropRect)
+{
+    if (m_captured)
+    {
+        return;
+    }
+
+    // Get full window bounds
+    RECT windowRect{};
+    winrt::check_hresult(DwmGetWindowAttribute(
+        windowToCrop,
+        DWMWA_EXTENDED_FRAME_BOUNDS,
+        &windowRect,
+        sizeof(windowRect)));
+
+    RECT clientRect = ClientAreaInScreenSpace(windowToCrop);
+    auto offsetX = clientRect.left - windowRect.left;
+    auto offsetY = clientRect.top - windowRect.top;
+
+    m_sourceRect = {
+        cropRect.left + offsetX,
+        cropRect.top + offsetY,
+        cropRect.right + offsetX,
+        cropRect.bottom + offsetY
+    };
+
+    int fullWidth = windowRect.right - windowRect.left;
+    int fullHeight = windowRect.bottom - windowRect.top;
+
+    HDC fullDC = CreateCompatibleDC(nullptr);
+    HDC screenDC = GetDC(nullptr);
+    HBITMAP fullBitmap = CreateCompatibleBitmap(screenDC, fullWidth, fullHeight);
+    HGDIOBJ oldFullBitmap = SelectObject(fullDC, fullBitmap);
+
+    // Capture full window
+    winrt::check_bool(PrintWindow(windowToCrop, fullDC, PW_RENDERFULLCONTENT));
+
+
+    // Crop
+    int cropWidth = m_sourceRect.right - m_sourceRect.left;
+    int cropHeight = m_sourceRect.bottom - m_sourceRect.top;
+
+    HDC cropDC = CreateCompatibleDC(nullptr);
+    HBITMAP cropBitmap = CreateCompatibleBitmap(screenDC, cropWidth, cropHeight);
+    HGDIOBJ oldCropBitmap = SelectObject(cropDC, cropBitmap);
+    ReleaseDC(nullptr, screenDC);
+
+    BitBlt(
+        cropDC,
+        0,
+        0,
+        cropWidth,
+        cropHeight,
+        fullDC,
+        m_sourceRect.left,
+        m_sourceRect.top,
+        SRCCOPY);
+
+    SelectObject(fullDC, oldFullBitmap);
+    DeleteObject(fullBitmap);
+    DeleteDC(fullDC);
+
+    SelectObject(cropDC, oldCropBitmap);
+    DeleteDC(cropDC);
+    m_bitmap.reset(cropBitmap);
+
+    // Resize our window
+    RECT dest{ 0, 0, cropWidth, cropHeight };
+    LONG_PTR exStyle = GetWindowLongPtrW(m_window, GWL_EXSTYLE);
+    LONG_PTR style = GetWindowLongPtrW(m_window, GWL_STYLE);
+
+    winrt::check_bool(AdjustWindowRectEx(&dest, static_cast<DWORD>(style), FALSE, static_cast<DWORD>(exStyle)));
+
+    winrt::check_bool(SetWindowPos(
+        m_window, HWND_TOPMOST, 0, 0, dest.right - dest.left, dest.bottom - dest.top, SWP_NOMOVE | SWP_SHOWWINDOW));
+
+    m_destRect = { 0, 0, cropWidth, cropHeight };
+    m_captured = true;
+    InvalidateRect(m_window, nullptr, FALSE);
+}

src/modules/CropAndLock/CropAndLock/ScreenshotCropAndLockWindow.h

@@ -0,0 +1,27 @@
+#pragma once
+#include <robmikh.common/DesktopWindow.h>
+#include "CropAndLockWindow.h"
+
+struct ScreenshotCropAndLockWindow : robmikh::common::desktop::DesktopWindow<ScreenshotCropAndLockWindow>, CropAndLockWindow
+{
+    static const std::wstring ClassName;
+    ScreenshotCropAndLockWindow(std::wstring const& titleString, int width, int height);
+    ~ScreenshotCropAndLockWindow() override;
+    LRESULT MessageHandler(UINT const message, WPARAM const wparam, LPARAM const lparam);
+
+    HWND Handle() override { return m_window; }
+    void CropAndLock(HWND windowToCrop, RECT cropRect) override;
+    void OnClosed(std::function<void(HWND)> callback) override { m_closedCallback = callback; }
+
+private:
+    static void RegisterWindowClass();
+
+private:
+    std::unique_ptr<void, decltype(&DeleteObject)> m_bitmap{ nullptr, &DeleteObject };
+    RECT m_destRect = {};
+    RECT m_sourceRect = {};
+
+    bool m_captured = false;
+    bool m_destroyed = false;
+    std::function<void(HWND)> m_closedCallback;
+};

src/modules/CropAndLock/CropAndLock/SettingsWindow.h

@@ -4,4 +4,5 @@ enum class CropAndLockType
 {
 	Reparent,
 	Thumbnail,
+	Screenshot,
 };

src/modules/CropAndLock/CropAndLock/main.cpp

@@ -2,6 +2,7 @@
 #include "SettingsWindow.h"
 #include "OverlayWindow.h"
 #include "CropAndLockWindow.h"
+#include "ScreenshotCropAndLockWindow.h"
 #include "ThumbnailCropAndLockWindow.h"
 #include "ReparentCropAndLockWindow.h"
 #include "ModuleConstants.h"
@@ -133,6 +134,7 @@ int WINAPI wWinMain(_In_ HINSTANCE, _In_opt_ HINSTANCE, _In_ PWSTR lpCmdLine, _I
     // Handles and thread for the events sent from runner
     HANDLE m_reparent_event_handle;
     HANDLE m_thumbnail_event_handle;
+    HANDLE m_screenshot_event_handle;
     HANDLE m_exit_event_handle;
     std::thread m_event_triggers_thread;
 
@@ -181,6 +183,11 @@ int WINAPI wWinMain(_In_ HINSTANCE, _In_opt_ HINSTANCE, _In_ PWSTR lpCmdLine, _I
                 Logger::trace(L"Creating a thumbnail window");
                 Trace::CropAndLock::CreateThumbnailWindow();
                 break;
+            case CropAndLockType::Screenshot:
+                croppedWindow = std::make_shared<ScreenshotCropAndLockWindow>(title, 800, 600);
+                Logger::trace(L"Creating a screenshot window");
+                Trace::CropAndLock::CreateScreenshotWindow();
+                break;
             default:
                 return;
             }
@@ -215,8 +222,9 @@ int WINAPI wWinMain(_In_ HINSTANCE, _In_opt_ HINSTANCE, _In_ PWSTR lpCmdLine, _I
     // Start a thread to listen on the events.
     m_reparent_event_handle = CreateEventW(nullptr, false, false, CommonSharedConstants::CROP_AND_LOCK_REPARENT_EVENT);
     m_thumbnail_event_handle = CreateEventW(nullptr, false, false, CommonSharedConstants::CROP_AND_LOCK_THUMBNAIL_EVENT);
+    m_screenshot_event_handle = CreateEventW(nullptr, false, false, CommonSharedConstants::CROP_AND_LOCK_SCREENSHOT_EVENT);
     m_exit_event_handle = CreateEventW(nullptr, false, false, CommonSharedConstants::CROP_AND_LOCK_EXIT_EVENT);
-    if (!m_reparent_event_handle || !m_thumbnail_event_handle || !m_exit_event_handle)
+    if (!m_reparent_event_handle || !m_thumbnail_event_handle || !m_screenshot_event_handle || !m_exit_event_handle)
     {
         Logger::warn(L"Failed to create events. {}", get_last_error_or_default(GetLastError()));
         return 1;
@@ -224,10 +232,10 @@ int WINAPI wWinMain(_In_ HINSTANCE, _In_opt_ HINSTANCE, _In_ PWSTR lpCmdLine, _I
 
     m_event_triggers_thread = std::thread([&]() {
         MSG msg;
-        HANDLE event_handles[3] = { m_reparent_event_handle, m_thumbnail_event_handle, m_exit_event_handle };
+        HANDLE event_handles[4] = { m_reparent_event_handle, m_thumbnail_event_handle, m_screenshot_event_handle, m_exit_event_handle };
         while (m_running)
         {
-            DWORD dwEvt = MsgWaitForMultipleObjects(3, event_handles, false, INFINITE, QS_ALLINPUT);
+            DWORD dwEvt = MsgWaitForMultipleObjects(4, event_handles, false, INFINITE, QS_ALLINPUT);
             if (!m_running)
             {
                 break;
@@ -259,13 +267,25 @@ int WINAPI wWinMain(_In_ HINSTANCE, _In_opt_ HINSTANCE, _In_ PWSTR lpCmdLine, _I
                 break;
             }
             case WAIT_OBJECT_0 + 2:
+            {
+                // Screenshot Event
+                bool enqueueSucceeded = controller.DispatcherQueue().TryEnqueue([&]() {
+                    ProcessCommand(CropAndLockType::Screenshot);
+                });
+                if (!enqueueSucceeded)
+                {
+                    Logger::error("Couldn't enqueue message to screenshot a window.");
+                }
+                break;
+            }
+            case WAIT_OBJECT_0 + 3:
             {
                 // Exit Event
                 Logger::trace(L"Received an exit event.");
                 PostThreadMessage(mainThreadId, WM_QUIT, 0, 0);
                 break;
             }
-            case WAIT_OBJECT_0 + 3:
+            case WAIT_OBJECT_0 + 4:
                 if (PeekMessageW(&msg, nullptr, 0, 0, PM_REMOVE))
                 {
                     TranslateMessage(&msg);
@@ -295,6 +315,7 @@ int WINAPI wWinMain(_In_ HINSTANCE, _In_opt_ HINSTANCE, _In_ PWSTR lpCmdLine, _I
     SetEvent(m_reparent_event_handle);
     CloseHandle(m_reparent_event_handle);
     CloseHandle(m_thumbnail_event_handle);
+    CloseHandle(m_screenshot_event_handle);
     CloseHandle(m_exit_event_handle);
     m_event_triggers_thread.join();
 

src/modules/CropAndLock/CropAndLock/trace.cpp

@@ -41,6 +41,15 @@ void Trace::CropAndLock::ActivateThumbnail() noexcept
         TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE));
 }
 
+void Trace::CropAndLock::ActivateScreenshot() noexcept
+{
+    TraceLoggingWriteWrapper(
+        g_hProvider,
+        "CropAndLock_ActivateScreenshot",
+        ProjectTelemetryPrivacyDataTag(ProjectTelemetryTag_ProductAndServicePerformance),
+        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE));
+}
+
 void Trace::CropAndLock::CreateReparentWindow() noexcept
 {
     TraceLoggingWriteWrapper(
@@ -59,8 +68,17 @@ void Trace::CropAndLock::CreateThumbnailWindow() noexcept
         TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE));
 }
 
+void Trace::CropAndLock::CreateScreenshotWindow() noexcept
+{
+    TraceLoggingWriteWrapper(
+        g_hProvider,
+        "CropAndLock_CreateScreenshotWindow",
+        ProjectTelemetryPrivacyDataTag(ProjectTelemetryTag_ProductAndServicePerformance),
+        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE));
+}
+
 // Event to send settings telemetry.
-void Trace::CropAndLock::SettingsTelemetry(PowertoyModuleIface::Hotkey& reparentHotkey, PowertoyModuleIface::Hotkey& thumbnailHotkey) noexcept
+void Trace::CropAndLock::SettingsTelemetry(PowertoyModuleIface::Hotkey& reparentHotkey, PowertoyModuleIface::Hotkey& thumbnailHotkey, PowertoyModuleIface::Hotkey& screenshotHotkey) noexcept
 {
     std::wstring hotKeyStrReparent =
         std::wstring(reparentHotkey.win ? L"Win + " : L"") +
@@ -76,11 +94,19 @@ void Trace::CropAndLock::SettingsTelemetry(PowertoyModuleIface::Hotkey& reparent
         std::wstring(thumbnailHotkey.alt ? L"Alt + " : L"") +
         std::wstring(L"VK ") + std::to_wstring(thumbnailHotkey.key);
 
+    std::wstring hotKeyStrScreenshot =
+        std::wstring(screenshotHotkey.win ? L"Win + " : L"") +
+        std::wstring(screenshotHotkey.ctrl ? L"Ctrl + " : L"") +
+        std::wstring(screenshotHotkey.shift ? L"Shift + " : L"") +
+        std::wstring(screenshotHotkey.alt ? L"Alt + " : L"") +
+        std::wstring(L"VK ") + std::to_wstring(screenshotHotkey.key);
+
     TraceLoggingWriteWrapper(
         g_hProvider,
         "CropAndLock_Settings",
         ProjectTelemetryPrivacyDataTag(ProjectTelemetryTag_ProductAndServicePerformance),
         TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE),
         TraceLoggingWideString(hotKeyStrReparent.c_str(), "ReparentHotKey"),
-        TraceLoggingWideString(hotKeyStrThumbnail.c_str(), "ThumbnailHotkey"));
+        TraceLoggingWideString(hotKeyStrThumbnail.c_str(), "ThumbnailHotkey"),
+        TraceLoggingWideString(hotKeyStrScreenshot.c_str(), "ScreenshotHotkey"));
 }

src/modules/CropAndLock/CropAndLock/trace.h

@@ -12,8 +12,10 @@ public:
         static void Enable(bool enabled) noexcept;
         static void ActivateReparent() noexcept;
         static void ActivateThumbnail() noexcept;
+        static void ActivateScreenshot() noexcept;
         static void CreateReparentWindow() noexcept;
         static void CreateThumbnailWindow() noexcept;
-        static void SettingsTelemetry(PowertoyModuleIface::Hotkey&, PowertoyModuleIface::Hotkey&) noexcept;
+        static void CreateScreenshotWindow() noexcept;
+        static void SettingsTelemetry(PowertoyModuleIface::Hotkey&, PowertoyModuleIface::Hotkey&, PowertoyModuleIface::Hotkey&) noexcept;
     };
 };

src/modules/CropAndLock/CropAndLockModuleInterface/dllmain.cpp

@@ -29,6 +29,7 @@ namespace
     const wchar_t JSON_KEY_CODE[] = L"code";
     const wchar_t JSON_KEY_REPARENT_HOTKEY[] = L"reparent-hotkey";
     const wchar_t JSON_KEY_THUMBNAIL_HOTKEY[] = L"thumbnail-hotkey";
+    const wchar_t JSON_KEY_SCREENSHOT_HOTKEY[] = L"screenshot-hotkey";
     const wchar_t JSON_KEY_VALUE[] = L"value";
 }
 
@@ -124,6 +125,10 @@ public:
                 SetEvent(m_thumbnail_event_handle);
                 Trace::CropAndLock::ActivateThumbnail();
             }
+            if (hotkeyId == 2) { // Same order as set by get_hotkeys
+                SetEvent(m_screenshot_event_handle);
+                Trace::CropAndLock::ActivateScreenshot();
+            }
 
             return true;
         }
@@ -133,12 +138,13 @@ public:
 
     virtual size_t get_hotkeys(Hotkey* hotkeys, size_t buffer_size) override
     {
-        if (hotkeys && buffer_size >= 2)
+        if (hotkeys && buffer_size >= 3)
         {
             hotkeys[0] = m_reparent_hotkey;
             hotkeys[1] = m_thumbnail_hotkey;
+            hotkeys[2] = m_screenshot_hotkey;
         }
-        return 2;
+        return 3;
     }
 
     // Enable the powertoy
@@ -171,7 +177,7 @@ public:
     virtual void send_settings_telemetry() override
     {
         Logger::info("Send settings telemetry");
-        Trace::CropAndLock::SettingsTelemetry(m_reparent_hotkey, m_thumbnail_hotkey);
+        Trace::CropAndLock::SettingsTelemetry(m_reparent_hotkey, m_thumbnail_hotkey, m_screenshot_hotkey);
     }
 
     CropAndLockModuleInterface()
@@ -182,6 +188,7 @@ public:
 
         m_reparent_event_handle = CreateDefaultEvent(CommonSharedConstants::CROP_AND_LOCK_REPARENT_EVENT);
         m_thumbnail_event_handle = CreateDefaultEvent(CommonSharedConstants::CROP_AND_LOCK_THUMBNAIL_EVENT);
+        m_screenshot_event_handle = CreateDefaultEvent(CommonSharedConstants::CROP_AND_LOCK_SCREENSHOT_EVENT);
         m_exit_event_handle = CreateDefaultEvent(CommonSharedConstants::CROP_AND_LOCK_EXIT_EVENT);
 
         init_settings();
@@ -202,6 +209,7 @@ private:
         
         ResetEvent(m_reparent_event_handle);
         ResetEvent(m_thumbnail_event_handle);
+        ResetEvent(m_screenshot_event_handle);
         ResetEvent(m_exit_event_handle);
 
         SHELLEXECUTEINFOW sei{ sizeof(sei) };
@@ -234,6 +242,7 @@ private:
 
         ResetEvent(m_reparent_event_handle);
         ResetEvent(m_thumbnail_event_handle);
+        ResetEvent(m_screenshot_event_handle);
 
         // Log telemetry
         if (traceEvent)
@@ -283,6 +292,21 @@ private:
             {
                 Logger::error("Failed to initialize CropAndLock thumbnail shortcut from settings. Value will keep unchanged.");
             }
+            try
+            {
+                Hotkey _temp_screenshot;
+                auto jsonHotkeyObject = settingsObject.GetNamedObject(JSON_KEY_PROPERTIES).GetNamedObject(JSON_KEY_SCREENSHOT_HOTKEY).GetNamedObject(JSON_KEY_VALUE);
+                _temp_screenshot.win = jsonHotkeyObject.GetNamedBoolean(JSON_KEY_WIN);
+                _temp_screenshot.alt = jsonHotkeyObject.GetNamedBoolean(JSON_KEY_ALT);
+                _temp_screenshot.shift = jsonHotkeyObject.GetNamedBoolean(JSON_KEY_SHIFT);
+                _temp_screenshot.ctrl = jsonHotkeyObject.GetNamedBoolean(JSON_KEY_CTRL);
+                _temp_screenshot.key = static_cast<unsigned char>(jsonHotkeyObject.GetNamedNumber(JSON_KEY_CODE));
+                m_screenshot_hotkey = _temp_screenshot;
+            }
+            catch (...)
+            {
+                Logger::error("Failed to initialize CropAndLock screenshot shortcut from settings. Value will keep unchanged.");
+            }
         }
         else
         {
@@ -321,9 +345,11 @@ private:
     // TODO: actual default hotkey setting in line with other PowerToys.
     Hotkey m_reparent_hotkey = { .win = true, .ctrl = true, .shift = true, .alt = false, .key = 'R' };
     Hotkey m_thumbnail_hotkey = { .win = true, .ctrl = true, .shift = true, .alt = false, .key = 'T' };
+    Hotkey m_screenshot_hotkey = { .win = true, .ctrl = true, .shift = true, .alt = false, .key = 'S' };
 
     HANDLE m_reparent_event_handle;
     HANDLE m_thumbnail_event_handle;
+    HANDLE m_screenshot_event_handle;
     HANDLE m_exit_event_handle;
 
 };

src/modules/EnvironmentVariables/EnvironmentVariablesModuleInterface/dllmain.cpp

@@ -146,7 +146,7 @@ public:
             }
         }
 
-        m_showEventWaiter = EventWaiter(CommonSharedConstants::SHOW_ENVIRONMENT_VARIABLES_EVENT, [&](int err) {
+        m_showEventWaiter.start(CommonSharedConstants::SHOW_ENVIRONMENT_VARIABLES_EVENT, [&](DWORD err) {
             if (m_enabled && err == ERROR_SUCCESS)
             {
                 Logger::trace(L"{} event was signaled", CommonSharedConstants::SHOW_ENVIRONMENT_VARIABLES_EVENT);
@@ -164,7 +164,7 @@ public:
             }
         });
 
-        m_showAdminEventWaiter = EventWaiter(CommonSharedConstants::SHOW_ENVIRONMENT_VARIABLES_ADMIN_EVENT, [&](int err) {
+        m_showAdminEventWaiter.start(CommonSharedConstants::SHOW_ENVIRONMENT_VARIABLES_ADMIN_EVENT, [&](DWORD err) {
             if (m_enabled && err == ERROR_SUCCESS)
             {
                 Logger::trace(L"{} event was signaled", CommonSharedConstants::SHOW_ENVIRONMENT_VARIABLES_ADMIN_EVENT);

src/modules/EnvironmentVariables/EnvironmentVariablesUILib/EnvironmentVariablesMainPage.xaml

@@ -466,27 +466,39 @@
                         TextChanged="EditVariableDialogValueTxtBox_TextChanged"
                         TextWrapping="Wrap" />
                     <MenuFlyoutSeparator Visibility="{Binding ShowAsList, Converter={StaticResource BoolToVisibilityConverter}}" />
-                    <ItemsControl
+                    <ListView
                         x:Name="EditVariableValuesList"
                         Margin="0,-8,0,12"
                         HorizontalAlignment="Stretch"
+                        AllowDrop="True"
+                        CanDragItems="True"
+                        CanReorderItems="True"
+                        DragItemsCompleted="EditVariableValuesList_DragItemsCompleted"
                         ItemsSource="{Binding ValuesList, Mode=TwoWay}"
                         Visibility="{Binding ShowAsList, Converter={StaticResource BoolToVisibilityConverter}}">
-                        <ItemsControl.ItemTemplate>
+                        <ListView.ItemTemplate>
                             <DataTemplate>
                                 <Grid>
                                     <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="32" />
                                         <ColumnDefinition Width="*" />
                                         <ColumnDefinition Width="40" />
                                     </Grid.ColumnDefinitions>
+                                    <FontIcon
+                                        Grid.Column="0"
+                                        Margin="0,0,8,0"
+                                        FontSize="16"
+                                        Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                                        Glyph="&#xE759;" />
                                     <TextBox
+                                        Grid.Column="1"
                                         Background="Transparent"
                                         BorderBrush="Transparent"
                                         LostFocus="EditVariableValuesListTextBox_LostFocus"
                                         Text="{Binding Text}" />
                                     <Button
                                         x:Uid="More_Options_Button"
-                                        Grid.Column="1"
+                                        Grid.Column="2"
                                         VerticalAlignment="Center"
                                         Content="&#xE712;"
                                         FontFamily="{ThemeResource SymbolThemeFontFamily}"
@@ -523,8 +535,8 @@
                                     </Button>
                                 </Grid>
                             </DataTemplate>
-                        </ItemsControl.ItemTemplate>
-                    </ItemsControl>
+                        </ListView.ItemTemplate>
+                    </ListView>
                 </StackPanel>
             </ScrollViewer>
         </ContentDialog>

src/modules/EnvironmentVariables/EnvironmentVariablesUILib/EnvironmentVariablesMainPage.xaml.cs

@@ -16,6 +16,8 @@ namespace EnvironmentVariablesUILib
 {
     public sealed partial class EnvironmentVariablesMainPage : Page
     {
+        private const string ValueListSeparator = ";";
+
         private sealed class RelayCommandParameter
         {
             public RelayCommandParameter(Variable variable, VariablesSet set)
@@ -440,7 +442,7 @@ namespace EnvironmentVariablesUILib
                 variable.ValuesList.Move(index, index - 1);
             }
 
-            var newValues = string.Join(";", variable.ValuesList?.Select(x => x.Text).ToArray());
+            var newValues = string.Join(ValueListSeparator, variable.ValuesList?.Select(x => x.Text).ToArray());
             EditVariableDialogValueTxtBox.Text = newValues;
         }
 
@@ -461,7 +463,7 @@ namespace EnvironmentVariablesUILib
                 variable.ValuesList.Move(index, index + 1);
             }
 
-            var newValues = string.Join(";", variable.ValuesList?.Select(x => x.Text).ToArray());
+            var newValues = string.Join(ValueListSeparator, variable.ValuesList?.Select(x => x.Text).ToArray());
             EditVariableDialogValueTxtBox.Text = newValues;
         }
 
@@ -476,7 +478,7 @@ namespace EnvironmentVariablesUILib
             var variable = EditVariableDialog.DataContext as Variable;
             variable.ValuesList.Remove(listItem);
 
-            var newValues = string.Join(";", variable.ValuesList?.Select(x => x.Text).ToArray());
+            var newValues = string.Join(ValueListSeparator, variable.ValuesList?.Select(x => x.Text).ToArray());
             EditVariableDialogValueTxtBox.Text = newValues;
         }
 
@@ -492,7 +494,7 @@ namespace EnvironmentVariablesUILib
             var index = variable.ValuesList.IndexOf(listItem);
             variable.ValuesList.Insert(index, new Variable.ValuesListItem { Text = string.Empty });
 
-            var newValues = string.Join(";", variable.ValuesList?.Select(x => x.Text).ToArray());
+            var newValues = string.Join(ValueListSeparator, variable.ValuesList?.Select(x => x.Text).ToArray());
             EditVariableDialogValueTxtBox.TextChanged -= EditVariableDialogValueTxtBox_TextChanged;
             EditVariableDialogValueTxtBox.Text = newValues;
             EditVariableDialogValueTxtBox.TextChanged += EditVariableDialogValueTxtBox_TextChanged;
@@ -510,7 +512,7 @@ namespace EnvironmentVariablesUILib
             var index = variable.ValuesList.IndexOf(listItem);
             variable.ValuesList.Insert(index + 1, new Variable.ValuesListItem { Text = string.Empty });
 
-            var newValues = string.Join(";", variable.ValuesList?.Select(x => x.Text).ToArray());
+            var newValues = string.Join(ValueListSeparator, variable.ValuesList?.Select(x => x.Text).ToArray());
             EditVariableDialogValueTxtBox.TextChanged -= EditVariableDialogValueTxtBox_TextChanged;
             EditVariableDialogValueTxtBox.Text = newValues;
             EditVariableDialogValueTxtBox.TextChanged += EditVariableDialogValueTxtBox_TextChanged;
@@ -532,7 +534,7 @@ namespace EnvironmentVariablesUILib
             listItem.Text = (sender as TextBox)?.Text;
             var variable = EditVariableDialog.DataContext as Variable;
 
-            var newValues = string.Join(";", variable.ValuesList?.Select(x => x.Text).ToArray());
+            var newValues = string.Join(ValueListSeparator, variable.ValuesList?.Select(x => x.Text).ToArray());
             EditVariableDialogValueTxtBox.TextChanged -= EditVariableDialogValueTxtBox_TextChanged;
             EditVariableDialogValueTxtBox.Text = newValues;
             EditVariableDialogValueTxtBox.TextChanged += EditVariableDialogValueTxtBox_TextChanged;
@@ -548,5 +550,16 @@ namespace EnvironmentVariablesUILib
             CancelAddVariable();
             ConfirmAddVariableBtn.IsEnabled = false;
         }
+
+        private void EditVariableValuesList_DragItemsCompleted(ListViewBase sender, DragItemsCompletedEventArgs args)
+        {
+            if (EditVariableDialog.DataContext is Variable variable && variable.ValuesList != null)
+            {
+                var newValues = string.Join(ValueListSeparator, variable.ValuesList.Select(x => x.Text));
+                EditVariableDialogValueTxtBox.TextChanged -= EditVariableDialogValueTxtBox_TextChanged;
+                EditVariableDialogValueTxtBox.Text = newValues;
+                EditVariableDialogValueTxtBox.TextChanged += EditVariableDialogValueTxtBox_TextChanged;
+            }
+        }
     }
 }

src/modules/FileLocksmith/FileLocksmithCLI/CLILogic.cpp

@@ -0,0 +1,248 @@
+#include "pch.h"
+#include "CLILogic.h"
+#include <common/utils/json.h>
+#include <iostream>
+#include <sstream>
+#include <chrono>
+#include "resource.h"
+#include <common/logger/logger.h>
+#include <common/utils/logger_helper.h>
+#include <type_traits>
+
+template<typename T>
+DWORD_PTR ToDwordPtr(T val)
+{
+    if constexpr (std::is_pointer_v<T>)
+    {
+        return reinterpret_cast<DWORD_PTR>(val);
+    }
+    else
+    {
+        return static_cast<DWORD_PTR>(val);
+    }
+}
+
+template<typename... Args>
+std::wstring FormatString(IStringProvider& strings, UINT id, Args... args)
+{
+    std::wstring format = strings.GetString(id);
+    if (format.empty()) return L"";
+
+    DWORD_PTR arguments[] = { ToDwordPtr(args)..., 0 };
+
+    LPWSTR buffer = nullptr;
+    FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_ARGUMENT_ARRAY,
+                   format.c_str(),
+                   0,
+                   0,
+                   reinterpret_cast<LPWSTR>(&buffer),
+                   0,
+                   reinterpret_cast<va_list*>(arguments));
+
+    if (buffer)
+    {
+        std::wstring result(buffer);
+        LocalFree(buffer);
+        return result;
+    }
+    return L"";
+}
+
+std::wstring get_usage(IStringProvider& strings)
+{
+    return strings.GetString(IDS_USAGE);
+}
+
+std::wstring get_json(const std::vector<ProcessResult>& results)
+{
+    json::JsonObject root;
+    json::JsonArray processes;
+
+    for (const auto& result : results)
+    {
+        json::JsonObject process;
+        process.SetNamedValue(L"pid", json::JsonValue::CreateNumberValue(result.pid));
+        process.SetNamedValue(L"name", json::JsonValue::CreateStringValue(result.name));
+        process.SetNamedValue(L"user", json::JsonValue::CreateStringValue(result.user));
+        
+        json::JsonArray files;
+        for (const auto& file : result.files)
+        {
+            files.Append(json::JsonValue::CreateStringValue(file));
+        }
+        process.SetNamedValue(L"files", files);
+        
+        processes.Append(process);
+    }
+
+    root.SetNamedValue(L"processes", processes);
+    return root.Stringify().c_str();
+}
+
+std::wstring get_text(const std::vector<ProcessResult>& results, IStringProvider& strings)
+{
+    std::wstringstream ss;
+    if (results.empty())
+    {
+        ss << strings.GetString(IDS_NO_PROCESSES);
+        return ss.str();
+    }
+
+    ss << strings.GetString(IDS_HEADER);
+    for (const auto& result : results)
+    {
+        ss << result.pid << L"\t" 
+           << result.user << L"\t" 
+           << result.name << std::endl;
+    }
+    return ss.str();
+}
+
+std::wstring kill_processes(const std::vector<ProcessResult>& results, IProcessTerminator& terminator, IStringProvider& strings)
+{
+    std::wstringstream ss;
+    for (const auto& result : results)
+    {
+        if (terminator.terminate(result.pid))
+        {
+            ss << FormatString(strings, IDS_TERMINATED, result.pid, result.name.c_str());
+        }
+        else
+        {
+            ss << FormatString(strings, IDS_FAILED_TERMINATE, result.pid, result.name.c_str());
+        }
+    }
+    return ss.str();
+}
+
+CommandResult run_command(int argc, wchar_t* argv[], IProcessFinder& finder, IProcessTerminator& terminator, IStringProvider& strings)
+{
+    Logger::info("Parsing arguments");
+    if (argc < 2)
+    {
+        Logger::warn("No arguments provided");
+        return { 1, get_usage(strings) };
+    }
+
+    bool json_output = false;
+    bool kill = false;
+    bool wait = false;
+    int timeout_ms = -1;
+    std::vector<std::wstring> paths;
+
+    for (int i = 1; i < argc; ++i)
+    {
+        std::wstring arg = argv[i];
+        if (arg == L"--json")
+        {
+            json_output = true;
+        }
+        else if (arg == L"--kill")
+        {
+            kill = true;
+        }
+        else if (arg == L"--wait")
+        {
+            wait = true;
+        }
+        else if (arg == L"--timeout")
+        {
+            if (i + 1 < argc)
+            {
+                try
+                {
+                    timeout_ms = std::stoi(argv[++i]);
+                }
+                catch (...)
+                {
+                    Logger::error("Invalid timeout value");
+                    return { 1, strings.GetString(IDS_ERROR_INVALID_TIMEOUT) };
+                }
+            }
+            else
+            {
+                Logger::error("Timeout argument missing");
+                return { 1, strings.GetString(IDS_ERROR_TIMEOUT_ARG) };
+            }
+        }
+        else if (arg == L"--help")
+        {
+            return { 0, get_usage(strings) };
+        }
+        else
+        {
+            paths.push_back(arg);
+        }
+    }
+
+    if (paths.empty())
+    {
+        Logger::error("No paths specified");
+        return { 1, strings.GetString(IDS_ERROR_NO_PATHS) };
+    }
+
+    Logger::info("Processing {} paths", paths.size());
+
+    if (wait)
+    {
+        std::wstringstream ss;
+        if (json_output)
+        {
+             Logger::warn("Wait is incompatible with JSON output");
+             ss << strings.GetString(IDS_WARN_JSON_WAIT);
+             json_output = false;
+        }
+        
+        ss << strings.GetString(IDS_WAITING);
+        auto start_time = std::chrono::steady_clock::now();
+        while (true)
+        {
+            auto results = finder.find(paths);
+            if (results.empty())
+            {
+                Logger::info("Files unlocked");
+                ss << strings.GetString(IDS_UNLOCKED);
+                break;
+            }
+
+            if (timeout_ms >= 0)
+            {
+                auto current_time = std::chrono::steady_clock::now();
+                auto elapsed = std::chrono::duration_cast<std::chrono::milliseconds>(current_time - start_time).count();
+                if (elapsed > timeout_ms)
+                {
+                    Logger::warn("Timeout waiting for files to be unlocked");
+                    ss << strings.GetString(IDS_TIMEOUT);
+                    return { 1, ss.str() };
+                }
+            }
+
+            Sleep(200);
+        }
+        return { 0, ss.str() };
+    }
+
+    auto results = finder.find(paths);
+    Logger::info("Found {} processes locking the files", results.size());
+    std::wstringstream output_ss;
+
+    if (kill)
+    {
+        Logger::info("Killing processes");
+        output_ss << kill_processes(results, terminator, strings);
+        // Re-check after killing
+        results = finder.find(paths);
+        Logger::info("Remaining processes: {}", results.size());
+    }
+
+    if (json_output)
+    {
+        output_ss << get_json(results) << std::endl;
+    }
+    else
+    {
+        output_ss << get_text(results, strings);
+    }
+
+    return { 0, output_ss.str() };
+}

src/modules/FileLocksmith/FileLocksmithCLI/CLILogic.h

@@ -0,0 +1,31 @@
+#pragma once
+#include <vector>
+#include <string>
+#include "FileLocksmithLib/FileLocksmith.h"
+#include <Windows.h>
+
+struct CommandResult
+{
+    int exit_code;
+    std::wstring output;
+};
+
+struct IProcessFinder
+{
+    virtual std::vector<ProcessResult> find(const std::vector<std::wstring>& paths) = 0;
+    virtual ~IProcessFinder() = default;
+};
+
+struct IProcessTerminator
+{
+    virtual bool terminate(DWORD pid) = 0;
+    virtual ~IProcessTerminator() = default;
+};
+
+struct IStringProvider
+{
+    virtual std::wstring GetString(UINT id) = 0;
+    virtual ~IStringProvider() = default;
+};
+
+CommandResult run_command(int argc, wchar_t* argv[], IProcessFinder& finder, IProcessTerminator& terminator, IStringProvider& strings);

src/modules/FileLocksmith/FileLocksmithCLI/FileLocksmithCLI.rc

@@ -0,0 +1,19 @@
+#include "resource.h"
+#include <windows.h>
+
+STRINGTABLE
+BEGIN
+    IDS_USAGE               "Usage: FileLocksmithCLI.exe [options] <path1> [path2] ...\nOptions:\n  --kill      Kill processes locking the files\n  --json      Output results in JSON format\n  --wait      Wait for files to be unlocked\n  --timeout   Timeout in milliseconds for --wait\n  --help      Show this help message\n"
+    IDS_NO_PROCESSES        "No processes found locking the file(s).\n"
+    IDS_HEADER              "PID\tUser\tProcess\n"
+    IDS_TERMINATED          "Terminated process %1!d! (%2)\n"
+    IDS_FAILED_TERMINATE    "Failed to terminate process %1!d! (%2)\n"
+    IDS_FAILED_OPEN         "Failed to open process %1!d! (%2)\n"
+    IDS_ERROR_NO_PATHS      "Error: No paths specified.\n"
+    IDS_WARN_JSON_WAIT      "Warning: --wait is incompatible with --json. Ignoring --json.\n"
+    IDS_WAITING             "Waiting for files to be unlocked...\n"
+    IDS_UNLOCKED            "Files unlocked.\n"
+    IDS_TIMEOUT             "Timeout waiting for files to be unlocked.\n"
+    IDS_ERROR_INVALID_TIMEOUT "Error: Invalid timeout value.\n"
+    IDS_ERROR_TIMEOUT_ARG   "Error: --timeout requires an argument.\n"
+END

src/modules/FileLocksmith/FileLocksmithCLI/FileLocksmithCLI.vcxproj

@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props')" />
+  <PropertyGroup Label="Globals">
+    <VCProjectVersion>17.0</VCProjectVersion>
+    <Keyword>Win32Proj</Keyword>
+    <ProjectGuid>{49D456D3-F485-45AF-8875-45B44F193DDC}</ProjectGuid>
+    <RootNamespace>FileLocksmithCLI</RootNamespace>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+    <ProjectName>FileLocksmithCLI</ProjectName>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <Import Project="..\..\..\..\deps\spdlog.props" />
+  <PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)'=='Release'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <OutDir>..\..\..\..\$(Platform)\$(Configuration)</OutDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)'=='Debug'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>false</ConformanceMode>
+      <AdditionalIncludeDirectories>$(ProjectDir)..;$(ProjectDir)..\..\..;$(ProjectDir)..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
+      <RunCodeAnalysis>false</RunCodeAnalysis>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>shlwapi.lib;ntdll.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)'=='Release'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>false</ConformanceMode>
+      <AdditionalIncludeDirectories>$(ProjectDir)..;$(ProjectDir)..\..\..;$(ProjectDir)..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
+      <RunCodeAnalysis>false</RunCodeAnalysis>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>shlwapi.lib;ntdll.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="CLILogic.cpp" />
+    <ClCompile Include="main.cpp" />
+    <ClCompile Include="pch.cpp">
+      <PrecompiledHeader Condition="'$(UsePrecompiledHeaders)' != 'false'">Create</PrecompiledHeader>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="CLILogic.h" />
+    <ClInclude Include="pch.h" />
+    <ClInclude Include="resource.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="FileLocksmithCLI.rc" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\FileLocksmithLib\FileLocksmithLib.vcxproj">
+      <Project>{9d52fd25-ef90-4f9a-a015-91efc5daf54f}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\common\logger\logger.vcxproj">
+      <Project>{d9b8fc84-322a-4f9f-bbb9-20915c47ddfd}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\common\SettingsAPI\SettingsAPI.vcxproj">
+      <Project>{6955446d-23f7-4023-9bb3-8657f904af99}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\common\version\version.vcxproj">
+      <Project>{1248566c-272a-43c0-88d6-e6675d569a09}</Project>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+    <Import Project="..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets')" />
+  </ImportGroup>
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props'))" />
+    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets'))" />
+  </Target>
+</Project>

src/modules/FileLocksmith/FileLocksmithCLI/FileLocksmithCLI.vcxproj.filters

@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;c++;cppm;ixx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hh;hpp;hxx;h++;hm;inl;inc;ipp;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="CLILogic.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="main.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="pch.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="CLILogic.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="pch.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="resource.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+</Project>

src/modules/FileLocksmith/FileLocksmithCLI/main.cpp

@@ -0,0 +1,71 @@
+#include "pch.h"
+#include "CLILogic.h"
+#include "FileLocksmithLib/FileLocksmith.h"
+#include <iostream>
+#include "resource.h"
+#include <common/logger/logger.h>
+#include <common/utils/logger_helper.h>
+
+struct RealProcessFinder : IProcessFinder
+{
+    std::vector<ProcessResult> find(const std::vector<std::wstring>& paths) override
+    {
+        return find_processes_recursive(paths);
+    }
+};
+
+struct RealProcessTerminator : IProcessTerminator
+{
+    bool terminate(DWORD pid) override
+    {
+        HANDLE hProcess = OpenProcess(PROCESS_TERMINATE, FALSE, pid);
+        if (hProcess)
+        {
+            bool result = TerminateProcess(hProcess, 0);
+            CloseHandle(hProcess);
+            return result;
+        }
+        return false;
+    }
+};
+
+struct RealStringProvider : IStringProvider
+{
+    std::wstring GetString(UINT id) override
+    {
+        wchar_t buffer[4096];
+        int len = LoadStringW(GetModuleHandle(NULL), id, buffer, ARRAYSIZE(buffer));
+        if (len > 0)
+        {
+            return std::wstring(buffer, len);
+        }
+        return L"";
+    }
+};
+
+#ifndef UNIT_TEST
+int wmain(int argc, wchar_t* argv[])
+{
+    winrt::init_apartment();
+    LoggerHelpers::init_logger(L"FileLocksmithCLI", L"", LogSettings::fileLocksmithLoggerName);
+    Logger::info("FileLocksmithCLI started");
+
+    RealProcessFinder finder;
+    RealProcessTerminator terminator;
+    RealStringProvider strings;
+
+    auto result = run_command(argc, argv, finder, terminator, strings);
+
+    if (result.exit_code != 0)
+    {
+        Logger::error("Command failed with exit code {}", result.exit_code);
+    }
+    else
+    {
+        Logger::info("Command succeeded");
+    }
+
+    std::wcout << result.output;
+    return result.exit_code;
+}
+#endif

src/modules/FileLocksmith/FileLocksmithCLI/packages.config

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Microsoft.Windows.CppWinRT" version="2.0.240111.5" targetFramework="native" />
+</packages>

src/modules/FileLocksmith/FileLocksmithCLI/pch.cpp

@@ -0,0 +1 @@
+#include "pch.h"

src/modules/FileLocksmith/FileLocksmithCLI/pch.h

@@ -0,0 +1,22 @@
+#pragma once
+
+#ifndef PCH_H
+#define PCH_H
+
+#define NOMINMAX
+#define WIN32_LEAN_AND_MEAN
+#include <Windows.h>
+#include <winternl.h>
+#include <Psapi.h>
+#include <shellapi.h>
+
+#include <iostream>
+#include <vector>
+#include <string>
+#include <map>
+#include <set>
+#include <algorithm>
+
+#include <winrt/base.h>
+
+#endif // PCH_H

src/modules/FileLocksmith/FileLocksmithCLI/resource.h

@@ -0,0 +1,16 @@
+// resource.h
+#pragma once
+
+#define IDS_USAGE                       101
+#define IDS_NO_PROCESSES                102
+#define IDS_HEADER                      103
+#define IDS_TERMINATED                  104
+#define IDS_FAILED_TERMINATE            105
+#define IDS_FAILED_OPEN                 106
+#define IDS_ERROR_NO_PATHS              107
+#define IDS_WARN_JSON_WAIT              108
+#define IDS_WAITING                     109
+#define IDS_UNLOCKED                    110
+#define IDS_TIMEOUT                     111
+#define IDS_ERROR_INVALID_TIMEOUT       112
+#define IDS_ERROR_TIMEOUT_ARG           113

src/modules/FileLocksmith/FileLocksmithCLI/tests/FileLocksmithCLITests.cpp

@@ -0,0 +1,130 @@
+#include "pch.h"
+#include "CppUnitTest.h"
+#include "../CLILogic.h"
+#include <map>
+
+using namespace Microsoft::VisualStudio::CppUnitTestFramework;
+
+namespace FileLocksmithCLIUnitTests
+{
+    struct MockProcessFinder : IProcessFinder
+    {
+        std::vector<ProcessResult> results;
+        std::vector<ProcessResult> find(const std::vector<std::wstring>& paths) override
+        {
+            (void)paths;
+            return results;
+        }
+    };
+
+    struct MockProcessTerminator : IProcessTerminator
+    {
+        bool shouldSucceed = true;
+        std::vector<DWORD> terminatedPids;
+        bool terminate(DWORD pid) override
+        {
+            terminatedPids.push_back(pid);
+            return shouldSucceed;
+        }
+    };
+
+    struct MockStringProvider : IStringProvider
+    {
+        std::map<UINT, std::wstring> strings;
+        std::wstring GetString(UINT id) override
+        {
+            if (strings.count(id)) return strings[id];
+            return L"String_" + std::to_wstring(id);
+        }
+    };
+
+    TEST_CLASS(CLITests)
+    {
+    public:
+        
+        TEST_METHOD(TestNoArgs)
+        {
+            MockProcessFinder finder;
+            MockProcessTerminator terminator;
+            MockStringProvider strings;
+            
+            wchar_t* argv[] = { (wchar_t*)L"exe" };
+            auto result = run_command(1, argv, finder, terminator, strings);
+            
+            Assert::AreEqual(1, result.exit_code);
+        }
+
+        TEST_METHOD(TestHelp)
+        {
+            MockProcessFinder finder;
+            MockProcessTerminator terminator;
+            MockStringProvider strings;
+            
+            wchar_t* argv[] = { (wchar_t*)L"exe", (wchar_t*)L"--help" };
+            auto result = run_command(2, argv, finder, terminator, strings);
+            
+            Assert::AreEqual(0, result.exit_code);
+        }
+
+        TEST_METHOD(TestFindProcesses)
+        {
+            MockProcessFinder finder;
+            finder.results = { { L"process", 123, L"user", { L"file1" } } };
+            MockProcessTerminator terminator;
+            MockStringProvider strings;
+            
+            wchar_t* argv[] = { (wchar_t*)L"exe", (wchar_t*)L"file1" };
+            auto result = run_command(2, argv, finder, terminator, strings);
+            
+            Assert::AreEqual(0, result.exit_code);
+            Assert::IsTrue(result.output.find(L"123") != std::wstring::npos);
+            Assert::IsTrue(result.output.find(L"process") != std::wstring::npos);
+        }
+
+        TEST_METHOD(TestJsonOutput)
+        {
+            MockProcessFinder finder;
+            finder.results = { { L"process", 123, L"user", { L"file1" } } };
+            MockProcessTerminator terminator;
+            MockStringProvider strings;
+            
+            wchar_t* argv[] = { (wchar_t*)L"exe", (wchar_t*)L"file1", (wchar_t*)L"--json" };
+            auto result = run_command(3, argv, finder, terminator, strings);
+            
+            Microsoft::VisualStudio::CppUnitTestFramework::Logger::WriteMessage(result.output.c_str());
+
+            Assert::AreEqual(0, result.exit_code);
+            Assert::IsTrue(result.output.find(L"\"pid\"") != std::wstring::npos);
+            Assert::IsTrue(result.output.find(L"123") != std::wstring::npos);
+        }
+
+        TEST_METHOD(TestKill)
+        {
+            MockProcessFinder finder;
+            finder.results = { { L"process", 123, L"user", { L"file1" } } };
+            MockProcessTerminator terminator;
+            MockStringProvider strings;
+            
+            wchar_t* argv[] = { (wchar_t*)L"exe", (wchar_t*)L"file1", (wchar_t*)L"--kill" };
+            auto result = run_command(3, argv, finder, terminator, strings);
+            
+            Assert::AreEqual(0, result.exit_code);
+            Assert::AreEqual((size_t)1, terminator.terminatedPids.size());
+            Assert::AreEqual((DWORD)123, terminator.terminatedPids[0]);
+        }
+
+        TEST_METHOD(TestTimeout)
+        {
+            MockProcessFinder finder;
+            // Always return results so it waits
+            finder.results = { { L"process", 123, L"user", { L"file1" } } };
+            MockProcessTerminator terminator;
+            MockStringProvider strings;
+            
+            wchar_t* argv[] = { (wchar_t*)L"exe", (wchar_t*)L"file1", (wchar_t*)L"--wait", (wchar_t*)L"--timeout", (wchar_t*)L"100" };
+            auto result = run_command(5, argv, finder, terminator, strings);
+            
+            Assert::AreEqual(1, result.exit_code);
+        }
+    };
+}

src/modules/FileLocksmith/FileLocksmithCLI/tests/FileLocksmithCLIUnitTests.vcxproj

@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('..\..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props')" />
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{A1B2C3D4-E5F6-7890-1234-567890ABCDEF}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <RootNamespace>FileLocksmithCLIUnitTests</RootNamespace>
+    <ProjectName>FileLocksmithCLI.UnitTests</ProjectName>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <Import Project="..\..\..\..\..\deps\spdlog.props" />
+  <PropertyGroup Label="Configuration">
+    <PlatformToolset>v143</PlatformToolset>
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <OutDir>..\..\..\..\..\$(Platform)\$(Configuration)\tests\FileLocksmithCLI\</OutDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <AdditionalIncludeDirectories>..\;..\..\;..\..\..\..\;$(VCInstallDir)UnitTest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;UNIT_TEST;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <UseFullPaths>true</UseFullPaths>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
+      <DisableSpecificWarnings>26466;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+    <Link>
+      <AdditionalLibraryDirectories>$(VCInstallDir)UnitTest\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>shlwapi.lib;ntdll.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClInclude Include="pch.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="pch.cpp">
+      <PrecompiledHeader Condition="'$(UsePrecompiledHeaders)' != 'false'">Create</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="FileLocksmithCLITests.cpp" />
+    <ClCompile Include="..\CLILogic.cpp">
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\FileLocksmithLib\FileLocksmithLib.vcxproj">
+      <Project>{9d52fd25-ef90-4f9a-a015-91efc5daf54f}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\common\logger\logger.vcxproj">
+      <Project>{d9b8fc84-322a-4f9f-bbb9-20915c47ddfd}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\common\SettingsAPI\SettingsAPI.vcxproj">
+      <Project>{6955446d-23f7-4023-9bb3-8657f904af99}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\common\version\version.vcxproj">
+      <Project>{1248566c-272a-43c0-88d6-e6675d569a09}</Project>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+    <Import Project="..\..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('..\..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets')" />
+  </ImportGroup>
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets'))" />
+  </Target>
+</Project>

src/modules/FileLocksmith/FileLocksmithCLI/tests/packages.config

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Microsoft.Windows.CppWinRT" version="2.0.240111.5" targetFramework="native" />
+</packages>

src/modules/FileLocksmith/FileLocksmithCLI/tests/pch.cpp

@@ -0,0 +1 @@
+#include "pch.h"

src/modules/FileLocksmith/FileLocksmithCLI/tests/pch.h

@@ -0,0 +1,9 @@
+#pragma once
+#include <winrt/base.h>
+#include <Windows.h>
+#include <shellapi.h>
+#include <string>
+#include <vector>
+#include <iostream>
+#include <sstream>
+#include "CppUnitTest.h"

src/modules/FileLocksmith/FileLocksmithLib/FileLocksmith.h

@@ -0,0 +1,9 @@
+#pragma once
+
+#include "ProcessResult.h"
+
+// Second version, checks handles towards files and all subfiles and folders of given dirs, if any.
+std::vector<ProcessResult> find_processes_recursive(const std::vector<std::wstring>& paths);
+
+// Gives the full path of the executable, given the process id
+std::wstring pid_to_full_path(DWORD pid);

src/modules/FileLocksmith/FileLocksmithLib/FileLocksmithLib.vcxproj

@@ -34,9 +34,9 @@
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
       <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;FILELOCKSMITH_LIB_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>../../..;../..;</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\FileLocksmithLibInterop;../../..;../..;</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>
@@ -50,9 +50,9 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;FILELOCKSMITH_LIB_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>../../..;../..;</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\FileLocksmithLibInterop;../../..;../..;</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>
@@ -68,13 +68,15 @@
     <ClInclude Include="Settings.h" />
     <ClInclude Include="Trace.h" />
     <ClInclude Include="framework.h" />
-    <ClInclude Include="pch.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="IPC.cpp" />
     <ClCompile Include="Settings.cpp" />
     <ClCompile Include="Trace.cpp" />
     <ClCompile Include="FileLocksmithLib.cpp" />
+    <ClCompile Include="..\FileLocksmithLibInterop\FileLocksmith.cpp" />
+    <ClCompile Include="..\FileLocksmithLibInterop\NtdllBase.cpp" />
+    <ClCompile Include="..\FileLocksmithLibInterop\NtdllExtensions.cpp" />
     <ClCompile Include="pch.cpp">
       <PrecompiledHeader Condition="'$(UsePrecompiledHeaders)' != 'false'">Create</PrecompiledHeader>
     </ClCompile>

src/modules/FileLocksmith/FileLocksmithLib/FileLocksmithLib.vcxproj.filters

@@ -38,6 +38,15 @@
     <ClCompile Include="FileLocksmithLib.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="FileLocksmith.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="NtdllBase.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="NtdllExtensions.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="pch.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>

src/modules/FileLocksmith/FileLocksmithLib/ProcessResult.h

@@ -0,0 +1,12 @@
+#pragma once
+#include <string>
+#include <vector>
+#include <Windows.h>
+
+struct ProcessResult
+{
+    std::wstring name;
+    DWORD pid;
+    std::wstring user;
+    std::vector<std::wstring> files;
+};

src/modules/FileLocksmith/FileLocksmithLib/Settings.cpp

@@ -2,6 +2,7 @@
 #include "Settings.h"
 #include "Constants.h"
 
+#include <filesystem>
 #include <common/utils/json.h>
 #include <common/SettingsAPI/settings_helpers.h>
 

src/modules/FileLocksmith/FileLocksmithLib/pch.h

@@ -1,13 +0,0 @@
-// pch.h: This is a precompiled header file.
-// Files listed below are compiled only once, improving build performance for future builds.
-// This also affects IntelliSense performance, including code completion and many code browsing features.
-// However, files listed here are ALL re-compiled if any one of them is updated between builds.
-// Do not add files here that you will be updating frequently as this negates the performance advantage.
-
-#ifndef PCH_H
-#define PCH_H
-
-// add headers that you want to pre-compile here
-#include "framework.h"
-
-#endif //PCH_H

src/modules/FileLocksmith/FileLocksmithLibInterop/pch.h

@@ -18,4 +18,6 @@
 #include <algorithm>
 #include <fstream>
 
+#ifndef FILELOCKSMITH_LIB_STATIC
 #include <winrt/PowerToys.Interop.h>
+#endif

src/modules/Hosts/Hosts/HostsXAML/App.xaml.cs

@@ -67,7 +67,7 @@ namespace Hosts
                     services.AddSingleton<IElevationHelper, ElevationHelper>();
                     services.AddSingleton<OpenSettingsFunction>(() =>
                     {
-                        SettingsDeepLink.OpenSettings(SettingsDeepLink.SettingsWindow.Hosts, true);
+                        SettingsDeepLink.OpenSettings(SettingsDeepLink.SettingsWindow.Hosts);
                     });
 
                     services.AddSingleton<MainViewModel, MainViewModel>();

src/modules/Hosts/HostsModuleInterface/dllmain.cpp

@@ -155,7 +155,7 @@ public:
             }
         }
 
-        m_showEventWaiter = EventWaiter(CommonSharedConstants::SHOW_HOSTS_EVENT, [&](int err)
+        m_showEventWaiter.start(CommonSharedConstants::SHOW_HOSTS_EVENT, [&](DWORD err)
         {
             if (m_enabled && err == ERROR_SUCCESS)
             {
@@ -174,7 +174,7 @@ public:
             }
         });
 
-        m_showAdminEventWaiter = EventWaiter(CommonSharedConstants::SHOW_HOSTS_ADMIN_EVENT, [&](int err)
+        m_showAdminEventWaiter.start(CommonSharedConstants::SHOW_HOSTS_ADMIN_EVENT, [&](DWORD err)
         {
             if (m_enabled && err == ERROR_SUCCESS)
             {

src/modules/LightSwitch/LightSwitchModuleInterface/LightSwitchModuleInterface.vcxproj

@@ -168,9 +168,6 @@
     <ClCompile>
       <AdditionalIncludeDirectories>..\..\..\common\inc;..\..\..\common\Telemetry;..\..\;..\..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
-    <Link>
-      <AdditionalDependencies Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">$(CoreLibraryDependencies);%(AdditionalDependencies);advapi32.lib</AdditionalDependencies>
-    </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClInclude Include="pch.h" />
@@ -222,4 +219,4 @@
     <Error Condition="!Exists('..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props'))" />
     <Error Condition="!Exists('..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets'))" />
   </Target>
-</Project>
+</Project>

src/modules/LightSwitch/LightSwitchModuleInterface/dllmain.cpp

@@ -8,6 +8,8 @@
 #include <codecvt>
 #include <common/utils/logger_helper.h>
 #include "ThemeHelper.h"
+#include <thread>
+#include <atomic>
 
 extern "C" IMAGE_DOS_HEADER __ImageBase;
 
@@ -103,12 +105,18 @@ private:
     HANDLE m_force_light_event_handle;
     HANDLE m_force_dark_event_handle;
     HANDLE m_manual_override_event_handle;
+    HANDLE m_toggle_event_handle{ nullptr };
+    std::thread m_toggle_thread;
+    std::atomic<bool> m_toggle_thread_running{ false };
 
     static const constexpr int NUM_DEFAULT_HOTKEYS = 4;
 
     Hotkey m_toggle_theme_hotkey = { .win = true, .ctrl = true, .shift = true, .alt = false, .key = 'D' };
 
     void init_settings();
+    void ToggleTheme();
+    void StartToggleListener();
+    void StopToggleListener();
 
 public:
     LightSwitchInterface()
@@ -118,6 +126,7 @@ public:
         m_force_light_event_handle = CreateDefaultEvent(L"POWERTOYS_LIGHTSWITCH_FORCE_LIGHT");
         m_force_dark_event_handle = CreateDefaultEvent(L"POWERTOYS_LIGHTSWITCH_FORCE_DARK");
         m_manual_override_event_handle = CreateEventW(nullptr, TRUE, FALSE, L"POWERTOYS_LIGHTSWITCH_MANUAL_OVERRIDE");
+        m_toggle_event_handle = CreateDefaultEvent(L"Local\\PowerToys-LightSwitch-ToggleEvent-d8dc2f29-8c94-4ca1-8c5f-3e2b1e3c4f5a");
 
         init_settings();
     };
@@ -130,6 +139,8 @@ public:
     // Destroy the powertoy and free memory
     virtual void destroy() override
     {
+        // Ensure worker threads/process handles are cleaned up before destruction
+        disable();
         delete this;
     }
 
@@ -394,6 +405,7 @@ public:
     {
         m_enabled = true;
         Logger::info(L"Enabling Light Switch module...");
+        Trace::Enable(true);
 
         unsigned long powertoys_pid = GetCurrentProcessId();
         std::wstring args = L"--pid " + std::to_wstring(powertoys_pid);
@@ -444,6 +456,8 @@ public:
         Logger::info(L"Light Switch process launched successfully (PID: {}).", pi.dwProcessId);
         m_process = pi.hProcess;
         CloseHandle(pi.hThread);
+
+        StartToggleListener();
     }
 
     // Disable the powertoy
@@ -469,6 +483,9 @@ public:
             CloseHandle(m_process);
             m_process = nullptr;
         }
+        
+        Trace::Enable(false);
+        StopToggleListener();
     }
 
     // Returns if the powertoys is enabled
@@ -524,37 +541,16 @@ public:
         if (m_enabled)
         {
             Logger::trace(L"Light Switch hotkey pressed");
+            Trace::ShortcutInvoked();
+
             if (!is_process_running())
             {
                 enable();
             }
             else if (hotkeyId == 0)
             {
-                // get current will return true if in light mode; otherwise false
                 Logger::info(L"[Light Switch] Hotkey triggered: Toggle Theme");
-                if (g_settings.m_changeSystem)
-                {
-                    SetSystemTheme(!GetCurrentSystemTheme());
-                }
-                if (g_settings.m_changeApps)
-                {
-                    SetAppsTheme(!GetCurrentAppsTheme());
-                }
-
-                if (!m_manual_override_event_handle)
-                {
-                    m_manual_override_event_handle = OpenEventW(SYNCHRONIZE | EVENT_MODIFY_STATE, FALSE, L"POWERTOYS_LIGHTSWITCH_MANUAL_OVERRIDE");
-                    if (!m_manual_override_event_handle)
-                    {
-                        m_manual_override_event_handle = CreateEventW(nullptr, TRUE, FALSE, L"POWERTOYS_LIGHTSWITCH_MANUAL_OVERRIDE");
-                    }
-                }
-
-                if (m_manual_override_event_handle)
-                {
-                    SetEvent(m_manual_override_event_handle);
-                    Logger::debug(L"[Light Switch] Manual override event set");
-                }
+                ToggleTheme();
             }
 
             return true;
@@ -567,8 +563,80 @@ public:
     {
         return WaitForSingleObject(m_process, 0) == WAIT_TIMEOUT;
     }
+
 };
 
+void LightSwitchInterface::ToggleTheme()
+{
+    if (g_settings.m_changeSystem)
+    {
+        SetSystemTheme(!GetCurrentSystemTheme());
+    }
+    if (g_settings.m_changeApps)
+    {
+        SetAppsTheme(!GetCurrentAppsTheme());
+    }
+
+    if (!m_manual_override_event_handle)
+    {
+        m_manual_override_event_handle = OpenEventW(SYNCHRONIZE | EVENT_MODIFY_STATE, FALSE, L"POWERTOYS_LIGHTSWITCH_MANUAL_OVERRIDE");
+        if (!m_manual_override_event_handle)
+        {
+            m_manual_override_event_handle = CreateEventW(nullptr, TRUE, FALSE, L"POWERTOYS_LIGHTSWITCH_MANUAL_OVERRIDE");
+        }
+    }
+
+    if (m_manual_override_event_handle)
+    {
+        SetEvent(m_manual_override_event_handle);
+        Logger::debug(L"[Light Switch] Manual override event set");
+    }
+}
+
+void LightSwitchInterface::StartToggleListener()
+{
+    if (m_toggle_thread_running || !m_toggle_event_handle)
+    {
+        return;
+    }
+
+    m_toggle_thread_running = true;
+    m_toggle_thread = std::thread([this]() {
+        while (m_toggle_thread_running)
+        {
+            const DWORD wait_result = WaitForSingleObject(m_toggle_event_handle, 500);
+            if (!m_toggle_thread_running)
+            {
+                break;
+            }
+
+            if (wait_result == WAIT_OBJECT_0)
+            {
+                ToggleTheme();
+                ResetEvent(m_toggle_event_handle);
+            }
+        }
+    });
+}
+
+void LightSwitchInterface::StopToggleListener()
+{
+    if (!m_toggle_thread_running)
+    {
+        return;
+    }
+
+    m_toggle_thread_running = false;
+    if (m_toggle_event_handle)
+    {
+        SetEvent(m_toggle_event_handle);
+    }
+    if (m_toggle_thread.joinable())
+    {
+        m_toggle_thread.join();
+    }
+}
+
 std::wstring utf8_to_wstring(const std::string& str)
 {
     if (str.empty())
@@ -646,4 +714,4 @@ void LightSwitchInterface::init_settings()
 extern "C" __declspec(dllexport) PowertoyModuleIface* __cdecl powertoy_create()
 {
     return new LightSwitchInterface();
-}
+}

src/modules/LightSwitch/LightSwitchModuleInterface/trace.cpp

@@ -19,12 +19,21 @@ void Trace::UnregisterProvider()
     TraceLoggingUnregister(g_hProvider);
 }
 
-void Trace::MyEvent()
+void Trace::Enable(bool enabled) noexcept
 {
     TraceLoggingWrite(
         g_hProvider,
-        "PowerToyName_MyEvent",
+        "LightSwitch_EnableLightSwitch",
+        ProjectTelemetryPrivacyDataTag(ProjectTelemetryTag_ProductAndServicePerformance),
+        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE),
+        TraceLoggingBoolean(enabled, "Enabled"));
+}
+
+void Trace::ShortcutInvoked() noexcept
+{
+    TraceLoggingWrite(
+        g_hProvider,
+        "LightSwitch_ShortcutInvoked",
         ProjectTelemetryPrivacyDataTag(ProjectTelemetryTag_ProductAndServicePerformance),
-        TraceLoggingBoolean(TRUE, "UTCReplace_AppSessionGuid"),
         TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE));
 }

src/modules/LightSwitch/LightSwitchModuleInterface/trace.h

@@ -11,5 +11,6 @@ class Trace
 public:
     static void RegisterProvider();
     static void UnregisterProvider();
-    static void MyEvent();
+    static void Enable(bool enabled) noexcept;
+    static void ShortcutInvoked() noexcept;
 };

src/modules/LightSwitch/LightSwitchService/LightSwitchService.cpp

@@ -14,6 +14,7 @@
 #include "LightSwitchStateManager.h"
 #include <LightSwitchUtils.h>
 #include <NightLightRegistryObserver.h>
+#include <trace.h>
 
 SERVICE_STATUS g_ServiceStatus = {};
 SERVICE_STATUS_HANDLE g_StatusHandle = nullptr;
@@ -357,6 +358,8 @@ DWORD WINAPI ServiceWorkerThread(LPVOID lpParam)
 
 int APIENTRY wWinMain(HINSTANCE, HINSTANCE, PWSTR, int)
 {
+    Trace::LightSwitch::RegisterProvider();
+
     if (powertoys_gpo::getConfiguredLightSwitchEnabledValue() == powertoys_gpo::gpo_rule_configured_disabled)
     {
         wchar_t msg[160];
@@ -364,12 +367,14 @@ int APIENTRY wWinMain(HINSTANCE, HINSTANCE, PWSTR, int)
             msg,
             L"Tried to start with a GPO policy setting the utility to always be disabled. Please contact your systems administrator.");
         Logger::info(msg);
+        Trace::LightSwitch::UnregisterProvider();
         return 0;
     }
-
     int argc = 0;
     LPWSTR* argv = CommandLineToArgvW(GetCommandLineW(), &argc);
     int rc = _tmain(argc, argv); // reuse your existing logic
     LocalFree(argv);
+
+    Trace::LightSwitch::UnregisterProvider();
     return rc;
 }

src/modules/LightSwitch/LightSwitchService/LightSwitchService.vcxproj

@@ -80,6 +80,7 @@
     <ClCompile Include="SettingsConstants.cpp" />
     <ClCompile Include="ThemeHelper.cpp" />
     <ClCompile Include="ThemeScheduler.cpp" />
+    <ClCompile Include="trace.cpp" />
     <ClCompile Include="WinHookEventIDs.cpp" />
   </ItemGroup>
   <ItemGroup>
@@ -94,6 +95,7 @@
     <ClInclude Include="SettingsObserver.h" />
     <ClInclude Include="ThemeHelper.h" />
     <ClInclude Include="ThemeScheduler.h" />
+    <ClInclude Include="trace.h" />
     <ClInclude Include="WinHookEventIDs.h" />
   </ItemGroup>
   <ItemGroup>

src/modules/LightSwitch/LightSwitchService/LightSwitchService.vcxproj.filters

@@ -39,6 +39,9 @@
     <ClCompile Include="NightLightRegistryObserver.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="trace.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="ThemeScheduler.h">
@@ -68,6 +71,9 @@
     <ClInclude Include="NightLightRegistryObserver.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="trace.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Natvis Include="$(MSBuildThisFileDirectory)..\..\natvis\wil.natvis" />

src/modules/LightSwitch/LightSwitchService/LightSwitchSettings.cpp

@@ -5,6 +5,7 @@
 #include <filesystem>
 #include <fstream>
 #include <logger.h>
+#include <LightSwitchService/trace.h>
 
 using namespace std;
 
@@ -151,6 +152,7 @@ void LightSwitchSettings::LoadSettings()
             if (m_settings.scheduleMode != newMode)
             {
                 m_settings.scheduleMode = newMode;
+                Trace::LightSwitch::ScheduleModeToggled(val);
                 NotifyObservers(SettingId::ScheduleMode);
             }
         }
@@ -220,6 +222,8 @@ void LightSwitchSettings::LoadSettings()
             }
         }
 
+        bool themeTargetChanged = false;
+
         // ChangeSystem
         if (const auto jsonVal = values.get_bool_value(L"changeSystem"))
         {
@@ -227,6 +231,7 @@ void LightSwitchSettings::LoadSettings()
             if (m_settings.changeSystem != val)
             {
                 m_settings.changeSystem = val;
+                themeTargetChanged = true;
                 NotifyObservers(SettingId::ChangeSystem);
             }
         }
@@ -238,9 +243,16 @@ void LightSwitchSettings::LoadSettings()
             if (m_settings.changeApps != val)
             {
                 m_settings.changeApps = val;
+                themeTargetChanged = true;
                 NotifyObservers(SettingId::ChangeApps);
             }
         }
+
+        // For ChangeSystem/ChangeApps changes, log telemetry
+        if (themeTargetChanged)
+        {
+            Trace::LightSwitch::ThemeTargetChanged(m_settings.changeApps, m_settings.changeSystem);
+        }
     }
     catch (...)
     {

src/modules/LightSwitch/LightSwitchService/trace.cpp

@@ -0,0 +1,43 @@
+#include "pch.h"
+#include "trace.h"
+
+// Telemetry strings should not be localized.
+#define LoggingProviderKey "Microsoft.PowerToys"
+
+TRACELOGGING_DEFINE_PROVIDER(
+    g_hProvider,
+    LoggingProviderKey,
+    // {38e8889b-9731-53f5-e901-e8a7c1753074}
+    (0x38e8889b, 0x9731, 0x53f5, 0xe9, 0x01, 0xe8, 0xa7, 0xc1, 0x75, 0x30, 0x74),
+    TraceLoggingOptionProjectTelemetry());
+
+void Trace::LightSwitch::RegisterProvider()
+{
+    TraceLoggingRegister(g_hProvider);
+}
+
+void Trace::LightSwitch::UnregisterProvider()
+{
+    TraceLoggingUnregister(g_hProvider);
+}
+
+void Trace::LightSwitch::ScheduleModeToggled(const std::wstring& newMode) noexcept
+{
+    TraceLoggingWriteWrapper(
+        g_hProvider,
+        "LightSwitch_ScheduleModeToggled",
+        ProjectTelemetryPrivacyDataTag(ProjectTelemetryTag_ProductAndServicePerformance),
+        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE),
+        TraceLoggingWideString(newMode.c_str(), "NewMode"));
+}
+
+void Trace::LightSwitch::ThemeTargetChanged(bool changeApps, bool changeSystem) noexcept
+{
+    TraceLoggingWriteWrapper(
+        g_hProvider,
+        "LightSwitch_ThemeTargetChanged",
+        ProjectTelemetryPrivacyDataTag(ProjectTelemetryTag_ProductAndServicePerformance),
+        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE),
+        TraceLoggingBoolean(changeApps, "ChangeApps"),
+        TraceLoggingBoolean(changeSystem, "ChangeSystem"));
+}

src/modules/LightSwitch/LightSwitchService/trace.h

@@ -0,0 +1,17 @@
+#pragma once
+
+#include <common/Telemetry/TraceBase.h>
+#include <string>
+
+class Trace
+{
+public:
+    class LightSwitch : public telemetry::TraceBase
+    {
+    public:
+        static void RegisterProvider();
+        static void UnregisterProvider();
+        static void ScheduleModeToggled(const std::wstring& newMode) noexcept;
+        static void ThemeTargetChanged(bool changeApps, bool changeSystem) noexcept;
+    };
+};

src/modules/MeasureTool/MeasureToolModuleInterface/dllmain.cpp

@@ -149,7 +149,7 @@ public:
         init_settings();
 
         triggerEvent = CreateEvent(nullptr, false, false, CommonSharedConstants::MEASURE_TOOL_TRIGGER_EVENT);
-        triggerEventWaiter = EventWaiter(CommonSharedConstants::MEASURE_TOOL_TRIGGER_EVENT, [this](int) {
+        triggerEventWaiter.start(CommonSharedConstants::MEASURE_TOOL_TRIGGER_EVENT, [this](DWORD) {
             on_hotkey(0);
         });
     }

src/modules/MouseUtils/CursorWrap/dllmain.cpp

@@ -6,6 +6,7 @@
 #include "../../../common/utils/resources.h"
 #include "../../../common/logger/logger.h"
 #include "../../../common/utils/logger_helper.h"
+#include "../../../common/interop/shared_constants.h"
 #include <atomic>
 #include <thread>
 #include <vector>
@@ -108,6 +109,12 @@ private:
     // Hotkey
     Hotkey m_activationHotkey{};
 
+    // Event-driven trigger support (for CmdPal/automation)
+    HANDLE m_triggerEventHandle = nullptr;
+    HANDLE m_terminateEventHandle = nullptr;
+    std::thread m_eventThread;
+    std::atomic_bool m_listening{ false };
+
 public:
     // Constructor
     CursorWrap()
@@ -121,7 +128,8 @@ public:
     // Destroy the powertoy and free memory
     virtual void destroy() override
     {
-        StopMouseHook();
+        // Ensure hooks/threads/handles are torn down before deletion
+        disable();
         g_cursorWrapInstance = nullptr; // Clear global instance pointer
         delete this;
     }
@@ -195,11 +203,54 @@ public:
     {
         m_enabled = true;
         Trace::EnableCursorWrap(true);
-        
-        // Always start the mouse hook when the module is enabled
-        // This ensures cursor wrapping is active immediately after enabling
-        StartMouseHook();
-        Logger::info("CursorWrap enabled - mouse hook started");
+
+        // Start listening for external trigger event so we can invoke the same logic as the activation hotkey.
+        m_triggerEventHandle = CreateEventW(nullptr, false, false, CommonSharedConstants::CURSOR_WRAP_TRIGGER_EVENT);
+        m_terminateEventHandle = CreateEventW(nullptr, false, false, nullptr);
+        if (m_triggerEventHandle && m_terminateEventHandle)
+        {
+            m_listening = true;
+            m_eventThread = std::thread([this]() {
+                HANDLE handles[2] = { m_triggerEventHandle, m_terminateEventHandle };
+
+                // WH_MOUSE_LL callbacks are delivered to the thread that installed the hook.
+                // Ensure this thread has a message queue and pumps messages while the hook is active.
+                MSG msg;
+                PeekMessage(&msg, nullptr, WM_USER, WM_USER, PM_NOREMOVE);
+
+                StartMouseHook();
+                Logger::info("CursorWrap enabled - mouse hook started");
+
+                while (m_listening)
+                {
+                    auto res = MsgWaitForMultipleObjects(2, handles, false, INFINITE, QS_ALLINPUT);
+                    if (!m_listening)
+                    {
+                        break;
+                    }
+
+                    if (res == WAIT_OBJECT_0)
+                    {
+                        ToggleMouseHook();
+                    }
+                    else if (res == WAIT_OBJECT_0 + 1)
+                    {
+                        break;
+                    }
+                    else
+                    {
+                        while (PeekMessage(&msg, nullptr, 0, 0, PM_REMOVE))
+                        {
+                            TranslateMessage(&msg);
+                            DispatchMessage(&msg);
+                        }
+                    }
+                }
+
+                StopMouseHook();
+                Logger::info("CursorWrap event listener stopped");
+            });
+        }
     }
 
     // Disable the powertoy
@@ -207,8 +258,26 @@ public:
     {
         m_enabled = false;
         Trace::EnableCursorWrap(false);
-        StopMouseHook();
-        Logger::info("CursorWrap disabled - mouse hook stopped");
+
+        m_listening = false;
+        if (m_terminateEventHandle)
+        {
+            SetEvent(m_terminateEventHandle);
+        }
+        if (m_eventThread.joinable())
+        {
+            m_eventThread.join();
+        }
+        if (m_triggerEventHandle)
+        {
+            CloseHandle(m_triggerEventHandle);
+            m_triggerEventHandle = nullptr;
+        }
+        if (m_terminateEventHandle)
+        {
+            CloseHandle(m_terminateEventHandle);
+            m_terminateEventHandle = nullptr;
+        }
     }
 
     // Returns if the powertoys is enabled
@@ -240,7 +309,19 @@ public:
             return false;
         }
 
-        // Toggle cursor wrapping
+        // Toggle on the thread that owns the WH_MOUSE_LL hook (the event listener thread).
+        if (m_triggerEventHandle)
+        {
+            return SetEvent(m_triggerEventHandle);
+        }
+
+        return false;
+    }
+
+ private:
+    void ToggleMouseHook()
+    {
+        // Toggle cursor wrapping.
         if (m_hookActive)
         {
             StopMouseHook();
@@ -253,11 +334,8 @@ public:
             RunComprehensiveTests();
 #endif
         }
-        
-        return true;
     }
 
-private:
     // Load the settings file.
     void init_settings()
     {