add restore

<!-- Enter a brief description/summary of your PR here. What does it
fix/what does it change/how was it tested (even manually, if necessary)?
-->
## Summary of the Pull Request
This pull request introduces a new command-line interface (CLI) project
for the File Locksmith module, enabling users to interact with File
Locksmith functionality directly from the command line. The changes
include project and build configuration, CLI implementation, and
supporting code to integrate with the existing FileLocksmith library.

## Commands and Options

| Command / Option | Alias | Description |
| :--- | :--- | :--- |
| `<path>` | N/A | **Required**. One or more file or directory paths to
check. You can specify multiple paths separated by spaces. |
| `--kill` | N/A | Terminates (kills) all processes that are currently
locking the specified files. |
| `--json` | N/A | Outputs the results in structured **JSON** format
instead of human-readable text. Useful for automation and scripts. |
| `--wait` | N/A | **Blocks execution** and waits until the specified
files are released. The command will not exit until the files are
unlocked. |
| `--help` | N/A | Displays the help message with usage instructions. |

## Usage Examples

### 1. Basic check (Human-readable output)
Check which processes are locking a specific file:
```powershell
FileLocksmithCLI.exe "C:\Users\Docs\report.docx"
```

### 2. Check multiple files and output JSON
Check multiple files and get the output in JSON format for parsing:
```powershell
FileLocksmithCLI.exe --json "C:\File1.txt" "C:\Folder\File2.dll"
```

### 3. Wait for a file to be unlocked
Block script execution until a file is released (useful in build
scripts):
```powershell
FileLocksmithCLI.exe --wait "C:\bin\output.exe"
```

### 4. Force unlock a file
Kill all processes that are locking a specific file:
```powershell
FileLocksmithCLI.exe --kill "C:\LockedFile.dat"
```

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

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

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

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

---------

Signed-off-by: Shawn Yuan (from Dev Box) <shuaiyuan@microsoft.com>

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

@@ -1810,7 +1810,6 @@ TILEDWINDOW
 TILLSON
 timedate
 timediff
-timeunion
 timeutil
 TITLEBARINFO
 Titlecase

.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",

.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) }}:

DATA_AND_PRIVACY.md

@@ -694,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>

PowerToys.slnx

@@ -420,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" />
@@ -429,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" />

doc/thirdPartyRunPlugins.md

@@ -50,7 +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 Antygravity](https://github.com/artickc/PowerToys-Run-Antygravity) | [artickc](https://github.com/artickc) | 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) |
 

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/LightSwitch/LightSwitchModuleInterface/dllmain.cpp

@@ -405,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);
@@ -482,7 +483,8 @@ public:
             CloseHandle(m_process);
             m_process = nullptr;
         }
-
+        
+        Trace::Enable(false);
         StopToggleListener();
     }
 
@@ -539,6 +541,8 @@ public:
         if (m_enabled)
         {
             Logger::trace(L"Light Switch hotkey pressed");
+            Trace::ShortcutInvoked();
+
             if (!is_process_running())
             {
                 enable();

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/MouseUtils/FindMyMouse/FindMyMouse.cpp

@@ -77,10 +77,8 @@ protected:
     int m_sonarRadius = FIND_MY_MOUSE_DEFAULT_SPOTLIGHT_RADIUS;
     int m_sonarZoomFactor = FIND_MY_MOUSE_DEFAULT_SPOTLIGHT_INITIAL_ZOOM;
     DWORD m_fadeDuration = FIND_MY_MOUSE_DEFAULT_ANIMATION_DURATION_MS;
-    int m_finalAlphaNumerator = 100; // legacy (root now always animates to 1.0; kept for GDI fallback compatibility)
     std::vector<std::wstring> m_excludedApps;
     int m_shakeMinimumDistance = FIND_MY_MOUSE_DEFAULT_SHAKE_MINIMUM_DISTANCE;
-    static constexpr int FinalAlphaDenominator = 100;
     winrt::Microsoft::UI::Dispatching::DispatcherQueueController m_dispatcherQueueController{ nullptr };
 
     // Don't consider movements started past these milliseconds to detect shaking.
@@ -155,7 +153,7 @@ private:
     void DetectShake();
     bool KeyboardInputCanActivate();
 
-    void StartSonar();
+    void StartSonar(FindMyMouseActivationMethod activationMethod);
     void StopSonar();
 };
 
@@ -275,7 +273,7 @@ LRESULT SuperSonar<D>::BaseWndProc(UINT message, WPARAM wParam, LPARAM lParam) n
     {
         if (m_sonarStart == NoSonar)
         {
-            StartSonar();
+            StartSonar(FindMyMouseActivationMethod::Shortcut);
         }
         else
         {
@@ -384,7 +382,7 @@ void SuperSonar<D>::OnSonarKeyboardInput(RAWINPUT const& input)
                 IsEqual(m_lastKeyPos, ptCursor))
             {
                 m_sonarState = SonarState::ControlDown2;
-                StartSonar();
+                StartSonar(m_activationMethod);
             }
             else
             {
@@ -451,7 +449,7 @@ void SuperSonar<D>::DetectShake()
     if (diagonal > 0 && distanceTravelled / diagonal > (m_shakeFactor / 100.f))
     {
         m_movementHistory.clear();
-        StartSonar();
+        StartSonar(m_activationMethod);
     }
 }
 
@@ -519,7 +517,7 @@ void SuperSonar<D>::OnSonarMouseInput(RAWINPUT const& input)
 }
 
 template<typename D>
-void SuperSonar<D>::StartSonar()
+void SuperSonar<D>::StartSonar(FindMyMouseActivationMethod activationMethod)
 {
     // Don't activate if game mode is on.
     if (m_doNotActivateOnGameMode && detect_game_mode())
@@ -532,7 +530,7 @@ void SuperSonar<D>::StartSonar()
         return;
     }
 
-    Trace::MousePointerFocused();
+    Trace::MousePointerFocused(static_cast<int>(activationMethod));
     // Cover the entire virtual screen.
     // HACK: Draw with 1 pixel off. Otherwise, Windows glitches the task bar transparency when a transparent window fill the whole screen.
     SetWindowPos(m_hwnd, HWND_TOPMOST, GetSystemMetrics(SM_XVIRTUALSCREEN) + 1, GetSystemMetrics(SM_YVIRTUALSCREEN) + 1, GetSystemMetrics(SM_CXVIRTUALSCREEN) - 2, GetSystemMetrics(SM_CYVIRTUALSCREEN) - 2, 0);
@@ -816,13 +814,16 @@ private:
         // Dim color (source)
         m_dimColorBrush = m_compositor.CreateColorBrush(m_backgroundColor);
         // Radial gradient mask (center transparent, outer opaque)
+        // Fixed feather width: 1px for radius < 300, 2px for radius >= 300
+        const float featherPixels = (m_sonarRadius >= 300) ? 2.0f : 1.0f;
+        const float featherOffset = 1.0f - featherPixels / (rDip * zoom);
         m_spotlightMaskGradient = m_compositor.CreateRadialGradientBrush();
         m_spotlightMaskGradient.MappingMode(muxc::CompositionMappingMode::Absolute);
         m_maskStopCenter = m_compositor.CreateColorGradientStop();
         m_maskStopCenter.Offset(0.0f);
         m_maskStopCenter.Color(winrt::Windows::UI::ColorHelper::FromArgb(0, 0, 0, 0));
         m_maskStopInner = m_compositor.CreateColorGradientStop();
-        m_maskStopInner.Offset(0.995f);
+        m_maskStopInner.Offset(featherOffset);
         m_maskStopInner.Color(winrt::Windows::UI::ColorHelper::FromArgb(0, 0, 0, 0));
         m_maskStopOuter = m_compositor.CreateColorGradientStop();
         m_maskStopOuter.Offset(1.0f);
@@ -852,23 +853,7 @@ private:
         m_root.ImplicitAnimations(collection);
 
         // 6) Spotlight radius shrinks as opacity increases (expression animation)
-        auto radiusExpression = m_compositor.CreateExpressionAnimation();
-        radiusExpression.SetReferenceParameter(L"Root", m_root);
-
-        wchar_t expressionText[256];
-        winrt::check_hresult(StringCchPrintfW(
-            expressionText, ARRAYSIZE(expressionText), L"Lerp(Vector2(%d, %d), Vector2(%d, %d), Root.Opacity)", m_sonarRadius * m_sonarZoomFactor, m_sonarRadius * m_sonarZoomFactor, m_sonarRadius, m_sonarRadius));
-
-        radiusExpression.Expression(expressionText);
-        m_spotlightMaskGradient.StartAnimation(L"EllipseRadius", radiusExpression);
-        // Also animate spotlight geometry radius for visual consistency
-        if (m_circleGeometry)
-        {
-            auto radiusExpression2 = m_compositor.CreateExpressionAnimation();
-            radiusExpression2.SetReferenceParameter(L"Root", m_root);
-            radiusExpression2.Expression(expressionText);
-            m_circleGeometry.StartAnimation(L"Radius", radiusExpression2);
-        }
+        SetupRadiusAnimations(rDip * zoom, rDip, featherPixels);
 
         // Composition created successfully
         return true;
@@ -887,6 +872,41 @@ private:
         }
     }
 
+    // Helper to setup radius and feather expression animations
+    void SetupRadiusAnimations(float startRadiusDip, float endRadiusDip, float featherPixels)
+    {
+        // Radius expression: shrinks from startRadiusDip to endRadiusDip as opacity goes 0->1
+        auto radiusExpression = m_compositor.CreateExpressionAnimation();
+        radiusExpression.SetReferenceParameter(L"Root", m_root);
+        wchar_t expressionText[256];
+        winrt::check_hresult(StringCchPrintfW(
+            expressionText, ARRAYSIZE(expressionText),
+            L"Lerp(Vector2(%.1f, %.1f), Vector2(%.1f, %.1f), Root.Opacity)",
+            startRadiusDip, startRadiusDip, endRadiusDip, endRadiusDip));
+        radiusExpression.Expression(expressionText);
+        m_spotlightMaskGradient.StartAnimation(L"EllipseRadius", radiusExpression);
+
+        // Feather expression: maintains fixed pixel width as radius changes
+        auto featherExpression = m_compositor.CreateExpressionAnimation();
+        featherExpression.SetReferenceParameter(L"Root", m_root);
+        wchar_t featherExpressionText[256];
+        winrt::check_hresult(StringCchPrintfW(
+            featherExpressionText, ARRAYSIZE(featherExpressionText),
+            L"1.0f - %.1ff / Lerp(%.1ff, %.1ff, Root.Opacity)",
+            featherPixels, startRadiusDip, endRadiusDip));
+        featherExpression.Expression(featherExpressionText);
+        m_maskStopInner.StartAnimation(L"Offset", featherExpression);
+
+        // Circle geometry radius for visual consistency
+        if (m_circleGeometry)
+        {
+            auto radiusExpression2 = m_compositor.CreateExpressionAnimation();
+            radiusExpression2.SetReferenceParameter(L"Root", m_root);
+            radiusExpression2.Expression(expressionText);
+            m_circleGeometry.StartAnimation(L"Radius", radiusExpression2);
+        }
+    }
+
     void UpdateIslandSize()
     {
         if (!m_island)
@@ -964,27 +984,21 @@ public:
                     const float scale = static_cast<float>(m_surface.XamlRoot().RasterizationScale());
                     const float rDip = m_sonarRadiusFloat / scale;
                     const float zoom = static_cast<float>(m_sonarZoomFactor);
+                    const float featherPixels = (m_sonarRadius >= 300) ? 2.0f : 1.0f;
+                    const float startRadiusDip = rDip * zoom;
                     m_spotlightMaskGradient.StopAnimation(L"EllipseRadius");
-                    m_spotlightMaskGradient.EllipseCenter({ rDip * zoom, rDip * zoom });
-                    if (m_spotlight)
-                    {
-                        m_spotlight.Size({ rDip * 2 * zoom, rDip * 2 * zoom });
-                        m_circleShape.Offset({ rDip * zoom, rDip * zoom });
-                    }
-                    auto radiusExpression = m_compositor.CreateExpressionAnimation();
-                    radiusExpression.SetReferenceParameter(L"Root", m_root);
-                    wchar_t expressionText[256];
-                    winrt::check_hresult(StringCchPrintfW(expressionText, ARRAYSIZE(expressionText), L"Lerp(Vector2(%d, %d), Vector2(%d, %d), Root.Opacity)", m_sonarRadius * m_sonarZoomFactor, m_sonarRadius * m_sonarZoomFactor, m_sonarRadius, m_sonarRadius));
-                    radiusExpression.Expression(expressionText);
-                    m_spotlightMaskGradient.StartAnimation(L"EllipseRadius", radiusExpression);
+                    m_maskStopInner.StopAnimation(L"Offset");
                     if (m_circleGeometry)
                     {
                         m_circleGeometry.StopAnimation(L"Radius");
-                        auto radiusExpression2 = m_compositor.CreateExpressionAnimation();
-                        radiusExpression2.SetReferenceParameter(L"Root", m_root);
-                        radiusExpression2.Expression(expressionText);
-                        m_circleGeometry.StartAnimation(L"Radius", radiusExpression2);
                     }
+                    m_spotlightMaskGradient.EllipseCenter({ startRadiusDip, startRadiusDip });
+                    if (m_spotlight)
+                    {
+                        m_spotlight.Size({ rDip * 2 * zoom, rDip * 2 * zoom });
+                        m_circleShape.Offset({ startRadiusDip, startRadiusDip });
+                    }
+                    SetupRadiusAnimations(startRadiusDip, rDip, featherPixels);
                 }
             });
             if (!enqueueSucceeded)
@@ -1018,202 +1032,6 @@ private:
     muxc::ScalarKeyFrameAnimation m_animation{ nullptr };
 };
 
-template<typename D>
-struct GdiSonar : SuperSonar<D>
-{
-    LRESULT WndProc(UINT message, WPARAM wParam, LPARAM lParam) noexcept
-    {
-        switch (message)
-        {
-        case WM_CREATE:
-            SetLayeredWindowAttributes(this->m_hwnd, 0, 0, LWA_ALPHA);
-            break;
-
-        case WM_TIMER:
-            switch (wParam)
-            {
-            case TIMER_ID_FADE:
-                OnFadeTimer();
-                break;
-            }
-            break;
-
-        case WM_PAINT:
-            this->Shim()->OnPaint();
-            break;
-        }
-        return this->BaseWndProc(message, wParam, lParam);
-    }
-
-    void BeforeMoveSonar() { this->Shim()->InvalidateSonar(); }
-    void AfterMoveSonar() { this->Shim()->InvalidateSonar(); }
-
-    void SetSonarVisibility(bool visible)
-    {
-        m_alphaTarget = visible ? MaxAlpha : 0;
-        m_fadeStart = GetTickCount() - FadeFramePeriod;
-        SetTimer(this->m_hwnd, TIMER_ID_FADE, FadeFramePeriod, nullptr);
-        OnFadeTimer();
-    }
-
-    void OnFadeTimer()
-    {
-        auto now = GetTickCount();
-        auto step = (int)((now - m_fadeStart) * MaxAlpha / this->m_fadeDuration);
-
-        this->Shim()->InvalidateSonar();
-        if (m_alpha < m_alphaTarget)
-        {
-            m_alpha += step;
-            if (m_alpha > m_alphaTarget)
-                m_alpha = m_alphaTarget;
-        }
-        else if (m_alpha > m_alphaTarget)
-        {
-            m_alpha -= step;
-            if (m_alpha < m_alphaTarget)
-                m_alpha = m_alphaTarget;
-        }
-        SetLayeredWindowAttributes(this->m_hwnd, 0, (BYTE)m_alpha, LWA_ALPHA);
-        this->Shim()->InvalidateSonar();
-        if (m_alpha == m_alphaTarget)
-        {
-            KillTimer(this->m_hwnd, TIMER_ID_FADE);
-            if (m_alpha == 0)
-            {
-                ShowWindow(this->m_hwnd, SW_HIDE);
-            }
-        }
-        else
-        {
-            ShowWindow(this->m_hwnd, SW_SHOWNOACTIVATE);
-        }
-    }
-
-protected:
-    int CurrentSonarRadius()
-    {
-        int range = MaxAlpha - m_alpha;
-        int radius = this->m_sonarRadius + this->m_sonarRadius * range * (this->m_sonarZoomFactor - 1) / MaxAlpha;
-        return radius;
-    }
-
-private:
-    static constexpr DWORD FadeFramePeriod = 10;
-    int MaxAlpha = SuperSonar<D>::m_finalAlphaNumerator * 255 / SuperSonar<D>::FinalAlphaDenominator;
-    static constexpr DWORD TIMER_ID_FADE = 101;
-
-private:
-    int m_alpha = 0;
-    int m_alphaTarget = 0;
-    DWORD m_fadeStart = 0;
-};
-
-struct GdiSpotlight : GdiSonar<GdiSpotlight>
-{
-    void InvalidateSonar()
-    {
-        RECT rc;
-        auto radius = CurrentSonarRadius();
-        rc.left = this->m_sonarPos.x - radius;
-        rc.top = this->m_sonarPos.y - radius;
-        rc.right = this->m_sonarPos.x + radius;
-        rc.bottom = this->m_sonarPos.y + radius;
-        InvalidateRect(this->m_hwnd, &rc, FALSE);
-    }
-
-    void OnPaint()
-    {
-        PAINTSTRUCT ps;
-        BeginPaint(this->m_hwnd, &ps);
-
-        auto radius = CurrentSonarRadius();
-        auto spotlight = CreateRoundRectRgn(
-            this->m_sonarPos.x - radius, this->m_sonarPos.y - radius, this->m_sonarPos.x + radius, this->m_sonarPos.y + radius, radius * 2, radius * 2);
-
-        FillRgn(ps.hdc, spotlight, static_cast<HBRUSH>(GetStockObject(WHITE_BRUSH)));
-        Sleep(1000 / 60);
-        ExtSelectClipRgn(ps.hdc, spotlight, RGN_DIFF);
-        FillRect(ps.hdc, &ps.rcPaint, static_cast<HBRUSH>(GetStockObject(BLACK_BRUSH)));
-        DeleteObject(spotlight);
-
-        EndPaint(this->m_hwnd, &ps);
-    }
-};
-
-struct GdiCrosshairs : GdiSonar<GdiCrosshairs>
-{
-    void InvalidateSonar()
-    {
-        RECT rc;
-        auto radius = CurrentSonarRadius();
-        GetClientRect(m_hwnd, &rc);
-        rc.left = m_sonarPos.x - radius;
-        rc.right = m_sonarPos.x + radius;
-        InvalidateRect(m_hwnd, &rc, FALSE);
-
-        GetClientRect(m_hwnd, &rc);
-        rc.top = m_sonarPos.y - radius;
-        rc.bottom = m_sonarPos.y + radius;
-        InvalidateRect(m_hwnd, &rc, FALSE);
-    }
-
-    void OnPaint()
-    {
-        PAINTSTRUCT ps;
-        BeginPaint(this->m_hwnd, &ps);
-
-        auto radius = CurrentSonarRadius();
-        RECT rc;
-
-        HBRUSH white = static_cast<HBRUSH>(GetStockObject(WHITE_BRUSH));
-
-        rc.left = m_sonarPos.x - radius;
-        rc.top = ps.rcPaint.top;
-        rc.right = m_sonarPos.x + radius;
-        rc.bottom = ps.rcPaint.bottom;
-        FillRect(ps.hdc, &rc, white);
-
-        rc.left = ps.rcPaint.left;
-        rc.top = m_sonarPos.y - radius;
-        rc.right = ps.rcPaint.right;
-        rc.bottom = m_sonarPos.y + radius;
-        FillRect(ps.hdc, &rc, white);
-
-        HBRUSH black = static_cast<HBRUSH>(GetStockObject(BLACK_BRUSH));
-
-        // Top left
-        rc.left = ps.rcPaint.left;
-        rc.top = ps.rcPaint.top;
-        rc.right = m_sonarPos.x - radius;
-        rc.bottom = m_sonarPos.y - radius;
-        FillRect(ps.hdc, &rc, black);
-
-        // Top right
-        rc.left = m_sonarPos.x + radius;
-        rc.top = ps.rcPaint.top;
-        rc.right = ps.rcPaint.right;
-        rc.bottom = m_sonarPos.y - radius;
-        FillRect(ps.hdc, &rc, black);
-
-        // Bottom left
-        rc.left = ps.rcPaint.left;
-        rc.top = m_sonarPos.y + radius;
-        rc.right = m_sonarPos.x - radius;
-        rc.bottom = ps.rcPaint.bottom;
-        FillRect(ps.hdc, &rc, black);
-
-        // Bottom right
-        rc.left = m_sonarPos.x + radius;
-        rc.top = m_sonarPos.y + radius;
-        rc.right = ps.rcPaint.right;
-        rc.bottom = ps.rcPaint.bottom;
-        FillRect(ps.hdc, &rc, black);
-
-        EndPaint(this->m_hwnd, &ps);
-    }
-};
-
 #pragma endregion Super_Sonar_Base_Code
 
 #pragma region Super_Sonar_API
@@ -1284,4 +1102,4 @@ HWND GetSonarHwnd() noexcept
     return nullptr;
 }
 
-#pragma endregion Super_Sonar_API
+#pragma endregion Super_Sonar_API

src/modules/MouseUtils/FindMyMouse/FindMyMouse.vcxproj

@@ -154,4 +154,4 @@
 
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <Import Project="..\..\..\..\deps\spdlog.props" />
-</Project>
+</Project>

src/modules/MouseUtils/FindMyMouse/trace.cpp

@@ -22,11 +22,12 @@ void Trace::EnableFindMyMouse(const bool enabled) noexcept
 }
 
 // Log that the user activated the module by focusing the mouse pointer
-void Trace::MousePointerFocused() noexcept
+void Trace::MousePointerFocused(const int activationMethod) noexcept
 {
     TraceLoggingWriteWrapper(
         g_hProvider,
         "FindMyMouse_MousePointerFocused",
         ProjectTelemetryPrivacyDataTag(ProjectTelemetryTag_ProductAndServicePerformance),
-        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE));
+        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE),
+        TraceLoggingInt32(activationMethod, "ActivationMethod"));
 }

src/modules/MouseUtils/FindMyMouse/trace.h

@@ -9,5 +9,6 @@ public:
     static void EnableFindMyMouse(const bool enabled) noexcept;
 
     // Log that the user activated the module by focusing the mouse pointer
-    static void MousePointerFocused() noexcept;
+    // activationMethod: 0 = DoubleLeftControlKey, 1 = DoubleRightControlKey, 2 = ShakeMouse, 3 = Shortcut
+    static void MousePointerFocused(const int activationMethod) noexcept;
 };

src/modules/MouseWithoutBorders/App/Class/IClipboardHelper.cs

@@ -18,12 +18,12 @@ using System.Threading.Tasks;
 using System.Windows.Forms;
 
 using Microsoft.VisualStudio.Threading;
+using MouseWithoutBorders.Core;
 using Newtonsoft.Json;
 using StreamJsonRpc;
 
 #if !MM_HELPER
 using MouseWithoutBorders.Class;
-using MouseWithoutBorders.Core;
 #endif
 
 using SystemClipboard = System.Windows.Forms.Clipboard;
@@ -246,11 +246,11 @@ WellKnownSidType.AuthenticatedUserSid, null);
                 CancellationToken cancellationToken = _serverTaskCancellationSource.Token;
 
                 IpcChannel<ClipboardHelper>.StartIpcServer(ChannelName + "/" + RemoteObjectName, cancellationToken);
-                Common.IpcChannelCreated = true;
+                IpcChannelHelper.IpcChannelCreated = true;
             }
             catch (Exception e)
             {
-                Common.IpcChannelCreated = false;
+                IpcChannelHelper.IpcChannelCreated = false;
                 Common.ShowToolTip("Error setting up clipboard sharing, clipboard sharing will not work!", 5000, ToolTipIcon.Error);
                 Logger.Log(e);
             }
@@ -405,7 +405,7 @@ WellKnownSidType.AuthenticatedUserSid, null);
 
             try
             {
-                rv = Common.Retry(nameof(SystemClipboard.ContainsFileDropList), () => { return SystemClipboard.ContainsFileDropList(); }, (log) => Log(log));
+                rv = IpcChannelHelper.Retry(nameof(SystemClipboard.ContainsFileDropList), () => { return SystemClipboard.ContainsFileDropList(); }, (log) => Log(log));
             }
             catch (ExternalException e)
             {
@@ -427,7 +427,7 @@ WellKnownSidType.AuthenticatedUserSid, null);
 
             try
             {
-                rv = Common.Retry(nameof(SystemClipboard.ContainsImage), () => { return SystemClipboard.ContainsImage(); }, (log) => Log(log));
+                rv = IpcChannelHelper.Retry(nameof(SystemClipboard.ContainsImage), () => { return SystemClipboard.ContainsImage(); }, (log) => Log(log));
             }
             catch (ExternalException e)
             {
@@ -449,7 +449,7 @@ WellKnownSidType.AuthenticatedUserSid, null);
 
             try
             {
-                rv = Common.Retry(nameof(SystemClipboard.ContainsText), () => { return SystemClipboard.ContainsText(); }, (log) => Log(log));
+                rv = IpcChannelHelper.Retry(nameof(SystemClipboard.ContainsText), () => { return SystemClipboard.ContainsText(); }, (log) => Log(log));
             }
             catch (ExternalException e)
             {
@@ -471,7 +471,7 @@ WellKnownSidType.AuthenticatedUserSid, null);
 
             try
             {
-                rv = Common.Retry(nameof(SystemClipboard.GetFileDropList), () => { return SystemClipboard.GetFileDropList(); }, (log) => Log(log));
+                rv = IpcChannelHelper.Retry(nameof(SystemClipboard.GetFileDropList), () => { return SystemClipboard.GetFileDropList(); }, (log) => Log(log));
             }
             catch (ExternalException e)
             {
@@ -493,7 +493,7 @@ WellKnownSidType.AuthenticatedUserSid, null);
 
             try
             {
-                rv = Common.Retry(nameof(SystemClipboard.GetImage), () => { return SystemClipboard.GetImage(); }, (log) => Log(log));
+                rv = IpcChannelHelper.Retry(nameof(SystemClipboard.GetImage), () => { return SystemClipboard.GetImage(); }, (log) => Log(log));
             }
             catch (ExternalException e)
             {
@@ -515,7 +515,7 @@ WellKnownSidType.AuthenticatedUserSid, null);
 
             try
             {
-                rv = Common.Retry(nameof(SystemClipboard.GetText), () => { return SystemClipboard.GetText(format); }, (log) => Log(log));
+                rv = IpcChannelHelper.Retry(nameof(SystemClipboard.GetText), () => { return SystemClipboard.GetText(format); }, (log) => Log(log));
             }
             catch (ExternalException e)
             {
@@ -539,7 +539,7 @@ WellKnownSidType.AuthenticatedUserSid, null);
         {
             try
             {
-                _ = Common.Retry(
+                _ = IpcChannelHelper.Retry(
                     nameof(SystemClipboard.SetImage),
                     () =>
                 {
@@ -568,7 +568,7 @@ WellKnownSidType.AuthenticatedUserSid, null);
         {
             try
             {
-                _ = Common.Retry(
+                _ = IpcChannelHelper.Retry(
                     nameof(SystemClipboard.SetText),
                     () =>
                 {
@@ -600,44 +600,4 @@ WellKnownSidType.AuthenticatedUserSid, null);
     {
         internal const int QUIT_CMD = 0x409;
     }
-
-    internal sealed partial class Common
-    {
-        internal static bool IpcChannelCreated { get; set; }
-
-        internal static T Retry<T>(string name, Func<T> func, Action<string> log, Action preRetry = null)
-        {
-            int count = 0;
-
-            do
-            {
-                try
-                {
-                    T rv = func();
-
-                    if (count > 0)
-                    {
-                        log($"Trace: {name} has been successful after {count} retry.");
-                    }
-
-                    return rv;
-                }
-                catch (Exception)
-                {
-                    count++;
-
-                    preRetry?.Invoke();
-
-                    if (count > 10)
-                    {
-                        throw;
-                    }
-
-                    Application.DoEvents();
-                    Thread.Sleep(200);
-                }
-            }
-            while (true);
-        }
-    }
 }

src/modules/MouseWithoutBorders/App/Core/Clipboard.cs

@@ -1036,7 +1036,7 @@ internal static class Clipboard
         {
             try
             {
-                _ = Common.Retry(
+                _ = IpcChannelHelper.Retry(
                     nameof(SystemClipboard.SetFileDropList),
                     () =>
                     {
@@ -1073,7 +1073,7 @@ internal static class Clipboard
         {
             try
             {
-                _ = Common.Retry(
+                _ = IpcChannelHelper.Retry(
                     nameof(SystemClipboard.SetImage),
                     () =>
                 {
@@ -1104,7 +1104,7 @@ internal static class Clipboard
         {
             try
             {
-                _ = Common.Retry(
+                _ = IpcChannelHelper.Retry(
                     nameof(SystemClipboard.SetText),
                     () =>
                 {

src/modules/MouseWithoutBorders/App/Core/Helper.cs

@@ -295,9 +295,9 @@ internal static class Helper
             return;
         }
 
-        if (!Common.IpcChannelCreated)
+        if (!IpcChannelHelper.IpcChannelCreated)
         {
-            Logger.TelemetryLogTrace($"{nameof(Common.IpcChannelCreated)} = {Common.IpcChannelCreated}. {Logger.GetStackTrace(new StackTrace())}", SeverityLevel.Warning);
+            Logger.TelemetryLogTrace($"{nameof(IpcChannelHelper.IpcChannelCreated)} = {IpcChannelHelper.IpcChannelCreated}. {Logger.GetStackTrace(new StackTrace())}", SeverityLevel.Warning);
             return;
         }
 

src/modules/MouseWithoutBorders/App/Core/IpcChannelHelper.cs

@@ -0,0 +1,53 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Threading;
+using System.Windows.Forms;
+
+#if !MM_HELPER
+using Thread = MouseWithoutBorders.Core.Thread;
+#endif
+
+namespace MouseWithoutBorders.Core;
+
+internal static class IpcChannelHelper
+{
+    internal static bool IpcChannelCreated { get; set; }
+
+    internal static T Retry<T>(string name, Func<T> func, Action<string> log, Action preRetry = null)
+    {
+        int count = 0;
+
+        do
+        {
+            try
+            {
+                T rv = func();
+
+                if (count > 0)
+                {
+                    log($"Trace: {name} has been successful after {count} retry.");
+                }
+
+                return rv;
+            }
+            catch (Exception)
+            {
+                count++;
+
+                preRetry?.Invoke();
+
+                if (count > 10)
+                {
+                    throw;
+                }
+
+                Application.DoEvents();
+                Thread.Sleep(200);
+            }
+        }
+        while (true);
+    }
+}

src/modules/MouseWithoutBorders/App/Core/Logger.cs

@@ -198,7 +198,6 @@ internal static class Logger
             }
 
             Logger.DumpProgramLogs(sb, level);
-            Logger.DumpOtherLogs(sb, level);
             Logger.DumpStaticTypes(sb, level);
 
             log = string.Format(
@@ -240,19 +239,16 @@ internal static class Logger
         _ = Logger.PrivateDump(sb, AllLogs, "[Program logs]\r\n===============\r\n", 0, level, false);
     }
 
-    internal static void DumpOtherLogs(StringBuilder sb, int level)
-    {
-        _ = Logger.PrivateDump(sb, new Common(), "[Other Logs]\r\n===============\r\n", 0, level, false);
-    }
-
     internal static void DumpStaticTypes(StringBuilder sb, int level)
     {
         var staticTypes = new List<Type>
         {
             typeof(Clipboard),
+            typeof(Common),
             typeof(DragDrop),
             typeof(Encryption),
             typeof(Event),
+            typeof(IpcChannelHelper),
             typeof(InitAndCleanup),
             typeof(Helper),
             typeof(Launch),

src/modules/MouseWithoutBorders/App/Form/Settings/SetupPage2b.cs

@@ -2,6 +2,8 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+using MouseWithoutBorders.Core;
+
 namespace MouseWithoutBorders
 {
     public partial class SetupPage2b : SettingsFormPage

src/modules/MouseWithoutBorders/App/Form/frmAbout.cs

@@ -15,6 +15,8 @@ using System.Globalization;
 using System.Reflection;
 using System.Windows.Forms;
 
+using MouseWithoutBorders.Core;
+
 namespace MouseWithoutBorders
 {
     internal partial class FrmAbout : System.Windows.Forms.Form, IDisposable

src/modules/MouseWithoutBorders/App/Form/frmMessage.cs

@@ -6,6 +6,8 @@ using System;
 using System.Globalization;
 using System.Windows.Forms;
 
+using MouseWithoutBorders.Core;
+
 namespace MouseWithoutBorders
 {
     public partial class FrmMessage : System.Windows.Forms.Form

src/modules/MouseWithoutBorders/App/Form/frmMouseCursor.cs

@@ -6,6 +6,7 @@ using System;
 using System.Windows.Forms;
 
 using MouseWithoutBorders.Class;
+using MouseWithoutBorders.Core;
 
 namespace MouseWithoutBorders
 {

src/modules/MouseWithoutBorders/App/Helper/MouseWithoutBordersHelper.csproj

@@ -49,6 +49,9 @@
     <Compile Include="..\Class\IClipboardHelper.cs">
       <Link>IClipboardHelper.cs</Link>
     </Compile>
+    <Compile Include="..\Core\IpcChannelHelper.cs">
+      <Link>IpcChannelHelper.cs</Link>
+    </Compile>
   </ItemGroup>
 
   <ItemGroup>

src/modules/MouseWithoutBorders/MouseWithoutBorders.UnitTests/Core/Logger.PrivateDump.expected.txt

@@ -1,9 +1,38 @@
 [Program logs]
 ===============
  = System.String[]
-[Other Logs]
+[Clipboard]
+===============
+Comma = System.Char[]
+--System.Char[] = System.Char[]: N/A
+Star = System.Char[]
+--System.Char[] = System.Char[]: N/A
+NullSeparator = System.Char[]
+--System.Char[] = System.Char[]: N/A
+lastClipboardEventTime = 0
+clipboardCopiedTime = 0
+<LastIDWithClipboardData>k__BackingField = NONE
+<NextClipboardViewer>k__BackingField = 0
+<IsClipboardDataImage>k__BackingField = False
+lastClipboardObject = 
+<HasSwitchedMachineSinceLastCopy>k__BackingField = False
+ClipboardThreadOldLock = Lock
+--_owningThreadId = 0
+--_state = 0
+--_recursionCount = 0
+--_spinCount = 22
+--_waiterStartTimeMs = 0
+--s_contentionCount = 0
+--s_maxSpinCount = 22
+--s_minSpinCountForAdaptiveSpin = -100
+BIG_CLIPBOARD_DATA_TIMEOUT = 30000
+MAX_CLIPBOARD_DATA_SIZE_CAN_BE_SENT_INSTANTLY_TCP = 1048576
+MAX_CLIPBOARD_FILE_SIZE_CAN_BE_SENT = 104857600
+TEXT_HEADER_SIZE = 12
+DATA_SIZE = 48
+TEXT_TYPE_SEP = {4CFF57F7-BEDD-43d5-AE8F-27A61E886F2F}
+[Common]
 ===============
- = MouseWithoutBorders.Common
 screenWidth = 0
 screenHeight = 0
 lastX = 0
@@ -46,7 +75,6 @@ avgSendTime = 0
 maxSendTime = 0
 totalSendCount = 0
 totalSendTime = 0
-<IpcChannelCreated>k__BackingField = False
 TOGGLE_ICONS_SIZE = 4
 ICON_ONE = 0
 ICON_ALL = 1
@@ -55,36 +83,6 @@ ICON_BIG_CLIPBOARD = 3
 ICON_ERROR = 4
 JUST_GOT_BACK_FROM_SCREEN_SAVER = 9999
 NETWORK_STREAM_BUF_SIZE = 1048576
-[Clipboard]
-===============
-Comma = System.Char[]
---System.Char[] = System.Char[]: N/A
-Star = System.Char[]
---System.Char[] = System.Char[]: N/A
-NullSeparator = System.Char[]
---System.Char[] = System.Char[]: N/A
-lastClipboardEventTime = 0
-clipboardCopiedTime = 0
-<LastIDWithClipboardData>k__BackingField = NONE
-<NextClipboardViewer>k__BackingField = 0
-<IsClipboardDataImage>k__BackingField = False
-lastClipboardObject = 
-<HasSwitchedMachineSinceLastCopy>k__BackingField = False
-ClipboardThreadOldLock = Lock
---_owningThreadId = 0
---_state = 0
---_recursionCount = 0
---_spinCount = 22
---_waiterStartTimeMs = 0
---s_contentionCount = 0
---s_maxSpinCount = 22
---s_minSpinCountForAdaptiveSpin = -100
-BIG_CLIPBOARD_DATA_TIMEOUT = 30000
-MAX_CLIPBOARD_DATA_SIZE_CAN_BE_SENT_INSTANTLY_TCP = 1048576
-MAX_CLIPBOARD_FILE_SIZE_CAN_BE_SENT = 104857600
-TEXT_HEADER_SIZE = 12
-DATA_SIZE = 48
-TEXT_TYPE_SEP = {4CFF57F7-BEDD-43d5-AE8F-27A61E886F2F}
 [DragDrop]
 ===============
 isDragging = False
@@ -174,6 +172,9 @@ actualLastPos = {X=0,Y=0}
 --Empty = {X=0,Y=0}
 myLastX = 0
 myLastY = 0
+[IpcChannelHelper]
+===============
+<IpcChannelCreated>k__BackingField = False
 [InitAndCleanup]
 ===============
 initDone = False
@@ -440,6 +441,7 @@ WM_LBUTTONDBLCLK = 515
 WM_RBUTTONDBLCLK = 518
 WM_MBUTTONDBLCLK = 521
 WM_MOUSEWHEEL = 522
+WM_MOUSEHWHEEL = 526
 WM_KEYDOWN = 256
 WM_KEYUP = 257
 WM_SYSKEYDOWN = 260

src/modules/MouseWithoutBorders/MouseWithoutBorders.UnitTests/Core/LoggerTests.cs

@@ -117,7 +117,6 @@ public static class LoggerTests
             // copied from DumpObjects in Logger.cs
             var sb = new StringBuilder(1000000);
             Logger.DumpProgramLogs(sb, settingsDumpObjectsLevel);
-            Logger.DumpOtherLogs(sb, settingsDumpObjectsLevel);
             Logger.DumpStaticTypes(sb, settingsDumpObjectsLevel);
             var actual = sb.ToString();
 

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

@@ -106,7 +106,7 @@
                             <controls:SettingsCard HorizontalContentAlignment="Left" ContentAlignment="Left">
                                 <StackPanel Margin="-12,0,0,0" Orientation="Vertical">
                                     <HyperlinkButton x:Uid="Settings_GeneralPage_About_GithubLink_Hyperlink" NavigateUri="https://go.microsoft.com/fwlink/?linkid=2310837" />
-                                    <HyperlinkButton x:Uid="Settings_GeneralPage_About_SDKDocs_Hyperlink" NavigateUri="https://go.microsoft.com/fwlink/?linkid=2310639" />
+                                    <HyperlinkButton x:Uid="Settings_GeneralPage_About_SDKDocs_Hyperlink" NavigateUri="https://aka.ms/cmdpalextensions-devdocs" />
                                 </StackPanel>
                             </controls:SettingsCard>
                         </controls:SettingsExpander.Items>

src/modules/cmdpal/extensionsdk/README.md

@@ -7,7 +7,7 @@ Palette, and use the "Create a new extension" command. That will set up a
 project for you, with the packaging, dependencies, and basic program structure
 ready to go.
 
-To view the full docs, you can head over to [our docs site](https://go.microsoft.com/fwlink/?linkid=2310639)
+To view the full docs, you can head over to [our docs site](https://aka.ms/cmdpalextensions-devdocs)
 
 There are samples of just about everything you can do in [the samples project].
 Head over there to see basic usage of the APIs.

src/runner/settings_window.cpp

@@ -148,16 +148,19 @@ std::optional<std::wstring> dispatch_json_action_to_module(const json::JsonObjec
     return result;
 }
 
-void send_json_config_to_module(const std::wstring& module_key, const std::wstring& settings)
+void send_json_config_to_module(const std::wstring& module_key, const std::wstring& settings, bool hotkeyUpdated)
 {
     auto moduleIt = modules().find(module_key);
     if (moduleIt != modules().end())
     {
         moduleIt->second->set_config(settings.c_str());
 
-        moduleIt->second.remove_hotkey_records();
-        moduleIt->second.update_hotkeys();
-        moduleIt->second.UpdateHotkeyEx();
+        if (hotkeyUpdated)
+        {
+            moduleIt->second.remove_hotkey_records();
+            moduleIt->second.update_hotkeys();
+            moduleIt->second.UpdateHotkeyEx();
+        }
     }
 }
 
@@ -166,7 +169,22 @@ void dispatch_json_config_to_modules(const json::JsonObject& powertoys_configs)
     for (const auto& powertoy_element : powertoys_configs)
     {
         const auto element = powertoy_element.Value().Stringify();
-        send_json_config_to_module(powertoy_element.Key().c_str(), element.c_str());
+
+        /* As PowerToys Run hotkeys are not registered by the runner, hotkey updates are
+         * triggered only when hotkey properties change to avoid incorrect conflict detection; 
+         * otherwise, the existing logic remains.
+         */
+        auto settings = powertoy_element.Value().GetObjectW();
+        bool hotkeyUpdated = true;
+        if (settings.HasKey(L"properties"))
+        {
+            const auto properties = settings.GetNamedObject(L"properties");
+
+            // Currently, only PowerToys Run settings use the 'hotkey_changed' property.
+            json::get(properties, L"hotkey_changed", hotkeyUpdated, true);
+        }
+        
+        send_json_config_to_module(powertoy_element.Key().c_str(), element.c_str(), hotkeyUpdated);
     }
 };
 

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

@@ -94,6 +94,9 @@ namespace Microsoft.PowerToys.Settings.UI.Library
         [JsonPropertyName("generate_thumbnails_from_files")]
         public bool GenerateThumbnailsFromFiles { get; set; }
 
+        [JsonPropertyName("hotkey_changed")]
+        public bool HotkeyChanged { get; set; } = false;
+
         [CmdConfigureIgnoreAttribute]
         public HotkeySettings DefaultOpenPowerLauncher => new HotkeySettings(false, false, true, false, 32);
 

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

@@ -31,6 +31,7 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
         private bool _enabledStateIsGPOConfigured;
         private bool _isEnabled;
         private string _searchText;
+        private bool _hotkeyChanged;
 
         private GeneralSettings GeneralSettingsConfig { get; set; }
 
@@ -162,6 +163,12 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
             // Notify UI of property change
             OnPropertyChanged(propertyName);
 
+            // Since PowerLauncher registers its hotkeys independently within the module process,
+            // the runner is notified to update PowerLauncher<65>s hotkeys only when changes occur.
+            // This prevents incorrect conflict detection results.
+            settings.Properties.HotkeyChanged = _hotkeyChanged;
+            _hotkeyChanged = false;
+
             callback(settings);
         }
 
@@ -335,6 +342,7 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
                 if (settings.Properties.OpenPowerLauncher != value)
                 {
                     settings.Properties.OpenPowerLauncher = value ?? settings.Properties.DefaultOpenPowerLauncher;
+                    _hotkeyChanged = true;
                     UpdateSettings();
                 }
             }

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

@@ -242,6 +242,15 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
                     // No need to save settings here, the runner will call module interface to save it
                     // SaveSettingsToFile(settings);
 
+                    // For PowerToys Run, we should set the 'HotkeyChanged' property here to avoid issue #41468
+                    if (string.Equals(moduleName, PowerLauncherSettings.ModuleName, StringComparison.OrdinalIgnoreCase))
+                    {
+                        if (settings is PowerLauncherSettings powerLauncherSettings)
+                        {
+                            powerLauncherSettings.Properties.HotkeyChanged = true;
+                        }
+                    }
+
                     // Send IPC notification using the same format as other ViewModels
                     SendConfigMSG(settingsConfig, moduleName);
                 }