PRE-MERGE #19822 Update actions page and edit actions page with better alignment

This commit fixes the issue where the tab row loses its acrylic material
when the window loses focus, even when 'Allow acrylic material in unfocused
windows' setting is enabled.

The fix modifies the _updateThemeColors() function in TerminalPage.cpp to
check both the UseAcrylicInTabRow setting AND the window focus state along
with the EnableUnfocusedAcrylic setting. Now the tab row will maintain its
acrylic effect when:
1. UseAcrylicInTabRow is enabled, AND
2. Either the window is focused OR EnableUnfocusedAcrylic is enabled

This ensures that the 'Allow acrylic material in unfocused windows' setting
is properly respected for the tab row, not just the terminal background.

Fixes #19544

.github/ISSUE_TEMPLATE/config.yml

@@ -1,4 +1,4 @@
-blank_issues_enabled: false
+blank_issues_enabled: true
 
 contact_links:
   - name: Microsoft Security Response Center 🔐

.github/actions/spelling/allow/allow.txt

@@ -67,7 +67,6 @@ servicebus
 slnt
 stakeholders
 subpage
-subpages
 sustainability
 sxn
 Tencent

.github/actions/spelling/expect/expect.txt

@@ -572,7 +572,6 @@ FGHIJ
 fgidx
 FGs
 FILEDESCRIPTION
-filehops
 FILESUBTYPE
 FILESYSPATH
 FILEW
@@ -1773,7 +1772,6 @@ uldash
 uldb
 ULONGLONG
 ulwave
-Unaccess
 Unadvise
 unattend
 UNCPRIORITY

.github/workflows/spelling2.yml

@@ -93,7 +93,7 @@ jobs:
     steps:
       - name: check-spelling
         id: spelling
-        uses: check-spelling/check-spelling@cfb6f7e75bbfc89c71eaa30366d0c166f1bd9c8c # v0.0.26
+        uses: check-spelling/check-spelling@v0.0.25
         with:
           suppress_push_for_open_pull_request: ${{ github.actor != 'dependabot[bot]' && 1 }}
           checkout: true
@@ -153,8 +153,9 @@ jobs:
     if: (success() || failure()) && needs.spelling.outputs.followup && github.event_name == 'push'
     steps:
       - name: comment
-        uses: check-spelling/check-spelling@cfb6f7e75bbfc89c71eaa30366d0c166f1bd9c8c # v0.0.26
+        uses: check-spelling/check-spelling@v0.0.25
         with:
+          checkout: true
           spell_check_this: microsoft/terminal@main
           task: ${{ needs.spelling.outputs.followup }}
 
@@ -170,8 +171,9 @@ jobs:
     if: (success() || failure()) && needs.spelling.outputs.followup && contains(github.event_name, 'pull_request')
     steps:
       - name: comment
-        uses: check-spelling/check-spelling@cfb6f7e75bbfc89c71eaa30366d0c166f1bd9c8c # v0.0.26
+        uses: check-spelling/check-spelling@v0.0.25
         with:
+          checkout: true
           spell_check_this: microsoft/terminal@main
           task: ${{ needs.spelling.outputs.followup }}
           experimental_apply_changes_via_bot: ${{ github.repository_owner != 'microsoft' && 1 }}
@@ -195,7 +197,7 @@ jobs:
       cancel-in-progress: false
     steps:
       - name: apply spelling updates
-        uses: check-spelling/check-spelling@cfb6f7e75bbfc89c71eaa30366d0c166f1bd9c8c # v0.0.26
+        uses: check-spelling/check-spelling@v0.0.25
         with:
           experimental_apply_changes_via_bot: ${{ github.repository_owner != 'microsoft' && 1 }}
           checkout: true

README.md

@@ -15,6 +15,7 @@
     - [Via Chocolatey (unofficial)](#via-chocolatey-unofficial)
     - [Via Scoop (unofficial)](#via-scoop-unofficial)
 - [Installing Windows Terminal Canary](#installing-windows-terminal-canary)
+- [Windows Terminal Roadmap](#windows-terminal-roadmap)
 - [Terminal \& Console Overview](#terminal--console-overview)
   - [Windows Terminal](#windows-terminal)
   - [The Windows Console Host](#the-windows-console-host)
@@ -177,6 +178,11 @@ _Learn more about the [types of Windows Terminal distributions](https://learn.mi
 
 ---
 
+## Windows Terminal Roadmap
+
+The plan for the Windows Terminal [is described here](/doc/roadmap-2023.md) and
+will be updated as the project proceeds.
+
 ## Terminal & Console Overview
 
 Please take a few minutes to review the overview below before diving into the

build/StoreSubmission/Preview/PDPs/de-DE/PDP.xml

@@ -56,10 +56,9 @@ Dies ist ein Open Source-Projekt, und wir freuen uns über die Teilnahme der Com
   <ReleaseNotes>
     Version __VERSION_NUMBER__
 
-– Endlich die Möglichkeit, nach beliebigen Einstellungen zu suchen!
-– Ein neuer nativer Editor für Tastenkombinationen, Aktionen und Einträge in der Befehlspalette.
-– Neue Community-Übersetzungen für Serbisch und Ukrainisch
-– Unterstützung für das „Kitty“-Tastaturprotokoll für hochauflösende Eingabecodierung
+– 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 Informationen finden Sie auf unserer GitHub-Releaseseite.
   </ReleaseNotes>

build/StoreSubmission/Preview/PDPs/en-US/PDP.xml

@@ -54,12 +54,11 @@ This is an open source project and we welcome community participation. To partic
     <!-- _locComment_text="{MaxLength=255} App DevStudio" -->
   </DevStudio>
   <ReleaseNotes _locID="App_ReleaseNotes">
-    <!-- _locComment_text="{MaxLength=1500} {Locked=__VERSION_NUMBER__}{Locked=wt.exe}{Locked=Kitty} App Release Note" -->Version __VERSION_NUMBER__
+    <!-- _locComment_text="{MaxLength=1500} {Locked=__VERSION_NUMBER__}{Locked=wt.exe} App Release Note" -->Version __VERSION_NUMBER__
 
-- Finally, the ability to search for any setting!
-- A new native editor for key bindings, actions and command palette entries.
-- New community localizations to Serbian and Ukrainian
-- Support for the "Kitty" keyboard protocol for high-fidelity input encoding
+- A whole new Extensions page that shows what has been installed into your Terminal
+- Command Palette now shows up in your native language as well as English
+- New VT features such as synchronized rendering, new color schemes, configuration for quick mouse actions like zooming, and more
 
 Please see our GitHub releases page for additional details.
   </ReleaseNotes>

build/StoreSubmission/Preview/PDPs/es-ES/PDP.xml

@@ -54,12 +54,11 @@ Este es un proyecto de fuente abierta y animamos a la comunidad a participar. Pa
     
   </DevStudio>
   <ReleaseNotes>
-    Version __VERSION_NUMBER__
+    Versión __VERSION_NUMBER__
 
-- Por último, la capacidad de buscar cualquier configuración.
-- Nuevo editor nativo para asignaciones de teclas, acciones y entradas de la paleta de comandos.
-- Nuevas localizaciones comunitarias para serbio y ucraniano
-- Soporte para el protocolo de teclado "Kitty" para codificación de entrada de alta fidelidad
+- 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
 
 Consulta la página de versiones de GitHub para más información.
   </ReleaseNotes>

build/StoreSubmission/Preview/PDPs/fr-FR/PDP.xml

@@ -56,12 +56,11 @@ Il s’agit d’un projet open source et nous vous invitons à participer dans l
   <ReleaseNotes>
     Version __VERSION_NUMBER__
 
-- Enfin, la possibilité de rechercher n’importe quel paramètre !
-- Un nouvel éditeur natif pour les raccourcis clavier, les actions et les entrées de la palette de commandes.
-- De nouvelles localisations communautaires en serbe et en ukrainien
-- Une prise en charge du protocole clavier « Kitty » pour un encodage d’entrée à haute fidélité
+- 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
 
-Consultez notre page des versions de GitHub pour plus de détails.
+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 -->

build/StoreSubmission/Preview/PDPs/it-IT/PDP.xml

@@ -54,12 +54,11 @@ Si tratta di un progetto open source e la partecipazione della community è molt
     
   </DevStudio>
   <ReleaseNotes>
-    Versione __VERSION_NUMBER__
+    Versione __VERSION_NUMBER__ 
 
-- Finalmente è possibile cercare qualsiasi impostazione
-- Nuovo editor nativo per le associazioni di tasti, le azioni e le voci del riquadro comandi.
-- Nuove localizzazioni della community in serbo e ucraino
-- Supporto per il protocollo di tastiera "Kitty" per una codifica dell'input ad alta fedeltà
+- 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, vedi la pagina delle release di GitHub.
   </ReleaseNotes>

build/StoreSubmission/Preview/PDPs/ja-JP/PDP.xml

@@ -56,10 +56,9 @@
   <ReleaseNotes>
     バージョン __VERSION_NUMBER__
 
-- 最後に、任意の設定を検索する機能です。
-- キー バインド、アクション、コマンド パレット エントリ用の新しいネイティブ エディター。
-- セルビア語とウクライナ語への新しいコミュニティ ローカライズ
-- 高忠実度入力エンコード用の "Kitty" キーボード プロトコルのサポート
+- ターミナルに何がインストールされているかを表示する新しい [拡張機能] ページ
+- コマンド パレットがネイティブ言語と英語で表示されるようになりました
+- 同期レンダリング、新しい配色、ズームなどのクイック マウス操作の構成などの、新しい VT 機能
 
 詳細については、GitHub リリース ページをご覧ください。
   </ReleaseNotes>

build/StoreSubmission/Preview/PDPs/ko-KR/PDP.xml

@@ -56,12 +56,11 @@
   <ReleaseNotes>
     버전 __VERSION_NUMBER__
 
-- 드디어 모든 설정을 검색할 수 있게 되었어요!
-- 키 바인딩, 작업, 명령 팔레트 항목을 위한 새로운 기본 편집기가 추가되었습니다.
-- 세르비아어와 우크라이나어 커뮤니티 지역화를 새롭게 지원합니다.
-- 고품질 입력 인코딩을 위해 "Kitty" 키보드 프로토콜을 지원합니다.
+- 터미널에 설치된 항목을 보여 주는 완전히 새로운 확장 페이지
+- 명령 팔레트가 이제 영어뿐만 아니라 모국어로도 표시
+- 동기화된 렌더링, 새로운 색 구성표, 확대/축소와 같은 빠른 마우스 동작을 위한 구성 등 새로운 VT 기능이 추가
 
-자세한 정보는 GitHub 릴리스 페이지를 참고하세요.
+자세한 내용은 GitHub 릴리스 페이지를 참조하세요.
   </ReleaseNotes>
   <ScreenshotCaptions>
     <!-- Valid length: 200 character limit, up to 9 elements per platform -->

build/StoreSubmission/Preview/PDPs/pt-BR/PDP.xml

@@ -56,10 +56,9 @@ Este é um projeto de código aberto e a participação da comunidade é bem-vin
   <ReleaseNotes>
     Version __VERSION_NUMBER__
 
-- Finalmente, a possibilidade de pesquisar qualquer configuração!
-- Um novo editor nativo para combinações de teclas, ações e entradas na paleta de comandos.
-- Novas localizações da comunidade para sérvio e ucraniano
-- Suporte para o protocolo de teclado "Kitty" para codificação de entrada de alta fidelidade
+– 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
 
 Confira nossa página de lançamentos no GitHub para obter mais detalhes.
   </ReleaseNotes>

build/StoreSubmission/Preview/PDPs/qps-ploc/PDP.xml

@@ -56,12 +56,11 @@
   <ReleaseNotes>
     Vėѓѕіöй __VERSION_NUMBER__ !!! !!! !
 
-- ₣ïňάĺĺў, ŧне âъΐŀίťŷ ţø şēаґсђ ƒбг ăиÿ şēťτіήġ! !!! !!! !!! !!! !!!
-- Á ŋеώ ñăŧїνе ěðíτōг ƒοѓ ќэÿ вїñďĭňğş, дčтιθήѕ дñð çθmmãήδ ρàľěţťę ёñтгĩέś. !!! !!! !!! !!! !!! !!! !!! !
-- Пėώ čоmmμñìтў ŀό¢àłįżåţίòйš ŧō Šэґъιäñ åηδ Ůκŗăįлīăπ !!! !!! !!! !!! !!! !
-- Ѕυррòŗт ƒòŗ ťĥё "Kitty" ĸ℮ŷъøàŗď ρřŏťô¢õℓ ƒŏґ нįģћ-ƒíđёℓïтÿ îńрüť êńсøďíлğ !!! !!! !!! !!! !!! !!! !!! !
+- Ą ωћόĺé ņέш ∑×τзńşĩōиŝ ρâģε τђат šнòωş ωħąт нǻś ъеēñ įηšтǻľĺéδ ĭʼnтο ўбμŗ Ţзřmĭňāŀ !!! !!! !!! !!! !!! !!! !!! !!! 
+- €όммаήδ Рдĺēтţĕ пŏẅ şĥŏшś üρ ϊñ ỳоũѓ йαťïνє ļäŋģµаġέ άś ŵєŀľ åś Σиĝℓĭŝђ !!! !!! !!! !!! !!! !!! !!! 
+- ∏еẅ VΤ ƒэåŧύґέŝ şűçн ăŝ ѕỳňсĥŗǿйìźėð гēŋďзříⁿğ, ηĕш ćôĺõг şĉћěмєѕ, çóńƒіĝџŗáτїöπ ƒοг qũī¢ķ möűšë ąćŧϊόņŝ ľîķє žøōmίйğ, ǻⁿđ мόřε !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!!
 
-Ρŀ℮âѕē şєё όûя ĜîтΗūь ŕεĺĕǻŝёš раġĕ ƒŏґ ãδđϊŧïбπåľ δеτáΐłś. !!! !!! !!! !!! !!! !!!
+Ρĺęąŝэ ѕєě õμя ĞĭтΗύв řєĺэдšέŝ рάġě ƒοґ àďđϊтїõлаℓ ðêţǻїłş. !!! !!! !!! !!! !!! !!!
    </ReleaseNotes>
   <ScreenshotCaptions>
     <!-- Valid length: 200 character limit, up to 9 elements per platform -->

build/StoreSubmission/Preview/PDPs/qps-ploca/PDP.xml

@@ -56,12 +56,11 @@
   <ReleaseNotes>
     Vėѓѕіöй __VERSION_NUMBER__ !!! !!! !
 
-- ₣ïňάĺĺў, ŧне âъΐŀίťŷ ţø şēаґсђ ƒбг ăиÿ şēťτіήġ! !!! !!! !!! !!! !!!
-- Á ŋеώ ñăŧїνе ěðíτōг ƒοѓ ќэÿ вїñďĭňğş, дčтιθήѕ дñð çθmmãήδ ρàľěţťę ёñтгĩέś. !!! !!! !!! !!! !!! !!! !!! !
-- Пėώ čоmmμñìтў ŀό¢àłįżåţίòйš ŧō Šэґъιäñ åηδ Ůκŗăįлīăπ !!! !!! !!! !!! !!! !
-- Ѕυррòŗт ƒòŗ ťĥё "Kitty" ĸ℮ŷъøàŗď ρřŏťô¢õℓ ƒŏґ нįģћ-ƒíđёℓïтÿ îńрüť êńсøďíлğ !!! !!! !!! !!! !!! !!! !!! !
+- Ą ωћόĺé ņέш ∑×τзńşĩōиŝ ρâģε τђат šнòωş ωħąт нǻś ъеēñ įηšтǻľĺéδ ĭʼnтο ўбμŗ Ţзřmĭňāŀ !!! !!! !!! !!! !!! !!! !!! !!! 
+- €όммаήδ Рдĺēтţĕ пŏẅ şĥŏшś üρ ϊñ ỳоũѓ йαťïνє ļäŋģµаġέ άś ŵєŀľ åś Σиĝℓĭŝђ !!! !!! !!! !!! !!! !!! !!! 
+- ∏еẅ VΤ ƒэåŧύґέŝ şűçн ăŝ ѕỳňсĥŗǿйìźėð гēŋďзříⁿğ, ηĕш ćôĺõг şĉћěмєѕ, çóńƒіĝџŗáτїöπ ƒοг qũī¢ķ möűšë ąćŧϊόņŝ ľîķє žøōmίйğ, ǻⁿđ мόřε !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!!
 
-Ρŀ℮âѕē şєё όûя ĜîтΗūь ŕεĺĕǻŝёš раġĕ ƒŏґ ãδđϊŧïбπåľ δеτáΐłś. !!! !!! !!! !!! !!! !!!
+Ρĺęąŝэ ѕєě õμя ĞĭтΗύв řєĺэдšέŝ рάġě ƒοґ àďđϊтїõлаℓ ðêţǻїłş. !!! !!! !!! !!! !!! !!!
    </ReleaseNotes>
   <ScreenshotCaptions>
     <!-- Valid length: 200 character limit, up to 9 elements per platform -->

build/StoreSubmission/Preview/PDPs/qps-plocm/PDP.xml

@@ -56,12 +56,11 @@
   <ReleaseNotes>
     Vėѓѕіöй __VERSION_NUMBER__ !!! !!! !
 
-- ₣ïňάĺĺў, ŧне âъΐŀίťŷ ţø şēаґсђ ƒбг ăиÿ şēťτіήġ! !!! !!! !!! !!! !!!
-- Á ŋеώ ñăŧїνе ěðíτōг ƒοѓ ќэÿ вїñďĭňğş, дčтιθήѕ дñð çθmmãήδ ρàľěţťę ёñтгĩέś. !!! !!! !!! !!! !!! !!! !!! !
-- Пėώ čоmmμñìтў ŀό¢àłįżåţίòйš ŧō Šэґъιäñ åηδ Ůκŗăįлīăπ !!! !!! !!! !!! !!! !
-- Ѕυррòŗт ƒòŗ ťĥё "Kitty" ĸ℮ŷъøàŗď ρřŏťô¢õℓ ƒŏґ нįģћ-ƒíđёℓïтÿ îńрüť êńсøďíлğ !!! !!! !!! !!! !!! !!! !!! !
+- Ą ωћόĺé ņέш ∑×τзńşĩōиŝ ρâģε τђат šнòωş ωħąт нǻś ъеēñ įηšтǻľĺéδ ĭʼnтο ўбμŗ Ţзřmĭňāŀ !!! !!! !!! !!! !!! !!! !!! !!! 
+- €όммаήδ Рдĺēтţĕ пŏẅ şĥŏшś üρ ϊñ ỳоũѓ йαťïνє ļäŋģµаġέ άś ŵєŀľ åś Σиĝℓĭŝђ !!! !!! !!! !!! !!! !!! !!! 
+- ∏еẅ VΤ ƒэåŧύґέŝ şűçн ăŝ ѕỳňсĥŗǿйìźėð гēŋďзříⁿğ, ηĕш ćôĺõг şĉћěмєѕ, çóńƒіĝџŗáτїöπ ƒοг qũī¢ķ möűšë ąćŧϊόņŝ ľîķє žøōmίйğ, ǻⁿđ мόřε !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!!
 
-Ρŀ℮âѕē şєё όûя ĜîтΗūь ŕεĺĕǻŝёš раġĕ ƒŏґ ãδđϊŧïбπåľ δеτáΐłś. !!! !!! !!! !!! !!! !!!
+Ρĺęąŝэ ѕєě õμя ĞĭтΗύв řєĺэдšέŝ рάġě ƒοґ àďđϊтїõлаℓ ðêţǻїłş. !!! !!! !!! !!! !!! !!!
    </ReleaseNotes>
   <ScreenshotCaptions>
     <!-- Valid length: 200 character limit, up to 9 elements per platform -->

build/StoreSubmission/Preview/PDPs/ru-RU/PDP.xml

@@ -56,10 +56,9 @@
   <ReleaseNotes>
     Версия __VERSION_NUMBER__
 
-– Наконец-то появилась возможность поиска любых параметров!
-– Новый собственный редактор для настраиваемых сочетаний клавиш, действий и записей палитры команд.
-– Новые локализации сообщества на сербский и украинский языки
-– Поддержка протокола клавиатуры Kitty для высокоточного кодирования ввода
+– Новая страница расширений, на которой отображается информация о том, что было установлено в вашем терминале
+– Палитра команд теперь доступна на вашем языке, а также на английском
+– Новые функции VT, например синхронизированная отрисовка, новые цветовые схемы, настройка быстрых действий мыши, таких как масштабирование, и т. д.
 
 Дополнительные сведения см. на странице выпусков GitHub.
   </ReleaseNotes>

build/StoreSubmission/Preview/PDPs/sr-Cyrl-RS/PDP.xml

@@ -1,182 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ProductDescription language="sr-cyrl-rs" xmlns="http://schemas.microsoft.com/appx/2012/ProductDescription" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xml:lang="en-us" Release="">
-  <AppStoreName _locID="App_AppStoreName">
-    <!-- This is optional.  AppStoreName is typically extracted from your package's AppxManifest DisplayName property. -->
-    <!-- Uncomment (and localize) this Store name if your application package does not contain a localization for the DisplayName in this language. -->
-    <!-- Leaving this uncommented for a language that your application package DOES contain a DisplayName for will result in a submission failure with the API. -->
-    <!-- _locComment_text="{MaxLength=200} App AppStoreName" -->
-    <!-- Windows Terminal -->
-  </AppStoreName>
-  <Keywords>
-    <!-- Valid length: 30 character limit, up to 7 elements -->
-    <Keyword _locID="App_keyword1">
-      <!-- _locComment_text="{MaxLength=30} App keyword 1" -->Терминал</Keyword>
-    <Keyword _locID="App_keyword2">
-      <!-- _locComment_text="{MaxLength=30} App keyword 2" -->Конзола</Keyword>
-    <Keyword _locID="App_keyword3">
-      <!-- _locComment_text="{MaxLength=30} App keyword 3" -->
-    </Keyword>
-    <Keyword _locID="App_keyword4">
-      <!-- _locComment_text="{MaxLength=30} App keyword 4" -->
-    </Keyword>
-    <Keyword _locID="App_keyword5">
-      <!-- _locComment_text="{MaxLength=30} App keyword 5" -->
-    </Keyword>
-    <Keyword _locID="App_keyword6">
-      <!-- _locComment_text="{MaxLength=30} App keyword 6" -->
-    </Keyword>
-    <Keyword _locID="App_keyword7">
-      <!-- _locComment_text="{MaxLength=30} App keyword 7" -->
-    </Keyword>
-  </Keywords>
-  <Description _locID="App_Description">
-    <!-- _locComment_text="{MaxLength=10000} App Description" -->Ово је изградња прегледа апликације Windows терминал. Она садржи најновије могућности које се још увек развијају. Windows терминал је модерна, брза, ефикасна, моћна и продуктивна апликација терминала за кориснике алата из командне линије и љуски као што су Command Prompt, PowerShell, и WSL. Неке од његових главних функционалности су вишеструке картице, панели, подршка за Уникод и UTF-8, GPU убрзани механизам за исцртавање текста, произвољне теме, стилови и конфигурације.
-
-Ово је пројекат отвореног кода и учешће заједнице је добродошло. Ако желите да учествујете, молимо вас да посетите https://github.com/microsoft/terminal </Description>
-  <ShortDescription _locID="App_ShortDescription">
-    <!-- Only used for games. This description appears in the Information section of the Game Hub on Xbox One, and helps customers understand more about your game. -->
-    <!-- _locComment_text="{MaxLength=500} App ShortDescription" -->
-  </ShortDescription>
-  <ShortTitle _locID="App_ShortTitle">
-    <!-- A shorter version of your product's name. If provided, this shorter name may appear in various places on Xbox One (during installation, in Achievements, etc.) in place of the full title of your product. -->
-    <!-- _locComment_text="{MaxLength=50} App ShortTitle" -->
-  </ShortTitle>
-  <SortTitle _locID="App_SortTitle">
-    <!-- If your product could be alphabetized in different ways, you can enter another version here. This may help customers find the product more quickly when searching. -->
-    <!-- _locComment_text="{MaxLength=255} App SortTitle" -->
-  </SortTitle>
-  <VoiceTitle _locID="App_VoiceTitle">
-    <!-- An alternate name for your product that, if provided, may be used in the audio experience on Xbox One when using Kinect or a headset. -->
-    <!-- _locComment_text="{MaxLength=255} App VoiceTitle" -->
-  </VoiceTitle>
-  <DevStudio _locID="App_DevStudio">
-    <!-- Specify this value if you want to include a "Developed by" field in the listing. (The "Published by" field will list the publisher display name associated with your account, whether or not you provide a devStudio value.) -->
-    <!-- _locComment_text="{MaxLength=255} App DevStudio" -->
-  </DevStudio>
-  <ReleaseNotes _locID="App_ReleaseNotes">
-    <!-- _locComment_text="{MaxLength=1500} {Locked=__VERSION_NUMBER__}{Locked=wt.exe}{Locked=Kitty} App Release Note" -->Верзија __VERSION_NUMBER__
-
-- Коначно, могућност претраге било ког подешавања!
-- Нови својствени едитор ставки пречица на тастатури, акција и командне палете
-- Нова локализација заједнице на српски и украјински језик
-- Подршка за „Kitty” протокол тастатуре који омогућава верно кодирање уноса
-
-За више детаља, молимо вас да посетите нашу GitHub страницу издања.
-  </ReleaseNotes>
-  <ScreenshotCaptions>
-    <!-- Valid length: 200 character limit, up to 9 elements per platform -->
-    <!-- Valid attributes: any of DesktopImage, MobileImage, XboxImage, SurfaceHubImage, and HoloLensImage -->
-    <Caption DesktopImage="acrylic-emoji.png" _locID="App_caption1">
-      <!-- _locComment_text="{MaxLength=200} Screenshot caption 1" -->
-    </Caption>
-    <Caption DesktopImage="panes.png" _locID="App_caption2">
-      <!-- _locComment_text="{MaxLength=200} Screenshot caption 2" -->
-    </Caption>
-    <Caption DesktopImage="htop.png" _locID="App_caption3">
-      <!-- _locComment_text="{MaxLength=200} Screenshot caption 3" -->
-    </Caption>
-  </ScreenshotCaptions>
-  <AdditionalAssets>
-    <!-- Valid elements:-->
-    <!--   HeroImage414x180, HeroImage846x468, HeroImage558x756, HeroImage414x468, HeroImage558x558, HeroImage2400x1200,-->
-    <!--   ScreenshotWXGA, ScreenshotHD720, ScreenshotWVGA, Doublewide, Panoramic, Square,-->
-    <!--   SmallMobileTile, SmallXboxLiveTile, LargeMobileTile, LargeXboxLiveTile, Tile,-->
-    <!--   DesktopIcon, Icon (use this value for the 1:1 300x300 pixels logo), AchievementIcon,-->
-    <!--   ChallengePromoIcon, RewardDisplayIcon, Icon150X150, Icon71X71,-->
-    <!--   BoxArt, BrandedKeyArt, PosterArt, FeaturedPromotionalArt, PromotionalArt16x9, TitledHeroArt-->
-    <!-- There is no content for any of these elements, just a single attribute called FileName. -->
-    <PosterArt FileName="Store Poster Art.png" />
-    <BoxArt FileName="Store Box Art.png" />
-    <PromotionalArt16x9 FileName="Store Thumbnail.png" />
-  </AdditionalAssets>
-  <Trailers>
-    <!-- Maximum number of trailers permitted: 15 -->
-    <Trailer FileName="CC0605_CommandLine_Teaser_WEB_MASTER_H264_1080p_23.976_-16LKFS_-3dbTP_ST.mp4">
-      <Title _locID="App_trailerTitle1">
-        <!-- _locComment_text="{MaxLength=255} Trailer title 1" -->Нови Windows терминал</Title>
-      <Images>
-        <!-- Current maximum of 1 image per trailer permitted. -->
-        <Image FileName="Store Thumbnail.png">
-          <!-- _locComment_text="{Locked} Trailer screenshot 1 description" -->
-        </Image>
-      </Images>
-    </Trailer>
-  </Trailers>
-  <AppFeatures>
-    <!-- Valid length: 200 character limit, up to 20 elements -->
-    <AppFeature _locID="App_feature1">
-      <!-- _locComment_text="{MaxLength=200} App Feature 1" -->Вишеструке картице</AppFeature>
-    <AppFeature _locID="App_feature2">
-      <!-- _locComment_text="{MaxLength=200} App Feature 2" -->Пуна Уникод подршка</AppFeature>
-    <AppFeature _locID="App_feature3">
-      <!-- _locComment_text="{MaxLength=200} App Feature 3" -->GPU-убрзано исцртавање текста</AppFeature>
-    <AppFeature _locID="App_feature4">
-      <!-- _locComment_text="{MaxLength=200} App Feature 4" -->Потпуна прилагодљивост</AppFeature>
-    <AppFeature _locID="App_feature5">
-      <!-- _locComment_text="{MaxLength=200} App Feature 5" -->Подела панела</AppFeature>
-    <AppFeature _locID="App_feature6">
-      <!-- _locComment_text="{MaxLength=200} App Feature 6" -->
-    </AppFeature>
-    <AppFeature _locID="App_feature7">
-      <!-- _locComment_text="{MaxLength=200} App Feature 7" -->
-    </AppFeature>
-    <AppFeature _locID="App_feature8">
-      <!-- _locComment_text="{MaxLength=200} App Feature 8" -->
-    </AppFeature>
-    <AppFeature _locID="App_feature9">
-      <!-- _locComment_text="{MaxLength=200} App Feature 9" -->
-    </AppFeature>
-    <AppFeature _locID="App_feature10">
-      <!-- _locComment_text="{MaxLength=200} App Feature 10" -->
-    </AppFeature>
-    <AppFeature _locID="App_feature11">
-      <!-- _locComment_text="{MaxLength=200} App Feature 11" -->
-    </AppFeature>
-    <AppFeature _locID="App_feature12">
-      <!-- _locComment_text="{MaxLength=200} App Feature 12" -->
-    </AppFeature>
-    <AppFeature _locID="App_feature13">
-      <!-- _locComment_text="{MaxLength=200} App Feature 13" -->
-    </AppFeature>
-    <AppFeature _locID="App_feature14">
-      <!-- _locComment_text="{MaxLength=200} App Feature 14" -->
-    </AppFeature>
-    <AppFeature _locID="App_feature15">
-      <!-- _locComment_text="{MaxLength=200} App Feature 15" -->
-    </AppFeature>
-    <AppFeature _locID="App_feature16">
-      <!-- _locComment_text="{MaxLength=200} App Feature 16" -->
-    </AppFeature>
-    <AppFeature _locID="App_feature17">
-      <!-- _locComment_text="{MaxLength=200} App Feature 17" -->
-    </AppFeature>
-    <AppFeature _locID="App_feature18">
-      <!-- _locComment_text="{MaxLength=200} App Feature 18" -->
-    </AppFeature>
-    <AppFeature _locID="App_feature19">
-      <!-- _locComment_text="{MaxLength=200} App Feature 19" -->
-    </AppFeature>
-    <AppFeature _locID="App_feature20">
-      <!-- _locComment_text="{MaxLength=200} App Feature 20" -->
-    </AppFeature>
-  </AppFeatures>
-  <RecommendedHardware>
-    <!-- Valid length: 200 character limit, up to 11 elements -->
-    <Recommendation _locID="App_RecommendedHW1">
-      <!-- _locComment_text="{MaxLength=200} App Recommended Hardware 1" -->Тастатура</Recommendation>
-  </RecommendedHardware>
-  <MinimumHardware>
-    <!-- Valid length: 200 character limit, up to 11 elements -->
-  </MinimumHardware>
-  <CopyrightAndTrademark _locID="App_CopyrightandTrademark">
-    <!-- _locComment_text="{MaxLength=200} Copyright and Trademark" -->Copyright (c) Microsoft Corporation</CopyrightAndTrademark>
-  <AdditionalLicenseTerms _locID="App_AdditionalLicenseTerms">
-    <!-- _locComment_text="{MaxLength=10000} Additional License Terms" -->
-  </AdditionalLicenseTerms>
-  <WebsiteURL _locID="App_WebsiteURL">
-    <!-- _locComment_text="{MaxLength=2048} WebsiteURL" -->https://github.com/microsoft/terminal</WebsiteURL>
-  <SupportContactInfo _locID="App_SupportContactInfo">
-    <!-- _locComment_text="{MaxLength=2048} Support Contact Info" -->https://github.com/microsoft/terminal/issues/new</SupportContactInfo>
-  <PrivacyPolicyURL _locID="App_PrivacyURL">
-    <!-- _locComment_text="{MaxLength=2048} Privacy Policy URL" -->https://go.microsoft.com/fwlink/?LinkID=521839</PrivacyPolicyURL>
-</ProductDescription>

build/StoreSubmission/Preview/PDPs/uk-UA/PDP.xml

@@ -56,10 +56,9 @@
   <ReleaseNotes _locID="App_ReleaseNotes">
     <!-- _locComment_text="{MaxLength=1500} {Locked=__VERSION_NUMBER__}{Locked=wt.exe} App Release Note" -->Версія __VERSION_NUMBER__
 
-- Нарешті, можливість пошуку будь-якого налаштування!
-- Новий вбудований редактор для прив'язки клавіш, дій та палітри команд.
-- Нові локалізації спільноти на сербську та українську мови.
-- Підтримка протоколу клавіатури "Kitty" для високоточного кодування введення.
+- Цілком нова сторінка розширень, яка показує, що було встановлено у вашому терміналі
+- Палітра команд тепер відображається вашою рідною мовою, а також англійською
+- Нові функції віртуального автомата, такі як синхронізований рендеринг, нові колірні схеми, налаштування для швидких дій миші, таких як масштабування, тощо
 
 Будь ласка, перегляньте нашу сторінку релізів GitHub для отримання додаткової інформації.
   </ReleaseNotes>

build/StoreSubmission/Preview/PDPs/zh-CN/PDP.xml

@@ -56,10 +56,9 @@
   <ReleaseNotes>
     Version __VERSION_NUMBER__
 
-- 终于可以搜索任何设置了!
-- 新增用于键绑定、操作和命令面板条目的原生编辑器。
-- 新增塞尔维亚语和乌克兰语社区本地化支持
-- 支持 "Kitty" 键盘协议，实现高保真输入编码
+- 一个全新的“扩展”页，显示已安装到终端的内容
+- 命令面板现在以你的母语和英语显示
+- 新的 VT 功能，例如同步渲染、新配色方案、快速鼠标操作(如缩放)的配置等
 
 有关其他详细信息，请参阅我们的 GitHub 发布页面。
   </ReleaseNotes>

build/StoreSubmission/Preview/PDPs/zh-TW/PDP.xml

@@ -56,10 +56,9 @@
   <ReleaseNotes>
     Version __VERSION_NUMBER__
 
-- 終於，提供可搜尋任何設定的功能!
-- 全新原生編輯器，支援按鍵繫結、動作及命令選擇區項目。
-- 新增社群本地語系化，包含塞爾維亞語與烏克蘭語
-- 支援高保真度輸入編碼的「Kitty」鍵盤通訊協定
+- 全新的延伸模組頁面會顯示已安裝在您終端機中的內容
+- 命令選擇區現在以您的母語和英文顯示
+- 新的 VT 功能，例如同步轉譯、新的色彩配置、快速滑鼠動作 (例如縮放) 設定等等
 
 如需更多詳細資料，請參閱我們的 GitHub 發行版本頁面。
   </ReleaseNotes>

build/StoreSubmission/Stable/PDPs/de-DE/PDP.xml

@@ -56,9 +56,9 @@ Dies ist ein Open Source-Projekt, und wir freuen uns über die Teilnahme an der
   <ReleaseNotes>
     Version __VERSION_NUMBER__
 
-– 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
+– 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>

build/StoreSubmission/Stable/PDPs/en-US/PDP.xml

@@ -56,9 +56,9 @@ This is an open source project and we welcome community participation. To partic
   <ReleaseNotes _locID="App_ReleaseNotes">
     <!-- _locComment_text="{MaxLength=1500} {Locked=__VERSION_NUMBER__}{Locked=wt.exe} App Release Note" -->Version __VERSION_NUMBER__
 
-- A whole new Extensions page that shows what has been installed into your Terminal
-- Command Palette now shows up in your native language as well as English
-- New VT features such as synchronized rendering, new color schemes, configuration for quick mouse actions like zooming, and more
+- We've added dozens of settings to the UI that once only existed in the JSON file, including a new page for customizing the layout of your New Tab menu!
+- We have rearchitected window management to improve reliability; please file any bugs you encounter with the wt.exe alias
+- Profiles now show an icon if they've been hidden or refer to programs which were uninstalled.
 
 Please see our GitHub releases page for additional details.
   </ReleaseNotes>

build/StoreSubmission/Stable/PDPs/es-ES/PDP.xml

@@ -56,9 +56,9 @@ Este es un proyecto de fuente abierta y animamos a la comunidad a participar. Pa
   <ReleaseNotes>
     Versión __VERSION_NUMBER__
 
-- 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
+- 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>

build/StoreSubmission/Stable/PDPs/fr-FR/PDP.xml

@@ -56,11 +56,11 @@ Il s’agit d’un projet open source et nous encourageons la participation à l
   <ReleaseNotes>
     Version __VERSION_NUMBER__
 
-- Une toute nouvelle page Extensions qui affiche ce qui a été installé dans votre Terminal
-- La palette de commandes s’affiche désormais dans votre langue native, ainsi qu’en anglais
-- De nouvelles fonctionnalités VT, telles que le rendu synchronisé, de nouveaux schémas de couleurs, une configuration pour des actions rapides de la souris comme le zoom, et bien plus encore
+- 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.
 
-Consultez notre page des versions de GitHub pour plus de détails.
+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 -->

build/StoreSubmission/Stable/PDPs/it-IT/PDP.xml

@@ -56,9 +56,9 @@ Si tratta di un progetto open source e la partecipazione della community è molt
   <ReleaseNotes>
     Versione __VERSION_NUMBER__
 
-- 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
+- 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>

build/StoreSubmission/Stable/PDPs/ja-JP/PDP.xml

@@ -56,9 +56,9 @@
   <ReleaseNotes>
     バージョン __VERSION_NUMBER__
 
-- お使いのターミナルに何がインストールされているかを表示する新しい [拡張機能] ページ
-- コマンド パレットがネイティブ言語と英語で表示されるようになりました
-- 同期レンダリング、新しい配色、ズームなどのクイック マウス操作の構成などの、新しい VT 機能
+- 新しいタブ メニューのレイアウトをカスタマイズするための新しいページなど、以前は JSON ファイルにしかなかった設定が UI に多数追加されました。
+- 信頼性を向上させるために、ウィンドウ管理を再設計しました。wt.exe エイリアスで発生したバグを報告してください
+- プロファイルが非表示になっている場合や、アンインストールされたプログラムを参照している場合に、アイコンが表示されるようになりました。
 
 詳細については、GitHub リリース ページをご覧ください。
   </ReleaseNotes>

build/StoreSubmission/Stable/PDPs/ko-KR/PDP.xml

@@ -56,11 +56,11 @@
   <ReleaseNotes>
     버전 __VERSION_NUMBER__
 
-- 터미널에 설치된 항목을 보여 주는 완전히 새로운 확장 페이지
-- 이제 영어뿐만 아니라 모국어로도 표시되는 명령 팔레트
-- 동기화된 렌더링, 새로운 색 구성표, 확대/축소와 같은 빠른 마우스 동작을 위한 구성 등 새로운 VT 기능 추가
+- 새 탭 메뉴의 레이아웃을 사용자 지정하기 위한 새 페이지를 포함하여 JSON 파일에만 존재했던 수십 개의 설정을 UI에 추가
+- 안정성을 개선하기 위해 창 관리 구조를 재구성했습니다. wt.exe 별칭과 관련하여 발생한 버그 신고
+- 프로필이 숨겨졌거나 제거된 프로그램을 참조하는 경우 이제 프로필에 아이콘이 표시됩니다.
 
-자세한 정보는 GitHub 릴리스 페이지를 참고하세요.
+자세한 내용은 GitHub 릴리스 페이지를 참조하세요.
   </ReleaseNotes>
   <ScreenshotCaptions>
     <!-- Valid length: 200 character limit, up to 9 elements per platform -->

build/StoreSubmission/Stable/PDPs/pt-BR/PDP.xml

@@ -56,9 +56,9 @@ Este é um projeto de código aberto e a participação da comunidade é bem-vin
   <ReleaseNotes>
     Version __VERSION_NUMBER__
 
-– 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
+– 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>

build/StoreSubmission/Stable/PDPs/qps-ploc/PDP.xml

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

build/StoreSubmission/Stable/PDPs/qps-ploca/PDP.xml

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

build/StoreSubmission/Stable/PDPs/qps-plocm/PDP.xml

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

build/StoreSubmission/Stable/PDPs/ru-RU/PDP.xml

@@ -56,9 +56,9 @@
   <ReleaseNotes>
     Версия __VERSION_NUMBER__
 
-– Новая страница расширений, на которой отображается информация о том, что было установлено в вашем терминале
-– Палитра команд теперь доступна на вашем языке, а также на английском
-– Новые функции VT, например синхронизированная отрисовка, новые цветовые схемы, настройка быстрых действий мыши, таких как масштабирование, и т. д.
+– Мы добавили в пользовательский интерфейс десятки параметров, которые ранее существовали только в JSON-файле, включая новую страницу для настройки макета меню новой вкладки.
+– Мы переработали управление окнами для повышения надежности. Сообщайте о любых ошибках, которые вы обнаружите с псевдонимом wt.exe
+– Профили теперь отображают значок, если они были скрыты или ссылаются на программы, которые были удалены.
 
 Дополнительные сведения см. на странице выпусков GitHub.
   </ReleaseNotes>

build/StoreSubmission/Stable/PDPs/sr-Cyrl-RS/PDP.xml

@@ -1,181 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ProductDescription language="sr-cyrl-rs" xmlns="http://schemas.microsoft.com/appx/2012/ProductDescription" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xml:lang="en-us" Release="">
-  <AppStoreName _locID="App_AppStoreName">
-    <!-- This is optional.  AppStoreName is typically extracted from your package's AppxManifest DisplayName property. -->
-    <!-- Uncomment (and localize) this Store name if your application package does not contain a localization for the DisplayName in this language. -->
-    <!-- Leaving this uncommented for a language that your application package DOES contain a DisplayName for will result in a submission failure with the API. -->
-    <!-- _locComment_text="{MaxLength=200} App AppStoreName" -->
-    <!-- Windows Terminal -->
-  </AppStoreName>
-  <Keywords>
-    <!-- Valid length: 30 character limit, up to 7 elements -->
-    <Keyword _locID="App_keyword1">
-      <!-- _locComment_text="{MaxLength=30} App keyword 1" -->Терминал</Keyword>
-    <Keyword _locID="App_keyword2">
-      <!-- _locComment_text="{MaxLength=30} App keyword 2" -->Конзола</Keyword>
-    <Keyword _locID="App_keyword3">
-      <!-- _locComment_text="{MaxLength=30} App keyword 3" -->
-    </Keyword>
-    <Keyword _locID="App_keyword4">
-      <!-- _locComment_text="{MaxLength=30} App keyword 4" -->
-    </Keyword>
-    <Keyword _locID="App_keyword5">
-      <!-- _locComment_text="{MaxLength=30} App keyword 5" -->
-    </Keyword>
-    <Keyword _locID="App_keyword6">
-      <!-- _locComment_text="{MaxLength=30} App keyword 6" -->
-    </Keyword>
-    <Keyword _locID="App_keyword7">
-      <!-- _locComment_text="{MaxLength=30} App keyword 7" -->
-    </Keyword>
-  </Keywords>
-  <Description _locID="App_Description">
-    <!-- _locComment_text="{MaxLength=10000} App Description" -->Windows терминал је модерна, брза, ефикасна, моћна и продуктивна апликација терминала за кориснике алата из командне линије и љуски као што су Command Prompt, PowerShell, и WSL. Неке од његових главних функционалности су вишеструке картице, панели, подршка за Уникод и UTF-8, GPU убрзани механизам за исцртавање текста, произвољне теме, стилови и конфигурације.
-
-Ово је пројекат отвореног кода и учешће заједнице је добродошло. Ако желите да учествујете, молимо вас да посетите https://github.com/microsoft/terminal </Description>
-  <ShortDescription _locID="App_ShortDescription">
-    <!-- Only used for games. This description appears in the Information section of the Game Hub on Xbox One, and helps customers understand more about your game. -->
-    <!-- _locComment_text="{MaxLength=500} App ShortDescription" -->
-  </ShortDescription>
-  <ShortTitle _locID="App_ShortTitle">
-    <!-- A shorter version of your product's name. If provided, this shorter name may appear in various places on Xbox One (during installation, in Achievements, etc.) in place of the full title of your product. -->
-    <!-- _locComment_text="{MaxLength=50} App ShortTitle" -->
-  </ShortTitle>
-  <SortTitle _locID="App_SortTitle">
-    <!-- If your product could be alphabetized in different ways, you can enter another version here. This may help customers find the product more quickly when searching. -->
-    <!-- _locComment_text="{MaxLength=255} App SortTitle" -->
-  </SortTitle>
-  <VoiceTitle _locID="App_VoiceTitle">
-    <!-- An alternate name for your product that, if provided, may be used in the audio experience on Xbox One when using Kinect or a headset. -->
-    <!-- _locComment_text="{MaxLength=255} App VoiceTitle" -->
-  </VoiceTitle>
-  <DevStudio _locID="App_DevStudio">
-    <!-- Specify this value if you want to include a "Developed by" field in the listing. (The "Published by" field will list the publisher display name associated with your account, whether or not you provide a devStudio value.) -->
-    <!-- _locComment_text="{MaxLength=255} App DevStudio" -->
-  </DevStudio>
-  <ReleaseNotes _locID="App_ReleaseNotes">
-    <!-- _locComment_text="{MaxLength=1500} {Locked=__VERSION_NUMBER__}{Locked=wt.exe} App Release Note" -->Верзија __VERSION_NUMBER__
-
-- Попуно нова страница Проширења која приказује шта је све инсталирано у ваш Терминал
-- Палета команди се сада приказује и на вашем матерњем језику, као и на енглеском
-- Нове VT функционалности као што су синхронизовано исцртавање, нове шеме боја, конфигурација за брзе акције мишем, као што је зумирање, и још тога
-
-За више детаља, молимо вас да посетите нашу GitHub страницу издања.
-  </ReleaseNotes>
-  <ScreenshotCaptions>
-    <!-- Valid length: 200 character limit, up to 9 elements per platform -->
-    <!-- Valid attributes: any of DesktopImage, MobileImage, XboxImage, SurfaceHubImage, and HoloLensImage -->
-    <Caption DesktopImage="acrylic-emoji.png" _locID="App_caption1">
-      <!-- _locComment_text="{MaxLength=200} Screenshot caption 1" -->
-    </Caption>
-    <Caption DesktopImage="panes.png" _locID="App_caption2">
-      <!-- _locComment_text="{MaxLength=200} Screenshot caption 2" -->
-    </Caption>
-    <Caption DesktopImage="htop.png" _locID="App_caption3">
-      <!-- _locComment_text="{MaxLength=200} Screenshot caption 3" -->
-    </Caption>
-  </ScreenshotCaptions>
-  <AdditionalAssets>
-    <!-- Valid elements:-->
-    <!--   HeroImage414x180, HeroImage846x468, HeroImage558x756, HeroImage414x468, HeroImage558x558, HeroImage2400x1200,-->
-    <!--   ScreenshotWXGA, ScreenshotHD720, ScreenshotWVGA, Doublewide, Panoramic, Square,-->
-    <!--   SmallMobileTile, SmallXboxLiveTile, LargeMobileTile, LargeXboxLiveTile, Tile,-->
-    <!--   DesktopIcon, Icon (use this value for the 1:1 300x300 pixels logo), AchievementIcon,-->
-    <!--   ChallengePromoIcon, RewardDisplayIcon, Icon150X150, Icon71X71,-->
-    <!--   BoxArt, BrandedKeyArt, PosterArt, FeaturedPromotionalArt, PromotionalArt16x9, TitledHeroArt-->
-    <!-- There is no content for any of these elements, just a single attribute called FileName. -->
-    <PosterArt FileName="Store Poster Art.png" />
-    <BoxArt FileName="Store Box Art.png" />
-    <PromotionalArt16x9 FileName="Store Thumbnail.png" />
-  </AdditionalAssets>
-  <Trailers>
-    <!-- Maximum number of trailers permitted: 15 -->
-    <Trailer FileName="CC0605_CommandLine_Teaser_WEB_MASTER_H264_1080p_23.976_-16LKFS_-3dbTP_ST.mp4">
-      <Title _locID="App_trailerTitle1">
-        <!-- _locComment_text="{MaxLength=255} Trailer title 1" -->Нови Windows терминал</Title>
-      <Images>
-        <!-- Current maximum of 1 image per trailer permitted. -->
-        <Image FileName="Store Thumbnail.png">
-          <!-- _locComment_text="{Locked} Trailer screenshot 1 description" -->
-        </Image>
-      </Images>
-    </Trailer>
-  </Trailers>
-  <AppFeatures>
-    <!-- Valid length: 200 character limit, up to 20 elements -->
-    <AppFeature _locID="App_feature1">
-      <!-- _locComment_text="{MaxLength=200} App Feature 1" -->Вишеструке картице</AppFeature>
-    <AppFeature _locID="App_feature2">
-      <!-- _locComment_text="{MaxLength=200} App Feature 2" -->Пуна Уникод подршка</AppFeature>
-    <AppFeature _locID="App_feature3">
-      <!-- _locComment_text="{MaxLength=200} App Feature 3" -->GPU-убрзано исцртавање текста</AppFeature>
-    <AppFeature _locID="App_feature4">
-      <!-- _locComment_text="{MaxLength=200} App Feature 4" -->Потпуна прилагодљивост</AppFeature>
-    <AppFeature _locID="App_feature5">
-      <!-- _locComment_text="{MaxLength=200} App Feature 5" -->Подела панела</AppFeature>
-    <AppFeature _locID="App_feature6">
-      <!-- _locComment_text="{MaxLength=200} App Feature 6" -->
-    </AppFeature>
-    <AppFeature _locID="App_feature7">
-      <!-- _locComment_text="{MaxLength=200} App Feature 7" -->
-    </AppFeature>
-    <AppFeature _locID="App_feature8">
-      <!-- _locComment_text="{MaxLength=200} App Feature 8" -->
-    </AppFeature>
-    <AppFeature _locID="App_feature9">
-      <!-- _locComment_text="{MaxLength=200} App Feature 9" -->
-    </AppFeature>
-    <AppFeature _locID="App_feature10">
-      <!-- _locComment_text="{MaxLength=200} App Feature 10" -->
-    </AppFeature>
-    <AppFeature _locID="App_feature11">
-      <!-- _locComment_text="{MaxLength=200} App Feature 11" -->
-    </AppFeature>
-    <AppFeature _locID="App_feature12">
-      <!-- _locComment_text="{MaxLength=200} App Feature 12" -->
-    </AppFeature>
-    <AppFeature _locID="App_feature13">
-      <!-- _locComment_text="{MaxLength=200} App Feature 13" -->
-    </AppFeature>
-    <AppFeature _locID="App_feature14">
-      <!-- _locComment_text="{MaxLength=200} App Feature 14" -->
-    </AppFeature>
-    <AppFeature _locID="App_feature15">
-      <!-- _locComment_text="{MaxLength=200} App Feature 15" -->
-    </AppFeature>
-    <AppFeature _locID="App_feature16">
-      <!-- _locComment_text="{MaxLength=200} App Feature 16" -->
-    </AppFeature>
-    <AppFeature _locID="App_feature17">
-      <!-- _locComment_text="{MaxLength=200} App Feature 17" -->
-    </AppFeature>
-    <AppFeature _locID="App_feature18">
-      <!-- _locComment_text="{MaxLength=200} App Feature 18" -->
-    </AppFeature>
-    <AppFeature _locID="App_feature19">
-      <!-- _locComment_text="{MaxLength=200} App Feature 19" -->
-    </AppFeature>
-    <AppFeature _locID="App_feature20">
-      <!-- _locComment_text="{MaxLength=200} App Feature 20" -->
-    </AppFeature>
-  </AppFeatures>
-  <RecommendedHardware>
-    <!-- Valid length: 200 character limit, up to 11 elements -->
-    <Recommendation _locID="App_RecommendedHW1">
-      <!-- _locComment_text="{MaxLength=200} App Recommended Hardware 1" -->Тастатура</Recommendation>
-  </RecommendedHardware>
-  <MinimumHardware>
-    <!-- Valid length: 200 character limit, up to 11 elements -->
-  </MinimumHardware>
-  <CopyrightAndTrademark _locID="App_CopyrightandTrademark">
-    <!-- _locComment_text="{MaxLength=200} Copyright and Trademark" -->Copyright (c) Microsoft Corporation</CopyrightAndTrademark>
-  <AdditionalLicenseTerms _locID="App_AdditionalLicenseTerms">
-    <!-- _locComment_text="{MaxLength=10000} Additional License Terms" -->
-  </AdditionalLicenseTerms>
-  <WebsiteURL _locID="App_WebsiteURL">
-    <!-- _locComment_text="{MaxLength=2048} WebsiteURL" -->https://github.com/microsoft/terminal</WebsiteURL>
-  <SupportContactInfo _locID="App_SupportContactInfo">
-    <!-- _locComment_text="{MaxLength=2048} Support Contact Info" -->https://github.com/microsoft/terminal/issues/new</SupportContactInfo>
-  <PrivacyPolicyURL _locID="App_PrivacyURL">
-    <!-- _locComment_text="{MaxLength=2048} Privacy Policy URL" -->https://go.microsoft.com/fwlink/?LinkID=521839</PrivacyPolicyURL>
-</ProductDescription>

build/StoreSubmission/Stable/PDPs/uk-UA/PDP.xml

@@ -56,9 +56,9 @@
   <ReleaseNotes _locID="App_ReleaseNotes">
     <!-- _locComment_text="{MaxLength=1500} {Locked=__VERSION_NUMBER__}{Locked=wt.exe} App Release Note" -->Версія __VERSION_NUMBER__
 
-- Цілком нова сторінка розширень, яка показує, що було встановлено у вашому Терміналі
-- Палітра команд тепер відображається вашою рідною мовою, так само, як і англійською
-- Нові VT функції, такі як синхронізований рендеринг, нові колірні схеми, налаштування для швидких дій миші, таких як масштабування, тощо
+- Ми додали десятки налаштувань до інтерфейсу користувача, які раніше існували лише у файлі JSON, включаючи нову сторінку для налаштування макета меню «Нова вкладка»!
+- Ми переробили архітектуру керування вікнами для підвищення надійності; будь ласка, повідомляйте про будь-які помилки, з якими ви зіткнулися, за допомогою псевдоніма wt.exe.
+- Профілі тепер відображають значок, якщо вони були приховані, або посилаються на програми, які було видалено.
 
 Будь ласка, перегляньте нашу сторінку релізів GitHub для отримання додаткової інформації.
   </ReleaseNotes>

build/StoreSubmission/Stable/PDPs/zh-CN/PDP.xml

@@ -56,9 +56,9 @@
   <ReleaseNotes>
     Version __VERSION_NUMBER__
 
-- 一个全新的“扩展”页，显示已安装到终端的内容
-- 命令面板现在以你的母语和英语显示
-- 新的 VT 功能，例如同步渲染、新配色方案、快速鼠标操作(如缩放)的配置等
+- 我们向用户界面添加了许多之前仅存在于 JSON 文件中的设置，包括用于自定义“新建标签页”菜单布局的新页面!
+- 我们已重新架构窗口管理以提高可靠性; 请使用 wt.exe 别名提交您遇到的任何错误
+- 配置文件如果已被隐藏或引用了已卸载的程序，现在会显示一个图标。
 
 有关其他详细信息，请参阅我们的 GitHub 发布页面。
   </ReleaseNotes>

build/StoreSubmission/Stable/PDPs/zh-TW/PDP.xml

@@ -56,9 +56,9 @@
   <ReleaseNotes>
     Version __VERSION_NUMBER__
 
-- 全新的延伸模組頁面會顯示已安裝在您終端機中的內容
-- 命令選擇區現在以您的母語和英文顯示
-- 新的 VT 功能，例如同步轉譯、新的色彩配置、快速滑鼠動作 (例如縮放) 設定等等
+- 我們已在使用者介面中新增數十個曾經僅存在於 JSON 檔案中的設定，包括一個可自訂新索引標籤選單版面配置的新頁面!
+- 我們已重新架構視窗管理以提升可靠性; 如果您在使用 wt.exe 別名時遇到任何錯誤，請提交錯誤回報
+- 如果設定檔已隱藏或參照已解除安裝的程式，現在會顯示圖示。
 
 如需更多詳細資料，請參閱我們的 GitHub 發行版本頁面。
   </ReleaseNotes>

build/pipelines/templates-v2/job-build-package-wpf.yml

@@ -46,7 +46,6 @@ jobs:
           BuildConfiguration: ${{ config }}
   dependsOn: ${{ parameters.dependsOn }}
   variables:
-    BuildPlatform: Any CPU
     OutputBuildPlatform: AnyCPU
     Terminal.BinDir: $(Build.SourcesDirectory)/bin/$(OutputBuildPlatform)/$(BuildConfiguration)
     JobOutputDirectory: $(Build.ArtifactStagingDirectory)\nupkg

build/pipelines/templates-v2/pipeline-onebranch-full-release-build.yml

@@ -211,7 +211,7 @@ extends:
                   ob_createvpack_verbose: true
                   ob_createvpack_vpackdirectory: '$(JobOutputDirectory)\vpack'
                   ob_createvpack_versionAs: string
-                  ob_createvpack_version: '$(XES_PACKAGEVERSIONNUMBER)'
+                  ob_createvpack_version: '$(XES_APPXMANIFESTVERSION)'
                   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'

custom.props

@@ -3,9 +3,9 @@
   <!-- This file is read by XES, which we use in our Release builds. -->
   <PropertyGroup Label="Version">
     <XesUseOneStoreVersioning>true</XesUseOneStoreVersioning>
-    <XesBaseYearForStoreVersion>2026</XesBaseYearForStoreVersion>
+    <XesBaseYearForStoreVersion>2025</XesBaseYearForStoreVersion>
     <VersionMajor>1</VersionMajor>
-    <VersionMinor>26</VersionMinor>
+    <VersionMinor>25</VersionMinor>
     <VersionInfoProductName>Windows Terminal</VersionInfoProductName>
     <VersionInfoCulture>1033</VersionInfoCulture>
     <!-- The default has a spacing problem -->

dep/vcpkg-overlay-ports/fmt/0001-When-using-MSVC-x86-to-compile-v12.0.0-or-v12.1.0-co.patch

@@ -1,45 +0,0 @@
-From c3be070b7ee42639554555c27dce10c9de7af76c Mon Sep 17 00:00:00 2001
-From: "J. Berger" <mail@janaberger.de>
-Date: Sat, 1 Nov 2025 17:38:30 +0100
-Subject: [PATCH] When using MSVC x86 to compile v12.0.0 or v12.1.0,
- conversions from __int64 to a 32bit unsigned int trigger warnings. (#4594)
-
-This is a follow-up for PR #4572.
----
- include/fmt/format.h | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/include/fmt/format.h b/include/fmt/format.h
-index 4a653007..65e19d2d 100644
---- a/include/fmt/format.h
-+++ b/include/fmt/format.h
-@@ -2534,7 +2534,7 @@ FMT_CONSTEXPR20 auto write_fixed(OutputIt out, const DecimalFP& f,
-     auto grouping = Grouping(loc, specs.localized());
-     size += grouping.count_separators(exp);
-     return write_padded<Char, align::right>(
--        out, specs, to_unsigned(size), [&](iterator it) {
-+        out, specs, static_cast<size_t>(size), [&](iterator it) {
-           if (s != sign::none) *it++ = detail::getsign<Char>(s);
-           it = write_significand(it, f.significand, significand_size, exp,
-                                  decimal_point, grouping);
-@@ -2550,7 +2550,7 @@ FMT_CONSTEXPR20 auto write_fixed(OutputIt out, const DecimalFP& f,
-   bool pointy = num_zeros != 0 || significand_size != 0 || specs.alt();
-   size += 1 + (pointy ? 1 : 0) + num_zeros;
-   return write_padded<Char, align::right>(
--      out, specs, to_unsigned(size), [&](iterator it) {
-+      out, specs, static_cast<size_t>(size), [&](iterator it) {
-         if (s != sign::none) *it++ = detail::getsign<Char>(s);
-         *it++ = Char('0');
-         if (!pointy) return it;
-@@ -2594,7 +2594,7 @@ FMT_CONSTEXPR20 auto do_write_float(OutputIt out, const DecimalFP& f,
-     *it++ = Char(exp_char);
-     return write_exponent<Char>(exp, it);
-   };
--  auto usize = to_unsigned(size);
-+  size_t usize = static_cast<size_t>(size);
-   return specs.width > 0
-              ? write_padded<Char, align::right>(out, specs, usize, write)
-              : base_iterator(out, write(reserve(out, usize)));
--- 
-2.52.0.vfs.0.5
-

dep/vcpkg-overlay-ports/fmt/fix-write-batch.patch

@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 88c12148..967b53dd 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -260,7 +260,7 @@ if (FMT_MASTER_PROJECT AND CMAKE_GENERATOR MATCHES "Visual Studio")
+   join(netfxpath
+        "C:\\Program Files\\Reference Assemblies\\Microsoft\\Framework\\"
+        ".NETFramework\\v4.0")
+-  file(WRITE run-msbuild.bat "
++  file(WRITE "${CMAKE_BINARY_DIR}/run-msbuild.bat" "
+     ${MSBUILD_SETUP}
+     ${CMAKE_MAKE_PROGRAM} -p:FrameworkPathOverride=\"${netfxpath}\" %*")
+ endif ()

dep/vcpkg-overlay-ports/fmt/portfile.cmake

@@ -2,10 +2,10 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO fmtlib/fmt
     REF "${VERSION}"
-    SHA512 f0da82c545b01692e9fd30fdfb613dbb8dd9716983dcd0ff19ac2a8d36f74beb5540ef38072fdecc1e34191b3682a8542ecbf3a61ef287dbba0a2679d4e023f2
+    SHA512 573b7de1bd224b7b1b60d44808a843db35d4bc4634f72a9edcb52cf68e99ca66c744fd5d5c97b4336ba70b94abdabac5fc253b245d0d5cd8bbe2a096bf941e39
     HEAD_REF master
     PATCHES
-        0001-When-using-MSVC-x86-to-compile-v12.0.0-or-v12.1.0-co.patch
+        fix-write-batch.patch
 )
 
 vcpkg_cmake_configure(
@@ -22,6 +22,13 @@ vcpkg_cmake_config_fixup()
 vcpkg_fixup_pkgconfig()
 vcpkg_copy_pdbs()
 
+if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
+    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/fmt/base.h"
+        "defined(FMT_SHARED)"
+        "1"
+    )
+endif()
+
 file(REMOVE_RECURSE
     "${CURRENT_PACKAGES_DIR}/debug/include"
     "${CURRENT_PACKAGES_DIR}/debug/share"

dep/vcpkg-overlay-ports/fmt/vcpkg.json

@@ -1,6 +1,6 @@
 {
   "name": "fmt",
-  "version": "12.1.0",
+  "version": "11.1.4",
   "description": "{fmt} is an open-source formatting library providing a fast and safe alternative to C stdio and C++ iostreams.",
   "homepage": "https://github.com/fmtlib/fmt",
   "license": "MIT",

doc/cascadia/profiles.schema.json

@@ -2407,14 +2407,6 @@
             "console"
           ]
         },
-        "compatibility.ambiguousWidth": {
-          "default": "narrow",
-          "description": "Controls the cell width of East Asian Ambiguous characters.",
-          "enum": [
-            "narrow",
-            "wide"
-          ]
-        },
         "copyFormatting": {
           "default": true,
           "description": "When set to `true`, the color and font formatting of selected text is also copied to your clipboard. When set to `false`, only plain text is copied to your clipboard. An array of specific formats can also be used. Supported array values include `html` and `rtf`. Plain text is always copied.",
@@ -3174,11 +3166,6 @@
             "mingw"
           ],
           "type": "string"
-        },
-        "dragDropDelimiter": {
-          "default": " ",
-          "description": "The delimiter used when dropping multiple files onto the terminal.",
-          "type": "string"
         }
       }
     },

src/buffer/out/Row.cpp

@@ -350,7 +350,7 @@ void ROW::_init() noexcept
     std::iota(_charOffsets.begin(), _charOffsets.end(), uint16_t{ 0 });
 #endif
 
-#pragma warning(pop)
+#pragma warning(push)
 }
 
 void ROW::CopyFrom(const ROW& source)
@@ -1143,13 +1143,6 @@ til::CoordType ROW::GetTrailingColumnAtCharOffset(const ptrdiff_t offset) const
     return _createCharToColumnMapper(offset).GetTrailingColumnAt(offset);
 }
 
-uint16_t ROW::GetCharOffset(til::CoordType col) const noexcept
-{
-    const auto columns = GetReadableColumnCount();
-    const auto colBeg = clamp(col, 0, columns);
-    return _uncheckedCharOffset(gsl::narrow_cast<size_t>(colBeg));
-}
-
 DelimiterClass ROW::DelimiterClassAt(til::CoordType column, const std::wstring_view& wordDelimiters) const noexcept
 {
     const auto col = _clampedColumn(column);

src/buffer/out/Row.hpp

@@ -172,7 +172,6 @@ public:
     std::wstring_view GetText(til::CoordType columnBegin, til::CoordType columnEnd) const noexcept;
     til::CoordType GetLeadingColumnAtCharOffset(ptrdiff_t offset) const noexcept;
     til::CoordType GetTrailingColumnAtCharOffset(ptrdiff_t offset) const noexcept;
-    uint16_t GetCharOffset(til::CoordType col) const noexcept;
     DelimiterClass DelimiterClassAt(til::CoordType column, const std::wstring_view& wordDelimiters) const noexcept;
 
     auto AttrBegin() const noexcept { return _attr.begin(); }

src/buffer/out/UTextAdapter.cpp

@@ -390,9 +390,6 @@ Microsoft::Console::ICU::unique_utext Microsoft::Console::ICU::UTextFromTextBuff
     utext_setup(&ut, 0, &status);
     FAIL_FAST_IF(status > U_ZERO_ERROR);
 
-    rowBeg = std::max<til::CoordType>(0, rowBeg);
-    rowEnd = std::min(textBuffer.GetSize().BottomExclusive(), rowEnd);
-
     ut.providerProperties = (1 << UTEXT_PROVIDER_LENGTH_IS_EXPENSIVE) | (1 << UTEXT_PROVIDER_STABLE_CHUNKS);
     ut.pFuncs = &utextFuncs;
     ut.context = &textBuffer;

src/buffer/out/textBuffer.cpp

@@ -219,17 +219,6 @@ til::CoordType TextBuffer::_estimateOffsetOfLastCommittedRow() const noexcept
     return std::max(0, gsl::narrow_cast<til::CoordType>(lastRowOffset - 2));
 }
 
-bool TextBuffer::_isRowCommitted(til::CoordType y) const noexcept
-{
-    auto offset = (_firstRow + y + 1 /* account for the scratch row */) % _height;
-    if (offset < 0)
-    {
-        offset += _height;
-    }
-    const auto row = _buffer.get() + _bufferRowStride * offset;
-    return row < _commitWatermark;
-}
-
 // Retrieves a row from the buffer by its offset from the first row of the text buffer
 // (what corresponds to the top row of the screen buffer).
 const ROW& TextBuffer::GetRowByOffset(const til::CoordType index) const
@@ -945,10 +934,6 @@ void TextBuffer::ResetLineRenditionRange(const til::CoordType startRow, const ti
 
 LineRendition TextBuffer::GetLineRendition(const til::CoordType row) const
 {
-    if (!_isRowCommitted(row)) [[unlikely]]
-    {
-        return LineRendition::SingleWidth;
-    }
     return GetRowByOffset(row).GetLineRendition();
 }
 
@@ -1156,20 +1141,7 @@ DelimiterClass TextBuffer::_GetDelimiterClassAt(const til::point pos, const std:
     return GetRowByOffset(realPos.y).DelimiterClassAt(realPos.x, wordDelimiters);
 }
 
-// Method Description:
-// - Get the start of the word at or before the given position
-// - When includeWhitespace is false, returns the start of the current delimiter class run
-//   (selection behavior: stops at non-wrapped row boundaries)
-// - When includeWhitespace is true, also skips backward past any leading ControlChars
-//   to include the preceding word (accessibility/UIA behavior: crosses all row boundaries)
-// Arguments:
-// - pos - the buffer position to start from
-// - wordDelimiters - characters considered as DelimiterClass::DelimiterChar
-// - includeWhitespace - when true, skip past leading whitespace to find the word start
-// - limitOptional - (optional) the last possible position in the buffer that can be explored
-// Return Value:
-// - The position of the first character of the word (inclusive)
-til::point TextBuffer::GetWordStart(til::point pos, const std::wstring_view wordDelimiters, bool includeWhitespace, std::optional<til::point> limitOptional) const
+til::point TextBuffer::GetWordStart2(til::point pos, const std::wstring_view wordDelimiters, bool includeWhitespace, std::optional<til::point> limitOptional) const
 {
     const auto bufferSize{ GetSize() };
     const auto limit{ limitOptional.value_or(bufferSize.BottomInclusiveRightExclusive()) };
@@ -1202,7 +1174,7 @@ til::point TextBuffer::GetWordStart(til::point pos, const std::wstring_view word
     // 1. move to the beginning of the delimiter class run
     // 2. (includeWhitespace) if we were on a ControlChar, go back one more delimiter class run
     const auto initialDelimiter = bufferSize.IsInBounds(pos) ? _GetDelimiterClassAt(pos, wordDelimiters) : DelimiterClass::ControlChar;
-    pos = _GetDelimiterClassRunStart(pos, wordDelimiters, includeWhitespace);
+    pos = _GetDelimiterClassRunStart(pos, wordDelimiters);
     if (!includeWhitespace || pos.x == bufferSize.Left())
     {
         // Special case:
@@ -1213,26 +1185,12 @@ til::point TextBuffer::GetWordStart(til::point pos, const std::wstring_view word
     else if (initialDelimiter == DelimiterClass::ControlChar)
     {
         bufferSize.DecrementInExclusiveBounds(pos);
-        pos = _GetDelimiterClassRunStart(pos, wordDelimiters, includeWhitespace);
+        pos = _GetDelimiterClassRunStart(pos, wordDelimiters);
     }
     return pos;
 }
 
-// Method Description:
-// - Get the exclusive end of the word at or after the given position
-// - When includeWhitespace is false, returns the exclusive end of the current delimiter class run
-//   (selection behavior: stops at non-wrapped row boundaries)
-// - When includeWhitespace is true, also skips forward past any trailing ControlChars
-//   to include trailing whitespace (accessibility/UIA behavior: crosses all row boundaries)
-// - The result is clamped to limitOptional when provided
-// Arguments:
-// - pos - the buffer position to start from
-// - wordDelimiters - characters considered as DelimiterClass::DelimiterChar
-// - includeWhitespace - when true, skip past trailing whitespace to find the next word boundary
-// - limitOptional - (optional) the last possible position in the buffer that can be explored
-// Return Value:
-// - The exclusive end position of the word
-til::point TextBuffer::GetWordEnd(til::point pos, const std::wstring_view wordDelimiters, bool includeWhitespace, std::optional<til::point> limitOptional) const
+til::point TextBuffer::GetWordEnd2(til::point pos, const std::wstring_view wordDelimiters, bool includeWhitespace, std::optional<til::point> limitOptional) const
 {
     const auto bufferSize{ GetSize() };
     const auto limit{ limitOptional.value_or(bufferSize.BottomInclusiveRightExclusive()) };
@@ -1265,12 +1223,8 @@ til::point TextBuffer::GetWordEnd(til::point pos, const std::wstring_view wordDe
     // So the heuristic we use is:
     // 1. move to the end of the delimiter class run
     // 2. (includeWhitespace) if the next delimiter class run is a ControlChar, go forward one more delimiter class run
-    pos = _GetDelimiterClassRunEnd(pos, wordDelimiters, includeWhitespace);
-    if (pos >= limit)
-    {
-        return limit;
-    }
-    else if (!includeWhitespace || pos.x == bufferSize.RightExclusive())
+    pos = _GetDelimiterClassRunEnd(pos, wordDelimiters);
+    if (!includeWhitespace || pos.x == bufferSize.RightExclusive())
     {
         // Special case:
         // we're at the right boundary (and end of a delimiter class run),
@@ -1281,8 +1235,7 @@ til::point TextBuffer::GetWordEnd(til::point pos, const std::wstring_view wordDe
     if (const auto nextDelimClass = bufferSize.IsInBounds(pos) ? _GetDelimiterClassAt(pos, wordDelimiters) : DelimiterClass::ControlChar;
         nextDelimClass == DelimiterClass::ControlChar)
     {
-        pos = _GetDelimiterClassRunEnd(pos, wordDelimiters, includeWhitespace);
-        return std::min(pos, limit);
+        return _GetDelimiterClassRunEnd(pos, wordDelimiters);
     }
     return pos;
 }
@@ -1335,48 +1288,29 @@ bool TextBuffer::IsWordBoundary(const til::point pos, const std::wstring_view wo
     return prevDelimiterClass != currentDelimiterClass && currentDelimiterClass != DelimiterClass::ControlChar;
 }
 
-// Method Description:
-// - Get the start position for the current delimiter class run, scanning backward
-// - Stops when the delimiter class changes or a row boundary is reached
-// - When accessibilityMode is true, freely crosses non-wrapped row boundaries
-// - When accessibilityMode is false, only crosses wrap-forced row boundaries
-// Arguments:
-// - pos - the buffer position to start scanning from
-// - wordDelimiters - what characters are we considering for the separation of words
-// - accessibilityMode - when true, cross non-wrapped row boundaries freely
-// Return Value:
-// - The position of the first character in the current delimiter class run (inclusive)
-til::point TextBuffer::_GetDelimiterClassRunStart(til::point pos, const std::wstring_view wordDelimiters, const bool accessibilityMode) const
+til::point TextBuffer::_GetDelimiterClassRunStart(til::point pos, const std::wstring_view wordDelimiters) const
 {
     const auto bufferSize = GetSize();
     const auto initialDelimClass = bufferSize.IsInBounds(pos) ? _GetDelimiterClassAt(pos, wordDelimiters) : DelimiterClass::ControlChar;
-    auto nextPos = pos;
-    while (nextPos != bufferSize.Origin())
+    for (auto nextPos = pos; nextPos != bufferSize.Origin(); pos = nextPos)
     {
         bufferSize.DecrementInExclusiveBounds(nextPos);
 
         if (nextPos.x == bufferSize.RightExclusive())
         {
-            // wrapped onto previous line
+            // wrapped onto previous line,
+            // check if it was forced to wrap
             const auto& row = GetRowByOffset(nextPos.y);
-            if (!row.WasWrapForced() && !accessibilityMode)
+            if (!row.WasWrapForced())
             {
                 return pos;
             }
-            // In accessibility mode (or if row was wrap-forced), continue
-            // across the row boundary. The actual last character of the
-            // previous row will be checked on the next iteration.
-            // Don't update pos to avoid storing a transient position
         }
         else if (_GetDelimiterClassAt(nextPos, wordDelimiters) != initialDelimClass)
         {
             // if we changed delim class, we're done (don't apply move)
             return pos;
         }
-        else
-        {
-            pos = nextPos;
-        }
     }
     return pos;
 }
@@ -1386,8 +1320,7 @@ til::point TextBuffer::_GetDelimiterClassRunStart(til::point pos, const std::wst
 // Arguments:
 // - pos - the buffer position being within the current delimiter class
 // - wordDelimiters - what characters are we considering for the separation of words
-// - accessibilityMode - when true, cross non-wrapped row boundaries freely
-til::point TextBuffer::_GetDelimiterClassRunEnd(til::point pos, const std::wstring_view wordDelimiters, const bool accessibilityMode) const
+til::point TextBuffer::_GetDelimiterClassRunEnd(til::point pos, const std::wstring_view wordDelimiters) const
 {
     const auto bufferSize = GetSize();
     const auto initialDelimClass = bufferSize.IsInBounds(pos) ? _GetDelimiterClassAt(pos, wordDelimiters) : DelimiterClass::ControlChar;
@@ -1400,16 +1333,7 @@ til::point TextBuffer::_GetDelimiterClassRunEnd(til::point pos, const std::wstri
             // wrapped onto next line,
             // check if it was forced to wrap or switched delimiter class
             const auto& row = GetRowByOffset(pos.y);
-            if (accessibilityMode)
-            {
-                // In accessibility mode, always cross row boundaries,
-                // but still stop if the delimiter class changes
-                if (_GetDelimiterClassAt(nextPos, wordDelimiters) != initialDelimClass)
-                {
-                    return nextPos;
-                }
-            }
-            else if (!row.WasWrapForced() || _GetDelimiterClassAt(nextPos, wordDelimiters) != initialDelimClass)
+            if (!row.WasWrapForced() || _GetDelimiterClassAt(nextPos, wordDelimiters) != initialDelimClass)
             {
                 return pos;
             }
@@ -1424,6 +1348,283 @@ til::point TextBuffer::_GetDelimiterClassRunEnd(til::point pos, const std::wstri
     return pos;
 }
 
+// Method Description:
+// - Get the til::point for the beginning of the word you are on
+// Arguments:
+// - target - a til::point on the word you are currently on
+// - wordDelimiters - what characters are we considering for the separation of words
+// - accessibilityMode - when enabled, we continue expanding left until we are at the beginning of a readable word.
+//                        Otherwise, expand left until a character of a new delimiter class is found
+//                        (or a row boundary is encountered)
+// - limitOptional - (optional) the last possible position in the buffer that can be explored. This can be used to improve performance.
+// Return Value:
+// - The til::point for the first character on the "word" (inclusive)
+til::point TextBuffer::GetWordStart(const til::point target, const std::wstring_view wordDelimiters, bool accessibilityMode, std::optional<til::point> limitOptional) const
+{
+    // Consider a buffer with this text in it:
+    // "  word   other  "
+    // In selection (accessibilityMode = false),
+    //  a "word" is defined as the range between two delimiters
+    //  so the words in the example include ["  ", "word", "   ", "other", "  "]
+    // In accessibility (accessibilityMode = true),
+    //  a "word" includes the delimiters after a range of readable characters
+    //  so the words in the example include ["word   ", "other  "]
+    // NOTE: the start anchor (this one) is inclusive, whereas the end anchor (GetWordEnd) is exclusive
+
+#pragma warning(suppress : 26496)
+    auto copy{ target };
+    const auto bufferSize{ GetSize() };
+    const auto limit{ limitOptional.value_or(bufferSize.EndExclusive()) };
+    if (target == bufferSize.Origin())
+    {
+        // can't expand left
+        return target;
+    }
+    else if (target == bufferSize.EndExclusive())
+    {
+        // GH#7664: Treat EndExclusive as EndInclusive so
+        // that it actually points to a space in the buffer
+        copy = bufferSize.BottomRightInclusive();
+    }
+    else if (bufferSize.CompareInBounds(target, limit, true) >= 0)
+    {
+        // if at/past the limit --> clamp to limit
+        copy = limitOptional.value_or(bufferSize.BottomRightInclusive());
+    }
+
+    if (accessibilityMode)
+    {
+        return _GetWordStartForAccessibility(copy, wordDelimiters);
+    }
+    else
+    {
+        return _GetWordStartForSelection(copy, wordDelimiters);
+    }
+}
+
+// Method Description:
+// - Helper method for GetWordStart(). Get the til::point for the beginning of the word (accessibility definition) you are on
+// Arguments:
+// - target - a til::point on the word you are currently on
+// - wordDelimiters - what characters are we considering for the separation of words
+// Return Value:
+// - The til::point for the first character on the current/previous READABLE "word" (inclusive)
+til::point TextBuffer::_GetWordStartForAccessibility(const til::point target, const std::wstring_view wordDelimiters) const
+{
+    auto result = target;
+    const auto bufferSize = GetSize();
+
+    // ignore left boundary. Continue until readable text found
+    while (_GetDelimiterClassAt(result, wordDelimiters) != DelimiterClass::RegularChar)
+    {
+        if (result == bufferSize.Origin())
+        {
+            //looped around and hit origin (no word between origin and target)
+            return result;
+        }
+        bufferSize.DecrementInBounds(result);
+    }
+
+    // make sure we expand to the left boundary or the beginning of the word
+    while (_GetDelimiterClassAt(result, wordDelimiters) == DelimiterClass::RegularChar)
+    {
+        if (result == bufferSize.Origin())
+        {
+            // first char in buffer is a RegularChar
+            // we can't move any further back
+            return result;
+        }
+        bufferSize.DecrementInBounds(result);
+    }
+
+    // move off of delimiter
+    bufferSize.IncrementInBounds(result);
+
+    return result;
+}
+
+// Method Description:
+// - Helper method for GetWordStart(). Get the til::point for the beginning of the word (selection definition) you are on
+// Arguments:
+// - target - a til::point on the word you are currently on
+// - wordDelimiters - what characters are we considering for the separation of words
+// Return Value:
+// - The til::point for the first character on the current word or delimiter run (stopped by the left margin)
+til::point TextBuffer::_GetWordStartForSelection(const til::point target, const std::wstring_view wordDelimiters) const
+{
+    auto result = target;
+    const auto bufferSize = GetSize();
+
+    const auto initialDelimiter = _GetDelimiterClassAt(result, wordDelimiters);
+    const bool isControlChar = initialDelimiter == DelimiterClass::ControlChar;
+
+    // expand left until we hit the left boundary or a different delimiter class
+    while (result != bufferSize.Origin() && _GetDelimiterClassAt(result, wordDelimiters) == initialDelimiter)
+    {
+        if (result.x == bufferSize.Left())
+        {
+            // Prevent wrapping to the previous line if the selection begins on whitespace
+            if (isControlChar)
+            {
+                break;
+            }
+
+            if (result.y > 0)
+            {
+                // Prevent wrapping to the previous line if it was hard-wrapped (e.g. not forced by us to wrap)
+                const auto& priorRow = GetRowByOffset(result.y - 1);
+                if (!priorRow.WasWrapForced())
+                {
+                    break;
+                }
+            }
+        }
+        bufferSize.DecrementInBounds(result);
+    }
+
+    if (_GetDelimiterClassAt(result, wordDelimiters) != initialDelimiter)
+    {
+        // move off of delimiter
+        bufferSize.IncrementInBounds(result);
+    }
+
+    return result;
+}
+
+// Method Description:
+// - Get the til::point for the beginning of the NEXT word
+// Arguments:
+// - target - a til::point on the word you are currently on
+// - wordDelimiters - what characters are we considering for the separation of words
+// - accessibilityMode - when enabled, we continue expanding right until we are at the beginning of the next READABLE word
+//                        Otherwise, expand right until a character of a new delimiter class is found
+//                        (or a row boundary is encountered)
+// - limitOptional - (optional) the last possible position in the buffer that can be explored. This can be used to improve performance.
+// Return Value:
+// - The til::point for the last character on the "word" (inclusive)
+til::point TextBuffer::GetWordEnd(const til::point target, const std::wstring_view wordDelimiters, bool accessibilityMode, std::optional<til::point> limitOptional) const
+{
+    // Consider a buffer with this text in it:
+    // "  word   other  "
+    // In selection (accessibilityMode = false),
+    //  a "word" is defined as the range between two delimiters
+    //  so the words in the example include ["  ", "word", "   ", "other", "  "]
+    // In accessibility (accessibilityMode = true),
+    //  a "word" includes the delimiters after a range of readable characters
+    //  so the words in the example include ["word   ", "other  "]
+    // NOTE: the end anchor (this one) is exclusive, whereas the start anchor (GetWordStart) is inclusive
+
+    // Already at/past the limit. Can't move forward.
+    const auto bufferSize{ GetSize() };
+    const auto limit{ limitOptional.value_or(bufferSize.EndExclusive()) };
+    if (bufferSize.CompareInBounds(target, limit, true) >= 0)
+    {
+        return target;
+    }
+
+    if (accessibilityMode)
+    {
+        return _GetWordEndForAccessibility(target, wordDelimiters, limit);
+    }
+    else
+    {
+        return _GetWordEndForSelection(target, wordDelimiters);
+    }
+}
+
+// Method Description:
+// - Helper method for GetWordEnd(). Get the til::point for the beginning of the next READABLE word
+// Arguments:
+// - target - a til::point on the word you are currently on
+// - wordDelimiters - what characters are we considering for the separation of words
+// - limit - the last "valid" position in the text buffer (to improve performance)
+// Return Value:
+// - The til::point for the first character of the next readable "word". If no next word, return one past the end of the buffer
+til::point TextBuffer::_GetWordEndForAccessibility(const til::point target, const std::wstring_view wordDelimiters, const til::point limit) const
+{
+    const auto bufferSize{ GetSize() };
+    auto result{ target };
+
+    if (bufferSize.CompareInBounds(target, limit, true) >= 0)
+    {
+        // if we're already on/past the last RegularChar,
+        // clamp result to that position
+        result = limit;
+
+        // make the result exclusive
+        bufferSize.IncrementInBounds(result, true);
+    }
+    else
+    {
+        while (result != limit && result != bufferSize.BottomRightInclusive() && _GetDelimiterClassAt(result, wordDelimiters) == DelimiterClass::RegularChar)
+        {
+            // Iterate through readable text
+            bufferSize.IncrementInBounds(result);
+        }
+
+        while (result != limit && result != bufferSize.BottomRightInclusive() && _GetDelimiterClassAt(result, wordDelimiters) != DelimiterClass::RegularChar)
+        {
+            // expand to the beginning of the NEXT word
+            bufferSize.IncrementInBounds(result);
+        }
+
+        // Special case: we tried to move one past the end of the buffer
+        // Manually increment onto the EndExclusive point.
+        if (result == bufferSize.BottomRightInclusive())
+        {
+            bufferSize.IncrementInBounds(result, true);
+        }
+    }
+
+    return result;
+}
+
+// Method Description:
+// - Helper method for GetWordEnd(). Get the til::point for the beginning of the NEXT word
+// Arguments:
+// - target - a til::point on the word you are currently on
+// - wordDelimiters - what characters are we considering for the separation of words
+// Return Value:
+// - The til::point for the last character of the current word or delimiter run (stopped by right margin)
+til::point TextBuffer::_GetWordEndForSelection(const til::point target, const std::wstring_view wordDelimiters) const
+{
+    const auto bufferSize = GetSize();
+
+    auto result = target;
+    const auto initialDelimiter = _GetDelimiterClassAt(result, wordDelimiters);
+    const bool isControlChar = initialDelimiter == DelimiterClass::ControlChar;
+
+    // expand right until we hit the right boundary as a ControlChar or a different delimiter class
+    while (result != bufferSize.BottomRightInclusive() && _GetDelimiterClassAt(result, wordDelimiters) == initialDelimiter)
+    {
+        if (result.x == bufferSize.RightInclusive())
+        {
+            // Prevent wrapping to the next line if the selection begins on whitespace
+            if (isControlChar)
+            {
+                break;
+            }
+
+            // Prevent wrapping to the next line if this one was hard-wrapped (e.g. not forced by us to wrap)
+            const auto& row = GetRowByOffset(result.y);
+            if (!row.WasWrapForced())
+            {
+                break;
+            }
+        }
+
+        bufferSize.IncrementInBounds(result);
+    }
+
+    if (_GetDelimiterClassAt(result, wordDelimiters) != initialDelimiter)
+    {
+        // move off of delimiter
+        bufferSize.DecrementInBounds(result);
+    }
+
+    return result;
+}
+
 void TextBuffer::_PruneHyperlinks()
 {
     // Check the old first row for hyperlink references
@@ -1470,6 +1671,57 @@ void TextBuffer::_PruneHyperlinks()
     }
 }
 
+// Method Description:
+// - Update pos to be the position of the first character of the next word. This is used for accessibility
+// Arguments:
+// - pos - a til::point on the word you are currently on
+// - wordDelimiters - what characters are we considering for the separation of words
+// - limitOptional - (optional) the last possible position in the buffer that can be explored. This can be used to improve performance.
+// Return Value:
+// - true, if successfully updated pos. False, if we are unable to move (usually due to a buffer boundary)
+// - pos - The til::point for the first character on the "word" (inclusive)
+bool TextBuffer::MoveToNextWord(til::point& pos, const std::wstring_view wordDelimiters, std::optional<til::point> limitOptional) const
+{
+    // move to the beginning of the next word
+    // NOTE: _GetWordEnd...() returns the exclusive position of the "end of the word"
+    //       This is also the inclusive start of the next word.
+    const auto bufferSize{ GetSize() };
+    const auto limit{ limitOptional.value_or(bufferSize.EndExclusive()) };
+    const auto copy{ _GetWordEndForAccessibility(pos, wordDelimiters, limit) };
+
+    if (bufferSize.CompareInBounds(copy, limit, true) >= 0)
+    {
+        return false;
+    }
+
+    pos = copy;
+    return true;
+}
+
+// Method Description:
+// - Update pos to be the position of the first character of the previous word. This is used for accessibility
+// Arguments:
+// - pos - a til::point on the word you are currently on
+// - wordDelimiters - what characters are we considering for the separation of words
+// Return Value:
+// - true, if successfully updated pos. False, if we are unable to move (usually due to a buffer boundary)
+// - pos - The til::point for the first character on the "word" (inclusive)
+bool TextBuffer::MoveToPreviousWord(til::point& pos, std::wstring_view wordDelimiters) const
+{
+    // move to the beginning of the current word
+    auto copy{ GetWordStart(pos, wordDelimiters, true) };
+
+    if (!GetSize().DecrementInBounds(copy, true))
+    {
+        // can't move behind current word
+        return false;
+    }
+
+    // move to the beginning of the previous word
+    pos = GetWordStart(copy, wordDelimiters, true);
+    return true;
+}
+
 // Method Description:
 // - Update pos to be the beginning of the current glyph/character. This is used for accessibility
 // Arguments:
@@ -3527,34 +3779,3 @@ void TextBuffer::ManuallyMarkRowAsPrompt(til::CoordType y)
         attr.SetMarkAttributes(MarkKind::Prompt);
     }
 }
-
-// This is an optimization used by the renderer to avoid scheduling a timer if not necessary;
-// unlike the renderer, we know the committed range of our own buffer.
-bool TextBuffer::ContainsBlinkAttributeInRegion(const Microsoft::Console::Types::Viewport& region) const
-{
-    const auto top = region.Top();
-    auto bottom = std::min(region.BottomInclusive(), _estimateOffsetOfLastCommittedRow());
-
-    for (auto row = top; row < bottom; ++row)
-    {
-        const auto& r = GetRowByOffset(row);
-        for (const auto& attr : r.Attributes())
-        {
-            if (attr.IsBlinking())
-            {
-                return true;
-            }
-        }
-    }
-
-    return false;
-}
-
-bool TextBuffer::IsGlyphDoubleWidthAt(const til::point at) const
-{
-    if (!_isRowCommitted(at.y)) [[unlikely]]
-    {
-        return false;
-    }
-    return _getRow(at.y).DbcsAttrAt(at.x) != DbcsAttribute::Single;
-}

src/buffer/out/textBuffer.hpp

@@ -172,10 +172,15 @@ public:
     void TriggerNewTextNotification(const std::wstring_view newText);
     void TriggerSelection();
 
-    til::point GetWordStart(til::point pos, const std::wstring_view wordDelimiters, bool includeWhitespace, std::optional<til::point> limitOptional = std::nullopt) const;
-    til::point GetWordEnd(til::point pos, const std::wstring_view wordDelimiters, bool includeWhitespace, std::optional<til::point> limitOptional = std::nullopt) const;
+    til::point GetWordStart(const til::point target, const std::wstring_view wordDelimiters, bool accessibilityMode = false, std::optional<til::point> limitOptional = std::nullopt) const;
+    til::point GetWordEnd(const til::point target, const std::wstring_view wordDelimiters, bool accessibilityMode = false, std::optional<til::point> limitOptional = std::nullopt) const;
+
+    til::point GetWordStart2(til::point pos, const std::wstring_view wordDelimiters, bool includeWhitespace, std::optional<til::point> limitOptional = std::nullopt) const;
+    til::point GetWordEnd2(til::point pos, const std::wstring_view wordDelimiters, bool includeWhitespace, std::optional<til::point> limitOptional = std::nullopt) const;
 
     bool IsWordBoundary(const til::point pos, const std::wstring_view wordDelimiters) const;
+    bool MoveToNextWord(til::point& pos, const std::wstring_view wordDelimiters, std::optional<til::point> limitOptional = std::nullopt) const;
+    bool MoveToPreviousWord(til::point& pos, const std::wstring_view wordDelimiters) const;
 
     til::point GetGlyphStart(const til::point pos, std::optional<til::point> limitOptional = std::nullopt) const;
     til::point GetGlyphEnd(const til::point pos, bool accessibilityMode = false, std::optional<til::point> limitOptional = std::nullopt) const;
@@ -310,9 +315,6 @@ public:
     void SetScrollbarData(ScrollbarData mark, til::CoordType y);
     void ManuallyMarkRowAsPrompt(til::CoordType y);
 
-    bool ContainsBlinkAttributeInRegion(const Microsoft::Console::Types::Viewport& region) const;
-    bool IsGlyphDoubleWidthAt(const til::point at) const;
-
 private:
     void _reserve(til::size screenBufferSize, const TextAttribute& defaultAttributes);
     void _commit(const std::byte* row);
@@ -322,13 +324,16 @@ private:
     ROW& _getRowByOffsetDirect(size_t offset);
     ROW& _getRow(til::CoordType y) const;
     til::CoordType _estimateOffsetOfLastCommittedRow() const noexcept;
-    bool _isRowCommitted(til::CoordType y) const noexcept;
 
     void _SetFirstRowIndex(const til::CoordType FirstRowIndex) noexcept;
     void _ExpandTextRow(til::inclusive_rect& selectionRow) const;
     DelimiterClass _GetDelimiterClassAt(const til::point pos, const std::wstring_view wordDelimiters) const;
-    til::point _GetDelimiterClassRunStart(til::point pos, const std::wstring_view wordDelimiters, const bool accessibilityMode = false) const;
-    til::point _GetDelimiterClassRunEnd(til::point pos, const std::wstring_view wordDelimiters, const bool accessibilityMode = false) const;
+    til::point _GetDelimiterClassRunStart(til::point pos, const std::wstring_view wordDelimiters) const;
+    til::point _GetDelimiterClassRunEnd(til::point pos, const std::wstring_view wordDelimiters) const;
+    til::point _GetWordStartForAccessibility(const til::point target, const std::wstring_view wordDelimiters) const;
+    til::point _GetWordStartForSelection(const til::point target, const std::wstring_view wordDelimiters) const;
+    til::point _GetWordEndForAccessibility(const til::point target, const std::wstring_view wordDelimiters, const til::point limit) const;
+    til::point _GetWordEndForSelection(const til::point target, const std::wstring_view wordDelimiters) const;
     void _PruneHyperlinks();
 
     std::wstring _commandForRow(const til::CoordType rowOffset, const til::CoordType bottomInclusive, const bool clipAtCursor = false) const;

src/buffer/out/ut_textbuffer/UTextAdapterTests.cpp

@@ -34,16 +34,6 @@ class UTextAdapterTests
 {
     TEST_CLASS(UTextAdapterTests);
 
-    TEST_CLASS_SETUP(ClassSetup)
-    {
-        wil::unique_hmodule icu{ LoadLibraryExW(L"icu.dll", nullptr, LOAD_LIBRARY_SEARCH_SYSTEM32) };
-        if (!icu)
-        {
-            WEX::Logging::Log::Result(WEX::Logging::TestResults::Skipped, L"ICU is not present");
-        }
-        return true;
-    }
-
     TEST_METHOD(Unicode)
     {
         DummyRenderer renderer;

src/buffer/out/ut_textbuffer/sources

@@ -26,9 +26,6 @@ TARGETLIBS = \
     $(CONSOLE_OBJ_PATH)\types\lib\$(O)\ConTypes.lib \
     $(TARGETLIBS) \
 
-DELAYLOAD = \
-    icu.dll \
-
 # -------------------------------------
 # Localization
 # -------------------------------------

src/cascadia/LocalTests_TerminalApp/SettingsTests.cpp

@@ -1421,7 +1421,7 @@ namespace TerminalAppLocalTests
             VERIFY_ARE_EQUAL(L"profile0", terminalArgs.Profile());
             VERIFY_IS_NULL(terminalArgs.Elevate());
 
-            const auto termSettingsResult = TerminalSettings::CreateWithNewTerminalArgs(settings, terminalArgs, settings.WindowSettingsDefaults());
+            const auto termSettingsResult = TerminalSettings::CreateWithNewTerminalArgs(settings, terminalArgs);
             const auto termSettings = termSettingsResult.DefaultSettings();
             VERIFY_ARE_EQUAL(L"cmd.exe", termSettings->Commandline());
             VERIFY_ARE_EQUAL(false, termSettings->Elevate());
@@ -1444,7 +1444,7 @@ namespace TerminalAppLocalTests
             VERIFY_ARE_EQUAL(L"profile1", terminalArgs.Profile());
             VERIFY_IS_NULL(terminalArgs.Elevate());
 
-            const auto termSettingsResult = TerminalSettings::CreateWithNewTerminalArgs(settings, terminalArgs, settings.WindowSettingsDefaults());
+            const auto termSettingsResult = TerminalSettings::CreateWithNewTerminalArgs(settings, terminalArgs);
             const auto termSettings = termSettingsResult.DefaultSettings();
             VERIFY_ARE_EQUAL(L"pwsh.exe", termSettings->Commandline());
             VERIFY_ARE_EQUAL(true, termSettings->Elevate());
@@ -1467,7 +1467,7 @@ namespace TerminalAppLocalTests
             VERIFY_ARE_EQUAL(L"profile2", terminalArgs.Profile());
             VERIFY_IS_NULL(terminalArgs.Elevate());
 
-            const auto termSettingsResult = TerminalSettings::CreateWithNewTerminalArgs(settings, terminalArgs, settings.WindowSettingsDefaults());
+            const auto termSettingsResult = TerminalSettings::CreateWithNewTerminalArgs(settings, terminalArgs);
             const auto termSettings = termSettingsResult.DefaultSettings();
             VERIFY_ARE_EQUAL(L"wsl.exe", termSettings->Commandline());
             VERIFY_ARE_EQUAL(false, termSettings->Elevate());
@@ -1492,7 +1492,7 @@ namespace TerminalAppLocalTests
             VERIFY_IS_NOT_NULL(terminalArgs.Elevate());
             VERIFY_IS_FALSE(terminalArgs.Elevate().Value());
 
-            const auto termSettingsResult = TerminalSettings::CreateWithNewTerminalArgs(settings, terminalArgs, settings.WindowSettingsDefaults());
+            const auto termSettingsResult = TerminalSettings::CreateWithNewTerminalArgs(settings, terminalArgs);
             const auto termSettings = termSettingsResult.DefaultSettings();
             VERIFY_ARE_EQUAL(L"cmd.exe", termSettings->Commandline());
             VERIFY_ARE_EQUAL(false, termSettings->Elevate());
@@ -1516,7 +1516,7 @@ namespace TerminalAppLocalTests
             VERIFY_IS_NOT_NULL(terminalArgs.Elevate());
             VERIFY_IS_FALSE(terminalArgs.Elevate().Value());
 
-            const auto termSettingsResult = TerminalSettings::CreateWithNewTerminalArgs(settings, terminalArgs, settings.WindowSettingsDefaults());
+            const auto termSettingsResult = TerminalSettings::CreateWithNewTerminalArgs(settings, terminalArgs);
             const auto termSettings = termSettingsResult.DefaultSettings();
             VERIFY_ARE_EQUAL(L"pwsh.exe", termSettings->Commandline());
             VERIFY_ARE_EQUAL(false, termSettings->Elevate());
@@ -1540,7 +1540,7 @@ namespace TerminalAppLocalTests
             VERIFY_IS_NOT_NULL(terminalArgs.Elevate());
             VERIFY_IS_FALSE(terminalArgs.Elevate().Value());
 
-            const auto termSettingsResult = TerminalSettings::CreateWithNewTerminalArgs(settings, terminalArgs, settings.WindowSettingsDefaults());
+            const auto termSettingsResult = TerminalSettings::CreateWithNewTerminalArgs(settings, terminalArgs);
             const auto termSettings = termSettingsResult.DefaultSettings();
             VERIFY_ARE_EQUAL(L"wsl.exe", termSettings->Commandline());
             VERIFY_ARE_EQUAL(false, termSettings->Elevate());
@@ -1565,7 +1565,7 @@ namespace TerminalAppLocalTests
             VERIFY_IS_NOT_NULL(terminalArgs.Elevate());
             VERIFY_IS_TRUE(terminalArgs.Elevate().Value());
 
-            const auto termSettingsResult = TerminalSettings::CreateWithNewTerminalArgs(settings, terminalArgs, settings.WindowSettingsDefaults());
+            const auto termSettingsResult = TerminalSettings::CreateWithNewTerminalArgs(settings, terminalArgs);
             const auto termSettings = termSettingsResult.DefaultSettings();
             VERIFY_ARE_EQUAL(L"cmd.exe", termSettings->Commandline());
             VERIFY_ARE_EQUAL(true, termSettings->Elevate());
@@ -1588,7 +1588,7 @@ namespace TerminalAppLocalTests
             VERIFY_IS_NOT_NULL(terminalArgs.Elevate());
             VERIFY_IS_TRUE(terminalArgs.Elevate().Value());
 
-            const auto termSettingsResult = TerminalSettings::CreateWithNewTerminalArgs(settings, terminalArgs, settings.WindowSettingsDefaults());
+            const auto termSettingsResult = TerminalSettings::CreateWithNewTerminalArgs(settings, terminalArgs);
             const auto termSettings = termSettingsResult.DefaultSettings();
             VERIFY_ARE_EQUAL(L"pwsh.exe", termSettings->Commandline());
             VERIFY_ARE_EQUAL(true, termSettings->Elevate());
@@ -1612,7 +1612,7 @@ namespace TerminalAppLocalTests
             VERIFY_IS_NOT_NULL(terminalArgs.Elevate());
             VERIFY_IS_TRUE(terminalArgs.Elevate().Value());
 
-            const auto termSettingsResult = TerminalSettings::CreateWithNewTerminalArgs(settings, terminalArgs, settings.WindowSettingsDefaults());
+            const auto termSettingsResult = TerminalSettings::CreateWithNewTerminalArgs(settings, terminalArgs);
             const auto termSettings = termSettingsResult.DefaultSettings();
             VERIFY_ARE_EQUAL(L"wsl.exe", termSettings->Commandline());
             VERIFY_ARE_EQUAL(true, termSettings->Elevate());

src/cascadia/LocalTests_TerminalApp/TabTests.cpp

@@ -308,11 +308,6 @@ namespace TerminalAppLocalTests
         // TerminalPage and not only create them successfully, but also create a
         // tab using those settings successfully.
 
-        // - - - IMPORTANT - - -
-        // GH#14623: "closeOnExit": "never" is important for all test profiles. Without
-        // it, the spawned process exits immediately in the UAP test environment,
-        // and the default "automatic" close-on-exit behavior removes the
-        // tab/pane asynchronously, racing against test assertions.
         static constexpr std::wstring_view settingsJson0{ LR"(
         {
             "defaultProfile": "{6239a42c-1111-49a3-80bd-e8fdd045185c}",
@@ -320,14 +315,12 @@ namespace TerminalAppLocalTests
                 {
                     "name" : "profile0",
                     "guid": "{6239a42c-1111-49a3-80bd-e8fdd045185c}",
-                    "historySize": 1,
-                    "closeOnExit": "never"
+                    "historySize": 1
                 },
                 {
                     "name" : "profile1",
                     "guid": "{6239a42c-2222-49a3-80bd-e8fdd045185c}",
-                    "historySize": 2,
-                    "closeOnExit": "never"
+                    "historySize": 2
                 }
             ]
         })" };
@@ -354,6 +347,10 @@ namespace TerminalAppLocalTests
 
     void TabTests::TryDuplicateBadTab()
     {
+        BEGIN_TEST_METHOD_PROPERTIES()
+            TEST_METHOD_PROPERTY(L"Ignore", L"True") // GH#19610 tracks re-enabling this test
+        END_TEST_METHOD_PROPERTIES()
+
         // * Create a tab with a profile with GUID 1
         // * Reload the settings so that GUID 1 is no longer in the list of profiles
         // * Try calling _DuplicateFocusedTab on tab 1
@@ -368,14 +365,12 @@ namespace TerminalAppLocalTests
                 {
                     "name" : "profile0",
                     "guid": "{6239a42c-1111-49a3-80bd-e8fdd045185c}",
-                    "historySize": 1,
-                    "closeOnExit": "never"
+                    "historySize": 1
                 },
                 {
                     "name" : "profile1",
                     "guid": "{6239a42c-2222-49a3-80bd-e8fdd045185c}",
-                    "historySize": 2,
-                    "closeOnExit": "never"
+                    "historySize": 2
                 }
             ]
         })" };
@@ -387,8 +382,7 @@ namespace TerminalAppLocalTests
                 {
                     "name" : "profile1",
                     "guid": "{6239a42c-2222-49a3-80bd-e8fdd045185c}",
-                    "historySize": 2,
-                    "closeOnExit": "never"
+                    "historySize": 2
                 }
             ]
         })" };
@@ -444,6 +438,10 @@ namespace TerminalAppLocalTests
 
     void TabTests::TryDuplicateBadPane()
     {
+        BEGIN_TEST_METHOD_PROPERTIES()
+            TEST_METHOD_PROPERTY(L"Ignore", L"True") // GH#19610 tracks re-enabling this test
+        END_TEST_METHOD_PROPERTIES()
+
         // * Create a tab with a profile with GUID 1
         // * Reload the settings so that GUID 1 is no longer in the list of profiles
         // * Try calling _SplitPane(Duplicate) on tab 1
@@ -458,14 +456,12 @@ namespace TerminalAppLocalTests
                 {
                     "name" : "profile0",
                     "guid": "{6239a42c-1111-49a3-80bd-e8fdd045185c}",
-                    "historySize": 1,
-                    "closeOnExit": "never"
+                    "historySize": 1
                 },
                 {
                     "name" : "profile1",
                     "guid": "{6239a42c-2222-49a3-80bd-e8fdd045185c}",
-                    "historySize": 2,
-                    "closeOnExit": "never"
+                    "historySize": 2
                 }
             ]
         })" };
@@ -477,8 +473,7 @@ namespace TerminalAppLocalTests
                 {
                     "name" : "profile1",
                     "guid": "{6239a42c-2222-49a3-80bd-e8fdd045185c}",
-                    "historySize": 2,
-                    "closeOnExit": "never"
+                    "historySize": 2
                 }
             ]
         })" };
@@ -577,29 +572,25 @@ namespace TerminalAppLocalTests
                     "name" : "profile0",
                     "guid": "{6239a42c-1111-49a3-80bd-e8fdd045185c}",
                     "tabTitle" : "Profile 0",
-                    "historySize": 1,
-                    "closeOnExit": "never"
+                    "historySize": 1
                 },
                 {
                     "name" : "profile1",
                     "guid": "{6239a42c-2222-49a3-80bd-e8fdd045185c}",
                     "tabTitle" : "Profile 1",
-                    "historySize": 2,
-                    "closeOnExit": "never"
+                    "historySize": 2
                 },
                 {
                     "name" : "profile2",
                     "guid": "{6239a42c-3333-49a3-80bd-e8fdd045185c}",
                     "tabTitle" : "Profile 2",
-                    "historySize": 3,
-                    "closeOnExit": "never"
+                    "historySize": 3
                 },
                 {
                     "name" : "profile3",
                     "guid": "{6239a42c-4444-49a3-80bd-e8fdd045185c}",
                     "tabTitle" : "Profile 3",
-                    "historySize": 4,
-                    "closeOnExit": "never"
+                    "historySize": 4
                 }
             ],
             "schemes":
@@ -702,6 +693,7 @@ namespace TerminalAppLocalTests
     {
         BEGIN_TEST_METHOD_PROPERTIES()
             TEST_METHOD_PROPERTY(L"IsolationLevel", L"Method")
+            TEST_METHOD_PROPERTY(L"Ignore", L"True") // GH#19610 tracks re-enabling this test
         END_TEST_METHOD_PROPERTIES()
 
         auto page = _commonSetup();
@@ -741,6 +733,10 @@ namespace TerminalAppLocalTests
 
     void TabTests::MoveFocusFromZoomedPane()
     {
+        BEGIN_TEST_METHOD_PROPERTIES()
+            TEST_METHOD_PROPERTY(L"Ignore", L"True") // GH#19610 tracks re-enabling this test
+        END_TEST_METHOD_PROPERTIES()
+
         auto page = _commonSetup();
 
         Log::Comment(L"Create a second pane");
@@ -786,6 +782,10 @@ namespace TerminalAppLocalTests
 
     void TabTests::CloseZoomedPane()
     {
+        BEGIN_TEST_METHOD_PROPERTIES()
+            TEST_METHOD_PROPERTY(L"Ignore", L"True") // GH#19610 tracks re-enabling this test
+        END_TEST_METHOD_PROPERTIES()
+
         auto page = _commonSetup();
 
         Log::Comment(L"Create a second pane");
@@ -841,6 +841,10 @@ namespace TerminalAppLocalTests
 
     void TabTests::SwapPanes()
     {
+        BEGIN_TEST_METHOD_PROPERTIES()
+            TEST_METHOD_PROPERTY(L"Ignore", L"True") // GH#19610 tracks re-enabling this test
+        END_TEST_METHOD_PROPERTIES()
+
         auto page = _commonSetup();
 
         Log::Comment(L"Setup 4 panes.");
@@ -1047,31 +1051,31 @@ namespace TerminalAppLocalTests
 
     void TabTests::NextMRUTab()
     {
-        // This is a test for GH#8025 - we want to make sure that MRU tab
-        // ordering works correctly and that in-order/disabled switching works.
-        //
-        // Note: We test MRU ordering directly rather than going through the
-        // command palette tab switcher, because the palette's anchor key
-        // handling auto-dismisses when no modifier keys are held (which we
-        // can't simulate in the test environment).
+        BEGIN_TEST_METHOD_PROPERTIES()
+            TEST_METHOD_PROPERTY(L"Ignore", L"True") // GH#19610 tracks re-enabling this test
+        END_TEST_METHOD_PROPERTIES()
+
+        // This is a test for GH#8025 - we want to make sure that we can do both
+        // in-order and MRU tab traversal, using the tab switcher and with the
+        // tab switcher disabled.
 
         auto page = _commonSetup();
 
-        Log::Comment(L"Create Tab[1]");
+        Log::Comment(L"Create a second tab");
         TestOnUIThread([&page]() {
             NewTerminalArgs newTerminalArgs{ 1 };
             page->_OpenNewTab(newTerminalArgs);
         });
         VERIFY_ARE_EQUAL(2u, page->_tabs.Size());
 
-        Log::Comment(L"Create Tab[2]");
+        Log::Comment(L"Create a third tab");
         TestOnUIThread([&page]() {
             NewTerminalArgs newTerminalArgs{ 2 };
             page->_OpenNewTab(newTerminalArgs);
         });
         VERIFY_ARE_EQUAL(3u, page->_tabs.Size());
 
-        Log::Comment(L"Create Tab[3]");
+        Log::Comment(L"Create a fourth tab");
         TestOnUIThread([&page]() {
             NewTerminalArgs newTerminalArgs{ 3 };
             page->_OpenNewTab(newTerminalArgs);
@@ -1080,90 +1084,99 @@ namespace TerminalAppLocalTests
 
         TestOnUIThread([&page]() {
             auto focusedIndex = page->_GetFocusedTabIndex().value_or(-1);
-            VERIFY_ARE_EQUAL(3u, focusedIndex, L"Verify Tab[3] is focused");
+            VERIFY_ARE_EQUAL(3u, focusedIndex, L"Verify the fourth tab is the focused one");
         });
 
-        Log::Comment(L"Select Tab[1]");
+        Log::Comment(L"Select the second tab");
         TestOnUIThread([&page]() {
             page->_SelectTab(1);
         });
 
         TestOnUIThread([&page]() {
             auto focusedIndex = page->_GetFocusedTabIndex().value_or(-1);
-            VERIFY_ARE_EQUAL(1u, focusedIndex, L"Verify Tab[1] is focused");
+            VERIFY_ARE_EQUAL(1u, focusedIndex, L"Verify the second tab is the focused one");
         });
 
-        // MRU order should now be: Tab[1], Tab[3], Tab[2], Tab[0]
-        // Verify the MRU list directly.
-        Log::Comment(L"Verify MRU order: MRU[0]=Tab[1], MRU[1]=Tab[3]");
+        Log::Comment(L"Change the tab switch order to MRU switching");
         TestOnUIThread([&page]() {
-            page->_currentWindowSettings().TabSwitcherMode(TabSwitcherMode::MostRecentlyUsed);
-            VERIFY_ARE_EQUAL(4u, page->_mruTabs.Size());
-            uint32_t mruIdx;
-            page->_tabs.IndexOf(page->_mruTabs.GetAt(0), mruIdx);
-            VERIFY_ARE_EQUAL(1u, mruIdx, L"MRU[0] should be Tab[1] (most recent)");
-            page->_tabs.IndexOf(page->_mruTabs.GetAt(1), mruIdx);
-            VERIFY_ARE_EQUAL(3u, mruIdx, L"MRU[1] should be Tab[3] (last tab added)");
+            page->_settings.GlobalSettings().TabSwitcherMode(TabSwitcherMode::MostRecentlyUsed);
         });
 
-        Log::Comment(L"Select MRU[1]=Tab[3] directly");
+        Log::Comment(L"Switch to the next MRU tab, which is the fourth tab");
         TestOnUIThread([&page]() {
-            // The next MRU tab after Tab[1] is Tab[3]
-            uint32_t nextMruIdx;
-            page->_tabs.IndexOf(page->_mruTabs.GetAt(1), nextMruIdx);
-            page->_SelectTab(nextMruIdx);
+            page->_SelectNextTab(true, nullptr);
+        });
+
+        Log::Comment(L"Sleep to let events propagate");
+        Sleep(250);
+
+        TestOnUIThread([&page]() {
+            Log::Comment(L"Hide the command palette, to confirm the selection");
+            // If you don't do this, the palette will just stay open, and the
+            // next time we call _HandleNextTab, we'll continue traversing the
+            // MRU list, instead of just hoping one entry.
+            page->LoadCommandPalette().Visibility(Visibility::Collapsed);
         });
 
         TestOnUIThread([&page]() {
             auto focusedIndex = page->_GetFocusedTabIndex().value_or(-1);
-            VERIFY_ARE_EQUAL(3u, focusedIndex, L"Verify Tab[3] is focused");
+            VERIFY_ARE_EQUAL(3u, focusedIndex, L"Verify the fourth tab is the focused one");
         });
 
-        Log::Comment(L"Select MRU[1]=Tab[1] directly");
+        Log::Comment(L"Switch to the next MRU tab, which is the second tab");
         TestOnUIThread([&page]() {
-            uint32_t nextMruIdx;
-            page->_tabs.IndexOf(page->_mruTabs.GetAt(1), nextMruIdx);
-            page->_SelectTab(nextMruIdx);
+            page->_SelectNextTab(true, nullptr);
+        });
+
+        Log::Comment(L"Sleep to let events propagate");
+        Sleep(250);
+
+        TestOnUIThread([&page]() {
+            Log::Comment(L"Hide the command palette, to confirm the selection");
+            // If you don't do this, the palette will just stay open, and the
+            // next time we call _HandleNextTab, we'll continue traversing the
+            // MRU list, instead of just hoping one entry.
+            page->LoadCommandPalette().Visibility(Visibility::Collapsed);
         });
 
         TestOnUIThread([&page]() {
             auto focusedIndex = page->_GetFocusedTabIndex().value_or(-1);
-            VERIFY_ARE_EQUAL(1u, focusedIndex, L"Verify Tab[1] is focused");
+            VERIFY_ARE_EQUAL(1u, focusedIndex, L"Verify the second tab is the focused one");
+        });
+
+        Log::Comment(L"Change the tab switch order to in-order switching");
+        page->_settings.GlobalSettings().TabSwitcherMode(TabSwitcherMode::InOrder);
+
+        Log::Comment(L"Switch to the next in-order tab, which is the third tab");
+        TestOnUIThread([&page]() {
+            page->_SelectNextTab(true, nullptr);
+        });
+        TestOnUIThread([&page]() {
+            auto focusedIndex = page->_GetFocusedTabIndex().value_or(-1);
+            VERIFY_ARE_EQUAL(2u, focusedIndex, L"Verify the third tab is the focused one");
         });
 
-        // The Disabled tab switcher mode uses direct index-based switching
-        // without the command palette, so it works in the test environment.
         Log::Comment(L"Change the tab switch order to not use the tab switcher (which is in-order always)");
-        page->_currentWindowSettings().TabSwitcherMode(TabSwitcherMode::Disabled);
+        page->_settings.GlobalSettings().TabSwitcherMode(TabSwitcherMode::Disabled);
 
-        Log::Comment(L"Switch to the next in-order tab: Tab[2]");
+        Log::Comment(L"Switch to the next in-order tab, which is the fourth tab");
         TestOnUIThread([&page]() {
             page->_SelectNextTab(true, nullptr);
         });
         TestOnUIThread([&page]() {
             auto focusedIndex = page->_GetFocusedTabIndex().value_or(-1);
-            VERIFY_ARE_EQUAL(2u, focusedIndex, L"Verify Tab[2] is focused");
-        });
-
-        Log::Comment(L"Switch to the next in-order tab: Tab[3]");
-        TestOnUIThread([&page]() {
-            page->_SelectNextTab(true, nullptr);
-        });
-        TestOnUIThread([&page]() {
-            auto focusedIndex = page->_GetFocusedTabIndex().value_or(-1);
-            VERIFY_ARE_EQUAL(3u, focusedIndex, L"Verify Tab[3] is focused");
+            VERIFY_ARE_EQUAL(3u, focusedIndex, L"Verify the fourth tab is the focused one");
         });
     }
 
     void TabTests::VerifyCommandPaletteTabSwitcherOrder()
     {
-        // This is a test for GH#8188 - we want to make sure that the MRU
-        // ordering is correctly maintained as tabs are selected.
-        //
-        // Note: We verify MRU ordering directly rather than going through
-        // the command palette tab switcher, because the palette's anchor key
-        // handling auto-dismisses when no modifier keys are held (which we
-        // can't simulate in the test environment).
+        BEGIN_TEST_METHOD_PROPERTIES()
+            TEST_METHOD_PROPERTY(L"Ignore", L"True") // GH#19610 tracks re-enabling this test
+        END_TEST_METHOD_PROPERTIES()
+
+        // This is a test for GH#8188 - we want to make sure that the order of tabs
+        // is preserved in the CommandPalette's TabSwitcher
 
         auto page = _commonSetup();
 
@@ -1176,7 +1189,7 @@ namespace TerminalAppLocalTests
         });
         VERIFY_ARE_EQUAL(4u, page->_mruTabs.Size());
 
-        Log::Comment(L"give alphabetical names to all tabs");
+        Log::Comment(L"give alphabetical names to all switch tab actions");
         TestOnUIThread([&page]() {
             page->_GetTabImpl(page->_tabs.GetAt(0))->Title(L"a");
         });
@@ -1198,7 +1211,6 @@ namespace TerminalAppLocalTests
             VERIFY_ARE_EQUAL(L"c", page->_tabs.GetAt(2).Title());
             VERIFY_ARE_EQUAL(L"d", page->_tabs.GetAt(3).Title());
 
-            // MRU order after creating Tab[0]-Tab[3]: MRU[0]=Tab[3], MRU[3]=Tab[0]
             VERIFY_ARE_EQUAL(L"d", page->_mruTabs.GetAt(0).Title());
             VERIFY_ARE_EQUAL(L"c", page->_mruTabs.GetAt(1).Title());
             VERIFY_ARE_EQUAL(L"b", page->_mruTabs.GetAt(2).Title());
@@ -1207,10 +1219,10 @@ namespace TerminalAppLocalTests
 
         Log::Comment(L"Change the tab switch order to MRU switching");
         TestOnUIThread([&page]() {
-            page->_currentWindowSettings().TabSwitcherMode(TabSwitcherMode::MostRecentlyUsed);
+            page->_settings.GlobalSettings().TabSwitcherMode(TabSwitcherMode::MostRecentlyUsed);
         });
 
-        Log::Comment(L"Select Tab[0] through Tab[3] to establish MRU order");
+        Log::Comment(L"Select the tabs from 0 to 3");
         RunOnUIThread([&page]() {
             page->_UpdatedSelectedTab(page->_tabs.GetAt(0));
             page->_UpdatedSelectedTab(page->_tabs.GetAt(1));
@@ -1218,31 +1230,47 @@ namespace TerminalAppLocalTests
             page->_UpdatedSelectedTab(page->_tabs.GetAt(3));
         });
 
-        Log::Comment(L"Verify MRU order: MRU[0]='d', MRU[1]='c', MRU[2]='b', MRU[3]='a'");
         VERIFY_ARE_EQUAL(4u, page->_mruTabs.Size());
         VERIFY_ARE_EQUAL(L"d", page->_mruTabs.GetAt(0).Title());
         VERIFY_ARE_EQUAL(L"c", page->_mruTabs.GetAt(1).Title());
         VERIFY_ARE_EQUAL(L"b", page->_mruTabs.GetAt(2).Title());
         VERIFY_ARE_EQUAL(L"a", page->_mruTabs.GetAt(3).Title());
 
-        Log::Comment(L"Select Tab[2]='c' (MRU[1] after 'd')");
-        TestOnUIThread([&page]() {
-            page->_SelectTab(2);
+        Log::Comment(L"Switch to the next MRU tab, which is the third tab");
+        RunOnUIThread([&page]() {
+            page->_SelectNextTab(true, nullptr);
+            // In the course of a single tick, the Command Palette will:
+            // * open
+            // * select the proper tab from the mru's list
+            // * raise an event for _filteredActionsView().SelectionChanged to
+            //   immediately preview the new tab
+            // * raise a _SwitchToTabRequestedHandlers event
+            // * then dismiss itself, because we can't fake holing down an
+            //   anchor key in the tests
         });
 
-        Log::Comment(L"Verify MRU order updated: MRU[0]='c', MRU[1]='d', MRU[2]='b', MRU[3]='a'");
         TestOnUIThread([&page]() {
             VERIFY_ARE_EQUAL(L"c", page->_mruTabs.GetAt(0).Title());
             VERIFY_ARE_EQUAL(L"d", page->_mruTabs.GetAt(1).Title());
             VERIFY_ARE_EQUAL(L"b", page->_mruTabs.GetAt(2).Title());
             VERIFY_ARE_EQUAL(L"a", page->_mruTabs.GetAt(3).Title());
         });
+
+        const auto palette = winrt::get_self<winrt::TerminalApp::implementation::CommandPalette>(page->LoadCommandPalette());
+
+        VERIFY_ARE_EQUAL(winrt::TerminalApp::implementation::CommandPaletteMode::TabSwitchMode, palette->_currentMode, L"Verify we are in the tab switcher mode");
+        // At this point, the contents of the command palette's _mruTabs list is
+        // still the _old_ ordering (d, c, b, a). The ordering is only updated
+        // in TerminalPage::_SelectNextTab, but as we saw before, the palette
+        // will also dismiss itself immediately when that's called. So we can't
+        // really inspect the contents of the list in this test, unfortunately.
     }
 
     void TabTests::TestWindowRenameSuccessful()
     {
         BEGIN_TEST_METHOD_PROPERTIES()
             TEST_METHOD_PROPERTY(L"IsolationLevel", L"Method")
+            TEST_METHOD_PROPERTY(L"Ignore", L"True") // GH#19610 tracks re-enabling this test
         END_TEST_METHOD_PROPERTIES()
 
         auto page = _commonSetup();
@@ -1275,6 +1303,7 @@ namespace TerminalAppLocalTests
     {
         BEGIN_TEST_METHOD_PROPERTIES()
             TEST_METHOD_PROPERTY(L"IsolationLevel", L"Method")
+            TEST_METHOD_PROPERTY(L"Ignore", L"True") // GH#19610 tracks re-enabling this test
         END_TEST_METHOD_PROPERTIES()
 
         auto page = _commonSetup();
@@ -1307,6 +1336,10 @@ namespace TerminalAppLocalTests
 
     void TabTests::TestPreviewCommitScheme()
     {
+        BEGIN_TEST_METHOD_PROPERTIES()
+            TEST_METHOD_PROPERTY(L"Ignore", L"True") // GH#19610 tracks re-enabling this test
+        END_TEST_METHOD_PROPERTIES()
+
         Log::Comment(L"Preview a color scheme. Make sure it's applied, then committed accordingly");
 
         auto page = _commonSetup();
@@ -1369,6 +1402,10 @@ namespace TerminalAppLocalTests
 
     void TabTests::TestPreviewDismissScheme()
     {
+        BEGIN_TEST_METHOD_PROPERTIES()
+            TEST_METHOD_PROPERTY(L"Ignore", L"True") // GH#19610 tracks re-enabling this test
+        END_TEST_METHOD_PROPERTIES()
+
         Log::Comment(L"Preview a color scheme. Make sure it's applied, then dismissed accordingly");
 
         auto page = _commonSetup();
@@ -1417,6 +1454,10 @@ namespace TerminalAppLocalTests
 
     void TabTests::TestPreviewSchemeWhilePreviewing()
     {
+        BEGIN_TEST_METHOD_PROPERTIES()
+            TEST_METHOD_PROPERTY(L"Ignore", L"True") // GH#19610 tracks re-enabling this test
+        END_TEST_METHOD_PROPERTIES()
+
         Log::Comment(L"Preview a color scheme, then preview another scheme. ");
 
         Log::Comment(L"Preview a color scheme. Make sure it's applied, then committed accordingly");
@@ -1484,6 +1525,10 @@ namespace TerminalAppLocalTests
 
     void TabTests::TestClampSwitchToTab()
     {
+        BEGIN_TEST_METHOD_PROPERTIES()
+            TEST_METHOD_PROPERTY(L"Ignore", L"True") // GH#19610 tracks re-enabling this test
+        END_TEST_METHOD_PROPERTIES()
+
         Log::Comment(L"Test that switching to a tab index higher than the number of tabs just clamps to the last tab.");
 
         auto page = _commonSetup();

src/cascadia/TerminalApp/App.xaml

@@ -192,7 +192,7 @@
                                             ResourceKey="TabViewBackground" />
 
                             <SolidColorBrush x:Key="SettingsUiTabBrush"
-                                             Color="#282828" />
+                                             Color="#0c0c0c" />
 
                             <SolidColorBrush x:Key="BroadcastPaneBorderColor"
                                              Color="{StaticResource SystemAccentColorDark2}" />
@@ -211,7 +211,7 @@
                                             ResourceKey="TabViewBackground" />
 
                             <SolidColorBrush x:Key="SettingsUiTabBrush"
-                                             Color="#F9F9F9" />
+                                             Color="#ffffff" />
 
                             <SolidColorBrush x:Key="BroadcastPaneBorderColor"
                                              Color="{StaticResource SystemAccentColorLight2}" />
@@ -234,7 +234,7 @@
                                             ResourceKey="SystemColorButtonFaceColorBrush" />
 
                             <StaticResource x:Key="SettingsUiTabBrush"
-                                            ResourceKey="SystemColorWindowBrush" />
+                                            ResourceKey="SystemControlBackgroundBaseLowBrush" />
 
                             <SolidColorBrush x:Key="BroadcastPaneBorderColor"
                                              Color="{StaticResource SystemColorHighlightColor}" />

src/cascadia/TerminalApp/AppActionHandlers.cpp

@@ -550,7 +550,7 @@ namespace winrt::TerminalApp::implementation
         if (const auto& realArgs = args.ActionArgs().try_as<CopyTextArgs>())
         {
             const auto copyFormatting = realArgs.CopyFormatting();
-            const auto format = copyFormatting ? copyFormatting.Value() : _currentWindowSettings().CopyFormatting();
+            const auto format = copyFormatting ? copyFormatting.Value() : _settings.GlobalSettings().CopyFormatting();
             const auto handled = _CopyText(realArgs.DismissSelection(), realArgs.SingleLine(), realArgs.WithControlSequences(), format);
             args.Handled(handled);
         }
@@ -961,7 +961,7 @@ namespace winrt::TerminalApp::implementation
 
         if (const auto& terminalArgs{ newContentArgs.try_as<NewTerminalArgs>() })
         {
-            const auto profile{ _settings.GetProfileForArgs(terminalArgs, _currentWindowSettings()) };
+            const auto profile{ _settings.GetProfileForArgs(terminalArgs) };
             terminalArgs.Profile(::Microsoft::Console::Utils::GuidToString(profile.Guid()));
         }
 
@@ -1118,7 +1118,7 @@ namespace winrt::TerminalApp::implementation
                 // use global default if query URL is unspecified
                 if (queryUrl.empty())
                 {
-                    queryUrl = std::wstring_view{ _currentWindowSettings().SearchWebDefaultQueryUrl() };
+                    queryUrl = std::wstring_view{ _settings.GlobalSettings().SearchWebDefaultQueryUrl() };
                 }
 
                 constexpr std::wstring_view queryToken{ L"%s" };
@@ -1475,7 +1475,7 @@ namespace winrt::TerminalApp::implementation
                                       WI_IsAnyFlagSet(source, SuggestionsSource::CommandHistory | SuggestionsSource::QuickFixes);
         if (const auto& control{ _GetActiveControl() })
         {
-            currentWorkingDirectory = control.WorkingDirectory();
+            currentWorkingDirectory = control.CurrentWorkingDirectory();
 
             if (shouldGetContext)
             {

src/cascadia/TerminalApp/AppLogic.cpp

@@ -194,7 +194,7 @@ namespace winrt::TerminalApp::implementation
             g_hTerminalAppProvider,
             "AppCreated",
             TraceLoggingDescription("Event emitted when the application is started"),
-            TraceLoggingBool(_settings.WindowSettingsDefaults().ShowTabsInTitlebar(), "TabsInTitlebar"),
+            TraceLoggingBool(_settings.GlobalSettings().ShowTabsInTitlebar(), "TabsInTitlebar"),
             TraceLoggingKeyword(MICROSOFT_KEYWORD_MEASURES),
             TelemetryPrivacyDataTag(PDT_ProductAndServiceUsage));
     }
@@ -229,12 +229,12 @@ namespace winrt::TerminalApp::implementation
             }
 
             _hasSettingsStartupActions = false;
-            const auto startupActions = newSettings.WindowSettingsDefaults().StartupActions();
+            const auto startupActions = newSettings.GlobalSettings().StartupActions();
             if (!startupActions.empty())
             {
                 _settingsAppArgs.FullResetState();
 
-                ExecuteCommandlineArgs args{ newSettings.WindowSettingsDefaults().StartupActions() };
+                ExecuteCommandlineArgs args{ newSettings.GlobalSettings().StartupActions() };
                 auto result = _settingsAppArgs.ParseArgs(args);
                 if (result == 0)
                 {

src/cascadia/TerminalApp/CommandPalette.cpp

@@ -928,17 +928,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

src/cascadia/TerminalApp/Resources/de-DE/Resources.resw

@@ -672,15 +672,9 @@
   <data name="UnsupportedSchemeText" xml:space="preserve">
     <value>Dieser Linktyp wird derzeit nicht unterstützt:</value>
   </data>
-  <data name="UriErrorDialog.CloseButtonText" xml:space="preserve">
+  <data name="CouldNotOpenUriDialog.PrimaryButtonText" xml:space="preserve">
     <value>Abbrechen</value>
   </data>
-  <data name="UnsafeUrlConfirmText" xml:space="preserve">
-    <value>Dieser Link kann zu einem unsicheren Speicherort führen. Links können ihren Computer und Ihre Daten beschädigen. Klicken Sie zum Schutz Des Computers nur auf Links aus vertrauenswürdigen Quellen.</value>
-  </data>
-  <data name="UnsafeUrlConfirmAllowAction" xml:space="preserve">
-    <value>Trotzdem öffnen</value>
-  </data>
   <data name="SettingsTab" xml:space="preserve">
     <value>Einstellungen</value>
   </data>

src/cascadia/TerminalApp/Resources/en-US/Resources.resw

@@ -669,15 +669,9 @@
   <data name="UnsupportedSchemeText" xml:space="preserve">
     <value>This link type is currently not supported:</value>
   </data>
-  <data name="UriErrorDialog.CloseButtonText" xml:space="preserve">
+  <data name="CouldNotOpenUriDialog.PrimaryButtonText" xml:space="preserve">
     <value>Cancel</value>
   </data>
-  <data name="UnsafeUrlConfirmText" xml:space="preserve">
-    <value>This link may lead to an unsafe location. Hyperlinks can be harmful to your computer and data. To protect your computer, only click links from trusted sources.</value>
-  </data>
-  <data name="UnsafeUrlConfirmAllowAction" xml:space="preserve">
-    <value>Open anyway</value>
-  </data>
   <data name="SettingsTab" xml:space="preserve">
     <value>Settings</value>
   </data>

src/cascadia/TerminalApp/Resources/es-ES/Resources.resw

@@ -669,15 +669,9 @@
   <data name="UnsupportedSchemeText" xml:space="preserve">
     <value>Este tipo de vínculo no se admite actualmente:</value>
   </data>
-  <data name="UriErrorDialog.CloseButtonText" xml:space="preserve">
+  <data name="CouldNotOpenUriDialog.PrimaryButtonText" xml:space="preserve">
     <value>Cancelar</value>
   </data>
-  <data name="UnsafeUrlConfirmText" xml:space="preserve">
-    <value>Este vínculo puede dar lugar a una ubicación no segura. Los hipervínculos pueden ser perjudiciales para el equipo y los datos. Para proteger el equipo, haga clic solo en vínculos de orígenes de confianza.</value>
-  </data>
-  <data name="UnsafeUrlConfirmAllowAction" xml:space="preserve">
-    <value>Abrir de todas formas</value>
-  </data>
   <data name="SettingsTab" xml:space="preserve">
     <value>Configuración</value>
   </data>

src/cascadia/TerminalApp/Resources/fr-FR/Resources.resw

@@ -669,15 +669,9 @@
   <data name="UnsupportedSchemeText" xml:space="preserve">
     <value>Ce type de lien n’est actuellement pas pris en charge :</value>
   </data>
-  <data name="UriErrorDialog.CloseButtonText" xml:space="preserve">
+  <data name="CouldNotOpenUriDialog.PrimaryButtonText" xml:space="preserve">
     <value>Annuler</value>
   </data>
-  <data name="UnsafeUrlConfirmText" xml:space="preserve">
-    <value>Ce lien peut entraîner un emplacement non sécurisé. Les liens hypertexte peuvent endommager votre ordinateur et vos données. Pour protéger votre ordinateur, cliquez uniquement sur des liens provenant de sources fiables.</value>
-  </data>
-  <data name="UnsafeUrlConfirmAllowAction" xml:space="preserve">
-    <value>Ouvrir quand même</value>
-  </data>
   <data name="SettingsTab" xml:space="preserve">
     <value>Paramètres</value>
   </data>

src/cascadia/TerminalApp/Resources/it-IT/Resources.resw

@@ -669,15 +669,9 @@
   <data name="UnsupportedSchemeText" xml:space="preserve">
     <value>Questo tipo di collegamento non è al momento supportato:</value>
   </data>
-  <data name="UriErrorDialog.CloseButtonText" xml:space="preserve">
+  <data name="CouldNotOpenUriDialog.PrimaryButtonText" xml:space="preserve">
     <value>Annulla</value>
   </data>
-  <data name="UnsafeUrlConfirmText" xml:space="preserve">
-    <value>Questo collegamento potrebbe causare un percorso non sicuro. I collegamenti ipertestuali possono essere dannosi per il computer e i dati. Per proteggere il computer, fare clic solo su collegamenti da origini attendibili.</value>
-  </data>
-  <data name="UnsafeUrlConfirmAllowAction" xml:space="preserve">
-    <value>Apri comunque</value>
-  </data>
   <data name="SettingsTab" xml:space="preserve">
     <value>Impostazioni</value>
   </data>

src/cascadia/TerminalApp/Resources/ja-JP/Resources.resw

@@ -670,15 +670,9 @@
   <data name="UnsupportedSchemeText" xml:space="preserve">
     <value>このリンクの種類は現在サポートされていません:</value>
   </data>
-  <data name="UriErrorDialog.CloseButtonText" xml:space="preserve">
+  <data name="CouldNotOpenUriDialog.PrimaryButtonText" xml:space="preserve">
     <value>キャンセル</value>
   </data>
-  <data name="UnsafeUrlConfirmText" xml:space="preserve">
-    <value>このリンクは安全でない可能性があります。ハイパーリンクは、コンピューターやデータに問題を起こす可能性があります。コンピューターを保護するには、信頼できるソースからのリンクのみをクリックしてください。</value>
-  </data>
-  <data name="UnsafeUrlConfirmAllowAction" xml:space="preserve">
-    <value>開く</value>
-  </data>
   <data name="SettingsTab" xml:space="preserve">
     <value>設定</value>
   </data>

src/cascadia/TerminalApp/Resources/ko-KR/Resources.resw

@@ -669,15 +669,9 @@
   <data name="UnsupportedSchemeText" xml:space="preserve">
     <value>이 링크 형식은 현재 지원되지 않습니다.</value>
   </data>
-  <data name="UriErrorDialog.CloseButtonText" xml:space="preserve">
+  <data name="CouldNotOpenUriDialog.PrimaryButtonText" xml:space="preserve">
     <value>취소</value>
   </data>
-  <data name="UnsafeUrlConfirmText" xml:space="preserve">
-    <value>이 링크로 인해 안전하지 않은 위치가 발생할 수 있습니다. 하이퍼링크는 컴퓨터와 데이터를 손상시킬 수 있습니다. 컴퓨터를 보호하려면 신뢰할 수 있는 원본의 링크만 클릭하세요.</value>
-  </data>
-  <data name="UnsafeUrlConfirmAllowAction" xml:space="preserve">
-    <value>열기</value>
-  </data>
   <data name="SettingsTab" xml:space="preserve">
     <value>설정</value>
   </data>

src/cascadia/TerminalApp/Resources/pt-BR/Resources.resw

@@ -669,15 +669,9 @@
   <data name="UnsupportedSchemeText" xml:space="preserve">
     <value>Não há suporte para este tipo de link no momento:</value>
   </data>
-  <data name="UriErrorDialog.CloseButtonText" xml:space="preserve">
+  <data name="CouldNotOpenUriDialog.PrimaryButtonText" xml:space="preserve">
     <value>Cancelar</value>
   </data>
-  <data name="UnsafeUrlConfirmText" xml:space="preserve">
-    <value>Este link pode levar a um local não seguro. Hiperlinks podem ser prejudiciais ao computador e aos dados. Para proteger o computador, clique somente em links de fontes confiáveis.</value>
-  </data>
-  <data name="UnsafeUrlConfirmAllowAction" xml:space="preserve">
-    <value>Abrir mesmo assim</value>
-  </data>
   <data name="SettingsTab" xml:space="preserve">
     <value>Configurações</value>
   </data>

src/cascadia/TerminalApp/Resources/qps-ploc/Resources.resw

@@ -669,14 +669,8 @@
   <data name="UnsupportedSchemeText" xml:space="preserve">
     <value>Ťђïś łϊηќ ŧурē ιş çũґѓзⁿτľÿ ñστ şΰρρоŕŧĕđ: !!! !!! !!! !!! </value>
   </data>
-  <data name="UriErrorDialog.CloseButtonText" xml:space="preserve">
-    <value>Çдπсёľ !</value>
-  </data>
-  <data name="UnsafeUrlConfirmText" xml:space="preserve">
-    <value>Ŧђīś ℓîŋќ мαў ľêãδ τб áń úʼnšàƒé ℓоćάŧίоñ. Ĥўрзŗℓĭŋķѕ çâⁿ ъέ ђąřмƒúļ τό ўôця ċómφύŧèґ аňδ ðáťǻ. Ţб ρгøťėçŧ ўòύг ςömφùţĕŕ, ŏŋľỳ čℓΐςķ łίŋκѕ ƒřöм ťŗμѕŧєđ śόυяčêś. !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!!</value>
-  </data>
-  <data name="UnsafeUrlConfirmAllowAction" xml:space="preserve">
-    <value>Őρέй ǻпŷŵãγ !!!</value>
+  <data name="CouldNotOpenUriDialog.PrimaryButtonText" xml:space="preserve">
+    <value>Сąñс℮ł !</value>
   </data>
   <data name="SettingsTab" xml:space="preserve">
     <value>Śëţťĩпğś !!</value>

src/cascadia/TerminalApp/Resources/qps-ploca/Resources.resw

@@ -669,14 +669,8 @@
   <data name="UnsupportedSchemeText" xml:space="preserve">
     <value>Ťђïś łϊηќ ŧурē ιş çũґѓзⁿτľÿ ñστ şΰρρоŕŧĕđ: !!! !!! !!! !!! </value>
   </data>
-  <data name="UriErrorDialog.CloseButtonText" xml:space="preserve">
-    <value>Çдπсёľ !</value>
-  </data>
-  <data name="UnsafeUrlConfirmText" xml:space="preserve">
-    <value>Ŧђīś ℓîŋќ мαў ľêãδ τб áń úʼnšàƒé ℓоćάŧίоñ. Ĥўрзŗℓĭŋķѕ çâⁿ ъέ ђąřмƒúļ τό ўôця ċómφύŧèґ аňδ ðáťǻ. Ţб ρгøťėçŧ ўòύг ςömφùţĕŕ, ŏŋľỳ čℓΐςķ łίŋκѕ ƒřöм ťŗμѕŧєđ śόυяčêś. !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!!</value>
-  </data>
-  <data name="UnsafeUrlConfirmAllowAction" xml:space="preserve">
-    <value>Őρέй ǻпŷŵãγ !!!</value>
+  <data name="CouldNotOpenUriDialog.PrimaryButtonText" xml:space="preserve">
+    <value>Сąñс℮ł !</value>
   </data>
   <data name="SettingsTab" xml:space="preserve">
     <value>Śëţťĩпğś !!</value>

src/cascadia/TerminalApp/Resources/qps-plocm/Resources.resw

@@ -669,14 +669,8 @@
   <data name="UnsupportedSchemeText" xml:space="preserve">
     <value>Ťђïś łϊηќ ŧурē ιş çũґѓзⁿτľÿ ñστ şΰρρоŕŧĕđ: !!! !!! !!! !!! </value>
   </data>
-  <data name="UriErrorDialog.CloseButtonText" xml:space="preserve">
-    <value>Çдπсёľ !</value>
-  </data>
-  <data name="UnsafeUrlConfirmText" xml:space="preserve">
-    <value>Ŧђīś ℓîŋќ мαў ľêãδ τб áń úʼnšàƒé ℓоćάŧίоñ. Ĥўрзŗℓĭŋķѕ çâⁿ ъέ ђąřмƒúļ τό ўôця ċómφύŧèґ аňδ ðáťǻ. Ţб ρгøťėçŧ ўòύг ςömφùţĕŕ, ŏŋľỳ čℓΐςķ łίŋκѕ ƒřöм ťŗμѕŧєđ śόυяčêś. !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!!</value>
-  </data>
-  <data name="UnsafeUrlConfirmAllowAction" xml:space="preserve">
-    <value>Őρέй ǻпŷŵãγ !!!</value>
+  <data name="CouldNotOpenUriDialog.PrimaryButtonText" xml:space="preserve">
+    <value>Сąñс℮ł !</value>
   </data>
   <data name="SettingsTab" xml:space="preserve">
     <value>Śëţťĩпğś !!</value>

src/cascadia/TerminalApp/Resources/ru-RU/Resources.resw

@@ -669,15 +669,9 @@
   <data name="UnsupportedSchemeText" xml:space="preserve">
     <value>Этот тип связи в настоящее время не поддерживается:</value>
   </data>
-  <data name="UriErrorDialog.CloseButtonText" xml:space="preserve">
+  <data name="CouldNotOpenUriDialog.PrimaryButtonText" xml:space="preserve">
     <value>Отмена</value>
   </data>
-  <data name="UnsafeUrlConfirmText" xml:space="preserve">
-    <value>Эта ссылка может привести к небезопасному расположению. Гиперссылки могут нанести вред компьютеру и данным. Чтобы защитить компьютер, щелкните ссылки только из надежных источников.</value>
-  </data>
-  <data name="UnsafeUrlConfirmAllowAction" xml:space="preserve">
-    <value>Все равно открыть</value>
-  </data>
   <data name="SettingsTab" xml:space="preserve">
     <value>Параметры</value>
   </data>

src/cascadia/TerminalApp/Resources/sr-Cyrl-RS/ContextMenu.resw

@@ -121,6 +121,10 @@
     <value>Терминал</value>
     <comment>{Locked=qps-ploc,qps-ploca,qps-plocm}</comment>
   </data>
+  <data name="AppNameDev" xml:space="preserve">
+    <value>Терминал Dev</value>
+    <comment>{Locked} The dev build will never be seen in multiple languages</comment>
+  </data>
   <data name="AppNameCan" xml:space="preserve">
     <value>Терминал Канаринац</value>
     <comment>{Locked=qps-ploc,qps-ploca,qps-plocm}</comment>
@@ -133,6 +137,10 @@
     <value>Windows терминал</value>
     <comment>{Locked=qps-ploc,qps-ploca,qps-plocm}</comment>
   </data>
+  <data name="AppStoreNameDev" xml:space="preserve">
+    <value>Windows Терминал Dev</value>
+    <comment>{Locked} The dev build will never be seen in multiple languages</comment>
+  </data>
   <data name="AppStoreNameCan" xml:space="preserve">
     <value>Windows терминал Канаринац</value>
     <comment>{Locked=qps-ploc,qps-ploca,qps-plocm}. "Canary" in this context means an unstable or nightly build of a software product, not the bird.</comment>
@@ -145,6 +153,10 @@
     <value>Терминал</value>
     <comment>{Locked=qps-ploc,qps-ploca,qps-plocm}</comment>
   </data>
+  <data name="AppShortNameDev" xml:space="preserve">
+    <value>Терминал Dev</value>
+    <comment>{Locked} The dev build will never be seen in multiple languages</comment>
+  </data>
   <data name="AppShortNameCan" xml:space="preserve">
     <value>Терминал Канаринац</value>
     <comment>{Locked=qps-ploc,qps-ploca,qps-plocm}</comment>
@@ -156,11 +168,23 @@
   <data name="AppDescription" xml:space="preserve">
     <value>Нови Windows терминал</value>
   </data>
+  <data name="AppDescriptionDev" xml:space="preserve">
+    <value>Windows Терминал, али незваничан</value>
+    <comment>{Locked} The dev build will never be seen in multiple languages</comment>
+  </data>
+  <data name="AppDescriptionCan" xml:space="preserve">
+    <value>Windows Терминал (Канаринац изградња)</value>
+    <comment>{Locked}</comment>
+  </data>
   <data name="AppDescriptionPre" xml:space="preserve">
     <value>Windows терминал са прегледом предстојећих функција</value>
   </data>
+  <data name="ShellExtension_OpenInTerminalMenuItem_Dev" xml:space="preserve">
+    <value>Отвори у Терминалу (&amp;Dev)</value>
+    <comment>{Locked} The dev build will never be seen in multiple languages</comment>
+  </data>
   <data name="ShellExtension_OpenInTerminalMenuItem_Canary" xml:space="preserve">
-    <value>Отвори у терминалу(&amp;Канаринац)</value>
+    <value>Отвори у терминалу (&amp;Канаринац)</value>
     <comment>This is a menu item that will be displayed in the Windows File Explorer that launches the Canary version of Windows Terminal. Please mark one of the characters to be an accelerator key.</comment>
   </data>
   <data name="ShellExtension_OpenInTerminalMenuItem_Preview" xml:space="preserve">
@@ -171,4 +195,4 @@
     <value>Отвори у апликацији &amp;Windows терминал</value>
     <comment>This is a menu item that will be displayed in the Windows File Explorer that launches the non-preview version of Windows Terminal. Please mark one of the characters to be an accelerator key.</comment>
   </data>
-</root>
+</root>

src/cascadia/TerminalApp/Resources/zh-CN/Resources.resw

@@ -669,15 +669,9 @@
   <data name="UnsupportedSchemeText" xml:space="preserve">
     <value>当前不支持此链接类型：</value>
   </data>
-  <data name="UriErrorDialog.CloseButtonText" xml:space="preserve">
+  <data name="CouldNotOpenUriDialog.PrimaryButtonText" xml:space="preserve">
     <value>取消</value>
   </data>
-  <data name="UnsafeUrlConfirmText" xml:space="preserve">
-    <value>此链接可能会导致不安全的位置。超链接可能对你的计算机和数据有害。若要保护你的计算机，请仅单击来自受信任源的链接。</value>
-  </data>
-  <data name="UnsafeUrlConfirmAllowAction" xml:space="preserve">
-    <value>仍然打开</value>
-  </data>
   <data name="SettingsTab" xml:space="preserve">
     <value>设置</value>
   </data>

src/cascadia/TerminalApp/Resources/zh-TW/Resources.resw

@@ -669,15 +669,9 @@
   <data name="UnsupportedSchemeText" xml:space="preserve">
     <value>目前不支援此連結類型:</value>
   </data>
-  <data name="UriErrorDialog.CloseButtonText" xml:space="preserve">
+  <data name="CouldNotOpenUriDialog.PrimaryButtonText" xml:space="preserve">
     <value>取消</value>
   </data>
-  <data name="UnsafeUrlConfirmText" xml:space="preserve">
-    <value>此連結可能通往不安全地點。超連結可能對你的電腦和資料造成傷害。為了保護你的電腦，只點擊來自可信來源的連結。</value>
-  </data>
-  <data name="UnsafeUrlConfirmAllowAction" xml:space="preserve">
-    <value>一律開啟</value>
-  </data>
   <data name="SettingsTab" xml:space="preserve">
     <value>設定</value>
   </data>

src/cascadia/TerminalApp/SettingsPaneContent.cpp

@@ -19,7 +19,7 @@ namespace winrt::TerminalApp::implementation
 
         // Stash away the current requested theme of the app. We'll need that in
         // _BackgroundBrush() to do a theme-aware resource lookup
-        _requestedTheme = settings.GlobalSettings().CurrentTheme(settings.WindowSettingsDefaults()).RequestedTheme();
+        _requestedTheme = settings.GlobalSettings().CurrentTheme().RequestedTheme();
     }
 
     void SettingsPaneContent::UpdateSettings(const CascadiaSettings& settings)
@@ -27,7 +27,7 @@ namespace winrt::TerminalApp::implementation
         ASSERT_UI_THREAD();
         _sui.UpdateSettings(settings);
 
-        _requestedTheme = settings.GlobalSettings().CurrentTheme(settings.WindowSettingsDefaults()).RequestedTheme();
+        _requestedTheme = settings.GlobalSettings().CurrentTheme().RequestedTheme();
     }
 
     winrt::Windows::UI::Xaml::FrameworkElement SettingsPaneContent::GetRoot()

src/cascadia/TerminalApp/SnippetsPaneContent.cpp

@@ -121,7 +121,7 @@ namespace winrt::TerminalApp::implementation
     {
         static const auto key = winrt::box_value(L"SettingsUiTabBrush");
         return ThemeLookup(WUX::Application::Current().Resources(),
-                           _settings.GlobalSettings().CurrentTheme(_settings.WindowSettingsDefaults()).RequestedTheme(),
+                           _settings.GlobalSettings().CurrentTheme().RequestedTheme(),
                            key)
             .try_as<winrt::WUX::Media::Brush>();
     }

src/cascadia/TerminalApp/Tab.cpp

@@ -173,7 +173,7 @@ namespace winrt::TerminalApp::implementation
             // Make sure to try/catch this, because the LocalTests won't be
             // able to use this helper.
             const auto settings{ winrt::TerminalApp::implementation::AppLogic::CurrentAppSettings() };
-            if (settings.WindowSettingsDefaults().TabWidthMode() == winrt::Microsoft::UI::Xaml::Controls::TabViewWidthMode::SizeToContent)
+            if (settings.GlobalSettings().TabWidthMode() == winrt::Microsoft::UI::Xaml::Controls::TabViewWidthMode::SizeToContent)
             {
                 _headerControl.RenamerMaxWidth(HeaderRenameBoxWidthTitleLength);
             }
@@ -1114,7 +1114,7 @@ namespace winrt::TerminalApp::implementation
             [dispatcher, weakThis](auto&&, auto&&) -> safe_void_coroutine {
                 const auto weakThisCopy = weakThis;
                 co_await wil::resume_foreground(dispatcher);
-                if (auto tab{ weakThisCopy.get() })
+                if (auto tab{ weakThis.get() })
                 {
                     tab->_RecalculateAndApplyReadOnly();
                 }

src/cascadia/TerminalApp/TabManagement.cpp

@@ -66,14 +66,14 @@ namespace winrt::TerminalApp::implementation
     {
         if (const auto& newTerminalArgs{ newContentArgs.try_as<NewTerminalArgs>() })
         {
-            const auto profile{ _settings.GetProfileForArgs(newTerminalArgs, _currentWindowSettings()) };
+            const auto profile{ _settings.GetProfileForArgs(newTerminalArgs) };
             // GH#11114: GetProfileForArgs can return null if the index is higher
             // than the number of available profiles.
             if (!profile)
             {
                 return S_FALSE;
             }
-            const auto settings{ Settings::TerminalSettings::CreateWithNewTerminalArgs(_settings, newTerminalArgs, _currentWindowSettings()) };
+            const auto settings{ Settings::TerminalSettings::CreateWithNewTerminalArgs(_settings, newTerminalArgs) };
 
             // Try to handle auto-elevation
             if (_maybeElevate(newTerminalArgs, settings, profile))
@@ -105,7 +105,7 @@ namespace winrt::TerminalApp::implementation
         if (insertPosition == -1)
         {
             insertPosition = _tabs.Size();
-            if (_currentWindowSettings().NewTabPosition() == NewTabPosition::AfterCurrentTab)
+            if (_settings.GlobalSettings().NewTabPosition() == NewTabPosition::AfterCurrentTab)
             {
                 auto currentTabIndex = _GetFocusedTabIndex();
                 if (currentTabIndex.has_value())
@@ -220,7 +220,7 @@ namespace winrt::TerminalApp::implementation
         if (const auto content{ tab.GetActiveContent() })
         {
             const auto& icon{ content.Icon() };
-            const auto theme = _settings.GlobalSettings().CurrentTheme(_currentWindowSettings());
+            const auto theme = _settings.GlobalSettings().CurrentTheme();
             const auto iconStyle = (theme && theme.Tab()) ? theme.Tab().IconStyle() : IconStyle::Default;
 
             tab.UpdateIcon(icon, iconStyle);
@@ -231,7 +231,7 @@ namespace winrt::TerminalApp::implementation
     // - Handle changes to the tab width set by the user
     void TerminalPage::_UpdateTabWidthMode()
     {
-        _tabView.TabWidthMode(_currentWindowSettings().TabWidthMode());
+        _tabView.TabWidthMode(_settings.GlobalSettings().TabWidthMode());
     }
 
     // Method Description:
@@ -244,9 +244,9 @@ namespace winrt::TerminalApp::implementation
         // - there is more than one tab, or the user has chosen to always show tabs
         const auto isVisible = !_isInFocusMode &&
                                (!_isFullscreen || _showTabsFullscreen) &&
-                               (_currentWindowSettings().ShowTabsInTitlebar() ||
+                               (_settings.GlobalSettings().ShowTabsInTitlebar() ||
                                 (_tabs.Size() > 1) ||
-                                _currentWindowSettings().AlwaysShowTabs());
+                                _settings.GlobalSettings().AlwaysShowTabs());
 
         if (_tabView)
         {
@@ -286,7 +286,7 @@ namespace winrt::TerminalApp::implementation
             // current control's live settings (which will include changes
             // made through VT).
             uint32_t insertPosition = _tabs.Size();
-            if (_currentWindowSettings().NewTabPosition() == NewTabPosition::AfterCurrentTab)
+            if (_settings.GlobalSettings().NewTabPosition() == NewTabPosition::AfterCurrentTab)
             {
                 insertPosition = tab.TabViewIndex() + 1;
             }
@@ -477,7 +477,7 @@ namespace winrt::TerminalApp::implementation
             // 1. We want to customize this behavior (e.g., use MRU logic)
             // 2. In fullscreen (GH#5799) and focus (GH#7916) modes the _OnTabItemsChanged is not fired
             // 3. When rearranging tabs (GH#7916) _OnTabItemsChanged is suppressed
-            const auto tabSwitchMode = _currentWindowSettings().TabSwitcherMode();
+            const auto tabSwitchMode = _settings.GlobalSettings().TabSwitcherMode();
 
             if (tabSwitchMode == TabSwitcherMode::MostRecentlyUsed)
             {
@@ -528,7 +528,7 @@ namespace winrt::TerminalApp::implementation
     void TerminalPage::_SelectNextTab(const bool bMoveRight, const Windows::Foundation::IReference<Microsoft::Terminal::Settings::Model::TabSwitcherMode>& customTabSwitcherMode)
     {
         const auto index{ _GetFocusedTabIndex().value_or(0) };
-        const auto tabSwitchMode = customTabSwitcherMode ? customTabSwitcherMode.Value() : _currentWindowSettings().TabSwitcherMode();
+        const auto tabSwitchMode = customTabSwitcherMode ? customTabSwitcherMode.Value() : _settings.GlobalSettings().TabSwitcherMode();
         if (tabSwitchMode == TabSwitcherMode::Disabled)
         {
             auto tabCount = _tabs.Size();
@@ -1017,7 +1017,7 @@ namespace winrt::TerminalApp::implementation
 
     void TerminalPage::_UpdateBackground(const winrt::Microsoft::Terminal::Settings::Model::Profile& profile)
     {
-        if (profile && _currentWindowSettings().UseBackgroundImageForWindow())
+        if (profile && _settings.GlobalSettings().UseBackgroundImageForWindow())
         {
             _SetBackgroundImage(profile.DefaultAppearance());
         }

src/cascadia/TerminalApp/TerminalPage.cpp

@@ -38,6 +38,7 @@ using namespace winrt::Microsoft::Terminal;
 using namespace winrt::Windows::ApplicationModel::DataTransfer;
 using namespace winrt::Windows::Foundation::Collections;
 using namespace winrt::Windows::System;
+using namespace winrt::Windows::System;
 using namespace winrt::Windows::UI;
 using namespace winrt::Windows::UI::Core;
 using namespace winrt::Windows::UI::Text;
@@ -226,11 +227,6 @@ namespace winrt::TerminalApp::implementation
         _WindowProperties.PropertyChanged({ get_weak(), &TerminalPage::_windowPropertyChanged });
     }
 
-    winrt::Microsoft::Terminal::Settings::Model::WindowSettings TerminalPage::_currentWindowSettings() const
-    {
-        return _settings.WindowSettings(_WindowProperties.WindowName());
-    }
-
     // Method Description:
     // - implements the IInitializeWithWindow interface from shobjidl_core.
     // - We're going to use this HWND as the owner for the ConPTY windows, via
@@ -273,19 +269,12 @@ namespace winrt::TerminalApp::implementation
     void TerminalPage::SetSettings(CascadiaSettings settings, bool needRefreshUI)
     {
         assert(Dispatcher().HasThreadAccess());
-
-        // IMPORTANT: we must assign _settings FIRST, because many downstream
-        // helpers (e.g. _currentWindowSettings()) dereference it.  On the very
-        // first call _settings is nullptr, so any access before this line would
-        // crash.
-        const auto firstLoad = _settings == nullptr;
-        _settings = settings;
-
-        if (firstLoad)
+        if (_settings == nullptr)
         {
             // Create this only on the first time we load the settings.
-            _terminalSettingsCache = std::make_shared<TerminalSettingsCache>(settings, _currentWindowSettings());
+            _terminalSettingsCache = std::make_shared<TerminalSettingsCache>(settings);
         }
+        _settings = settings;
 
         // Make sure to call SetCommands before _RefreshUIForSettingsReload.
         // SetCommands will make sure the KeyChordText of Commands is updated, which needs
@@ -347,7 +336,7 @@ namespace winrt::TerminalApp::implementation
         auto tabRowImpl = winrt::get_self<implementation::TabRowControl>(_tabRow);
         _newTabButton = tabRowImpl->NewTabButton();
 
-        if (_currentWindowSettings().ShowTabsInTitlebar())
+        if (_settings.GlobalSettings().ShowTabsInTitlebar())
         {
             // Remove the TabView from the page. We'll hang on to it, we need to
             // put it in the titlebar.
@@ -382,7 +371,7 @@ namespace winrt::TerminalApp::implementation
 
         // Initialize the state of the CloseButtonOverlayMode property of
         // our TabView, to match the tab.showCloseButton property in the theme.
-        if (const auto theme = _settings.GlobalSettings().CurrentTheme(_currentWindowSettings()))
+        if (const auto theme = _settings.GlobalSettings().CurrentTheme())
         {
             const auto visibility = theme.Tab() ? theme.Tab().ShowCloseButton() : Settings::Model::TabCloseButtonVisibility::Always;
 
@@ -437,7 +426,7 @@ namespace winrt::TerminalApp::implementation
         // Settings AllowDependentAnimations will affect whether animations are
         // enabled application-wide, so we don't need to check it each time we
         // want to create an animation.
-        WUX::Media::Animation::Timeline::AllowDependentAnimations(!_currentWindowSettings().DisableAnimations());
+        WUX::Media::Animation::Timeline::AllowDependentAnimations(!_settings.GlobalSettings().DisableAnimations());
 
         // Once the page is actually laid out on the screen, trigger all our
         // startup actions. Things like Panes need to know at least how big the
@@ -446,14 +435,14 @@ namespace winrt::TerminalApp::implementation
         // _OnFirstLayout will remove this handler so it doesn't get called more than once.
         _layoutUpdatedRevoker = _tabContent.LayoutUpdated(winrt::auto_revoke, { this, &TerminalPage::_OnFirstLayout });
 
-        _isAlwaysOnTop = _currentWindowSettings().AlwaysOnTop();
-        _showTabsFullscreen = _currentWindowSettings().ShowTabsFullscreen();
+        _isAlwaysOnTop = _settings.GlobalSettings().AlwaysOnTop();
+        _showTabsFullscreen = _settings.GlobalSettings().ShowTabsFullscreen();
 
         // DON'T set up Toasts/TeachingTips here. They should be loaded and
         // initialized the first time they're opened, in whatever method opens
         // them.
 
-        _tabRow.ShowElevationShield(IsRunningElevated() && _currentWindowSettings().ShowAdminShield());
+        _tabRow.ShowElevationShield(IsRunningElevated() && _settings.GlobalSettings().ShowAdminShield());
 
         _adjustProcessPriorityThrottled = std::make_shared<ThrottledFunc<>>(
             DispatcherQueue::GetForCurrentThread(),
@@ -532,7 +521,7 @@ namespace winrt::TerminalApp::implementation
 
             // It's possible that newTerminalArgs is null here.
             // GetProfileForArgs should be resilient to that.
-            const auto profile{ settings.GetProfileForArgs(newTerminalArgs, settings.WindowSettingsDefaults()) };
+            const auto profile{ settings.GetProfileForArgs(newTerminalArgs) };
             if (profile.Elevate())
             {
                 continue;
@@ -963,7 +952,7 @@ namespace winrt::TerminalApp::implementation
         // Create profile entries from the NewTabMenu configuration using a
         // recursive helper function. This returns a std::vector of FlyoutItemBases,
         // that we then add to our Flyout.
-        auto entries = _currentWindowSettings().NewTabMenu();
+        auto entries = _settings.GlobalSettings().NewTabMenu();
         auto items = _CreateNewTabFlyoutItems(entries);
         for (const auto& item : items)
         {
@@ -1245,7 +1234,7 @@ namespace winrt::TerminalApp::implementation
             profileMenuItem.Icon(icon);
         }
 
-        if (profile.Guid() == _currentWindowSettings().DefaultProfile())
+        if (profile.Guid() == _settings.GlobalSettings().DefaultProfile())
         {
             // Contrast the default profile with others in font weight.
             profileMenuItem.FontWeight(FontWeights::Bold());
@@ -1411,7 +1400,7 @@ namespace winrt::TerminalApp::implementation
             if (newTerminalArgs.ProfileIndex() != nullptr)
             {
                 // We want to promote the index to a GUID because there is no "launch to profile index" command.
-                const auto profile = _settings.GetProfileForArgs(newTerminalArgs, _currentWindowSettings());
+                const auto profile = _settings.GetProfileForArgs(newTerminalArgs);
                 if (profile)
                 {
                     newTerminalArgs.Profile(::Microsoft::Console::Utils::GuidToString(profile.Guid()));
@@ -1482,7 +1471,7 @@ namespace winrt::TerminalApp::implementation
                                                                                         const bool inheritCursor)
     {
         static const auto textMeasurement = [&]() -> std::wstring_view {
-            switch (_currentWindowSettings().TextMeasurement())
+            switch (_settings.GlobalSettings().TextMeasurement())
             {
             case TextMeasurement::Graphemes:
                 return L"graphemes";
@@ -1494,9 +1483,6 @@ namespace winrt::TerminalApp::implementation
                 return {};
             }
         }();
-        static const auto ambiguousIsWide = [&]() -> bool {
-            return _settings.GlobalSettings().AmbiguousWidth() == AmbiguousWidth::Wide;
-        }();
 
         TerminalConnection::ITerminalConnection connection{ nullptr };
 
@@ -1562,10 +1548,6 @@ namespace winrt::TerminalApp::implementation
         {
             valueSet.Insert(L"textMeasurement", Windows::Foundation::PropertyValue::CreateString(textMeasurement));
         }
-        if (ambiguousIsWide)
-        {
-            valueSet.Insert(L"ambiguousIsWide", Windows::Foundation::PropertyValue::CreateBoolean(true));
-        }
 
         if (const auto id = settings.SessionId(); id != winrt::guid{})
         {
@@ -1608,11 +1590,12 @@ namespace winrt::TerminalApp::implementation
         {
             // TODO GH#5047 If we cache the NewTerminalArgs, we no longer need to do this.
             profile = GetClosestProfileForDuplicationOfProfile(profile);
-            controlSettings = Settings::TerminalSettings::CreateWithProfile(_settings, profile, _currentWindowSettings());
+            controlSettings = Settings::TerminalSettings::CreateWithProfile(_settings, profile);
 
             // Replace the Starting directory with the CWD, if given
             const auto workingDirectory = control.WorkingDirectory();
-            if (Utils::IsValidDirectory(workingDirectory.c_str()))
+            const auto validWorkingDirectory = !workingDirectory.empty();
+            if (validWorkingDirectory)
             {
                 controlSettings.DefaultSettings()->StartingDirectory(workingDirectory);
             }
@@ -2324,7 +2307,7 @@ namespace winrt::TerminalApp::implementation
     safe_void_coroutine TerminalPage::CloseWindow()
     {
         if (_HasMultipleTabs() &&
-            _currentWindowSettings().ConfirmCloseAllTabs() &&
+            _settings.GlobalSettings().ConfirmCloseAllTabs() &&
             !_displayingCloseDialog)
         {
             if (_newTabButton && _newTabButton.Flyout())
@@ -2849,7 +2832,7 @@ namespace winrt::TerminalApp::implementation
     // - the title of the focused control if there is one, else "Terminal"
     hstring TerminalPage::Title()
     {
-        if (_currentWindowSettings().ShowTitleInTitlebar())
+        if (_settings.GlobalSettings().ShowTitleInTitlebar())
         {
             if (const auto tab{ _GetFocusedTab() })
             {
@@ -2938,7 +2921,7 @@ namespace winrt::TerminalApp::implementation
     // - See Pane::CalcSnappedDimension
     float TerminalPage::CalcSnappedDimension(const bool widthOrHeight, const float dimension) const
     {
-        if (_settings && _currentWindowSettings().SnapToGridOnResize())
+        if (_settings && _settings.GlobalSettings().SnapToGridOnResize())
         {
             if (const auto tabImpl{ _GetFocusedTabImpl() })
             {
@@ -2959,16 +2942,15 @@ namespace winrt::TerminalApp::implementation
     // - Does some of this in a background thread, as to not hang/crash the UI thread.
     // Arguments:
     // - eventArgs: the PasteFromClipboard event sent from the TermControl
-    safe_void_coroutine TerminalPage::_PasteFromClipboardHandler(const IInspectable sender, const PasteFromClipboardEventArgs eventArgs)
+    safe_void_coroutine TerminalPage::_PasteFromClipboardHandler(const IInspectable /*sender*/, const PasteFromClipboardEventArgs eventArgs)
     try
     {
         // The old Win32 clipboard API as used below is somewhere in the order of 300-1000x faster than
         // the WinRT one on average, depending on CPU load. Don't use the WinRT clipboard API if you can.
         const auto weakThis = get_weak();
         const auto dispatcher = Dispatcher();
-        const auto windowSettings = _currentWindowSettings();
+        const auto globalSettings = _settings.GlobalSettings();
         const auto bracketedPaste = eventArgs.BracketedPasteEnabled();
-        const auto sourceId = sender.try_as<ControlInteractivity>().Id();
 
         // GetClipboardData might block for up to 30s for delay-rendered contents.
         co_await winrt::resume_background();
@@ -2979,22 +2961,18 @@ namespace winrt::TerminalApp::implementation
             text = clipboard::read();
         }
 
-        if (!bracketedPaste && windowSettings.TrimPaste())
+        if (!bracketedPaste && globalSettings.TrimPaste())
         {
             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;
         }
 
         bool warnMultiLine = false;
-        switch (windowSettings.WarnAboutMultiLinePaste())
+        switch (globalSettings.WarnAboutMultiLinePaste())
         {
         case WarnAboutMultiLinePaste::Automatic:
             // NOTE that this is unsafe, because a shell that doesn't support bracketed paste
@@ -3017,7 +2995,7 @@ namespace winrt::TerminalApp::implementation
         }
 
         constexpr std::size_t minimumSizeForWarning = 1024 * 5; // 5 KiB
-        const auto warnLargeText = text.size() > minimumSizeForWarning && windowSettings.WarnAboutLargePaste();
+        const auto warnLargeText = text.size() > minimumSizeForWarning && globalSettings.WarnAboutLargePaste();
 
         if (warnMultiLine || warnLargeText)
         {
@@ -3070,69 +3048,22 @@ namespace winrt::TerminalApp::implementation
         // This will end up calling ConptyConnection::WriteInput which calls WriteFile which may block for
         // an indefinite amount of time. Avoid freezes and deadlocks by running this on a background thread.
         assert(!dispatcher.HasThreadAccess());
-        eventArgs.HandleClipboardData(text);
-
-        // GH#18821: If broadcast input is active, paste the same text into all other
-        // panes on the tab. We do this here (rather than re-reading the
-        // clipboard per-pane) so that only one paste warning is shown.
-        co_await wil::resume_foreground(dispatcher);
-        if (const auto strongThis = weakThis.get())
-        {
-            if (const auto& tab{ strongThis->_GetFocusedTabImpl() })
-            {
-                if (tab->TabStatus().IsInputBroadcastActive())
-                {
-                    tab->GetRootPane()->WalkTree([&](auto&& pane) {
-                        if (const auto control = pane->GetTerminalControl())
-                        {
-                            if (control.ContentId() != sourceId && !control.ReadOnly())
-                            {
-                                control.RawWriteString(text);
-                            }
-                        }
-                    });
-                }
-            }
-        }
+        eventArgs.HandleClipboardData(std::move(text));
     }
     CATCH_LOG();
 
-    safe_void_coroutine TerminalPage::_OpenHyperlinkHandler(const IInspectable /*sender*/, const Microsoft::Terminal::Control::OpenHyperlinkEventArgs eventArgs)
+    void TerminalPage::_OpenHyperlinkHandler(const IInspectable /*sender*/, const Microsoft::Terminal::Control::OpenHyperlinkEventArgs eventArgs)
     {
         try
         {
-            auto uriString{ eventArgs.Uri() };
-            auto parsed = winrt::Windows::Foundation::Uri(uriString);
+            auto parsed = winrt::Windows::Foundation::Uri(eventArgs.Uri());
             if (_IsUriSupported(parsed))
             {
-                bool shouldLaunch{ _IsUriConsideredSomewhatSafe(parsed) };
-
-                if (!shouldLaunch)
-                {
-                    if (auto presenter{ _dialogPresenter.get() })
-                    {
-                        // FindName needs to be called first to actually load the xaml object
-                        auto unopenedUriDialog = FindName(L"UriErrorDialog").try_as<WUX::Controls::ContentDialog>();
-
-                        // Insert the reason and the URI
-                        unopenedUriDialog.SecondaryButtonText(RS_(L"UnsafeUrlConfirmAllowAction"));
-                        CouldNotOpenUriReason().Text(RS_(L"UnsafeUrlConfirmText"));
-                        UnopenedUri().Text(uriString);
-
-                        // Show the dialog
-                        auto result = co_await presenter.ShowDialog(unopenedUriDialog);
-                        shouldLaunch = result == ContentDialogResult::Secondary;
-                    }
-                }
-
-                if (shouldLaunch)
-                {
-                    ShellExecuteW(nullptr, L"open", uriString.c_str(), nullptr, nullptr, SW_SHOWNORMAL);
-                }
+                ShellExecute(nullptr, L"open", eventArgs.Uri().c_str(), nullptr, nullptr, SW_SHOWNORMAL);
             }
             else
             {
-                _ShowCouldNotOpenDialog(RS_(L"UnsupportedSchemeText"), uriString);
+                _ShowCouldNotOpenDialog(RS_(L"UnsupportedSchemeText"), eventArgs.Uri());
             }
         }
         catch (...)
@@ -3152,10 +3083,9 @@ namespace winrt::TerminalApp::implementation
         if (auto presenter{ _dialogPresenter.get() })
         {
             // FindName needs to be called first to actually load the xaml object
-            auto unopenedUriDialog = FindName(L"UriErrorDialog").try_as<WUX::Controls::ContentDialog>();
+            auto unopenedUriDialog = FindName(L"CouldNotOpenUriDialog").try_as<WUX::Controls::ContentDialog>();
 
             // Insert the reason and the URI
-            unopenedUriDialog.SecondaryButtonText({});
             CouldNotOpenUriReason().Text(reason);
             UnopenedUri().Text(uri);
 
@@ -3208,30 +3138,6 @@ namespace winrt::TerminalApp::implementation
         return true;
     }
 
-    bool TerminalPage::_IsUriConsideredSomewhatSafe(const winrt::Windows::Foundation::Uri& parsedUri)
-    {
-        if (parsedUri.SchemeName() == L"http" || parsedUri.SchemeName() == L"https")
-        {
-            return true;
-        }
-        if (parsedUri.SchemeName() == L"file")
-        {
-            static const auto pathext{ wil::TryGetEnvironmentVariableW<std::wstring>(L"PATHEXT") };
-            const auto filename = parsedUri.Path();
-            for (const auto& e : til::split_iterator{ std::wstring_view{ pathext }, L';' })
-            {
-                if (til::ends_with_insensitive_ascii(filename, e))
-                {
-                    return false;
-                }
-            }
-
-            return true;
-        }
-
-        return false;
-    }
-
     // Important! Don't take this eventArgs by reference, we need to extend the
     // lifetime of it to the other side of the co_await!
     safe_void_coroutine TerminalPage::_ControlNoticeRaisedHandler(const IInspectable /*sender*/,
@@ -3411,13 +3317,13 @@ namespace winrt::TerminalApp::implementation
     void TerminalPage::_WindowSizeChanged(const IInspectable sender, const Microsoft::Terminal::Control::WindowSizeChangedEventArgs args)
     {
         // Raise if:
-        // - Not in docked mode
+        // - Not in quake mode
         // - Not in fullscreen
         // - Only one tab exists
         // - Only one pane exists
         // else:
         // - Reset conpty to its original size back
-        if (!_currentWindowSettings().DockWindow() && !Fullscreen() &&
+        if (!WindowProperties().IsQuakeWindow() && !Fullscreen() &&
             NumberOfTabs() == 1 && _GetFocusedTabImpl()->GetLeafPaneCount() == 1)
         {
             WindowSizeChanged.raise(*this, args);
@@ -3452,6 +3358,24 @@ namespace winrt::TerminalApp::implementation
     // - Paste text from the Windows Clipboard to the focused terminal
     void TerminalPage::_PasteText()
     {
+        // First, check if we're in broadcast input mode. If so, let's tell all
+        // the controls to paste.
+        if (const auto& tab{ _GetFocusedTabImpl() })
+        {
+            if (tab->TabStatus().IsInputBroadcastActive())
+            {
+                tab->GetRootPane()->WalkTree([](auto&& pane) {
+                    if (auto control = pane->GetTerminalControl())
+                    {
+                        control.PasteTextFromClipboard();
+                    }
+                });
+                return;
+            }
+        }
+
+        // The focused tab wasn't in broadcast mode. No matter. Just ask the
+        // current one to paste.
         if (const auto& control{ _GetActiveControl() })
         {
             control.PasteTextFromClipboard();
@@ -3601,7 +3525,7 @@ namespace winrt::TerminalApp::implementation
         {
             // Don't need to worry about duplicating or anything - we'll
             // serialize the actual profile's GUID along with the content guid.
-            const auto& profile = _settings.GetProfileForArgs(newTerminalArgs, _currentWindowSettings());
+            const auto& profile = _settings.GetProfileForArgs(newTerminalArgs);
             const auto control = _AttachControlToContent(newTerminalArgs.ContentId());
             auto paneContent{ winrt::make<TerminalPaneContent>(profile, _terminalSettingsCache, control) };
             return std::make_shared<Pane>(paneContent);
@@ -3617,9 +3541,10 @@ namespace winrt::TerminalApp::implementation
             {
                 // TODO GH#5047 If we cache the NewTerminalArgs, we no longer need to do this.
                 profile = GetClosestProfileForDuplicationOfProfile(profile);
-                controlSettings = Settings::TerminalSettings::CreateWithProfile(_settings, profile, _currentWindowSettings());
+                controlSettings = Settings::TerminalSettings::CreateWithProfile(_settings, profile);
                 const auto workingDirectory = tabImpl->GetActiveTerminalControl().WorkingDirectory();
-                if (Utils::IsValidDirectory(workingDirectory.c_str()))
+                const auto validWorkingDirectory = !workingDirectory.empty();
+                if (validWorkingDirectory)
                 {
                     controlSettings.DefaultSettings()->StartingDirectory(workingDirectory);
                 }
@@ -3627,8 +3552,8 @@ namespace winrt::TerminalApp::implementation
         }
         if (!profile)
         {
-            profile = _settings.GetProfileForArgs(newTerminalArgs, _currentWindowSettings());
-            controlSettings = Settings::TerminalSettings::CreateWithNewTerminalArgs(_settings, newTerminalArgs, _currentWindowSettings());
+            profile = _settings.GetProfileForArgs(newTerminalArgs);
+            controlSettings = Settings::TerminalSettings::CreateWithNewTerminalArgs(_settings, newTerminalArgs);
         }
 
         // Try to handle auto-elevation
@@ -3805,13 +3730,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();
         }
     }
@@ -3825,7 +3744,7 @@ namespace winrt::TerminalApp::implementation
     // - <none>
     void TerminalPage::_SetBackgroundImage(const winrt::Microsoft::Terminal::Settings::Model::IAppearanceConfig& newAppearance)
     {
-        if (!_currentWindowSettings().UseBackgroundImageForWindow())
+        if (!_settings.GlobalSettings().UseBackgroundImageForWindow())
         {
             _tabContent.Background(nullptr);
             return;
@@ -3896,7 +3815,7 @@ namespace winrt::TerminalApp::implementation
         // updating terminal panes, so that we don't have to build a _new_
         // TerminalSettings for every profile we update - we can just look them
         // up the previous ones we built.
-        _terminalSettingsCache->Reset(_settings, _currentWindowSettings());
+        _terminalSettingsCache->Reset(_settings);
 
         for (const auto& tab : _tabs)
         {
@@ -3934,17 +3853,17 @@ namespace winrt::TerminalApp::implementation
         // Reload the current value of alwaysOnTop from the settings file. This
         // will let the user hot-reload this setting, but any runtime changes to
         // the alwaysOnTop setting will be lost.
-        _isAlwaysOnTop = _currentWindowSettings().AlwaysOnTop();
+        _isAlwaysOnTop = _settings.GlobalSettings().AlwaysOnTop();
         AlwaysOnTopChanged.raise(*this, nullptr);
 
-        _showTabsFullscreen = _currentWindowSettings().ShowTabsFullscreen();
+        _showTabsFullscreen = _settings.GlobalSettings().ShowTabsFullscreen();
 
         // Settings AllowDependentAnimations will affect whether animations are
         // enabled application-wide, so we don't need to check it each time we
         // want to create an animation.
-        WUX::Media::Animation::Timeline::AllowDependentAnimations(!_currentWindowSettings().DisableAnimations());
+        WUX::Media::Animation::Timeline::AllowDependentAnimations(!_settings.GlobalSettings().DisableAnimations());
 
-        _tabRow.ShowElevationShield(IsRunningElevated() && _currentWindowSettings().ShowAdminShield());
+        _tabRow.ShowElevationShield(IsRunningElevated() && _settings.GlobalSettings().ShowAdminShield());
 
         Media::SolidColorBrush transparent{ Windows::UI::Colors::Transparent() };
         _tabView.Background(transparent);
@@ -3965,7 +3884,7 @@ namespace winrt::TerminalApp::implementation
         // our TabView, to match the tab.showCloseButton property in the theme.
         //
         // Also update every tab's individual IsClosable to match the same property.
-        const auto theme = _settings.GlobalSettings().CurrentTheme(_currentWindowSettings());
+        const auto theme = _settings.GlobalSettings().CurrentTheme();
         const auto visibility = (theme && theme.Tab()) ?
                                     theme.Tab().ShowCloseButton() :
                                     Settings::Model::TabCloseButtonVisibility::Always;
@@ -4173,12 +4092,12 @@ namespace winrt::TerminalApp::implementation
     {
         constexpr auto lightnessThreshold = 0.6f;
         // TODO GH#3327: Look at what to do with the tab button when we have XAML theming
-        const auto isBrightColor = ColorFix::GetLightness(color) >= lightnessThreshold;
+        const auto IsBrightColor = ColorFix::GetLightness(color) >= lightnessThreshold;
         const auto isLightAccentColor = ColorFix::GetLightness(accentColor) >= lightnessThreshold;
         const auto hoverColorAdjustment = isLightAccentColor ? -0.05f : 0.05f;
         const auto pressedColorAdjustment = isLightAccentColor ? -0.1f : 0.1f;
 
-        const auto foregroundColor = isBrightColor ? Colors::Black() : Colors::White();
+        const auto foregroundColor = IsBrightColor ? Colors::Black() : Colors::White();
         const auto hoverColor = til::color{ ColorFix::AdjustLightness(accentColor, hoverColorAdjustment) };
         const auto pressedColor = til::color{ ColorFix::AdjustLightness(accentColor, pressedColorAdjustment) };
 
@@ -4579,7 +4498,7 @@ namespace winrt::TerminalApp::implementation
     // - <none>
     void TerminalPage::_UpdateTeachingTipTheme(winrt::Windows::UI::Xaml::FrameworkElement element)
     {
-        auto theme{ _settings.GlobalSettings().CurrentTheme(_currentWindowSettings()) };
+        auto theme{ _settings.GlobalSettings().CurrentTheme() };
         auto requestedTheme{ theme.RequestedTheme() };
         while (element)
         {
@@ -4732,7 +4651,7 @@ namespace winrt::TerminalApp::implementation
     {
         if (profile == _settings.ProfileDefaults())
         {
-            return _settings.FindProfile(_currentWindowSettings().DefaultProfile());
+            return _settings.FindProfile(_settings.GlobalSettings().DefaultProfile());
         }
         return profile;
     }
@@ -4953,7 +4872,7 @@ namespace winrt::TerminalApp::implementation
             return;
         }
 
-        const auto theme = _settings.GlobalSettings().CurrentTheme(_currentWindowSettings());
+        const auto theme = _settings.GlobalSettings().CurrentTheme();
         auto requestedTheme{ theme.RequestedTheme() };
 
         {
@@ -4997,7 +4916,7 @@ namespace winrt::TerminalApp::implementation
                                                             theme.TabRow().UnfocusedBackground()) :
                                               ThemeColor{ nullptr } };
 
-        if (_currentWindowSettings().UseAcrylicInTabRow() && (_activated || _currentWindowSettings().EnableUnfocusedAcrylic()))
+        if (_settings.GlobalSettings().UseAcrylicInTabRow() && (_activated || _settings.GlobalSettings().EnableUnfocusedAcrylic()))
         {
             if (tabRowBg)
             {
@@ -5027,7 +4946,7 @@ namespace winrt::TerminalApp::implementation
             TitlebarBrush(backgroundSolidBrush);
         }
 
-        if (!_currentWindowSettings().ShowTabsInTitlebar())
+        if (!_settings.GlobalSettings().ShowTabsInTitlebar())
         {
             _tabRow.Background(TitlebarBrush());
         }
@@ -5263,7 +5182,7 @@ namespace winrt::TerminalApp::implementation
         // Feature_ShellCompletions::IsEnabled back in _RegisterTerminalEvents
 
         // User must explicitly opt-in on Preview builds
-        if (!_currentWindowSettings().EnableShellCompletionMenu())
+        if (!_settings.GlobalSettings().EnableShellCompletionMenu())
         {
             co_return;
         }

src/cascadia/TerminalApp/TerminalPage.h

@@ -283,8 +283,6 @@ namespace winrt::TerminalApp::implementation
 
         TerminalApp::ContentManager _manager{ nullptr };
 
-        Microsoft::Terminal::Settings::Model::WindowSettings _currentWindowSettings() const;
-
         std::shared_ptr<TerminalSettingsCache> _terminalSettingsCache{};
 
         struct StashedDragData
@@ -424,9 +422,8 @@ namespace winrt::TerminalApp::implementation
         safe_void_coroutine _PasteFromClipboardHandler(const IInspectable sender,
                                                        const Microsoft::Terminal::Control::PasteFromClipboardEventArgs eventArgs);
 
-        safe_void_coroutine _OpenHyperlinkHandler(const IInspectable sender, const Microsoft::Terminal::Control::OpenHyperlinkEventArgs eventArgs);
-        static bool _IsUriSupported(const winrt::Windows::Foundation::Uri& parsedUri);
-        static bool _IsUriConsideredSomewhatSafe(const winrt::Windows::Foundation::Uri& parsedUri);
+        void _OpenHyperlinkHandler(const IInspectable sender, const Microsoft::Terminal::Control::OpenHyperlinkEventArgs eventArgs);
+        bool _IsUriSupported(const winrt::Windows::Foundation::Uri& parsedUri);
 
         void _ShowCouldNotOpenDialog(winrt::hstring reason, winrt::hstring uri);
         bool _CopyText(bool dismissSelection, bool singleLine, bool withControlSequences, Microsoft::Terminal::Control::CopyFormat formats);

src/cascadia/TerminalApp/TerminalPage.idl

@@ -41,6 +41,8 @@ namespace TerminalApp
 
         String VirtualWorkingDirectory { get; set; };
         String VirtualEnvVars { get; set; };
+
+        Boolean IsQuakeWindow();
     };
 
     runtimeclass LaunchPositionRequest

src/cascadia/TerminalApp/TerminalPage.xaml

@@ -144,17 +144,17 @@
             </TextBlock>
         </ContentDialog>
 
-        <ContentDialog x:Name="UriErrorDialog"
-                       x:Uid="UriErrorDialog"
+        <ContentDialog x:Name="CouldNotOpenUriDialog"
+                       x:Uid="CouldNotOpenUriDialog"
                        Grid.Row="2"
                        x:Load="False"
-                       DefaultButton="Close">
+                       DefaultButton="Primary">
             <TextBlock IsTextSelectionEnabled="True"
                        TextWrapping="WrapWholeWords">
                 <TextBlock.ContextFlyout>
                     <mtu:TextMenuFlyout />
                 </TextBlock.ContextFlyout>
-                <Run x:Name="CouldNotOpenUriReason" /> <LineBreak /> <LineBreak />
+                <Run x:Name="CouldNotOpenUriReason" /> <LineBreak />
                 <Run x:Name="UnopenedUri"
                      FontFamily="Cascadia Mono" />
             </TextBlock>

src/cascadia/TerminalApp/TerminalPaneContent.cpp

@@ -102,7 +102,7 @@ namespace winrt::TerminalApp::implementation
 
         args.Profile(::Microsoft::Console::Utils::GuidToString(_profile.Guid()));
         // If we know the user's working directory use it instead of the profile.
-        if (const auto dir = _control.WorkingDirectory(); ::Microsoft::Console::Utils::IsValidDirectory(dir.c_str()))
+        if (const auto dir = _control.WorkingDirectory(); !dir.empty())
         {
             args.StartingDirectory(dir);
         }

src/cascadia/TerminalApp/TerminalSettingsCache.cpp

@@ -18,9 +18,9 @@ namespace winrt::TerminalApp::implementation
         result.UnfocusedSettings().try_as(_unfocusedSettings);
     }
 
-    TerminalSettingsCache::TerminalSettingsCache(const MTSM::CascadiaSettings& settings, const MTSM::WindowSettings& windowSettings)
+    TerminalSettingsCache::TerminalSettingsCache(const MTSM::CascadiaSettings& settings)
     {
-        Reset(settings, windowSettings);
+        Reset(settings);
     }
 
     std::optional<TerminalSettingsPair> TerminalSettingsCache::TryLookup(const MTSM::Profile& profile)
@@ -35,7 +35,7 @@ namespace winrt::TerminalApp::implementation
             auto& pair{ found->second };
             if (!pair.second)
             {
-                pair.second = winrt::Microsoft::Terminal::Settings::TerminalSettings::CreateWithProfile(_settings, pair.first, _windowSettings);
+                pair.second = winrt::Microsoft::Terminal::Settings::TerminalSettings::CreateWithProfile(_settings, pair.first);
             }
             return std::optional{ TerminalSettingsPair{ *pair.second } };
         }
@@ -43,10 +43,9 @@ namespace winrt::TerminalApp::implementation
         return std::nullopt;
     }
 
-    void TerminalSettingsCache::Reset(const MTSM::CascadiaSettings& settings, const MTSM::WindowSettings& windowSettings)
+    void TerminalSettingsCache::Reset(const MTSM::CascadiaSettings& settings)
     {
         _settings = settings;
-        _windowSettings = windowSettings;
 
         // Mapping by GUID isn't _excellent_ because the defaults profile doesn't have a stable GUID; however,
         // when we stabilize its guid this will become fully safe.

src/cascadia/TerminalApp/TerminalSettingsCache.h

@@ -38,13 +38,12 @@ namespace winrt::TerminalApp::implementation
 
     struct TerminalSettingsCache
     {
-        TerminalSettingsCache(const Microsoft::Terminal::Settings::Model::CascadiaSettings& settings, const Microsoft::Terminal::Settings::Model::WindowSettings& windowSettings);
+        TerminalSettingsCache(const Microsoft::Terminal::Settings::Model::CascadiaSettings& settings);
         std::optional<TerminalSettingsPair> TryLookup(const Microsoft::Terminal::Settings::Model::Profile& profile);
-        void Reset(const Microsoft::Terminal::Settings::Model::CascadiaSettings& settings, const Microsoft::Terminal::Settings::Model::WindowSettings& windowSettings);
+        void Reset(const Microsoft::Terminal::Settings::Model::CascadiaSettings& settings);
 
     private:
         Microsoft::Terminal::Settings::Model::CascadiaSettings _settings{ nullptr };
-        Microsoft::Terminal::Settings::Model::WindowSettings _windowSettings{ nullptr };
         std::unordered_map<winrt::guid, std::pair<Microsoft::Terminal::Settings::Model::Profile, std::optional<winrt::Microsoft::Terminal::Settings::TerminalSettingsCreateResult>>> profileGuidSettingsMap;
     };
 }

src/cascadia/TerminalApp/TerminalWindow.cpp

@@ -232,7 +232,7 @@ namespace winrt::TerminalApp::implementation
         // that the window size is _first_ set up as something sensible, so
         // leaving fullscreen returns to a reasonable size.
         const auto launchMode = this->GetLaunchMode();
-        if (WI_IsFlagSet(launchMode, LaunchMode::FocusMode))
+        if (_WindowProperties->IsQuakeWindow() || WI_IsFlagSet(launchMode, LaunchMode::FocusMode))
         {
             _root->SetFocusMode(true);
         }
@@ -244,7 +244,7 @@ namespace winrt::TerminalApp::implementation
             _root->Maximized(true);
         }
 
-        if (WI_IsFlagSet(launchMode, LaunchMode::FullscreenMode))
+        if (WI_IsFlagSet(launchMode, LaunchMode::FullscreenMode) && !_WindowProperties->IsQuakeWindow())
         {
             _root->SetFullscreen(true);
         }
@@ -267,22 +267,22 @@ namespace winrt::TerminalApp::implementation
 
     bool TerminalWindow::GetShowTabsInTitlebar()
     {
-        return _currentWindowSettings().ShowTabsInTitlebar();
+        return _settings.GlobalSettings().ShowTabsInTitlebar();
     }
 
     bool TerminalWindow::GetInitialAlwaysOnTop()
     {
-        return _currentWindowSettings().AlwaysOnTop();
+        return _settings.GlobalSettings().AlwaysOnTop();
     }
 
     bool TerminalWindow::GetInitialShowTabsFullscreen()
     {
-        return _currentWindowSettings().ShowTabsFullscreen();
+        return _settings.GlobalSettings().ShowTabsFullscreen();
     }
 
     bool TerminalWindow::GetMinimizeToNotificationArea()
     {
-        return _currentWindowSettings().MinimizeToNotificationArea();
+        return _settings.GlobalSettings().MinimizeToNotificationArea();
     }
 
     bool TerminalWindow::GetAlwaysShowNotificationIcon()
@@ -292,12 +292,12 @@ namespace winrt::TerminalApp::implementation
 
     bool TerminalWindow::GetShowTitleInTitlebar()
     {
-        return _currentWindowSettings().ShowTitleInTitlebar();
+        return _settings.GlobalSettings().ShowTitleInTitlebar();
     }
 
     Microsoft::Terminal::Settings::Model::Theme TerminalWindow::Theme()
     {
-        return _settings.GlobalSettings().CurrentTheme(_currentWindowSettings());
+        return _settings.GlobalSettings().CurrentTheme();
     }
 
     // WinUI can't show 2 dialogs simultaneously. Yes, really. If you do, you get an exception.
@@ -374,7 +374,7 @@ namespace winrt::TerminalApp::implementation
         auto themingLambda{ [weak](const Windows::Foundation::IInspectable& sender, const RoutedEventArgs&) {
             if (const auto strong = weak.get())
             {
-                auto theme{ strong->_settings.GlobalSettings().CurrentTheme(strong->_currentWindowSettings()) };
+                auto theme{ strong->_settings.GlobalSettings().CurrentTheme() };
                 auto requestedTheme{ theme.RequestedTheme() };
                 auto element{ sender.try_as<winrt::Windows::UI::Xaml::FrameworkElement>() };
                 while (element)
@@ -598,7 +598,7 @@ namespace winrt::TerminalApp::implementation
         // --focusMode on the commandline here, and the mode in the settings.
         // Below, we'll also account for if focus mode was persisted into the
         // session for restoration.
-        bool focusMode = _appArgs && _appArgs->ParsedArgs().GetLaunchMode().value_or(_currentWindowSettings().LaunchMode()) == LaunchMode::FocusMode;
+        bool focusMode = _appArgs && _appArgs->ParsedArgs().GetLaunchMode().value_or(_settings.GlobalSettings().LaunchMode()) == LaunchMode::FocusMode;
 
         const auto scale = static_cast<float>(dpi) / static_cast<float>(USER_DEFAULT_SCREEN_DPI);
         if (const auto layout = LoadPersistedLayout())
@@ -621,7 +621,7 @@ namespace winrt::TerminalApp::implementation
         if ((_appArgs && _appArgs->ParsedArgs().GetSize().has_value()) || (proposedSize.Width == 0 && proposedSize.Height == 0))
         {
             // Use the default profile to determine how big of a window we need.
-            const auto settings{ Settings::TerminalSettings::CreateWithNewTerminalArgs(_settings, nullptr, _currentWindowSettings()) };
+            const auto settings{ Settings::TerminalSettings::CreateWithNewTerminalArgs(_settings, nullptr) };
 
             const til::size emptySize{};
             const auto commandlineSize = _appArgs ? _appArgs->ParsedArgs().GetSize().value_or(emptySize) : til::size{};
@@ -645,7 +645,7 @@ namespace winrt::TerminalApp::implementation
         // GH#2061 - If the global setting "Always show tab bar" is
         // set or if "Show tabs in title bar" is set, then we'll need to add
         // the height of the tab bar here.
-        if (_currentWindowSettings().ShowTabsInTitlebar() && !focusMode)
+        if (_settings.GlobalSettings().ShowTabsInTitlebar() && !focusMode)
         {
             // In the past, we used to actually instantiate a TitlebarControl
             // and use Measure() to determine the DesiredSize of the control, to
@@ -663,7 +663,7 @@ namespace winrt::TerminalApp::implementation
             static constexpr auto titlebarHeight = 40;
             proposedSize.Height += (titlebarHeight)*scale;
         }
-        else if (_currentWindowSettings().AlwaysShowTabs() && !focusMode)
+        else if (_settings.GlobalSettings().AlwaysShowTabs() && !focusMode)
         {
             // Same comment as above, but with a TabRowControl.
             //
@@ -696,7 +696,7 @@ namespace winrt::TerminalApp::implementation
 
         // GH#4620/#5801 - If the user passed --maximized or --fullscreen on the
         // commandline, then use that to override the value from the settings.
-        const auto valueFromSettings = _currentWindowSettings().LaunchMode();
+        const auto valueFromSettings = _settings.GlobalSettings().LaunchMode();
         const auto valueFromCommandlineArgs = _appArgs ? _appArgs->ParsedArgs().GetLaunchMode() : std::nullopt;
         if (const auto layout = LoadPersistedLayout())
         {
@@ -722,7 +722,7 @@ namespace winrt::TerminalApp::implementation
     // - a point containing the requested initial position in pixels.
     TerminalApp::InitialPosition TerminalWindow::GetInitialPosition(int64_t defaultInitialX, int64_t defaultInitialY)
     {
-        auto initialPosition{ _currentWindowSettings().InitialPosition() };
+        auto initialPosition{ _settings.GlobalSettings().InitialPosition() };
 
         if (const auto layout = LoadPersistedLayout())
         {
@@ -770,15 +770,10 @@ namespace winrt::TerminalApp::implementation
 
         return !_contentBounds &&
                !hadPersistedPosition &&
-               _currentWindowSettings().CenterOnLaunch() &&
+               _settings.GlobalSettings().CenterOnLaunch() &&
                (_appArgs && !_appArgs->ParsedArgs().GetPosition().has_value());
     }
 
-    Microsoft::Terminal::Settings::Model::Docking TerminalWindow::Docking()
-    {
-        return _currentWindowSettings().DockWindow();
-    }
-
     // Method Description:
     // - See Pane::CalcSnappedDimension
     float TerminalWindow::CalcSnappedDimension(const bool widthOrHeight, const float dimension) const
@@ -1193,7 +1188,7 @@ namespace winrt::TerminalApp::implementation
 
     bool TerminalWindow::AutoHideWindow()
     {
-        return _currentWindowSettings().AutoHideWindow();
+        return _settings.GlobalSettings().AutoHideWindow();
     }
 
     void TerminalWindow::UpdateSettingsHandler(const winrt::IInspectable& /*sender*/,
@@ -1212,22 +1207,21 @@ namespace winrt::TerminalApp::implementation
 
     void TerminalWindow::WindowName(const winrt::hstring& name)
     {
-        const auto oldName = _WindowProperties->WindowName();
+        const auto oldIsQuakeMode = _WindowProperties->IsQuakeWindow();
         _WindowProperties->WindowName(name);
-        if (!_root || oldName == name)
+        if (!_root)
         {
             return;
         }
-
-        // The window name determines which WindowSettings we use
-        // (via _currentWindowSettings()). Since it changed, refresh
-        // all downstream consumers of per-window settings:
-        //  - TerminalPage (settings cache, tab/pane settings)
-        //  - Theme (may differ per window)
-        //  - Docking & host-level properties (via IsQuakeWindowChanged -> AppHost)
-        _root->SetSettings(_settings, true);
-        _RefreshThemeRoutine();
-        IsQuakeWindowChanged.raise(*this, nullptr);
+        const auto newIsQuakeMode = _WindowProperties->IsQuakeWindow();
+        if (newIsQuakeMode != oldIsQuakeMode)
+        {
+            // If we're entering Quake Mode from ~Focus Mode, then this will enter Focus Mode
+            // If we're entering Quake Mode from Focus Mode, then this will do nothing
+            // If we're leaving Quake Mode (we're already in Focus Mode), then this will do nothing
+            _root->SetFocusMode(true);
+            IsQuakeWindowChanged.raise(*this, nullptr);
+        }
     }
     void TerminalWindow::WindowId(const uint64_t& id)
     {
@@ -1338,13 +1332,13 @@ namespace winrt::TerminalApp::implementation
 
         if (!FocusMode())
         {
-            if (!_currentWindowSettings().AlwaysShowTabs())
+            if (!_settings.GlobalSettings().AlwaysShowTabs())
             {
                 // Hide the title bar = off, Always show tabs = off.
                 static constexpr auto titlebarHeight = 10;
                 pixelSize.Height += (titlebarHeight)*scale;
             }
-            else if (!_currentWindowSettings().ShowTabsInTitlebar())
+            else if (!_settings.GlobalSettings().ShowTabsInTitlebar())
             {
                 // Hide the title bar = off, Always show tabs = on.
                 static constexpr auto titlebarAndTabBarHeight = 40;
@@ -1425,9 +1419,9 @@ namespace winrt::TerminalApp::implementation
         return _WindowName.empty() ? til::hstring_format(FMT_COMPILE(L"<{}>"), RS_(L"UnnamedWindowName")) : _WindowName;
     }
 
-    WindowSettings TerminalWindow::_currentWindowSettings() const
+    bool WindowProperties::IsQuakeWindow() const noexcept
     {
-        return _settings.WindowSettings(_WindowProperties->WindowName());
+        return _WindowName == L"_quake";
     }
 
 };

src/cascadia/TerminalApp/TerminalWindow.h

@@ -44,6 +44,7 @@ namespace winrt::TerminalApp::implementation
         void WindowId(const uint64_t& value);
         winrt::hstring WindowIdForDisplay() const noexcept;
         winrt::hstring WindowNameForDisplay() const noexcept;
+        bool IsQuakeWindow() const noexcept;
 
         til::property_changed_event PropertyChanged;
 
@@ -133,12 +134,12 @@ namespace winrt::TerminalApp::implementation
         void DismissDialog();
 
         Microsoft::Terminal::Settings::Model::Theme Theme();
-        Microsoft::Terminal::Settings::Model::Docking Docking();
         void UpdateSettingsHandler(const winrt::Windows::Foundation::IInspectable& sender, const winrt::TerminalApp::SettingsLoadEventArgs& arg);
 
         void WindowName(const winrt::hstring& value);
         void WindowId(const uint64_t& value);
 
+        bool IsQuakeWindow() const noexcept { return _WindowProperties->IsQuakeWindow(); }
         TerminalApp::WindowProperties WindowProperties() { return *_WindowProperties; }
 
         void AttachContent(winrt::hstring content, uint32_t tabIndex);
@@ -186,8 +187,6 @@ namespace winrt::TerminalApp::implementation
         TerminalApp::ContentManager _manager{ nullptr };
         std::vector<Microsoft::Terminal::Settings::Model::ActionAndArgs> _initialContentArgs;
 
-        Microsoft::Terminal::Settings::Model::WindowSettings _currentWindowSettings() const;
-
         void _ShowLoadErrorsDialog(const winrt::hstring& titleKey,
                                    const winrt::hstring& contentKey,
                                    HRESULT settingsLoadedResult,

src/cascadia/TerminalApp/TerminalWindow.idl

@@ -72,8 +72,6 @@ namespace TerminalApp
         Boolean AlwaysOnTop { get; };
         Boolean AutoHideWindow { get; };
         Boolean ShowTabsFullscreen { get; };
-        Microsoft.Terminal.Settings.Model.Theme Theme { get; };
-        Microsoft.Terminal.Settings.Model.Docking Docking { get; };
 
         void IdentifyWindow();
         void SetPersistedLayoutIdx(UInt32 idx);
@@ -107,6 +105,7 @@ namespace TerminalApp
         WindowProperties WindowProperties { get; };
         void WindowName(String name);
         void WindowId(UInt64 id);
+        Boolean IsQuakeWindow();
 
         // See IDialogPresenter and TerminalPage's DialogPresenter for more
         // information.

src/cascadia/TerminalConnection/ConptyConnection.cpp

@@ -289,11 +289,6 @@ namespace winrt::Microsoft::Terminal::TerminalConnection::implementation
                 }
             }
 
-            if (unbox_prop_or<bool>(settings, L"ambiguousIsWide", false))
-            {
-                _flags |= PSEUDOCONSOLE_AMBIGUOUS_IS_WIDE;
-            }
-
             const auto& initialEnvironment{ unbox_prop_or<winrt::hstring>(settings, L"initialEnvironment", L"") };
             const bool reloadEnvironmentVariables = unbox_prop_or<bool>(settings, L"reloadEnvironmentVariables", false);
 

src/cascadia/TerminalControl/ControlCore.cpp

@@ -85,12 +85,6 @@ namespace winrt::Microsoft::Terminal::Control::implementation
                 break;
             }
             CodepointWidthDetector::Singleton().Reset(mode);
-
-            if (settings.AmbiguousWidth() == AmbiguousWidth::Wide)
-            {
-                CodepointWidthDetector::Singleton().SetAmbiguousWidth(2);
-            }
-
             return true;
         }();
 
@@ -355,12 +349,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)
@@ -2081,10 +2069,7 @@ namespace winrt::Microsoft::Terminal::Control::implementation
         //   the selection (we need to reset selection on double-click or
         //   triple-click, so it captures the word or the line, rather than
         //   extending the selection)
-        // - GH#9608: VT mouse mode is enabled. In this mode, Shift is used
-        //   to override mouse input, so Shift+Click should start a fresh
-        //   selection rather than extending the previous one.
-        if (_terminal->IsSelectionActive() && (!shiftEnabled || isOnOriginalPosition || _terminal->IsTrackingMouseInput()))
+        if (_terminal->IsSelectionActive() && (!shiftEnabled || isOnOriginalPosition))
         {
             // Reset the selection
             _terminal->ClearSelection();
@@ -2426,6 +2411,11 @@ namespace winrt::Microsoft::Terminal::Control::implementation
         return *context;
     }
 
+    winrt::hstring ControlCore::CurrentWorkingDirectory() const
+    {
+        return winrt::hstring{ _terminal->GetWorkingDirectory() };
+    }
+
     bool ControlCore::QuickFixesAvailable() const noexcept
     {
         return _cachedQuickFixes && _cachedQuickFixes.Size() > 0;

src/cascadia/TerminalControl/ControlCore.h

@@ -191,6 +191,8 @@ namespace winrt::Microsoft::Terminal::Control::implementation
 
         void ContextMenuSelectCommand();
         void ContextMenuSelectOutput();
+
+        winrt::hstring CurrentWorkingDirectory() const;
 #pragma endregion
 
 #pragma region ITerminalInput
@@ -255,7 +257,6 @@ namespace winrt::Microsoft::Terminal::Control::implementation
 
         TerminalConnection::ITerminalConnection Connection();
         void Connection(const TerminalConnection::ITerminalConnection& connection);
-        void HardResetWithoutErase();
 
         void AnchorContextMenu(til::point viewportRelativeCharacterPosition);
 

src/cascadia/TerminalControl/ControlCore.idl

@@ -98,7 +98,6 @@ namespace Microsoft.Terminal.Control
         void ApplyAppearance(Boolean focused);
 
         Microsoft.Terminal.TerminalConnection.ITerminalConnection Connection;
-        void HardResetWithoutErase();
 
         IControlSettings Settings { get; };
         IControlAppearance FocusedAppearance { get; };

src/cascadia/TerminalControl/ControlInteractivity.cpp

@@ -54,20 +54,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()
@@ -169,8 +155,6 @@ namespace winrt::Microsoft::Terminal::Control::implementation
 
     void ControlInteractivity::GotFocus()
     {
-        _focused = true;
-
         if (_uiaEngine.get())
         {
             THROW_IF_FAILED(_uiaEngine->Enable());
@@ -183,8 +167,6 @@ namespace winrt::Microsoft::Terminal::Control::implementation
 
     void ControlInteractivity::LostFocus()
     {
-        _focused = false;
-
         if (_uiaEngine.get())
         {
             THROW_IF_FAILED(_uiaEngine->Disable());
@@ -252,8 +234,7 @@ namespace winrt::Microsoft::Terminal::Control::implementation
         PasteFromClipboard.raise(*this, std::move(args));
     }
 
-    void ControlInteractivity::PointerPressed(const uint32_t /*pointerId*/,
-                                              Control::MouseButtonState buttonState,
+    void ControlInteractivity::PointerPressed(Control::MouseButtonState buttonState,
                                               const unsigned int pointerUpdateKind,
                                               const uint64_t timestamp,
                                               const ::Microsoft::Terminal::Core::ControlKeyStates modifiers,
@@ -266,10 +247,6 @@ namespace winrt::Microsoft::Terminal::Control::implementation
         const auto shiftEnabled = modifiers.IsShiftPressed();
         const auto ctrlEnabled = modifiers.IsCtrlPressed();
 
-        // Mark that this pointer event actually started within our bounds.
-        // We'll need this later, for PointerMoved events.
-        _pointerPressedInBounds = true;
-
         // GH#9396: we prioritize hyper-link over VT mouse events
         auto hyperlink = _core->GetHyperlink(terminalPosition.to_core_point());
         if (WI_IsFlagSet(buttonState, MouseButtonState::IsLeftButtonDown) &&
@@ -308,10 +285,8 @@ namespace winrt::Microsoft::Terminal::Control::implementation
             }
             const auto isOnOriginalPosition = _lastMouseClickPosNoSelection == pixelPosition;
 
-            // Rounded coordinates for text selection.
-            // Don't round in VT mouse mode; cell-level precision matters more
-            const auto round = !_core->IsVtMouseModeEnabled();
-            _core->LeftClickOnTerminal(_getTerminalPosition(til::point{ pixelPosition }, round),
+            // Rounded coordinates for text selection
+            _core->LeftClickOnTerminal(_getTerminalPosition(til::point{ pixelPosition }, true),
                                        multiClickMapper,
                                        altEnabled,
                                        shiftEnabled,
@@ -321,15 +296,8 @@ namespace winrt::Microsoft::Terminal::Control::implementation
             if (_core->HasSelection())
             {
                 // GH#9787: if selection is active we don't want to track the touchdown position
-                // so that dragging the mouse will extend the selection rather than starting the new one.
-                // In VT mouse mode, keep tracking the touchdown point so that PointerMoved
-                // can re-anchor the selection based on drag direction (the dx < 0 adjustment).
-                // Without this, dragging left wouldn't include the initially clicked cell
-                // because floored coordinates place the anchor on the cell's left edge.
-                if (!_core->IsVtMouseModeEnabled())
-                {
-                    _singleClickTouchdownPos = std::nullopt;
-                }
+                // so that dragging the mouse will extend the selection rather than starting the new one
+                _singleClickTouchdownPos = std::nullopt;
             }
         }
         else if (WI_IsFlagSet(buttonState, MouseButtonState::IsRightButtonDown))
@@ -346,41 +314,37 @@ 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();
                 }
             }
         }
     }
 
-    void ControlInteractivity::TouchPressed(const Core::Point contactPoint)
+    void ControlInteractivity::TouchPressed(const winrt::Windows::Foundation::Point contactPoint)
     {
         _touchAnchor = contactPoint;
     }
 
-    bool ControlInteractivity::PointerMoved(const uint32_t /*pointerId*/,
-                                            Control::MouseButtonState buttonState,
+    bool ControlInteractivity::PointerMoved(Control::MouseButtonState buttonState,
                                             const unsigned int pointerUpdateKind,
                                             const ::Microsoft::Terminal::Core::ControlKeyStates modifiers,
-                                            const Core::Point pixelPosition)
+                                            const bool focused,
+                                            const Core::Point pixelPosition,
+                                            const bool pointerPressedInBounds)
     {
         const auto terminalPosition = _getTerminalPosition(til::point{ pixelPosition }, false);
         // Returning true from this function indicates that the caller should do no further processing of this movement.
         bool handledCompletely = false;
 
         // Short-circuit isReadOnly check to avoid warning dialog
-        if (_focused && !_core->IsInReadOnlyMode() && _canSendVTMouseInput(modifiers))
+        if (focused && !_core->IsInReadOnlyMode() && _canSendVTMouseInput(modifiers))
         {
             _sendMouseEventHelper(terminalPosition, pointerUpdateKind, modifiers, 0, buttonState);
             handledCompletely = true;
@@ -389,7 +353,7 @@ namespace winrt::Microsoft::Terminal::Control::implementation
         // actually start _in_ the control bounds. Case in point - someone drags
         // a file into the bounds of the control. That shouldn't send the
         // selection into space.
-        else if (_focused && _pointerPressedInBounds && WI_IsFlagSet(buttonState, MouseButtonState::IsLeftButtonDown))
+        else if (focused && pointerPressedInBounds && WI_IsFlagSet(buttonState, MouseButtonState::IsLeftButtonDown))
         {
             if (_singleClickTouchdownPos)
             {
@@ -435,9 +399,10 @@ namespace winrt::Microsoft::Terminal::Control::implementation
         return handledCompletely;
     }
 
-    void ControlInteractivity::TouchMoved(const Core::Point newTouchPoint)
+    void ControlInteractivity::TouchMoved(const winrt::Windows::Foundation::Point newTouchPoint,
+                                          const bool focused)
     {
-        if (_focused &&
+        if (focused &&
             _touchAnchor)
         {
             const auto anchor = _touchAnchor.value();
@@ -471,14 +436,11 @@ namespace winrt::Microsoft::Terminal::Control::implementation
         }
     }
 
-    void ControlInteractivity::PointerReleased(const uint32_t /*pointerId*/,
-                                               Control::MouseButtonState buttonState,
+    void ControlInteractivity::PointerReleased(Control::MouseButtonState buttonState,
                                                const unsigned int pointerUpdateKind,
                                                const ::Microsoft::Terminal::Core::ControlKeyStates modifiers,
                                                const Core::Point pixelPosition)
     {
-        _pointerPressedInBounds = false;
-
         const auto terminalPosition = _getTerminalPosition(til::point{ pixelPosition }, false);
         // Short-circuit isReadOnly check to avoid warning dialog
         if (!_core->IsInReadOnlyMode() && _canSendVTMouseInput(modifiers))
@@ -720,9 +682,7 @@ namespace winrt::Microsoft::Terminal::Control::implementation
     // - cursorPosition: in pixels, relative to the origin of the control
     void ControlInteractivity::SetEndSelectionPoint(const Core::Point pixelPosition)
     {
-        // Don't round in VT mouse mode; cell-level precision matters more
-        const auto round = !_core->IsVtMouseModeEnabled();
-        _core->SetEndSelectionPoint(_getTerminalPosition(til::point{ pixelPosition }, round));
+        _core->SetEndSelectionPoint(_getTerminalPosition(til::point{ pixelPosition }, true));
         _selectionNeedsToBeCopied = true;
     }
 

src/cascadia/TerminalControl/ControlInteractivity.h

@@ -51,23 +51,23 @@ namespace winrt::Microsoft::Terminal::Control::implementation
         ::Microsoft::Console::Render::IRenderData* GetRenderData() const;
 
 #pragma region Input Methods
-        void PointerPressed(const uint32_t pointerId,
-                            Control::MouseButtonState buttonState,
+        void PointerPressed(Control::MouseButtonState buttonState,
                             const unsigned int pointerUpdateKind,
                             const uint64_t timestamp,
                             const ::Microsoft::Terminal::Core::ControlKeyStates modifiers,
                             const Core::Point pixelPosition);
-        void TouchPressed(const Core::Point contactPoint);
+        void TouchPressed(const winrt::Windows::Foundation::Point contactPoint);
 
-        bool PointerMoved(const uint32_t pointerId,
-                          Control::MouseButtonState buttonState,
+        bool PointerMoved(Control::MouseButtonState buttonState,
                           const unsigned int pointerUpdateKind,
                           const ::Microsoft::Terminal::Core::ControlKeyStates modifiers,
-                          const Core::Point pixelPosition);
-        void TouchMoved(const Core::Point newTouchPoint);
+                          const bool focused,
+                          const Core::Point pixelPosition,
+                          const bool pointerPressedInBounds);
+        void TouchMoved(const winrt::Windows::Foundation::Point newTouchPoint,
+                        const bool focused);
 
-        void PointerReleased(const uint32_t pointerId,
-                             Control::MouseButtonState buttonState,
+        void PointerReleased(Control::MouseButtonState buttonState,
                              const unsigned int pointerUpdateKind,
                              const ::Microsoft::Terminal::Core::ControlKeyStates modifiers,
                              const Core::Point pixelPosition);
@@ -115,7 +115,7 @@ namespace winrt::Microsoft::Terminal::Control::implementation
 
         // If this is set, then we assume we are in the middle of panning the
         //      viewport via touch input.
-        std::optional<Core::Point> _touchAnchor;
+        std::optional<winrt::Windows::Foundation::Point> _touchAnchor;
 
         using Timestamp = uint64_t;
 
@@ -142,9 +142,6 @@ namespace winrt::Microsoft::Terminal::Control::implementation
         uint64_t _id;
         static std::atomic<uint64_t> _nextId;
 
-        bool _focused{ false };
-        bool _pointerPressedInBounds{ false };
-
         unsigned int _numberOfClicks(Core::Point clickPos, Timestamp clickTime);
         void _updateSystemParameterSettings() noexcept;
 

src/cascadia/TerminalControl/ControlInteractivity.idl

@@ -36,24 +36,24 @@ namespace Microsoft.Terminal.Control
         void RequestPasteTextFromClipboard();
         void SetEndSelectionPoint(Microsoft.Terminal.Core.Point point);
 
-        void PointerPressed(UInt32 pointerId,
-                            MouseButtonState buttonState,
+        void PointerPressed(MouseButtonState buttonState,
                             UInt32 pointerUpdateKind,
                             UInt64 timestamp,
                             Microsoft.Terminal.Core.ControlKeyStates modifiers,
                             Microsoft.Terminal.Core.Point pixelPosition);
-        void TouchPressed(Microsoft.Terminal.Core.Point contactPoint);
+        void TouchPressed(Windows.Foundation.Point contactPoint);
 
-        Boolean PointerMoved(UInt32 pointerId,
-                             MouseButtonState buttonState,
+        Boolean PointerMoved(MouseButtonState buttonState,
                              UInt32 pointerUpdateKind,
                              Microsoft.Terminal.Core.ControlKeyStates modifiers,
-                             Microsoft.Terminal.Core.Point pixelPosition);
+                             Boolean focused,
+                             Microsoft.Terminal.Core.Point pixelPosition,
+                             Boolean pointerPressedInBounds);
 
-        void TouchMoved(Microsoft.Terminal.Core.Point newTouchPoint);
+        void TouchMoved(Windows.Foundation.Point newTouchPoint,
+                        Boolean focused);
 
-        void PointerReleased(UInt32 pointerId,
-                             MouseButtonState buttonState,
+        void PointerReleased(MouseButtonState buttonState,
                              UInt32 pointerUpdateKind,
                              Microsoft.Terminal.Core.ControlKeyStates modifiers,
                              Microsoft.Terminal.Core.Point pixelPosition);

src/cascadia/TerminalControl/EventArgs.idl

@@ -26,12 +26,6 @@ namespace Microsoft.Terminal.Control
         Console,
     };
 
-    enum AmbiguousWidth
-    {
-        Narrow,
-        Wide,
-    };
-
     enum DefaultInputScope
     {
         Default,

src/cascadia/TerminalControl/IControlSettings.idl

@@ -68,7 +68,6 @@ namespace Microsoft.Terminal.Control
         Boolean DisablePartialInvalidation { get; };
         Boolean SoftwareRendering { get; };
         Microsoft.Terminal.Control.TextMeasurement TextMeasurement { get; };
-        Microsoft.Terminal.Control.AmbiguousWidth AmbiguousWidth { get; };
         Microsoft.Terminal.Control.DefaultInputScope DefaultInputScope { get; };
         Boolean ShowMarks { get; };
         Boolean UseBackgroundImageForWindow { get; };
@@ -76,7 +75,6 @@ namespace Microsoft.Terminal.Control
         Boolean RepositionCursorWithMouse { get; };
 
         PathTranslationStyle PathTranslationStyle { get; };
-        String DragDropDelimiter { get; };
 
         // NOTE! When adding something here, make sure to update ControlProperties.h too!
     };

src/cascadia/TerminalControl/ICoreState.idl

@@ -60,5 +60,7 @@ namespace Microsoft.Terminal.Control
         void SelectOutput(Boolean goUp);
         IVector<ScrollMark> ScrollMarks { get; };
 
+        String CurrentWorkingDirectory { get; };
+
     };
 }

src/cascadia/TerminalControl/InteractivityAutomationPeer.cpp

@@ -49,10 +49,7 @@ namespace winrt::Microsoft::Terminal::Control::implementation
 
     void InteractivityAutomationPeer::ParentProvider(AutomationPeer parentProvider)
     {
-        // LOAD-BEARING: use _parentProvider->ProviderFromPeer(_parentProvider) instead of this->ProviderFromPeer(*this).
-        // Since we split the automation peer into TermControlAutomationPeer and InteractivityAutomationPeer,
-        // using "this" returns null. This can cause issues with some UIA Client scenarios like any navigation in Narrator.
-        _parentProvider = parentProvider ? parentProvider.as<IAutomationPeerProtected>().ProviderFromPeer(parentProvider) : nullptr;
+        _parentProvider = parentProvider;
     }
 
     // Method Description:
@@ -184,11 +181,15 @@ namespace winrt::Microsoft::Terminal::Control::implementation
 
     XamlAutomation::ITextRangeProvider InteractivityAutomationPeer::_CreateXamlUiaTextRange(UIA::ITextRangeProvider* returnVal) const
     {
-        if (!_parentProvider)
+        // LOAD-BEARING: use _parentProvider->ProviderFromPeer(_parentProvider) instead of this->ProviderFromPeer(*this).
+        // Since we split the automation peer into TermControlAutomationPeer and InteractivityAutomationPeer,
+        // using "this" returns null. This can cause issues with some UIA Client scenarios like any navigation in Narrator.
+        const auto parent{ _parentProvider.get() };
+        if (!parent)
         {
             return nullptr;
         }
-        const auto xutr = winrt::make_self<XamlUiaTextRange>(returnVal, _parentProvider);
+        const auto xutr = winrt::make_self<XamlUiaTextRange>(returnVal, parent.as<IAutomationPeerProtected>().ProviderFromPeer(parent));
         return xutr.as<XamlAutomation::ITextRangeProvider>();
     };
 
@@ -200,24 +201,22 @@ namespace winrt::Microsoft::Terminal::Control::implementation
     // - com_array of Xaml Wrapped UiaTextRange (ITextRangeProviders)
     com_array<XamlAutomation::ITextRangeProvider> InteractivityAutomationPeer::WrapArrayOfTextRangeProviders(SAFEARRAY* textRanges)
     {
-        if (!_parentProvider)
-        {
-            return {};
-        }
-
         // transfer ownership of UiaTextRanges to this new vector
         auto providers = SafeArrayToOwningVector<::Microsoft::Terminal::TermControlUiaTextRange>(textRanges);
-        const auto len = gsl::narrow<uint32_t>(providers.size());
-        com_array<XamlAutomation::ITextRangeProvider> result{ len };
+        auto count = gsl::narrow<int>(providers.size());
 
-        for (uint32_t i = 0; i < len; ++i)
+        std::vector<XamlAutomation::ITextRangeProvider> vec;
+        vec.reserve(count);
+        for (auto i = 0; i < count; i++)
         {
             if (auto xutr = _CreateXamlUiaTextRange(providers[i].detach()))
             {
-                result[i] = std::move(xutr);
+                vec.emplace_back(std::move(xutr));
             }
         }
 
+        com_array<XamlAutomation::ITextRangeProvider> result{ vec };
+
         return result;
     }
 }

src/cascadia/TerminalControl/InteractivityAutomationPeer.h

@@ -80,7 +80,7 @@ namespace winrt::Microsoft::Terminal::Control::implementation
 
         ::Microsoft::WRL::ComPtr<::Microsoft::Terminal::TermControlUiaProvider> _uiaProvider;
         winrt::Microsoft::Terminal::Control::implementation::ControlInteractivity* _interactivity;
-        winrt::Windows::UI::Xaml::Automation::Provider::IRawElementProviderSimple _parentProvider{ nullptr };
+        weak_ref<Windows::UI::Xaml::Automation::Peers::AutomationPeer> _parentProvider;
 
         til::rect _controlBounds{};
         til::rect _controlPadding{};

src/cascadia/TerminalControl/InteractivityAutomationPeer.idl

@@ -3,7 +3,7 @@
 namespace Microsoft.Terminal.Control
 {
     [default_interface] runtimeclass InteractivityAutomationPeer :
-        Windows.UI.Xaml.Automation.Peers.FrameworkElementAutomationPeer,
+        Windows.UI.Xaml.Automation.Peers.AutomationPeer,
         Windows.UI.Xaml.Automation.Provider.ITextProvider
     {