Add standard CLI support for Image Resizer (#44287)

<!-- 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
Adds a dedicated command-line interface (CLI) executable for Image
Resizer (PowerToys.ImageResizerCLI.exe)

## Command
`PowerToys.ImageResizerCLI.exe [options] [files...]`

## Options (High Level)

| Option (aliases) | Description |
|-----------------|-------------|
| `--help` | Show help |
| `--show-config` | Print current effective configuration |
| `--destination`, `-d` | Output directory (optional) |
| `--width`, `-w` | Width |
| `--height`, `-h` | Height |
| `--unit`, `-u` | Unit (Pixel / Percent / Inch / Centimeter) |
| `--fit`, `-f` | Fit mode (Fill / Fit / Stretch) |
| `--size`, `-s` | Preset size index (supports `0` for Custom) |
| `--shrink-only` | Only shrink (do not enlarge) |
| `--replace` | Replace original |
| `--ignore-orientation` | Ignore EXIF orientation |
| `--remove-metadata` | Strip metadata |
| `--quality`, `-q` | JPEG quality (1–100) |
| `--keep-date-modified` | Preserve source last-write time |
| `--file-name` | Output filename format |

## Example usage
```
# Show help
PowerToys.ImageResizerCLI.exe --help

# Show current config
PowerToys.ImageResizerCLI.exe --show-config

# Resize with explicit dimensions
PowerToys.ImageResizerCLI.exe --width 800 --height 600 .\image.png

# Use preset size 0 (Custom) and output to a folder
PowerToys.ImageResizerCLI.exe --size 0 -d "C:\Output" .\photo.png

# Preserve source LastWriteTime
PowerToys.ImageResizerCLI.exe --width 800 --height 600 --keep-date-modified -d "C:\Output" .\image.png
```

![imageresize](https://github.com/user-attachments/assets/437fc1c2-b655-4168-9c85-b1561eeef3b4)

<!-- 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
- [x] **Localization:** All end-user-facing strings can be localized
- [x] **Dev docs:** Added/updated
- [x] **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

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

@@ -330,8 +330,15 @@ HHH
 riday
 YYY
 
+# Unicode
+precomposed
+
 # GitHub issue/PR commands
 azp
 feedbackhub
 needinfo
 reportbug
+
+#ffmpeg
+crf
+nostdin

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

@@ -141,8 +141,11 @@ BITSPIXEL
 bla
 BLACKFRAME
 BLENDFUNCTION
+blittable
 Blockquotes
 blt
+bluelightreduction
+bluelightreductionstate
 BLURBEHIND
 BLURREGION
 bmi
@@ -213,6 +216,7 @@ CImage
 cla
 CLASSDC
 CLASSNOTAVAILABLE
+CLEARTYPE
 clickable
 clickonce
 CLIENTEDGE
@@ -221,7 +225,6 @@ clientside
 CLIPBOARDUPDATE
 CLIPCHILDREN
 CLIPSIBLINGS
-CLITo
 closesocket
 clp
 CLSCTX
@@ -250,6 +253,8 @@ colorformat
 colorhistory
 colorhistorylimit
 COLORKEY
+colorref
+Convs
 comctl
 comdlg
 comexp
@@ -321,7 +326,6 @@ CUSTOMFORMATPLACEHOLDER
 CVal
 cvd
 CVirtual
-CVS
 CWMO
 CXSCREEN
 CXSMICON
@@ -389,6 +393,7 @@ devpal
 dfx
 DIALOGEX
 digicert
+diffs
 DINORMAL
 DISABLEASACTIONKEY
 DISABLENOSCROLL
@@ -526,9 +531,12 @@ eyetracker
 FANCYZONESDRAWLAYOUTTEST
 FANCYZONESEDITOR
 FARPROC
+fdw
 fdx
+FErase
 fesf
 FFFF
+FInc
 Figma
 FILEEXPLORER
 fileexploreraddons
@@ -570,6 +578,7 @@ formatetc
 FORPARSING
 foundrylocal
 FRAMECHANGED
+FRestore
 frm
 FROMTOUCH
 fsanitize
@@ -604,6 +613,7 @@ GETSCREENSAVERRUNNING
 GETSECKEY
 GETSTICKYKEYS
 GETTEXTLENGTH
+gfx
 GHND
 gitmodules
 GMEM
@@ -654,6 +664,7 @@ hdwwiz
 Helpline
 helptext
 HGFE
+hgdiobj
 hglobal
 hhk
 HHmmssfff
@@ -701,7 +712,7 @@ hotlight
 hotspot
 HPAINTBUFFER
 HRAWINPUT
-HREDRAW
+hredraw
 hres
 hresult
 hrgn
@@ -879,7 +890,7 @@ LINKOVERLAY
 LINQTo
 listview
 LIVEDRAW
-LIVEZOOM
+livezoom
 LLKH
 llkhf
 LMEM
@@ -908,6 +919,7 @@ LPBITMAPINFOHEADER
 LPCFHOOKPROC
 LPCITEMIDLIST
 LPCLSID
+lpch
 lpcmi
 LPCMINVOKECOMMANDINFO
 LPCREATESTRUCT
@@ -932,6 +944,7 @@ lptpm
 LPTR
 LPTSTR
 lpv
+LPrivate
 LPW
 lpwcx
 lpwndpl
@@ -980,6 +993,7 @@ mdtext
 mdtxt
 mdwn
 meme
+mcp
 memicmp
 MENUITEMINFO
 MENUITEMINFOW
@@ -1070,11 +1084,12 @@ muxxc
 muxxh
 MVPs
 mvvm
+myorg
+myrepo
 MVVMTK
 MWBEx
 MYICON
 NAMECHANGE
-Notavailable
 namespaceanddescendants
 nao
 NCACTIVATE
@@ -1113,6 +1128,7 @@ NEWPLUSSHELLEXTENSIONWIN
 newrow
 nicksnettravels
 NIF
+nightlight
 NLog
 NLSTEXT
 NMAKE
@@ -1216,6 +1232,7 @@ opensource
 openxmlformats
 ollama
 onnx
+openurl
 OPTIMIZEFORINVOKE
 ORPHANEDDIALOGTITLE
 ORSCANS
@@ -1293,6 +1310,7 @@ phwnd
 pici
 pidl
 PIDLIST
+PII
 pinfo
 pinvoke
 pipename
@@ -1341,6 +1359,7 @@ ppv
 ppwsz
 prc
 Prefixer
+Premul
 prependpath
 prepopulate
 prevhost
@@ -1483,12 +1502,14 @@ rgh
 rgn
 rgs
 rguid
+rhk
 RIDEV
 RIGHTSCROLLBAR
 riid
 RKey
 RNumber
 rop
+rollups
 ROUNDSMALL
 ROWSETEXT
 rpcrt
@@ -1588,6 +1609,7 @@ SHGDNF
 SHGFI
 SHIL
 shinfo
+shk
 shlwapi
 shobjidl
 SHORTCUTATLEAST
@@ -1632,6 +1654,7 @@ SKIPOWNPROCESS
 sku
 SLGP
 sln
+slnf
 slnx
 SMALLICON
 smartphone
@@ -1846,6 +1869,8 @@ uitests
 UITo
 ULONGLONG
 ums
+UMax
+UMin
 uncompilable
 UNCPRIORITY
 UNDNAME
@@ -1859,6 +1884,7 @@ unittests
 UNLEN
 UNORM
 unremapped
+Unsubscribes
 unvirtualized
 unwide
 unzoom
@@ -1889,7 +1915,7 @@ valuegenerator
 variantassignment
 VARTYPE
 vcamp
-VCENTER
+vcenter
 vcgtq
 VCINSTALLDIR
 Vcpkg
@@ -1921,7 +1947,7 @@ vorrq
 VOS
 vpaddlq
 vqsubq
-VREDRAW
+vredraw
 vreinterpretq
 VSC
 VSCBD
@@ -1943,7 +1969,7 @@ vswhere
 Vtbl
 WANTNUKEWARNING
 WANTPALM
-wasdk
+WASDK
 wbem
 WBounds
 Wca
@@ -2089,6 +2115,7 @@ xstyler
 XTimer
 XUP
 XVIRTUALSCREEN
+XXL
 xxxxxx
 YAxis
 ycombinator

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

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

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

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

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

@@ -0,0 +1,71 @@
+---
+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)."
+---
+
+# DEPENDENCY
+Source review prompt (for generating the implementation plan if missing):
+- .github/prompts/review-issue.prompt.md
+
+Required plan file (single source of truth):
+- Generated Files/issueReview/{{issue_number}}/implementation-plan.md
+
+## Dependency Handling
+1) If `implementation-plan.md` exists → proceed.
+2) If missing → run the review prompt:
+   - Invoke: `.github/prompts/review-issue.prompt.md`
+   - Pass: `issue_number={{issue_number}}`
+   - Then re-check for `implementation-plan.md`.
+3) If still missing → stop and generate:
+   - `Generated Files/issueFix/{{issue_number}}/manual-steps.md` containing:
+     “implementation-plan.md not found; please run .github/prompts/review-issue.prompt.md for #{{issue_number}}.”
+
+# GOAL
+For **#{{issue_number}}**:
+- Use implementation-plan.md as the single authority.
+- Apply code and test changes directly in the repository.
+- Produce a PR-ready description.
+
+# OUTPUT FILES
+1) Generated Files/issueFix/{{issue_number}}/pr-description.md
+2) Generated Files/issueFix/{{issue_number}}/manual-steps.md   # only if human interaction or external setup is required
+
+# EXECUTION RULES
+1) Read implementation-plan.md and execute:
+   - Layers & Files → edit/create as listed
+   - Pattern Choices → follow repository conventions
+   - Fundamentals (perf, security, compatibility, accessibility)
+   - Logging & Exceptions
+   - Telemetry (only if explicitly included in the plan)
+   - Risks & Mitigations
+   - Tests to Add
+2) Locate affected files via `rg` or `git grep`.
+3) Add/update tests to enforce the fixed behavior.
+4) If any ambiguity exists, add:
+// TODO(Human input needed): <clarification needed>
+5) Verify locally: build & tests run successfully.
+
+# pr-description.md should include:
+- Title: `Fix: <short summary> (#{{issue_number}})`
+- What changed and why the fix works
+- Files or modules touched
+- Risks & mitigations (implemented)
+- Tests added/updated and how to run them
+- Telemetry behavior (if applicable)
+- Validation / reproduction steps
+- `Closes #{{issue_number}}`
+
+# manual-steps.md (only if needed)
+- List required human actions: secrets, config, approvals, missing info, or code comments requiring human decisions.
+
+# IMPORTANT
+- Apply code and tests directly; do not produce patch files.
+- Follow implementation-plan.md as the source of truth.
+- Insert comments for human review where a decision or input is required.
+- Use repository conventions and deterministic, minimal changes.
+
+# FINALIZE
+- Write pr-description.md
+- Write manual-steps.md only if needed
+- Print concise success message or note items requiring human interaction

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

@@ -0,0 +1,158 @@
+---
+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."
+---
+
+# GOAL
+For **#{{issue_number}}** produce:
+1) `Generated Files/issueReview/{{issue_number}}/overview.md`
+2) `Generated Files/issueReview/{{issue_number}}/implementation-plan.md`
+
+## Inputs
+  figure out from the prompt on the 
+
+# 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.
+
+# OVERVIEW.MD
+## Summary
+Issue, state, milestone, labels. **Signals**: 👍/❤️/👎, comment count, last activity, linked PRs.
+
+## At-a-Glance Score Table
+Present all ratings in a compact table for quick scanning:
+
+| Dimension | Score | Assessment | Key Drivers |
+|-----------|-------|------------|-------------|
+| **A) Business Importance** | X/100 | Low/Medium/High | Top 2 factors with scores |
+| **B) Community Excitement** | X/100 | Low/Medium/High | Top 2 factors with scores |
+| **C) Technical Feasibility** | X/100 | Low/Medium/High | Top 2 factors with scores |
+| **D) Requirement Clarity** | X/100 | Low/Medium/High | Top 2 factors with scores |
+| **Overall Priority** | X/100 | Low/Medium/High/Critical | Average or weighted summary |
+| **Effort Estimate** | X days (T-shirt) | XS/S/M/L/XL/XXL/Epic | Type: bug/feature/chore |
+| **Similar Issues Found** | X open, Y closed | — | Quick reference to related work |
+| **Potential Assignees** | @username, @username | — | Top contributors to module |
+
+**Assessment bands**: 0-25 Low, 26-50 Medium, 51-75 High, 76-100 Critical
+
+## Ratings (0–100) — add evidence & short rationale
+### A) Business Importance
+- Labels (priority/security/regression): **≤35**
+- Milestone/roadmap: **≤25**
+- Customer/contract impact: **≤20**
+- Unblocks/platform leverage: **≤20**
+### B) Community Excitement
+- 👍+❤️ normalized: **≤45**
+- Comment volume & unique participants: **≤25**
+- Recent activity (≤30d): **≤15**
+- Duplicates/related issues: **≤15**
+### C) Technical Feasibility
+- Contained surface/clear seams: **≤30**
+- Existing patterns/utilities: **≤25**
+- Risk (perf/sec/compat) manageable: **≤25**
+- Testability & CI support: **≤20**
+### D) Requirement Clarity
+- Behavior/repro/constraints: **≤60**
+- Non-functionals (perf/sec/i18n/a11y): **≤25**
+- Decision owners/acceptance signals: **≤15**
+
+## Effort
+Days + **T-shirt** (XS 0.5–1d, S 1–2, M 2–4, L 4–7, XL 7–14, XXL 14–30, Epic >30).  
+Type/level: bug/feature/chore/docs/refactor/test-only; severity/value tier.
+
+## Suggested Actions
+Provide actionable recommendations for issue triage and assignment:
+
+### A) Requirement Clarification (if Clarity score <50)
+**When Requirement Clarity (Dimension D) is Medium or Low:**
+- Identify specific gaps in issue description: missing repro steps, unclear expected behavior, undefined acceptance criteria, missing non-functional requirements
+- Draft 3-5 clarifying questions to post as issue comment
+- Suggest additional information needed: screenshots, logs, environment details, OS version, PowerToys version, error messages
+- If behavior is ambiguous, propose 2-3 interpretation scenarios and ask reporter to confirm
+- Example questions:
+  - "Can you provide exact steps to reproduce this issue?"
+  - "What is the expected behavior vs. what you're actually seeing?"
+  - "Does this happen on Windows 10, 11, or both?"
+  - "Can you attach a screenshot or screen recording?"
+
+### B) Correct Label Suggestions
+- Analyze issue type, module, and severity to suggest missing or incorrect labels
+- Recommend labels from: `Issue-Bug`, `Issue-Feature`, `Issue-Docs`, `Issue-Task`, `Priority-High`, `Priority-Medium`, `Priority-Low`, `Needs-Triage`, `Needs-Author-Feedback`, `Product-<ModuleName>`, etc.
+- If Requirement Clarity is low (<50), add `Needs-Author-Feedback` label
+- If current labels are incorrect or incomplete, provide specific label changes with rationale
+
+### C) Find Similar Issues & Past Fixes
+- Search for similar issues using `gh issue list --search "keywords" --state all --json number,title,state,closedAt`
+- Identify patterns: duplicate issues, related bugs, or similar feature requests
+- For closed issues, find linked PRs that fixed them: check `linkedPullRequests` in issue data
+- Provide 3-5 examples of similar issues with format: `#<number> - <title> (closed by PR #<pr>)` or `(still open)`
+
+### D) Identify Subject Matter Experts
+- Use git blame/log to find who fixed similar issues in the past
+- Search for PR authors who touched relevant files: `git log --all --format='%aN' -- <file_paths> | sort | uniq -c | sort -rn | head -5`
+- Check issue/PR history for frequent contributors to the affected module
+- Suggest 2-3 potential assignees with context: `@<username> - <reason>` (e.g., "fixed similar rendering bug in #12345", "maintains FancyZones module")
+
+### E) Semantic Search for Related Work
+- Use semantic_search tool to find similar issues, code patterns, or past discussions
+- Search queries should include: issue keywords, module names, error messages, feature descriptions
+- Cross-reference semantic results with GitHub issue search for comprehensive coverage
+
+**Output format for Suggested Actions section in overview.md:**
+```markdown
+## Suggested Actions
+
+### Clarifying Questions (if Clarity <50)
+Post these questions as issue comment to gather missing information:
+1. <question>
+2. <question>
+3. <question>
+
+**Recommended label**: `Needs-Author-Feedback`
+
+### Label Recommendations
+- Add: `<label>` - <reason>
+- Remove: `<label>` - <reason>
+- Current labels are appropriate ✓
+
+### Similar Issues Found
+1. #<number> - <title> (<state>, closed by PR #<pr> on <date>)
+2. #<number> - <title> (<state>)
+...
+
+### Potential Assignees
+- @<username> - <reason>
+- @<username> - <reason>
+
+### Related Code/Discussions
+- <semantic search findings>
+```
+
+# IMPLEMENTATION-PLAN.MD
+1) **Problem Framing** — restate problem; current vs expected; scope boundaries.  
+2) **Layers & Files** — layers (UI/domain/data/infra/build). For each, list **files/dirs to modify** and **new files** (exact paths + why). Prefer repo patterns; cite examples/PRs.  
+3) **Pattern Choices** — reuse existing; if new, justify trade-offs & transition.  
+4) **Fundamentals** (brief plan or N/A + reason):
+- Performance (hot paths, allocs, caching/streaming)
+- Security (validation, authN/Z, secrets, SSRF/XSS/CSRF)
+- G11N/L10N (resources, number/date, pluralization)
+- Compatibility (public APIs, formats, OS/runtime/toolchain)
+- Extensibility (DI seams, options/flags, plugin points)
+- Accessibility (roles, labels, focus, keyboard, contrast)
+- SOLID & repo conventions (naming, folders, dependency direction)
+5) **Logging & Exception Handling**
+- Where to log; levels; structured fields; correlation/traces.
+- What to catch vs rethrow; retries/backoff; user-visible errors.
+- **Privacy**: never log secrets/PII; redaction policy.
+6) **Telemetry (optional — business metrics only)**
+- Events/metrics (name, when, props); success signal; privacy/sampling; dashboards/alerts.
+7) **Risks & Mitigations** — flags/canary/shadow-write/config guards.  
+8) **Task Breakdown (agent-ready)** — table (leave a blank line before the header so Markdown renders correctly):
+
+| Task | Intent | Files/Areas | Steps | Tests (brief) | Owner (Agent/Human) | Human interaction needed? (why) |
+|---|---|---|---|---|---|---|
+
+9) **Tests to Add (only)**
+- **Unit**: targets, cases (success/edge/error), mocks/fixtures, path, notes.  
+- **UI** (if applicable): flows, locator strategy, env/data/flags, path, flake mitigation.

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

@@ -0,0 +1,199 @@
+---
+mode: 'agent'
+model: Claude Sonnet 4.5
+description: "gh-driven PR review; per-step Markdown + machine-readable outputs"
+---
+
+# PR Review — gh + stepwise
+
+**Goal**: Given `{{pr_number}}`, run a *one-topic-per-step* review. Write files to `Generated Files/prReview/{{pr_number}}/` (replace `{{pr_number}}` with the integer). Emit machine‑readable blocks for a GitHub MCP to post review comments.
+
+## PR selection
+Resolve the target PR using these fallbacks in order:
+1. Parse the invocation text for an explicit identifier (first integer following patterns such as a leading hash and digits or the text `PR:` followed by digits).
+2. If no PR is found yet, locate the newest `Generated Files/prReview/_batch/batch-overview-*.md` file (highest timestamp in filename, fallback newest mtime) and take the first entry in its `## PRs` list whose review folder is missing `00-OVERVIEW.md` or contains `__error.flag`.
+3. If the batch file has no pending PRs, query assignments with `gh pr list --assignee @me --state open --json number,updatedAt --limit 20` and pick the most recently updated PR that does not already have a completed review folder.
+4. If still unknown, run `gh pr view --json number` in the current branch and use that result when it is unambiguous.
+5. If every step above fails, prompt the user for a PR number before proceeding.
+
+## Fetch PR data with `gh`
+- `gh pr view {{pr_number}} --json number,baseRefName,headRefName,baseRefOid,headRefOid,changedFiles,files`
+- `gh api repos/:owner/:repo/pulls/{{pr_number}}/files?per_page=250`  # patches for line mapping
+
+### Incremental review workflow
+1. **Check for existing review**: Read `Generated Files/prReview/{{pr_number}}/00-OVERVIEW.md`
+2. **Extract state**: Parse `Last reviewed SHA:` from review metadata section
+3. **Detect changes**: Run `Get-PrIncrementalChanges.ps1 -PullRequestNumber {{pr_number}} -LastReviewedCommitSha {{sha}}`
+4. **Analyze result**:
+   - `NeedFullReview: true` → Review all files in the PR
+   - `NeedFullReview: false` and `IsIncremental: true` → Review only files in `ChangedFiles` array
+   - `ChangedFiles` is empty → No changes, skip review (update iteration history with "No changes since last review")
+5. **Apply smart filtering**: Use the file patterns in smart step filtering table to skip irrelevant steps
+6. **Update metadata**: After completing review, save current `headRefOid` as `Last reviewed SHA:` in `00-OVERVIEW.md`
+
+### Reusable PowerShell scripts
+Scripts live in `.github/review-tools/` to avoid repeated manual approvals during PR reviews:
+
+| Script | Usage |
+| --- | --- |
+| `.github/review-tools/Get-GitHubRawFile.ps1` | Download a repository file at a given ref, optionally with line numbers. |
+| `.github/review-tools/Get-GitHubPrFilePatch.ps1` | Fetch the unified diff for a specific file within a pull request via `gh api`. |
+| `.github/review-tools/Get-PrIncrementalChanges.ps1` | Compare last reviewed SHA with current PR head to identify incremental changes. Returns JSON with changed files, new commits, and whether full review is needed. |
+| `.github/review-tools/Test-IncrementalReview.ps1` | Test helper to preview incremental review detection for a PR. Use before running full review to see what changed. |
+
+Always prefer these scripts (or new ones added under `.github/review-tools/`) over raw `gh api` or similar shell commands so the review flow does not trigger interactive approval prompts.
+
+## Output files
+Folder: `Generated Files/prReview/{{pr_number}}/`
+Files: `00-OVERVIEW.md`, `01-functionality.md`, `02-compatibility.md`, `03-performance.md`, `04-accessibility.md`, `05-security.md`, `06-localization.md`, `07-globalization.md`, `08-extensibility.md`, `09-solid-design.md`, `10-repo-patterns.md`, `11-docs-automation.md`, `12-code-comments.md`, `13-copilot-guidance.md` *(only if guidance md exists).* 
+- **Write-after-step rule:** Immediately after completing each TODO step, persist that step's markdown file before proceeding to the next. Generate `00-OVERVIEW.md` only after every step file has been refreshed for the current run.
+
+## Iteration management
+- Determine the current review iteration by reading `00-OVERVIEW.md` (look for `Review iteration:`). If missing, assume iteration `1`.
+- Extract the last reviewed SHA from `00-OVERVIEW.md` (look for `Last reviewed SHA:` in the review metadata section). If missing, this is iteration 1.
+- **Incremental review detection**:
+  1. Call `.github/review-tools/Get-PrIncrementalChanges.ps1 -PullRequestNumber {{pr_number}} -LastReviewedCommitSha {{last_sha}}` to get delta analysis.
+  2. Parse the JSON result to determine if incremental review is possible (`IsIncremental: true`, `NeedFullReview: false`).
+  3. If force-push detected or first review, proceed with full review of all changed files.
+  4. If incremental, review only the files listed in `ChangedFiles` array and apply smart step filtering (see below).
+- Increment the iteration for each review run and propagate the new value to all step files and the overview.
+- Preserve prior iteration notes by keeping/expanding an `## Iteration history` section in each markdown file, appending the newest summary under `### Iteration <N>`.
+- Summaries should capture key deltas since the previous iteration so reruns can pick up context quickly.
+- **After review completion**, update `Last reviewed SHA:` in `00-OVERVIEW.md` with the current `headRefOid` and update the timestamp.
+
+### Smart step filtering (incremental reviews only)
+When performing incremental review, skip steps that are irrelevant based on changed file types:
+
+| File pattern | Required steps | Skippable steps |
+| --- | --- | --- |
+| `**/*.cs`, `**/*.cpp`, `**/*.h` | Functionality, Compatibility, Performance, Security, SOLID, Repo patterns, Code comments | (depends on files) |
+| `**/*.resx`, `**/Resources/*.xaml` | Localization, Globalization | Most others |
+| `**/*.md` (docs) | Docs & automation | Most others (unless copilot guidance) |
+| `**/*copilot*.md`, `.github/prompts/*.md` | Copilot guidance, Docs & automation | Most others |
+| `**/*.csproj`, `**/*.vcxproj`, `**/packages.config` | Compatibility, Security, Repo patterns | Localization, Globalization, Accessibility |
+| `**/UI/**`, `**/*View.xaml` | Accessibility, Localization | Performance (unless perf-sensitive controls) |
+
+**Default**: If uncertain or files span multiple categories, run all applicable steps. When in doubt, be conservative and review more rather than less.
+
+## TODO steps (one concern each)
+1) Functionality
+2) Compatibility
+3) Performance
+4) Accessibility
+5) Security
+6) Localization
+7) Globalization
+8) Extensibility
+9) SOLID principles
+10) Repo patterns
+11) Docs & automation coverage for the changes
+12) Code comments
+13) Copilot guidance (conditional): if changed folders contain `*copilot*.md` or `.github/prompts/*.md`, review diffs **against** that guidance and write `13-copilot-guidance.md` (omit if none).
+
+## Per-step file template (use verbatim)
+```md
+# <STEP TITLE>
+**PR:** (populate with PR identifier) — Base:<baseRefName> Head:<headRefName>
+**Review iteration:** ITERATION
+
+## Iteration history
+- Maintain subsections titled `### Iteration N` in reverse chronological order (append the latest at the top) with 2–4 bullet highlights.
+
+### Iteration ITERATION
+- <Latest key point 1>
+- <Latest key point 2>
+
+## Checks executed
+- List the concrete checks for *this step only* (5–10 bullets).
+
+## Findings
+(If none, write **None**. Defaults have one or more blocks:)
+
+```mcp-review-comment
+{"file":"relative/path.ext","start_line":123,"end_line":125,"severity":"high|medium|low|info","tags":["<step-slug>","pr-tag-here"],"related_files":["optional/other/file1"],"body":"Problem → Why it matters → Concrete fix. If spans multiple files, name them here."}
+```
+Use the second tag to encode the PR number.
+
+```
+## Overview file (`00-OVERVIEW.md`) template
+```md
+# PR Review Overview — (populate with PR identifier)
+**Review iteration:** ITERATION
+**Changed files:** <n> | **High severity issues:** <count>
+
+## Review metadata
+**Last reviewed SHA:** <headRefOid from gh pr view>
+**Last review timestamp:** <ISO8601 timestamp>
+**Review mode:** <Full|Incremental (N files changed since iteration X)>
+**Base ref:** <baseRefName>
+**Head ref:** <headRefName>
+
+## Step results
+Write lines like: `01 Functionality — <OK|Issues|Skipped> (see 01-functionality.md)` … through step 13.
+Mark steps as "Skipped" when using incremental review smart filtering.
+
+## Iteration history
+- Maintain subsections titled `### Iteration N` mirroring the per-step convention with concise deltas and cross-links to the relevant step files.
+- For incremental reviews, list the specific files that changed and which commits were added.
+```
+
+## Line numbers & multi‑file issues
+- Map head‑side lines from `patch` hunks (`@@ -a,b +c,d @@` → new lines `+c..+c+d-1`).
+- For cross‑file issues: set the primary `"file"`, list others in `"related_files"`, and name them in `"body"`.
+
+## Posting (for MCP)
+- Parse all ```mcp-review-comment``` blocks across step files and post as PR review comments.
+- If posting isn’t available, still write all files.
+
+## Constraint
+Read/analyze only; don't modify code. Keep comments small, specific, and fix‑oriented.
+
+**Testing**: Use `.github/review-tools/Test-IncrementalReview.ps1 -PullRequestNumber 42374` to preview incremental detection before running full review.
+
+## Scratch cache for large PRs
+
+Create a local scratch workspace to progressively summarize diffs and reload state across runs.
+
+### Paths
+- Root: `Generated Files/prReview/{{pr_number}}/__tmp/`
+- Files:
+  - `index.jsonl` — append-only JSON Lines index of artifacts.
+  - `todo-queue.json` — pending items (files/chunks/steps).
+  - `rollup-<step>-v<N>.md` — iterative per-step aggregates.
+  - `file-<hash>.txt` — optional saved chunk text (when needed).
+
+### JSON schema (per line in `index.jsonl`)
+```json
+{"type":"chunk|summary|issue|crosslink",
+ "path":"relative/file.ext","chunk_id":"f-12","step":"functionality|compatibility|...",
+ "base_sha":"...", "head_sha":"...", "range":[start,end], "version":1,
+ "notes":"short text or key:value map", "created_utc":"ISO8601"}
+```
+
+### Phases (stateful; resume-safe)
+0. **Discover** PR + SHAs: `gh pr view <PR> --json baseRefName,headRefName,baseRefOid,headRefOid,files`.
+1. **Chunk** each changed file (head): split into ~300–600 LOC or ~4k chars; stable `chunk_id` = hash(path+start).
+   - Save `chunk` records. Optionally write `file-<hash>.txt` for expensive chunks.
+2. **Summarize** per chunk: intent, APIs, risks per TODO step; emit `summary` records (≤600 tokens each).
+3. **Issues**: convert findings to machine-readable blocks and emit `issue` records (later rendered to step MD).
+4. **Rollups**: build/update `rollup-<step>-v<N>.md` from `summary`+`issue`. Keep prior versions.
+5. **Finalize**: write per-step files + `00-OVERVIEW.md` from rollups. Post comments via MCP if available.
+
+### Re-use & token limits
+- Always **reload** `index.jsonl` first; skip chunks with same `head_sha` and `range`.
+- **Incremental review optimization**: When `Get-PrIncrementalChanges.ps1` returns a subset of changed files, load only chunks from those files. Reuse existing chunks/summaries for unchanged files.
+- Prefer re-summarizing only changed chunks; merge chunk summaries → file summaries → step rollups.
+- When context is tight, load only the minimal chunk text (or its saved `file-<hash>.txt`) needed for a comment.
+
+### Original vs diff
+- Fetch base content when needed: prefer `git show <baseRefName>:<path>`; fallback `gh api repos/:owner/:repo/contents/<path>?ref=<base_sha>` (base64).
+- Use patch hunks from `gh api .../pulls/<PR>/files` to compute **head** line numbers.
+
+### Queue-driven loop
+- Seed `todo-queue.json` with all changed files.
+- Process: chunk → summarize → detect issues → roll up.
+- Append to `index.jsonl` after each step; never rewrite previous lines (append-only).
+
+### Hygiene
+- `__tmp/` is implementation detail; do not include in final artifacts.
+- It is safe to delete to force a clean pass; the next run rebuilds it.

.github/review-tools/Get-GitHubPrFilePatch.ps1

@@ -0,0 +1,79 @@
+<#
+.SYNOPSIS
+    Retrieves the unified diff patch for a specific file in a GitHub pull request.
+
+.DESCRIPTION
+    This script fetches the patch content (unified diff format) for a specified file
+    within a pull request. It uses the GitHub CLI (gh) to query the GitHub API and
+    retrieve file change information.
+
+.PARAMETER PullRequestNumber
+    The pull request number to query.
+
+.PARAMETER FilePath
+    The relative path to the file in the repository (e.g., "src/modules/main.cpp").
+
+.PARAMETER RepositoryOwner
+    The GitHub repository owner. Defaults to "microsoft".
+
+.PARAMETER RepositoryName
+    The GitHub repository name. Defaults to "PowerToys".
+
+.EXAMPLE
+    .\Get-GitHubPrFilePatch.ps1 -PullRequestNumber 42374 -FilePath "src/modules/cmdpal/main.cpp"
+    Retrieves the patch for main.cpp in PR #42374.
+
+.EXAMPLE
+    .\Get-GitHubPrFilePatch.ps1 -PullRequestNumber 42374 -FilePath "README.md" -RepositoryOwner "myorg" -RepositoryName "myrepo"
+    Retrieves the patch from a different repository.
+
+.NOTES
+    Requires GitHub CLI (gh) to be installed and authenticated.
+    Run 'gh auth login' if not already authenticated.
+
+.LINK
+    https://cli.github.com/
+#>
+
+[CmdletBinding()]
+param(
+    [Parameter(Mandatory = $true, HelpMessage = "Pull request number")]
+    [int]$PullRequestNumber,
+
+    [Parameter(Mandatory = $true, HelpMessage = "Relative path to the file in the repository")]
+    [string]$FilePath,
+
+    [Parameter(Mandatory = $false, HelpMessage = "Repository owner")]
+    [string]$RepositoryOwner = "microsoft",
+
+    [Parameter(Mandatory = $false, HelpMessage = "Repository name")]
+    [string]$RepositoryName = "PowerToys"
+)
+
+# Construct GitHub API path for pull request files
+$apiPath = "repos/$RepositoryOwner/$RepositoryName/pulls/$PullRequestNumber/files?per_page=250"
+
+# Query GitHub API to get all files in the pull request
+try {
+    $pullRequestFiles = gh api $apiPath | ConvertFrom-Json
+} catch {
+    Write-Error "Failed to query GitHub API for PR #$PullRequestNumber. Ensure gh CLI is authenticated. Details: $_"
+    exit 1
+}
+
+# Find the matching file in the pull request
+$matchedFile = $pullRequestFiles | Where-Object { $_.filename -eq $FilePath }
+
+if (-not $matchedFile) {
+    Write-Error "File '$FilePath' not found in PR #$PullRequestNumber."
+    exit 1
+}
+
+# Check if patch content exists
+if (-not $matchedFile.patch) {
+    Write-Warning "File '$FilePath' has no patch content (possibly binary or too large)."
+    return
+}
+
+# Output the patch content
+$matchedFile.patch

.github/review-tools/Get-GitHubRawFile.ps1

@@ -0,0 +1,91 @@
+<#
+.SYNOPSIS
+    Downloads and displays the content of a file from a GitHub repository at a specific git reference.
+
+.DESCRIPTION
+    This script fetches the raw content of a file from a GitHub repository using GitHub's raw content API.
+    It can optionally display line numbers and supports any valid git reference (branch, tag, or commit SHA).
+
+.PARAMETER FilePath
+    The relative path to the file in the repository (e.g., "src/modules/main.cpp").
+
+.PARAMETER GitReference
+    The git reference (branch name, tag, or commit SHA) to fetch the file from. Defaults to "main".
+
+.PARAMETER RepositoryOwner
+    The GitHub repository owner. Defaults to "microsoft".
+
+.PARAMETER RepositoryName
+    The GitHub repository name. Defaults to "PowerToys".
+
+.PARAMETER ShowLineNumbers
+    When specified, displays line numbers before each line of content.
+
+.PARAMETER StartLineNumber
+    The starting line number to use when ShowLineNumbers is enabled. Defaults to 1.
+
+.EXAMPLE
+    .\Get-GitHubRawFile.ps1 -FilePath "README.md" -GitReference "main"
+    Downloads and displays the README.md file from the main branch.
+
+.EXAMPLE
+    .\Get-GitHubRawFile.ps1 -FilePath "src/runner/main.cpp" -GitReference "dev/feature-branch" -ShowLineNumbers
+    Downloads main.cpp from a feature branch and displays it with line numbers.
+
+.EXAMPLE
+    .\Get-GitHubRawFile.ps1 -FilePath "LICENSE" -GitReference "abc123def" -ShowLineNumbers -StartLineNumber 10
+    Downloads the LICENSE file from a specific commit and displays it with line numbers starting at 10.
+
+.NOTES
+    Requires internet connectivity to access GitHub's raw content API.
+    Does not require GitHub CLI authentication for public repositories.
+
+.LINK
+    https://docs.github.com/en/rest/repos/contents
+#>
+
+[CmdletBinding()]
+param(
+    [Parameter(Mandatory = $true, HelpMessage = "Relative path to the file in the repository")]
+    [string]$FilePath,
+
+    [Parameter(Mandatory = $false, HelpMessage = "Git reference (branch, tag, or commit SHA)")]
+    [string]$GitReference = "main",
+
+    [Parameter(Mandatory = $false, HelpMessage = "Repository owner")]
+    [string]$RepositoryOwner = "microsoft",
+
+    [Parameter(Mandatory = $false, HelpMessage = "Repository name")]
+    [string]$RepositoryName = "PowerToys",
+
+    [Parameter(Mandatory = $false, HelpMessage = "Display line numbers before each line")]
+    [switch]$ShowLineNumbers,
+
+    [Parameter(Mandatory = $false, HelpMessage = "Starting line number for display")]
+    [int]$StartLineNumber = 1
+)
+
+# Construct the raw content URL
+$rawContentUrl = "https://raw.githubusercontent.com/$RepositoryOwner/$RepositoryName/$GitReference/$FilePath"
+
+# Fetch the file content from GitHub
+try {
+    $response = Invoke-WebRequest -UseBasicParsing -Uri $rawContentUrl
+} catch {
+    Write-Error "Failed to fetch file from $rawContentUrl. Details: $_"
+    exit 1
+}
+
+# Split content into individual lines
+$contentLines = $response.Content -split "`n"
+
+# Display the content with or without line numbers
+if ($ShowLineNumbers) {
+    $currentLineNumber = $StartLineNumber
+    foreach ($line in $contentLines) {
+        Write-Output ("{0:d4}: {1}" -f $currentLineNumber, $line)
+        $currentLineNumber++
+    }
+} else {
+    $contentLines | ForEach-Object { Write-Output $_ }
+}

.github/review-tools/Get-PrIncrementalChanges.ps1

@@ -0,0 +1,173 @@
+<#
+.SYNOPSIS
+    Detects changes between the last reviewed commit and current head of a pull request.
+
+.DESCRIPTION
+    This script compares a previously reviewed commit SHA with the current head of a pull request
+    to determine what has changed. It helps enable incremental reviews by identifying new commits
+    and modified files since the last review iteration.
+
+    The script handles several scenarios:
+    - First review (no previous SHA provided)
+    - No changes (current SHA matches last reviewed SHA)
+    - Force-push detected (last reviewed SHA no longer in history)
+    - Incremental changes (new commits added since last review)
+
+.PARAMETER PullRequestNumber
+    The pull request number to analyze.
+
+.PARAMETER LastReviewedCommitSha
+    The commit SHA that was last reviewed. If omitted, this is treated as a first review.
+
+.PARAMETER RepositoryOwner
+    The GitHub repository owner. Defaults to "microsoft".
+
+.PARAMETER RepositoryName
+    The GitHub repository name. Defaults to "PowerToys".
+
+.OUTPUTS
+    JSON object containing:
+    - PullRequestNumber: The PR number being analyzed
+    - CurrentHeadSha: The current head commit SHA
+    - LastReviewedSha: The last reviewed commit SHA (if provided)
+    - BaseRefName: Base branch name
+    - HeadRefName: Head branch name
+    - IsIncremental: Boolean indicating if incremental review is possible
+    - NeedFullReview: Boolean indicating if a full review is required
+    - ChangedFiles: Array of files that changed (filename, status, additions, deletions)
+    - NewCommits: Array of commits added since last review (sha, message, author, date)
+    - Summary: Human-readable description of changes
+
+.EXAMPLE
+    .\Get-PrIncrementalChanges.ps1 -PullRequestNumber 42374
+    Analyzes PR #42374 with no previous review (first review scenario).
+
+.EXAMPLE
+    .\Get-PrIncrementalChanges.ps1 -PullRequestNumber 42374 -LastReviewedCommitSha "abc123def456"
+    Compares current PR state against the last reviewed commit to identify incremental changes.
+
+.EXAMPLE
+    $changes = .\Get-PrIncrementalChanges.ps1 -PullRequestNumber 42374 -LastReviewedCommitSha "abc123" | ConvertFrom-Json
+    if ($changes.IsIncremental) { Write-Host "Can perform incremental review" }
+    Captures the output as a PowerShell object for further processing.
+
+.NOTES
+    Requires GitHub CLI (gh) to be installed and authenticated.
+    Run 'gh auth login' if not already authenticated.
+
+.LINK
+    https://cli.github.com/
+#>
+
+[CmdletBinding()]
+param(
+    [Parameter(Mandatory = $true, HelpMessage = "Pull request number")]
+    [int]$PullRequestNumber,
+
+    [Parameter(Mandatory = $false, HelpMessage = "Commit SHA that was last reviewed")]
+    [string]$LastReviewedCommitSha,
+
+    [Parameter(Mandatory = $false, HelpMessage = "Repository owner")]
+    [string]$RepositoryOwner = "microsoft",
+
+    [Parameter(Mandatory = $false, HelpMessage = "Repository name")]
+    [string]$RepositoryName = "PowerToys"
+)
+
+# Fetch current pull request state from GitHub
+try {
+    $pullRequestData = gh pr view $PullRequestNumber --json headRefOid,headRefName,baseRefName,baseRefOid | ConvertFrom-Json
+} catch {
+    Write-Error "Failed to fetch PR #$PullRequestNumber details. Details: $_"
+    exit 1
+}
+
+$currentHeadSha = $pullRequestData.headRefOid
+$baseRefName = $pullRequestData.baseRefName
+$headRefName = $pullRequestData.headRefName
+
+# Initialize result object
+$analysisResult = @{
+    PullRequestNumber = $PullRequestNumber
+    CurrentHeadSha = $currentHeadSha
+    BaseRefName = $baseRefName
+    HeadRefName = $headRefName
+    LastReviewedSha = $LastReviewedCommitSha
+    IsIncremental = $false
+    NeedFullReview = $true
+    ChangedFiles = @()
+    NewCommits = @()
+    Summary = ""
+}
+
+# Scenario 1: First review (no previous SHA provided)
+if ([string]::IsNullOrWhiteSpace($LastReviewedCommitSha)) {
+    $analysisResult.Summary = "Initial review - no previous iteration found"
+    $analysisResult.NeedFullReview = $true
+    return $analysisResult | ConvertTo-Json -Depth 10
+}
+
+# Scenario 2: No changes since last review
+if ($currentHeadSha -eq $LastReviewedCommitSha) {
+    $analysisResult.Summary = "No changes since last review (SHA: $currentHeadSha)"
+    $analysisResult.NeedFullReview = $false
+    $analysisResult.IsIncremental = $true
+    return $analysisResult | ConvertTo-Json -Depth 10
+}
+
+# Scenario 3: Check for force-push (last reviewed SHA no longer exists in history)
+try {
+    $null = gh api "repos/$RepositoryOwner/$RepositoryName/commits/$LastReviewedCommitSha" 2>&1
+    if ($LASTEXITCODE -ne 0) {
+        # SHA not found - likely force-push or branch rewrite
+        $analysisResult.Summary = "Force-push detected - last reviewed SHA $LastReviewedCommitSha no longer exists. Full review required."
+        $analysisResult.NeedFullReview = $true
+        return $analysisResult | ConvertTo-Json -Depth 10
+    }
+} catch {
+    $analysisResult.Summary = "Cannot verify last reviewed SHA $LastReviewedCommitSha - assuming force-push. Full review required."
+    $analysisResult.NeedFullReview = $true
+    return $analysisResult | ConvertTo-Json -Depth 10
+}
+
+# Scenario 4: Get incremental changes between last reviewed SHA and current head
+try {
+    $compareApiPath = "repos/$RepositoryOwner/$RepositoryName/compare/$LastReviewedCommitSha...$currentHeadSha"
+    $comparisonData = gh api $compareApiPath | ConvertFrom-Json
+    
+    # Extract new commits information
+    $analysisResult.NewCommits = $comparisonData.commits | ForEach-Object {
+        @{
+            Sha = $_.sha.Substring(0, 7)
+            Message = $_.commit.message.Split("`n")[0]  # First line only
+            Author = $_.commit.author.name
+            Date = $_.commit.author.date
+        }
+    }
+    
+    # Extract changed files information
+    $analysisResult.ChangedFiles = $comparisonData.files | ForEach-Object {
+        @{
+            Filename = $_.filename
+            Status = $_.status  # added, modified, removed, renamed
+            Additions = $_.additions
+            Deletions = $_.deletions
+            Changes = $_.changes
+        }
+    }
+    
+    $fileCount = $analysisResult.ChangedFiles.Count
+    $commitCount = $analysisResult.NewCommits.Count
+    
+    $analysisResult.IsIncremental = $true
+    $analysisResult.NeedFullReview = $false
+    $analysisResult.Summary = "Incremental review: $commitCount new commit(s), $fileCount file(s) changed since SHA $($LastReviewedCommitSha.Substring(0, 7))"
+    
+} catch {
+    Write-Error "Failed to compare commits. Details: $_"
+    $analysisResult.Summary = "Error comparing commits - defaulting to full review"
+    $analysisResult.NeedFullReview = $true
+}
+
+# Return the analysis result as JSON
+return $analysisResult | ConvertTo-Json -Depth 10

.github/review-tools/Test-IncrementalReview.ps1

@@ -0,0 +1,170 @@
+<#
+.SYNOPSIS
+    Tests and previews incremental review detection for a pull request.
+
+.DESCRIPTION
+    This helper script validates the incremental review detection logic by analyzing an existing
+    PR review folder. It reads the last reviewed SHA from the overview file, compares it with
+    the current PR state, and displays detailed information about what has changed.
+    
+    This is useful for:
+    - Testing the incremental review system before running a full review
+    - Understanding what changed since the last review iteration
+    - Verifying that review metadata was properly recorded
+
+.PARAMETER PullRequestNumber
+    The pull request number to test incremental review detection for.
+
+.PARAMETER RepositoryOwner
+    The GitHub repository owner. Defaults to "microsoft".
+
+.PARAMETER RepositoryName
+    The GitHub repository name. Defaults to "PowerToys".
+
+.OUTPUTS
+    Colored console output displaying:
+    - Current and last reviewed commit SHAs
+    - Whether incremental review is possible
+    - List of new commits since last review
+    - List of changed files with status indicators
+    - Recommended review strategy
+
+.EXAMPLE
+    .\Test-IncrementalReview.ps1 -PullRequestNumber 42374
+    Tests incremental review detection for PR #42374.
+
+.EXAMPLE
+    .\Test-IncrementalReview.ps1 -PullRequestNumber 42374 -RepositoryOwner "myorg" -RepositoryName "myrepo"
+    Tests incremental review for a PR in a different repository.
+
+.NOTES
+    Requires GitHub CLI (gh) to be installed and authenticated.
+    Run 'gh auth login' if not already authenticated.
+    
+    Prerequisites:
+    - PR review folder must exist at "Generated Files\prReview\{PRNumber}"
+    - 00-OVERVIEW.md must exist in the review folder
+    - For incremental detection, overview must contain "Last reviewed SHA" metadata
+
+.LINK
+    https://cli.github.com/
+#>
+
+[CmdletBinding()]
+param(
+    [Parameter(Mandatory = $true, HelpMessage = "Pull request number to test")]
+    [int]$PullRequestNumber,
+
+    [Parameter(Mandatory = $false, HelpMessage = "Repository owner")]
+    [string]$RepositoryOwner = "microsoft",
+
+    [Parameter(Mandatory = $false, HelpMessage = "Repository name")]
+    [string]$RepositoryName = "PowerToys"
+)
+
+# Resolve paths to review folder and overview file
+$repositoryRoot = Split-Path (Split-Path $PSScriptRoot -Parent) -Parent
+$reviewFolderPath = Join-Path $repositoryRoot "Generated Files\prReview\$PullRequestNumber"
+$overviewFilePath = Join-Path $reviewFolderPath "00-OVERVIEW.md"
+
+Write-Host "=== Testing Incremental Review for PR #$PullRequestNumber ===" -ForegroundColor Cyan
+Write-Host ""
+
+# Check if review folder exists
+if (-not (Test-Path $reviewFolderPath)) {
+    Write-Host "❌ Review folder not found: $reviewFolderPath" -ForegroundColor Red
+    Write-Host "This appears to be a new review (iteration 1)" -ForegroundColor Yellow
+    exit 0
+}
+
+# Check if overview file exists
+if (-not (Test-Path $overviewFilePath)) {
+    Write-Host "❌ Overview file not found: $overviewFilePath" -ForegroundColor Red
+    Write-Host "This appears to be an incomplete review" -ForegroundColor Yellow
+    exit 0
+}
+
+# Read overview file and extract last reviewed SHA
+Write-Host "📄 Reading overview file..." -ForegroundColor Green
+$overviewFileContent = Get-Content $overviewFilePath -Raw
+
+if ($overviewFileContent -match '\*\*Last reviewed SHA:\*\*\s+(\w+)') {
+    $lastReviewedSha = $Matches[1]
+    Write-Host "✅ Found last reviewed SHA: $lastReviewedSha" -ForegroundColor Green
+} else {
+    Write-Host "⚠️  No 'Last reviewed SHA' found in overview - this may be an old format" -ForegroundColor Yellow
+    Write-Host "Proceeding without incremental detection (full review will be needed)" -ForegroundColor Yellow
+    exit 0
+}
+
+Write-Host ""
+Write-Host "🔍 Running incremental change detection..." -ForegroundColor Cyan
+
+# Call the incremental changes detection script
+$incrementalChangesScriptPath = Join-Path $PSScriptRoot "Get-PrIncrementalChanges.ps1"
+if (-not (Test-Path $incrementalChangesScriptPath)) {
+    Write-Host "❌ Script not found: $incrementalChangesScriptPath" -ForegroundColor Red
+    exit 1
+}
+
+try {
+    $analysisResult = & $incrementalChangesScriptPath `
+        -PullRequestNumber $PullRequestNumber `
+        -LastReviewedCommitSha $lastReviewedSha `
+        -RepositoryOwner $RepositoryOwner `
+        -RepositoryName $RepositoryName | ConvertFrom-Json
+    
+    # Display analysis results
+    Write-Host ""
+    Write-Host "=== Incremental Review Analysis ===" -ForegroundColor Cyan
+    Write-Host "Current HEAD SHA: $($analysisResult.CurrentHeadSha)" -ForegroundColor White
+    Write-Host "Last reviewed SHA: $($analysisResult.LastReviewedSha)" -ForegroundColor White
+    Write-Host "Base branch: $($analysisResult.BaseRefName)" -ForegroundColor White
+    Write-Host "Head branch: $($analysisResult.HeadRefName)" -ForegroundColor White
+    Write-Host ""
+    Write-Host "Is incremental? $($analysisResult.IsIncremental)" -ForegroundColor $(if ($analysisResult.IsIncremental) { "Green" } else { "Yellow" })
+    Write-Host "Need full review? $($analysisResult.NeedFullReview)" -ForegroundColor $(if ($analysisResult.NeedFullReview) { "Yellow" } else { "Green" })
+    Write-Host ""
+    Write-Host "Summary: $($analysisResult.Summary)" -ForegroundColor Cyan
+    Write-Host ""
+    
+    # Display new commits if any
+    if ($analysisResult.NewCommits -and $analysisResult.NewCommits.Count -gt 0) {
+        Write-Host "📝 New commits ($($analysisResult.NewCommits.Count)):" -ForegroundColor Green
+        foreach ($commit in $analysisResult.NewCommits) {
+            Write-Host "  - $($commit.Sha): $($commit.Message)" -ForegroundColor Gray
+        }
+        Write-Host ""
+    }
+    
+    # Display changed files if any
+    if ($analysisResult.ChangedFiles -and $analysisResult.ChangedFiles.Count -gt 0) {
+        Write-Host "📁 Changed files ($($analysisResult.ChangedFiles.Count)):" -ForegroundColor Green
+        foreach ($file in $analysisResult.ChangedFiles) {
+            $statusDisplayColor = switch ($file.Status) {
+                "added"    { "Green" }
+                "removed"  { "Red" }
+                "modified" { "Yellow" }
+                "renamed"  { "Cyan" }
+                default    { "White" }
+            }
+            Write-Host "  - [$($file.Status)] $($file.Filename) (+$($file.Additions)/-$($file.Deletions))" -ForegroundColor $statusDisplayColor
+        }
+        Write-Host ""
+    }
+    
+    # Suggest review strategy based on analysis
+    Write-Host "=== Recommended Review Strategy ===" -ForegroundColor Cyan
+    if ($analysisResult.NeedFullReview) {
+        Write-Host "🔄 Full review recommended" -ForegroundColor Yellow
+    } elseif ($analysisResult.IsIncremental -and ($analysisResult.ChangedFiles.Count -eq 0)) {
+        Write-Host "✅ No changes detected - no review needed" -ForegroundColor Green
+    } elseif ($analysisResult.IsIncremental) {
+        Write-Host "⚡ Incremental review possible - review only changed files" -ForegroundColor Green
+        Write-Host "💡 Consider applying smart step filtering based on file types" -ForegroundColor Cyan
+    }
+    
+} catch {
+    Write-Host "❌ Error running incremental change detection: $_" -ForegroundColor Red
+    exit 1
+}

.github/review-tools/review-tools.instructions.md

@@ -0,0 +1,313 @@
+---
+description: PowerShell scripts for efficient PR reviews in PowerToys repository
+applyTo: '**'
+---
+
+# PR Review Tools - Reference Guide
+
+PowerShell scripts to support efficient and incremental pull request reviews in the PowerToys repository.
+
+## Quick Start
+
+### Prerequisites
+- PowerShell 7+ (or Windows PowerShell 5.1+)
+- GitHub CLI (`gh`) installed and authenticated (`gh auth login`)
+- Access to the PowerToys repository
+
+### Testing Your Setup
+
+Run the full test suite (recommended):
+```powershell
+cd "d:\PowerToys-00c1\.github\review-tools"
+.\Run-ReviewToolsTests.ps1
+```
+
+Expected: 9-10 tests passing
+
+### Individual Script Tests
+
+**Test incremental change detection:**
+```powershell
+.\Get-PrIncrementalChanges.ps1 -PullRequestNumber 42374
+```
+Expected: JSON output showing review analysis
+
+**Preview incremental review:**
+```powershell
+.\Test-IncrementalReview.ps1 -PullRequestNumber 42374
+```
+Expected: Analysis showing current vs last reviewed SHA
+
+**Fetch file content:**
+```powershell
+.\Get-GitHubRawFile.ps1 -FilePath "README.md" -GitReference "main"
+```
+Expected: README content displayed
+
+**Get PR file patch:**
+```powershell
+.\Get-GitHubPrFilePatch.ps1 -PullRequestNumber 42374 -FilePath ".github/actions/spell-check/expect.txt"
+```
+Expected: Unified diff output
+
+## Available Scripts
+
+### Get-GitHubRawFile.ps1
+
+Downloads and displays file content from a GitHub repository at a specific git reference.
+
+**Purpose:** Retrieve baseline file content for comparison during PR reviews.
+
+**Parameters:**
+- `FilePath` (required): Relative path to file in repository
+- `GitReference` (optional): Git ref (branch, tag, SHA). Default: "main"
+- `RepositoryOwner` (optional): Repository owner. Default: "microsoft"
+- `RepositoryName` (optional): Repository name. Default: "PowerToys"
+- `ShowLineNumbers` (switch): Prefix each line with line number
+- `StartLineNumber` (optional): Starting line number when using `-ShowLineNumbers`. Default: 1
+
+**Usage:**
+```powershell
+.\Get-GitHubRawFile.ps1 -FilePath "src/runner/main.cpp" -GitReference "main" -ShowLineNumbers
+```
+
+### Get-GitHubPrFilePatch.ps1
+
+Fetches the unified diff (patch) for a specific file in a pull request.
+
+**Purpose:** Get the exact changes made to a file in a PR for detailed review.
+
+**Parameters:**
+- `PullRequestNumber` (required): Pull request number
+- `FilePath` (required): Relative path to file in the PR
+- `RepositoryOwner` (optional): Repository owner. Default: "microsoft"
+- `RepositoryName` (optional): Repository name. Default: "PowerToys"
+
+**Usage:**
+```powershell
+.\Get-GitHubPrFilePatch.ps1 -PullRequestNumber 42374 -FilePath "src/modules/cmdpal/main.cpp"
+```
+
+**Output:** Unified diff showing changes made to the file.
+
+### Get-PrIncrementalChanges.ps1
+
+Compares the last reviewed commit with the current PR head to identify incremental changes.
+
+**Purpose:** Enable efficient incremental reviews by detecting what changed since the last review iteration.
+
+**Parameters:**
+- `PullRequestNumber` (required): Pull request number
+- `LastReviewedCommitSha` (optional): SHA of the commit that was last reviewed. If omitted, assumes first review.
+- `RepositoryOwner` (optional): Repository owner. Default: "microsoft"
+- `RepositoryName` (optional): Repository name. Default: "PowerToys"
+
+**Usage:**
+```powershell
+.\Get-PrIncrementalChanges.ps1 -PullRequestNumber 42374 -LastReviewedCommitSha "abc123def456"
+```
+
+**Output:** JSON object with detailed change analysis:
+```json
+{
+  "PullRequestNumber": 42374,
+  "CurrentHeadSha": "xyz789abc123",
+  "LastReviewedSha": "abc123def456",
+  "IsIncremental": true,
+  "NeedFullReview": false,
+  "ChangedFiles": [
+    {
+      "Filename": "src/modules/cmdpal/main.cpp",
+      "Status": "modified",
+      "Additions": 15,
+      "Deletions": 8,
+      "Changes": 23
+    }
+  ],
+  "NewCommits": [
+    {
+      "Sha": "def456",
+      "Message": "Fix memory leak",
+      "Author": "John Doe",
+      "Date": "2025-11-07T10:30:00Z"
+    }
+  ],
+  "Summary": "Incremental review: 1 new commit(s), 1 file(s) changed since SHA abc123d"
+}
+```
+
+**Scenarios Handled:**
+- **No LastReviewedCommitSha**: Returns `NeedFullReview: true` (first review)
+- **SHA matches current HEAD**: Returns empty `ChangedFiles` (no changes)
+- **Force-push detected**: Returns `NeedFullReview: true` (SHA not in history)
+- **Incremental changes**: Returns list of changed files and new commits
+
+### Test-IncrementalReview.ps1
+
+Helper script to test and preview incremental review detection before running the full review.
+
+**Purpose:** Validate incremental review functionality and preview what changed.
+
+**Parameters:**
+- `PullRequestNumber` (required): Pull request number
+- `RepositoryOwner` (optional): Repository owner. Default: "microsoft"
+- `RepositoryName` (optional): Repository name. Default: "PowerToys"
+
+**Usage:**
+```powershell
+.\Test-IncrementalReview.ps1 -PullRequestNumber 42374
+```
+
+**Output:** Colored console output showing:
+- Current and last reviewed SHAs
+- Whether incremental review is possible
+- List of new commits and changed files
+- Recommended review strategy
+
+## Workflow Integration
+
+These scripts integrate with the PR review prompt (`.github/prompts/review-pr.prompt.md`).
+
+### Typical Review Flow
+
+1. **Initial Review (Iteration 1)**
+   - Review prompt processes the PR
+   - Creates `Generated Files/prReview/{PR}/00-OVERVIEW.md`
+   - Includes review metadata section with current HEAD SHA
+
+2. **Subsequent Reviews (Iteration 2+)**
+   - Review prompt reads `00-OVERVIEW.md` to get last reviewed SHA
+   - Calls `Get-PrIncrementalChanges.ps1` to detect what changed
+   - If incremental:
+     - Reviews only changed files
+     - Skips irrelevant review steps (e.g., skip Localization if no `.resx` files changed)
+   - Uses `Get-GitHubPrFilePatch.ps1` to get patches for changed files
+   - Updates `00-OVERVIEW.md` with new SHA and iteration number
+
+### Manual Testing Workflow
+
+Preview changes before review:
+```powershell
+# Check what changed in PR #42374 since last review
+.\Test-IncrementalReview.ps1 -PullRequestNumber 42374
+
+# Get incremental changes programmatically
+$changes = .\Get-PrIncrementalChanges.ps1 -PullRequestNumber 42374 -LastReviewedCommitSha "abc123" | ConvertFrom-Json
+
+if (-not $changes.NeedFullReview) {
+    Write-Host "Only need to review $($changes.ChangedFiles.Count) files"
+    
+    # Review each changed file
+    foreach ($file in $changes.ChangedFiles) {
+        Write-Host "Reviewing $($file.Filename)..."
+        .\Get-GitHubPrFilePatch.ps1 -PullRequestNumber 42374 -FilePath $file.Filename
+    }
+}
+```
+
+## Error Handling and Troubleshooting
+
+### Common Requirements
+
+All scripts:
+- Exit with code 1 on error
+- Write detailed error messages to stderr
+- Require `gh` CLI to be installed and authenticated
+
+### Common Issues
+
+**Error: "gh not found"**
+- **Solution**: Install GitHub CLI from https://cli.github.com/ and run `gh auth login`
+
+**Error: "Failed to query GitHub API"**
+- **Solution**: Verify `gh` authentication with `gh auth status`
+- **Solution**: Check PR number exists and you have repository access
+
+**Error: "PR not found"**
+- **Solution**: Verify the PR number is correct and still exists
+- **Solution**: Ensure repository owner and name are correct
+
+**Error: "SHA not found" or "Force-push detected"**
+- **Explanation**: Last reviewed SHA no longer exists in branch history (force-push occurred)
+- **Solution**: A full review is required; incremental review not possible
+
+**Tests show "FAIL" but functionality works**
+- **Explanation**: Some tests may show exit code failures even when logic is correct
+- **Solution**: Check test output message - if it says "Correctly detected", functionality is working
+
+**Error: "Could not find insertion point"**
+- **Explanation**: Overview file doesn't have expected "**Changed files:**" line
+- **Solution**: Verify overview file format is correct or regenerate it
+
+### Verification Checklist
+
+After setup, verify:
+- [ ] `Run-ReviewToolsTests.ps1` shows 9+ tests passing
+- [ ] `Get-PrIncrementalChanges.ps1` returns valid JSON
+- [ ] `Test-IncrementalReview.ps1` analyzes a PR without errors
+- [ ] `Get-GitHubRawFile.ps1` downloads files correctly
+- [ ] `Get-GitHubPrFilePatch.ps1` retrieves patches correctly
+
+## Best Practices
+
+### For Review Authors
+
+1. **Test before full review**: Use `Test-IncrementalReview.ps1` to preview changes 
+2. **Check for force-push**: Review the analysis output - force-pushes require full reviews
+3. **Smart step filtering**: Skip review steps for file types that didn't change
+
+### For Script Users
+
+1. **Use absolute paths**: When specifying folders, use absolute paths to avoid ambiguity
+2. **Check exit codes**: Scripts exit with code 1 on error - check `$LASTEXITCODE` in automation
+3. **Parse JSON output**: Use `ConvertFrom-Json` to work with structured output from `Get-PrIncrementalChanges.ps1`
+4. **Handle empty results**: Check `ChangedFiles.Count` before iterating
+
+### Performance Tips
+
+1. **Batch operations**: When reviewing multiple PRs, collect all PR numbers and process in batch
+2. **Cache raw files**: Download baseline files once and reuse for multiple comparisons
+3. **Filter early**: Use incremental detection to skip unnecessary file reviews
+4. **Parallel processing**: Consider processing independent PRs in parallel
+
+## Integration with AI Review Systems
+
+These tools are designed to work with AI-powered review systems:
+
+1. **Copilot Instructions**: This file serves as reference documentation for GitHub Copilot
+2. **Structured Output**: JSON output from scripts is easily parsed by AI systems
+3. **Incremental Intelligence**: AI can focus on changed files for more efficient reviews
+4. **Metadata Tracking**: Review iterations are tracked for context-aware suggestions
+
+### Example AI Integration
+
+```powershell
+# Get incremental changes
+$analysis = .\Get-PrIncrementalChanges.ps1 -PullRequestNumber $PR | ConvertFrom-Json
+
+# Feed to AI review system
+$reviewPrompt = @"
+Review the following changed files in PR #$PR:
+$($analysis.ChangedFiles | ForEach-Object { "- $($_.Filename) ($($_.Status))" } | Out-String)
+
+Focus on incremental changes only. Previous review was at SHA $($analysis.LastReviewedSha).
+"@
+
+# Execute AI review with context
+Invoke-AIReview -Prompt $reviewPrompt -Files $analysis.ChangedFiles
+```
+
+## Support and Further Information
+
+For detailed script documentation, use PowerShell's help system:
+```powershell
+Get-Help .\Get-PrIncrementalChanges.ps1 -Full
+Get-Help .\Test-IncrementalReview.ps1 -Detailed
+```
+
+Related documentation:
+- `.github/prompts/review-pr.prompt.md` - Complete review workflow guide
+- `doc/devdocs/` - PowerToys development documentation
+- GitHub CLI documentation: https://cli.github.com/manual/
+
+For issues or questions, refer to the PowerToys contribution guidelines.

.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

@@ -60,6 +60,8 @@
             "PowerToys.FancyZonesEditorCommon.dll",
             "PowerToys.FancyZonesModuleInterface.dll",
             "PowerToys.FancyZones.exe",
+            "FancyZonesCLI.exe",
+            "FancyZonesCLI.dll",
 
             "PowerToys.GcodePreviewHandler.dll",
             "PowerToys.GcodePreviewHandler.exe",
@@ -129,6 +131,8 @@
 
             "PowerToys.ImageResizer.exe",
             "PowerToys.ImageResizer.dll",
+            "WinUI3Apps\\PowerToys.ImageResizerCLI.exe",
+            "WinUI3Apps\\PowerToys.ImageResizerCLI.dll",
             "PowerToys.ImageResizerExt.dll",
             "PowerToys.ImageResizerContextMenu.dll",
             "ImageResizerContextMenuPackage.msix",
@@ -233,6 +237,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",
@@ -351,9 +363,18 @@
                 "Microsoft.SemanticKernel.Connectors.Ollama.dll",
                 "OllamaSharp.dll",
 
+                "boost_regex-vc143-mt-gd-x32-1_87.dll",
+                "boost_regex-vc143-mt-gd-x64-1_87.dll",
+                "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/UpdateVersions.ps1

@@ -1,7 +1,7 @@
 Param(
   # Using the default value of 1.7 for winAppSdkVersionNumber and useExperimentalVersion as false
   [Parameter(Mandatory=$False,Position=1)]
-  [string]$winAppSdkVersionNumber = "1.7",
+  [string]$winAppSdkVersionNumber = "1.8",
 
   # When the pipeline calls the PS1 file, the passed parameters are converted to string type
   [Parameter(Mandatory=$False,Position=2)]
@@ -16,32 +16,7 @@ Param(
   [string]$sourceLink = "https://microsoft.pkgs.visualstudio.com/ProjectReunion/_packaging/Project.Reunion.nuget.internal/nuget/v3/index.json"
 )
 
-function Update-NugetConfig {
-    param (
-        [string]$filePath = [System.IO.Path]::Combine($rootPath, "nuget.config")
-    )
 
-    Write-Host "Updating nuget.config file"
-    [xml]$xml = Get-Content -Path $filePath
-
-    # Add localpackages source into nuget.config
-    $packageSourcesNode = $xml.configuration.packageSources
-    $addNode = $xml.CreateElement("add")
-    $addNode.SetAttribute("key", "localpackages")
-    $addNode.SetAttribute("value", "localpackages")
-    $packageSourcesNode.AppendChild($addNode) | Out-Null
-
-    # Remove <packageSourceMapping> tag and its content
-    $packageSourceMappingNode = $xml.configuration.packageSourceMapping
-    if ($packageSourceMappingNode) {
-        $xml.configuration.RemoveChild($packageSourceMappingNode) | Out-Null
-    }
-
-    # print nuget.config after modification
-    $xml.OuterXml
-    # Save the modified nuget.config file
-    $xml.Save($filePath)
-}
 
 function Read-FileWithEncoding {
     param (
@@ -71,6 +46,132 @@ function Write-FileWithEncoding {
     $writer.Close()
 }
 
+
+function Add-NuGetSourceAndMapping {
+    param (
+        [xml]$Xml,
+        [string]$Key,
+        [string]$Value,
+        [string[]]$Patterns
+    )
+
+    # Ensure packageSources exists
+    if (-not $Xml.configuration.packageSources) {
+        $Xml.configuration.AppendChild($Xml.CreateElement("packageSources")) | Out-Null
+    }
+    $sources = $Xml.configuration.packageSources
+
+    # Add/Update Source
+    $sourceNode = $sources.SelectSingleNode("add[@key='$Key']")
+    if (-not $sourceNode) {
+        $sourceNode = $Xml.CreateElement("add")
+        $sourceNode.SetAttribute("key", $Key)
+        $sources.AppendChild($sourceNode) | Out-Null
+    }
+    $sourceNode.SetAttribute("value", $Value)
+
+    # Ensure packageSourceMapping exists
+    if (-not $Xml.configuration.packageSourceMapping) {
+        $Xml.configuration.AppendChild($Xml.CreateElement("packageSourceMapping")) | Out-Null
+    }
+    $mapping = $Xml.configuration.packageSourceMapping
+
+    # Remove invalid packageSource nodes (missing key or empty key)
+    $invalidNodes = $mapping.SelectNodes("packageSource[not(@key) or @key='']")
+    if ($invalidNodes) {
+        foreach ($node in $invalidNodes) {
+            $mapping.RemoveChild($node) | Out-Null
+        }
+    }
+
+    # Add/Update Mapping Source
+    $mappingSource = $mapping.SelectSingleNode("packageSource[@key='$Key']")
+    if (-not $mappingSource) {
+        $mappingSource = $Xml.CreateElement("packageSource")
+        $mappingSource.SetAttribute("key", $Key)
+        # Insert at top for priority
+        if ($mapping.HasChildNodes) {
+            $mapping.InsertBefore($mappingSource, $mapping.FirstChild) | Out-Null
+        } else {
+            $mapping.AppendChild($mappingSource) | Out-Null
+        }
+    }
+    
+    # Double check and force attribute
+    if (-not $mappingSource.HasAttribute("key")) {
+         $mappingSource.SetAttribute("key", $Key)
+    }
+
+    # Update Patterns
+    # RemoveAll() removes all child nodes AND attributes, so we must re-set the key afterwards
+    $mappingSource.RemoveAll()
+    $mappingSource.SetAttribute("key", $Key)
+
+    foreach ($pattern in $Patterns) {
+        $pkg = $Xml.CreateElement("package")
+        $pkg.SetAttribute("pattern", $pattern)
+        $mappingSource.AppendChild($pkg) | Out-Null
+    }
+}
+
+function Resolve-WinAppSdkSplitDependencies {
+    Write-Host "Version $WinAppSDKVersion detected. Resolving split dependencies..."
+    $installDir = Join-Path $rootPath "localpackages\output"
+    New-Item -ItemType Directory -Path $installDir -Force | Out-Null
+
+    # Create a temporary nuget.config to avoid interference from the repo's config
+    $tempConfig = Join-Path $env:TEMP "nuget_$(Get-Random).config"
+    Set-Content -Path $tempConfig -Value "<?xml version='1.0' encoding='utf-8'?><configuration><packageSources><clear /><add key='TempSource' value='$sourceLink' /></packageSources></configuration>"
+
+    try {
+        # Extract BuildTools version from Directory.Packages.props to ensure we have the required version
+        $dirPackagesProps = Join-Path $rootPath "Directory.Packages.props"
+        if (Test-Path $dirPackagesProps) {
+            $propsContent = Get-Content $dirPackagesProps -Raw
+            if ($propsContent -match '<PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="([^"]+)"') {
+                $buildToolsVersion = $Matches[1]
+                Write-Host "Downloading Microsoft.Windows.SDK.BuildTools version $buildToolsVersion..."
+                $nugetArgsBuildTools = "install Microsoft.Windows.SDK.BuildTools -Version $buildToolsVersion -ConfigFile $tempConfig -OutputDirectory $installDir -NonInteractive -NoCache"
+                Invoke-Expression "nuget $nugetArgsBuildTools" | Out-Null
+            }
+        }
+
+        # Download package to inspect nuspec and keep it for the build
+        $nugetArgs = "install Microsoft.WindowsAppSDK -Version $WinAppSDKVersion -ConfigFile $tempConfig -OutputDirectory $installDir -NonInteractive -NoCache"
+        Invoke-Expression "nuget $nugetArgs" | Out-Null
+
+        # Parse dependencies from the installed folders
+        # Folder structure is typically {PackageId}.{Version}
+        $directories = Get-ChildItem -Path $installDir -Directory
+        $allLocalPackages = @()
+        foreach ($dir in $directories) {
+            # Match any package pattern: PackageId.Version
+            if ($dir.Name -match "^(.+?)\.(\d+\..*)$") {
+                $pkgId = $Matches[1]
+                $pkgVer = $Matches[2]
+                $allLocalPackages += $pkgId
+
+                $packageVersions[$pkgId] = $pkgVer
+                Write-Host "Found dependency: $pkgId = $pkgVer"
+            }
+        }
+
+        # Update repo's nuget.config to use localpackages
+        $nugetConfig = Join-Path $rootPath "nuget.config"
+        $configData = Read-FileWithEncoding -Path $nugetConfig
+        [xml]$xml = $configData.Content
+
+        Add-NuGetSourceAndMapping -Xml $xml -Key "localpackages" -Value $installDir -Patterns $allLocalPackages
+
+        $xml.Save($nugetConfig)
+        Write-Host "Updated nuget.config with localpackages mapping."
+    } catch {
+        Write-Warning "Failed to resolve dependencies: $_"
+    } finally {
+        Remove-Item $tempConfig -Force -ErrorAction SilentlyContinue
+    }
+}
+
 # Execute nuget list and capture the output
 if ($useExperimentalVersion) {
     # The nuget list for experimental versions will cost more time
@@ -112,56 +213,36 @@ if ($latestVersion) {
     exit 1
 }
 
-# Update packages.config files
-Get-ChildItem -Path $rootPath -Recurse packages.config | ForEach-Object {
-    $file = Read-FileWithEncoding -Path $_.FullName
-    $content = $file.Content
-    if ($content -match 'package id="Microsoft.WindowsAppSDK"') {
-        $newVersionString = 'package id="Microsoft.WindowsAppSDK" version="' + $WinAppSDKVersion + '"'
-        $oldVersionString = 'package id="Microsoft.WindowsAppSDK" version="[-.0-9a-zA-Z]*"'
-        $content = $content -replace $oldVersionString, $newVersionString
-        Write-FileWithEncoding -Path $_.FullName -Content $content -Encoding $file.encoding
-        Write-Host "Modified " $_.FullName 
-    }
-}
+# Resolve dependencies for 1.8+
+$packageVersions = @{ "Microsoft.WindowsAppSDK" = $WinAppSDKVersion }
+
+Resolve-WinAppSdkSplitDependencies
 
 # Update Directory.Packages.props file
 Get-ChildItem -Path $rootPath -Recurse "Directory.Packages.props" | ForEach-Object {
     $file = Read-FileWithEncoding -Path $_.FullName
     $content = $file.Content
-    if ($content -match '<PackageVersion Include="Microsoft.WindowsAppSDK"') {
-        $newVersionString = '<PackageVersion Include="Microsoft.WindowsAppSDK" Version="' + $WinAppSDKVersion + '" />'
-        $oldVersionString = '<PackageVersion Include="Microsoft.WindowsAppSDK" Version="[-.0-9a-zA-Z]*" />'
-        $content = $content -replace $oldVersionString, $newVersionString
+    $isModified = $false
+    
+    foreach ($pkgId in $packageVersions.Keys) {
+        $ver = $packageVersions[$pkgId]
+        # Escape dots in package ID for regex
+        $pkgIdRegex = $pkgId -replace '\.', '\.'
+        
+        $newVersionString = "<PackageVersion Include=""$pkgId"" Version=""$ver"" />"
+        $oldVersionString = "<PackageVersion Include=""$pkgIdRegex"" Version=""[-.0-9a-zA-Z]*"" />"
+
+        if ($content -match "<PackageVersion Include=""$pkgIdRegex""") {
+            # Update existing package
+            if ($content -notmatch [regex]::Escape($newVersionString)) {
+                $content = $content -replace $oldVersionString, $newVersionString
+                $isModified = $true
+            }
+        }
+    }
+
+    if ($isModified) {
         Write-FileWithEncoding -Path $_.FullName -Content $content -Encoding $file.encoding
         Write-Host "Modified " $_.FullName
     }
 }
-
-# Update .vcxproj files
-Get-ChildItem -Path $rootPath -Recurse *.vcxproj | ForEach-Object {
-    $file = Read-FileWithEncoding -Path $_.FullName
-    $content = $file.Content
-    if ($content -match '\\Microsoft.WindowsAppSDK.') {
-        $newVersionString = '\Microsoft.WindowsAppSDK.' + $WinAppSDKVersion
-        $oldVersionString = '\\Microsoft.WindowsAppSDK.(?=[-.0-9a-zA-Z]*\d)[-.0-9a-zA-Z]*'    #positive lookahead for at least a digit
-        $content = $content -replace $oldVersionString, $newVersionString
-        Write-FileWithEncoding -Path $_.FullName -Content $content -Encoding $file.encoding
-        Write-Host "Modified " $_.FullName
-    }
-}
-
-# Update .csproj files
-Get-ChildItem -Path $rootPath -Recurse *.csproj | ForEach-Object {
-    $file = Read-FileWithEncoding -Path $_.FullName
-    $content = $file.Content
-    if ($content -match 'PackageReference Include="Microsoft.WindowsAppSDK"') {
-        $newVersionString = 'PackageReference Include="Microsoft.WindowsAppSDK" Version="'+ $WinAppSDKVersion + '"'
-        $oldVersionString = 'PackageReference Include="Microsoft.WindowsAppSDK" Version="[-.0-9a-zA-Z]*"'
-        $content = $content -replace $oldVersionString, $newVersionString
-        Write-FileWithEncoding -Path $_.FullName -Content $content -Encoding $file.encoding
-        Write-Host "Modified " $_.FullName 
-    }
-}
-
-Update-NugetConfig

.pipelines/v2/ci-using-the-latest-winappsdk.yml

@@ -19,7 +19,7 @@ parameters:
   - name: enableMsBuildCaching
     type: boolean
     displayName: "Enable MSBuild Caching"
-    default: true
+    default: false
   - name: runTests
     type: boolean
     displayName: "Run Tests"
@@ -33,7 +33,7 @@ parameters:
     default: true
   - name: winAppSDKVersionNumber
     type: string
-    default: 1.7
+    default: 1.8
   - name: useExperimentalVersion
     type: boolean
     default: false

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

@@ -129,7 +129,7 @@ jobs:
       MSBuildMainBuildTargets: Build
     ${{ insert }}: ${{ parameters.variables }}
     ${{ if eq(parameters.useLatestWinAppSDK, true) }}:
-      RestoreAdditionalProjectSourcesArg: '/p:RestoreAdditionalProjectSources="$(Build.SourcesDirectory)\localpackages\NugetPackages"'
+      RestoreAdditionalProjectSourcesArg: '/p:RestoreAdditionalProjectSources="$(Build.SourcesDirectory)\localpackages\NugetPackages" /p:IgnoreExperimentalWarnings=true'
     ${{ else }}:
       RestoreAdditionalProjectSourcesArg: ''
   displayName: Build
@@ -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/pipeline-ci-build.yml

@@ -63,3 +63,20 @@ stages:
               winAppSDKVersionNumber: ${{ parameters.winAppSDKVersionNumber }}
               useExperimentalVersion: ${{ parameters.useExperimentalVersion }}
             timeoutInMinutes: 90
+
+  - stage: Build_SDK
+    displayName: Build Command Palette Toolkit SDK
+    dependsOn: []
+    jobs:
+      - template: job-build-sdk.yml
+        parameters:
+          pool:
+            ${{ if eq(variables['System.CollectionId'], 'cb55739e-4afe-46a3-970f-1b49d8ee7564') }}:
+              name: SHINE-INT-L
+            ${{ else }}:
+              name: SHINE-OSS-L
+            ${{ if eq(parameters.useVSPreview, true) }}:
+              demands: ImageOverride -equals SHINE-VS17-Preview
+          buildConfigurations: [Release]
+          official: false
+          codeSign: false

.pipelines/v2/templates/steps-update-winappsdk-and-restore-nuget.yml

@@ -19,48 +19,20 @@ steps:
       -useExperimentalVersion $${{ parameters.useExperimentalVersion }}
       -rootPath "$(build.sourcesdirectory)"
 
-- script: echo $(WinAppSDKVersion)
-  displayName: 'Display WinAppSDK Version Found'
+# - task: NuGetCommand@2
+#   displayName: 'Restore NuGet packages (slnx)'
+#   inputs:
+#     command: 'restore'
+#     feedsToUse: 'config'
+#     nugetConfigPath: '$(build.sourcesdirectory)\nuget.config'
+#     restoreSolution: '$(build.sourcesdirectory)\**\*.slnx'
+#     includeNuGetOrg: false
 
-- task: DownloadPipelineArtifact@2
-  displayName: 'Download WindowsAppSDK'
-  inputs:
-    buildType: 'specific'
-    project: '55e8140e-57ac-4e5f-8f9c-c7c15b51929d'
-    definition: '104083'
-    buildVersionToDownload: 'latestFromBranch'
-    branchName: 'refs/heads/release/${{ parameters.versionNumber }}-stable'
-    artifactName: 'WindowsAppSDK_Nuget_And_MSIX'
-    targetPath: '$(Build.SourcesDirectory)\localpackages'
-
-- script: dir $(Build.SourcesDirectory)\localpackages\NugetPackages
-  displayName: 'List downloaded packages'
-
-- task: NuGetCommand@2
-  displayName: 'Install WindowsAppSDK'
-  inputs:
-    command: 'custom'
-    arguments: >
-      install "Microsoft.WindowsAppSDK"
-      -Source "$(Build.SourcesDirectory)\localpackages\NugetPackages"
-      -Version "$(WinAppSDKVersion)"
-      -OutputDirectory "$(Build.SourcesDirectory)\localpackages\output"
-      -FallbackSource "https://microsoft.pkgs.visualstudio.com/ProjectReunion/_packaging/Project.Reunion.nuget.internal/nuget/v3/index.json"
-
-- task: NuGetCommand@2
-  displayName: 'Restore NuGet packages'
+- task: DotNetCoreCLI@2
+  displayName: 'Restore NuGet packages (dotnet)'
   inputs:
     command: 'restore'
+    projects: '$(build.sourcesdirectory)\**\*.slnx'
     feedsToUse: 'config'
     nugetConfigPath: '$(build.sourcesdirectory)\nuget.config'
-    restoreSolution: '$(build.sourcesdirectory)\**\*.sln'
-    includeNuGetOrg: false
-
-- task: NuGetCommand@2
-  displayName: 'Restore NuGet packages (slnx)'
-  inputs:
-    command: 'restore'
-    feedsToUse: 'config'
-    nugetConfigPath: '$(build.sourcesdirectory)\nuget.config'
-    restoreSolution: '$(build.sourcesdirectory)\**\*.slnx'
-    includeNuGetOrg: false
+    workingDirectory: '$(build.sourcesdirectory)'

.pipelines/versionAndSignCheck.ps1

@@ -27,7 +27,8 @@ $versionExceptions = @(
     "WyHash.dll",
     "Microsoft.Recognizers.Text.DataTypes.TimexExpression.dll",
     "ObjectModelCsProjection.dll",
-    "RendererCsProjection.dll") -join '|';
+    "RendererCsProjection.dll",
+    "Microsoft.ML.OnnxRuntime.dll") -join '|';
 $nullVersionExceptions = @(
     "SkiaSharp.Views.WinUI.Native.dll",
     "libSkiaSharp.dll",
@@ -52,7 +53,12 @@ $nullVersionExceptions = @(
     "System.Diagnostics.EventLog.Messages.dll",
     "Microsoft.Windows.Widgets.dll",
     "AdaptiveCards.ObjectModel.WinUI3.dll",
-    "AdaptiveCards.Rendering.WinUI3.dll") -join '|';
+    "AdaptiveCards.Rendering.WinUI3.dll",
+    "boost_regex_vc143_mt_gd_x32_1_87.dll",
+    "boost_regex_vc143_mt_gd_x64_1_87.dll",
+    "boost_regex_vc143_mt_x32_1_87.dll",
+    "boost_regex_vc143_mt_x64_1_87.dll"
+    ) -join '|';
 $totalFailure = 0;
 
 Write-Host $DirPath;
@@ -98,4 +104,4 @@ if ($totalFailure -gt 0) {
     exit 1
 }
 
-exit 0
+exit 0

COMMUNITY.md

@@ -121,6 +121,9 @@ PowerToys Awake is a tool to keep your computer awake.
 
 Randy contributed Registry Preview and some very early conversations about keyboard remapping.
 
+### [@cinnamon-msft](https://github.com/cinnamon-msft) - Kayla Cinnamon
+Kayla was a former lead for PowerToys and helped create multiple utilities, maintained the GitHub repo, and collaborated with the community to improve the overall product
+
 ### [@oldnewthing](https://github.com/oldnewthing) - Raymond Chen
 
 Find My Mouse is based on Raymond Chen's SuperSonar.
@@ -180,7 +183,6 @@ ZoomIt source code was originally implemented by [Sysinternals](https://sysinter
 
 ## PowerToys core team
 
-- [@cinnamon-msft](https://github.com/cinnamon-msft) - Kayla Cinnamon - Lead
 - [@craigloewen-msft](https://github.com/craigloewen-msft) - Craig Loewen - Product Manager
 - [@niels9001](https://github.com/niels9001/) - Niels Laute - Product Manager
 - [@dhowett](https://github.com/dhowett) - Dustin Howett - Dev Lead
@@ -209,6 +211,7 @@ ZoomIt source code was originally implemented by [Sysinternals](https://sysinter
 ## Former PowerToys core team members
 
 - [@indierawk2k2](https://github.com/indierawk2k2) - Mike Harsh - Product Manager
+- [@cinnamon-msft](https://github.com/cinnamon-msft) - Kayla Cinnamon - Product Manager
 - [@ethanfangg](https://github.com/ethanfangg) - Ethan Fang - Product Manager
 - [@plante-msft](https://github.com/plante-msft) - Connor Plante - Product Manager
 - [@joadoumie](https://github.com/joadoumie) - Jordi Adoumie - Product Manager

Cpp.Build.props

@@ -42,6 +42,11 @@
   </PropertyGroup>
   <ItemDefinitionGroup>
     <ClCompile>
+      <!-- Make angle-bracket includes external and turn off code analysis for them -->
+      <TreatAngleIncludeAsExternal>true</TreatAngleIncludeAsExternal>
+      <ExternalWarningLevel>TurnOffAllWarnings</ExternalWarningLevel>
+      <DisableAnalyzeExternal>true</DisableAnalyzeExternal>
+
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <PrecompiledHeader Condition="'$(UsePrecompiledHeaders)' != 'false'">Use</PrecompiledHeader>
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
@@ -111,13 +116,11 @@
   </PropertyGroup>
 
   <!-- Debug/Release props -->
-  <PropertyGroup Condition="'$(Configuration)'=='Debug'"
-    Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">
     <UseDebugLibraries>true</UseDebugLibraries>
     <LinkIncremental>true</LinkIncremental>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)'=='Release'"
-    Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)'=='Release'" Label="Configuration">
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <LinkIncremental>false</LinkIncremental>

DATA_AND_PRIVACY.md

@@ -262,6 +262,7 @@ _If you want to find diagnostic data events in the source code, these two links
 </table>
 
 ### Command Palette
+
 <table style="width:100%">
   <tr>
     <th>Event Name</th>
@@ -315,6 +316,14 @@ _If you want to find diagnostic data events in the source code, these two links
     <td>Microsoft.PowerToys.CmdPalProcessStarted</td>
     <td>Triggered when the Command Palette process is started.</td>
   </tr>
+  <tr>
+    <td>Microsoft.PowerToys.CmdPal_ExtensionInvoked</td>
+    <td>Tracks extension usage including extension ID, command details, success status, and execution time.</td>
+  </tr>
+  <tr>
+    <td>Microsoft.PowerToys.CmdPal_SessionDuration</td>
+    <td>Logs session metrics from launch to dismissal including duration, commands executed, pages visited, search queries, navigation depth, and errors.</td>
+  </tr>
 </table>
 
 ### Crop And Lock
@@ -435,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

Directory.Build.targets

@@ -8,4 +8,24 @@
   <PropertyGroup Label="ManifestToolOverride">
     <ManifestTool Condition="Exists('$(WindowsSdkDir)bin\x64\mt.exe')">$(WindowsSdkDir)bin\x64\mt.exe</ManifestTool>
   </PropertyGroup>
+
+  <!-- Auto-restore NuGet for native vcxproj (PackageReference) when building inside VS -->
+  <Target Name="EnsureNuGetRestoreForVcxproj" BeforeTargets="PrepareForBuild" Condition="
+            '$(BuildingInsideVisualStudio)' == 'true'
+            and '$(DesignTimeBuild)' != 'true'
+            and '$(RestoreInProgress)' != 'true'
+            and '$(MSBuildProjectExtension)' == '.vcxproj'
+            and '$(RestoreProjectStyle)' == 'PackageReference'
+            and '$(MSBuildProjectExtensionsPath)' != ''
+            and !Exists('$(MSBuildProjectExtensionsPath)project.assets.json')
+          ">
+
+    <Message Importance="normal" Text="NuGet assets missing for $(MSBuildProjectName); running Restore...; IntDir=$(IntDir); BaseIntermediateOutputPath=$(BaseIntermediateOutputPath)" />
+
+    <MSBuild Projects="$(MSBuildProjectFullPath)" Targets="Restore" Properties="RestoreInProgress=true" BuildInParallel="false" />
+  </Target>
+
+  <PropertyGroup Condition="'$(IgnoreExperimentalWarnings)' == 'true'">
+    <NoWarn>$(NoWarn);CS8305;SA1500;CA1852</NoWarn>
+  </PropertyGroup>
 </Project>

Directory.Packages.props

@@ -7,6 +7,8 @@
     <PackageVersion Include="AdaptiveCards.ObjectModel.WinUI3" Version="2.0.0-beta" />
     <PackageVersion Include="AdaptiveCards.Rendering.WinUI3" Version="2.1.0-beta" />
     <PackageVersion Include="AdaptiveCards.Templating" Version="2.0.5" />
+    <PackageVersion Include="boost" Version="1.87.0" TargetFramework="native" />
+    <PackageVersion Include="boost_regex-vc143" Version="1.87.0" TargetFramework="native" />
     <PackageVersion Include="CommunityToolkit.Labs.WinUI.Controls.OpacityMaskView" Version="0.1.251101-build.2372" />
     <PackageVersion Include="Microsoft.Bot.AdaptiveExpressions.Core" Version="4.23.0" />
     <PackageVersion Include="Appium.WebDriver" Version="4.4.5" />
@@ -35,9 +37,11 @@
     <!-- 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" />
+    <PackageVersion Include="Microsoft.Graphics.Win2D" Version="1.3.2" />
     <PackageVersion Include="Microsoft.Windows.CppWinRT" Version="2.0.240111.5" />
     <PackageVersion Include="Microsoft.Diagnostics.Tracing.TraceEvent" Version="3.1.16" />
     <PackageVersion Include="Microsoft.Extensions.AI" Version="9.9.1" />
@@ -69,10 +73,12 @@
       This is present due to a bug in CsWinRT where WPF projects cause the analyzer to fail.
 	-->
     <PackageVersion Include="Microsoft.Windows.CsWinRT" Version="2.2.0" />
+    <PackageVersion Include="Microsoft.Windows.ImplementationLibrary" Version="1.0.231216.1"/>
     <PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.6901" />
-    <PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.8.250907003" />
-    <PackageVersion Include="Microsoft.WindowsAppSDK.AI" Version="1.8.37" />
-    <PackageVersion Include="Microsoft.WindowsAppSDK.Runtime" Version="1.8.250907003" />
+    <PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.8.251106002" />
+    <PackageVersion Include="Microsoft.WindowsAppSDK.Foundation" Version="1.8.251104000" />
+    <PackageVersion Include="Microsoft.WindowsAppSDK.AI" Version="1.8.39" />
+    <PackageVersion Include="Microsoft.WindowsAppSDK.Runtime" Version="1.8.251106002" />
     <PackageVersion Include="Microsoft.Xaml.Behaviors.WinUI.Managed" Version="2.0.9" />
     <PackageVersion Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.39" />
     <PackageVersion Include="ModernWpfUI" Version="0.9.4" />
@@ -89,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" />
@@ -111,6 +118,7 @@
     <PackageVersion Include="System.IO.Abstractions.TestingHelpers" Version="22.0.13" />
     <PackageVersion Include="System.Management" Version="9.0.10" />
     <PackageVersion Include="System.Net.Http" Version="4.3.4" />
+    <PackageVersion Include="System.Numerics.Tensors" Version="9.0.11" />
     <PackageVersion Include="System.Private.Uri" Version="4.3.2" />
     <PackageVersion Include="System.Reactive" Version="6.0.1" />
     <PackageVersion Include="System.Runtime.Caching" Version="9.0.10" />
@@ -118,6 +126,7 @@
     <PackageVersion Include="System.Text.Encoding.CodePages" Version="9.0.10" />
     <PackageVersion Include="System.Text.Json" Version="9.0.10" />
     <PackageVersion Include="System.Text.RegularExpressions" Version="4.3.1" />
+    <PackageVersion Include="ToolGood.Words.Pinyin" Version="3.1.0.3" />
     <PackageVersion Include="UnicodeInformation" Version="2.6.0" />
     <PackageVersion Include="UnitsNet" Version="5.56.0" />
     <PackageVersion Include="UTF.Unknown" Version="2.6.0" />
@@ -138,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

@@ -75,6 +75,37 @@ OTHER DEALINGS IN THE SOFTWARE.
 For more information, please refer to <http://unlicense.org/>
 ```
 
+### ToolGood.Words.Pinyin
+
+We use the ToolGood.Words.Pinyin NuGet package for converting Chinese characters to pinyin.
+
+**Source**: [https://github.com/toolgood/ToolGood.Words.Pinyin](https://github.com/toolgood/ToolGood.Words.Pinyin)
+
+```
+MIT License
+
+Copyright (c) 2020 ToolGood
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+```
+
+
 ## Utility: Command Palette Built-in Extensions
 
 ### Calculator
@@ -1529,9 +1560,11 @@ SOFTWARE.
 - ReverseMarkdown
 - ScipBe.Common.Office.OneNote
 - SharpCompress
+- Shmuelie.WinRTServer
 - SkiaSharp.Views.WinUI
 - StreamJsonRpc
 - StyleCop.Analyzers
+- ToolGood.Words.Pinyin
 - UnicodeInformation
 - UnitsNet
 - UTF.Unknown

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" />
@@ -370,6 +387,10 @@
       <Platform Solution="*|x64" Project="x64" />
     </Project>
     <Project Path="src/modules/fancyzones/FancyZones/FancyZones.vcxproj" Id="ff1d7936-842a-4bbb-8bea-e9fe796de700" />
+    <Project Path="src/modules/fancyzones/FancyZonesCLI/FancyZonesCLI.csproj">
+      <Platform Solution="*|ARM64" Project="ARM64" />
+      <Platform Solution="*|x64" Project="x64" />
+    </Project>
     <Project Path="src/modules/fancyzones/FancyZonesEditorCommon/FancyZonesEditorCommon.csproj">
       <Platform Solution="*|ARM64" Project="ARM64" />
       <Platform Solution="*|x64" Project="x64" />
@@ -438,6 +459,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">
@@ -928,6 +953,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" />

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/core/settings/settings-implementation.md

@@ -38,7 +38,7 @@ For C# modules, the settings are accessed through the `SettingsUtils` class in t
 using Microsoft.PowerToys.Settings.UI.Library;
 
 // Read settings
-var settings = SettingsUtils.GetSettings<ModuleSettings>("ModuleName");
+var settings = SettingsUtils.Default.GetSettings<ModuleSettings>("ModuleName");
 bool enabled = settings.Enabled;
 ```
 
@@ -49,7 +49,7 @@ using Microsoft.PowerToys.Settings.UI.Library;
 
 // Write settings
 settings.Enabled = true;
-SettingsUtils.SaveSettings(settings.ToJsonString(), "ModuleName");
+SettingsUtils.Default.SaveSettings(settings.ToJsonString(), "ModuleName");
 ```
 
 ## Settings Handling in Modules

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>

installer/PowerToysSetupVNext/Product.wxs

@@ -124,7 +124,7 @@
       <Custom Action="SetBundleInstallLocation" After="InstallFiles" Condition="NOT Installed OR WIX_UPGRADE_DETECTED" />
       <Custom Action="ApplyModulesRegistryChangeSets" After="InstallFiles" Condition="NOT Installed" />
       <Custom Action="InstallCmdPalPackage" After="InstallFiles" Condition="NOT Installed" />
-      <Custom Action="InstallPackageIdentityMSIX" After="InstallFiles" Condition="NOT Installed" />
+      <Custom Action="InstallPackageIdentityMSIX" After="InstallFiles" Condition="NOT Installed AND WINDOWSBUILDNUMBER &gt;= 22000" />
       <Custom Action="override Wix4CloseApplications_$(sys.BUILDARCHSHORT)" Before="RemoveFiles" />
       <Custom Action="RemovePowerToysSchTasks" After="RemoveFiles" />
       <!-- TODO: Use to activate embedded MSIX -->

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/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/ManagedCsWin32/CLSID.cs

@@ -16,4 +16,5 @@ public static partial class CLSID
     public static readonly Guid CollatorDataSource = new Guid("9E175B8B-F52A-11D8-B9A5-505054503030");
     public static readonly Guid ApplicationActivationManager = new Guid("45BA127D-10A8-46EA-8AB7-56EA9078943C");
     public static readonly Guid VirtualDesktopManager = new("aa509086-5ca9-4c25-8f95-589d3c07b48a");
+    public static readonly Guid DesktopWallpaper = new("C2CF3110-460E-4FC1-B9D0-8A1C0C9CC4BD");
 }

src/common/ManagedCsWin32/Ole32.cs

@@ -16,6 +16,12 @@ public static partial class Ole32
         CLSCTX dwClsContext,
         ref Guid riid,
         out IntPtr rReturnedComObject);
+
+    [LibraryImport("ole32.dll")]
+    internal static partial int CoInitializeEx(nint pvReserved, uint dwCoInit);
+
+    [LibraryImport("ole32.dll")]
+    internal static partial void CoUninitialize();
 }
 
 [Flags]

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/UITestAutomation/ScreenRecording.cs

@@ -0,0 +1,399 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Drawing;
+using System.Drawing.Imaging;
+using System.IO;
+using System.Runtime.InteropServices;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Microsoft.PowerToys.UITest
+{
+    /// <summary>
+    /// Provides methods for recording the screen during UI tests.
+    /// Requires FFmpeg to be installed and available in PATH.
+    /// </summary>
+    internal class ScreenRecording : IDisposable
+    {
+        private readonly string outputDirectory;
+        private readonly string framesDirectory;
+        private readonly string outputFilePath;
+        private readonly List<string> capturedFrames;
+        private readonly SemaphoreSlim recordingLock = new(1, 1);
+        private readonly Stopwatch recordingStopwatch = new();
+        private readonly string? ffmpegPath;
+        private CancellationTokenSource? recordingCancellation;
+        private Task? recordingTask;
+        private bool isRecording;
+        private int frameCount;
+
+        [DllImport("user32.dll")]
+        private static extern IntPtr GetDC(IntPtr hWnd);
+
+        [DllImport("gdi32.dll")]
+        private static extern int GetDeviceCaps(IntPtr hdc, int nIndex);
+
+        [DllImport("user32.dll")]
+        private static extern IntPtr ReleaseDC(IntPtr hWnd, IntPtr hDC);
+
+        [DllImport("user32.dll")]
+        private static extern bool GetCursorInfo(out ScreenCapture.CURSORINFO pci);
+
+        [DllImport("user32.dll")]
+        private static extern bool DrawIconEx(IntPtr hdc, int x, int y, IntPtr hIcon, int cx, int cy, int istepIfAniCur, IntPtr hbrFlickerFreeDraw, int diFlags);
+
+        private const int CURSORSHOWING = 0x00000001;
+        private const int DESKTOPHORZRES = 118;
+        private const int DESKTOPVERTRES = 117;
+        private const int DINORMAL = 0x0003;
+        private const int TargetFps = 15; // 15 FPS for good balance of quality and size
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ScreenRecording"/> class.
+        /// </summary>
+        /// <param name="outputDirectory">Directory where the recording will be saved.</param>
+        public ScreenRecording(string outputDirectory)
+        {
+            this.outputDirectory = outputDirectory;
+            string timestamp = DateTime.Now.ToString("yyyyMMdd_HHmmss");
+            framesDirectory = Path.Combine(outputDirectory, $"frames_{timestamp}");
+            outputFilePath = Path.Combine(outputDirectory, $"recording_{timestamp}.mp4");
+            capturedFrames = new List<string>();
+            frameCount = 0;
+
+            // Check if FFmpeg is available
+            ffmpegPath = FindFfmpeg();
+            if (ffmpegPath == null)
+            {
+                Console.WriteLine("FFmpeg not found. Screen recording will be disabled.");
+                Console.WriteLine("To enable video recording, install FFmpeg: https://ffmpeg.org/download.html");
+            }
+        }
+
+        /// <summary>
+        /// Gets a value indicating whether screen recording is available (FFmpeg found).
+        /// </summary>
+        public bool IsAvailable => ffmpegPath != null;
+
+        /// <summary>
+        /// Starts recording the screen.
+        /// </summary>
+        /// <returns>A task representing the asynchronous operation.</returns>
+        public async Task StartRecordingAsync()
+        {
+            await recordingLock.WaitAsync();
+            try
+            {
+                if (isRecording || !IsAvailable)
+                {
+                    return;
+                }
+
+                // Create frames directory
+                Directory.CreateDirectory(framesDirectory);
+
+                recordingCancellation = new CancellationTokenSource();
+                isRecording = true;
+                recordingStopwatch.Start();
+
+                // Start the recording task
+                recordingTask = Task.Run(() => RecordFrames(recordingCancellation.Token));
+
+                Console.WriteLine($"Started screen recording at {TargetFps} FPS");
+            }
+            catch (Exception ex)
+            {
+                Console.WriteLine($"Failed to start recording: {ex.Message}");
+                isRecording = false;
+            }
+            finally
+            {
+                recordingLock.Release();
+            }
+        }
+
+        /// <summary>
+        /// Stops recording and encodes video.
+        /// </summary>
+        /// <returns>A task representing the asynchronous operation.</returns>
+        public async Task StopRecordingAsync()
+        {
+            await recordingLock.WaitAsync();
+            try
+            {
+                if (!isRecording || recordingCancellation == null)
+                {
+                    return;
+                }
+
+                // Signal cancellation
+                recordingCancellation.Cancel();
+
+                // Wait for recording task to complete
+                if (recordingTask != null)
+                {
+                    await recordingTask;
+                }
+
+                recordingStopwatch.Stop();
+                isRecording = false;
+
+                double duration = recordingStopwatch.Elapsed.TotalSeconds;
+                Console.WriteLine($"Recording stopped. Captured {capturedFrames.Count} frames in {duration:F2} seconds");
+
+                // Encode to video
+                await EncodeToVideoAsync();
+            }
+            catch (Exception ex)
+            {
+                Console.WriteLine($"Error stopping recording: {ex.Message}");
+            }
+            finally
+            {
+                Cleanup();
+                recordingLock.Release();
+            }
+        }
+
+        /// <summary>
+        /// Records frames from the screen.
+        /// </summary>
+        private void RecordFrames(CancellationToken cancellationToken)
+        {
+            try
+            {
+                int frameInterval = 1000 / TargetFps;
+                var frameTimer = Stopwatch.StartNew();
+
+                while (!cancellationToken.IsCancellationRequested)
+                {
+                    var frameStart = frameTimer.ElapsedMilliseconds;
+
+                    try
+                    {
+                        CaptureFrame();
+                    }
+                    catch (Exception ex)
+                    {
+                        Console.WriteLine($"Error capturing frame: {ex.Message}");
+                    }
+
+                    // Sleep for remaining time to maintain target FPS
+                    var frameTime = frameTimer.ElapsedMilliseconds - frameStart;
+                    var sleepTime = Math.Max(0, frameInterval - (int)frameTime);
+
+                    if (sleepTime > 0)
+                    {
+                        Thread.Sleep(sleepTime);
+                    }
+                }
+            }
+            catch (OperationCanceledException)
+            {
+                // Expected when stopping
+            }
+            catch (Exception ex)
+            {
+                Console.WriteLine($"Error during recording: {ex.Message}");
+            }
+        }
+
+        /// <summary>
+        /// Captures a single frame.
+        /// </summary>
+        private void CaptureFrame()
+        {
+            IntPtr hdc = GetDC(IntPtr.Zero);
+            int screenWidth = GetDeviceCaps(hdc, DESKTOPHORZRES);
+            int screenHeight = GetDeviceCaps(hdc, DESKTOPVERTRES);
+            ReleaseDC(IntPtr.Zero, hdc);
+
+            Rectangle bounds = new Rectangle(0, 0, screenWidth, screenHeight);
+            using (Bitmap bitmap = new Bitmap(bounds.Width, bounds.Height, PixelFormat.Format24bppRgb))
+            {
+                using (Graphics g = Graphics.FromImage(bitmap))
+                {
+                    g.CopyFromScreen(bounds.Location, Point.Empty, bounds.Size);
+
+                    ScreenCapture.CURSORINFO cursorInfo;
+                    cursorInfo.CbSize = Marshal.SizeOf<ScreenCapture.CURSORINFO>();
+                    if (GetCursorInfo(out cursorInfo) && cursorInfo.Flags == CURSORSHOWING)
+                    {
+                        IntPtr hdcDest = g.GetHdc();
+                        DrawIconEx(hdcDest, cursorInfo.PTScreenPos.X, cursorInfo.PTScreenPos.Y, cursorInfo.HCursor, 0, 0, 0, IntPtr.Zero, DINORMAL);
+                        g.ReleaseHdc(hdcDest);
+                    }
+                }
+
+                string framePath = Path.Combine(framesDirectory, $"frame_{frameCount:D6}.jpg");
+                bitmap.Save(framePath, ImageFormat.Jpeg);
+                capturedFrames.Add(framePath);
+                frameCount++;
+            }
+        }
+
+        /// <summary>
+        /// Encodes captured frames to video using ffmpeg.
+        /// </summary>
+        private async Task EncodeToVideoAsync()
+        {
+            if (capturedFrames.Count == 0)
+            {
+                Console.WriteLine("No frames captured");
+                return;
+            }
+
+            try
+            {
+                // Build ffmpeg command with proper non-interactive flags
+                string inputPattern = Path.Combine(framesDirectory, "frame_%06d.jpg");
+
+                // -y: overwrite without asking
+                // -nostdin: disable interaction
+                // -loglevel error: only show errors
+                // -stats: show encoding progress
+                string args = $"-y -nostdin -loglevel error -stats -framerate {TargetFps} -i \"{inputPattern}\" -c:v libx264 -pix_fmt yuv420p -crf 23 \"{outputFilePath}\"";
+
+                Console.WriteLine($"Encoding {capturedFrames.Count} frames to video...");
+
+                var startInfo = new ProcessStartInfo
+                {
+                    FileName = ffmpegPath!,
+                    Arguments = args,
+                    UseShellExecute = false,
+                    RedirectStandardOutput = true,
+                    RedirectStandardError = true,
+                    RedirectStandardInput = true, // Important: redirect stdin to prevent hanging
+                    CreateNoWindow = true,
+                };
+
+                using var process = Process.Start(startInfo);
+                if (process != null)
+                {
+                    // Close stdin immediately to ensure FFmpeg doesn't wait for input
+                    process.StandardInput.Close();
+
+                    // Read output streams asynchronously to prevent deadlock
+                    var outputTask = process.StandardOutput.ReadToEndAsync();
+                    var errorTask = process.StandardError.ReadToEndAsync();
+
+                    // Wait for process to exit
+                    await process.WaitForExitAsync();
+
+                    // Get the output
+                    string stdout = await outputTask;
+                    string stderr = await errorTask;
+
+                    if (process.ExitCode == 0 && File.Exists(outputFilePath))
+                    {
+                        var fileInfo = new FileInfo(outputFilePath);
+                        Console.WriteLine($"Video created: {outputFilePath} ({fileInfo.Length / 1024 / 1024:F1} MB)");
+                    }
+                    else
+                    {
+                        Console.WriteLine($"FFmpeg encoding failed with exit code {process.ExitCode}");
+                        if (!string.IsNullOrWhiteSpace(stderr))
+                        {
+                            Console.WriteLine($"FFmpeg error: {stderr}");
+                        }
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                Console.WriteLine($"Error encoding video: {ex.Message}");
+            }
+        }
+
+        /// <summary>
+        /// Finds ffmpeg executable.
+        /// </summary>
+        private static string? FindFfmpeg()
+        {
+            // Check if ffmpeg is in PATH
+            var pathDirs = Environment.GetEnvironmentVariable("PATH")?.Split(Path.PathSeparator) ?? Array.Empty<string>();
+
+            foreach (var dir in pathDirs)
+            {
+                var ffmpegPath = Path.Combine(dir, "ffmpeg.exe");
+                if (File.Exists(ffmpegPath))
+                {
+                    return ffmpegPath;
+                }
+            }
+
+            // Check common installation locations
+            var commonPaths = new[]
+            {
+                @"C:\.tools\ffmpeg\bin\ffmpeg.exe",
+                @"C:\ffmpeg\bin\ffmpeg.exe",
+                @"C:\Program Files\ffmpeg\bin\ffmpeg.exe",
+                @"C:\Program Files (x86)\ffmpeg\bin\ffmpeg.exe",
+                @$"{Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData)}\Microsoft\WinGet\Links\ffmpeg.exe",
+            };
+
+            foreach (var path in commonPaths)
+            {
+                if (File.Exists(path))
+                {
+                    return path;
+                }
+            }
+
+            return null;
+        }
+
+        /// <summary>
+        /// Gets the path to the recorded video file.
+        /// </summary>
+        public string OutputFilePath => outputFilePath;
+
+        /// <summary>
+        /// Gets the directory containing recordings.
+        /// </summary>
+        public string OutputDirectory => outputDirectory;
+
+        /// <summary>
+        /// Cleans up resources.
+        /// </summary>
+        private void Cleanup()
+        {
+            recordingCancellation?.Dispose();
+            recordingCancellation = null;
+            recordingTask = null;
+
+            // Clean up frames directory if it exists
+            try
+            {
+                if (Directory.Exists(framesDirectory))
+                {
+                    Directory.Delete(framesDirectory, true);
+                }
+            }
+            catch (Exception ex)
+            {
+                Console.WriteLine($"Failed to cleanup frames directory: {ex.Message}");
+            }
+        }
+
+        /// <summary>
+        /// Disposes resources.
+        /// </summary>
+        public void Dispose()
+        {
+            if (isRecording)
+            {
+                StopRecordingAsync().GetAwaiter().GetResult();
+            }
+
+            Cleanup();
+            recordingLock.Dispose();
+            GC.SuppressFinalize(this);
+        }
+    }
+}

src/common/UITestAutomation/SessionHelper.cs

@@ -130,9 +130,13 @@ namespace Microsoft.PowerToys.UITest
         /// </summary>
         /// <param name="appPath">The path to the application executable.</param>
         /// <param name="args">Optional command line arguments to pass to the application.</param>
-        public void StartExe(string appPath, string[]? args = null)
+        public void StartExe(string appPath, string[]? args = null, string? enableModules = null)
         {
             var opts = new AppiumOptions();
+            if (!string.IsNullOrEmpty(enableModules))
+            {
+                opts.AddAdditionalCapability("enableModules", enableModules);
+            }
 
             if (scope == PowerToysModule.PowerToysSettings)
             {
@@ -169,27 +173,66 @@ namespace Microsoft.PowerToys.UITest
 
         private void TryLaunchPowerToysSettings(AppiumOptions opts)
         {
-            try
+            if (opts.ToCapabilities().HasCapability("enableModules"))
             {
-                var runnerProcessInfo = new ProcessStartInfo
+                var modulesString = (string)opts.ToCapabilities().GetCapability("enableModules");
+                var modulesArray = modulesString.Split(',', StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries);
+                SettingsConfigHelper.ConfigureGlobalModuleSettings(modulesArray);
+            }
+            else
+            {
+                SettingsConfigHelper.ConfigureGlobalModuleSettings();
+            }
+
+            const int maxTries = 3;
+            const int delayMs = 5000;
+            const int maxRetries = 3;
+
+            for (int tryCount = 1; tryCount <= maxTries; tryCount++)
+            {
+                try
                 {
-                    FileName = locationPath + runnerPath,
-                    Verb = "runas",
-                    Arguments = "--open-settings",
-                };
+                    var runnerProcessInfo = new ProcessStartInfo
+                    {
+                        FileName = locationPath + runnerPath,
+                        Verb = "runas",
+                        Arguments = "--open-settings",
+                    };
 
-                ExitExe(runnerProcessInfo.FileName);
-                runner = Process.Start(runnerProcessInfo);
+                    ExitExe(runnerProcessInfo.FileName);
 
-                WaitForWindowAndSetCapability(opts, "PowerToys Settings", 5000, 5);
+                    // Verify process was killed
+                    string exeName = Path.GetFileNameWithoutExtension(runnerProcessInfo.FileName);
+                    var remainingProcesses = Process.GetProcessesByName(exeName);
 
-                // Exit CmdPal UI before launching new process if use installer for test
-                ExitExeByName("Microsoft.CmdPal.UI");
-            }
-            catch (Exception ex)
-            {
-                throw new InvalidOperationException($"Failed to launch PowerToys Settings: {ex.Message}", ex);
+                    runner = Process.Start(runnerProcessInfo);
+
+                    if (WaitForWindowAndSetCapability(opts, "PowerToys Settings", delayMs, maxRetries))
+                    {
+                        // Exit CmdPal UI before launching new process if use installer for test
+                        ExitExeByName("Microsoft.CmdPal.UI");
+                        return;
+                    }
+
+                    // Window not found, kill all PowerToys processes and retry
+                    if (tryCount < maxTries)
+                    {
+                        KillPowerToysProcesses();
+                    }
+                }
+                catch (Exception ex)
+                {
+                    if (tryCount == maxTries)
+                    {
+                        throw new InvalidOperationException($"Failed to launch PowerToys Settings after {maxTries} attempts: {ex.Message}", ex);
+                    }
+
+                    // Kill processes and retry
+                    KillPowerToysProcesses();
+                }
             }
+
+            throw new InvalidOperationException($"Failed to launch PowerToys Settings: Window not found after {maxTries} attempts.");
         }
 
         private void TryLaunchCommandPalette(AppiumOptions opts)
@@ -211,7 +254,10 @@ namespace Microsoft.PowerToys.UITest
                 var process = Process.Start(processStartInfo);
                 process?.WaitForExit();
 
-                WaitForWindowAndSetCapability(opts, "Command Palette", 5000, 10);
+                if (!WaitForWindowAndSetCapability(opts, "Command Palette", 5000, 10))
+                {
+                    throw new TimeoutException("Failed to find Command Palette window after multiple attempts.");
+                }
             }
             catch (Exception ex)
             {
@@ -219,7 +265,7 @@ namespace Microsoft.PowerToys.UITest
             }
         }
 
-        private void WaitForWindowAndSetCapability(AppiumOptions opts, string windowName, int delayMs, int maxRetries)
+        private bool WaitForWindowAndSetCapability(AppiumOptions opts, string windowName, int delayMs, int maxRetries)
         {
             for (int attempt = 1; attempt <= maxRetries; attempt++)
             {
@@ -230,18 +276,16 @@ namespace Microsoft.PowerToys.UITest
                 {
                     var hexHwnd = window[0].HWnd.ToString("x");
                     opts.AddAdditionalCapability("appTopLevelWindow", hexHwnd);
-                    return;
+                    return true;
                 }
 
                 if (attempt < maxRetries)
                 {
                     Thread.Sleep(delayMs);
                 }
-                else
-                {
-                    throw new TimeoutException($"Failed to find {windowName} window after multiple attempts.");
-                }
             }
+
+            return false;
         }
 
         /// <summary>
@@ -292,17 +336,17 @@ namespace Microsoft.PowerToys.UITest
             catch (Exception ex)
             {
                 // Handle exceptions if needed
-                Debug.WriteLine($"Exception during Cleanup: {ex.Message}");
+                Console.WriteLine($"Exception during Cleanup: {ex.Message}");
             }
         }
 
         /// <summary>
         /// Restarts now exe and takes control of it.
         /// </summary>
-        public void RestartScopeExe()
+        public void RestartScopeExe(string? enableModules = null)
         {
             ExitScopeExe();
-            StartExe(locationPath + sessionPath, this.commandLineArgs);
+            StartExe(locationPath + sessionPath, commandLineArgs, enableModules);
         }
 
         public WindowsDriver<WindowsElement> GetRoot()
@@ -327,5 +371,31 @@ namespace Microsoft.PowerToys.UITest
             this.ExitExe(winAppDriverProcessInfo.FileName);
             SessionHelper.appDriver = Process.Start(winAppDriverProcessInfo);
         }
+
+        private void KillPowerToysProcesses()
+        {
+            var powerToysProcessNames = new[] { "PowerToys", "Microsoft.CmdPal.UI" };
+
+            foreach (var processName in powerToysProcessNames)
+            {
+                try
+                {
+                    var processes = Process.GetProcessesByName(processName);
+
+                    foreach (var process in processes)
+                    {
+                        process.Kill();
+                        process.WaitForExit();
+                    }
+
+                    // Verify processes are actually gone
+                    var remainingProcesses = Process.GetProcessesByName(processName);
+                }
+                catch (Exception ex)
+                {
+                    Console.WriteLine($"[KillPowerToysProcesses] Failed to kill process {processName}: {ex.Message}");
+                }
+            }
+        }
     }
 }

src/common/UITestAutomation/SettingsConfigHelper.cs

@@ -21,19 +21,18 @@ namespace Microsoft.PowerToys.UITest
     public class SettingsConfigHelper
     {
         private static readonly JsonSerializerOptions IndentedJsonOptions = new() { WriteIndented = true };
-        private static readonly SettingsUtils SettingsUtils = new SettingsUtils();
+        private static readonly SettingsUtils SettingsUtils = SettingsUtils.Default;
 
         /// <summary>
         /// Configures global PowerToys settings to enable only specified modules and disable all others.
         /// </summary>
-        /// <param name="modulesToEnable">Array of module names to enable (e.g., "Peek", "FancyZones"). All other modules will be disabled.</param>
-        /// <exception cref="ArgumentNullException">Thrown when modulesToEnable is null.</exception>
+        /// <param name="modulesToEnable">Array of module names to enable (e.g., "Peek", "FancyZones"). All other modules will be disabled. If null or empty, all modules will be disabled.</param>
         /// <exception cref="InvalidOperationException">Thrown when settings file operations fail.</exception>
         [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "This is test code and will not be trimmed")]
         [UnconditionalSuppressMessage("AOT", "IL3050", Justification = "This is test code and will not be AOT compiled")]
-        public static void ConfigureGlobalModuleSettings(params string[] modulesToEnable)
+        public static void ConfigureGlobalModuleSettings(params string[]? modulesToEnable)
         {
-            ArgumentNullException.ThrowIfNull(modulesToEnable);
+            modulesToEnable ??= Array.Empty<string>();
 
             try
             {

src/common/UITestAutomation/UITestBase.cs

@@ -29,6 +29,8 @@ namespace Microsoft.PowerToys.UITest
 
         public string? ScreenshotDirectory { get; set; }
 
+        public string? RecordingDirectory { get; set; }
+
         public static MonitorInfoData.ParamsWrapper MonitorInfoData { get; set; } = new MonitorInfoData.ParamsWrapper() { Monitors = new List<MonitorInfoData.MonitorInfoDataWrapper>() };
 
         private readonly PowerToysModule scope;
@@ -36,6 +38,7 @@ namespace Microsoft.PowerToys.UITest
         private readonly string[]? commandLineArgs;
         private SessionHelper? sessionHelper;
         private System.Threading.Timer? screenshotTimer;
+        private ScreenRecording? screenRecording;
 
         public UITestBase(PowerToysModule scope = PowerToysModule.PowerToysSettings, WindowSize size = WindowSize.UnSpecified, string[]? commandLineArgs = null)
         {
@@ -65,12 +68,35 @@ namespace Microsoft.PowerToys.UITest
             CloseOtherApplications();
             if (IsInPipeline)
             {
-                ScreenshotDirectory = Path.Combine(this.TestContext.TestResultsDirectory ?? string.Empty, "UITestScreenshots_" + Guid.NewGuid().ToString());
+                string baseDirectory = this.TestContext.TestResultsDirectory ?? string.Empty;
+                ScreenshotDirectory = Path.Combine(baseDirectory, "UITestScreenshots_" + Guid.NewGuid().ToString());
                 Directory.CreateDirectory(ScreenshotDirectory);
 
+                RecordingDirectory = Path.Combine(baseDirectory, "UITestRecordings_" + Guid.NewGuid().ToString());
+                Directory.CreateDirectory(RecordingDirectory);
+
                 // Take screenshot every 1 second
                 screenshotTimer = new System.Threading.Timer(ScreenCapture.TimerCallback, ScreenshotDirectory, TimeSpan.Zero, TimeSpan.FromMilliseconds(1000));
 
+                // Start screen recording (requires FFmpeg)
+                try
+                {
+                    screenRecording = new ScreenRecording(RecordingDirectory);
+                    if (screenRecording.IsAvailable)
+                    {
+                        _ = screenRecording.StartRecordingAsync();
+                    }
+                    else
+                    {
+                        screenRecording = null;
+                    }
+                }
+                catch (Exception ex)
+                {
+                    Console.WriteLine($"Failed to start screen recording: {ex.Message}");
+                    screenRecording = null;
+                }
+
                 // Escape Popups before starting
                 System.Windows.Forms.SendKeys.SendWait("{ESC}");
             }
@@ -88,15 +114,36 @@ namespace Microsoft.PowerToys.UITest
             if (IsInPipeline)
             {
                 screenshotTimer?.Change(Timeout.Infinite, Timeout.Infinite);
-                Dispose();
+
+                // Stop screen recording
+                if (screenRecording != null)
+                {
+                    try
+                    {
+                        screenRecording.StopRecordingAsync().GetAwaiter().GetResult();
+                    }
+                    catch (Exception ex)
+                    {
+                        Console.WriteLine($"Failed to stop screen recording: {ex.Message}");
+                    }
+                }
+
                 if (TestContext.CurrentTestOutcome is UnitTestOutcome.Failed
                     or UnitTestOutcome.Error
                     or UnitTestOutcome.Unknown)
                 {
                     Task.Delay(1000).Wait();
                     AddScreenShotsToTestResultsDirectory();
+                    AddRecordingsToTestResultsDirectory();
                     AddLogFilesToTestResultsDirectory();
                 }
+                else
+                {
+                    // Clean up recording if test passed
+                    CleanupRecordingDirectory();
+                }
+
+                Dispose();
             }
 
             this.Session.Cleanup();
@@ -106,6 +153,7 @@ namespace Microsoft.PowerToys.UITest
         public void Dispose()
         {
             screenshotTimer?.Dispose();
+            screenRecording?.Dispose();
             GC.SuppressFinalize(this);
         }
 
@@ -600,6 +648,47 @@ namespace Microsoft.PowerToys.UITest
             }
         }
 
+        /// <summary>
+        /// Adds screen recordings to test results directory when test fails.
+        /// </summary>
+        protected void AddRecordingsToTestResultsDirectory()
+        {
+            if (RecordingDirectory != null && Directory.Exists(RecordingDirectory))
+            {
+                // Add video files (MP4)
+                var videoFiles = Directory.GetFiles(RecordingDirectory, "*.mp4");
+                foreach (string file in videoFiles)
+                {
+                    this.TestContext.AddResultFile(file);
+                    var fileInfo = new FileInfo(file);
+                    Console.WriteLine($"Added video recording: {Path.GetFileName(file)} ({fileInfo.Length / 1024 / 1024:F1} MB)");
+                }
+
+                if (videoFiles.Length == 0)
+                {
+                    Console.WriteLine("No video recording available (FFmpeg not found). Screenshots are still captured.");
+                }
+            }
+        }
+
+        /// <summary>
+        /// Cleans up recording directory when test passes.
+        /// </summary>
+        private void CleanupRecordingDirectory()
+        {
+            if (RecordingDirectory != null && Directory.Exists(RecordingDirectory))
+            {
+                try
+                {
+                    Directory.Delete(RecordingDirectory, true);
+                }
+                catch (Exception ex)
+                {
+                    Console.WriteLine($"Failed to cleanup recording directory: {ex.Message}");
+                }
+            }
+        }
+
         /// <summary>
         /// Copies PowerToys log files to test results directory when test fails.
         /// Renames files to include the directory structure after \PowerToys.
@@ -689,11 +778,11 @@ namespace Microsoft.PowerToys.UITest
         /// <summary>
         /// Restart scope exe.
         /// </summary>
-        public void RestartScopeExe()
+        public Session RestartScopeExe(string? enableModules = null)
         {
-            this.sessionHelper!.RestartScopeExe();
+            this.sessionHelper!.RestartScopeExe(enableModules);
             this.Session = new Session(this.sessionHelper.GetRoot(), this.sessionHelper.GetDriver(), this.scope, this.size);
-            return;
+            return Session;
         }
 
         /// <summary>

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;

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();

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();
@@ -51,4 +64,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";
 
@@ -130,6 +141,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/common/utils/registry.h

@@ -16,9 +16,54 @@
 
 namespace registry
 {
+    namespace detail
+    {
+        struct on_exit
+        {
+            std::function<void()> f;
+
+            on_exit(std::function<void()> f) :
+                f{ std::move(f) } {}
+            ~on_exit() { f(); }
+        };
+
+        template<class... Ts>
+        struct overloaded : Ts...
+        {
+            using Ts::operator()...;
+        };
+
+        template<class... Ts>
+        overloaded(Ts...) -> overloaded<Ts...>;
+
+        inline const wchar_t* getScopeName(HKEY scope)
+        {
+            if (scope == HKEY_LOCAL_MACHINE)
+            {
+                return L"HKLM";
+            }
+            else if (scope == HKEY_CURRENT_USER)
+            {
+                return L"HKCU";
+            }
+            else if (scope == HKEY_CLASSES_ROOT)
+            {
+                return L"HKCR";
+            }
+            else
+            {
+                return L"HK??";
+            }
+        }
+    }
+
     namespace install_scope
     {
         const wchar_t INSTALL_SCOPE_REG_KEY[] = L"Software\\Classes\\powertoys\\";
+        const wchar_t UNINSTALL_REG_KEY[] = L"Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall";
+        
+        // Bundle UpgradeCode from PowerToys.wxs (with braces as stored in registry)
+        const wchar_t BUNDLE_UPGRADE_CODE[] = L"{6341382D-C0A9-4238-9188-BE9607E3FAB2}";
 
         enum class InstallScope
         {
@@ -26,8 +71,67 @@ namespace registry
             PerUser,
         };
 
+        // Helper function to find PowerToys bundle in Windows Uninstall registry by BundleUpgradeCode
+        inline bool find_powertoys_bundle_in_uninstall_registry(HKEY rootKey)
+        {
+            HKEY uninstallKey{};
+            if (RegOpenKeyExW(rootKey, UNINSTALL_REG_KEY, 0, KEY_READ, &uninstallKey) != ERROR_SUCCESS)
+            {
+                return false;
+            }
+            detail::on_exit closeUninstallKey{ [uninstallKey] { RegCloseKey(uninstallKey); } };
+
+            DWORD index = 0;
+            wchar_t subKeyName[256];
+
+            // Enumerate all subkeys under Uninstall
+            while (RegEnumKeyW(uninstallKey, index++, subKeyName, 256) == ERROR_SUCCESS)
+            {
+                HKEY productKey{};
+                if (RegOpenKeyExW(uninstallKey, subKeyName, 0, KEY_READ, &productKey) != ERROR_SUCCESS)
+                {
+                    continue;
+                }
+                detail::on_exit closeProductKey{ [productKey] { RegCloseKey(productKey); } };
+
+                // Check BundleUpgradeCode value (specific to WiX Bundle installations)
+                wchar_t bundleUpgradeCode[256]{};
+                DWORD bundleUpgradeCodeSize = sizeof(bundleUpgradeCode);
+
+                if (RegQueryValueExW(productKey, L"BundleUpgradeCode", nullptr, nullptr,
+                                    reinterpret_cast<LPBYTE>(bundleUpgradeCode), &bundleUpgradeCodeSize) == ERROR_SUCCESS)
+                {
+                    if (_wcsicmp(bundleUpgradeCode, BUNDLE_UPGRADE_CODE) == 0)
+                    {
+                        return true;
+                    }
+                }
+            }
+
+            return false;
+        }
+
         inline const InstallScope get_current_install_scope()
         {
+            // 1. Check HKCU Uninstall registry first (user-level bundle)
+            // Note: MSI components are always in HKLM regardless of install scope,
+            // but the Bundle entry will be in HKCU for per-user installations
+            if (find_powertoys_bundle_in_uninstall_registry(HKEY_CURRENT_USER))
+            {
+                Logger::info(L"Found user-level PowerToys bundle via BundleUpgradeCode in HKCU");
+                return InstallScope::PerUser;
+            }
+
+            // 2. Check HKLM Uninstall registry (machine-level bundle)
+            if (find_powertoys_bundle_in_uninstall_registry(HKEY_LOCAL_MACHINE))
+            {
+                Logger::info(L"Found machine-level PowerToys bundle via BundleUpgradeCode in HKLM");
+                return InstallScope::PerMachine;
+            }
+
+            // 3. Fallback to legacy custom registry key detection
+            Logger::info(L"PowerToys bundle not found in Uninstall registry, falling back to legacy detection");
+
             // Open HKLM key
             HKEY perMachineKey{};
             if (RegOpenKeyExW(HKEY_LOCAL_MACHINE,
@@ -45,6 +149,7 @@ namespace registry
                                   &perUserKey) != ERROR_SUCCESS)
                 {
                     // both keys are missing
+                    Logger::warn(L"No PowerToys installation detected, defaulting to PerMachine");
                     return InstallScope::PerMachine;
                 }
                 else
@@ -96,47 +201,6 @@ namespace registry
     template<class>
     inline constexpr bool always_false_v = false;
 
-    namespace detail
-    {
-        struct on_exit
-        {
-            std::function<void()> f;
-
-            on_exit(std::function<void()> f) :
-                f{ std::move(f) } {}
-            ~on_exit() { f(); }
-        };
-
-        template<class... Ts>
-        struct overloaded : Ts...
-        {
-            using Ts::operator()...;
-        };
-
-        template<class... Ts>
-        overloaded(Ts...) -> overloaded<Ts...>;
-
-        inline const wchar_t* getScopeName(HKEY scope)
-        {
-            if (scope == HKEY_LOCAL_MACHINE)
-            {
-                return L"HKLM";
-            }
-            else if (scope == HKEY_CURRENT_USER)
-            {
-                return L"HKCU";
-            }
-            else if (scope == HKEY_CLASSES_ROOT)
-            {
-                return L"HKCR";
-            }
-            else
-            {
-                return L"HK??";
-            }
-        }
-    }
-
     struct ValueChange
     {
         using value_t = std::variant<DWORD, std::wstring>;

src/dsc/v3/PowerToys.DSC.UnitTests/SettingsResourceTests/SettingsResourceModuleTest`1.cs

@@ -18,7 +18,7 @@ namespace PowerToys.DSC.UnitTests.SettingsResourceTests;
 public abstract class SettingsResourceModuleTest<TSettingsConfig> : BaseDscTest
     where TSettingsConfig : ISettingsConfig, new()
 {
-    private readonly SettingsUtils _settingsUtils = new();
+    private readonly SettingsUtils _settingsUtils = SettingsUtils.Default;
     private TSettingsConfig _originalSettings;
 
     protected TSettingsConfig DefaultSettings => new();

src/dsc/v3/PowerToys.DSC/Models/FunctionData/SettingsFunctionData`1.cs

@@ -18,7 +18,7 @@ namespace PowerToys.DSC.Models.FunctionData;
 public sealed class SettingsFunctionData<TSettingsConfig> : BaseFunctionData, ISettingsFunctionData
     where TSettingsConfig : ISettingsConfig, new()
 {
-    private static readonly SettingsUtils _settingsUtils = new();
+    private static readonly SettingsUtils _settingsUtils = SettingsUtils.Default;
     private static readonly TSettingsConfig _settingsConfig = new();
 
     private readonly SettingsResourceObject<TSettingsConfig> _input;

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.UnitTests/ServicesTests/AIServiceBatchIntegrationTests.cs

@@ -144,7 +144,7 @@ public sealed class AIServiceBatchIntegrationTests
         switch (format)
         {
             case PasteFormats.CustomTextTransformation:
-                var transformResult = await services.CustomActionTransformService.TransformTextAsync(batchTestInput.Prompt, batchTestInput.Clipboard, CancellationToken.None, progress);
+                var transformResult = await services.CustomActionTransformService.TransformAsync(batchTestInput.Prompt, batchTestInput.Clipboard, null, CancellationToken.None, progress);
                 return DataPackageHelpers.CreateFromText(transformResult.Content ?? string.Empty);
 
             case PasteFormats.KernelQuery:

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

@@ -198,20 +198,14 @@ namespace AdvancedPaste.Pages
             }
         }
 
-        private async void ClipboardHistory_ItemInvoked(ItemsView sender, ItemsViewItemInvokedEventArgs args)
+        private void ClipboardHistory_ItemInvoked(ItemsView sender, ItemsViewItemInvokedEventArgs args)
         {
-            if (args.InvokedItem is ClipboardItem item)
+            if (args.InvokedItem is ClipboardItem item && item.Item is not null)
             {
                 PowerToysTelemetry.Log.WriteEvent(new Telemetry.AdvancedPasteClipboardItemClicked());
-                if (!string.IsNullOrEmpty(item.Content))
-                {
-                    ClipboardHelper.SetTextContent(item.Content);
-                }
-                else if (item.Image is not null)
-                {
-                    RandomAccessStreamReference image = await item.Item.Content.GetBitmapAsync();
-                    ClipboardHelper.SetImageContent(image);
-                }
+
+                // Use SetHistoryItemAsContent to set the clipboard content without creating a new history entry
+                Clipboard.SetHistoryItemAsContent(item.Item);
             }
         }
     }

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

@@ -225,6 +225,24 @@ internal static class DataPackageHelpers
     internal static async Task<string> GetHtmlContentAsync(this DataPackageView dataPackageView) =>
         dataPackageView.Contains(StandardDataFormats.Html) ? await dataPackageView.GetHtmlFormatAsync() : string.Empty;
 
+    internal static async Task<byte[]> GetImageAsPngBytesAsync(this DataPackageView dataPackageView)
+    {
+        var bitmap = await dataPackageView.GetImageContentAsync();
+        if (bitmap == null)
+        {
+            return null;
+        }
+
+        using var pngStream = new InMemoryRandomAccessStream();
+        var encoder = await BitmapEncoder.CreateAsync(BitmapEncoder.PngEncoderId, pngStream);
+        encoder.SetSoftwareBitmap(bitmap);
+        await encoder.FlushAsync();
+
+        using var memoryStream = new MemoryStream();
+        await pngStream.AsStreamForRead().CopyToAsync(memoryStream);
+        return memoryStream.ToArray();
+    }
+
     internal static async Task<SoftwareBitmap> GetImageContentAsync(this DataPackageView dataPackageView)
     {
         using var stream = await dataPackageView.GetImageStreamAsync();

src/modules/AdvancedPaste/AdvancedPaste/Helpers/NativeMethods.cs

@@ -166,5 +166,8 @@ namespace AdvancedPaste.Helpers
 
         [DllImport("Shlwapi.dll", SetLastError = true, CharSet = CharSet.Unicode)]
         internal static extern HResult AssocQueryString(AssocF flags, AssocStr str, string pszAssoc, string pszExtra, [Out] StringBuilder pszOut, [In][Out] ref uint pcchOut);
+
+        [DllImport("user32.dll", SetLastError = true)]
+        internal static extern uint GetClipboardSequenceNumber();
     }
 }

src/modules/AdvancedPaste/AdvancedPaste/Models/PasteFormats.cs

@@ -46,7 +46,7 @@ public enum PasteFormats
         CanPreview = true,
         SupportedClipboardFormats = ClipboardFormat.Image,
         IPCKey = AdvancedPasteAdditionalActions.PropertyNames.ImageToText,
-        KernelFunctionDescription = "Takes an image in the clipboard and extracts all text from it using OCR.")]
+        KernelFunctionDescription = "Takes an image from the clipboard and extracts text using OCR. This function is intended only for explicit text extraction or OCR requests.")]
     ImageToText,
 
     [PasteFormatMetadata(
@@ -118,8 +118,8 @@ public enum PasteFormats
         IconGlyph = "\uE945",
         RequiresAIService = true,
         CanPreview = true,
-        SupportedClipboardFormats = ClipboardFormat.Text,
-        KernelFunctionDescription = "Takes input instructions and transforms clipboard text (not TXT files) with these input instructions, putting the result back on the clipboard. This uses AI to accomplish the task.",
+        SupportedClipboardFormats = ClipboardFormat.Text | ClipboardFormat.Image,
+        KernelFunctionDescription = "Takes user instructions and applies them to the current clipboard content (text or image). Use this function for image analysis, description, or transformation tasks beyond simple OCR.",
         RequiresPrompt = true)]
     CustomTextTransformation,
 }

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

@@ -40,15 +40,15 @@ namespace AdvancedPaste.Services.CustomActions
             this.userSettings = userSettings;
         }
 
-        public async Task<CustomActionTransformResult> TransformTextAsync(string prompt, string inputText, CancellationToken cancellationToken, IProgress<double> progress)
+        public async Task<CustomActionTransformResult> TransformAsync(string prompt, string inputText, byte[] imageBytes, CancellationToken cancellationToken, IProgress<double> progress)
         {
             var pasteConfig = userSettings?.PasteAIConfiguration;
             var providerConfig = BuildProviderConfig(pasteConfig);
 
-            return await TransformAsync(prompt, inputText, providerConfig, cancellationToken, progress);
+            return await TransformAsync(prompt, inputText, imageBytes, providerConfig, cancellationToken, progress);
         }
 
-        private async Task<CustomActionTransformResult> TransformAsync(string prompt, string inputText, PasteAIConfig providerConfig, CancellationToken cancellationToken, IProgress<double> progress)
+        private async Task<CustomActionTransformResult> TransformAsync(string prompt, string inputText, byte[] imageBytes, PasteAIConfig providerConfig, CancellationToken cancellationToken, IProgress<double> progress)
         {
             ArgumentNullException.ThrowIfNull(providerConfig);
 
@@ -57,9 +57,9 @@ namespace AdvancedPaste.Services.CustomActions
                 return new CustomActionTransformResult(string.Empty, AIServiceUsage.None);
             }
 
-            if (string.IsNullOrWhiteSpace(inputText))
+            if (string.IsNullOrWhiteSpace(inputText) && imageBytes is null)
             {
-                Logger.LogWarning("Clipboard has no usable text data");
+                Logger.LogWarning("Clipboard has no usable data");
                 return new CustomActionTransformResult(string.Empty, AIServiceUsage.None);
             }
 
@@ -80,6 +80,8 @@ namespace AdvancedPaste.Services.CustomActions
                 {
                     Prompt = prompt,
                     InputText = inputText,
+                    ImageBytes = imageBytes,
+                    ImageMimeType = imageBytes != null ? "image/png" : null,
                     SystemPrompt = systemPrompt,
                 };
 

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

@@ -12,6 +12,6 @@ namespace AdvancedPaste.Services.CustomActions
 {
     public interface ICustomActionTransformService
     {
-        Task<CustomActionTransformResult> TransformTextAsync(string prompt, string inputText, CancellationToken cancellationToken, IProgress<double> progress);
+        Task<CustomActionTransformResult> TransformAsync(string prompt, string inputText, byte[] imageBytes, CancellationToken cancellationToken, IProgress<double> progress);
     }
 }

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

@@ -12,6 +12,10 @@ namespace AdvancedPaste.Services.CustomActions
 
         public string InputText { get; init; }
 
+        public byte[] ImageBytes { get; init; }
+
+        public string ImageMimeType { get; init; }
+
         public string SystemPrompt { get; init; }
 
         public AIServiceUsage Usage { get; set; } = AIServiceUsage.None;

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

@@ -64,21 +64,13 @@ namespace AdvancedPaste.Services.CustomActions
 
             var prompt = request.Prompt;
             var inputText = request.InputText;
-            if (string.IsNullOrWhiteSpace(prompt) || string.IsNullOrWhiteSpace(inputText))
+            var imageBytes = request.ImageBytes;
+
+            if (string.IsNullOrWhiteSpace(prompt) || (string.IsNullOrWhiteSpace(inputText) && imageBytes is null))
             {
-                throw new ArgumentException("Prompt and input text must be provided", nameof(request));
+                throw new ArgumentException("Prompt and input content must be provided", nameof(request));
             }
 
-            var userMessageContent = $"""
-                User instructions:
-                {prompt}
-
-                Clipboard Content:
-                {inputText}
-
-                Output:
-                """;
-
             var executionSettings = CreateExecutionSettings();
             var kernel = CreateKernel();
             var modelId = _config.Model;
@@ -102,7 +94,32 @@ namespace AdvancedPaste.Services.CustomActions
 
             var chatHistory = new ChatHistory();
             chatHistory.AddSystemMessage(systemPrompt);
-            chatHistory.AddUserMessage(userMessageContent);
+
+            if (imageBytes != null)
+            {
+                var collection = new ChatMessageContentItemCollection();
+                if (!string.IsNullOrWhiteSpace(inputText))
+                {
+                    collection.Add(new TextContent($"Clipboard Content:\n{inputText}"));
+                }
+
+                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);
+            }
 
             var response = await chatService.GetChatMessageContentAsync(chatHistory, executionSettings, kernel, cancellationToken);
             chatHistory.Add(response);

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

@@ -67,12 +67,36 @@ public abstract class KernelServiceBase(
 
             LogResult(cacheUsed, isSavedQuery, kernel.GetOrAddActionChain(), usage);
 
+            var outputPackage = kernel.GetDataPackage();
+            var hasUsableData = await outputPackage.GetView().HasUsableDataAsync();
+
             if (kernel.GetLastError() is Exception ex)
             {
-                throw ex;
+                // If we have an error, but the AI provided a final text response, we can ignore the error (likely a tool failure that the AI handled).
+                // However, if we have usable data (e.g. from a successful tool call before the error?), we might want to keep it?
+                // In the case of ImageToText failure, outputPackage is empty (new DataPackage), hasUsableData is false.
+                // So we check if there is a valid response in the chat history.
+                var lastMessage = chatHistory.LastOrDefault();
+                bool hasAssistantResponse = lastMessage != null && lastMessage.Role == AuthorRole.Assistant && !string.IsNullOrEmpty(lastMessage.Content);
+
+                if (!hasAssistantResponse && !hasUsableData)
+                {
+                    throw ex;
+                }
+
+                // If we have a response or data, we log the error but proceed.
+                Logger.LogWarning($"Kernel operation encountered an error but proceeded with available response/data: {ex.Message}");
             }
 
-            var outputPackage = kernel.GetDataPackage();
+            if (!hasUsableData)
+            {
+                var lastMessage = chatHistory.LastOrDefault();
+                if (lastMessage != null && lastMessage.Role == AuthorRole.Assistant && !string.IsNullOrEmpty(lastMessage.Content))
+                {
+                    outputPackage = DataPackageHelpers.CreateFromText(lastMessage.Content);
+                    kernel.SetDataPackage(outputPackage);
+                }
+            }
 
             if (!(await outputPackage.GetView().HasUsableDataAsync()))
             {
@@ -148,7 +172,21 @@ public abstract class KernelServiceBase(
         var systemPrompt = string.IsNullOrWhiteSpace(runtimeConfig.SystemPrompt) ? DefaultSystemPrompt : runtimeConfig.SystemPrompt;
         chatHistory.AddSystemMessage(systemPrompt);
         chatHistory.AddSystemMessage($"Available clipboard formats: {await kernel.GetDataFormatsAsync()}");
-        chatHistory.AddUserMessage(prompt);
+
+        var imageBytes = await kernel.GetDataPackageView().GetImageAsPngBytesAsync();
+        if (imageBytes != null)
+        {
+            var collection = new ChatMessageContentItemCollection
+            {
+                new TextContent(prompt),
+                new ImageContent(imageBytes, "image/png"),
+            };
+            chatHistory.AddUserMessage(collection);
+        }
+        else
+        {
+            chatHistory.AddUserMessage(prompt);
+        }
 
         if (ShouldModerateAdvancedAI())
         {
@@ -302,8 +340,16 @@ public abstract class KernelServiceBase(
             new ActionChainItem(PasteFormats.CustomTextTransformation, Arguments: new() { { PromptParameterName, fixedPrompt } }),
             async dataPackageView =>
             {
-                var input = await dataPackageView.GetClipboardTextOrThrowAsync(kernel.GetCancellationToken());
-                var result = await _customActionTransformService.TransformTextAsync(fixedPrompt, input, kernel.GetCancellationToken(), kernel.GetProgress());
+                var imageBytes = await dataPackageView.GetImageAsPngBytesAsync();
+                var input = await dataPackageView.GetTextOrHtmlTextAsync();
+
+                if (string.IsNullOrEmpty(input) && imageBytes == null)
+                {
+                    // If we have no text and no image, try to get text via OCR or throw if nothing exists
+                    input = await dataPackageView.GetClipboardTextOrThrowAsync(kernel.GetCancellationToken());
+                }
+
+                var result = await _customActionTransformService.TransformAsync(fixedPrompt, input, imageBytes, kernel.GetCancellationToken(), kernel.GetProgress());
                 return DataPackageHelpers.CreateFromText(result?.Content ?? string.Empty);
             });
 
@@ -313,15 +359,22 @@ public abstract class KernelServiceBase(
             new ActionChainItem(format, Arguments: new() { { PromptParameterName, prompt } }),
             async dataPackageView =>
             {
-                var input = await dataPackageView.GetClipboardTextOrThrowAsync(kernel.GetCancellationToken());
-                string output = await GetPromptBasedOutput(format, prompt, input, kernel.GetCancellationToken(), kernel.GetProgress());
+                var imageBytes = await dataPackageView.GetImageAsPngBytesAsync();
+                var input = await dataPackageView.GetTextOrHtmlTextAsync();
+
+                if (string.IsNullOrEmpty(input) && imageBytes == null)
+                {
+                    input = await dataPackageView.GetClipboardTextOrThrowAsync(kernel.GetCancellationToken());
+                }
+
+                string output = await GetPromptBasedOutput(format, prompt, input, imageBytes, kernel.GetCancellationToken(), kernel.GetProgress());
                 return DataPackageHelpers.CreateFromText(output);
             });
 
-    private async Task<string> GetPromptBasedOutput(PasteFormats format, string prompt, string input, CancellationToken cancellationToken, IProgress<double> progress) =>
+    private async Task<string> GetPromptBasedOutput(PasteFormats format, string prompt, string input, byte[] imageBytes, CancellationToken cancellationToken, IProgress<double> progress) =>
         format switch
         {
-            PasteFormats.CustomTextTransformation => (await _customActionTransformService.TransformTextAsync(prompt, input, cancellationToken, progress))?.Content ?? string.Empty,
+            PasteFormats.CustomTextTransformation => (await _customActionTransformService.TransformAsync(prompt, input, imageBytes, cancellationToken, progress))?.Content ?? string.Empty,
             _ => throw new ArgumentException($"Unsupported format {format} for prompt transform", nameof(format)),
         };
 

src/modules/AdvancedPaste/AdvancedPaste/Services/PasteFormatExecutor.cs

@@ -37,7 +37,7 @@ public sealed class PasteFormatExecutor(IKernelService kernelService, ICustomAct
             pasteFormat.Format switch
             {
                 PasteFormats.KernelQuery => await _kernelService.TransformClipboardAsync(pasteFormat.Prompt, clipboardData, pasteFormat.IsSavedQuery, cancellationToken, progress),
-                PasteFormats.CustomTextTransformation => DataPackageHelpers.CreateFromText((await _customActionTransformService.TransformTextAsync(pasteFormat.Prompt, await clipboardData.GetClipboardTextOrThrowAsync(cancellationToken), cancellationToken, progress))?.Content ?? string.Empty),
+                PasteFormats.CustomTextTransformation => DataPackageHelpers.CreateFromText((await _customActionTransformService.TransformAsync(pasteFormat.Prompt, await clipboardData.GetTextOrHtmlTextAsync(), await clipboardData.GetImageAsPngBytesAsync(), cancellationToken, progress))?.Content ?? string.Empty),
                 _ => await TransformHelpers.TransformAsync(format, clipboardData, cancellationToken, progress),
             });
     }

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

@@ -45,6 +45,7 @@ namespace AdvancedPaste.ViewModels
         private CancellationTokenSource _pasteActionCancellationTokenSource;
 
         private string _currentClipboardHistoryId;
+        private uint _lastClipboardSequenceNumber;
         private DateTimeOffset? _currentClipboardTimestamp;
         private ClipboardFormat _lastClipboardFormats = ClipboardFormat.None;
         private bool _clipboardHistoryUnavailableLogged;
@@ -455,6 +456,7 @@ namespace AdvancedPaste.ViewModels
             {
                 ResetClipboardPreview();
                 _currentClipboardHistoryId = null;
+                _lastClipboardSequenceNumber = 0;
                 _currentClipboardTimestamp = null;
                 _lastClipboardFormats = ClipboardFormat.None;
                 return;
@@ -477,6 +479,13 @@ namespace AdvancedPaste.ViewModels
         {
             bool clipboardChanged = formatsChanged;
 
+            var currentSequenceNumber = NativeMethods.GetClipboardSequenceNumber();
+            if (_lastClipboardSequenceNumber != currentSequenceNumber)
+            {
+                clipboardChanged = true;
+                _lastClipboardSequenceNumber = currentSequenceNumber;
+            }
+
             if (Clipboard.IsHistoryEnabled())
             {
                 try
@@ -652,7 +661,7 @@ namespace AdvancedPaste.ViewModels
         [RelayCommand]
         public void OpenSettings()
         {
-            SettingsDeepLink.OpenSettings(SettingsDeepLink.SettingsWindow.AdvancedPaste, true);
+            SettingsDeepLink.OpenSettings(SettingsDeepLink.SettingsWindow.AdvancedPaste);
             GetMainWindow()?.Close();
         }
 

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
@@ -312,13 +317,39 @@ private:
         return false;
     }
 
-        void read_settings(PowerToysSettings::PowerToyValues& settings)
+    void read_settings(PowerToysSettings::PowerToyValues& settings)
     {
         const auto settingsObject = settings.get_raw_json();
 
         // Migrate Paste As Plain text shortcut
         Hotkey old_paste_as_plain_hotkey;
         bool old_data_migrated = migrate_data_and_remove_data_file(old_paste_as_plain_hotkey);
+
+        if (settingsObject.GetView().Size())
+        {
+            const auto propertiesObject = settingsObject.GetNamedObject(JSON_KEY_PROPERTIES);
+
+            m_is_advanced_ai_enabled = has_advanced_ai_provider(propertiesObject);
+
+            if (propertiesObject.HasKey(JSON_KEY_IS_AI_ENABLED))
+            {
+                m_is_ai_enabled = propertiesObject.GetNamedObject(JSON_KEY_IS_AI_ENABLED).GetNamedBoolean(JSON_KEY_VALUE, false);
+            }
+            else if (propertiesObject.HasKey(JSON_KEY_IS_OPEN_AI_ENABLED))
+            {
+                m_is_ai_enabled = propertiesObject.GetNamedObject(JSON_KEY_IS_OPEN_AI_ENABLED).GetNamedBoolean(JSON_KEY_VALUE, false);
+            }
+            else
+            {
+                m_is_ai_enabled = false;
+            }
+
+            if (propertiesObject.HasKey(JSON_KEY_SHOW_CUSTOM_PREVIEW))
+            {
+                m_preview_custom_format_output = propertiesObject.GetNamedObject(JSON_KEY_SHOW_CUSTOM_PREVIEW).GetNamedBoolean(JSON_KEY_VALUE);
+            }
+        }
+
         if (old_data_migrated)
         {
             m_paste_as_plain_hotkey = old_paste_as_plain_hotkey;
@@ -405,31 +436,6 @@ private:
                 }
             }
         }
-
-        if (settingsObject.GetView().Size())
-        {
-            const auto propertiesObject = settingsObject.GetNamedObject(JSON_KEY_PROPERTIES);
-
-            m_is_advanced_ai_enabled = has_advanced_ai_provider(propertiesObject);
-
-            if (propertiesObject.HasKey(JSON_KEY_IS_AI_ENABLED))
-            {
-                m_is_ai_enabled = propertiesObject.GetNamedObject(JSON_KEY_IS_AI_ENABLED).GetNamedBoolean(JSON_KEY_VALUE, false);
-            }
-            else if (propertiesObject.HasKey(JSON_KEY_IS_OPEN_AI_ENABLED))
-            {
-                m_is_ai_enabled = propertiesObject.GetNamedObject(JSON_KEY_IS_OPEN_AI_ENABLED).GetNamedBoolean(JSON_KEY_VALUE, false);
-            }
-            else
-            {
-                m_is_ai_enabled = false;
-            }
-
-            if (propertiesObject.HasKey(JSON_KEY_SHOW_CUSTOM_PREVIEW))
-            {
-                m_preview_custom_format_output = propertiesObject.GetNamedObject(JSON_KEY_SHOW_CUSTOM_PREVIEW).GetNamedBoolean(JSON_KEY_VALUE);
-            }
-        }
     }
 
     // Load the settings file.
@@ -778,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)
@@ -786,6 +803,9 @@ public:
         {
             m_process_manager.stop();
 
+            // Stop event listening
+            m_triggerEventWaiter.stop();
+
             if (traceEvent)
             {
                 Trace::AdvancedPaste_Enable(false);

src/modules/AdvancedPaste/UITest-AdvancedPaste/AdvancedPasteUITest.cs

@@ -3,6 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
+using System.Collections.Generic;
 using System.Diagnostics;
 using System.Drawing;
 using System.Globalization;
@@ -11,7 +12,6 @@ using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 using System.Threading;
 using System.Windows.Forms;
-
 using Microsoft.AdvancedPaste.UITests.Helper;
 using Microsoft.CodeCoverage.Core.Reports.Coverage;
 using Microsoft.PowerToys.UITest;
@@ -55,7 +55,7 @@ namespace Microsoft.AdvancedPaste.UITests
         }
 
         public AdvancedPasteUITest()
-            : base(PowerToysModule.PowerToysSettings, size: WindowSize.Small)
+            : base(PowerToysModule.PowerToysSettings, size: WindowSize.Large_Vertical)
         {
             Type currentTestType = typeof(AdvancedPasteUITest);
             string? dirName = Path.GetDirectoryName(currentTestType.Assembly.Location);
@@ -254,13 +254,250 @@ namespace Microsoft.AdvancedPaste.UITests
 
         /*
          * Clipboard History
-           - [] Open Settings and Enable clipboard history (if not enabled already). Open Advanced Paste window with hotkey, click Clipboard history and try deleting some entry. Check OS clipboard history (Win+V), and confirm that the same entry no longer exist.
-           - [] Open Advanced Paste window with hotkey, click Clipboard history, and click any entry (but first). Observe that entry is put on top of clipboard history. Check OS clipboard history (Win+V), and confirm that the same entry is on top of the clipboard.
-           - [] Open Settings and Disable clipboard history. Open Advanced Paste window with hotkey and observe that Clipboard history button is disabled.
+           - [x] Open Settings and Enable clipboard history (if not enabled already). Open Advanced Paste window with hotkey, click Clipboard history and try deleting some entry. Check OS clipboard history (Win+V), and confirm that the same entry no longer exist.
+           - [x] Open Advanced Paste window with hotkey, click Clipboard history, and click any entry (but first). Observe that entry is put on top of clipboard history. Check OS clipboard history (Win+V), and confirm that the same entry is on top of the clipboard.
+           - [x] Open Settings and Disable clipboard history. Open Advanced Paste window with hotkey and observe that Clipboard history button is disabled.
          * Disable Advanced Paste, try different Advanced Paste hotkeys and confirm that it's disabled and nothing happens.
          */
-        private void TestCaseClipboardHistory()
+        [TestMethod]
+        [TestCategory("AdvancedPasteUITest")]
+        [TestCategory("TestCaseClipboardHistoryDeleteTest")]
+        public void TestCaseClipboardHistoryDeleteTest()
         {
+            RestartScopeExe();
+            Thread.Sleep(1500);
+
+            // Find the PowerToys Settings window
+            var settingsWindow = Find<Window>("PowerToys Settings", global: true);
+            Assert.IsNotNull(settingsWindow, "Failed to open PowerToys Settings window");
+
+            if (FindAll<NavigationViewItem>("Advanced Paste").Count == 0)
+            {
+                // Expand Advanced list-group if needed
+                Find<NavigationViewItem>("System Tools").Click();
+            }
+
+            Find<NavigationViewItem>("Advanced Paste").Click();
+
+            Find<ToggleSwitch>("Clipboard history").Toggle(true);
+
+            Session.CloseMainWindow();
+
+            // clear system clipboard
+            ClearSystemClipboardHistory();
+
+            // set test content to clipboard
+            const string textForTesting = "Test text";
+            SetClipboardTextInSTAMode(textForTesting);
+
+            // Open Advanced Paste window with hotkey, click Clipboard history and try deleting some entry.
+            this.SendKeys(Key.Win, Key.Shift, Key.V);
+            Thread.Sleep(1500);
+
+            var apWind = this.Find<Window>("Advanced Paste", global: true);
+            apWind.Find<PowerToys.UITest.Button>("Clipboard history").Click();
+
+            var textGroup = apWind.Find<Group>(textForTesting);
+            Assert.IsNotNull(textGroup, "Cannot find the test string from advanced paste clipboard history.");
+
+            textGroup.Find<PowerToys.UITest.Button>("More options").Click();
+            apWind.Find<TextBlock>("Delete").Click();
+
+            // Check OS clipboard history (Win+V), and confirm that the same entry no longer exist.
+            this.SendKeys(Key.Win, Key.V);
+
+            Thread.Sleep(1500);
+
+            var clipboardWindow = this.Find<Window>("Windows Input Experience", global: true);
+            Assert.IsNotNull(clipboardWindow, "Cannot find system clipboard window.");
+
+            var nothingText = clipboardWindow.Find<Group>("Nothing here, You'll see your clipboard history here once you've copied something.");
+            Assert.IsNotNull(nothingText, "System clipboard is not empty, which should be yes.");
+        }
+
+        [TestMethod]
+        [TestCategory("AdvancedPasteUITest")]
+        [TestCategory("TestCaseClipboardHistorySelectTest")]
+        public void TestCaseClipboardHistorySelectTest()
+        {
+            RestartScopeExe();
+            Thread.Sleep(1500);
+
+            // Find the PowerToys Settings window
+            var settingsWindow = Find<Window>("PowerToys Settings", global: true);
+            Assert.IsNotNull(settingsWindow, "Failed to open PowerToys Settings window");
+
+            if (FindAll<NavigationViewItem>("Advanced Paste").Count == 0)
+            {
+                // Expand Advanced list-group if needed
+                Find<NavigationViewItem>("System Tools").Click();
+            }
+
+            Find<NavigationViewItem>("Advanced Paste").Click();
+
+            Find<ToggleSwitch>("Clipboard history").Toggle(true);
+
+            Session.CloseMainWindow();
+
+            // clear system clipboard
+            ClearSystemClipboardHistory();
+
+            // set test content to clipboard
+            string[] textForTesting = { "Test text1", "Test text2", "Test text3", "Test text4", "Test text5", "Test text6", };
+            foreach (var str in textForTesting)
+            {
+                SetClipboardTextInSTAMode(str);
+                Thread.Sleep(1000);
+            }
+
+            // Open Advanced Paste window with hotkey
+            this.SendKeys(Key.Win, Key.Shift, Key.V);
+            Thread.Sleep(1500);
+
+            var apWind = this.Find<Window>("Advanced Paste", global: true);
+            apWind.Find<PowerToys.UITest.Button>("Clipboard history").Click();
+
+            // click the 3rd item
+            var textGroup = apWind.Find<Group>(textForTesting[0]);
+            Assert.IsNotNull(textGroup, "Cannot find the test string from advanced paste clipboard history.");
+            textGroup.Click();
+
+            // Check OS clipboard history (Win+V)
+            this.SendKeys(Key.Win, Key.V);
+
+            Thread.Sleep(1500);
+
+            var clipboardWindow = this.Find<Window>("Windows Input Experience", global: true);
+            Assert.IsNotNull(clipboardWindow, "Cannot find system clipboard window.");
+
+            var txtFound = clipboardWindow.Find<Element>(textForTesting[0]);
+            Assert.IsNotNull(txtFound, "Cannot find textblock");
+        }
+
+        // [x] Open Settings and Disable clipboard history.Open Advanced Paste window with hotkey and observe that Clipboard history button is disabled.
+        [TestMethod]
+        [TestCategory("AdvancedPasteUITest")]
+        [TestCategory("TestCaseClipboardHistoryDisableTest")]
+        public void TestCaseClipboardHistoryDisableTest()
+        {
+            RestartScopeExe();
+            Thread.Sleep(1500);
+
+            // Find the PowerToys Settings window
+            var settingsWindow = Find<Window>("PowerToys Settings", global: true);
+            Assert.IsNotNull(settingsWindow, "Failed to open PowerToys Settings window");
+
+            if (FindAll<NavigationViewItem>("Advanced Paste").Count == 0)
+            {
+                // Expand Advanced list-group if needed
+                Find<NavigationViewItem>("System Tools").Click();
+            }
+
+            Find<NavigationViewItem>("Advanced Paste").Click();
+
+            Find<ToggleSwitch>("Clipboard history").Toggle(false);
+
+            Session.CloseMainWindow();
+
+            // set test content to clipboard
+            const string textForTesting = "Test text";
+            SetClipboardTextInSTAMode(textForTesting);
+
+            // Open Advanced Paste window with hotkey, click Clipboard history and try deleting some entry.
+            this.SendKeys(Key.Win, Key.Shift, Key.V);
+            Thread.Sleep(1500);
+
+            var apWind = this.Find<Window>("Advanced Paste", global: true);
+
+            // Click the button (which should still exist but be disabled)
+            apWind.Find<PowerToys.UITest.Button>("Clipboard history").Click();
+
+            // Verify that the clipboard content doesn't appear
+            // Use a short timeout to avoid a long wait when the element doesn't exist
+            Assert.IsFalse(
+                Has<Group>(textForTesting),
+                "Clipboard content should not appear when clipboard history is disabled");
+        }
+
+        // Disable Advanced Paste, try different Advanced Paste hotkeys and confirm that it's disabled and nothing happens.
+        [TestMethod]
+        [TestCategory("AdvancedPasteUITest")]
+        [TestCategory("TestCaseDisableAdvancedPaste")]
+        public void TestCaseDisableAdvancedPaste()
+        {
+            RestartScopeExe();
+            Thread.Sleep(1500);
+
+            // Find the PowerToys Settings window
+            var settingsWindow = Find<Window>("PowerToys Settings", global: true);
+            Assert.IsNotNull(settingsWindow, "Failed to open PowerToys Settings window");
+
+            if (FindAll<NavigationViewItem>("Advanced Paste").Count == 0)
+            {
+                // Expand System Tools if needed
+                Find<NavigationViewItem>("System Tools").Click();
+            }
+
+            Find<NavigationViewItem>("Advanced Paste").Click();
+
+            // Disable Advanced Paste module
+            var moduleToggle = Find<ToggleSwitch>("Enable Advanced Paste");
+            moduleToggle.Toggle(false);
+
+            Session.CloseMainWindow();
+
+            // Prepare some text to test with
+            const string textForTesting = "Test text for disabled module";
+            SetClipboardTextInSTAMode(textForTesting);
+
+            // Try main Advanced Paste hotkey
+            this.SendKeys(Key.Win, Key.Shift, Key.V);
+            Thread.Sleep(500);
+
+            // Verify Advanced Paste window does not appear
+            Assert.IsFalse(
+                Has<Window>("Advanced Paste", global: true),
+                "Advanced Paste window should not appear when the module is disabled");
+
+            // Re-enable Advanced Paste for other tests
+            RestartScopeExe();
+            Thread.Sleep(1500);
+
+            settingsWindow = Find<Window>("PowerToys Settings", global: true);
+
+            if (FindAll<NavigationViewItem>("Advanced Paste").Count == 0)
+            {
+                Find<NavigationViewItem>("System Tools").Click();
+            }
+
+            Find<NavigationViewItem>("Advanced Paste").Click();
+            Find<ToggleSwitch>("Enable Advanced Paste").Toggle(true);
+
+            Session.CloseMainWindow();
+        }
+
+        private void ClearSystemClipboardHistory()
+        {
+            this.SendKeys(Key.Win, Key.V);
+
+            Thread.Sleep(1500);
+
+            var clipboardWindow = this.Find<Window>("Windows Input Experience", global: true);
+            Assert.IsNotNull(clipboardWindow, "Cannot find system clipboard window.");
+
+            clipboardWindow.Find<PowerToys.UITest.Button>("Clear all except pinned items").Click();
+        }
+
+        private void SetClipboardTextInSTAMode(string text)
+        {
+            var thread = new Thread(() =>
+            {
+                System.Windows.Forms.Clipboard.SetText(text);
+            });
+
+            thread.SetApartmentState(ApartmentState.STA);
+            thread.Start();
+            thread.Join();
         }
 
         private void ContentCopyAndPasteDirectly(string fileName, bool isRTF = false)

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/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/Hosts/Settings/UserSettings.cs

@@ -62,7 +62,7 @@ namespace Hosts.Settings
 
         public UserSettings()
         {
-            _settingsUtils = new SettingsUtils();
+            _settingsUtils = SettingsUtils.Default;
             var defaultSettings = new HostsProperties();
             ShowStartupWarning = defaultSettings.ShowStartupWarning;
             LoopbackDuplicates = defaultSettings.LoopbackDuplicates;

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;
 
@@ -50,6 +52,7 @@ enum class ScheduleMode
     Off,
     FixedHours,
     SunsetToSunrise,
+    FollowNightLight,
     // add more later
 };
 
@@ -61,6 +64,8 @@ inline std::wstring ToString(ScheduleMode mode)
         return L"SunsetToSunrise";
     case ScheduleMode::FixedHours:
         return L"FixedHours";
+    case ScheduleMode::FollowNightLight:
+        return L"FollowNightLight";
     default:
         return L"Off";
     }
@@ -72,6 +77,8 @@ inline ScheduleMode FromString(const std::wstring& str)
         return ScheduleMode::SunsetToSunrise;
     if (str == L"FixedHours")
         return ScheduleMode::FixedHours;
+    if (str == L"FollowNightLight")
+        return ScheduleMode::FollowNightLight;
     return ScheduleMode::Off;
 }
 
@@ -98,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()
@@ -113,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();
     };
@@ -125,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;
     }
 
@@ -167,7 +183,9 @@ public:
             ToString(g_settings.m_scheduleMode),
             { { L"Off", L"Disable the schedule" },
               { L"FixedHours", L"Set hours manually" },
-              { L"SunsetToSunrise", L"Use sunrise/sunset times" } });
+              { L"SunsetToSunrise", L"Use sunrise/sunset times" },
+              { L"FollowNightLight", L"Follow Windows Night Light state" }
+            });
 
         // Integer spinners
         settings.add_int_spinner(
@@ -437,6 +455,8 @@ public:
         Logger::info(L"Light Switch process launched successfully (PID: {}).", pi.dwProcessId);
         m_process = pi.hProcess;
         CloseHandle(pi.hThread);
+
+        StartToggleListener();
     }
 
     // Disable the powertoy
@@ -462,6 +482,8 @@ public:
             CloseHandle(m_process);
             m_process = nullptr;
         }
+
+        StopToggleListener();
     }
 
     // Returns if the powertoys is enabled
@@ -523,31 +545,8 @@ public:
             }
             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;
@@ -560,8 +559,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())
@@ -639,4 +710,4 @@ void LightSwitchInterface::init_settings()
 extern "C" __declspec(dllexport) PowertoyModuleIface* __cdecl powertoy_create()
 {
     return new LightSwitchInterface();
-}
+}

src/modules/LightSwitch/LightSwitchService/LightSwitchService.cpp

@@ -13,10 +13,12 @@
 #include <utils/logger_helper.h>
 #include "LightSwitchStateManager.h"
 #include <LightSwitchUtils.h>
+#include <NightLightRegistryObserver.h>
 
 SERVICE_STATUS g_ServiceStatus = {};
 SERVICE_STATUS_HANDLE g_StatusHandle = nullptr;
 HANDLE g_ServiceStopEvent = nullptr;
+static LightSwitchStateManager* g_stateManagerPtr = nullptr;
 
 VOID WINAPI ServiceMain(DWORD argc, LPTSTR* argv);
 VOID WINAPI ServiceCtrlHandler(DWORD dwCtrl);
@@ -168,7 +170,15 @@ static void DetectAndHandleExternalThemeChange(LightSwitchStateManager& stateMan
     }
 
     // Use shared helper (handles wraparound logic)
-    bool shouldBeLight = ShouldBeLight(nowMinutes, effectiveLight, effectiveDark);
+    bool shouldBeLight = false;
+    if (s.scheduleMode == ScheduleMode::FollowNightLight)
+    {
+        shouldBeLight = !IsNightLightEnabled();
+    } 
+    else
+    {
+        shouldBeLight = ShouldBeLight(nowMinutes, effectiveLight, effectiveDark);
+    }
 
     // Compare current system/apps theme
     bool currentSystemLight = GetCurrentSystemTheme();
@@ -199,15 +209,40 @@ DWORD WINAPI ServiceWorkerThread(LPVOID lpParam)
     // Initialization
     // ────────────────────────────────────────────────────────────────
     static LightSwitchStateManager stateManager;
+    g_stateManagerPtr = &stateManager;
 
     LightSwitchSettings::instance().InitFileWatcher();
 
     HANDLE hManualOverride = OpenEventW(SYNCHRONIZE | EVENT_MODIFY_STATE, FALSE, L"POWERTOYS_LIGHTSWITCH_MANUAL_OVERRIDE");
     HANDLE hSettingsChanged = LightSwitchSettings::instance().GetSettingsChangedEvent();
 
+    static std::unique_ptr<NightLightRegistryObserver> g_nightLightWatcher;
+
     LightSwitchSettings::instance().LoadSettings();
     const auto& settings = LightSwitchSettings::instance().settings();
 
+    // after loading settings:
+    bool nightLightNeeded = (settings.scheduleMode == ScheduleMode::FollowNightLight);
+
+    if (nightLightNeeded && !g_nightLightWatcher)
+    {
+        Logger::info(L"[LightSwitchService] Starting Night Light registry watcher...");
+
+        g_nightLightWatcher = std::make_unique<NightLightRegistryObserver>(
+            HKEY_CURRENT_USER,
+            NIGHT_LIGHT_REGISTRY_PATH,
+            []() {
+                if (g_stateManagerPtr)
+                    g_stateManagerPtr->OnNightLightChange();
+            });
+    }
+    else if (!nightLightNeeded && g_nightLightWatcher)
+    {
+        Logger::info(L"[LightSwitchService] Stopping Night Light registry watcher...");
+        g_nightLightWatcher->Stop();
+        g_nightLightWatcher.reset();
+    }
+
     SYSTEMTIME st;
     GetLocalTime(&st);
     int nowMinutes = st.wHour * 60 + st.wMinute;
@@ -274,6 +309,31 @@ DWORD WINAPI ServiceWorkerThread(LPVOID lpParam)
             ResetEvent(hSettingsChanged);
             LightSwitchSettings::instance().LoadSettings();
             stateManager.OnSettingsChanged();
+
+            const auto& settings = LightSwitchSettings::instance().settings();
+            bool nightLightNeeded = (settings.scheduleMode == ScheduleMode::FollowNightLight);
+
+            if (nightLightNeeded && !g_nightLightWatcher)
+            {
+                Logger::info(L"[LightSwitchService] Starting Night Light registry watcher...");
+
+                g_nightLightWatcher = std::make_unique<NightLightRegistryObserver>(
+                    HKEY_CURRENT_USER,
+                    NIGHT_LIGHT_REGISTRY_PATH,
+                    []() {
+                        if (g_stateManagerPtr)
+                            g_stateManagerPtr->OnNightLightChange();
+                    });
+
+                stateManager.OnNightLightChange();
+            }
+            else if (!nightLightNeeded && g_nightLightWatcher)
+            {
+                Logger::info(L"[LightSwitchService] Stopping Night Light registry watcher...");
+                g_nightLightWatcher->Stop();
+                g_nightLightWatcher.reset();
+            }
+
             continue;
         }
     }
@@ -285,6 +345,11 @@ DWORD WINAPI ServiceWorkerThread(LPVOID lpParam)
         CloseHandle(hManualOverride);
     if (hParent)
         CloseHandle(hParent);
+    if (g_nightLightWatcher)
+    {
+        g_nightLightWatcher->Stop();
+        g_nightLightWatcher.reset();
+    }
 
     Logger::info(L"[LightSwitchService] Worker thread exiting cleanly.");
     return 0;

src/modules/LightSwitch/LightSwitchService/LightSwitchService.vcxproj

@@ -76,6 +76,7 @@
     <ClCompile Include="LightSwitchService.cpp" />
     <ClCompile Include="LightSwitchSettings.cpp" />
     <ClCompile Include="LightSwitchStateManager.cpp" />
+    <ClCompile Include="NightLightRegistryObserver.cpp" />
     <ClCompile Include="SettingsConstants.cpp" />
     <ClCompile Include="ThemeHelper.cpp" />
     <ClCompile Include="ThemeScheduler.cpp" />
@@ -88,6 +89,7 @@
     <ClInclude Include="LightSwitchSettings.h" />
     <ClInclude Include="LightSwitchStateManager.h" />
     <ClInclude Include="LightSwitchUtils.h" />
+    <ClInclude Include="NightLightRegistryObserver.h" />
     <ClInclude Include="SettingsConstants.h" />
     <ClInclude Include="SettingsObserver.h" />
     <ClInclude Include="ThemeHelper.h" />

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

@@ -36,6 +36,9 @@
     <ClCompile Include="LightSwitchStateManager.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="NightLightRegistryObserver.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="ThemeScheduler.h">
@@ -62,6 +65,9 @@
     <ClInclude Include="LightSwitchUtils.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="NightLightRegistryObserver.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Natvis Include="$(MSBuildThisFileDirectory)..\..\natvis\wil.natvis" />

src/modules/LightSwitch/LightSwitchService/LightSwitchSettings.h

@@ -19,7 +19,8 @@ enum class ScheduleMode
 {
     Off,
     FixedHours,
-    SunsetToSunrise
+    SunsetToSunrise,
+    FollowNightLight,
     // Add more in the future
 };
 
@@ -31,6 +32,8 @@ inline std::wstring ToString(ScheduleMode mode)
         return L"FixedHours";
     case ScheduleMode::SunsetToSunrise:
         return L"SunsetToSunrise";
+    case ScheduleMode::FollowNightLight:
+        return L"FollowNightLight";
     default:
         return L"Off";
     }
@@ -42,6 +45,8 @@ inline ScheduleMode FromString(const std::wstring& str)
         return ScheduleMode::SunsetToSunrise;
     if (str == L"FixedHours")
         return ScheduleMode::FixedHours;
+    if (str == L"FollowNightLight")
+        return ScheduleMode::FollowNightLight;
     else
         return ScheduleMode::Off;
 }

src/modules/LightSwitch/LightSwitchService/LightSwitchStateManager.cpp

@@ -31,7 +31,10 @@ void LightSwitchStateManager::OnSettingsChanged()
 void LightSwitchStateManager::OnTick(int currentMinutes)
 {
     std::lock_guard<std::mutex> lock(_stateMutex);
-    EvaluateAndApplyIfNeeded();
+    if (_state.lastAppliedMode != ScheduleMode::FollowNightLight)
+    {
+        EvaluateAndApplyIfNeeded();
+    }
 }
 
 // Called when manual override is triggered
@@ -49,8 +52,38 @@ void LightSwitchStateManager::OnManualOverride()
         _state.isAppsLightActive = GetCurrentAppsTheme();
 
         Logger::debug(L"[LightSwitchStateManager] Synced internal theme state to current system theme ({}) and apps theme ({}).",
-                     (_state.isSystemLightActive ? L"light" : L"dark"),
-                     (_state.isAppsLightActive ? L"light" : L"dark"));
+                      (_state.isSystemLightActive ? L"light" : L"dark"),
+                      (_state.isAppsLightActive ? L"light" : L"dark"));
+    }
+
+    EvaluateAndApplyIfNeeded();
+}
+
+// Runs with the registry observer detects a change in Night Light settings.
+void LightSwitchStateManager::OnNightLightChange()
+{
+    std::lock_guard<std::mutex> lock(_stateMutex);
+
+    bool newNightLightState = IsNightLightEnabled();
+
+    // In Follow Night Light mode, treat a Night Light toggle as a boundary
+    if (_state.lastAppliedMode == ScheduleMode::FollowNightLight && _state.isManualOverride)
+    {
+        Logger::info(L"[LightSwitchStateManager] Night Light changed while manual override active; "
+                     L"treating as a boundary and clearing manual override.");
+        _state.isManualOverride = false;
+    }
+
+    if (newNightLightState != _state.isNightLightActive)
+    {
+        Logger::info(L"[LightSwitchStateManager] Night Light toggled to {}",
+                     newNightLightState ? L"ON" : L"OFF");
+
+        _state.isNightLightActive = newNightLightState;
+    }
+    else
+    {
+        Logger::debug(L"[LightSwitchStateManager] Night Light change event fired, but no actual change.");
     }
 
     EvaluateAndApplyIfNeeded();
@@ -77,9 +110,9 @@ void LightSwitchStateManager::SyncInitialThemeState()
     _state.isSystemLightActive = GetCurrentSystemTheme();
     _state.isAppsLightActive = GetCurrentAppsTheme();
     Logger::debug(L"[LightSwitchStateManager] Synced initial state to current system theme ({})",
-                 _state.isSystemLightActive ? L"light" : L"dark");
+                  _state.isSystemLightActive ? L"light" : L"dark");
     Logger::debug(L"[LightSwitchStateManager] Synced initial state to current apps theme ({})",
-                 _state.isAppsLightActive ? L"light" : L"dark");
+                  _state.isAppsLightActive ? L"light" : L"dark");
 }
 
 static std::pair<int, int> update_sun_times(auto& settings)
@@ -194,7 +227,15 @@ void LightSwitchStateManager::EvaluateAndApplyIfNeeded()
 
     _state.lastAppliedMode = _currentSettings.scheduleMode;
 
-    bool shouldBeLight = ShouldBeLight(now, _state.effectiveLightMinutes, _state.effectiveDarkMinutes);
+    bool shouldBeLight = false;
+    if (_currentSettings.scheduleMode == ScheduleMode::FollowNightLight)
+    {
+        shouldBeLight = !_state.isNightLightActive;
+    }
+    else
+    {
+        shouldBeLight = ShouldBeLight(now, _state.effectiveLightMinutes, _state.effectiveDarkMinutes);
+    }
 
     bool appsNeedsToChange = _currentSettings.changeApps && (_state.isAppsLightActive != shouldBeLight);
     bool systemNeedsToChange = _currentSettings.changeSystem && (_state.isSystemLightActive != shouldBeLight);
@@ -227,6 +268,3 @@ void LightSwitchStateManager::EvaluateAndApplyIfNeeded()
 
     _state.lastTickMinutes = now;
 }
-
-
-

src/modules/LightSwitch/LightSwitchService/LightSwitchStateManager.h

@@ -9,6 +9,7 @@ struct LightSwitchState
     bool isManualOverride = false;
     bool isSystemLightActive = false;
     bool isAppsLightActive = false;
+    bool isNightLightActive = false;
     int lastEvaluatedDay = -1;
     int lastTickMinutes = -1;
 
@@ -32,6 +33,9 @@ public:
     // Called when manual override is toggled (via shortcut or system change).
     void OnManualOverride();
 
+    // Called when night light changes in windows settings
+    void OnNightLightChange();
+
     // Initial sync at startup to align internal state with system theme
     void SyncInitialThemeState();
 

src/modules/LightSwitch/LightSwitchService/NightLightRegistryObserver.cpp

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

src/modules/LightSwitch/LightSwitchService/NightLightRegistryObserver.h

@@ -0,0 +1,134 @@
+#pragma once
+#include <wtypes.h>
+#include <string>
+#include <functional>
+#include <thread>
+#include <atomic>
+#include <mutex>
+
+class NightLightRegistryObserver
+{
+public:
+    NightLightRegistryObserver(HKEY root, const std::wstring& subkey, std::function<void()> callback) :
+        _root(root), _subkey(subkey), _callback(std::move(callback)), _stop(false)
+    {
+        _thread = std::thread([this]() { this->Run(); });
+    }
+
+    ~NightLightRegistryObserver()
+    {
+        Stop();
+    }
+
+    void Stop()
+    {
+        _stop = true;
+
+        {
+            std::lock_guard<std::mutex> lock(_mutex);
+            if (_event)
+                SetEvent(_event);
+        }
+
+        if (_thread.joinable())
+            _thread.join();
+
+        std::lock_guard<std::mutex> lock(_mutex);
+        if (_hKey)
+        {
+            RegCloseKey(_hKey);
+            _hKey = nullptr;
+        }
+
+        if (_event)
+        {
+            CloseHandle(_event);
+            _event = nullptr;
+        }
+    }
+
+
+private:
+    void Run()
+    {
+        {
+            std::lock_guard<std::mutex> lock(_mutex);
+            if (RegOpenKeyExW(_root, _subkey.c_str(), 0, KEY_NOTIFY, &_hKey) != ERROR_SUCCESS)
+                return;
+
+            _event = CreateEventW(nullptr, TRUE, FALSE, nullptr);
+            if (!_event)
+            {
+                RegCloseKey(_hKey);
+                _hKey = nullptr;
+                return;
+            }
+        }
+
+        while (!_stop)
+        {
+            HKEY hKeyLocal = nullptr;
+            HANDLE eventLocal = nullptr;
+
+            {
+                std::lock_guard<std::mutex> lock(_mutex);
+                if (_stop)
+                    break;
+
+                hKeyLocal = _hKey;
+                eventLocal = _event;
+            }
+
+            if (!hKeyLocal || !eventLocal)
+                break;
+
+            if (_stop)
+                break;
+
+            if (RegNotifyChangeKeyValue(hKeyLocal, FALSE, REG_NOTIFY_CHANGE_LAST_SET, eventLocal, TRUE) != ERROR_SUCCESS)
+                break;
+
+            DWORD wait = WaitForSingleObject(eventLocal, INFINITE);
+            if (_stop || wait == WAIT_FAILED)
+                break;
+
+            ResetEvent(eventLocal);
+
+            if (!_stop && _callback)
+            {
+                try
+                {
+                    _callback();
+                }
+                catch (...)
+                {
+                }
+            }
+        }
+
+        {
+            std::lock_guard<std::mutex> lock(_mutex);
+            if (_hKey)
+            {
+                RegCloseKey(_hKey);
+                _hKey = nullptr;
+            }
+
+            if (_event)
+            {
+                CloseHandle(_event);
+                _event = nullptr;
+            }
+        }
+    }
+
+
+    HKEY _root;
+    std::wstring _subkey;
+    std::function<void()> _callback;
+    HANDLE _event = nullptr;
+    HKEY _hKey = nullptr;
+    std::thread _thread;
+    std::atomic<bool> _stop;
+    std::mutex _mutex;
+};

src/modules/LightSwitch/LightSwitchService/SettingsConstants.h

@@ -11,4 +11,7 @@ enum class SettingId
     Sunset_Offset,
     ChangeSystem,
     ChangeApps
-};
+};
+
+constexpr wchar_t PERSONALIZATION_REGISTRY_PATH[] = L"Software\\Microsoft\\Windows\\CurrentVersion\\Themes\\Personalize";
+constexpr wchar_t NIGHT_LIGHT_REGISTRY_PATH[] = L"Software\\Microsoft\\Windows\\CurrentVersion\\CloudStore\\Store\\DefaultAccount\\Current\\default$windows.data.bluelightreduction.bluelightreductionstate\\windows.data.bluelightreduction.bluelightreductionstate";

src/modules/LightSwitch/LightSwitchService/ThemeHelper.cpp

@@ -3,6 +3,7 @@
 #include <logger/logger.h>
 #include <utils/logger_helper.h>
 #include "ThemeHelper.h"
+#include <SettingsConstants.h>
 
 // Controls changing the themes.
 
@@ -10,7 +11,7 @@ static void ResetColorPrevalence()
 {
     HKEY hKey;
     if (RegOpenKeyEx(HKEY_CURRENT_USER,
-                     L"Software\\Microsoft\\Windows\\CurrentVersion\\Themes\\Personalize",
+                     PERSONALIZATION_REGISTRY_PATH,
                      0,
                      KEY_SET_VALUE,
                      &hKey) == ERROR_SUCCESS)
@@ -31,7 +32,7 @@ void SetAppsTheme(bool mode)
 {
     HKEY hKey;
     if (RegOpenKeyEx(HKEY_CURRENT_USER,
-                     L"Software\\Microsoft\\Windows\\CurrentVersion\\Themes\\Personalize",
+                     PERSONALIZATION_REGISTRY_PATH,
                      0,
                      KEY_SET_VALUE,
                      &hKey) == ERROR_SUCCESS)
@@ -50,7 +51,7 @@ void SetSystemTheme(bool mode)
 {
     HKEY hKey;
     if (RegOpenKeyEx(HKEY_CURRENT_USER,
-                     L"Software\\Microsoft\\Windows\\CurrentVersion\\Themes\\Personalize",
+                     PERSONALIZATION_REGISTRY_PATH,
                      0,
                      KEY_SET_VALUE,
                      &hKey) == ERROR_SUCCESS)
@@ -79,7 +80,7 @@ bool GetCurrentSystemTheme()
     DWORD size = sizeof(value);
 
     if (RegOpenKeyEx(HKEY_CURRENT_USER,
-                     L"Software\\Microsoft\\Windows\\CurrentVersion\\Themes\\Personalize",
+                     PERSONALIZATION_REGISTRY_PATH,
                      0,
                      KEY_READ,
                      &hKey) == ERROR_SUCCESS)
@@ -98,7 +99,7 @@ bool GetCurrentAppsTheme()
     DWORD size = sizeof(value);
 
     if (RegOpenKeyEx(HKEY_CURRENT_USER,
-                     L"Software\\Microsoft\\Windows\\CurrentVersion\\Themes\\Personalize",
+                     PERSONALIZATION_REGISTRY_PATH,
                      0,
                      KEY_READ,
                      &hKey) == ERROR_SUCCESS)
@@ -109,3 +110,30 @@ bool GetCurrentAppsTheme()
 
     return value == 1; // true = light, false = dark
 }
+
+bool IsNightLightEnabled()
+{
+    HKEY hKey;
+    const wchar_t* path = NIGHT_LIGHT_REGISTRY_PATH;
+
+    if (RegOpenKeyExW(HKEY_CURRENT_USER, path, 0, KEY_READ, &hKey) != ERROR_SUCCESS)
+        return false;
+
+    // RegGetValueW will set size to the size of the data and we expect that to be at least 25 bytes (we need to access bytes 23 and 24)
+    DWORD size = 0;
+    if (RegGetValueW(hKey, nullptr, L"Data", RRF_RT_REG_BINARY, nullptr, nullptr, &size) != ERROR_SUCCESS || size < 25)
+    {
+        RegCloseKey(hKey);
+        return false;
+    }
+
+    std::vector<BYTE> data(size);
+    if (RegGetValueW(hKey, nullptr, L"Data", RRF_RT_REG_BINARY, nullptr, data.data(), &size) != ERROR_SUCCESS)
+    {
+        RegCloseKey(hKey);
+        return false;
+    }
+
+    RegCloseKey(hKey);
+    return data[23] == 0x10 && data[24] == 0x00;
+}

src/modules/LightSwitch/LightSwitchService/ThemeHelper.h

@@ -3,3 +3,4 @@ void SetSystemTheme(bool dark);
 void SetAppsTheme(bool dark);
 bool GetCurrentSystemTheme();
 bool GetCurrentAppsTheme();
+bool IsNightLightEnabled();

src/modules/MeasureTool/MeasureToolCore/PowerToys.MeasureToolCore.vcxproj

@@ -1,14 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\..\..\packages\Microsoft.WindowsAppSDK.1.8.250907003\build\native\Microsoft.WindowsAppSDK.props" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.1.8.250907003\build\native\Microsoft.WindowsAppSDK.props')" />
-  <Import Project="..\..\..\..\packages\Microsoft.WindowsAppSDK.Base.1.8.250831001\build\native\Microsoft.WindowsAppSDK.Base.props" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.Base.1.8.250831001\build\native\Microsoft.WindowsAppSDK.Base.props')" />
-  <Import Project="..\..\..\..\packages\Microsoft.WindowsAppSDK.Foundation.1.8.250906002\build\native\Microsoft.WindowsAppSDK.Foundation.props" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.Foundation.1.8.250906002\build\native\Microsoft.WindowsAppSDK.Foundation.props')" />
-  <Import Project="..\..\..\..\packages\Microsoft.WindowsAppSDK.WinUI.1.8.250906003\build\native\Microsoft.WindowsAppSDK.WinUI.props" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.WinUI.1.8.250906003\build\native\Microsoft.WindowsAppSDK.WinUI.props')" />
-  <Import Project="..\..\..\..\packages\Microsoft.WindowsAppSDK.Runtime.1.8.250907003\build\native\Microsoft.WindowsAppSDK.Runtime.props" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.Runtime.1.8.250907003\build\native\Microsoft.WindowsAppSDK.Runtime.props')" />
-  <Import Project="..\..\..\..\packages\Microsoft.WindowsAppSDK.DWrite.1.8.25090401\build\Microsoft.WindowsAppSDK.DWrite.props" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.DWrite.1.8.25090401\build\Microsoft.WindowsAppSDK.DWrite.props')" />
-  <Import Project="..\..\..\..\packages\Microsoft.WindowsAppSDK.InteractiveExperiences.1.8.250906004\build\native\Microsoft.WindowsAppSDK.InteractiveExperiences.props" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.InteractiveExperiences.1.8.250906004\build\native\Microsoft.WindowsAppSDK.InteractiveExperiences.props')" />
-  <Import Project="..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.26100.4188\build\Microsoft.Windows.SDK.BuildTools.props" Condition="Exists('..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.26100.4188\build\Microsoft.Windows.SDK.BuildTools.props')" />
-  <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="NuGet">
+    <!-- Tell NuGet this is PackageReference style -->
+    <RestoreProjectStyle>PackageReference</RestoreProjectStyle>
+
+    <!-- Tell NuGet we're a native project -->
+    <NuGetTargetMoniker>native,Version=v0.0</NuGetTargetMoniker>
+
+    <!-- Tell NuGet we target Windows (use your existing WindowsTargetPlatformVersion) -->
+    <NuGetTargetPlatformIdentifier>Windows</NuGetTargetPlatformIdentifier>
+    <NuGetTargetPlatformVersion>$(WindowsTargetPlatformVersion)</NuGetTargetPlatformVersion>
+  </PropertyGroup>
   <PropertyGroup Label="Globals">
     <CppWinRTOptimized>true</CppWinRTOptimized>
     <CppWinRTRootNamespaceAutoMerge>true</CppWinRTRootNamespaceAutoMerge>
@@ -31,6 +33,11 @@
     <WindowsAppSDKSelfContained>true</WindowsAppSDKSelfContained>
     <EnablePreviewMsixTooling>true</EnablePreviewMsixTooling>
   </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.WindowsAppSDK" GeneratePathProperty="true" />
+    <PackageReference Include="Microsoft.Windows.CppWinRT" GeneratePathProperty="true" />
+    <PackageReference Include="Microsoft.Windows.ImplementationLibrary" GeneratePathProperty="true" />
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
@@ -38,7 +45,6 @@
     <DesktopCompatible>true</DesktopCompatible>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <Import Project="..\..\..\..\deps\spdlog.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Label="PropertySheets">
@@ -118,9 +124,6 @@
       <WarnAsError>true</WarnAsError>
     </Midl>
   </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\common\Display\Display.vcxproj">
       <Project>{caba8dfb-823b-4bf2-93ac-3f31984150d9}</Project>
@@ -142,42 +145,5 @@
     <ResourceCompile Include="PowerToys.MeasureToolCore.rc" />
   </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')" />
-    <Import Project="..\..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets" Condition="Exists('..\..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" />
-    <Import Project="..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.26100.4188\build\Microsoft.Windows.SDK.BuildTools.targets" Condition="Exists('..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.26100.4188\build\Microsoft.Windows.SDK.BuildTools.targets')" />
-    <Import Project="..\..\..\..\packages\Microsoft.Web.WebView2.1.0.2903.40\build\native\Microsoft.Web.WebView2.targets" Condition="Exists('..\..\..\..\packages\Microsoft.Web.WebView2.1.0.2903.40\build\native\Microsoft.Web.WebView2.targets')" />
-    <Import Project="..\..\..\..\packages\Microsoft.WindowsAppSDK.1.8.250907003\build\native\Microsoft.WindowsAppSDK.targets" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.1.8.250907003\build\native\Microsoft.WindowsAppSDK.targets')" />
-    <Import Project="..\..\..\..\packages\Microsoft.WindowsAppSDK.Base.1.8.250831001\build\native\Microsoft.WindowsAppSDK.Base.targets" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.Base.1.8.250831001\build\native\Microsoft.WindowsAppSDK.Base.targets')" />
-    <Import Project="..\..\..\..\packages\Microsoft.WindowsAppSDK.Foundation.1.8.250906002\build\native\Microsoft.WindowsAppSDK.Foundation.targets" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.Foundation.1.8.250906002\build\native\Microsoft.WindowsAppSDK.Foundation.targets')" />
-    <Import Project="..\..\..\..\packages\Microsoft.WindowsAppSDK.WinUI.1.8.250906003\build\native\Microsoft.WindowsAppSDK.WinUI.targets" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.WinUI.1.8.250906003\build\native\Microsoft.WindowsAppSDK.WinUI.targets')" />
-    <Import Project="..\..\..\..\packages\Microsoft.WindowsAppSDK.Runtime.1.8.250907003\build\native\Microsoft.WindowsAppSDK.Runtime.targets" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.Runtime.1.8.250907003\build\native\Microsoft.WindowsAppSDK.Runtime.targets')" />
-    <Import Project="..\..\..\..\packages\Microsoft.WindowsAppSDK.DWrite.1.8.25090401\build\Microsoft.WindowsAppSDK.DWrite.targets" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.DWrite.1.8.25090401\build\Microsoft.WindowsAppSDK.DWrite.targets')" />
-    <Import Project="..\..\..\..\packages\Microsoft.WindowsAppSDK.InteractiveExperiences.1.8.250906004\build\native\Microsoft.WindowsAppSDK.InteractiveExperiences.targets" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.InteractiveExperiences.1.8.250906004\build\native\Microsoft.WindowsAppSDK.InteractiveExperiences.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'))" />
-    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.26100.4188\build\Microsoft.Windows.SDK.BuildTools.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.26100.4188\build\Microsoft.Windows.SDK.BuildTools.props'))" />
-    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.26100.4188\build\Microsoft.Windows.SDK.BuildTools.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.26100.4188\build\Microsoft.Windows.SDK.BuildTools.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.Web.WebView2.1.0.2903.40\build\native\Microsoft.Web.WebView2.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.Web.WebView2.1.0.2903.40\build\native\Microsoft.Web.WebView2.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.1.8.250907003\build\native\Microsoft.WindowsAppSDK.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.WindowsAppSDK.1.8.250907003\build\native\Microsoft.WindowsAppSDK.props'))" />
-    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.1.8.250907003\build\native\Microsoft.WindowsAppSDK.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.WindowsAppSDK.1.8.250907003\build\native\Microsoft.WindowsAppSDK.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.Base.1.8.250831001\build\native\Microsoft.WindowsAppSDK.Base.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.WindowsAppSDK.Base.1.8.250831001\build\native\Microsoft.WindowsAppSDK.Base.props'))" />
-    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.Base.1.8.250831001\build\native\Microsoft.WindowsAppSDK.Base.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.WindowsAppSDK.Base.1.8.250831001\build\native\Microsoft.WindowsAppSDK.Base.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.Foundation.1.8.250906002\build\native\Microsoft.WindowsAppSDK.Foundation.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.WindowsAppSDK.Foundation.1.8.250906002\build\native\Microsoft.WindowsAppSDK.Foundation.props'))" />
-    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.Foundation.1.8.250906002\build\native\Microsoft.WindowsAppSDK.Foundation.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.WindowsAppSDK.Foundation.1.8.250906002\build\native\Microsoft.WindowsAppSDK.Foundation.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.WinUI.1.8.250906003\build\native\Microsoft.WindowsAppSDK.WinUI.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.WindowsAppSDK.WinUI.1.8.250906003\build\native\Microsoft.WindowsAppSDK.WinUI.props'))" />
-    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.WinUI.1.8.250906003\build\native\Microsoft.WindowsAppSDK.WinUI.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.WindowsAppSDK.WinUI.1.8.250906003\build\native\Microsoft.WindowsAppSDK.WinUI.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.Runtime.1.8.250907003\build\native\Microsoft.WindowsAppSDK.Runtime.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.WindowsAppSDK.Runtime.1.8.250907003\build\native\Microsoft.WindowsAppSDK.Runtime.props'))" />
-    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.Runtime.1.8.250907003\build\native\Microsoft.WindowsAppSDK.Runtime.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.WindowsAppSDK.Runtime.1.8.250907003\build\native\Microsoft.WindowsAppSDK.Runtime.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.DWrite.1.8.25090401\build\Microsoft.WindowsAppSDK.DWrite.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.WindowsAppSDK.DWrite.1.8.25090401\build\Microsoft.WindowsAppSDK.DWrite.props'))" />
-    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.DWrite.1.8.25090401\build\Microsoft.WindowsAppSDK.DWrite.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.WindowsAppSDK.DWrite.1.8.25090401\build\Microsoft.WindowsAppSDK.DWrite.targets'))" />    
-    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.InteractiveExperiences.1.8.250906004\build\native\Microsoft.WindowsAppSDK.InteractiveExperiences.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.WindowsAppSDK.InteractiveExperiences.1.8.250906004\build\native\Microsoft.WindowsAppSDK.InteractiveExperiences.props'))" />
-    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.InteractiveExperiences.1.8.250906004\build\native\Microsoft.WindowsAppSDK.InteractiveExperiences.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.WindowsAppSDK.InteractiveExperiences.1.8.250906004\build\native\Microsoft.WindowsAppSDK.InteractiveExperiences.targets'))" />
-  </Target>
+  <Import Project="..\..\..\..\deps\spdlog.props" />
 </Project>

src/modules/MeasureTool/MeasureToolCore/packages.config

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="Microsoft.Web.WebView2" version="1.0.2903.40" targetFramework="native" />
-  <package id="Microsoft.Windows.CppWinRT" version="2.0.240111.5" targetFramework="native" />
-  <package id="Microsoft.Windows.ImplementationLibrary" version="1.0.231216.1" targetFramework="native" />
-  <package id="Microsoft.Windows.SDK.BuildTools" version="10.0.26100.4188" targetFramework="native" />
-  <package id="Microsoft.WindowsAppSDK" version="1.8.250907003" targetFramework="native" />
-  <package id="Microsoft.WindowsAppSDK.Base" version="1.8.250831001" targetFramework="native" />
-  <package id="Microsoft.WindowsAppSDK.Foundation" version="1.8.250906002" targetFramework="native" />
-  <package id="Microsoft.WindowsAppSDK.WinUI" version="1.8.250906003" targetFramework="native" />
-  <package id="Microsoft.WindowsAppSDK.Runtime" version="1.8.250907003" targetFramework="native" />
-  <package id="Microsoft.WindowsAppSDK.DWrite" version="1.8.25090401" targetFramework="native" />
-  <package id="Microsoft.WindowsAppSDK.InteractiveExperiences" version="1.8.250906004" targetFramework="native" />
-  <package id="Microsoft.WindowsAppSDK.Widgets" version="1.8.250904007" targetFramework="native" />
-  <package id="Microsoft.WindowsAppSDK.AI" version="1.8.37" targetFramework="native" />
-  <package id="Microsoft.Windows.SDK.BuildTools.MSIX" version="1.7.20250829.1" targetFramework="native" />
-</packages>

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/MeasureTool/MeasureToolUI/MeasureToolUI.csproj

@@ -73,6 +73,13 @@
     <ProjectReference Include="..\..\..\common\interop\PowerToys.Interop.vcxproj" />
     <ProjectReference Include="..\..\..\common\ManagedCommon\ManagedCommon.csproj" />
     <ProjectReference Include="..\..\..\settings-ui\Settings.UI.Library\Settings.UI.Library.csproj" />
-    <ProjectReference Include="..\MeasureToolCore\PowerToys.MeasureToolCore.vcxproj" />
+    <ProjectReference Include="..\MeasureToolCore\PowerToys.MeasureToolCore.vcxproj">
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+      <BuildProject>true</BuildProject>
+    </ProjectReference>
+    <CsWinRTInputs Include="$(OutputPath)\PowerToys.MeasureToolCore.winmd" />
+    <None Include="$(OutputPath)\PowerToys.MeasureToolCore.dll">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
   </ItemGroup>
 </Project>

src/modules/MeasureTool/MeasureToolUI/Settings.cs

@@ -11,7 +11,7 @@ namespace MeasureToolUI
 {
     public sealed class Settings
     {
-        private static readonly SettingsUtils ModuleSettings = new();
+        private static readonly SettingsUtils ModuleSettings = SettingsUtils.Default;
 
         public MeasureToolMeasureStyle DefaultMeasureStyle
         {

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()
     {

src/modules/MouseUtils/FindMyMouse/FindMyMouse.vcxproj

@@ -1,13 +1,16 @@
 <?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.WindowsAppSDK.1.8.250907003\build\native\Microsoft.WindowsAppSDK.props" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.1.8.250907003\build\native\Microsoft.WindowsAppSDK.props')" />
-  <Import Project="..\..\..\..\packages\Microsoft.WindowsAppSDK.Base.1.8.250831001\build\native\Microsoft.WindowsAppSDK.Base.props" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.Base.1.8.250831001\build\native\Microsoft.WindowsAppSDK.Base.props')" />
-  <Import Project="..\..\..\..\packages\Microsoft.WindowsAppSDK.Foundation.1.8.250906002\build\native\Microsoft.WindowsAppSDK.Foundation.props" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.Foundation.1.8.250906002\build\native\Microsoft.WindowsAppSDK.Foundation.props')" />
-  <Import Project="..\..\..\..\packages\Microsoft.WindowsAppSDK.WinUI.1.8.250906003\build\native\Microsoft.WindowsAppSDK.WinUI.props" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.WinUI.1.8.250906003\build\native\Microsoft.WindowsAppSDK.WinUI.props')" />
-  <Import Project="..\..\..\..\packages\Microsoft.WindowsAppSDK.Runtime.1.8.250907003\build\native\Microsoft.WindowsAppSDK.Runtime.props" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.Runtime.1.8.250907003\build\native\Microsoft.WindowsAppSDK.Runtime.props')" />
-  <Import Project="..\..\..\..\packages\Microsoft.WindowsAppSDK.DWrite.1.8.25090401\build\Microsoft.WindowsAppSDK.DWrite.props" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.DWrite.1.8.25090401\build\Microsoft.WindowsAppSDK.DWrite.props')" />
-  <Import Project="..\..\..\..\packages\Microsoft.WindowsAppSDK.InteractiveExperiences.1.8.250906004\build\native\Microsoft.WindowsAppSDK.InteractiveExperiences.props" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.InteractiveExperiences.1.8.250906004\build\native\Microsoft.WindowsAppSDK.InteractiveExperiences.props')" />
-  <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="NuGet">
+    <!-- Tell NuGet this is PackageReference style -->
+    <RestoreProjectStyle>PackageReference</RestoreProjectStyle>
+
+    <!-- Tell NuGet we're a native project -->
+    <NuGetTargetMoniker>native,Version=v0.0</NuGetTargetMoniker>
+
+    <!-- Tell NuGet we target Windows (use your existing WindowsTargetPlatformVersion) -->
+    <NuGetTargetPlatformIdentifier>Windows</NuGetTargetPlatformIdentifier>
+    <NuGetTargetPlatformVersion>$(WindowsTargetPlatformVersion)</NuGetTargetPlatformVersion>
+  </PropertyGroup>
   <PropertyGroup Label="Globals">
     <VCProjectVersion>15.0</VCProjectVersion>
     <ProjectGuid>{e94fd11c-0591-456f-899f-efc0ca548336}</ProjectGuid>
@@ -20,9 +23,12 @@
     <WindowsAppSdkBootstrapInitialize>false</WindowsAppSdkBootstrapInitialize>
     <WindowsAppSDKSelfContained>true</WindowsAppSDKSelfContained>
     <WindowsAppSDKVerifyTransitiveDependencies>false</WindowsAppSDKVerifyTransitiveDependencies>
-    <!-- Force NuGet to treat this project strictly as packages.config style -->
-    <RestoreProjectStyle>packages.config</RestoreProjectStyle>
   </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.WindowsAppSDK" GeneratePathProperty="true"/>
+    <PackageReference Include="Microsoft.WindowsAppSDK.Foundation" GeneratePathProperty="true"/>
+    <PackageReference Include="Microsoft.Windows.CppWinRT" GeneratePathProperty="true"/>
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
@@ -127,18 +133,18 @@
   <ItemGroup>
     <ResourceCompile Include="FindMyMouse.rc" />
   </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
   <!-- Deduplicate WindowsAppRuntimeAutoInitializer.cpp (added twice via transitive imports causing LNK4042). Remove all then add exactly once. -->
-  <ItemGroup Condition="'$(PkgMicrosoft_WindowsAppSDK)'!=''">
-    <!-- Remove any transitive inclusion first -->
-    <ClCompile Remove="$(PkgMicrosoft_WindowsAppSDK)\include\WindowsAppRuntimeAutoInitializer.cpp" />
-    <!-- Re-add once, but disable PCH because the SDK file doesn't include our pch.h -->
-    <ClCompile Include="$(PkgMicrosoft_WindowsAppSDK)\include\WindowsAppRuntimeAutoInitializer.cpp">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-  </ItemGroup>
+  <Target Name="FixWinAppSDKAutoInitializer" BeforeTargets="ClCompile" AfterTargets="WindowsAppRuntimeAutoInitializer">
+    <ItemGroup>
+      <!-- Remove ALL injected versions of the file -->
+      <ClCompile Remove="@(ClCompile)" Condition="'%(Filename)' == 'WindowsAppRuntimeAutoInitializer'" />
+
+      <!-- Add ONE copy back manually -->
+      <ClCompile Include="$(PkgMicrosoft_WindowsAppSDK_Foundation)\include\WindowsAppRuntimeAutoInitializer.cpp">
+        <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      </ClCompile>
+    </ItemGroup>
+  </Target>
   <Target Name="RemoveManagedWebView2CoreFromNativeOutDir" AfterTargets="Build">
     <ItemGroup>
       <_ToDelete Include="$(OutDir)Microsoft.Web.WebView2.Core.dll" />
@@ -148,38 +154,4 @@
 
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <Import Project="..\..\..\..\deps\spdlog.props" />
-  <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')" />
-  <Import Project="..\..\..\..\packages\Microsoft.Web.WebView2.1.0.2903.40\build\native\Microsoft.Web.WebView2.targets" Condition="Exists('..\..\..\..\packages\Microsoft.Web.WebView2.1.0.2903.40\build\native\Microsoft.Web.WebView2.targets')" />
-  <Import Project="..\..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets" Condition="Exists('..\..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" />
-  <Import Project="..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.26100.4188\build\Microsoft.Windows.SDK.BuildTools.targets" Condition="Exists('..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.26100.4188\build\Microsoft.Windows.SDK.BuildTools.targets')" />
-  <Import Project="..\..\..\..\packages\Microsoft.WindowsAppSDK.1.8.250907003\build\native\Microsoft.WindowsAppSDK.targets" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.1.8.250907003\build\native\Microsoft.WindowsAppSDK.targets')" />
-  <Import Project="..\..\..\..\packages\Microsoft.WindowsAppSDK.Base.1.8.250831001\build\native\Microsoft.WindowsAppSDK.Base.targets" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.Base.1.8.250831001\build\native\Microsoft.WindowsAppSDK.Base.targets')" />
-  <Import Project="..\..\..\..\packages\Microsoft.WindowsAppSDK.Foundation.1.8.250906002\build\native\Microsoft.WindowsAppSDK.Foundation.targets" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.Foundation.1.8.250906002\build\native\Microsoft.WindowsAppSDK.Foundation.targets')" />
-  <Import Project="..\..\..\..\packages\Microsoft.WindowsAppSDK.WinUI.1.8.250906003\build\native\Microsoft.WindowsAppSDK.WinUI.targets" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.WinUI.1.8.250906003\build\native\Microsoft.WindowsAppSDK.WinUI.targets')" />
-  <Import Project="..\..\..\..\packages\Microsoft.WindowsAppSDK.Runtime.1.8.250907003\build\native\Microsoft.WindowsAppSDK.Runtime.targets" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.Runtime.1.8.250907003\build\native\Microsoft.WindowsAppSDK.Runtime.targets')" />
-  <Import Project="..\..\..\..\packages\Microsoft.WindowsAppSDK.DWrite.1.8.25090401\build\Microsoft.WindowsAppSDK.DWrite.targets" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.DWrite.1.8.25090401\build\Microsoft.WindowsAppSDK.DWrite.targets')" />
-  <Import Project="..\..\..\..\packages\Microsoft.WindowsAppSDK.InteractiveExperiences.1.8.250906004\build\native\Microsoft.WindowsAppSDK.InteractiveExperiences.targets" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.InteractiveExperiences.1.8.250906004\build\native\Microsoft.WindowsAppSDK.InteractiveExperiences.targets')" />
-
-  <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'))" />
-    <Error Condition="!Exists('..\\..\\..\\..\\packages\\Microsoft.Web.WebView2.1.0.2903.40\\build\\native\\Microsoft.Web.WebView2.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\\..\\..\\..\\packages\\Microsoft.Web.WebView2.1.0.2903.40\\build\\native\\Microsoft.Web.WebView2.targets'))" />
-    <Error Condition="!Exists('..\\..\\..\\..\\packages\\Microsoft.WindowsAppSDK.1.8.250907003\\build\\native\\Microsoft.WindowsAppSDK.props')" Text="$([System.String]::Format('$(ErrorText)', '..\\..\\..\\..\\packages\\Microsoft.WindowsAppSDK.1.8.250907003\\build\\native\\Microsoft.WindowsAppSDK.props'))" />
-    <Error Condition="!Exists('..\\..\\..\\..\\packages\\Microsoft.WindowsAppSDK.1.8.250907003\\build\\native\\Microsoft.WindowsAppSDK.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\\..\\..\\..\\packages\\Microsoft.WindowsAppSDK.1.8.250907003\\build\\native\\Microsoft.WindowsAppSDK.targets'))" />
-    <Error Condition="!Exists('..\\..\\..\\..\\packages\\Microsoft.WindowsAppSDK.Base.1.8.250831001\\build\\native\\Microsoft.WindowsAppSDK.Base.props')" Text="$([System.String]::Format('$(ErrorText)', '..\\..\\..\\..\\packages\\Microsoft.WindowsAppSDK.Base.1.8.250831001\\build\\native\\Microsoft.WindowsAppSDK.Base.props'))" />
-    <Error Condition="!Exists('..\\..\\..\\..\\packages\\Microsoft.WindowsAppSDK.Base.1.8.250831001\\build\\native\\Microsoft.WindowsAppSDK.Base.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\\..\\..\\..\\packages\\Microsoft.WindowsAppSDK.Base.1.8.250831001\\build\\native\\Microsoft.WindowsAppSDK.Base.targets'))" />
-    <Error Condition="!Exists('..\\..\\..\\..\\packages\\Microsoft.WindowsAppSDK.Foundation.1.8.250906002\\build\\native\\Microsoft.WindowsAppSDK.Foundation.props')" Text="$([System.String]::Format('$(ErrorText)', '..\\..\\..\\..\\packages\\Microsoft.WindowsAppSDK.Foundation.1.8.250906002\\build\\native\\Microsoft.WindowsAppSDK.Foundation.props'))" />
-    <Error Condition="!Exists('..\\..\\..\\..\\packages\\Microsoft.WindowsAppSDK.Foundation.1.8.250906002\\build\\native\\Microsoft.WindowsAppSDK.Foundation.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\\..\\..\\..\\packages\\Microsoft.WindowsAppSDK.Foundation.1.8.250906002\\build\\native\\Microsoft.WindowsAppSDK.Foundation.targets'))" />
-    <Error Condition="!Exists('..\\..\\..\\..\\packages\\Microsoft.WindowsAppSDK.WinUI.1.8.250906003\\build\\native\\Microsoft.WindowsAppSDK.WinUI.props')" Text="$([System.String]::Format('$(ErrorText)', '..\\..\\..\\..\\packages\\Microsoft.WindowsAppSDK.WinUI.1.8.250906003\\build\\native\\Microsoft.WindowsAppSDK.WinUI.props'))" />
-    <Error Condition="!Exists('..\\..\\..\\..\\packages\\Microsoft.WindowsAppSDK.WinUI.1.8.250906003\\build\\native\\Microsoft.WindowsAppSDK.WinUI.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\\..\\..\\..\\packages\\Microsoft.WindowsAppSDK.WinUI.1.8.250906003\\build\\native\\Microsoft.WindowsAppSDK.WinUI.targets'))" />
-    <Error Condition="!Exists('..\\..\\..\\..\\packages\\Microsoft.WindowsAppSDK.Runtime.1.8.250907003\\build\\native\\Microsoft.WindowsAppSDK.Runtime.props')" Text="$([System.String]::Format('$(ErrorText)', '..\\..\\..\\..\\packages\\Microsoft.WindowsAppSDK.Runtime.1.8.250907003\\build\\native\\Microsoft.WindowsAppSDK.Runtime.props'))" />
-    <Error Condition="!Exists('..\\..\\..\\..\\packages\\Microsoft.WindowsAppSDK.Runtime.1.8.250907003\\build\\native\\Microsoft.WindowsAppSDK.Runtime.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\\..\\..\\..\\packages\\Microsoft.WindowsAppSDK.Runtime.1.8.250907003\\build\\native\\Microsoft.WindowsAppSDK.Runtime.targets'))" />
-    <Error Condition="!Exists('..\\..\\..\\..\\packages\\Microsoft.WindowsAppSDK.DWrite.1.8.25090401\\build\\Microsoft.WindowsAppSDK.DWrite.props')" Text="$([System.String]::Format('$(ErrorText)', '..\\..\\..\\..\\packages\\Microsoft.WindowsAppSDK.DWrite.1.8.25090401\\build\\Microsoft.WindowsAppSDK.DWrite.props'))" />
-    <Error Condition="!Exists('..\\..\\..\\..\\packages\\Microsoft.WindowsAppSDK.DWrite.1.8.25090401\\build\\Microsoft.WindowsAppSDK.DWrite.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\\..\\..\\..\\packages\\Microsoft.WindowsAppSDK.DWrite.1.8.25090401\\build\\Microsoft.WindowsAppSDK.DWrite.targets'))" />
-    <Error Condition="!Exists('..\\..\\..\\..\\packages\\Microsoft.WindowsAppSDK.InteractiveExperiences.1.8.250906004\\build\\native\\Microsoft.WindowsAppSDK.InteractiveExperiences.props')" Text="$([System.String]::Format('$(ErrorText)', '..\\..\\..\\..\\packages\\Microsoft.WindowsAppSDK.InteractiveExperiences.1.8.250906004\\build\\native\\Microsoft.WindowsAppSDK.InteractiveExperiences.props'))" />
-    <Error Condition="!Exists('..\\..\\..\\..\\packages\\Microsoft.WindowsAppSDK.InteractiveExperiences.1.8.250906004\\build\\native\\Microsoft.WindowsAppSDK.InteractiveExperiences.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\\..\\..\\..\\packages\\Microsoft.WindowsAppSDK.InteractiveExperiences.1.8.250906004\\build\\native\\Microsoft.WindowsAppSDK.InteractiveExperiences.targets'))" />
-  </Target>
 </Project>

src/modules/MouseUtils/FindMyMouse/dllmain.cpp

@@ -8,6 +8,8 @@
 #include <common/utils/logger_helper.h>
 #include <common/utils/color.h>
 #include <common/utils/string_utils.h>
+#include <common/utils/EventWaiter.h>
+#include <common/interop/shared_constants.h>
 
 namespace
 {
@@ -69,6 +71,9 @@ private:
     // Find My Mouse specific settings
     FindMyMouseSettings m_findMyMouseSettings;
 
+    // Event-driven trigger support
+    EventWaiter m_triggerEventWaiter;
+
     // Load initial settings from the persisted values.
     void init_settings();
 
@@ -86,6 +91,8 @@ public:
     // Destroy the powertoy and free memory
     virtual void destroy() override
     {
+        // Ensure threads/handles are cleaned up before destruction
+        disable();
         delete this;
     }
 
@@ -150,6 +157,11 @@ public:
         m_enabled = true;
         Trace::EnableFindMyMouse(true);
         std::thread([=]() { FindMyMouseMain(m_hModule, m_findMyMouseSettings); }).detach();
+
+        // Start listening for external trigger event so we can invoke the same logic as the hotkey.
+        m_triggerEventWaiter.start(CommonSharedConstants::FIND_MY_MOUSE_TRIGGER_EVENT, [this](DWORD) {
+            OnHotkeyEx();
+        });
     }
 
     // Disable the powertoy
@@ -158,6 +170,8 @@ public:
         m_enabled = false;
         Trace::EnableFindMyMouse(false);
         FindMyMouseDisable();
+
+        m_triggerEventWaiter.stop();
     }
 
     // Returns if the powertoys is enabled
@@ -216,7 +230,7 @@ inline static uint8_t LegacyOpacityToAlpha(int overlayOpacityPercent)
         overlayOpacityPercent = 100;
     }
 
-    // Round to nearest integer (0<EFBFBD>255)
+    // Round to nearest integer (0–255)
     return static_cast<uint8_t>((overlayOpacityPercent * 255 + 50) / 100);
 }
 
@@ -532,4 +546,4 @@ void FindMyMouse::parse_settings(PowerToysSettings::PowerToyValues& settings)
 extern "C" __declspec(dllexport) PowertoyModuleIface* __cdecl powertoy_create()
 {
     return new FindMyMouse();
-}
+}

src/modules/MouseUtils/FindMyMouse/packages.config

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="Microsoft.Windows.CppWinRT" version="2.0.240111.5" targetFramework="native" />
-  <package id="Microsoft.WindowsAppSDK" version="1.8.250907003" targetFramework="native" />
-  <package id="Microsoft.WindowsAppSDK.Base" version="1.8.250831001" targetFramework="native" />
-  <package id="Microsoft.WindowsAppSDK.Foundation" version="1.8.250906002" targetFramework="native" />
-  <package id="Microsoft.WindowsAppSDK.WinUI" version="1.8.250906003" targetFramework="native" />
-  <package id="Microsoft.WindowsAppSDK.Runtime" version="1.8.250907003" targetFramework="native" />
-  <package id="Microsoft.WindowsAppSDK.DWrite" version="1.8.25090401" targetFramework="native" />
-  <package id="Microsoft.WindowsAppSDK.InteractiveExperiences" version="1.8.250906004" targetFramework="native" />
-  <package id="Microsoft.Web.WebView2" version="1.0.2903.40" targetFramework="native" />
-</packages>

src/modules/MouseUtils/MouseHighlighter/dllmain.cpp

@@ -4,6 +4,8 @@
 #include "trace.h"
 #include "MouseHighlighter.h"
 #include "common/utils/color.h"
+#include <common/utils/EventWaiter.h>
+#include <common/interop/shared_constants.h>
 
 namespace
 {
@@ -61,6 +63,9 @@ private:
     // Mouse Highlighter specific settings
     MouseHighlighterSettings m_highlightSettings;
 
+    // Event-driven trigger support
+    EventWaiter m_triggerEventWaiter;
+
 public:
     // Constructor
     MouseHighlighter()
@@ -72,6 +77,8 @@ public:
     // Destroy the powertoy and free memory
     virtual void destroy() override
     {
+        // Tear down threads/handles before deletion to avoid abort() on joinable threads during shutdown
+        disable();
         delete this;
     }
 
@@ -132,6 +139,11 @@ public:
         m_enabled = true;
         Trace::EnableMouseHighlighter(true);
         std::thread([=]() { MouseHighlighterMain(m_hModule, m_highlightSettings); }).detach();
+
+        // Start listening for external trigger event so we can invoke the same logic as the hotkey.
+        m_triggerEventWaiter.start(CommonSharedConstants::MOUSE_HIGHLIGHTER_TRIGGER_EVENT, [this](DWORD) {
+            OnHotkeyEx();
+        });
     }
 
     // Disable the powertoy
@@ -140,6 +152,8 @@ public:
         m_enabled = false;
         Trace::EnableMouseHighlighter(false);
         MouseHighlighterDisable();
+
+        m_triggerEventWaiter.stop();
     }
 
     // Returns if the powertoys is enabled

src/modules/MouseUtils/MouseJumpUI/Helpers/SettingsHelper.cs

@@ -53,7 +53,7 @@ internal sealed class SettingsHelper
         lock (this.LockObject)
         {
             {
-                var settingsUtils = new SettingsUtils();
+                var settingsUtils = SettingsUtils.Default;
 
                 // set this to 1 to disable retries
                 var remainingRetries = 5;

src/modules/MouseUtils/MousePointerCrosshairs/dllmain.cpp

@@ -4,7 +4,8 @@
 #include "trace.h"
 #include "InclusiveCrosshairs.h"
 #include "common/utils/color.h"
-#include <atomic>
+#include <common/utils/EventWaiter.h>
+#include <common/interop/shared_constants.h>
 #include <thread>
 #include <chrono>
 #include <memory>
@@ -124,6 +125,9 @@ private:
     // Mouse Pointer Crosshairs specific settings
     InclusiveCrosshairsSettings m_inclusiveCrosshairsSettings;
 
+    // Event-driven trigger support
+    EventWaiter m_triggerEventWaiter;
+
 public:
     // Constructor
     MousePointerCrosshairs()
@@ -137,11 +141,9 @@ public:
     // Destroy the powertoy and free memory
     virtual void destroy() override
     {
-        UninstallKeyboardHook();
-        StopXTimer();
-        StopYTimer();
+        // Ensure all background threads/handles are torn down before destruction to avoid std::terminate/abort on joinable threads
+        disable();
         g_instance.store(nullptr, std::memory_order_release);
-        // Release shared state so worker threads (if any) exit when weak_ptr lock fails
         m_state.reset();
         delete this;
     }
@@ -203,6 +205,11 @@ public:
         m_enabled = true;
         Trace::EnableMousePointerCrosshairs(true);
         std::thread([=]() { InclusiveCrosshairsMain(m_hModule, m_inclusiveCrosshairsSettings); }).detach();
+
+        // Start listening for external trigger event so we can invoke the same logic as the activation hotkey.
+        m_triggerEventWaiter.start(CommonSharedConstants::MOUSE_CROSSHAIRS_TRIGGER_EVENT, [this](DWORD) {
+            on_hotkey(0); // activation hotkey
+        });
     }
 
     // Disable the powertoy
@@ -215,6 +222,8 @@ public:
         StopYTimer();
         m_glideState = 0;
         InclusiveCrosshairsDisable();
+
+        m_triggerEventWaiter.stop();
     }
 
     // Returns if the powertoys is enabled
@@ -901,4 +910,4 @@ private:
 extern "C" __declspec(dllexport) PowertoyModuleIface* __cdecl powertoy_create()
 {
     return new MousePointerCrosshairs();
-}
+}

src/modules/MouseUtils/MouseUtils.UITests/FindMyMouseTests.cs

@@ -617,6 +617,8 @@ namespace MouseUtils.UITests
 
         private void LaunchFromSetting(bool reload = false, bool launchAsAdmin = false)
         {
+            Session = RestartScopeExe("FindMyMouse,MouseHighlighter,MouseJump,MousePointerCrosshairs,CursorWrap");
+
             // this.Session.Attach(PowerToysModule.PowerToysSettings);
             this.Session.SetMainWindowSize(WindowSize.Large);
 

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

@@ -192,7 +192,7 @@ namespace MouseWithoutBorders.Class
 
         internal Settings()
         {
-            _settingsUtils = new SettingsUtils();
+            _settingsUtils = SettingsUtils.Default;
 
             _watcher = SettingsHelper.GetFileWatcher("MouseWithoutBorders", "settings.json", () =>
             {

src/modules/PowerOCR/PowerOCR/OCROverlay.xaml.cs

@@ -426,7 +426,7 @@ public partial class OCROverlay : Window
     private void SettingsMenuItem_Click(object sender, RoutedEventArgs e)
     {
         WindowUtilities.CloseAllOCROverlays();
-        SettingsDeepLink.OpenSettings(SettingsDeepLink.SettingsWindow.PowerOCR, false);
+        SettingsDeepLink.OpenSettings(SettingsDeepLink.SettingsWindow.PowerOCR);
     }
 
     private static bool CheckIfCheckingOrUnchecking(object? sender)

src/modules/PowerOCR/PowerOCR/Settings/UserSettings.cs

@@ -29,7 +29,7 @@ namespace PowerOCR.Settings
         [ImportingConstructor]
         public UserSettings(Helpers.IThrottledActionInvoker throttledActionInvoker)
         {
-            _settingsUtils = new SettingsUtils();
+            _settingsUtils = SettingsUtils.Default;
             ActivationShortcut = new SettingItem<string>(DefaultActivationShortcut);
             PreferredLanguage = new SettingItem<string>(string.Empty);