Fix window count going out of sync when headless

Localization Updates - main - 08/26/2025 03:03:22 (#19278 )
Include Profile.BellSound as a media resource (#19289 )
2026-04-08 15:21:01 +00:00 · 2025-08-29 16:50:13 +02:00 · 2025-08-29 00:32:22 +02:00 · 2025-08-28 00:05:51 +00:00 · 2025-08-27 10:22:28 -07:00 · 2025-08-26 21:50:32 +00:00
146 changed files with 1166 additions and 1597 deletions
--- a/.github/actions/spelling/allow/apis.txt
+++ b/.github/actions/spelling/allow/apis.txt
@@ -178,7 +178,6 @@ ubrk
 UChar
 UFIELD
 ULARGE
-UNCEx
 UOI
 UPDATEINIFILE
 urlmon
--- a/.github/actions/spelling/expect/expect.txt
+++ b/.github/actions/spelling/expect/expect.txt
@@ -141,7 +141,6 @@ BValue
 Cacafire
 CALLCONV
 CANDRABINDU
-CANTCALLOUT
 capslock
 CARETBLINKINGENABLED
 CARRIAGERETURN
@@ -810,7 +809,6 @@ inclusivity
 INCONTEXT
 INFOEX
 inheritcursor
-ININPUTSYNCCALL
 INITCOMMONCONTROLSEX
 INITDIALOG
 INITGUID
@@ -1063,7 +1061,6 @@ Mypair
 Myval
 NAMELENGTH
 namestream
-NCACTIVATE
 NCCALCSIZE
 NCCREATE
 NCLBUTTONDOWN
@@ -1094,8 +1091,6 @@ NEXTLINE
 nfe
 NLSMODE
 NOACTIVATE
-NOACTIVATEKEYBOARDLAYOUT
-NOACTIVATETIP
 NOAPPLYNOW
 NOCLIP
 NOCOMM
@@ -1510,6 +1505,7 @@ scrolllock
 scrolloffset
 SCROLLSCALE
 SCROLLSCREENBUFFER
+scursor
 sddl
 SDKDDK
 segfault
@@ -1707,11 +1703,9 @@ TEXTMETRIC
 TEXTMETRICW
 textmode
 texttests
-TFCAT
 THUMBPOSITION
 THUMBTRACK
 tilunittests
-TIPCAP
 titlebars
 TITLEISLINKNAME
 TLDP
@@ -1763,8 +1757,6 @@ UIACCESS
 uiacore
 uiautomationcore
 uielem
-UIELEMENTENABLED
-UIELEMENTENABLEDONLY
 UINTs
 uld
 uldash
--- a/OpenConsole.sln
+++ b/OpenConsole.sln
@@ -309,6 +309,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Scripts", "Scripts", "{D3EF
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "winconpty.Tests.Feature", "src\winconpty\ft_pty\winconpty.FeatureTests.vcxproj", "{024052DE-83FB-4653-AEA4-90790D29D5BD}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TerminalAzBridge", "src\cascadia\TerminalAzBridge\TerminalAzBridge.vcxproj", "{067F0A06-FCB7-472C-96E9-B03B54E8E18D}"
+	ProjectSection(ProjectDependencies) = postProject
+		{CA5CAD1A-C46D-4588-B1C0-40F31AE9100B} = {CA5CAD1A-C46D-4588-B1C0-40F31AE9100B}
+	EndProjectSection
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WpfTerminalTestNetCore", "src\cascadia\WpfTerminalTestNetCore\WpfTerminalTestNetCore.csproj", "{1588FD7C-241E-4E7D-9113-43735F3E6BAD}"
 	ProjectSection(ProjectDependencies) = postProject
 		{CA5CAD1A-F542-4635-A069-7CAEFB930070} = {CA5CAD1A-F542-4635-A069-7CAEFB930070}
@@ -1698,6 +1703,30 @@ Global
 		{024052DE-83FB-4653-AEA4-90790D29D5BD}.Release|x64.Build.0 = Release|x64
 		{024052DE-83FB-4653-AEA4-90790D29D5BD}.Release|x86.ActiveCfg = Release|Win32
 		{024052DE-83FB-4653-AEA4-90790D29D5BD}.Release|x86.Build.0 = Release|Win32
+		{067F0A06-FCB7-472C-96E9-B03B54E8E18D}.AuditMode|Any CPU.ActiveCfg = AuditMode|Win32
+		{067F0A06-FCB7-472C-96E9-B03B54E8E18D}.AuditMode|ARM64.ActiveCfg = AuditMode|ARM64
+		{067F0A06-FCB7-472C-96E9-B03B54E8E18D}.AuditMode|ARM64.Build.0 = AuditMode|ARM64
+		{067F0A06-FCB7-472C-96E9-B03B54E8E18D}.AuditMode|x64.ActiveCfg = Release|x64
+		{067F0A06-FCB7-472C-96E9-B03B54E8E18D}.AuditMode|x86.ActiveCfg = AuditMode|Win32
+		{067F0A06-FCB7-472C-96E9-B03B54E8E18D}.AuditMode|x86.Build.0 = AuditMode|Win32
+		{067F0A06-FCB7-472C-96E9-B03B54E8E18D}.Debug|Any CPU.ActiveCfg = Debug|Win32
+		{067F0A06-FCB7-472C-96E9-B03B54E8E18D}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{067F0A06-FCB7-472C-96E9-B03B54E8E18D}.Debug|ARM64.Build.0 = Debug|ARM64
+		{067F0A06-FCB7-472C-96E9-B03B54E8E18D}.Debug|x64.ActiveCfg = Debug|x64
+		{067F0A06-FCB7-472C-96E9-B03B54E8E18D}.Debug|x64.Build.0 = Debug|x64
+		{067F0A06-FCB7-472C-96E9-B03B54E8E18D}.Debug|x86.ActiveCfg = Debug|Win32
+		{067F0A06-FCB7-472C-96E9-B03B54E8E18D}.Debug|x86.Build.0 = Debug|Win32
+		{067F0A06-FCB7-472C-96E9-B03B54E8E18D}.Fuzzing|Any CPU.ActiveCfg = Fuzzing|Win32
+		{067F0A06-FCB7-472C-96E9-B03B54E8E18D}.Fuzzing|ARM64.ActiveCfg = Fuzzing|ARM64
+		{067F0A06-FCB7-472C-96E9-B03B54E8E18D}.Fuzzing|x64.ActiveCfg = Fuzzing|x64
+		{067F0A06-FCB7-472C-96E9-B03B54E8E18D}.Fuzzing|x86.ActiveCfg = Fuzzing|Win32
+		{067F0A06-FCB7-472C-96E9-B03B54E8E18D}.Release|Any CPU.ActiveCfg = Release|Win32
+		{067F0A06-FCB7-472C-96E9-B03B54E8E18D}.Release|ARM64.ActiveCfg = Release|ARM64
+		{067F0A06-FCB7-472C-96E9-B03B54E8E18D}.Release|ARM64.Build.0 = Release|ARM64
+		{067F0A06-FCB7-472C-96E9-B03B54E8E18D}.Release|x64.ActiveCfg = Release|x64
+		{067F0A06-FCB7-472C-96E9-B03B54E8E18D}.Release|x64.Build.0 = Release|x64
+		{067F0A06-FCB7-472C-96E9-B03B54E8E18D}.Release|x86.ActiveCfg = Release|Win32
+		{067F0A06-FCB7-472C-96E9-B03B54E8E18D}.Release|x86.Build.0 = Release|Win32
 		{1588FD7C-241E-4E7D-9113-43735F3E6BAD}.AuditMode|Any CPU.ActiveCfg = Debug|Any CPU
 		{1588FD7C-241E-4E7D-9113-43735F3E6BAD}.AuditMode|ARM64.ActiveCfg = Debug|Any CPU
 		{1588FD7C-241E-4E7D-9113-43735F3E6BAD}.AuditMode|x64.ActiveCfg = Debug|Any CPU
@@ -2274,6 +2303,7 @@ Global
 		{6B5A44ED-918D-4747-BFB1-2472A1FCA173} = {04170EEF-983A-4195-BFEF-2321E5E38A1E}
 		{D3EF7B96-CD5E-47C9-B9A9-136259563033} = {04170EEF-983A-4195-BFEF-2321E5E38A1E}
 		{024052DE-83FB-4653-AEA4-90790D29D5BD} = {E8F24881-5E37-4362-B191-A3BA0ED7F4EB}
+		{067F0A06-FCB7-472C-96E9-B03B54E8E18D} = {61901E80-E97D-4D61-A9BB-E8F2FDA8B40C}
 		{1588FD7C-241E-4E7D-9113-43735F3E6BAD} = {4DAF0299-495E-4CD1-A982-9BAC16A45932}
 		{506FD703-BAA7-4F6E-9361-64F550EC8FCA} = {61901E80-E97D-4D61-A9BB-E8F2FDA8B40C}
 		{416FD703-BAA7-4F6E-9361-64F550EC8FCA} = {61901E80-E97D-4D61-A9BB-E8F2FDA8B40C}
--- a/build/StoreSubmission/Preview/PDPs/de-DE/PDP.xml
+++ b/build/StoreSubmission/Preview/PDPs/de-DE/PDP.xml
@@ -56,11 +56,11 @@ Dies ist ein Open Source-Projekt, und wir freuen uns über die Teilnahme der Com
  <ReleaseNotes>
    Version __VERSION_NUMBER__

- Wir haben der Benutzeroberfläche durchschnittliche Einstellungen hinzugefügt, die nur einmal in der JSON-Datei vorhanden waren, einschließlich einer neuen Seite zum Anpassen des Layouts Ihres Menüs "Neue Registerkarte"!
- Wir haben die Fensterverwaltung zurückgesetzt, um die Zuverlässigkeit zu verbessern; Melden Sie alle Fehler, die mit dem alias "wt.exe" auftreten.
- Profile zeigen jetzt ein Symbol an, wenn sie ausgeblendet wurden oder auf programme verweisen, die deinstalliert wurden.
+– Eine komplett neue Erweiterungsseite, die anzeigt, was in Ihrem Terminal installiert ist
+– Die Befehlspalette wird jetzt sowohl in Ihrer Muttersprache als auch auf Englisch angezeigt
+– Neue VT-Features wie synchronisiertes Rendering, neue Farbschemas, Konfiguration für schnelle Mausaktionen wie Zoomen und mehr

-Weitere Details finden Sie auf unserer GitHub-Releasesseite.
+Weitere Informationen finden Sie auf unserer GitHub-Releaseseite.
  </ReleaseNotes>
  <ScreenshotCaptions>
    <!-- Valid length: 200 character limit, up to 9 elements per platform -->
--- a/build/StoreSubmission/Preview/PDPs/es-ES/PDP.xml
+++ b/build/StoreSubmission/Preview/PDPs/es-ES/PDP.xml
@@ -56,11 +56,11 @@ Este es un proyecto de fuente abierta y animamos a la comunidad a participar. Pa
  <ReleaseNotes>
    Versión __VERSION_NUMBER__

- Hemos agregado decenas de configuraciones a la interfaz de usuario que solo existían una vez en el archivo JSON, incluida una página nueva para personalizar el diseño del menú Nueva pestaña.
- Tenemos administración de ventanas rearchitecdas para mejorar la confiabilidad; envíe los errores que encuentre con el alias de wt.exe.
- Ahora, los perfiles muestran un icono si se han ocultado o hacen referencia a programas que se han desinstalado.
+- Página Extensiones completamente nueva que muestra lo que se ha instalado en tu terminal
+- La paleta de comandos ahora se muestra en tu idioma nativo, así como en inglés
+- Nuevas características de VT, como la representación sincronizada, nuevos esquemas de color, configuración para acciones rápidas del ratón, como el zoom, y más

-Consulte nuestra página de versiones de GitHub para obtener más detalles.
+Consulta la página de versiones de GitHub para más información.
  </ReleaseNotes>
  <ScreenshotCaptions>
    <!-- Valid length: 200 character limit, up to 9 elements per platform -->
--- a/build/StoreSubmission/Preview/PDPs/fr-FR/PDP.xml
+++ b/build/StoreSubmission/Preview/PDPs/fr-FR/PDP.xml
@@ -54,13 +54,13 @@ Il s’agit d’un projet open source et nous vous invitons à participer dans l
    
  </DevStudio>
  <ReleaseNotes>
-    __VERSION_NUMBER__ de version
+    Version __VERSION_NUMBER__

- Nous avons ajouté des milliers de paramètres à l’interface utilisateur qui n’existaient auparavant que dans le fichier JSON, y compris une nouvelle page pour personnaliser la disposition de votre menu Nouvel onglet !
- Nous avons réarchitialiser la gestion des fenêtres pour améliorer la fiabilité ; entrez les bogues rencontrés avec l’alias wt.exe
- Les profils affichent désormais une icône s’ils ont été masqués ou s’ils font référence à des programmes qui ont été désinstallés.
+- Une toute nouvelle page Extensions qui montre ce qui a été installé dans votre terminal
+- La palette de commandes s’affiche désormais dans votre langue native, ainsi qu’en anglais
+- Nouvelles fonctionnalités VT telles que le rendu synchronisé, de nouveaux schémas de couleurs, la configuration pour des actions rapides de la souris comme le zoom, et plus encore

-Pour plus d’informations, consultez notre page des mises en production GitHub.
+Veuillez consulter notre page des versions GitHub pour découvrir d’autres détails.
  </ReleaseNotes>
  <ScreenshotCaptions>
    <!-- Valid length: 200 character limit, up to 9 elements per platform -->
--- a/build/StoreSubmission/Preview/PDPs/it-IT/PDP.xml
+++ b/build/StoreSubmission/Preview/PDPs/it-IT/PDP.xml
@@ -54,13 +54,13 @@ Si tratta di un progetto open source e la partecipazione della community è molt
    
  </DevStudio>
  <ReleaseNotes>
-    Versione __VERSION_NUMBER__
+    Versione __VERSION_NUMBER__ 

- Sono state aggiunte decine di impostazioni all'interfaccia utente che una volta esisteva solo nel file JSON, inclusa una nuova pagina per personalizzare il layout del menu Nuova scheda.
- È stata riattivata la gestione delle finestre per migliorare l'affidabilità; inserire eventuali bug riscontrati con l'alias wt.exe
- I profili ora mostrano un'icona se sono stati nascosti o fanno riferimento ai programmi che sono stati disinstallati.
+- Una pagina Estensioni completamente nuova che mostra ciò che è stato installato nel terminale
+- Il riquadro comandi ora viene visualizzato nella tua lingua di origine oltre che in inglese
+- Nuove funzionalità VT come il rendering sincronizzato, le nuove combinazioni di colori, la configurazione per azioni rapide del mouse come lo zoom e altro ancora

-Per altri dettagli, vedere la pagina delle versioni di GitHub.
+Per altri dettagli, vedi la pagina delle release di GitHub.
  </ReleaseNotes>
  <ScreenshotCaptions>
    <!-- Valid length: 200 character limit, up to 9 elements per platform -->
--- a/build/StoreSubmission/Preview/PDPs/ja-JP/PDP.xml
+++ b/build/StoreSubmission/Preview/PDPs/ja-JP/PDP.xml
@@ -56,11 +56,11 @@
  <ReleaseNotes>
    バージョン __VERSION_NUMBER__

- [新しいタブ] メニューのレイアウトをカスタマイズするための新しいページを含む、一度だけ JSON ファイルに存在した UI に多数の設定を追加しました。
- 信頼性を向上させるためにウィンドウ管理を再選択しました。wt.exe エイリアスで発生したバグを報告してください
- プロファイルが非表示になっているか、アンインストールされたプログラムを参照している場合にアイコンが表示されるようになりました。
+- ターミナルに何がインストールされているかを表示する新しい [拡張機能] ページ
+- コマンド パレットがネイティブ言語と英語で表示されるようになりました
+- 同期レンダリング、新しい配色、ズームなどのクイック マウス操作の構成などの、新しい VT 機能

-詳細については、GitHub リリース ページを参照してください。
+詳細については、GitHub リリース ページをご覧ください。
  </ReleaseNotes>
  <ScreenshotCaptions>
    <!-- Valid length: 200 character limit, up to 9 elements per platform -->
--- a/build/StoreSubmission/Preview/PDPs/ko-KR/PDP.xml
+++ b/build/StoreSubmission/Preview/PDPs/ko-KR/PDP.xml
@@ -56,9 +56,9 @@
  <ReleaseNotes>
    버전 __VERSION_NUMBER__

- 새 탭 메뉴의 레이아웃을 사용자 지정하기 위한 새 페이지를 포함하여 JSON 파일에 한 번만 존재했던 UI에 수천 개의 설정을 추가했습니다.
- 안정성을 개선하기 위해 창 관리를 다시 보관했습니다. wt.exe 별칭에 발생한 버그를 제출하세요.
- 프로필이 숨겨졌거나 제거된 프로그램을 참조하는 경우 이제 프로필에 아이콘이 표시됩니다.
+- 터미널에 설치된 항목을 보여 주는 완전히 새로운 확장 페이지
+- 명령 팔레트가 이제 영어뿐만 아니라 모국어로도 표시
+- 동기화된 렌더링, 새로운 색 구성표, 확대/축소와 같은 빠른 마우스 동작을 위한 구성 등 새로운 VT 기능이 추가

 자세한 내용은 GitHub 릴리스 페이지를 참조하세요.
  </ReleaseNotes>
--- a/build/StoreSubmission/Preview/PDPs/pt-BR/PDP.xml
+++ b/build/StoreSubmission/Preview/PDPs/pt-BR/PDP.xml
@@ -54,13 +54,13 @@ Este é um projeto de código aberto e a participação da comunidade é bem-vin
    
  </DevStudio>
  <ReleaseNotes>
-    Versão __VERSION_NUMBER__
+    Version __VERSION_NUMBER__

- Adicionamos várias configurações à interface do usuário que só existiam no arquivo JSON, incluindo uma nova página para personalizar o layout do menu Nova Guia!
- Temos o gerenciamento de janelas rearmado para melhorar a confiabilidade; registre todos os bugs encontrados com o wt.exe alias
- Os perfis agora mostram um ícone se eles foram ocultos ou se referem a programas que foram desinstalados.
+– Uma nova página de Extensões que mostra o que foi instalado no seu Terminal
+– A Paleta de Comandos agora aparece no seu idioma nativo, além do inglês
+– Novos recursos da VT, como renderização sincronizada, novos esquemas de cores, configuração para ações rápidas do mouse, como zoom, e muito mais

-Consulte nossa página de versões do GitHub para obter detalhes adicionais.
+Confira nossa página de lançamentos no GitHub para obter mais detalhes.
  </ReleaseNotes>
  <ScreenshotCaptions>
    <!-- Valid length: 200 character limit, up to 9 elements per platform -->
--- a/build/StoreSubmission/Preview/PDPs/qps-ploc/PDP.xml
+++ b/build/StoreSubmission/Preview/PDPs/qps-ploc/PDP.xml
@@ -56,11 +56,11 @@
  <ReleaseNotes>
    Vėѓѕіöй __VERSION_NUMBER__ !!! !!! !

- Ẁē'νё àðđέď đöžзńş öƒ śėŧťїńģš тб тнè ÛĮ ťħąт ŏņ¢з όⁿℓγ έжіѕŧéð іή тђε ЈŠΩŃ ƒїℓė, ĭňĉŀџđіņģ å ňэẅ φâģé ƒøя ςŭśŧŏmïżϊñģ тħέ ĺαŷöυτ öƒ убµř Йέẁ Ţàъ мęήµ! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! 
- Ẁè ĥаνė řэąřčħΐŧέсτέð щįлďοш мǻňαĝēмêиť ťô ϊmрябνé ŗĕŀĩāвîĺïтγ; ρŀěăѕе ƒíŀё αⁿу вûġš ÿøú εŉćōùлťēѓ ẃïτħ ŧћё wt.exe ǻļĭâś !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! 
- Рґøƒíŀêŝ ňöẁ šћθẁ ãй ĭčöñ ίƒ ŧħэŷ'νę ъеєл ђіðδэñ őř řєƒěґ ŧσ φяοġгаmŝ ẅђíçĥ ẁ℮гέ џňϊйşťàľĺèð. !!! !!! !!! !!! !!! !!! !!! !!! !!! !
+- Ą ωћόĺé ņέш ∑×τзńşĩōиŝ ρâģε τђат šнòωş ωħąт нǻś ъеēñ įηšтǻľĺéδ ĭŉтο ўбμŗ Ţзřmĭňāŀ !!! !!! !!! !!! !!! !!! !!! !!! 
+- €όммаήδ Рдĺēтţĕ пŏẅ şĥŏшś üρ ϊñ ỳоũѓ йαťïνє ļäŋģµаġέ άś ŵєŀľ åś Σиĝℓĭŝђ !!! !!! !!! !!! !!! !!! !!! 
+- ∏еẅ VΤ ƒэåŧύґέŝ şűçн ăŝ ѕỳňсĥŗǿйìźėð гēŋďзříⁿğ, ηĕш ćôĺõг şĉћěмєѕ, çóńƒіĝџŗáτїöπ ƒοг qũī¢ķ möűšë ąćŧϊόņŝ ľîķє žøōmίйğ, ǻⁿđ мόřε !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!!

-Рļèāŝє ŝèĕ θџŗ ĢίťĤцъ řέĺэªşэš ρąĝę ƒόř áďđїτϊōπαľ đэŧдįļŝ. !!! !!! !!! !!! !!! !!!
+Ρĺęąŝэ ѕєě õμя ĞĭтΗύв řєĺэдšέŝ рάġě ƒοґ àďđϊтїõлаℓ ðêţǻїłş. !!! !!! !!! !!! !!! !!!
   </ReleaseNotes>
  <ScreenshotCaptions>
    <!-- Valid length: 200 character limit, up to 9 elements per platform -->
--- a/build/StoreSubmission/Preview/PDPs/qps-ploca/PDP.xml
+++ b/build/StoreSubmission/Preview/PDPs/qps-ploca/PDP.xml
@@ -56,11 +56,11 @@
  <ReleaseNotes>
    Vėѓѕіöй __VERSION_NUMBER__ !!! !!! !

- Ẁē'νё àðđέď đöžзńş öƒ śėŧťїńģš тб тнè ÛĮ ťħąт ŏņ¢з όⁿℓγ έжіѕŧéð іή тђε ЈŠΩŃ ƒїℓė, ĭňĉŀџđіņģ å ňэẅ φâģé ƒøя ςŭśŧŏmïżϊñģ тħέ ĺαŷöυτ öƒ убµř Йέẁ Ţàъ мęήµ! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! 
- Ẁè ĥаνė řэąřčħΐŧέсτέð щįлďοш мǻňαĝēмêиť ťô ϊmрябνé ŗĕŀĩāвîĺïтγ; ρŀěăѕе ƒíŀё αⁿу вûġš ÿøú εŉćōùлťēѓ ẃïτħ ŧћё wt.exe ǻļĭâś !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! 
- Рґøƒíŀêŝ ňöẁ šћθẁ ãй ĭčöñ ίƒ ŧħэŷ'νę ъеєл ђіðδэñ őř řєƒěґ ŧσ φяοġгаmŝ ẅђíçĥ ẁ℮гέ џňϊйşťàľĺèð. !!! !!! !!! !!! !!! !!! !!! !!! !!! !
+- Ą ωћόĺé ņέш ∑×τзńşĩōиŝ ρâģε τђат šнòωş ωħąт нǻś ъеēñ įηšтǻľĺéδ ĭŉтο ўбμŗ Ţзřmĭňāŀ !!! !!! !!! !!! !!! !!! !!! !!! 
+- €όммаήδ Рдĺēтţĕ пŏẅ şĥŏшś üρ ϊñ ỳоũѓ йαťïνє ļäŋģµаġέ άś ŵєŀľ åś Σиĝℓĭŝђ !!! !!! !!! !!! !!! !!! !!! 
+- ∏еẅ VΤ ƒэåŧύґέŝ şűçн ăŝ ѕỳňсĥŗǿйìźėð гēŋďзříⁿğ, ηĕш ćôĺõг şĉћěмєѕ, çóńƒіĝџŗáτїöπ ƒοг qũī¢ķ möűšë ąćŧϊόņŝ ľîķє žøōmίйğ, ǻⁿđ мόřε !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!!

-Рļèāŝє ŝèĕ θџŗ ĢίťĤцъ řέĺэªşэš ρąĝę ƒόř áďđїτϊōπαľ đэŧдįļŝ. !!! !!! !!! !!! !!! !!!
+Ρĺęąŝэ ѕєě õμя ĞĭтΗύв řєĺэдšέŝ рάġě ƒοґ àďđϊтїõлаℓ ðêţǻїłş. !!! !!! !!! !!! !!! !!!
   </ReleaseNotes>
  <ScreenshotCaptions>
    <!-- Valid length: 200 character limit, up to 9 elements per platform -->
--- a/build/StoreSubmission/Preview/PDPs/qps-plocm/PDP.xml
+++ b/build/StoreSubmission/Preview/PDPs/qps-plocm/PDP.xml
@@ -56,11 +56,11 @@
  <ReleaseNotes>
    Vėѓѕіöй __VERSION_NUMBER__ !!! !!! !

- Ẁē'νё àðđέď đöžзńş öƒ śėŧťїńģš тб тнè ÛĮ ťħąт ŏņ¢з όⁿℓγ έжіѕŧéð іή тђε ЈŠΩŃ ƒїℓė, ĭňĉŀџđіņģ å ňэẅ φâģé ƒøя ςŭśŧŏmïżϊñģ тħέ ĺαŷöυτ öƒ убµř Йέẁ Ţàъ мęήµ! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! 
- Ẁè ĥаνė řэąřčħΐŧέсτέð щįлďοш мǻňαĝēмêиť ťô ϊmрябνé ŗĕŀĩāвîĺïтγ; ρŀěăѕе ƒíŀё αⁿу вûġš ÿøú εŉćōùлťēѓ ẃïτħ ŧћё wt.exe ǻļĭâś !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! 
- Рґøƒíŀêŝ ňöẁ šћθẁ ãй ĭčöñ ίƒ ŧħэŷ'νę ъеєл ђіðδэñ őř řєƒěґ ŧσ φяοġгаmŝ ẅђíçĥ ẁ℮гέ џňϊйşťàľĺèð. !!! !!! !!! !!! !!! !!! !!! !!! !!! !
+- Ą ωћόĺé ņέш ∑×τзńşĩōиŝ ρâģε τђат šнòωş ωħąт нǻś ъеēñ įηšтǻľĺéδ ĭŉтο ўбμŗ Ţзřmĭňāŀ !!! !!! !!! !!! !!! !!! !!! !!! 
+- €όммаήδ Рдĺēтţĕ пŏẅ şĥŏшś üρ ϊñ ỳоũѓ йαťïνє ļäŋģµаġέ άś ŵєŀľ åś Σиĝℓĭŝђ !!! !!! !!! !!! !!! !!! !!! 
+- ∏еẅ VΤ ƒэåŧύґέŝ şűçн ăŝ ѕỳňсĥŗǿйìźėð гēŋďзříⁿğ, ηĕш ćôĺõг şĉћěмєѕ, çóńƒіĝџŗáτїöπ ƒοг qũī¢ķ möűšë ąćŧϊόņŝ ľîķє žøōmίйğ, ǻⁿđ мόřε !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!!

-Рļèāŝє ŝèĕ θџŗ ĢίťĤцъ řέĺэªşэš ρąĝę ƒόř áďđїτϊōπαľ đэŧдįļŝ. !!! !!! !!! !!! !!! !!!
+Ρĺęąŝэ ѕєě õμя ĞĭтΗύв řєĺэдšέŝ рάġě ƒοґ àďđϊтїõлаℓ ðêţǻїłş. !!! !!! !!! !!! !!! !!!
   </ReleaseNotes>
  <ScreenshotCaptions>
    <!-- Valid length: 200 character limit, up to 9 elements per platform -->
--- a/build/StoreSubmission/Preview/PDPs/ru-RU/PDP.xml
+++ b/build/StoreSubmission/Preview/PDPs/ru-RU/PDP.xml
@@ -56,9 +56,9 @@
  <ReleaseNotes>
    Версия __VERSION_NUMBER__

- Мы добавили в пользовательский интерфейс десятки параметров, которые существовали только в JSON-файле, включая новую страницу для настройки макета меню "Новая вкладка".
- Для повышения надежности мы переупоряхлили управление окнами; создайте все ошибки, обнаруженные с wt.exe псевдонимом
- Профили теперь показывают значок, если они скрыты или ссылаются на программы, которые были удалены.
+– Новая страница расширений, на которой отображается информация о том, что было установлено в вашем терминале
+– Палитра команд теперь доступна на вашем языке, а также на английском
+– Новые функции VT, например синхронизированная отрисовка, новые цветовые схемы, настройка быстрых действий мыши, таких как масштабирование, и т. д.

 Дополнительные сведения см. на странице выпусков GitHub.
  </ReleaseNotes>
--- a/build/StoreSubmission/Preview/PDPs/zh-CN/PDP.xml
+++ b/build/StoreSubmission/Preview/PDPs/zh-CN/PDP.xml
@@ -54,13 +54,13 @@
    
  </DevStudio>
  <ReleaseNotes>
-    版本 __VERSION_NUMBER__
+    Version __VERSION_NUMBER__

- 我们向用户界面添加了许多设置，这些设置仅存在于 JSON 文件中，包括用于自定义“新建标签页”菜单布局的新页面！
- 我们已重新检测窗口管理以提高可靠性;请将遇到的任何 bug 归档为 wt.exe 别名
- 如果配置文件已隐藏或引用已卸载的程序，则它们现在将显示一个图标。
+- 一个全新的“扩展”页，显示已安装到终端的内容
+- 命令面板现在以你的母语和英语显示
+- 新的 VT 功能，例如同步渲染、新配色方案、快速鼠标操作(如缩放)的配置等

-有关其他详细信息，请参阅 GitHub 发布页面。
+有关其他详细信息，请参阅我们的 GitHub 发布页面。
  </ReleaseNotes>
  <ScreenshotCaptions>
    <!-- Valid length: 200 character limit, up to 9 elements per platform -->
--- a/build/StoreSubmission/Preview/PDPs/zh-TW/PDP.xml
+++ b/build/StoreSubmission/Preview/PDPs/zh-TW/PDP.xml
@@ -54,13 +54,13 @@
    
  </DevStudio>
  <ReleaseNotes>
-    版本 __VERSION_NUMBER__
+    Version __VERSION_NUMBER__

- 我們已新增數十個只存在於 JSON 檔案中的設定到 UI，包括自定義 [新索引標籤] 功能表版面配置的新頁面！
- 我們已重新設定視窗管理，以改善可靠性;請提出您在 wt.exe 別名遇到的任何錯誤
- 設定文件現在會在隱藏或參照已卸載的程式時顯示圖示。
+- 全新的延伸模組頁面會顯示已安裝在您終端機中的內容
+- 命令選擇區現在以您的母語和英文顯示
+- 新的 VT 功能，例如同步轉譯、新的色彩配置、快速滑鼠動作 (例如縮放) 設定等等

-如需詳細數據，請參閱我們的 GitHub 版本頁面。
+如需更多詳細資料，請參閱我們的 GitHub 發行版本頁面。
  </ReleaseNotes>
  <ScreenshotCaptions>
    <!-- Valid length: 200 character limit, up to 9 elements per platform -->
--- a/build/StoreSubmission/Stable/PDPs/de-DE/PDP.xml
+++ b/build/StoreSubmission/Stable/PDPs/de-DE/PDP.xml
@@ -56,12 +56,9 @@ Dies ist ein Open Source-Projekt, und wir freuen uns über die Teilnahme an der
  <ReleaseNotes>
    Version __VERSION_NUMBER__

-– Wir haben umgeschrieben, wie Konsolenanwendungen im Terminal gehostet werden! Melden Sie alle auftretenden Fehler.
-– Terminal unterstützt jetzt Sixels!
-– Sie können jetzt einen angedockten Bereich öffnen, der Ausschnitte von Befehlen enthält, die Sie gespeichert haben, um sie später zu verwenden.
-– Für Benutzer der Eingabeaufforderung der neuesten Version von Windows 11 wird möglicherweise ein QuickInfo-Symbol angezeigt, das installierbare Software von WinGet vorschlägt.
-– Ausgewählter Text wird jetzt viel sichtbarer (und anpassbarer!).
- Eine Reihe von Zuverlässigkeitsfehlern, Benutzerfreundlichkeitsproblemen und Ärgernissen wurden behoben.
+– Wir haben der Benutzeroberfläche Dutzende von Einstellungen hinzugefügt, die nur einmal in der JSON-Datei vorhanden waren, einschließlich einer neuen Seite zum Anpassen des Layouts Ihres Menüs „Neue Registerkarte“!
+– Wir haben die Fensterverwaltung umgestaltet, um die Zuverlässigkeit zu verbessern. Melden Sie alle Fehler, die beim alias „wt.exe“ auftreten
+– Profile zeigen jetzt ein Symbol an, wenn sie ausgeblendet wurden oder auf Programme verweisen, die deinstalliert wurden.

 Weitere Informationen finden Sie auf unserer GitHub-Releaseseite.
  </ReleaseNotes>
--- a/build/StoreSubmission/Stable/PDPs/es-ES/PDP.xml
+++ b/build/StoreSubmission/Stable/PDPs/es-ES/PDP.xml
@@ -56,12 +56,9 @@ Este es un proyecto de fuente abierta y animamos a la comunidad a participar. Pa
  <ReleaseNotes>
    Versión __VERSION_NUMBER__

- Hemos reescrito cómo se hospedan las aplicaciones de consola en Terminal. Informe de los errores que encuentre.
- Terminal ahora admite síxeles.
- Ahora puede abrir un panel acoplado que contenga fragmentos de comandos que haya guardado para usarlos más adelante
- Los usuarios del símbolo del sistema de la versión más reciente de Windows 11 pueden ver un icono de "sugerencia rápida" que sugiere software instalable de WinGet
- El texto seleccionado ahora será mucho más visible (y personalizable)
- Se han corregido varios errores de fiabilidad, problemas de comodidad y molestias.
+- Hemos añadido decenas de configuraciones a la interfaz de usuario que antes solo existían en el archivo JSON, incluida una nueva página para personalizar el diseño del menú Nueva pestaña.
+- Hemos reestructurado la gestión de ventanas para mejorar la fiabilidad; informe de cualquier error que encuentre con el alias wt.exe
+- Ahora, los perfiles muestran un icono si han sido ocultados o hacen referencia a programas que han sido desinstalados.

 Consulte la página de versiones de GitHub para más información.
  </ReleaseNotes>
--- a/build/StoreSubmission/Stable/PDPs/fr-FR/PDP.xml
+++ b/build/StoreSubmission/Stable/PDPs/fr-FR/PDP.xml
@@ -56,12 +56,9 @@ Il s’agit d’un projet open source et nous encourageons la participation à l
  <ReleaseNotes>
    Version __VERSION_NUMBER__

-– Nous avons réécrit la manière dont les applications de console sont hébergées dans Terminal ! Veuillez signaler tout bogue que vous rencontrez.
-– Terminal prend désormais en charge Sixels !
-– Vous pouvez maintenant ouvrir un panneau ancré contenant des extraits de commandes que vous avez enregistrées pour les utiliser ultérieurement
-– Les utilisateurs de l’invite de commande sur la dernière version de Windows 11 peuvent voir une icône « astuce rapide » qui suggère un logiciel installable à partir de WinGet
-– Le texte sélectionné sera désormais beaucoup plus visible (et personnalisable !)
-– Un certain nombre de bogues de fiabilité, de problèmes de commodité et de désagréments ont été corrigés.
+- Nous avons ajouté des dizaines de paramètres à l’interface utilisateur qui n’existaient auparavant que dans le fichier JSON, y compris une nouvelle page pour personnaliser la disposition de votre menu Nouvel onglet.
+- Nous avons fait une refonte de la gestion des fenêtres pour améliorer la fiabilité. Veuillez signaler les bogues que vous rencontrez avec l’alias wt.exe.
+- Les profils affichent désormais une icône s’ils ont été masqués ou s’ils font référence à des programmes qui ont été désinstallés.

 Veuillez consulter notre page des versions GitHub pour découvrir d’autres détails.
  </ReleaseNotes>
--- a/build/StoreSubmission/Stable/PDPs/it-IT/PDP.xml
+++ b/build/StoreSubmission/Stable/PDPs/it-IT/PDP.xml
@@ -56,12 +56,9 @@ Si tratta di un progetto open source e la partecipazione della community è molt
  <ReleaseNotes>
    Versione __VERSION_NUMBER__

- Abbiamo cambiato il modo in cui le applicazioni della console vengono ospitate all’interno di Terminale. Segnala eventuali bug riscontrati.
- Ora Terminale supporta i Sixel.
- Puoi aprire un pannello ancorato contenente frammenti di comandi salvati per usarli in seguito
- Gli utenti che usano il prompt dei comandi nella versione più recente di Windows 11 potrebbero visualizzare un’icona di “suggerimento rapido” che consiglia il software installabile da WinGet
- Il testo selezionato sarà ora molto più visibile, oltre che personalizzabile.
- Sono stati risolti diversi bug di affidabilità e problemi di ordine pratico.
+- Abbiamo aggiunto decine di impostazioni all'interfaccia utente che in precedenza esistevano solo nel file JSON, inclusa una nuova pagina per personalizzare il layout del menu Nuova scheda.
+- Abbiamo riprogettato la gestione delle finestre per migliorarne l'affidabilità; segnala eventuali bug riscontrati con l'alias wt.exe
+- I profili ora mostrano un'icona se sono stati nascosti o se fanno riferimento a programmi disinstallati.

 Per altri dettagli, vedi la pagina delle release di GitHub.
  </ReleaseNotes>
--- a/build/StoreSubmission/Stable/PDPs/ja-JP/PDP.xml
+++ b/build/StoreSubmission/Stable/PDPs/ja-JP/PDP.xml
@@ -56,12 +56,9 @@
  <ReleaseNotes>
    バージョン __VERSION_NUMBER__

- ターミナル内でのコンソール アプリケーションのホスト方法を書き換えました。発生したバグを報告してください。
- ターミナルで Sixels がサポートされるようになりました。
- 後で使用するために保存したコマンドのスニペットを含むドッキング パネルを開けるようになりました
- 最新の Windows 11 リリースのコマンド プロンプト ユーザーには、WinGet からインストール可能なソフトウェアを提案する "クイック ヒント" アイコンが表示される場合があります
- 選択したテキストが大幅に見やすくなりました (カスタマイズも可能です)
- 信頼性に関するバグ、利便性の問題、不快な問題の多くが修正されました。
+- 新しいタブ メニューのレイアウトをカスタマイズするための新しいページなど、以前は JSON ファイルにしかなかった設定が UI に多数追加されました。
+- 信頼性を向上させるために、ウィンドウ管理を再設計しました。wt.exe エイリアスで発生したバグを報告してください
+- プロファイルが非表示になっている場合や、アンインストールされたプログラムを参照している場合に、アイコンが表示されるようになりました。

 詳細については、GitHub リリース ページをご覧ください。
  </ReleaseNotes>
--- a/build/StoreSubmission/Stable/PDPs/ko-KR/PDP.xml
+++ b/build/StoreSubmission/Stable/PDPs/ko-KR/PDP.xml
@@ -56,12 +56,9 @@
  <ReleaseNotes>
    버전 __VERSION_NUMBER__

- 콘솔 애플리케이션이 터미널 내에서 호스팅되는 방법을 다시 작성했습니다. 버그가 발생하면 보고해 주세요.
- 터미널에서 이제 Sixels를 지원합니다.
- 이제 나중에 사용하기 위해 저장한 명령 조각이 포함된 도킹된 패널을 열 수 있습니다.
- 최신 Windows 11 릴리스의 명령 프롬프트 사용자는 WinGet에서 설치 가능한 소프트웨어를 추천하는 "간단한 팁" 아이콘을 볼 수 있습니다.
- 이제 선택한 텍스트가 훨씬 더 잘 보입니다(사용자 지정 가능).
- 여러 안정성 버그, 편의성 문제, 불편 사항이 수정되었습니다.
+- 새 탭 메뉴의 레이아웃을 사용자 지정하기 위한 새 페이지를 포함하여 JSON 파일에만 존재했던 수십 개의 설정을 UI에 추가
+- 안정성을 개선하기 위해 창 관리 구조를 재구성했습니다. wt.exe 별칭과 관련하여 발생한 버그 신고
+- 프로필이 숨겨졌거나 제거된 프로그램을 참조하는 경우 이제 프로필에 아이콘이 표시됩니다.

 자세한 내용은 GitHub 릴리스 페이지를 참조하세요.
  </ReleaseNotes>
--- a/build/StoreSubmission/Stable/PDPs/pt-BR/PDP.xml
+++ b/build/StoreSubmission/Stable/PDPs/pt-BR/PDP.xml
@@ -54,14 +54,11 @@ Este é um projeto de código aberto e a participação da comunidade é bem-vin
    
  </DevStudio>
  <ReleaseNotes>
-    Versão __VERSION_NUMBER__
+    Version __VERSION_NUMBER__

-– Reescrevemos a forma como os aplicativos de console são hospedados no Terminal! Relate os bugs encontrados.
-– O terminal agora oferece suporte ao Sixels!
-– Agora você pode abrir um painel acoplado contendo snippets de comandos que você salvou para usar mais tarde
-– Os usuários do Prompt de Comando na versão mais recente do Windows 11 podem ver um ícone de "dica rápida", que sugere softwares instaláveis a partir do WinGet
-– O texto selecionado agora ficará muito mais visível (e personalizável!)
-– Vários bugs de confiabilidade, problemas de conveniência e incômodos foram resolvidos.
+– Adicionamos várias configurações à interface do usuário que antes só existiam no arquivo JSON, incluindo uma nova página para personalizar o layout do seu menu Nova Guia!
+– Reestruturamos o gerenciamento de janelas para melhorar a confiabilidade; registre os bugs que você encontrar com o alias wt.exe
+– Os perfis agora exibem um ícone se estiverem ocultos ou se referirem a programas que foram desinstalados.

 Confira nossa página de lançamentos no GitHub para obter mais detalhes.
  </ReleaseNotes>
--- a/build/StoreSubmission/Stable/PDPs/qps-ploc/PDP.xml
+++ b/build/StoreSubmission/Stable/PDPs/qps-ploc/PDP.xml
@@ -56,14 +56,11 @@
  <ReleaseNotes>
    Vėѓѕіöй __VERSION_NUMBER__ !!! !!! !

- Ẁē'νё ŕéẁѓĭτťёñ ћοώ ĉòπşõℓε άррℓіċªťįõпѕ αяе ĥθѕťэđ įŋšιďé Ţєямїńąℓ! Рļéаšė яёροřτ αņу ьϋģš ýõμ éпćŏџήţęя. !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!
- Ţëямΐŉαļ ńóẃ ŝüррöятš Śїхέłś! !!! !!! !!!
- ¥оų ĉåи ńòŵ θρėñ д đбčĸэď ράńέļ ċőлŧăīņϊňģ śⁿіφφëťś оƒ ςōмmàⁿďş ŷŏũ ĥªν℮ şåνěđ τσ üśε łαťэŗ !!! !!! !!! !!! !!! !!! !!! !!! !!! 
- Ćοмmäлđ Рřōmφť üş℮ŗѕ öη τће ļāťëšτ Щīйđôώѕ 11 řёℓеаѕĕ måў ŝэε ά "qůïςκ ŧĭр" ιсôñ τĥдт šűğģєѕŧѕ ίńśŧăłłавļз šôƒţẁαгέ ƒґόm ЩĩйĞéţ !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!!
- Śєļèċťєď ţĕжт ωϊŀļ йǿẃ ьέ mџ¢н мǿѓε νĭŝϊъļė (άŋđ сŭŝтŏмΐżдьļē!) !!! !!! !!! !!! !!! !!! !
- Ä ņϋmъ℮ŗ ŏƒ ѓēŀїаъïļŧÿ ьüĝś, ςôⁿνėηĭ℮иć℮ îѕšůëş ăπð âлňбγдňçėŝ ћªνε ъēёп ƒΐ×еð. !!! !!! !!! !!! !!! !!! !!! !!!
+- Ẁē'νё àðđέď đöžзńş öƒ śėŧťїńģš тб тнè ÛĮ ťħąт ŏņ¢з όⁿℓγ έжіѕŧéð іή тђε ЈŠΩŃ ƒїℓė, ĭňĉŀџđіņģ å ňэẅ φâģé ƒøя ςŭśŧŏmïżϊñģ тħέ ĺαŷöυτ öƒ убµř Йέẁ Ţàъ мęήµ! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! 
+- Ẁè ĥаνė řэąřčħΐŧέсτέð щįлďοш мǻňαĝēмêиť ťô ϊmрябνé ŗĕŀĩāвîĺïтγ; ρŀěăѕе ƒíŀё αⁿу вûġš ÿøú εŉćōùлťēѓ ẃïτħ ŧћё wt.exe ǻļĭâś !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! 
+- Рґøƒíŀêŝ ňöẁ šћθẁ ãй ĭčöñ ίƒ ŧħэŷ'νę ъеєл ђіðδэñ őř řєƒěґ ŧσ φяοġгаmŝ ẅђíçĥ ẁ℮гέ џňϊйşťàľĺèð. !!! !!! !!! !!! !!! !!! !!! !!! !!! !

-Ρĺёàŝ℮ ŝез ǿúг ĢīťНŭъ řěłεαśèŝ φāğ℮ ƒóѓ дďδітĭøиąℓ ð℮тªїľŝ. !!! !!! !!! !!! !!! !!!
+Рļèāŝє ŝèĕ θџŗ ĢίťĤцъ řέĺэªşэš ρąĝę ƒόř áďđїτϊōπαľ đэŧдįļŝ. !!! !!! !!! !!! !!! !!!
   </ReleaseNotes>
  <ScreenshotCaptions>
    <!-- Valid length: 200 character limit, up to 9 elements per platform -->
--- a/build/StoreSubmission/Stable/PDPs/qps-ploca/PDP.xml
+++ b/build/StoreSubmission/Stable/PDPs/qps-ploca/PDP.xml
@@ -56,14 +56,11 @@
  <ReleaseNotes>
    Vėѓѕіöй __VERSION_NUMBER__ !!! !!! !

- Ẁē'νё ŕéẁѓĭτťёñ ћοώ ĉòπşõℓε άррℓіċªťįõпѕ αяе ĥθѕťэđ įŋšιďé Ţєямїńąℓ! Рļéаšė яёροřτ αņу ьϋģš ýõμ éпćŏџήţęя. !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!
- Ţëямΐŉαļ ńóẃ ŝüррöятš Śїхέłś! !!! !!! !!!
- ¥оų ĉåи ńòŵ θρėñ д đбčĸэď ράńέļ ċőлŧăīņϊňģ śⁿіφφëťś оƒ ςōмmàⁿďş ŷŏũ ĥªν℮ şåνěđ τσ üśε łαťэŗ !!! !!! !!! !!! !!! !!! !!! !!! !!! 
- Ćοмmäлđ Рřōmφť üş℮ŗѕ öη τће ļāťëšτ Щīйđôώѕ 11 řёℓеаѕĕ måў ŝэε ά "qůïςκ ŧĭр" ιсôñ τĥдт šűğģєѕŧѕ ίńśŧăłłавļз šôƒţẁαгέ ƒґόm ЩĩйĞéţ !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!!
- Śєļèċťєď ţĕжт ωϊŀļ йǿẃ ьέ mџ¢н мǿѓε νĭŝϊъļė (άŋđ сŭŝтŏмΐżдьļē!) !!! !!! !!! !!! !!! !!! !
- Ä ņϋmъ℮ŗ ŏƒ ѓēŀїаъïļŧÿ ьüĝś, ςôⁿνėηĭ℮иć℮ îѕšůëş ăπð âлňбγдňçėŝ ћªνε ъēёп ƒΐ×еð. !!! !!! !!! !!! !!! !!! !!! !!!
+- Ẁē'νё àðđέď đöžзńş öƒ śėŧťїńģš тб тнè ÛĮ ťħąт ŏņ¢з όⁿℓγ έжіѕŧéð іή тђε ЈŠΩŃ ƒїℓė, ĭňĉŀџđіņģ å ňэẅ φâģé ƒøя ςŭśŧŏmïżϊñģ тħέ ĺαŷöυτ öƒ убµř Йέẁ Ţàъ мęήµ! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! 
+- Ẁè ĥаνė řэąřčħΐŧέсτέð щįлďοш мǻňαĝēмêиť ťô ϊmрябνé ŗĕŀĩāвîĺïтγ; ρŀěăѕе ƒíŀё αⁿу вûġš ÿøú εŉćōùлťēѓ ẃïτħ ŧћё wt.exe ǻļĭâś !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! 
+- Рґøƒíŀêŝ ňöẁ šћθẁ ãй ĭčöñ ίƒ ŧħэŷ'νę ъеєл ђіðδэñ őř řєƒěґ ŧσ φяοġгаmŝ ẅђíçĥ ẁ℮гέ џňϊйşťàľĺèð. !!! !!! !!! !!! !!! !!! !!! !!! !!! !

-Ρĺёàŝ℮ ŝез ǿúг ĢīťНŭъ řěłεαśèŝ φāğ℮ ƒóѓ дďδітĭøиąℓ ð℮тªїľŝ. !!! !!! !!! !!! !!! !!!
+Рļèāŝє ŝèĕ θџŗ ĢίťĤцъ řέĺэªşэš ρąĝę ƒόř áďđїτϊōπαľ đэŧдįļŝ. !!! !!! !!! !!! !!! !!!
   </ReleaseNotes>
  <ScreenshotCaptions>
    <!-- Valid length: 200 character limit, up to 9 elements per platform -->
--- a/build/StoreSubmission/Stable/PDPs/qps-plocm/PDP.xml
+++ b/build/StoreSubmission/Stable/PDPs/qps-plocm/PDP.xml
@@ -56,14 +56,11 @@
  <ReleaseNotes>
    Vėѓѕіöй __VERSION_NUMBER__ !!! !!! !

- Ẁē'νё ŕéẁѓĭτťёñ ћοώ ĉòπşõℓε άррℓіċªťįõпѕ αяе ĥθѕťэđ įŋšιďé Ţєямїńąℓ! Рļéаšė яёροřτ αņу ьϋģš ýõμ éпćŏџήţęя. !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!
- Ţëямΐŉαļ ńóẃ ŝüррöятš Śїхέłś! !!! !!! !!!
- ¥оų ĉåи ńòŵ θρėñ д đбčĸэď ράńέļ ċőлŧăīņϊňģ śⁿіφφëťś оƒ ςōмmàⁿďş ŷŏũ ĥªν℮ şåνěđ τσ üśε łαťэŗ !!! !!! !!! !!! !!! !!! !!! !!! !!! 
- Ćοмmäлđ Рřōmφť üş℮ŗѕ öη τће ļāťëšτ Щīйđôώѕ 11 řёℓеаѕĕ måў ŝэε ά "qůïςκ ŧĭр" ιсôñ τĥдт šűğģєѕŧѕ ίńśŧăłłавļз šôƒţẁαгέ ƒґόm ЩĩйĞéţ !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!!
- Śєļèċťєď ţĕжт ωϊŀļ йǿẃ ьέ mџ¢н мǿѓε νĭŝϊъļė (άŋđ сŭŝтŏмΐżдьļē!) !!! !!! !!! !!! !!! !!! !
- Ä ņϋmъ℮ŗ ŏƒ ѓēŀїаъïļŧÿ ьüĝś, ςôⁿνėηĭ℮иć℮ îѕšůëş ăπð âлňбγдňçėŝ ћªνε ъēёп ƒΐ×еð. !!! !!! !!! !!! !!! !!! !!! !!!
+- Ẁē'νё àðđέď đöžзńş öƒ śėŧťїńģš тб тнè ÛĮ ťħąт ŏņ¢з όⁿℓγ έжіѕŧéð іή тђε ЈŠΩŃ ƒїℓė, ĭňĉŀџđіņģ å ňэẅ φâģé ƒøя ςŭśŧŏmïżϊñģ тħέ ĺαŷöυτ öƒ убµř Йέẁ Ţàъ мęήµ! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! 
+- Ẁè ĥаνė řэąřčħΐŧέсτέð щįлďοш мǻňαĝēмêиť ťô ϊmрябνé ŗĕŀĩāвîĺïтγ; ρŀěăѕе ƒíŀё αⁿу вûġš ÿøú εŉćōùлťēѓ ẃïτħ ŧћё wt.exe ǻļĭâś !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! 
+- Рґøƒíŀêŝ ňöẁ šћθẁ ãй ĭčöñ ίƒ ŧħэŷ'νę ъеєл ђіðδэñ őř řєƒěґ ŧσ φяοġгаmŝ ẅђíçĥ ẁ℮гέ џňϊйşťàľĺèð. !!! !!! !!! !!! !!! !!! !!! !!! !!! !

-Ρĺёàŝ℮ ŝез ǿúг ĢīťНŭъ řěłεαśèŝ φāğ℮ ƒóѓ дďδітĭøиąℓ ð℮тªїľŝ. !!! !!! !!! !!! !!! !!!
+Рļèāŝє ŝèĕ θџŗ ĢίťĤцъ řέĺэªşэš ρąĝę ƒόř áďđїτϊōπαľ đэŧдįļŝ. !!! !!! !!! !!! !!! !!!
   </ReleaseNotes>
  <ScreenshotCaptions>
    <!-- Valid length: 200 character limit, up to 9 elements per platform -->
--- a/build/StoreSubmission/Stable/PDPs/ru-RU/PDP.xml
+++ b/build/StoreSubmission/Stable/PDPs/ru-RU/PDP.xml
@@ -56,12 +56,9 @@
  <ReleaseNotes>
    Версия __VERSION_NUMBER__

-– Мы переписали, как консольные приложения размещаются внутри Терминала! Сообщайте о любых ошибках, с которыми вы столкнулись.
-– Терминал теперь поддерживает форматы Sixel!
-– Теперь вы можете открыть закрепленную панель, содержащую фрагменты команд, которые вы сохранили для использования в дальнейшем
-– Пользователи командной строки в новейшем выпуске Windows 11 могут увидеть значок "краткой подсказки", который предлагает устанавливаемые программы из WinGet
-– Выделенный текст теперь станет более видимым (и настраиваемым!)
-– Исправлено несколько ошибок надежности, проблем с удобством, а также устранены раздражающие моменты.
+– Мы добавили в пользовательский интерфейс десятки параметров, которые ранее существовали только в JSON-файле, включая новую страницу для настройки макета меню новой вкладки.
+– Мы переработали управление окнами для повышения надежности. Сообщайте о любых ошибках, которые вы обнаружите с псевдонимом wt.exe
+– Профили теперь отображают значок, если они были скрыты или ссылаются на программы, которые были удалены.

 Дополнительные сведения см. на странице выпусков GitHub.
  </ReleaseNotes>
--- a/build/StoreSubmission/Stable/PDPs/zh-CN/PDP.xml
+++ b/build/StoreSubmission/Stable/PDPs/zh-CN/PDP.xml
@@ -56,12 +56,9 @@
  <ReleaseNotes>
    Version __VERSION_NUMBER__

- 我们已改变主机应用程序在终端内的托管方式!请报告遇到的任何 bug。
- 终端现在支持 Sixels!
- 现在可以打开一个停靠面板，其中包含已保存供以后使用的命令片段
- 最新 Windows 11 版本上的命令提示用户可能会看到“快速提示”图标，该图标建议从 WinGet 安装软件
- 所选文本现在将具有更高的可见性(和可自定义性!)
- 修复了许多可靠性 bug、便利性问题和令人烦恼的问题。
+- 我们向用户界面添加了许多之前仅存在于 JSON 文件中的设置，包括用于自定义“新建标签页”菜单布局的新页面!
+- 我们已重新架构窗口管理以提高可靠性; 请使用 wt.exe 别名提交您遇到的任何错误
+- 配置文件如果已被隐藏或引用了已卸载的程序，现在会显示一个图标。

 有关其他详细信息，请参阅我们的 GitHub 发布页面。
  </ReleaseNotes>
--- a/build/StoreSubmission/Stable/PDPs/zh-TW/PDP.xml
+++ b/build/StoreSubmission/Stable/PDPs/zh-TW/PDP.xml
@@ -54,16 +54,13 @@
    
  </DevStudio>
  <ReleaseNotes>
-    版本 __VERSION_NUMBER__
+    Version __VERSION_NUMBER__

- 我們已重寫主機應用程式在終端機內託管的方式!請報告您遇到的錯誤。
- 終端機現在支援 Sixels!
- 現在，您可以開啟包含已儲存命令程式碼片段的固定面板，以供稍後使用
- 最新 Windows 11 版本中的 [命令提示] 使用者可能會看到「快速提示」圖示，建議可自 WinGet 安裝的軟體
- 選取的文字現在會更明顯 (且可自訂!)
- 已修正一些可靠性錯誤、便利性問題和令人困擾的問題。
+- 我們已在使用者介面中新增數十個曾經僅存在於 JSON 檔案中的設定，包括一個可自訂新索引標籤選單版面配置的新頁面!
+- 我們已重新架構視窗管理以提升可靠性; 如果您在使用 wt.exe 別名時遇到任何錯誤，請提交錯誤回報
+- 如果設定檔已隱藏或參照已解除安裝的程式，現在會顯示圖示。

-如需更多詳細資訊，請參閱我們的 GitHub 發行頁面。
+如需更多詳細資料，請參閱我們的 GitHub 發行版本頁面。
  </ReleaseNotes>
  <ScreenshotCaptions>
    <!-- Valid length: 200 character limit, up to 9 elements per platform -->
--- a/build/config/GitCheckin.json
+++ b/build/config/GitCheckin.json
@@ -4,7 +4,7 @@
        "collection": "microsoft",
        "project": "OS",
        "repo": "os.2020",
-        "name": "official/ge_current_directwinpd_deep",
+        "name": "official/rs_we_adept_e4d2",
        "workitem": "38106206",
        "CheckinFiles": [
          {
--- a/build/config/esrp.build.batch.terminal_constituents.json
+++ b/build/config/esrp.build.batch.terminal_constituents.json
@@ -17,6 +17,7 @@
            "PackageContents/WindowsTerminalShellExt.dll",

            // The rest
+            "PackageContents/TerminalAzBridge.exe",
            "PackageContents/wt.exe",
            "PackageContents/WindowsTerminal.exe",
            "PackageContents/elevate-shim.exe"
--- a/build/pgo/Terminal.PGO.props
+++ b/build/pgo/Terminal.PGO.props
@@ -9,7 +9,7 @@

  <PropertyGroup>
    <!-- Optional, defaults to main.  Name of the branch which will be used for calculating branch point. -->
-    <PGOBranch>release-1.24</PGOBranch>
+    <PGOBranch>main</PGOBranch>

    <!-- Mandatory.  Name of the NuGet package which will contain PGO databases for consumption by build system. -->
    <PGOPackageName>Microsoft.Internal.Windows.Terminal.PGODatabase</PGOPackageName>
--- a/build/pipelines/ob-release.yml
+++ b/build/pipelines/ob-release.yml
@@ -53,12 +53,8 @@ parameters:
    displayName: "Publish Symbols to MSDL"
    type: boolean
    default: true
-  - name: createVpack
-    displayName: "Create a VPack for Windows"
-    type: boolean
-    default: false
  - name: publishVpackToWindows
-    displayName: "Publish above VPack to Windows"
+    displayName: "Publish VPack to Windows"
    type: boolean
    default: false

@@ -93,7 +89,6 @@ extends:
      clientId: $(SigningOriginalClientId)
    terminalInternalPackageVersion: ${{ parameters.terminalInternalPackageVersion }}
    publishSymbolsToPublic: ${{ parameters.publishSymbolsToPublic }}
-    createVpack: ${{ parameters.createVpack }}
    publishVpackToWindows: ${{ parameters.publishVpackToWindows }}
    symbolPublishingSubscription: $(SymbolPublishingServiceConnection)
    symbolPublishingProject: $(SymbolPublishingProject)
--- a/build/pipelines/pgo.yml
+++ b/build/pipelines/pgo.yml
@@ -50,7 +50,6 @@ stages:
          buildEverything: true
          pgoBuildMode: Instrument
          artifactStem: -instrumentation
-          keepAllExpensiveBuildOutputs: false # the ARM64 build agent runs out of memory downloading the artifacts...

  - stage: RunPGO
    displayName: Run PGO
--- a/build/pipelines/templates-v2/job-pgo-build-nuget-and-publish.yml
+++ b/build/pipelines/templates-v2/job-pgo-build-nuget-and-publish.yml
@@ -26,7 +26,6 @@ jobs:
    pgoToolsPath: $(Build.SourcesDirectory)\build\PGO
    nuspecPath: $(pgoToolsPath)\NuSpecs
    nuspecFilename: PGO.nuspec
-    nugetFeed: "https://pkgs.dev.azure.com/shine-oss/terminal/_packaging/TerminalDependencies/nuget/v3/index.json"

  steps:
  - checkout: self
@@ -46,8 +45,7 @@ jobs:

  - task: NuGetAuthenticate@1
    inputs:
-      azureDevOpsServiceConnection: 'Terminal Public Artifact Feed'
-      feedUrl: $(nugetFeed)
+      nuGetServiceConnections: 'Terminal Public Artifact Feed'

  # In the Microsoft Azure DevOps tenant, NuGetCommand is ambiguous.
  # This should be `task: NuGetCommand@2`
@@ -70,7 +68,15 @@ jobs:
    artifact: pgo-nupkg-${{ parameters.buildConfiguration }}${{ parameters.artifactStem }}
    displayName: "Publish Pipeline Artifact"

-  - pwsh: |-
-      $nupkg = Get-Item "$(Build.ArtifactStagingDirectory)/*.nupkg"
-      & nuget push -ApiKey az -Source "$(nugetFeed)" "$nupkg"
-    displayName: NuGet push
+  - task: 333b11bd-d341-40d9-afcf-b32d5ce6f23b@2
+    displayName: 'NuGet push'
+    inputs:
+      command: push
+      nuGetFeedType: external
+      packagesToPush: $(Build.ArtifactStagingDirectory)/*.nupkg
+      # The actual URL and PAT for this feed is configured at
+      # https://microsoft.visualstudio.com/Dart/_settings/adminservices
+      # This is the name of that connection
+      publishFeedCredentials: 'Terminal Public Artifact Feed'
+      feedsToUse: config
+      nugetConfigPath: '$(Build.SourcesDirectory)/NuGet.config'
--- a/build/pipelines/templates-v2/job-run-pgo-tests.yml
+++ b/build/pipelines/templates-v2/job-run-pgo-tests.yml
@@ -45,10 +45,6 @@ jobs:
    displayName: Extract the unpackaged build for PGO

  - template: steps-ensure-nuget-version.yml
-    parameters:
-      ${{ if eq(parameters.buildPlatform, 'arm64') }}:
-        # The ARM64 agents do not seem to have NuGet installed
-        forceNugetInstallation: true

  - powershell: |-
      $Package = 'Microsoft.Internal.Windows.Terminal.TestContent'
--- a/build/pipelines/templates-v2/pipeline-onebranch-full-release-build.yml
+++ b/build/pipelines/templates-v2/pipeline-onebranch-full-release-build.yml
@@ -49,9 +49,6 @@ parameters:
  - name: symbolExpiryTime
    type: string
    default: 36530 # This is the default from PublishSymbols@2
-  - name: createVpack
-    type: boolean
-    default: false
  - name: publishVpackToWindows
    type: boolean
    default: false
@@ -195,8 +192,8 @@ extends:
                  ob_outputDirectory: $(JobOutputDirectory)
                  ob_artifactBaseName: $(JobOutputArtifactName)
                  ### This job is also in charge of submitting the vpack to Windows if it's enabled
-                  ob_createvpack_enabled: ${{ and(parameters.buildTerminal, parameters.createVpack) }}
-                  ob_updateOSManifest_enabled: ${{ and(parameters.buildTerminal, parameters.createVpack, parameters.publishVpackToWindows) }}
+                  ob_createvpack_enabled: ${{ and(parameters.buildTerminal, parameters.publishVpackToWindows) }}
+                  ob_updateOSManifest_enabled: ${{ and(parameters.buildTerminal, parameters.publishVpackToWindows) }}
                  ### If enabled above, these options are in play.
                  ob_createvpack_packagename: 'WindowsTerminal.app'
                  ob_createvpack_owneralias: 'conhost@microsoft.com'
@@ -210,8 +207,6 @@ extends:
                  ob_createvpack_taskLogVerbosity: Detailed
                  ob_createvpack_verbose: true
                  ob_createvpack_vpackdirectory: '$(JobOutputDirectory)\vpack'
-                  ob_createvpack_versionAs: string
-                  ob_createvpack_version: '$(XES_PACKAGEVERSIONNUMBER)'
                  ob_updateOSManifest_gitcheckinConfigPath: '$(Build.SourcesDirectory)\build\config\GitCheckin.json'
                  # We're skipping the 'fetch' part of the OneBranch rules, but that doesn't mean
                  # that it doesn't expect to have downloaded a manifest directly to some 'destination'
@@ -234,7 +229,7 @@ extends:
                      New-Item "$(JobOutputDirectory)/vpack" -Type Directory
                    displayName: Make sure the vpack directory exists

-                  - ${{ if parameters.createVpack }}:
+                  - ${{ if parameters.publishVpackToWindows }}:
                    - pwsh: |-
                        Copy-Item -Verbose -Path "$(MsixBundlePath)" -Destination (Join-Path "$(JobOutputDirectory)/vpack" 'Microsoft.WindowsTerminal_8wekyb3d8bbwe.msixbundle')
                      displayName: Stage msixbundle for vpack
--- a/build/pipelines/templates-v2/steps-ensure-nuget-version.yml
+++ b/build/pipelines/templates-v2/steps-ensure-nuget-version.yml
@@ -1,10 +1,5 @@
-parameters:
-  - name: forceNugetInstallation
-    type: boolean
-    default: false
-
 steps:
- ${{ if and(ne(parameters.forceNugetInstallation, true), eq(variables['System.CollectionId'], 'cb55739e-4afe-46a3-970f-1b49d8ee7564')) }}:
+- ${{ if eq(variables['System.CollectionId'], 'cb55739e-4afe-46a3-970f-1b49d8ee7564') }}:
  - pwsh: |-
      Write-Host "Assuming NuGet is already installed..."
      & nuget.exe help
@@ -12,6 +7,6 @@ steps:

 - ${{ else }}:
  - task: NuGetToolInstaller@1
-    displayName: Use NuGet 7.0.1
+    displayName: Use NuGet 6.6.1
    inputs:
-      versionSpec: 7.0.1
+      versionSpec: 6.6.1
--- a/custom.props
+++ b/custom.props
@@ -5,7 +5,7 @@
    <XesUseOneStoreVersioning>true</XesUseOneStoreVersioning>
    <XesBaseYearForStoreVersion>2025</XesBaseYearForStoreVersion>
    <VersionMajor>1</VersionMajor>
-    <VersionMinor>24</VersionMinor>
+    <VersionMinor>25</VersionMinor>
    <VersionInfoProductName>Windows Terminal</VersionInfoProductName>
    <VersionInfoCulture>1033</VersionInfoCulture>
    <!-- The default has a spacing problem -->
--- a/doc/cascadia/profiles.schema.json
+++ b/doc/cascadia/profiles.schema.json
@@ -2302,15 +2302,8 @@
      "additionalProperties": false,
      "properties": {
        "id": {
-          "description": "The ID of the command this keybinding should execute (or null to disable a default).",
-          "oneOf": [
-            {
-              "type": "string"
-            },
-            {
-              "type": "null"
-            }
-          ]
+          "description": "The ID of the command this keybinding should execute.",
+          "type": "string"
        },
        "keys": {
          "description": "Defines the key combinations used to call the command. It must be composed of...\n -any number of modifiers (ctrl/alt/shift)\n -a non-modifier key",
@@ -2466,7 +2459,6 @@
          "description": "Direct3D 11 provides a more performant and feature-rich experience, whereas Direct2D is more stable. The default option \"Automatic\" will pick the API that best fits your graphics hardware. If you experience significant issues, consider using Direct2D.",
          "type": "string",
          "enum": [
-            "automatic",
            "direct2d",
            "direct3d11"
          ]
@@ -2480,9 +2472,8 @@
          "type": "boolean"
        },
        "experimental.input.forceVT": {
-          "type": "boolean",
-          "description": "[Deprecated] Replaced with the \"compatibility.input.forceVT\" profile setting.",
-          "deprecated": true
+          "description": "Force the terminal to use the legacy input encoding. Certain keys in some applications may stop working when enabling this setting.",
+          "type": "boolean"
        },
        "experimental.useBackgroundImageForWindow": {
          "default": false,
@@ -2529,14 +2520,14 @@
          "type": "string"
        },
        "rowsToScroll": {
+          "default": "system",
+          "description": "This parameter once allowed you to override the systemwide \"choose how many lines to scroll at one time\" setting. It no longer does so. However, you can customize the number of lines to scroll in \"scrollUp\" and \"scrollDown\" bindings.",
+          "maximum": 999,
+          "minimum": 0,
          "type": [
            "integer",
            "string"
          ],
-          "description": "[Deprecated] This setting no longer has any effect. However, you can customize the number of lines to scroll using the \"rowsToScroll\" argument on the \"scrollUp\" and \"scrollDown\" actions.",
-          "default": "system",
-          "minimum": 0,
-          "maximum": 999,
          "deprecated": true
        },
        "minimizeToNotificationArea": {
@@ -2582,12 +2573,9 @@
          "$ref": "#/$defs/NewTabMenu"
        },
        "language": {
-          "type": [
-            "string",
-            "null"
-          ],
+          "default": "",
          "description": "Sets an override for the app's preferred language, expressed as a BCP-47 language tag like en-US.",
-          "default": null
+          "type": "string"
        },
        "theme": {
          "default": "dark",
@@ -2651,19 +2639,19 @@
          "type": "boolean"
        },
        "useTabSwitcher": {
-          "description": "[Deprecated] Replaced with the \"tabSwitcherMode\" setting.",
          "default": true,
+          "description": "Deprecated. Please use \"tabSwitcherMode\" instead.",
          "oneOf": [
            {
              "type": "boolean"
            },
            {
-              "type": "string",
              "enum": [
                "mru",
                "inOrder",
                "disabled"
-              ]
+              ],
+              "type": "string"
            }
          ],
          "deprecated": true
@@ -2720,12 +2708,12 @@
      "type": "object",
      "properties": {
        "acrylicOpacity": {
-          "type": "number",
-          "description": "[Deprecated] Replaced with the \"opacity\" setting.",
          "default": 0.5,
-          "minimum": 0,
+          "description": "[deprecated] Please use `opacity` instead.",
+          "deprecated": true,
          "maximum": 1,
-          "deprecated": true
+          "minimum": 0,
+          "type": "number"
        },
        "antialiasingMode": {
          "default": "grayscale",
@@ -2751,11 +2739,6 @@
          "description": "When set to true, when opening a new tab or pane it will get reloaded environment variables.",
          "type": "boolean"
        },
-        "compatibility.input.forceVT": {
-          "default": false,
-          "description": "Force the terminal to use the legacy input encoding. Certain keys in some applications may stop working when enabling this setting.",
-          "type": "boolean"
-        },
        "compatibility.allowDECRQCRA": {
          "default": false,
          "description": "When set to true, the terminal will support the DECRQCRA (Request Checksum of Rectangular Area) escape sequence.",
@@ -2927,29 +2910,24 @@
          "type": "boolean"
        },
        "experimental.autoMarkPrompts": {
-          "type": "boolean",
-          "description": "[Deprecated] Replaced with the \"autoMarkPrompts\" setting.",
-          "deprecated": true
+          "deprecated": true,
+          "description": "This has been replaced by autoMarkPrompts in 1.21",
+          "type": "boolean"
        },
        "experimental.retroTerminalEffect": {
          "description": "When set to true, enable retro terminal effects. This is an experimental feature, and its continued existence is not guaranteed.",
          "type": "boolean"
        },
        "experimental.showMarksOnScrollbar": {
-          "type": "boolean",
-          "description": "[Deprecated] Replaced with the \"showMarksOnScrollbar\" setting.",
-          "deprecated": true
+          "deprecated": true,
+          "description": "This has been replaced by showMarksOnScrollbar in 1.21",
+          "type": "boolean"
        },
        "showMarksOnScrollbar": {
          "default": false,
          "description": "When set to true, marks added to the buffer via the addMark action will appear on the scrollbar.",
          "type": "boolean"
        },
-        "experimental.rainbowSuggestions": {
-          "type": "boolean",
-          "description": "Enables displaying command suggestions in the terminal in RGB (all the colors of the rainbow!).",
-          "default": false
-        },
        "experimental.rightClickContextMenu": {
          "default": false,
          "description": "When true, right-click shows a context menu; otherwise, it pastes from the clipboard or copies selection.",
@@ -2965,29 +2943,23 @@
          "type": "string"
        },
        "fontFace": {
-          "type": "string",
-          "description": "[Deprecated] Replaced with the \"face\" setting within the \"font\" object.",
          "default": "Cascadia Mono",
+          "description": "[deprecated] Define 'face' within the 'font' object instead.",
+          "type": "string",
          "deprecated": true
        },
        "fontSize": {
-          "type": "number",
-          "description": "[Deprecated] Replaced with the \"size\" setting within the \"font\" object.",
          "default": 12,
+          "description": "[deprecated] Define 'size' within the 'font' object instead.",
          "minimum": 1,
+          "type": "number",
          "deprecated": true
        },
        "fontWeight": {
-          "description": "[Deprecated] Replaced with the \"weight\" setting within the \"font\" object.",
          "default": "normal",
+          "description": "[deprecated] Define 'weight' within the 'font' object instead.",
          "oneOf": [
            {
-              "type": "integer",
-              "minimum": 100,
-              "maximum": 990
-            },
-            {
-              "type": "string",
              "enum": [
                "thin",
                "extra-light",
@@ -3000,7 +2972,13 @@
                "extra-bold",
                "black",
                "extra-black"
-              ]
+              ],
+              "type": "string"
+            },
+            {
+              "maximum": 990,
+              "minimum": 100,
+              "type": "integer"
            }
          ],
          "deprecated": true
@@ -3111,10 +3089,7 @@
        },
        "answerbackMessage": {
          "description": "The response that is sent when an ENQ control character is received.",
-          "type": [
-            "string",
-            "null"
-          ]
+          "type": "string"
        },
        "source": {
          "description": "Stores the name of the profile generator that originated this profile.",
--- a/src/cascadia/CascadiaPackage/CascadiaPackage.wapproj
+++ b/src/cascadia/CascadiaPackage/CascadiaPackage.wapproj
@@ -77,6 +77,9 @@
    <ProjectReference Include="$(OpenConsoleDir)src\cascadia\WindowsTerminal\WindowsTerminal.vcxproj">
      <Project>{CA5CAD1A-1754-4A9D-93D7-857A9D17CB1B}</Project>
    </ProjectReference>
+    <ProjectReference Include="$(OpenConsoleDir)src\cascadia\TerminalAzBridge\TerminalAzBridge.vcxproj">
+      <Project>{067F0A06-FCB7-472C-96E9-B03B54E8E18D}</Project>
+    </ProjectReference>
    <ProjectReference Include="$(OpenConsoleDir)src\cascadia\ShellExtension\WindowsTerminalShellExt.vcxproj">
      <Project>{f2ed628a-db22-446f-a081-4cc845b51a2b}</Project>
    </ProjectReference>
--- a/src/cascadia/TerminalApp/AppActionHandlers.cpp
+++ b/src/cascadia/TerminalApp/AppActionHandlers.cpp
@@ -900,10 +900,7 @@ namespace winrt::TerminalApp::implementation
            co_return;
        }

-        // ShellExecuteExW may block, so do it on a background thread.
-        //
-        // NOTE: All remaining code of this function doesn't touch `this`, so we don't need weak/strong_ref.
-        // NOTE NOTE: Don't touch `this` when you make changes here.
+        // Hop to the BG thread
        co_await winrt::resume_background();

        // This will get us the correct exe for dev/preview/release. If you
@@ -1456,8 +1453,6 @@ namespace winrt::TerminalApp::implementation

    safe_void_coroutine TerminalPage::_doHandleSuggestions(SuggestionsArgs realArgs)
    {
-        const auto weak = get_weak();
-        const auto dispatcher = Dispatcher();
        const auto source = realArgs.Source();
        std::vector<Command> commandsCollection;
        Control::CommandHistoryContext context{ nullptr };
@@ -1524,12 +1519,7 @@ namespace winrt::TerminalApp::implementation
            }
        }

-        co_await wil::resume_foreground(dispatcher);
-        const auto strong = weak.get();
-        if (!strong)
-        {
-            co_return;
-        }
+        co_await wil::resume_foreground(Dispatcher());

        // Open the palette with all these commands in it.
        _OpenSuggestions(_GetActiveControl(),
--- a/src/cascadia/TerminalApp/AppLogic.cpp
+++ b/src/cascadia/TerminalApp/AppLogic.cpp
@@ -150,9 +150,7 @@ namespace winrt::TerminalApp::implementation
            });

        _languageProfileNotifier = winrt::make_self<LanguageProfileNotifier>([this]() {
-            // TODO: This is really bad, because we reset any current user customizations.
-            // See GH#11522.
-            ReloadSettingsThrottled();
+            _reloadSettings->Run();
        });

        // Do this here, rather than at the top of main. This will prevent us from
@@ -332,7 +330,7 @@ namespace winrt::TerminalApp::implementation

                if (modifiedBasename == settingsBasename)
                {
-                    ReloadSettingsThrottled();
+                    _reloadSettings->Run();
                }
            });
    }
@@ -438,11 +436,6 @@ namespace winrt::TerminalApp::implementation
        SettingsChanged.raise(*this, *ev);
    }

-    void AppLogic::ReloadSettingsThrottled()
-    {
-        _reloadSettings->Run();
-    }
-
    // This is a continuation of AppLogic::Create() and includes the more expensive parts.
    void AppLogic::NotifyRootInitialized()
    {
--- a/src/cascadia/TerminalApp/AppLogic.h
+++ b/src/cascadia/TerminalApp/AppLogic.h
@@ -36,7 +36,6 @@ namespace winrt::TerminalApp::implementation
        bool IsRunningElevated() const noexcept;
        bool CanDragDrop() const noexcept;
        void ReloadSettings();
-        void ReloadSettingsThrottled();
        void NotifyRootInitialized();

        bool HasSettingsStartupActions() const noexcept;
@@ -81,6 +80,7 @@ namespace winrt::TerminalApp::implementation
        [[nodiscard]] HRESULT _TryLoadSettings() noexcept;
        void _ProcessLazySettingsChanges();
        void _RegisterSettingsChange();
+        safe_void_coroutine _DispatchReloadSettings();

        void _setupFolderPathEnvVar();

--- a/src/cascadia/TerminalApp/AppLogic.idl
+++ b/src/cascadia/TerminalApp/AppLogic.idl
@@ -25,7 +25,6 @@ namespace TerminalApp
        Boolean HasSettingsStartupActions();

        void ReloadSettings();
-        void ReloadSettingsThrottled();
        Microsoft.Terminal.Settings.Model.CascadiaSettings Settings { get; };

        TerminalWindow CreateNewWindow();
--- a/src/cascadia/TerminalApp/CommandPalette.cpp
+++ b/src/cascadia/TerminalApp/CommandPalette.cpp
@@ -929,17 +929,6 @@ namespace winrt::TerminalApp::implementation
    void CommandPalette::_filterTextChanged(const IInspectable& /*sender*/,
                                            const Windows::UI::Xaml::RoutedEventArgs& /*args*/)
    {
-        // GH#18737: Only respond to this change if we are visible:
-        // _close calls _searchBox().Text(L"") to reset the search text, which lands us
-        // in here after the command palette is dismissed. Since we have a code path here that
-        // could potentially lead to an action being previewed (specifically if there is a
-        // preview-able action as the first entry in the command list), that preview will
-        // appear after the palette is dismissed without this check.
-        if (Visibility() != Visibility::Visible)
-        {
-            return;
-        }
-
        // When we are executing the _SelectNextTab in the TabManagement.cpp, this method
        // is getting triggered because we set up the default value for that CommandPalette
        // with an empty string. Therefore, to avoid the reset of the index when executing
--- a/src/cascadia/TerminalApp/DebugTapConnection.cpp
+++ b/src/cascadia/TerminalApp/DebugTapConnection.cpp
@@ -34,15 +34,9 @@ namespace winrt::Microsoft::TerminalApp::implementation
            // before actually starting the connection to the client app. This
            // will ensure both controls are initialized before the client app
            // is.
-            const auto weak = get_weak();
            co_await winrt::resume_background();
-            const auto strong = weak.get();
-            if (!strong)
-            {
-                co_return;
-            }
-
            _pairedTap->_start.wait();
+
            _wrappedConnection.Start();
        }
        void WriteInput(const winrt::array_view<const char16_t> buffer)
--- a/src/cascadia/TerminalApp/Jumplist.cpp
+++ b/src/cascadia/TerminalApp/Jumplist.cpp
@@ -43,9 +43,6 @@ safe_void_coroutine Jumplist::UpdateJumplist(const CascadiaSettings& settings) n
    // make sure to capture the settings _before_ the co_await
    const auto strongSettings = settings;

-    // Explorer APIs may block, so do it on a background thread.
-    //
-    // NOTE: Jumplist has no members, so we don't need to hold onto `this` here.
    co_await winrt::resume_background();

    try
--- a/src/cascadia/TerminalApp/MinMaxCloseControl.cpp
+++ b/src/cascadia/TerminalApp/MinMaxCloseControl.cpp
@@ -89,18 +89,6 @@ namespace winrt::TerminalApp::implementation
        CloseClick.raise(*this, e);
    }

-    bool MinMaxCloseControl::Focused() const
-    {
-        return _focused;
-    }
-
-    void MinMaxCloseControl::Focused(bool focused)
-    {
-        _focused = focused;
-
-        ReleaseButtons();
-    }
-
    void MinMaxCloseControl::SetWindowVisualState(WindowVisualState visualState)
    {
        // Look up the heights we should use for the caption buttons from our
@@ -182,25 +170,25 @@ namespace winrt::TerminalApp::implementation
            // animate the fade in/out transition between colors.
        case CaptionButton::Minimize:
            VisualStateManager::GoToState(MinimizeButton(), L"PointerOver", true);
-            VisualStateManager::GoToState(MaximizeButton(), _normalState(), true);
-            VisualStateManager::GoToState(CloseButton(), _normalState(), true);
+            VisualStateManager::GoToState(MaximizeButton(), L"Normal", true);
+            VisualStateManager::GoToState(CloseButton(), L"Normal", true);

            _displayToolTip->Run(MinimizeButton());
            closeToolTipForButton(MaximizeButton());
            closeToolTipForButton(CloseButton());
            break;
        case CaptionButton::Maximize:
-            VisualStateManager::GoToState(MinimizeButton(), _normalState(), true);
+            VisualStateManager::GoToState(MinimizeButton(), L"Normal", true);
            VisualStateManager::GoToState(MaximizeButton(), L"PointerOver", true);
-            VisualStateManager::GoToState(CloseButton(), _normalState(), true);
+            VisualStateManager::GoToState(CloseButton(), L"Normal", true);

            closeToolTipForButton(MinimizeButton());
            _displayToolTip->Run(MaximizeButton());
            closeToolTipForButton(CloseButton());
            break;
        case CaptionButton::Close:
-            VisualStateManager::GoToState(MinimizeButton(), _normalState(), true);
-            VisualStateManager::GoToState(MaximizeButton(), _normalState(), true);
+            VisualStateManager::GoToState(MinimizeButton(), L"Normal", true);
+            VisualStateManager::GoToState(MaximizeButton(), L"Normal", true);
            VisualStateManager::GoToState(CloseButton(), L"PointerOver", true);

            closeToolTipForButton(MinimizeButton());
@@ -223,17 +211,17 @@ namespace winrt::TerminalApp::implementation
        {
        case CaptionButton::Minimize:
            VisualStateManager::GoToState(MinimizeButton(), L"Pressed", true);
-            VisualStateManager::GoToState(MaximizeButton(), _normalState(), true);
-            VisualStateManager::GoToState(CloseButton(), _normalState(), true);
+            VisualStateManager::GoToState(MaximizeButton(), L"Normal", true);
+            VisualStateManager::GoToState(CloseButton(), L"Normal", true);
            break;
        case CaptionButton::Maximize:
-            VisualStateManager::GoToState(MinimizeButton(), _normalState(), true);
+            VisualStateManager::GoToState(MinimizeButton(), L"Normal", true);
            VisualStateManager::GoToState(MaximizeButton(), L"Pressed", true);
-            VisualStateManager::GoToState(CloseButton(), _normalState(), true);
+            VisualStateManager::GoToState(CloseButton(), L"Normal", true);
            break;
        case CaptionButton::Close:
-            VisualStateManager::GoToState(MinimizeButton(), _normalState(), true);
-            VisualStateManager::GoToState(MaximizeButton(), _normalState(), true);
+            VisualStateManager::GoToState(MinimizeButton(), L"Normal", true);
+            VisualStateManager::GoToState(MaximizeButton(), L"Normal", true);
            VisualStateManager::GoToState(CloseButton(), L"Pressed", true);
            break;
        }
@@ -246,9 +234,9 @@ namespace winrt::TerminalApp::implementation
    void MinMaxCloseControl::ReleaseButtons()
    {
        _displayToolTip->Run(nullptr);
-        VisualStateManager::GoToState(MinimizeButton(), _normalState(), true);
-        VisualStateManager::GoToState(MaximizeButton(), _normalState(), true);
-        VisualStateManager::GoToState(CloseButton(), _normalState(), true);
+        VisualStateManager::GoToState(MinimizeButton(), L"Normal", true);
+        VisualStateManager::GoToState(MaximizeButton(), L"Normal", true);
+        VisualStateManager::GoToState(CloseButton(), L"Normal", true);

        closeToolTipForButton(MinimizeButton());
        closeToolTipForButton(MaximizeButton());
@@ -256,11 +244,4 @@ namespace winrt::TerminalApp::implementation

        _lastPressedButton = std::nullopt;
    }
-
-    const winrt::param::hstring& MinMaxCloseControl::_normalState() const
-    {
-        static const winrt::param::hstring normal = L"Normal";
-        static const winrt::param::hstring unfocused = L"Unfocused";
-        return (_focused ? normal : unfocused);
-    }
 }
--- a/src/cascadia/TerminalApp/MinMaxCloseControl.h
+++ b/src/cascadia/TerminalApp/MinMaxCloseControl.h
@@ -21,9 +21,6 @@ namespace winrt::TerminalApp::implementation
        void PressButton(CaptionButton button);
        void ReleaseButtons();

-        bool Focused() const;
-        void Focused(bool focused);
-
        void _MinimizeClick(const winrt::Windows::Foundation::IInspectable& sender,
                            const winrt::Windows::UI::Xaml::RoutedEventArgs& e);
        void _MaximizeClick(const winrt::Windows::Foundation::IInspectable& sender,
@@ -35,12 +32,8 @@ namespace winrt::TerminalApp::implementation
        til::typed_event<TerminalApp::MinMaxCloseControl, winrt::Windows::UI::Xaml::RoutedEventArgs> MaximizeClick;
        til::typed_event<TerminalApp::MinMaxCloseControl, winrt::Windows::UI::Xaml::RoutedEventArgs> CloseClick;

-        bool _focused{ false };
        std::shared_ptr<ThrottledFunc<winrt::Windows::UI::Xaml::Controls::Button>> _displayToolTip{ nullptr };
        std::optional<CaptionButton> _lastPressedButton{ std::nullopt };
-
-    private:
-        const winrt::param::hstring& _normalState() const;
    };
 }

--- a/src/cascadia/TerminalApp/MinMaxCloseControl.idl
+++ b/src/cascadia/TerminalApp/MinMaxCloseControl.idl
@@ -14,7 +14,6 @@ namespace TerminalApp
        void HoverButton(CaptionButton button);
        void PressButton(CaptionButton button);
        void ReleaseButtons();
-        Boolean Focused { get; set; };

        event Windows.Foundation.TypedEventHandler<MinMaxCloseControl, Windows.UI.Xaml.RoutedEventArgs> MinimizeClick;
        event Windows.Foundation.TypedEventHandler<MinMaxCloseControl, Windows.UI.Xaml.RoutedEventArgs> MaximizeClick;
--- a/src/cascadia/TerminalApp/MinMaxCloseControl.xaml
+++ b/src/cascadia/TerminalApp/MinMaxCloseControl.xaml
@@ -32,10 +32,6 @@
                                    ResourceKey="SystemControlForegroundBaseHighBrush" />
                    <StaticResource x:Key="CaptionButtonForegroundPressed"
                                    ResourceKey="SystemControlForegroundBaseHighBrush" />
-                    <StaticResource x:Key="CaptionButtonForegroundUnfocusedColor"
-                                    ResourceKey="TextFillColorDisabled" />
-                    <SolidColorBrush x:Key="CaptionButtonForegroundUnfocused"
-                                     Color="{ThemeResource CaptionButtonForegroundUnfocusedColor}" />
                    <SolidColorBrush x:Key="CaptionButtonBackground"
                                     Color="Transparent" />
                    <Color x:Key="CaptionButtonBackgroundColor">Transparent</Color>
@@ -70,10 +66,6 @@
                                    ResourceKey="SystemControlForegroundBaseHighBrush" />
                    <StaticResource x:Key="CaptionButtonForegroundPressed"
                                    ResourceKey="SystemControlForegroundBaseHighBrush" />
-                    <StaticResource x:Key="CaptionButtonForegroundUnfocusedColor"
-                                    ResourceKey="TextFillColorDisabled" />
-                    <SolidColorBrush x:Key="CaptionButtonForegroundUnfocused"
-                                     Color="{ThemeResource CaptionButtonForegroundUnfocusedColor}" />
                    <SolidColorBrush x:Key="CaptionButtonBackground"
                                     Color="Transparent" />
                    <Color x:Key="CaptionButtonBackgroundColor">Transparent</Color>
@@ -111,10 +103,6 @@
                                     Color="{ThemeResource SystemColorHighlightTextColor}" />
                    <SolidColorBrush x:Key="CaptionButtonForegroundPressed"
                                     Color="{ThemeResource SystemColorHighlightTextColor}" />
-                    <SolidColorBrush x:Key="CaptionButtonForegroundUnfocused"
-                                     Color="{ThemeResource SystemColorButtonTextColor}" />
-                    <StaticResource x:Key="CaptionButtonForegroundUnfocusedColor"
-                                    ResourceKey="SystemColorButtonTextColor" />
                    <SolidColorBrush x:Key="CloseButtonBackgroundPointerOver"
                                     Color="{ThemeResource SystemColorHighlightColor}" />
                    <SolidColorBrush x:Key="CloseButtonForegroundPointerOver"
@@ -201,20 +189,6 @@
                                                                    Duration="0:0:0.1" />
                                                </Storyboard>
                                            </VisualTransition>
-
-                                            <VisualTransition From="PointerOver"
-                                                              To="Unfocused">
-                                                <Storyboard>
-                                                    <ColorAnimation Storyboard.TargetName="ButtonBaseElement"
-                                                                    Storyboard.TargetProperty="(UIElement.Background).(SolidColorBrush.Color)"
-                                                                    To="{ThemeResource CaptionButtonBackgroundColor}"
-                                                                    Duration="0:0:0.15" />
-                                                    <ColorAnimation Storyboard.TargetName="ButtonIcon"
-                                                                    Storyboard.TargetProperty="(UIElement.Foreground).(SolidColorBrush.Color)"
-                                                                    To="{ThemeResource CaptionButtonForegroundUnfocusedColor}"
-                                                                    Duration="0:0:0.1" />
-                                                </Storyboard>
-                                            </VisualTransition>
                                        </VisualStateGroup.Transitions>

                                        <VisualState x:Name="Normal">
@@ -224,13 +198,6 @@
                                            </VisualState.Setters>
                                        </VisualState>

-                                        <VisualState x:Name="Unfocused">
-                                            <VisualState.Setters>
-                                                <Setter Target="ButtonBaseElement.Background" Value="{ThemeResource CaptionButtonBackground}" />
-                                                <Setter Target="ButtonIcon.Foreground" Value="{ThemeResource CaptionButtonForegroundUnfocused}" />
-                                            </VisualState.Setters>
-                                        </VisualState>
-
                                        <VisualState x:Name="PointerOver">
                                            <VisualState.Setters>
                                                <Setter Target="ButtonBaseElement.Background" Value="{ThemeResource CaptionButtonBackgroundPointerOver}" />
--- a/src/cascadia/TerminalApp/Remoting.cpp
+++ b/src/cascadia/TerminalApp/Remoting.cpp
@@ -44,6 +44,10 @@ namespace winrt::TerminalApp::implementation
    {
        _args = { value.begin(), value.end() };
        _parseResult = _parsed.ParseArgs(_args);
+        if (_parseResult == 0)
+        {
+            _parsed.ValidateStartupCommands();
+        }
    }

    winrt::com_array<winrt::hstring> CommandlineArgs::Commandline()
--- a/src/cascadia/TerminalApp/Resources/fr-FR/Resources.resw
+++ b/src/cascadia/TerminalApp/Resources/fr-FR/Resources.resw
@@ -887,7 +887,7 @@
    <value>Déplacer l'onglet vers une nouvelle fenêtre </value>
  </data>
  <data name="RunAsAdminFlyout.Text" xml:space="preserve">
-    <value>Exécuter en tant qu'administrateur (restreint)</value>
+    <value>Exécuter en temps qu'administrateur (restreint)</value>
    <comment>This text is displayed on context menu for profile entries in add new tab button.</comment>
  </data>
  <data name="TerminalPage_PaneMovedAnnouncement_ExistingTab" xml:space="preserve">
--- a/src/cascadia/TerminalApp/Resources/ja-JP/Resources.resw
+++ b/src/cascadia/TerminalApp/Resources/ja-JP/Resources.resw
@@ -185,7 +185,7 @@
    <value>終了</value>
  </data>
  <data name="MultiplePanes" xml:space="preserve">
-    <value>複数ペイン</value>
+    <value>複数ウィンドウ</value>
  </data>
  <data name="TabCloseSubMenu" xml:space="preserve">
    <value>閉じる</value>
@@ -203,13 +203,13 @@
    <value>タブを閉じる</value>
  </data>
  <data name="PaneClose" xml:space="preserve">
-    <value>ペインを閉じる</value>
+    <value>ウィンドウを閉じる</value>
  </data>
  <data name="SplitTabText" xml:space="preserve">
    <value>タブを分割</value>
  </data>
  <data name="SplitPaneText" xml:space="preserve">
-    <value>ペインを分割する</value>
+    <value>ウィンドウを分割する</value>
  </data>
  <data name="SplitPaneToolTipText" xml:space="preserve">
    <value>分割する方向を右クリック - 右/下/上/左</value>
@@ -230,7 +230,7 @@
    <value>複製</value>
  </data>
  <data name="SwapPaneText" xml:space="preserve">
-    <value>ペインを入れ替える</value>
+    <value>ウィンドウを入れ替える</value>
  </data>
  <data name="SwapPaneDownText" xml:space="preserve">
    <value>下とペインを入れ替え</value>
@@ -245,10 +245,10 @@
    <value>左とペインを入れ替え</value>
  </data>
  <data name="TogglePaneZoomText" xml:space="preserve">
-    <value>ペインのズームの切り替え</value>
+    <value>ウィンドウのズームの切り替え</value>
  </data>
  <data name="CloseOtherPanesText" xml:space="preserve">
-    <value>他のペインを閉じる</value>
+    <value>他のウィンドウを閉じる</value>
  </data>
  <data name="SearchWebText" xml:space="preserve">
    <value>Web 検索</value>
@@ -317,7 +317,7 @@
    <value>同じ名前ですが大文字と小文字が異なる環境変数が複数見つかりました。使用される値は 1 つだけです。</value>
  </data>
  <data name="CmdCommandArgDesc" xml:space="preserve">
-    <value>新しいタブまたはペインで生成されるオプションのコマンドと引数</value>
+    <value>新しいタブまたはウィンドウで生成されるオプションのコマンドと引数</value>
  </data>
  <data name="SaveSnippetDesc" xml:space="preserve">
    <value>コマンド ラインを入力アクションとして保存する</value>
@@ -345,17 +345,17 @@
    <value>指定されたインデックスのタブにフォーカスを移動する</value>
  </data>
  <data name="CmdMovePaneTabArgDesc" xml:space="preserve">
-    <value>フォーカスされたペインを指定されたインデックスのタブに移動する</value>
+    <value>フォーカスされたウィンドウを指定されたインデックスのタブに移動する</value>
  </data>
  <data name="CmdMovePaneDesc" xml:space="preserve">
-    <value>フォーカスされたペインを別のタブに移動する</value>
+    <value>フォーカスされたウィンドウを別のタブに移動する</value>
  </data>
  <data name="CmdMPDesc" xml:space="preserve">
    <value>"move-pane" サブコマンドのエイリアス。</value>
    <comment>{Locked="\"move-pane\""}</comment>
  </data>
  <data name="CmdSplitPaneSizeArgDesc" xml:space="preserve">
-    <value>サイズを親ペインに対する割合として指定します。有効な値は (0,1) の間で、排他的です。</value>
+    <value>サイズを親ウィンドウに対する割合として指定します。有効な値は (0,1) の間で、排他的です。</value>
  </data>
  <data name="CmdNewTabDesc" xml:space="preserve">
    <value>新しいタブの作成</value>
@@ -365,14 +365,14 @@
    <comment>{Locked="\"new-tab\""}</comment>
  </data>
  <data name="CmdFocusPaneDesc" xml:space="preserve">
-    <value>別のペインにフォーカスを移動する</value>
+    <value>別のウィンドウにフォーカスを移動する</value>
  </data>
  <data name="CmdFPDesc" xml:space="preserve">
    <value>"focus-pane" サブコマンドのエイリアス。</value>
    <comment>{Locked="\"focus-pane\""}</comment>
  </data>
  <data name="CmdFocusPaneTargetArgDesc" xml:space="preserve">
-    <value>指定されたインデックスのペインをフォーカスする</value>
+    <value>指定されたインデックスのウィンドウをフォーカスする</value>
  </data>
  <data name="CmdProfileArgDesc" xml:space="preserve">
    <value>指定されたプロファイルで開きます。プロファイルの名前または GUID を指定できます</value>
@@ -381,20 +381,20 @@
    <value>WT_SESSION 変数を設定します; GUID である必要があります</value>
  </data>
  <data name="CmdSplitPaneDesc" xml:space="preserve">
-    <value>新しい分割ペインの作成</value>
+    <value>新しい分割ウィンドウの作成</value>
  </data>
  <data name="CmdSPDesc" xml:space="preserve">
    <value>"split-pane" サブコマンドのエイリアス。</value>
    <comment>{Locked="\"split-pane\""}</comment>
  </data>
  <data name="CmdSplitPaneHorizontalArgDesc" xml:space="preserve">
-    <value>新しいペインを水平方向に分割して作成します ([-]と考えてください)</value>
+    <value>新しいウィンドウを水平方向に分割して作成します ([-]と考えてください)</value>
  </data>
  <data name="CmdSplitPaneVerticalArgDesc" xml:space="preserve">
-    <value>新しいペインを垂直方向に分割して作成します ([|]と考えてください)</value>
+    <value>新しいウィンドウを垂直方向に分割して作成します ([|]と考えてください)</value>
  </data>
  <data name="CmdSplitPaneDuplicateArgDesc" xml:space="preserve">
-    <value>フォーカスされたペインのプロファイルを複製して、新しいペインを作成します</value>
+    <value>フォーカスされたウィンドウのプロファイルを複製して、新しいウィンドウを作成します</value>
  </data>
  <data name="CmdStartingDirArgDesc" xml:space="preserve">
    <value>プロファイルの "startingDirectory" の設定ではなく、指定されたディレクトリで開きます</value>
@@ -412,7 +412,7 @@
    <comment>{Locked="\"tabTitle\""}</comment>
  </data>
  <data name="CmdInheritEnvDesc" xml:space="preserve">
-    <value>新しい環境ブロックを作成するのではなく、新しいタブまたはペインを作成するときに、ターミナル独自の環境変数を継承します。これは、"command" が渡されたときに既定で設定されます。 </value>
+    <value>新しい環境ブロックを作成するのではなく、新しいタブまたはウィンドウを作成するときに、ターミナル独自の環境変数を継承します。これは、"command" が渡されたときに既定で設定されます。 </value>
    <comment>{Locked="\"command\""}</comment>
  </data>
  <data name="CmdColorSchemeArgDesc" xml:space="preserve">
@@ -429,7 +429,7 @@
    <value>ウィンドウを全画面表示モードで起動する</value>
  </data>
  <data name="CmdMoveFocusDesc" xml:space="preserve">
-    <value>指定した方向にある隣のペインにフォーカスを移動する</value>
+    <value>指定した方向にある隣のウィンドウにフォーカスを移動する</value>
  </data>
  <data name="CmdMFDesc" xml:space="preserve">
    <value>"move-focus" サブコマンドのエイリアス。</value>
@@ -439,10 +439,10 @@
    <value>フォーカスを移動する方向</value>
  </data>
  <data name="CmdSwapPaneDesc" xml:space="preserve">
-    <value>フォーカスされたペインを、指定された方向の隣接するペインと入れ替える</value>
+    <value>フォーカスされたウィンドウを、指定された方向の隣接するウィンドウと入れ替える</value>
  </data>
  <data name="CmdSwapPaneDirectionArgDesc" xml:space="preserve">
-    <value>フォーカスされたペインを移動する方向</value>
+    <value>フォーカスされたウィンドウを移動する方向</value>
  </data>
  <data name="CmdFocusDesc" xml:space="preserve">
    <value>ウィンドウをフォーカス モードで起動</value>
@@ -857,7 +857,7 @@
    <value>設定ページを開きます</value>
  </data>
  <data name="SplitTabToolTip" xml:space="preserve">
-    <value>現在のディレクトリのアクティブなプロファイルを使用して新しいペインを開きます</value>
+    <value>現在のディレクトリのアクティブなプロファイルを使用して新しいウィンドウを開きます</value>
  </data>
  <data name="TabCloseAfterToolTip" xml:space="preserve">
    <value>このタブの右側にあるすべてのタブを閉じます</value>
@@ -872,10 +872,10 @@
    <value>なし</value>
  </data>
  <data name="ClosePaneText" xml:space="preserve">
-    <value>ペインを閉じる</value>
+    <value>ウィンドウを閉じる</value>
  </data>
  <data name="ClosePaneToolTip" xml:space="preserve">
-    <value>複数のペインが存在する場合は、アクティブなペインを閉じます</value>
+    <value>複数のウィンドウが存在する場合は、アクティブなウィンドウを閉じます</value>
  </data>
  <data name="TabColorClearButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.FullDescription" xml:space="preserve">
    <value>タブの色をリセット</value>
@@ -892,7 +892,7 @@
    <comment>This text is displayed on context menu for profile entries in add new tab button.</comment>
  </data>
  <data name="TerminalPage_PaneMovedAnnouncement_ExistingTab" xml:space="preserve">
-    <value>アクティブなペインを [{0}] タブに移動しました</value>
+    <value>アクティブなウィンドウを [{0}] タブに移動しました</value>
    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the tab the pane was moved to.</comment>
  </data>
  <data name="TerminalPage_TabMovedAnnouncement_Default" xml:space="preserve">
@@ -908,19 +908,19 @@
    <comment>{Locked="{0}"}{Locked="{1}"}This text is read out by screen readers upon a successful tab movement. {0} is the name of the tab. {1} is the new tab index in the tab row.</comment>
  </data>
  <data name="TerminalPage_PaneMovedAnnouncement_ExistingWindow" xml:space="preserve">
-    <value>アクティブなペインを "{1}" ウィンドウの [{0}] タブに移動しました</value>
+    <value>アクティブなウィンドウを "{1}" ウィンドウの [{0}] タブに移動しました</value>
    <comment>{Locked="{0}"}{Locked="{1}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the tab the pane was moved to. {1} is the name of the window the pane was moved to. Replaced in 1.19 by TerminalPage_PaneMovedAnnouncement_ExistingWindow2</comment>
  </data>
  <data name="TerminalPage_PaneMovedAnnouncement_ExistingWindow2" xml:space="preserve">
-    <value>アクティブなペインを "{0}" ウィンドウに移動しました</value>
+    <value>アクティブなウィンドウを "{0}" ウィンドウに移動しました</value>
    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the window the pane was moved to.</comment>
  </data>
  <data name="TerminalPage_PaneMovedAnnouncement_NewWindow" xml:space="preserve">
-    <value>アクティブなペインを新しいウィンドウに移動しました</value>
+    <value>アクティブなウィンドウを新しいウィンドウに移動しました</value>
    <comment>This text is read out by screen readers upon a successful pane movement to a new window.</comment>
  </data>
  <data name="TerminalPage_PaneMovedAnnouncement_NewTab" xml:space="preserve">
-    <value>アクティブなペインを新しいタブに移動しました</value>
+    <value>アクティブなウィンドウを新しいタブに移動しました</value>
    <comment>This text is read out by screen readers upon a successful pane movement to a new tab within the existing window.</comment>
  </data>
  <data name="CmdAppendCommandLineDesc" xml:space="preserve">
@@ -930,7 +930,7 @@
    <value>接続の再起動</value>
  </data>
  <data name="RestartConnectionToolTip" xml:space="preserve">
-    <value>アクティブ ペイン接続を再起動します</value>
+    <value>アクティブウィンドウ接続を再起動します</value>
  </data>
  <data name="SnippetPaneTitle.Text" xml:space="preserve">
    <value>抜粋</value>
@@ -961,10 +961,10 @@
    <value>操作の保存に失敗しました</value>
  </data>
  <data name="CloseSnippetsPaneButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
-    <value>ペインを閉じる</value>
+    <value>ウィンドウを閉じる</value>
  </data>
  <data name="CloseSnippetsPaneButton.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
-    <value>ペインを閉じる</value>
+    <value>ウィンドウを閉じる</value>
  </data>
  <data name="TabMoveLeft" xml:space="preserve">
    <value>左へ移動</value>
--- a/src/cascadia/TerminalApp/SnippetsPaneContent.cpp
+++ b/src/cascadia/TerminalApp/SnippetsPaneContent.cpp
@@ -48,22 +48,13 @@ namespace winrt::TerminalApp::implementation
    {
        _settings = settings;

-        const auto dispatcher = Dispatcher();
-        const auto weak = get_weak();
-
        // You'd think that `FilterToSendInput(queryString)` would work. It
        // doesn't! That uses the queryString as the current command the user
        // has typed, then relies on the suggestions UI to _also_ filter with that
        // string.

        const auto tasks = co_await _settings.GlobalSettings().ActionMap().FilterToSnippets(winrt::hstring{}, winrt::hstring{}); // IVector<Model::Command>
-        co_await wil::resume_foreground(dispatcher);
-
-        const auto strong = weak.get();
-        if (!strong)
-        {
-            co_return;
-        }
+        co_await wil::resume_foreground(Dispatcher());

        _allTasks.Clear();
        for (const auto& t : tasks)
--- a/src/cascadia/TerminalApp/Tab.cpp
+++ b/src/cascadia/TerminalApp/Tab.cpp
@@ -1062,6 +1062,7 @@ namespace winrt::TerminalApp::implementation
            dispatcher,
            til::throttled_func_options{
                .delay = std::chrono::milliseconds{ 200 },
+                .leading = true,
                .trailing = true,
            },
            [weakThis]() {
@@ -2417,7 +2418,7 @@ namespace winrt::TerminalApp::implementation
            const auto& currentDictionary = v.as<ResourceDictionary>();

            // TabViewItem.Background
-            currentDictionary.Insert(winrt::box_value(L"TabViewItemHeaderBackground"), selectedTabBrush);
+            currentDictionary.Insert(winrt::box_value(L"TabViewItemHeaderBackground"), deselectedTabBrush);
            currentDictionary.Insert(winrt::box_value(L"TabViewItemHeaderBackgroundSelected"), selectedTabBrush);
            currentDictionary.Insert(winrt::box_value(L"TabViewItemHeaderBackgroundPointerOver"), isHighContrast ? fontBrush : hoverTabBrush);
            currentDictionary.Insert(winrt::box_value(L"TabViewItemHeaderBackgroundPressed"), selectedTabBrush);
--- a/src/cascadia/TerminalApp/TabManagement.cpp
+++ b/src/cascadia/TerminalApp/TabManagement.cpp
@@ -157,7 +157,12 @@ namespace winrt::TerminalApp::implementation
        // Set this tab's icon to the icon from the content
        _UpdateTabIcon(*newTabImpl);

+        // This is necessary, because WinUI does not have support for middle clicks.
+        // Its Tapped event doesn't provide the information what button was used either.
        tabViewItem.PointerPressed({ this, &TerminalPage::_OnTabPointerPressed });
+        tabViewItem.PointerReleased({ this, &TerminalPage::_OnTabPointerReleased });
+        tabViewItem.PointerExited({ this, &TerminalPage::_OnTabPointerExited });
+        tabViewItem.PointerEntered({ this, &TerminalPage::_OnTabPointerEntered });

        // When the tab requests close, try to close it (prompt for approval, if required)
        newTabImpl->CloseRequested([weakTab, weakThis{ get_weak() }](auto&& /*s*/, auto&& /*e*/) {
@@ -397,18 +402,12 @@ namespace winrt::TerminalApp::implementation
    // - tab: the tab to remove
    winrt::Windows::Foundation::IAsyncAction TerminalPage::_HandleCloseTabRequested(winrt::TerminalApp::Tab tab)
    {
-        winrt::com_ptr<TerminalPage> strong;
-
        if (tab.ReadOnly())
        {
-            const auto weak = get_weak();
-
            auto warningResult = co_await _ShowCloseReadOnlyDialog();

-            strong = weak.get();
-
            // If the user didn't explicitly click on close tab - leave
-            if (!strong || warningResult != ContentDialogResult::Primary)
+            if (warningResult != ContentDialogResult::Primary)
            {
                co_return;
            }
@@ -665,7 +664,7 @@ namespace winrt::TerminalApp::implementation
    // Method Description:
    // - returns a tab corresponding to a view item. This might return null,
    //   so make sure to check the result!
-    winrt::TerminalApp::Tab TerminalPage::_GetTabByTabViewItem(const IInspectable& tabViewItem) const noexcept
+    winrt::TerminalApp::Tab TerminalPage::_GetTabByTabViewItem(const Microsoft::UI::Xaml::Controls::TabViewItem& tabViewItem) const noexcept
    {
        uint32_t tabIndexFromControl{};
        const auto items{ _tabView.TabItems() };
@@ -719,14 +718,10 @@ namespace winrt::TerminalApp::implementation
    {
        if (pane->ContainsReadOnly())
        {
-            const auto weak = get_weak();
-
            auto warningResult = co_await _ShowCloseReadOnlyDialog();

-            const auto strong = weak.get();
-
            // If the user didn't explicitly click on close tab - leave
-            if (!strong || warningResult != ContentDialogResult::Primary)
+            if (warningResult != ContentDialogResult::Primary)
            {
                co_return false;
            }
@@ -784,13 +779,9 @@ namespace winrt::TerminalApp::implementation

            if (const auto pane{ activeTab->GetActivePane() })
            {
-                const auto weak = get_weak();
                if (co_await _PaneConfirmCloseReadOnly(pane))
                {
-                    if (const auto strong = weak.get())
-                    {
-                        _HandleClosePaneRequested(pane);
-                    }
+                    _HandleClosePaneRequested(pane);
                }
            }
        }
@@ -848,22 +839,9 @@ namespace winrt::TerminalApp::implementation
    // - tabs - tabs to remove
    safe_void_coroutine TerminalPage::_RemoveTabs(const std::vector<winrt::TerminalApp::Tab> tabs)
    {
-        const auto weak = get_weak();
-
        for (auto& tab : tabs)
        {
-            winrt::Windows::Foundation::IAsyncAction action{ nullptr };
-            if (const auto strong = weak.get())
-            {
-                action = _HandleCloseTabRequested(tab);
-            }
-
-            if (!action)
-            {
-                co_return;
-            }
-
-            co_await action;
+            co_await _HandleCloseTabRequested(tab);
        }
    }
    // Method Description:
@@ -898,69 +876,60 @@ namespace winrt::TerminalApp::implementation
        _UpdateTabView();
    }

-    void TerminalPage::_OnTabPointerPressed(const IInspectable& sender, const Windows::UI::Xaml::Input::PointerRoutedEventArgs& e)
+    // Method Description:
+    // - Additional responses to clicking on a TabView's item. Currently, just remove tab with middle click
+    // Arguments:
+    // - sender: the control that originated this event (TabViewItem)
+    // - eventArgs: the event's constituent arguments
+    void TerminalPage::_OnTabPointerPressed(const IInspectable& sender, const Windows::UI::Xaml::Input::PointerRoutedEventArgs& eventArgs)
    {
-        if (!_tabItemMiddleClickHookEnabled || !e.GetCurrentPoint(nullptr).Properties().IsMiddleButtonPressed())
+        if (eventArgs.GetCurrentPoint(nullptr).Properties().IsMiddleButtonPressed())
        {
-            return;
-        }
-
-        const auto tabViewItem = sender.try_as<MUX::Controls::TabViewItem>();
-        if (!tabViewItem || !tabViewItem.CapturePointer(e.Pointer()))
-        {
-            return;
-        }
-
-        _tabItemMiddleClickExited = false;
-
-        _tabItemMiddleClickPointerEntered = tabViewItem.PointerEntered(winrt::auto_revoke, [this](auto&&, auto&& e) {
-            _tabItemMiddleClickExited = false;
-            e.Handled(true);
-        });
-        _tabItemMiddleClickPointerExited = tabViewItem.PointerExited(winrt::auto_revoke, [this](auto&&, auto&& e) {
-            _tabItemMiddleClickExited = true;
-            e.Handled(true);
-        });
-        _tabItemMiddleClickPointerCaptureLost = tabViewItem.PointerCaptureLost(winrt::auto_revoke, [this](auto&& sender, auto&& e) {
-            // The WinUI TabView calls CapturePointer() internally and it's not reference counted,
-            // so when it calls ReleasePointerCapture() in its PointerReleased handler,
-            // we get a PointerCaptureLost before we receive the PointerReleased event.
-            // This makes typical handling of PointerReleased events on our side difficult.
-            // Well, whatever, now we just hook PointerCaptureLost because we know WinUI will trigger it.
-
-            _tabItemMiddleClickPointerEntered.revoke();
-            _tabItemMiddleClickPointerExited.revoke();
-            _tabItemMiddleClickPointerCaptureLost.revoke();
-
-            if (!_tabItemMiddleClickExited && !e.GetCurrentPoint(nullptr).Properties().IsMiddleButtonPressed())
+            if (const auto tabViewItem{ sender.try_as<MUX::Controls::TabViewItem>() })
            {
-                _OnTabPointerReleasedCloseTab(std::move(sender));
+                _tabPointerMiddleButtonPressed = tabViewItem.CapturePointer(eventArgs.Pointer());
+                _tabPointerMiddleButtonExited = false;
            }
-
-            e.Handled(true);
-        });
-        e.Handled(true);
+            eventArgs.Handled(true);
+        }
    }

-    safe_void_coroutine TerminalPage::_OnTabPointerReleasedCloseTab(IInspectable sender)
+    // Method Description:
+    // - Tracking pointer state for tab remove
+    // Arguments:
+    // - sender: the control that originated this event (TabViewItem)
+    // - eventArgs: the event's constituent arguments
+    void TerminalPage::_OnTabPointerReleased(const IInspectable& sender, const Windows::UI::Xaml::Input::PointerRoutedEventArgs& eventArgs)
    {
-        // WinUI asynchronously updates its tab view items, so it may happen that we're given a
-        // `TabViewItem` that still contains a `Tab` which has actually already been removed.
-        // First we must yield once, to flush out whatever TabView is currently doing.
-        const auto weak = get_weak();
-        co_await wil::resume_foreground(Dispatcher());
-        const auto strong = weak.get();
-        if (!strong)
+        if (_tabPointerMiddleButtonPressed && !eventArgs.GetCurrentPoint(nullptr).Properties().IsMiddleButtonPressed())
        {
-            co_return;
+            _tabPointerMiddleButtonPressed = false;
+            if (auto tabViewItem{ sender.try_as<MUX::Controls::TabViewItem>() })
+            {
+                tabViewItem.ReleasePointerCapture(eventArgs.Pointer());
+                if (!_tabPointerMiddleButtonExited)
+                {
+                    _OnTabPointerReleasedCloseTab(std::move(tabViewItem));
+                }
+            }
+            eventArgs.Handled(true);
        }
+    }

+    safe_void_coroutine TerminalPage::_OnTabPointerReleasedCloseTab(winrt::Microsoft::UI::Xaml::Controls::TabViewItem sender)
+    {
        const auto tab = _GetTabByTabViewItem(sender);
        if (!tab)
        {
            co_return;
        }

+        // WinUI asynchronously updates its tab view items, so it may happen that we're given a
+        // `TabViewItem` that still contains a `Tab` which has actually already been removed.
+        // First we must yield once, to flush out whatever TabView is currently doing.
+        const auto strong = get_strong();
+        co_await wil::resume_foreground(Dispatcher());
+
        // `tab.Shutdown()` in `_RemoveTab()` sets the content to null = This checks if the tab is closed.
        if (tab.Content())
        {
@@ -968,6 +937,34 @@ namespace winrt::TerminalApp::implementation
        }
    }

+    // Method Description:
+    // - Tracking pointer state for tab remove
+    // Arguments:
+    // - sender: the control that originated this event (TabViewItem)
+    // - eventArgs: the event's constituent arguments
+    void TerminalPage::_OnTabPointerEntered(const IInspectable& /*sender*/, const Windows::UI::Xaml::Input::PointerRoutedEventArgs& eventArgs)
+    {
+        if (eventArgs.GetCurrentPoint(nullptr).Properties().IsMiddleButtonPressed())
+        {
+            _tabPointerMiddleButtonExited = false;
+            eventArgs.Handled(true);
+        }
+    }
+
+    // Method Description:
+    // - Tracking pointer state for tab remove
+    // Arguments:
+    // - sender: the control that originated this event (TabViewItem)
+    // - eventArgs: the event's constituent arguments
+    void TerminalPage::_OnTabPointerExited(const IInspectable& /*sender*/, const Windows::UI::Xaml::Input::PointerRoutedEventArgs& eventArgs)
+    {
+        if (eventArgs.GetCurrentPoint(nullptr).Properties().IsMiddleButtonPressed())
+        {
+            _tabPointerMiddleButtonExited = true;
+            eventArgs.Handled(true);
+        }
+    }
+
    void TerminalPage::_UpdatedSelectedTab(const winrt::TerminalApp::Tab& tab)
    {
        // Unfocus all the tabs.
--- a/src/cascadia/TerminalApp/TerminalPage.cpp
+++ b/src/cascadia/TerminalApp/TerminalPage.cpp
@@ -7,7 +7,6 @@

 #include <LibraryResources.h>
 #include <TerminalThemeHelpers.h>
-#include <til/unicode.h>
 #include <Utils.h>
 #include <TerminalCore/ControlKeyStates.hpp>

@@ -61,42 +60,8 @@ namespace winrt

 namespace clipboard
 {
-    static SRWLOCK lock = SRWLOCK_INIT;
-
-    struct ClipboardHandle
+    wil::unique_close_clipboard_call open(HWND hwnd)
    {
-        explicit ClipboardHandle(bool open) :
-            _open{ open }
-        {
-        }
-
-        ~ClipboardHandle()
-        {
-            if (_open)
-            {
-                ReleaseSRWLockExclusive(&lock);
-                CloseClipboard();
-            }
-        }
-
-        explicit operator bool() const noexcept
-        {
-            return _open;
-        }
-
-    private:
-        bool _open = false;
-    };
-
-    ClipboardHandle open(HWND hwnd)
-    {
-        // Turns out, OpenClipboard/CloseClipboard are not thread-safe whatsoever,
-        // and on CloseClipboard, the GetClipboardData handle may get freed.
-        // The problem is that WinUI also uses OpenClipboard (through WinRT which uses OLE),
-        // and so even with this mutex we can still crash randomly if you copy something via WinUI.
-        // Makes you wonder how many Windows apps are subtly broken, huh.
-        AcquireSRWLockExclusive(&lock);
-
        bool success = false;

        // OpenClipboard may fail to acquire the internal lock --> retry.
@@ -115,12 +80,7 @@ namespace clipboard
            Sleep(sleep);
        }

-        if (!success)
-        {
-            ReleaseSRWLockExclusive(&lock);
-        }
-
-        return ClipboardHandle{ success };
+        return wil::unique_close_clipboard_call{ success };
    }

    void write(wil::zwstring_view text, std::string_view html, std::string_view rtf)
@@ -260,16 +220,6 @@ namespace winrt::TerminalApp::implementation
            }
        }

-        _adjustProcessPriorityThrottled = std::make_shared<ThrottledFunc<>>(
-            DispatcherQueue::GetForCurrentThread(),
-            til::throttled_func_options{
-                .delay = std::chrono::milliseconds{ 100 },
-                .debounce = true,
-                .trailing = true,
-            },
-            [=]() {
-                _adjustProcessPriority();
-            });
        _hostingHwnd = hwnd;
        return S_OK;
    }
@@ -384,8 +334,6 @@ namespace winrt::TerminalApp::implementation
        {
            const auto visibility = theme.Tab() ? theme.Tab().ShowCloseButton() : Settings::Model::TabCloseButtonVisibility::Always;

-            _tabItemMiddleClickHookEnabled = visibility == Settings::Model::TabCloseButtonVisibility::Never;
-
            switch (visibility)
            {
            case Settings::Model::TabCloseButtonVisibility::Never:
@@ -452,6 +400,17 @@ namespace winrt::TerminalApp::implementation
        // them.

        _tabRow.ShowElevationShield(IsRunningElevated() && _settings.GlobalSettings().ShowAdminShield());
+
+        _adjustProcessPriorityThrottled = std::make_shared<ThrottledFunc<>>(
+            DispatcherQueue::GetForCurrentThread(),
+            til::throttled_func_options{
+                .delay = std::chrono::milliseconds{ 100 },
+                .debounce = true,
+                .trailing = true,
+            },
+            [=]() {
+                _adjustProcessPriority();
+            });
    }

    Windows::UI::Xaml::Automation::Peers::AutomationPeer TerminalPage::OnCreateAutomationPeer()
@@ -1490,8 +1449,18 @@ namespace winrt::TerminalApp::implementation
        if (connectionType == TerminalConnection::AzureConnection::ConnectionType() &&
            TerminalConnection::AzureConnection::IsAzureConnectionAvailable())
        {
-            connection = TerminalConnection::AzureConnection{};
-            valueSet = TerminalConnection::ConptyConnection::CreateSettings(winrt::hstring{},
+            std::filesystem::path azBridgePath{ wil::GetModuleFileNameW<std::wstring>(nullptr) };
+            azBridgePath.replace_filename(L"TerminalAzBridge.exe");
+            if constexpr (Feature_AzureConnectionInProc::IsEnabled())
+            {
+                connection = TerminalConnection::AzureConnection{};
+            }
+            else
+            {
+                connection = TerminalConnection::ConptyConnection{};
+            }
+
+            valueSet = TerminalConnection::ConptyConnection::CreateSettings(azBridgePath.native(),
                                                                            L".",
                                                                            L"Azure",
                                                                            false,
@@ -2206,15 +2175,7 @@ namespace winrt::TerminalApp::implementation
        if (!_displayingCloseDialog)
        {
            _displayingCloseDialog = true;
-
-            const auto weak = get_weak();
            auto warningResult = co_await _ShowQuitDialog();
-            const auto strong = weak.get();
-            if (!strong)
-            {
-                co_return;
-            }
-
            _displayingCloseDialog = false;

            if (warningResult != ContentDialogResult::Primary)
@@ -2942,11 +2903,7 @@ namespace winrt::TerminalApp::implementation
            text = winrt::hstring{ Utils::TrimPaste(text) };
        }

-        // LOAD BEARING: Send an empty bracketed paste even if the clipboard was empty.
-        // Bracketed Paste provides an application a way to know whether the
-        // user pasted, even if there was no applicable content on it. This
-        // behavior is observed in GNOME Terminal, among others.
-        if (!bracketedPaste && text.empty())
+        if (text.empty())
        {
            co_return;
        }
@@ -2985,19 +2942,7 @@ namespace winrt::TerminalApp::implementation
            {
                // We have to initialize the dialog here to be able to change the text of the text block within it
                std::ignore = FindName(L"MultiLinePasteDialog");
-
-                // WinUI absolutely cannot deal with large amounts of text (at least O(n), possibly O(n^2),
-                // so we limit the string length here and add an ellipsis if necessary.
-                auto clipboardText = text;
-                if (clipboardText.size() > 1024)
-                {
-                    const std::wstring_view view{ text };
-                    // Make sure we don't cut in the middle of a surrogate pair
-                    const auto len = til::utf16_iterate_prev(view, 512);
-                    clipboardText = til::hstring_format(FMT_COMPILE(L"{}\n…"), view.substr(0, len));
-                }
-
-                ClipboardText().Text(std::move(clipboardText));
+                ClipboardText().Text(text);

                // The vertical offset on the scrollbar does not reset automatically, so reset it manually
                ClipboardContentScrollViewer().ScrollToVerticalOffset(0);
@@ -3013,7 +2958,7 @@ namespace winrt::TerminalApp::implementation
                }

                // Clear the clipboard text so it doesn't lie around in memory
-                ClipboardText().Text({});
+                ClipboardText().Text(L"");

                if (warningResult != ContentDialogResult::Primary)
                {
@@ -3193,12 +3138,8 @@ namespace winrt::TerminalApp::implementation
    // - eventArgs: the arguments specifying how to set the progress indicator
    safe_void_coroutine TerminalPage::_SetTaskbarProgressHandler(const IInspectable /*sender*/, const IInspectable /*eventArgs*/)
    {
-        const auto weak = get_weak();
        co_await wil::resume_foreground(Dispatcher());
-        if (const auto strong = weak.get())
-        {
-            SetTaskbarProgress.raise(*this, nullptr);
-        }
+        SetTaskbarProgress.raise(*this, nullptr);
    }

    // Method Description:
@@ -3235,17 +3176,33 @@ namespace winrt::TerminalApp::implementation
        }

        PackageCatalog catalog = connectResult.PackageCatalog();
+        // clang-format off
+        static constexpr std::array<WinGetSearchParams, 3> searches{ {
+            { .Field = PackageMatchField::Command, .MatchOption = PackageFieldMatchOption::StartsWithCaseInsensitive },
+            { .Field = PackageMatchField::Name, .MatchOption = PackageFieldMatchOption::ContainsCaseInsensitive },
+            { .Field = PackageMatchField::Moniker, .MatchOption = PackageFieldMatchOption::ContainsCaseInsensitive } } };
+        // clang-format on
+
        PackageMatchFilter filter = WindowsPackageManagerFactory::CreatePackageMatchFilter();
        filter.Value(query);
-        filter.Field(PackageMatchField::Command);
-        filter.Option(PackageFieldMatchOption::Equals);

        FindPackagesOptions options = WindowsPackageManagerFactory::CreateFindPackagesOptions();
        options.Filters().Append(filter);
        options.ResultLimit(20);

-        const auto result = co_await catalog.FindPackagesAsync(options);
-        const IVectorView<MatchResult> pkgList = result.Matches();
+        IVectorView<MatchResult> pkgList;
+        for (const auto& search : searches)
+        {
+            filter.Field(search.Field);
+            filter.Option(search.MatchOption);
+
+            const auto result = co_await catalog.FindPackagesAsync(options);
+            pkgList = result.Matches();
+            if (pkgList.Size() > 0)
+            {
+                break;
+            }
+        }
        co_return pkgList;
    }

@@ -3255,12 +3212,6 @@ namespace winrt::TerminalApp::implementation
        {
            co_return;
        }
-
-        const auto weak = get_weak();
-        const auto dispatcher = Dispatcher();
-
-        // All of the code until resume_foreground is static and
-        // doesn't touch `this`, so we don't need weak/strong_ref.
        co_await winrt::resume_background();

        // no packages were found, nothing to suggest
@@ -3278,12 +3229,7 @@ namespace winrt::TerminalApp::implementation
            suggestions.emplace_back(fmt::format(FMT_COMPILE(L"winget install --id {} -s winget"), pkg.CatalogPackage().Id()));
        }

-        co_await wil::resume_foreground(dispatcher);
-        const auto strong = weak.get();
-        if (!strong)
-        {
-            co_return;
-        }
+        co_await wil::resume_foreground(Dispatcher());

        auto term = _GetActiveControl();
        if (!term)
@@ -3378,9 +3324,6 @@ namespace winrt::TerminalApp::implementation
            // UI) thread. This is IMPORTANT, because the Windows.Storage API's
            // (used for retrieving the path to the file) will crash on the UI
            // thread, because the main thread is a STA.
-            //
-            // NOTE: All remaining code of this function doesn't touch `this`, so we don't need weak/strong_ref.
-            // NOTE NOTE: Don't touch `this` when you make changes here.
            co_await winrt::resume_background();

            auto openFile = [](const auto& filePath) {
@@ -3707,13 +3650,7 @@ namespace winrt::TerminalApp::implementation
        // for nulls
        if (const auto& connection{ _duplicateConnectionForRestart(paneContent) })
        {
-            // Reset the terminal's VT state before attaching the new connection.
-            // The previous client may have left dirty modes (e.g., bracketed
-            // paste, mouse tracking, alternate buffer, kitty keyboard) that
-            // would corrupt input/output for the new shell process.
-            const auto& termControl = paneContent.GetTermControl();
-            termControl.HardResetWithoutErase();
-            termControl.Connection(connection);
+            paneContent.GetTermControl().Connection(connection);
            connection.Start();
        }
    }
@@ -3872,8 +3809,6 @@ namespace winrt::TerminalApp::implementation
                                    theme.Tab().ShowCloseButton() :
                                    Settings::Model::TabCloseButtonVisibility::Always;

-        _tabItemMiddleClickHookEnabled = visibility == Settings::Model::TabCloseButtonVisibility::Never;
-
        for (const auto& tab : _tabs)
        {
            tab.CloseButtonVisibility(visibility);
@@ -4745,18 +4680,12 @@ namespace winrt::TerminalApp::implementation
    // - sender: the ICoreState instance containing the connection state
    // Return Value:
    // - <none>
-    safe_void_coroutine TerminalPage::_ConnectionStateChangedHandler(const IInspectable& sender, const IInspectable& /*args*/)
+    safe_void_coroutine TerminalPage::_ConnectionStateChangedHandler(const IInspectable& sender, const IInspectable& /*args*/) const
    {
        if (const auto coreState{ sender.try_as<winrt::Microsoft::Terminal::Control::ICoreState>() })
        {
            const auto newConnectionState = coreState.ConnectionState();
-            const auto weak = get_weak();
            co_await wil::resume_foreground(Dispatcher());
-            const auto strong = weak.get();
-            if (!strong)
-            {
-                co_return;
-            }

            _adjustProcessPriorityThrottled->Run();

@@ -4894,18 +4823,8 @@ namespace winrt::TerminalApp::implementation
            }
        }

-        // GH#19604: Get the theme's tabRow color to use as the acrylic tint.
-        const auto tabRowBg{ theme.TabRow() ? (_activated ? theme.TabRow().Background() :
-                                                            theme.TabRow().UnfocusedBackground()) :
-                                              ThemeColor{ nullptr } };
-
-        if (_settings.GlobalSettings().UseAcrylicInTabRow() && (_activated || _settings.GlobalSettings().EnableUnfocusedAcrylic()))
+        if (_settings.GlobalSettings().UseAcrylicInTabRow())
        {
-            if (tabRowBg)
-            {
-                bgColor = ThemeColor::ColorFromBrush(tabRowBg.Evaluate(res, terminalBrush, true));
-            }
-
            const auto acrylicBrush = Media::AcrylicBrush();
            acrylicBrush.BackgroundSource(Media::AcrylicBackgroundSource::HostBackdrop);
            acrylicBrush.FallbackColor(bgColor);
@@ -4914,7 +4833,9 @@ namespace winrt::TerminalApp::implementation

            TitlebarBrush(acrylicBrush);
        }
-        else if (tabRowBg)
+        else if (auto tabRowBg{ theme.TabRow() ? (_activated ? theme.TabRow().Background() :
+                                                               theme.TabRow().UnfocusedBackground()) :
+                                                 ThemeColor{ nullptr } })
        {
            const auto themeBrush{ tabRowBg.Evaluate(res, terminalBrush, true) };
            bgColor = ThemeColor::ColorFromBrush(themeBrush);
--- a/src/cascadia/TerminalApp/TerminalPage.h
+++ b/src/cascadia/TerminalApp/TerminalPage.h
@@ -391,7 +391,7 @@ namespace winrt::TerminalApp::implementation
        std::optional<uint32_t> _GetTabIndex(const TerminalApp::Tab& tab) const noexcept;
        TerminalApp::Tab _GetFocusedTab() const noexcept;
        winrt::com_ptr<Tab> _GetFocusedTabImpl() const noexcept;
-        TerminalApp::Tab _GetTabByTabViewItem(const IInspectable& tabViewItem) const noexcept;
+        TerminalApp::Tab _GetTabByTabViewItem(const Microsoft::UI::Xaml::Controls::TabViewItem& tabViewItem) const noexcept;

        void _HandleClosePaneRequested(std::shared_ptr<Pane> pane);
        safe_void_coroutine _SetFocusedTab(const winrt::TerminalApp::Tab tab);
@@ -435,18 +435,13 @@ namespace winrt::TerminalApp::implementation
        void _TabDragStarted(const IInspectable& sender, const IInspectable& eventArgs);
        void _TabDragCompleted(const IInspectable& sender, const IInspectable& eventArgs);

-        // BODGY: WinUI's TabView has a broken close event handler:
-        // If the close button is disabled, middle-clicking the tab raises no close
-        // event. Because that's dumb, we implement our own middle-click handling.
-        // `_tabItemMiddleClickHookEnabled` is true whenever the close button is hidden,
-        // and that enables all of the rest of this machinery (and this workaround).
-        bool _tabItemMiddleClickHookEnabled = false;
-        bool _tabItemMiddleClickExited = false;
-        PointerEntered_revoker _tabItemMiddleClickPointerEntered;
-        PointerExited_revoker _tabItemMiddleClickPointerExited;
-        PointerCaptureLost_revoker _tabItemMiddleClickPointerCaptureLost;
+        bool _tabPointerMiddleButtonPressed{ false };
+        bool _tabPointerMiddleButtonExited{ false };
        void _OnTabPointerPressed(const IInspectable& sender, const Windows::UI::Xaml::Input::PointerRoutedEventArgs& eventArgs);
-        safe_void_coroutine _OnTabPointerReleasedCloseTab(IInspectable sender);
+        void _OnTabPointerReleased(const IInspectable& sender, const Windows::UI::Xaml::Input::PointerRoutedEventArgs& eventArgs);
+        safe_void_coroutine _OnTabPointerReleasedCloseTab(winrt::Microsoft::UI::Xaml::Controls::TabViewItem sender);
+        void _OnTabPointerEntered(const IInspectable& sender, const Windows::UI::Xaml::Input::PointerRoutedEventArgs& eventArgs);
+        void _OnTabPointerExited(const IInspectable& sender, const Windows::UI::Xaml::Input::PointerRoutedEventArgs& eventArgs);

        void _OnTabSelectionChanged(const IInspectable& sender, const Windows::UI::Xaml::Controls::SelectionChangedEventArgs& eventArgs);
        void _OnTabItemsChanged(const IInspectable& sender, const Windows::Foundation::Collections::IVectorChangedEventArgs& eventArgs);
@@ -520,7 +515,7 @@ namespace winrt::TerminalApp::implementation
                           const winrt::Microsoft::Terminal::Settings::Model::Profile& profile);
        void _OpenElevatedWT(winrt::Microsoft::Terminal::Settings::Model::NewTerminalArgs newTerminalArgs);

-        safe_void_coroutine _ConnectionStateChangedHandler(const winrt::Windows::Foundation::IInspectable& sender, const winrt::Windows::Foundation::IInspectable& args);
+        safe_void_coroutine _ConnectionStateChangedHandler(const winrt::Windows::Foundation::IInspectable& sender, const winrt::Windows::Foundation::IInspectable& args) const;
        void _CloseOnExitInfoDismissHandler(const winrt::Windows::Foundation::IInspectable& sender, const winrt::Windows::Foundation::IInspectable& args) const;
        void _KeyboardServiceWarningInfoDismissHandler(const winrt::Windows::Foundation::IInspectable& sender, const winrt::Windows::Foundation::IInspectable& args) const;
        static bool _IsMessageDismissed(const winrt::Microsoft::Terminal::Settings::Model::InfoBarMessage& message);
@@ -536,7 +531,7 @@ namespace winrt::TerminalApp::implementation

        void _ShowWindowChangedHandler(const IInspectable sender, const winrt::Microsoft::Terminal::Control::ShowWindowArgs args);
        Windows::Foundation::IAsyncAction _SearchMissingCommandHandler(const IInspectable sender, const winrt::Microsoft::Terminal::Control::SearchMissingCommandEventArgs args);
-        static Windows::Foundation::IAsyncOperation<Windows::Foundation::Collections::IVectorView<winrt::Microsoft::Management::Deployment::MatchResult>> _FindPackageAsync(hstring query);
+        Windows::Foundation::IAsyncOperation<Windows::Foundation::Collections::IVectorView<winrt::Microsoft::Management::Deployment::MatchResult>> _FindPackageAsync(hstring query);

        void _WindowSizeChanged(const IInspectable sender, const winrt::Microsoft::Terminal::Control::WindowSizeChangedEventArgs args);
        void _windowPropertyChanged(const IInspectable& sender, const winrt::Windows::UI::Xaml::Data::PropertyChangedEventArgs& args);
--- a/src/cascadia/TerminalApp/TerminalWindow.cpp
+++ b/src/cascadia/TerminalApp/TerminalWindow.cpp
@@ -322,10 +322,6 @@ namespace winrt::TerminalApp::implementation
    // - an IAsyncOperation with the dialog result
    winrt::Windows::Foundation::IAsyncOperation<ContentDialogResult> TerminalWindow::ShowDialog(winrt::WUX::Controls::ContentDialog dialog)
    {
-        const auto weak = get_weak();
-        const auto dispatcher = _root->Dispatcher();
-        const auto root = _root->XamlRoot();
-
        // As mentioned on s_activeDialog, dismissing the active dialog is necessary.
        // We repeat it a few times in case the resume_foreground failed to work,
        // but I found that one iteration will always be enough in practice.
@@ -339,7 +335,7 @@ namespace winrt::TerminalApp::implementation
            s_activeDialog.Hide();

            // Wait for the current dialog to be hidden.
-            co_await wil::resume_foreground(dispatcher, CoreDispatcherPriority::Low);
+            co_await wil::resume_foreground(_root->Dispatcher(), CoreDispatcherPriority::Low);
        }

        // If two sources call ShowDialog() simultaneously, it may happen that both enter the above loop,
@@ -356,7 +352,7 @@ namespace winrt::TerminalApp::implementation
        // IMPORTANT: This is necessary as documented in the ContentDialog MSDN docs.
        // Since we're hosting the dialog in a Xaml island, we need to connect it to the
        // xaml tree somehow.
-        dialog.XamlRoot(root);
+        dialog.XamlRoot(_root->XamlRoot());

        // IMPORTANT: Set the requested theme of the dialog, because the
        // PopupRoot isn't directly in the Xaml tree of our root. So the dialog
@@ -370,17 +366,14 @@ namespace winrt::TerminalApp::implementation
        // theme on each element up to the root. We're relying a bit on Xaml's implementation
        // details here, but it does have the desired effect.
        // It's not enough to set the theme on the dialog alone.
-        auto themingLambda{ [weak](const Windows::Foundation::IInspectable& sender, const RoutedEventArgs&) {
-            if (const auto strong = weak.get())
+        auto themingLambda{ [this](const Windows::Foundation::IInspectable& sender, const RoutedEventArgs&) {
+            auto theme{ _settings.GlobalSettings().CurrentTheme() };
+            auto requestedTheme{ theme.RequestedTheme() };
+            auto element{ sender.try_as<winrt::Windows::UI::Xaml::FrameworkElement>() };
+            while (element)
            {
-                auto theme{ strong->_settings.GlobalSettings().CurrentTheme() };
-                auto requestedTheme{ theme.RequestedTheme() };
-                auto element{ sender.try_as<winrt::Windows::UI::Xaml::FrameworkElement>() };
-                while (element)
-                {
-                    element.RequestedTheme(requestedTheme);
-                    element = element.Parent().try_as<winrt::Windows::UI::Xaml::FrameworkElement>();
-                }
+                element.RequestedTheme(requestedTheme);
+                element = element.Parent().try_as<winrt::Windows::UI::Xaml::FrameworkElement>();
            }
        } };

@@ -895,11 +888,6 @@ namespace winrt::TerminalApp::implementation
        {
            // Manually bubble the OnDirectKeyEvent event up through the focus tree.
            auto xamlRoot{ _root->XamlRoot() };
-            if (!xamlRoot)
-            {
-                return false;
-            }
-
            auto focusedObject{ Windows::UI::Xaml::Input::FocusManager::GetFocusedElement(xamlRoot) };
            do
            {
@@ -1060,11 +1048,6 @@ namespace winrt::TerminalApp::implementation
        // (or called TerminalWindow::Initialize)
        if (_appArgs->ExitCode() == 0)
        {
-            // The existing logic (before this commit) strictly relied on
-            // ValidateStartupCommands() only to be called for new windows.
-            // It modifies the actions it stores.
-            parsedArgs.ValidateStartupCommands();
-
            // If the size of the arguments list is 1,
            // then it contains only the executable name and no other arguments.
            _hasCommandLineArguments = _appArgs->CommandlineRef().size() > 1;
--- a/src/cascadia/TerminalApp/TitlebarControl.cpp
+++ b/src/cascadia/TerminalApp/TitlebarControl.cpp
@@ -53,16 +53,6 @@ namespace winrt::TerminalApp::implementation
        return static_cast<float>(minMaxCloseWidth) / 3.0f;
    }

-    bool TitlebarControl::Focused()
-    {
-        return MinMaxCloseControl().Focused();
-    }
-
-    void TitlebarControl::Focused(bool focused)
-    {
-        MinMaxCloseControl().Focused(focused);
-    }
-
    IInspectable TitlebarControl::Content()
    {
        return ContentRoot().Content();
--- a/src/cascadia/TerminalApp/TitlebarControl.h
+++ b/src/cascadia/TerminalApp/TitlebarControl.h
@@ -17,9 +17,6 @@ namespace winrt::TerminalApp::implementation
        void ReleaseButtons();
        float CaptionButtonWidth();

-        bool Focused();
-        void Focused(bool focused);
-
        IInspectable Content();
        void Content(IInspectable content);

--- a/src/cascadia/TerminalApp/TitlebarControl.idl
+++ b/src/cascadia/TerminalApp/TitlebarControl.idl
@@ -29,7 +29,6 @@ namespace TerminalApp
        void ClickButton(CaptionButton button);
        void ReleaseButtons();
        Single CaptionButtonWidth { get; };
-        Boolean Focused { get; set; };

        IInspectable Content;
        Windows.UI.Xaml.Controls.Border DragBar { get; };
--- a/src/cascadia/TerminalAzBridge/ConsoleInputReader.cpp
+++ b/src/cascadia/TerminalAzBridge/ConsoleInputReader.cpp
@@ -0,0 +1,87 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+
+#include "pch.h"
+#include "ConsoleInputReader.h"
+#include "unicode.hpp"
+
+ConsoleInputReader::ConsoleInputReader(HANDLE handle) :
+    _handle(handle)
+{
+    _buffer.resize(BufferSize);
+    _convertedString.reserve(BufferSize);
+}
+
+void ConsoleInputReader::SetWindowSizeChangedCallback(std::function<void()> callback)
+{
+    _windowSizeChangedCallback = std::move(callback);
+}
+
+std::optional<std::wstring_view> ConsoleInputReader::Read()
+{
+    DWORD readCount{ 0 };
+
+    _convertedString.clear();
+    while (_convertedString.empty())
+    {
+        _buffer.resize(BufferSize);
+        auto succeeded =
+            ReadConsoleInputW(_handle, _buffer.data(), gsl::narrow_cast<DWORD>(_buffer.size()), &readCount);
+        if (!succeeded)
+        {
+            return std::nullopt;
+        }
+
+        _buffer.resize(readCount);
+        for (auto it = _buffer.begin(); it != _buffer.end(); ++it)
+        {
+            if (it->EventType == WINDOW_BUFFER_SIZE_EVENT && _windowSizeChangedCallback)
+            {
+                _windowSizeChangedCallback();
+            }
+            else if (it->EventType == KEY_EVENT)
+            {
+                const auto& keyEvent = it->Event.KeyEvent;
+                if (keyEvent.bKeyDown || (!keyEvent.bKeyDown && keyEvent.wVirtualKeyCode == VK_MENU))
+                {
+                    // Got a high surrogate at the end of the buffer
+                    if (IS_HIGH_SURROGATE(keyEvent.uChar.UnicodeChar))
+                    {
+                        _highSurrogate.emplace(keyEvent.uChar.UnicodeChar);
+                        continue; // we've consumed it -- only dispatch it if we get a low
+                    }
+
+                    if (IS_LOW_SURROGATE(keyEvent.uChar.UnicodeChar))
+                    {
+                        // No matter what we do, we want to destructively consume the high surrogate
+                        if (const auto oldHighSurrogate{ std::exchange(_highSurrogate, std::nullopt) })
+                        {
+                            _convertedString.push_back(*_highSurrogate);
+                        }
+                        else
+                        {
+                            // If we get a low without a high surrogate, we've done everything we can.
+                            // This is an illegal state.
+                            _convertedString.push_back(UNICODE_REPLACEMENT);
+                            continue; // onto the next event
+                        }
+                    }
+
+                    // (\0 with a scancode is probably a modifier key, not a VT input key)
+                    if (keyEvent.uChar.UnicodeChar != L'\0' || keyEvent.wVirtualScanCode == 0)
+                    {
+                        if (_highSurrogate) // non-destructive: we don't want to set it to nullopt needlessly for every character
+                        {
+                            // If we get a high surrogate *here*, we didn't find a low surrogate.
+                            // This state is also illegal.
+                            _convertedString.push_back(UNICODE_REPLACEMENT);
+                            _highSurrogate.reset();
+                        }
+                        _convertedString.push_back(keyEvent.uChar.UnicodeChar);
+                    }
+                }
+            }
+        }
+    }
+    return _convertedString;
+}
--- a/src/cascadia/TerminalAzBridge/ConsoleInputReader.h
+++ b/src/cascadia/TerminalAzBridge/ConsoleInputReader.h
@@ -0,0 +1,33 @@
+/*++
+
+Copyright (c) Microsoft Corporation.
+Licensed under the MIT license.
+
+Module Name:
+
+    ConsoleInputReader.h
+
+Abstract:
+
+    This file contains a class whose sole purpose is to
+    abstract away a bunch of details you usually need to
+    know to read VT from a console input handle.
+
+--*/
+
+class ConsoleInputReader
+{
+public:
+    explicit ConsoleInputReader(HANDLE handle);
+    void SetWindowSizeChangedCallback(std::function<void()> callback);
+    std::optional<std::wstring_view> Read();
+
+private:
+    static constexpr size_t BufferSize{ 128 };
+
+    HANDLE _handle;
+    std::wstring _convertedString;
+    std::vector<INPUT_RECORD> _buffer;
+    std::optional<wchar_t> _highSurrogate;
+    std::function<void()> _windowSizeChangedCallback;
+};
--- a/src/cascadia/TerminalAzBridge/TerminalAzBridge.vcxproj
+++ b/src/cascadia/TerminalAzBridge/TerminalAzBridge.vcxproj
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{067F0A06-FCB7-472C-96E9-B03B54E8E18D}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <RootNamespace>TerminalAzBridge</RootNamespace>
+    <ProjectName>TerminalAzBridge</ProjectName>
+    <TargetName>TerminalAzBridge</TargetName>
+    <ConfigurationType>Application</ConfigurationType>
+    <OpenConsoleUniversalApp>false</OpenConsoleUniversalApp>
+    <ApplicationType>Windows Store</ApplicationType>
+    <TargetPlatformIdentifier>Windows</TargetPlatformIdentifier>
+    <VersionInfoFileDescription>Windows Terminal Azure Cloud Shell Connector</VersionInfoFileDescription>
+  </PropertyGroup>
+
+  <PropertyGroup Label="NuGet Dependencies">
+    <TerminalCppWinrt>true</TerminalCppWinrt>
+  </PropertyGroup>
+
+  <Import Project="..\..\..\common.openconsole.props" Condition="'$(OpenConsoleDir)'==''" />
+  <Import Project="$(OpenConsoleDir)src\common.nugetversions.props" />
+  <Import Project="$(OpenConsoleDir)src\cppwinrt.build.pre.props" />
+
+  <PropertyGroup>
+    <GenerateManifest>true</GenerateManifest>
+    <EmbedManifest>true</EmbedManifest>
+  </PropertyGroup>
+
+  <!-- Source Files -->
+  <ItemGroup>
+    <ClInclude Include="pch.h" />
+    <ClInclude Include="ConsoleInputReader.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="pch.cpp">
+      <PrecompiledHeader>Create</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="main.cpp" />
+    <ClCompile Include="ConsoleInputReader.cpp" />
+  </ItemGroup>
+  <!-- Dependencies -->
+  <ItemGroup>
+    <ProjectReference Include="$(OpenConsoleDir)src\cascadia\TerminalConnection\TerminalConnection.vcxproj">
+      <Project>{CA5CAD1A-C46D-4588-B1C0-40F31AE9100B}</Project>
+    </ProjectReference>
+    <ProjectReference Include="$(OpenConsoleDir)src\types\lib\types.vcxproj" />
+  </ItemGroup>
+
+  <!--
+    This ItemGroup and the Globals PropertyGroup below it are required in order
+    to enable F5 debugging for the unpackaged application
+    -->
+  <ItemGroup>
+    <PropertyPageSchema Include="$(VCTargetsPath)$(LangID)\debugger_general.xml" />
+    <PropertyPageSchema Include="$(VCTargetsPath)$(LangID)\debugger_local_windows.xml" />
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
+  </PropertyGroup>
+
+  <Import Project="$(OpenConsoleDir)src\cppwinrt.build.post.props" />
+  <Import Project="$(OpenConsoleDir)src\common.nugetversions.targets" />
+
+  <!-- These have to come after post.props because the Cpp common targets will inexplicably overwrite them. -->
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <SDLCheck>true</SDLCheck>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+
+  <!--
+  BODGY
+
+  The wapproj `GetResolvedWinMD` target tries to get a winmd from every cppwinrt
+  executable we put in the package. But we DON'T produce a winmd. This makes the
+  FastUpToDate check fail every time, and leads to the whole wapproj build
+  running even if you're just f5'ing the package. EVEN AFTER A SUCCESSFUL BUILD.
+
+  Setting GenerateWindowsMetadata=false is enough to tell the build system that
+  we don't produce one, and get it off our backs.
+  -->
+  <ItemDefinitionGroup>
+    <Link>
+        <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
+    </Link>
+  </ItemDefinitionGroup>
+
+  <Import Project="$(OpenConsoleDir)\build\rules\GenerateSxsManifestsFromWinmds.targets" />
+</Project>
--- a/src/cascadia/TerminalAzBridge/main.cpp
+++ b/src/cascadia/TerminalAzBridge/main.cpp
@@ -0,0 +1,108 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+
+#include "pch.h"
+#include "winrt/Microsoft.Terminal.TerminalConnection.h"
+#include "ConsoleInputReader.h"
+
+using namespace winrt;
+using namespace winrt::Windows::Foundation;
+using namespace winrt::Microsoft::Terminal::TerminalConnection;
+
+static til::size GetConsoleScreenSize(HANDLE outputHandle)
+{
+    CONSOLE_SCREEN_BUFFER_INFOEX csbiex{};
+    csbiex.cbSize = sizeof(csbiex);
+    GetConsoleScreenBufferInfoEx(outputHandle, &csbiex);
+    return {
+        (csbiex.srWindow.Right - csbiex.srWindow.Left) + 1,
+        (csbiex.srWindow.Bottom - csbiex.srWindow.Top) + 1
+    };
+}
+
+static ConnectionState RunConnectionToCompletion(const ITerminalConnection& connection, HANDLE outputHandle, HANDLE inputHandle)
+{
+    connection.TerminalOutput([outputHandle](const winrt::hstring& output) {
+        WriteConsoleW(outputHandle, output.data(), output.size(), nullptr, nullptr);
+    });
+
+    // Detach a thread to spin the console read indefinitely.
+    // This application exits when the connection is closed, so
+    // the connection's lifetime will outlast this thread.
+    std::thread([connection, outputHandle, inputHandle] {
+        ConsoleInputReader reader{ inputHandle };
+        reader.SetWindowSizeChangedCallback([&]() {
+            const auto size = GetConsoleScreenSize(outputHandle);
+
+            connection.Resize(size.height, size.width);
+        });
+
+        while (true)
+        {
+            auto input = reader.Read();
+            if (input)
+            {
+                connection.WriteInput(winrt_wstring_to_array_view(*input));
+            }
+        }
+    }).detach();
+
+    std::condition_variable stateChangeVar;
+    std::optional<ConnectionState> state;
+    std::mutex stateMutex;
+
+    connection.StateChanged([&](auto&& /*s*/, auto&& /*e*/) {
+        std::unique_lock<std::mutex> lg{ stateMutex };
+        state = connection.State();
+        stateChangeVar.notify_all();
+    });
+
+    connection.Start();
+
+    std::unique_lock<std::mutex> lg{ stateMutex };
+    stateChangeVar.wait(lg, [&]() {
+        if (!state.has_value())
+        {
+            return false;
+        }
+        return state.value() == ConnectionState::Closed || state.value() == ConnectionState::Failed;
+    });
+
+    return state.value();
+}
+
+int wmain(int /*argc*/, wchar_t** /*argv*/)
+{
+    winrt::init_apartment(winrt::apartment_type::single_threaded);
+
+    DWORD inputMode{}, outputMode{};
+    auto conIn{ GetStdHandle(STD_INPUT_HANDLE) }, conOut{ GetStdHandle(STD_OUTPUT_HANDLE) };
+    auto codepage{ GetConsoleCP() }, outputCodepage{ GetConsoleOutputCP() };
+
+    RETURN_IF_WIN32_BOOL_FALSE(GetConsoleMode(conIn, &inputMode));
+    RETURN_IF_WIN32_BOOL_FALSE(GetConsoleMode(conOut, &outputMode));
+
+    RETURN_IF_WIN32_BOOL_FALSE(SetConsoleMode(conIn, ENABLE_WINDOW_INPUT | ENABLE_VIRTUAL_TERMINAL_INPUT));
+    RETURN_IF_WIN32_BOOL_FALSE(SetConsoleMode(conOut, ENABLE_PROCESSED_OUTPUT | ENABLE_VIRTUAL_TERMINAL_PROCESSING | ENABLE_WRAP_AT_EOL_OUTPUT | DISABLE_NEWLINE_AUTO_RETURN));
+    RETURN_IF_WIN32_BOOL_FALSE(SetConsoleCP(CP_UTF8));
+    RETURN_IF_WIN32_BOOL_FALSE(SetConsoleOutputCP(CP_UTF8));
+
+    auto restoreConsoleModes = wil::scope_exit([&]() {
+        SetConsoleMode(conIn, inputMode);
+        SetConsoleMode(conOut, outputMode);
+        SetConsoleCP(codepage);
+        SetConsoleOutputCP(outputCodepage);
+    });
+
+    const auto size = GetConsoleScreenSize(conOut);
+
+    AzureConnection azureConn{};
+    winrt::Windows::Foundation::Collections::ValueSet vs{};
+    vs.Insert(L"initialRows", winrt::Windows::Foundation::PropertyValue::CreateUInt32(gsl::narrow_cast<uint32_t>(size.height)));
+    vs.Insert(L"initialCols", winrt::Windows::Foundation::PropertyValue::CreateUInt32(gsl::narrow_cast<uint32_t>(size.width)));
+    azureConn.Initialize(vs);
+
+    const auto state = RunConnectionToCompletion(azureConn, conOut, conIn);
+
+    return state == ConnectionState::Closed ? 0 : 1;
+}
--- a/src/cascadia/TerminalAzBridge/pch.cpp
+++ b/src/cascadia/TerminalAzBridge/pch.cpp
@@ -0,0 +1,4 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+
+#include "pch.h"
--- a/src/cascadia/TerminalAzBridge/pch.h
+++ b/src/cascadia/TerminalAzBridge/pch.h
@@ -0,0 +1,40 @@
+/*++
+Copyright (c) Microsoft Corporation
+Licensed under the MIT license.
+
+Module Name:
+- pch.h
+
+Abstract:
+- Contains external headers to include in the precompile phase of console build process.
+- Avoid including internal project headers. Instead include them only in the classes that need them (helps with test project building).
+--*/
+
+#pragma once
+
+// Ignore checked iterators warning from VC compiler.
+#define _SCL_SECURE_NO_WARNINGS
+
+// Block minwindef.h min/max macros to prevent <algorithm> conflict
+#define NOMINMAX
+
+#define WIN32_LEAN_AND_MEAN
+#define NOMCX
+#define NOHELP
+#define NOCOMM
+#include <Unknwn.h>
+
+#include <windows.h>
+
+#include "../inc/LibraryIncludes.h"
+
+#include <wil/cppwinrt.h>
+
+#include <winrt/Windows.system.h>
+#include <winrt/Windows.Foundation.h>
+#include <winrt/Windows.Foundation.Collections.h>
+
+#include <wil/resource.h>
+#include <wil/win32_helpers.h>
+
+#include <cppwinrt_utils.h>
--- a/src/cascadia/TerminalControl/ControlCore.cpp
+++ b/src/cascadia/TerminalControl/ControlCore.cpp
@@ -149,27 +149,12 @@ namespace winrt::Microsoft::Terminal::Control::implementation

            _renderer->SetBackgroundColorChangedCallback([this]() { _rendererBackgroundColorChanged(); });
            _renderer->SetFrameColorChangedCallback([this]() { _rendererTabColorChanged(); });
-            _renderer->SetRendererEnteredErrorStateCallback([this]() { _rendererEnteredErrorState(); });
+            _renderer->SetRendererEnteredErrorStateCallback([this]() { RendererEnteredErrorState.raise(nullptr, nullptr); });
        }

        UpdateSettings(settings, unfocusedAppearance);
    }

-    void ControlCore::_rendererEnteredErrorState()
-    {
-        // The first time the renderer fails out (after all of its own retries), switch it to D2D and WARP
-        // and force it to try again. If it _still_ fails, we can let it halt.
-        if (_renderFailures++ == 0)
-        {
-            const auto lock = _terminal->LockForWriting();
-            _renderEngine->SetGraphicsAPI(parseGraphicsAPI(GraphicsAPI::Direct2D));
-            _renderEngine->SetSoftwareRendering(true);
-            _renderer->EnablePainting();
-            return;
-        }
-        RendererEnteredErrorState.raise(nullptr, nullptr);
-    }
-
    void ControlCore::_setupDispatcherAndCallbacks()
    {
        // Get our dispatcher. If we're hosted in-proc with XAML, this will get
@@ -349,12 +334,6 @@ namespace winrt::Microsoft::Terminal::Control::implementation
        }
    }

-    void ControlCore::HardResetWithoutErase()
-    {
-        const auto lock = _terminal->LockForWriting();
-        _terminal->HardResetWithoutErase();
-    }
-
    bool ControlCore::Initialize(const float actualWidth,
                                 const float actualHeight,
                                 const float compositionScale)
@@ -932,7 +911,6 @@ namespace winrt::Microsoft::Terminal::Control::implementation
        _renderEngine->SetSoftwareRendering(_settings->SoftwareRendering());
        // Inform the renderer of our opacity
        _renderEngine->EnableTransparentBackground(_isBackgroundTransparent());
-        _renderFailures = 0; // We may have changed the engine; reset the failure counter.

        // Trigger a redraw to repaint the window background and tab colors.
        _renderer->TriggerRedrawAll(true, true);
@@ -1690,7 +1668,7 @@ namespace winrt::Microsoft::Terminal::Control::implementation
    // - resetOnly: If true, only Reset() will be called, if anything. FindNext() will never be called.
    // Return Value:
    // - <none>
-    SearchResults ControlCore::Search(const SearchRequest& request)
+    SearchResults ControlCore::Search(SearchRequest request)
    {
        const auto lock = _terminal->LockForWriting();

@@ -1699,9 +1677,15 @@ namespace winrt::Microsoft::Terminal::Control::implementation
        WI_SetFlagIf(flags, SearchFlag::RegularExpression, request.RegularExpression);
        const auto searchInvalidated = _searcher.IsStale(*_terminal.get(), request.Text, flags);

-        if (searchInvalidated || request.ExecuteSearch)
+        if (searchInvalidated || !request.ResetOnly)
        {
            std::vector<til::point_span> oldResults;
+            til::point_span oldFocused;
+
+            if (const auto focused = _terminal->GetSearchHighlightFocused())
+            {
+                oldFocused = *focused;
+            }

            if (searchInvalidated)
            {
@@ -1710,18 +1694,18 @@ namespace winrt::Microsoft::Terminal::Control::implementation
                _terminal->SetSearchHighlights(_searcher.Results());
            }

-            if (request.ExecuteSearch)
+            if (!request.ResetOnly)
            {
                _searcher.FindNext(!request.GoForward);
            }

            _terminal->SetSearchHighlightFocused(gsl::narrow<size_t>(std::max<ptrdiff_t>(0, _searcher.CurrentMatch())));
            _renderer->TriggerSearchHighlight(oldResults);
-        }

-        if (request.ScrollIntoView)
-        {
-            _terminal->ScrollToSearchHighlight(request.ScrollOffset);
+            if (const auto focused = _terminal->GetSearchHighlightFocused(); focused && *focused != oldFocused)
+            {
+                _terminal->ScrollToSearchHighlight(request.ScrollOffset);
+            }
        }

        int32_t totalMatches = 0;
@@ -1928,7 +1912,6 @@ namespace winrt::Microsoft::Terminal::Control::implementation
    {
        // The lock must be held, because it calls into IRenderData which is shared state.
        const auto lock = _terminal->LockForWriting();
-        _renderFailures = 0;
        _renderer->EnablePainting();
    }

--- a/src/cascadia/TerminalControl/ControlCore.h
+++ b/src/cascadia/TerminalControl/ControlCore.h
@@ -228,7 +228,7 @@ namespace winrt::Microsoft::Terminal::Control::implementation
        void SetSelectionAnchor(const til::point position);
        void SetEndSelectionPoint(const til::point position);

-        SearchResults Search(const SearchRequest& request);
+        SearchResults Search(SearchRequest request);
        const std::vector<til::point_span>& SearchResultRows() const noexcept;
        void ClearSearch();

@@ -260,7 +260,6 @@ namespace winrt::Microsoft::Terminal::Control::implementation

        TerminalConnection::ITerminalConnection Connection();
        void Connection(const TerminalConnection::ITerminalConnection& connection);
-        void HardResetWithoutErase();

        void AnchorContextMenu(til::point viewportRelativeCharacterPosition);

@@ -348,7 +347,6 @@ namespace winrt::Microsoft::Terminal::Control::implementation
        safe_void_coroutine _renderEngineSwapChainChanged(const HANDLE handle);
        void _rendererBackgroundColorChanged();
        void _rendererTabColorChanged();
-        void _rendererEnteredErrorState();
 #pragma endregion

        void _raiseReadOnlyWarning();
@@ -403,7 +401,6 @@ namespace winrt::Microsoft::Terminal::Control::implementation
        float _panelWidth{ 0 };
        float _panelHeight{ 0 };
        float _compositionScale{ 0 };
-        uint8_t _renderFailures{ 0 };

        // Audio stuff.
        MidiAudio _midiAudio;
--- a/src/cascadia/TerminalControl/ControlCore.idl
+++ b/src/cascadia/TerminalControl/ControlCore.idl
@@ -55,8 +55,7 @@ namespace Microsoft.Terminal.Control
        Boolean GoForward;
        Boolean CaseSensitive;
        Boolean RegularExpression;
-        Boolean ExecuteSearch;
-        Boolean ScrollIntoView;
+        Boolean ResetOnly;
        Int32 ScrollOffset;
    };

@@ -98,7 +97,6 @@ namespace Microsoft.Terminal.Control
        void ApplyAppearance(Boolean focused);

        Microsoft.Terminal.TerminalConnection.ITerminalConnection Connection;
-        void HardResetWithoutErase();

        IControlSettings Settings { get; };
        IControlAppearance FocusedAppearance { get; };
--- a/src/cascadia/TerminalControl/ControlInteractivity.cpp
+++ b/src/cascadia/TerminalControl/ControlInteractivity.cpp
@@ -55,20 +55,6 @@ namespace winrt::Microsoft::Terminal::Control::implementation
                self->Attached.raise(*self, nullptr);
            }
        });
-
-        // GH#14464: Mark mode and quick-edit (shift+arrow) selections update
-        // the selection through ControlCore, bypassing SetEndSelectionPoint.
-        // Listen for selection changes so _selectionNeedsToBeCopied is set
-        // for ALL selection types, not just mouse drag.
-        _core->UpdateSelectionMarkers([weakThis = get_weak()](auto&&, auto&&) {
-            if (auto self{ weakThis.get() })
-            {
-                if (self->_core->HasSelection())
-                {
-                    self->_selectionNeedsToBeCopied = true;
-                }
-            }
-        });
    }

    uint64_t ControlInteractivity::Id()
@@ -329,18 +315,13 @@ namespace winrt::Microsoft::Terminal::Control::implementation
            }
            else
            {
-                // GH#19942, GH#14464: Don't re-copy a selection that was
-                // already copied via copyOnSelect on mouse-up. But DO copy
-                // if the selection was made via mark mode or modified with
-                // quick-edit keys (shift+arrow), since those paths never
-                // triggered an automatic copy.
-                const auto copied = (_selectionNeedsToBeCopied || !_core->CopyOnSelect()) &&
-                                    CopySelectionToClipboard(shiftEnabled, false, _core->Settings().CopyFormatting());
+                // Try to copy the text and clear the selection
+                const auto successfulCopy = CopySelectionToClipboard(shiftEnabled, false, _core->Settings().CopyFormatting());
                _core->ClearSelection();
-                if (_core->CopyOnSelect() || !copied)
+                if (_core->CopyOnSelect() || !successfulCopy)
                {
-                    // CopyOnSelect: right-click always pastes.
-                    // Otherwise: no selection → paste.
+                    // CopyOnSelect: right click always pastes!
+                    // Otherwise: no selection --> paste
                    RequestPasteTextFromClipboard();
                }
            }
@@ -504,7 +485,7 @@ namespace winrt::Microsoft::Terminal::Control::implementation
    // - modifiers: The modifiers pressed during this event, in the form of a VirtualKeyModifiers
    // - delta: the mouse wheel delta that triggered this event.
    bool ControlInteractivity::MouseWheel(const ::Microsoft::Terminal::Core::ControlKeyStates modifiers,
-                                          const Core::Point delta,
+                                          const int32_t delta,
                                          const Core::Point pixelPosition,
                                          const Control::MouseButtonState buttonState)
    {
@@ -525,9 +506,9 @@ namespace winrt::Microsoft::Terminal::Control::implementation
            // PointerPoint to work with. So, we're just going to do a
            // mousewheel event manually
            return _sendMouseEventHelper(terminalPosition,
-                                         delta.Y != 0 ? WM_MOUSEWHEEL : WM_MOUSEHWHEEL,
+                                         WM_MOUSEWHEEL,
                                         modifiers,
-                                         ::base::saturated_cast<short>(delta.Y != 0 ? delta.Y : delta.X),
+                                         ::base::saturated_cast<short>(delta),
                                         buttonState);
        }

@@ -536,15 +517,15 @@ namespace winrt::Microsoft::Terminal::Control::implementation

        if (ctrlPressed && shiftPressed && _core->Settings().ScrollToChangeOpacity())
        {
-            _mouseTransparencyHandler(delta.Y);
+            _mouseTransparencyHandler(delta);
        }
        else if (ctrlPressed && !shiftPressed && _core->Settings().ScrollToZoom())
        {
-            _mouseZoomHandler(delta.Y);
+            _mouseZoomHandler(delta);
        }
        else
        {
-            _mouseScrollHandler(delta.Y, pixelPosition, WI_IsFlagSet(buttonState, MouseButtonState::IsLeftButtonDown));
+            _mouseScrollHandler(delta, pixelPosition, WI_IsFlagSet(buttonState, MouseButtonState::IsLeftButtonDown));
        }
        return false;
    }
@@ -678,7 +659,7 @@ namespace winrt::Microsoft::Terminal::Control::implementation
        return _core->IsVtMouseModeEnabled();
    }

-    bool ControlInteractivity::_shouldSendAlternateScroll(const ::Microsoft::Terminal::Core::ControlKeyStates modifiers, const Core::Point delta)
+    bool ControlInteractivity::_shouldSendAlternateScroll(const ::Microsoft::Terminal::Core::ControlKeyStates modifiers, const int32_t delta)
    {
        // If the user is holding down Shift, suppress mouse events
        // TODO GH#4875: disable/customize this functionality
@@ -686,14 +667,7 @@ namespace winrt::Microsoft::Terminal::Control::implementation
        {
            return false;
        }
-        if (delta.Y != 0)
-        {
-            return _core->ShouldSendAlternateScroll(WM_MOUSEWHEEL, delta.Y);
-        }
-        else
-        {
-            return _core->ShouldSendAlternateScroll(WM_MOUSEHWHEEL, delta.X);
-        }
+        return _core->ShouldSendAlternateScroll(WM_MOUSEWHEEL, delta);
    }

    // Method Description:
--- a/src/cascadia/TerminalControl/ControlInteractivity.h
+++ b/src/cascadia/TerminalControl/ControlInteractivity.h
@@ -74,7 +74,7 @@ namespace winrt::Microsoft::Terminal::Control::implementation
        void TouchReleased();

        bool MouseWheel(const ::Microsoft::Terminal::Core::ControlKeyStates modifiers,
-                        const Core::Point delta,
+                        const int32_t delta,
                        const Core::Point pixelPosition,
                        const Control::MouseButtonState state);

@@ -153,7 +153,7 @@ namespace winrt::Microsoft::Terminal::Control::implementation

        void _hyperlinkHandler(const std::wstring_view uri);
        bool _canSendVTMouseInput(const ::Microsoft::Terminal::Core::ControlKeyStates modifiers);
-        bool _shouldSendAlternateScroll(const ::Microsoft::Terminal::Core::ControlKeyStates modifiers, const Core::Point delta);
+        bool _shouldSendAlternateScroll(const ::Microsoft::Terminal::Core::ControlKeyStates modifiers, const int32_t delta);

        til::point _getTerminalPosition(const til::point pixelPosition, bool roundToNearestCell);

--- a/src/cascadia/TerminalControl/ControlInteractivity.idl
+++ b/src/cascadia/TerminalControl/ControlInteractivity.idl
@@ -60,7 +60,7 @@ namespace Microsoft.Terminal.Control
        void TouchReleased();

        Boolean MouseWheel(Microsoft.Terminal.Core.ControlKeyStates modifiers,
-                           Microsoft.Terminal.Core.Point delta,
+                           Int32 delta,
                           Microsoft.Terminal.Core.Point pixelPosition,
                           MouseButtonState state);

--- a/src/cascadia/TerminalControl/HwndTerminal.cpp
+++ b/src/cascadia/TerminalControl/HwndTerminal.cpp
@@ -462,11 +462,6 @@ void HwndTerminal::SendOutput(std::wstring_view data)
    _terminal->Write(data);
 }

-void _stdcall AvoidBuggyTSFConsoleFlags()
-{
-    Microsoft::Console::TSF::Handle::AvoidBuggyTSFConsoleFlags();
-}
-
 HRESULT _stdcall CreateTerminal(HWND parentHwnd, _Out_ void** hwnd, _Out_ void** terminal)
 {
    auto publicTerminal = std::make_unique<HwndTerminal>(parentHwnd);
--- a/src/cascadia/TerminalControl/HwndTerminal.hpp
+++ b/src/cascadia/TerminalControl/HwndTerminal.hpp
@@ -41,7 +41,6 @@ typedef struct _TerminalTheme
 } TerminalTheme, *LPTerminalTheme;

 extern "C" {
-__declspec(dllexport) void _stdcall AvoidBuggyTSFConsoleFlags();
 __declspec(dllexport) HRESULT _stdcall CreateTerminal(HWND parentHwnd, _Out_ void** hwnd, _Out_ void** terminal);
 __declspec(dllexport) void _stdcall TerminalSendOutput(void* terminal, LPCWSTR data);
 __declspec(dllexport) void _stdcall TerminalRegisterScrollCallback(void* terminal, void __stdcall callback(int, int, int));
--- a/src/cascadia/TerminalControl/IMouseWheelListener.idl
+++ b/src/cascadia/TerminalControl/IMouseWheelListener.idl
@@ -11,6 +11,6 @@ namespace Microsoft.Terminal.Control
    [uuid("65b8b8c5-988f-43ff-aba9-e89368da1598")]
    interface IMouseWheelListener
    {
-        Boolean OnMouseWheel(Windows.Foundation.Point coord, Microsoft.Terminal.Core.Point delta, Boolean leftButtonDown, Boolean midButtonDown, Boolean rightButtonDown);
+        Boolean OnMouseWheel(Windows.Foundation.Point coord, Int32 delta, Boolean leftButtonDown, Boolean midButtonDown, Boolean rightButtonDown);
    }
 }
--- a/src/cascadia/TerminalControl/SearchBoxControl.cpp
+++ b/src/cascadia/TerminalControl/SearchBoxControl.cpp
@@ -330,14 +330,10 @@ namespace winrt::Microsoft::Terminal::Control::implementation
    // - bool: whether the current focus is on the search box
    bool SearchBoxControl::ContainsFocus()
    {
-        // BODGY: It is possible for this to get called with no XAML root. We are unsure why.
-        if (auto root = XamlRoot())
+        auto focusedElement = Input::FocusManager::GetFocusedElement(this->XamlRoot());
+        if (_focusableElements.count(focusedElement) > 0)
        {
-            auto focusedElement = Input::FocusManager::GetFocusedElement(root);
-            if (_focusableElements.count(focusedElement) > 0)
-            {
-                return true;
-            }
+            return true;
        }

        return false;
--- a/src/cascadia/TerminalControl/TermControl.cpp
+++ b/src/cascadia/TerminalControl/TermControl.cpp
@@ -536,11 +536,6 @@ namespace winrt::Microsoft::Terminal::Control::implementation
        _core.Connection(newConnection);
    }

-    void TermControl::HardResetWithoutErase()
-    {
-        _core.HardResetWithoutErase();
-    }
-
    void TermControl::_throttledUpdateScrollbar(const ScrollBarUpdate& update)
    {
        if (!_initializedTerminal)
@@ -723,15 +718,8 @@ namespace winrt::Microsoft::Terminal::Control::implementation
        }
        else
        {
-            _handleSearchResults(_core.Search(SearchRequest{
-                .Text = _searchBox->Text(),
-                .GoForward = goForward,
-                .CaseSensitive = _searchBox->CaseSensitive(),
-                .RegularExpression = _searchBox->RegularExpression(),
-                .ExecuteSearch = true,
-                .ScrollIntoView = true,
-                .ScrollOffset = _searchScrollOffset,
-            }));
+            const auto request = SearchRequest{ _searchBox->Text(), goForward, _searchBox->CaseSensitive(), _searchBox->RegularExpression(), false, _searchScrollOffset };
+            _handleSearchResults(_core.Search(request));
        }
    }

@@ -765,15 +753,8 @@ namespace winrt::Microsoft::Terminal::Control::implementation
    {
        if (_searchBox && _searchBox->IsOpen())
        {
-            _handleSearchResults(_core.Search(SearchRequest{
-                .Text = text,
-                .GoForward = goForward,
-                .CaseSensitive = caseSensitive,
-                .RegularExpression = regularExpression,
-                .ExecuteSearch = true,
-                .ScrollIntoView = true,
-                .ScrollOffset = _searchScrollOffset,
-            }));
+            const auto request = SearchRequest{ text, goForward, caseSensitive, regularExpression, false, _searchScrollOffset };
+            _handleSearchResults(_core.Search(request));
        }
    }

@@ -792,15 +773,11 @@ namespace winrt::Microsoft::Terminal::Control::implementation
    {
        if (_searchBox && _searchBox->IsOpen())
        {
-            _handleSearchResults(_core.Search(SearchRequest{
-                .Text = text,
-                .GoForward = goForward,
-                .CaseSensitive = caseSensitive,
-                .RegularExpression = regularExpression,
-                .ExecuteSearch = false,
-                .ScrollIntoView = true,
-                .ScrollOffset = _searchScrollOffset,
-            }));
+            // We only want to update the search results based on the new text. Set
+            // `resetOnly` to true so we don't accidentally update the current match index.
+            const auto request = SearchRequest{ text, goForward, caseSensitive, regularExpression, true, _searchScrollOffset };
+            const auto result = _core.Search(request);
+            _handleSearchResults(result);
        }
    }

@@ -1844,16 +1821,6 @@ namespace winrt::Microsoft::Terminal::Control::implementation
            return true;
        }

-        // While TSF has an active composition, key events must not be forwarded
-        // to the PTY directly. The IME re-injects navigation/confirmation keys
-        // after composition ends, at which point HasActiveComposition() == false
-        // and they are forwarded normally. This mirrors conhost v1 behavior in
-        // src/interactivity/win32/windowio.cpp.
-        if (GetTSFHandle().HasActiveComposition())
-        {
-            return true;
-        }
-
        if (_TrySendKeyEvent(vkey, scanCode, modifiers, keyDown))
        {
            return true;
@@ -2028,13 +1995,7 @@ namespace winrt::Microsoft::Terminal::Control::implementation
        const auto point = args.GetCurrentPoint(*this);
        const auto type = ptr.PointerDeviceType();

-        // GH#19908: _focused can be true even when the search box has
-        // keyboard focus, because GotFocus bubbles from the search box
-        // child and _GotFocusHandler sets _focused=true. If the user
-        // click-drags in the terminal while the search box is focused,
-        // we need to explicitly call Focus() to move keyboard focus back
-        // to the terminal so that Ctrl+C copies the selection.
-        if (!_focused || (_searchBox && _searchBox->ContainsFocus()))
+        if (!_focused)
        {
            Focus(FocusState::Pointer);
        }
@@ -2203,11 +2164,15 @@ namespace winrt::Microsoft::Terminal::Control::implementation
        RestorePointerCursor.raise(*this, nullptr);

        const auto point = args.GetCurrentPoint(*this);
-        auto delta = point.Properties().MouseWheelDelta();
+        // GH#10329 - we don't need to handle horizontal scrolls. Only vertical ones.
+        // So filter out the horizontal ones.
+        if (point.Properties().IsHorizontalMouseWheel())
+        {
+            return;
+        }
+
        auto result = _interactivity.MouseWheel(ControlKeyStates{ args.KeyModifiers() },
-                                                point.Properties().IsHorizontalMouseWheel() ?
-                                                    Core::Point{ delta, 0 } :
-                                                    Core::Point{ 0, delta },
+                                                point.Properties().MouseWheelDelta(),
                                                _toTerminalOrigin(point.Position()),
                                                TermControl::GetPressedMouseButtons(point));
        if (result)
@@ -2227,7 +2192,7 @@ namespace winrt::Microsoft::Terminal::Control::implementation
    // - delta: the mouse wheel delta that triggered this event.
    // - state: the state for each of the mouse buttons individually (pressed/unpressed)
    bool TermControl::OnMouseWheel(const Windows::Foundation::Point location,
-                                   const Core::Point delta,
+                                   const int32_t delta,
                                   const bool leftButtonDown,
                                   const bool midButtonDown,
                                   const bool rightButtonDown)
@@ -2630,9 +2595,9 @@ namespace winrt::Microsoft::Terminal::Control::implementation

        _updateScrollBar->Run(update);

-        // If we have a selection with markers (exposed via selection mode),
-        //   update the position of the markers
-        if (_core.HasSelection() && _core.SelectionMode() >= SelectionInteractionMode::Keyboard)
+        // if a selection marker is already visible,
+        // update the position of those markers
+        if (SelectionStartMarker().Visibility() == Visibility::Visible || SelectionEndMarker().Visibility() == Visibility::Visible)
        {
            _updateSelectionMarkers(nullptr, winrt::make<UpdateSelectionMarkersEventArgs>(false));
        }
@@ -3198,17 +3163,12 @@ namespace winrt::Microsoft::Terminal::Control::implementation
            co_return;
        }

-        const auto weak = get_weak();
-
        if (e.DataView().Contains(StandardDataFormats::ApplicationLink()))
        {
            try
            {
                auto link{ co_await e.DataView().GetApplicationLinkAsync() };
-                if (const auto strong = weak.get())
-                {
-                    _pasteTextWithBroadcast(link.AbsoluteUri());
-                }
+                _pasteTextWithBroadcast(link.AbsoluteUri());
            }
            CATCH_LOG();
        }
@@ -3217,10 +3177,7 @@ namespace winrt::Microsoft::Terminal::Control::implementation
            try
            {
                auto link{ co_await e.DataView().GetWebLinkAsync() };
-                if (const auto strong = weak.get())
-                {
-                    _pasteTextWithBroadcast(link.AbsoluteUri());
-                }
+                _pasteTextWithBroadcast(link.AbsoluteUri());
            }
            CATCH_LOG();
        }
@@ -3229,10 +3186,7 @@ namespace winrt::Microsoft::Terminal::Control::implementation
            try
            {
                auto text{ co_await e.DataView().GetTextAsync() };
-                if (const auto strong = weak.get())
-                {
-                    _pasteTextWithBroadcast(text);
-                }
+                _pasteTextWithBroadcast(text);
            }
            CATCH_LOG();
        }
@@ -3294,12 +3248,6 @@ namespace winrt::Microsoft::Terminal::Control::implementation
                    }
                }

-                const auto strong = weak.get();
-                if (!strong)
-                {
-                    co_return;
-                }
-
                std::wstring allPathsString;
                for (auto& fullPath : fullPaths)
                {
@@ -3642,14 +3590,9 @@ namespace winrt::Microsoft::Terminal::Control::implementation

    safe_void_coroutine TermControl::_updateSelectionMarkers(IInspectable /*sender*/, Control::UpdateSelectionMarkersEventArgs args)
    {
-        if (!args)
-        {
-            co_return;
-        }
-
        auto weakThis{ get_weak() };
        co_await resume_foreground(Dispatcher());
-        if (const auto strong = weakThis.get())
+        if (weakThis.get() && args)
        {
            if (_core.HasSelection() && !args.ClearMarkers())
            {
@@ -3901,15 +3844,8 @@ namespace winrt::Microsoft::Terminal::Control::implementation
        const auto goForward = _searchBox->GoForward();
        const auto caseSensitive = _searchBox->CaseSensitive();
        const auto regularExpression = _searchBox->RegularExpression();
-        _handleSearchResults(_core.Search(SearchRequest{
-            .Text = text,
-            .GoForward = goForward,
-            .CaseSensitive = caseSensitive,
-            .RegularExpression = regularExpression,
-            .ExecuteSearch = false,
-            .ScrollIntoView = false,
-            .ScrollOffset = _searchScrollOffset,
-        }));
+        const auto request = SearchRequest{ text, goForward, caseSensitive, regularExpression, true, _searchScrollOffset };
+        _handleSearchResults(_core.Search(request));
    }

    void TermControl::_handleSearchResults(SearchResults results)
--- a/src/cascadia/TerminalControl/TermControl.h
+++ b/src/cascadia/TerminalControl/TermControl.h
@@ -147,7 +147,7 @@ namespace winrt::Microsoft::Terminal::Control::implementation

        bool OnDirectKeyEvent(const uint32_t vkey, const uint8_t scanCode, const bool down);

-        bool OnMouseWheel(const Windows::Foundation::Point location, const winrt::Microsoft::Terminal::Core::Point delta, const bool leftButtonDown, const bool midButtonDown, const bool rightButtonDown);
+        bool OnMouseWheel(const Windows::Foundation::Point location, const int32_t delta, const bool leftButtonDown, const bool midButtonDown, const bool rightButtonDown);

        ~TermControl();

@@ -194,7 +194,6 @@ namespace winrt::Microsoft::Terminal::Control::implementation

        TerminalConnection::ITerminalConnection Connection();
        void Connection(const TerminalConnection::ITerminalConnection& connection);
-        void HardResetWithoutErase();

        Control::CursorDisplayState CursorVisibility() const noexcept;
        void CursorVisibility(Control::CursorDisplayState cursorVisibility);
--- a/src/cascadia/TerminalControl/TermControl.idl
+++ b/src/cascadia/TerminalControl/TermControl.idl
@@ -47,7 +47,6 @@ namespace Microsoft.Terminal.Control
        void UpdateControlSettings(IControlSettings settings, IControlAppearance unfocusedAppearance);

        Microsoft.Terminal.TerminalConnection.ITerminalConnection Connection;
-        void HardResetWithoutErase();

        UInt64 ContentId{ get; };

--- a/src/cascadia/TerminalControl/dll/Microsoft.Terminal.Control.def
+++ b/src/cascadia/TerminalControl/dll/Microsoft.Terminal.Control.def
@@ -4,7 +4,6 @@ EXPORTS
  DllGetActivationFactory = WINRT_GetActivationFactory    PRIVATE

  ; Flat C ABI
-  AvoidBuggyTSFConsoleFlags
  CreateTerminal
  DestroyTerminal
  TerminalBlinkCursor
--- a/src/cascadia/TerminalCore/Terminal.cpp
+++ b/src/cascadia/TerminalCore/Terminal.cpp
@@ -55,18 +55,6 @@ void Terminal::Create(til::size viewportSize, til::CoordType scrollbackLines, Re
    _stateMachine = std::make_unique<StateMachine>(std::move(engine));
 }

-// Method Description:
-// - Resets all VT state to defaults without clearing the buffer content.
-// Called when a connection is restarted so that any dirty modes left
-// behind by a crashed application don't affect the new connection.
-void Terminal::HardResetWithoutErase()
-{
-    _assertLocked();
-    _stateMachine->ResetState();
-    auto& engine = reinterpret_cast<OutputStateMachineEngine&>(_stateMachine->Engine());
-    engine.Dispatch().HardReset(false);
-}
-
 // Method Description:
 // - Initializes the Terminal from the given set of settings.
 // Arguments:
--- a/src/cascadia/TerminalCore/Terminal.hpp
+++ b/src/cascadia/TerminalCore/Terminal.hpp
@@ -86,7 +86,6 @@ public:
    void Create(til::size viewportSize,
                til::CoordType scrollbackLines,
                Microsoft::Console::Render::Renderer& renderer);
-    void HardResetWithoutErase();

    void CreateFromSettings(winrt::Microsoft::Terminal::Core::ICoreSettings settings,
                            Microsoft::Console::Render::Renderer& renderer);
--- a/src/cascadia/TerminalSettingsEditor/NullableColorPicker.cpp
+++ b/src/cascadia/TerminalSettingsEditor/NullableColorPicker.cpp
@@ -159,7 +159,12 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
        CurrentColor(nullptr);
    }

-    void NullableColorPicker::Flyout_Opening(const IInspectable& /*sender*/, const IInspectable& /*args*/)
+    safe_void_coroutine NullableColorPicker::MoreColors_Clicked(const IInspectable& /*sender*/, const RoutedEventArgs& /*args*/)
+    {
+        co_await ColorPickerDialog().ShowAsync();
+    }
+
+    void NullableColorPicker::ColorPickerDialog_Opened(const IInspectable& /*sender*/, const ContentDialogOpenedEventArgs& /*args*/)
    {
        // Initialize color picker with current color
        if (CurrentColor())
@@ -180,7 +185,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
        }
    }

-    void NullableColorPicker::Flyout_Closing(const winrt::Windows::Foundation::IInspectable& /*sender*/, const winrt::Windows::UI::Xaml::Controls::Primitives::FlyoutBaseClosingEventArgs& /*args*/)
+    void NullableColorPicker::ColorPickerDialog_PrimaryButtonClick(const IInspectable& /*sender*/, const ContentDialogButtonClickEventArgs& /*args*/)
    {
        const auto& selectedColor = ColorPickerControl().Color();
        const Microsoft::Terminal::Core::Color terminalColor{ selectedColor.R, selectedColor.G, selectedColor.B, selectedColor.A };
--- a/src/cascadia/TerminalSettingsEditor/NullableColorPicker.h
+++ b/src/cascadia/TerminalSettingsEditor/NullableColorPicker.h
@@ -22,8 +22,10 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
        void ColorChip_DataContextChanged(const winrt::Windows::Foundation::IInspectable& sender, const winrt::Windows::UI::Xaml::DataContextChangedEventArgs& args);

        void NullColorButton_Clicked(const winrt::Windows::Foundation::IInspectable& sender, const winrt::Windows::UI::Xaml::RoutedEventArgs& args);
-        void Flyout_Opening(const winrt::Windows::Foundation::IInspectable& sender, const winrt::Windows::Foundation::IInspectable& args);
-        void Flyout_Closing(const winrt::Windows::Foundation::IInspectable& sender, const winrt::Windows::UI::Xaml::Controls::Primitives::FlyoutBaseClosingEventArgs& args);
+        safe_void_coroutine MoreColors_Clicked(const winrt::Windows::Foundation::IInspectable& sender, const winrt::Windows::UI::Xaml::RoutedEventArgs& args);
+
+        void ColorPickerDialog_Opened(const winrt::Windows::Foundation::IInspectable& sender, const winrt::Windows::UI::Xaml::Controls::ContentDialogOpenedEventArgs& args);
+        void ColorPickerDialog_PrimaryButtonClick(const winrt::Windows::Foundation::IInspectable& sender, const winrt::Windows::UI::Xaml::Controls::ContentDialogButtonClickEventArgs& args);

        DEPENDENCY_PROPERTY(Editor::ColorSchemeViewModel, ColorSchemeVM);
        DEPENDENCY_PROPERTY(Windows::Foundation::IReference<Microsoft::Terminal::Core::Color>, CurrentColor);
--- a/src/cascadia/TerminalSettingsEditor/NullableColorPicker.xaml
+++ b/src/cascadia/TerminalSettingsEditor/NullableColorPicker.xaml
@@ -97,6 +97,25 @@
    <StackPanel x:Name="ContentStackPanel"
                Orientation="Horizontal"
                Spacing="5">
+        <ContentDialog x:Name="ColorPickerDialog"
+                       x:Uid="NullableColorPicker_ColorPickerContentDialog"
+                       DefaultButton="Primary"
+                       Opened="ColorPickerDialog_Opened"
+                       PrimaryButtonClick="ColorPickerDialog_PrimaryButtonClick"
+                       TabFocusNavigation="Cycle">
+            <muxc:ColorPicker x:Name="ColorPickerControl"
+                              Margin="0,0,0,-40"
+                              ColorSpectrumShape="Box"
+                              IsAlphaEnabled="False"
+                              IsAlphaSliderVisible="True"
+                              IsAlphaTextInputVisible="True"
+                              IsColorChannelTextInputVisible="False"
+                              IsColorSliderVisible="False"
+                              IsHexInputVisible="False"
+                              IsMoreButtonVisible="False"
+                              Orientation="Horizontal" />
+        </ContentDialog>
+
        <ContentPresenter Content="{x:Bind ColorSchemeVM, Mode=OneWay}"
                          ContentTemplate="{StaticResource ColorSchemeTemplate}" />

@@ -127,14 +146,8 @@
                </ToggleButton>

                <Button x:Uid="NullableColorPicker_MoreColorsButton"
-                        HorizontalAlignment="Stretch">
-                    <Button.Flyout>
-                        <Flyout Closing="Flyout_Closing"
-                                Opening="Flyout_Opening">
-                            <muxc:ColorPicker x:Name="ColorPickerControl" />
-                        </Flyout>
-                    </Button.Flyout>
-                </Button>
+                        HorizontalAlignment="Stretch"
+                        Click="MoreColors_Clicked" />
            </StackPanel>
        </Grid>

--- a/src/cascadia/TerminalSettingsEditor/Resources/ja-JP/Resources.resw
+++ b/src/cascadia/TerminalSettingsEditor/Resources/ja-JP/Resources.resw
@@ -371,7 +371,7 @@
    <value>入力したテキストをセルにグループ化する方法を変更します。"Grapheme clusters" オプションは最も新しく Unicode で正しい方法ですが、UNIX では "wcswidth" は一般的な方法であり、"Windows コンソール" は Windows での動作方法をレプリケートします。この設定を変更するには、Windows ターミナルの再起動が必要です。この設定は、その中から起動されたアプリケーションにのみ適用されます。</value>
  </data>
  <data name="Globals_TextMeasurement_Graphemes.Text" xml:space="preserve">
-    <value>書記素クラスター</value>
+    <value>Grapheme クラスター</value>
    <comment>The default choice between multiple graphics APIs.</comment>
  </data>
  <data name="Globals_TextMeasurement_Wcswidth.Text" xml:space="preserve">
@@ -1338,7 +1338,7 @@
    <comment>"environment variables" are user-definable values that can affect the way running processes will behave on a computer</comment>
  </data>
  <data name="Profile_ReloadEnvVars.HelpText" xml:space="preserve">
-    <value>有効にすると、ターミナルは、このプロファイルで新しいタブまたはペインを作成するときに新しい環境ブロックを生成します。無効にすると、代わりにタブ/ペインはターミナルが開始された変数を継承します。</value>
+    <value>有効にすると、ターミナルは、このプロファイルで新しいタブまたはウィンドウを作成するときに新しい環境ブロックを生成します。無効にすると、代わりにタブ/ペインはターミナルが開始された変数を継承します。</value>
    <comment>A description for what the "Reload environment variables" setting does. Presented near "Profile_ReloadEnvVars".</comment>
  </data>
  <data name="Profile_RightClickContextMenu.Header" xml:space="preserve">
@@ -1382,7 +1382,7 @@
    <comment>An option to choose from for the "bell style" setting. When selected, notifications are silenced.</comment>
  </data>
  <data name="Globals_DisableAnimations.Header" xml:space="preserve">
-    <value>ペインのアニメーションを無効にする</value>
+    <value>ウィンドウのアニメーションを無効にする</value>
    <comment>Header for a control to toggle animations on panes. "Enabled" value disables the animations.</comment>
  </data>
  <data name="Profile_FontWeightBlack.Content" xml:space="preserve">
@@ -1733,7 +1733,7 @@
    <comment>An error message that appears when the user attempts to rename a color scheme to something invalid. This appears as the title, and explains the issue.</comment>
  </data>
  <data name="Globals_FocusFollowMouse.Header" xml:space="preserve">
-    <value>マウスをポイントしたときにフォーカス ペインを自動的に表示する</value>
+    <value>マウスをポイントしたときにフォーカス ウィンドウを自動的に表示する</value>
    <comment>Header for a control to toggle the "focus follow mouse" setting. When enabled, hovering over a pane puts it in focus.</comment>
  </data>
  <data name="Globals_ScrollToZoom.Header" xml:space="preserve">
@@ -1745,7 +1745,7 @@
    <comment>Header for a control to toggle opacity changes with scrolling. When enabled, holding the Ctrl and Shift keys while scrolling will increase or decrease the window opacity.</comment>
  </data>
  <data name="Globals_DisableAnimationsReversed.Header" xml:space="preserve">
-    <value>ペインのアニメーション</value>
+    <value>ウィンドウのアニメーション</value>
    <comment>Header for a control to toggle animations on panes. "Enabled" value enables the animations.</comment>
  </data>
  <data name="Globals_AlwaysShowNotificationIcon.Header" xml:space="preserve">
--- a/src/cascadia/TerminalSettingsEditor/Resources/ko-KR/Resources.resw
+++ b/src/cascadia/TerminalSettingsEditor/Resources/ko-KR/Resources.resw
@@ -729,7 +729,7 @@
    <comment>A description for what the "antialiasing mode" setting does. Presented near "Profile_AntialiasingMode.Header".</comment>
  </data>
  <data name="Profile_AntialiasingModeAliased.Content" xml:space="preserve">
-    <value>앨리어싱</value>
+    <value>별칭</value>
    <comment>An option to choose from for the "text antialiasing" setting. When selected, the app's text renderer does not use antialiasing techniques.</comment>
  </data>
  <data name="Profile_AntialiasingModeClearType.Content" xml:space="preserve">
--- a/src/cascadia/TerminalSettingsEditor/Resources/zh-TW/Resources.resw
+++ b/src/cascadia/TerminalSettingsEditor/Resources/zh-TW/Resources.resw
@@ -335,7 +335,7 @@
    <comment>This text is shown next to a list of choices.</comment>
  </data>
  <data name="Globals_GraphicsAPI.HelpText" xml:space="preserve">
-    <value>Direct3D 11 提供更具效能且功能更豐富的體驗，而 Direct2D 則較穩定。預設選項 [自動] 會挑選最適合您圖形硬體的 API。如果您遇到重大問題，請考慮使用 Direct2D。</value>
+    <value>Direct3D 11 提供更具效能且功能更豐富的體驗，而 Direct2D 則較穩定。默認選項 [自動] 會挑選最適合您圖形硬體的 API。如果您遇到重大問題，請考慮使用 Direct2D。</value>
  </data>
  <data name="Globals_GraphicsAPI_Automatic.Text" xml:space="preserve">
    <value>自動</value>
@@ -1018,7 +1018,7 @@
    <comment>A description for what the "line height" setting does. Presented near "Profile_LineHeight".</comment>
  </data>
  <data name="Profile_CellWidth.HelpText" xml:space="preserve">
-    <value>覆寫終端機的單元格寬度。以字型大小的倍數表示。預設值取決於您的字型，通常大約是0.6。</value>
+    <value>覆寫終端機的單元格寬度。以字型大小的倍數表示。默認值取決於您的字型，通常大約是0.6。</value>
    <comment>A description for what the "cell width" setting does. Presented near "Profile_CellWidth".</comment>
  </data>
  <data name="Profile_LineHeightBox.PlaceholderText" xml:space="preserve">
--- a/src/cascadia/TerminalSettingsModel/ActionMapSerialization.cpp
+++ b/src/cascadia/TerminalSettingsModel/ActionMapSerialization.cpp
@@ -82,13 +82,18 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation
                command->LogSettingChanges(_changeLog);
                AddAction(*command, keys);

-                if (jsonBlock.isMember(JsonKey(ActionKey)) && !jsonBlock.isMember(JsonKey(IterateOnKey)) && origin == OriginTag::User &&
-                    (!jsonBlock.isMember(JsonKey(IDKey)) || jsonBlock.isMember(JsonKey(KeysKey))))
+                if (jsonBlock.isMember(JsonKey(KeysKey)))
+                {
+                    // there are keys in this command block meaning this is the legacy style -
+                    // inform the loader that fixups are needed
+                    _fixupsAppliedDuringLoad = true;
+                }
+
+                if (jsonBlock.isMember(JsonKey(ActionKey)) && !jsonBlock.isMember(JsonKey(IterateOnKey)) && origin == OriginTag::User && !jsonBlock.isMember(JsonKey(IDKey)))
                {
                    // for non-nested non-iterable commands,
-                    // if there's no ID in the command block we will generate one for the user,
-                    // or if there are keys in this command block that means this is the legacy style -
-                    // in either case, inform the loader that fixups are needed
+                    // if there's no ID in the command block we will generate one for the user -
+                    // inform the loader that the ID needs to be written into the json
                    _fixupsAppliedDuringLoad = true;
                }
            }
--- a/src/cascadia/TerminalSettingsModel/CascadiaSettings.cpp
+++ b/src/cascadia/TerminalSettingsModel/CascadiaSettings.cpp
@@ -588,16 +588,6 @@ static void _resolveSingleMediaResourceInner(Model::OriginTag origin, std::wstri
        }
    }

-    if (origin == winrt::Microsoft::Terminal::Settings::Model::OriginTag::Fragment)
-    {
-        if (PathIsUNCEx(resourcePath.c_str(), nullptr))
-        {
-            // A UNC path is just another type of network path, which fragments are not allowed to specify.
-            resource.Reject();
-            return;
-        }
-    }
-
    // Not a URI? Try a path.
    try
    {
@@ -648,12 +638,9 @@ void CascadiaSettings::_validateMediaResources()

    _globals->ResolveMediaResources(mediaResourceResolver);

-    if (Feature_WarnOnInvalidSettingsMediaResources::IsEnabled())
+    if (_foundInvalidUserResources)
    {
-        if (_foundInvalidUserResources)
-        {
-            _warnings.Append(SettingsLoadWarnings::InvalidMediaResource);
-        }
+        _warnings.Append(SettingsLoadWarnings::InvalidMediaResource);
    }
 }

--- a/src/cascadia/TerminalSettingsModel/CascadiaSettingsSerialization.cpp
+++ b/src/cascadia/TerminalSettingsModel/CascadiaSettingsSerialization.cpp
@@ -16,7 +16,9 @@
 #include "PowershellCoreProfileGenerator.h"
 #include "VisualStudioGenerator.h"
 #include "WslDistroGenerator.h"
+#if TIL_FEATURE_DYNAMICSSHPROFILES_ENABLED
 #include "SshHostGenerator.h"
+#endif

 #include "ApplicationState.h"
 #include "DefaultTerminal.h"
@@ -224,10 +226,9 @@ void SettingsLoader::GenerateProfiles()
    generateProfiles(WslDistroGenerator{});
    generateProfiles(AzureCloudShellGenerator{});
    generateProfiles(VisualStudioGenerator{});
-    if constexpr (Feature_DynamicSSHProfiles::IsEnabled())
-    {
-        sshProfilesGenerated = generateProfiles(SshHostGenerator{});
-    }
+#if TIL_FEATURE_DYNAMICSSHPROFILES_ENABLED
+    sshProfilesGenerated = generateProfiles(SshHostGenerator{});
+#endif
 }

 // Generate ExtensionPackage objects from the profile generators.
@@ -266,10 +267,9 @@ void SettingsLoader::GenerateExtensionPackagesFromProfileGenerators()
    generateExtensionPackages(WslDistroGenerator{});
    generateExtensionPackages(AzureCloudShellGenerator{});
    generateExtensionPackages(VisualStudioGenerator{});
-    if constexpr (Feature_DynamicSSHProfiles::IsEnabled())
-    {
-        generateExtensionPackages(SshHostGenerator{});
-    }
+#if TIL_FEATURE_DYNAMICSSHPROFILES_ENABLED
+    generateExtensionPackages(SshHostGenerator{});
+#endif
 }

 // A new settings.json gets a special treatment:
@@ -559,7 +559,6 @@ bool SettingsLoader::AddDynamicProfileFolders()
        folderEntry->Inlining(FolderEntryInlining::Auto);
        folderEntry->RawEntries(winrt::single_threaded_vector<Model::NewTabMenuEntry>({ *matchProfilesEntry }));

-        // NewTabMenu is guaranteed to exist by FixupUserSettings, which runs before this fixup.
        userSettings.globals->NewTabMenu().Append(folderEntry.as<Model::NewTabMenuEntry>());
        state->SSHFolderGenerated(true);
        return true;
@@ -690,16 +689,6 @@ bool SettingsLoader::FixupUserSettings()
        fixedUp = true;
    }

-    // Terminal 1.24
-    // Ensure that the user always has a newTabMenu. We used to do this last, after
-    // resolving all of the new tab menu entries, but there was no conceivable reason
-    // that it should happen so late.
-    if (!userSettings.globals->HasNewTabMenu())
-    {
-        userSettings.globals->NewTabMenu(winrt::single_threaded_vector<Model::NewTabMenuEntry>({ Model::RemainingProfilesEntry{} }));
-        // This one does not need to be written back to the settings file immediately, it can wait until we write one for another reason.
-    }
-
    return fixedUp;
 }

@@ -1274,8 +1263,8 @@ try
    // DisableDeletedProfiles returns true whenever we encountered any new generated/dynamic profiles.
    // Similarly FixupUserSettings returns true, when it encountered settings that were patched up.
    mustWriteToDisk |= loader.DisableDeletedProfiles();
-    mustWriteToDisk |= loader.FixupUserSettings();
    mustWriteToDisk |= loader.AddDynamicProfileFolders();
+    mustWriteToDisk |= loader.FixupUserSettings();

    // If this throws, the app will catch it and use the default settings.
    const auto settings = winrt::make_self<CascadiaSettings>(std::move(loader));
@@ -1756,6 +1745,16 @@ void CascadiaSettings::_resolveNewTabMenuProfiles() const
    {
        remainingProfilesEntry.Profiles(remainingProfiles);
    }
+
+    // If the configuration does not have a "newTabMenu" field, GlobalAppSettings
+    // will return a default value containing just a "remainingProfiles" entry. However,
+    // this value is regenerated on every "get" operation, so the effect of setting
+    // the remaining profiles above will be undone. So only in the case that no custom
+    // value is present in GlobalAppSettings, we will store the modified default value.
+    if (!_globals->HasNewTabMenu())
+    {
+        _globals->NewTabMenu(entries);
+    }
 }

 // Method Description:
--- a/src/cascadia/TerminalSettingsModel/Resources/ja-JP/Resources.resw
+++ b/src/cascadia/TerminalSettingsModel/Resources/ja-JP/Resources.resw
@@ -124,10 +124,10 @@
    <value>新しいタブ...</value>
  </data>
  <data name="SplitPaneParentCommandName" xml:space="preserve">
-    <value>ペインの分割...</value>
+    <value>ウィンドウの分割...</value>
  </data>
  <data name="SnippetsPaneCommandName" xml:space="preserve">
-    <value>スニペット ペインを開く</value>
+    <value>スニペット ウィンドウを開く</value>
    <comment>This will open a pane with a list of the users's saved commands ("snippets") in it</comment>
  </data>
  <data name="ApplicationDisplayNamePortable" xml:space="preserve">
@@ -153,7 +153,7 @@
    <value>他のすべてのタブを閉じる</value>
  </data>
  <data name="ClosePaneCommandKey" xml:space="preserve">
-    <value>ペインを閉じる</value>
+    <value>ウィンドウを閉じる</value>
  </data>
  <data name="CloseTabAtIndexCommandKey" xml:space="preserve">
    <value>インデックス {0}のタブを閉じる</value>
@@ -229,7 +229,7 @@
    <value>以前</value>
  </data>
  <data name="DuplicatePaneCommandKey" xml:space="preserve">
-    <value>ペインの複製する</value>
+    <value>ウィンドウの複製する</value>
  </data>
  <data name="DuplicateTabCommandKey" xml:space="preserve">
    <value>タブを複製する</value>
@@ -262,41 +262,41 @@
    <comment>{0} will be replaced with one of the four directions "DirectionLeft", "DirectionRight", "DirectionUp", "DirectionDown"</comment>
  </data>
  <data name="MoveFocusToLastUsedPane" xml:space="preserve">
-    <value>前回使用したペインにフォーカスを移動する</value>
+    <value>前回使用したウィンドウにフォーカスを移動する</value>
  </data>
  <data name="MoveFocusNextInOrder" xml:space="preserve">
-    <value>次のペインに順番にフォーカスを移動する</value>
+    <value>次のウィンドウに順番にフォーカスを移動する</value>
  </data>
  <data name="MoveFocusPreviousInOrder" xml:space="preserve">
-    <value>前のペインに順番にフォーカスを移動する</value>
+    <value>前のウィンドウに順番にフォーカスを移動する</value>
  </data>
  <data name="MoveFocusFirstPane" xml:space="preserve">
-    <value>最初のペインにフォーカスを移動する</value>
+    <value>最初のウィンドウにフォーカスを移動する</value>
  </data>
  <data name="MoveFocusParentPane" xml:space="preserve">
-    <value>親ペインにフォーカスを移動する</value>
+    <value>親ウィンドウにフォーカスを移動する</value>
  </data>
  <data name="MoveFocusChildPane" xml:space="preserve">
-    <value>子ペインにフォーカスを移動する</value>
+    <value>子ウィンドウにフォーカスを移動する</value>
  </data>
  <data name="SwapPaneCommandKey" xml:space="preserve">
-    <value>ペインを入れ替える</value>
+    <value>ウィンドウを入れ替える</value>
  </data>
  <data name="SwapPaneWithArgCommandKey" xml:space="preserve">
-    <value>ペインを入れ替える {0}</value>
+    <value>ウィンドウを入れ替える {0}</value>
    <comment>{0} will be replaced with one of the four directions "DirectionLeft", "DirectionRight", "DirectionUp", "DirectionDown"</comment>
  </data>
  <data name="SwapPaneToLastUsedPane" xml:space="preserve">
-    <value>ペインを最後に使用したペインと入れ替える</value>
+    <value>ウィンドウを最後に使用したウィンドウと入れ替える</value>
  </data>
  <data name="SwapPaneNextInOrder" xml:space="preserve">
-    <value>ペインを次のペインと順番に入れ替える</value>
+    <value>ウィンドウを次のウィンドウと順番に入れ替える</value>
  </data>
  <data name="SwapPanePreviousInOrder" xml:space="preserve">
-    <value>ペインを前のペインと順番に入れ替える</value>
+    <value>ウィンドウを前のウィンドウと順番に入れ替える</value>
  </data>
  <data name="SwapPaneFirstPane" xml:space="preserve">
-    <value>最初のペインとペインを入れ替える</value>
+    <value>最初のウィンドウとウィンドウを入れ替える</value>
  </data>
  <data name="NewTabCommandKey" xml:space="preserve">
    <value>新しいタブ</value>
@@ -357,10 +357,10 @@
    <value>タブ名を変更</value>
  </data>
  <data name="ResizePaneCommandKey" xml:space="preserve">
-    <value>ペインのサイズの変更する</value>
+    <value>ウィンドウのサイズの変更する</value>
  </data>
  <data name="ResizePaneWithArgCommandKey" xml:space="preserve">
-    <value>ペインのサイズを変更する {0}</value>
+    <value>ウィンドウのサイズを変更する {0}</value>
    <comment>{0} will be replaced with one of the four directions "DirectionLeft", "DirectionRight", "DirectionUp", or "DirectionDown"</comment>
  </data>
  <data name="ScrollDownCommandKey" xml:space="preserve">
@@ -427,19 +427,19 @@
    <comment>{0} will be replaced with a color, displayed in hexadecimal (#RRGGBB) notation.</comment>
  </data>
  <data name="SplitHorizontalCommandKey" xml:space="preserve">
-    <value>ペインを左右に分割</value>
+    <value>ウィンドウを左右に分割</value>
  </data>
  <data name="MovePaneCommandKey" xml:space="preserve">
-    <value>ペインの移動</value>
+    <value>ウィンドウの移動</value>
  </data>
  <data name="MovePaneToNewWindowCommandKey" xml:space="preserve">
-    <value>ペインを新しいウィンドウに移動</value>
+    <value>ウィンドウを新しいウィンドウに移動</value>
  </data>
  <data name="SplitPaneCommandKey" xml:space="preserve">
-    <value>ペインを分割する</value>
+    <value>ウィンドウを分割する</value>
  </data>
  <data name="SplitVerticalCommandKey" xml:space="preserve">
-    <value>ペインを上下に分割</value>
+    <value>ウィンドウを上下に分割</value>
  </data>
  <data name="SwitchToTabCommandKey" xml:space="preserve">
    <value>タブに切り替え</value>
@@ -488,19 +488,19 @@
    <value>最大化ウィンドウを復元する</value>
  </data>
  <data name="ToggleSplitOrientationCommandKey" xml:space="preserve">
-    <value>ペイン分割の方向の切り替え</value>
+    <value>ウィンドウ分割の方向の切り替え</value>
  </data>
  <data name="TogglePaneZoomCommandKey" xml:space="preserve">
-    <value>ペインのズームの切り替え</value>
+    <value>ウィンドウのズームの切り替え</value>
  </data>
  <data name="TogglePaneReadOnlyCommandKey" xml:space="preserve">
-    <value>ペインを読み取り専用モードに切り替える</value>
+    <value>ウィンドウを読み取り専用モードに切り替える</value>
  </data>
  <data name="EnablePaneReadOnlyCommandKey" xml:space="preserve">
-    <value>ペインの読み取り専用モードを有効にする</value>
+    <value>ウィンドウの読み取り専用モードを有効にする</value>
  </data>
  <data name="DisablePaneReadOnlyCommandKey" xml:space="preserve">
-    <value>ペインの読み取り専用モードを無効にする</value>
+    <value>ウィンドウの読み取り専用モードを無効にする</value>
  </data>
  <data name="ToggleShaderEffectsCommandKey" xml:space="preserve">
    <value>ターミナルの視覚効果の切り替え</value>
@@ -532,7 +532,7 @@
    <comment>Quake is a well-known computer game and isn't related to earthquakes, etc. See https://en.wikipedia.org/wiki/Quake_(video_game)</comment>
  </data>
  <data name="FocusPaneCommandKey" xml:space="preserve">
-    <value>ペイン {0} をフォーカスする</value>
+    <value>ウィンドウ {0} をフォーカスする</value>
    <comment>{0} will be replaced with a user-specified number</comment>
  </data>
  <data name="ExportBufferToPathCommandKey" xml:space="preserve">
@@ -585,7 +585,7 @@
    <comment>A command to change how transparent the background of the window is</comment>
  </data>
  <data name="RestoreLastClosedCommandKey" xml:space="preserve">
-    <value>最後に閉じたペインまたはタブを復元する</value>
+    <value>最後に閉じたウィンドウまたはタブを復元する</value>
  </data>
  <data name="SelectAllCommandKey" xml:space="preserve">
    <value>すべてのテキストを選択</value>
@@ -695,10 +695,10 @@
    <value>コンテキスト メニューの表示</value>
  </data>
  <data name="CloseOtherPanesCommandKey" xml:space="preserve">
-    <value>他のすべてのペインを閉じる</value>
+    <value>他のすべてのウィンドウを閉じる</value>
  </data>
  <data name="ToggleBroadcastInputCommandKey" xml:space="preserve">
-    <value>ブロードキャスト入力をすべてのペインに切り替える</value>
+    <value>ブロードキャスト入力をすべてのウィンドウに切り替える</value>
    <comment>When enabled, input will go to all panes in this tab simultaneously</comment>
  </data>
  <data name="RestartConnectionKey" xml:space="preserve">
@@ -760,4 +760,4 @@
    <value>SSH ホスト プロファイル ジェネレーター</value>
    <comment>The display name of a dynamic profile generator for SSH hosts</comment>
  </data>
-</root>
+</root>
--- a/src/cascadia/TerminalSettingsModel/SshHostGenerator.cpp
+++ b/src/cascadia/TerminalSettingsModel/SshHostGenerator.cpp
@@ -35,14 +35,19 @@ using namespace winrt::Microsoft::Terminal::Settings::Model;

 /*static*/ const std::wregex SshHostGenerator::_configKeyValueRegex{ LR"(^\s*(\w+)\s+([^\s]+.*[^\s])\s*$)" };

-winrt::hstring _getProfileName(const std::wstring_view& hostName) noexcept
+/*static*/ std::wstring_view SshHostGenerator::_getProfileName(const std::wstring_view& hostName) noexcept
 {
-    return winrt::hstring{ fmt::format(FMT_COMPILE(L"{0}{1}"), PROFILE_TITLE_PREFIX, hostName) };
+    return std::wstring_view{ L"" + PROFILE_TITLE_PREFIX + hostName };
 }

-winrt::hstring _getProfileCommandLine(const std::wstring_view& sshExePath, const std::wstring_view& hostName) noexcept
+/*static*/ std::wstring_view SshHostGenerator::_getProfileIconPath() noexcept
 {
-    return winrt::hstring{ fmt::format(FMT_COMPILE(LR"("{0}" {1})"), sshExePath, hostName) };
+    return PROFILE_ICON_PATH;
+}
+
+/*static*/ std::wstring_view SshHostGenerator::_getProfileCommandLine(const std::wstring_view& sshExePath, const std::wstring_view& hostName) noexcept
+{
+    return std::wstring_view{ L"\"" + sshExePath + L"\" " + hostName };
 }

 /*static*/ bool SshHostGenerator::_tryFindSshExePath(std::wstring& sshExePath) noexcept
@@ -159,8 +164,8 @@ void SshHostGenerator::GenerateProfiles(std::vector<winrt::com_ptr<implementatio
        {
            const auto profile{ CreateDynamicProfile(_getProfileName(hostName)) };

-            profile->Commandline(_getProfileCommandLine(sshExePath, hostName));
-            profile->Icon(winrt::hstring{ PROFILE_ICON_PATH });
+            profile->Commandline(winrt::hstring{ _getProfileCommandLine(sshExePath, hostName) });
+            profile->Icon(winrt::hstring{ _getProfileIconPath() });

            profiles.emplace_back(profile);
        }
--- a/src/cascadia/TerminalSettingsModel/SshHostGenerator.h
+++ b/src/cascadia/TerminalSettingsModel/SshHostGenerator.h
@@ -31,6 +31,10 @@ namespace winrt::Microsoft::Terminal::Settings::Model
    private:
        static const std::wregex _configKeyValueRegex;

+        static std::wstring_view _getProfileName(const std::wstring_view& hostName) noexcept;
+        static std::wstring_view _getProfileIconPath() noexcept;
+        static std::wstring_view _getProfileCommandLine(const std::wstring_view& sshExePath, const std::wstring_view& hostName) noexcept;
+
        static bool _tryFindSshExePath(std::wstring& sshExePath) noexcept;
        static bool _tryParseConfigKeyValue(const std::wstring_view& line, std::wstring& key, std::wstring& value) noexcept;
        static void _getHostNamesFromConfigFile(const std::wstring_view& configPath, std::vector<std::wstring>& hostNames) noexcept;
--- a/src/cascadia/TerminalSettingsModel/VsDevCmdGenerator.h
+++ b/src/cascadia/TerminalSettingsModel/VsDevCmdGenerator.h
@@ -26,13 +26,12 @@ namespace winrt::Microsoft::Terminal::Settings::Model
        void GenerateProfiles(const VsSetupConfiguration::VsSetupInstance& instance, bool hidden, std::vector<winrt::com_ptr<implementation::Profile>>& profiles) const override;

    private:
-        bool IsInstanceValid(const VsSetupConfiguration::VsSetupInstance& instance) const
+        bool IsInstanceValid(const VsSetupConfiguration::VsSetupInstance&) const
        {
            // We only support version of VS from 15.0.
            // Per heaths: The [ISetupConfiguration] COM server only supports Visual Studio 15.0 and newer anyway.
            // Eliding the version range will improve the discovery performance by not having to parse or compare the versions.
-            std::error_code ec;
-            return std::filesystem::exists(GetDevCmdScriptPath(instance), ec) && !ec;
+            return true;
        }

        std::wstring GetProfileGuidSeed(const VsSetupConfiguration::VsSetupInstance& instance) const
--- a/src/cascadia/TerminalSettingsModel/VsDevShellGenerator.h
+++ b/src/cascadia/TerminalSettingsModel/VsDevShellGenerator.h
@@ -28,8 +28,7 @@ namespace winrt::Microsoft::Terminal::Settings::Model
    private:
        bool IsInstanceValid(const VsSetupConfiguration::VsSetupInstance& instance) const
        {
-            std::error_code ec;
-            return instance.VersionInRange(L"[16.2,)") && std::filesystem::exists(GetDevShellModulePath(instance), ec) && !ec;
+            return instance.VersionInRange(L"[16.2,)");
        }

        std::wstring GetProfileGuidSeed(const VsSetupConfiguration::VsSetupInstance& instance) const
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Leonard Hecker	bc30bf7d07	Fix window count going out of sync when headless	2025-08-29 16:50:13 +02:00
Windows Console Service Bot	1283c0f5b9	Localization Updates - main - 08/26/2025 03:03:22 (#19278 )	2025-08-29 00:32:22 +02:00
Dustin L. Howett	4272151adc	Include Profile.BellSound as a media resource (#19289 ) I legitimately cannot figure out how I forgot this. Bell should support all the same validation as other media resources! Technically this means you can set `bellSound` to `desktopWallpaper`, but... we'll pretend that makes sense. I reworked the viewmodel to be a little more sensible. It no longer requires somebody else to check that its files exist. The settings UI now also displays `File not found` in the _preview_ for the bell if it is a single file which failed validation!	2025-08-28 00:05:51 +00:00
Dustin L. Howett	bd14f69080	sb: add appId to the StoreBroker blobs (new AERO requirement) (#19290 ) > _I am altering the deal. Pray I do not alter it further._ > -the AERO team, maybe	2025-08-27 10:22:28 -07:00
Dustin L. Howett	91c9a14a71	env: don't explode when GetShortPathNameW fails (#19284 ) It fails inside app containers (!) such as the one used by LocalTests.	2025-08-26 21:50:32 +00:00
Dustin L. Howett	9e10436a80	Move adjustProcessPriorityThrottled ctor earlier (#19283 ) Test Impact: The LocalTests do not call `Initialize(HWND)`, so we would fail on launch. Also, we have `Create()` and `Initialize()` and `event Initialized` (the last of which is not called from either of the first two...)	2025-08-26 21:34:01 +00:00
Dustin L. Howett	a9b660cc36	version: bump to 1.25 on main (#19276 )	2025-08-25 17:06:19 -05:00
Dustin L. Howett	7b754e3d8e	Localization Updates - 08/25/2025 21:39:33 (#19277 ) Co-authored-by: Console Service Bot <consvc@microsoft.com>	2025-08-25 17:02:41 -05:00