fix xaml format

update
2025-12-31 01:16:59 +01:00 · 2025-12-24 15:23:50 +08:00 · 2025-12-24 15:22:51 +08:00 · 2025-12-24 14:14:05 +08:00 · 2025-12-24 11:36:10 +08:00 · 2025-12-24 11:17:17 +08:00
221 changed files with 5486 additions and 1980 deletions
--- a/.github/actions/spell-check/expect.txt
+++ b/.github/actions/spell-check/expect.txt
@@ -224,7 +224,6 @@ clientside
 CLIPBOARDUPDATE
 CLIPCHILDREN
 CLIPSIBLINGS
-CLITo
 closesocket
 clp
 CLSCTX
@@ -325,7 +324,6 @@ CUSTOMFORMATPLACEHOLDER
 CVal
 cvd
 CVirtual
-CVS
 CWMO
 CXSCREEN
 CXSMICON
@@ -393,6 +391,7 @@ devpal
 dfx
 DIALOGEX
 digicert
+diffs
 DINORMAL
 DISABLEASACTIONKEY
 DISABLENOSCROLL
@@ -984,6 +983,7 @@ mdtext
 mdtxt
 mdwn
 meme
+mcp
 memicmp
 MENUITEMINFO
 MENUITEMINFOW
@@ -1074,11 +1074,12 @@ muxxc
 muxxh
 MVPs
 mvvm
+myorg
+myrepo
 MVVMTK
 MWBEx
 MYICON
 NAMECHANGE
-Notavailable
 namespaceanddescendants
 nao
 NCACTIVATE
@@ -1221,6 +1222,7 @@ opensource
 openxmlformats
 ollama
 onnx
+openurl
 OPTIMIZEFORINVOKE
 ORPHANEDDIALOGTITLE
 ORSCANS
@@ -1298,6 +1300,7 @@ phwnd
 pici
 pidl
 PIDLIST
+PII
 pinfo
 pinvoke
 pipename
@@ -1495,6 +1498,7 @@ riid
 RKey
 RNumber
 rop
+rollups
 ROUNDSMALL
 ROWSETEXT
 rpcrt
@@ -1639,6 +1643,7 @@ SKIPOWNPROCESS
 sku
 SLGP
 sln
+slnf
 slnx
 SMALLICON
 smartphone
@@ -1805,7 +1810,6 @@ tlbimp
 tlc
 tmain
 TNP
-toolgood
 Toolhelp
 toolwindow
 TOPDOWNDIB
@@ -1867,7 +1871,6 @@ Uniquifies
 unitconverter
 unittests
 UNLEN
-Uninitializes
 UNORM
 unremapped
 Unsubscribes
@@ -1955,7 +1958,7 @@ vswhere
 Vtbl
 WANTNUKEWARNING
 WANTPALM
-wasdk
+WASDK
 wbem
 WBounds
 Wca
@@ -2101,6 +2104,7 @@ xstyler
 XTimer
 XUP
 XVIRTUALSCREEN
+XXL
 xxxxxx
 YAxis
 ycombinator
--- a/.github/prompts/create-commit-title.prompt.md
+++ b/.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.'
 ---

--- a/.github/prompts/create-pr-summary.prompt.md
+++ b/.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.'
 ---

--- a/.github/prompts/fix-issue.prompt.md
+++ b/.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
--- a/.github/prompts/review-issue.prompt.md
+++ b/.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.
--- a/.github/prompts/review-pr.prompt.md
+++ b/.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.
--- a/.github/review-tools/Get-GitHubPrFilePatch.ps1
+++ b/.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
--- a/.github/review-tools/Get-GitHubRawFile.ps1
+++ b/.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 $_ }
+}
--- a/.github/review-tools/Get-PrIncrementalChanges.ps1
+++ b/.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
--- a/.github/review-tools/Test-IncrementalReview.ps1
+++ b/.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
+}
--- a/.github/review-tools/review-tools.instructions.md
+++ b/.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.
--- a/.pipelines/UpdateVersions.ps1
+++ b/.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
--- a/.pipelines/v2/ci-using-the-latest-winappsdk.yml
+++ b/.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
--- a/.pipelines/v2/templates/job-build-project.yml
+++ b/.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
--- a/.pipelines/v2/templates/pipeline-ci-build.yml
+++ b/.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
--- a/.pipelines/v2/templates/steps-update-winappsdk-and-restore-nuget.yml
+++ b/.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)'
--- a/Cpp.Build.props
+++ b/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>
--- a/DATA_AND_PRIVACY.md
+++ b/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
--- a/Directory.Build.targets
+++ b/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>
--- a/Directory.Packages.props
+++ b/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" />
@@ -70,10 +72,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" />
@@ -112,6 +116,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" />
--- a/src/modules/AdvancedPaste/AdvancedPaste.UnitTests/ServicesTests/AIServiceBatchIntegrationTests.cs
+++ b/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:
--- a/src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/Controls/PromptBox.xaml
+++ b/src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/Controls/PromptBox.xaml
@@ -335,6 +335,7 @@
            <converters:CountToVisibilityConverter x:Key="CountToVisibilityConverter" />
            <converters:CountToInvertedVisibilityConverter x:Key="CountToInvertedVisibilityConverter" />
            <converters:ServiceTypeToIconConverter x:Key="ServiceTypeToIconConverter" />
+            <converters:PasteAIUsageToStringConverter x:Key="PasteAIUsageToStringConverter" />
        </ResourceDictionary>
    </UserControl.Resources>
    <Grid x:Name="PromptBoxGrid" Loaded="Grid_Loaded">
@@ -430,12 +431,20 @@
                                        Grid.Row="1"
                                        MinHeight="104"
                                        MaxHeight="320">
-                                        <TextBlock
-                                            Foreground="{ThemeResource TextFillColorSecondaryBrush}"
-                                            IsTextSelectionEnabled="True"
-                                            Style="{StaticResource CaptionTextBlockStyle}"
-                                            Text="{x:Bind ViewModel.CustomFormatResult, Mode=OneWay}"
-                                            TextWrapping="Wrap" />
+                                        <StackPanel>
+                                            <TextBlock
+                                                Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                                                IsTextSelectionEnabled="True"
+                                                Style="{StaticResource CaptionTextBlockStyle}"
+                                                Text="{x:Bind ViewModel.CustomFormatResult, Mode=OneWay}"
+                                                TextWrapping="Wrap"
+                                                Visibility="{x:Bind ViewModel.HasCustomFormatText, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}" />
+                                            <Image
+                                                HorizontalAlignment="Left"
+                                                Source="{x:Bind ViewModel.CustomFormatImageResult, Mode=OneWay}"
+                                                Stretch="Uniform"
+                                                Visibility="{x:Bind ViewModel.HasCustomFormatImage, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}" />
+                                        </StackPanel>
                                    </ScrollViewer>
                                </Grid>
                                <Rectangle
@@ -602,20 +611,37 @@
                                                        Style="{StaticResource CaptionTextBlockStyle}"
                                                        Text="{x:Bind ServiceType, Mode=OneWay}" />
                                                </StackPanel>
-                                                <Border
+                                                <StackPanel
                                                    Grid.Column="2"
-                                                    Padding="2,0,2,0"
                                                    VerticalAlignment="Center"
-                                                    BorderBrush="{ThemeResource ControlStrokeColorSecondary}"
-                                                    BorderThickness="1"
-                                                    CornerRadius="{StaticResource ControlCornerRadius}"
-                                                    Visibility="{x:Bind IsLocalModel, Mode=OneWay}">
-                                                    <TextBlock
-                                                        x:Uid="LocalModelBadge"
-                                                        AutomationProperties.AccessibilityView="Raw"
-                                                        FontSize="10"
-                                                        Foreground="{ThemeResource TextFillColorSecondaryBrush}" />
-                                                </Border>
+                                                    Orientation="Horizontal"
+                                                    Spacing="4">
+                                                    <Border
+                                                        Padding="2,0,2,0"
+                                                        VerticalAlignment="Center"
+                                                        BorderBrush="{ThemeResource ControlStrokeColorSecondary}"
+                                                        BorderThickness="1"
+                                                        CornerRadius="{StaticResource ControlCornerRadius}">
+                                                        <TextBlock
+                                                            AutomationProperties.AccessibilityView="Raw"
+                                                            FontSize="10"
+                                                            Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                                                            Text="{x:Bind Usage, Mode=OneWay, Converter={StaticResource PasteAIUsageToStringConverter}}" />
+                                                    </Border>
+                                                    <Border
+                                                        Padding="2,0,2,0"
+                                                        VerticalAlignment="Center"
+                                                        BorderBrush="{ThemeResource ControlStrokeColorSecondary}"
+                                                        BorderThickness="1"
+                                                        CornerRadius="{StaticResource ControlCornerRadius}"
+                                                        Visibility="{x:Bind IsLocalModel, Mode=OneWay}">
+                                                        <TextBlock
+                                                            x:Uid="LocalModelBadge"
+                                                            AutomationProperties.AccessibilityView="Raw"
+                                                            FontSize="10"
+                                                            Foreground="{ThemeResource TextFillColorSecondaryBrush}" />
+                                                    </Border>
+                                                </StackPanel>
                                                <!--<Border
                                                    Grid.Column="2"
                                                    Padding="2,0,2,0"
--- a/src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/Controls/PromptBox.xaml.cs
+++ b/src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/Controls/PromptBox.xaml.cs
@@ -164,7 +164,7 @@ namespace AdvancedPaste.Controls
                return;
            }

-            var flyout = FlyoutBase.GetAttachedFlyout(AIProviderButton);
+            var flyout = AIProviderButton.Flyout;

            if (AIProviderListView.SelectedItem is not PasteAIProviderDefinition provider)
            {
@@ -180,7 +180,6 @@ namespace AdvancedPaste.Controls
            if (ViewModel.SetActiveProviderCommand.CanExecute(provider))
            {
                await ViewModel.SetActiveProviderCommand.ExecuteAsync(provider);
-                SyncProviderSelection();
            }

            flyout?.Hide();
--- a/src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/Converters/PasteAIUsageToStringConverter.cs
+++ b/src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/Converters/PasteAIUsageToStringConverter.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.
+
+using System;
+using AdvancedPaste.Helpers;
+using Microsoft.PowerToys.Settings.UI.Library;
+using Microsoft.UI.Xaml.Data;
+
+namespace AdvancedPaste.Converters;
+
+public sealed partial class PasteAIUsageToStringConverter : IValueConverter
+{
+    public object Convert(object value, Type targetType, object parameter, string language)
+    {
+        var usage = value switch
+        {
+            string s => PasteAIUsageExtensions.FromConfigString(s),
+            PasteAIUsage u => u,
+            _ => PasteAIUsage.ChatCompletion,
+        };
+
+        return ResourceLoaderInstance.ResourceLoader.GetString($"PasteAIUsage_{usage}");
+    }
+
+    public object ConvertBack(object value, Type targetType, object parameter, string language)
+    {
+        throw new NotImplementedException();
+    }
+}
--- a/src/modules/AdvancedPaste/AdvancedPaste/Helpers/DataPackageHelpers.cs
+++ b/src/modules/AdvancedPaste/AdvancedPaste/Helpers/DataPackageHelpers.cs
@@ -46,6 +46,13 @@ internal static class DataPackageHelpers
        return dataPackage;
    }

+    internal static DataPackage CreateFromImage(RandomAccessStreamReference imageStreamRef)
+    {
+        DataPackage dataPackage = new();
+        dataPackage.SetBitmap(imageStreamRef);
+        return dataPackage;
+    }
+
    internal static async Task<DataPackage> CreateFromFileAsync(string fileName)
    {
        var storageFile = await StorageFile.GetFileFromPathAsync(fileName);
@@ -225,6 +232,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();
--- a/src/modules/AdvancedPaste/AdvancedPaste/Helpers/NativeMethods.cs
+++ b/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();
    }
 }
--- a/src/modules/AdvancedPaste/AdvancedPaste/Models/PasteFormats.cs
+++ b/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,
 }
--- a/src/modules/AdvancedPaste/AdvancedPaste/Services/CustomActions/CustomActionTransformService.cs
+++ b/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,
                };

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

            return providerConfig;
--- a/src/modules/AdvancedPaste/AdvancedPaste/Services/CustomActions/ICustomActionTransformService.cs
+++ b/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);
    }
 }
--- a/src/modules/AdvancedPaste/AdvancedPaste/Services/CustomActions/PasteAIConfig.cs
+++ b/src/modules/AdvancedPaste/AdvancedPaste/Services/CustomActions/PasteAIConfig.cs
@@ -28,5 +28,11 @@ namespace AdvancedPaste.Services.CustomActions
        public string SystemPrompt { get; set; }

        public bool ModerationEnabled { get; set; }
+
+        public PasteAIUsage Usage { get; set; }
+
+        public int ImageWidth { get; set; }
+
+        public int ImageHeight { get; set; }
    }
 }
--- a/src/modules/AdvancedPaste/AdvancedPaste/Services/CustomActions/PasteAIRequest.cs
+++ b/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;
--- a/src/modules/AdvancedPaste/AdvancedPaste/Services/CustomActions/SemanticKernelPasteProvider.cs
+++ b/src/modules/AdvancedPaste/AdvancedPaste/Services/CustomActions/SemanticKernelPasteProvider.cs
@@ -4,6 +4,7 @@

 using System;
 using System.Collections.Generic;
+using System.Net.Http;
 using System.Threading;
 using System.Threading.Tasks;
 using AdvancedPaste.Helpers;
@@ -16,6 +17,7 @@ using Microsoft.SemanticKernel.Connectors.Google;
 using Microsoft.SemanticKernel.Connectors.MistralAI;
 using Microsoft.SemanticKernel.Connectors.Ollama;
 using Microsoft.SemanticKernel.Connectors.OpenAI;
+using Microsoft.SemanticKernel.TextToImage;

 namespace AdvancedPaste.Services.CustomActions
 {
@@ -64,23 +66,78 @@ 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();
+
+            switch (_config.Usage)
+            {
+                case PasteAIUsage.TextToImage:
+                    var imageDescription = string.IsNullOrWhiteSpace(prompt) ? inputText : $"{inputText}. {prompt}";
+                    return await ProcessTextToImageAsync(kernel, imageDescription, cancellationToken);
+                case PasteAIUsage.ChatCompletion:
+                default:
+                    var userMessageContent = $"""
+                        User instructions:
+                        {prompt}
+
+                        Clipboard Content:
+                        {inputText}
+
+                        Output:
+                        """;
+                    return await ProcessChatCompletionAsync(kernel, request, userMessageContent, systemPrompt, cancellationToken);
+            }
+        }
+
+        private async Task<string> ProcessTextToImageAsync(Kernel kernel, string userMessageContent, CancellationToken cancellationToken)
+        {
+#pragma warning disable SKEXP0001
+            var imageService = kernel.GetRequiredService<ITextToImageService>();
+            var width = _config.ImageWidth > 0 ? _config.ImageWidth : 1024;
+            var height = _config.ImageHeight > 0 ? _config.ImageHeight : 1024;
+            var settings = new OpenAITextToImageExecutionSettings
+            {
+                Size = (width, height),
+            };
+
+            var generatedImages = await imageService.GetImageContentsAsync(new TextContent(userMessageContent), settings, cancellationToken: cancellationToken);
+
+            if (generatedImages.Count == 0)
+            {
+                throw new InvalidOperationException("No image generated.");
+            }
+
+            var imageContent = generatedImages[0];
+
+            if (imageContent.Data.HasValue)
+            {
+                var base64 = Convert.ToBase64String(imageContent.Data.Value.ToArray());
+                return $"data:{imageContent.MimeType ?? "image/png"};base64,{base64}";
+            }
+            else if (imageContent.Uri != null)
+            {
+                using var client = new HttpClient();
+                var imageBytes = await client.GetByteArrayAsync(imageContent.Uri, cancellationToken);
+                var base64 = Convert.ToBase64String(imageBytes);
+                return $"data:image/png;base64,{base64}";
+            }
+            else
+            {
+                throw new InvalidOperationException("Generated image contains no data.");
+            }
+#pragma warning restore SKEXP0001
+        }
+
+        private async Task<string> ProcessChatCompletionAsync(Kernel kernel, PasteAIRequest request, string userMessageContent, string systemPrompt, CancellationToken cancellationToken)
+        {
+            var executionSettings = CreateExecutionSettings();
            var modelId = _config.Model;

            IChatCompletionService chatService;
@@ -102,7 +159,23 @@ namespace AdvancedPaste.Services.CustomActions

            var chatHistory = new ChatHistory();
            chatHistory.AddSystemMessage(systemPrompt);
-            chatHistory.AddUserMessage(userMessageContent);
+
+            if (request.ImageBytes != null)
+            {
+                var collection = new ChatMessageContentItemCollection();
+                if (!string.IsNullOrWhiteSpace(request.InputText))
+                {
+                    collection.Add(new TextContent($"Clipboard Content:\n{request.InputText}"));
+                }
+
+                collection.Add(new ImageContent(request.ImageBytes, request.ImageMimeType ?? "image/png"));
+                collection.Add(new TextContent($"User instructions:\n{request.Prompt}\n\nOutput:"));
+                chatHistory.AddUserMessage(collection);
+            }
+            else
+            {
+                chatHistory.AddUserMessage(userMessageContent);
+            }

            var response = await chatService.GetChatMessageContentAsync(chatHistory, executionSettings, kernel, cancellationToken);
            chatHistory.Add(response);
@@ -125,11 +198,31 @@ namespace AdvancedPaste.Services.CustomActions
            switch (_serviceType)
            {
                case AIServiceType.OpenAI:
-                    kernelBuilder.AddOpenAIChatCompletion(_config.Model, apiKey, serviceId: _config.Model);
+                    if (_config.Usage == PasteAIUsage.TextToImage)
+                    {
+#pragma warning disable SKEXP0010
+                        kernelBuilder.AddOpenAITextToImage(apiKey, modelId: _config.Model);
+#pragma warning restore SKEXP0010
+                    }
+                    else
+                    {
+                        kernelBuilder.AddOpenAIChatCompletion(_config.Model, apiKey, serviceId: _config.Model);
+                    }
+
                    break;
                case AIServiceType.AzureOpenAI:
                    var deploymentName = string.IsNullOrWhiteSpace(_config.DeploymentName) ? _config.Model : _config.DeploymentName;
-                    kernelBuilder.AddAzureOpenAIChatCompletion(deploymentName, RequireEndpoint(endpoint, _serviceType), apiKey, serviceId: _config.Model);
+                    if (_config.Usage == PasteAIUsage.TextToImage)
+                    {
+#pragma warning disable SKEXP0010
+                        kernelBuilder.AddAzureOpenAITextToImage(deploymentName, RequireEndpoint(endpoint, _serviceType), apiKey);
+#pragma warning restore SKEXP0010
+                    }
+                    else
+                    {
+                        kernelBuilder.AddAzureOpenAIChatCompletion(deploymentName, RequireEndpoint(endpoint, _serviceType), apiKey, serviceId: _config.Model);
+                    }
+
                    break;
                case AIServiceType.Mistral:
                    kernelBuilder.AddMistralChatCompletion(_config.Model, apiKey: apiKey);
--- a/src/modules/AdvancedPaste/AdvancedPaste/Services/KernelServiceBase.cs
+++ b/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)),
        };

--- a/src/modules/AdvancedPaste/AdvancedPaste/Services/PasteFormatExecutor.cs
+++ b/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),
            });
    }
--- a/src/modules/AdvancedPaste/AdvancedPaste/Strings/en-us/Resources.resw
+++ b/src/modules/AdvancedPaste/AdvancedPaste/Strings/en-us/Resources.resw
@@ -372,4 +372,10 @@
    <value>Unable to load Foundry Local model: {0}</value>
    <comment>{0} is the model identifier. Do not translate {0}.</comment>
  </data>
+  <data name="PasteAIUsage_ChatCompletion" xml:space="preserve">
+    <value>Chat completion</value>
+  </data>
+  <data name="PasteAIUsage_TextToImage" xml:space="preserve">
+    <value>Text to image</value>
+  </data>
 </root>
--- a/src/modules/AdvancedPaste/AdvancedPaste/ViewModels/OptionsViewModel.cs
+++ b/src/modules/AdvancedPaste/AdvancedPaste/ViewModels/OptionsViewModel.cs
@@ -7,6 +7,7 @@ using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Diagnostics;
 using System.Globalization;
+using System.IO;
 using System.IO.Abstractions;
 using System.Linq;
 using System.Runtime.InteropServices;
@@ -45,6 +46,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 +457,7 @@ namespace AdvancedPaste.ViewModels
            {
                ResetClipboardPreview();
                _currentClipboardHistoryId = null;
+                _lastClipboardSequenceNumber = 0;
                _currentClipboardTimestamp = null;
                _lastClipboardFormats = ClipboardFormat.None;
                return;
@@ -477,6 +480,13 @@ namespace AdvancedPaste.ViewModels
        {
            bool clipboardChanged = formatsChanged;

+            var currentSequenceNumber = NativeMethods.GetClipboardSequenceNumber();
+            if (_lastClipboardSequenceNumber != currentSequenceNumber)
+            {
+                clipboardChanged = true;
+                _lastClipboardSequenceNumber = currentSequenceNumber;
+            }
+
            if (Clipboard.IsHistoryEnabled())
            {
                try
@@ -605,8 +615,40 @@ namespace AdvancedPaste.ViewModels
        }

        [ObservableProperty]
+        [NotifyPropertyChangedFor(nameof(HasCustomFormatImage))]
+        [NotifyPropertyChangedFor(nameof(HasCustomFormatText))]
+        [NotifyPropertyChangedFor(nameof(CustomFormatImageResult))]
        private string _customFormatResult;

+        public bool HasCustomFormatImage => CustomFormatResult?.StartsWith("data:image", StringComparison.OrdinalIgnoreCase) ?? false;
+
+        public bool HasCustomFormatText => !HasCustomFormatImage;
+
+        public ImageSource CustomFormatImageResult
+        {
+            get
+            {
+                if (HasCustomFormatImage && !string.IsNullOrEmpty(CustomFormatResult))
+                {
+                    try
+                    {
+                        var base64Data = CustomFormatResult.Split(',')[1];
+                        var bytes = Convert.FromBase64String(base64Data);
+                        var stream = new System.IO.MemoryStream(bytes);
+                        var image = new BitmapImage();
+                        image.SetSource(stream.AsRandomAccessStream());
+                        return image;
+                    }
+                    catch (Exception ex)
+                    {
+                        Logger.LogError("Failed to create image source from data URI", ex);
+                    }
+                }
+
+                return null;
+            }
+        }
+
        [RelayCommand]
        public async Task PasteCustomAsync()
        {
@@ -614,7 +656,25 @@ namespace AdvancedPaste.ViewModels

            if (!string.IsNullOrEmpty(text))
            {
-                await CopyPasteAndHideAsync(DataPackageHelpers.CreateFromText(text));
+                if (text.StartsWith("data:image", StringComparison.OrdinalIgnoreCase))
+                {
+                    try
+                    {
+                        var base64Data = text.Split(',')[1];
+                        var bytes = Convert.FromBase64String(base64Data);
+                        var stream = new System.IO.MemoryStream(bytes);
+                        var dataPackage = DataPackageHelpers.CreateFromImage(Windows.Storage.Streams.RandomAccessStreamReference.CreateFromStream(stream.AsRandomAccessStream()));
+                        await CopyPasteAndHideAsync(dataPackage);
+                    }
+                    catch (Exception ex)
+                    {
+                        Logger.LogError("Failed to paste image from data URI", ex);
+                    }
+                }
+                else
+                {
+                    await CopyPasteAndHideAsync(DataPackageHelpers.CreateFromText(text));
+                }
            }
        }

@@ -886,11 +946,6 @@ namespace AdvancedPaste.ViewModels
                Logger.LogError("Failed to activate AI provider", ex);
                return;
            }
-
-            UpdateAIProviderActiveFlags();
-            OnPropertyChanged(nameof(AIProviders));
-            NotifyActiveProviderChanged();
-            EnqueueRefreshPasteFormats();
        }

        public async Task CancelPasteActionAsync()
--- a/src/modules/AdvancedPaste/AdvancedPasteModuleInterface/dllmain.cpp
+++ b/src/modules/AdvancedPaste/AdvancedPasteModuleInterface/dllmain.cpp
@@ -312,13 +312,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 +431,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.
--- a/src/modules/AdvancedPaste/UITest-AdvancedPaste/AdvancedPasteUITest.cs
+++ b/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)
--- a/src/modules/MeasureTool/MeasureToolCore/PowerToys.MeasureToolCore.vcxproj
+++ b/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>
--- a/src/modules/MeasureTool/MeasureToolCore/packages.config
+++ b/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>
--- a/src/modules/MeasureTool/MeasureToolUI/MeasureToolUI.csproj
+++ b/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>
--- a/src/modules/MouseUtils/FindMyMouse/FindMyMouse.vcxproj
+++ b/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>
--- a/src/modules/MouseUtils/FindMyMouse/packages.config
+++ b/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>
--- a/src/modules/cmdpal/CommandPalette.slnf
+++ b/src/modules/cmdpal/CommandPalette.slnf
@@ -0,0 +1,54 @@
+{
+  "solution": {
+    "path": "..\\..\\..\\PowerToys.slnx",
+    "projects": [
+      "src\\common\\CalculatorEngineCommon\\CalculatorEngineCommon.vcxproj",
+      "src\\common\\ManagedCommon\\ManagedCommon.csproj",
+      "src\\common\\ManagedCsWin32\\ManagedCsWin32.csproj",
+      "src\\common\\ManagedTelemetry\\Telemetry\\ManagedTelemetry.csproj",
+      "src\\common\\interop\\PowerToys.Interop.vcxproj",
+      "src\\common\\version\\version.vcxproj",
+      "src\\modules\\cmdpal\\CmdPalKeyboardService\\CmdPalKeyboardService.vcxproj",
+      "src\\modules\\cmdpal\\CmdPalModuleInterface\\CmdPalModuleInterface.vcxproj",
+      "src\\modules\\cmdpal\\Core\\Microsoft.CmdPal.Core.Common\\Microsoft.CmdPal.Core.Common.csproj",
+      "src\\modules\\cmdpal\\Core\\Microsoft.CmdPal.Core.ViewModels\\Microsoft.CmdPal.Core.ViewModels.csproj",
+      "src\\modules\\cmdpal\\Microsoft.CmdPal.UI.ViewModels\\Microsoft.CmdPal.UI.ViewModels.csproj",
+      "src\\modules\\cmdpal\\Microsoft.CmdPal.UI\\Microsoft.CmdPal.UI.csproj",
+      "src\\modules\\cmdpal\\Microsoft.Terminal.UI\\Microsoft.Terminal.UI.vcxproj",
+      "src\\modules\\cmdpal\\Tests\\Microsoft.CmdPal.Ext.Apps.UnitTests\\Microsoft.CmdPal.Ext.Apps.UnitTests.csproj",
+      "src\\modules\\cmdpal\\Tests\\Microsoft.CmdPal.Ext.Bookmarks.UnitTests\\Microsoft.CmdPal.Ext.Bookmarks.UnitTests.csproj",
+      "src\\modules\\cmdpal\\Tests\\Microsoft.CmdPal.Ext.Calc.UnitTests\\Microsoft.CmdPal.Ext.Calc.UnitTests.csproj",
+      "src\\modules\\cmdpal\\Tests\\Microsoft.CmdPal.Ext.ClipboardHistory.UnitTests\\Microsoft.CmdPal.Ext.ClipboardHistory.UnitTests.csproj",
+      "src\\modules\\cmdpal\\Tests\\Microsoft.CmdPal.Ext.Registry.UnitTests\\Microsoft.CmdPal.Ext.Registry.UnitTests.csproj",
+      "src\\modules\\cmdpal\\Tests\\Microsoft.CmdPal.Ext.RemoteDesktop.UnitTests\\Microsoft.CmdPal.Ext.RemoteDesktop.UnitTests.csproj",
+      "src\\modules\\cmdpal\\Tests\\Microsoft.CmdPal.Ext.Shell.UnitTests\\Microsoft.CmdPal.Ext.Shell.UnitTests.csproj",
+      "src\\modules\\cmdpal\\Tests\\Microsoft.CmdPal.Ext.System.UnitTests\\Microsoft.CmdPal.Ext.System.UnitTests.csproj",
+      "src\\modules\\cmdpal\\Tests\\Microsoft.CmdPal.Ext.TimeDate.UnitTests\\Microsoft.CmdPal.Ext.TimeDate.UnitTests.csproj",
+      "src\\modules\\cmdpal\\Tests\\Microsoft.CmdPal.Ext.UnitTestsBase\\Microsoft.CmdPal.Ext.UnitTestBase.csproj",
+      "src\\modules\\cmdpal\\Tests\\Microsoft.CmdPal.Ext.WebSearch.UnitTests\\Microsoft.CmdPal.Ext.WebSearch.UnitTests.csproj",
+      "src\\modules\\cmdpal\\Tests\\Microsoft.CmdPal.Ext.WindowWalker.UnitTests\\Microsoft.CmdPal.Ext.WindowWalker.UnitTests.csproj",
+      "src\\modules\\cmdpal\\Tests\\Microsoft.CmdPal.UI.ViewModels.UnitTests\\Microsoft.CmdPal.UI.ViewModels.UnitTests.csproj",
+      "src\\modules\\cmdpal\\Tests\\Microsoft.CmdPal.UITests\\Microsoft.CmdPal.UITests.csproj",
+      "src\\modules\\cmdpal\\ext\\Microsoft.CmdPal.Ext.Apps\\Microsoft.CmdPal.Ext.Apps.csproj",
+      "src\\modules\\cmdpal\\ext\\Microsoft.CmdPal.Ext.Bookmark\\Microsoft.CmdPal.Ext.Bookmarks.csproj",
+      "src\\modules\\cmdpal\\ext\\Microsoft.CmdPal.Ext.Calc\\Microsoft.CmdPal.Ext.Calc.csproj",
+      "src\\modules\\cmdpal\\ext\\Microsoft.CmdPal.Ext.ClipboardHistory\\Microsoft.CmdPal.Ext.ClipboardHistory.csproj",
+      "src\\modules\\cmdpal\\ext\\Microsoft.CmdPal.Ext.Indexer\\Microsoft.CmdPal.Ext.Indexer.csproj",
+      "src\\modules\\cmdpal\\ext\\Microsoft.CmdPal.Ext.Registry\\Microsoft.CmdPal.Ext.Registry.csproj",
+      "src\\modules\\cmdpal\\ext\\Microsoft.CmdPal.Ext.RemoteDesktop\\Microsoft.CmdPal.Ext.RemoteDesktop.csproj",
+      "src\\modules\\cmdpal\\ext\\Microsoft.CmdPal.Ext.Shell\\Microsoft.CmdPal.Ext.Shell.csproj",
+      "src\\modules\\cmdpal\\ext\\Microsoft.CmdPal.Ext.System\\Microsoft.CmdPal.Ext.System.csproj",
+      "src\\modules\\cmdpal\\ext\\Microsoft.CmdPal.Ext.TimeDate\\Microsoft.CmdPal.Ext.TimeDate.csproj",
+      "src\\modules\\cmdpal\\ext\\Microsoft.CmdPal.Ext.WebSearch\\Microsoft.CmdPal.Ext.WebSearch.csproj",
+      "src\\modules\\cmdpal\\ext\\Microsoft.CmdPal.Ext.WinGet\\Microsoft.CmdPal.Ext.WinGet.csproj",
+      "src\\modules\\cmdpal\\ext\\Microsoft.CmdPal.Ext.WindowWalker\\Microsoft.CmdPal.Ext.WindowWalker.csproj",
+      "src\\modules\\cmdpal\\ext\\Microsoft.CmdPal.Ext.WindowsServices\\Microsoft.CmdPal.Ext.WindowsServices.csproj",
+      "src\\modules\\cmdpal\\ext\\Microsoft.CmdPal.Ext.WindowsSettings\\Microsoft.CmdPal.Ext.WindowsSettings.csproj",
+      "src\\modules\\cmdpal\\ext\\Microsoft.CmdPal.Ext.WindowsTerminal\\Microsoft.CmdPal.Ext.WindowsTerminal.csproj",
+      "src\\modules\\cmdpal\\ext\\ProcessMonitorExtension\\ProcessMonitorExtension.csproj",
+      "src\\modules\\cmdpal\\ext\\SamplePagesExtension\\SamplePagesExtension.csproj",
+      "src\\modules\\cmdpal\\extensionsdk\\Microsoft.CommandPalette.Extensions.Toolkit\\Microsoft.CommandPalette.Extensions.Toolkit.csproj",
+      "src\\modules\\cmdpal\\extensionsdk\\Microsoft.CommandPalette.Extensions\\Microsoft.CommandPalette.Extensions.vcxproj"
+    ]
+  }
+}
--- a/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/Messages/ErrorOccurredMessage.cs
+++ b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/Messages/ErrorOccurredMessage.cs
@@ -0,0 +1,11 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+namespace Microsoft.CmdPal.Core.ViewModels.Messages;
+
+/// <summary>
+/// Message sent when an error occurs during command execution.
+/// Used to track session error count for telemetry.
+/// </summary>
+public record ErrorOccurredMessage();
--- a/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/Messages/ExtensionInvokedMessage.cs
+++ b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/Messages/ExtensionInvokedMessage.cs
@@ -0,0 +1,11 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+namespace Microsoft.CmdPal.Core.ViewModels.Messages;
+
+/// <summary>
+/// Message sent when an extension command or page is invoked.
+/// Captures extension usage metrics for telemetry tracking.
+/// </summary>
+public record ExtensionInvokedMessage(string ExtensionId, string CommandId, string CommandName, bool Success, ulong ExecutionTimeMs);
--- a/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/Messages/NavigationDepthMessage.cs
+++ b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/Messages/NavigationDepthMessage.cs
@@ -0,0 +1,11 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+namespace Microsoft.CmdPal.Core.ViewModels.Messages;
+
+/// <summary>
+/// Message containing the current navigation depth (BackStack count) when navigating to a page.
+/// Used to track maximum navigation depth reached during a session for telemetry.
+/// </summary>
+public record NavigationDepthMessage(int Depth);
--- a/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/Messages/SearchQueryMessage.cs
+++ b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/Messages/SearchQueryMessage.cs
@@ -0,0 +1,11 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+namespace Microsoft.CmdPal.Core.ViewModels.Messages;
+
+/// <summary>
+/// Message sent when a search query is executed in the Command Palette.
+/// Used to track session search activity for telemetry.
+/// </summary>
+public record SearchQueryMessage();
--- a/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/Messages/SessionDurationMessage.cs
+++ b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/Messages/SessionDurationMessage.cs
@@ -0,0 +1,11 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+namespace Microsoft.CmdPal.Core.ViewModels.Messages;
+
+/// <summary>
+/// Message containing session telemetry data from Command Palette launch to dismissal.
+/// Used to aggregate metrics like duration, commands executed, pages visited, and search activity.
+/// </summary>
+public record SessionDurationMessage(ulong DurationMs, int CommandsExecuted, int PagesVisited, string DismissalReason, int SearchQueriesCount, int MaxNavigationDepth, int ErrorCount);
--- a/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/Messages/TelemetryBeginInvokeMessage.cs
+++ b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/Messages/TelemetryBeginInvokeMessage.cs
@@ -0,0 +1,10 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+namespace Microsoft.CmdPal.Core.ViewModels.Messages;
+
+/// <summary>
+/// Telemetry message sent when command invocation begins.
+/// </summary>
+public record TelemetryBeginInvokeMessage;
--- a/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/Messages/TelemetryExtensionInvokedMessage.cs
+++ b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/Messages/TelemetryExtensionInvokedMessage.cs
@@ -0,0 +1,11 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+namespace Microsoft.CmdPal.Core.ViewModels.Messages;
+
+/// <summary>
+/// Telemetry message sent when an extension command or page is invoked.
+/// Captures extension usage metrics for telemetry tracking.
+/// </summary>
+public record TelemetryExtensionInvokedMessage(string ExtensionId, string CommandId, string CommandName, bool Success, ulong ExecutionTimeMs);
--- a/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/Messages/TelemetryInvokeResultMessage.cs
+++ b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/Messages/TelemetryInvokeResultMessage.cs
@@ -0,0 +1,10 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+namespace Microsoft.CmdPal.Core.ViewModels.Messages;
+
+/// <summary>
+/// Telemetry message sent when command invocation completes with a result.
+/// </summary>
+public record TelemetryInvokeResultMessage(Microsoft.CommandPalette.Extensions.CommandResultKind Kind);
--- a/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/ShellViewModel.cs
+++ b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/ShellViewModel.cs
@@ -270,8 +270,18 @@ public partial class ShellViewModel : ObservableObject,
                var isMainPage = command == _rootPage;
                _isNested = !isMainPage;

+                // Telemetry: Track extension page navigation for session metrics
+                if (host is not null)
+                {
+                    string extensionId = host.GetExtensionDisplayName() ?? "builtin";
+                    string commandId = command?.Id ?? "unknown";
+                    string commandName = command?.Name ?? "unknown";
+                    WeakReferenceMessenger.Default.Send<TelemetryExtensionInvokedMessage>(
+                        new(extensionId, commandId, commandName, true, 0));
+                }
+
                // Construct our ViewModel of the appropriate type and pass it the UI Thread context.
-                var pageViewModel = _pageViewModelFactory.TryCreatePageViewModel(page, _isNested, host);
+                var pageViewModel = _pageViewModelFactory.TryCreatePageViewModel(page, _isNested, host!);
                if (pageViewModel is null)
                {
                    CoreLogger.LogError($"Failed to create ViewModel for page {page.GetType().Name}");
@@ -306,7 +316,7 @@ public partial class ShellViewModel : ObservableObject,
            {
                CoreLogger.LogDebug($"Invoking command");

-                WeakReferenceMessenger.Default.Send<BeginInvokeMessage>();
+                WeakReferenceMessenger.Default.Send<TelemetryBeginInvokeMessage>();
                StartInvoke(message, invokable, host);
            }
        }
@@ -339,6 +349,14 @@ public partial class ShellViewModel : ObservableObject,

    private void SafeHandleInvokeCommandSynchronous(PerformCommandMessage message, IInvokableCommand invokable, AppExtensionHost? host)
    {
+        // Telemetry: Track command execution time and success
+        var stopwatch = System.Diagnostics.Stopwatch.StartNew();
+        var command = message.Command.Unsafe;
+        string extensionId = host?.GetExtensionDisplayName() ?? "builtin";
+        string commandId = command?.Id ?? "unknown";
+        string commandName = command?.Name ?? "unknown";
+        bool success = false;
+
        try
        {
            // Call out to extension process.
@@ -349,16 +367,28 @@ public partial class ShellViewModel : ObservableObject,
            // But if it did succeed, we need to handle the result.
            UnsafeHandleCommandResult(result);

+            success = true;
            _handleInvokeTask = null;
        }
        catch (Exception ex)
        {
+            success = false;
            _handleInvokeTask = null;

+            // Telemetry: Track errors for session metrics
+            WeakReferenceMessenger.Default.Send<ErrorOccurredMessage>(new());
+
            // TODO: It would be better to do this as a page exception, rather
            // than a silent log message.
            host?.Log(ex.Message);
        }
+        finally
+        {
+            // Telemetry: Send extension invocation metrics (always sent, even on failure)
+            stopwatch.Stop();
+            WeakReferenceMessenger.Default.Send<TelemetryExtensionInvokedMessage>(
+                new(extensionId, commandId, commandName, success, (ulong)stopwatch.ElapsedMilliseconds));
+        }
    }

    private void UnsafeHandleCommandResult(ICommandResult? result)
@@ -372,7 +402,7 @@ public partial class ShellViewModel : ObservableObject,
        var kind = result.Kind;
        CoreLogger.LogDebug($"handling {kind.ToString()}");

-        WeakReferenceMessenger.Default.Send<CmdPalInvokeResultMessage>(new(kind));
+        WeakReferenceMessenger.Default.Send<TelemetryInvokeResultMessage>(new(kind));
        switch (kind)
        {
            case CommandResultKind.Dismiss:
--- a/src/modules/cmdpal/CoreCommonProps.props
+++ b/src/modules/cmdpal/CoreCommonProps.props
@@ -6,12 +6,12 @@
    <!-- For MVVM Toolkit Partial Properties/AOT support -->
    <LangVersion>preview</LangVersion>

-    <OutputPath>$(SolutionDir)$(Platform)\$(Configuration)\WinUI3Apps\CmdPal\</OutputPath>
+    <OutputPath>..\..\..\$(Platform)\$(Configuration)\WinUI3Apps\CmdPal\</OutputPath>
    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
    <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
    <!-- MRT from windows app sdk will search for a pri file with the same name of the module before defaulting to resources.pri -->
    <ProjectPriFileName>$(RootNamespace).pri</ProjectPriFileName>
-    
+
    <!-- Disable SA1313 for Primary Constructor fields conflict https://learn.microsoft.com/dotnet/csharp/programming-guide/classes-and-structs/instance-constructors#primary-constructors  -->
    <NoWarn>SA1313;</NoWarn>

@@ -42,5 +42,5 @@
      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
    </EmbeddedResource>
  </ItemGroup>
-		
+
 </Project>
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/CommandPaletteHost.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/CommandPaletteHost.cs
@@ -34,6 +34,6 @@ public sealed partial class CommandPaletteHost : AppExtensionHost, IExtensionHos

    public override string? GetExtensionDisplayName()
    {
-        return Extension?.ExtensionDisplayName;
+        return Extension?.ExtensionDisplayName ?? _builtInProvider?.DisplayName ?? _builtInProvider?.Id;
    }
 }
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/CommandProviderWrapper.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/CommandProviderWrapper.cs
@@ -188,11 +188,12 @@ public sealed class CommandProviderWrapper
        Func<ICommandItem?, bool, TopLevelViewModel> makeAndAdd = (ICommandItem? i, bool fallback) =>
        {
            CommandItemViewModel commandItemViewModel = new(new(i), pageContext);
-            TopLevelViewModel topLevelViewModel = new(commandItemViewModel, fallback, ExtensionHost, ProviderId, settings, providerSettings, serviceProvider);
+            TopLevelViewModel topLevelViewModel = new(commandItemViewModel, fallback, ExtensionHost, ProviderId, settings, providerSettings, serviceProvider, i);
            topLevelViewModel.InitializeProperties();

            return topLevelViewModel;
        };
+
        if (commands is not null)
        {
            TopLevelItems = commands
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Commands/BuiltInsCommandProvider.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Commands/BuiltInsCommandProvider.cs
@@ -2,7 +2,6 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.

-using Microsoft.CmdPal.Core.ViewModels.Messages;
 using Microsoft.CommandPalette.Extensions;
 using Microsoft.CommandPalette.Extensions.Toolkit;

@@ -27,7 +26,13 @@ public sealed partial class BuiltInsCommandProvider : CommandProvider

    public override IFallbackCommandItem[] FallbackCommands() =>
        [
-            new FallbackCommandItem(quitCommand, displayTitle: Properties.Resources.builtin_quit_subtitle) { Subtitle = Properties.Resources.builtin_quit_subtitle },
+            new FallbackCommandItem(
+                    quitCommand,
+                    Properties.Resources.builtin_quit_subtitle,
+                    quitCommand.Id)
+            {
+                Subtitle = Properties.Resources.builtin_quit_subtitle,
+            },
            _fallbackReloadItem,
            _fallbackLogItem,
        ];
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Commands/FallbackLogItem.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Commands/FallbackLogItem.cs
@@ -13,8 +13,10 @@ internal sealed partial class FallbackLogItem : FallbackCommandItem
 {
    private readonly LogMessagesPage _logMessagesPage;

+    private const string _id = "com.microsoft.cmdpal.log";
+
    public FallbackLogItem()
-        : base(new LogMessagesPage() { Id = "com.microsoft.cmdpal.log" }, Resources.builtin_log_subtitle)
+        : base(new LogMessagesPage() { Id = _id }, Resources.builtin_log_subtitle, _id)
    {
        _logMessagesPage = (LogMessagesPage)Command!;
        Title = string.Empty;
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Commands/FallbackReloadItem.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Commands/FallbackReloadItem.cs
@@ -2,7 +2,6 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.

-using System;
 using Microsoft.CommandPalette.Extensions.Toolkit;

 namespace Microsoft.CmdPal.UI.ViewModels.BuiltinCommands;
@@ -11,10 +10,13 @@ internal sealed partial class FallbackReloadItem : FallbackCommandItem
 {
    private readonly ReloadExtensionsCommand _reloadCommand;

+    private const string _id = "com.microsoft.cmdpal.reload";
+
    public FallbackReloadItem()
        : base(
-            new ReloadExtensionsCommand() { Id = "com.microsoft.cmdpal.reload" },
-            Properties.Resources.builtin_reload_display_title)
+            new ReloadExtensionsCommand() { Id = _id },
+            Properties.Resources.builtin_reload_display_title,
+            _id)
    {
        _reloadCommand = (ReloadExtensionsCommand)Command!;
        Title = string.Empty;
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Commands/MainListPage.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Commands/MainListPage.cs
@@ -17,7 +17,6 @@ using Microsoft.CmdPal.UI.ViewModels.Messages;
 using Microsoft.CmdPal.UI.ViewModels.Properties;
 using Microsoft.CommandPalette.Extensions;
 using Microsoft.CommandPalette.Extensions.Toolkit;
-using Microsoft.Extensions.DependencyInjection;

 namespace Microsoft.CmdPal.UI.ViewModels.MainPage;

@@ -29,26 +28,17 @@ public partial class MainListPage : DynamicListPage,
    IRecipient<ClearSearchMessage>,
    IRecipient<UpdateFallbackItemsMessage>, IDisposable
 {
-    private readonly string[] _specialFallbacks = [
-        "com.microsoft.cmdpal.builtin.run",
-        "com.microsoft.cmdpal.builtin.calculator",
-        "com.microsoft.cmdpal.builtin.system",
-        "com.microsoft.cmdpal.builtin.core",
-        "com.microsoft.cmdpal.builtin.websearch",
-        "com.microsoft.cmdpal.builtin.windowssettings",
-        "com.microsoft.cmdpal.builtin.datetime",
-        "com.microsoft.cmdpal.builtin.remotedesktop",
-    ];
-
-    private readonly IServiceProvider _serviceProvider;
    private readonly TopLevelCommandManager _tlcManager;
+    private readonly AliasManager _aliasManager;
+    private readonly SettingsModel _settings;
+    private readonly AppStateModel _appStateModel;
    private List<Scored<IListItem>>? _filteredItems;
    private List<Scored<IListItem>>? _filteredApps;
-    private List<Scored<IListItem>>? _fallbackItems;

    // Keep as IEnumerable for deferred execution. Fallback item titles are updated
    // asynchronously, so scoring must happen lazily when GetItems is called.
    private IEnumerable<Scored<IListItem>>? _scoredFallbackItems;
+    private IEnumerable<Scored<IListItem>>? _fallbackItems;
    private bool _includeApps;
    private bool _filteredItemsIncludesApps;
    private int _appResultLimit = 10;
@@ -58,14 +48,16 @@ public partial class MainListPage : DynamicListPage,

    private CancellationTokenSource? _cancellationTokenSource;

-    public MainListPage(IServiceProvider serviceProvider)
+    public MainListPage(TopLevelCommandManager topLevelCommandManager, SettingsModel settings, AliasManager aliasManager, AppStateModel appStateModel)
    {
        Title = Resources.builtin_home_name;
        Icon = IconHelpers.FromRelativePath("Assets\\StoreLogo.scale-200.png");
        PlaceholderText = Properties.Resources.builtin_main_list_page_searchbar_placeholder;
-        _serviceProvider = serviceProvider;

-        _tlcManager = _serviceProvider.GetService<TopLevelCommandManager>()!;
+        _settings = settings;
+        _aliasManager = aliasManager;
+        _appStateModel = appStateModel;
+        _tlcManager = topLevelCommandManager;
        _tlcManager.PropertyChanged += TlcManager_PropertyChanged;
        _tlcManager.TopLevelCommands.CollectionChanged += Commands_CollectionChanged;

@@ -83,7 +75,6 @@ public partial class MainListPage : DynamicListPage,
        WeakReferenceMessenger.Default.Register<ClearSearchMessage>(this);
        WeakReferenceMessenger.Default.Register<UpdateFallbackItemsMessage>(this);

-        var settings = _serviceProvider.GetService<SettingsModel>()!;
        settings.SettingsChanged += SettingsChangedHandler;
        HotReloadSettings(settings);
        _includeApps = _tlcManager.IsProviderActive(AllAppsCommandProvider.WellKnownId);
@@ -163,14 +154,29 @@ public partial class MainListPage : DynamicListPage,
        {
            // Either return the top-level commands (no search text), or the merged and
            // filtered results.
-            return string.IsNullOrEmpty(SearchText)
-                ? _tlcManager.TopLevelCommands.Where(tlc => !tlc.IsFallback && !string.IsNullOrEmpty(tlc.Title)).ToArray()
-                : MainListPageResultFactory.Create(
+            if (string.IsNullOrWhiteSpace(SearchText))
+            {
+                return _tlcManager.TopLevelCommands
+                    .Where(tlc => !tlc.IsFallback && !string.IsNullOrEmpty(tlc.Title))
+                    .ToArray();
+            }
+            else
+            {
+                var validScoredFallbacks = _scoredFallbackItems?
+                    .Where(s => !string.IsNullOrWhiteSpace(s.Item.Title))
+                    .ToList();
+
+                var validFallbacks = _fallbackItems?
+                    .Where(s => !string.IsNullOrWhiteSpace(s.Item.Title))
+                    .ToList();
+
+                return MainListPageResultFactory.Create(
                    _filteredItems,
-                    _scoredFallbackItems?.ToList(),
+                    validScoredFallbacks,
                    _filteredApps,
-                    _fallbackItems,
+                    validFallbacks,
                    _appResultLimit);
+            }
        }
    }

@@ -200,7 +206,7 @@ public partial class MainListPage : DynamicListPage,
        // Handle changes to the filter text here
        if (!string.IsNullOrEmpty(SearchText))
        {
-            var aliases = _serviceProvider.GetService<AliasManager>()!;
+            var aliases = _aliasManager;

            if (token.IsCancellationRequested)
            {
@@ -236,7 +242,8 @@ public partial class MainListPage : DynamicListPage,
            }

            // prefilter fallbacks
-            var specialFallbacks = new List<TopLevelViewModel>(_specialFallbacks.Length);
+            var globalFallbacks = _settings.GetGlobalFallbacks();
+            var specialFallbacks = new List<TopLevelViewModel>(globalFallbacks.Length);
            var commonFallbacks = new List<TopLevelViewModel>();

            foreach (var s in commands)
@@ -246,7 +253,7 @@ public partial class MainListPage : DynamicListPage,
                    continue;
                }

-                if (_specialFallbacks.Contains(s.CommandProviderId))
+                if (globalFallbacks.Contains(s.Id))
                {
                    specialFallbacks.Add(s);
                }
@@ -369,7 +376,7 @@ public partial class MainListPage : DynamicListPage,
                }
            }

-            var history = _serviceProvider.GetService<AppStateModel>()!.RecentCommands!;
+            var history = _appStateModel.RecentCommands!;
            Func<string, IListItem, int> scoreItem = (a, b) => { return ScoreTopLevelItem(a, b, history); };

            // Produce a list of everything that matches the current filter.
@@ -380,7 +387,7 @@ public partial class MainListPage : DynamicListPage,
                return;
            }

-            IEnumerable<IListItem> newFallbacksForScoring = commands.Where(s => s.IsFallback && _specialFallbacks.Contains(s.CommandProviderId));
+            IEnumerable<IListItem> newFallbacksForScoring = commands.Where(s => s.IsFallback && globalFallbacks.Contains(s.Id));

            if (token.IsCancellationRequested)
            {
@@ -394,8 +401,8 @@ public partial class MainListPage : DynamicListPage,
                return;
            }

-            // Defaulting scored to 1 but we'll eventually use user rankings
-            _fallbackItems = [.. newFallbacks.Select(f => new Scored<IListItem> { Item = f, Score = 1 })];
+            Func<string, IListItem, int> scoreFallbackItem = (a, b) => { return ScoreFallbackItem(a, b, _settings.FallbackRanks); };
+            _fallbackItems = [.. ListHelpers.FilterListWithScores<IListItem>(newFallbacks ?? [], SearchText, scoreFallbackItem)];

            if (token.IsCancellationRequested)
            {
@@ -464,9 +471,8 @@ public partial class MainListPage : DynamicListPage,

    private bool ActuallyLoading()
    {
-        var tlcManager = _serviceProvider.GetService<TopLevelCommandManager>()!;
        var allApps = AllAppsCommandProvider.Page;
-        return allApps.IsLoading || tlcManager.IsLoading;
+        return allApps.IsLoading || _tlcManager.IsLoading;
    }

    // Almost verbatim ListHelpers.ScoreListItem, but also accounting for the
@@ -558,13 +564,30 @@ public partial class MainListPage : DynamicListPage,
        return (int)finalScore;
    }

+    internal static int ScoreFallbackItem(string query, IListItem topLevelOrAppItem, string[] fallbackRanks)
+    {
+        // Default to 1 so it always shows in list.
+        var finalScore = 1;
+
+        if (topLevelOrAppItem is TopLevelViewModel topLevelViewModel)
+        {
+            var index = Array.IndexOf(fallbackRanks, topLevelViewModel.Id);
+
+            if (index >= 0)
+            {
+                finalScore = fallbackRanks.Length - index + 1;
+            }
+        }
+
+        return finalScore;
+    }
+
    public void UpdateHistory(IListItem topLevelOrAppItem)
    {
        var id = IdForTopLevelOrAppItem(topLevelOrAppItem);
-        var state = _serviceProvider.GetService<AppStateModel>()!;
-        var history = state.RecentCommands;
+        var history = _appStateModel.RecentCommands;
        history.AddHistoryItem(id);
-        AppStateModel.SaveState(state);
+        AppStateModel.SaveState(_appStateModel);
    }

    private static string IdForTopLevelOrAppItem(IListItem topLevelOrAppItem)
@@ -596,10 +619,9 @@ public partial class MainListPage : DynamicListPage,
        _tlcManager.PropertyChanged -= TlcManager_PropertyChanged;
        _tlcManager.TopLevelCommands.CollectionChanged -= Commands_CollectionChanged;

-        var settings = _serviceProvider.GetService<SettingsModel>();
-        if (settings is not null)
+        if (_settings is not null)
        {
-            settings.SettingsChanged -= SettingsChangedHandler;
+            _settings.SettingsChanged -= SettingsChangedHandler;
        }

        WeakReferenceMessenger.Default.UnregisterAll(this);
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Commands/MainListPageResultFactory.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Commands/MainListPageResultFactory.cs
@@ -29,13 +29,19 @@ internal static class MainListPageResultFactory
        }

        int len1 = filteredItems?.Count ?? 0;
+
+        // Empty fallbacks are removed prior to this merge.
        int len2 = scoredFallbackItems?.Count ?? 0;

        // Apps are pre-sorted, so we just need to take the top N, limited by appResultLimit.
        int len3 = Math.Min(filteredApps?.Count ?? 0, appResultLimit);

+        int nonEmptyFallbackCount = fallbackItems?.Count ?? 0;
+
        // Allocate the exact size of the result array.
-        int totalCount = len1 + len2 + len3 + GetNonEmptyFallbackItemsCount(fallbackItems);
+        // We'll add an extra slot for the fallbacks section header if needed.
+        int totalCount = len1 + len2 + len3 + nonEmptyFallbackCount + (nonEmptyFallbackCount > 0 ? 1 : 0);
+
        var result = new IListItem[totalCount];

        // Three-way stable merge of already-sorted lists.
@@ -119,9 +125,15 @@ internal static class MainListPageResultFactory
        }

        // Append filtered fallback items. Fallback items are added post-sort so they are
-        // always at the end of the list and eventually ordered based on user preference.
+        // always at the end of the list and are sorted by user settings.
        if (fallbackItems is not null)
        {
+            // Create the fallbacks section header
+            if (fallbackItems.Count > 0)
+            {
+                result[writePos++] = new Separator(Properties.Resources.fallbacks);
+            }
+
            for (int i = 0; i < fallbackItems.Count; i++)
            {
                var item = fallbackItems[i].Item;
@@ -143,7 +155,7 @@ internal static class MainListPageResultFactory
        {
            for (int i = 0; i < fallbackItems.Count; i++)
            {
-                if (!string.IsNullOrEmpty(fallbackItems[i].Item.Title))
+                if (!string.IsNullOrWhiteSpace(fallbackItems[i].Item.Title))
                {
                    fallbackItemsCount++;
                }
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/FallbackSettings.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/FallbackSettings.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.
+
+using System.Text.Json.Serialization;
+
+namespace Microsoft.CmdPal.UI.ViewModels;
+
+public class FallbackSettings
+{
+    public bool IsEnabled { get; set; } = true;
+
+    public bool IncludeInGlobalResults { get; set; }
+
+    public FallbackSettings()
+    {
+    }
+
+    public FallbackSettings(bool isBuiltIn)
+    {
+        IncludeInGlobalResults = isBuiltIn;
+    }
+
+    [JsonConstructor]
+    public FallbackSettings(bool isEnabled, bool includeInGlobalResults)
+    {
+        IsEnabled = isEnabled;
+        IncludeInGlobalResults = includeInGlobalResults;
+    }
+}
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/FallbackSettingsViewModel.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/FallbackSettingsViewModel.cs
@@ -0,0 +1,86 @@
+// 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 CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.Messaging;
+using Microsoft.CmdPal.Core.ViewModels;
+using Microsoft.CmdPal.UI.ViewModels.Messages;
+
+namespace Microsoft.CmdPal.UI.ViewModels;
+
+public partial class FallbackSettingsViewModel : ObservableObject
+{
+    private readonly SettingsModel _settings;
+    private readonly FallbackSettings _fallbackSettings;
+
+    public string DisplayName { get; private set; } = string.Empty;
+
+    public IconInfoViewModel Icon { get; private set; } = new(null);
+
+    public string Id { get; private set; } = string.Empty;
+
+    public bool IsEnabled
+    {
+        get => _fallbackSettings.IsEnabled;
+        set
+        {
+            if (value != _fallbackSettings.IsEnabled)
+            {
+                _fallbackSettings.IsEnabled = value;
+
+                if (!_fallbackSettings.IsEnabled)
+                {
+                    _fallbackSettings.IncludeInGlobalResults = false;
+                }
+
+                Save();
+                OnPropertyChanged(nameof(IsEnabled));
+            }
+        }
+    }
+
+    public bool IncludeInGlobalResults
+    {
+        get => _fallbackSettings.IncludeInGlobalResults;
+        set
+        {
+            if (value != _fallbackSettings.IncludeInGlobalResults)
+            {
+                _fallbackSettings.IncludeInGlobalResults = value;
+
+                if (!_fallbackSettings.IsEnabled)
+                {
+                    _fallbackSettings.IsEnabled = true;
+                }
+
+                Save();
+                OnPropertyChanged(nameof(IncludeInGlobalResults));
+            }
+        }
+    }
+
+    public FallbackSettingsViewModel(
+    TopLevelViewModel fallback,
+    FallbackSettings fallbackSettings,
+    SettingsModel settingsModel,
+    ProviderSettingsViewModel providerSettings)
+    {
+        _settings = settingsModel;
+        _fallbackSettings = fallbackSettings;
+
+        Id = fallback.Id;
+        DisplayName = string.IsNullOrWhiteSpace(fallback.DisplayTitle)
+            ? (string.IsNullOrWhiteSpace(fallback.Title) ? providerSettings.DisplayName : fallback.Title)
+            : fallback.DisplayTitle;
+
+        Icon = new(fallback.InitialIcon);
+        Icon.InitializeProperties();
+    }
+
+    private void Save()
+    {
+        SettingsModel.SaveSettings(_settings);
+        WeakReferenceMessenger.Default.Send<ReloadCommandsMessage>(new());
+    }
+}
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Properties/Resources.Designer.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Properties/Resources.Designer.cs
@@ -205,7 +205,7 @@ namespace Microsoft.CmdPal.UI.ViewModels.Properties {
        }
        
        /// <summary>
-        ///   Looks up a localized string similar to Create a new extension.
+        ///   Looks up a localized string similar to Create extension.
        /// </summary>
        public static string builtin_create_extension_title {
            get {
@@ -349,7 +349,7 @@ namespace Microsoft.CmdPal.UI.ViewModels.Properties {
        }
        
        /// <summary>
-        ///   Looks up a localized string similar to Creates a project for a new Command Palette extension.
+        ///   Looks up a localized string similar to Generate a new Command Palette extension project.
        /// </summary>
        public static string builtin_new_extension_subtitle {
            get {
@@ -358,7 +358,7 @@ namespace Microsoft.CmdPal.UI.ViewModels.Properties {
        }
        
        /// <summary>
-        ///   Looks up a localized string similar to Open Settings.
+        ///   Looks up a localized string similar to Open Command Palette settings.
        /// </summary>
        public static string builtin_open_settings_name {
            get {
@@ -366,15 +366,6 @@ namespace Microsoft.CmdPal.UI.ViewModels.Properties {
            }
        }
        
-        /// <summary>
-        ///   Looks up a localized string similar to Open Command Palette settings.
-        /// </summary>
-        public static string builtin_open_settings_subtitle {
-            get {
-                return ResourceManager.GetString("builtin_open_settings_subtitle", resourceCulture);
-            }
-        }
-        
        /// <summary>
        ///   Looks up a localized string similar to Exit Command Palette.
        /// </summary>
@@ -437,5 +428,14 @@ namespace Microsoft.CmdPal.UI.ViewModels.Properties {
                return ResourceManager.GetString("builtin_settings_extension_n_extensions_installed", resourceCulture);
            }
        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Fallbacks.
+        /// </summary>
+        public static string fallbacks {
+            get {
+                return ResourceManager.GetString("fallbacks", resourceCulture);
+            }
+        }
    }
 }
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Properties/Resources.resx
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Properties/Resources.resx
@@ -242,4 +242,7 @@
  <data name="builtin_settings_appearance_pick_background_image_title" xml:space="preserve">
    <value>Pick background image</value>
  </data>
+  <data name="fallbacks" xml:space="preserve">
+    <value>Fallbacks</value>
+  </data>
 </root>
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/ProviderSettings.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/ProviderSettings.cs
@@ -8,9 +8,15 @@ namespace Microsoft.CmdPal.UI.ViewModels;

 public class ProviderSettings
 {
+    // List of built-in fallbacks that should not have global results enabled by default
+    private readonly string[] _excludedBuiltInFallbacks = [
+        "com.microsoft.cmdpal.builtin.indexer.fallback",
+        "com.microsoft.cmdpal.builtin.calculator.fallback",
+        ];
+
    public bool IsEnabled { get; set; } = true;

-    public Dictionary<string, bool> FallbackCommands { get; set; } = [];
+    public Dictionary<string, FallbackSettings> FallbackCommands { get; set; } = new();

    [JsonIgnore]
    public string ProviderDisplayName { get; set; } = string.Empty;
@@ -39,19 +45,21 @@ public class ProviderSettings

        ProviderDisplayName = wrapper.DisplayName;

+        if (wrapper.FallbackItems.Length > 0)
+        {
+            foreach (var fallback in wrapper.FallbackItems)
+            {
+                if (!FallbackCommands.ContainsKey(fallback.Id))
+                {
+                    var enableGlobalResults = IsBuiltin && !_excludedBuiltInFallbacks.Contains(fallback.Id);
+                    FallbackCommands[fallback.Id] = new FallbackSettings(enableGlobalResults);
+                }
+            }
+        }
+
        if (string.IsNullOrEmpty(ProviderId))
        {
            throw new InvalidDataException("Did you add a built-in command and forget to set the Id? Make sure you do that!");
        }
    }
-
-    public bool IsFallbackEnabled(TopLevelViewModel command)
-    {
-        return FallbackCommands.TryGetValue(command.Id, out var enabled) ? enabled : true;
-    }
-
-    public void SetFallbackEnabled(TopLevelViewModel command, bool enabled)
-    {
-        FallbackCommands[command.Id] = enabled;
-    }
 }
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/ProviderSettingsViewModel.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/ProviderSettingsViewModel.cs
@@ -9,26 +9,39 @@ using Microsoft.CmdPal.Core.Common.Services;
 using Microsoft.CmdPal.Core.ViewModels;
 using Microsoft.CmdPal.UI.ViewModels.Messages;
 using Microsoft.CmdPal.UI.ViewModels.Properties;
-using Microsoft.Extensions.DependencyInjection;

 namespace Microsoft.CmdPal.UI.ViewModels;

-public partial class ProviderSettingsViewModel(
-    CommandProviderWrapper _provider,
-    ProviderSettings _providerSettings,
-    IServiceProvider _serviceProvider) : ObservableObject
+public partial class ProviderSettingsViewModel : ObservableObject
 {
-    private readonly SettingsModel _settings = _serviceProvider.GetService<SettingsModel>()!;
+    private readonly CommandProviderWrapper _provider;
+    private readonly ProviderSettings _providerSettings;
+    private readonly SettingsModel _settings;
+
    private readonly Lock _initializeSettingsLock = new();
    private Task? _initializeSettingsTask;

+    public ProviderSettingsViewModel(
+        CommandProviderWrapper provider,
+        ProviderSettings providerSettings,
+        SettingsModel settings)
+    {
+        _provider = provider;
+        _providerSettings = providerSettings;
+        _settings = settings;
+
+        LoadingSettings = _provider.Settings?.HasSettings ?? false;
+
+        BuildFallbackViewModels();
+    }
+
    public string DisplayName => _provider.DisplayName;

    public string ExtensionName => _provider.Extension?.ExtensionDisplayName ?? "Built-in";

    public string ExtensionSubtext => IsEnabled ?
        HasFallbackCommands ?
-            $"{ExtensionName}, {TopLevelCommands.Count} commands, {FallbackCommands.Count} fallback commands" :
+            $"{ExtensionName}, {TopLevelCommands.Count} commands, {_provider.FallbackItems?.Length} fallback commands" :
            $"{ExtensionName}, {TopLevelCommands.Count} commands" :
        Resources.builtin_disabled_extension;

@@ -42,7 +55,7 @@ public partial class ProviderSettingsViewModel(
    public IconInfoViewModel Icon => _provider.Icon;

    [ObservableProperty]
-    public partial bool LoadingSettings { get; set; } = _provider.Settings?.HasSettings ?? false;
+    public partial bool LoadingSettings { get; set; }

    public bool IsEnabled
    {
@@ -145,28 +158,29 @@ public partial class ProviderSettingsViewModel(
    }

    [field: AllowNull]
-    public List<TopLevelViewModel> FallbackCommands
-    {
-        get
-        {
-            if (field is null)
-            {
-                field = BuildFallbackViewModels();
-            }
-
-            return field;
-        }
-    }
+    public List<FallbackSettingsViewModel> FallbackCommands { get; set; } = [];

    public bool HasFallbackCommands => _provider.FallbackItems?.Length > 0;

-    private List<TopLevelViewModel> BuildFallbackViewModels()
+    private void BuildFallbackViewModels()
    {
        var thisProvider = _provider;
-        var providersCommands = thisProvider.FallbackItems;
+        var providersFallbackCommands = thisProvider.FallbackItems;

-        // Remember! This comes in on the UI thread!
-        return [.. providersCommands];
+        List<FallbackSettingsViewModel> fallbackViewModels = new(providersFallbackCommands.Length);
+        foreach (var fallbackItem in providersFallbackCommands)
+        {
+            if (_providerSettings.FallbackCommands.TryGetValue(fallbackItem.Id, out var fallbackSettings))
+            {
+                fallbackViewModels.Add(new FallbackSettingsViewModel(fallbackItem, fallbackSettings, _settings, this));
+            }
+            else
+            {
+                fallbackViewModels.Add(new FallbackSettingsViewModel(fallbackItem, new(), _settings, this));
+            }
+        }
+
+        FallbackCommands = fallbackViewModels;
    }

    private void Save() => SettingsModel.SaveSettings(_settings);
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/SettingsModel.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/SettingsModel.cs
@@ -50,6 +50,8 @@ public partial class SettingsModel : ObservableObject

    public Dictionary<string, ProviderSettings> ProviderSettings { get; set; } = [];

+    public string[] FallbackRanks { get; set; } = [];
+
    public Dictionary<string, CommandAlias> Aliases { get; set; } = [];

    public List<TopLevelHotkey> CommandHotkeys { get; set; } = [];
@@ -107,6 +109,25 @@ public partial class SettingsModel : ObservableObject
        return settings;
    }

+    public string[] GetGlobalFallbacks()
+    {
+        var globalFallbacks = new HashSet<string>();
+
+        foreach (var provider in ProviderSettings.Values)
+        {
+            foreach (var fallback in provider.FallbackCommands)
+            {
+                var fallbackSetting = fallback.Value;
+                if (fallbackSetting.IsEnabled && fallbackSetting.IncludeInGlobalResults)
+                {
+                    globalFallbacks.Add(fallback.Key);
+                }
+            }
+        }
+
+        return globalFallbacks.ToArray();
+    }
+
    public static SettingsModel LoadSettings()
    {
        if (string.IsNullOrEmpty(FilePath))
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/SettingsViewModel.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/SettingsViewModel.cs
@@ -4,10 +4,9 @@

 using System.Collections.ObjectModel;
 using System.ComponentModel;
-using Microsoft.CmdPal.Core.Common.Services;
 using Microsoft.CmdPal.UI.ViewModels.Services;
 using Microsoft.CmdPal.UI.ViewModels.Settings;
-using Microsoft.Extensions.DependencyInjection;
+using Microsoft.CommandPalette.Extensions.Toolkit;

 namespace Microsoft.CmdPal.UI.ViewModels;

@@ -27,7 +26,7 @@ public partial class SettingsViewModel : INotifyPropertyChanged
    ];

    private readonly SettingsModel _settings;
-    private readonly IServiceProvider _serviceProvider;
+    private readonly TopLevelCommandManager _topLevelCommandManager;

    public event PropertyChangedEventHandler? PropertyChanged;

@@ -174,38 +173,76 @@ public partial class SettingsViewModel : INotifyPropertyChanged
        }
    }

-    public ObservableCollection<ProviderSettingsViewModel> CommandProviders { get; } = [];
+    public ObservableCollection<ProviderSettingsViewModel> CommandProviders { get; } = new();
+
+    public ObservableCollection<FallbackSettingsViewModel> FallbackRankings { get; set; } = new();

    public SettingsExtensionsViewModel Extensions { get; }

-    public SettingsViewModel(SettingsModel settings, IServiceProvider serviceProvider, TaskScheduler scheduler)
+    public SettingsViewModel(SettingsModel settings, TopLevelCommandManager topLevelCommandManager, TaskScheduler scheduler, IThemeService themeService)
    {
        _settings = settings;
-        _serviceProvider = serviceProvider;
+        _topLevelCommandManager = topLevelCommandManager;

-        var themeService = serviceProvider.GetRequiredService<IThemeService>();
        Appearance = new AppearanceSettingsViewModel(themeService, _settings);

        var activeProviders = GetCommandProviders();
        var allProviderSettings = _settings.ProviderSettings;

+        var fallbacks = new List<FallbackSettingsViewModel>();
+        var currentRankings = _settings.FallbackRanks;
+        var needsSave = false;
+
        foreach (var item in activeProviders)
        {
            var providerSettings = settings.GetProviderSettings(item);

-            var settingsModel = new ProviderSettingsViewModel(item, providerSettings, _serviceProvider);
+            var settingsModel = new ProviderSettingsViewModel(item, providerSettings, _settings);
            CommandProviders.Add(settingsModel);
+
+            fallbacks.AddRange(settingsModel.FallbackCommands);
        }

+        var fallbackRankings = new List<Scored<FallbackSettingsViewModel>>(fallbacks.Count);
+        foreach (var fallback in fallbacks)
+        {
+            var index = currentRankings.IndexOf(fallback.Id);
+            var score = fallbacks.Count;
+
+            if (index >= 0)
+            {
+                score = index;
+            }
+
+            fallbackRankings.Add(new Scored<FallbackSettingsViewModel>() { Item = fallback, Score = score });
+
+            if (index == -1)
+            {
+                needsSave = true;
+            }
+        }
+
+        FallbackRankings = new ObservableCollection<FallbackSettingsViewModel>(fallbackRankings.OrderBy(o => o.Score).Select(fr => fr.Item));
        Extensions = new SettingsExtensionsViewModel(CommandProviders, scheduler);
+
+        if (needsSave)
+        {
+            ApplyFallbackSort();
+        }
    }

    private IEnumerable<CommandProviderWrapper> GetCommandProviders()
    {
-        var manager = _serviceProvider.GetService<TopLevelCommandManager>()!;
-        var allProviders = manager.CommandProviders;
+        var allProviders = _topLevelCommandManager.CommandProviders;
        return allProviders;
    }

+    public void ApplyFallbackSort()
+    {
+        _settings.FallbackRanks = FallbackRankings.Select(s => s.Id).ToArray();
+        Save();
+        PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(FallbackRankings)));
+    }
+
    private void Save() => SettingsModel.SaveSettings(_settings);
 }
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/TopLevelViewModel.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/TopLevelViewModel.cs
@@ -4,11 +4,9 @@

 using System.Collections.ObjectModel;
 using CommunityToolkit.Mvvm.ComponentModel;
-using CommunityToolkit.Mvvm.Messaging;
 using ManagedCommon;
 using Microsoft.CmdPal.Core.ViewModels;
 using Microsoft.CmdPal.Core.ViewModels.Messages;
-using Microsoft.CmdPal.UI.ViewModels.Messages;
 using Microsoft.CmdPal.UI.ViewModels.Settings;
 using Microsoft.CommandPalette.Extensions;
 using Microsoft.CommandPalette.Extensions.Toolkit;
@@ -27,7 +25,9 @@ public sealed partial class TopLevelViewModel : ObservableObject, IListItem, IEx

    private readonly string _commandProviderId;

-    private string IdFromModel => _commandItemViewModel.Command.Id;
+    private string IdFromModel => IsFallback && !string.IsNullOrWhiteSpace(_fallbackId) ? _fallbackId : _commandItemViewModel.Command.Id;
+
+    private string _fallbackId = string.Empty;

    private string _generatedId = string.Empty;

@@ -41,7 +41,7 @@ public sealed partial class TopLevelViewModel : ObservableObject, IListItem, IEx
    [ObservableProperty]
    public partial ObservableCollection<Tag> Tags { get; set; } = [];

-    public string Id => string.IsNullOrEmpty(IdFromModel) ? _generatedId : IdFromModel;
+    public string Id => string.IsNullOrWhiteSpace(IdFromModel) ? _generatedId : IdFromModel;

    public CommandPaletteHost ExtensionHost { get; private set; }

@@ -158,14 +158,20 @@ public sealed partial class TopLevelViewModel : ObservableObject, IListItem, IEx

    public bool IsEnabled
    {
-        get => _providerSettings.IsFallbackEnabled(this);
-        set
+        get
        {
-            if (value != IsEnabled)
+            if (IsFallback)
            {
-                _providerSettings.SetFallbackEnabled(this, value);
-                Save();
-                WeakReferenceMessenger.Default.Send<ReloadCommandsMessage>(new());
+                if (_providerSettings.FallbackCommands.TryGetValue(_fallbackId, out var fallbackSettings))
+                {
+                    return fallbackSettings.IsEnabled;
+                }
+
+                return true;
+            }
+            else
+            {
+                return _providerSettings.IsEnabled;
            }
        }
    }
@@ -177,7 +183,8 @@ public sealed partial class TopLevelViewModel : ObservableObject, IListItem, IEx
        string commandProviderId,
        SettingsModel settings,
        ProviderSettings providerSettings,
-        IServiceProvider serviceProvider)
+        IServiceProvider serviceProvider,
+        ICommandItem? commandItem)
    {
        _serviceProvider = serviceProvider;
        _settings = settings;
@@ -187,6 +194,10 @@ public sealed partial class TopLevelViewModel : ObservableObject, IListItem, IEx

        IsFallback = isFallback;
        ExtensionHost = extensionHost;
+        if (isFallback && commandItem is FallbackCommandItem fallback)
+        {
+            _fallbackId = fallback.Id;
+        }

        item.PropertyChanged += Item_PropertyChanged;

--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/CmdPal.Branding.props
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/CmdPal.Branding.props
@@ -24,7 +24,7 @@

  <ItemGroup>
    <!-- Images -->
-    <Content Include="$(SolutionDir)\src\modules\cmdpal\Microsoft.CmdPal.UI\Assets\$(CmdPalAssetSuffix)\**\*">
+    <Content Include=".\Assets\$(CmdPalAssetSuffix)\**\*">
      <DeploymentContent>true</DeploymentContent>
      <Link>Assets\%(RecursiveDir)%(FileName)%(Extension)</Link>
    </Content>
@@ -35,14 +35,10 @@

    <!-- In the future, when we actually want to support "preview" and "canary",
         add a Package-Pre.appxmanifest, etc. -->
-    <AppxManifest Include="Package.appxmanifest"
-                  Condition="'$(CommandPaletteBranding)'=='Release'" />
-    <AppxManifest Include="Package.appxmanifest"
-                  Condition="'$(CommandPaletteBranding)'=='Preview'" />
-    <AppxManifest Include="Package.appxmanifest"
-                  Condition="'$(CommandPaletteBranding)'=='Canary'" />
-    <AppxManifest Include="Package-Dev.appxmanifest"
-                  Condition="'$(CommandPaletteBranding)'=='' or '$(CommandPaletteBranding)'=='Dev'" />
+    <AppxManifest Include="Package.appxmanifest" Condition="'$(CommandPaletteBranding)'=='Release'" />
+    <AppxManifest Include="Package.appxmanifest" Condition="'$(CommandPaletteBranding)'=='Preview'" />
+    <AppxManifest Include="Package.appxmanifest" Condition="'$(CommandPaletteBranding)'=='Canary'" />
+    <AppxManifest Include="Package-Dev.appxmanifest" Condition="'$(CommandPaletteBranding)'=='' or '$(CommandPaletteBranding)'=='Dev'" />
  </ItemGroup>

 </Project>
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/CmdPal.pre.props
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/CmdPal.pre.props
@@ -7,7 +7,7 @@
  </PropertyGroup>

  <PropertyGroup>
-    <OutputPath>$(SolutionDir)$(Platform)\$(Configuration)\WinUI3Apps\CmdPal</OutputPath>
+    <OutputPath>..\..\..\..\$(Platform)\$(Configuration)\WinUI3Apps\CmdPal</OutputPath>
    <!-- Reset this because the Versioning task might have overwritten it before it knew about OutDir -->
    <AppxPackageDir>$(OutputPath)\AppPackages\</AppxPackageDir>
  </PropertyGroup>
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/FallbackRanker.xaml
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/FallbackRanker.xaml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<UserControl
+    x:Class="Microsoft.CmdPal.UI.Controls.FallbackRanker"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:cmdpalUI="using:Microsoft.CmdPal.UI"
+    xmlns:controls="using:CommunityToolkit.WinUI.Controls"
+    xmlns:converters="using:CommunityToolkit.WinUI.Converters"
+    xmlns:coreViewModels="using:Microsoft.CmdPal.Core.ViewModels"
+    xmlns:cpcontrols="using:Microsoft.CmdPal.UI.Controls"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:helpers="using:Microsoft.CmdPal.UI.Helpers"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:viewModels="using:Microsoft.CmdPal.UI.ViewModels"
+    mc:Ignorable="d">
+
+    <Grid>
+        <ListView
+            Padding="12,0,24,0"
+            AllowDrop="True"
+            CanDragItems="True"
+            CanReorderItems="True"
+            DragItemsCompleted="ListView_DragItemsCompleted"
+            ItemsSource="{x:Bind viewModel.FallbackRankings, Mode=OneWay}"
+            SelectionMode="None">
+            <ListView.ItemTemplate>
+                <DataTemplate x:DataType="viewModels:FallbackSettingsViewModel">
+                    <Grid Padding="4,0,0,0">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="*" />
+                            <ColumnDefinition Width="Auto" />
+                        </Grid.ColumnDefinitions>
+                        <Viewbox Grid.Column="1" Height="18">
+                            <PathIcon Data="M15.5 17C16.3284 17 17 17.6716 17 18.5C17 19.3284 16.3284 20 15.5 20C14.6716 20 14 19.3284 14 18.5C14 17.6716 14.6716 17 15.5 17ZM8.5 17C9.32843 17 10 17.6716 10 18.5C10 19.3284 9.32843 20 8.5 20C7.67157 20 7 19.3284 7 18.5C7 17.6716 7.67157 17 8.5 17ZM15.5 10C16.3284 10 17 10.6716 17 11.5C17 12.3284 16.3284 13 15.5 13C14.6716 13 14 12.3284 14 11.5C14 10.6716 14.6716 10 15.5 10ZM8.5 10C9.32843 10 10 10.6716 10 11.5C10 12.3284 9.32843 13 8.5 13C7.67157 13 7 12.3284 7 11.5C7 10.6716 7.67157 10 8.5 10ZM15.5 3C16.3284 3 17 3.67157 17 4.5C17 5.32843 16.3284 6 15.5 6C14.6716 6 14 5.32843 14 4.5C14 3.67157 14.6716 3 15.5 3ZM8.5 3C9.32843 3 10 3.67157 10 4.5C10 5.32843 9.32843 6 8.5 6C7.67157 6 7 5.32843 7 4.5C7 3.67157 7.67157 3 8.5 3Z" Foreground="{ThemeResource TextFillColorSecondaryBrush}" />
+                        </Viewbox>
+                        <controls:SettingsCard
+                            Width="560"
+                            MinHeight="0"
+                            Padding="8"
+                            Background="Transparent"
+                            BorderThickness="0"
+                            Header="{x:Bind DisplayName}"
+                            ToolTipService.ToolTip="{x:Bind Id}">
+                            <controls:SettingsCard.HeaderIcon>
+                                <cpcontrols:ContentIcon>
+                                    <cpcontrols:ContentIcon.Content>
+                                        <cpcontrols:IconBox
+                                            Width="16"
+                                            Height="16"
+                                            AutomationProperties.AccessibilityView="Raw"
+                                            SourceKey="{x:Bind Icon, Mode=OneWay}"
+                                            SourceRequested="{x:Bind helpers:IconCacheProvider.SourceRequested}" />
+                                    </cpcontrols:ContentIcon.Content>
+                                </cpcontrols:ContentIcon>
+                            </controls:SettingsCard.HeaderIcon>
+                        </controls:SettingsCard>
+                    </Grid>
+                </DataTemplate>
+            </ListView.ItemTemplate>
+            <!--  Customize Size of Item Container from ListView  -->
+            <ListView.ItemsPanel>
+                <ItemsPanelTemplate>
+                    <StackPanel Orientation="Vertical" Spacing="0" />
+                </ItemsPanelTemplate>
+            </ListView.ItemsPanel>
+            <ListView.ItemContainerStyle>
+                <Style BasedOn="{StaticResource DefaultListViewItemStyle}" TargetType="ListViewItem">
+                    <Setter Property="Margin" Value="0" />
+                    <Setter Property="Padding" Value="4" />
+                </Style>
+            </ListView.ItemContainerStyle>
+        </ListView>
+    </Grid>
+</UserControl>
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/FallbackRanker.xaml.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/FallbackRanker.xaml.cs
@@ -0,0 +1,31 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using Microsoft.CmdPal.UI.ViewModels;
+using Microsoft.CmdPal.UI.ViewModels.Services;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.UI.Xaml.Controls;
+
+namespace Microsoft.CmdPal.UI.Controls;
+
+public sealed partial class FallbackRanker : UserControl
+{
+    private readonly TaskScheduler _mainTaskScheduler = TaskScheduler.FromCurrentSynchronizationContext();
+    private SettingsViewModel? viewModel;
+
+    public FallbackRanker()
+    {
+        this.InitializeComponent();
+
+        var settings = App.Current.Services.GetService<SettingsModel>()!;
+        var topLevelCommandManager = App.Current.Services.GetService<TopLevelCommandManager>()!;
+        var themeService = App.Current.Services.GetService<IThemeService>()!;
+        viewModel = new SettingsViewModel(settings, topLevelCommandManager, _mainTaskScheduler, themeService);
+    }
+
+    private void ListView_DragItemsCompleted(ListViewBase sender, DragItemsCompletedEventArgs args)
+    {
+        viewModel?.ApplyFallbackSort();
+    }
+}
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/FallbackRankerDialog.xaml
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/FallbackRankerDialog.xaml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<UserControl
+    x:Class="Microsoft.CmdPal.UI.Controls.FallbackRankerDialog"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:cpcontrols="using:Microsoft.CmdPal.UI.Controls"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    mc:Ignorable="d">
+    <ContentDialog
+        x:Name="FallbackRankerContentDialog"
+        Width="420"
+        MinWidth="420"
+        PrimaryButtonText="OK">
+        <ContentDialog.Title>
+            <TextBlock x:Uid="ManageFallbackRank" />
+        </ContentDialog.Title>
+        <ContentDialog.Resources>
+            <x:Double x:Key="ContentDialogMaxWidth">800</x:Double>
+        </ContentDialog.Resources>
+        <Grid Width="560" MinWidth="420">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="*" />
+            </Grid.RowDefinitions>
+            <TextBlock
+                x:Uid="ManageFallbackOrderDialogDescription"
+                Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                TextWrapping="Wrap" />
+            <Rectangle
+                Grid.Row="1"
+                Height="1"
+                Margin="0,16,0,16"
+                HorizontalAlignment="Stretch"
+                Fill="{ThemeResource DividerStrokeColorDefaultBrush}" />
+            <cpcontrols:FallbackRanker
+                x:Name="FallbackRanker"
+                Grid.Row="2"
+                Margin="-24,0,-24,0" />
+        </Grid>
+    </ContentDialog>
+</UserControl>
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/FallbackRankerDialog.xaml.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/FallbackRankerDialog.xaml.cs
@@ -0,0 +1,33 @@
+// 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.IO;
+using System.Linq;
+using System.Runtime.InteropServices.WindowsRuntime;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Controls.Primitives;
+using Microsoft.UI.Xaml.Data;
+using Microsoft.UI.Xaml.Input;
+using Microsoft.UI.Xaml.Media;
+using Microsoft.UI.Xaml.Navigation;
+using Windows.Foundation;
+using Windows.Foundation.Collections;
+
+namespace Microsoft.CmdPal.UI.Controls;
+
+public sealed partial class FallbackRankerDialog : UserControl
+{
+    public FallbackRankerDialog()
+    {
+        InitializeComponent();
+    }
+
+    public IAsyncOperation<ContentDialogResult> ShowAsync()
+    {
+        return FallbackRankerContentDialog!.ShowAsync()!;
+    }
+}
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/SearchBar.xaml.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/SearchBar.xaml.cs
@@ -379,6 +379,12 @@ public sealed partial class SearchBar : UserControl,
        if (CurrentPageViewModel is not null)
        {
            CurrentPageViewModel.SearchTextBox = FilterBox.Text;
+
+            // Telemetry: Track search query count for session metrics (only non-empty queries)
+            if (!string.IsNullOrWhiteSpace(FilterBox.Text))
+            {
+                WeakReferenceMessenger.Default.Send<SearchQueryMessage>(new());
+            }
        }
    }

--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/WrapPanelCustom/WrapPanel.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/WrapPanelCustom/WrapPanel.cs
@@ -8,6 +8,8 @@ using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 using Windows.Foundation;

+using ToolkitStretchChild = CommunityToolkit.WinUI.Controls.StretchChild;
+
 namespace Microsoft.CmdPal.UI.Controls;

 /// <summary>
@@ -177,9 +179,9 @@ public sealed partial class WrapPanel : Panel
    /// <summary>
    /// Gets or sets a value indicating how to arrange child items
    /// </summary>
-    public StretchChild StretchChild
+    public ToolkitStretchChild StretchChild
    {
-        get { return (StretchChild)GetValue(StretchChildProperty); }
+        get { return (ToolkitStretchChild)GetValue(StretchChildProperty); }
        set { SetValue(StretchChildProperty, value); }
    }

@@ -190,9 +192,9 @@ public sealed partial class WrapPanel : Panel
    public static readonly DependencyProperty StretchChildProperty =
        DependencyProperty.Register(
            nameof(StretchChild),
-            typeof(StretchChild),
+            typeof(ToolkitStretchChild),
            typeof(WrapPanel),
-            new PropertyMetadata(StretchChild.None, LayoutPropertyChanged));
+            new PropertyMetadata(ToolkitStretchChild.None, LayoutPropertyChanged));

    /// <summary>
    /// Identifies the IsFullLine attached dependency property.
@@ -397,7 +399,7 @@ public sealed partial class WrapPanel : Panel
            Arrange(Children[i]);
        }

-        Arrange(Children[lastIndex], StretchChild == StretchChild.Last);
+        Arrange(Children[lastIndex], StretchChild == ToolkitStretchChild.Last);

        if (currentRow.ChildrenRects.Count > 0)
        {
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Events/CmdPalExtensionInvoked.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Events/CmdPalExtensionInvoked.cs
@@ -0,0 +1,56 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System.Diagnostics.CodeAnalysis;
+using System.Diagnostics.Tracing;
+using Microsoft.PowerToys.Telemetry;
+using Microsoft.PowerToys.Telemetry.Events;
+
+namespace Microsoft.CmdPal.UI.Events;
+
+/// <summary>
+/// Tracks extension usage with extension name and invocation details.
+/// Purpose: Identify popular vs. unused plugins and track extension performance.
+/// </summary>
+[EventData]
+[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicProperties)]
+public class CmdPalExtensionInvoked : EventBase, IEvent
+{
+    /// <summary>
+    /// Gets or sets the unique identifier of the extension provider.
+    /// </summary>
+    public string ExtensionId { get; set; }
+
+    /// <summary>
+    /// Gets or sets the non-localized identifier of the command being invoked.
+    /// </summary>
+    public string CommandId { get; set; }
+
+    /// <summary>
+    /// Gets or sets the localized display name of the command being invoked.
+    /// </summary>
+    public string CommandName { get; set; }
+
+    /// <summary>
+    /// Gets or sets whether the command executed successfully.
+    /// </summary>
+    public bool Success { get; set; }
+
+    /// <summary>
+    /// Gets or sets the execution time in milliseconds.
+    /// </summary>
+    public ulong ExecutionTimeMs { get; set; }
+
+    public CmdPalExtensionInvoked(string extensionId, string commandId, string commandName, bool success, ulong executionTimeMs)
+    {
+        EventName = "CmdPal_ExtensionInvoked";
+        ExtensionId = extensionId;
+        CommandId = commandId;
+        CommandName = commandName;
+        Success = success;
+        ExecutionTimeMs = executionTimeMs;
+    }
+
+    public PartA_PrivTags PartA_PrivTags => PartA_PrivTags.ProductAndServiceUsage;
+}
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Events/CmdPalInvokeResult.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Events/CmdPalInvokeResult.cs
@@ -18,6 +18,7 @@ public class CmdPalInvokeResult : EventBase, IEvent

    public CmdPalInvokeResult(CommandResultKind resultKind)
    {
+        EventName = "CmdPal_InvokeResult";
        ResultKind = resultKind.ToString();
    }

--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Events/CmdPalSessionDuration.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Events/CmdPalSessionDuration.cs
@@ -0,0 +1,68 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System.Diagnostics.CodeAnalysis;
+using System.Diagnostics.Tracing;
+using Microsoft.PowerToys.Telemetry;
+using Microsoft.PowerToys.Telemetry.Events;
+
+namespace Microsoft.CmdPal.UI.Events;
+
+/// <summary>
+/// Tracks Command Palette session duration from launch to close.
+/// Purpose: Understand user engagement patterns - quick actions vs. browsing behavior.
+/// </summary>
+[EventData]
+[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicProperties)]
+public class CmdPalSessionDuration : EventBase, IEvent
+{
+    /// <summary>
+    /// Gets or sets the session duration in milliseconds.
+    /// </summary>
+    public ulong DurationMs { get; set; }
+
+    /// <summary>
+    /// Gets or sets the number of commands executed during the session.
+    /// </summary>
+    public int CommandsExecuted { get; set; }
+
+    /// <summary>
+    /// Gets or sets the number of pages visited during the session.
+    /// </summary>
+    public int PagesVisited { get; set; }
+
+    /// <summary>
+    /// Gets or sets the reason for dismissal (Escape, LostFocus, Command, etc.).
+    /// </summary>
+    public string DismissalReason { get; set; }
+
+    /// <summary>
+    /// Gets or sets the number of search queries executed during the session.
+    /// </summary>
+    public int SearchQueriesCount { get; set; }
+
+    /// <summary>
+    /// Gets or sets the maximum navigation depth reached during the session.
+    /// </summary>
+    public int MaxNavigationDepth { get; set; }
+
+    /// <summary>
+    /// Gets or sets the number of errors encountered during the session.
+    /// </summary>
+    public int ErrorCount { get; set; }
+
+    public CmdPalSessionDuration(ulong durationMs, int commandsExecuted, int pagesVisited, string dismissalReason, int searchQueriesCount, int maxNavigationDepth, int errorCount)
+    {
+        EventName = "CmdPal_SessionDuration";
+        DurationMs = durationMs;
+        CommandsExecuted = commandsExecuted;
+        PagesVisited = pagesVisited;
+        DismissalReason = dismissalReason;
+        SearchQueriesCount = searchQueriesCount;
+        MaxNavigationDepth = maxNavigationDepth;
+        ErrorCount = errorCount;
+    }
+
+    public PartA_PrivTags PartA_PrivTags => PartA_PrivTags.ProductAndServiceUsage;
+}
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Helpers/TelemetryForwarder.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Helpers/TelemetryForwarder.cs
@@ -6,40 +6,78 @@ using CommunityToolkit.Mvvm.Messaging;
 using Microsoft.CmdPal.Core.Common.Services;
 using Microsoft.CmdPal.Core.ViewModels.Messages;
 using Microsoft.CmdPal.UI.Events;
+using Microsoft.CommandPalette.Extensions;
 using Microsoft.PowerToys.Telemetry;

 namespace Microsoft.CmdPal.UI;

 /// <summary>
 /// TelemetryForwarder is responsible for forwarding telemetry events from the
-/// command palette core to PowerToys Telemetry.
-/// This allows us to emit telemetry events as messages from the core,
-/// and then handle them by logging to our PT telemetry provider.
-///
-/// We may in the future want to replace this with a more generic "ITelemetryService"
-/// or something similar, but this works for now.
+/// command palette to PowerToys Telemetry.
+/// Listens to telemetry-specific messages from the core layer and logs them to PowerToys telemetry.
+/// Also implements ITelemetryService for dependency injection in extensions.
 /// </summary>
 internal sealed class TelemetryForwarder :
    ITelemetryService,
-    IRecipient<BeginInvokeMessage>,
-    IRecipient<CmdPalInvokeResultMessage>
+    IRecipient<TelemetryBeginInvokeMessage>,
+    IRecipient<TelemetryInvokeResultMessage>,
+    IRecipient<TelemetryExtensionInvokedMessage>
 {
    public TelemetryForwarder()
    {
-        WeakReferenceMessenger.Default.Register<BeginInvokeMessage>(this);
-        WeakReferenceMessenger.Default.Register<CmdPalInvokeResultMessage>(this);
+        WeakReferenceMessenger.Default.Register<TelemetryBeginInvokeMessage>(this);
+        WeakReferenceMessenger.Default.Register<TelemetryInvokeResultMessage>(this);
+        WeakReferenceMessenger.Default.Register<TelemetryExtensionInvokedMessage>(this);
    }

-    public void Receive(CmdPalInvokeResultMessage message)
-    {
-        PowerToysTelemetry.Log.WriteEvent(new CmdPalInvokeResult(message.Kind));
-    }
-
-    public void Receive(BeginInvokeMessage message)
+    // Message handlers for telemetry events from core layer
+    public void Receive(TelemetryBeginInvokeMessage message)
    {
        PowerToysTelemetry.Log.WriteEvent(new BeginInvoke());
    }

+    public void Receive(TelemetryInvokeResultMessage message)
+    {
+        PowerToysTelemetry.Log.WriteEvent(new CmdPalInvokeResult(message.Kind));
+    }
+
+    public void Receive(TelemetryExtensionInvokedMessage message)
+    {
+        PowerToysTelemetry.Log.WriteEvent(new CmdPalExtensionInvoked(
+            message.ExtensionId,
+            message.CommandId,
+            message.CommandName,
+            message.Success,
+            message.ExecutionTimeMs));
+
+        // Increment session counter for commands executed
+        if (App.Current.AppWindow is MainWindow mainWindow)
+        {
+            mainWindow.IncrementCommandsExecuted();
+        }
+    }
+
+    // Static method for logging session duration from UI layer
+    public static void LogSessionDuration(
+        ulong durationMs,
+        int commandsExecuted,
+        int pagesVisited,
+        string dismissalReason,
+        int searchQueriesCount,
+        int maxNavigationDepth,
+        int errorCount)
+    {
+        PowerToysTelemetry.Log.WriteEvent(new CmdPalSessionDuration(
+            durationMs,
+            commandsExecuted,
+            pagesVisited,
+            dismissalReason,
+            searchQueriesCount,
+            maxNavigationDepth,
+            errorCount));
+    }
+
+    // ITelemetryService implementation for dependency injection in extensions
    public void LogRunQuery(string query, int resultCount, ulong durationMs)
    {
        PowerToysTelemetry.Log.WriteEvent(new CmdPalRunQuery(query, resultCount, durationMs));
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/MainWindow.xaml.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/MainWindow.xaml.cs
@@ -52,6 +52,10 @@ public sealed partial class MainWindow : WindowEx,
    IRecipient<ShowWindowMessage>,
    IRecipient<HideWindowMessage>,
    IRecipient<QuitMessage>,
+    IRecipient<NavigateToPageMessage>,
+    IRecipient<NavigationDepthMessage>,
+    IRecipient<SearchQueryMessage>,
+    IRecipient<ErrorOccurredMessage>,
    IRecipient<DragStartedMessage>,
    IRecipient<DragCompletedMessage>,
    IDisposable
@@ -75,6 +79,14 @@ public sealed partial class MainWindow : WindowEx,
    private bool _ignoreHotKeyWhenFullScreen = true;
    private bool _themeServiceInitialized;

+    // Session tracking for telemetry
+    private Stopwatch? _sessionStopwatch;
+    private int _sessionCommandsExecuted;
+    private int _sessionPagesVisited;
+    private int _sessionSearchQueriesCount;
+    private int _sessionMaxNavigationDepth;
+    private int _sessionErrorCount;
+
    private DesktopAcrylicController? _acrylicController;
    private SystemBackdropConfiguration? _configurationSource;
    private TimeSpan _autoGoHomeInterval = Timeout.InfiniteTimeSpan;
@@ -123,6 +135,10 @@ public sealed partial class MainWindow : WindowEx,
        WeakReferenceMessenger.Default.Register<QuitMessage>(this);
        WeakReferenceMessenger.Default.Register<ShowWindowMessage>(this);
        WeakReferenceMessenger.Default.Register<HideWindowMessage>(this);
+        WeakReferenceMessenger.Default.Register<NavigateToPageMessage>(this);
+        WeakReferenceMessenger.Default.Register<NavigationDepthMessage>(this);
+        WeakReferenceMessenger.Default.Register<SearchQueryMessage>(this);
+        WeakReferenceMessenger.Default.Register<ErrorOccurredMessage>(this);
        WeakReferenceMessenger.Default.Register<DragStartedMessage>(this);
        WeakReferenceMessenger.Default.Register<DragCompletedMessage>(this);

@@ -524,6 +540,11 @@ public sealed partial class MainWindow : WindowEx,
    {
        var settings = App.Current.Services.GetService<SettingsModel>()!;

+        // Start session tracking
+        _sessionStopwatch = Stopwatch.StartNew();
+        _sessionCommandsExecuted = 0;
+        _sessionPagesVisited = 0;
+
        ShowHwnd(message.Hwnd, settings.SummonOn);
    }

@@ -532,6 +553,7 @@ public sealed partial class MainWindow : WindowEx,
        // This might come in off the UI thread. Make sure to hop back.
        DispatcherQueue.TryEnqueue(() =>
        {
+            EndSession("Hide");
            HideWindow();
        });
    }
@@ -551,10 +573,67 @@ public sealed partial class MainWindow : WindowEx,
        // This might come in off the UI thread. Make sure to hop back.
        DispatcherQueue.TryEnqueue(() =>
        {
+            EndSession("Dismiss");
            HideWindow();
        });
    }

+    // Session telemetry: Track metrics during the Command Palette session
+    // These receivers increment counters that are sent when EndSession is called
+    public void Receive(NavigateToPageMessage message)
+    {
+        _sessionPagesVisited++;
+    }
+
+    public void Receive(NavigationDepthMessage message)
+    {
+        if (message.Depth > _sessionMaxNavigationDepth)
+        {
+            _sessionMaxNavigationDepth = message.Depth;
+        }
+    }
+
+    public void Receive(SearchQueryMessage message)
+    {
+        _sessionSearchQueriesCount++;
+    }
+
+    public void Receive(ErrorOccurredMessage message)
+    {
+        _sessionErrorCount++;
+    }
+
+    /// <summary>
+    /// Ends the current telemetry session and emits the CmdPal_SessionDuration event.
+    /// Aggregates all session metrics collected since ShowWindow and sends them to telemetry.
+    /// </summary>
+    /// <param name="dismissalReason">The reason the session ended (e.g., Dismiss, Hide, LostFocus).</param>
+    private void EndSession(string dismissalReason)
+    {
+        if (_sessionStopwatch is not null)
+        {
+            _sessionStopwatch.Stop();
+            TelemetryForwarder.LogSessionDuration(
+                (ulong)_sessionStopwatch.ElapsedMilliseconds,
+                _sessionCommandsExecuted,
+                _sessionPagesVisited,
+                dismissalReason,
+                _sessionSearchQueriesCount,
+                _sessionMaxNavigationDepth,
+                _sessionErrorCount);
+            _sessionStopwatch = null;
+        }
+    }
+
+    /// <summary>
+    /// Increments the session commands executed counter for telemetry.
+    /// Called by TelemetryForwarder when an extension command is invoked.
+    /// </summary>
+    internal void IncrementCommandsExecuted()
+    {
+        _sessionCommandsExecuted++;
+    }
+
    private void HideWindow()
    {
        // Cloak our HWND to avoid all animations.
@@ -764,6 +843,7 @@ public sealed partial class MainWindow : WindowEx,
            }

            // This will DWM cloak our window:
+            EndSession("LostFocus");
            HideWindow();

            PowerToysTelemetry.Log.WriteEvent(new CmdPalDismissedOnLostFocus());
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Microsoft.CmdPal.UI.csproj
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Microsoft.CmdPal.UI.csproj
@@ -15,7 +15,7 @@
    <ImplicitUsings>enable</ImplicitUsings>
    <Nullable>enable</Nullable>
    <WindowsAppSDKSelfContained>true</WindowsAppSDKSelfContained>
-  <LangVersion>preview</LangVersion>
+    <LangVersion>preview</LangVersion>

    <Version>$(CmdPalVersion)</Version>

@@ -23,13 +23,14 @@

    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
    <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
+    <UseWinRT>true</UseWinRT>
  </PropertyGroup>
-  
+
  <!-- For debugging purposes, uncomment this block to enable AOT builds -->
-   <!--<PropertyGroup>
+  <!--<PropertyGroup>
    <EnableCmdPalAOT>true</EnableCmdPalAOT>
    <GeneratePackageLocally>true</GeneratePackageLocally>
-  </PropertyGroup>--> 
+  </PropertyGroup>-->

  <PropertyGroup Condition="'$(EnableCmdPalAOT)' == 'true'">
    <SelfContained>true</SelfContained>
@@ -45,7 +46,7 @@
  </PropertyGroup>

  <PropertyGroup>
-    <!-- This lets us actually reference types from Microsoft.Terminal.UI -->
+    <!-- This lets us actually reference types from Microsoft.Terminal.UI and CmdPalKeyboardService -->
    <CsWinRTIncludes>Microsoft.Terminal.UI;CmdPalKeyboardService</CsWinRTIncludes>
    <CsWinRTGeneratedFilesDir>$(OutDir)</CsWinRTGeneratedFilesDir>
  </PropertyGroup>
@@ -70,6 +71,7 @@
    <None Remove="Controls\ColorPalette.xaml" />
    <None Remove="Controls\CommandPalettePreview.xaml" />
    <None Remove="Controls\DevRibbon.xaml" />
+    <None Remove="Controls\FallbackRankerDialog.xaml" />
    <None Remove="Controls\KeyVisual\KeyCharPresenter.xaml" />
    <None Remove="Controls\ScreenPreview.xaml" />
    <None Remove="Controls\SearchBar.xaml" />
@@ -101,7 +103,7 @@
    <PackageReference Include="Microsoft.Windows.SDK.BuildTools" />
    <PackageReference Include="Microsoft.WindowsAppSDK" />
    <PackageReference Include="Microsoft.Xaml.Behaviors.WinUI.Managed" />
-	<PackageReference Include="WinUIEx" />
+    <PackageReference Include="WinUIEx" />
    <PackageReference Include="Microsoft.Windows.CsWin32">
      <PrivateAssets>all</PrivateAssets>
      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
@@ -147,12 +149,16 @@
    <ProjectReference Include="..\ext\Microsoft.CmdPal.Ext.WindowWalker\Microsoft.CmdPal.Ext.WindowWalker.csproj" />
    <ProjectReference Include="..\ext\Microsoft.CmdPal.Ext.WinGet\Microsoft.CmdPal.Ext.WinGet.csproj" />

-    <ProjectReference Include="..\Microsoft.Terminal.UI\Microsoft.Terminal.UI.vcxproj">
-      <ReferenceOutputAssembly>True</ReferenceOutputAssembly>
-      <Private>True</Private>
-      <CopyLocalSatelliteAssemblies>True</CopyLocalSatelliteAssemblies>
+    <ProjectReference Include="$(ProjectDir)\..\Microsoft.Terminal.UI\Microsoft.Terminal.UI.vcxproj">
+      <ReferenceOutputAssembly>False</ReferenceOutputAssembly>
+      <BuildProject>True</BuildProject>
    </ProjectReference>
-
+    <!-- WinRT metadata reference -->
+    <CsWinRTInputs Include="$(OutputPath)\Microsoft.Terminal.UI.winmd" />
+    <!-- Native implementation DLL -->
+    <None Include="$(OutputPath)\Microsoft.Terminal.UI.dll">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
    <ProjectReference Include="..\CmdPalKeyboardService\CmdPalKeyboardService.vcxproj">
      <ReferenceOutputAssembly>True</ReferenceOutputAssembly>
      <Private>True</Private>
@@ -226,6 +232,12 @@
    </Page>
  </ItemGroup>

+  <ItemGroup>
+	  <Page Update="Controls\FallbackRankerDialog.xaml">
+		  <Generator>MSBuild:Compile</Generator>
+	  </Page>
+  </ItemGroup>
+
  <ItemGroup>
    <Page Update="Styles\Theme.Colorful.xaml">
      <SubType>Designer</SubType>
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Pages/ShellPage.xaml.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Pages/ShellPage.xaml.cs
@@ -161,6 +161,9 @@ public sealed partial class ShellPage : Microsoft.UI.Xaml.Controls.Page,

            PowerToysTelemetry.Log.WriteEvent(new OpenPage(RootFrame.BackStackDepth, message.Page.Id));

+            // Telemetry: Send navigation depth for session max depth tracking
+            WeakReferenceMessenger.Default.Send(new NavigationDepthMessage(RootFrame.BackStackDepth));
+
            if (!ViewModel.IsNested)
            {
                // todo BODGY
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/PowerToysRootPageService.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/PowerToysRootPageService.cs
@@ -10,7 +10,6 @@ using Microsoft.CmdPal.Core.ViewModels;
 using Microsoft.CmdPal.UI.ViewModels;
 using Microsoft.CmdPal.UI.ViewModels.MainPage;
 using Microsoft.CommandPalette.Extensions;
-using Microsoft.Extensions.DependencyInjection;
 using WinRT;

 // To learn more about WinUI, the WinUI project structure,
@@ -19,24 +18,24 @@ namespace Microsoft.CmdPal.UI;

 internal sealed class PowerToysRootPageService : IRootPageService
 {
-    private readonly IServiceProvider _serviceProvider;
+    private readonly TopLevelCommandManager _tlcManager;
+
    private IExtensionWrapper? _activeExtension;
    private Lazy<MainListPage> _mainListPage;

-    public PowerToysRootPageService(IServiceProvider serviceProvider)
+    public PowerToysRootPageService(TopLevelCommandManager topLevelCommandManager, SettingsModel settings, AliasManager aliasManager, AppStateModel appStateModel)
    {
-        _serviceProvider = serviceProvider;
+        _tlcManager = topLevelCommandManager;

        _mainListPage = new Lazy<MainListPage>(() =>
        {
-            return new MainListPage(_serviceProvider);
+            return new MainListPage(_tlcManager, settings, aliasManager, appStateModel);
        });
    }

    public async Task PreLoadAsync()
    {
-        var tlcManager = _serviceProvider.GetService<TopLevelCommandManager>()!;
-        await tlcManager.LoadBuiltinsAsync();
+        await _tlcManager.LoadBuiltinsAsync();
    }

    public Microsoft.CommandPalette.Extensions.IPage GetRootPage()
@@ -46,13 +45,11 @@ internal sealed class PowerToysRootPageService : IRootPageService

    public async Task PostLoadRootPageAsync()
    {
-        var tlcManager = _serviceProvider.GetService<TopLevelCommandManager>()!;
-
        // After loading built-ins, and starting navigation, kick off a thread to load extensions.
-        tlcManager.LoadExtensionsCommand.Execute(null);
+        _tlcManager.LoadExtensionsCommand.Execute(null);

-        await tlcManager.LoadExtensionsCommand.ExecutionTask!;
-        if (tlcManager.LoadExtensionsCommand.ExecutionTask.Status != TaskStatus.RanToCompletion)
+        await _tlcManager.LoadExtensionsCommand.ExecutionTask!;
+        if (_tlcManager.LoadExtensionsCommand.ExecutionTask.Status != TaskStatus.RanToCompletion)
        {
            // TODO: Handle failure case
        }
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Settings/AppearancePage.xaml.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Settings/AppearancePage.xaml.cs
@@ -5,6 +5,7 @@
 using System.Diagnostics;
 using ManagedCommon;
 using Microsoft.CmdPal.UI.ViewModels;
+using Microsoft.CmdPal.UI.ViewModels.Services;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.UI;
 using Microsoft.UI.Xaml;
@@ -28,7 +29,9 @@ public sealed partial class AppearancePage : Page
        InitializeComponent();

        var settings = App.Current.Services.GetService<SettingsModel>()!;
-        ViewModel = new SettingsViewModel(settings, App.Current.Services, _mainTaskScheduler);
+        var themeService = App.Current.Services.GetRequiredService<IThemeService>();
+        var topLevelCommandManager = App.Current.Services.GetService<TopLevelCommandManager>()!;
+        ViewModel = new SettingsViewModel(settings, topLevelCommandManager, _mainTaskScheduler, themeService);
    }

    private async void PickBackgroundImage_Click(object sender, RoutedEventArgs e)
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Settings/ExtensionPage.xaml
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Settings/ExtensionPage.xaml
@@ -122,33 +122,65 @@
                                    </ItemsRepeater.ItemTemplate>
                                </ItemsRepeater>

-                                <TextBlock
-                                    x:Uid="ExtensionFallbackCommandsHeader"
-                                    Style="{StaticResource SettingsSectionHeaderTextBlockStyle}"
-                                    Visibility="{x:Bind ViewModel.HasFallbackCommands}" />
+                                <Grid Visibility="{x:Bind ViewModel.HasFallbackCommands}">
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="*" />
+                                        <ColumnDefinition Width="Auto" />
+                                    </Grid.ColumnDefinitions>
+                                    <TextBlock x:Uid="ExtensionFallbackCommandsHeader" Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" />
+                                    <HyperlinkButton
+                                        x:Uid="ManageFallbackRankAutomation"
+                                        Grid.Column="1"
+                                        Margin="0,0,0,4"
+                                        Padding="0"
+                                        VerticalAlignment="Bottom"
+                                        Click="RankButton_Click">
+                                        <HyperlinkButton.Content>
+                                            <StackPanel Orientation="Horizontal" Spacing="8">
+                                                <FontIcon
+                                                    AutomationProperties.AccessibilityView="Raw"
+                                                    FontSize="16"
+                                                    Glyph="&#xE8CB;" />
+                                                <TextBlock x:Uid="ManageFallbackRank" />
+                                            </StackPanel>
+                                        </HyperlinkButton.Content>
+                                    </HyperlinkButton>
+                                </Grid>

                                <ItemsRepeater
                                    ItemsSource="{x:Bind ViewModel.FallbackCommands, Mode=OneWay}"
                                    Layout="{StaticResource VerticalStackLayout}"
                                    Visibility="{x:Bind ViewModel.HasFallbackCommands}">
                                    <ItemsRepeater.ItemTemplate>
-                                        <DataTemplate x:DataType="viewModels:TopLevelViewModel">
-                                            <controls:SettingsCard DataContext="{x:Bind}" Header="{x:Bind DisplayTitle, Mode=OneWay}">
-                                                <controls:SettingsCard.HeaderIcon>
+                                        <DataTemplate x:DataType="viewModels:FallbackSettingsViewModel">
+                                            <controls:SettingsExpander
+                                                Grid.Column="1"
+                                                Header="{x:Bind DisplayName, Mode=OneWay}"
+                                                IsExpanded="False">
+                                                <controls:SettingsExpander.HeaderIcon>
                                                    <cpcontrols:ContentIcon>
                                                        <cpcontrols:ContentIcon.Content>
                                                            <cpcontrols:IconBox
                                                                Width="20"
                                                                Height="20"
                                                                AutomationProperties.AccessibilityView="Raw"
-                                                                SourceKey="{x:Bind InitialIcon, Mode=OneWay}"
+                                                                SourceKey="{x:Bind Icon, Mode=OneWay}"
                                                                SourceRequested="{x:Bind helpers:IconCacheProvider.SourceRequested}" />
                                                        </cpcontrols:ContentIcon.Content>
                                                    </cpcontrols:ContentIcon>
-                                                </controls:SettingsCard.HeaderIcon>
-                                                <!--  Content goes here  -->
+                                                </controls:SettingsExpander.HeaderIcon>
+
                                                <ToggleSwitch IsOn="{x:Bind IsEnabled, Mode=TwoWay}" />
-                                            </controls:SettingsCard>
+
+                                                <controls:SettingsExpander.Items>
+                                                    <controls:SettingsCard ContentAlignment="Left">
+                                                        <cpcontrols:CheckBoxWithDescriptionControl
+                                                            x:Uid="Settings_FallbacksPage_GlobalResults_SettingsCard"
+                                                            IsChecked="{x:Bind IncludeInGlobalResults, Mode=TwoWay}"
+                                                            IsEnabled="{x:Bind IsEnabled, Mode=OneWay}" />
+                                                    </controls:SettingsCard>
+                                                </controls:SettingsExpander.Items>
+                                            </controls:SettingsExpander>
                                        </DataTemplate>
                                    </ItemsRepeater.ItemTemplate>
                                </ItemsRepeater>
@@ -198,7 +230,6 @@
                                        Text="{x:Bind ViewModel.ExtensionVersion}" />
                                </controls:SettingsCard>
                            </StackPanel>
-
                        </controls:Case>

                        <controls:Case Value="False">
@@ -217,5 +248,6 @@
                </StackPanel>
            </Grid>
        </ScrollViewer>
+        <cpcontrols:FallbackRankerDialog x:Name="FallbackRankerDialog" />
    </Grid>
 </Page>
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Settings/ExtensionPage.xaml.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Settings/ExtensionPage.xaml.cs
@@ -25,4 +25,9 @@ public sealed partial class ExtensionPage : Page
            ? vm
            : throw new ArgumentException($"{nameof(ExtensionPage)} navigation args should be passed a {nameof(ProviderSettingsViewModel)}");
    }
+
+    private async void RankButton_Click(object sender, Microsoft.UI.Xaml.RoutedEventArgs e)
+    {
+        await FallbackRankerDialog.ShowAsync();
+    }
 }
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Settings/ExtensionsPage.xaml
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Settings/ExtensionsPage.xaml
@@ -177,6 +177,12 @@
                                                <FontIcon Glyph="&#xE777;" />
                                            </MenuFlyoutItem.Icon>
                                        </MenuFlyoutItem>
+                                        <MenuFlyoutSeparator />
+                                        <MenuFlyoutItem x:Uid="Settings_ExtensionsPage_More_ReorderFallbacks_MenuFlyoutItem" Click="MenuFlyoutItem_OnClick">
+                                            <MenuFlyoutItem.Icon>
+                                                <FontIcon Glyph="&#xE8CB;" />
+                                            </MenuFlyoutItem.Icon>
+                                        </MenuFlyoutItem>
                                    </MenuFlyout>
                                </Button.Flyout>
                                <FontIcon
@@ -240,6 +246,7 @@
                </StackPanel>
            </Grid>
        </ScrollViewer>
+        <cpcontrols:FallbackRankerDialog x:Name="FallbackRankerDialog" />
        <VisualStateManager.VisualStateGroups>
            <VisualStateGroup x:Name="LayoutVisualStates">
                <VisualState x:Name="WideLayout">
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Settings/ExtensionsPage.xaml.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Settings/ExtensionsPage.xaml.cs
@@ -4,7 +4,9 @@

 using CommunityToolkit.Mvvm.Messaging;
 using CommunityToolkit.WinUI.Controls;
+using ManagedCommon;
 using Microsoft.CmdPal.UI.ViewModels;
+using Microsoft.CmdPal.UI.ViewModels.Services;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
@@ -23,7 +25,9 @@ public sealed partial class ExtensionsPage : Page
        this.InitializeComponent();

        var settings = App.Current.Services.GetService<SettingsModel>()!;
-        viewModel = new SettingsViewModel(settings, App.Current.Services, _mainTaskScheduler);
+        var topLevelCommandManager = App.Current.Services.GetService<TopLevelCommandManager>()!;
+        var themeService = App.Current.Services.GetService<IThemeService>()!;
+        viewModel = new SettingsViewModel(settings, topLevelCommandManager, _mainTaskScheduler, themeService);
    }

    private void SettingsCard_Click(object sender, RoutedEventArgs e)
@@ -42,4 +46,16 @@ public sealed partial class ExtensionsPage : Page
        SearchBox?.Focus(FocusState.Keyboard);
        args.Handled = true;
    }
+
+    private async void MenuFlyoutItem_OnClick(object sender, RoutedEventArgs e)
+    {
+        try
+        {
+            await FallbackRankerDialog!.ShowAsync();
+        }
+        catch (Exception ex)
+        {
+            Logger.LogError("Error when showing FallbackRankerDialog", ex);
+        }
+    }
 }
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Settings/GeneralPage.xaml.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Settings/GeneralPage.xaml.cs
@@ -3,6 +3,7 @@
 // See the LICENSE file in the project root for more information.

 using Microsoft.CmdPal.UI.ViewModels;
+using Microsoft.CmdPal.UI.ViewModels.Services;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.UI.Xaml.Controls;
 using Windows.ApplicationModel;
@@ -20,7 +21,9 @@ public sealed partial class GeneralPage : Page
        this.InitializeComponent();

        var settings = App.Current.Services.GetService<SettingsModel>()!;
-        viewModel = new SettingsViewModel(settings, App.Current.Services, _mainTaskScheduler);
+        var topLevelCommandManager = App.Current.Services.GetService<TopLevelCommandManager>()!;
+        var themeService = App.Current.Services.GetService<IThemeService>()!;
+        viewModel = new SettingsViewModel(settings, topLevelCommandManager, _mainTaskScheduler, themeService);
    }

    public string ApplicationVersion
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Strings/en-us/Resources.resw
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Strings/en-us/Resources.resw
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <root>
-  <!--
-    Microsoft ResX Schema
-
+  <!-- 
+    Microsoft ResX Schema 
+    
    Version 2.0
-
-    The primary goals of this format is to allow a simple XML format
-    that is mostly human readable. The generation and parsing of the
-    various data types are done through the TypeConverter classes
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
    associated with the data types.
-
+    
    Example:
-
+    
    ... ado.net/XML headers & schema ...
    <resheader name="resmimetype">text/microsoft-resx</resheader>
    <resheader name="version">2.0</resheader>
@@ -26,36 +26,36 @@
        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
        <comment>This is a comment</comment>
    </data>
-
-    There are any number of "resheader" rows that contain simple
+                
+    There are any number of "resheader" rows that contain simple 
    name/value pairs.
-
-    Each data row contains a name, and value. The row also contains a
-    type or mimetype. Type corresponds to a .NET class that support
-    text/value conversion through the TypeConverter architecture.
-    Classes that don't support this are serialized and stored with the
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
    mimetype set.
-
-    The mimetype is used for serialized objects, and tells the
-    ResXResourceReader how to depersist the object. This is currently not
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
    extensible. For a given mimetype the value must be set accordingly:
-
-    Note - application/x-microsoft.net.object.binary.base64 is the format
-    that the ResXResourceWriter will generate, however the reader can
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
    read any of the formats listed below.
-
+    
    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with
+    value   : The object must be serialized with 
            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
            : and then encoded with base64 encoding.
-
+    
    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with
+    value   : The object must be serialized with 
            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
            : and then encoded with base64 encoding.

    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array
+    value   : The object must be serialized into a byte array 
            : using a System.ComponentModel.TypeConverter
            : and then encoded with base64 encoding.
    -->
@@ -706,4 +706,22 @@ Right-click to remove the key combination, thereby deactivating the shortcut.</v
  <data name="Settings_GeneralPage_AppTheme_Mode_System_Automation.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
    <value>Use system settings</value>
  </data>
+  <data name="Settings_FallbacksPage_GlobalResults_SettingsCard.Header" xml:space="preserve">
+    <value>Include in the Global result</value>
+  </data>
+  <data name="Settings_FallbacksPage_GlobalResults_SettingsCard.Description" xml:space="preserve">
+    <value>Show results on queries without direct activation command</value>
+  </data>
+  <data name="ManageFallbackRankAutomation.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+    <value>Manage fallback order</value>
+  </data>
+  <data name="ManageFallbackRank.Text" xml:space="preserve">
+    <value>Manage fallback order</value>
+  </data>
+  <data name="ManageFallbackOrderDialogDescription.Text" xml:space="preserve">
+    <value>Drag items to set which fallback commands run first; commands at the top take priority.</value>
+  </data>
+  <data name="Settings_ExtensionsPage_More_ReorderFallbacks_MenuFlyoutItem.Text" xml:space="preserve">
+    <value>Manage fallback order</value>
+  </data>
 </root>
--- a/src/modules/cmdpal/Microsoft.Terminal.UI/FontIconGlyphClassifier.cpp
+++ b/src/modules/cmdpal/Microsoft.Terminal.UI/FontIconGlyphClassifier.cpp
@@ -12,9 +12,9 @@ namespace winrt::Microsoft::Terminal::UI::implementation
        // Check if the code point is in the Private Use Area range used by Fluent UI icons.
        [[nodiscard]] constexpr bool _isFluentIconPua(const UChar32 cp) noexcept
        {
-            static constexpr UChar32 _fluentIconsPrivateUseAreaStart = 0xE700;
-            static constexpr UChar32 _fluentIconsPrivateUseAreaEnd = 0xF8FF;
-            return cp >= _fluentIconsPrivateUseAreaStart && cp <= _fluentIconsPrivateUseAreaEnd;
+            constexpr UChar32 fluentIconsPrivateUseAreaStart = 0xE700;
+            constexpr UChar32 fluentIconsPrivateUseAreaEnd = 0xF8FF;
+            return cp >= fluentIconsPrivateUseAreaStart && cp <= fluentIconsPrivateUseAreaEnd;
        }

        // Determine if the given text (as a sequence of UChar code units) is emoji
--- a/src/modules/cmdpal/Microsoft.Terminal.UI/Microsoft.Terminal.UI.vcxproj
+++ b/src/modules/cmdpal/Microsoft.Terminal.UI/Microsoft.Terminal.UI.vcxproj
@@ -1,17 +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.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>
-    <PathToRoot>..\..\..\..\</PathToRoot>
-    <WasdkNuget>$(PathToRoot)packages\Microsoft.WindowsAppSDK.1.8.250907003</WasdkNuget>
+  <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>
  </PropertyGroup>
-  <Import Project="$(WasdkNuget)\build\native\Microsoft.WindowsAppSDK.props" Condition="Exists('$(WasdkNuget)\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')" />
  <PropertyGroup Label="Globals">
    <CppWinRTOptimized>true</CppWinRTOptimized>
    <CppWinRTRootNamespaceAutoMerge>true</CppWinRTRootNamespaceAutoMerge>
@@ -28,6 +27,11 @@
    <WindowsTargetPlatformVersion Condition=" '$(WindowsTargetPlatformVersion)' == '' ">10.0.26100.0</WindowsTargetPlatformVersion>
    <WindowsTargetPlatformMinVersion>10.0.19041.0</WindowsTargetPlatformMinVersion>
  </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" />
  <ItemGroup Label="ProjectConfigurations">
    <ProjectConfiguration Include="Debug|ARM64">
@@ -47,10 +51,6 @@
      <Platform>x64</Platform>
    </ProjectConfiguration>
  </ItemGroup>
-  <PropertyGroup>
-    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\WinUI3Apps\CmdPal</OutDir>
-    <IntDir>obj\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
  <PropertyGroup Label="Configuration">
    <ConfigurationType>DynamicLibrary</ConfigurationType>
    <PlatformToolset>v143</PlatformToolset>
@@ -200,43 +200,11 @@
    <Midl Include="FontIconGlyphClassifier.idl" />
  </ItemGroup>
  <ItemGroup>
-    <None Include="packages.config" />
    <None Include="Microsoft.Terminal.UI.def" />
  </ItemGroup>
+  <PropertyGroup>
+    <OutDir>..\..\..\..\$(Platform)\$(Configuration)\WinUI3Apps\CmdPal</OutDir>
+    <IntDir>obj\$(Platform)\$(Configuration)\</IntDir>
+  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-    <Import Project="$(WasdkNuget)\build\native\Microsoft.WindowsAppSDK.targets" Condition="Exists('$(WasdkNuget)\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')" />
-    <Import Project="..\..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets" Condition="Exists('$(MSBuildThisFileDirectory)..\..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.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.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets')" />
-  </ImportGroup>
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('$(WasdkNuget)\build\native\Microsoft.WindowsAppSDK.props')" Text="$([System.String]::Format('$(ErrorText)', '$(WasdkNuget)\build\native\Microsoft.WindowsAppSDK.props'))" />
-    <Error Condition="!Exists('$(WasdkNuget)\build\native\Microsoft.WindowsAppSDK.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(WasdkNuget)\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'))" />
-    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" Text="$([System.String]::Format('$(ErrorText)', 'Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.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.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>
--- a/src/modules/cmdpal/Microsoft.Terminal.UI/packages.config
+++ b/src/modules/cmdpal/Microsoft.Terminal.UI/packages.config
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- The packages.config acts as the global version for all of the NuGet packages contained within. -->
-<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.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>
--- a/src/modules/cmdpal/Tests/Microsoft.CmdPal.UI.ViewModels.UnitTests/MainListPageResultFactoryTests.cs
+++ b/src/modules/cmdpal/Tests/Microsoft.CmdPal.UI.ViewModels.UnitTests/MainListPageResultFactoryTests.cs
@@ -96,7 +96,7 @@ public partial class MainListPageResultFactoryTests
        var titles = result.Select(r => r.Title).ToArray();
 #pragma warning disable CA1861 // Avoid constant arrays as arguments
        CollectionAssert.AreEqual(
-            new[] { "F1", "SF1", "A1", "SF2", "A2", "F2", "FB1", "FB2" },
+            new[] { "F1", "SF1", "A1", "SF2", "A2", "F2", "Fallbacks", "FB1", "FB2" },
            titles);
 #pragma warning restore CA1861 // Avoid constant arrays as arguments
    }
@@ -129,7 +129,6 @@ public partial class MainListPageResultFactoryTests
        var fallbacks = new List<Scored<IListItem>>
        {
            S("FB1", 0),
-            S(string.Empty, 0),
            S("FB3", 0),
        };

@@ -140,9 +139,10 @@ public partial class MainListPageResultFactoryTests
            fallbacks,
            appResultLimit: 10);

-        Assert.AreEqual(2, result.Length);
-        Assert.AreEqual("FB1", result[0].Title);
-        Assert.AreEqual("FB3", result[1].Title);
+        Assert.AreEqual(3, result.Length);
+        Assert.AreEqual("Fallbacks", result[0].Title);
+        Assert.AreEqual("FB1", result[1].Title);
+        Assert.AreEqual("FB3", result[2].Title);
    }

    [TestMethod]
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Calc/Pages/FallbackCalculatorItem.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Calc/Pages/FallbackCalculatorItem.cs
@@ -10,11 +10,12 @@ namespace Microsoft.CmdPal.Ext.Calc.Pages;

 public sealed partial class FallbackCalculatorItem : FallbackCommandItem
 {
+    private const string _id = "com.microsoft.cmdpal.builtin.calculator.fallback";
    private readonly CopyTextCommand _copyCommand = new(string.Empty);
    private readonly ISettingsInterface _settings;

    public FallbackCalculatorItem(ISettingsInterface settings)
-        : base(new NoOpCommand(), Resources.calculator_title)
+        : base(new NoOpCommand(), Resources.calculator_title, _id)
    {
        Command = _copyCommand;
        _copyCommand.Name = string.Empty;
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/FallbackOpenFileItem.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/FallbackOpenFileItem.cs
@@ -16,7 +16,8 @@ namespace Microsoft.CmdPal.Ext.Indexer;

 internal sealed partial class FallbackOpenFileItem : FallbackCommandItem, System.IDisposable
 {
-    private static readonly NoOpCommand _baseCommandWithId = new() { Id = "com.microsoft.indexer.fallback" };
+    private const string _id = "com.microsoft.cmdpal.builtin.indexer.fallback";
+    private static readonly NoOpCommand _baseCommandWithId = new() { Id = _id };

    private readonly CompositeFormat fallbackItemSearchPageTitleCompositeFormat = CompositeFormat.Parse(Resources.Indexer_fallback_searchPage_title);

@@ -27,7 +28,7 @@ internal sealed partial class FallbackOpenFileItem : FallbackCommandItem, System
    private Func<string, bool> _suppressCallback;

    public FallbackOpenFileItem()
-        : base(_baseCommandWithId, Resources.Indexer_Find_Path_fallback_display_title)
+        : base(_baseCommandWithId, Resources.Indexer_Find_Path_fallback_display_title, _id)
    {
        Title = string.Empty;
        Subtitle = string.Empty;
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.RemoteDesktop/Commands/FallbackRemoteDesktopItem.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.RemoteDesktop/Commands/FallbackRemoteDesktopItem.cs
@@ -28,7 +28,7 @@ internal sealed partial class FallbackRemoteDesktopItem : FallbackCommandItem
    private readonly NoOpCommand _emptyCommand = new NoOpCommand();

    public FallbackRemoteDesktopItem(IRdpConnectionsManager rdpConnectionsManager)
-    : base(Resources.remotedesktop_title)
+    : base(Resources.remotedesktop_title, _id)
    {
        _rdpConnectionsManager = rdpConnectionsManager;

--- a/Show More
+++ b/Show More