Delete unused ps1

Since we switched to running the build on C:\, this test started
failing. C: means "current directory on the C drive"!

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

@@ -94,8 +94,10 @@ ASSOCSTR
 ASYNCWINDOWPLACEMENT
 ASYNCWINDOWPOS
 atl
+ATX
 ATRIOX
 aumid
+authenticode
 Authenticode
 AUTOBUDDY
 AUTOCHECKBOX
@@ -113,6 +115,7 @@ azman
 bbwe
 BCIE
 bck
+backticks
 BESTEFFORT
 bezelled
 bhid
@@ -140,6 +143,7 @@ bmi
 BNumber
 BODGY
 BOklab
+Bootstrappers
 BOOTSTRAPPERINSTALLFOLDER
 BOTTOMALIGN
 boxmodel
@@ -268,6 +272,7 @@ countof
 covrun
 cpcontrols
 cph
+cppcoreguidelines
 cplusplus
 CPower
 cpptools
@@ -373,6 +378,7 @@ devpal
 dfx
 DIALOGEX
 digicert
+diffs
 DINORMAL
 DISABLEASACTIONKEY
 DISABLENOSCROLL
@@ -513,6 +519,7 @@ FARPROC
 fdx
 fesf
 FFFF
+Figma
 FILEEXPLORER
 fileexploreraddons
 fileexplorerpreview
@@ -747,7 +754,7 @@ INITDIALOG
 INITGUID
 INITTOLOGFONTSTRUCT
 INLINEPREFIX
-Inlines
+inlines
 INPC
 inproc
 INPUTHARDWARE
@@ -947,13 +954,13 @@ maxversiontested
 mber
 MBM
 MBR
-mcp
 MDICHILD
 MDL
 mdtext
 mdtxt
 mdwn
 meme
+mcp
 memicmp
 MENUITEMINFO
 MENUITEMINFOW
@@ -1027,6 +1034,7 @@ msiexec
 MSIFASTINSTALL
 MSIHANDLE
 MSIRESTARTMANAGERCONTROL
+MSIs
 msixbundle
 MSIXCA
 MSLLHOOKSTRUCT
@@ -1041,6 +1049,8 @@ multizone
 muxc
 MVPs
 mvvm
+myorg
+myrepo
 MVVMTK
 MWBEx
 MYICON
@@ -1256,6 +1266,7 @@ phwnd
 pici
 pidl
 PIDLIST
+PII
 pinfo
 pinvoke
 pipename
@@ -1451,6 +1462,7 @@ riid
 RKey
 RNumber
 rop
+rollups
 ROUNDSMALL
 ROWSETEXT
 rpcrt
@@ -2042,6 +2054,7 @@ xstyler
 XTimer
 XUP
 XVIRTUALSCREEN
+XXL
 xxxxxx
 YAxis
 ycombinator

.github/copilot-instructions.md

@@ -1,43 +1,59 @@
-# PowerToys – Copilot guide (concise)
+---
+description: PowerToys AI contributor guidance.
+applyTo: pullRequests
+---
+
+# PowerToys - Copilot guide (concise)
 
 This is the top-level guide for AI changes. Keep edits small, follow existing patterns, and cite exact paths in PRs.
 
-Repo map (1‑line per area)
+# Repo map (1-line per area)
 - Core apps: `src/runner/**` (tray/loader), `src/settings-ui/**` (Settings app)
 - Shared libs: `src/common/**`
 - Modules: `src/modules/*` (one per utility; Command Palette in `src/modules/cmdpal/**`)
 - Build tools/docs: `tools/**`, `doc/devdocs/**`
 
-Build and test (defaults)
+# Build and test (defaults)
 - Prerequisites: Visual Studio 2022 17.4+, minimal Windows 10 1803+.
 - Build discipline:
-  - One terminal per operation (build → test). Don’t switch/open new ones mid-flow.
+  - One terminal per operation (build -> test). Do not switch or open new ones mid-flow.
   - After making changes, `cd` to the project folder that changed (`.csproj`/`.vcxproj`).
-  - Use script(s) to build, synchronously block and wait in foreground for it to finish: `tools/build/build.ps1|.cmd` (current folder), `build-essentials.*` (once per brand new build for missing nuget packages)
-  - Treat build **exit code 0** as success; any non-zero exit code is a failure, have Copilot read the errors log in the build folder (e.g., `build.*.*.errors.log`) and surface problems.
-  - Don’t start tests or launch Runner until the previous step succeeded.
-- Tests (fast + targeted):
-  - Find the test project by product code prefix (e.g., FancyZones, AdvancedPaste). Look for a sibling folder or 1–2 levels up named like `<Product>*UnitTests` or `<Product>*UITests`.
-  - Build the test project, wait for **exit**, then run only those tests via VS Test Explorer or `vstest.console.exe` with filters. Avoid `dotnet test` in this repo.
-  - Add/adjust tests when changing behavior; if skipped, state why (e.g., comment-only, string rename).
+  - Use scripts to build, synchronously block and wait in foreground for completion: `tools/build/build.ps1|.cmd` (current folder), `build-essentials.*` (once per brand new build for missing nuget packages).
+  - Treat build exit code 0 as success; any non-zero exit code is a failure. Read the errors log in the build folder (such as `build.*.*.errors.log`) and surface problems.
+  - Do not start tests or launch Runner until the previous step succeeded.
+- Tests (fast and targeted):
+  - Find the test project by product code prefix (for example FancyZones, AdvancedPaste). Look for a sibling folder or one to two levels up named like `<Product>*UnitTests` or `<Product>*UITests`.
+  - Build the test project, wait for exit, then run only those tests via VS Test Explorer or `vstest.console.exe` with filters. Avoid `dotnet test` in this repo.
+  - Add or adjust tests when changing behavior; if skipped, state why (for example comment-only or string rename).
 
-Pull requests (expectations)
-- Atomic: one logical change; no drive‑by refactors.
-- Describe: problem / approach / risk / test evidence.
+# Pull requests (expectations)
+- Atomic: one logical change; no drive-by refactors.
+- Describe: problem, approach, risk, test evidence.
 - List: touched paths if not obvious.
 
-When to ask for clarification
+# When to ask for clarification
 - Ambiguous spec after scanning relevant docs (see below).
-- Cross-module impact (shared enum/struct) not clear.
-- Security / elevation / installer changes.
+- Cross-module impact (shared enum or struct) not clear.
+- Security, elevation, or installer changes.
 
-Logging (use existing stacks)
-- C++: `src/common/logger/**` (`Logger::info|warn|error|debug`). Keep hot paths quiet (hooks, tight loops).
-- C#: `ManagedCommon.Logger` (`LogInfo|LogWarning|LogError|LogDebug|LogTrace`). Some UIs use injected `ILogger` via `LoggerInstance.Logger`.
+# Logging (use existing stacks)
+- C++ logging lives in `src/common/logger/**` (`Logger::info`, `Logger::warn`, `Logger::error`, `Logger::debug`). Keep hot paths quiet (hooks, tight loops).
+- C# logging goes through `ManagedCommon.Logger` (`LogInfo`, `LogWarning`, `LogError`, `LogDebug`, `LogTrace`). Some UIs use injected `ILogger` via `LoggerInstance.Logger`.
 
-Docs to consult
+# Docs to consult
 - `tools/build/BUILD-GUIDELINES.md`
-- `doc/devdocs/core/architecture.md`, `doc/devdocs/core/runner.md`, `doc/devdocs/core/settings/readme.md`, `doc/devdocs/modules/readme.md`
+- `doc/devdocs/core/architecture.md`
+- `doc/devdocs/core/runner.md`
+- `doc/devdocs/core/settings/readme.md`
+- `doc/devdocs/modules/readme.md`
 
-Done checklist (self review before finishing)
-- Build clean? Tests updated/passed? No unintended formatting? Any new dependency? Documented skips?
+# Language style rules
+- Always enforce repo analyzers: root `.editorconfig` plus any `stylecop.json`.
+- C# code follows StyleCop.Analyzers and Microsoft.CodeAnalysis.NetAnalyzers.
+- C++ code honors `.clang-format` plus `.clang-tidy` (modernize/cppcoreguidelines/readability).
+- Markdown files wrap at 80 characters and use ATX headers with fenced code blocks that include language tags.
+- YAML files indent two spaces and add comments for complex settings while keeping keys clear.
+- PowerShell scripts use Verb-Noun names and prefer single-quoted literals while documenting parameters and satisfying PSScriptAnalyzer.
+
+# Done checklist (self review before finishing)
+- Build clean? Tests updated or passed? No unintended formatting? Any new dependency? Documented skips?

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

@@ -0,0 +1,16 @@
+---
+mode: 'agent'
+model: Claude Sonnet 4.5
+description: 'Generate an 80-character git commit title for the local diff.'
+---
+
+**Goal:** Provide a ready-to-paste git commit title (<= 80 characters) that captures the most important local changes since `HEAD`.
+
+**Workflow:**
+1. Run a single command to view the local diff since the last commit:
+   ```@terminal
+   git diff HEAD
+   ```
+2. From that diff, identify the dominant area (reference key paths like `src/modules/*`, `doc/devdocs/**`, etc.), the type of change (bug fix, docs update, config tweak), and any notable impact.
+3. Draft a concise, imperative commit title summarizing the dominant change. Keep it plain ASCII, <= 80 characters, and avoid trailing punctuation. Mention the primary component when obvious (for example `FancyZones:` or `Docs:`).
+4. Respond with only the final commit title on a single line so it can be pasted directly into `git commit`.

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

@@ -0,0 +1,22 @@
+---
+mode: 'agent'
+model: Claude Sonnet 4.5
+description: 'Generate a PowerToys-ready pull request description from the local diff.'
+---
+
+**Goal:** Produce a ready-to-paste PR title and description that follows PowerToys conventions by comparing the current branch against a user-selected target branch.
+
+**Repo guardrails:**
+- Treat `.github/pull_request_template.md` as the single source of truth; load it at runtime instead of embedding hardcoded content in this prompt.
+- Preserve section order from the template but only surface checklist lines that are relevant for the detected changes, filling them with `[x]`/`[ ]` as appropriate.
+- Cite touched paths with inline backticks, matching the guidance in `.github/copilot-instructions.md`.
+- Call out test coverage explicitly: list automated tests run (unit/UI) or state why they are not applicable.
+
+**Workflow:**
+1. Determine the target branch from user context; default to `main` when no branch is supplied.
+2. Run `git status --short` once to surface uncommitted files that may influence the summary.
+3. Run `git diff <target-branch>...HEAD` a single time to review the detailed changes. Only when confidence stays low dig deeper with focused calls such as `git diff <target-branch>...HEAD -- <path>`.
+4. From the diff, capture impacted areas, key file changes, behavioral risks, migrations, and noteworthy edge cases.
+5. Confirm validation: list tests executed with results or state why tests were skipped in line with repo guidance.
+6. Load `.github/pull_request_template.md`, mirror its section order, and populate it with the gathered facts. Include only relevant checklist entries, marking them `[x]/[ ]` and noting any intentional omissions as "N/A".
+7. Present the filled template inside a fenced ```markdown code block with no extra commentary so it is ready to paste into a PR, clearly flagging any placeholders that still need user input.

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

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

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

@@ -0,0 +1,22 @@
+---
+mode: 'agent'
+model: GPT-5-Codex (Preview)
+description: 'Resolve Code scanning / check-spelling comments on the active PR.'
+---
+
+**Goal:** Clear every outstanding GitHub pull request comment created by the `Code scanning / check-spelling` workflow by explicitly allowing intentional terms.
+
+**Guardrails:**
+- Update only discussion threads authored by `github-actions` or `github-actions[bot]` that mention `Code scanning results / check-spelling`.
+- Resolve findings solely by editing `.github/actions/spell-check/expect.txt`; reuse existing entries.
+- Leave all other files and topics untouched.
+
+**Prerequisites:**
+- Install GitHub CLI if it is not present: `winget install GitHub.cli`.
+- Run `gh auth login` once before the first CLI use.
+
+**Workflow:**
+1. Determine the active pull request with a single `gh pr view --json number` call (default to the current branch).
+2. Fetch all PR discussion data once via `gh pr view --json comments,reviews` and filter to check-spelling comments authored by `github-actions` or `github-actions[bot]` that are not minimized; when several remain, process only the most recent comment body.
+3. For each flagged token, review `.github/actions/spell-check/expect.txt` for an equivalent term (for example an existing lowercase variant); when found, reuse that normalized term rather than adding a new entry, even if the flagged token differs only by casing. Only add a new entry after confirming no equivalent already exists.
+4. Add any remaining missing token to `.github/actions/spell-check/expect.txt`, keeping surrounding formatting intact.

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

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

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

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

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

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

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

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

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

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

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

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

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

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

.pipelines/ESRPSigning_core.json

@@ -237,9 +237,7 @@
             "PowerToys.DSC.dll",
             "PowerToys.DSC.exe",
 
-            "PowerToysSparse.msix",
-            "PowerToys.McpServer.dll",
-            "PowerToys.McpServer.exe"
+            "PowerToysSparse.msix"
           ],
             "SigningInfo": {
                 "Operations": [

.pipelines/ESRPSigning_installer.json

@@ -1,53 +0,0 @@
-{
-    "Version": "1.0.0",
-    "UseMinimatch": false,
-    "SignBatches": [
-        {
-            "MatchedPath": [
-                "PowerToysSetupCustomActionsVNext.dll",
-                "SilentFilesInUseBAFunction.dll",
-                "PowerToys*Setup-*.exe",
-                "PowerToys*Setup-*.msi"
-            ],
-            "SigningInfo": {
-                "Operations": [
-                    {
-                        "KeyCode": "CP-230012",
-                        "OperationSetCode": "SigntoolSign",
-                        "Parameters": [
-                            {
-                                "parameterName": "OpusName",
-                                "parameterValue": "Microsoft"
-                            },
-                            {
-                                "parameterName": "OpusInfo",
-                                "parameterValue": "http://www.microsoft.com"
-                            },
-                            {
-                                "parameterName": "FileDigest",
-                                "parameterValue": "/fd \"SHA256\""
-                            },
-                            {
-                                "parameterName": "PageHash",
-                                "parameterValue": "/NPH"
-                            },
-                            {
-                                "parameterName": "TimeStamp",
-                                "parameterValue": "/tr \"http://rfc3161.gtm.corp.microsoft.com/TSS/HttpTspServer\" /td sha256"
-                            }
-                        ],
-                        "ToolName": "sign",
-                        "ToolVersion": "1.0"
-                    },
-                    {
-                        "KeyCode": "CP-230012",
-                        "OperationSetCode": "SigntoolVerify",
-                        "Parameters": [],
-                        "ToolName": "sign",
-                        "ToolVersion": "1.0"
-                    }
-                ]
-            }
-        }
-    ]
-}

.pipelines/v2/release.yml

@@ -73,10 +73,11 @@ extends:
             parameters:
               pool:
                 name: SHINE-INT-L
-                ${{ if eq(parameters.useVSPreview, true) }}:
-                  demands: ImageOverride -equals SHINE-VS17-Preview
-                ${{ else }}:
-                  image: SHINE-VS17-Latest
+                demands:
+                  # Our INT agents have a large disk mounted at P:\
+                  - WorkFolder -equals P:\_work
+                  - ${{ if eq(parameters.useVSPreview, true) }}:
+                    - ImageOverride -equals SHINE-VS17-Preview
                 os: windows
               variables:
                 IsPipeline: 1 # The installer uses this to detect whether it should pick up localizations

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

@@ -512,14 +512,6 @@ jobs:
       versionNumber: ${{ parameters.versionNumber }}
       additionalBuildOptions: ${{ parameters.additionalBuildOptions }}
 
-  - template: steps-build-installer-vnext.yml
-    parameters:
-      codeSign: ${{ parameters.codeSign }}
-      signingIdentity: ${{ parameters.signingIdentity }}
-      versionNumber: ${{ parameters.versionNumber }}
-      additionalBuildOptions: ${{ parameters.additionalBuildOptions }}
-      buildUserInstaller: true # NOTE: This is the distinction between the above and below rules
-
   # This saves ~1GiB per architecture. We won't need these later.
   # Removes:
   # - All .pdb files from any static libs .libs (which were only used during linking)

.pipelines/v2/templates/steps-build-installer-vnext.yml

@@ -2,9 +2,6 @@ parameters:
   - name: versionNumber
     type: string
     default: "0.0.1"
-  - name: buildUserInstaller
-    type: boolean
-    default: false
   - name: codeSign
     type: boolean
     default: false
@@ -25,43 +22,26 @@ steps:
       arguments: 'install --global wix --version 5.0.2'
 
   - pwsh: |-
-      & git clean -xfd -e *exe -- .\installer\
-    displayName: ${{replace(replace(parameters.buildUserInstaller,'True','👤'),'False','💻')}} Clean installer to reduce cross-contamination
-
-  - pwsh: |-
-      # Determine whether this is a per-user build
-      $IsPerUser = $${{ parameters.buildUserInstaller }}
-
-      # Build slug used to locate the artifacts
-      $InstallerBuildSlug = if ($IsPerUser) { 'UserSetup' } else { 'MachineSetup' }
-
-      # VNext bundle folder; base name intentionally omits the VNext suffix
-      $InstallerFolder = 'PowerToysSetupVNext'
-      if ($IsPerUser) {
-        $InstallerBasename = "PowerToysUserSetup-${{ parameters.versionNumber }}-$(BuildPlatform)"
-      }
-      else {
-        $InstallerBasename = "PowerToysSetup-${{ parameters.versionNumber }}-$(BuildPlatform)"
-      }
-
-      # Export variables for downstream steps
-      Write-Host "##vso[task.setvariable variable=InstallerBuildSlug]$InstallerBuildSlug"
-      Write-Host "##vso[task.setvariable variable=InstallerRelativePath]$(BuildPlatform)\$(BuildConfiguration)\$InstallerBuildSlug"
-      Write-Host "##vso[task.setvariable variable=InstallerBasename]$InstallerBasename"
-      Write-Host "##vso[task.setvariable variable=InstallerFolder]$InstallerFolder"
-    displayName: ${{replace(replace(parameters.buildUserInstaller,'True','👤'),'False','💻')}} Prepare Installer variables
+      Write-Host "##vso[task.setvariable variable=InstallerMachineRoot]installer\PowerToysSetupVNext\$(BuildPlatform)\$(BuildConfiguration)\MachineSetup"
+      Write-Host "##vso[task.setvariable variable=InstallerUserRoot]installer\PowerToysSetupVNext\$(BuildPlatform)\$(BuildConfiguration)\UserSetup"
+      Write-Host "##vso[task.setvariable variable=InstallerMachineBasename]PowerToysSetup-${{ parameters.versionNumber }}-$(BuildPlatform)"
+      Write-Host "##vso[task.setvariable variable=InstallerUserBasename]PowerToysUserSetup-${{ parameters.versionNumber }}-$(BuildPlatform)"
+    displayName: Prepare Installer variables
 
   # This dll needs to be built and signed before building the MSI.
+  # The Custom Actions project contains a pre-build event that prepares the .wxs files
+  # by filling them out with all our components. We pass RunBuildEvents=true to force
+  # that logic to run.
   - task: VSBuild@1
-    displayName: ${{replace(replace(parameters.buildUserInstaller,'True','👤'),'False','💻')}} Build PowerToysSetupCustomActionsVNext
+    displayName: Build Shared Support DLLs
     inputs:
       solution: "**/installer/PowerToysSetup.sln"
       vsVersion: 17.0
       msbuildArgs: >-
-        /t:PowerToysSetupCustomActionsVNext
-        /p:RunBuildEvents=true;PerUser=${{parameters.buildUserInstaller}};RestorePackagesConfig=true;CIBuild=true
+        /t:PowerToysSetupCustomActionsVNext;SilentFilesInUseBAFunction
+        /p:RunBuildEvents=true;RestorePackagesConfig=true;CIBuild=true
         -restore -graph
-        /bl:$(LogOutputDirectory)\installer-$(InstallerBuildSlug)-actions.binlog
+        /bl:$(LogOutputDirectory)\installer-actions.binlog
         ${{ parameters.additionalBuildOptions }}
       platform: $(BuildPlatform)
       configuration: $(BuildConfiguration)
@@ -70,28 +50,53 @@ steps:
       maximumCpuCount: true
 
   - ${{ if eq(parameters.codeSign, true) }}:
-    - template: steps-esrp-signing.yml
+    - template: steps-esrp-sign-files-authenticode.yml
       parameters:
-        displayName: ${{replace(replace(parameters.buildUserInstaller,'True','👤'),'False','💻')}} Sign PowerToysSetupCustomActionsVNext
+        displayName: Sign Shared Support DLLs
         signingIdentity: ${{ parameters.signingIdentity }}
-        inputs:
-          FolderPath: 'installer/PowerToysSetupCustomActionsVNext/$(InstallerRelativePath)'
-          signType: batchSigning
-          batchSignPolicyFile: '$(build.sourcesdirectory)\.pipelines\ESRPSigning_installer.json'
-          ciPolicyFile: '$(build.sourcesdirectory)\.pipelines\CIPolicy.xml'
+        folder: 'installer'
+        pattern: |-
+          **/PowerToysSetupCustomActionsVNext.dll
+          **/SilentFilesInUseBAFunction.dll
 
   ## INSTALLER START
   #### MSI BUILDING AND SIGNING
+  #
+  # The MSI build contains code that reverts the .wxs files to their in-tree versions.
+  # This is only supposed to happen during local builds. Since this build system is
+  # supposed to run side by side--machine and then user--we do NOT want to destroy
+  # the .wxs files. Therefore, we pass RunBuildEvents=false to suppress all of that
+  # logic.
+  #
+  # We pass BuildProjectReferences=false so that it does not recompile the DLLs we just built.
+  # We only pass -restore on the first one because the second run should already have all
+  # of the dependencies.
   - task: VSBuild@1
-    displayName: ${{replace(replace(parameters.buildUserInstaller,'True','👤'),'False','💻')}} Build VNext MSI
+    displayName: 💻 Build VNext MSI
     inputs:
       solution: "**/installer/PowerToysSetup.sln"
       vsVersion: 17.0
       msbuildArgs: >-
         -restore
         /t:PowerToysInstallerVNext
-        /p:RunBuildEvents=false;PerUser=${{parameters.buildUserInstaller}};BuildProjectReferences=false;CIBuild=true
-        /bl:$(LogOutputDirectory)\installer-$(InstallerBuildSlug)-msi.binlog
+        /p:RunBuildEvents=false;PerUser=false;BuildProjectReferences=false;CIBuild=true
+        /bl:$(LogOutputDirectory)\installer-machine-msi.binlog
+        ${{ parameters.additionalBuildOptions }}
+      platform: $(BuildPlatform)
+      configuration: $(BuildConfiguration)
+      clean: false # don't undo our hard work above by deleting the CustomActions dll
+      msbuildArchitecture: x64
+      maximumCpuCount: true
+
+  - task: VSBuild@1
+    displayName: 👤 Build VNext MSI
+    inputs:
+      solution: "**/installer/PowerToysSetup.sln"
+      vsVersion: 17.0
+      msbuildArgs: >-
+        /t:PowerToysInstallerVNext
+        /p:RunBuildEvents=false;PerUser=true;BuildProjectReferences=false;CIBuild=true
+        /bl:$(LogOutputDirectory)\installer-user-msi.binlog
         ${{ parameters.additionalBuildOptions }}
       platform: $(BuildPlatform)
       configuration: $(BuildConfiguration)
@@ -100,77 +105,66 @@ steps:
       maximumCpuCount: true
 
   - script: |-
-      wix msi decompile installer\$(InstallerFolder)\$(InstallerRelativePath)\$(InstallerBasename).msi -x $(build.sourcesdirectory)\extractedMsi
-      dir $(build.sourcesdirectory)\extractedMsi
-    displayName: "${{replace(replace(parameters.buildUserInstaller,'True','👤'),'False','💻')}} WiX5: Extract and verify MSI"
+      wix msi decompile $(InstallerMachineRoot)\$(InstallerMachineBasename).msi -x $(build.sourcesdirectory)\extractedMachineMsi
+      wix msi decompile $(InstallerUserRoot)\$(InstallerUserBasename).msi -x $(build.sourcesdirectory)\extractedUserMsi
+      dir $(build.sourcesdirectory)\extractedMachineMsi
+      dir $(build.sourcesdirectory)\extractedUserMsi
+    displayName: "WiX5: Extract and verify MSIs"
 
   # Check if deps.json files don't reference different dll versions.
   - pwsh: |-
-      & '.pipelines/verifyDepsJsonLibraryVersions.ps1' -targetDir '$(build.sourcesdirectory)\extractedMsi\File'
-    displayName: ${{replace(replace(parameters.buildUserInstaller,'True','👤'),'False','💻')}} Audit deps.json in MSI extracted files
+      & '.pipelines/verifyDepsJsonLibraryVersions.ps1' -targetDir '$(build.sourcesdirectory)\extractedMachineMsi\File'
+      & '.pipelines/verifyDepsJsonLibraryVersions.ps1' -targetDir '$(build.sourcesdirectory)\extractedUserMsi\File'
+    displayName: Audit deps.json in MSI extracted files
 
   - ${{ if eq(parameters.codeSign, true) }}:
     - pwsh: |-
-        & .pipelines/versionAndSignCheck.ps1 -targetDir '$(build.sourcesdirectory)\extractedMsi\File'
-        & .pipelines/versionAndSignCheck.ps1 -targetDir '$(build.sourcesdirectory)\extractedMsi\Binary'
-        git clean -xfd ./extractedMsi
-      displayName: ${{replace(replace(parameters.buildUserInstaller,'True','👤'),'False','💻')}} Verify all binaries are signed and versioned
+        & .pipelines/versionAndSignCheck.ps1 -targetDir '$(build.sourcesdirectory)\extractedMachineMsi\File'
+        & .pipelines/versionAndSignCheck.ps1 -targetDir '$(build.sourcesdirectory)\extractedMachineMsi\Binary'
+        & .pipelines/versionAndSignCheck.ps1 -targetDir '$(build.sourcesdirectory)\extractedUserMsi\File'
+        & .pipelines/versionAndSignCheck.ps1 -targetDir '$(build.sourcesdirectory)\extractedUserMsi\Binary'
+        git clean -xfd ./extractedMachineMsi ./extractedUserMsi
+      displayName: Verify all binaries are signed and versioned
 
-    - template: steps-esrp-signing.yml
+    - template: steps-esrp-sign-files-authenticode.yml
       parameters:
-        displayName: ${{replace(replace(parameters.buildUserInstaller,'True','👤'),'False','💻')}} Sign VNext MSI
+        displayName: Sign VNext MSIs
         signingIdentity: ${{ parameters.signingIdentity }}
-        inputs:
-          FolderPath: 'installer/$(InstallerFolder)/$(InstallerRelativePath)'
-          signType: batchSigning
-          batchSignPolicyFile: '$(build.sourcesdirectory)\.pipelines\ESRPSigning_installer.json'
-          ciPolicyFile: '$(build.sourcesdirectory)\.pipelines\CIPolicy.xml'
+        folder: 'installer'
+        pattern: '**/PowerToys*Setup-*.msi'
 
   #### END MSI
   
-  #### BUILDING AND SIGNING SilentFilesInUseBAFunction DLL
-  - task: VSBuild@1
-    displayName: ${{replace(replace(parameters.buildUserInstaller,'True','👤'),'False','💻')}} Build SilentFilesInUseBAFunction
-    inputs:
-      solution: "**/installer/PowerToysSetup.sln"
-      vsVersion: 17.0
-      msbuildArgs: >-
-        /t:SilentFilesInUseBAFunction
-        /p:RunBuildEvents=true;PerUser=${{parameters.buildUserInstaller}};RestorePackagesConfig=true;CIBuild=true
-        -restore -graph
-        /bl:$(LogOutputDirectory)\installer-$(InstallerBuildSlug)-SilentFilesInUseBAFunction.binlog
-        ${{ parameters.additionalBuildOptions }}
-      platform: $(BuildPlatform)
-      configuration: $(BuildConfiguration)
-      clean: false # don't undo our hard work above by deleting the msi
-      msbuildArchitecture: x64
-      maximumCpuCount: true
-
-  - ${{ if eq(parameters.codeSign, true) }}:
-    - template: steps-esrp-signing.yml
-      parameters:
-        displayName: ${{replace(replace(parameters.buildUserInstaller,'True','👤'),'False','💻')}} Sign SilentFilesInUseBAFunction
-        signingIdentity: ${{ parameters.signingIdentity }}
-        inputs:
-          FolderPath: 'installer/$(BuildPlatform)/$(BuildConfiguration)'
-          signType: batchSigning
-          batchSignPolicyFile: '$(build.sourcesdirectory)\.pipelines\ESRPSigning_installer.json'
-          ciPolicyFile: '$(build.sourcesdirectory)\.pipelines\CIPolicy.xml'
-
-  #### END BUILDING AND SIGNING SilentFilesInUseBAFunction DLL
-  
   #### BOOTSTRAP BUILDING AND SIGNING
+  # We pass BuildProjectReferences=false so that it does not recompile the DLLs we just built.
+  # We only pass -restore on the first one because the second run should already have all
+  # of the dependencies.
   - task: VSBuild@1
-    displayName: ${{replace(replace(parameters.buildUserInstaller,'True','👤'),'False','💻')}} Build VNext Bootstrapper
+    displayName: 💻 Build VNext Bootstrapper
     inputs:
       solution: "**/installer/PowerToysSetup.sln"
       vsVersion: 17.0
       msbuildArgs: >-
         -restore
         /t:PowerToysBootstrapperVNext
-        /p:PerUser=${{parameters.buildUserInstaller}};CIBuild=true
-        /bl:$(LogOutputDirectory)\installer-$(InstallerBuildSlug)-bootstrapper.binlog
-        -restore -graph
+        /p:PerUser=false;BuildProjectReferences=false;CIBuild=true
+        /bl:$(LogOutputDirectory)\installer-machine-bootstrapper.binlog
+        ${{ parameters.additionalBuildOptions }}
+      platform: $(BuildPlatform)
+      configuration: $(BuildConfiguration)
+      clean: false # don't undo our hard work above by deleting the MSI nor SilentFilesInUseBAFunction
+      msbuildArchitecture: x64
+      maximumCpuCount: true
+
+  - task: VSBuild@1
+    displayName: 👤 Build VNext Bootstrapper
+    inputs:
+      solution: "**/installer/PowerToysSetup.sln"
+      vsVersion: 17.0
+      msbuildArgs: >-
+        /t:PowerToysBootstrapperVNext
+        /p:PerUser=true;BuildProjectReferences=false;CIBuild=true
+        /bl:$(LogOutputDirectory)\installer-user-bootstrapper.binlog
         ${{ parameters.additionalBuildOptions }}
       platform: $(BuildPlatform)
       configuration: $(BuildConfiguration)
@@ -181,54 +175,41 @@ steps:
   # The entirety of bundle unpacking/re-packing is unnecessary if we are not code signing it.
   - ${{ if eq(parameters.codeSign, true) }}:
     - script: |-
-        wix burn detach installer\$(InstallerFolder)\$(InstallerRelativePath)\$(InstallerBasename).exe -engine installer\engine.exe
-      displayName: "${{replace(replace(parameters.buildUserInstaller,'True','👤'),'False','💻')}} WiX5: Extract Engine from Bundle"
+        wix burn detach $(InstallerMachineRoot)\$(InstallerMachineBasename).exe -engine installer\machine-engine.exe
+        wix burn detach $(InstallerUserRoot)\$(InstallerUserBasename).exe -engine installer\user-engine.exe
+      displayName: "WiX5: Extract Engines from Bundles"
 
-    - template: steps-esrp-signing.yml
+    - template: steps-esrp-sign-files-authenticode.yml
       parameters:
-        displayName: ${{replace(replace(parameters.buildUserInstaller,'True','👤'),'False','💻')}} Sign WiX Engine
+        displayName: Sign WiX Engines
         signingIdentity: ${{ parameters.signingIdentity }}
-        inputs:
-          FolderPath: "installer"
-          Pattern: engine.exe
-          signConfigType: inlineSignParams
-          inlineOperation: |
-            [
-                {
-                    "KeyCode": "CP-230012",
-                    "OperationCode": "SigntoolSign",
-                    "Parameters": {
-                        "OpusName": "Microsoft",
-                        "OpusInfo": "http://www.microsoft.com",
-                        "FileDigest": "/fd \"SHA256\"",
-                        "PageHash": "/NPH",
-                        "TimeStamp": "/tr \"http://rfc3161.gtm.corp.microsoft.com/TSS/HttpTspServer\" /td sha256"
-                    },
-                    "ToolName": "sign",
-                    "ToolVersion": "1.0"
-                },
-                {
-                    "KeyCode": "CP-230012",
-                    "OperationCode": "SigntoolVerify",
-                    "Parameters": {},
-                    "ToolName": "sign",
-                    "ToolVersion": "1.0"
-                }
-            ]
+        folder: "installer"
+        pattern: '*-engine.exe'
 
     - script: |-
-        wix burn reattach installer\$(InstallerFolder)\$(InstallerRelativePath)\$(InstallerBasename).exe -engine installer\engine.exe -o installer\$(InstallerFolder)\$(InstallerRelativePath)\$(InstallerBasename).exe
-      displayName: "${{replace(replace(parameters.buildUserInstaller,'True','👤'),'False','💻')}} WiX5: Reattach Engine to Bundle"
+        wix burn reattach $(InstallerMachineRoot)\$(InstallerMachineBasename).exe -engine installer\machine-engine.exe -o $(InstallerMachineRoot)\$(InstallerMachineBasename).exe
+        wix burn reattach $(InstallerUserRoot)\$(InstallerUserBasename).exe -engine installer\user-engine.exe -o $(InstallerUserRoot)\$(InstallerUserBasename).exe
+      displayName: "WiX5: Reattach Engines to Bundles"
 
-    - template: steps-esrp-signing.yml
+    - pwsh: |-
+        & wix burn extract -oba installer\ba\m "$(InstallerMachineRoot)\$(InstallerMachineBasename).exe"
+        & wix burn extract -oba installer\ba\u "$(InstallerUserRoot)\$(InstallerUserBasename).exe"
+        Get-ChildItem installer\ba -Recurse -Include *.exe,*.dll | Get-AuthenticodeSignature | ForEach-Object {
+          If ($_.Status -Ne "Valid") {
+            Write-Error $_.StatusMessage
+          } Else {
+            Write-Host $_.StatusMessage
+          }
+        }
+        & git clean -fdx installer\ba
+      displayName: "WiX5: Verify Bootstrapper content is signed"
+
+    - template: steps-esrp-sign-files-authenticode.yml
       parameters:
-        displayName: ${{replace(replace(parameters.buildUserInstaller,'True','👤'),'False','💻')}} Sign Final Bootstrapper
+        displayName: Sign Final Bootstrappers
         signingIdentity: ${{ parameters.signingIdentity }}
-        inputs:
-          FolderPath: 'installer/$(InstallerFolder)/$(InstallerRelativePath)'
-          signType: batchSigning
-          batchSignPolicyFile: '$(build.sourcesdirectory)\.pipelines\ESRPSigning_installer.json'
-          ciPolicyFile: '$(build.sourcesdirectory)\.pipelines\CIPolicy.xml'
+        folder: 'installer'
+        pattern: '**/PowerToys*Setup-*.exe'
 
   #### END BOOTSTRAP
   ## END INSTALLER

.pipelines/v2/templates/steps-esrp-sign-files-authenticode.yml

@@ -0,0 +1,45 @@
+parameters:
+  - name: displayName
+    type: string
+    default: Sign Specific Files
+  - name: folder
+    type: string
+  - name: pattern
+    type: string
+  - name: signingIdentity
+    type: object
+    default: {}
+
+steps:
+  - template: steps-esrp-signing.yml
+    parameters:
+      displayName: ${{ parameters.displayName }}
+      signingIdentity: ${{ parameters.signingIdentity }}
+      inputs:
+        FolderPath: ${{ parameters.folder }}
+        Pattern: ${{ parameters.pattern }}
+        UseMinimatch: true
+        signConfigType: inlineSignParams
+        inlineOperation: |-
+          [
+              {
+                  "KeyCode": "CP-230012",
+                  "OperationCode": "SigntoolSign",
+                  "Parameters": {
+                      "OpusName": "Microsoft",
+                      "OpusInfo": "http://www.microsoft.com",
+                      "FileDigest": "/fd \"SHA256\"",
+                      "PageHash": "/NPH",
+                      "TimeStamp": "/tr \"http://rfc3161.gtm.corp.microsoft.com/TSS/HttpTspServer\" /td sha256"
+                  },
+                  "ToolName": "sign",
+                  "ToolVersion": "1.0"
+              },
+              {
+                  "KeyCode": "CP-230012",
+                  "OperationCode": "SigntoolVerify",
+                  "Parameters": {},
+                  "ToolName": "sign",
+                  "ToolVersion": "1.0"
+              }
+          ]

Cpp.Build.props

@@ -1,6 +1,56 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0"
   xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <!-- Hybrid CRT configuration -->
+  <PropertyGroup Condition="'$(HybridCrtConfiguration)'==''">
+    <HybridCrtConfiguration>$(Configuration)</HybridCrtConfiguration>
+  </PropertyGroup>
+
+  <!-- Skip Hybrid CRT for AppContainer/UWP projects as they require MultiThreadedDLL -->
+  <PropertyGroup Condition="'$(AppContainerApplication)'=='true' and '$(_VC_Target_Library_Platform)'!='Desktop'">
+    <HybridCrtConfiguration></HybridCrtConfiguration>
+  </PropertyGroup>
+
+  <ItemDefinitionGroup Condition="'$(HybridCrtConfiguration)'=='Debug'">
+    <ClCompile>
+      <!-- We use MultiThreadedDebug, rather than MultiThreadedDebugDLL, to avoid DLL dependencies on VCRUNTIME140d.dll and MSVCP140d.dll. -->
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <!-- Link statically against the runtime and STL, but link dynamically against the CRT by ignoring the static CRT
+           lib and instead linking against the Universal CRT DLL import library. This "hybrid" linking mechanism is
+           supported according to the CRT maintainer. Dynamic linking against the CRT makes the binaries a bit smaller
+           than they would otherwise be if the CRT, runtime, and STL were all statically linked in. -->
+      <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries);libucrtd.lib</IgnoreSpecificDefaultLibraries>
+      <AdditionalOptions>%(AdditionalOptions) /defaultlib:ucrtd.lib</AdditionalOptions>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(HybridCrtConfiguration)'=='Release'">
+    <ClCompile>
+      <!-- We use MultiThreaded, rather than MultiThreadedDLL, to avoid DLL dependencies on VCRUNTIME140.dll and MSVCP140.dll. -->
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <!-- Link statically against the runtime and STL, but link dynamically against the CRT by ignoring the static CRT
+           lib and instead linking against the Universal CRT DLL import library. This "hybrid" linking mechanism is
+           supported according to the CRT maintainer. Dynamic linking against the CRT makes the binaries a bit smaller
+           than they would otherwise be if the CRT, runtime, and STL were all statically linked in. -->
+      <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries);libucrt.lib</IgnoreSpecificDefaultLibraries>
+      <AdditionalOptions>%(AdditionalOptions) /defaultlib:ucrt.lib</AdditionalOptions>
+    </Link>
+  </ItemDefinitionGroup>
+
+  <!-- AppContainer/UWP projects must use MultiThreadedDLL -->
+  <ItemDefinitionGroup Condition="'$(AppContainerApplication)'=='true' and '$(_VC_Target_Library_Platform)'!='Desktop' And '$(Configuration)'=='Debug'">
+    <ClCompile>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(AppContainerApplication)'=='true' and '$(_VC_Target_Library_Platform)'!='Desktop' And '$(Configuration)'=='Release'">
+    <ClCompile>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+    </ClCompile>
+  </ItemDefinitionGroup>
 
   <!-- Project configurations -->
   <ItemGroup Label="ProjectConfigurations">
@@ -73,7 +123,6 @@
     <ClCompile>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Optimization>Disabled</Optimization>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -83,7 +132,6 @@
     <ClCompile>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Optimization>MaxSpeed</Optimization>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
     </ClCompile>

Directory.Packages.props

@@ -1,4 +1,4 @@
-<Project>
+<Project>
   <PropertyGroup>
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
     <CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
@@ -9,6 +9,7 @@
     <PackageVersion Include="AdaptiveCards.Templating" Version="2.0.5" />
     <PackageVersion Include="Microsoft.Bot.AdaptiveExpressions.Core" Version="4.23.0" />
     <PackageVersion Include="Appium.WebDriver" Version="4.4.5" />
+    <PackageVersion Include="Azure.AI.OpenAI" Version="1.0.0-beta.17" />
     <PackageVersion Include="CoenM.ImageSharp.ImageHash" Version="1.3.6" />
     <PackageVersion Include="CommunityToolkit.Common" Version="8.4.0" />
     <PackageVersion Include="CommunityToolkit.Mvvm" Version="8.4.0" />
@@ -39,21 +40,12 @@
     <PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="9.0.8" />
     <PackageVersion Include="Microsoft.Windows.CppWinRT" Version="2.0.240111.5" />
     <PackageVersion Include="Microsoft.Diagnostics.Tracing.TraceEvent" Version="3.1.16" />
-    <PackageVersion Include="Microsoft.Extensions.AI" Version="9.9.1" />
-    <PackageVersion Include="Microsoft.Extensions.AI.OpenAI" Version="9.9.1-preview.1.25474.6" />
-    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="9.0.9" />
-    <PackageVersion Include="Microsoft.Extensions.Logging" Version="9.0.9" />
-    <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.9" />
+    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="9.0.8" />
+    <PackageVersion Include="Microsoft.Extensions.Logging" Version="9.0.8" />
+    <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.8" />
     <PackageVersion Include="Microsoft.Extensions.Hosting" Version="9.0.8" />
     <PackageVersion Include="Microsoft.Extensions.Hosting.WindowsServices" Version="9.0.8" />
-    <PackageVersion Include="Microsoft.SemanticKernel" Version="1.66.0" />
-    <PackageVersion Include="Microsoft.SemanticKernel.Connectors.OpenAI" Version="1.66.0" />
-    <PackageVersion Include="Microsoft.SemanticKernel.Connectors.Amazon" Version="1.66.0-alpha" />
-    <PackageVersion Include="Microsoft.SemanticKernel.Connectors.AzureAIInference" Version="1.66.0-beta" />
-    <PackageVersion Include="Microsoft.SemanticKernel.Connectors.Google" Version="1.66.0-alpha" />
-    <PackageVersion Include="Microsoft.SemanticKernel.Connectors.HuggingFace" Version="1.66.0-preview" />
-    <PackageVersion Include="Microsoft.SemanticKernel.Connectors.MistralAI" Version="1.66.0-alpha" />
-    <PackageVersion Include="Microsoft.SemanticKernel.Connectors.Ollama" Version="1.66.0-alpha" />
+    <PackageVersion Include="Microsoft.SemanticKernel" Version="1.15.0" />
     <PackageVersion Include="Microsoft.Toolkit.Uwp.Notifications" Version="7.1.2" />
     <PackageVersion Include="Microsoft.Web.WebView2" Version="1.0.3179.45" />
     <!-- Package Microsoft.Win32.SystemEvents added as a hack for being able to exclude the runtime assets so they don't conflict with 8.0.1. This is a dependency of System.Drawing.Common but the 8.0.1 version wasn't published to nuget. -->
@@ -73,7 +65,6 @@
     <PackageVersion Include="Microsoft.WindowsAppSDK.Runtime" Version="1.8.250907003" />
     <PackageVersion Include="Microsoft.Xaml.Behaviors.WinUI.Managed" Version="2.0.9" />
     <PackageVersion Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.39" />
-    <PackageVersion Include="ModelContextProtocol" Version="0.4.0-preview.2" />
     <PackageVersion Include="ModernWpfUI" Version="0.9.4" />
     <!-- Moq to stay below v4.20 due to behavior change. need to be sure fixed -->
     <PackageVersion Include="Moq" Version="4.18.4" />
@@ -83,7 +74,7 @@
     <PackageVersion Include="NLog" Version="5.2.8" />
     <PackageVersion Include="NLog.Extensions.Logging" Version="5.3.8" />
     <PackageVersion Include="NLog.Schema" Version="5.2.8" />
-    <PackageVersion Include="OpenAI" Version="2.5.0" />
+    <PackageVersion Include="OpenAI" Version="2.0.0" />
     <PackageVersion Include="ReverseMarkdown" Version="4.1.0" />
     <PackageVersion Include="RtfPipe" Version="2.0.7677.4303" />
     <PackageVersion Include="ScipBe.Common.Office.OneNote" Version="3.0.1" />
@@ -104,7 +95,6 @@
     <PackageVersion Include="System.Diagnostics.EventLog" Version="9.0.8" />
     <!-- Package System.Diagnostics.PerformanceCounter added as a hack for being able to exclude the runtime assets so they don't conflict with 8.0.11. -->
     <PackageVersion Include="System.Diagnostics.PerformanceCounter" Version="9.0.8" />
-  <PackageVersion Include="System.ClientModel" Version="1.7.0" />
     <PackageVersion Include="System.Drawing.Common" Version="9.0.8" />
     <PackageVersion Include="System.IO.Abstractions" Version="22.0.13" />
     <PackageVersion Include="System.IO.Abstractions.TestingHelpers" Version="22.0.13" />

NOTICE.md

@@ -1495,6 +1495,7 @@ SOFTWARE.
 - AdaptiveCards.Rendering.WinUI3
 - AdaptiveCards.Templating
 - Appium.WebDriver
+- Azure.AI.OpenAI
 - CoenM.ImageSharp.ImageHash
 - CommunityToolkit.Common
 - CommunityToolkit.Labs.WinUI.Controls.MarkdownTextBlock

PowerToys.sln

@@ -330,8 +330,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AwakeModuleInterface", "src
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Awake", "src\modules\awake\Awake\Awake.csproj", "{D940E07F-532C-4FF3-883F-790DA014F19A}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PowerToys.McpServer", "src\McpServer\PowerToys.McpServer.csproj", "{8A6F5D3B-F59E-4F34-A1D3-3F69D3FDBD9D}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Community.PowerToys.Run.Plugin.UnitConverter", "src\modules\launcher\Plugins\Community.PowerToys.Run.Plugin.UnitConverter\Community.PowerToys.Run.Plugin.UnitConverter.csproj", "{BB23A474-5058-4F75-8FA3-5FE3DE53CDF4}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Community.PowerToys.Run.Plugin.UnitConverter.UnitTest", "src\modules\launcher\Plugins\Community.PowerToys.Run.Plugin.UnitConverter.UnitTest\Community.PowerToys.Run.Plugin.UnitConverter.UnitTest.csproj", "{3E424AD2-19E5-4AE6-B833-F53963EB5FC1}"
@@ -830,8 +828,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LightSwitch.UITests", "src\
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.CmdPal.Ext.ClipboardHistory.UnitTests", "src\modules\cmdpal\Tests\Microsoft.CmdPal.Ext.ClipboardHistory.UnitTests\Microsoft.CmdPal.Ext.ClipboardHistory.UnitTests.csproj", "{4E0FCF69-B06B-D272-76BF-ED3A559B4EDA}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LanguageModelProvider", "src\common\LanguageModelProvider\LanguageModelProvider.csproj", "{45354F4F-1414-45CE-B600-51CD1209FD19}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.CmdPal.UI.ViewModels.UnitTests", "src\modules\cmdpal\Tests\Microsoft.CmdPal.UI.ViewModels.UnitTests\Microsoft.CmdPal.UI.ViewModels.UnitTests.csproj", "{A66E9270-5D93-EC9C-F06E-CE7295BB9A6C}"
 EndProject
 Global
@@ -1458,14 +1454,6 @@ Global
 		{D940E07F-532C-4FF3-883F-790DA014F19A}.Release|ARM64.Build.0 = Release|ARM64
 		{D940E07F-532C-4FF3-883F-790DA014F19A}.Release|x64.ActiveCfg = Release|x64
 		{D940E07F-532C-4FF3-883F-790DA014F19A}.Release|x64.Build.0 = Release|x64
-		{8A6F5D3B-F59E-4F34-A1D3-3F69D3FDBD9D}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{8A6F5D3B-F59E-4F34-A1D3-3F69D3FDBD9D}.Debug|ARM64.Build.0 = Debug|ARM64
-		{8A6F5D3B-F59E-4F34-A1D3-3F69D3FDBD9D}.Debug|x64.ActiveCfg = Debug|x64
-		{8A6F5D3B-F59E-4F34-A1D3-3F69D3FDBD9D}.Debug|x64.Build.0 = Debug|x64
-		{8A6F5D3B-F59E-4F34-A1D3-3F69D3FDBD9D}.Release|ARM64.ActiveCfg = Release|ARM64
-		{8A6F5D3B-F59E-4F34-A1D3-3F69D3FDBD9D}.Release|ARM64.Build.0 = Release|ARM64
-		{8A6F5D3B-F59E-4F34-A1D3-3F69D3FDBD9D}.Release|x64.ActiveCfg = Release|x64
-		{8A6F5D3B-F59E-4F34-A1D3-3F69D3FDBD9D}.Release|x64.Build.0 = Release|x64
 		{BB23A474-5058-4F75-8FA3-5FE3DE53CDF4}.Debug|ARM64.ActiveCfg = Debug|ARM64
 		{BB23A474-5058-4F75-8FA3-5FE3DE53CDF4}.Debug|ARM64.Build.0 = Debug|ARM64
 		{BB23A474-5058-4F75-8FA3-5FE3DE53CDF4}.Debug|x64.ActiveCfg = Debug|x64
@@ -3020,14 +3008,6 @@ Global
 		{4E0FCF69-B06B-D272-76BF-ED3A559B4EDA}.Release|ARM64.Build.0 = Release|ARM64
 		{4E0FCF69-B06B-D272-76BF-ED3A559B4EDA}.Release|x64.ActiveCfg = Release|x64
 		{4E0FCF69-B06B-D272-76BF-ED3A559B4EDA}.Release|x64.Build.0 = Release|x64
-		{45354F4F-1414-45CE-B600-51CD1209FD19}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{45354F4F-1414-45CE-B600-51CD1209FD19}.Debug|ARM64.Build.0 = Debug|ARM64
-		{45354F4F-1414-45CE-B600-51CD1209FD19}.Debug|x64.ActiveCfg = Debug|x64
-		{45354F4F-1414-45CE-B600-51CD1209FD19}.Debug|x64.Build.0 = Debug|x64
-		{45354F4F-1414-45CE-B600-51CD1209FD19}.Release|ARM64.ActiveCfg = Release|ARM64
-		{45354F4F-1414-45CE-B600-51CD1209FD19}.Release|ARM64.Build.0 = Release|ARM64
-		{45354F4F-1414-45CE-B600-51CD1209FD19}.Release|x64.ActiveCfg = Release|x64
-		{45354F4F-1414-45CE-B600-51CD1209FD19}.Release|x64.Build.0 = Release|x64
 		{A66E9270-5D93-EC9C-F06E-CE7295BB9A6C}.Debug|ARM64.ActiveCfg = Debug|ARM64
 		{A66E9270-5D93-EC9C-F06E-CE7295BB9A6C}.Debug|ARM64.Build.0 = Debug|ARM64
 		{A66E9270-5D93-EC9C-F06E-CE7295BB9A6C}.Debug|x64.ActiveCfg = Debug|x64
@@ -3364,9 +3344,7 @@ Global
 		{3DCCD936-D085-4869-A1DE-CA6A64152C94} = {5B201255-53C8-490B-A34F-01F05D48A477}
 		{F5333ED7-06D8-4AB3-953A-36D63F08CB6F} = {3DCCD936-D085-4869-A1DE-CA6A64152C94}
 		{4E0FCF69-B06B-D272-76BF-ED3A559B4EDA} = {8EF25507-2575-4ADE-BF7E-D23376903AB8}
-		{45354F4F-1414-45CE-B600-51CD1209FD19} = {1AFB6476-670D-4E80-A464-657E01DFF482}
 		{A66E9270-5D93-EC9C-F06E-CE7295BB9A6C} = {8EF25507-2575-4ADE-BF7E-D23376903AB8}
-
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {C3A2F9D1-7930-4EF4-A6FC-7EE0A99821D0}

README.md

@@ -48,7 +48,7 @@ Before you begin, make sure your device meets the system requirements:
 
 Choose one of the installation methods below:
 
-<details>
+<details open>
 <summary>Download .exe from GitHub</summary>
 
 Go to the [PowerToys GitHub releases][github-release-link], click Assets to reveal the downloads, and choose the installer that matches your architecture and install scope. For most devices, that's the x64 per-user installer.
@@ -56,17 +56,17 @@ Go to the [PowerToys GitHub releases][github-release-link], click Assets to reve
 <!-- items that need to be updated release to release -->
 [github-next-release-work]: https://github.com/microsoft/PowerToys/issues?q=is%3Aissue+milestone%3A%22PowerToys+0.96%22
 [github-current-release-work]: https://github.com/microsoft/PowerToys/issues?q=is%3Aissue+milestone%3A%22PowerToys+0.95%22
-[ptUserX64]: https://github.com/microsoft/PowerToys/releases/download/v0.95.0/PowerToysUserSetup-0.95.0-x64.exe 
-[ptUserArm64]: https://github.com/microsoft/PowerToys/releases/download/v0.95.0/PowerToysUserSetup-0.95.0-arm64.exe 
-[ptMachineX64]: https://github.com/microsoft/PowerToys/releases/download/v0.95.0/PowerToysSetup-0.95.0-x64.exe 
-[ptMachineArm64]: https://github.com/microsoft/PowerToys/releases/download/v0.95.0/PowerToysSetup-0.95.0-arm64.exe
+[ptUserX64]: https://github.com/microsoft/PowerToys/releases/download/v0.95.1/PowerToysUserSetup-0.95.1-x64.exe 
+[ptUserArm64]: https://github.com/microsoft/PowerToys/releases/download/v0.95.1/PowerToysUserSetup-0.95.1-arm64.exe 
+[ptMachineX64]: https://github.com/microsoft/PowerToys/releases/download/v0.95.1/PowerToysSetup-0.95.1-x64.exe 
+[ptMachineArm64]: https://github.com/microsoft/PowerToys/releases/download/v0.95.1/PowerToysSetup-0.95.1-arm64.exe
  
 |  Description   | Filename |
 |----------------|----------|
-| Per user - x64       | [PowerToysUserSetup-0.95.0-x64.exe][ptUserX64] |
-| Per user - ARM64     | [PowerToysUserSetup-0.95.0-arm64.exe][ptUserArm64] |
-| Machine wide - x64   | [PowerToysSetup-0.95.0-x64.exe][ptMachineX64] |
-| Machine wide - ARM64 | [PowerToysSetup-0.95.0-arm64.exe][ptMachineArm64] |
+| Per user - x64       | [PowerToysUserSetup-0.95.1-x64.exe][ptUserX64] |
+| Per user - ARM64     | [PowerToysUserSetup-0.95.1-arm64.exe][ptUserArm64] |
+| Machine wide - x64   | [PowerToysSetup-0.95.1-x64.exe][ptMachineX64] |
+| Machine wide - ARM64 | [PowerToysSetup-0.95.1-arm64.exe][ptMachineArm64] |
 
 </details>
 
@@ -281,4 +281,4 @@ The application logs basic diagnostic data (telemetry). For more privacy informa
 [roadmap]: https://github.com/microsoft/PowerToys/wiki/Roadmap
 [privacy-link]: http://go.microsoft.com/fwlink/?LinkId=521839 
 [loc-bug]: https://github.com/microsoft/PowerToys/issues/new?assignees=&labels=&template=translation_issue.md&title= 
-[usingPowerToys-docs-link]: https://aka.ms/powertoys-docs
+[usingPowerToys-docs-link]: https://aka.ms/powertoys-docs

installer/PowerToysSetupCustomActionsVNext/CustomAction.cpp

@@ -1493,12 +1493,11 @@ UINT __stdcall TerminateProcessesCA(MSIHANDLE hInstall)
     }
     processes.resize(bytes / sizeof(processes[0]));
 
-    std::array<std::wstring_view, 43> processesToTerminate = {
+    std::array<std::wstring_view, 42> processesToTerminate = {
         L"PowerToys.PowerLauncher.exe",
         L"PowerToys.Settings.exe",
         L"PowerToys.AdvancedPaste.exe",
         L"PowerToys.Awake.exe",
-        L"PowerToys.McpServer.exe",
         L"PowerToys.FancyZones.exe",
         L"PowerToys.FancyZonesEditor.exe",
         L"PowerToys.FileLocksmithUI.exe",

installer/PowerToysSetupCustomActionsVNext/PowerToysSetupCustomActionsVNext.vcxproj

@@ -34,13 +34,8 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
-    <OutDir Condition=" '$(PerUser)' != 'true' ">$(Platform)\$(Configuration)\MachineSetup\</OutDir>
-    <OutDir Condition=" '$(PerUser)' == 'true' ">$(Platform)\$(Configuration)\UserSetup\</OutDir>
-    <IntDir Condition=" '$(PerUser)' != 'true' ">$(SolutionDir)$(ProjectName)\$(Platform)\$(Configuration)\MachineSetup\obj\</IntDir>
-    <IntDir Condition=" '$(PerUser)' == 'true' ">$(SolutionDir)$(ProjectName)\$(Platform)\$(Configuration)\UserSetup\obj\</IntDir>
-    <!-- The CMD script below checks this value, and it is **CASE SENSITIVE** -->
-    <NormalizedPerUserValue>false</NormalizedPerUserValue>
-    <NormalizedPerUserValue Condition=" '$(PerUser)' == 'true' ">true</NormalizedPerUserValue>
+    <OutDir>$(Platform)\$(Configuration)\SetupShared\</OutDir>
+    <IntDir>$(SolutionDir)$(ProjectName)\$(Platform)\$(Configuration)\SetupShared\obj\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)'=='Debug'">
     <LinkIncremental>true</LinkIncremental>
@@ -80,8 +75,7 @@
       call cmd /C "copy ""$(ProjectDir)..\PowerToysSetupVNext\WinAppSDK.wxs"" ""$(ProjectDir)..\PowerToysSetupVNext\WinAppSDK.wxs.bk""""
       call cmd /C "copy ""$(ProjectDir)..\PowerToysSetupVNext\WinUI3Applications.wxs"" ""$(ProjectDir)..\PowerToysSetupVNext\WinUI3Applications.wxs.bk""""
       call cmd /C "copy ""$(ProjectDir)..\PowerToysSetupVNext\Workspaces.wxs"" ""$(ProjectDir)..\PowerToysSetupVNext\Workspaces.wxs.bk""""
-      if not "$(NormalizedPerUserValue)" == "true" call powershell.exe -NonInteractive -executionpolicy Unrestricted -File ..\PowerToysSetupVNext\generateAllFileComponents.ps1 -platform $(Platform)
-      if "$(NormalizedPerUserValue)" == "true" call powershell.exe -NonInteractive -executionpolicy Unrestricted -File ..\PowerToysSetupVNext\generateAllFileComponents.ps1 -platform $(Platform) -installscopeperuser $(NormalizedPerUserValue)
+      call powershell.exe -NonInteractive -executionpolicy Unrestricted -File ..\PowerToysSetupVNext\generateAllFileComponents.ps1 -platform $(Platform)
       </Command>
       <Message>Backing up original files and populating .NET and WPF Runtime dependencies for WiX3 based installer</Message>
     </PreBuildEvent>
@@ -115,7 +109,6 @@
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>_DEBUG;_WINDOWS;_USRDLL;CUSTOMACTIONTEST_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -128,7 +121,6 @@
       <Optimization>MaxSpeed</Optimization>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>NDEBUG;_WINDOWS;_USRDLL;CUSTOMACTIONTEST_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
     </ClCompile>
     <Link>
@@ -181,4 +173,4 @@
     <Error Condition="!Exists('..\packages\WixToolset.DUtil.5.0.2\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\WixToolset.DUtil.5.0.2\build\WixToolset.DUtil.props'))" />
     <Error Condition="!Exists('..\packages\WixToolset.WcaUtil.5.0.2\build\WixToolset.WcaUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\WixToolset.WcaUtil.5.0.2\build\WixToolset.WcaUtil.props'))" />
   </Target>
-</Project>
+</Project>

installer/PowerToysSetupVNext/Directory.Build.props

@@ -1,4 +1,5 @@
 <Project>
+  <Import Project="..\..\Directory.Build.props" Condition="Exists('..\..\Directory.Build.props')" />
   <Import Project="..\..\src\Version.props" Condition="Exists('..\..\src\Version.props')" />
   <PropertyGroup>
     <!-- Set BaseIntermediateOutputPath for each project to avoid conflicts -->
@@ -8,4 +9,4 @@
     <!-- Set MSBuildProjectExtensionsPath to use the BaseIntermediateOutputPath -->
     <MSBuildProjectExtensionsPath Condition="'$(BaseIntermediateOutputPath)' != ''">$(BaseIntermediateOutputPath)</MSBuildProjectExtensionsPath>
   </PropertyGroup>
-</Project>
+</Project>

installer/PowerToysSetupVNext/PowerToysInstallerVNext.wixproj

@@ -60,6 +60,12 @@ call powershell.exe -NonInteractive -executionpolicy Unrestricted -File $(MSBuil
       call move /Y ..\..\..\Workspaces.wxs.bk ..\..\..\Workspaces.wxs
     </PostBuildEvent>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(RunBuildEvents)'=='false'">
+    <PostBuildEvent></PostBuildEvent>
+    <RunPostBuildEvent></RunPostBuildEvent>
+    <PreBuildEventUseInBuild>false</PreBuildEventUseInBuild>
+    <PostBuildEventUseInBuild>false</PostBuildEventUseInBuild>
+  </PropertyGroup>
   <PropertyGroup Label="UserMacros" Condition=" '$(PerUser)' == 'true' ">
     <DefineConstants>$(DefineConstants);PerUser=true</DefineConstants>
   </PropertyGroup>

installer/PowerToysSetupVNext/SilentFilesInUseBA/SilentFilesInUseBAFunction.vcxproj

@@ -1,30 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
-
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|ARM64">
-      <Configuration>Debug</Configuration>
-      <Platform>ARM64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|ARM64">
-      <Configuration>Release</Configuration>
-      <Platform>ARM64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-
   <PropertyGroup Label="Globals">
     <ProjectGuid>{F8B9F842-F5C3-4A2D-8C85-7F8B9E2B4F1D}</ProjectGuid>
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
     <TargetName>SilentFilesInUseBAFunction</TargetName>
     <ProjectName>PowerToysSetupCustomActionsVNext</ProjectName>
     <ProjectModuleDefinitionFile>bafunctions.def</ProjectModuleDefinitionFile>
@@ -33,7 +10,6 @@
 
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   
-  <!-- Configuration-specific property groups -->
   <PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
@@ -65,7 +41,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ClCompile Include="SilentFilesInUseBAFunctions.cpp" />
+    <ClCompile Include="SilentFilesInUseBAFunctions.cpp">
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeaderFile>precomp.h</PrecompiledHeaderFile>
+    </ClCompile>
     <ClCompile Include="bafunctions.cpp">
       <PrecompiledHeader>Create</PrecompiledHeader>
       <PrecompiledHeaderFile>precomp.h</PrecompiledHeaderFile>
@@ -92,31 +71,5 @@
     </Link>
   </ItemDefinitionGroup>
 
-  <!-- C++ source compile-specific things for Debug/Release configurations -->
-  <ItemDefinitionGroup Condition="'$(Configuration)'=='Debug'">
-    <ClCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Optimization>Disabled</Optimization>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)'=='Release'">
-    <ClCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Optimization>MaxSpeed</Optimization>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
 </Project>

installer/PowerToysSetupVNext/SilentFilesInUseBA/SilentFilesInUseBAFunctions.cpp

@@ -18,7 +18,6 @@ public: // IBootstrapperApplication
 
         BalLog(BOOTSTRAPPER_LOG_LEVEL_STANDARD, "*** CUSTOM BA FUNCTION SYSTEM ACTIVE *** Running detect begin BA function. fCached=%d, registrationType=%d, cPackages=%u, fCancel=%d", fCached, registrationType, cPackages, *pfCancel);
 
-    LExit:
         return hr;
     }
 
@@ -32,12 +31,6 @@ public: // IBAFunctions
 
         BalLog(BOOTSTRAPPER_LOG_LEVEL_STANDARD, "*** CUSTOM BA FUNCTION SYSTEM ACTIVE *** Running plan begin BA function. cPackages=%u, fCancel=%d", cPackages, *pfCancel);
 
-        //-------------------------------------------------------------------------------------------------
-        // YOUR CODE GOES HERE
-        // BalExitOnFailure(hr, "Change this message to represent real error handling.");
-        //-------------------------------------------------------------------------------------------------
-
-    LExit:
         return hr;
     }
 
@@ -63,6 +56,7 @@ public: // IBAFunctions
         )
     {
         HRESULT hr = S_OK;
+        UNREFERENCED_PARAMETER(source);
 
         BalLog(BOOTSTRAPPER_LOG_LEVEL_STANDARD, "*** CUSTOM BA FUNCTION CALLED *** Running OnExecuteFilesInUse BA function. packageId=%ls, cFiles=%u, recommendation=%d", wzPackageId, cFiles, nRecommendation);
         

installer/PowerToysSetupVNext/generateAllFileComponents.ps1

@@ -1,9 +1,7 @@
 [CmdletBinding()]
 Param(
     [Parameter(Mandatory = $True, Position = 1)]
-    [string]$platform,
-    [Parameter(Mandatory = $False, Position = 2)]
-    [string]$installscopeperuser = "false"
+    [string]$platform
 )
 
 Function Generate-FileList() {
@@ -77,9 +75,7 @@ Function Generate-FileComponents() {
         [Parameter(Mandatory = $True, Position = 1)]
         [string]$fileListName,
         [Parameter(Mandatory = $True, Position = 2)]
-        [string]$wxsFilePath,
-        [Parameter(Mandatory = $True, Position = 3)]
-        [string]$regroot
+        [string]$wxsFilePath
     )
 
     $wxsFile = Get-Content $wxsFilePath;
@@ -100,7 +96,7 @@ Function Generate-FileComponents() {
     $componentDefs +=
     @"
             <Component Id="$($componentId)" Guid="$((New-Guid).ToString().ToUpper())">
-              <RegistryKey Root="$($regroot)" Key="Software\Classes\powertoys\components">
+              <RegistryKey Root="`$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
                 <RegistryValue Type="string" Name="$($componentId)" Value="" KeyPath="yes"/>
               </RegistryKey>`r`n
 "@
@@ -134,194 +130,188 @@ if ($platform -ceq "arm64") {
     $platform = "ARM64"
 }
 
-if ($installscopeperuser -eq "true") {
-    $registryroot = "HKCU"
-} else {
-    $registryroot = "HKLM"
-}
-
 #BaseApplications
 Generate-FileList -fileDepsJson "" -fileListName BaseApplicationsFiles -wxsFilePath $PSScriptRoot\BaseApplications.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release"
-Generate-FileComponents -fileListName "BaseApplicationsFiles" -wxsFilePath $PSScriptRoot\BaseApplications.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "BaseApplicationsFiles" -wxsFilePath $PSScriptRoot\BaseApplications.wxs
 
 #WinUI3Applications
 Generate-FileList -fileDepsJson "" -fileListName WinUI3ApplicationsFiles -wxsFilePath $PSScriptRoot\WinUI3Applications.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps"
-Generate-FileComponents -fileListName "WinUI3ApplicationsFiles" -wxsFilePath $PSScriptRoot\WinUI3Applications.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "WinUI3ApplicationsFiles" -wxsFilePath $PSScriptRoot\WinUI3Applications.wxs
 
 #AdvancedPaste
 Generate-FileList -fileDepsJson "" -fileListName AdvancedPasteAssetsFiles -wxsFilePath $PSScriptRoot\AdvancedPaste.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps\Assets\AdvancedPaste"
-Generate-FileComponents -fileListName "AdvancedPasteAssetsFiles" -wxsFilePath $PSScriptRoot\AdvancedPaste.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "AdvancedPasteAssetsFiles" -wxsFilePath $PSScriptRoot\AdvancedPaste.wxs
 
 #AwakeFiles
 Generate-FileList -fileDepsJson "" -fileListName AwakeImagesFiles -wxsFilePath $PSScriptRoot\Awake.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\Assets\Awake"
-Generate-FileComponents -fileListName "AwakeImagesFiles" -wxsFilePath $PSScriptRoot\Awake.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "AwakeImagesFiles" -wxsFilePath $PSScriptRoot\Awake.wxs
 
 #ColorPicker
 Generate-FileList -fileDepsJson "" -fileListName ColorPickerAssetsFiles -wxsFilePath $PSScriptRoot\ColorPicker.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\Assets\ColorPicker"
-Generate-FileComponents -fileListName "ColorPickerAssetsFiles" -wxsFilePath $PSScriptRoot\ColorPicker.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "ColorPickerAssetsFiles" -wxsFilePath $PSScriptRoot\ColorPicker.wxs
 
 #Environment Variables
 Generate-FileList -fileDepsJson "" -fileListName EnvironmentVariablesAssetsFiles -wxsFilePath $PSScriptRoot\EnvironmentVariables.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps\Assets\EnvironmentVariables"
-Generate-FileComponents -fileListName "EnvironmentVariablesAssetsFiles" -wxsFilePath $PSScriptRoot\EnvironmentVariables.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "EnvironmentVariablesAssetsFiles" -wxsFilePath $PSScriptRoot\EnvironmentVariables.wxs
 
 #FileExplorerAdd-ons
 Generate-FileList -fileDepsJson "" -fileListName MonacoPreviewHandlerMonacoAssetsFiles -wxsFilePath $PSScriptRoot\FileExplorerPreview.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\Assets\Monaco"
 Generate-FileList -fileDepsJson "" -fileListName MonacoPreviewHandlerCustomLanguagesFiles -wxsFilePath $PSScriptRoot\FileExplorerPreview.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\Assets\Monaco\customLanguages"
-Generate-FileComponents -fileListName "MonacoPreviewHandlerMonacoAssetsFiles" -wxsFilePath $PSScriptRoot\FileExplorerPreview.wxs -regroot $registryroot
-Generate-FileComponents -fileListName "MonacoPreviewHandlerCustomLanguagesFiles" -wxsFilePath $PSScriptRoot\FileExplorerPreview.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "MonacoPreviewHandlerMonacoAssetsFiles" -wxsFilePath $PSScriptRoot\FileExplorerPreview.wxs
+Generate-FileComponents -fileListName "MonacoPreviewHandlerCustomLanguagesFiles" -wxsFilePath $PSScriptRoot\FileExplorerPreview.wxs
 
 #FileLocksmith
 Generate-FileList -fileDepsJson "" -fileListName FileLocksmithAssetsFiles -wxsFilePath $PSScriptRoot\FileLocksmith.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps\Assets\FileLocksmith"
-Generate-FileComponents -fileListName "FileLocksmithAssetsFiles" -wxsFilePath $PSScriptRoot\FileLocksmith.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "FileLocksmithAssetsFiles" -wxsFilePath $PSScriptRoot\FileLocksmith.wxs
 
 #Hosts
 Generate-FileList -fileDepsJson "" -fileListName HostsAssetsFiles -wxsFilePath $PSScriptRoot\Hosts.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps\Assets\Hosts"
-Generate-FileComponents -fileListName "HostsAssetsFiles" -wxsFilePath $PSScriptRoot\Hosts.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "HostsAssetsFiles" -wxsFilePath $PSScriptRoot\Hosts.wxs
 
 #ImageResizer
 Generate-FileList -fileDepsJson "" -fileListName ImageResizerAssetsFiles -wxsFilePath $PSScriptRoot\ImageResizer.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps\Assets\ImageResizer"
-Generate-FileComponents -fileListName "ImageResizerAssetsFiles" -wxsFilePath $PSScriptRoot\ImageResizer.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "ImageResizerAssetsFiles" -wxsFilePath $PSScriptRoot\ImageResizer.wxs
 
 # Light Switch Service
 Generate-FileList -fileDepsJson "" -fileListName LightSwitchFiles -wxsFilePath $PSScriptRoot\LightSwitch.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\LightSwitchService"
-Generate-FileComponents -fileListName "LightSwitchFiles" -wxsFilePath $PSScriptRoot\LightSwitch.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "LightSwitchFiles" -wxsFilePath $PSScriptRoot\LightSwitch.wxs
 
 #New+
 Generate-FileList -fileDepsJson "" -fileListName NewPlusAssetsFiles -wxsFilePath $PSScriptRoot\NewPlus.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps\Assets\NewPlus"
-Generate-FileComponents -fileListName "NewPlusAssetsFiles" -wxsFilePath $PSScriptRoot\NewPlus.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "NewPlusAssetsFiles" -wxsFilePath $PSScriptRoot\NewPlus.wxs
 
 #Peek
 Generate-FileList -fileDepsJson "" -fileListName PeekAssetsFiles -wxsFilePath $PSScriptRoot\Peek.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps\Assets\Peek\"
-Generate-FileComponents -fileListName "PeekAssetsFiles" -wxsFilePath $PSScriptRoot\Peek.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "PeekAssetsFiles" -wxsFilePath $PSScriptRoot\Peek.wxs
 
 #PowerRename
 Generate-FileList -fileDepsJson "" -fileListName PowerRenameAssetsFiles -wxsFilePath $PSScriptRoot\PowerRename.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps\Assets\PowerRename\"
-Generate-FileComponents -fileListName "PowerRenameAssetsFiles" -wxsFilePath $PSScriptRoot\PowerRename.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "PowerRenameAssetsFiles" -wxsFilePath $PSScriptRoot\PowerRename.wxs
 
 #RegistryPreview
 Generate-FileList -fileDepsJson "" -fileListName RegistryPreviewAssetsFiles -wxsFilePath $PSScriptRoot\RegistryPreview.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps\Assets\RegistryPreview\"
-Generate-FileComponents -fileListName "RegistryPreviewAssetsFiles" -wxsFilePath $PSScriptRoot\RegistryPreview.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "RegistryPreviewAssetsFiles" -wxsFilePath $PSScriptRoot\RegistryPreview.wxs
 
 #Run
 Generate-FileList -fileDepsJson "" -fileListName launcherImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\Assets\PowerLauncher"
-Generate-FileComponents -fileListName "launcherImagesComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "launcherImagesComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs
 ## Plugins
 ###Calculator
 Generate-FileList -fileDepsJson "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Calculator\Microsoft.PowerToys.Run.Plugin.Calculator.deps.json" -fileListName calcComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1
 Generate-FileList -fileDepsJson "" -fileListName calcImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Calculator\Images"
-Generate-FileComponents -fileListName "calcComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
-Generate-FileComponents -fileListName "calcImagesComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "calcComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs
+Generate-FileComponents -fileListName "calcImagesComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs
 ###Folder
 Generate-FileList -fileDepsJson "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Folder\Microsoft.Plugin.Folder.deps.json" -fileListName FolderComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1
 Generate-FileList -fileDepsJson "" -fileListName FolderImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Folder\Images"
-Generate-FileComponents -fileListName "FolderComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
-Generate-FileComponents -fileListName "FolderImagesComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "FolderComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs
+Generate-FileComponents -fileListName "FolderImagesComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs
 ###Program
 Generate-FileList -fileDepsJson "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Program\Microsoft.Plugin.Program.deps.json" -fileListName ProgramComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1
 Generate-FileList -fileDepsJson "" -fileListName ProgramImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Program\Images"
-Generate-FileComponents -fileListName "ProgramComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
-Generate-FileComponents -fileListName "ProgramImagesComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "ProgramComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs
+Generate-FileComponents -fileListName "ProgramImagesComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs
 ###Shell
 Generate-FileList -fileDepsJson "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Shell\Microsoft.Plugin.Shell.deps.json" -fileListName ShellComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1
 Generate-FileList -fileDepsJson "" -fileListName ShellImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Shell\Images"
-Generate-FileComponents -fileListName "ShellComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
-Generate-FileComponents -fileListName "ShellImagesComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "ShellComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs
+Generate-FileComponents -fileListName "ShellImagesComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs
 ###Indexer
 Generate-FileList -fileDepsJson "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Indexer\Microsoft.Plugin.Indexer.deps.json" -fileListName IndexerComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1
 Generate-FileList -fileDepsJson "" -fileListName IndexerImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Indexer\Images"
-Generate-FileComponents -fileListName "IndexerComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
-Generate-FileComponents -fileListName "IndexerImagesComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "IndexerComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs
+Generate-FileComponents -fileListName "IndexerImagesComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs
 ###UnitConverter
 Generate-FileList -fileDepsJson "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\UnitConverter\Community.PowerToys.Run.Plugin.UnitConverter.deps.json" -fileListName UnitConvCompFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1
 Generate-FileList -fileDepsJson "" -fileListName UnitConvImagesCompFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\UnitConverter\Images"
-Generate-FileComponents -fileListName "UnitConvCompFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
-Generate-FileComponents -fileListName "UnitConvImagesCompFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "UnitConvCompFiles" -wxsFilePath $PSScriptRoot\Run.wxs
+Generate-FileComponents -fileListName "UnitConvImagesCompFiles" -wxsFilePath $PSScriptRoot\Run.wxs
 ###WebSearch
 Generate-FileList -fileDepsJson "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\WebSearch\Community.PowerToys.Run.Plugin.WebSearch.deps.json" -fileListName WebSrchCompFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1
 Generate-FileList -fileDepsJson "" -fileListName WebSrchImagesCompFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\WebSearch\Images"
-Generate-FileComponents -fileListName "WebSrchCompFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
-Generate-FileComponents -fileListName "WebSrchImagesCompFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "WebSrchCompFiles" -wxsFilePath $PSScriptRoot\Run.wxs
+Generate-FileComponents -fileListName "WebSrchImagesCompFiles" -wxsFilePath $PSScriptRoot\Run.wxs
 ###History
 Generate-FileList -fileDepsJson "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\History\Microsoft.PowerToys.Run.Plugin.History.deps.json" -fileListName HistoryPluginComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1
 Generate-FileList -fileDepsJson "" -fileListName HistoryPluginImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\History\Images"
-Generate-FileComponents -fileListName "HistoryPluginComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
-Generate-FileComponents -fileListName "HistoryPluginImagesComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "HistoryPluginComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs
+Generate-FileComponents -fileListName "HistoryPluginImagesComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs
 ###Uri
 Generate-FileList -fileDepsJson "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Uri\Microsoft.Plugin.Uri.deps.json" -fileListName UriComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1
 Generate-FileList -fileDepsJson "" -fileListName UriImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Uri\Images"
-Generate-FileComponents -fileListName "UriComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
-Generate-FileComponents -fileListName "UriImagesComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "UriComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs
+Generate-FileComponents -fileListName "UriImagesComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs
 ###VSCodeWorkspaces
 Generate-FileList -fileDepsJson "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\VSCodeWorkspaces\Community.PowerToys.Run.Plugin.VSCodeWorkspaces.deps.json" -fileListName VSCWrkCompFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1
 Generate-FileList -fileDepsJson "" -fileListName VSCWrkImagesCompFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\VSCodeWorkspaces\Images"
-Generate-FileComponents -fileListName "VSCWrkCompFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
-Generate-FileComponents -fileListName "VSCWrkImagesCompFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "VSCWrkCompFiles" -wxsFilePath $PSScriptRoot\Run.wxs
+Generate-FileComponents -fileListName "VSCWrkImagesCompFiles" -wxsFilePath $PSScriptRoot\Run.wxs
 ###WindowWalker
 Generate-FileList -fileDepsJson "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\WindowWalker\Microsoft.Plugin.WindowWalker.deps.json" -fileListName WindowWlkrCompFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1
 Generate-FileList -fileDepsJson "" -fileListName WindowWlkrImagesCompFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\WindowWalker\Images"
-Generate-FileComponents -fileListName "WindowWlkrCompFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
-Generate-FileComponents -fileListName "WindowWlkrImagesCompFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "WindowWlkrCompFiles" -wxsFilePath $PSScriptRoot\Run.wxs
+Generate-FileComponents -fileListName "WindowWlkrImagesCompFiles" -wxsFilePath $PSScriptRoot\Run.wxs
 ###OneNote
 Generate-FileList -fileDepsJson "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\OneNote\Microsoft.PowerToys.Run.Plugin.OneNote.deps.json" -fileListName OneNoteComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1
 Generate-FileList -fileDepsJson "" -fileListName OneNoteImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\OneNote\Images"
-Generate-FileComponents -fileListName "OneNoteComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
-Generate-FileComponents -fileListName "OneNoteImagesComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "OneNoteComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs
+Generate-FileComponents -fileListName "OneNoteImagesComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs
 ###Registry
 Generate-FileList -fileDepsJson "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Registry\Microsoft.PowerToys.Run.Plugin.Registry.deps.json" -fileListName RegistryComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1
 Generate-FileList -fileDepsJson "" -fileListName RegistryImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Registry\Images"
-Generate-FileComponents -fileListName "RegistryComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
-Generate-FileComponents -fileListName "RegistryImagesComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "RegistryComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs
+Generate-FileComponents -fileListName "RegistryImagesComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs
 ###Service
 Generate-FileList -fileDepsJson "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Service\Microsoft.PowerToys.Run.Plugin.Service.deps.json" -fileListName ServiceComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1
 Generate-FileList -fileDepsJson "" -fileListName ServiceImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Service\Images"
-Generate-FileComponents -fileListName "ServiceComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
-Generate-FileComponents -fileListName "ServiceImagesComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "ServiceComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs
+Generate-FileComponents -fileListName "ServiceImagesComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs
 ###System
 Generate-FileList -fileDepsJson "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\System\Microsoft.PowerToys.Run.Plugin.System.deps.json" -fileListName SystemComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1
 Generate-FileList -fileDepsJson "" -fileListName SystemImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\System\Images"
-Generate-FileComponents -fileListName "SystemComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
-Generate-FileComponents -fileListName "SystemImagesComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "SystemComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs
+Generate-FileComponents -fileListName "SystemImagesComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs
 ###TimeDate
 Generate-FileList -fileDepsJson "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\TimeDate\Microsoft.PowerToys.Run.Plugin.TimeDate.deps.json" -fileListName TimeDateComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1
 Generate-FileList -fileDepsJson "" -fileListName TimeDateImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\TimeDate\Images"
-Generate-FileComponents -fileListName "TimeDateComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
-Generate-FileComponents -fileListName "TimeDateImagesComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "TimeDateComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs
+Generate-FileComponents -fileListName "TimeDateImagesComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs
 ###WindowsSettings
 Generate-FileList -fileDepsJson "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\WindowsSettings\Microsoft.PowerToys.Run.Plugin.WindowsSettings.deps.json" -fileListName WinSetCmpFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1
 Generate-FileList -fileDepsJson "" -fileListName WinSetImagesCmpFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\WindowsSettings\Images"
-Generate-FileComponents -fileListName "WinSetCmpFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
-Generate-FileComponents -fileListName "WinSetImagesCmpFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "WinSetCmpFiles" -wxsFilePath $PSScriptRoot\Run.wxs
+Generate-FileComponents -fileListName "WinSetImagesCmpFiles" -wxsFilePath $PSScriptRoot\Run.wxs
 ###WindowsTerminal
 Generate-FileList -fileDepsJson "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\WindowsTerminal\Microsoft.PowerToys.Run.Plugin.WindowsTerminal.deps.json" -fileListName WinTermCmpFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1
 Generate-FileList -fileDepsJson "" -fileListName WinTermImagesCmpFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\WindowsTerminal\Images"
-Generate-FileComponents -fileListName "WinTermCmpFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
-Generate-FileComponents -fileListName "WinTermImagesCmpFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "WinTermCmpFiles" -wxsFilePath $PSScriptRoot\Run.wxs
+Generate-FileComponents -fileListName "WinTermImagesCmpFiles" -wxsFilePath $PSScriptRoot\Run.wxs
 ###PowerToys
 Generate-FileList -fileDepsJson "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\PowerToys\Microsoft.PowerToys.Run.Plugin.PowerToys.deps.json" -fileListName PowerToysCmpFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1
 Generate-FileList -fileDepsJson "" -fileListName PowerToysImagesCmpFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\PowerToys\Images"
-Generate-FileComponents -fileListName "PowerToysCmpFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
-Generate-FileComponents -fileListName "PowerToysImagesCmpFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "PowerToysCmpFiles" -wxsFilePath $PSScriptRoot\Run.wxs
+Generate-FileComponents -fileListName "PowerToysImagesCmpFiles" -wxsFilePath $PSScriptRoot\Run.wxs
 ###ValueGenerator
 Generate-FileList -fileDepsJson "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\ValueGenerator\Community.PowerToys.Run.Plugin.ValueGenerator.deps.json" -fileListName ValueGeneratorCmpFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1
 Generate-FileList -fileDepsJson "" -fileListName ValueGeneratorImagesCmpFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\ValueGenerator\Images"
-Generate-FileComponents -fileListName "ValueGeneratorCmpFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
-Generate-FileComponents -fileListName "ValueGeneratorImagesCmpFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "ValueGeneratorCmpFiles" -wxsFilePath $PSScriptRoot\Run.wxs
+Generate-FileComponents -fileListName "ValueGeneratorImagesCmpFiles" -wxsFilePath $PSScriptRoot\Run.wxs
 ## Plugins
 
 #ShortcutGuide
 Generate-FileList -fileDepsJson "" -fileListName ShortcutGuideSvgFiles -wxsFilePath $PSScriptRoot\ShortcutGuide.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\Assets\ShortcutGuide\"
-Generate-FileComponents -fileListName "ShortcutGuideSvgFiles" -wxsFilePath $PSScriptRoot\ShortcutGuide.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "ShortcutGuideSvgFiles" -wxsFilePath $PSScriptRoot\ShortcutGuide.wxs
 
 #Settings
 Generate-FileList -fileDepsJson "" -fileListName SettingsV2AssetsFiles -wxsFilePath $PSScriptRoot\Settings.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps\Assets\Settings\"
 Generate-FileList -fileDepsJson "" -fileListName SettingsV2AssetsModulesFiles -wxsFilePath $PSScriptRoot\Settings.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps\Assets\Settings\Modules\"
 Generate-FileList -fileDepsJson "" -fileListName SettingsV2OOBEAssetsModulesFiles -wxsFilePath $PSScriptRoot\Settings.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps\Assets\Settings\Modules\OOBE\"
 Generate-FileList -fileDepsJson "" -fileListName SettingsV2OOBEAssetsFluentIconsFiles -wxsFilePath $PSScriptRoot\Settings.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps\Assets\Settings\Icons\"
-Generate-FileComponents -fileListName "SettingsV2AssetsFiles" -wxsFilePath $PSScriptRoot\Settings.wxs -regroot $registryroot
-Generate-FileComponents -fileListName "SettingsV2AssetsModulesFiles" -wxsFilePath $PSScriptRoot\Settings.wxs -regroot $registryroot
-Generate-FileComponents -fileListName "SettingsV2OOBEAssetsModulesFiles" -wxsFilePath $PSScriptRoot\Settings.wxs -regroot $registryroot
-Generate-FileComponents -fileListName "SettingsV2OOBEAssetsFluentIconsFiles" -wxsFilePath $PSScriptRoot\Settings.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "SettingsV2AssetsFiles" -wxsFilePath $PSScriptRoot\Settings.wxs
+Generate-FileComponents -fileListName "SettingsV2AssetsModulesFiles" -wxsFilePath $PSScriptRoot\Settings.wxs
+Generate-FileComponents -fileListName "SettingsV2OOBEAssetsModulesFiles" -wxsFilePath $PSScriptRoot\Settings.wxs
+Generate-FileComponents -fileListName "SettingsV2OOBEAssetsFluentIconsFiles" -wxsFilePath $PSScriptRoot\Settings.wxs
 
 #Workspaces
 Generate-FileList -fileDepsJson "" -fileListName WorkspacesImagesComponentFiles -wxsFilePath $PSScriptRoot\Workspaces.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\Assets\Workspaces\"
-Generate-FileComponents -fileListName "WorkspacesImagesComponentFiles" -wxsFilePath $PSScriptRoot\Workspaces.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "WorkspacesImagesComponentFiles" -wxsFilePath $PSScriptRoot\Workspaces.wxs

nuget.config

@@ -2,17 +2,9 @@
 <configuration>
 	<packageSources>
 		<clear />
-		<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
 		<add key="PowerToysPublicDependencies" value="https://pkgs.dev.azure.com/shine-oss/PowerToys/_packaging/PowerToysPublicDependencies/nuget/v3/index.json" />
 	</packageSources>
 	<packageSourceMapping>
-		<packageSource key="nuget.org">
-            <package pattern="Microsoft.SemanticKernel*" />
-            <package pattern="Microsoft.Extensions.*" />
-            <package pattern="System.*" />
-            <package pattern="OpenAI" />
-            <package pattern="Azure.*" />
-        </packageSource>
 		<packageSource key="PowerToysPublicDependencies">
 			<package pattern="*" />
 		</packageSource>

src/McpServer/PowerToys.McpServer.csproj

@@ -1,32 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="..\Common.Dotnet.CsWinRT.props" />
-  <Import Project="..\Common.SelfContained.props" />
-
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <RootNamespace>PowerToys.McpServer</RootNamespace>
-    <AssemblyName>PowerToys.McpServer</AssemblyName>
-    <Nullable>enable</Nullable>
-    <OutputPath>..\..\$(Platform)\$(Configuration)</OutputPath>
-    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
-    <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
-  </PropertyGroup>
-
-  <PropertyGroup>
-    <ApplicationManifest>PowerToys.McpServer.dev.manifest</ApplicationManifest>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(CIBuild)'=='true'">
-    <ApplicationManifest>PowerToys.McpServer.prod.manifest</ApplicationManifest>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Hosting" />
-    <PackageReference Include="ModelContextProtocol" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\settings-ui\Settings.UI.Library\Settings.UI.Library.csproj" />
-    <ProjectReference Include="..\common\ManagedCommon\ManagedCommon.csproj" />
-  </ItemGroup>
-</Project>

src/McpServer/PowerToys.McpServer.dev.manifest

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
-  <assemblyIdentity version="1.0.0.0" name="PowerToys.McpServer.app" />
-  <msix xmlns="urn:schemas-microsoft-com:msix.v1"
-        publisher="CN=PowerToys Dev, O=PowerToys, L=Redmond, S=Washington, C=US"
-        packageName="Microsoft.PowerToys.SparseApp"
-        applicationId="PowerToys.McpServer" />
-</assembly>

src/McpServer/PowerToys.McpServer.prod.manifest

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
-  <assemblyIdentity version="1.0.0.0" name="PowerToys.McpServer.app" />
-  <msix xmlns="urn:schemas-microsoft-com:msix.v1"
-        publisher="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US"
-        packageName="Microsoft.PowerToys.SparseApp"
-        applicationId="PowerToys.McpServer" />
-</assembly>

src/McpServer/Program.cs

@@ -1,57 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using System.IO;
-using System.Threading.Tasks;
-using ManagedCommon;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Hosting;
-using Microsoft.Extensions.Logging;
-using ModelContextProtocol.Server;
-using PowerToys.McpServer.Tools;
-
-namespace PowerToys.McpServer
-{
-    internal sealed class Program
-    {
-        private static async Task<int> Main(string[] args)
-        {
-            // Initialize PowerToys logger
-            // Logger.InitializeLogger expects path relative to Constants.AppDataPath()
-            // which already points to LocalAppData\Microsoft\PowerToys
-            string logPath = Path.Combine("\\McpServer", "Logs");
-            Logger.InitializeLogger(logPath);
-            Logger.LogInfo("Starting PowerToys MCP Server with official SDK");
-
-            try
-            {
-                var builder = Host.CreateApplicationBuilder(args);
-
-                // Configure all logs to go to stderr (required for MCP protocol)
-                builder.Logging.AddConsole(consoleLogOptions =>
-                {
-                    consoleLogOptions.LogToStandardErrorThreshold = LogLevel.Trace;
-                });
-
-                // Register MCP server with stdio transport and tools
-                builder.Services
-                    .AddMcpServer()
-                    .WithStdioServerTransport()
-                    .WithToolsFromAssembly();
-
-                Logger.LogInfo("Building and running MCP host...");
-                await builder.Build().RunAsync();
-                Logger.LogInfo("MCP server shutdown complete");
-
-                return 0;
-            }
-            catch (Exception ex)
-            {
-                Logger.LogError("Fatal error in MCP server", ex);
-                return 1;
-            }
-        }
-    }
-}

src/McpServer/README.md

@@ -1,102 +0,0 @@
-# PowerToys Model Context Protocol Server
-
-This module hosts a standalone Model Context Protocol (MCP) server that exposes PowerToys functionality to MCP-compliant AI agents. The server is built as a .NET 9 console application that implements the MCP specification using the official ModelContextProtocol SDK.
-
-## Project Structure
-
-- **Program.cs**: Main entry point that configures the MCP server with stdio transport
-- **Tools/AwakeTools.cs**: Implementation of Awake-related MCP tools
-- **PowerToys.McpServer.csproj**: .NET 9 project configuration with MCP dependencies
-
-## Dependencies
-
-- **Microsoft.Extensions.Hosting**: For hosting infrastructure and dependency injection
-- **ModelContextProtocol**: Official MCP SDK for .NET
-- **PowerToys Settings Library**: Integration with PowerToys settings system
-- **ManagedCommon**: PowerToys logging and utilities
-
-## Available Tools
-
-| Tool Name | Description | Parameters | Module |
-|-----------|-------------|------------|--------|
-| `GetAwakeStatus` | Returns the current Awake configuration (mode, timers, display policy) | None | Awake |
-| `SetAwakePassive` | Set Awake to passive mode (allow system to sleep normally) | None | Awake |
-| `SetAwakeIndefinite` | Set Awake to indefinite mode (keep system awake until manually changed) | `keepDisplayOn` (bool), `force` (bool) | Awake |
-| `SetAwakeTimed` | Set Awake to timed mode (keep system awake for a specific duration) | `durationSeconds` (int), `keepDisplayOn` (bool), `force` (bool) | Awake |
-
-## Building and Running
-
-### Prerequisites
-- .NET 9 SDK
-- Visual Studio 2022 (recommended) or VS Code with C# extension
-
-### Build
-```bash
-# From PowerToys root directory
-msbuild src/McpServer/PowerToys.McpServer.csproj /p:Platform=x64 /p:Configuration=Debug
-
-# Or using dotnet CLI
-cd src/McpServer
-dotnet build -c Debug
-```
-
-### Run the Server
-The executable is built to `x64\Debug\PowerToys.McpServer.exe`. The server communicates over standard input/output using MCP framing (`Content-Length` header followed by JSON).
-
-**Example MCP Client Session:**
-1. Client sends `initialize` request with MCP version and capabilities
-2. Client calls `tools/list` to discover available PowerToys tools
-3. Client invokes `tools/call` with the desired tool name and arguments
-4. Server responds with tool execution results or errors
-
-The server will remain active until the process is terminated or a `shutdown` request is received.
-
-### Logging
-- Application logs are written to `%LOCALAPPDATA%\Microsoft\PowerToys\McpServer\Logs\`
-- MCP protocol logs are sent to stderr (required by MCP specification)
-
-## Architecture
-
-The server uses the official ModelContextProtocol .NET SDK and follows these patterns:
-
-- **Tool Discovery**: Tools are automatically discovered using `WithToolsFromAssembly()` 
-- **Tool Attributes**: Methods marked with `[McpServerTool]` and `[Description]` are exposed as MCP tools
-- **Parameter Binding**: Method parameters are automatically bound from MCP tool call arguments
-- **Error Handling**: Exceptions are caught and returned as MCP error responses
-- **Settings Integration**: Uses PowerToys settings system for configuration persistence
-
-## Adding New Module Tools
-
-1. Create a new static class in the `Tools/` directory (e.g., `FancyZonesTools.cs`)
-2. Mark the class with `[McpServerToolType]` attribute
-3. Implement static methods with `[McpServerTool]` and `[Description]` attributes:
-   ```csharp
-   [McpServerToolType]
-   public static class MyModuleTools
-   {
-       [McpServerTool]
-       [Description("Description of what this tool does")]
-       public static JsonObject MyTool(
-           [Description("Parameter description")] string parameter)
-       {
-           // Implementation here
-           return new JsonObject();
-       }
-   }
-   ```
-4. Follow existing patterns in `AwakeTools.cs` for:
-   - Settings integration using `SettingsUtils`
-   - Logging using `Logger.LogInfo/LogError`
-   - Error handling and response formatting
-   - PowerToys process detection and module status checks
-
-## Integration with PowerToys
-
-The MCP server integrates with PowerToys through:
-
-- **Settings System**: Uses the same settings files as the main PowerToys application
-- **Process Management**: Detects and interacts with running PowerToys processes
-- **Module Status**: Checks if specific PowerToys modules are enabled
-- **Logging**: Uses PowerToys logging infrastructure for troubleshooting
-
-Refer to the PowerToys developer documentation for build and packaging instructions.

src/McpServer/Tools/AwakeTools.cs

@@ -1,694 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics;
-using System.Globalization;
-using System.IO;
-using System.Text.Json.Nodes;
-using ManagedCommon;
-using Microsoft.PowerToys.Settings.UI.Library;
-using ModelContextProtocol.Server;
-using Lock = System.Threading.Lock;
-
-namespace PowerToys.McpServer.Tools
-{
-    /// <summary>
-    /// MCP tools for PowerToys Awake module.
-    /// </summary>
-    [McpServerToolType]
-    public static class AwakeTools
-    {
-        private static readonly SettingsUtils SettingsUtils = new SettingsUtils();
-        private const string PowerToysProcessName = "PowerToys";
-        private const string AwakeExecutableName = "PowerToys.Awake.exe";
-        private static readonly string[] AwakeRelativeSearchPaths =
-        [
-            AwakeExecutableName,
-            Path.Combine("modules", "Awake", AwakeExecutableName),
-        ];
-
-        /// <summary>
-        /// Gets the current Awake mode and configuration.
-        /// </summary>
-        /// <returns>JSON object with current Awake status.</returns>
-        [McpServerTool]
-        [Description("Get the current Awake mode and configuration from the PowerToys settings store.")]
-        public static JsonObject GetAwakeStatus()
-        {
-            try
-            {
-                (bool powerToysRunning, bool awakeModuleEnabled) = CheckPowerToysAndAwakeStatus();
-
-                if (!powerToysRunning || !awakeModuleEnabled)
-                {
-                    if (IsAwakeProcessRunning())
-                    {
-                        // Awake is running via CLI, but we cannot determine its actual configuration
-                        Logger.LogInfo("[MCP] Detected Awake CLI process running while PowerToys is not active or Awake module is disabled.");
-                        return AwakeStatusPayload.CreateUnknownActive().ToJsonObject();
-                    }
-
-                    return AwakeStatusPayload.CreateInactive().ToJsonObject();
-                }
-
-                // PowerToys is running and Awake module is enabled
-                bool awakeProcessRunning = IsAwakeProcessRunning();
-
-                AwakeSettings settings = SettingsUtils.GetSettingsOrDefault<AwakeSettings>(AwakeSettings.ModuleName);
-                string summary = FormatAwakeDescription(settings);
-
-                if (awakeProcessRunning)
-                {
-                    summary = $"{summary} An Awake process is already running with the current configuration. To override the active session and apply new settings, use force=true.";
-                }
-
-                AwakeStatusPayload payload = AwakeStatusPayload.FromSettings(settings, summary);
-                Logger.LogInfo("[MCP] Retrieved Awake status via SDK tool.");
-                return payload.ToJsonObject();
-            }
-            catch (Exception ex)
-            {
-                Logger.LogError("[MCP] Failed to read Awake status.", ex);
-                return AwakeStatusPayload.CreateError(ex.Message).ToJsonObject();
-            }
-        }
-
-        /// <summary>
-        /// Sets the Awake mode to passive (allow system sleep).
-        /// </summary>
-        /// <returns>JSON object with updated Awake status.</returns>
-        [McpServerTool]
-        [Description("Set Awake to passive mode (allow system to sleep normally).")]
-        public static JsonObject SetAwakePassive()
-        {
-            try
-            {
-                (bool powerToysRunning, bool awakeModuleEnabled) = CheckPowerToysAndAwakeStatus();
-
-                if (!powerToysRunning || !awakeModuleEnabled)
-                {
-                    StopAwakeProcesses();
-                    Logger.LogInfo("[MCP] Stopped all Awake processes because PowerToys is not running.");
-                    return AwakeStatusPayload.CreateInactive().ToJsonObject();
-                }
-
-                AwakeSettings settings = SettingsUtils.GetSettingsOrDefault<AwakeSettings>(AwakeSettings.ModuleName);
-                settings.Properties.Mode = AwakeMode.PASSIVE;
-                settings.Properties.KeepDisplayOn = false;
-                settings.Properties.IntervalHours = 0;
-                settings.Properties.IntervalMinutes = 0;
-                SettingsUtils.SaveSettings(settings.ToJsonString(), AwakeSettings.ModuleName);
-
-                string confirmation = FormatAwakeDescription(settings);
-                Logger.LogInfo($"[MCP] {confirmation}");
-                AwakeStatusPayload payload = AwakeStatusPayload.FromSettings(settings, confirmation);
-                return payload.ToJsonObject();
-            }
-            catch (Exception ex)
-            {
-                Logger.LogError("[MCP] Failed to set Awake to passive.", ex);
-                return AwakeStatusPayload.CreateError(ex.Message).ToJsonObject();
-            }
-        }
-
-        /// <summary>
-        /// Sets the Awake mode to indefinite (keep system awake forever).
-        /// </summary>
-        /// <param name="keepDisplayOn">Whether to keep the display on. Default is true.</param>
-        /// <returns>JSON object with updated Awake status.</returns>
-        [McpServerTool]
-        [Description("Set Awake to indefinite mode (keep system awake until manually changed).")]
-        public static JsonObject SetAwakeIndefinite(
-            [Description("Whether to keep the display on")] bool keepDisplayOn = true,
-            [Description("Force the change even if Awake is already running (default: false)")] bool force = false)
-        {
-            try
-            {
-                (bool powerToysRunning, bool awakeModuleEnabled) = CheckPowerToysAndAwakeStatus();
-
-                if (!powerToysRunning || !awakeModuleEnabled)
-                {
-                    return AwakeStatusPayload.CreateError(
-                        "Indefinite mode requires PowerToys to be running with Awake module enabled. CLI mode does not support indefinite operation.").ToJsonObject();
-                }
-
-                AwakeSettings settings = SettingsUtils.GetSettingsOrDefault<AwakeSettings>(AwakeSettings.ModuleName);
-                if (!force && IsAwakeActive(settings))
-                {
-                    return BuildActiveProcessResponse(settings, true, false);
-                }
-
-                settings.Properties.Mode = AwakeMode.INDEFINITE;
-                settings.Properties.KeepDisplayOn = keepDisplayOn;
-                settings.Properties.IntervalHours = 0;
-                settings.Properties.IntervalMinutes = 0;
-                SettingsUtils.SaveSettings(settings.ToJsonString(), AwakeSettings.ModuleName);
-
-                string confirmation = FormatAwakeDescription(settings);
-                Logger.LogInfo($"[MCP] {confirmation}");
-                AwakeStatusPayload payload = AwakeStatusPayload.FromSettings(settings, confirmation);
-                return payload.ToJsonObject();
-            }
-            catch (Exception ex)
-            {
-                Logger.LogError("[MCP] Failed to set Awake to indefinite.", ex);
-                return AwakeStatusPayload.CreateError(ex.Message).ToJsonObject();
-            }
-        }
-
-        /// <summary>
-        /// Sets the Awake mode to expire at a specific date and time.
-        /// </summary>
-        /// <param name="expireAt">ISO 8601 date/time when Awake should expire (e.g., "2025-10-22T15:30:00").</param>
-        /// <param name="keepDisplayOn">Whether to keep the display on. Default is true.</param>
-        /// <returns>JSON object with updated Awake status.</returns>
-        [McpServerTool]
-        [Description("Set Awake to expire at a specific date and time (ISO 8601 format).")]
-        public static JsonObject SetAwakeExpireAt(
-            [Description("ISO 8601 date/time when Awake should expire (e.g., \"2025-10-22T15:30:00\")")] string expireAt,
-            [Description("Whether to keep the display on")] bool keepDisplayOn = true,
-            [Description("Force the change even if Awake is already running (default: false)")] bool force = false)
-        {
-            try
-            {
-                if (!DateTimeOffset.TryParse(expireAt, out DateTimeOffset expirationDateTime))
-                {
-                    return AwakeStatusPayload.CreateError($"Invalid date format: '{expireAt}'. Please use ISO 8601 format (e.g., '2025-10-22T15:30:00').").ToJsonObject();
-                }
-
-                if (expirationDateTime <= DateTimeOffset.Now)
-                {
-                    return AwakeStatusPayload.CreateError("Expiration time must be in the future.").ToJsonObject();
-                }
-
-                (bool powerToysRunning, bool awakeModuleEnabled) = CheckPowerToysAndAwakeStatus();
-
-                if (!powerToysRunning || !awakeModuleEnabled)
-                {
-                    TimeSpan duration = expirationDateTime - DateTimeOffset.Now;
-                    uint durationSeconds = (uint)Math.Max(60, duration.TotalSeconds);
-                    return HandleCliScenario(AwakeMode.EXPIRABLE, keepDisplayOn, durationSeconds, force);
-                }
-
-                AwakeSettings settings = SettingsUtils.GetSettingsOrDefault<AwakeSettings>(AwakeSettings.ModuleName);
-                if (!force && IsAwakeActive(settings))
-                {
-                    return BuildActiveProcessResponse(settings, true, false);
-                }
-
-                TimeSpan timeSpan = expirationDateTime - DateTimeOffset.Now;
-                uint hours = (uint)timeSpan.TotalHours;
-                uint minutes = (uint)Math.Ceiling(timeSpan.TotalMinutes % 60);
-                if (hours == 0 && minutes == 0)
-                {
-                    minutes = 1;
-                }
-
-                settings.Properties.Mode = AwakeMode.EXPIRABLE;
-                settings.Properties.KeepDisplayOn = keepDisplayOn;
-                settings.Properties.IntervalHours = hours;
-                settings.Properties.IntervalMinutes = minutes;
-                settings.Properties.ExpirationDateTime = expirationDateTime;
-                SettingsUtils.SaveSettings(settings.ToJsonString(), AwakeSettings.ModuleName);
-
-                string confirmation = FormatAwakeDescription(settings);
-                Logger.LogInfo($"[MCP] {confirmation}");
-                AwakeStatusPayload payload = AwakeStatusPayload.FromSettings(settings, confirmation);
-                return payload.ToJsonObject();
-            }
-            catch (Exception ex)
-            {
-                Logger.LogError("[MCP] Failed to set Awake expire-at mode.", ex);
-                return AwakeStatusPayload.CreateError(ex.Message).ToJsonObject();
-            }
-        }
-
-        /// <summary>
-        /// Sets the Awake mode to timed (keep system awake for a specific duration).
-        /// </summary>
-        /// <param name="durationSeconds">Duration in seconds (minimum 60).</param>
-        /// <param name="keepDisplayOn">Whether to keep the display on. Default is true.</param>
-        /// <returns>JSON object with updated Awake status.</returns>
-        [McpServerTool]
-        [Description("Set Awake to timed mode (keep system awake for a specific duration).")]
-        public static JsonObject SetAwakeTimed(
-            [Description("Duration in seconds (minimum 60)")] int durationSeconds,
-            [Description("Whether to keep the display on")] bool keepDisplayOn = true,
-            [Description("Force the change even if Awake is already running (default: false)")] bool force = false)
-        {
-            try
-            {
-                if (durationSeconds < 60)
-                {
-                    durationSeconds = 60;
-                }
-
-                (bool powerToysRunning, bool awakeModuleEnabled) = CheckPowerToysAndAwakeStatus();
-
-                if (!powerToysRunning || !awakeModuleEnabled)
-                {
-                    return HandleCliScenario(AwakeMode.TIMED, keepDisplayOn, (uint)durationSeconds, force);
-                }
-
-                TimeSpan timeSpan = TimeSpan.FromSeconds(durationSeconds);
-                uint hours = (uint)timeSpan.TotalHours;
-                uint minutes = (uint)Math.Ceiling(timeSpan.TotalMinutes % 60);
-                if (hours == 0 && minutes == 0)
-                {
-                    minutes = 1;
-                }
-
-                AwakeSettings settings = SettingsUtils.GetSettingsOrDefault<AwakeSettings>(AwakeSettings.ModuleName);
-                if (!force && IsAwakeActive(settings))
-                {
-                    return BuildActiveProcessResponse(settings, true, false);
-                }
-
-                settings.Properties.Mode = AwakeMode.TIMED;
-                settings.Properties.KeepDisplayOn = keepDisplayOn;
-                settings.Properties.IntervalHours = hours;
-                settings.Properties.IntervalMinutes = minutes;
-                settings.Properties.ExpirationDateTime = DateTimeOffset.Now.Add(timeSpan);
-                SettingsUtils.SaveSettings(settings.ToJsonString(), AwakeSettings.ModuleName);
-
-                string confirmation = FormatAwakeDescription(settings);
-                Logger.LogInfo($"[MCP] {confirmation}");
-                AwakeStatusPayload payload = AwakeStatusPayload.FromSettings(settings, confirmation);
-                return payload.ToJsonObject();
-            }
-            catch (Exception ex)
-            {
-                Logger.LogError("[MCP] Failed to set Awake to timed mode.", ex);
-                return AwakeStatusPayload.CreateError(ex.Message).ToJsonObject();
-            }
-        }
-
-        private static string FormatAwakeDescription(AwakeSettings settings)
-        {
-            var mode = settings.Properties.Mode.ToString().ToLowerInvariant();
-            var display = settings.Properties.KeepDisplayOn ? "display on" : "display off";
-
-            return settings.Properties.Mode switch
-            {
-                AwakeMode.PASSIVE => "Awake mode: passive (system sleep allowed)",
-                AwakeMode.INDEFINITE => $"Awake mode: indefinite, {display}",
-                AwakeMode.TIMED => $"Awake mode: timed ({settings.Properties.IntervalHours}h {settings.Properties.IntervalMinutes}m), {display}",
-                AwakeMode.EXPIRABLE => $"Awake mode: expirable (until {settings.Properties.ExpirationDateTime:yyyy-MM-dd HH:mm}), {display}",
-                _ => $"Awake mode: {mode}",
-            };
-        }
-
-        private static JsonObject BuildActiveProcessResponse(AwakeSettings settings, bool powerToysRunning, bool launchedViaCli)
-        {
-            return AwakeStatusPayload.CreateError(
-                "Awake is already running. Use force=true to override.",
-                settings).ToJsonObject();
-        }
-
-        private static bool IsPowerToysRunning()
-        {
-            try
-            {
-                return Process.GetProcessesByName(PowerToysProcessName).Length > 0;
-            }
-            catch (Exception ex)
-            {
-                Logger.LogWarning($"[MCP] Unable to determine PowerToys runner status: {ex.Message}");
-                return true;
-            }
-        }
-
-        /// <summary>
-        /// Gets whether the Awake module is enabled in PowerToys settings.
-        /// </summary>
-        /// <returns>True if Awake module is enabled, false otherwise</returns>
-        private static bool IsAwakeModuleEnabled()
-        {
-            try
-            {
-                var generalSettings = SettingsUtils.GetSettings<GeneralSettings>();
-                return generalSettings?.Enabled?.Awake == true;
-            }
-            catch
-            {
-                // If we can't read settings, assume disabled
-                return false;
-            }
-        }
-
-        /// <summary>
-        /// Checks PowerToys and Awake module status.
-        /// </summary>
-        /// <returns>Tuple containing (powerToysRunning, awakeModuleEnabled)</returns>
-        private static (bool PowerToysRunning, bool AwakeModuleEnabled) CheckPowerToysAndAwakeStatus()
-        {
-            bool powerToysRunning = IsPowerToysRunning();
-            bool awakeModuleEnabled = powerToysRunning && IsAwakeModuleEnabled();
-
-            return (powerToysRunning, awakeModuleEnabled);
-        }
-
-        /// <summary>
-        /// Handles CLI scenario when PowerToys is not running or Awake module is disabled.
-        /// </summary>
-        /// <param name="mode">The Awake mode to set</param>
-        /// <param name="keepDisplayOn">Whether to keep display on</param>
-        /// <param name="durationSeconds">Duration in seconds (0 for indefinite)</param>
-        /// <param name="force">Whether to force override existing process</param>
-        /// <returns>JSON response for CLI scenario</returns>
-        private static JsonObject HandleCliScenario(AwakeMode mode, bool keepDisplayOn, uint durationSeconds, bool force)
-        {
-            if (!force && IsAwakeProcessRunning())
-            {
-                return AwakeStatusPayload.CreateError(
-                    "Awake is already running and PowerToys is not active. Use force=true to override.").ToJsonObject();
-            }
-
-            if (IsAwakeProcessRunning())
-            {
-                StopAwakeProcesses();
-            }
-
-            JsonObject cliPayload = StartAwakeCliProcess(mode, keepDisplayOn, durationSeconds);
-            return cliPayload;
-        }
-
-        private static JsonObject StartAwakeCliProcess(AwakeMode mode, bool keepDisplayOn, uint durationSeconds)
-        {
-            try
-            {
-                if (!TryResolveAwakeExecutable(out string executablePath))
-                {
-                    throw new FileNotFoundException("PowerToys.Awake.exe was not found near the MCP server executable.");
-                }
-
-                ProcessStartInfo startInfo = CreateSimpleStartInfo(executablePath, mode, keepDisplayOn, durationSeconds);
-                Process? launchedProcess = Process.Start(startInfo);
-                if (launchedProcess is null)
-                {
-                    throw new InvalidOperationException("Failed to start PowerToys.Awake.exe.");
-                }
-
-                // No tracking, just launch and forget
-                launchedProcess.Dispose();
-
-                AwakeSettings snapshot = BuildAwakeSnapshot(mode, keepDisplayOn, durationSeconds);
-                string confirmation = FormatAwakeDescription(snapshot);
-                Logger.LogInfo($"[MCP] Launched Awake CLI for mode {mode} (PowerToys not running).");
-                AwakeStatusPayload payload = AwakeStatusPayload.FromSettings(snapshot, confirmation);
-                return payload.ToJsonObject();
-            }
-            catch (Exception ex)
-            {
-                Logger.LogError("[MCP] Failed to start Awake CLI.", ex);
-                return AwakeStatusPayload.CreateError(ex.Message).ToJsonObject();
-            }
-        }
-
-        private static ProcessStartInfo CreateSimpleStartInfo(string executablePath, AwakeMode mode, bool keepDisplayOn, uint durationSeconds)
-        {
-            string workingDirectory = Path.GetDirectoryName(executablePath) ?? AppDomain.CurrentDomain.BaseDirectory;
-            var startInfo = new ProcessStartInfo(executablePath)
-            {
-                UseShellExecute = false,
-                CreateNoWindow = true,
-                WorkingDirectory = string.IsNullOrEmpty(workingDirectory) ? AppDomain.CurrentDomain.BaseDirectory : workingDirectory,
-            };
-
-            startInfo.ArgumentList.Add("--display-on");
-            startInfo.ArgumentList.Add(keepDisplayOn ? "true" : "false");
-
-            if (mode == AwakeMode.TIMED && durationSeconds > 0)
-            {
-                startInfo.ArgumentList.Add("--time-limit");
-                startInfo.ArgumentList.Add(durationSeconds.ToString(CultureInfo.InvariantCulture));
-            }
-            else if (mode == AwakeMode.EXPIRABLE && durationSeconds > 0)
-            {
-                // For EXPIRABLE mode, convert duration to expiration datetime
-                DateTimeOffset expirationDateTime = DateTimeOffset.Now.AddSeconds(durationSeconds);
-                startInfo.ArgumentList.Add("--expire-at");
-                startInfo.ArgumentList.Add(expirationDateTime.ToString("O")); // ISO 8601 format
-            }
-
-            return startInfo;
-        }
-
-        private static void StopAwakeProcesses()
-        {
-            string processName = Path.GetFileNameWithoutExtension(AwakeExecutableName);
-            try
-            {
-                Process[] awakeProcesses = Process.GetProcessesByName(processName);
-                foreach (Process process in awakeProcesses)
-                {
-                    try
-                    {
-                        if (!process.HasExited)
-                        {
-                            process.Kill(true);
-                            process.WaitForExit(TimeSpan.FromSeconds(5));
-                        }
-                    }
-                    catch (Exception ex)
-                    {
-                        Logger.LogWarning($"[MCP] Failed to terminate Awake process {process.Id}: {ex.Message}");
-                    }
-                    finally
-                    {
-                        process.Dispose();
-                    }
-                }
-            }
-            catch (Exception ex)
-            {
-                Logger.LogWarning($"[MCP] Failed to enumerate Awake processes: {ex.Message}");
-            }
-        }
-
-        private static AwakeSettings BuildAwakeSnapshot(AwakeMode mode, bool keepDisplayOn, uint durationSeconds)
-        {
-            var snapshot = new AwakeSettings();
-            snapshot.Properties.Mode = mode;
-            snapshot.Properties.KeepDisplayOn = keepDisplayOn;
-
-            if (mode == AwakeMode.TIMED && durationSeconds > 0)
-            {
-                TimeSpan timeSpan = TimeSpan.FromSeconds(durationSeconds);
-                snapshot.Properties.IntervalHours = (uint)timeSpan.TotalHours;
-                snapshot.Properties.IntervalMinutes = (uint)Math.Ceiling(timeSpan.TotalMinutes % 60);
-                snapshot.Properties.ExpirationDateTime = DateTimeOffset.Now.Add(timeSpan);
-            }
-            else if (mode == AwakeMode.EXPIRABLE && durationSeconds > 0)
-            {
-                snapshot.Properties.IntervalHours = 0;
-                snapshot.Properties.IntervalMinutes = 0;
-                snapshot.Properties.ExpirationDateTime = DateTimeOffset.Now.AddSeconds(durationSeconds);
-            }
-            else
-            {
-                snapshot.Properties.IntervalHours = 0;
-                snapshot.Properties.IntervalMinutes = 0;
-                snapshot.Properties.ExpirationDateTime = DateTimeOffset.Now;
-            }
-
-            return snapshot;
-        }
-
-        private static bool TryResolveAwakeExecutable(out string executablePath)
-        {
-            string baseDirectory = AppDomain.CurrentDomain.BaseDirectory;
-            if (TryResolveAwakeExecutableFrom(baseDirectory, out executablePath))
-            {
-                return true;
-            }
-
-            string? parentDirectory = Directory.GetParent(baseDirectory)?.FullName;
-            if (!string.IsNullOrEmpty(parentDirectory) && TryResolveAwakeExecutableFrom(parentDirectory, out executablePath))
-            {
-                return true;
-            }
-
-            executablePath = string.Empty;
-            return false;
-        }
-
-        private static bool TryResolveAwakeExecutableFrom(string rootDirectory, out string executablePath)
-        {
-            foreach (string relativePath in AwakeRelativeSearchPaths)
-            {
-                string candidate = Path.Combine(rootDirectory, relativePath);
-                if (File.Exists(candidate))
-                {
-                    executablePath = candidate;
-                    return true;
-                }
-            }
-
-            executablePath = string.Empty;
-            return false;
-        }
-
-        private static bool IsAwakeProcessRunning()
-        {
-            try
-            {
-                string processName = Path.GetFileNameWithoutExtension(AwakeExecutableName);
-                return Process.GetProcessesByName(processName).Length > 0;
-            }
-            catch (Exception ex)
-            {
-                Logger.LogWarning($"[MCP] Unable to determine Awake process status: {ex.Message}");
-                return false;
-            }
-        }
-
-        private static bool IsAwakeActive(AwakeSettings settings)
-        {
-            // Only check if Awake module is enabled
-            return IsAwakeModuleEnabled();
-        }
-
-        private sealed class AwakeStatusPayload
-        {
-            internal string Mode { get; set; } = "unknown";
-
-            internal bool? KeepDisplayOn { get; set; }
-
-            internal uint? IntervalHours { get; set; }
-
-            internal uint? IntervalMinutes { get; set; }
-
-            internal string? ExpirationDateTime { get; set; }
-
-            internal string Summary { get; set; } = string.Empty;
-
-            internal bool Success { get; set; } = true;
-
-            internal string? ErrorMessage { get; set; }
-
-            internal JsonObject ToJsonObject()
-            {
-                var result = new JsonObject
-                {
-                    ["mode"] = Mode,
-                    ["summary"] = Summary,
-                };
-
-                // Add properties only if they have values
-                if (KeepDisplayOn.HasValue)
-                {
-                    result["keepDisplayOn"] = KeepDisplayOn.Value;
-                }
-
-                if (IntervalHours.HasValue)
-                {
-                    result["intervalHours"] = IntervalHours.Value;
-                }
-
-                if (IntervalMinutes.HasValue)
-                {
-                    result["intervalMinutes"] = IntervalMinutes.Value;
-                }
-
-                if (!string.IsNullOrEmpty(ExpirationDateTime))
-                {
-                    result["expirationDateTime"] = ExpirationDateTime;
-                }
-
-                // Add error handling properties
-                if (!Success)
-                {
-                    result["success"] = false;
-                    if (!string.IsNullOrEmpty(ErrorMessage))
-                    {
-                        result["error"] = ErrorMessage;
-                    }
-                }
-
-                return result;
-            }
-
-            internal static AwakeStatusPayload FromSettings(AwakeSettings settings, string summary)
-            {
-                var payload = new AwakeStatusPayload
-                {
-                    Mode = settings.Properties.Mode.ToString().ToLowerInvariant(),
-                    Summary = summary,
-                };
-
-                // Only include properties relevant to the current mode
-                if (settings.Properties.Mode != AwakeMode.PASSIVE)
-                {
-                    payload.KeepDisplayOn = settings.Properties.KeepDisplayOn;
-                }
-
-                if (settings.Properties.Mode == AwakeMode.TIMED || settings.Properties.Mode == AwakeMode.EXPIRABLE)
-                {
-                    payload.IntervalHours = settings.Properties.IntervalHours;
-                    payload.IntervalMinutes = settings.Properties.IntervalMinutes;
-                    payload.ExpirationDateTime = settings.Properties.ExpirationDateTime.ToString("O");
-                }
-
-                return payload;
-            }
-
-            internal static AwakeStatusPayload CreateInactive()
-            {
-                return new AwakeStatusPayload
-                {
-                    Mode = "inactive",
-                    Summary = "PowerToys Awake is not running because PowerToys is not active.",
-                };
-            }
-
-            internal static AwakeStatusPayload CreateUnknownActive()
-            {
-                return new AwakeStatusPayload
-                {
-                    Mode = "unknown",
-                    Summary = "An Awake process is currently running, but its configuration cannot be determined. To terminate the existing process and start with new settings, use force=true.",
-                };
-            }
-
-            internal static AwakeStatusPayload CreateError(string errorMessage, AwakeSettings? settings = null)
-            {
-                var payload = new AwakeStatusPayload
-                {
-                    Success = false,
-                    ErrorMessage = errorMessage,
-                };
-
-                if (settings != null)
-                {
-                    payload.Mode = settings.Properties.Mode.ToString().ToLowerInvariant();
-
-                    // Only include properties relevant to the current mode
-                    if (settings.Properties.Mode != AwakeMode.PASSIVE)
-                    {
-                        payload.KeepDisplayOn = settings.Properties.KeepDisplayOn;
-                    }
-
-                    if (settings.Properties.Mode == AwakeMode.TIMED || settings.Properties.Mode == AwakeMode.EXPIRABLE)
-                    {
-                        payload.IntervalHours = settings.Properties.IntervalHours;
-                        payload.IntervalMinutes = settings.Properties.IntervalMinutes;
-                        payload.ExpirationDateTime = settings.Properties.ExpirationDateTime.ToString("O");
-                    }
-
-                    payload.Summary = "An Awake session is already active with the current settings. To override and change the configuration, use force=true.";
-                }
-                else
-                {
-                    payload.Mode = "unknown";
-                    payload.Summary = "An Awake process is currently running. To terminate the existing process and start with new settings, use force=true.";
-                }
-
-                return payload;
-            }
-        }
-    }
-}

src/PackageIdentity/AppxManifest.xml

@@ -36,7 +36,7 @@
   </Capabilities>
 
   <Applications>
-    <Application Id="PowerToys.OCR" Executable="PowerToys.PowerOCR.exe" uap10:TrustLevel="mediumIL" uap10:RuntimeBehavior="win32App">
+    <Application Id="PowerToys.OCR" Executable="PowerToys.PowerOCR.exe" EntryPoint="Windows.FullTrustApplication">
       <uap:VisualElements
         DisplayName="PowerToys.OCR"
         Description="PowerToys OCR Module"
@@ -45,7 +45,7 @@
         Square44x44Logo="Images\Square44x44Logo.png">
       </uap:VisualElements>
     </Application>
-    <Application Id="PowerToys.SettingsUI" Executable="PowerToys.Settings.exe" uap10:TrustLevel="mediumIL" uap10:RuntimeBehavior="win32App">
+    <Application Id="PowerToys.SettingsUI" Executable="WinUI3Apps\PowerToys.Settings.exe" EntryPoint="Windows.FullTrustApplication">
       <uap:VisualElements
         DisplayName="PowerToys.SettingsUI"
         Description="PowerToys Settings UI"
@@ -54,7 +54,7 @@
         Square44x44Logo="Images\Square44x44Logo.png">
       </uap:VisualElements>
     </Application>
-    <Application Id="PowerToys.ImageResizerUI" Executable="WinUI3Apps\PowerToys.ImageResizer.exe" uap10:TrustLevel="mediumIL" uap10:RuntimeBehavior="win32App">
+    <Application Id="PowerToys.ImageResizerUI" Executable="WinUI3Apps\PowerToys.ImageResizer.exe" EntryPoint="Windows.FullTrustApplication">
       <uap:VisualElements
         DisplayName="PowerToys.ImageResizer"
         Description="PowerToys Image Resizer UI"
@@ -63,28 +63,5 @@
         Square44x44Logo="Images\Square44x44Logo.png">
       </uap:VisualElements>
     </Application>
-    <Application Id="PowerToys.McpServer" Executable="PowerToys.McpServer.exe" uap10:TrustLevel="mediumIL" uap10:RuntimeBehavior="win32App">
-      <uap:VisualElements
-        AppListEntry="none"
-        DisplayName="PowerToys.McpServer"
-        Description="PowerToys MCP Server"
-        BackgroundColor="transparent"
-        Square150x150Logo="Images\Square150x150Logo.png"
-        Square44x44Logo="Images\Square44x44Logo.png">
-      </uap:VisualElements>
-      <Extensions>
-        <uap3:Extension Category="windows.appExtension">
-          <uap3:AppExtension
-            Name="com.microsoft.windows.ai.mcpServer"
-            Id="PowerToys.McpServer"
-            DisplayName="PowerToys MCP Server"
-            PublicFolder="Assets">
-            <uap3:Properties>
-              <Registration>mcpServerConfig.json</Registration>
-            </uap3:Properties>
-          </uap3:AppExtension>
-        </uap3:Extension>
-      </Extensions>
-    </Application>
   </Applications>
 </Package>

src/PackageIdentity/Assets/mcpServerConfig.json

@@ -1,18 +0,0 @@
-{
-  "manifest_version": "0.1",
-  "name": "PowerToys-McpServer",
-  "version": "1.0.0",
-  "description": "PowerToys McpServer",
-  "author": {
-    "name": "Microsoft"
-  },
-  "server": {
-    "type": "binary",
-    "entry_point": "PowerToys.McpServer.exe",
-    "mcp_config": {
-      "command": "PowerToys.McpServer.exe",
-      "args": [
-      ]
-    }
-  }
-}

src/PackageIdentity/BuildSparsePackage.ps1

@@ -12,7 +12,8 @@ Param(
 
     [switch]$Clean,
     [switch]$ForceCert,
-    [switch]$NoSign
+    [switch]$NoSign,
+    [switch]$CIBuild
 )
 
 # PowerToys sparse packaging helper.
@@ -22,7 +23,7 @@ Param(
 $ErrorActionPreference = 'Stop'
 
 $isCIBuild = $false
-if ($NoSign.IsPresent) {
+if ($CIBuild.IsPresent) {
     $isCIBuild = $true
 } elseif ($env:CIBuild) {
     $isCIBuild = $env:CIBuild -ieq 'true'
@@ -291,7 +292,6 @@ try {
     $essentialFiles = @(
         "AppxManifest.xml"
         "Images\*"
-        "Assets\*"
     )
     
     foreach ($filePattern in $essentialFiles) {
@@ -310,11 +310,7 @@ try {
             $sourceDir = $sourcePath.TrimEnd('\*')
             $targetDir = Join-Path $stagingDir (Split-Path $relativePath.TrimEnd('\*') -Parent)
             if (Test-Path $sourceDir) {
-                $targetSubDir = Join-Path $stagingDir ($relativePath.TrimEnd('\*'))
-                if (-not (Test-Path $targetSubDir)) {
-                    New-Item -ItemType Directory -Path $targetSubDir -Force | Out-Null
-                }
-                Copy-Item -Path "$sourceDir\*" -Destination $targetSubDir -Force -ErrorAction SilentlyContinue
+                Copy-Item -Path "$sourceDir\*" -Destination $targetDir -Force -ErrorAction SilentlyContinue
             }
         } else {
             # Copy single file

src/PackageIdentity/PackageIdentity.vcxproj

@@ -2,20 +2,22 @@
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   
   <!-- CI Build Configuration -->
-  <PropertyGroup Condition="'$(CIBuild)'=='true' and '$(ForceSign)' != 'true'">
+  <PropertyGroup Condition="'$(CIBuild)'=='true'">
     <ForceCIPackaging>true</ForceCIPackaging>
-    <EffectiveCIBuild>true</EffectiveCIBuild>
+    <NoSignCI>true</NoSignCI>
   </PropertyGroup>
 
   <!-- Target to generate sparse MSIX package -->
   <Target Name="GenerateSparsePackage" BeforeTargets="PrepareForBuild">
     <!-- Use NoSign only for CI builds to avoid certificate issues on hosted agents -->
     <PropertyGroup>
-  <NoSignParam Condition="'$(EffectiveCIBuild)' == 'true'">-NoSign</NoSignParam>
-      <NoSignParam Condition="'$(EffectiveCIBuild)' != 'true'"></NoSignParam>
+      <NoSignParam Condition="'$(NoSignCI)' == 'true'">-NoSign</NoSignParam>
+      <NoSignParam Condition="'$(NoSignCI)' != 'true'"></NoSignParam>
+      <CIBuildParam Condition="'$(CIBuild)' == 'true'">-CIBuild</CIBuildParam>
+      <CIBuildParam Condition="'$(CIBuild)' != 'true'"></CIBuildParam>
     </PropertyGroup>
     
-    <Exec Command="pwsh -NonInteractive -ExecutionPolicy Bypass -File &quot;$(MSBuildThisFileDirectory)BuildSparsePackage.ps1&quot; -Platform $(Platform) -Configuration $(Configuration) $(NoSignParam)" 
+  <Exec Command="pwsh -NonInteractive -ExecutionPolicy Bypass -File &quot;$(MSBuildThisFileDirectory)BuildSparsePackage.ps1&quot; -Platform $(Platform) -Configuration $(Configuration) $(NoSignParam) $(CIBuildParam)" 
           ContinueOnError="false"
           WorkingDirectory="$(MSBuildThisFileDirectory)" />
   </Target>
@@ -110,12 +112,6 @@
     </Image>
   </ItemGroup>
 
-  <ItemGroup>
-    <None Include="Assets\mcpServerConfig.json">
-      <Filter>Assets</Filter>
-    </None>
-  </ItemGroup>
-
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
 
   <ImportGroup Label="ExtensionTargets">

src/PackageIdentity/PackageIdentity.vcxproj.filters

@@ -5,18 +5,11 @@
       <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
       <Extensions>png;jpg;jpeg;gif;bmp;ico</Extensions>
     </Filter>
-    <Filter Include="Assets">
-      <UniqueIdentifier>{B3E94A82-1F2C-4D3E-A5F6-789ABC012DEF}</UniqueIdentifier>
-      <Extensions>json;xml;txt</Extensions>
-    </Filter>
   </ItemGroup>
   <ItemGroup>
     <None Include="AppxManifest.xml" />
     <None Include="BuildSparsePackage.ps1" />
     <None Include="BuildSparsePackage.cmd" />
-    <None Include="Assets\mcpServerConfig.json">
-      <Filter>Assets</Filter>
-    </None>
   </ItemGroup>
   <ItemGroup>
     <Image Include="Images\Square150x150Logo.png">

src/common/CalculatorEngineCommon/CalculatorEngineCommon.vcxproj

@@ -9,12 +9,6 @@
     <RootNamespace>CalculatorEngineCommon</RootNamespace>
     <AppxPackage>false</AppxPackage>
   </PropertyGroup>
-  <!-- BEGIN common.build.pre.props -->
-  <PropertyGroup Label="Configuration">
-    <EnableHybridCRT>true</EnableHybridCRT>
-    <UseCrtSDKReferenceStaticWarning Condition="'$(EnableHybridCRT)'=='true'">false</UseCrtSDKReferenceStaticWarning>
-  </PropertyGroup>
-  <!-- END common.build.pre.props -->
   <!-- BEGIN cppwinrt.build.pre.props -->
   <PropertyGroup Label="Globals">
     <CppWinRTEnabled>true</CppWinRTEnabled>
@@ -25,11 +19,9 @@
   </PropertyGroup>
   <PropertyGroup>
     <MinimalCoreWin>true</MinimalCoreWin>
-    <AppContainerApplication>true</AppContainerApplication>
+    <AppContainerApplication>false</AppContainerApplication>
     <WindowsStoreApp>true</WindowsStoreApp>
     <ApplicationType>Windows Store</ApplicationType>
-    <UseCrtSDKReference Condition="'$(EnableHybridCRT)'=='true'">false</UseCrtSDKReference>
-    <!-- The SDK reference breaks the Hybrid CRT -->
   </PropertyGroup>
   <PropertyGroup>
     <!-- We have to use the Desktop platform for Hybrid CRT to work. -->
@@ -148,43 +140,5 @@
     </PropertyGroup>
     <Error Condition="!Exists('..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props'))" />
     <Error Condition="!Exists('..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets'))" />
-  </Target>
-  <!-- BEGIN common.build.post.props -->
-  <!--
-    The Hybrid CRT model statically links the runtime and STL and dynamically
-    links the UCRT instead of the VC++ CRT. The UCRT ships with Windows.
-    WinAppSDK asserts that this is "supported according to the CRT maintainer."
-
-    This must come before Microsoft.Cpp.targets because it manipulates ClCompile.RuntimeLibrary.
-  -->
-  <ItemDefinitionGroup Condition="'$(EnableHybridCRT)'=='true' and '$(Configuration)'=='Debug'">
-    <ClCompile>
-      <!-- We use MultiThreadedDebug, rather than MultiThreadedDebugDLL, to avoid DLL dependencies on VCRUNTIME140d.dll and MSVCP140d.dll. -->
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <LanguageStandard Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">stdcpp17</LanguageStandard>
-    </ClCompile>
-    <Link>
-      <!-- Link statically against the runtime and STL, but link dynamically against the CRT by ignoring the static CRT
-           lib and instead linking against the Universal CRT DLL import library. This "hybrid" linking mechanism is
-           supported according to the CRT maintainer. Dynamic linking against the CRT makes the binaries a bit smaller
-           than they would otherwise be if the CRT, runtime, and STL were all statically linked in. -->
-      <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries);libucrtd.lib</IgnoreSpecificDefaultLibraries>
-      <AdditionalOptions>%(AdditionalOptions) /defaultlib:ucrtd.lib</AdditionalOptions>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(EnableHybridCRT)'=='true' and ('$(Configuration)'=='Release' or '$(Configuration)'=='AuditMode')">
-    <ClCompile>
-      <!-- We use MultiThreaded, rather than MultiThreadedDLL, to avoid DLL dependencies on VCRUNTIME140.dll and MSVCP140.dll. -->
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-    </ClCompile>
-    <Link>
-      <!-- Link statically against the runtime and STL, but link dynamically against the CRT by ignoring the static CRT
-           lib and instead linking against the Universal CRT DLL import library. This "hybrid" linking mechanism is
-           supported according to the CRT maintainer. Dynamic linking against the CRT makes the binaries a bit smaller
-           than they would otherwise be if the CRT, runtime, and STL were all statically linked in. -->
-      <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries);libucrt.lib</IgnoreSpecificDefaultLibraries>
-      <AdditionalOptions>%(AdditionalOptions) /defaultlib:ucrt.lib</AdditionalOptions>
-    </Link>
-  </ItemDefinitionGroup>
-  <!-- END common.build.post.props -->
+  </Target>  <!-- END common.build.post.props -->
 </Project>

src/common/GPOWrapperProjection/GPOWrapper.cs

@@ -66,11 +66,5 @@ namespace PowerToys.GPOWrapperProjection
         {
             return (GpoRuleConfigured)PowerToys.GPOWrapper.GPOWrapper.GetConfiguredWorkspacesEnabledValue();
         }
-
-        public static GpoRuleConfigured GetConfiguredMcpEnabledValue()
-        {
-            // MCP doesn't have GPO support yet, always return NotConfigured
-            return GpoRuleConfigured.NotConfigured;
-        }
     }
 }

src/common/LanguageModelProvider/AppUtils.cs

@@ -1,14 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-namespace LanguageModelProvider;
-
-internal static class AppUtils
-{
-    public static string GetThemeAssetSuffix()
-    {
-        // Default suffix for assets that are theme-agnostic today.
-        return string.Empty;
-    }
-}

src/common/LanguageModelProvider/FoundryLocal/FoundryCatalogModel.cs

@@ -1,61 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System.Text.Json.Serialization;
-
-namespace LanguageModelProvider.FoundryLocal;
-
-internal sealed record FoundryCatalogModel
-{
-    [JsonPropertyName("name")]
-    public string Name { get; init; } = string.Empty;
-
-    [JsonPropertyName("displayName")]
-    public string DisplayName { get; init; } = string.Empty;
-
-    [JsonPropertyName("providerType")]
-    public string ProviderType { get; init; } = string.Empty;
-
-    [JsonPropertyName("uri")]
-    public string Uri { get; init; } = string.Empty;
-
-    [JsonPropertyName("version")]
-    public string Version { get; init; } = string.Empty;
-
-    [JsonPropertyName("modelType")]
-    public string ModelType { get; init; } = string.Empty;
-
-    [JsonPropertyName("promptTemplate")]
-    public PromptTemplate PromptTemplate { get; init; } = default!;
-
-    [JsonPropertyName("publisher")]
-    public string Publisher { get; init; } = string.Empty;
-
-    [JsonPropertyName("task")]
-    public string Task { get; init; } = string.Empty;
-
-    [JsonPropertyName("runtime")]
-    public Runtime Runtime { get; init; } = default!;
-
-    [JsonPropertyName("fileSizeMb")]
-    public long FileSizeMb { get; init; }
-
-    [JsonPropertyName("modelSettings")]
-    public ModelSettings ModelSettings { get; init; } = default!;
-
-    [JsonPropertyName("alias")]
-    public string Alias { get; init; } = string.Empty;
-
-    [JsonPropertyName("supportsToolCalling")]
-    public bool SupportsToolCalling { get; init; }
-
-    [JsonPropertyName("license")]
-    public string License { get; init; } = string.Empty;
-
-    [JsonPropertyName("licenseDescription")]
-    public string LicenseDescription { get; init; } = string.Empty;
-
-    [JsonPropertyName("parentModelUri")]
-    public string ParentModelUri { get; init; } = string.Empty;
-}

src/common/LanguageModelProvider/FoundryLocal/FoundryClient.cs

@@ -1,229 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System.Globalization;
-using System.Text;
-using System.Text.Json;
-
-namespace LanguageModelProvider.FoundryLocal;
-
-internal sealed class FoundryClient
-{
-    public static async Task<FoundryClient?> CreateAsync()
-    {
-        var serviceManager = FoundryServiceManager.TryCreate();
-        if (serviceManager is null)
-        {
-            return null;
-        }
-
-        if (!await serviceManager.IsRunning().ConfigureAwait(false))
-        {
-            if (!await serviceManager.StartService().ConfigureAwait(false))
-            {
-                return null;
-            }
-        }
-
-        var serviceUrl = await serviceManager.GetServiceUrl().ConfigureAwait(false);
-
-        if (string.IsNullOrEmpty(serviceUrl))
-        {
-            return null;
-        }
-
-        var serviceUri = new Uri(serviceUrl, UriKind.Absolute);
-        var baseAddress = serviceUri.AbsoluteUri.EndsWith('/')
-            ? serviceUri
-            : new Uri(serviceUri, "/");
-
-        var httpClient = new HttpClient
-        {
-            BaseAddress = baseAddress,
-            Timeout = TimeSpan.FromHours(2),
-        };
-
-        var assemblyVersion = typeof(FoundryClient).Assembly.GetName().Version?.ToString() ?? "unknown";
-        httpClient.DefaultRequestHeaders.UserAgent.ParseAdd($"foundry-local-cs-sdk/{assemblyVersion}");
-
-        return new FoundryClient(serviceManager, httpClient);
-    }
-
-    public FoundryServiceManager ServiceManager { get; }
-
-    private readonly HttpClient _httpClient;
-    private readonly List<FoundryCatalogModel> _catalogModels = [];
-
-    private FoundryClient(FoundryServiceManager serviceManager, HttpClient httpClient)
-    {
-        ServiceManager = serviceManager;
-        _httpClient = httpClient;
-    }
-
-    public async Task<List<FoundryCatalogModel>> ListCatalogModels()
-    {
-        if (_catalogModels.Count > 0)
-        {
-            return _catalogModels;
-        }
-
-        try
-        {
-            var response = await _httpClient.GetAsync("/foundry/list").ConfigureAwait(false);
-            response.EnsureSuccessStatusCode();
-
-            var models = await JsonSerializer.DeserializeAsync(
-                response.Content.ReadAsStream(),
-                FoundryJsonContext.Default.ListFoundryCatalogModel).ConfigureAwait(false);
-
-            if (models is { Count: > 0 })
-            {
-                models.ForEach(_catalogModels.Add);
-            }
-        }
-        catch
-        {
-            // Surfacing errors here prevents listing other providers; swallow and return cached list instead.
-        }
-
-        return _catalogModels;
-    }
-
-    public async Task<List<FoundryCachedModel>> ListCachedModels()
-    {
-        var response = await _httpClient.GetAsync("/openai/models").ConfigureAwait(false);
-        response.EnsureSuccessStatusCode();
-
-        var catalogModels = await ListCatalogModels().ConfigureAwait(false);
-
-        var content = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
-        var modelIds = content
-            .Trim('[', ']')
-            .Split(',', StringSplitOptions.TrimEntries | StringSplitOptions.RemoveEmptyEntries)
-            .Select(id => id.Trim('"'));
-
-        List<FoundryCachedModel> models = [];
-
-        foreach (var id in modelIds)
-        {
-            var model = catalogModels.FirstOrDefault(m => m.Name == id);
-            models.Add(model != null ? new FoundryCachedModel(id, model.Alias) : new FoundryCachedModel(id, null));
-        }
-
-        return models;
-    }
-
-    public async Task<FoundryDownloadResult> DownloadModel(FoundryCatalogModel model, IProgress<float>? progress, CancellationToken cancellationToken = default)
-    {
-        var models = await ListCachedModels().ConfigureAwait(false);
-
-        if (models.Any(m => m.Name == model.Name))
-        {
-            return new(true, "Model already downloaded");
-        }
-
-        return await Task.Run(
-            async () =>
-            {
-                try
-                {
-                    var providerType = model.ProviderType.EndsWith("Local", StringComparison.OrdinalIgnoreCase)
-                        ? model.ProviderType
-                        : $"{model.ProviderType}Local";
-
-                    var downloadRequest = new FoundryDownloadBody
-                    {
-                        Model = new FoundryModelDownload
-                        {
-                            Name = model.Name,
-                            Uri = model.Uri,
-                            Publisher = model.Publisher,
-                            ProviderType = providerType,
-                            PromptTemplate = model.PromptTemplate,
-                        },
-                        Token = string.Empty,
-                        IgnorePipeReport = true,
-                    };
-
-                    var downloadBodyContext = FoundryJsonContext.Default.FoundryDownloadBody;
-                    string body = JsonSerializer.Serialize(downloadRequest, downloadBodyContext);
-
-                    using var request = new HttpRequestMessage(HttpMethod.Post, "/openai/download")
-                    {
-                        Content = new StringContent(body, Encoding.UTF8, "application/json"),
-                    };
-
-                    using var response = await _httpClient.SendAsync(request, HttpCompletionOption.ResponseHeadersRead, cancellationToken).ConfigureAwait(false);
-
-                    response.EnsureSuccessStatusCode();
-
-                    using var stream = await response.Content.ReadAsStreamAsync(cancellationToken).ConfigureAwait(false);
-                    using var reader = new StreamReader(stream);
-
-                    StringBuilder jsonBuilder = new();
-                    var collectingJson = false;
-                    var completed = false;
-
-                    while (!completed && (await reader.ReadLineAsync(cancellationToken).ConfigureAwait(false)) is string line)
-                    {
-                        if (string.IsNullOrWhiteSpace(line))
-                        {
-                            continue;
-                        }
-
-                        if (line.StartsWith("Total", StringComparison.CurrentCultureIgnoreCase) &&
-                            line.Contains("Downloading", StringComparison.OrdinalIgnoreCase) &&
-                            line.Contains('%'))
-                        {
-                            var percentStr = line.Split('%')[0].Split(' ').Last();
-                            if (double.TryParse(percentStr, NumberStyles.Float, CultureInfo.CurrentCulture, out var percentage))
-                            {
-                                progress?.Report((float)(percentage / 100));
-                            }
-                        }
-                        else if (line.Contains("[DONE]", StringComparison.OrdinalIgnoreCase) ||
-                                 line.Contains("All Completed", StringComparison.OrdinalIgnoreCase))
-                        {
-                            collectingJson = true;
-                        }
-                        else if (collectingJson && line.TrimStart().StartsWith('{'))
-                        {
-                            jsonBuilder.AppendLine(line);
-                        }
-                        else if (collectingJson && jsonBuilder.Length > 0)
-                        {
-                            jsonBuilder.AppendLine(line);
-                            if (line.Trim() == "}")
-                            {
-                                completed = true;
-                            }
-                        }
-                    }
-
-                    var downloadResultContext = FoundryJsonContext.Default.FoundryDownloadResult;
-                    var jsonPayload = jsonBuilder.Length > 0 ? jsonBuilder.ToString() : null;
-
-                    if (jsonPayload is null)
-                    {
-                        return new FoundryDownloadResult(false, "No completion response received from server.");
-                    }
-
-                    try
-                    {
-                        return JsonSerializer.Deserialize(jsonPayload, downloadResultContext)
-                               ?? new FoundryDownloadResult(false, "Failed to parse completion response.");
-                    }
-                    catch (JsonException ex)
-                    {
-                        return new FoundryDownloadResult(false, $"Failed to parse completion response: {ex.Message}");
-                    }
-                }
-                catch (Exception e)
-                {
-                    return new FoundryDownloadResult(false, e.Message);
-                }
-            },
-            cancellationToken).ConfigureAwait(false);
-    }
-}

src/common/LanguageModelProvider/FoundryLocal/FoundryDownloadBody.cs

@@ -1,19 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System.Text.Json.Serialization;
-
-namespace LanguageModelProvider.FoundryLocal;
-
-internal sealed class FoundryDownloadBody
-{
-    [JsonPropertyName("Model")]
-    public required FoundryModelDownload Model { get; init; }
-
-    [JsonPropertyName("token")]
-    public required string Token { get; init; }
-
-    [JsonPropertyName("IgnorePipeReport")]
-    public required bool IgnorePipeReport { get; init; }
-}

src/common/LanguageModelProvider/FoundryLocal/FoundryDownloadResult.cs

@@ -1,7 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-namespace LanguageModelProvider.FoundryLocal;
-
-internal sealed record FoundryDownloadResult(bool Success, string? ErrorMessage);

src/common/LanguageModelProvider/FoundryLocal/FoundryJsonContext.cs

@@ -1,20 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System.Collections.Generic;
-using System.Text.Json.Serialization;
-
-namespace LanguageModelProvider.FoundryLocal;
-
-[JsonSourceGenerationOptions(
-    PropertyNamingPolicy = JsonKnownNamingPolicy.CamelCase,
-    WriteIndented = false)]
-[JsonSerializable(typeof(FoundryCatalogModel))]
-[JsonSerializable(typeof(List<FoundryCatalogModel>))]
-[JsonSerializable(typeof(FoundryDownloadResult))]
-[JsonSerializable(typeof(FoundryModelDownload))]
-[JsonSerializable(typeof(FoundryDownloadBody))]
-internal sealed partial class FoundryJsonContext : JsonSerializerContext
-{
-}

src/common/LanguageModelProvider/FoundryLocal/FoundryModelDownload.cs

@@ -1,25 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System.Text.Json.Serialization;
-
-namespace LanguageModelProvider.FoundryLocal;
-
-internal sealed class FoundryModelDownload
-{
-    [JsonPropertyName("Name")]
-    public required string Name { get; init; }
-
-    [JsonPropertyName("Uri")]
-    public required string Uri { get; init; }
-
-    [JsonPropertyName("Publisher")]
-    public required string Publisher { get; init; }
-
-    [JsonPropertyName("ProviderType")]
-    public required string ProviderType { get; init; }
-
-    [JsonPropertyName("PromptTemplate")]
-    public required PromptTemplate? PromptTemplate { get; init; }
-}

src/common/LanguageModelProvider/FoundryLocal/FoundryServiceManager.cs

@@ -1,80 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System.Diagnostics;
-using System.Text.RegularExpressions;
-
-namespace LanguageModelProvider.FoundryLocal;
-
-internal sealed class FoundryServiceManager
-{
-    public static FoundryServiceManager? TryCreate()
-    {
-        return IsAvailable() ? new FoundryServiceManager() : null;
-    }
-
-    private static bool IsAvailable()
-    {
-        using var process = new Process();
-        process.StartInfo.FileName = "where";
-        process.StartInfo.Arguments = "foundry";
-        process.StartInfo.RedirectStandardOutput = true;
-        process.StartInfo.RedirectStandardError = true;
-        process.StartInfo.UseShellExecute = false;
-        process.StartInfo.CreateNoWindow = true;
-        process.Start();
-        process.WaitForExit();
-        return process.ExitCode == 0;
-    }
-
-    private static string? GetUrl(string output)
-    {
-        var match = Regex.Match(output, @"https?:\/\/[^\/]+:\d+");
-        return match.Success ? match.Value : null;
-    }
-
-    public async Task<string?> GetServiceUrl()
-    {
-        var status = await Utils.RunFoundryWithArguments("service status").ConfigureAwait(false);
-
-        if (status.ExitCode != 0 || string.IsNullOrWhiteSpace(status.Output))
-        {
-            return null;
-        }
-
-        return GetUrl(status.Output);
-    }
-
-    public async Task<bool> IsRunning()
-    {
-        var url = await GetServiceUrl().ConfigureAwait(false);
-        return url is not null;
-    }
-
-    public async Task<bool> StartService(int maxWaitSeconds = 30)
-    {
-        if (await IsRunning().ConfigureAwait(false))
-        {
-            return true;
-        }
-
-        // Start foundry service (fire-and-forget, don't wait for the process to exit)
-        _ = Task.Run(() => Utils.RunFoundryWithArguments("service start"));
-
-        // Poll to check if service is running
-        int elapsedSeconds = 0;
-        while (elapsedSeconds < maxWaitSeconds)
-        {
-            await Task.Delay(1000).ConfigureAwait(false);
-            elapsedSeconds++;
-
-            if (await IsRunning().ConfigureAwait(false))
-            {
-                return true;
-            }
-        }
-
-        return false;
-    }
-}

src/common/LanguageModelProvider/FoundryLocal/ModelSettings.cs

@@ -1,16 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System.Collections.Generic;
-using System.Text.Json;
-using System.Text.Json.Serialization;
-
-namespace LanguageModelProvider.FoundryLocal;
-
-internal sealed record ModelSettings
-{
-    // The sample shows an empty array; keep it open-ended.
-    [JsonPropertyName("parameters")]
-    public List<JsonElement> Parameters { get; init; } = [];
-}

src/common/LanguageModelProvider/FoundryLocal/PromptTemplate.cs

@@ -1,16 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System.Text.Json.Serialization;
-
-namespace LanguageModelProvider.FoundryLocal;
-
-internal sealed record PromptTemplate
-{
-    [JsonPropertyName("assistant")]
-    public string Assistant { get; init; } = string.Empty;
-
-    [JsonPropertyName("prompt")]
-    public string Prompt { get; init; } = string.Empty;
-}

src/common/LanguageModelProvider/FoundryLocal/Runtime.cs

@@ -1,16 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System.Text.Json.Serialization;
-
-namespace LanguageModelProvider.FoundryLocal;
-
-internal sealed record Runtime
-{
-    [JsonPropertyName("deviceType")]
-    public string DeviceType { get; init; } = string.Empty;
-
-    [JsonPropertyName("executionProvider")]
-    public string ExecutionProvider { get; init; } = string.Empty;
-}

src/common/LanguageModelProvider/FoundryLocal/Utils.cs

@@ -1,37 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System.Diagnostics;
-
-namespace LanguageModelProvider.FoundryLocal;
-
-internal static class Utils
-{
-    public static async Task<(string? Output, string? Error, int ExitCode)> RunFoundryWithArguments(string arguments)
-    {
-        try
-        {
-            using var process = new Process();
-            process.StartInfo.FileName = "foundry";
-            process.StartInfo.Arguments = arguments;
-            process.StartInfo.RedirectStandardOutput = true;
-            process.StartInfo.RedirectStandardError = true;
-            process.StartInfo.UseShellExecute = false;
-            process.StartInfo.CreateNoWindow = true;
-
-            process.Start();
-
-            string? output = await process.StandardOutput.ReadToEndAsync().ConfigureAwait(false);
-            string? error = await process.StandardError.ReadToEndAsync().ConfigureAwait(false);
-
-            await process.WaitForExitAsync().ConfigureAwait(false);
-
-            return (output, error, process.ExitCode);
-        }
-        catch
-        {
-            return (null, null, -1);
-        }
-    }
-}

src/common/LanguageModelProvider/FoundryLocalModelProvider.cs

@@ -1,206 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using System.ClientModel;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using LanguageModelProvider.FoundryLocal;
-using Microsoft.Extensions.AI;
-using OpenAI;
-
-namespace LanguageModelProvider;
-
-public sealed class FoundryLocalModelProvider : ILanguageModelProvider
-{
-    private IEnumerable<ModelDetails>? _downloadedModels;
-    private IEnumerable<ModelDetails>? _catalogModels;
-    private FoundryClient? _foundryManager;
-    private string? _serviceUrl;
-
-    public static FoundryLocalModelProvider Instance { get; } = new();
-
-    public string Name => "FoundryLocal";
-
-    public HardwareAccelerator ModelHardwareAccelerator => HardwareAccelerator.FOUNDRYLOCAL;
-
-    public string ProviderDescription => "The model will run locally via Foundry Local";
-
-    public string UrlPrefix => "fl://";
-
-    public string Icon => $"fl{AppUtils.GetThemeAssetSuffix()}.svg";
-
-    public string Url => _serviceUrl ?? string.Empty;
-
-    public string GetDetailsUrl(ModelDetails details)
-    {
-        throw new NotImplementedException();
-    }
-
-    public IChatClient? GetIChatClient(string url)
-    {
-        try
-        {
-            InitializeAsync().GetAwaiter().GetResult();
-        }
-        catch
-        {
-            return null;
-        }
-
-        if (string.IsNullOrWhiteSpace(_serviceUrl))
-        {
-            return null;
-        }
-
-        var modelId = url.Split('/').LastOrDefault();
-        if (string.IsNullOrWhiteSpace(modelId))
-        {
-            return null;
-        }
-
-        return new OpenAIClient(
-            new ApiKeyCredential("none"),
-            new OpenAIClientOptions { Endpoint = new Uri($"{_serviceUrl}/v1") })
-            .GetChatClient(modelId)
-            .AsIChatClient();
-    }
-
-    public string GetIChatClientString(string url)
-    {
-        try
-        {
-            InitializeAsync().GetAwaiter().GetResult();
-        }
-        catch
-        {
-            return string.Empty;
-        }
-
-        var modelId = url.Split('/').LastOrDefault();
-
-        if (string.IsNullOrWhiteSpace(_serviceUrl) || string.IsNullOrWhiteSpace(modelId))
-        {
-            return string.Empty;
-        }
-
-        return $"new OpenAIClient(new ApiKeyCredential(\"none\"), new OpenAIClientOptions{{ Endpoint = new Uri(\"{_serviceUrl}/v1\") }}).GetChatClient(\"{modelId}\").AsIChatClient()";
-    }
-
-    public async Task<IEnumerable<ModelDetails>> GetModelsAsync(bool ignoreCached = false, CancellationToken cancelationToken = default)
-    {
-        if (ignoreCached)
-        {
-            Reset();
-        }
-
-        await InitializeAsync(cancelationToken);
-
-        return _downloadedModels ?? [];
-    }
-
-    public IEnumerable<ModelDetails> GetAllModelsInCatalog()
-    {
-        return _catalogModels ?? [];
-    }
-
-    public async Task<bool> DownloadModel(ModelDetails modelDetails, IProgress<float>? progress, CancellationToken cancellationToken = default)
-    {
-        if (_foundryManager == null)
-        {
-            return false;
-        }
-
-        if (modelDetails.ProviderModelDetails is not FoundryCatalogModel model)
-        {
-            return false;
-        }
-
-        return (await _foundryManager.DownloadModel(model, progress, cancellationToken)).Success;
-    }
-
-    private void Reset()
-    {
-        _downloadedModels = null;
-        _ = InitializeAsync();
-    }
-
-    private async Task InitializeAsync(CancellationToken cancelationToken = default)
-    {
-        if (_foundryManager != null && _downloadedModels != null && _downloadedModels.Any())
-        {
-            return;
-        }
-
-        _foundryManager ??= await FoundryClient.CreateAsync();
-
-        if (_foundryManager == null)
-        {
-            return;
-        }
-
-        _serviceUrl ??= await _foundryManager.ServiceManager.GetServiceUrl();
-
-        if (_catalogModels == null || !_catalogModels.Any())
-        {
-            _catalogModels = (await _foundryManager.ListCatalogModels()).Select(ToModelDetails).ToArray();
-        }
-
-        var cachedModels = await _foundryManager.ListCachedModels();
-
-        List<ModelDetails> downloadedModels = [];
-
-        foreach (var model in _catalogModels)
-        {
-            var cachedModel = cachedModels.FirstOrDefault(m => m.Name == model.Name);
-
-            if (cachedModel != default)
-            {
-                model.Id = $"{UrlPrefix}{cachedModel.Id}";
-                downloadedModels.Add(model);
-                cachedModels.Remove(cachedModel);
-            }
-        }
-
-        foreach (var model in cachedModels)
-        {
-            downloadedModels.Add(new ModelDetails
-            {
-                Id = $"fl-{model.Name}",
-                Name = model.Name,
-                Url = $"{UrlPrefix}{model.Name}",
-                Description = $"{model.Name} running locally with Foundry Local",
-                HardwareAccelerators = [HardwareAccelerator.FOUNDRYLOCAL],
-                SupportedOnQualcomm = true,
-                ProviderModelDetails = model,
-            });
-        }
-
-        _downloadedModels = downloadedModels;
-    }
-
-    private ModelDetails ToModelDetails(FoundryCatalogModel model)
-    {
-        return new ModelDetails
-        {
-            Id = $"fl-{model.Name}",
-            Name = model.Name,
-            Url = $"{UrlPrefix}{model.Name}",
-            Description = $"{model.Alias} running locally with Foundry Local",
-            HardwareAccelerators = [HardwareAccelerator.FOUNDRYLOCAL],
-            Size = model.FileSizeMb * 1024 * 1024,
-            SupportedOnQualcomm = true,
-            License = model.License?.ToLowerInvariant() ?? string.Empty,
-            ProviderModelDetails = model,
-        };
-    }
-
-    public async Task<bool> IsAvailable()
-    {
-        await InitializeAsync();
-        return _foundryManager != null;
-    }
-}

src/common/LanguageModelProvider/HardwareAccelerator.cs

@@ -1,22 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-namespace LanguageModelProvider;
-
-public enum HardwareAccelerator
-{
-    CPU,
-    DML,
-    QNN,
-    WCRAPI,
-    OLLAMA,
-    OPENAI,
-    FOUNDRYLOCAL,
-    LEMONADE,
-    NPU,
-    GPU,
-    VitisAI,
-    OpenVINO,
-    NvTensorRT,
-}

src/common/LanguageModelProvider/ILanguageModelProvider.cs

@@ -1,30 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using Microsoft.Extensions.AI;
-
-namespace LanguageModelProvider;
-
-public interface ILanguageModelProvider
-{
-    string Name { get; }
-
-    string UrlPrefix { get; }
-
-    string Icon { get; }
-
-    HardwareAccelerator ModelHardwareAccelerator { get; }
-
-    string ProviderDescription { get; }
-
-    Task<IEnumerable<ModelDetails>> GetModelsAsync(bool ignoreCached = false, CancellationToken cancelationToken = default);
-
-    IChatClient? GetIChatClient(string url);
-
-    string GetIChatClientString(string url);
-
-    string GetDetailsUrl(ModelDetails details);
-
-    string Url { get; }
-}

src/common/LanguageModelProvider/LanguageModelProvider.csproj

@@ -1,15 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <!-- Look at Directory.Build.props in root for common stuff as well -->
-  <Import Project="..\..\Common.Dotnet.CsWinRT.props" />
-
-  <PropertyGroup>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.AI" />
-    <PackageReference Include="Microsoft.Extensions.AI.OpenAI" />
-    <PackageReference Include="OpenAI" />
-  </ItemGroup>
-</Project>

src/common/LanguageModelProvider/LanguageModelService.cs

@@ -1,106 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System.Collections.Concurrent;
-using Microsoft.Extensions.AI;
-
-namespace LanguageModelProvider;
-
-public sealed class LanguageModelService
-{
-    private readonly ConcurrentDictionary<string, ILanguageModelProvider> _providersByPrefix;
-
-    public LanguageModelService(IEnumerable<ILanguageModelProvider> providers)
-    {
-        ArgumentNullException.ThrowIfNull(providers);
-
-        _providersByPrefix = new ConcurrentDictionary<string, ILanguageModelProvider>(StringComparer.OrdinalIgnoreCase);
-
-        foreach (var provider in providers)
-        {
-            if (!string.IsNullOrWhiteSpace(provider.UrlPrefix))
-            {
-                _providersByPrefix[provider.UrlPrefix] = provider;
-            }
-        }
-    }
-
-    public static LanguageModelService CreateDefault()
-    {
-        return new LanguageModelService(new[]
-        {
-            FoundryLocalModelProvider.Instance,
-        });
-    }
-
-    public IReadOnlyCollection<ILanguageModelProvider> Providers => _providersByPrefix.Values.ToArray();
-
-    public bool RegisterProvider(ILanguageModelProvider provider)
-    {
-        ArgumentNullException.ThrowIfNull(provider);
-
-        if (string.IsNullOrWhiteSpace(provider.UrlPrefix))
-        {
-            throw new ArgumentException("Provider must supply a URL prefix.", nameof(provider));
-        }
-
-        _providersByPrefix[provider.UrlPrefix] = provider;
-        return true;
-    }
-
-    public ILanguageModelProvider? GetProviderFor(string? modelReference)
-    {
-        if (string.IsNullOrWhiteSpace(modelReference))
-        {
-            return null;
-        }
-
-        foreach (var provider in _providersByPrefix.Values)
-        {
-            if (modelReference.StartsWith(provider.UrlPrefix, StringComparison.OrdinalIgnoreCase))
-            {
-                return provider;
-            }
-        }
-
-        return null;
-    }
-
-    public async Task<IReadOnlyList<ModelDetails>> GetModelsAsync(bool refresh = false, CancellationToken cancellationToken = default)
-    {
-        List<ModelDetails> models = [];
-
-        foreach (var provider in _providersByPrefix.Values)
-        {
-            cancellationToken.ThrowIfCancellationRequested();
-            var providerModels = await provider.GetModelsAsync(refresh, cancellationToken).ConfigureAwait(false);
-            models.AddRange(providerModels);
-        }
-
-        return models;
-    }
-
-    public IChatClient? GetClient(ModelDetails model)
-    {
-        if (model is null)
-        {
-            return null;
-        }
-
-        var reference = !string.IsNullOrWhiteSpace(model.Url) ? model.Url : model.Id;
-        return GetClient(reference);
-    }
-
-    public IChatClient? GetClient(string? modelReference)
-    {
-        if (string.IsNullOrWhiteSpace(modelReference))
-        {
-            return null;
-        }
-
-        var provider = GetProviderFor(modelReference);
-
-        return provider?.GetIChatClient(modelReference);
-    }
-}

src/common/LanguageModelProvider/ModelDetails.cs

@@ -1,32 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System.Collections.Generic;
-
-namespace LanguageModelProvider;
-
-public class ModelDetails
-{
-    public string Id { get; set; } = string.Empty;
-
-    public string Name { get; set; } = string.Empty;
-
-    public string Url { get; set; } = string.Empty;
-
-    public string Description { get; set; } = string.Empty;
-
-    public long Size { get; set; }
-
-    public bool IsUserAdded { get; set; }
-
-    public string Icon { get; set; } = string.Empty;
-
-    public List<HardwareAccelerator> HardwareAccelerators { get; set; } = [];
-
-    public bool SupportedOnQualcomm { get; set; }
-
-    public string License { get; set; } = string.Empty;
-
-    public object? ProviderModelDetails { get; set; }
-}

src/common/ManagedCommon/Logger.cs

@@ -130,7 +130,7 @@ namespace ManagedCommon
                 {
                     exMessage +=
                         "Inner exception: " + Environment.NewLine +
-                        ex.InnerException.GetType() + " (" + ex.HResult + "): " + ex.InnerException.Message + Environment.NewLine;
+                        ex.InnerException.GetType() + " (" + ex.InnerException.HResult + "): " + ex.InnerException.Message + Environment.NewLine;
                 }
 
                 exMessage +=

src/common/interop/PowerToys.Interop.vcxproj

@@ -63,14 +63,12 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)'=='Debug'">
     <ClCompile>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <UseDebugLibraries>true</UseDebugLibraries>
       <LinkIncremental>true</LinkIncremental>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)'=='Release'">
     <ClCompile>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <UseDebugLibraries>false</UseDebugLibraries>
       <WholeProgramOptimization>true</WholeProgramOptimization>
       <LinkIncremental>false</LinkIncremental>

src/common/notifications/BackgroundActivator/BackgroundActivator.vcxproj

@@ -46,16 +46,6 @@
   <PropertyGroup>
     <TargetName>notifications</TargetName>
   </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)'=='Debug'">
-    <ClCompile>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)'=='Release'">
-    <ClCompile>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-    </ClCompile>
-  </ItemDefinitionGroup>
   <ItemDefinitionGroup>
     <ClCompile>
       <PrecompiledHeaderOutputFile>$(IntDir)pch.pch</PrecompiledHeaderOutputFile>

src/dsc/v3/PowerToys.DSC.UnitTests/SettingsResourceTests/SettingsResourceAdvancedPasteModuleTest.cs

@@ -23,8 +23,7 @@ public sealed class SettingsResourceAdvancedPasteModuleTest : SettingsResourceMo
         {
             s.Properties.ShowCustomPreview = !s.Properties.ShowCustomPreview;
             s.Properties.CloseAfterLosingFocus = !s.Properties.CloseAfterLosingFocus;
-
-            // s.Properties.IsAdvancedAIEnabled = !s.Properties.IsAdvancedAIEnabled;
+            s.Properties.IsAdvancedAIEnabled = !s.Properties.IsAdvancedAIEnabled;
             s.Properties.AdvancedPasteUIShortcut = new HotkeySettings
             {
                 Key = "mock",

src/modules/AdvancedPaste/AdvancedPaste/AdvancedPaste.csproj

@@ -33,26 +33,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <None Remove="AdvancedPasteXAML\Controls\ClipboardHistoryItemPreviewControl.xaml" />
     <None Remove="AdvancedPasteXAML\Controls\PromptBox.xaml" />
-    <None Remove="AdvancedPasteXAML\Styles\Button.xaml" />
     <None Remove="Assets\AdvancedPaste\AIIcon.png" />
-    <None Remove="Assets\AdvancedPaste\Anthropic.svg" />
-    <None Remove="Assets\AdvancedPaste\Azure.svg" />
-    <None Remove="Assets\AdvancedPaste\AzureAI.svg" />
-    <None Remove="Assets\AdvancedPaste\Bedrock.svg" />
-    <None Remove="Assets\AdvancedPaste\FoundryLocal.svg" />
-    <None Remove="Assets\AdvancedPaste\Gemini.svg" />
     <None Remove="Assets\AdvancedPaste\Gradient.png" />
     <None Remove="AdvancedPasteXAML\Controls\AnimatedContentControl\AnimatedBorderBrush.xaml" />
     <None Remove="AdvancedPasteXAML\Views\MainPage.xaml" />
-    <None Remove="Assets\AdvancedPaste\HuggingFace.svg" />
-    <None Remove="Assets\AdvancedPaste\Mistral.svg" />
-    <None Remove="Assets\AdvancedPaste\Ollama.svg" />
-    <None Remove="Assets\AdvancedPaste\Onnx.svg" />
-    <None Remove="Assets\AdvancedPaste\OpenAI.dark.svg" />
-    <None Remove="Assets\AdvancedPaste\OpenAI.light.svg" />
-    <None Remove="Assets\AdvancedPaste\WindowsML.svg" />
   </ItemGroup>
 
   <ItemGroup>
@@ -64,6 +49,7 @@
 
   <ItemGroup>
     <PackageReference Include="OpenAI" />
+    <PackageReference Include="Azure.AI.OpenAI" />
     <PackageReference Include="CommunityToolkit.Mvvm" />
     <PackageReference Include="CommunityToolkit.WinUI.Animations" />
     <PackageReference Include="CommunityToolkit.WinUI.Converters" />
@@ -71,17 +57,10 @@
     <PackageReference Include="CommunityToolkit.WinUI.Controls.Primitives" />
     <!-- Including MessagePack to force version, since it's used by StreamJsonRpc but contains vulnerabilities. After StreamJsonRpc updates the version of MessagePack, we can upgrade StreamJsonRpc instead. -->
     <PackageReference Include="MessagePack" />
-	<PackageReference Include="Microsoft.SemanticKernel.Connectors.Amazon" />
-	<PackageReference Include="Microsoft.SemanticKernel.Connectors.AzureAIInference" />
-	<PackageReference Include="Microsoft.SemanticKernel.Connectors.Google" />
-	<PackageReference Include="Microsoft.SemanticKernel.Connectors.HuggingFace" />
-	<PackageReference Include="Microsoft.SemanticKernel.Connectors.MistralAI" />
-	<PackageReference Include="Microsoft.SemanticKernel.Connectors.Ollama" />
     <PackageReference Include="Microsoft.Extensions.Hosting" />
     <PackageReference Include="Microsoft.SemanticKernel" />
     <PackageReference Include="Microsoft.WindowsAppSDK" />
     <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" />
-  <PackageReference Include="System.ClientModel" />
     <PackageReference Include="Microsoft.Windows.Compatibility" />
     <PackageReference Include="Microsoft.Windows.CsWin32" />
     <PackageReference Include="Microsoft.Windows.SDK.BuildTools" />
@@ -123,7 +102,6 @@
     <!-- HACK: Common.UI is referenced, even if it is not used, to force dll versions to be the same as in other projects that use it. It's still unclear why this is the case, but this is need for flattening the install directory. -->
     <ProjectReference Include="..\..\..\common\Common.UI\Common.UI.csproj" />
     <ProjectReference Include="..\..\..\common\ManagedCommon\ManagedCommon.csproj" />
-    <ProjectReference Include="..\..\..\common\LanguageModelProvider\LanguageModelProvider.csproj" />
     <ProjectReference Include="..\..\..\common\GPOWrapper\GPOWrapper.vcxproj" />
     <ProjectReference Include="..\..\..\settings-ui\Settings.UI.Library\Settings.UI.Library.csproj" />
   </ItemGroup>
@@ -136,19 +114,9 @@
   <PropertyGroup Condition="'$(DisableHasPackageAndPublishMenuAddedByProject)'!='true' and '$(EnableMsixTooling)'=='true'">
     <HasPackageAndPublishMenu>true</HasPackageAndPublishMenu>
   </PropertyGroup>
-  <ItemGroup>
-    <Page Update="AdvancedPasteXAML\Controls\ClipboardHistoryItemPreviewControl.xaml">
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-  </ItemGroup>
   <ItemGroup>
     <Page Update="AdvancedPasteXAML\Controls\PromptBox.xaml">
       <Generator>MSBuild:Compile</Generator>
     </Page>
   </ItemGroup>
-  <ItemGroup>
-    <Page Update="AdvancedPasteXAML\Styles\Button.xaml">
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-  </ItemGroup>
 </Project>

src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/App.xaml

@@ -9,7 +9,6 @@
             <ResourceDictionary.MergedDictionaries>
                 <XamlControlsResources xmlns="using:Microsoft.UI.Xaml.Controls" />
                 <ResourceDictionary Source="ms-appx:///AdvancedPasteXAML/Controls/AnimatedContentControl/AnimatedContentControl.xaml" />
-                <ResourceDictionary Source="ms-appx:///AdvancedPasteXAML/Styles/Button.xaml" />
                 <!--  Other merged dictionaries here  -->
             </ResourceDictionary.MergedDictionaries>
             <!--  Other app resources here  -->

src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/App.xaml.cs

@@ -10,10 +10,10 @@ using System.Linq;
 using System.Reflection;
 using System.Threading;
 using System.Threading.Tasks;
+
 using AdvancedPaste.Helpers;
 using AdvancedPaste.Models;
 using AdvancedPaste.Services;
-using AdvancedPaste.Services.CustomActions;
 using AdvancedPaste.Settings;
 using AdvancedPaste.ViewModels;
 using ManagedCommon;
@@ -77,12 +77,11 @@ namespace AdvancedPaste
             {
                 services.AddSingleton<IFileSystem, FileSystem>();
                 services.AddSingleton<IUserSettings, UserSettings>();
-                services.AddSingleton<IAICredentialsProvider, EnhancedVaultCredentialsProvider>();
+                services.AddSingleton<IAICredentialsProvider, Services.OpenAI.VaultCredentialsProvider>();
                 services.AddSingleton<IPromptModerationService, Services.OpenAI.PromptModerationService>();
+                services.AddSingleton<ICustomTextTransformService, Services.OpenAI.CustomTextTransformService>();
                 services.AddSingleton<IKernelQueryCacheService, CustomActionKernelQueryCacheService>();
-                services.AddSingleton<IPasteAIProviderFactory, PasteAIProviderFactory>();
-                services.AddSingleton<ICustomActionTransformService, CustomActionTransformService>();
-                services.AddSingleton<IKernelService, AdvancedAIKernelService>();
+                services.AddSingleton<IKernelService, Services.OpenAI.KernelService>();
                 services.AddSingleton<IPasteFormatExecutor, PasteFormatExecutor>();
                 services.AddSingleton<OptionsViewModel>();
             }).Build();
@@ -112,11 +111,7 @@ namespace AdvancedPaste
         /// Invoked when the application is launched.
         /// </summary>
         /// <param name="args">Details about the launch request and process.</param>
-#if DEBUG
-        protected async override void OnLaunched(LaunchActivatedEventArgs args)
-#else
         protected override void OnLaunched(LaunchActivatedEventArgs args)
-#endif
         {
             var cmdArgs = Environment.GetCommandLineArgs();
             if (cmdArgs?.Length > 1)
@@ -138,10 +133,6 @@ namespace AdvancedPaste
             {
                 ProcessNamedPipe(cmdArgs[2]);
             }
-
-#if DEBUG
-            await ShowWindow(); // This allows for direct access without using PowerToys Runner, not all functionality might work
-#endif
         }
 
         private void ProcessNamedPipe(string pipeName)

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

@@ -11,7 +11,7 @@
             <Setter Property="Background" Value="Transparent" />
             <Setter Property="BorderBrush" Value="Transparent" />
             <Setter Property="BorderThickness" Value="1" />
-            <Setter Property="CornerRadius" Value="16" />
+            <Setter Property="CornerRadius" Value="8" />
             <Setter Property="Template">
                 <Setter.Value>
                     <ControlTemplate TargetType="local:AnimatedContentControl">

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

@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<UserControl
-    x:Class="AdvancedPaste.Controls.ClipboardHistoryItemPreviewControl"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:converters="using:AdvancedPaste.Converters"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:local="using:AdvancedPaste.Controls"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:tkconverters="using:CommunityToolkit.WinUI.Converters"
-    mc:Ignorable="d">
-    <UserControl.Resources>
-        <converters:DateTimeToFriendlyStringConverter x:Key="DateTimeToFriendlyStringConverter" />
-        <tkconverters:BoolToVisibilityConverter x:Name="BoolToVisibilityConverter" />
-    </UserControl.Resources>
-    <Grid Height="64" ColumnSpacing="12">
-        <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="80" />
-            <ColumnDefinition Width="*" />
-        </Grid.ColumnDefinitions>
-        <Border Background="{ThemeResource SubtleFillColorSecondaryBrush}" CornerRadius="16,0,0,16">
-            <Grid>
-                <!--  Image preview  -->
-                <Image
-                    Source="{x:Bind ClipboardItem.Image, Mode=OneWay}"
-                    Stretch="UniformToFill"
-                    Visibility="{x:Bind HasImage, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}" />
-                <!--  Text preview  -->
-                <TextBlock
-                    Margin="8,0,0,0"
-                    VerticalAlignment="Center"
-                    FontSize="10"
-                    Foreground="{ThemeResource TextFillColorSecondaryBrush}"
-                    Text="{x:Bind ClipboardItem.Content, Mode=OneWay}"
-                    TextWrapping="Wrap"
-                    Visibility="{x:Bind HasText, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}" />
-                <!--  Icon glyph fallback  -->
-                <FontIcon
-                    HorizontalAlignment="Center"
-                    VerticalAlignment="Center"
-                    FontSize="48"
-                    Glyph="{x:Bind IconGlyph, Mode=OneWay}"
-                    Visibility="{x:Bind HasGlyph, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}" />
-            </Grid>
-        </Border>
-        <StackPanel
-            Grid.Column="1"
-            VerticalAlignment="Center"
-            Spacing="2">
-            <TextBlock
-                Style="{StaticResource BodyTextBlockStyle}"
-                Text="{x:Bind Header, Mode=OneWay}"
-                TextWrapping="NoWrap" />
-            <TextBlock
-                Foreground="{ThemeResource TextFillColorSecondaryBrush}"
-                Style="{StaticResource CaptionTextBlockStyle}"
-                Text="{x:Bind Timestamp, Converter={StaticResource DateTimeToFriendlyStringConverter}, Mode=OneWay}" />
-        </StackPanel>
-    </Grid>
-</UserControl>

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

@@ -1,127 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using AdvancedPaste.Helpers;
-using AdvancedPaste.Models;
-using Microsoft.UI.Xaml;
-using Microsoft.UI.Xaml.Controls;
-using Microsoft.UI.Xaml.Media;
-
-namespace AdvancedPaste.Controls
-{
-    public sealed partial class ClipboardHistoryItemPreviewControl : UserControl
-    {
-        public static readonly DependencyProperty ClipboardItemProperty = DependencyProperty.Register(
-            nameof(ClipboardItem),
-            typeof(ClipboardItem),
-            typeof(ClipboardHistoryItemPreviewControl),
-            new PropertyMetadata(defaultValue: null, OnClipboardItemChanged));
-
-        public ClipboardItem ClipboardItem
-        {
-            get => (ClipboardItem)GetValue(ClipboardItemProperty);
-            set => SetValue(ClipboardItemProperty, value);
-        }
-
-        // Computed properties for display
-        public string Header => ClipboardItem != null ? GetHeaderFromFormat(ClipboardItem.Format) : string.Empty;
-
-        public string IconGlyph => ClipboardItem != null ? GetGlyphFromFormat(ClipboardItem.Format) : string.Empty;
-
-        public string ContentText => ClipboardItem?.Content ?? string.Empty;
-
-        public ImageSource ContentImage => ClipboardItem?.Image;
-
-        public DateTimeOffset? Timestamp => ClipboardItem?.Timestamp ?? ClipboardItem?.Item?.Timestamp;
-
-        public bool HasImage => ContentImage is not null;
-
-        public bool HasText => !string.IsNullOrEmpty(ContentText) && !HasImage;
-
-        public bool HasGlyph => !HasImage && !HasText && !string.IsNullOrEmpty(IconGlyph);
-
-        public ClipboardHistoryItemPreviewControl()
-        {
-            InitializeComponent();
-        }
-
-        private static void OnClipboardItemChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            if (d is ClipboardHistoryItemPreviewControl control)
-            {
-                // Notify bindings that all computed properties may have changed
-                control.Bindings.Update();
-            }
-        }
-
-        private static string GetHeaderFromFormat(ClipboardFormat format)
-        {
-            // Check flags in priority order (most specific first)
-            if (format.HasFlag(ClipboardFormat.Image))
-            {
-                return GetStringOrFallback("ClipboardPreviewCategoryImage", "Image");
-            }
-
-            if (format.HasFlag(ClipboardFormat.Video))
-            {
-                return GetStringOrFallback("ClipboardPreviewCategoryVideo", "Video");
-            }
-
-            if (format.HasFlag(ClipboardFormat.Audio))
-            {
-                return GetStringOrFallback("ClipboardPreviewCategoryAudio", "Audio");
-            }
-
-            if (format.HasFlag(ClipboardFormat.File))
-            {
-                return GetStringOrFallback("ClipboardPreviewCategoryFile", "File");
-            }
-
-            if (format.HasFlag(ClipboardFormat.Text) || format.HasFlag(ClipboardFormat.Html))
-            {
-                return GetStringOrFallback("ClipboardPreviewCategoryText", "Text");
-            }
-
-            return GetStringOrFallback("ClipboardPreviewCategoryUnknown", "Clipboard");
-        }
-
-        private static string GetGlyphFromFormat(ClipboardFormat format)
-        {
-            // Check flags in priority order (most specific first)
-            if (format.HasFlag(ClipboardFormat.Image))
-            {
-                return "\uEB9F"; // Image icon
-            }
-
-            if (format.HasFlag(ClipboardFormat.Video))
-            {
-                return "\uE714"; // Video icon
-            }
-
-            if (format.HasFlag(ClipboardFormat.Audio))
-            {
-                return "\uE189"; // Audio icon
-            }
-
-            if (format.HasFlag(ClipboardFormat.File))
-            {
-                return "\uE8A5"; // File icon
-            }
-
-            if (format.HasFlag(ClipboardFormat.Text) || format.HasFlag(ClipboardFormat.Html))
-            {
-                return "\uE8D2"; // Text icon
-            }
-
-            return "\uE77B"; // Generic clipboard icon
-        }
-
-        private static string GetStringOrFallback(string resourceKey, string fallback)
-        {
-            var value = ResourceLoaderInstance.ResourceLoader.GetString(resourceKey);
-            return string.IsNullOrEmpty(value) ? fallback : value;
-        }
-    }
-}

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

@@ -7,10 +7,8 @@
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:local="using:AdvancedPaste.Controls"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:settings="using:Microsoft.PowerToys.Settings.UI.Library"
     xmlns:tkconverters="using:CommunityToolkit.WinUI.Converters"
     xmlns:ui="using:CommunityToolkit.WinUI"
-    x:Name="PromptBoxControl"
     mc:Ignorable="d">
     <UserControl.Resources>
         <ResourceDictionary>
@@ -36,7 +34,7 @@
                     <SolidColorBrush x:Key="AccentGradientBrush" Color="{StaticResource AccentGradientColor}" />
                 </ResourceDictionary>
             </ResourceDictionary.ThemeDictionaries>
-            <x:Double x:Key="ModelSelectorButtonWidth">44</x:Double>
+
             <Style x:Key="CustomTextBoxStyle" TargetType="TextBox">
                 <Setter Property="Foreground" Value="{ThemeResource TextControlForeground}" />
                 <Setter Property="Background" Value="{ThemeResource TextControlBackground}" />
@@ -157,7 +155,6 @@
                                     Foreground="{ThemeResource TextControlHeaderForeground}"
                                     TextWrapping="Wrap"
                                     Visibility="Collapsed" />
-
                                 <Border
                                     x:Name="BorderElement"
                                     Grid.Row="1"
@@ -171,19 +168,48 @@
                                     BorderThickness="{TemplateBinding BorderThickness}"
                                     Control.IsTemplateFocusTarget="True"
                                     CornerRadius="{TemplateBinding CornerRadius}" />
-                                <Grid Grid.Row="1" Width="{StaticResource ModelSelectorButtonWidth}">
-                                    <ProgressRing
-                                        Width="20"
-                                        Height="20"
-                                        HorizontalAlignment="Center"
-                                        VerticalAlignment="Center"
-                                        IsActive="{Binding DataContext.IsBusy, Mode=OneWay, RelativeSource={RelativeSource Mode=TemplatedParent}}"
-                                        IsIndeterminate="{Binding DataContext.HasIndeterminateTransformProgress, Mode=OneWay, RelativeSource={RelativeSource Mode=TemplatedParent}}"
-                                        Maximum="100"
-                                        Minimum="0"
-                                        Visibility="{Binding DataContext.IsBusy, Mode=OneWay, RelativeSource={RelativeSource Mode=TemplatedParent}, Converter={StaticResource BoolToVisibilityConverter}}"
-                                        Value="{Binding DataContext.TransformProgress, Mode=OneWay, RelativeSource={RelativeSource Mode=TemplatedParent}}" />
-                                </Grid>
+                                <Viewbox
+                                    Grid.Row="1"
+                                    Width="16"
+                                    Height="16"
+                                    Margin="8,0,0,0">
+                                    <StackPanel
+                                        Margin="0"
+                                        Padding="0"
+                                        HorizontalAlignment="Stretch"
+                                        VerticalAlignment="Stretch">
+                                        <ProgressRing
+                                            Width="30"
+                                            Height="30"
+                                            HorizontalAlignment="Right"
+                                            VerticalAlignment="Center"
+                                            IsActive="{Binding DataContext.IsBusy, Mode=OneWay, RelativeSource={RelativeSource Mode=TemplatedParent}}"
+                                            IsIndeterminate="{Binding DataContext.HasIndeterminateTransformProgress, Mode=OneWay, RelativeSource={RelativeSource Mode=TemplatedParent}}"
+                                            Maximum="100"
+                                            Minimum="0"
+                                            Visibility="{Binding DataContext.IsBusy, Mode=OneWay, RelativeSource={RelativeSource Mode=TemplatedParent}, Converter={StaticResource BoolToVisibilityConverter}}"
+                                            Value="{Binding DataContext.TransformProgress, Mode=OneWay, RelativeSource={RelativeSource Mode=TemplatedParent}}" />
+
+                                        <StackPanel
+                                            Margin="0"
+                                            Padding="0"
+                                            HorizontalAlignment="Stretch"
+                                            VerticalAlignment="Stretch"
+                                            Visibility="{Binding DataContext.IsBusy, Mode=OneWay, RelativeSource={RelativeSource Mode=TemplatedParent}, Converter={StaticResource BoolToInvertedVisibilityConverter}}">
+                                            <Image
+                                                x:Name="AIGlyphImage"
+                                                AutomationProperties.AccessibilityView="Raw"
+                                                Source="/Assets/AdvancedPaste/SemanticKernel.svg"
+                                                Visibility="{Binding DataContext.IsAdvancedAIEnabled, Mode=OneWay, RelativeSource={RelativeSource Mode=TemplatedParent}, Converter={StaticResource BoolToVisibilityConverter}}" />
+                                            <PathIcon
+                                                x:Name="AIGlyph"
+                                                AutomationProperties.AccessibilityView="Raw"
+                                                Data="M128 766q0-42 24-77t65-48l178-57q32-11 61-30t52-42q50-50 71-114l58-179q13-40 48-65t78-26q42 0 77 24t50 65l58 177q21 66 72 117 49 50 117 72l176 58q43 14 69 48t26 80q0 41-25 76t-64 49l-178 58q-66 21-117 72-32 32-51 73t-33 84-26 83-30 73-45 51-71 20q-42 0-77-24t-49-65l-58-178q-8-25-19-47t-28-43q-34-43-77-68t-89-41-89-27-78-29-55-45-21-75zm1149 7q-76-29-145-53t-129-60-104-88-73-138l-57-176-67 176q-18 48-42 89t-60 78q-34 34-76 61t-89 43l-177 57q75 29 144 53t127 60 103 89 73 137l57 176 67-176q37-97 103-168t168-103l177-57zm-125 759q0-31 20-57t49-36l99-32q34-11 53-34t30-51 20-59 20-54 33-41 58-16q32 0 59 19t38 50q6 20 11 40t13 40 17 38 25 34q16 17 39 26t48 18 49 16 44 20 31 32 12 50q0 33-18 60t-51 38q-19 6-39 11t-41 13-39 17-34 25q-24 25-35 62t-24 73-35 61-68 25q-32 0-59-19t-38-50q-6-18-11-39t-13-41-17-40-24-33q-18-17-41-27t-47-17-49-15-43-20-30-33-12-54zm583 4q-43-13-74-30t-55-41-40-55-32-74q-12 41-29 72t-42 55-55 42-71 31q81 23 128 71t71 129q15-43 31-74t40-54 53-40 75-32z"
+                                                Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                                                Visibility="{Binding DataContext.IsAdvancedAIEnabled, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BoolToInvertedVisibilityConverter}}" />
+                                        </StackPanel>
+                                    </StackPanel>
+                                </Viewbox>
                                 <ScrollViewer
                                     x:Name="ContentElement"
                                     Grid.Row="1"
@@ -253,6 +279,12 @@
                                                 <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentElement" Storyboard.TargetProperty="Foreground">
                                                     <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource TextControlForegroundDisabled}" />
                                                 </ObjectAnimationUsingKeyFrames>
+                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="AIGlyph" Storyboard.TargetProperty="Foreground">
+                                                    <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource TextControlForegroundDisabled}" />
+                                                </ObjectAnimationUsingKeyFrames>
+                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="AIGlyphImage" Storyboard.TargetProperty="Opacity">
+                                                    <DiscreteObjectKeyFrame KeyTime="0" Value="0.4" />
+                                                </ObjectAnimationUsingKeyFrames>
                                                 <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PlaceholderTextContentPresenter" Storyboard.TargetProperty="Foreground">
                                                     <DiscreteObjectKeyFrame KeyTime="0" Value="{Binding PlaceholderForeground, RelativeSource={RelativeSource TemplatedParent}, TargetNullValue={ThemeResource TextControlPlaceholderForegroundDisabled}}" />
                                                 </ObjectAnimationUsingKeyFrames>
@@ -332,8 +364,6 @@
                 FalseValue="Visible"
                 TrueValue="Collapsed" />
             <converters:CountToVisibilityConverter x:Key="CountToVisibilityConverter" />
-            <converters:CountToInvertedVisibilityConverter x:Key="CountToInvertedVisibilityConverter" />
-            <converters:ServiceTypeToIconConverter x:Key="ServiceTypeToIconConverter" />
         </ResourceDictionary>
     </UserControl.Resources>
     <Grid x:Name="PromptBoxGrid" Loaded="Grid_Loaded">
@@ -344,19 +374,18 @@
         <local:AnimatedContentControl
             x:Name="Loader"
             MinHeight="48"
-            CornerRadius="16">
+            CornerRadius="8">
             <Grid>
                 <TextBox
                     x:Name="InputTxtBox"
                     HorizontalAlignment="Stretch"
                     x:FieldModifier="public"
-                    CornerRadius="16"
                     DataContext="{x:Bind ViewModel}"
                     IsEnabled="{x:Bind ViewModel.ClipboardHasData, Mode=OneWay}"
                     KeyDown="InputTxtBox_KeyDown"
                     PlaceholderText="{x:Bind ViewModel.InputTxtBoxPlaceholderText, Mode=OneWay}"
                     Style="{StaticResource CustomTextBoxStyle}"
-                    TabIndex="1"
+                    TabIndex="0"
                     Text="{x:Bind ViewModel.Query, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}">
                     <ToolTipService.ToolTip>
                         <TextBlock x:Uid="InputTxtBoxTooltip" />
@@ -516,136 +545,6 @@
                         </Flyout>
                     </FlyoutBase.AttachedFlyout>
                 </TextBox>
-                <DropDownButton
-                    x:Name="AIProviderButton"
-                    x:Uid="AIProviderButton"
-                    MinWidth="{StaticResource ModelSelectorButtonWidth}"
-                    Margin="1,1,0,2"
-                    Padding="0,0,4,0"
-                    VerticalAlignment="Stretch"
-                    BorderBrush="{ThemeResource DividerStrokeColorDefaultBrush}"
-                    BorderThickness="0,0,1,0"
-                    CornerRadius="16,0,0,16"
-                    Style="{StaticResource SubtleDropDownButtonStyle}"
-                    TabIndex="0"
-                    Visibility="{x:Bind ViewModel.IsBusy, Mode=OneWay, Converter={StaticResource BoolToInvertedVisibilityConverter}}">
-                    <ToolTipService.ToolTip>
-                        <TextBlock Text="{x:Bind ViewModel.ActiveAIProviderTooltip, Mode=OneWay}" TextWrapping="WrapWholeWords" />
-                    </ToolTipService.ToolTip>
-                    <DropDownButton.Content>
-                        <Image
-                            x:Name="AIProviderIcon"
-                            Width="16"
-                            Height="16"
-                            AutomationProperties.AccessibilityView="Raw"
-                            Source="{x:Bind ViewModel.ActiveAIProvider?.ServiceType, Mode=OneWay, Converter={StaticResource ServiceTypeToIconConverter}}" />
-                    </DropDownButton.Content>
-                    <DropDownButton.Flyout>
-                        <Flyout Placement="Bottom" ShouldConstrainToRootBounds="False">
-                            <Grid
-                                Width="386"
-                                Margin="-4"
-                                RowSpacing="12">
-                                <Grid.RowDefinitions>
-                                    <RowDefinition Height="Auto" />
-                                    <RowDefinition Height="Auto" />
-                                    <RowDefinition Height="Auto" />
-                                </Grid.RowDefinitions>
-                                <TextBlock
-                                    x:Uid="AIProvidersFlyoutHeader"
-                                    Grid.Row="0"
-                                    Style="{StaticResource BodyStrongTextBlockStyle}" />
-                                <ListView
-                                    x:Name="AIProviderListView"
-                                    Grid.Row="1"
-                                    MaxHeight="320"
-                                    Background="{ThemeResource CardBackgroundFillColorDefaultBrush}"
-                                    BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}"
-                                    BorderThickness="1"
-                                    CornerRadius="{StaticResource OverlayCornerRadius}"
-                                    ItemsSource="{x:Bind ViewModel.AIProviders, Mode=OneWay}"
-                                    ScrollViewer.VerticalScrollBarVisibility="Auto"
-                                    ScrollViewer.VerticalScrollMode="Auto"
-                                    SelectedItem="{x:Bind ViewModel.ActiveAIProvider, Mode=OneWay}"
-                                    SelectionChanged="AIProviderListView_SelectionChanged"
-                                    SelectionMode="Single"
-                                    Visibility="{x:Bind ViewModel.AIProviders.Count, Mode=OneWay, Converter={StaticResource CountToVisibilityConverter}}">
-                                    <ListView.ItemsPanel>
-                                        <ItemsPanelTemplate>
-                                            <StackPanel Orientation="Vertical" Spacing="2" />
-                                        </ItemsPanelTemplate>
-                                    </ListView.ItemsPanel>
-                                    <ListView.ItemTemplate>
-                                        <DataTemplate x:DataType="settings:PasteAIProviderDefinition">
-                                            <Grid Padding="0,8,0,8" ColumnSpacing="12">
-                                                <Grid.ColumnDefinitions>
-                                                    <ColumnDefinition Width="Auto" />
-                                                    <ColumnDefinition Width="*" />
-                                                    <ColumnDefinition Width="Auto" />
-                                                </Grid.ColumnDefinitions>
-                                                <Image
-                                                    Width="20"
-                                                    Height="20"
-                                                    AutomationProperties.AccessibilityView="Raw"
-                                                    Source="{x:Bind ServiceType, Mode=OneWay, Converter={StaticResource ServiceTypeToIconConverter}}" />
-                                                <StackPanel
-                                                    Grid.Column="1"
-                                                    VerticalAlignment="Center"
-                                                    Spacing="2">
-                                                    <TextBlock Text="{x:Bind DisplayName, Mode=OneWay}" TextTrimming="CharacterEllipsis" />
-                                                    <TextBlock
-                                                        Foreground="{ThemeResource TextFillColorSecondaryBrush}"
-                                                        Style="{StaticResource CaptionTextBlockStyle}"
-                                                        Text="{x:Bind ServiceType, Mode=OneWay}" />
-                                                </StackPanel>
-                                                <Border
-                                                    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
-                                                        AutomationProperties.AccessibilityView="Raw"
-                                                        FontSize="10"
-                                                        Foreground="{ThemeResource TextFillColorSecondaryBrush}"
-                                                        Text="Local" />
-                                                </Border>
-                                                <!--<Border
-                                                    Grid.Column="2"
-                                                    Padding="2,0,2,0"
-                                                    VerticalAlignment="Center"
-                                                    BorderBrush="{ThemeResource TertiaryButtonBorderBrush}"
-                                                    BorderThickness="1"
-                                                    CornerRadius="{StaticResource ControlCornerRadius}"
-                                                    Visibility="{x:Bind EnableAdvanceAI}">
-                                                    <TextBlock
-                                                        AutomationProperties.AccessibilityView="Raw"
-                                                        FontSize="10"
-                                                        Foreground="{ThemeResource TextFillColorSecondaryBrush}"
-                                                        Text="ADVANCED" />
-                                                </Border>-->
-                                            </Grid>
-                                        </DataTemplate>
-                                    </ListView.ItemTemplate>
-                                </ListView>
-                                <TextBlock
-                                    x:Uid="AIProvidersEmptyText"
-                                    Grid.Row="1"
-                                    Foreground="{ThemeResource TextFillColorSecondaryBrush}"
-                                    Style="{StaticResource CaptionTextBlockStyle}"
-                                    TextWrapping="WrapWholeWords"
-                                    Visibility="{x:Bind ViewModel.AIProviders.Count, Mode=OneWay, Converter={StaticResource CountToInvertedVisibilityConverter}}" />
-                                <HyperlinkButton
-                                    x:Uid="AIProvidersManageButtonContent"
-                                    Grid.Row="2"
-                                    HorizontalAlignment="Right"
-                                    Command="{x:Bind ViewModel.OpenSettingsCommand, Mode=OneWay}" />
-                            </Grid>
-                        </Flyout>
-                    </DropDownButton.Flyout>
-                </DropDownButton>
                 <Grid
                     Width="32"
                     Height="32"
@@ -663,9 +562,10 @@
                         Command="{x:Bind GenerateCustomAICommand}"
                         Content="{ui:FontIcon Glyph=&#xE724;,
                                               FontSize=16}"
+                        Foreground="{ThemeResource AccentTextFillColorPrimaryBrush}"
                         IsEnabled="{x:Bind ViewModel.IsCustomAIAvailable, Mode=OneWay}"
                         Style="{StaticResource SubtleButtonStyle}"
-                        TabIndex="2"
+                        TabIndex="1"
                         Visibility="{x:Bind ViewModel.Query.Length, Mode=OneWay, Converter={StaticResource CountToVisibilityConverter}}">
                         <ToolTipService.ToolTip>
                             <TextBlock x:Uid="SendBtnToolTip" TextWrapping="WrapWholeWords" />

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

@@ -10,11 +10,9 @@ using AdvancedPaste.Models;
 using AdvancedPaste.ViewModels;
 using CommunityToolkit.Mvvm.Input;
 using ManagedCommon;
-using Microsoft.PowerToys.Settings.UI.Library;
 using Microsoft.PowerToys.Telemetry;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
-using Microsoft.UI.Xaml.Controls.Primitives;
 
 namespace AdvancedPaste.Controls
 {
@@ -46,18 +44,6 @@ namespace AdvancedPaste.Controls
             set => SetValue(FooterProperty, value);
         }
 
-        public static readonly DependencyProperty ModelSelectorProperty = DependencyProperty.Register(
-            nameof(ModelSelector),
-            typeof(object),
-            typeof(PromptBox),
-            new PropertyMetadata(defaultValue: null));
-
-        public object ModelSelector
-        {
-            get => GetValue(ModelSelectorProperty);
-            set => SetValue(ModelSelectorProperty, value);
-        }
-
         public PromptBox()
         {
             InitializeComponent();
@@ -125,19 +111,5 @@ namespace AdvancedPaste.Controls
         {
             Loader.IsLoading = loading;
         }
-
-        private async void AIProviderListView_SelectionChanged(object sender, SelectionChangedEventArgs e)
-        {
-            if (AIProviderListView.SelectedItem is PasteAIProviderDefinition provider)
-            {
-                if (ViewModel.SetActiveProviderCommand.CanExecute(provider))
-                {
-                    await ViewModel.SetActiveProviderCommand.ExecuteAsync(provider);
-                }
-
-                var flyout = FlyoutBase.GetAttachedFlyout(AIProviderButton);
-                flyout?.Hide();
-            }
-        }
     }
 }

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

@@ -1,24 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using System.Collections;
-using Microsoft.UI.Xaml;
-using Microsoft.UI.Xaml.Data;
-
-namespace AdvancedPaste.Converters;
-
-public sealed partial class CountToInvertedVisibilityConverter : IValueConverter
-{
-    public object Convert(object value, Type targetType, object parameter, string language)
-    {
-        bool hasItems = ((value is int intValue) && intValue > 0) || (value is IEnumerable enumerable && enumerable.GetEnumerator().MoveNext());
-        return targetType == typeof(Visibility)
-            ? (hasItems ? Visibility.Collapsed : Visibility.Visible)
-            : !hasItems;
-    }
-
-    public object ConvertBack(object value, Type targetType, object parameter, string language)
-        => throw new NotSupportedException();
-}

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

@@ -1,103 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Microsoft.UI.Xaml.Data;
-using Microsoft.Windows.ApplicationModel.Resources;
-
-namespace AdvancedPaste.Converters
-{
-    public sealed partial class DateTimeToFriendlyStringConverter : IValueConverter
-    {
-        private static readonly ResourceLoader _resources = new ResourceLoader();
-
-        public object Convert(object value, Type targetType, object parameter, string language)
-        {
-            if (value is not DateTimeOffset dto)
-            {
-                return string.Empty;
-            }
-
-            // Use local times to calculate relative values and formatting
-            var now = DateTimeOffset.Now;
-            var localValue = dto.ToLocalTime();
-            var culture = !string.IsNullOrEmpty(language)
-                ? new CultureInfo(language)
-                : CultureInfo.CurrentCulture;
-
-            var delta = now - localValue;
-
-            // Future dates: fall back to date/time formatting
-            if (delta < TimeSpan.Zero)
-            {
-                return FormatDateAndTime(localValue, culture);
-            }
-
-            // < 1 minute
-            if (delta.TotalSeconds < 60)
-            {
-                return _resources.GetString("Relative_JustNow"); // "Just now"
-            }
-
-            // < 60 minutes
-            if (delta.TotalMinutes < 60)
-            {
-                var mins = (int)Math.Round(delta.TotalMinutes);
-                if (mins <= 1)
-                {
-                    return _resources.GetString("Relative_MinuteAgo"); // "1 minute ago"
-                }
-
-                var fmt = _resources.GetString("Relative_MinutesAgo_Format"); // "{0} minutes ago"
-                return string.Format(culture, fmt, mins);
-            }
-
-            // Same calendar day → "Today, {time}"
-            var today = now.Date;
-            if (localValue.Date == today)
-            {
-                var time = localValue.ToString("t", culture); // localized short time
-                var fmt = _resources.GetString("Relative_Today_TimeFormat"); // "Today, {0}"
-                return string.Format(culture, fmt, time);
-            }
-
-            // Yesterday → "Yesterday, {time}"
-            if (localValue.Date == today.AddDays(-1))
-            {
-                var time = localValue.ToString("t", culture);
-                var fmt = _resources.GetString("Relative_Yesterday_TimeFormat"); // "Yesterday, {0}"
-                return string.Format(culture, fmt, time);
-            }
-
-            // Within last 7 days → "{Weekday}, {time}"
-            if (delta.TotalDays < 7)
-            {
-                var weekday = localValue.ToString("dddd", culture); // localized weekday
-                var time = localValue.ToString("t", culture);
-                var fmt = _resources.GetString("Relative_Weekday_TimeFormat"); // "{0}, {1}"
-                return string.Format(culture, fmt, weekday, time);
-            }
-
-            // Older → localized date + time
-            return FormatDateAndTime(localValue, culture);
-        }
-
-        public object ConvertBack(object value, Type targetType, object parameter, string language)
-            => throw new NotSupportedException();
-
-        private static string FormatDateAndTime(DateTimeOffset localValue, CultureInfo culture)
-        {
-            // Use localized short date + short time
-            var date = localValue.ToString("d", culture);
-            var time = localValue.ToString("t", culture);
-            var fmt = _resources.GetString("Relative_Date_TimeFormat"); // "{0}, {1}"
-            return string.Format(culture, fmt, date, time);
-        }
-    }
-}

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

@@ -1,42 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using ManagedCommon;
-using Microsoft.PowerToys.Settings.UI.Library;
-using Microsoft.UI.Xaml.Data;
-using Microsoft.UI.Xaml.Media.Imaging;
-
-namespace AdvancedPaste.Converters;
-
-public sealed partial class ServiceTypeToIconConverter : IValueConverter
-{
-    public object Convert(object value, Type targetType, object parameter, string language)
-    {
-        string iconPath = value switch
-        {
-            string service when !string.IsNullOrWhiteSpace(service) => AIServiceTypeRegistry.GetIconPath(service),
-            AIServiceType serviceType => AIServiceTypeRegistry.GetIconPath(serviceType),
-            _ => null,
-        };
-
-        if (string.IsNullOrEmpty(iconPath))
-        {
-            iconPath = AIServiceTypeRegistry.GetIconPath(AIServiceType.Unknown);
-        }
-
-        try
-        {
-            return new SvgImageSource(new Uri(iconPath));
-        }
-        catch (Exception ex)
-        {
-            Logger.LogDebug("Failed to create SvgImageSource for AI service icon", ex.Message);
-            return null;
-        }
-    }
-
-    public object ConvertBack(object value, Type targetType, object parameter, string language)
-        => throw new NotSupportedException();
-}

src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/MainWindow.xaml

@@ -7,9 +7,9 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:pages="using:AdvancedPaste.Pages"
     xmlns:winuiex="using:WinUIEx"
-    Width="486"
+    Width="420"
     Height="188"
-    MinWidth="486"
+    MinWidth="420"
     MinHeight="188"
     Closed="WindowEx_Closed"
     IsAlwaysOnTop="True"

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

@@ -35,7 +35,7 @@
                         AutomationProperties.HelpText="{x:Bind Name, Mode=OneWay}"
                         AutomationProperties.Name="{x:Bind AccessibleName, Mode=OneWay}">
                         <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="48" />
+                            <ColumnDefinition Width="26" />
                             <ColumnDefinition Width="*" />
                             <ColumnDefinition Width="Auto" />
                         </Grid.ColumnDefinitions>
@@ -52,7 +52,6 @@
                             Grid.Column="1"
                             VerticalAlignment="Center"
                             x:Phase="1"
-                            Style="{StaticResource CaptionTextBlockStyle}"
                             Text="{x:Bind Name, Mode=OneWay}" />
                         <TextBlock
                             Grid.Column="2"
@@ -75,7 +74,7 @@
                         AutomationProperties.AccessibilityView="Raw"
                         Opacity="0.5">
                         <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="48" />
+                            <ColumnDefinition Width="26" />
                             <ColumnDefinition Width="*" />
                             <ColumnDefinition Width="Auto" />
                         </Grid.ColumnDefinitions>
@@ -88,7 +87,6 @@
                             Grid.Column="1"
                             VerticalAlignment="Center"
                             x:Phase="1"
-                            Style="{StaticResource CaptionTextBlockStyle}"
                             Text="{x:Bind Name, Mode=OneWay}" />
                     </Grid>
                 </DataTemplate>
@@ -144,107 +142,14 @@
     </Page.KeyboardAccelerators>
     <Grid>
         <Grid.RowDefinitions>
-            <RowDefinition Height="Auto" />
             <RowDefinition Height="Auto" />
             <RowDefinition Height="*" />
         </Grid.RowDefinitions>
 
-        <Grid
-            Margin="8,8,8,4"
-            Padding="4"
-            Background="{ThemeResource CardBackgroundFillColorDefaultBrush}"
-            BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}"
-            BorderThickness="1"
-            CornerRadius="20"
-            Visibility="{x:Bind ViewModel.ClipboardHasData, Converter={StaticResource BoolToVisibilityConverter}, Mode=OneWay}">
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="*" />
-                <ColumnDefinition Width="Auto" />
-            </Grid.ColumnDefinitions>
-            <controls:ClipboardHistoryItemPreviewControl Height="64" ClipboardItem="{x:Bind ViewModel.CurrentClipboardItem, Mode=OneWay}" />
-            <Button
-                x:Uid="ClipboardHistoryButton"
-                Grid.Column="1"
-                Margin="0,0,4,0"
-                VerticalAlignment="Center"
-                IsEnabled="{x:Bind ViewModel.ClipboardHistoryEnabled, Mode=TwoWay}"
-                Style="{StaticResource SubtleButtonStyle}">
-                <ToolTipService.ToolTip>
-                    <TextBlock x:Uid="ClipboardHistoryButtonToolTip" />
-                </ToolTipService.ToolTip>
-                <FontIcon
-                    Margin="0,0,0,0"
-                    VerticalAlignment="Center"
-                    AutomationProperties.AccessibilityView="Raw"
-                    FontSize="16"
-                    Glyph="&#xE81C;" />
-                <Button.Flyout>
-                    <Flyout
-                        FlyoutPresenterStyle="{StaticResource PaddingLessFlyoutPresenterStyle}"
-                        Placement="Right"
-                        ShouldConstrainToRootBounds="False">
-                        <ItemsView
-                            Width="320"
-                            Margin="8,8,8,0"
-                            IsItemInvokedEnabled="True"
-                            ItemInvoked="ClipboardHistory_ItemInvoked"
-                            ItemsSource="{x:Bind clipboardHistory, Mode=OneWay}"
-                            SelectionMode="None">
-                            <ItemsView.Layout>
-                                <StackLayout Orientation="Vertical" Spacing="8" />
-                            </ItemsView.Layout>
-                            <ItemsView.Transitions />
-                            <ItemsView.ItemTemplate>
-                                <DataTemplate x:DataType="local:ClipboardItem">
-                                    <ItemContainer
-                                        AutomationProperties.Name="{x:Bind Description, Mode=OneWay}"
-                                        CornerRadius="16"
-                                        ToolTipService.ToolTip="{x:Bind Content}">
-                                        <Grid
-                                            Background="{ThemeResource CardBackgroundFillColorDefaultBrush}"
-                                            BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}"
-                                            BorderThickness="1"
-                                            ColumnSpacing="8"
-                                            CornerRadius="16">
-                                            <Grid.ColumnDefinitions>
-                                                <ColumnDefinition Width="*" MaxWidth="240" />
-                                                <ColumnDefinition Width="Auto" />
-                                            </Grid.ColumnDefinitions>
-                                            <controls:ClipboardHistoryItemPreviewControl x:Phase="0" ClipboardItem="{x:Bind}" />
-                                            <Button
-                                                x:Name="ClipboardHistoryItemMoreOptionsButton"
-                                                x:Uid="ClipboardHistoryItemMoreOptionsButton"
-                                                Grid.Column="1"
-                                                VerticalAlignment="Center"
-                                                Foreground="{ThemeResource TextFillColorSecondaryBrush}"
-                                                Style="{StaticResource SubtleButtonStyle}">
-                                                <Button.Content>
-                                                    <FontIcon FontSize="16" Glyph="&#xe712;" />
-                                                </Button.Content>
-                                                <Button.Flyout>
-                                                    <MenuFlyout>
-                                                        <MenuFlyoutItem
-                                                            x:Uid="ClipboardHistoryItemDeleteButton"
-                                                            Click="ClipboardHistoryItemDeleteButton_Click"
-                                                            CommandParameter="{x:Bind (local:ClipboardItem)}"
-                                                            Icon="Delete" />
-                                                    </MenuFlyout>
-                                                </Button.Flyout>
-                                            </Button>
-                                        </Grid>
-                                    </ItemContainer>
-                                </DataTemplate>
-                            </ItemsView.ItemTemplate>
-                        </ItemsView>
-                    </Flyout>
-                </Button.Flyout>
-            </Button>
-        </Grid>
         <controls:PromptBox
             x:Name="CustomFormatTextBox"
             x:Uid="CustomFormatTextBox"
-            Grid.Row="1"
-            Margin="20,4,20,0"
+            Margin="8,4,8,0"
             x:FieldModifier="public"
             TabIndex="0">
             <controls:PromptBox.Footer>
@@ -341,6 +246,117 @@
                 ScrollViewer.VerticalScrollMode="Auto"
                 SelectionMode="None"
                 TabIndex="2" />
+
+            <Rectangle
+                Grid.Row="3"
+                Height="1"
+                HorizontalAlignment="Stretch"
+                Fill="{ThemeResource DividerStrokeColorDefaultBrush}" />
+            <Button
+                Grid.Row="4"
+                Height="32"
+                Margin="4,0,4,4"
+                Padding="{StaticResource ButtonPadding}"
+                HorizontalAlignment="Stretch"
+                HorizontalContentAlignment="Stretch"
+                VerticalContentAlignment="Stretch"
+                AutomationProperties.LabeledBy="{x:Bind ClipboardHistoryButton}"
+                IsEnabled="{x:Bind ViewModel.ClipboardHistoryEnabled, Mode=TwoWay}"
+                Style="{StaticResource SubtleButtonStyle}">
+                <Grid
+                    HorizontalAlignment="Stretch"
+                    VerticalAlignment="Stretch"
+                    ColumnSpacing="10">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition Width="*" />
+                        <ColumnDefinition Width="Auto" />
+                    </Grid.ColumnDefinitions>
+                    <FontIcon
+                        Margin="0,0,0,0"
+                        VerticalAlignment="Center"
+                        AutomationProperties.AccessibilityView="Raw"
+                        FontSize="16"
+                        Glyph="&#xE81C;" />
+                    <TextBlock
+                        x:Name="ClipboardHistoryButton"
+                        x:Uid="ClipboardHistoryButton"
+                        Grid.Column="1"
+                        VerticalAlignment="Center" />
+                    <FontIcon
+                        Grid.Column="2"
+                        AutomationProperties.AccessibilityView="Raw"
+                        FontSize="12"
+                        Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                        Glyph="&#xE974;" />
+                </Grid>
+                <Button.Flyout>
+                    <Flyout
+                        FlyoutPresenterStyle="{StaticResource PaddingLessFlyoutPresenterStyle}"
+                        Placement="Right"
+                        ShouldConstrainToRootBounds="False">
+
+                        <ListView
+                            Width="320"
+                            IsItemClickEnabled="True"
+                            ItemClick="ClipboardHistory_ItemClick"
+                            ItemsSource="{x:Bind clipboardHistory, Mode=OneWay}"
+                            SelectionMode="None">
+                            <ListView.Transitions />
+                            <ListView.ItemTemplate>
+                                <DataTemplate x:DataType="local:ClipboardItem">
+                                    <Grid
+                                        Height="40"
+                                        HorizontalAlignment="Stretch"
+                                        AutomationProperties.Name="{x:Bind Description, Mode=OneWay}"
+                                        ColumnSpacing="8"
+                                        ToolTipService.ToolTip="{x:Bind Content}">
+                                        <Grid.ColumnDefinitions>
+                                            <ColumnDefinition Width="*" MaxWidth="240" />
+                                            <ColumnDefinition Width="Auto" />
+                                        </Grid.ColumnDefinitions>
+                                        <Image
+                                            Grid.Column="0"
+                                            HorizontalAlignment="Left"
+                                            x:Phase="2"
+                                            Source="{x:Bind Image}"
+                                            Visibility="Visible" />
+                                        <TextBlock
+                                            Grid.Column="0"
+                                            HorizontalAlignment="Left"
+                                            VerticalAlignment="Center"
+                                            x:Phase="1"
+                                            Text="{x:Bind Content}"
+                                            TextTrimming="CharacterEllipsis"
+                                            Visibility="Visible" />
+                                        <Button
+                                            x:Name="ClipboardHistoryItemMoreOptionsButton"
+                                            x:Uid="ClipboardHistoryItemMoreOptionsButton"
+                                            Grid.Column="1"
+                                            VerticalAlignment="Center"
+                                            Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                                            Style="{StaticResource SubtleButtonStyle}">
+                                            <Button.Content>
+                                                <FontIcon FontSize="16" Glyph="&#xe712;" />
+                                            </Button.Content>
+                                            <Button.Flyout>
+                                                <MenuFlyout>
+                                                    <MenuFlyoutItem
+                                                        x:Uid="ClipboardHistoryItemDeleteButton"
+                                                        Click="ClipboardHistoryItemDeleteButton_Click"
+                                                        CommandParameter="{x:Bind (local:ClipboardItem)}"
+                                                        Icon="Delete" />
+                                                </MenuFlyout>
+                                            </Button.Flyout>
+                                        </Button>
+                                    </Grid>
+                                </DataTemplate>
+                            </ListView.ItemTemplate>
+                        </ListView>
+                    </Flyout>
+                </Button.Flyout>
+            </Button>
+
         </Grid>
     </Grid>
 </Page>

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

@@ -68,22 +68,11 @@ namespace AdvancedPaste.Pages
                             if (item.Content.Contains(StandardDataFormats.Text))
                             {
                                 string text = await item.Content.GetTextAsync();
-                                items.Add(new ClipboardItem
-                                {
-                                    Content = text,
-                                    Format = ClipboardFormat.Text,
-                                    Timestamp = item.Timestamp,
-                                    Item = item,
-                                });
+                                items.Add(new ClipboardItem { Content = text, Item = item });
                             }
                             else if (item.Content.Contains(StandardDataFormats.Bitmap))
                             {
-                                items.Add(new ClipboardItem
-                                {
-                                    Format = ClipboardFormat.Image,
-                                    Timestamp = item.Timestamp,
-                                    Item = item,
-                                });
+                                items.Add(new ClipboardItem { Item = item });
                             }
                         }
                     }
@@ -198,9 +187,10 @@ namespace AdvancedPaste.Pages
             }
         }
 
-        private async void ClipboardHistory_ItemInvoked(ItemsView sender, ItemsViewItemInvokedEventArgs args)
+        private async void ClipboardHistory_ItemClick(object sender, ItemClickEventArgs e)
         {
-            if (args.InvokedItem is ClipboardItem item)
+            var item = e.ClickedItem as ClipboardItem;
+            if (item is not null)
             {
                 PowerToysTelemetry.Log.WriteEvent(new Telemetry.AdvancedPasteClipboardItemClicked());
                 if (!string.IsNullOrEmpty(item.Content))

src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/Styles/Button.xaml

@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<ResourceDictionary
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:animatedvisuals="using:Microsoft.UI.Xaml.Controls.AnimatedVisuals">
-
-    <Style x:Key="SubtleDropDownButtonStyle" TargetType="DropDownButton">
-        <Setter Property="Background" Value="{ThemeResource SubtleButtonBackground}" />
-        <Setter Property="Foreground" Value="{ThemeResource SubtleButtonForeground}" />
-        <Setter Property="BorderBrush" Value="{ThemeResource SubtleButtonBorderBrush}" />
-        <Setter Property="BorderThickness" Value="{ThemeResource ButtonBorderThemeThickness}" />
-        <Setter Property="Padding" Value="{StaticResource ButtonPadding}" />
-        <Setter Property="HorizontalAlignment" Value="Left" />
-        <Setter Property="VerticalAlignment" Value="Center" />
-        <Setter Property="FontFamily" Value="{ThemeResource ContentControlThemeFontFamily}" />
-        <Setter Property="FontWeight" Value="Normal" />
-        <Setter Property="FontSize" Value="{ThemeResource ControlContentThemeFontSize}" />
-        <Setter Property="UseSystemFocusVisuals" Value="{StaticResource UseSystemFocusVisuals}" />
-        <Setter Property="FocusVisualMargin" Value="-3" />
-        <Setter Property="CornerRadius" Value="{ThemeResource ControlCornerRadius}" />
-        <Setter Property="BackgroundSizing" Value="InnerBorderEdge" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="Button">
-                    <Grid
-                        x:Name="RootGrid"
-                        Padding="{TemplateBinding Padding}"
-                        Background="{TemplateBinding Background}"
-                        BackgroundSizing="{TemplateBinding BackgroundSizing}"
-                        BorderBrush="{TemplateBinding BorderBrush}"
-                        BorderThickness="{TemplateBinding BorderThickness}"
-                        CornerRadius="{TemplateBinding CornerRadius}">
-                        <Grid.BackgroundTransition>
-                            <BrushTransition Duration="0:0:0.083" />
-                        </Grid.BackgroundTransition>
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="*" />
-                            <ColumnDefinition Width="Auto" />
-                        </Grid.ColumnDefinitions>
-                        <ContentPresenter
-                            x:Name="ContentPresenter"
-                            HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                            VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                            AutomationProperties.AccessibilityView="Raw"
-                            Content="{TemplateBinding Content}"
-                            ContentTemplate="{TemplateBinding ContentTemplate}"
-                            ContentTransitions="{TemplateBinding ContentTransitions}" />
-                        <AnimatedIcon
-                            xmlns:local="using:Microsoft.UI.Xaml.Controls"
-                            x:Name="ChevronIcon"
-                            Grid.Column="1"
-                            Width="12"
-                            Height="12"
-                            Margin="-4,0,0,0"
-                            local:AnimatedIcon.State="Normal"
-                            AutomationProperties.AccessibilityView="Raw"
-                            Foreground="{ThemeResource DropDownButtonForegroundSecondary}">
-                            <animatedvisuals:AnimatedChevronDownSmallVisualSource />
-                            <AnimatedIcon.FallbackIconSource>
-                                <FontIconSource
-                                    FontFamily="{ThemeResource SymbolThemeFontFamily}"
-                                    FontSize="8"
-                                    Glyph="&#xE96E;"
-                                    IsTextScaleFactorEnabled="False" />
-                            </AnimatedIcon.FallbackIconSource>
-                        </AnimatedIcon>
-                        <VisualStateManager.VisualStateGroups>
-                            <VisualStateGroup x:Name="CommonStates">
-                                <VisualState x:Name="Normal" />
-                                <VisualState x:Name="PointerOver">
-                                    <Storyboard>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="RootGrid" Storyboard.TargetProperty="Background">
-                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SubtleButtonBackgroundPointerOver}" />
-                                        </ObjectAnimationUsingKeyFrames>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="RootGrid" Storyboard.TargetProperty="BorderBrush">
-                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SubtleButtonBorderBrushPointerOver}" />
-                                        </ObjectAnimationUsingKeyFrames>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Foreground">
-                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SubtleButtonForegroundPointerOver}" />
-                                        </ObjectAnimationUsingKeyFrames>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ChevronIcon" Storyboard.TargetProperty="Foreground">
-                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource DropDownButtonForegroundSecondaryPointerOver}" />
-                                        </ObjectAnimationUsingKeyFrames>
-                                    </Storyboard>
-                                    <VisualState.Setters>
-                                        <Setter Target="ChevronIcon.(AnimatedIcon.State)" Value="PointerOver" />
-                                    </VisualState.Setters>
-                                </VisualState>
-                                <VisualState x:Name="Pressed">
-                                    <Storyboard>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="RootGrid" Storyboard.TargetProperty="Background">
-                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SubtleButtonBackgroundPressed}" />
-                                        </ObjectAnimationUsingKeyFrames>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="RootGrid" Storyboard.TargetProperty="BorderBrush">
-                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SubtleButtonBorderBrushPressed}" />
-                                        </ObjectAnimationUsingKeyFrames>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Foreground">
-                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SubtleButtonForegroundPressed}" />
-                                        </ObjectAnimationUsingKeyFrames>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ChevronIcon" Storyboard.TargetProperty="Foreground">
-                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource DropDownButtonForegroundSecondaryPressed}" />
-                                        </ObjectAnimationUsingKeyFrames>
-                                    </Storyboard>
-                                    <VisualState.Setters>
-                                        <Setter Target="ChevronIcon.(AnimatedIcon.State)" Value="Pressed" />
-                                    </VisualState.Setters>
-                                </VisualState>
-                                <VisualState x:Name="Disabled">
-                                    <Storyboard>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="RootGrid" Storyboard.TargetProperty="Background">
-                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SubtleButtonBackgroundDisabled}" />
-                                        </ObjectAnimationUsingKeyFrames>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="RootGrid" Storyboard.TargetProperty="BorderBrush">
-                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SubtleButtonBorderBrushDisabled}" />
-                                        </ObjectAnimationUsingKeyFrames>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Foreground">
-                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SubtleButtonForegroundDisabled}" />
-                                        </ObjectAnimationUsingKeyFrames>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ChevronIcon" Storyboard.TargetProperty="Foreground">
-                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SubtleButtonForegroundDisabled}" />
-                                        </ObjectAnimationUsingKeyFrames>
-                                    </Storyboard>
-                                    <VisualState.Setters>
-                                        <!--  DisabledVisual Should be handled by the control, not the animated icon.  -->
-                                        <Setter Target="ChevronIcon.(AnimatedIcon.State)" Value="Normal" />
-                                    </VisualState.Setters>
-                                </VisualState>
-                            </VisualStateGroup>
-                        </VisualStateManager.VisualStateGroups>
-                    </Grid>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-</ResourceDictionary>

src/modules/AdvancedPaste/AdvancedPaste/Assets/AdvancedPaste/Anthropic.svg

@@ -1,10 +0,0 @@
-<svg width="17" height="16" viewBox="0 0 17 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#clip0_2092_1822)">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M9.718 2.34668H12.12L16.5 13.3333H14.098L9.718 2.34668ZM4.87933 2.34668H7.39067L11.7707 13.3333H9.32133L8.426 11.026H3.84467L2.94867 13.3327H0.5L4.88 2.34801L4.87933 2.34668ZM7.634 8.98601L6.13533 5.12468L4.63667 8.98668H7.63333L7.634 8.98601Z" fill="black"/>
-</g>
-<defs>
-<clipPath id="clip0_2092_1822">
-<rect width="16" height="16" fill="white" transform="translate(0.5)"/>
-</clipPath>
-</defs>
-</svg>

src/modules/AdvancedPaste/AdvancedPaste/Assets/AdvancedPaste/Azure.svg

@@ -1,23 +0,0 @@
-<svg width="17" height="16" viewBox="0 0 17 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M6.05607 1.09062H10.3957L5.89074 14.4385C5.84444 14.5756 5.75629 14.6948 5.6387 14.7792C5.52111 14.8637 5.38 14.9091 5.23524 14.9091H1.85791C1.74822 14.9091 1.64011 14.883 1.54252 14.833C1.44493 14.7829 1.36066 14.7103 1.29669 14.6212C1.23271 14.5322 1.19087 14.4291 1.17462 14.3206C1.15837 14.2122 1.16818 14.1014 1.20324 13.9975L5.40041 1.56129C5.44669 1.42407 5.53485 1.30483 5.65248 1.22037C5.7701 1.1359 5.91126 1.09063 6.05607 1.09062Z" fill="url(#paint0_linear_2092_1811)"/>
-<path d="M12.3626 10.0435H5.48096C5.41698 10.0434 5.35447 10.0626 5.30156 10.0986C5.24864 10.1345 5.20779 10.1856 5.18432 10.2451C5.16085 10.3046 5.15584 10.3698 5.16996 10.4322C5.18408 10.4946 5.21666 10.5513 5.26346 10.595L9.68546 14.7223C9.81421 14.8424 9.98373 14.9092 10.1598 14.9091H14.0565L12.3626 10.0435Z" fill="#0078D4"/>
-<path d="M6.05617 1.0907C5.90978 1.09014 5.76704 1.1364 5.64881 1.22273C5.53058 1.30906 5.44305 1.43093 5.399 1.57054L1.2085 13.9862C1.17108 14.0905 1.15933 14.2023 1.17425 14.3121C1.18917 14.4219 1.23031 14.5265 1.2942 14.617C1.3581 14.7076 1.44285 14.7814 1.54131 14.8323C1.63976 14.8831 1.74902 14.9095 1.85983 14.9092H5.32433C5.45337 14.8861 5.57397 14.8293 5.67382 14.7443C5.77367 14.6594 5.84919 14.5495 5.89267 14.4259L6.72833 11.963L9.71333 14.7472C9.83842 14.8507 9.99534 14.9079 10.1577 14.9092H14.0398L12.3372 10.0435L7.37367 10.0447L10.4115 1.0907H6.05617Z" fill="url(#paint1_linear_2092_1811)"/>
-<path d="M11.5996 1.5607C11.5533 1.4237 11.4653 1.30466 11.3479 1.22034C11.2304 1.13603 11.0895 1.09068 10.9449 1.0907H6.1084C6.25297 1.09071 6.3939 1.13606 6.51135 1.22038C6.62879 1.30469 6.71683 1.42372 6.76307 1.5607L10.9604 13.9974C10.9955 14.1013 11.0053 14.2121 10.9891 14.3206C10.9729 14.4291 10.931 14.5322 10.867 14.6213C10.8031 14.7104 10.7188 14.7831 10.6212 14.8331C10.5236 14.8832 10.4154 14.9094 10.3057 14.9094H15.1424C15.2521 14.9093 15.3602 14.8832 15.4578 14.8331C15.5554 14.783 15.6396 14.7104 15.7036 14.6213C15.7675 14.5321 15.8094 14.4291 15.8256 14.3206C15.8418 14.2121 15.832 14.1013 15.7969 13.9974L11.5996 1.5607Z" fill="url(#paint2_linear_2092_1811)"/>
-<defs>
-<linearGradient id="paint0_linear_2092_1811" x1="7.63774" y1="2.11462" x2="3.1309" y2="15.429" gradientUnits="userSpaceOnUse">
-<stop stop-color="#114A8B"/>
-<stop offset="1" stop-color="#0669BC"/>
-</linearGradient>
-<linearGradient id="paint1_linear_2092_1811" x1="9.04567" y1="8.31954" x2="8.00317" y2="8.67204" gradientUnits="userSpaceOnUse">
-<stop stop-opacity="0.3"/>
-<stop offset="0.071" stop-opacity="0.2"/>
-<stop offset="0.321" stop-opacity="0.1"/>
-<stop offset="0.623" stop-opacity="0.05"/>
-<stop offset="1" stop-opacity="0"/>
-</linearGradient>
-<linearGradient id="paint2_linear_2092_1811" x1="8.4729" y1="1.72636" x2="13.4201" y2="14.9065" gradientUnits="userSpaceOnUse">
-<stop stop-color="#3CCBF4"/>
-<stop offset="1" stop-color="#2892DF"/>
-</linearGradient>
-</defs>
-</svg>

src/modules/AdvancedPaste/AdvancedPaste/Assets/AdvancedPaste/AzureAI.svg

@@ -1,49 +0,0 @@
-<svg width="17" height="16" viewBox="0 0 17 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#clip0_2092_1818)">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M11.3222 0C11.7976 0 12.2189 0.367333 12.3702 0.886C12.5216 1.40467 13.4069 4.61267 13.4069 4.61267V10.9873H10.1982L10.2636 0H11.3222Z" fill="url(#paint0_linear_2092_1818)"/>
-<path d="M16.0323 4.97996C16.0323 4.75329 15.849 4.57996 15.6323 4.57996H13.7423C13.1034 4.58049 12.4908 4.83459 12.039 5.28645C11.5873 5.73832 11.3334 6.35101 11.333 6.98996V10.9873H13.6237C14.2624 10.9866 14.8747 10.7325 15.3263 10.2808C15.7779 9.82909 16.0318 9.21667 16.0323 8.57796V4.97996Z" fill="url(#paint1_linear_2092_1818)"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M11.3216 1.6754e-05C11.2349 -0.00060392 11.1489 0.0160265 11.0686 0.0489413C10.9883 0.0818561 10.9154 0.130399 10.854 0.191747C10.7927 0.253096 10.7442 0.326027 10.7112 0.406302C10.6783 0.486576 10.6617 0.572592 10.6623 0.65935L10.5976 12.7914C10.5975 13.6423 10.2594 14.4583 9.65765 15.06C9.05595 15.6617 8.23992 15.9998 7.38898 16H1.56631C1.50256 16.0004 1.43966 15.9854 1.3829 15.9564C1.32613 15.9274 1.27717 15.8852 1.24012 15.8333C1.20308 15.7814 1.17903 15.7214 1.17002 15.6583C1.161 15.5952 1.16727 15.5309 1.18831 15.4707L5.85498 2.15002C6.07482 1.5228 6.48378 0.979202 7.02549 0.594138C7.56721 0.209074 8.21502 0.00149836 8.87964 1.6754e-05H11.3323H11.3216Z" fill="url(#paint2_linear_2092_1818)"/>
-</g>
-<defs>
-<linearGradient id="paint0_linear_2092_1818" x1="12.6616" y1="11.2247" x2="9.96091" y2="0.410667" gradientUnits="userSpaceOnUse">
-<stop stop-color="#712575"/>
-<stop offset="0.09" stop-color="#9A2884"/>
-<stop offset="0.18" stop-color="#BF2C92"/>
-<stop offset="0.27" stop-color="#DA2E9C"/>
-<stop offset="0.34" stop-color="#EB30A2"/>
-<stop offset="0.4" stop-color="#F131A5"/>
-<stop offset="0.5" stop-color="#EC30A3"/>
-<stop offset="0.61" stop-color="#DF2F9E"/>
-<stop offset="0.72" stop-color="#C92D96"/>
-<stop offset="0.83" stop-color="#AA2A8A"/>
-<stop offset="0.95" stop-color="#83267C"/>
-<stop offset="1" stop-color="#712575"/>
-</linearGradient>
-<linearGradient id="paint1_linear_2092_1818" x1="13.6883" y1="0.226623" x2="13.6883" y2="15.4813" gradientUnits="userSpaceOnUse">
-<stop stop-color="#DA7ED0"/>
-<stop offset="0.08" stop-color="#B17BD5"/>
-<stop offset="0.19" stop-color="#8778DB"/>
-<stop offset="0.3" stop-color="#6276E1"/>
-<stop offset="0.41" stop-color="#4574E5"/>
-<stop offset="0.54" stop-color="#2E72E8"/>
-<stop offset="0.67" stop-color="#1D71EB"/>
-<stop offset="0.81" stop-color="#1471EC"/>
-<stop offset="1" stop-color="#1171ED"/>
-</linearGradient>
-<linearGradient id="paint2_linear_2092_1818" x1="12.769" y1="0.572683" x2="2.65698" y2="16.7887" gradientUnits="userSpaceOnUse">
-<stop stop-color="#DA7ED0"/>
-<stop offset="0.05" stop-color="#B77BD4"/>
-<stop offset="0.11" stop-color="#9079DA"/>
-<stop offset="0.18" stop-color="#6E77DF"/>
-<stop offset="0.25" stop-color="#5175E3"/>
-<stop offset="0.33" stop-color="#3973E7"/>
-<stop offset="0.42" stop-color="#2772E9"/>
-<stop offset="0.54" stop-color="#1A71EB"/>
-<stop offset="0.68" stop-color="#1371EC"/>
-<stop offset="1" stop-color="#1171ED"/>
-</linearGradient>
-<clipPath id="clip0_2092_1818">
-<rect width="16" height="16" fill="white" transform="translate(0.5)"/>
-</clipPath>
-</defs>
-</svg>

src/modules/AdvancedPaste/AdvancedPaste/Assets/AdvancedPaste/FoundryLocal.svg

@@ -1,59 +0,0 @@
-<svg width="17" height="16" viewBox="0 0 17 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#clip0_2092_1741)">
-<mask id="mask0_2092_1741" style="mask-type:luminance" maskUnits="userSpaceOnUse" x="0" y="0" width="17" height="16">
-<path d="M16.5 0H0.5V16H16.5V0Z" fill="white"/>
-</mask>
-<g mask="url(#mask0_2092_1741)">
-<mask id="mask1_2092_1741" style="mask-type:luminance" maskUnits="userSpaceOnUse" x="-1" y="-2" width="19" height="20">
-<path d="M17.8337 -1.33337H-0.833008V17.3333H17.8337V-1.33337Z" fill="white"/>
-</mask>
-<g mask="url(#mask1_2092_1741)">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M11.1137 0.315668C11.57 0.315668 11.9744 0.657891 12.1196 1.15567C12.2648 1.65345 13.1152 4.73345 13.1152 4.73345V10.852H10.0352L10.0974 0.305298H11.1137V0.315668Z" fill="url(#paint0_linear_2092_1741)"/>
-<path d="M15.6352 5.09586C15.6352 4.87808 15.4589 4.71216 15.2515 4.71216H13.4366C12.1611 4.71216 11.124 5.7492 11.124 7.02472V10.8618H13.3226C14.5982 10.8618 15.6352 9.82472 15.6352 8.54919V5.09586Z" fill="url(#paint1_linear_2092_1741)"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M11.1133 0.315674C10.7607 0.315674 10.4807 0.595674 10.4807 0.948265L10.4185 12.5942C10.4185 14.2949 9.0392 15.6742 7.33847 15.6742H1.74885C1.47921 15.6742 1.30292 15.4149 1.38589 15.1661L5.86589 2.37938C6.30144 1.14531 7.46293 0.315674 8.7696 0.315674H11.1237H11.1133Z" fill="url(#paint2_linear_2092_1741)"/>
-</g>
-</g>
-</g>
-<defs>
-<linearGradient id="paint0_linear_2092_1741" x1="12.3996" y1="11.0801" x2="9.80702" y2="0.699373" gradientUnits="userSpaceOnUse">
-<stop stop-color="#712575"/>
-<stop offset="0.09" stop-color="#9A2884"/>
-<stop offset="0.18" stop-color="#BF2C92"/>
-<stop offset="0.27" stop-color="#DA2E9C"/>
-<stop offset="0.34" stop-color="#EB30A2"/>
-<stop offset="0.4" stop-color="#F131A5"/>
-<stop offset="0.5" stop-color="#EC30A3"/>
-<stop offset="0.61" stop-color="#DF2F9E"/>
-<stop offset="0.72" stop-color="#C92D96"/>
-<stop offset="0.83" stop-color="#AA2A8A"/>
-<stop offset="0.95" stop-color="#83267C"/>
-<stop offset="1" stop-color="#712575"/>
-</linearGradient>
-<linearGradient id="paint1_linear_2092_1741" x1="13.3848" y1="0.532897" x2="13.3848" y2="15.1759" gradientUnits="userSpaceOnUse">
-<stop stop-color="#DA7ED0"/>
-<stop offset="0.08" stop-color="#B17BD5"/>
-<stop offset="0.19" stop-color="#8778DB"/>
-<stop offset="0.3" stop-color="#6276E1"/>
-<stop offset="0.41" stop-color="#4574E5"/>
-<stop offset="0.54" stop-color="#2E72E8"/>
-<stop offset="0.67" stop-color="#1D71EB"/>
-<stop offset="0.81" stop-color="#1471EC"/>
-<stop offset="1" stop-color="#1171ED"/>
-</linearGradient>
-<linearGradient id="paint2_linear_2092_1741" x1="12.5029" y1="0.865306" x2="2.79625" y2="16.4313" gradientUnits="userSpaceOnUse">
-<stop stop-color="#DA7ED0"/>
-<stop offset="0.05" stop-color="#B77BD4"/>
-<stop offset="0.11" stop-color="#9079DA"/>
-<stop offset="0.18" stop-color="#6E77DF"/>
-<stop offset="0.25" stop-color="#5175E3"/>
-<stop offset="0.33" stop-color="#3973E7"/>
-<stop offset="0.42" stop-color="#2772E9"/>
-<stop offset="0.54" stop-color="#1A71EB"/>
-<stop offset="0.68" stop-color="#1371EC"/>
-<stop offset="1" stop-color="#1171ED"/>
-</linearGradient>
-<clipPath id="clip0_2092_1741">
-<rect width="16" height="16" fill="white" transform="translate(0.5)"/>
-</clipPath>
-</defs>
-</svg>

src/modules/AdvancedPaste/AdvancedPaste/Assets/AdvancedPaste/Gemini.svg

@@ -1,20 +0,0 @@
-<svg width="17" height="16" viewBox="0 0 17 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M14.2445 7.22331C13.137 6.75184 12.13 6.07273 11.2778 5.22264C10.0911 4.03353 9.2444 2.54831 8.8258 0.921308C8.80744 0.849046 8.76551 0.784967 8.70665 0.739197C8.6478 0.693428 8.57536 0.668579 8.5008 0.668579C8.42624 0.668579 8.35381 0.693428 8.29495 0.739197C8.2361 0.784967 8.19417 0.849046 8.1758 0.921308C7.75632 2.5481 6.90952 4.03315 5.72314 5.22264C4.87089 6.07263 3.8639 6.75172 2.75647 7.22331C2.32314 7.40998 1.8778 7.55998 1.4218 7.67531C1.3491 7.69317 1.28448 7.7349 1.23829 7.79382C1.1921 7.85274 1.16699 7.92544 1.16699 8.00031C1.16699 8.07518 1.1921 8.14788 1.23829 8.2068C1.28448 8.26572 1.3491 8.30744 1.4218 8.32531C1.8778 8.43998 2.3218 8.58998 2.75647 8.77664C3.86397 9.24811 4.87098 9.92722 5.72314 10.7773C6.9102 11.9666 7.75709 13.452 8.1758 15.0793C8.19367 15.152 8.2354 15.2166 8.29431 15.2628C8.35323 15.309 8.42594 15.3341 8.5008 15.3341C8.57567 15.3341 8.64838 15.309 8.7073 15.2628C8.76621 15.2166 8.80794 15.152 8.8258 15.0793C8.94047 14.6226 9.09047 14.1786 9.27714 13.744C9.74858 12.6365 10.4277 11.6294 11.2778 10.7773C12.4671 9.59052 13.9526 8.74386 15.5798 8.32531C15.6521 8.30694 15.7161 8.26502 15.7619 8.20616C15.8077 8.1473 15.8325 8.07487 15.8325 8.00031C15.8325 7.92575 15.8077 7.85332 15.7619 7.79446C15.7161 7.7356 15.6521 7.69367 15.5798 7.67531C15.1234 7.56047 14.6768 7.40932 14.2445 7.22331Z" fill="#3186FF"/>
-<path d="M14.2445 7.22331C13.137 6.75184 12.13 6.07273 11.2778 5.22264C10.0911 4.03353 9.2444 2.54831 8.8258 0.921308C8.80744 0.849046 8.76551 0.784967 8.70665 0.739197C8.6478 0.693428 8.57536 0.668579 8.5008 0.668579C8.42624 0.668579 8.35381 0.693428 8.29495 0.739197C8.2361 0.784967 8.19417 0.849046 8.1758 0.921308C7.75632 2.5481 6.90952 4.03315 5.72314 5.22264C4.87089 6.07263 3.8639 6.75172 2.75647 7.22331C2.32314 7.40998 1.8778 7.55998 1.4218 7.67531C1.3491 7.69317 1.28448 7.7349 1.23829 7.79382C1.1921 7.85274 1.16699 7.92544 1.16699 8.00031C1.16699 8.07518 1.1921 8.14788 1.23829 8.2068C1.28448 8.26572 1.3491 8.30744 1.4218 8.32531C1.8778 8.43998 2.3218 8.58998 2.75647 8.77664C3.86397 9.24811 4.87098 9.92722 5.72314 10.7773C6.9102 11.9666 7.75709 13.452 8.1758 15.0793C8.19367 15.152 8.2354 15.2166 8.29431 15.2628C8.35323 15.309 8.42594 15.3341 8.5008 15.3341C8.57567 15.3341 8.64838 15.309 8.7073 15.2628C8.76621 15.2166 8.80794 15.152 8.8258 15.0793C8.94047 14.6226 9.09047 14.1786 9.27714 13.744C9.74858 12.6365 10.4277 11.6294 11.2778 10.7773C12.4671 9.59052 13.9526 8.74386 15.5798 8.32531C15.6521 8.30694 15.7161 8.26502 15.7619 8.20616C15.8077 8.1473 15.8325 8.07487 15.8325 8.00031C15.8325 7.92575 15.8077 7.85332 15.7619 7.79446C15.7161 7.7356 15.6521 7.69367 15.5798 7.67531C15.1234 7.56047 14.6768 7.40932 14.2445 7.22331Z" fill="url(#paint0_linear_2092_1806)"/>
-<path d="M14.2445 7.22331C13.137 6.75184 12.13 6.07273 11.2778 5.22264C10.0911 4.03353 9.2444 2.54831 8.8258 0.921308C8.80744 0.849046 8.76551 0.784967 8.70665 0.739197C8.6478 0.693428 8.57536 0.668579 8.5008 0.668579C8.42624 0.668579 8.35381 0.693428 8.29495 0.739197C8.2361 0.784967 8.19417 0.849046 8.1758 0.921308C7.75632 2.5481 6.90952 4.03315 5.72314 5.22264C4.87089 6.07263 3.8639 6.75172 2.75647 7.22331C2.32314 7.40998 1.8778 7.55998 1.4218 7.67531C1.3491 7.69317 1.28448 7.7349 1.23829 7.79382C1.1921 7.85274 1.16699 7.92544 1.16699 8.00031C1.16699 8.07518 1.1921 8.14788 1.23829 8.2068C1.28448 8.26572 1.3491 8.30744 1.4218 8.32531C1.8778 8.43998 2.3218 8.58998 2.75647 8.77664C3.86397 9.24811 4.87098 9.92722 5.72314 10.7773C6.9102 11.9666 7.75709 13.452 8.1758 15.0793C8.19367 15.152 8.2354 15.2166 8.29431 15.2628C8.35323 15.309 8.42594 15.3341 8.5008 15.3341C8.57567 15.3341 8.64838 15.309 8.7073 15.2628C8.76621 15.2166 8.80794 15.152 8.8258 15.0793C8.94047 14.6226 9.09047 14.1786 9.27714 13.744C9.74858 12.6365 10.4277 11.6294 11.2778 10.7773C12.4671 9.59052 13.9526 8.74386 15.5798 8.32531C15.6521 8.30694 15.7161 8.26502 15.7619 8.20616C15.8077 8.1473 15.8325 8.07487 15.8325 8.00031C15.8325 7.92575 15.8077 7.85332 15.7619 7.79446C15.7161 7.7356 15.6521 7.69367 15.5798 7.67531C15.1234 7.56047 14.6768 7.40932 14.2445 7.22331Z" fill="url(#paint1_linear_2092_1806)"/>
-<path d="M14.2445 7.22331C13.137 6.75184 12.13 6.07273 11.2778 5.22264C10.0911 4.03353 9.2444 2.54831 8.8258 0.921308C8.80744 0.849046 8.76551 0.784967 8.70665 0.739197C8.6478 0.693428 8.57536 0.668579 8.5008 0.668579C8.42624 0.668579 8.35381 0.693428 8.29495 0.739197C8.2361 0.784967 8.19417 0.849046 8.1758 0.921308C7.75632 2.5481 6.90952 4.03315 5.72314 5.22264C4.87089 6.07263 3.8639 6.75172 2.75647 7.22331C2.32314 7.40998 1.8778 7.55998 1.4218 7.67531C1.3491 7.69317 1.28448 7.7349 1.23829 7.79382C1.1921 7.85274 1.16699 7.92544 1.16699 8.00031C1.16699 8.07518 1.1921 8.14788 1.23829 8.2068C1.28448 8.26572 1.3491 8.30744 1.4218 8.32531C1.8778 8.43998 2.3218 8.58998 2.75647 8.77664C3.86397 9.24811 4.87098 9.92722 5.72314 10.7773C6.9102 11.9666 7.75709 13.452 8.1758 15.0793C8.19367 15.152 8.2354 15.2166 8.29431 15.2628C8.35323 15.309 8.42594 15.3341 8.5008 15.3341C8.57567 15.3341 8.64838 15.309 8.7073 15.2628C8.76621 15.2166 8.80794 15.152 8.8258 15.0793C8.94047 14.6226 9.09047 14.1786 9.27714 13.744C9.74858 12.6365 10.4277 11.6294 11.2778 10.7773C12.4671 9.59052 13.9526 8.74386 15.5798 8.32531C15.6521 8.30694 15.7161 8.26502 15.7619 8.20616C15.8077 8.1473 15.8325 8.07487 15.8325 8.00031C15.8325 7.92575 15.8077 7.85332 15.7619 7.79446C15.7161 7.7356 15.6521 7.69367 15.5798 7.67531C15.1234 7.56047 14.6768 7.40932 14.2445 7.22331Z" fill="url(#paint2_linear_2092_1806)"/>
-<defs>
-<linearGradient id="paint0_linear_2092_1806" x1="5.16714" y1="10.3333" x2="7.8338" y2="7.99997" gradientUnits="userSpaceOnUse">
-<stop stop-color="#08B962"/>
-<stop offset="1" stop-color="#08B962" stop-opacity="0"/>
-</linearGradient>
-<linearGradient id="paint1_linear_2092_1806" x1="5.8338" y1="3.66664" x2="8.16714" y2="7.33331" gradientUnits="userSpaceOnUse">
-<stop stop-color="#F94543"/>
-<stop offset="1" stop-color="#F94543" stop-opacity="0"/>
-</linearGradient>
-<linearGradient id="paint2_linear_2092_1806" x1="2.8338" y1="8.99998" x2="12.1671" y2="7.99998" gradientUnits="userSpaceOnUse">
-<stop stop-color="#FABC12"/>
-<stop offset="0.46" stop-color="#FABC12" stop-opacity="0"/>
-</linearGradient>
-</defs>
-</svg>

src/modules/AdvancedPaste/AdvancedPaste/Assets/AdvancedPaste/Mistral.svg

@@ -1,24 +0,0 @@
-<svg width="17" height="16" viewBox="0 0 17 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#clip0_2092_1755)">
-<mask id="mask0_2092_1755" style="mask-type:luminance" maskUnits="userSpaceOnUse" x="0" y="0" width="17" height="16">
-<path d="M16.428 0H0.5V16H16.428V0Z" fill="white"/>
-</mask>
-<g mask="url(#mask0_2092_1755)">
-<path d="M5.05035 0H2.77441V3.21057H5.05035V0Z" fill="#FFD800"/>
-<path d="M14.1529 0H11.877V3.21057H14.1529V0Z" fill="#FFD800"/>
-<path d="M7.32555 3.21082H2.77441V6.42139H7.32555V3.21082Z" fill="#FFAF00"/>
-<path d="M14.1537 3.21082H9.60254V6.42139H14.1537V3.21082Z" fill="#FFAF00"/>
-<path d="M14.1519 6.41992H2.77441V9.63049H14.1519V6.41992Z" fill="#FF8205"/>
-<path d="M5.05035 9.63074H2.77441V12.8414H5.05035V9.63074Z" fill="#FA500F"/>
-<path d="M9.60213 9.63074H7.32617V12.8414H9.60213V9.63074Z" fill="#FA500F"/>
-<path d="M14.1529 9.63074H11.877V12.8414H14.1529V9.63074Z" fill="#FA500F"/>
-<path d="M7.32633 12.8402H0.5V16.0509H7.32633V12.8402Z" fill="#E10500"/>
-<path d="M16.4296 12.8402H9.60254V16.0509H16.4296V12.8402Z" fill="#E10500"/>
-</g>
-</g>
-<defs>
-<clipPath id="clip0_2092_1755">
-<rect width="16" height="16" fill="white" transform="translate(0.5)"/>
-</clipPath>
-</defs>
-</svg>

src/modules/AdvancedPaste/AdvancedPaste/Assets/AdvancedPaste/Onnx.svg

@@ -1,18 +0,0 @@
-<svg width="17" height="16" viewBox="0 0 17 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#clip0_2092_1790)">
-<path d="M15.85 7.50005H15.75L13.08 2.54505C13.1287 2.45432 13.1544 2.35303 13.155 2.25005C13.155 2.16427 13.138 2.07933 13.105 2.00014C13.072 1.92095 13.0237 1.84907 12.9628 1.78865C12.9019 1.72823 12.8297 1.68045 12.7502 1.64808C12.6708 1.61571 12.5857 1.59939 12.5 1.60005C12.4129 1.59972 12.3267 1.6173 12.2467 1.65171C12.1667 1.68612 12.0946 1.73661 12.035 1.80005L6.71496 0.740047C6.70184 0.64745 6.66874 0.558814 6.61795 0.480283C6.56716 0.401752 6.4999 0.335204 6.42084 0.285253C6.34177 0.235302 6.25279 0.203143 6.16006 0.191003C6.06733 0.178864 5.97307 0.187036 5.88381 0.214952C5.79455 0.242869 5.71243 0.289862 5.64314 0.352674C5.57385 0.415486 5.51905 0.492615 5.48253 0.578715C5.44602 0.664814 5.42867 0.757825 5.43167 0.851299C5.43468 0.944773 5.45798 1.03647 5.49996 1.12005L1.34996 7.06505C1.29477 7.04867 1.23753 7.04025 1.17996 7.04005C1.01805 7.05429 0.867358 7.12867 0.757581 7.24853C0.647805 7.36838 0.586914 7.52502 0.586914 7.68755C0.586914 7.85008 0.647805 8.00671 0.757581 8.12657C0.867358 8.24643 1.01805 8.32081 1.17996 8.33505L3.42996 13.87C3.39194 13.9551 3.37153 14.0469 3.36996 14.14C3.37128 14.3116 3.44034 14.4756 3.5621 14.5964C3.68386 14.7173 3.84843 14.7851 4.01996 14.785C4.10788 14.7861 4.19505 14.7688 4.27596 14.7344C4.35686 14.7 4.42973 14.6491 4.48996 14.585L11.21 15.24C11.2312 15.4111 11.3195 15.5667 11.4554 15.6727C11.5914 15.7787 11.7639 15.8263 11.935 15.805C12.106 15.7838 12.2617 15.6955 12.3676 15.5596C12.4736 15.4236 12.5212 15.2511 12.5 15.08C12.498 14.9264 12.4433 14.7781 12.345 14.66L15.73 8.76005H15.84C15.9253 8.76137 16.0101 8.74587 16.0895 8.71442C16.1688 8.68297 16.2412 8.63619 16.3025 8.57676C16.3638 8.51733 16.4128 8.44641 16.4467 8.36804C16.4805 8.28968 16.4987 8.20541 16.5 8.12005C16.4947 7.95205 16.4236 7.79286 16.302 7.67686C16.1804 7.56085 16.018 7.49734 15.85 7.50005ZM12 2.64505C12.0769 2.74772 12.1833 2.82448 12.305 2.86505L11.305 10.55C11.2418 10.5642 11.1811 10.5878 11.125 10.62L5.49996 5.76005C5.51878 5.70543 5.52726 5.64778 5.52496 5.59005C5.52496 5.55005 5.52496 5.50505 5.52496 5.46505L12 2.64505ZM15.235 8.30505L11.79 10.66C11.763 10.6412 11.7345 10.6245 11.705 10.61L12.725 2.84505L15.355 7.69505C15.2499 7.81343 15.1928 7.96678 15.195 8.12505L15.235 8.30505ZM4.78496 4.95005C4.63217 4.97297 4.49283 5.0504 4.39266 5.16803C4.29249 5.28566 4.23825 5.43555 4.23996 5.59005V5.63505L1.92996 7.00005L5.49996 1.87005L4.78496 4.95005ZM4.99996 6.22505C5.08363 6.20348 5.16307 6.16798 5.23496 6.12005L10.79 10.955C10.7638 11.0306 10.7502 11.11 10.75 11.19V11.225L4.54996 13.775C4.46194 13.6393 4.32644 13.5412 4.16996 13.5L4.99996 6.22505ZM10.935 11.62C11.0198 11.7179 11.1337 11.7862 11.26 11.815L11.565 14.5C11.4362 14.5671 11.3327 14.6741 11.27 14.805L4.76996 14.165L10.935 11.62ZM11.7 11.765C11.8068 11.7099 11.8967 11.6269 11.9601 11.5248C12.0235 11.4226 12.058 11.3052 12.06 11.185C12.0622 11.1306 12.0537 11.0762 12.035 11.025L15.185 8.86005L12 14.4L11.7 11.765ZM11.86 2.22505L5.28996 5.08505L5.21496 5.03505L6.04996 1.45505H6.07496C6.18268 1.45615 6.28889 1.42961 6.38342 1.37796C6.47796 1.32631 6.55768 1.25129 6.61496 1.16005L11.86 2.20505V2.22505ZM1.82996 7.69005C1.82996 7.64505 1.82996 7.60505 1.82996 7.57005L4.42496 6.04005C4.47735 6.09439 4.53812 6.13997 4.60496 6.17505L3.74996 13.43L1.60996 8.17005C1.67867 8.11029 1.73383 8.03657 1.77177 7.95379C1.80971 7.87102 1.82955 7.7811 1.82996 7.69005Z" fill="#333333"/>
-<path d="M12.7446 2.84497L15.3696 7.69497C15.2665 7.81456 15.2098 7.96712 15.2096 8.12497C15.2023 8.18475 15.2023 8.24519 15.2096 8.30497L11.7696 10.66L11.6846 10.61L12.6846 2.84497H12.7446Z" fill="#DEDEDD"/>
-<path d="M11.7002 11.765C11.807 11.7099 11.8969 11.6268 11.9603 11.5247C12.0237 11.4226 12.0582 11.3052 12.0602 11.185C12.0625 11.1305 12.054 11.0762 12.0352 11.025L15.1852 8.85999L12.0002 14.4L11.7002 11.765Z" fill="#B2B2B2"/>
-<path d="M10.9345 11.62C11.0194 11.7179 11.1332 11.7862 11.2595 11.815L11.5645 14.5C11.4358 14.567 11.3322 14.6741 11.2695 14.805L4.76953 14.165L10.9345 11.62Z" fill="#D1D1D1"/>
-<path d="M4.99992 6.225C5.08359 6.20343 5.16303 6.16793 5.23492 6.12L10.7899 10.955C10.7637 11.0306 10.7502 11.11 10.7499 11.19V11.225L4.54992 13.775C4.4619 13.6392 4.3264 13.5412 4.16992 13.5L4.99992 6.225Z" fill="#F2F2F2"/>
-<path d="M1.83035 7.69004C1.83035 7.64504 1.83035 7.60504 1.83035 7.57004L4.42535 6.04004C4.47774 6.09439 4.53851 6.13997 4.60535 6.17504L3.75035 13.43L1.61035 8.17004C1.67906 8.11029 1.73422 8.03656 1.77216 7.95378C1.8101 7.87101 1.82994 7.78109 1.83035 7.69004Z" fill="#D8D8D7"/>
-<path d="M4.78469 4.95C4.6319 4.97292 4.49255 5.05034 4.39238 5.16797C4.29221 5.28561 4.23798 5.4355 4.23969 5.59V5.635L1.92969 7L5.49969 1.87L4.78469 4.95Z" fill="#B2B2B2"/>
-<path d="M11.8598 2.22503L5.28984 5.08503L5.21484 5.03503L6.04984 1.45503H6.07484C6.18256 1.45613 6.28877 1.42959 6.38331 1.37795C6.47785 1.3263 6.55757 1.25127 6.61484 1.16003L11.8598 2.20503V2.22503Z" fill="#D1D1D1"/>
-<path d="M12 2.64502C12.0769 2.74769 12.1833 2.82445 12.305 2.86502L11.305 10.55C11.2418 10.5642 11.1811 10.5878 11.125 10.62L5.5 5.76002C5.51882 5.7054 5.5273 5.64775 5.525 5.59002C5.525 5.55002 5.525 5.50502 5.525 5.46502L12 2.64502Z" fill="white"/>
-</g>
-<defs>
-<clipPath id="clip0_2092_1790">
-<rect width="16" height="16" fill="white" transform="translate(0.5)"/>
-</clipPath>
-</defs>
-</svg>

src/modules/AdvancedPaste/AdvancedPaste/Assets/AdvancedPaste/OpenAI.dark.svg

@@ -1,15 +0,0 @@
-<svg width="17" height="16" viewBox="0 0 17 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#clip0_2092_1800)">
-<mask id="mask0_2092_1800" style="mask-type:luminance" maskUnits="userSpaceOnUse" x="0" y="0" width="17" height="16">
-<path d="M16.5 0H0.5V16H16.5V0Z" fill="white"/>
-</mask>
-<g mask="url(#mask0_2092_1800)">
-<path d="M6.63673 5.772V4.26557C6.63673 4.13867 6.68433 4.0435 6.79527 3.98013L9.8241 2.23585C10.2364 1.998 10.728 1.88706 11.2353 1.88706C13.1382 1.88706 14.3434 3.3618 14.3434 4.9316C14.3434 5.0426 14.3434 5.16947 14.3275 5.29633L11.1877 3.45687C10.9975 3.3459 10.8071 3.3459 10.6169 3.45687L6.63673 5.772ZM13.709 11.6392V8.03953C13.709 7.8175 13.6138 7.65893 13.4236 7.54793L9.44343 5.2328L10.7437 4.48747C10.8547 4.42413 10.9499 4.42413 11.0609 4.48747L14.0897 6.23177C14.9619 6.73927 15.5485 7.8175 15.5485 8.864C15.5485 10.0691 14.835 11.1793 13.709 11.6392ZM5.70117 8.46777L4.40087 7.70667C4.28993 7.64333 4.2423 7.5481 4.2423 7.42123V3.9327C4.2423 2.23602 5.5426 0.951497 7.30277 0.951497C7.96887 0.951497 8.58717 1.17355 9.1106 1.56996L5.98673 3.37773C5.7965 3.4887 5.7013 3.64723 5.7013 3.86933L5.70117 8.46777ZM8.5 10.0852L6.63673 9.03863V6.8187L8.5 5.77217L10.3631 6.8187V9.03863L8.5 10.0852ZM9.6972 14.9058C9.03113 14.9058 8.41283 14.6838 7.8894 14.2874L11.0132 12.4796C11.2035 12.3686 11.2987 12.2101 11.2987 11.988V7.3894L12.6149 8.15053C12.7258 8.21387 12.7735 8.30907 12.7735 8.43597V11.9245C12.7735 13.6212 11.4572 14.9058 9.6972 14.9058ZM5.939 11.3697L2.91018 9.62543C2.03797 9.1179 1.45133 8.0397 1.45133 6.99317C1.45133 5.77217 2.18077 4.67803 3.30657 4.21813V7.83357C3.30657 8.0556 3.40178 8.21417 3.592 8.32513L7.5564 10.6244L6.2561 11.3697C6.14517 11.433 6.04993 11.433 5.939 11.3697ZM5.76467 13.9703C3.9728 13.9703 2.6566 12.6224 2.6566 10.9574C2.6566 10.8305 2.6725 10.7036 2.68826 10.5768L5.81213 12.3845C6.00237 12.4955 6.19273 12.4955 6.38297 12.3845L10.3631 10.0853V11.5918C10.3631 11.7186 10.3155 11.8138 10.2046 11.8772L7.17577 13.6215C6.76347 13.8593 6.27203 13.9703 5.76467 13.9703ZM9.6972 15.8572C11.6159 15.8572 13.2174 14.4935 13.5823 12.6857C15.3583 12.2258 16.5 10.5608 16.5 8.86417C16.5 7.7541 16.0243 6.6759 15.168 5.89887C15.2473 5.56583 15.2949 5.2328 15.2949 4.89993C15.2949 2.6324 13.4554 0.935567 11.3305 0.935567C10.9025 0.935567 10.4902 0.99892 10.0778 1.14172C9.36417 0.443973 8.381 0 7.30277 0C5.38407 0 3.78256 1.36364 3.41771 3.17142C1.64172 3.63133 0.5 5.29633 0.5 6.993C0.5 8.10307 0.975663 9.18127 1.83198 9.9583C1.7527 10.2913 1.70511 10.6244 1.70511 10.9572C1.70511 13.2248 3.54458 14.9216 5.66947 14.9216C6.09753 14.9216 6.50983 14.8582 6.92217 14.7154C7.63567 15.4132 8.61883 15.8572 9.6972 15.8572Z" fill="white"/>
-</g>
-</g>
-<defs>
-<clipPath id="clip0_2092_1800">
-<rect width="16" height="16" fill="white" transform="translate(0.5)"/>
-</clipPath>
-</defs>
-</svg>

src/modules/AdvancedPaste/AdvancedPaste/Assets/AdvancedPaste/OpenAI.light.svg

@@ -1,10 +0,0 @@
-<svg width="17" height="16" viewBox="0 0 17 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#clip0_2092_1732)">
-<path d="M6.63673 5.772V4.26557C6.63673 4.13867 6.68433 4.0435 6.79527 3.98013L9.8241 2.23585C10.2364 1.998 10.728 1.88706 11.2353 1.88706C13.1382 1.88706 14.3434 3.3618 14.3434 4.9316C14.3434 5.0426 14.3434 5.16947 14.3275 5.29633L11.1877 3.45687C10.9975 3.3459 10.8071 3.3459 10.6169 3.45687L6.63673 5.772ZM13.709 11.6392V8.03953C13.709 7.8175 13.6138 7.65893 13.4236 7.54793L9.44343 5.2328L10.7437 4.48747C10.8547 4.42413 10.9499 4.42413 11.0609 4.48747L14.0897 6.23177C14.9619 6.73927 15.5485 7.8175 15.5485 8.864C15.5485 10.0691 14.835 11.1793 13.709 11.6392ZM5.70117 8.46777L4.40087 7.70667C4.28993 7.64333 4.2423 7.5481 4.2423 7.42123V3.9327C4.2423 2.23602 5.5426 0.951497 7.30277 0.951497C7.96887 0.951497 8.58717 1.17355 9.1106 1.56996L5.98673 3.37773C5.7965 3.4887 5.7013 3.64723 5.7013 3.86933L5.70117 8.46777ZM8.5 10.0852L6.63673 9.03863V6.8187L8.5 5.77217L10.3631 6.8187V9.03863L8.5 10.0852ZM9.6972 14.9058C9.03113 14.9058 8.41283 14.6838 7.8894 14.2874L11.0132 12.4796C11.2035 12.3686 11.2987 12.2101 11.2987 11.988V7.3894L12.6149 8.15053C12.7258 8.21387 12.7735 8.30907 12.7735 8.43597V11.9245C12.7735 13.6212 11.4572 14.9058 9.6972 14.9058ZM5.939 11.3697L2.91018 9.62543C2.03797 9.1179 1.45133 8.0397 1.45133 6.99317C1.45133 5.77217 2.18077 4.67803 3.30657 4.21813V7.83357C3.30657 8.0556 3.40178 8.21417 3.592 8.32513L7.5564 10.6244L6.2561 11.3697C6.14517 11.433 6.04993 11.433 5.939 11.3697ZM5.76467 13.9703C3.9728 13.9703 2.6566 12.6224 2.6566 10.9574C2.6566 10.8305 2.6725 10.7036 2.68826 10.5768L5.81213 12.3845C6.00237 12.4955 6.19273 12.4955 6.38297 12.3845L10.3631 10.0853V11.5918C10.3631 11.7186 10.3155 11.8138 10.2046 11.8772L7.17577 13.6215C6.76347 13.8593 6.27203 13.9703 5.76467 13.9703ZM9.6972 15.8572C11.6159 15.8572 13.2174 14.4935 13.5823 12.6857C15.3583 12.2258 16.5 10.5608 16.5 8.86417C16.5 7.7541 16.0243 6.6759 15.168 5.89887C15.2473 5.56583 15.2949 5.2328 15.2949 4.89993C15.2949 2.6324 13.4554 0.935567 11.3305 0.935567C10.9025 0.935567 10.4902 0.99892 10.0778 1.14172C9.36417 0.443973 8.381 0 7.30277 0C5.38407 0 3.78256 1.36364 3.41771 3.17142C1.64172 3.63133 0.5 5.29633 0.5 6.993C0.5 8.10307 0.975663 9.18127 1.83198 9.9583C1.7527 10.2913 1.70511 10.6244 1.70511 10.9572C1.70511 13.2248 3.54458 14.9216 5.66947 14.9216C6.09753 14.9216 6.50983 14.8582 6.92217 14.7154C7.63567 15.4132 8.61883 15.8572 9.6972 15.8572Z" fill="black"/>
-</g>
-<defs>
-<clipPath id="clip0_2092_1732">
-<rect width="16" height="16" fill="white" transform="translate(0.5)"/>
-</clipPath>
-</defs>
-</svg>

src/modules/AdvancedPaste/AdvancedPaste/Assets/AdvancedPaste/WindowsML.svg

@@ -1,74 +0,0 @@
-<svg width="17" height="16" viewBox="0 0 17 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#clip0_2092_1770)">
-<mask id="mask0_2092_1770" style="mask-type:luminance" maskUnits="userSpaceOnUse" x="0" y="0" width="17" height="16">
-<path d="M16.5 0H0.5V16H16.5V0Z" fill="white"/>
-</mask>
-<g mask="url(#mask0_2092_1770)">
-<mask id="mask1_2092_1770" style="mask-type:luminance" maskUnits="userSpaceOnUse" x="0" y="0" width="17" height="16">
-<path d="M16.5 0H0.5V16H16.5V0Z" fill="white"/>
-</mask>
-<g mask="url(#mask1_2092_1770)">
-<path d="M16.131 10.9838L9.24712 15.124C9.02152 15.2597 8.76328 15.3313 8.5 15.3313C8.23675 15.3313 7.97846 15.2597 7.75286 15.124L0.869003 10.9838C0.640038 10.8461 0.5 10.5985 0.5 10.3313C0.5 10.0641 0.640038 9.81645 0.869003 9.67877L7.75286 5.53867C7.97846 5.40299 8.23675 5.3313 8.5 5.3313C8.76328 5.3313 9.02152 5.40299 9.24712 5.53867L16.131 9.67877C16.36 9.81645 16.5 10.0641 16.5 10.3313C16.5 10.5985 16.36 10.8461 16.131 10.9838Z" fill="url(#paint0_linear_2092_1770)"/>
-<path d="M16.131 8.65256L9.24712 12.7926C9.02152 12.9283 8.76328 13 8.5 13C8.23675 13 7.97846 12.9283 7.75286 12.7926L0.869003 8.65256C0.640038 8.5148 0.5 8.2672 0.5 8C0.5 7.73282 0.640038 7.48518 0.869003 7.34746L7.75286 3.20737C7.97846 3.07168 8.23675 3 8.5 3C8.76328 3 9.02152 3.07168 9.24712 3.20737L16.131 7.34746C16.36 7.48518 16.5 7.73282 16.5 8C16.5 8.2672 16.36 8.5148 16.131 8.65256Z" fill="url(#paint1_linear_2092_1770)"/>
-<path d="M16.131 6.31818L9.24712 10.4583C9.02152 10.5939 8.76328 10.6656 8.5 10.6656C8.23675 10.6656 7.97846 10.5939 7.75286 10.4583L0.869003 6.31818C0.640038 6.18046 0.5 5.93283 0.5 5.66565C0.5 5.39846 0.640038 5.15083 0.869003 5.01311L7.75286 0.873017C7.97846 0.737337 8.23675 0.665649 8.5 0.665649C8.76328 0.665649 9.02152 0.737337 9.24712 0.873017L16.131 5.01311C16.36 5.15083 16.5 5.39846 16.5 5.66565C16.5 5.93283 16.36 6.18046 16.131 6.31818Z" fill="url(#paint2_linear_2092_1770)"/>
-<path d="M11.8334 7.55765C11.8334 8.29403 11.2364 8.89099 10.5 8.89099H5.83334C5.09695 8.89099 4.5 8.29403 4.5 7.55765V2.66565H11.8334V7.55765Z" fill="url(#paint3_radial_2092_1770)" fill-opacity="0.4"/>
-<path d="M11.8334 7.55765C11.8334 8.29403 11.2364 8.89099 10.5 8.89099H5.83334C5.09695 8.89099 4.5 8.29403 4.5 7.55765V2.66565H11.8334V7.55765Z" fill="url(#paint4_radial_2092_1770)" fill-opacity="0.4"/>
-<path d="M11.8334 7.55765C11.8334 8.29403 11.2364 8.89099 10.5 8.89099H5.83334C5.09695 8.89099 4.5 8.29403 4.5 7.55765V2.66565H11.8334V7.55765Z" fill="url(#paint5_radial_2092_1770)" fill-opacity="0.4"/>
-<path d="M11.8334 7.55765C11.8334 8.29403 11.2364 8.89099 10.5 8.89099H5.83334C5.09695 8.89099 4.5 8.29403 4.5 7.55765V2.66565H11.8334V7.55765Z" fill="url(#paint6_radial_2092_1770)" fill-opacity="0.4"/>
-<path d="M11.8334 7.55765C11.8334 8.29403 11.2364 8.89099 10.5 8.89099H5.83334C5.09695 8.89099 4.5 8.29403 4.5 7.55765V2.66565H11.8334V7.55765Z" fill="url(#paint7_radial_2092_1770)" fill-opacity="0.4"/>
-<path d="M11.8334 7.55765C11.8334 8.29403 11.2364 8.89099 10.5 8.89099H5.83334C5.09695 8.89099 4.5 8.29403 4.5 7.55765V2.66565H11.8334V7.55765Z" fill="url(#paint8_radial_2092_1770)" fill-opacity="0.4"/>
-<path d="M8.01858 3.31028L7.76982 2.80011C7.749 2.7608 7.7104 2.72675 7.65934 2.70267C7.60826 2.67859 7.54725 2.66565 7.48468 2.66565C7.42214 2.66565 7.36112 2.67859 7.31005 2.70267C7.25898 2.72675 7.22038 2.7608 7.19957 2.80011L6.9508 3.31028C6.87498 3.46428 6.74675 3.60454 6.57612 3.72002C6.40548 3.83551 6.19708 3.92314 5.9672 3.97603L5.20177 4.14185C5.14277 4.15571 5.09168 4.18143 5.05555 4.21548C5.0194 4.24951 5 4.29019 5 4.33188C5 4.37357 5.0194 4.41423 5.05555 4.44828C5.09168 4.48231 5.14277 4.50803 5.20177 4.52191L5.9672 4.68771C6.16372 4.73139 6.34502 4.80035 6.501 4.89045C6.53005 4.90723 6.55823 4.92475 6.58548 4.94297C6.72874 5.03882 6.84258 5.152 6.92118 5.27615C6.93774 5.30231 6.95274 5.32895 6.9661 5.35602L7.21486 5.86619C7.23363 5.90162 7.26685 5.93279 7.31062 5.95622C7.3154 5.95879 7.32032 5.96127 7.32535 5.96363C7.37642 5.98771 7.43743 6.00065 7.5 6.00065C7.56257 6.00065 7.62358 5.98771 7.67465 5.96363C7.72572 5.93955 7.76432 5.9055 7.78514 5.86619L8.0339 5.35602C8.11125 5.20091 8.24182 5.05999 8.41522 4.94442C8.58864 4.82885 8.80008 4.74182 9.0328 4.69027L9.79824 4.52447C9.8572 4.51059 9.90832 4.48487 9.94448 4.45083C9.98056 4.41679 10 4.37611 10 4.33443C10 4.29274 9.98056 4.25207 9.94448 4.21803C9.90832 4.18399 9.8572 4.15827 9.79824 4.1444L9.78296 4.14185L9.01752 3.97603C8.7848 3.92448 8.57328 3.83747 8.39992 3.72188C8.22652 3.60631 8.09595 3.46539 8.01858 3.31028Z" fill="url(#paint9_linear_2092_1770)"/>
-<path d="M11.0775 6.78623L11.5368 6.88572L11.546 6.88725C11.5813 6.89557 11.612 6.911 11.6336 6.93143C11.6553 6.95185 11.667 6.97625 11.667 7.00126C11.667 7.02628 11.6553 7.05068 11.6336 7.0711C11.612 7.09154 11.5813 7.10697 11.546 7.11528L11.0867 7.21477C10.947 7.2457 10.8202 7.29792 10.7161 7.36726C10.6121 7.4366 10.5337 7.52117 10.4873 7.61422L10.338 7.92032C10.3256 7.94392 10.3024 7.96434 10.2718 7.97878C10.2412 7.99323 10.2045 8.00104 10.167 8.00104C10.1295 8.00104 10.0928 7.99323 10.0622 7.97878C10.0316 7.96434 10.0084 7.94392 9.99587 7.92032L9.99539 7.91937L9.84667 7.61422C9.80051 7.52088 9.72235 7.43602 9.61827 7.3664C9.51419 7.29677 9.38715 7.24434 9.24731 7.21323L8.78803 7.11375C8.75267 7.10543 8.72195 7.09 8.70035 7.06958C8.67859 7.04915 8.66699 7.02475 8.66699 6.99974C8.66699 6.97472 8.67859 6.95032 8.70035 6.9299C8.72195 6.90946 8.75267 6.89403 8.78803 6.88572L9.24731 6.78623C9.38523 6.7545 9.51027 6.70192 9.61267 6.63262C9.71499 6.56334 9.79195 6.47918 9.83747 6.38678L9.98675 6.08068C9.99923 6.05708 10.0224 6.03666 10.053 6.02222C10.0836 6.00777 10.1203 6 10.1578 6C10.1953 6 10.232 6.00777 10.2626 6.02222C10.2932 6.03666 10.3164 6.05708 10.3288 6.08068L10.4781 6.38678C10.5245 6.47983 10.6029 6.5644 10.7069 6.63375C10.811 6.70308 10.9379 6.7553 11.0775 6.78623Z" fill="url(#paint10_linear_2092_1770)"/>
-</g>
-</g>
-</g>
-<defs>
-<linearGradient id="paint0_linear_2092_1770" x1="0.5" y1="5.3313" x2="9.4888" y2="19.7133" gradientUnits="userSpaceOnUse">
-<stop stop-color="#004695"/>
-<stop offset="1" stop-color="#0078D4"/>
-</linearGradient>
-<linearGradient id="paint1_linear_2092_1770" x1="0.5" y1="3" x2="9.4888" y2="17.382" gradientUnits="userSpaceOnUse">
-<stop stop-color="#0078D4"/>
-<stop offset="1" stop-color="#0FAFFF"/>
-</linearGradient>
-<linearGradient id="paint2_linear_2092_1770" x1="0.9" y1="0.66565" x2="9.8888" y2="15.0477" gradientUnits="userSpaceOnUse">
-<stop stop-color="#3BD5FF"/>
-<stop offset="1" stop-color="#0FAFFF"/>
-</linearGradient>
-<radialGradient id="paint3_radial_2092_1770" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(7.5 5.33231) rotate(90) scale(1 0.97124)">
-<stop stop-color="#00204D"/>
-<stop offset="1" stop-color="#00204D" stop-opacity="0"/>
-</radialGradient>
-<radialGradient id="paint4_radial_2092_1770" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(8.5 4.99899) rotate(-14.0362) scale(1.37437 0.380635)">
-<stop stop-color="#00204D"/>
-<stop offset="1" stop-color="#00204D" stop-opacity="0"/>
-</radialGradient>
-<radialGradient id="paint5_radial_2092_1770" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(6.5 4.99899) rotate(-165.964) scale(1.37437 0.384775)">
-<stop stop-color="#00204D"/>
-<stop offset="1" stop-color="#00204D" stop-opacity="0"/>
-</radialGradient>
-<radialGradient id="paint6_radial_2092_1770" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(9.5 7.33231) rotate(-153.435) scale(0.745357 0.359002)">
-<stop stop-color="#00204D"/>
-<stop offset="1" stop-color="#00204D" stop-opacity="0"/>
-</radialGradient>
-<radialGradient id="paint7_radial_2092_1770" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(10.8334 7.33231) rotate(-26.565) scale(0.745357 0.290223)">
-<stop stop-color="#00204D"/>
-<stop offset="1" stop-color="#00204D" stop-opacity="0"/>
-</radialGradient>
-<radialGradient id="paint8_radial_2092_1770" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(10.1666 7.66565) rotate(90) scale(0.666666 0.627526)">
-<stop offset="0.0638343" stop-color="#00204D"/>
-<stop offset="1" stop-color="#00204D" stop-opacity="0"/>
-</radialGradient>
-<linearGradient id="paint9_linear_2092_1770" x1="6.43217" y1="3.09882" x2="8.32475" y2="8.55931" gradientUnits="userSpaceOnUse">
-<stop stop-color="white"/>
-<stop offset="1" stop-color="#DFFAFF"/>
-</linearGradient>
-<linearGradient id="paint10_linear_2092_1770" x1="6.43248" y1="3.09983" x2="8.32506" y2="8.56032" gradientUnits="userSpaceOnUse">
-<stop stop-color="white"/>
-<stop offset="1" stop-color="#DFFAFF"/>
-</linearGradient>
-<clipPath id="clip0_2092_1770">
-<rect width="16" height="16" fill="white" transform="translate(0.5)"/>
-</clipPath>
-</defs>
-</svg>

src/modules/AdvancedPaste/AdvancedPaste/Helpers/AIServiceUsageHelper.cs

@@ -1,54 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using AdvancedPaste.Models;
-using Microsoft.SemanticKernel;
-
-namespace AdvancedPaste.Helpers;
-
-/// <summary>
-/// Helper class for extracting AI service usage information from chat messages.
-/// </summary>
-public static class AIServiceUsageHelper
-{
-    /// <summary>
-    /// Extracts AI service usage information from OpenAI chat message metadata.
-    /// </summary>
-    /// <param name="chatMessage">The chat message containing usage metadata.</param>
-    /// <returns>AI service usage information or AIServiceUsage.None if extraction fails.</returns>
-    public static AIServiceUsage GetOpenAIServiceUsage(ChatMessageContent chatMessage)
-    {
-        // Try to get usage information from metadata
-        if (chatMessage.Metadata?.TryGetValue("Usage", out var usageObj) == true)
-        {
-            // Handle different possible usage types through reflection to be version-agnostic
-            var usageType = usageObj.GetType();
-
-            try
-            {
-                // Try common property names for prompt tokens
-                var promptTokensProp = usageType.GetProperty("PromptTokens") ??
-                                     usageType.GetProperty("InputTokens") ??
-                                     usageType.GetProperty("InputTokenCount");
-
-                var completionTokensProp = usageType.GetProperty("CompletionTokens") ??
-                                         usageType.GetProperty("OutputTokens") ??
-                                         usageType.GetProperty("OutputTokenCount");
-
-                if (promptTokensProp != null && completionTokensProp != null)
-                {
-                    var promptTokens = (int)(promptTokensProp.GetValue(usageObj) ?? 0);
-                    var completionTokens = (int)(completionTokensProp.GetValue(usageObj) ?? 0);
-                    return new AIServiceUsage(promptTokens, completionTokens);
-                }
-            }
-            catch
-            {
-                // If reflection fails, fall back to no usage
-            }
-        }
-
-        return AIServiceUsage.None;
-    }
-}

src/modules/AdvancedPaste/AdvancedPaste/Helpers/ClipboardItemHelper.cs

@@ -1,84 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using System.Threading.Tasks;
-using AdvancedPaste.Models;
-using Microsoft.UI.Xaml.Media.Imaging;
-using Windows.ApplicationModel.DataTransfer;
-
-namespace AdvancedPaste.Helpers
-{
-    internal static class ClipboardItemHelper
-    {
-        /// <summary>
-        /// Creates a ClipboardItem from current clipboard data.
-        /// </summary>
-        public static async Task<ClipboardItem> CreateFromCurrentClipboardAsync(
-            DataPackageView clipboardData,
-            ClipboardFormat availableFormats,
-            DateTimeOffset? timestamp = null,
-            BitmapImage existingImage = null)
-        {
-            if (clipboardData == null || availableFormats == ClipboardFormat.None)
-            {
-                return null;
-            }
-
-            var clipboardItem = new ClipboardItem
-            {
-                Format = availableFormats,
-                Timestamp = timestamp,
-            };
-
-            // Text or HTML content
-            if (availableFormats.HasFlag(ClipboardFormat.Text) || availableFormats.HasFlag(ClipboardFormat.Html))
-            {
-                clipboardItem.Content = await clipboardData.GetTextOrEmptyAsync();
-            }
-
-            // Image content
-            else if (availableFormats.HasFlag(ClipboardFormat.Image))
-            {
-                // Reuse existing image if provided
-                if (existingImage != null)
-                {
-                    clipboardItem.Image = existingImage;
-                }
-                else
-                {
-                    clipboardItem.Image = await TryCreateBitmapImageAsync(clipboardData);
-                }
-            }
-
-            return clipboardItem;
-        }
-
-        /// <summary>
-        /// Creates a BitmapImage from clipboard data.
-        /// </summary>
-        private static async Task<BitmapImage> TryCreateBitmapImageAsync(DataPackageView clipboardData)
-        {
-            try
-            {
-                var imageReference = await clipboardData.GetBitmapAsync();
-                if (imageReference != null)
-                {
-                    using (var imageStream = await imageReference.OpenReadAsync())
-                    {
-                        var bitmapImage = new BitmapImage();
-                        await bitmapImage.SetSourceAsync(imageStream);
-                        return bitmapImage;
-                    }
-                }
-            }
-            catch
-            {
-                // Silently fail - caller can check for null
-            }
-
-            return null;
-        }
-    }
-}

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

@@ -6,13 +6,11 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Runtime.InteropServices;
 using System.Text;
-using System.Threading;
 using System.Threading.Tasks;
+
 using AdvancedPaste.Models;
 using ManagedCommon;
-using Microsoft.UI.Xaml.Media.Imaging;
 using Microsoft.Win32;
 using Windows.ApplicationModel.DataTransfer;
 using Windows.Data.Html;
@@ -182,46 +180,6 @@ internal static class DataPackageHelpers
         }
     }
 
-    internal static async Task<string> GetClipboardTextOrThrowAsync(this DataPackageView dataPackageView, CancellationToken cancellationToken = default)
-    {
-        ArgumentNullException.ThrowIfNull(dataPackageView);
-
-        try
-        {
-            if (dataPackageView.Contains(StandardDataFormats.Text))
-            {
-                return await dataPackageView.GetTextAsync();
-            }
-
-            if (dataPackageView.Contains(StandardDataFormats.Html))
-            {
-                var html = await dataPackageView.GetHtmlFormatAsync();
-                return HtmlUtilities.ConvertToText(html);
-            }
-
-            if (dataPackageView.Contains(StandardDataFormats.Bitmap))
-            {
-                var bitmap = await dataPackageView.GetImageContentAsync();
-                if (bitmap != null)
-                {
-                    return await OcrHelpers.ExtractTextAsync(bitmap, cancellationToken);
-                }
-            }
-        }
-        catch (Exception ex) when (ex is COMException or InvalidOperationException)
-        {
-            throw CreateClipboardTextMissingException(ex);
-        }
-
-        throw CreateClipboardTextMissingException();
-    }
-
-    private static PasteActionException CreateClipboardTextMissingException(Exception innerException = null)
-    {
-        var message = ResourceLoaderInstance.ResourceLoader.GetString("ClipboardEmptyWarning");
-        return new PasteActionException(message, innerException ?? new InvalidOperationException("Clipboard does not contain text content."));
-    }
-
     internal static async Task<string> GetHtmlContentAsync(this DataPackageView dataPackageView) =>
         dataPackageView.Contains(StandardDataFormats.Html) ? await dataPackageView.GetHtmlFormatAsync() : string.Empty;
 
@@ -237,22 +195,6 @@ internal static class DataPackageHelpers
         return null;
     }
 
-    internal static async Task<BitmapImage> GetPreviewBitmapAsync(this DataPackageView dataPackageView)
-    {
-        var stream = await dataPackageView.GetImageStreamAsync();
-        if (stream == null)
-        {
-            return null;
-        }
-
-        using (stream)
-        {
-            var bitmapImage = new BitmapImage();
-            bitmapImage.SetSource(stream);
-            return bitmapImage;
-        }
-    }
-
     private static async Task<IRandomAccessStream> GetImageStreamAsync(this DataPackageView dataPackageView)
     {
         if (dataPackageView.Contains(StandardDataFormats.StorageItems))

src/modules/AdvancedPaste/AdvancedPaste/Helpers/IUserSettings.cs

@@ -4,7 +4,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Threading.Tasks;
 
 using AdvancedPaste.Models;
 using Microsoft.PowerToys.Settings.UI.Library;
@@ -13,7 +12,7 @@ namespace AdvancedPaste.Settings
 {
     public interface IUserSettings
     {
-        public bool IsAIEnabled { get; }
+        public bool IsAdvancedAIEnabled { get; }
 
         public bool ShowCustomPreview { get; }
 
@@ -23,10 +22,6 @@ namespace AdvancedPaste.Settings
 
         public IReadOnlyList<PasteFormats> AdditionalActions { get; }
 
-        public PasteAIConfiguration PasteAIConfiguration { get; }
-
         public event EventHandler Changed;
-
-        Task SetActiveAIProviderAsync(string providerId);
     }
 }