wip

.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,14 +67,11 @@ servicebus
 slnt
 stakeholders
 subpage
-subpages
 sustainability
 sxn
 Tencent
 toolset
-Uids
 UEFI
-UIDs
 uiatextrange
 und
 vsdevcmd

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

@@ -256,6 +256,7 @@ conterm
 contsf
 contypes
 conwinuserrefs
+coordnew
 COPYCOLOR
 COPYDATA
 COPYDATASTRUCT
@@ -572,7 +573,6 @@ FGHIJ
 fgidx
 FGs
 FILEDESCRIPTION
-filehops
 FILESUBTYPE
 FILESYSPATH
 FILEW
@@ -622,6 +622,7 @@ fuzzmap
 fuzzwrapper
 fwdecl
 fwe
+fwlink
 fzf
 gci
 gcx
@@ -1773,7 +1774,6 @@ uldash
 uldb
 ULONGLONG
 ulwave
-Unaccess
 Unadvise
 unattend
 UNCPRIORITY

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/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/pgo/Terminal.PGO.props

@@ -9,7 +9,7 @@
 
   <PropertyGroup>
     <!-- Optional, defaults to main.  Name of the branch which will be used for calculating branch point. -->
-    <PGOBranch>release-1.25</PGOBranch>
+    <PGOBranch>main</PGOBranch>
 
     <!-- Mandatory.  Name of the NuGet package which will contain PGO databases for consumption by build system. -->
     <PGOPackageName>Microsoft.Internal.Windows.Terminal.PGODatabase</PGOPackageName>

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,7 +3,7 @@
   <!-- 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>25</VersionMinor>
     <VersionInfoProductName>Windows Terminal</VersionInfoProductName>

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",

dep/vcpkg-overlay-ports/jsoncpp/0001-No-trailing-space-for-BuildStyledStreamWriter.patch

@@ -1,57 +0,0 @@
-From fae5556fd4d4850f948aeabee25ddf0280494725 Mon Sep 17 00:00:00 2001
-From: lizz <lizz@sensetime.com>
-Date: Fri, 10 Apr 2020 23:02:21 +0800
-Subject: [PATCH] No trailing space for BuiltStyledStreamWriter
-
-Signed-off-by: lizz <lizz@sensetime.com>
----
- src/lib_json/json_writer.cpp | 10 +++++++++-
- src/test_lib_json/main.cpp   |  4 ++--
- 2 files changed, 11 insertions(+), 3 deletions(-)
-
-diff --git a/src/lib_json/json_writer.cpp b/src/lib_json/json_writer.cpp
-index ee45c43..e22eb17 100644
---- a/src/lib_json/json_writer.cpp
-+++ b/src/lib_json/json_writer.cpp
-@@ -990,7 +990,15 @@ void BuiltStyledStreamWriter::writeValue(Value const& value) {
-         writeCommentBeforeValue(childValue);
-         writeWithIndent(
-             valueToQuotedStringN(name.data(), name.length(), emitUTF8_));
--        *sout_ << colonSymbol_;
-+        size_t n = colonSymbol_.size();
-+        if ((childValue.type() == objectValue && !childValue.empty()) ||
-+            (childValue.type() == arrayValue && !childValue.empty() &&
-+             ((cs_ == CommentStyle::All) || isMultilineArray(childValue)))) {
-+          // Line-ending colon, so trim any trailing space from it
-+          for (; n && colonSymbol_[n - 1] == ' '; --n)
-+            ;
-+        }
-+        sout_->write(colonSymbol_.data(), n);
-         writeValue(childValue);
-         if (++it == members.end()) {
-           writeCommentAfterValueOnSameLine(childValue);
-diff --git a/src/test_lib_json/main.cpp b/src/test_lib_json/main.cpp
-index 55ab224..28cb043 100644
---- a/src/test_lib_json/main.cpp
-+++ b/src/test_lib_json/main.cpp
-@@ -2533,7 +2533,7 @@ JSONTEST_FIXTURE_LOCAL(StreamWriterTest, writeNumericValue) {
- JSONTEST_FIXTURE_LOCAL(StreamWriterTest, writeArrays) {
-   Json::StreamWriterBuilder writer;
-   const Json::String expected("{\n"
--                              "\t\"property1\" : \n"
-+                              "\t\"property1\" :\n"
-                               "\t[\n"
-                               "\t\t\"value1\",\n"
-                               "\t\t\"value2\"\n"
-@@ -2553,7 +2553,7 @@ JSONTEST_FIXTURE_LOCAL(StreamWriterTest, writeArrays) {
- JSONTEST_FIXTURE_LOCAL(StreamWriterTest, writeNestedObjects) {
-   Json::StreamWriterBuilder writer;
-   const Json::String expected("{\n"
--                              "\t\"object1\" : \n"
-+                              "\t\"object1\" :\n"
-                               "\t{\n"
-                               "\t\t\"bool\" : true,\n"
-                               "\t\t\"nested\" : 123\n"
--- 
-2.52.0.vfs.0.5
-

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

@@ -1,36 +0,0 @@
-vcpkg_from_github(
-    OUT_SOURCE_PATH SOURCE_PATH
-    REPO open-source-parsers/jsoncpp
-    REF "${VERSION}"
-    SHA512 006d81f9f723dcfe875ebc2147449c07c5246bf97dd7b9eee1909decc914b051d6f3f06feb5c3dfa143d28773fb310aabb04a81dc447cc61513309df8eba8b08
-    HEAD_REF master
-    PATCHES
-        0001-No-trailing-space-for-BuildStyledStreamWriter.patch
-)
-
-string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" JSONCPP_STATIC)
-string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" STATIC_CRT)
-
-vcpkg_cmake_configure(
-    SOURCE_PATH "${SOURCE_PATH}"
-    OPTIONS 
-        -DJSONCPP_WITH_CMAKE_PACKAGE=ON
-        -DBUILD_STATIC_LIBS=${JSONCPP_STATIC}
-        -DJSONCPP_STATIC_WINDOWS_RUNTIME=${STATIC_CRT}
-        -DJSONCPP_WITH_PKGCONFIG_SUPPORT=ON
-        -DJSONCPP_WITH_POST_BUILD_UNITTEST=OFF
-        -DJSONCPP_WITH_TESTS=OFF
-        -DJSONCPP_WITH_EXAMPLE=OFF
-        -DBUILD_OBJECT_LIBS=OFF
-)
-
-vcpkg_cmake_install()
-
-vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/jsoncpp)
-
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
-
-vcpkg_copy_pdbs()
-vcpkg_fixup_pkgconfig()
-
-vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")

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

@@ -1,17 +0,0 @@
-{
-  "name": "jsoncpp",
-  "version": "1.9.6",
-  "description": "JsonCpp is a C++ library that allows manipulating JSON values, including serialization and deserialization to and from strings. It can also preserve existing comment in unserialization/serialization steps, making it a convenient format to store user input files.",
-  "homepage": "https://github.com/open-source-parsers/jsoncpp",
-  "license": "MIT",
-  "dependencies": [
-    {
-      "name": "vcpkg-cmake",
-      "host": true
-    },
-    {
-      "name": "vcpkg-cmake-config",
-      "host": true
-    }
-  ]
-}

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.",
@@ -2470,13 +2462,6 @@
           },
           "type": "array"
         },
-        "safeUriSchemes": {
-          "description": "Specifies a list of URI schemes that are considered safe. No confirmation will be required to open URIs with these schemes.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
         "rendering.graphicsAPI": {
           "description": "Direct3D 11 provides a more performant and feature-rich experience, whereas Direct2D is more stable. The default option \"Automatic\" will pick the API that best fits your graphics hardware. If you experience significant issues, consider using Direct2D.",
           "type": "string",

src/buffer/out/Row.cpp

@@ -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/ut_textbuffer/ReflowTests.cpp

@@ -604,8 +604,8 @@ namespace
 
 extern "C" HRESULT __declspec(dllexport) __cdecl ReflowTestDataSource(IDataSource** ppDataSource, void*)
 {
-    auto source{ Microsoft::WRL::Make<ArrayIndexTaefAdapterSource>() };
-    return source.CopyTo(ppDataSource);
+    *ppDataSource = new ArrayIndexTaefAdapterSource>(std::size(testCases));
+    return S_OK;
 }
 
 class ReflowTests

src/cascadia/CascadiaPackage/Package-Pre.appxmanifest

@@ -237,7 +237,6 @@
     <Capability Name="internetClient" />
     <rescap:Capability Name="runFullTrust" />
     <rescap:Capability Name="unvirtualizedResources" />
-    <rescap:Capability Name="appLicensing" />
   </Capabilities>
 
   <Extensions>

src/cascadia/CascadiaPackage/Package.appxmanifest

@@ -237,7 +237,6 @@
     <Capability Name="internetClient" />
     <rescap:Capability Name="runFullTrust" />
     <rescap:Capability Name="unvirtualizedResources" />
-    <rescap:Capability Name="appLicensing" />
   </Capabilities>
 
   <Extensions>

src/cascadia/TerminalApp/AppActionHandlers.cpp

@@ -499,8 +499,8 @@ namespace winrt::TerminalApp::implementation
             }
             else
             {
-                const auto resizeSucceeded = _ResizePane(realArgs.ResizeDirection());
-                args.Handled(resizeSucceeded);
+                _ResizePane(realArgs.ResizeDirection());
+                args.Handled(true);
             }
         }
     }

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>
@@ -854,11 +848,11 @@
   </data>
   <data name="TerminalPage_PaneMovedAnnouncement_ExistingTab" xml:space="preserve">
     <value>Der aktive Bereich wurde auf die Registerkarte „{0}“ verschoben</value>
-    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the tab to which the pane was moved.</comment>
+    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the tab the pane was moved to.</comment>
   </data>
   <data name="TerminalPage_TabMovedAnnouncement_Default" xml:space="preserve">
     <value>Registerkarte „{0}“ wurde in das Fenster „{1}“ verschoben</value>
-    <comment>{Locked="{0}"}{Locked="{1}"}This text is read out by screen readers upon a successful tab movement. {0} is the name of the tab. {1} is the name of the window to which the tab was moved.</comment>
+    <comment>{Locked="{0}"}{Locked="{1}"}This text is read out by screen readers upon a successful tab movement. {0} is the name of the tab. {1} is the name of the window the tab was moved to.</comment>
   </data>
   <data name="TerminalPage_TabMovedAnnouncement_NewWindow" xml:space="preserve">
     <value>Registerkarte „{0}“ in neues Fenster verschoben</value>
@@ -870,7 +864,7 @@
   </data>
   <data name="TerminalPage_PaneMovedAnnouncement_ExistingWindow2" xml:space="preserve">
     <value>Der aktive Bereich wurde in das Fenster "{0}" verschoben</value>
-    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the window to which the pane was moved.</comment>
+    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the window the pane was moved to.</comment>
   </data>
   <data name="TerminalPage_PaneMovedAnnouncement_NewWindow" xml:space="preserve">
     <value>Aktiver Bereich in neues Fenster verschoben</value>

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>
@@ -851,11 +845,11 @@
   </data>
   <data name="TerminalPage_PaneMovedAnnouncement_ExistingTab" xml:space="preserve">
     <value>Panel activo movido a la pestaña "{0}"</value>
-    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the tab to which the pane was moved.</comment>
+    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the tab the pane was moved to.</comment>
   </data>
   <data name="TerminalPage_TabMovedAnnouncement_Default" xml:space="preserve">
     <value>La pestaña "{0}" se ha movido a la ventana "{1}"</value>
-    <comment>{Locked="{0}"}{Locked="{1}"}This text is read out by screen readers upon a successful tab movement. {0} is the name of the tab. {1} is the name of the window to which the tab was moved.</comment>
+    <comment>{Locked="{0}"}{Locked="{1}"}This text is read out by screen readers upon a successful tab movement. {0} is the name of the tab. {1} is the name of the window the tab was moved to.</comment>
   </data>
   <data name="TerminalPage_TabMovedAnnouncement_NewWindow" xml:space="preserve">
     <value>La pestaña "{0}" se ha movido a la nueva ventana</value>
@@ -867,7 +861,7 @@
   </data>
   <data name="TerminalPage_PaneMovedAnnouncement_ExistingWindow2" xml:space="preserve">
     <value>Panel activo movido a la ventana "{0}"</value>
-    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the window to which the pane was moved.</comment>
+    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the window the pane was moved to.</comment>
   </data>
   <data name="TerminalPage_PaneMovedAnnouncement_NewWindow" xml:space="preserve">
     <value>Panel activo movido a nueva ventana</value>

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>
@@ -851,11 +845,11 @@
   </data>
   <data name="TerminalPage_PaneMovedAnnouncement_ExistingTab" xml:space="preserve">
     <value>Volet actif déplacé vers l’onglet « {0} »</value>
-    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the tab to which the pane was moved.</comment>
+    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the tab the pane was moved to.</comment>
   </data>
   <data name="TerminalPage_TabMovedAnnouncement_Default" xml:space="preserve">
     <value>Onglet « {0} » déplacé vers la fenêtre « {1} »</value>
-    <comment>{Locked="{0}"}{Locked="{1}"}This text is read out by screen readers upon a successful tab movement. {0} is the name of the tab. {1} is the name of the window to which the tab was moved.</comment>
+    <comment>{Locked="{0}"}{Locked="{1}"}This text is read out by screen readers upon a successful tab movement. {0} is the name of the tab. {1} is the name of the window the tab was moved to.</comment>
   </data>
   <data name="TerminalPage_TabMovedAnnouncement_NewWindow" xml:space="preserve">
     <value>Onglet « {0} » déplacé vers une nouvelle fenêtre</value>
@@ -867,7 +861,7 @@
   </data>
   <data name="TerminalPage_PaneMovedAnnouncement_ExistingWindow2" xml:space="preserve">
     <value>Volet actif déplacé vers l’onglet « {0} »</value>
-    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the window to which the pane was moved.</comment>
+    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the window the pane was moved to.</comment>
   </data>
   <data name="TerminalPage_PaneMovedAnnouncement_NewWindow" xml:space="preserve">
     <value>Volet actif déplacé vers une nouvelle fenêtre</value>

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>
@@ -851,11 +845,11 @@
   </data>
   <data name="TerminalPage_PaneMovedAnnouncement_ExistingTab" xml:space="preserve">
     <value>Riquadro attivo spostato nella scheda "{0}"</value>
-    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the tab to which the pane was moved.</comment>
+    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the tab the pane was moved to.</comment>
   </data>
   <data name="TerminalPage_TabMovedAnnouncement_Default" xml:space="preserve">
     <value>Scheda "{0}" spostata nella finestra "{1}"</value>
-    <comment>{Locked="{0}"}{Locked="{1}"}This text is read out by screen readers upon a successful tab movement. {0} is the name of the tab. {1} is the name of the window to which the tab was moved.</comment>
+    <comment>{Locked="{0}"}{Locked="{1}"}This text is read out by screen readers upon a successful tab movement. {0} is the name of the tab. {1} is the name of the window the tab was moved to.</comment>
   </data>
   <data name="TerminalPage_TabMovedAnnouncement_NewWindow" xml:space="preserve">
     <value>Scheda "{0}" spostata in una nuova finestra</value>
@@ -867,7 +861,7 @@
   </data>
   <data name="TerminalPage_PaneMovedAnnouncement_ExistingWindow2" xml:space="preserve">
     <value>Riquadro attivo spostato nella finestra "{0}"</value>
-    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the window to which the pane was moved.</comment>
+    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the window the pane was moved to.</comment>
   </data>
   <data name="TerminalPage_PaneMovedAnnouncement_NewWindow" xml:space="preserve">
     <value>Riquadro attivo spostato in una nuova finestra</value>

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>
@@ -852,11 +846,11 @@
   </data>
   <data name="TerminalPage_PaneMovedAnnouncement_ExistingTab" xml:space="preserve">
     <value>アクティブなペインを [{0}] タブに移動しました</value>
-    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the tab to which the pane was moved.</comment>
+    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the tab the pane was moved to.</comment>
   </data>
   <data name="TerminalPage_TabMovedAnnouncement_Default" xml:space="preserve">
     <value>[{0}] タブを "{1}" ウィンドウに移動しました</value>
-    <comment>{Locked="{0}"}{Locked="{1}"}This text is read out by screen readers upon a successful tab movement. {0} is the name of the tab. {1} is the name of the window to which the tab was moved.</comment>
+    <comment>{Locked="{0}"}{Locked="{1}"}This text is read out by screen readers upon a successful tab movement. {0} is the name of the tab. {1} is the name of the window the tab was moved to.</comment>
   </data>
   <data name="TerminalPage_TabMovedAnnouncement_NewWindow" xml:space="preserve">
     <value>[{0}] タブを新しいウィンドウに移動しました</value>
@@ -868,7 +862,7 @@
   </data>
   <data name="TerminalPage_PaneMovedAnnouncement_ExistingWindow2" xml:space="preserve">
     <value>アクティブなペインを "{0}" ウィンドウに移動しました</value>
-    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the window to which the pane was moved.</comment>
+    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the window the pane was moved to.</comment>
   </data>
   <data name="TerminalPage_PaneMovedAnnouncement_NewWindow" xml:space="preserve">
     <value>アクティブなペインを新しいウィンドウに移動しました</value>

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>
@@ -851,11 +845,11 @@
   </data>
   <data name="TerminalPage_PaneMovedAnnouncement_ExistingTab" xml:space="preserve">
     <value>활성 창이 "{0}" 탭으로 이동됨</value>
-    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the tab to which the pane was moved.</comment>
+    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the tab the pane was moved to.</comment>
   </data>
   <data name="TerminalPage_TabMovedAnnouncement_Default" xml:space="preserve">
     <value>"{0}" 탭이 "{1}" 창으로 이동됨</value>
-    <comment>{Locked="{0}"}{Locked="{1}"}This text is read out by screen readers upon a successful tab movement. {0} is the name of the tab. {1} is the name of the window to which the tab was moved.</comment>
+    <comment>{Locked="{0}"}{Locked="{1}"}This text is read out by screen readers upon a successful tab movement. {0} is the name of the tab. {1} is the name of the window the tab was moved to.</comment>
   </data>
   <data name="TerminalPage_TabMovedAnnouncement_NewWindow" xml:space="preserve">
     <value>"{0}" 탭이 새 창으로 이동됨</value>
@@ -867,7 +861,7 @@
   </data>
   <data name="TerminalPage_PaneMovedAnnouncement_ExistingWindow2" xml:space="preserve">
     <value>활성 창이 "{0}" 창으로 이동됨</value>
-    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the window to which the pane was moved.</comment>
+    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the window the pane was moved to.</comment>
   </data>
   <data name="TerminalPage_PaneMovedAnnouncement_NewWindow" xml:space="preserve">
     <value>활성 창이 새 창으로 이동됨</value>

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>
@@ -851,11 +845,11 @@
   </data>
   <data name="TerminalPage_PaneMovedAnnouncement_ExistingTab" xml:space="preserve">
     <value>Painel ativo movido para a guia "{0}"</value>
-    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the tab to which the pane was moved.</comment>
+    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the tab the pane was moved to.</comment>
   </data>
   <data name="TerminalPage_TabMovedAnnouncement_Default" xml:space="preserve">
     <value>Guia "{0}" movida para janela "{1}"</value>
-    <comment>{Locked="{0}"}{Locked="{1}"}This text is read out by screen readers upon a successful tab movement. {0} is the name of the tab. {1} is the name of the window to which the tab was moved.</comment>
+    <comment>{Locked="{0}"}{Locked="{1}"}This text is read out by screen readers upon a successful tab movement. {0} is the name of the tab. {1} is the name of the window the tab was moved to.</comment>
   </data>
   <data name="TerminalPage_TabMovedAnnouncement_NewWindow" xml:space="preserve">
     <value>Guia "{0}" movida para nova janela</value>
@@ -867,7 +861,7 @@
   </data>
   <data name="TerminalPage_PaneMovedAnnouncement_ExistingWindow2" xml:space="preserve">
     <value>Painel ativo movido para a janela "{0}"</value>
-    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the window to which the pane was moved.</comment>
+    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the window the pane was moved to.</comment>
   </data>
   <data name="TerminalPage_PaneMovedAnnouncement_NewWindow" xml:space="preserve">
     <value>Painel ativo movido para nova janela</value>

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>
@@ -851,11 +845,11 @@
   </data>
   <data name="TerminalPage_PaneMovedAnnouncement_ExistingTab" xml:space="preserve">
     <value>∆çťíνĕ рåⁿэ мôνеð ťб "{0}" ţав !!! !!! !!!</value>
-    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the tab to which the pane was moved.</comment>
+    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the tab the pane was moved to.</comment>
   </data>
   <data name="TerminalPage_TabMovedAnnouncement_Default" xml:space="preserve">
     <value>"{0}" ťāъ мōνęđ τŏ "{1}" шΐπδŏẅ !!! !!! !!!</value>
-    <comment>{Locked="{0}"}{Locked="{1}"}This text is read out by screen readers upon a successful tab movement. {0} is the name of the tab. {1} is the name of the window to which the tab was moved.</comment>
+    <comment>{Locked="{0}"}{Locked="{1}"}This text is read out by screen readers upon a successful tab movement. {0} is the name of the tab. {1} is the name of the window the tab was moved to.</comment>
   </data>
   <data name="TerminalPage_TabMovedAnnouncement_NewWindow" xml:space="preserve">
     <value>"{0}" тąь mǿνєđ ŧσ ήèώ ẅĩŋďøẃ !!! !!! !!!</value>
@@ -867,7 +861,7 @@
   </data>
   <data name="TerminalPage_PaneMovedAnnouncement_ExistingWindow2" xml:space="preserve">
     <value>Λςťìνє рáиė mόνéð ťб "{0}" ŵîńđθω !!! !!! !!! </value>
-    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the window to which the pane was moved.</comment>
+    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the window the pane was moved to.</comment>
   </data>
   <data name="TerminalPage_PaneMovedAnnouncement_NewWindow" xml:space="preserve">
     <value>Αĉťįνέ ρªņз mσνёđ τǿ ήёẃ ẃîпďǿω !!! !!! !!!</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>
@@ -851,11 +845,11 @@
   </data>
   <data name="TerminalPage_PaneMovedAnnouncement_ExistingTab" xml:space="preserve">
     <value>∆çťíνĕ рåⁿэ мôνеð ťб "{0}" ţав !!! !!! !!!</value>
-    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the tab to which the pane was moved.</comment>
+    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the tab the pane was moved to.</comment>
   </data>
   <data name="TerminalPage_TabMovedAnnouncement_Default" xml:space="preserve">
     <value>"{0}" ťāъ мōνęđ τŏ "{1}" шΐπδŏẅ !!! !!! !!!</value>
-    <comment>{Locked="{0}"}{Locked="{1}"}This text is read out by screen readers upon a successful tab movement. {0} is the name of the tab. {1} is the name of the window to which the tab was moved.</comment>
+    <comment>{Locked="{0}"}{Locked="{1}"}This text is read out by screen readers upon a successful tab movement. {0} is the name of the tab. {1} is the name of the window the tab was moved to.</comment>
   </data>
   <data name="TerminalPage_TabMovedAnnouncement_NewWindow" xml:space="preserve">
     <value>"{0}" тąь mǿνєđ ŧσ ήèώ ẅĩŋďøẃ !!! !!! !!!</value>
@@ -867,7 +861,7 @@
   </data>
   <data name="TerminalPage_PaneMovedAnnouncement_ExistingWindow2" xml:space="preserve">
     <value>Λςťìνє рáиė mόνéð ťб "{0}" ŵîńđθω !!! !!! !!! </value>
-    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the window to which the pane was moved.</comment>
+    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the window the pane was moved to.</comment>
   </data>
   <data name="TerminalPage_PaneMovedAnnouncement_NewWindow" xml:space="preserve">
     <value>Αĉťįνέ ρªņз mσνёđ τǿ ήёẃ ẃîпďǿω !!! !!! !!!</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>
@@ -851,11 +845,11 @@
   </data>
   <data name="TerminalPage_PaneMovedAnnouncement_ExistingTab" xml:space="preserve">
     <value>∆çťíνĕ рåⁿэ мôνеð ťб "{0}" ţав !!! !!! !!!</value>
-    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the tab to which the pane was moved.</comment>
+    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the tab the pane was moved to.</comment>
   </data>
   <data name="TerminalPage_TabMovedAnnouncement_Default" xml:space="preserve">
     <value>"{0}" ťāъ мōνęđ τŏ "{1}" шΐπδŏẅ !!! !!! !!!</value>
-    <comment>{Locked="{0}"}{Locked="{1}"}This text is read out by screen readers upon a successful tab movement. {0} is the name of the tab. {1} is the name of the window to which the tab was moved.</comment>
+    <comment>{Locked="{0}"}{Locked="{1}"}This text is read out by screen readers upon a successful tab movement. {0} is the name of the tab. {1} is the name of the window the tab was moved to.</comment>
   </data>
   <data name="TerminalPage_TabMovedAnnouncement_NewWindow" xml:space="preserve">
     <value>"{0}" тąь mǿνєđ ŧσ ήèώ ẅĩŋďøẃ !!! !!! !!!</value>
@@ -867,7 +861,7 @@
   </data>
   <data name="TerminalPage_PaneMovedAnnouncement_ExistingWindow2" xml:space="preserve">
     <value>Λςťìνє рáиė mόνéð ťб "{0}" ŵîńđθω !!! !!! !!! </value>
-    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the window to which the pane was moved.</comment>
+    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the window the pane was moved to.</comment>
   </data>
   <data name="TerminalPage_PaneMovedAnnouncement_NewWindow" xml:space="preserve">
     <value>Αĉťįνέ ρªņз mσνёđ τǿ ήёẃ ẃîпďǿω !!! !!! !!!</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>
@@ -851,11 +845,11 @@
   </data>
   <data name="TerminalPage_PaneMovedAnnouncement_ExistingTab" xml:space="preserve">
     <value>Активная область перемещена на вкладку "{0}"</value>
-    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the tab to which the pane was moved.</comment>
+    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the tab the pane was moved to.</comment>
   </data>
   <data name="TerminalPage_TabMovedAnnouncement_Default" xml:space="preserve">
     <value>Вкладка "{0}" перемещена в окно "{1}"</value>
-    <comment>{Locked="{0}"}{Locked="{1}"}This text is read out by screen readers upon a successful tab movement. {0} is the name of the tab. {1} is the name of the window to which the tab was moved.</comment>
+    <comment>{Locked="{0}"}{Locked="{1}"}This text is read out by screen readers upon a successful tab movement. {0} is the name of the tab. {1} is the name of the window the tab was moved to.</comment>
   </data>
   <data name="TerminalPage_TabMovedAnnouncement_NewWindow" xml:space="preserve">
     <value>Вкладка "{0}" перемещена в новое окно</value>
@@ -867,7 +861,7 @@
   </data>
   <data name="TerminalPage_PaneMovedAnnouncement_ExistingWindow2" xml:space="preserve">
     <value>Активная область перемещена в окно "{0}"</value>
-    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the window to which the pane was moved.</comment>
+    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the window the pane was moved to.</comment>
   </data>
   <data name="TerminalPage_PaneMovedAnnouncement_NewWindow" xml:space="preserve">
     <value>Активная область перемещена в новое окно</value>

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

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -118,7 +118,7 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <data name="InitialJsonParseErrorText" xml:space="preserve">
-    <value>Подешавања нису могла да се учитају из фајла. Проверите има ли синтаксних грешака, укључујући запете на крају реда.</value>
+    <value>Подешавања нису могла да се учитау из фајла. Проверите има ли синтаксних грешака, укључујући запете на крају реда.</value>
   </data>
   <data name="MissingDefaultProfileText" xml:space="preserve">
     <value>У листи профила није могао да се пронађе ваш подразумевани профил - користи се први профил. Проверите да ли се "defaultProfile" подудара са GUID неког од ваших профила.</value>
@@ -141,7 +141,7 @@
     <value>Подешавања нису могла поново да се учитају из фајла. Проверите има ли синтаксних грешака, укључујући запете на крају реда.</value>
   </data>
   <data name="UsingDefaultSettingsText" xml:space="preserve">
-    <value>Привремено се користе подразумевана подешавања апликације Windows Терминал.</value>
+    <value>Привремено се користе подразумевана подешавања Windows Терминала.</value>
   </data>
   <data name="InitialJsonParseErrorTitle" xml:space="preserve">
     <value>Није успело учитавање подешавања</value>
@@ -149,6 +149,12 @@
   <data name="SettingsValidateErrorTitle" xml:space="preserve">
     <value>Наишло се на грешке током учитавања корисничких подешавања</value>
   </data>
+  <data name="KeyboardServiceDisabledDialog.PrimaryButtonText" xml:space="preserve">
+    <value>ОК</value>
+  </data>
+  <data name="KeyboardServiceDisabledDialog.Title" xml:space="preserve">
+    <value>Упозорење:</value>
+  </data>
   <data name="KeyboardServiceWarningText" xml:space="preserve">
     <value>„{0}” се не извршава на вашој машини. Због тога Терминал можда неће моћи да прима улаз са тастатуре.</value>
     <comment>{0} will be replaced with the OS-localized name of the TabletInputService</comment>
@@ -159,12 +165,28 @@
   <data name="ReloadJsonParseErrorTitle" xml:space="preserve">
     <value>Није успело поновно учитавање подешавања</value>
   </data>
+  <data name="FeedbackUriValue" xml:space="preserve">
+    <value>https://go.microsoft.com/fwlink/?linkid=2125419</value>
+    <comment>{Locked}This is a FWLink, so it will be localized with the fwlink tool</comment>
+  </data>
   <data name="AboutMenuItem" xml:space="preserve">
     <value>О програму</value>
   </data>
+  <data name="FeedbackMenuItem" xml:space="preserve">
+    <value>Повратне информације</value>
+  </data>
   <data name="SettingsMenuItem" xml:space="preserve">
     <value>Подешавања</value>
   </data>
+  <data name="Cancel" xml:space="preserve">
+    <value>Откажи</value>
+  </data>
+  <data name="CloseAll" xml:space="preserve">
+    <value>Затвори све</value>
+  </data>
+  <data name="Quit" xml:space="preserve">
+    <value>Напусти</value>
+  </data>
   <data name="MultiplePanes" xml:space="preserve">
     <value>Више панела</value>
   </data>
@@ -271,6 +293,17 @@
     <value>• Наведена "theme" није пронађена у листи тема. Привремено се употребљава подразумевана вредност.</value>
     <comment>{Locked="•"} This glyph is a bullet, used in a bulleted list.</comment>
   </data>
+  <data name="LegacyGlobalsProperty" xml:space="preserve">
+    <value>Особина "globals" је застарела - ваша подешавања би требало да се ажурирају. </value>
+    <comment>{Locked="\"globals\""} </comment>
+  </data>
+  <data name="LegacyGlobalsPropertyHrefUrl" xml:space="preserve">
+    <value>https://go.microsoft.com/fwlink/?linkid=2128258</value>
+    <comment>{Locked}This is a FWLink, so it will be localized with the fwlink tool</comment>
+  </data>
+  <data name="LegacyGlobalsPropertyHrefLabel" xml:space="preserve">
+    <value>За више информација, погледајте следећу веб страницу.</value>
+  </data>
   <data name="FailedToParseCommandJson" xml:space="preserve">
     <value>Није успело развијање команде којој је постављено "iterateOn". Ова команда ће се игнорисати.</value>
     <comment>{Locked="\"iterateOn\""} </comment>
@@ -451,12 +484,21 @@
   <data name="ElevatedRun.Text" xml:space="preserve">
     <value>Ctrl+Клик да отворите као администратор</value>
   </data>
+  <data name="WindowCloseButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+    <value>Затвори</value>
+  </data>
   <data name="WindowCloseButton.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
     <value>Затвори</value>
   </data>
   <data name="WindowCloseButtonToolTip.Text" xml:space="preserve">
     <value>Затвори</value>
   </data>
+  <data name="WindowMaximizeButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+    <value>Увећај</value>
+  </data>
+  <data name="WindowMinimizeButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+    <value>Умањи</value>
+  </data>
   <data name="WindowMinimizeButton.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
     <value>Умањи</value>
   </data>
@@ -476,6 +518,10 @@
     <value>Верзија:</value>
     <comment>This is the heading for a version number label</comment>
   </data>
+  <data name="AboutDialog_GettingStartedLink.Content" xml:space="preserve">
+    <value>Брзи почетак</value>
+    <comment>A hyperlink name for a guide on how to get started using Terminal</comment>
+  </data>
   <data name="AboutDialog_SourceCodeLink.Content" xml:space="preserve">
     <value>Изворни кôд</value>
     <comment>A hyperlink name for the Terminal's documentation</comment>
@@ -554,7 +600,7 @@
     <value>Откуцајте име команде...</value>
   </data>
   <data name="CommandPalette_NoMatchesText.Text" xml:space="preserve">
-    <value>Ниједна команда се не подудара</value>
+    <value>Нема команди које се подударају</value>
   </data>
   <data name="CommandPaletteModeAnnouncement_ActionMode" xml:space="preserve">
     <value>Акција режим претраге</value>
@@ -751,9 +797,18 @@
   <data name="ExportTabText" xml:space="preserve">
     <value>Извези текст</value>
   </data>
+  <data name="ExportFailure" xml:space="preserve">
+    <value>Није успео извоз садржаја терминала</value>
+  </data>
+  <data name="ExportSuccess" xml:space="preserve">
+    <value>Успешно је извезен садржај терминала</value>
+  </data>
   <data name="FindText" xml:space="preserve">
     <value>Пронађи</value>
   </data>
+  <data name="PlainText" xml:space="preserve">
+    <value>Чисти текст</value>
+  </data>
   <data name="CloseOnExitInfoBar.Message" xml:space="preserve">
     <value>Понашање при прекиду извршавања може да се подеси у напредним подешавањима профила.</value>
   </data>
@@ -859,6 +914,10 @@
     <value>Картица "{0}" је премештена на позицију "{1}"</value>
     <comment>{Locked="{0}"}{Locked="{1}"}This text is read out by screen readers upon a successful tab movement. {0} is the name of the tab. {1} is the new tab index in the tab row.</comment>
   </data>
+  <data name="TerminalPage_PaneMovedAnnouncement_ExistingWindow" xml:space="preserve">
+    <value>Активни панел је премештен у картицу "{0}" у прозору "{1}"</value>
+    <comment>{Locked="{0}"}{Locked="{1}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the tab the pane was moved to. {1} is the name of the window the pane was moved to. Replaced in 1.19 by TerminalPage_PaneMovedAnnouncement_ExistingWindow2</comment>
+  </data>
   <data name="TerminalPage_PaneMovedAnnouncement_ExistingWindow2" xml:space="preserve">
     <value>Активни панел је премештен у прозор "{0}"</value>
     <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the window the pane was moved to.</comment>

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>
@@ -851,11 +845,11 @@
   </data>
   <data name="TerminalPage_PaneMovedAnnouncement_ExistingTab" xml:space="preserve">
     <value>活动窗格已移动到“{0}”选项卡</value>
-    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the tab to which the pane was moved.</comment>
+    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the tab the pane was moved to.</comment>
   </data>
   <data name="TerminalPage_TabMovedAnnouncement_Default" xml:space="preserve">
     <value>“{0}”选项卡已移动到“{1}”窗口</value>
-    <comment>{Locked="{0}"}{Locked="{1}"}This text is read out by screen readers upon a successful tab movement. {0} is the name of the tab. {1} is the name of the window to which the tab was moved.</comment>
+    <comment>{Locked="{0}"}{Locked="{1}"}This text is read out by screen readers upon a successful tab movement. {0} is the name of the tab. {1} is the name of the window the tab was moved to.</comment>
   </data>
   <data name="TerminalPage_TabMovedAnnouncement_NewWindow" xml:space="preserve">
     <value>“{0}”选项卡已移动到新窗口</value>
@@ -867,7 +861,7 @@
   </data>
   <data name="TerminalPage_PaneMovedAnnouncement_ExistingWindow2" xml:space="preserve">
     <value>活动窗格已移动到“{0}”选项卡</value>
-    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the window to which the pane was moved.</comment>
+    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the window the pane was moved to.</comment>
   </data>
   <data name="TerminalPage_PaneMovedAnnouncement_NewWindow" xml:space="preserve">
     <value>活动窗格已移动到新窗口</value>

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>
@@ -851,11 +845,11 @@
   </data>
   <data name="TerminalPage_PaneMovedAnnouncement_ExistingTab" xml:space="preserve">
     <value>活動窗格已移動至「{0}」索引標籤</value>
-    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the tab to which the pane was moved.</comment>
+    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the tab the pane was moved to.</comment>
   </data>
   <data name="TerminalPage_TabMovedAnnouncement_Default" xml:space="preserve">
     <value>「{0}」索引標籤已移至「{1}」視窗</value>
-    <comment>{Locked="{0}"}{Locked="{1}"}This text is read out by screen readers upon a successful tab movement. {0} is the name of the tab. {1} is the name of the window to which the tab was moved.</comment>
+    <comment>{Locked="{0}"}{Locked="{1}"}This text is read out by screen readers upon a successful tab movement. {0} is the name of the tab. {1} is the name of the window the tab was moved to.</comment>
   </data>
   <data name="TerminalPage_TabMovedAnnouncement_NewWindow" xml:space="preserve">
     <value>「{0}」索引標籤已移至新視窗</value>
@@ -867,7 +861,7 @@
   </data>
   <data name="TerminalPage_PaneMovedAnnouncement_ExistingWindow2" xml:space="preserve">
     <value>活動窗格已移動至「{0}」視窗</value>
-    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the window to which the pane was moved.</comment>
+    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the window the pane was moved to.</comment>
   </data>
   <data name="TerminalPage_PaneMovedAnnouncement_NewWindow" xml:space="preserve">
     <value>活動窗格已移至新視窗</value>

src/cascadia/TerminalApp/Tab.cpp

@@ -844,14 +844,14 @@ namespace winrt::TerminalApp::implementation
     // Arguments:
     // - direction: The direction to move the separator in.
     // Return Value:
-    // - whether a pane was resized
-    bool Tab::ResizePane(const ResizeDirection& direction)
+    // - <none>
+    void Tab::ResizePane(const ResizeDirection& direction)
     {
         ASSERT_UI_THREAD();
 
         // NOTE: This _must_ be called on the root pane, so that it can propagate
         // throughout the entire tree.
-        return _rootPane->ResizePane(direction);
+        _rootPane->ResizePane(direction);
     }
 
     // Method Description:
@@ -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/Tab.h

@@ -53,7 +53,7 @@ namespace winrt::TerminalApp::implementation
                                                                                                         const float splitSize,
                                                                                                         winrt::Windows::Foundation::Size availableSpace) const;
 
-        bool ResizePane(const winrt::Microsoft::Terminal::Settings::Model::ResizeDirection& direction);
+        void ResizePane(const winrt::Microsoft::Terminal::Settings::Model::ResizeDirection& direction);
         bool NavigateFocus(const winrt::Microsoft::Terminal::Settings::Model::FocusDirection& direction);
         bool SwapPane(const winrt::Microsoft::Terminal::Settings::Model::FocusDirection& direction);
         bool FocusPane(const uint32_t id);

src/cascadia/TerminalApp/TerminalAppLib.vcxproj

@@ -134,7 +134,7 @@
     </ClInclude>
     <ClInclude Include="FilteredCommand.h" />
     <ClInclude Include="Pane.h" />
-    <ClInclude Include="../fzf/fzf.h" />
+    <ClInclude Include="fzf/fzf.h" />
     <ClInclude Include="pch.h" />
     <ClInclude Include="ShortcutActionDispatch.h">
       <DependentUpon>ShortcutActionDispatch.idl</DependentUpon>
@@ -204,7 +204,7 @@
     <ClCompile Include="Tab.cpp">
       <DependentUpon>Tab.idl</DependentUpon>
     </ClCompile>
-    <ClCompile Include="../fzf/fzf.cpp" />
+    <ClCompile Include="fzf/fzf.cpp" />
     <ClCompile Include="TaskbarState.cpp">
       <DependentUpon>TaskbarState.idl</DependentUpon>
     </ClCompile>

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;
@@ -1482,9 +1483,6 @@ namespace winrt::TerminalApp::implementation
                 return {};
             }
         }();
-        static const auto ambiguousIsWide = [&]() -> bool {
-            return _settings.GlobalSettings().AmbiguousWidth() == AmbiguousWidth::Wide;
-        }();
 
         TerminalConnection::ITerminalConnection connection{ nullptr };
 
@@ -1550,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{})
         {
@@ -2791,15 +2785,14 @@ namespace winrt::TerminalApp::implementation
     // Arguments:
     // - direction: The direction to move the separator in.
     // Return Value:
-    // - whether a pane was resized
-    bool TerminalPage::_ResizePane(const ResizeDirection& direction)
+    // - <none>
+    void TerminalPage::_ResizePane(const ResizeDirection& direction)
     {
         if (const auto tabImpl{ _GetFocusedTabImpl() })
         {
             _UnZoomIfNeeded();
-            return tabImpl->ResizePane(direction);
+            tabImpl->ResizePane(direction);
         }
-        return false;
     }
 
     // Method Description:
@@ -2949,7 +2942,7 @@ 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
@@ -2958,7 +2951,6 @@ namespace winrt::TerminalApp::implementation
         const auto dispatcher = Dispatcher();
         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();
@@ -2974,11 +2966,7 @@ namespace winrt::TerminalApp::implementation
             text = winrt::hstring{ Utils::TrimPaste(text) };
         }
 
-        // LOAD BEARING: Send an empty bracketed paste even if the clipboard was empty.
-        // Bracketed Paste provides an application a way to know whether the
-        // user pasted, even if there was no applicable content on it. This
-        // behavior is observed in GNOME Terminal, among others.
-        if (!bracketedPaste && text.empty())
+        if (text.empty())
         {
             co_return;
         }
@@ -3060,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 (...)
@@ -3142,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);
 
@@ -3198,42 +3138,6 @@ namespace winrt::TerminalApp::implementation
         return true;
     }
 
-    bool TerminalPage::_IsUriConsideredSomewhatSafe(const winrt::Windows::Foundation::Uri& parsedUri) const
-    {
-        const auto& schemeName = parsedUri.SchemeName();
-
-        if (schemeName == L"http" || schemeName == L"https")
-        {
-            return true;
-        }
-        if (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;
-        }
-        if (const auto& safeSchemes = _settings.GlobalSettings().SafeUriSchemes())
-        {
-            for (const auto& scheme : safeSchemes)
-            {
-                if (til::equals_insensitive_ascii(schemeName, scheme))
-                {
-                    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*/,
@@ -3454,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();
@@ -3808,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();
         }
     }
@@ -4176,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) };
 
@@ -5000,7 +4916,7 @@ namespace winrt::TerminalApp::implementation
                                                             theme.TabRow().UnfocusedBackground()) :
                                               ThemeColor{ nullptr } };
 
-        if (_settings.GlobalSettings().UseAcrylicInTabRow() && (_activated || _settings.GlobalSettings().EnableUnfocusedAcrylic()))
+        if (_settings.GlobalSettings().UseAcrylicInTabRow())
         {
             if (tabRowBg)
             {

src/cascadia/TerminalApp/TerminalPage.h

@@ -412,7 +412,7 @@ namespace winrt::TerminalApp::implementation
                         const Microsoft::Terminal::Settings::Model::SplitDirection splitType,
                         const float splitSize,
                         std::shared_ptr<Pane> newPane);
-        bool _ResizePane(const Microsoft::Terminal::Settings::Model::ResizeDirection& direction);
+        void _ResizePane(const Microsoft::Terminal::Settings::Model::ResizeDirection& direction);
         void _ToggleSplitOrientation();
 
         void _ScrollPage(ScrollDirection scrollDirection);
@@ -422,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);
-        bool _IsUriConsideredSomewhatSafe(const winrt::Windows::Foundation::Uri& parsedUri) const;
+        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.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/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/TerminalConnection/Resources/sr-Cyrl-RS/Resources.resw

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -209,7 +209,7 @@
   </data>
   <data name="CtrlDToClose" xml:space="preserve">
     <value>Сада можете да затворите овај терминал са Ctrl+D, или да притиснете Ентер да га поново покренете.</value>
-    <comment>"Ctrl+D" and "Enter" represent keys the user will press (control+D and Enter).</comment>
+	  <comment>"Ctrl+D" and "Enter" represent keys the user will press (control+D and Enter).</comment>
   </data>
   <data name="ProcessFailedToLaunch" xml:space="preserve">
     <value>[грешка {0} приликом покретања `{1}']</value>
@@ -220,7 +220,7 @@
     <value>Не може да се приступи почетном директоријуму „{0}”</value>
     <comment>The first argument {0} is a path to a directory on the filesystem, as provided by the user.</comment>
   </data>
-  <data name="ElevationRequired" xml:space="preserve">
+    <data name="ElevationRequired" xml:space="preserve">
     <value>Тражена операција захтева веће привилегије.</value>
   </data>
   <data name="FileNotFound" xml:space="preserve">

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

src/cascadia/TerminalControl/ControlCore.h

@@ -257,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()
@@ -299,12 +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.
-            // Only round for single-click: for double/triple-click, rounding
-            // can push the position to the next cell, selecting the wrong word.
-            const auto round = multiClickMapper == 1 && !_core->IsVtMouseModeEnabled();
-            _core->LeftClickOnTerminal(_getTerminalPosition(til::point{ pixelPosition }, round),
+            // Rounded coordinates for text selection
+            _core->LeftClickOnTerminal(_getTerminalPosition(til::point{ pixelPosition }, true),
                                        multiClickMapper,
                                        altEnabled,
                                        shiftEnabled,
@@ -314,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))
@@ -339,18 +314,13 @@ namespace winrt::Microsoft::Terminal::Control::implementation
             }
             else
             {
-                // GH#19942, GH#14464: Don't re-copy a selection that was
-                // already copied via copyOnSelect on mouse-up. But DO copy
-                // if the selection was made via mark mode or modified with
-                // quick-edit keys (shift+arrow), since those paths never
-                // triggered an automatic copy.
-                const auto copied = (_selectionNeedsToBeCopied || !_core->CopyOnSelect()) &&
-                                    CopySelectionToClipboard(shiftEnabled, false, _core->Settings().CopyFormatting());
+                // Try to copy the text and clear the selection
+                const auto successfulCopy = CopySelectionToClipboard(shiftEnabled, false, _core->Settings().CopyFormatting());
                 _core->ClearSelection();
-                if (_core->CopyOnSelect() || !copied)
+                if (_core->CopyOnSelect() || !successfulCopy)
                 {
-                    // CopyOnSelect: right-click always pastes.
-                    // Otherwise: no selection → paste.
+                    // CopyOnSelect: right click always pastes!
+                    // Otherwise: no selection --> paste
                     RequestPasteTextFromClipboard();
                 }
             }
@@ -712,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/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; };

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
     {
 

src/cascadia/TerminalControl/TermControl.cpp

@@ -532,11 +532,6 @@ namespace winrt::Microsoft::Terminal::Control::implementation
         _core.Connection(newConnection);
     }
 
-    void TermControl::HardResetWithoutErase()
-    {
-        _core.HardResetWithoutErase();
-    }
-
     void TermControl::_throttledUpdateScrollbar(const ScrollBarUpdate& update)
     {
         if (!_initializedTerminal)
@@ -1795,16 +1790,6 @@ namespace winrt::Microsoft::Terminal::Control::implementation
             return true;
         }
 
-        // While TSF has an active composition, key events must not be forwarded
-        // to the PTY directly. The IME re-injects navigation/confirmation keys
-        // after composition ends, at which point HasActiveComposition() == false
-        // and they are forwarded normally. This mirrors conhost v1 behavior in
-        // src/interactivity/win32/windowio.cpp.
-        if (GetTSFHandle().HasActiveComposition())
-        {
-            return true;
-        }
-
         if (_TrySendKeyEvent(vkey, scanCode, modifiers, keyDown))
         {
             return true;
@@ -1935,6 +1920,8 @@ namespace winrt::Microsoft::Terminal::Control::implementation
     // - args: event data
     void TermControl::_TappedHandler(const IInspectable& /*sender*/, const TappedRoutedEventArgs& e)
     {
+        Focus(FocusState::Pointer);
+
         if (e.PointerDeviceType() == Windows::Devices::Input::PointerDeviceType::Touch)
         {
             // Normally TSF would be responsible for showing the touch keyboard, but it's buggy for us:
@@ -1968,13 +1955,7 @@ namespace winrt::Microsoft::Terminal::Control::implementation
         const auto point = args.GetCurrentPoint(*this);
         const auto type = ptr.PointerDeviceType();
 
-        // GH#19908: _focused can be true even when the search box has
-        // keyboard focus, because GotFocus bubbles from the search box
-        // child and _GotFocusHandler sets _focused=true. If the user
-        // click-drags in the terminal while the search box is focused,
-        // we need to explicitly call Focus() to move keyboard focus back
-        // to the terminal so that Ctrl+C copies the selection.
-        if (!_focused || (_searchBox && _searchBox->ContainsFocus()))
+        if (!_focused)
         {
             Focus(FocusState::Pointer);
         }
@@ -2520,9 +2501,9 @@ namespace winrt::Microsoft::Terminal::Control::implementation
 
         _updateScrollBar->Run(update);
 
-        // If we have a selection with markers (exposed via selection mode),
-        //   update the position of the markers
-        if (_core.HasSelection() && _core.SelectionMode() >= SelectionInteractionMode::Keyboard)
+        // if a selection marker is already visible,
+        // update the position of those markers
+        if (SelectionStartMarker().Visibility() == Visibility::Visible || SelectionEndMarker().Visibility() == Visibility::Visible)
         {
             _updateSelectionMarkers(nullptr, winrt::make<UpdateSelectionMarkersEventArgs>(false));
         }
@@ -3086,11 +3067,6 @@ namespace winrt::Microsoft::Terminal::Control::implementation
             co_return;
         }
 
-        if (const auto hwnd = reinterpret_cast<HWND>(OwningHwnd()))
-        {
-            SetForegroundWindow(hwnd);
-        }
-
         const auto weak = get_weak();
 
         if (e.DataView().Contains(StandardDataFormats::ApplicationLink()))

src/cascadia/TerminalControl/TermControl.h

@@ -192,7 +192,6 @@ namespace winrt::Microsoft::Terminal::Control::implementation
 
         TerminalConnection::ITerminalConnection Connection();
         void Connection(const TerminalConnection::ITerminalConnection& connection);
-        void HardResetWithoutErase();
 
         Control::CursorDisplayState CursorVisibility() const noexcept;
         void CursorVisibility(Control::CursorDisplayState cursorVisibility);

src/cascadia/TerminalControl/TermControl.idl

@@ -53,7 +53,6 @@ namespace Microsoft.Terminal.Control
         void SetOverrideColorScheme(Microsoft.Terminal.Core.ICoreScheme scheme);
 
         Microsoft.Terminal.TerminalConnection.ITerminalConnection Connection;
-        void HardResetWithoutErase();
 
         UInt64 ContentId{ get; };
 

src/cascadia/TerminalControl/TermControlAutomationPeer.cpp

@@ -121,9 +121,6 @@ namespace winrt::Microsoft::Terminal::Control::implementation
         // GH#13978: If the TermControl has already been removed from the UI tree, XAML might run into weird bugs.
         // This will prevent the `dispatcher.RunAsync` calls below from raising UIA events on the main thread.
         _termControl = {};
-
-        // Solve the circular reference between us and the content automation peer.
-        _contentAutomationPeer.ParentProvider(nullptr);
     }
 
     // Method Description:

src/cascadia/TerminalCore/Terminal.cpp

@@ -55,18 +55,6 @@ void Terminal::Create(til::size viewportSize, til::CoordType scrollbackLines, Re
     _stateMachine = std::make_unique<StateMachine>(std::move(engine));
 }
 
-// Method Description:
-// - Resets all VT state to defaults without clearing the buffer content.
-// Called when a connection is restarted so that any dirty modes left
-// behind by a crashed application don't affect the new connection.
-void Terminal::HardResetWithoutErase()
-{
-    _assertLocked();
-    _stateMachine->ResetState();
-    auto& engine = reinterpret_cast<OutputStateMachineEngine&>(_stateMachine->Engine());
-    engine.Dispatch().HardReset(false);
-}
-
 // Method Description:
 // - Initializes the Terminal from the given set of settings.
 // Arguments:
@@ -98,6 +86,7 @@ void Terminal::UpdateSettings(ICoreSettings settings)
     _answerbackMessage = settings.AnswerbackMessage();
     _wordDelimiters = settings.WordDelimiters();
     _suppressApplicationTitle = settings.SuppressApplicationTitle();
+    _startingTitle = settings.StartingTitle();
     _trimBlockSelection = settings.TrimBlockSelection();
     _autoMarkPrompts = settings.AutoMarkPrompts();
     _rainbowSuggestions = settings.RainbowSuggestions();
@@ -123,11 +112,6 @@ void Terminal::UpdateSettings(ICoreSettings settings)
     // Save the changes made above and in UpdateAppearance as the new default render settings.
     GetRenderSettings().SaveDefaultSettings();
 
-    if (!_startingTitle)
-    {
-        _startingTitle = settings.StartingTitle();
-    }
-
     if (!_startingTabColor && settings.StartingTabColor())
     {
         _startingTabColor = settings.StartingTabColor().Value();
@@ -529,27 +513,52 @@ std::wstring Terminal::GetHyperlinkAtViewportPosition(const til::point viewportP
 
 std::wstring Terminal::GetHyperlinkAtBufferPosition(const til::point bufferPos)
 {
-    const auto& buffer = _activeBuffer();
-
     // Case 1: buffer position has a hyperlink stored in the buffer
-    const auto attr = buffer.GetCellDataAt(bufferPos)->TextAttr();
+    const auto attr = _activeBuffer().GetCellDataAt(bufferPos)->TextAttr();
     if (attr.IsHyperlink())
     {
-        return buffer.GetHyperlinkUriFromId(attr.GetHyperlinkId());
+        return _activeBuffer().GetHyperlinkUriFromId(attr.GetHyperlinkId());
     }
 
     // Case 2: buffer position may point to an auto-detected hyperlink
-    // Check cached interval tree (covers visible viewport +/- viewport height)
-    if (const auto results = _patternIntervalTree.findOverlapping({ bufferPos.x + 1, bufferPos.y }, bufferPos); !results.empty())
+    // Case 2 - Step 1: get the auto-detected hyperlink
+    std::optional<interval_tree::Interval<til::point, size_t>> result;
+    const auto visibleViewport = _GetVisibleViewport();
+    if (visibleViewport.IsInBounds(bufferPos))
     {
-        for (const auto& result : results)
+        // Hyperlink is in the current view, so let's just get it
+        auto viewportPos = bufferPos;
+        visibleViewport.ConvertToOrigin(&viewportPos);
+        result = GetHyperlinkIntervalFromViewportPosition(viewportPos);
+        if (result.has_value())
         {
-            if (result.value == _hyperlinkPatternId)
-            {
-                return buffer.GetPlainText(result.start, result.stop);
-            }
+            result->start = _ConvertToBufferCell(result->start, false);
+            result->stop = _ConvertToBufferCell(result->stop, true);
         }
     }
+    else
+    {
+        // Hyperlink is outside of the current view.
+        // We need to find if there's a pattern at that location.
+        const auto patterns = _getPatterns(bufferPos.y, bufferPos.y);
+
+        // NOTE: patterns is stored with top y-position being 0,
+        //       so we need to cleverly set the y-pos to 0.
+        const til::point viewportPos{ bufferPos.x, 0 };
+        const auto results = patterns.findOverlapping(viewportPos, viewportPos);
+        if (!results.empty())
+        {
+            result = results.front();
+            result->start.y += bufferPos.y;
+            result->stop.y += bufferPos.y;
+        }
+    }
+
+    // Case 2 - Step 2: get the auto-detected hyperlink
+    if (result.has_value() && result->value == _hyperlinkPatternId)
+    {
+        return _activeBuffer().GetPlainText(result->start, result->stop);
+    }
     return {};
 }
 
@@ -569,25 +578,17 @@ uint16_t Terminal::GetHyperlinkIdAtViewportPosition(const til::point viewportPos
 // Arguments:
 // - The position relative to the viewport
 // Return value:
-// - The interval representing the start and end coordinates (viewport-relative)
+// - The interval representing the start and end coordinates
 std::optional<PointTree::interval> Terminal::GetHyperlinkIntervalFromViewportPosition(const til::point viewportPos)
 {
-    // GH#18177: The tree stores buffer-absolute coordinates
-    // Convert viewport-relative (y=0 at visible start) to buffer-absolute
-    const auto visStart = _VisibleStartIndex();
-    const til::point bufferPos{ viewportPos.x, viewportPos.y + visStart };
-    const auto results = _patternIntervalTree.findOverlapping({ bufferPos.x + 1, bufferPos.y }, bufferPos);
+    const auto results = _patternIntervalTree.findOverlapping({ viewportPos.x + 1, viewportPos.y }, viewportPos);
     if (results.size() > 0)
     {
         for (const auto& result : results)
         {
             if (result.value == _hyperlinkPatternId)
             {
-                // Convert back to viewport-relative coordinates
-                auto interval = result;
-                interval.start.y -= visStart;
-                interval.stop.y -= visStart;
-                return interval;
+                return result;
             }
         }
     }
@@ -806,8 +807,11 @@ TerminalInput::OutputType Terminal::FocusChanged(const bool focused)
 // - The interval tree containing regions that need to be invalidated
 void Terminal::_InvalidatePatternTree()
 {
+    const auto vis = _VisibleStartIndex();
     _patternIntervalTree.visit_all([&](const PointTree::interval& interval) {
-        _InvalidateFromCoords(interval.start, interval.stop);
+        const til::point startCoord{ interval.start.x, interval.start.y + vis };
+        const til::point endCoord{ interval.stop.x, interval.stop.y + vis };
+        _InvalidateFromCoords(startCoord, endCoord);
     });
 }
 
@@ -1205,16 +1209,7 @@ void Terminal::SetPlayMidiNoteCallback(std::function<void(const int, const int,
 void Terminal::UpdatePatternsUnderLock()
 {
     _InvalidatePatternTree();
-    const auto visStart = _VisibleStartIndex();
-    const auto visEnd = _VisibleEndIndex();
-    const auto viewportHeight = visEnd - visStart;
-
-    // GH#18177: Scan extra rows beyond the viewport so that URLs
-    // wrapping across the viewport boundary are matched in full
-    const auto bufferSize = _activeBuffer().GetSize();
-    const auto beg = std::max<til::CoordType>(0, visStart - viewportHeight);
-    const auto end = std::min(bufferSize.BottomInclusive(), visEnd + viewportHeight);
-    _patternIntervalTree = _getPatterns(beg, end);
+    _patternIntervalTree = _getPatterns(_VisibleStartIndex(), _VisibleEndIndex());
     _InvalidatePatternTree();
 }
 
@@ -1429,8 +1424,10 @@ PointTree Terminal::_getPatterns(til::CoordType beg, til::CoordType end) const
         {
             do
             {
-                // PointTree uses half-open ranges and buffer-absolute coordinates.
-                const auto range = ICU::BufferRangeFromMatch(&text, re.get());
+                auto range = ICU::BufferRangeFromMatch(&text, re.get());
+                // PointTree uses half-open ranges and viewport-relative coordinates.
+                range.start.y -= beg;
+                range.end.y -= beg;
                 intervals.push_back(PointTree::interval(range.start, range.end, 0));
             } while (uregex_findNext(re.get(), &status));
         }
@@ -1538,10 +1535,6 @@ void Terminal::SerializeMainBuffer(HANDLE handle) const
     _mainBuffer->SerializeTo(handle);
 }
 
-void Terminal::UnknownSequence() noexcept
-{
-}
-
 void Terminal::ColorSelection(const TextAttribute& attr, winrt::Microsoft::Terminal::Core::MatchMode matchMode)
 {
     const auto colorSelection = [this](const til::point coordStartInclusive, const til::point coordEndExclusive, const TextAttribute& attr) {

src/cascadia/TerminalCore/Terminal.hpp

@@ -85,7 +85,6 @@ public:
     void Create(til::size viewportSize,
                 til::CoordType scrollbackLines,
                 Microsoft::Console::Render::Renderer& renderer);
-    void HardResetWithoutErase();
 
     void CreateFromSettings(winrt::Microsoft::Terminal::Core::ICoreSettings settings,
                             Microsoft::Console::Render::Renderer& renderer);
@@ -132,9 +131,7 @@ public:
 
 #pragma region ITerminalApi
     // These methods are defined in TerminalApi.cpp
-    void UnknownSequence() noexcept override;
     void ReturnResponse(const std::wstring_view response) override;
-    bool IsConPTY() const noexcept override;
     Microsoft::Console::VirtualTerminal::StateMachine& GetStateMachine() noexcept override;
     BufferState GetBufferAndViewport() noexcept override;
     void SetViewportPosition(const til::point position) noexcept override;
@@ -207,7 +204,7 @@ public:
     bool IsGridLineDrawingAllowed() noexcept override;
     std::wstring GetHyperlinkUri(uint16_t id) const override;
     std::wstring GetHyperlinkCustomId(uint16_t id) const override;
-    std::vector<size_t> GetPatternId(const til::point viewportPos) const override;
+    std::vector<size_t> GetPatternId(const til::point location) const override;
 
     std::pair<COLORREF, COLORREF> GetAttributeColors(const TextAttribute& attr) const noexcept override;
     std::span<const til::point_span> GetSelectionSpans() const noexcept override;
@@ -349,7 +346,7 @@ private:
     ::Microsoft::Console::VirtualTerminal::TerminalInput _terminalInput;
 
     std::optional<std::wstring> _title;
-    std::optional<std::wstring> _startingTitle;
+    std::wstring _startingTitle;
     std::optional<til::color> _startingTabColor;
 
     std::vector<til::point_span> _searchHighlights;
@@ -400,6 +397,7 @@ private:
     std::wstring _wordDelimiters;
     SelectionExpansion _multiClickSelectionMode = SelectionExpansion::Char;
     SelectionInteractionMode _selectionMode = SelectionInteractionMode::None;
+    bool _selectionIsTargetingUrl = false;
     SelectionEndpoint _selectionEndpoint = SelectionEndpoint::None;
     bool _anchorInactiveSelectionEndpoint = false;
 #pragma endregion

src/cascadia/TerminalCore/TerminalApi.cpp

@@ -28,11 +28,6 @@ void Terminal::ReturnResponse(const std::wstring_view response)
     }
 }
 
-bool Terminal::IsConPTY() const noexcept
-{
-    return false;
-}
-
 Microsoft::Console::VirtualTerminal::StateMachine& Terminal::GetStateMachine() noexcept
 {
     return *_stateMachine;
@@ -91,12 +86,8 @@ void Terminal::SetWindowTitle(const std::wstring_view title)
     _assertLocked();
     if (!_suppressApplicationTitle)
     {
-        _title.reset();
-        if (!title.empty())
-        {
-            _title.emplace(title);
-        }
-        _pfnTitleChanged(GetConsoleTitle());
+        _title.emplace(title.empty() ? _startingTitle : title);
+        _pfnTitleChanged(_title.value());
     }
 }
 
@@ -116,13 +107,6 @@ bool Terminal::ResizeWindow(const til::CoordType width, const til::CoordType hei
         return false;
     }
 
-    const auto currentDimensions = _GetMutableViewport().Dimensions();
-
-    if (width == currentDimensions.width && height == currentDimensions.height)
-    {
-        return false;
-    }
-
     if (_pfnWindowSizeChanged)
     {
         _pfnWindowSizeChanged(width, height);
@@ -156,7 +140,7 @@ unsigned int Terminal::GetInputCodePage() const noexcept
 
 void Terminal::CopyToClipboard(wil::zwstring_view content)
 {
-    if (_clipboardOperationsAllowed && _focused)
+    if (_clipboardOperationsAllowed)
     {
         _pfnCopyToClipboard(content);
     }

src/cascadia/TerminalCore/TerminalSelection.cpp

@@ -254,6 +254,7 @@ void Terminal::_SetSelectionEnd(SelectionInfo* selection, const til::point viewp
         std::tie(selection->start, selection->end) = expandedAnchors;
     }
     _selectionMode = SelectionInteractionMode::Mouse;
+    _selectionIsTargetingUrl = false;
 }
 
 // Method Description:
@@ -398,6 +399,7 @@ void Terminal::ToggleMarkMode()
         }
         _ScrollToPoint(_selection->start);
         _selectionMode = SelectionInteractionMode::Mark;
+        _selectionIsTargetingUrl = false;
     }
 }
 
@@ -458,6 +460,7 @@ void Terminal::SelectHyperlink(const SearchDirection dir)
     if (_selectionMode != SelectionInteractionMode::Mark)
     {
         // This feature only works in mark mode
+        _selectionIsTargetingUrl = false;
         return;
     }
 
@@ -466,10 +469,19 @@ void Terminal::SelectHyperlink(const SearchDirection dir)
     const auto bufferSize = buffer.GetSize();
     const auto viewportHeight = _GetMutableViewport().Height();
 
+    // The patterns are stored relative to the "search area". Initially, this search area will be the viewport,
+    // but as we progressively search through more of the buffer, this will change.
+    // Keep track of the search area here, and use the lambda below to convert points to the search area coordinate space.
+    auto searchArea = _GetVisibleViewport();
+    auto convertToSearchArea = [&searchArea](const til::point pt) noexcept {
+        auto copy = pt;
+        searchArea.ConvertToOrigin(&copy);
+        return copy;
+    };
+
     // extracts the next/previous hyperlink from the list of hyperlink ranges provided
     auto extractResultFromList = [&](std::vector<interval_tree::Interval<til::point, size_t>>& list) noexcept {
-        const auto selectionStart = _selection->start;
-        const auto selectionEnd = _selection->end;
+        const auto selectionStartInSearchArea = convertToSearchArea(_selection->start);
 
         std::optional<std::pair<til::point, til::point>> resultFromList;
         if (!list.empty())
@@ -479,11 +491,12 @@ void Terminal::SelectHyperlink(const SearchDirection dir)
                 // pattern tree includes the currently selected range when going forward,
                 // so we need to check if we're pointing to that one before returning it.
                 auto range = list.front();
-                if (range.start == selectionStart && range.stop == selectionEnd)
+                if (_selectionIsTargetingUrl && range.start == selectionStartInSearchArea)
                 {
                     if (list.size() > 1)
                     {
-                        // Selection matches the current URL, pick the next one
+                        // if we're pointing to the currently selected URL,
+                        // pick the next one.
                         range = til::at(list, 1);
                         resultFromList = { range.start, range.stop };
                     }
@@ -508,6 +521,14 @@ void Terminal::SelectHyperlink(const SearchDirection dir)
                 resultFromList = { range.start, range.stop };
             }
         }
+
+        // pattern tree stores everything as viewport coords,
+        // so we need to convert them on the way out
+        if (resultFromList)
+        {
+            searchArea.ConvertFromOrigin(&resultFromList->first);
+            searchArea.ConvertFromOrigin(&resultFromList->second);
+        }
         return resultFromList;
     };
 
@@ -525,8 +546,8 @@ void Terminal::SelectHyperlink(const SearchDirection dir)
         searchEnd = _selection->start;
     }
 
-    // 1.A) Try searching the cached pattern tree (no scanning required)
-    auto resultList = _patternIntervalTree.findContained(searchStart, searchEnd);
+    // 1.A) Try searching the current viewport (no scrolling required)
+    auto resultList = _patternIntervalTree.findContained(convertToSearchArea(searchStart), convertToSearchArea(searchEnd));
     std::optional<std::pair<til::point, til::point>> result = extractResultFromList(resultList);
     if (!result)
     {
@@ -541,12 +562,14 @@ void Terminal::SelectHyperlink(const SearchDirection dir)
             searchEnd = { bufferSize.RightInclusive(), searchStart.y - 1 };
             searchStart = { bufferSize.Left(), std::max(searchStart.y - viewportHeight, bufferSize.Top()) };
         }
+        searchArea = Viewport::FromDimensions(searchStart, { searchEnd.x + 1, searchEnd.y + 1 });
+
         const til::point bufferStart{ bufferSize.Origin() };
         const til::point bufferEnd{ bufferSize.RightInclusive(), ViewEndIndex() };
         while (!result && bufferSize.IsInBounds(searchStart) && bufferSize.IsInBounds(searchEnd) && searchStart <= searchEnd && bufferStart <= searchStart && searchEnd <= bufferEnd)
         {
             auto patterns = _getPatterns(searchStart.y, searchEnd.y);
-            resultList = patterns.findContained(searchStart, searchEnd);
+            resultList = patterns.findContained(convertToSearchArea(searchStart), convertToSearchArea(searchEnd));
             result = extractResultFromList(resultList);
             if (!result)
             {
@@ -560,6 +583,7 @@ void Terminal::SelectHyperlink(const SearchDirection dir)
                     searchEnd.y -= 1;
                     searchStart.y = std::max(searchEnd.y - viewportHeight, bufferSize.Top());
                 }
+                searchArea = Viewport::FromDimensions(searchStart, { searchEnd.x + 1, searchEnd.y + 1 });
             }
         }
     }
@@ -632,10 +656,11 @@ void Terminal::SelectHyperlink(const SearchDirection dir)
     selection->start = result->first;
     selection->pivot = result->first;
     selection->end = result->second;
+    _selectionIsTargetingUrl = true;
     _selectionEndpoint = SelectionEndpoint::End;
 
     // 4. Scroll to the selected area (if necessary)
-    _ScrollToPoint(dir == SearchDirection::Forward ? selection->end : selection->start);
+    _ScrollToPoint(selection->end);
 }
 
 Terminal::UpdateSelectionParams Terminal::ConvertKeyEventToUpdateSelectionParams(const ControlKeyStates mods, const WORD vkey) const noexcept
@@ -743,6 +768,7 @@ void Terminal::UpdateSelection(SelectionDirection direction, SelectionExpansion
     }
 
     // 3. Actually modify the selection state
+    _selectionIsTargetingUrl = false;
     _selectionMode = std::max(_selectionMode, SelectionInteractionMode::Keyboard);
 
     auto selection{ _selection.write() };
@@ -785,6 +811,7 @@ void Terminal::SelectAll()
     };
 
     _selectionMode = SelectionInteractionMode::Keyboard;
+    _selectionIsTargetingUrl = false;
     _ScrollToPoint(_selection->start);
 }
 
@@ -916,6 +943,7 @@ void Terminal::ClearSelection()
     _assertLocked();
     _selection.write()->active = false;
     _selectionMode = SelectionInteractionMode::None;
+    _selectionIsTargetingUrl = false;
     _selectionEndpoint = static_cast<SelectionEndpoint>(0);
     _anchorInactiveSelectionEndpoint = false;
 }
@@ -1017,9 +1045,5 @@ void Terminal::_ScrollToPoint(const til::point pos)
         }
         _NotifyScrollEvent();
         _activeBuffer().TriggerScroll();
-
-        // Rebuild the pattern tree for the new viewport position
-        // so that callers always find a fresh cache after scrolling
-        _updateUrlDetection();
     }
 }

src/cascadia/TerminalCore/terminalrenderdata.cpp

@@ -74,16 +74,15 @@ std::wstring Microsoft::Terminal::Core::Terminal::GetHyperlinkCustomId(uint16_t
 // Method Description:
 // - Gets the regex pattern ids of a location
 // Arguments:
-// - The viewport-relative location
+// - The location
 // Return value:
 // - The pattern IDs of the location
-std::vector<size_t> Terminal::GetPatternId(const til::point viewportPos) const
+std::vector<size_t> Terminal::GetPatternId(const til::point location) const
 {
     _assertLocked();
 
-    // Convert viewport-relative (y=0 at visible start) to buffer-absolute
-    const til::point bufferPos{ viewportPos.x, viewportPos.y + _VisibleStartIndex() };
-    const auto intervals = _patternIntervalTree.findOverlapping({ bufferPos.x + 1, bufferPos.y }, bufferPos);
+    // Look through our interval tree for this location
+    const auto intervals = _patternIntervalTree.findOverlapping({ location.x + 1, location.y }, location);
     if (intervals.size() == 0)
     {
         return {};
@@ -184,18 +183,11 @@ void Terminal::SelectNewRegion(const til::point coordStart, const til::point coo
 std::wstring_view Terminal::GetConsoleTitle() const noexcept
 {
     _assertLocked();
-
-    if (_title)
+    if (_title.has_value())
     {
         return *_title;
     }
-
-    if (_startingTitle)
-    {
-        return *_startingTitle;
-    }
-
-    return {};
+    return _startingTitle;
 }
 
 // Method Description:

src/cascadia/TerminalSettingsAppAdapterLib/TerminalSettings.cpp

@@ -376,7 +376,6 @@ namespace winrt::Microsoft::Terminal::Settings
         _DisablePartialInvalidation = globalSettings.DisablePartialInvalidation();
         _SoftwareRendering = globalSettings.SoftwareRendering();
         _TextMeasurement = globalSettings.TextMeasurement();
-        _AmbiguousWidth = globalSettings.AmbiguousWidth();
         _DefaultInputScope = globalSettings.DefaultInputScope();
         _UseBackgroundImageForWindow = globalSettings.UseBackgroundImageForWindow();
         _TrimBlockSelection = globalSettings.TrimBlockSelection();

src/cascadia/TerminalSettingsEditor/Actions.cpp

@@ -4,7 +4,6 @@
 #include "pch.h"
 #include "Actions.h"
 #include "Actions.g.cpp"
-#include "LibraryResources.h"
 #include "../TerminalSettingsModel/AllShortcutActions.h"
 
 using namespace winrt::Windows::UI::Xaml;
@@ -21,9 +20,8 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
 
     void Actions::OnNavigatedTo(const NavigationEventArgs& e)
     {
-        const auto args = e.Parameter().as<Editor::NavigateToPageArgs>();
-        _ViewModel = args.ViewModel().as<Editor::ActionsViewModel>();
-        _ViewModel.ReSortCommandList();
+        _ViewModel = e.Parameter().as<Editor::ActionsViewModel>();
+        _ViewModel.CurrentPage(ActionsSubPage::Base);
         auto vmImpl = get_self<ActionsViewModel>(_ViewModel);
         vmImpl->MarkAsVisited();
         _layoutUpdatedRevoker = LayoutUpdated(winrt::auto_revoke, [this](auto /*s*/, auto /*e*/) {
@@ -32,7 +30,6 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
 
             AddNewButton().Focus(FocusState::Programmatic);
         });
-        BringIntoViewWhenLoaded(args.ElementToFocus());
 
         TraceLoggingWrite(
             g_hTerminalSettingsEditorProvider,

src/cascadia/TerminalSettingsEditor/Actions.xaml

@@ -164,33 +164,17 @@
                                    Style="{StaticResource KeyBindingNameTextBlockStyle}"
                                    Text="{x:Bind DisplayName, Mode=OneWay}" />
                         <!--  Key Chord Text  -->
-                        <Grid Grid.Column="1"
-                              HorizontalAlignment="Right"
-                              VerticalAlignment="Center"
-                              ColumnSpacing="4">
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="Auto" />
-                                <ColumnDefinition Width="Auto" />
-                            </Grid.ColumnDefinitions>
-                            <Border Grid.Column="0"
-                                    Padding="8,4,8,4"
-                                    Style="{ThemeResource KeyChordBorderStyle}"
-                                    Visibility="{x:Bind mtu:Converters.StringNotEmptyToVisibility(FirstKeyChordText)}">
-                                <TextBlock FontSize="14"
-                                           Style="{ThemeResource KeyChordTextBlockStyle}"
-                                           Text="{x:Bind FirstKeyChordText, Mode=OneWay}"
-                                           TextWrapping="WrapWholeWords" />
-                            </Border>
-                            <Border Grid.Column="1"
-                                    Padding="8,4,8,4"
-                                    Style="{ThemeResource KeyChordBorderStyle}"
-                                    ToolTipService.ToolTip="{x:Bind AdditionalKeyChordTooltipText, Mode=OneWay}"
-                                    Visibility="{x:Bind mtu:Converters.StringNotEmptyToVisibility(AdditionalKeyChordCountText)}">
-                                <TextBlock FontSize="14"
-                                           Style="{ThemeResource KeyChordTextBlockStyle}"
-                                           Text="{x:Bind AdditionalKeyChordCountText, Mode=OneWay}" />
-                            </Border>
-                        </Grid>
+                        <Border Grid.Column="1"
+                                Padding="8,4,8,4"
+                                HorizontalAlignment="Right"
+                                VerticalAlignment="Center"
+                                Style="{ThemeResource KeyChordBorderStyle}"
+                                Visibility="{x:Bind mtu:Converters.StringNotEmptyToVisibility(FirstKeyChordText)}">
+                            <TextBlock FontSize="14"
+                                       Style="{ThemeResource KeyChordTextBlockStyle}"
+                                       Text="{x:Bind FirstKeyChordText, Mode=OneWay}"
+                                       TextWrapping="WrapWholeWords" />
+                        </Border>
                     </Grid>
                 </ListViewItem>
             </DataTemplate>
@@ -198,7 +182,8 @@
     </Page.Resources>
 
     <Border MaxWidth="{StaticResource StandardControlMaxWidth}">
-        <StackPanel HorizontalAlignment="Stretch"
+        <StackPanel MaxWidth="600"
+                    HorizontalAlignment="Left"
                     Spacing="8"
                     Style="{StaticResource SettingsStackStyle}">
             <HyperlinkButton x:Uid="Actions_Disclaimer"

src/cascadia/TerminalSettingsEditor/ActionsViewModel.cpp

@@ -126,23 +126,18 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
 
     void CommandViewModel::Name(const winrt::hstring& newName)
     {
-        if (_command.Name() != newName)
+        _command.Name(newName);
+        if (newName.empty())
         {
-            _command.Name(newName);
+            // if the name was cleared, refresh the DisplayName
             _NotifyChanges(L"DisplayName", L"DisplayNameAndKeyChordAutomationPropName");
-            _cachedDisplayName.clear();
         }
+        _cachedDisplayName.clear();
     }
 
     winrt::hstring CommandViewModel::DisplayNameAndKeyChordAutomationPropName()
     {
-        auto result = DisplayName() + L", " + FirstKeyChordText();
-        const auto size = _KeyChordList.Size();
-        if (size > 1)
-        {
-            result = result + L" " + hstring{ RS_fmt(L"Actions_AdditionalKeyChords", winrt::to_hstring(size - 1)) };
-        }
-        return result;
+        return DisplayName() + L", " + FirstKeyChordText();
     }
 
     winrt::hstring CommandViewModel::FirstKeyChordText()
@@ -154,35 +149,6 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         return L"";
     }
 
-    winrt::hstring CommandViewModel::AdditionalKeyChordCountText()
-    {
-        const auto size = _KeyChordList.Size();
-        if (size > 1)
-        {
-            return winrt::hstring{ L"+" + winrt::to_hstring(size - 1) };
-        }
-        return L"";
-    }
-
-    winrt::hstring CommandViewModel::AdditionalKeyChordTooltipText()
-    {
-        const auto size = _KeyChordList.Size();
-        if (size <= 1)
-        {
-            return L"";
-        }
-        std::wstring result;
-        for (uint32_t i = 1; i < size; ++i)
-        {
-            if (!result.empty())
-            {
-                result += L"\n";
-            }
-            result += std::wstring_view{ _KeyChordList.GetAt(i).KeyChordText() };
-        }
-        return winrt::hstring{ result };
-    }
-
     winrt::hstring CommandViewModel::ID()
     {
         return _command.ID();
@@ -209,7 +175,6 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         kbdVM->IsInEditMode(true);
         _RegisterKeyChordVMEvents(*kbdVM);
         KeyChordList().Append(*kbdVM);
-        FocusContainer.raise(*this, *kbdVM);
     }
 
     winrt::hstring CommandViewModel::ActionNameTextBoxAutomationPropName()
@@ -321,10 +286,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
                 {
                     weak->_ReplaceCommandWithUserCopy(false);
                 }
-                if (!weak->_command.HasName())
-                {
-                    weak->_NotifyChanges(L"DisplayName");
-                }
+                weak->_NotifyChanges(L"DisplayName");
             }
         });
     }
@@ -361,10 +323,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         _RegisterActionArgsVMEvents(*actionArgsVM);
         actionArgsVM->Initialize();
         ActionArgsVM(*actionArgsVM);
-        if (!_command.HasName())
-        {
-            _NotifyChanges(L"DisplayName");
-        }
+        _NotifyChanges(L"DisplayName");
     }
 
     ArgWrapper::ArgWrapper(const Model::ArgDescriptor& descriptor, const Windows::Foundation::IInspectable& value) :
@@ -543,13 +502,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         auto lifetime = get_strong();
 
         static constexpr winrt::guid clientGuidFiles{ 0xbd00ae34, 0x839b, 0x43f6, { 0x8b, 0x94, 0x12, 0x37, 0x1a, 0xfe, 0xea, 0xb5 } };
-
-        const auto windowRoot = WindowRoot();
-        if (!windowRoot)
-        {
-            co_return;
-        }
-        const auto parentHwnd{ reinterpret_cast<HWND>(windowRoot.GetHostingWindow()) };
+        const auto parentHwnd{ reinterpret_cast<HWND>(_WindowRoot.GetHostingWindow()) };
         auto path = co_await OpenFilePicker(parentHwnd, [](auto&& dialog) {
             THROW_IF_FAILED(dialog->SetClientGuid(clientGuidFiles));
             try
@@ -572,13 +525,8 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         auto lifetime = get_strong();
 
         static constexpr winrt::guid clientGuidFolders{ 0xa611027, 0x42be, 0x4665, { 0xaf, 0xf1, 0x3f, 0x22, 0x26, 0xe9, 0xf7, 0x4d } };
-
-        const auto windowRoot = WindowRoot();
-        if (!windowRoot)
-        {
-            co_return;
-        }
-        const auto parentHwnd{ reinterpret_cast<HWND>(windowRoot.GetHostingWindow()) };
+        ;
+        const auto parentHwnd{ reinterpret_cast<HWND>(_WindowRoot.GetHostingWindow()) };
         auto path = co_await OpenFilePicker(parentHwnd, [](auto&& dialog) {
             THROW_IF_FAILED(dialog->SetClientGuid(clientGuidFolders));
             try
@@ -1246,25 +1194,6 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         CurrentPage(ActionsSubPage::Edit);
     }
 
-    void ActionsViewModel::ReSortCommandList()
-    {
-        if (_CommandListDirty)
-        {
-            std::vector<Editor::CommandViewModel> commandList;
-            commandList.reserve(_CommandList.Size());
-            for (const auto& cmd : _CommandList)
-            {
-                commandList.push_back(cmd);
-            }
-            std::sort(commandList.begin(), commandList.end(), [](const Editor::CommandViewModel& lhs, const Editor::CommandViewModel& rhs) {
-                return lhs.DisplayName() < rhs.DisplayName();
-            });
-            _CommandList = single_threaded_observable_vector(std::move(commandList));
-            _NotifyChanges(L"CommandList");
-            _CommandListDirty = false;
-        }
-    }
-
     void ActionsViewModel::CurrentCommand(const Editor::CommandViewModel& newCommand)
     {
         _CurrentCommand = newCommand;
@@ -1435,17 +1364,5 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         cmdVM->DeleteRequested({ this, &ActionsViewModel::_CmdVMDeleteRequestedHandler });
         cmdVM->PropagateColorSchemeRequested({ this, &ActionsViewModel::_CmdVMPropagateColorSchemeRequestedHandler });
         cmdVM->PropagateColorSchemeNamesRequested({ this, &ActionsViewModel::_CmdVMPropagateColorSchemeNamesRequestedHandler });
-        cmdVM->PropertyChanged([weakThis{ get_weak() }](const IInspectable& sender, const Windows::UI::Xaml::Data::PropertyChangedEventArgs& args) {
-            if (const auto self{ weakThis.get() })
-            {
-                const auto senderVM{ sender.as<Editor::CommandViewModel>() };
-                const auto propertyName{ args.PropertyName() };
-                if (propertyName == L"DisplayName")
-                {
-                    // when a command's name changes, note that we need to re-sort the command list when we navigate back to the actions page
-                    self->_CommandListDirty = true;
-                }
-            }
-        });
     }
 }

src/cascadia/TerminalSettingsEditor/ActionsViewModel.h

@@ -37,6 +37,7 @@ Abstract:
 #pragma once
 
 #include "ActionsViewModel.g.h"
+#include "NavigateToCommandArgs.g.h"
 #include "CommandViewModel.g.h"
 #include "ArgWrapper.g.h"
 #include "ActionArgsViewModel.g.h"
@@ -47,6 +48,21 @@ Abstract:
 
 namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
 {
+    struct NavigateToCommandArgs : NavigateToCommandArgsT<NavigateToCommandArgs>
+    {
+    public:
+        NavigateToCommandArgs(CommandViewModel command, Editor::IHostedInWindow windowRoot) :
+            _Command(command),
+            _WindowRoot(windowRoot) {}
+
+        Editor::IHostedInWindow WindowRoot() const noexcept { return _WindowRoot; }
+        Editor::CommandViewModel Command() const noexcept { return _Command; }
+
+    private:
+        Editor::IHostedInWindow _WindowRoot;
+        Editor::CommandViewModel _Command{ nullptr };
+    };
+
     struct ModifyKeyChordEventArgs : ModifyKeyChordEventArgsT<ModifyKeyChordEventArgs>
     {
     public:
@@ -74,8 +90,6 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         winrt::hstring DisplayNameAndKeyChordAutomationPropName();
 
         winrt::hstring FirstKeyChordText();
-        winrt::hstring AdditionalKeyChordCountText();
-        winrt::hstring AdditionalKeyChordTooltipText();
 
         winrt::hstring ID();
         bool IsUserAction();
@@ -127,8 +141,6 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         winrt::hstring Type() const noexcept { return _descriptor.Type; };
         Model::ArgTypeHint TypeHint() const noexcept { return _descriptor.TypeHint; };
         bool Required() const noexcept { return _descriptor.Required; };
-        Editor::IHostedInWindow WindowRoot() const noexcept { return _WeakWindowRoot.get(); }
-        void WindowRoot(const Editor::IHostedInWindow& value) { _WeakWindowRoot = value; }
 
         // We cannot use the macro here because we need to implement additional logic for the setter
         Windows::Foundation::IInspectable EnumValue() const noexcept { return _EnumValue; };
@@ -174,10 +186,10 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         VIEW_MODEL_OBSERVABLE_PROPERTY(Editor::ColorSchemeViewModel, DefaultColorScheme, nullptr);
         VIEW_MODEL_OBSERVABLE_PROPERTY(Windows::Foundation::IInspectable, Value, nullptr);
         WINRT_PROPERTY(Windows::Foundation::Collections::IVector<winrt::hstring>, ColorSchemeNamesList, nullptr);
+        WINRT_PROPERTY(Editor::IHostedInWindow, WindowRoot, nullptr);
 
     private:
         Model::ArgDescriptor _descriptor;
-        winrt::weak_ref<Editor::IHostedInWindow> _WeakWindowRoot{ nullptr };
         Windows::Foundation::IInspectable _EnumValue{ nullptr };
         Windows::Foundation::Collections::IObservableVector<Microsoft::Terminal::Settings::Editor::EnumEntry> _EnumList;
         Windows::Foundation::Collections::IObservableVector<Microsoft::Terminal::Settings::Editor::FlagEntry> _FlagList;
@@ -258,7 +270,6 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         bool DisplayBadge() const noexcept;
 
         void AddNewCommand();
-        void ReSortCommandList();
 
         void CurrentCommand(const Editor::CommandViewModel& newCommand);
         Editor::CommandViewModel CurrentCommand();
@@ -280,7 +291,6 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         Model::CascadiaSettings _Settings;
         Windows::Foundation::Collections::IMap<Model::ShortcutAction, winrt::hstring> _AvailableActionsAndNamesMap;
         Windows::Foundation::Collections::IMap<winrt::hstring, Model::ShortcutAction> _NameToActionMap;
-        bool _CommandListDirty{ false };
 
         void _MakeCommandVMsHelper();
         void _RegisterCmdVMEvents(com_ptr<implementation::CommandViewModel>& cmdVM);

src/cascadia/TerminalSettingsEditor/ActionsViewModel.idl

@@ -35,6 +35,12 @@ namespace Microsoft.Terminal.Settings.Editor
         CommandViewModel ViewModel { get; };
     }
 
+    runtimeclass NavigateToCommandArgs
+    {
+        CommandViewModel Command { get; };
+        IHostedInWindow WindowRoot { get; };
+    }
+
     runtimeclass ModifyKeyChordEventArgs
     {
         Microsoft.Terminal.Control.KeyChord OldKeys { get; };
@@ -55,8 +61,6 @@ namespace Microsoft.Terminal.Settings.Editor
         // View-model specific
         String DisplayName { get; };
         String FirstKeyChordText { get; };
-        String AdditionalKeyChordCountText { get; };
-        String AdditionalKeyChordTooltipText { get; };
         String DisplayNameAndKeyChordAutomationPropName { get; };
 
         // UI side (command list page)
@@ -166,7 +170,6 @@ namespace Microsoft.Terminal.Settings.Editor
         void UpdateSettings(Microsoft.Terminal.Settings.Model.CascadiaSettings settings);
 
         void AddNewCommand();
-        void ReSortCommandList();
 
         ActionsSubPage CurrentPage;
         Boolean DisplayBadge { get; };

src/cascadia/TerminalSettingsEditor/AddProfile.cpp

@@ -26,9 +26,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
 
     void AddProfile::OnNavigatedTo(const NavigationEventArgs& e)
     {
-        const auto args = e.Parameter().as<Editor::NavigateToPageArgs>();
-        _State = args.ViewModel().as<Editor::AddProfilePageNavigationState>();
-        BringIntoViewWhenLoaded(args.ElementToFocus());
+        _State = e.Parameter().as<Editor::AddProfilePageNavigationState>();
 
         TraceLoggingWrite(
             g_hTerminalSettingsEditorProvider,

src/cascadia/TerminalSettingsEditor/AddProfile.xaml

@@ -37,8 +37,7 @@
             </Button>
         </Border>
         <StackPanel Margin="{StaticResource StandardControlMargin}">
-            <local:SettingContainer x:Name="DuplicateProfile"
-                                    x:Uid="AddProfile_Duplicate">
+            <local:SettingContainer x:Uid="AddProfile_Duplicate">
                 <ComboBox x:Name="Profiles"
                           AutomationProperties.AccessibilityView="Content"
                           ItemsSource="{x:Bind State.Settings.AllProfiles, Mode=OneWay}"

src/cascadia/TerminalSettingsEditor/Appearances.cpp

@@ -1138,27 +1138,6 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         INITIALIZE_BINDABLE_ENUM_SETTING(IntenseTextStyle, IntenseTextStyle, winrt::Microsoft::Terminal::Settings::Model::IntenseStyle, L"Appearance_IntenseTextStyle", L"Content");
     }
 
-    // Appearances doesn't implement HasScrollViewer<T> which normally adds this function.
-    void Appearances::BringIntoViewWhenLoaded(hstring elementToFocus)
-    {
-        if (elementToFocus.empty())
-        {
-            return;
-        }
-
-        _loadedRevoker = this->Loaded(winrt::auto_revoke, [weakThis{ get_weak() }, elementToFocus](auto&&, auto&&) {
-            if (const auto strongThis = weakThis.get())
-            {
-                if (const auto& controlToFocus{ strongThis->FindName(elementToFocus).try_as<Controls::Control>() })
-                {
-                    controlToFocus.as<FrameworkElement>().StartBringIntoView();
-                    controlToFocus.Focus(FocusState::Programmatic);
-                }
-                strongThis->_loadedRevoker.revoke();
-            }
-        });
-    }
-
     IObservableVector<Editor::Font> Appearances::FilteredFontList()
     {
         if (!_filteredFonts)
@@ -1444,15 +1423,10 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
 
     safe_void_coroutine Appearances::BackgroundImage_Click(const IInspectable&, const RoutedEventArgs&)
     {
-        const auto lifetime = get_strong();
+        auto lifetime = get_strong();
 
-        const auto windowRoot = WindowRoot();
-        if (!windowRoot)
-        {
-            co_return;
-        }
-        const auto parentHwnd{ reinterpret_cast<HWND>(windowRoot.GetHostingWindow()) };
-        const auto file = co_await OpenImagePicker(parentHwnd);
+        const auto parentHwnd{ reinterpret_cast<HWND>(WindowRoot().GetHostingWindow()) };
+        auto file = co_await OpenImagePicker(parentHwnd);
         if (!file.empty())
         {
             Appearance().SetBackgroundImagePath(file);

src/cascadia/TerminalSettingsEditor/Appearances.h

@@ -188,14 +188,10 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
     struct Appearances : AppearancesT<Appearances>
     {
         Appearances();
-        void BringIntoViewWhenLoaded(hstring elementToFocus);
 
         // CursorShape visibility logic
         bool IsVintageCursor() const;
 
-        Editor::IHostedInWindow WindowRoot() const noexcept { return _WeakWindowRoot.get(); }
-        void WindowRoot(const Editor::IHostedInWindow& value) noexcept { _WeakWindowRoot = value; }
-
         Windows::Foundation::Collections::IObservableVector<Editor::Font> FilteredFontList();
         bool ShowAllFonts() const noexcept;
         void ShowAllFonts(bool value);
@@ -214,7 +210,6 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         bool IsCustomFontWeight();
 
         til::property_changed_event PropertyChanged;
-        winrt::Windows::UI::Xaml::FrameworkElement::Loaded_revoker _loadedRevoker;
 
         WINRT_PROPERTY(Windows::Foundation::Collections::IObservableVector<Microsoft::Terminal::Settings::Editor::EnumEntry>, FontWeightList);
 
@@ -223,12 +218,12 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
 
         DEPENDENCY_PROPERTY(Editor::AppearanceViewModel, Appearance);
         WINRT_PROPERTY(Editor::ProfileViewModel, SourceProfile, nullptr);
+        WINRT_PROPERTY(IHostedInWindow, WindowRoot, nullptr);
         GETSET_BINDABLE_ENUM_SETTING(BackgroundImageStretchMode, Windows::UI::Xaml::Media::Stretch, Appearance().BackgroundImageStretchMode);
 
         GETSET_BINDABLE_ENUM_SETTING(IntenseTextStyle, Microsoft::Terminal::Settings::Model::IntenseStyle, Appearance().IntenseTextStyle);
 
     private:
-        winrt::weak_ref<Editor::IHostedInWindow> _WeakWindowRoot{ nullptr };
         Windows::UI::Xaml::Data::INotifyPropertyChanged::PropertyChanged_revoker _ViewModelChangedRevoker;
         std::array<Windows::UI::Xaml::Controls::Primitives::ToggleButton, 9> _BIAlignmentButtons;
         Windows::Foundation::Collections::IMap<uint16_t, Microsoft::Terminal::Settings::Editor::EnumEntry> _FontWeightMap;

src/cascadia/TerminalSettingsEditor/Appearances.xaml

@@ -75,8 +75,7 @@
                        Style="{StaticResource TextBlockSubHeaderStyle}" />
             <!--  Color Scheme  -->
             <!--  This currently only display the Dark color scheme, even if the user has a pair of schemes set.  -->
-            <local:SettingContainer x:Name="ColorScheme"
-                                    x:Uid="Profile_ColorScheme"
+            <local:SettingContainer x:Uid="Profile_ColorScheme"
                                     ClearSettingValue="{x:Bind Appearance.ClearColorScheme}"
                                     CurrentValueAccessibleName="{x:Bind Appearance.CurrentColorScheme.Name, Mode=OneWay}"
                                     HasSettingValue="{x:Bind Appearance.HasDarkColorSchemeName, Mode=OneWay}"
@@ -285,20 +284,17 @@
                               IsChecked="{x:Bind ShowAllFonts, Mode=TwoWay}" />
                 </StackPanel>
             </local:SettingContainer>
-            <local:SettingContainer x:Name="MissingFontFaces"
-                                    x:Uid="Profile_MissingFontFaces"
+            <local:SettingContainer x:Uid="Profile_MissingFontFaces"
                                     HelpText="{x:Bind Appearance.MissingFontFaces, Mode=OneWay}"
                                     Style="{StaticResource SettingContainerErrorStyle}"
                                     Visibility="{x:Bind mtu:Converters.StringNotEmptyToVisibility(Appearance.MissingFontFaces), Mode=OneWay}" />
-            <local:SettingContainer x:Name="ProportionalFontFaces"
-                                    x:Uid="Profile_ProportionalFontFaces"
+            <local:SettingContainer x:Uid="Profile_ProportionalFontFaces"
                                     HelpText="{x:Bind Appearance.ProportionalFontFaces, Mode=OneWay}"
                                     Style="{StaticResource SettingContainerWarningStyle}"
                                     Visibility="{x:Bind mtu:Converters.StringNotEmptyToVisibility(Appearance.ProportionalFontFaces), Mode=OneWay}" />
 
             <!--  Font Size  -->
-            <local:SettingContainer x:Name="FontSize"
-                                    x:Uid="Profile_FontSize"
+            <local:SettingContainer x:Uid="Profile_FontSize"
                                     ClearSettingValue="{x:Bind Appearance.ClearFontSize}"
                                     HasSettingValue="{x:Bind Appearance.HasFontSize, Mode=OneWay}"
                                     SettingOverrideSource="{x:Bind Appearance.FontSizeOverrideSource, Mode=OneWay}"
@@ -314,8 +310,7 @@
             </local:SettingContainer>
 
             <!--  Line Height  -->
-            <local:SettingContainer x:Name="LineHeight"
-                                    x:Uid="Profile_LineHeight"
+            <local:SettingContainer x:Uid="Profile_LineHeight"
                                     ClearSettingValue="{x:Bind Appearance.ClearLineHeight}"
                                     HasSettingValue="{x:Bind Appearance.HasLineHeight, Mode=OneWay}"
                                     SettingOverrideSource="{x:Bind Appearance.LineHeightOverrideSource, Mode=OneWay}"
@@ -331,8 +326,7 @@
             </local:SettingContainer>
 
             <!--  Cell Width  -->
-            <local:SettingContainer x:Name="CellWidth"
-                                    x:Uid="Profile_CellWidth"
+            <local:SettingContainer x:Uid="Profile_CellWidth"
                                     ClearSettingValue="{x:Bind Appearance.ClearCellWidth}"
                                     HasSettingValue="{x:Bind Appearance.HasCellWidth, Mode=OneWay}"
                                     SettingOverrideSource="{x:Bind Appearance.CellWidthOverrideSource, Mode=OneWay}"
@@ -348,8 +342,7 @@
             </local:SettingContainer>
 
             <!--  Font Weight  -->
-            <local:SettingContainer x:Name="FontWeight"
-                                    x:Uid="Profile_FontWeight"
+            <local:SettingContainer x:Uid="Profile_FontWeight"
                                     ClearSettingValue="{x:Bind Appearance.ClearFontWeight}"
                                     HasSettingValue="{x:Bind Appearance.HasFontWeight, Mode=OneWay}"
                                     SettingOverrideSource="{x:Bind Appearance.FontWeightOverrideSource, Mode=OneWay}"
@@ -385,8 +378,7 @@
                     </Grid>
                 </StackPanel>
             </local:SettingContainer>
-            <local:SettingContainer x:Name="FontAxes"
-                                    x:Uid="Profile_FontAxes"
+            <local:SettingContainer x:Uid="Profile_FontAxes"
                                     ClearSettingValue="{x:Bind Appearance.ClearFontAxes}"
                                     HasSettingValue="{x:Bind Appearance.HasFontAxes, Mode=OneWay}"
                                     SettingOverrideSource="{x:Bind Appearance.FontAxesOverrideSource, Mode=OneWay}"
@@ -413,8 +405,7 @@
                     </muxc:DropDownButton>
                 </StackPanel>
             </local:SettingContainer>
-            <local:SettingContainer x:Name="FontFeatures"
-                                    x:Uid="Profile_FontFeatures"
+            <local:SettingContainer x:Uid="Profile_FontFeatures"
                                     ClearSettingValue="{x:Bind Appearance.ClearFontFeatures}"
                                     HasSettingValue="{x:Bind Appearance.HasFontFeatures, Mode=OneWay}"
                                     SettingOverrideSource="{x:Bind Appearance.FontFeaturesOverrideSource, Mode=OneWay}"
@@ -443,8 +434,7 @@
             </local:SettingContainer>
 
             <!--  Builtin Glyphs  -->
-            <local:SettingContainer x:Name="EnableBuiltinGlyphs"
-                                    x:Uid="Profile_EnableBuiltinGlyphs"
+            <local:SettingContainer x:Uid="Profile_EnableBuiltinGlyphs"
                                     ClearSettingValue="{x:Bind Appearance.ClearEnableBuiltinGlyphs}"
                                     HasSettingValue="{x:Bind Appearance.HasEnableBuiltinGlyphs, Mode=OneWay}"
                                     SettingOverrideSource="{x:Bind Appearance.EnableBuiltinGlyphsOverrideSource, Mode=OneWay}">
@@ -453,8 +443,7 @@
             </local:SettingContainer>
 
             <!--  Color Glyphs  -->
-            <local:SettingContainer x:Name="EnableColorGlyphs"
-                                    x:Uid="Profile_EnableColorGlyphs"
+            <local:SettingContainer x:Uid="Profile_EnableColorGlyphs"
                                     ClearSettingValue="{x:Bind Appearance.ClearEnableColorGlyphs}"
                                     HasSettingValue="{x:Bind Appearance.HasEnableColorGlyphs, Mode=OneWay}"
                                     SettingOverrideSource="{x:Bind Appearance.EnableColorGlyphsOverrideSource, Mode=OneWay}">
@@ -463,8 +452,7 @@
             </local:SettingContainer>
 
             <!--  Retro Terminal Effect  -->
-            <local:SettingContainer x:Name="RetroTerminalEffect"
-                                    x:Uid="Profile_RetroTerminalEffect"
+            <local:SettingContainer x:Uid="Profile_RetroTerminalEffect"
                                     ClearSettingValue="{x:Bind Appearance.ClearRetroTerminalEffect}"
                                     HasSettingValue="{x:Bind Appearance.HasRetroTerminalEffect, Mode=OneWay}"
                                     SettingOverrideSource="{x:Bind Appearance.RetroTerminalEffectOverrideSource, Mode=OneWay}">
@@ -473,8 +461,7 @@
             </local:SettingContainer>
 
             <!--  Adjust Indistinguishable Colors  -->
-            <local:SettingContainer x:Name="AdjustIndistinguishableColors"
-                                    x:Uid="Profile_AdjustIndistinguishableColors"
+            <local:SettingContainer x:Uid="Profile_AdjustIndistinguishableColors"
                                     ClearSettingValue="{x:Bind Appearance.ClearAdjustIndistinguishableColors}"
                                     HasSettingValue="{x:Bind Appearance.HasAdjustIndistinguishableColors, Mode=OneWay}"
                                     SettingOverrideSource="{x:Bind Appearance.AdjustIndistinguishableColorsOverrideSource, Mode=OneWay}">
@@ -492,8 +479,7 @@
                        Style="{StaticResource TextBlockSubHeaderStyle}" />
 
             <!--  Cursor Shape  -->
-            <local:SettingContainer x:Name="CursorShape"
-                                    x:Uid="Profile_CursorShape"
+            <local:SettingContainer x:Uid="Profile_CursorShape"
                                     ClearSettingValue="{x:Bind Appearance.ClearCursorShape}"
                                     HasSettingValue="{x:Bind Appearance.HasCursorShape, Mode=OneWay}"
                                     SettingOverrideSource="{x:Bind Appearance.CursorShapeOverrideSource, Mode=OneWay}">
@@ -505,8 +491,7 @@
             </local:SettingContainer>
 
             <!--  Cursor Height  -->
-            <local:SettingContainer x:Name="CursorHeight"
-                                    x:Uid="Profile_CursorHeight"
+            <local:SettingContainer x:Uid="Profile_CursorHeight"
                                     ClearSettingValue="{x:Bind Appearance.ClearCursorHeight}"
                                     HasSettingValue="{x:Bind Appearance.HasCursorHeight, Mode=OneWay}"
                                     SettingOverrideSource="{x:Bind Appearance.CursorHeightOverrideSource, Mode=OneWay}"
@@ -578,8 +563,7 @@
             </local:SettingContainer>
 
             <!--  Background Image Stretch Mode  -->
-            <local:SettingContainer x:Name="BackgroundImageStretchMode"
-                                    x:Uid="Profile_BackgroundImageStretchMode"
+            <local:SettingContainer x:Uid="Profile_BackgroundImageStretchMode"
                                     ClearSettingValue="{x:Bind Appearance.ClearBackgroundImageStretchMode}"
                                     HasSettingValue="{x:Bind Appearance.HasBackgroundImageStretchMode, Mode=OneWay}"
                                     SettingOverrideSource="{x:Bind Appearance.BackgroundImageStretchModeOverrideSource, Mode=OneWay}"
@@ -592,8 +576,7 @@
             </local:SettingContainer>
 
             <!--  Background Image Alignment  -->
-            <local:SettingContainer x:Name="BackgroundImageAlignment"
-                                    x:Uid="Profile_BackgroundImageAlignment"
+            <local:SettingContainer x:Uid="Profile_BackgroundImageAlignment"
                                     ClearSettingValue="{x:Bind Appearance.ClearBackgroundImageAlignment}"
                                     CurrentValue="{x:Bind Appearance.BackgroundImageAlignmentCurrentValue, Mode=OneWay}"
                                     HasSettingValue="{x:Bind Appearance.HasBackgroundImageAlignment, Mode=OneWay}"
@@ -781,8 +764,7 @@
             </local:SettingContainer>
 
             <!--  Background Image Opacity  -->
-            <local:SettingContainer x:Name="BackgroundImageOpacity"
-                                    x:Uid="Profile_BackgroundImageOpacity"
+            <local:SettingContainer x:Uid="Profile_BackgroundImageOpacity"
                                     ClearSettingValue="{x:Bind Appearance.ClearBackgroundImageOpacity}"
                                     HasSettingValue="{x:Bind Appearance.HasBackgroundImageOpacity, Mode=OneWay}"
                                     SettingOverrideSource="{x:Bind Appearance.BackgroundImageOpacityOverrideSource, Mode=OneWay}"
@@ -808,8 +790,7 @@
                        Style="{StaticResource TextBlockSubHeaderStyle}" />
 
             <!--  Intense is bold, bright  -->
-            <local:SettingContainer x:Name="IntenseTextStyle"
-                                    x:Uid="Appearance_IntenseTextStyle"
+            <local:SettingContainer x:Uid="Appearance_IntenseTextStyle"
                                     ClearSettingValue="{x:Bind Appearance.ClearIntenseTextStyle}"
                                     HasSettingValue="{x:Bind Appearance.HasIntenseTextStyle, Mode=OneWay}"
                                     SettingOverrideSource="{x:Bind Appearance.IntenseTextStyleOverrideSource, Mode=OneWay}">

src/cascadia/TerminalSettingsEditor/ColorSchemes.cpp

@@ -33,10 +33,8 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
 
     void ColorSchemes::OnNavigatedTo(const NavigationEventArgs& e)
     {
-        const auto args = e.Parameter().as<Editor::NavigateToPageArgs>();
-        _ViewModel = args.ViewModel().as<Editor::ColorSchemesPageViewModel>();
+        _ViewModel = e.Parameter().as<Editor::ColorSchemesPageViewModel>();
         _ViewModel.CurrentPage(ColorSchemesSubPage::Base);
-        BringIntoViewWhenLoaded(args.ElementToFocus());
 
         _layoutUpdatedRevoker = LayoutUpdated(winrt::auto_revoke, [this](auto /*s*/, auto /*e*/) {
             // Only let this succeed once.

src/cascadia/TerminalSettingsEditor/Compatibility.cpp

@@ -16,7 +16,6 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         _settings{ settings }
     {
         INITIALIZE_BINDABLE_ENUM_SETTING(TextMeasurement, TextMeasurement, winrt::Microsoft::Terminal::Control::TextMeasurement, L"Globals_TextMeasurement_", L"Text");
-        INITIALIZE_BINDABLE_ENUM_SETTING(AmbiguousWidth, AmbiguousWidth, winrt::Microsoft::Terminal::Control::AmbiguousWidth, L"Globals_AmbiguousWidth_", L"Text");
     }
 
     bool CompatibilityViewModel::DebugFeaturesAvailable() const noexcept
@@ -55,9 +54,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
 
     void Compatibility::OnNavigatedTo(const NavigationEventArgs& e)
     {
-        const auto args = e.Parameter().as<Editor::NavigateToPageArgs>();
-        _ViewModel = args.ViewModel().as<Editor::CompatibilityViewModel>();
-        BringIntoViewWhenLoaded(args.ElementToFocus());
+        _ViewModel = e.Parameter().as<Editor::CompatibilityViewModel>();
 
         TraceLoggingWrite(
             g_hTerminalSettingsEditorProvider,

src/cascadia/TerminalSettingsEditor/Compatibility.h

@@ -26,7 +26,6 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         PERMANENT_OBSERVABLE_PROJECTED_SETTING(_settings.GlobalSettings(), AllowHeadless);
         PERMANENT_OBSERVABLE_PROJECTED_SETTING(_settings.GlobalSettings(), DebugFeaturesEnabled);
         GETSET_BINDABLE_ENUM_SETTING(TextMeasurement, winrt::Microsoft::Terminal::Control::TextMeasurement, _settings.GlobalSettings().TextMeasurement);
-        GETSET_BINDABLE_ENUM_SETTING(AmbiguousWidth, winrt::Microsoft::Terminal::Control::AmbiguousWidth, _settings.GlobalSettings().AmbiguousWidth);
 
     private:
         Model::CascadiaSettings _settings;

src/cascadia/TerminalSettingsEditor/Compatibility.idl

@@ -20,9 +20,6 @@ namespace Microsoft.Terminal.Settings.Editor
 
         IInspectable CurrentTextMeasurement;
         Windows.Foundation.Collections.IObservableVector<Microsoft.Terminal.Settings.Editor.EnumEntry> TextMeasurementList { get; };
-
-        IInspectable CurrentAmbiguousWidth;
-        Windows.Foundation.Collections.IObservableVector<Microsoft.Terminal.Settings.Editor.EnumEntry> AmbiguousWidthList { get; };
     }
 
     [default_interface] runtimeclass Compatibility : Windows.UI.Xaml.Controls.Page

src/cascadia/TerminalSettingsEditor/Compatibility.xaml

@@ -26,15 +26,13 @@
 
     <StackPanel Style="{StaticResource SettingsStackStyle}">
         <!--  Allow Headless  -->
-        <local:SettingContainer x:Name="AllowHeadless"
-                                x:Uid="Globals_AllowHeadless">
+        <local:SettingContainer x:Uid="Globals_AllowHeadless">
             <ToggleSwitch IsOn="{x:Bind ViewModel.AllowHeadless, Mode=TwoWay}"
                           Style="{StaticResource ToggleSwitchInExpanderStyle}" />
         </local:SettingContainer>
 
         <!--  Text Measurement  -->
-        <local:SettingContainer x:Name="TextMeasurement"
-                                x:Uid="Globals_TextMeasurement">
+        <local:SettingContainer x:Uid="Globals_TextMeasurement">
             <ComboBox AutomationProperties.AccessibilityView="Content"
                       ItemTemplate="{StaticResource EnumComboBoxTemplate}"
                       ItemsSource="{x:Bind ViewModel.TextMeasurementList}"
@@ -42,27 +40,15 @@
                       Style="{StaticResource ComboBoxSettingStyle}" />
         </local:SettingContainer>
 
-        <!--  Ambiguous Width  -->
-        <local:SettingContainer x:Name="AmbiguousWidth"
-                                x:Uid="Globals_AmbiguousWidth">
-            <ComboBox AutomationProperties.AccessibilityView="Content"
-                      ItemTemplate="{StaticResource EnumComboBoxTemplate}"
-                      ItemsSource="{x:Bind ViewModel.AmbiguousWidthList}"
-                      SelectedItem="{x:Bind ViewModel.CurrentAmbiguousWidth, Mode=TwoWay}"
-                      Style="{StaticResource ComboBoxSettingStyle}" />
-        </local:SettingContainer>
-
         <!--  Debug Features  -->
-        <local:SettingContainer x:Name="DebugFeaturesEnabled"
-                                x:Uid="Globals_DebugFeaturesEnabled"
+        <local:SettingContainer x:Uid="Globals_DebugFeaturesEnabled"
                                 Visibility="{x:Bind ViewModel.DebugFeaturesAvailable}">
             <ToggleSwitch IsOn="{x:Bind ViewModel.DebugFeaturesEnabled, Mode=TwoWay}"
                           Style="{StaticResource ToggleSwitchInExpanderStyle}" />
         </local:SettingContainer>
 
         <!--  Reset Application State  -->
-        <local:SettingContainer x:Name="ResetApplicationState"
-                                x:Uid="Settings_ResetApplicationState">
+        <local:SettingContainer x:Uid="Settings_ResetApplicationState">
             <Button x:Uid="Settings_ResetApplicationStateButton"
                     Style="{StaticResource DeleteButtonStyle}">
                 <Button.Flyout>
@@ -83,8 +69,7 @@
         </local:SettingContainer>
 
         <!--  Reset to Default Settings  -->
-        <local:SettingContainer x:Name="ResetToDefaultSettings"
-                                x:Uid="Settings_ResetToDefaultSettings">
+        <local:SettingContainer x:Uid="Settings_ResetToDefaultSettings">
             <Button x:Uid="Settings_ResetToDefaultSettingsButton"
                     Style="{StaticResource DeleteButtonStyle}">
                 <Button.Flyout>

src/cascadia/TerminalSettingsEditor/EditAction.cpp

@@ -8,9 +8,7 @@
 #include "../TerminalSettingsModel/AllShortcutActions.h"
 
 using namespace winrt::Windows::UI::Xaml;
-using namespace winrt::Windows::UI::Xaml::Controls;
 using namespace winrt::Windows::UI::Xaml::Navigation;
-using namespace winrt::Windows::Foundation::Collections;
 
 namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
 {
@@ -20,8 +18,8 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
 
     void EditAction::OnNavigatedTo(const NavigationEventArgs& e)
     {
-        const auto args = e.Parameter().as<Editor::NavigateToPageArgs>();
-        _ViewModel = args.ViewModel().as<Editor::CommandViewModel>();
+        const auto args = e.Parameter().as<Editor::NavigateToCommandArgs>();
+        _ViewModel = args.Command();
         _propagateWindowRootRevoker = _ViewModel.PropagateWindowRootRequested(
             winrt::auto_revoke,
             [windowRoot = args.WindowRoot()](const IInspectable&, const Editor::ArgWrapper& wrapper) {
@@ -38,9 +36,6 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
                 {
                     if (auto kcVM{ args.try_as<KeyChordViewModel>() })
                     {
-                        // Force a layout update in case this key chord was newly added
-                        page->KeyChordListView().ScrollIntoView(*kcVM);
-                        page->KeyChordListView().UpdateLayout();
                         if (const auto& container = page->KeyChordListView().ContainerFromItem(*kcVM))
                         {
                             container.as<Controls::ListViewItem>().Focus(FocusState::Programmatic);
@@ -54,86 +49,5 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
 
             CommandNameTextBox().Focus(FocusState::Programmatic);
         });
-
-        // Initialize AutoSuggestBox with current action and store last valid action
-        if (_ViewModel.ProposedShortcutActionName())
-        {
-            const auto currentAction = winrt::unbox_value<winrt::hstring>(_ViewModel.ProposedShortcutActionName());
-            ShortcutActionBox().Text(currentAction);
-            _lastValidAction = currentAction;
-        }
-    }
-
-    void EditAction::ShortcutActionBox_GotFocus(const IInspectable& sender, const RoutedEventArgs&)
-    {
-        // Only rebuild the list if we don't have a cached list or if the cached list is filtered
-        if (!_filteredActions || !_currentActionFilter.empty())
-        {
-            // Open the suggestions list with all available actions
-            std::vector<winrt::hstring> allActions;
-            for (const auto& action : _ViewModel.AvailableShortcutActions())
-            {
-                allActions.push_back(action);
-            }
-
-            _filteredActions = winrt::single_threaded_observable_vector(std::move(allActions));
-            _currentActionFilter = L"";
-            sender.as<AutoSuggestBox>().ItemsSource(_filteredActions);
-        }
-        sender.as<AutoSuggestBox>().IsSuggestionListOpen(true);
-    }
-
-    void EditAction::ShortcutActionBox_TextChanged(const AutoSuggestBox& sender, const AutoSuggestBoxTextChangedEventArgs& args)
-    {
-        if (args.Reason() == AutoSuggestionBoxTextChangeReason::UserInput)
-        {
-            const auto searchText = sender.Text();
-            std::vector<winrt::hstring> filtered;
-
-            for (const auto& action : _ViewModel.AvailableShortcutActions())
-            {
-                // TODO: Update this to use fzf later
-                if (til::contains_linguistic_insensitive(action, searchText))
-                {
-                    filtered.push_back(action);
-                }
-            }
-
-            _filteredActions = winrt::single_threaded_observable_vector(std::move(filtered));
-            _currentActionFilter = searchText;
-            sender.ItemsSource(_filteredActions);
-        }
-    }
-
-    void EditAction::ShortcutActionBox_QuerySubmitted(const AutoSuggestBox& sender, const AutoSuggestBoxQuerySubmittedEventArgs& args)
-    {
-        const auto submittedText = args.QueryText();
-
-        for (const auto& action : _ViewModel.AvailableShortcutActions())
-        {
-            if (action == submittedText)
-            {
-                _ViewModel.ProposedShortcutActionName(winrt::box_value(submittedText));
-                _lastValidAction = submittedText;
-                return;
-            }
-        }
-
-        // If we get here, we never found a match.
-        // Revert to the last valid action
-        sender.Text(_lastValidAction);
-    }
-
-    void EditAction::ShortcutActionBox_LostFocus(const IInspectable& sender, const RoutedEventArgs&)
-    {
-        // The auto suggest box does a weird thing where it reverts to the last query text when you
-        // keyboard navigate out of it. Intercept it here and keep the correct text.
-        const auto box = sender.as<AutoSuggestBox>();
-        const auto currentText = box.Text();
-
-        if (currentText != _lastValidAction && !_lastValidAction.empty())
-        {
-            box.Text(_lastValidAction);
-        }
     }
 }

src/cascadia/TerminalSettingsEditor/EditAction.h

@@ -20,19 +20,11 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
 
         WINRT_OBSERVABLE_PROPERTY(Editor::CommandViewModel, ViewModel, PropertyChanged.raise, nullptr);
 
-        void ShortcutActionBox_GotFocus(const winrt::Windows::Foundation::IInspectable& sender, const winrt::Windows::UI::Xaml::RoutedEventArgs& args);
-        void ShortcutActionBox_TextChanged(const winrt::Windows::UI::Xaml::Controls::AutoSuggestBox& sender, const winrt::Windows::UI::Xaml::Controls::AutoSuggestBoxTextChangedEventArgs& args);
-        void ShortcutActionBox_QuerySubmitted(const winrt::Windows::UI::Xaml::Controls::AutoSuggestBox& sender, const winrt::Windows::UI::Xaml::Controls::AutoSuggestBoxQuerySubmittedEventArgs& args);
-        void ShortcutActionBox_LostFocus(const winrt::Windows::Foundation::IInspectable& sender, const winrt::Windows::UI::Xaml::RoutedEventArgs& args);
-
     private:
         friend struct EditActionT<EditAction>; // for Xaml to bind events
         winrt::Windows::UI::Xaml::FrameworkElement::LayoutUpdated_revoker _layoutUpdatedRevoker;
         Editor::CommandViewModel::PropagateWindowRootRequested_revoker _propagateWindowRootRevoker;
         Editor::CommandViewModel::FocusContainer_revoker _focusContainerRevoker;
-        winrt::Windows::Foundation::Collections::IObservableVector<winrt::hstring> _filteredActions{ nullptr };
-        winrt::hstring _lastValidAction;
-        winrt::hstring _currentActionFilter;
     };
 }
 

src/cascadia/TerminalSettingsEditor/EditAction.xaml

@@ -136,7 +136,7 @@
             </Style>
             <Style x:Key="KeyChordEditorStyle"
                    TargetType="local:KeyChordListener">
-                <Setter Property="HorizontalAlignment" Value="Stretch" />
+                <Setter Property="HorizontalAlignment" Value="Left" />
                 <Setter Property="VerticalAlignment" Value="Center" />
             </Style>
             <x:Int32 x:Key="EditButtonSize">32</x:Int32>
@@ -157,64 +157,63 @@
                 <Setter Property="Height" Value="{StaticResource EditButtonSize}" />
                 <Setter Property="Width" Value="{StaticResource EditButtonSize}" />
             </Style>
-            <Style x:Key="TextBlockGroupingStyle"
-                   BasedOn="{StaticResource BodyStrongTextBlockStyle}"
-                   TargetType="TextBlock">
-                <Setter Property="MaxWidth" Value="{StaticResource StandardControlMaxWidth}" />
-                <Setter Property="Margin" Value="0,0,0,4" />
-                <Setter Property="FontSize" Value="16" />
-            </Style>
 
             <!--  Templates  -->
             <DataTemplate x:Key="KeyChordTemplate"
                           x:DataType="local:KeyChordViewModel">
                 <ListViewItem IsTabStop="False"
                               Style="{StaticResource KeyBindingContainerStyle}">
-                    <Grid Padding="-4,0,0,0"
+                    <Grid Padding="2,0,2,0"
                           VerticalAlignment="Center">
                         <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="{StaticResource ArgumentNameWidth}" />
-                            <ColumnDefinition Width="Auto" />
                             <ColumnDefinition Width="Auto" />
                             <ColumnDefinition Width="Auto" />
                         </Grid.ColumnDefinitions>
                         <Button Grid.Column="0"
-                                Background="{ThemeResource AppBarItemBackgroundThemeBrush}"
                                 Click="{x:Bind ToggleEditMode}"
+                                Style="{ThemeResource KeyChordBorderStyle}"
                                 Visibility="{x:Bind mtu:Converters.InvertedBooleanToVisibility(IsInEditMode), Mode=OneWay}">
                             <TextBlock FontSize="14"
+                                       Style="{ThemeResource KeyChordTextBlockStyle}"
                                        Text="{x:Bind KeyChordText, Mode=OneWay}"
                                        TextWrapping="WrapWholeWords" />
                         </Button>
-                        <local:KeyChordListener Grid.Column="0"
-                                                Keys="{x:Bind ProposedKeys, Mode=TwoWay}"
-                                                Style="{StaticResource KeyChordEditorStyle}"
-                                                Visibility="{x:Bind IsInEditMode, Mode=OneWay}" />
-                        <Button x:Uid="Actions_CancelButton"
-                                Grid.Column="1"
+                        <Grid Grid.Column="0"
+                              ColumnSpacing="8"
+                              Visibility="{x:Bind IsInEditMode, Mode=OneWay}">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="*" />
+                                <ColumnDefinition Width="Auto" />
+                                <ColumnDefinition Width="Auto" />
+                            </Grid.ColumnDefinitions>
+                            <!--  Edit Mode: Key Chord Listener  -->
+                            <local:KeyChordListener Grid.Column="0"
+                                                    Keys="{x:Bind ProposedKeys, Mode=TwoWay}"
+                                                    Style="{StaticResource KeyChordEditorStyle}" />
+
+                            <!--  Cancel editing the action  -->
+                            <Button x:Uid="Actions_CancelButton"
+                                    Grid.Column="1"
+                                    AutomationProperties.Name="{x:Bind CancelButtonName}"
+                                    Click="{x:Bind CancelChanges}"
+                                    Style="{StaticResource EditButtonStyle}">
+                                <FontIcon FontSize="{StaticResource EditButtonIconSize}"
+                                          Glyph="&#xE711;" />
+                            </Button>
+
+                            <!--  Accept changes  -->
+                            <Button x:Uid="Actions_AcceptButton"
+                                    Grid.Column="2"
+                                    AutomationProperties.Name="{x:Bind AcceptButtonName}"
+                                    Click="{x:Bind AcceptChanges}"
+                                    Flyout="{x:Bind AcceptChangesFlyout, Mode=OneWay}"
+                                    Style="{StaticResource AccentEditButtonStyle}">
+                                <FontIcon FontSize="{StaticResource EditButtonIconSize}"
+                                          Glyph="&#xE8FB;" />
+                            </Button>
+                        </Grid>
+                        <Button Grid.Column="1"
                                 Margin="8,0,0,0"
-                                AutomationProperties.Name="{x:Bind CancelButtonName}"
-                                Click="{x:Bind CancelChanges}"
-                                Style="{StaticResource EditButtonStyle}"
-                                Visibility="{x:Bind IsInEditMode, Mode=OneWay}">
-                            <FontIcon FontSize="{StaticResource EditButtonIconSize}"
-                                      Glyph="&#xE711;" />
-                        </Button>
-
-                        <Button x:Uid="Actions_AcceptButton"
-                                Grid.Column="2"
-                                Margin="8,0,8,0"
-                                AutomationProperties.Name="{x:Bind AcceptButtonName}"
-                                Click="{x:Bind AcceptChanges}"
-                                Flyout="{x:Bind AcceptChangesFlyout, Mode=OneWay}"
-                                Style="{StaticResource AccentEditButtonStyle}"
-                                Visibility="{x:Bind IsInEditMode, Mode=OneWay}">
-                            <FontIcon FontSize="{StaticResource EditButtonIconSize}"
-                                      Glyph="&#xE8FB;" />
-                        </Button>
-
-                        <Button Grid.Column="3"
-                                HorizontalAlignment="Left"
                                 AutomationProperties.Name="{x:Bind DeleteButtonName}"
                                 Style="{StaticResource DeleteSmallButtonStyle}">
                             <Button.Content>
@@ -244,14 +243,13 @@
                       ColumnSpacing="8">
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="{StaticResource ArgumentNameWidth}" />
-                        <ColumnDefinition Width="*" />
+                        <ColumnDefinition Width="Auto" />
                     </Grid.ColumnDefinitions>
                     <TextBlock Grid.Column="0"
                                VerticalAlignment="Center"
                                Text="{x:Bind Name}"
                                TextWrapping="WrapWholeWords" />
                     <muxc:NumberBox Grid.Column="1"
-                                    HorizontalAlignment="Stretch"
                                     AutomationProperties.Name="{x:Bind Name}"
                                     LargeChange="1"
                                     Maximum="100"
@@ -269,14 +267,13 @@
                       ColumnSpacing="8">
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="{StaticResource ArgumentNameWidth}" />
-                        <ColumnDefinition Width="*" />
+                        <ColumnDefinition Width="Auto" />
                     </Grid.ColumnDefinitions>
                     <TextBlock Grid.Column="0"
                                VerticalAlignment="Center"
                                Text="{x:Bind Name}"
                                TextWrapping="WrapWholeWords" />
                     <muxc:NumberBox Grid.Column="1"
-                                    HorizontalAlignment="Stretch"
                                     AutomationProperties.Name="{x:Bind Name}"
                                     LargeChange="1"
                                     Maximum="999"
@@ -294,14 +291,13 @@
                       ColumnSpacing="8">
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="{StaticResource ArgumentNameWidth}" />
-                        <ColumnDefinition Width="*" />
+                        <ColumnDefinition Width="Auto" />
                     </Grid.ColumnDefinitions>
                     <TextBlock Grid.Column="0"
                                VerticalAlignment="Center"
                                Text="{x:Bind Name}"
                                TextWrapping="WrapWholeWords" />
                     <muxc:NumberBox Grid.Column="1"
-                                    HorizontalAlignment="Stretch"
                                     AutomationProperties.Name="{x:Bind Name}"
                                     LargeChange="1"
                                     Maximum="999"
@@ -319,14 +315,13 @@
                       ColumnSpacing="8">
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="{StaticResource ArgumentNameWidth}" />
-                        <ColumnDefinition Width="*" />
+                        <ColumnDefinition Width="Auto" />
                     </Grid.ColumnDefinitions>
                     <TextBlock Grid.Column="0"
                                VerticalAlignment="Center"
                                Text="{x:Bind Name}"
                                TextWrapping="WrapWholeWords" />
                     <muxc:NumberBox Grid.Column="1"
-                                    HorizontalAlignment="Stretch"
                                     AutomationProperties.Name="{x:Bind Name}"
                                     LargeChange="1"
                                     Maximum="999"
@@ -344,14 +339,13 @@
                       ColumnSpacing="8">
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="{StaticResource ArgumentNameWidth}" />
-                        <ColumnDefinition Width="*" />
+                        <ColumnDefinition Width="Auto" />
                     </Grid.ColumnDefinitions>
                     <TextBlock Grid.Column="0"
                                VerticalAlignment="Center"
                                Text="{x:Bind Name}"
                                TextWrapping="WrapWholeWords" />
                     <muxc:NumberBox Grid.Column="1"
-                                    HorizontalAlignment="Stretch"
                                     AutomationProperties.Name="{x:Bind Name}"
                                     LargeChange="1"
                                     Maximum="999"
@@ -369,14 +363,13 @@
                       ColumnSpacing="8">
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="{StaticResource ArgumentNameWidth}" />
-                        <ColumnDefinition Width="*" />
+                        <ColumnDefinition Width="Auto" />
                     </Grid.ColumnDefinitions>
                     <TextBlock Grid.Column="0"
                                VerticalAlignment="Center"
                                Text="{x:Bind Name}"
                                TextWrapping="WrapWholeWords" />
                     <muxc:NumberBox Grid.Column="1"
-                                    HorizontalAlignment="Stretch"
                                     AutomationProperties.Name="{x:Bind Name}"
                                     LargeChange="0.2"
                                     Maximum="1"
@@ -394,7 +387,7 @@
                       ColumnSpacing="8">
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="{StaticResource ArgumentNameWidth}" />
-                        <ColumnDefinition Width="*"
+                        <ColumnDefinition Width="Auto"
                                           MinWidth="196" />
                     </Grid.ColumnDefinitions>
                     <TextBlock Grid.Column="0"
@@ -415,14 +408,13 @@
                       ColumnSpacing="8">
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="{StaticResource ArgumentNameWidth}" />
-                        <ColumnDefinition Width="*" />
+                        <ColumnDefinition Width="Auto" />
                     </Grid.ColumnDefinitions>
                     <TextBlock Grid.Column="0"
                                VerticalAlignment="Center"
                                Text="{x:Bind Name}"
                                TextWrapping="WrapWholeWords" />
                     <ComboBox Grid.Column="1"
-                              HorizontalAlignment="Stretch"
                               AutomationProperties.Name="{x:Bind Name}"
                               ItemTemplate="{StaticResource EnumComboBoxTemplate}"
                               ItemsSource="{x:Bind EnumList, Mode=OneWay}"
@@ -490,14 +482,13 @@
                       ColumnSpacing="8">
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="{StaticResource ArgumentNameWidth}" />
-                        <ColumnDefinition Width="*" />
+                        <ColumnDefinition Width="Auto" />
                     </Grid.ColumnDefinitions>
                     <TextBlock Grid.Column="0"
                                VerticalAlignment="Center"
                                Text="{x:Bind Name}"
                                TextWrapping="WrapWholeWords" />
                     <ToggleSwitch Grid.Column="1"
-                                  HorizontalAlignment="Left"
                                   AutomationProperties.Name="{x:Bind Name}"
                                   IsOn="{x:Bind UnboxBool(Value), Mode=TwoWay, BindBack=BoolOptionalBindBack}" />
                 </Grid>
@@ -510,14 +501,13 @@
                       ColumnSpacing="8">
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="{StaticResource ArgumentNameWidth}" />
-                        <ColumnDefinition Width="*" />
+                        <ColumnDefinition Width="Auto" />
                     </Grid.ColumnDefinitions>
                     <TextBlock Grid.Column="0"
                                VerticalAlignment="Center"
                                Text="{x:Bind Name}"
                                TextWrapping="WrapWholeWords" />
                     <CheckBox Grid.Column="1"
-                              HorizontalAlignment="Left"
                               AutomationProperties.Name="{x:Bind Name}"
                               IsChecked="{x:Bind UnboxBoolOptional(Value), Mode=TwoWay, BindBack=BoolOptionalBindBack}"
                               IsThreeState="True" />
@@ -536,14 +526,13 @@
                       ColumnSpacing="8">
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="{StaticResource ArgumentNameWidth}" />
-                        <ColumnDefinition Width="*" />
+                        <ColumnDefinition Width="Auto" />
                     </Grid.ColumnDefinitions>
                     <TextBlock Grid.Column="0"
                                VerticalAlignment="Center"
                                Text="{x:Bind Name}"
                                TextWrapping="WrapWholeWords" />
                     <ComboBox Grid.Column="1"
-                              HorizontalAlignment="Stretch"
                               AutomationProperties.Name="{x:Bind Name}"
                               ItemTemplate="{StaticResource EnumComboBoxTemplate}"
                               ItemsSource="{x:Bind EnumList, Mode=OneWay}"
@@ -597,7 +586,7 @@
                       ColumnSpacing="8">
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="{StaticResource ArgumentNameWidth}" />
-                        <ColumnDefinition Width="*" />
+                        <ColumnDefinition Width="Auto" />
                     </Grid.ColumnDefinitions>
                     <TextBlock Grid.Column="0"
                                VerticalAlignment="Center"
@@ -619,7 +608,7 @@
                       ColumnSpacing="8">
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="{StaticResource ArgumentNameWidth}" />
-                        <ColumnDefinition Width="*" />
+                        <ColumnDefinition Width="Auto" />
                     </Grid.ColumnDefinitions>
                     <TextBlock Grid.Column="0"
                                VerticalAlignment="Center"
@@ -657,98 +646,73 @@
 
     <Border MaxWidth="{StaticResource StandardControlMaxWidth}"
             Margin="{StaticResource SettingStackMargin}">
-        <Grid Margin="{StaticResource SettingStackMargin}"
-              HorizontalAlignment="Stretch">
+        <Grid MaxWidth="600"
+              Margin="{StaticResource SettingStackMargin}"
+              HorizontalAlignment="Left"
+              ColumnSpacing="16"
+              RowSpacing="8">
             <Grid.RowDefinitions>
                 <RowDefinition Height="Auto" />
                 <RowDefinition Height="Auto" />
                 <RowDefinition Height="Auto" />
                 <RowDefinition Height="Auto" />
                 <RowDefinition Height="Auto" />
-                <RowDefinition Height="Auto" />
-                <RowDefinition Height="Auto" />
-                <RowDefinition Height="Auto" />
             </Grid.RowDefinitions>
             <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="{StaticResource ArgumentNameWidth}" />
+                <ColumnDefinition Width="Auto" />
                 <ColumnDefinition Width="*" />
             </Grid.ColumnDefinitions>
-            <TextBlock x:Uid="Actions_CommandDetails"
+            <TextBlock x:Uid="Actions_Name"
                        Grid.Row="0"
                        Grid.Column="0"
-                       Grid.ColumnSpan="2"
-                       Margin="0,0,0,12"
-                       VerticalAlignment="Center"
-                       Style="{StaticResource TextBlockGroupingStyle}" />
-            <TextBlock x:Uid="Actions_Name"
-                       Grid.Row="1"
-                       Grid.Column="0"
-                       Margin="0,0,0,8"
                        VerticalAlignment="Center" />
             <TextBox x:Name="CommandNameTextBox"
-                     Grid.Row="1"
+                     Grid.Row="0"
                      Grid.Column="1"
-                     Margin="0,0,0,8"
-                     HorizontalAlignment="Stretch"
+                     Width="300"
+                     HorizontalAlignment="Left"
                      AutomationProperties.Name="{x:Bind ViewModel.ActionNameTextBoxAutomationPropName}"
                      PlaceholderText="{x:Bind ViewModel.DisplayName, Mode=OneWay}"
                      Text="{x:Bind ViewModel.Name, Mode=TwoWay}" />
             <TextBlock x:Uid="Actions_ShortcutAction"
+                       Grid.Row="1"
+                       Grid.Column="0"
+                       VerticalAlignment="Center" />
+            <ComboBox Grid.Row="1"
+                      Grid.Column="1"
+                      VerticalAlignment="Center"
+                      AutomationProperties.Name="{x:Bind ViewModel.ShortcutActionComboBoxAutomationPropName}"
+                      ItemsSource="{x:Bind ViewModel.AvailableShortcutActions, Mode=OneWay}"
+                      SelectedItem="{x:Bind ViewModel.ProposedShortcutActionName, Mode=TwoWay}" />
+            <TextBlock x:Uid="Actions_Arguments"
                        Grid.Row="2"
                        Grid.Column="0"
-                       Margin="0,0,0,12"
-                       VerticalAlignment="Center" />
-            <AutoSuggestBox x:Name="ShortcutActionBox"
-                            Grid.Row="2"
-                            Grid.Column="1"
-                            Margin="0,0,0,12"
-                            VerticalAlignment="Center"
-                            AutomationProperties.Name="{x:Bind ViewModel.ShortcutActionComboBoxAutomationPropName}"
-                            GotFocus="ShortcutActionBox_GotFocus"
-                            LostFocus="ShortcutActionBox_LostFocus"
-                            QuerySubmitted="ShortcutActionBox_QuerySubmitted"
-                            TextChanged="ShortcutActionBox_TextChanged" />
-            <TextBlock x:Uid="Actions_Keybindings"
-                       Grid.Row="3"
-                       Grid.Column="0"
-                       Grid.ColumnSpan="2"
-                       Margin="0,0,0,12"
                        VerticalAlignment="Center"
-                       Style="{StaticResource TextBlockGroupingStyle}" />
-            <ListView x:Name="KeyChordListView"
-                      x:Uid="Actions_KeyBindingsListView"
-                      Grid.Row="4"
-                      Grid.Column="0"
-                      Grid.ColumnSpan="2"
-                      Margin="0,0,0,12"
-                      ItemTemplate="{StaticResource KeyChordTemplate}"
-                      ItemsSource="{x:Bind ViewModel.KeyChordList, Mode=OneWay}"
-                      SelectionMode="None">
-                <ListView.Footer>
-                    <Button Margin="0,4,0,0"
-                            Click="{x:Bind ViewModel.AddKeybinding_Click}">
-                        <TextBlock x:Uid="Actions_AddKeyChord" />
-                    </Button>
-                </ListView.Footer>
-            </ListView>
-            <TextBlock x:Uid="Actions_Arguments"
-                       Grid.Row="5"
-                       Grid.Column="0"
-                       Grid.ColumnSpan="2"
-                       Margin="0,0,0,12"
-                       VerticalAlignment="Center"
-                       Style="{StaticResource TextBlockGroupingStyle}"
                        Visibility="{x:Bind ViewModel.ActionArgsVM.HasArgs, Mode=OneWay}" />
-            <ItemsControl Grid.Row="6"
-                          Grid.Column="0"
-                          Grid.ColumnSpan="2"
-                          Margin="0,0,0,12"
-                          HorizontalAlignment="Stretch"
+            <ItemsControl Grid.Row="2"
+                          Grid.Column="1"
                           AutomationProperties.Name="{x:Bind ViewModel.AdditionalArgumentsControlAutomationPropName}"
                           IsTabStop="False"
                           ItemTemplateSelector="{StaticResource ArgsTemplateSelector}"
                           ItemsSource="{x:Bind ViewModel.ActionArgsVM.ArgValues, Mode=OneWay}" />
-            <Button Grid.Row="7"
+            <TextBlock x:Uid="Actions_Keybindings"
+                       Grid.Row="3"
+                       Grid.Column="0"
+                       VerticalAlignment="Center" />
+            <ListView x:Name="KeyChordListView"
+                      x:Uid="Actions_KeyBindingsListView"
+                      Grid.Row="3"
+                      Grid.Column="1"
+                      ItemTemplate="{StaticResource KeyChordTemplate}"
+                      ItemsSource="{x:Bind ViewModel.KeyChordList, Mode=OneWay}"
+                      SelectionMode="None">
+                <ListView.Header>
+                    <Button Click="{x:Bind ViewModel.AddKeybinding_Click}">
+                        <TextBlock x:Uid="Actions_AddKeyChord" />
+                    </Button>
+                </ListView.Header>
+            </ListView>
+            <Button Grid.Row="4"
                     Grid.Column="0"
                     IsEnabled="{x:Bind ViewModel.IsUserAction, Mode=OneWay}"
                     Style="{StaticResource DeleteButtonStyle}">

src/cascadia/TerminalSettingsEditor/EditColorScheme.cpp

@@ -38,9 +38,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
 
     void EditColorScheme::OnNavigatedTo(const NavigationEventArgs& e)
     {
-        const auto args = e.Parameter().as<Editor::NavigateToPageArgs>();
-        _ViewModel = args.ViewModel().as<Editor::ColorSchemeViewModel>();
-        BringIntoViewWhenLoaded(args.ElementToFocus());
+        _ViewModel = e.Parameter().as<Editor::ColorSchemeViewModel>();
 
         const auto schemeName = _ViewModel.Name();
         NameBox().Text(schemeName);

src/cascadia/TerminalSettingsEditor/EditColorScheme.xaml

@@ -200,8 +200,7 @@
             </Grid>
         </Border>
 
-        <local:SettingContainer x:Name="InboxSchemeDuplicate"
-                                x:Uid="ColorScheme_InboxSchemeDuplicate"
+        <local:SettingContainer x:Uid="ColorScheme_InboxSchemeDuplicate"
                                 Visibility="{x:Bind mtu:Converters.InvertedBooleanToVisibility(ViewModel.IsEditable), Mode=OneWay}">
             <Button x:Name="DuplicateSchemeButton"
                     x:Uid="ColorScheme_DuplicateButton"
@@ -209,8 +208,7 @@
                     Style="{StaticResource BrowseButtonStyle}" />
         </local:SettingContainer>
 
-        <local:SettingContainer x:Name="ColorsHeader"
-                                x:Uid="ColorScheme_ColorsHeader"
+        <local:SettingContainer x:Uid="ColorScheme_ColorsHeader"
                                 StartExpanded="True"
                                 Style="{StaticResource ExpanderSettingContainerStyle}"
                                 Visibility="{x:Bind ViewModel.IsEditable, Mode=OneWay}">

src/cascadia/TerminalSettingsEditor/Extensions.cpp

@@ -8,7 +8,6 @@
 #include "ExtensionsViewModel.g.cpp"
 #include "FragmentProfileViewModel.g.cpp"
 #include "ExtensionPackageTemplateSelector.g.cpp"
-#include "NavConstants.h"
 
 #include "..\WinRTUtils\inc\Utils.h"
 
@@ -34,17 +33,10 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
 
     void Extensions::OnNavigatedTo(const NavigationEventArgs& e)
     {
-        const auto args = e.Parameter().as<Editor::NavigateToPageArgs>();
-        _ViewModel = args.ViewModel().as<Editor::ExtensionsViewModel>();
-
-        // The extensions are loaded asynchronously as a part of the VM ctor.
-        // However, there's a chance that they aren't done loading yet.
-        // Calling LoadExtensions() ensures they're loaded by the time we try to display them, and it won't do anything if they're already loaded.
+        _ViewModel = e.Parameter().as<Editor::ExtensionsViewModel>();
         auto vmImpl = get_self<ExtensionsViewModel>(_ViewModel);
-        vmImpl->LoadExtensions();
         vmImpl->ExtensionPackageIdentifierTemplateSelector(_extensionPackageIdentifierTemplateSelector);
-
-        BringIntoViewWhenLoaded(args.ElementToFocus());
+        vmImpl->LazyLoadExtensions();
 
         if (vmImpl->IsExtensionView())
         {
@@ -97,10 +89,10 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
 
     ExtensionsViewModel::ExtensionsViewModel(const Model::CascadiaSettings& settings, const Editor::ColorSchemesPageViewModel& colorSchemesPageVM) :
         _settings{ settings },
-        _colorSchemesPageVM{ colorSchemesPageVM }
+        _colorSchemesPageVM{ colorSchemesPageVM },
+        _extensionsLoaded{ false }
     {
         UpdateSettings(settings, colorSchemesPageVM);
-        _LoadExtensionsAsync();
 
         PropertyChanged([this](auto&&, const PropertyChangedEventArgs& args) {
             const auto viewModelProperty{ args.PropertyName() };
@@ -220,7 +212,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         _CurrentExtensionPackage = nullptr;
 
         // The extension packages may not be loaded yet because we want to wait until we actually navigate to the page to do so.
-        // In that case, omit "updating" them. They'll get the proper references when we load them.
+        // In that case, omit "updating" them. They'll get the proper references when we lazy load them.
         if (_extensionPackages)
         {
             for (const auto& extPkg : _extensionPackages)
@@ -230,146 +222,139 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         }
     }
 
-    safe_void_coroutine ExtensionsViewModel::_LoadExtensionsAsync()
+    void ExtensionsViewModel::LazyLoadExtensions()
     {
-        auto weakThis = get_weak();
-        co_await winrt::resume_background();
-        if (auto strongThis = weakThis.get())
+        if (_extensionsLoaded)
         {
-            strongThis->LoadExtensions();
+            return;
         }
-    }
+        std::vector<Model::ExtensionPackage> extensions = wil::to_vector(_settings.Extensions());
 
-    void ExtensionsViewModel::LoadExtensions()
-    {
-        std::call_once(_extensionsLoaded, [this]() {
-            std::vector<Model::ExtensionPackage> extensions = wil::to_vector(_settings.Extensions());
-
-            // these vectors track components all extensions successfully added
-            std::vector<Editor::ExtensionPackageViewModel> extensionPackages;
-            std::vector<Editor::FragmentProfileViewModel> profilesModifiedTotal;
-            std::vector<Editor::FragmentProfileViewModel> profilesAddedTotal;
-            std::vector<Editor::FragmentColorSchemeViewModel> colorSchemesAddedTotal;
-            for (const auto& extPkg : extensions)
+        // these vectors track components all extensions successfully added
+        std::vector<Editor::ExtensionPackageViewModel> extensionPackages;
+        std::vector<Editor::FragmentProfileViewModel> profilesModifiedTotal;
+        std::vector<Editor::FragmentProfileViewModel> profilesAddedTotal;
+        std::vector<Editor::FragmentColorSchemeViewModel> colorSchemesAddedTotal;
+        for (const auto& extPkg : extensions)
+        {
+            auto extPkgVM = winrt::make_self<ExtensionPackageViewModel>(extPkg, _settings);
+            for (const auto& fragExt : extPkg.FragmentsView())
             {
-                auto extPkgVM = winrt::make_self<ExtensionPackageViewModel>(extPkg, _settings);
-                for (const auto& fragExt : extPkg.FragmentsView())
+                const auto extensionEnabled = GetExtensionState(fragExt.Source(), _settings);
+
+                // these vectors track everything the current extension attempted to bring in
+                std::vector<Editor::FragmentProfileViewModel> currentProfilesModified;
+                std::vector<Editor::FragmentProfileViewModel> currentProfilesAdded;
+                std::vector<Editor::FragmentColorSchemeViewModel> currentColorSchemesAdded;
+
+                if (fragExt.ModifiedProfilesView())
                 {
-                    const auto extensionEnabled = GetExtensionState(fragExt.Source(), _settings);
-
-                    // these vectors track everything the current extension attempted to bring in
-                    std::vector<Editor::FragmentProfileViewModel> currentProfilesModified;
-                    std::vector<Editor::FragmentProfileViewModel> currentProfilesAdded;
-                    std::vector<Editor::FragmentColorSchemeViewModel> currentColorSchemesAdded;
-
-                    if (fragExt.ModifiedProfilesView())
+                    for (const auto&& entry : fragExt.ModifiedProfilesView())
                     {
-                        for (const auto&& entry : fragExt.ModifiedProfilesView())
+                        // Ensure entry successfully modifies a profile before creating and registering the object
+                        if (const auto& deducedProfile = _settings.FindProfile(entry.ProfileGuid()))
                         {
-                            // Ensure entry successfully modifies a profile before creating and registering the object
-                            if (const auto& deducedProfile = _settings.FindProfile(entry.ProfileGuid()))
+                            auto vm = winrt::make<FragmentProfileViewModel>(entry, fragExt, deducedProfile);
+                            currentProfilesModified.push_back(vm);
+                            if (extensionEnabled)
                             {
-                                auto vm = winrt::make<FragmentProfileViewModel>(entry, fragExt, deducedProfile);
-                                currentProfilesModified.push_back(vm);
-                                if (extensionEnabled)
-                                {
-                                    profilesModifiedTotal.push_back(vm);
-                                }
+                                profilesModifiedTotal.push_back(vm);
                             }
                         }
                     }
-
-                    if (fragExt.NewProfilesView())
-                    {
-                        for (const auto&& entry : fragExt.NewProfilesView())
-                        {
-                            // Ensure entry successfully points to a profile before creating and registering the object.
-                            // The profile may have been removed by the user.
-                            if (const auto& deducedProfile = _settings.FindProfile(entry.ProfileGuid()))
-                            {
-                                auto vm = winrt::make<FragmentProfileViewModel>(entry, fragExt, deducedProfile);
-                                currentProfilesAdded.push_back(vm);
-                                if (extensionEnabled)
-                                {
-                                    profilesAddedTotal.push_back(vm);
-                                }
-                            }
-                        }
-                    }
-
-                    if (fragExt.ColorSchemesView())
-                    {
-                        for (const auto&& entry : fragExt.ColorSchemesView())
-                        {
-                            for (const auto& schemeVM : _colorSchemesPageVM.AllColorSchemes())
-                            {
-                                if (schemeVM.Name() == entry.ColorSchemeName())
-                                {
-                                    auto vm = winrt::make<FragmentColorSchemeViewModel>(entry, fragExt, schemeVM);
-                                    currentColorSchemesAdded.push_back(vm);
-                                    if (extensionEnabled)
-                                    {
-                                        colorSchemesAddedTotal.push_back(vm);
-                                    }
-                                }
-                            }
-                        }
-                    }
-
-                    // sort the lists linguistically for nicer presentation
-                    std::sort(currentProfilesModified.begin(), currentProfilesModified.end(), FragmentProfileViewModel::SortAscending);
-                    std::sort(currentProfilesAdded.begin(), currentProfilesAdded.end(), FragmentProfileViewModel::SortAscending);
-                    std::sort(currentColorSchemesAdded.begin(), currentColorSchemesAdded.end(), FragmentColorSchemeViewModel::SortAscending);
-
-                    extPkgVM->FragmentExtensions().Append(winrt::make<FragmentExtensionViewModel>(fragExt, currentProfilesModified, currentProfilesAdded, currentColorSchemesAdded));
-                    extPkgVM->PropertyChanged([&](const IInspectable& sender, const PropertyChangedEventArgs& args) {
-                        const auto viewModelProperty{ args.PropertyName() };
-                        if (viewModelProperty == L"Enabled")
-                        {
-                            // If the extension was enabled/disabled,
-                            // check if any of its fragments modified profiles, added profiles, or added color schemes.
-                            // Only notify what was affected!
-                            bool hasModifiedProfiles = false;
-                            bool hasAddedProfiles = false;
-                            bool hasAddedColorSchemes = false;
-                            for (const auto& fragExtVM : sender.as<ExtensionPackageViewModel>()->FragmentExtensions())
-                            {
-                                const auto profilesModified = fragExtVM.ProfilesModified();
-                                const auto profilesAdded = fragExtVM.ProfilesAdded();
-                                const auto colorSchemesAdded = fragExtVM.ColorSchemesAdded();
-                                hasModifiedProfiles |= profilesModified && profilesModified.Size() > 0;
-                                hasAddedProfiles |= profilesAdded && profilesAdded.Size() > 0;
-                                hasAddedColorSchemes |= colorSchemesAdded && colorSchemesAdded.Size() > 0;
-                            }
-                            if (hasModifiedProfiles)
-                            {
-                                _NotifyChanges(L"ProfilesModified");
-                            }
-                            if (hasAddedProfiles)
-                            {
-                                _NotifyChanges(L"ProfilesAdded");
-                            }
-                            if (hasAddedColorSchemes)
-                            {
-                                _NotifyChanges(L"ColorSchemesAdded");
-                            }
-                        }
-                    });
                 }
-                extensionPackages.push_back(*extPkgVM);
+
+                if (fragExt.NewProfilesView())
+                {
+                    for (const auto&& entry : fragExt.NewProfilesView())
+                    {
+                        // Ensure entry successfully points to a profile before creating and registering the object.
+                        // The profile may have been removed by the user.
+                        if (const auto& deducedProfile = _settings.FindProfile(entry.ProfileGuid()))
+                        {
+                            auto vm = winrt::make<FragmentProfileViewModel>(entry, fragExt, deducedProfile);
+                            currentProfilesAdded.push_back(vm);
+                            if (extensionEnabled)
+                            {
+                                profilesAddedTotal.push_back(vm);
+                            }
+                        }
+                    }
+                }
+
+                if (fragExt.ColorSchemesView())
+                {
+                    for (const auto&& entry : fragExt.ColorSchemesView())
+                    {
+                        for (const auto& schemeVM : _colorSchemesPageVM.AllColorSchemes())
+                        {
+                            if (schemeVM.Name() == entry.ColorSchemeName())
+                            {
+                                auto vm = winrt::make<FragmentColorSchemeViewModel>(entry, fragExt, schemeVM);
+                                currentColorSchemesAdded.push_back(vm);
+                                if (extensionEnabled)
+                                {
+                                    colorSchemesAddedTotal.push_back(vm);
+                                }
+                            }
+                        }
+                    }
+                }
+
+                // sort the lists linguistically for nicer presentation
+                std::sort(currentProfilesModified.begin(), currentProfilesModified.end(), FragmentProfileViewModel::SortAscending);
+                std::sort(currentProfilesAdded.begin(), currentProfilesAdded.end(), FragmentProfileViewModel::SortAscending);
+                std::sort(currentColorSchemesAdded.begin(), currentColorSchemesAdded.end(), FragmentColorSchemeViewModel::SortAscending);
+
+                extPkgVM->FragmentExtensions().Append(winrt::make<FragmentExtensionViewModel>(fragExt, currentProfilesModified, currentProfilesAdded, currentColorSchemesAdded));
+                extPkgVM->PropertyChanged([&](const IInspectable& sender, const PropertyChangedEventArgs& args) {
+                    const auto viewModelProperty{ args.PropertyName() };
+                    if (viewModelProperty == L"Enabled")
+                    {
+                        // If the extension was enabled/disabled,
+                        // check if any of its fragments modified profiles, added profiles, or added color schemes.
+                        // Only notify what was affected!
+                        bool hasModifiedProfiles = false;
+                        bool hasAddedProfiles = false;
+                        bool hasAddedColorSchemes = false;
+                        for (const auto& fragExtVM : sender.as<ExtensionPackageViewModel>()->FragmentExtensions())
+                        {
+                            const auto profilesModified = fragExtVM.ProfilesModified();
+                            const auto profilesAdded = fragExtVM.ProfilesAdded();
+                            const auto colorSchemesAdded = fragExtVM.ColorSchemesAdded();
+                            hasModifiedProfiles |= profilesModified && profilesModified.Size() > 0;
+                            hasAddedProfiles |= profilesAdded && profilesAdded.Size() > 0;
+                            hasAddedColorSchemes |= colorSchemesAdded && colorSchemesAdded.Size() > 0;
+                        }
+                        if (hasModifiedProfiles)
+                        {
+                            _NotifyChanges(L"ProfilesModified");
+                        }
+                        if (hasAddedProfiles)
+                        {
+                            _NotifyChanges(L"ProfilesAdded");
+                        }
+                        if (hasAddedColorSchemes)
+                        {
+                            _NotifyChanges(L"ColorSchemesAdded");
+                        }
+                    }
+                });
             }
+            extensionPackages.push_back(*extPkgVM);
+        }
 
-            // sort the lists linguistically for nicer presentation
-            std::sort(extensionPackages.begin(), extensionPackages.end(), ExtensionPackageViewModel::SortAscending);
-            std::sort(profilesModifiedTotal.begin(), profilesModifiedTotal.end(), FragmentProfileViewModel::SortAscending);
-            std::sort(profilesAddedTotal.begin(), profilesAddedTotal.end(), FragmentProfileViewModel::SortAscending);
-            std::sort(colorSchemesAddedTotal.begin(), colorSchemesAddedTotal.end(), FragmentColorSchemeViewModel::SortAscending);
+        // sort the lists linguistically for nicer presentation
+        std::sort(extensionPackages.begin(), extensionPackages.end(), ExtensionPackageViewModel::SortAscending);
+        std::sort(profilesModifiedTotal.begin(), profilesModifiedTotal.end(), FragmentProfileViewModel::SortAscending);
+        std::sort(profilesAddedTotal.begin(), profilesAddedTotal.end(), FragmentProfileViewModel::SortAscending);
+        std::sort(colorSchemesAddedTotal.begin(), colorSchemesAddedTotal.end(), FragmentColorSchemeViewModel::SortAscending);
 
-            _extensionPackages = single_threaded_observable_vector<Editor::ExtensionPackageViewModel>(std::move(extensionPackages));
-            _profilesModifiedView = single_threaded_observable_vector<Editor::FragmentProfileViewModel>(std::move(profilesModifiedTotal));
-            _profilesAddedView = single_threaded_observable_vector<Editor::FragmentProfileViewModel>(std::move(profilesAddedTotal));
-            _colorSchemesAddedView = single_threaded_observable_vector<Editor::FragmentColorSchemeViewModel>(std::move(colorSchemesAddedTotal));
-        });
+        _extensionPackages = single_threaded_observable_vector<Editor::ExtensionPackageViewModel>(std::move(extensionPackages));
+        _profilesModifiedView = single_threaded_observable_vector<Editor::FragmentProfileViewModel>(std::move(profilesModifiedTotal));
+        _profilesAddedView = single_threaded_observable_vector<Editor::FragmentProfileViewModel>(std::move(profilesAddedTotal));
+        _colorSchemesAddedView = single_threaded_observable_vector<Editor::FragmentColorSchemeViewModel>(std::move(colorSchemesAddedTotal));
+        _extensionsLoaded = true;
     }
 
     Windows::UI::Xaml::DataTemplate ExtensionsViewModel::CurrentExtensionPackageIdentifierTemplate() const
@@ -467,20 +452,6 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         }
     }
 
-    hstring ExtensionPackageViewModel::DisplayName() const noexcept
-    {
-        // Fragment extensions may not have a DisplayName, so fall back to Source
-        const auto displayName = _package.DisplayName();
-        return displayName.empty() ? _package.Source() : displayName;
-    }
-
-    hstring ExtensionPackageViewModel::Icon() const noexcept
-    {
-        // Fragment extensions may not have an Icon, so fall back to the extensions nav icon glyph
-        const auto icon = _package.Icon();
-        return icon.empty() ? NavTagIconMap[extensionsTag] : icon;
-    }
-
     hstring ExtensionPackageViewModel::Scope() const noexcept
     {
         return _package.Scope() == Model::FragmentScope::User ? RS_(L"Extensions_ScopeUser") : RS_(L"Extensions_ScopeSystem");

src/cascadia/TerminalSettingsEditor/Extensions.h

@@ -48,14 +48,13 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         bool NoSchemesAdded() const noexcept { return _colorSchemesAddedView.Size() == 0; }
 
         // Views
-        // NOTE: the extensions are being loaded asynchronously in the ctor. _extensionPackages may be null in that brief window of time.
-        Windows::Foundation::Collections::IObservableVector<Editor::ExtensionPackageViewModel> ExtensionPackages() const noexcept { return _extensionPackages ? _extensionPackages : single_threaded_observable_vector<Editor::ExtensionPackageViewModel>(); }
+        Windows::Foundation::Collections::IObservableVector<Editor::ExtensionPackageViewModel> ExtensionPackages() const noexcept { return _extensionPackages; }
         Windows::Foundation::Collections::IObservableVector<Editor::FragmentProfileViewModel> ProfilesModified() const noexcept { return _profilesModifiedView; }
         Windows::Foundation::Collections::IObservableVector<Editor::FragmentProfileViewModel> ProfilesAdded() const noexcept { return _profilesAddedView; }
         Windows::Foundation::Collections::IObservableVector<Editor::FragmentColorSchemeViewModel> ColorSchemesAdded() const noexcept { return _colorSchemesAddedView; }
 
         // Methods
-        void LoadExtensions();
+        void LazyLoadExtensions();
         void UpdateSettings(const Model::CascadiaSettings& settings, const Editor::ColorSchemesPageViewModel& colorSchemesPageVM);
         void NavigateToProfile(const guid profileGuid);
         void NavigateToColorScheme(const Editor::ColorSchemeViewModel& schemeVM);
@@ -76,9 +75,8 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         Windows::Foundation::Collections::IObservableVector<Editor::FragmentProfileViewModel> _profilesModifiedView;
         Windows::Foundation::Collections::IObservableVector<Editor::FragmentProfileViewModel> _profilesAddedView;
         Windows::Foundation::Collections::IObservableVector<Editor::FragmentColorSchemeViewModel> _colorSchemesAddedView;
-        std::once_flag _extensionsLoaded;
+        bool _extensionsLoaded;
 
-        safe_void_coroutine _LoadExtensionsAsync();
         void _UpdateListViews(bool updateProfilesModified, bool updateProfilesAdded, bool updateColorSchemesAdded);
     };
 
@@ -95,8 +93,6 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         void UpdateSettings(const Model::CascadiaSettings& settings);
 
         Model::ExtensionPackage Package() const noexcept { return _package; }
-        hstring DisplayName() const noexcept;
-        hstring Icon() const noexcept;
         hstring Scope() const noexcept;
         bool Enabled() const;
         void Enabled(bool val);

src/cascadia/TerminalSettingsEditor/Extensions.idl

@@ -40,8 +40,6 @@ namespace Microsoft.Terminal.Settings.Editor
     [default_interface] runtimeclass ExtensionPackageViewModel : Windows.UI.Xaml.Data.INotifyPropertyChanged
     {
         Microsoft.Terminal.Settings.Model.ExtensionPackage Package { get; };
-        String DisplayName { get; };
-        String Icon { get; };
         Boolean Enabled;
         String Scope { get; };
         String AccessibleName { get; };

src/cascadia/TerminalSettingsEditor/Extensions.xaml

@@ -500,8 +500,7 @@
                 <muxc:Expander.Content>
                     <StackPanel>
                         <!--  Scope  -->
-                        <local:SettingContainer x:Name="Scope"
-                                                x:Uid="Extensions_Scope"
+                        <local:SettingContainer x:Uid="Extensions_Scope"
                                                 Content="{x:Bind ViewModel.CurrentExtensionPackage.Scope, Mode=OneWay}"
                                                 IsTabStop="False"
                                                 Style="{StaticResource SettingContainerWithTextContent}" />

src/cascadia/TerminalSettingsEditor/GlobalAppearance.cpp

@@ -23,9 +23,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
 
     void GlobalAppearance::OnNavigatedTo(const NavigationEventArgs& e)
     {
-        const auto args = e.Parameter().as<Editor::NavigateToPageArgs>();
-        _ViewModel = args.ViewModel().as<Editor::GlobalAppearanceViewModel>();
-        BringIntoViewWhenLoaded(args.ElementToFocus());
+        _ViewModel = e.Parameter().as<Editor::GlobalAppearanceViewModel>();
 
         TraceLoggingWrite(
             g_hTerminalSettingsEditorProvider,

src/cascadia/TerminalSettingsEditor/GlobalAppearance.idl

@@ -5,7 +5,7 @@ import "GlobalAppearanceViewModel.idl";
 
 namespace Microsoft.Terminal.Settings.Editor
 {
-    runtimeclass GlobalAppearance : Windows.UI.Xaml.Controls.Page
+    [default_interface] runtimeclass GlobalAppearance : Windows.UI.Xaml.Controls.Page
     {
         GlobalAppearance();
         GlobalAppearanceViewModel ViewModel { get; };