Improve performance and binary size of til::enumset (#11493)

This commit approximately doubles the performance of til::enumset
and reduces it's binary footprint by approximately 1kB.
Most of the binary size can be attributed to exception handling.

Unfortunately this commit removes assertions that the given values are less than
the number of bits in the `underlying_type`. However I believe this to be a good
trade-off as the tests previously only happened at runtime, while tests at
compile time would be highly preferable. Such tests are technically possible,
however MSVC fails to compile (valid) `static_assert`s containing
`static_cast`s over a parameter pack at the time of writing.
With future MSVC versions such checks can be added to this class.

This change was initially discussed in #10492, but was forgotten to
be considered before it was merged. Since the work was already done,
this commit re-introduces the optimization. It's free!

## PR Checklist
* [x] I work here.
* [x] Tests added/passed

## Validation Steps Performed
* Run `printf '\e]8;;http://example.com\e\\This is a link\e]8;;\e\\\n'` in WSL
* A wild dotted line appears ✔️

.gitattributes

@@ -3,6 +3,8 @@
 ###############################################################################
 * -text
 
+*.inc linguist-language=cpp
+
 ###############################################################################
 # Set default behavior for command prompt diff.
 #

.github/ISSUE_TEMPLATE/Bug_Report.yml

@@ -10,14 +10,21 @@ body:
 
 - type: input
   attributes:
-    label: Windows Terminal version (or Windows build number)
-    placeholder: "10.0.19042.0, 1.7.3651.0"
+    label: Windows Terminal version
+    placeholder: "1.7.3651.0"
     description: |
-      If you are reporting an issue in Windows Terminal, you can find the version in the about dialog.
-
-      If you are reporting an issue with the Windows Console, please run `ver` or `[Environment]::OSVersion`.
+      You can find the version in the about dialog, or by running `wt -v` at the commandline.
   validations:
-    required: true
+    required: false
+    
+- type: input
+  attributes:
+    label: Windows build number
+    placeholder: "10.0.19042.0"
+    description: |
+      Please run `ver` or `[Environment]::OSVersion`.
+  validations:
+    required: false
 
 - type: textarea
   attributes:

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

@@ -1,12 +1,14 @@
+admins
 apc
+Apc
+bsd
 calt
 ccmp
 changelog
-cybersecurity
-Apc
 clickable
 clig
 copyable
+cybersecurity
 dalet
 dcs
 Dcs
@@ -30,20 +32,22 @@ hyperlink
 hyperlinking
 hyperlinks
 img
+inlined
 It'd
 kje
 liga
 lje
-locl
-lorem
 Llast
 Lmid
+locl
+lorem
 Lorigin
 maxed
 mkmk
+mnt
 mru
-noreply
 nje
+noreply
 ogonek
 ok'd
 overlined

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

@@ -1,5 +1,7 @@
 ACCEPTFILES
 ACCESSDENIED
+acl
+aclapi
 alignas
 alignof
 APPLYTOSUBMENUS
@@ -9,6 +11,7 @@ BUILDBRANCH
 BUILDMSG
 BUILDNUMBER
 BYPOSITION
+BYCOMMAND
 charconv
 CLASSNOTAVAILABLE
 cmdletbinding
@@ -16,15 +19,18 @@ COLORPROPERTY
 colspan
 COMDLG
 comparand
+commandlinetoargv
 cstdint
 CXICON
 CYICON
+Dacl
 dataobject
 dcomp
 DERR
 dlldata
 DONTADDTORECENT
 DWORDLONG
+enumset
 environstrings
 EXPCMDFLAGS
 EXPCMDSTATE
@@ -84,6 +90,7 @@ LSHIFT
 MENUCOMMAND
 MENUDATA
 MENUINFO
+MENUITEMINFOW
 memicmp
 mptt
 mov
@@ -113,15 +120,19 @@ OSVERSIONINFOEXW
 otms
 OUTLINETEXTMETRICW
 overridable
+PACL
 PAGESCROLL
+PEXPLICIT
 PICKFOLDERS
 pmr
+ptstr
 rcx
 REGCLS
 RETURNCMD
 rfind
 roundf
 RSHIFT
+SACL
 schandle
 semver
 serializer
@@ -158,6 +169,8 @@ toupper
 TTask
 TVal
 UChar
+UFIELD
+ULARGE
 UPDATEINIFILE
 userenv
 wcsstr

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

@@ -1,3 +1,11 @@
+atan
+CPrime
+HBar
+HPrime
 isnan
+LPrime
+LStep
 powf
+RSub
 sqrtf
+ULP

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

@@ -1,5 +1,6 @@
 ACLs
 ADMINS
+advapi
 altform
 altforms
 appendwttlogging
@@ -15,6 +16,7 @@ CPLs
 cpptools
 cppvsdbg
 CPRs
+cryptbase
 DACL
 DACLs
 diffs
@@ -24,7 +26,9 @@ DTDs
 DWINRT
 enablewttlogging
 Intelli
+IVisual
 LKG
+LOCKFILE
 Lxss
 mfcribbon
 microsoft
@@ -44,6 +48,7 @@ powershell
 propkey
 pscustomobject
 QWORD
+regedit
 robocopy
 SACLs
 sdkddkver

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

@@ -9,6 +9,7 @@ Diviness
 dsafa
 duhowett
 ekg
+eryksun
 ethanschoonover
 Firefox
 Gatta

.github/actions/spelling/excludes.txt

@@ -61,12 +61,14 @@ SUMS$
 ^src/host/runft\.bat$
 ^src/host/runut\.bat$
 ^src/interactivity/onecore/BgfxEngine\.
+^src/renderer/atlas/
 ^src/renderer/wddmcon/WddmConRenderer\.
 ^src/terminal/adapter/ut_adapter/run\.bat$
 ^src/terminal/parser/delfuzzpayload\.bat$
 ^src/terminal/parser/ft_fuzzer/run\.bat$
 ^src/terminal/parser/ft_fuzzer/VTCommandFuzzer\.cpp$
 ^src/terminal/parser/ft_fuzzwrapper/run\.bat$
+^src/terminal/parser/ut_parser/Base64Test.cpp$
 ^src/terminal/parser/ut_parser/run\.bat$
 ^src/tools/integrity/packageuwp/ConsoleUWP\.appxSources$
 ^src/tools/lnkd/lnkd\.bat$

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

@@ -189,13 +189,12 @@ cacafire
 callee
 capslock
 CARETBLINKINGENABLED
+carlos
 CARRIAGERETURN
 cascadia
 cassert
 castsi
 catid
-carlos
-zamora
 cazamor
 CBash
 cbegin
@@ -509,6 +508,7 @@ dealloc
 Debian
 debolden
 debugtype
+DECAC
 DECALN
 DECANM
 DECAUPSS
@@ -669,6 +669,7 @@ dwriteglyphrundescriptionclustermap
 dxgi
 dxgidwm
 dxinterop
+dxsm
 dxttbmp
 eachother
 eae
@@ -938,6 +939,7 @@ GTP
 guc
 gui
 guidatom
+guiddef
 GValue
 GWL
 GWLP
@@ -1232,6 +1234,7 @@ KLF
 KLMNO
 KLMNOPQRST
 KLMNOPQRSTQQQQQ
+KPRIORITY
 KVM
 langid
 LANGUAGELIST
@@ -1534,6 +1537,7 @@ NOCOLOR
 NOCOMM
 NOCONTEXTHELP
 NOCOPYBITS
+nodefaultlib
 nodiscard
 NODUP
 noexcept
@@ -1642,6 +1646,7 @@ onecoreuapuuid
 onecoreuuid
 ONECOREWINDOWS
 onehalf
+oneseq
 ONLCR
 openbash
 opencode
@@ -1708,6 +1713,7 @@ pcch
 PCCHAR
 PCCONSOLE
 PCD
+pcg
 pch
 PCHAR
 PCIDLIST
@@ -1803,6 +1809,7 @@ POSX
 POSXSCROLL
 POSYSCROLL
 ppci
+PPEB
 ppf
 ppguid
 ppidl
@@ -2022,6 +2029,7 @@ Rike
 RIPMSG
 RIS
 RMENU
+rng
 roadmap
 robomac
 roundtrip
@@ -2227,6 +2235,7 @@ STARTWPARMSW
 Statusline
 stdafx
 STDAPI
+stdc
 stdcall
 stdcpp
 stderr
@@ -2724,6 +2733,7 @@ wixproj
 wline
 wlinestream
 wmain
+wmemory
 WMSZ
 wnd
 WNDALLOC
@@ -2850,6 +2860,7 @@ YSize
 YSubstantial
 YVIRTUALSCREEN
 YWalk
+zamora
 ZCmd
 ZCtrl
 zsh

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

@@ -1,5 +1,7 @@
 http
 www
+easyrgb
+php
 ecma
 rapidtables
 WCAG

.github/actions/spelling/patterns/patterns.txt

@@ -4,7 +4,7 @@ https://www\.itscj\.ipsj\.or\.jp/iso-ir/[-0-9]+\.pdf
 https://www\.vt100\.net/docs/[-a-zA-Z0-9#_\/.]*
 https://www.w3.org/[-a-zA-Z0-9?&=\/_#]*
 https://(?:(?:www\.|)youtube\.com|youtu.be)/[-a-zA-Z0-9?&=]*
-https://(?:[a-z-]+\.|)github(?:usercontent|)\.com/[-a-zA-Z0-9?%&=_\/.]*
+https://(?:[a-z-]+\.|)github(?:usercontent|)\.com/[-a-zA-Z0-9?%&=_\/.+]*
 https://www.xfree86.org/[-a-zA-Z0-9?&=\/_#]*
 [Pp]ublicKeyToken="?[0-9a-fA-F]{16}"?
 (?:[{"]|UniqueIdentifier>)[0-9a-fA-F]{8}-(?:[0-9a-fA-F]{4}-){3}[0-9a-fA-F]{12}(?:[}"]|</UniqueIdentifier)
@@ -24,3 +24,4 @@ VERIFY_ARE_EQUAL\(L"[^"]+"
 std::memory_order_[\w]+
 D2DERR_SHADER_COMPILE_FAILED
 TIL_FEATURE_[0-9A-Z_]+
+vcvars\w*

.vsconfig

@@ -17,7 +17,7 @@
     "Microsoft.Net.Component.4.5.TargetingPack",
     "Microsoft.VisualStudio.Component.DiagnosticTools",
     "Microsoft.VisualStudio.Component.Debugger.JustInTime",
-    "Microsoft.VisualStudio.Component.Windows10SDK.19041",
+    "Microsoft.VisualStudio.Component.Windows10SDK.22000",
     "Microsoft.VisualStudio.ComponentGroup.UWP.Support",
     "Microsoft.VisualStudio.Component.VC.CoreIde",
     "Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Core",

CONTRIBUTING.md

@@ -99,15 +99,29 @@ If you don't have any additional info/context to add but would like to indicate
 
 ## Contributing fixes / features
 
-For those able & willing to help fix issues and/or implement features ...
+If you're able & willing to help fix issues and/or implement features, we'd love your contribution!
+
+The best place to start is the list of ["Easy Starter"](https://github.com/microsoft/terminal/issues?q=is%3Aopen+is%3Aissue+label%3A%22Help+Wanted%22+label%3A%22Easy+Starter%22+) issues. These are bugs or tasks that we on the team believe would be easier to implement for someone without any prior experience in the codebase. Once you're feeling more comfortable in the codebase, feel free to just use the ["Help Wanted"](https://github.com/microsoft/terminal/issues?q=is%3Aopen+is%3Aissue+label%3A%22Help+Wanted%22+) label, or just find an issue your interested in and hop in!
+
+Generally, we categorize issues in the following way, which is largely derived from our old internal work tracking system:
+* ["Bugs"](https://github.com/microsoft/terminal/issues?q=is%3Aopen+is%3Aissue+label%3A%22Issue-Bug%22+) are parts of the Terminal & Console that are not quite working the right way. There's code to already support some scenario, but it's not quite working right. Fixing these is generally a matter of debugging the broken functionality and fixing the wrong code.
+* ["Tasks"](https://github.com/microsoft/terminal/issues?q=is%3Aopen+is%3Aissue+label%3A%22Issue-Task%22+) are usually new pieces of functionality that aren't yet implemented for the Terminal/Console. These are usually smaller features, which we believe
+  - could be a single, atomic PR
+  - Don't require much design consideration, or we've already written the spec for the larger feature they belong to.
+* ["Features"](https://github.com/microsoft/terminal/issues?q=is%3Aopen+is%3Aissue+label%3A%22Issue-Feature%22+) are larger pieces of new functionality. These are usually things we believe would require larger discussion of how they should be implemented, or they'll require some complicated new settings. They might just be features that are composed of many individual tasks. Often times, with features, we like to have a spec written before development work is started, to make sure we're all on the same page (see below).
+
+Bugs and tasks are obviously the easiest to get started with, but don't feel afraid of features either! We've had some community members contribute some amazing "feature"-level work to the Terminal (albeit, with lots of discussion 😄).
+
+
+Often, we like to assign issues that generally belong to somebody's area of expertise to the team member that owns that area. This doesn't mean the community can't jump in -- they should reach out and have a chat with the assignee to see if it'd okay to take. If an issue's been assigned more than a month ago, there's a good chance it's fair game to try yourself.
 
 ### To Spec or not to Spec
 
 Some issues/features may be quick and simple to describe and understand. For such scenarios, once a team member has agreed with your approach, skip ahead to the section headed "Fork, Branch, and Create your PR", below.
 
-Small issues that do not require a spec will be labelled Issue-Bug or Issue-Task.
+Small issues that do not require a spec will be labelled `Issue-Bug` or `Issue-Task`.
 
-However, some issues/features will require careful thought & formal design before implementation. For these scenarios, we'll request that a spec is written and the associated issue will be labeled Issue-Feature.
+However, some issues/features will require careful thought & formal design before implementation. For these scenarios, we'll request that a spec is written and the associated issue will be labeled `Issue-Feature`. More often than not, we'll add such features to the ["Specification Tracker" project](https://github.com/microsoft/terminal/projects/1).
 
 Specs help collaborators discuss different approaches to solve a problem, describe how the feature will behave, how the feature will impact the user, what happens if something goes wrong, etc. Driving towards agreement in a spec, before any code is written, often results in simpler code, and less wasted effort in the long run.
 
@@ -125,7 +139,7 @@ Team members will be happy to help review specs and guide them to completion.
 
 ### Help Wanted
 
-Once the team have approved an issue/spec, development can proceed. If no developers are immediately available, the spec can be parked ready for a developer to get started. Parked specs' issues will be labeled "Help Wanted". To find a list of development opportunities waiting for developer involvement, visit the Issues and filter on [the Help-Wanted label](https://github.com/microsoft/terminal/labels/Help%20Wanted).
+Once the team has approved an issue/spec, development can proceed. If no developers are immediately available, the spec can be parked ready for a developer to get started. Parked specs' issues will be labeled "Help Wanted". To find a list of development opportunities waiting for developer involvement, visit the Issues and filter on [the Help-Wanted label](https://github.com/microsoft/terminal/labels/Help%20Wanted).
 
 ---
 

NOTICE.md

@@ -117,7 +117,6 @@ LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
 ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
 ```
 
 ## dynamic_bitset
@@ -148,7 +147,6 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
-
 ```
 
 ## \{fmt\}
@@ -215,7 +213,6 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
-
 ```
 
 
@@ -249,7 +246,71 @@ SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
 FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
 ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 DEALINGS IN THE SOFTWARE.
+```
 
+## PCG Random Number Generation
+
+**Source**: [https://github.com/imneme/pcg-cpp](https://github.com/imneme/pcg-cpp)
+
+### License
+
+```
+Copyright (c) 2014-2017 Melissa O'Neill and PCG Project contributors
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+```
+
+## ConEmu
+**Source**: [https://github.com/Maximus5/ConEmu](https://github.com/Maximus5/ConEmu)
+
+### License
+
+```
+BSD 3-Clause License
+
+Copyright (c) 2009-2017, Maximus5 <ConEmu.Maximus5@gmail.com>
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, this
+  list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
+
+* Neither the name of the copyright holder nor the names of its
+  contributors may be used to endorse or promote products derived from
+  this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 ```
 
 # Microsoft Open Source

OpenConsole.sln

@@ -400,6 +400,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WindowsTerminal.UIA.Tests",
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "api-ms-win-core-synch-l1-2-0", "src\api-ms-win-core-synch-l1-2-0\api-ms-win-core-synch-l1-2-0.vcxproj", "{9CF74355-F018-4C19-81AD-9DC6B7F2C6F5}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RendererAtlas", "src\renderer\atlas\atlas.vcxproj", "{8222900C-8B6C-452A-91AC-BE95DB04B95F}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		AuditMode|Any CPU = AuditMode|Any CPU
@@ -3339,6 +3341,46 @@ Global
 		{9CF74355-F018-4C19-81AD-9DC6B7F2C6F5}.Release|x64.Build.0 = Release|x64
 		{9CF74355-F018-4C19-81AD-9DC6B7F2C6F5}.Release|x86.ActiveCfg = Release|Win32
 		{9CF74355-F018-4C19-81AD-9DC6B7F2C6F5}.Release|x86.Build.0 = Release|Win32
+		{8222900C-8B6C-452A-91AC-BE95DB04B95F}.AuditMode|Any CPU.ActiveCfg = AuditMode|Win32
+		{8222900C-8B6C-452A-91AC-BE95DB04B95F}.AuditMode|ARM.ActiveCfg = AuditMode|Win32
+		{8222900C-8B6C-452A-91AC-BE95DB04B95F}.AuditMode|ARM64.ActiveCfg = AuditMode|ARM64
+		{8222900C-8B6C-452A-91AC-BE95DB04B95F}.AuditMode|ARM64.Build.0 = AuditMode|ARM64
+		{8222900C-8B6C-452A-91AC-BE95DB04B95F}.AuditMode|DotNet_x64Test.ActiveCfg = AuditMode|Win32
+		{8222900C-8B6C-452A-91AC-BE95DB04B95F}.AuditMode|DotNet_x86Test.ActiveCfg = AuditMode|Win32
+		{8222900C-8B6C-452A-91AC-BE95DB04B95F}.AuditMode|x64.ActiveCfg = AuditMode|x64
+		{8222900C-8B6C-452A-91AC-BE95DB04B95F}.AuditMode|x64.Build.0 = AuditMode|x64
+		{8222900C-8B6C-452A-91AC-BE95DB04B95F}.AuditMode|x86.ActiveCfg = AuditMode|Win32
+		{8222900C-8B6C-452A-91AC-BE95DB04B95F}.AuditMode|x86.Build.0 = AuditMode|Win32
+		{8222900C-8B6C-452A-91AC-BE95DB04B95F}.Debug|Any CPU.ActiveCfg = Debug|Win32
+		{8222900C-8B6C-452A-91AC-BE95DB04B95F}.Debug|ARM.ActiveCfg = Debug|Win32
+		{8222900C-8B6C-452A-91AC-BE95DB04B95F}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{8222900C-8B6C-452A-91AC-BE95DB04B95F}.Debug|ARM64.Build.0 = Debug|ARM64
+		{8222900C-8B6C-452A-91AC-BE95DB04B95F}.Debug|DotNet_x64Test.ActiveCfg = Debug|Win32
+		{8222900C-8B6C-452A-91AC-BE95DB04B95F}.Debug|DotNet_x86Test.ActiveCfg = Debug|Win32
+		{8222900C-8B6C-452A-91AC-BE95DB04B95F}.Debug|x64.ActiveCfg = Debug|x64
+		{8222900C-8B6C-452A-91AC-BE95DB04B95F}.Debug|x64.Build.0 = Debug|x64
+		{8222900C-8B6C-452A-91AC-BE95DB04B95F}.Debug|x86.ActiveCfg = Debug|Win32
+		{8222900C-8B6C-452A-91AC-BE95DB04B95F}.Debug|x86.Build.0 = Debug|Win32
+		{8222900C-8B6C-452A-91AC-BE95DB04B95F}.Fuzzing|Any CPU.ActiveCfg = Fuzzing|Win32
+		{8222900C-8B6C-452A-91AC-BE95DB04B95F}.Fuzzing|ARM.ActiveCfg = Fuzzing|Win32
+		{8222900C-8B6C-452A-91AC-BE95DB04B95F}.Fuzzing|ARM64.ActiveCfg = Fuzzing|ARM64
+		{8222900C-8B6C-452A-91AC-BE95DB04B95F}.Fuzzing|ARM64.Build.0 = Fuzzing|ARM64
+		{8222900C-8B6C-452A-91AC-BE95DB04B95F}.Fuzzing|DotNet_x64Test.ActiveCfg = Fuzzing|Win32
+		{8222900C-8B6C-452A-91AC-BE95DB04B95F}.Fuzzing|DotNet_x86Test.ActiveCfg = Fuzzing|Win32
+		{8222900C-8B6C-452A-91AC-BE95DB04B95F}.Fuzzing|x64.ActiveCfg = Fuzzing|x64
+		{8222900C-8B6C-452A-91AC-BE95DB04B95F}.Fuzzing|x64.Build.0 = Fuzzing|x64
+		{8222900C-8B6C-452A-91AC-BE95DB04B95F}.Fuzzing|x86.ActiveCfg = Fuzzing|Win32
+		{8222900C-8B6C-452A-91AC-BE95DB04B95F}.Fuzzing|x86.Build.0 = Fuzzing|Win32
+		{8222900C-8B6C-452A-91AC-BE95DB04B95F}.Release|Any CPU.ActiveCfg = Release|Win32
+		{8222900C-8B6C-452A-91AC-BE95DB04B95F}.Release|ARM.ActiveCfg = Release|Win32
+		{8222900C-8B6C-452A-91AC-BE95DB04B95F}.Release|ARM64.ActiveCfg = Release|ARM64
+		{8222900C-8B6C-452A-91AC-BE95DB04B95F}.Release|ARM64.Build.0 = Release|ARM64
+		{8222900C-8B6C-452A-91AC-BE95DB04B95F}.Release|DotNet_x64Test.ActiveCfg = Release|Win32
+		{8222900C-8B6C-452A-91AC-BE95DB04B95F}.Release|DotNet_x86Test.ActiveCfg = Release|Win32
+		{8222900C-8B6C-452A-91AC-BE95DB04B95F}.Release|x64.ActiveCfg = Release|x64
+		{8222900C-8B6C-452A-91AC-BE95DB04B95F}.Release|x64.Build.0 = Release|x64
+		{8222900C-8B6C-452A-91AC-BE95DB04B95F}.Release|x86.ActiveCfg = Release|Win32
+		{8222900C-8B6C-452A-91AC-BE95DB04B95F}.Release|x86.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -3438,6 +3480,7 @@ Global
 		{C323DAEE-B307-4C7B-ACE5-7293CBEFCB5B} = {BDB237B6-1D1D-400F-84CC-40A58FA59C8E}
 		{F19DACD5-0C6E-40DC-B6E4-767A3200542C} = {BDB237B6-1D1D-400F-84CC-40A58FA59C8E}
 		{9CF74355-F018-4C19-81AD-9DC6B7F2C6F5} = {89CDCC5C-9F53-4054-97A4-639D99F169CD}
+		{8222900C-8B6C-452A-91AC-BE95DB04B95F} = {05500DEF-2294-41E3-AF9A-24E580B82836}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {3140B1B7-C8EE-43D1-A772-D82A7061A271}

README.md

@@ -214,7 +214,7 @@ resources useful and interesting:
 * Windows Terminal Launch: [Build 2019
   Session](https://www.youtube.com/watch?v=KMudkRcwjCw)
 * Run As Radio: [Show 645 - Windows Terminal with Richard
-  Turner](http://www.runasradio.com/Shows/Show/645)
+  Turner](https://www.runasradio.com/Shows/Show/645)
 * Azure Devops Podcast: [Episode 54 - Kayla Cinnamon and Rich Turner on DevOps
   on the Windows
   Terminal](http://azuredevopspodcast.clear-measure.com/kayla-cinnamon-and-rich-turner-on-devops-on-the-windows-terminal-team-episode-54)

build/rules/GenerateFeatureFlags.proj

@@ -63,8 +63,14 @@
     Outputs="$(OpenConsoleCommonOutDir)\inc\TilFeatureStaging.h"
     DependsOnTargets="_GenerateBranchAndBrandingCache">
     <MakeDir Directories="$(OpenConsoleCommonOutDir)\inc" />
+    <!-- This commandline is escaped like:
+
+    powershell -Command "&'$(SolutionDir)\tools\Generate-FeatureStagingHeader.ps1' -Path '%(FeatureFlagFile.FullPath)'' -Branding $(_WTBrandingName)"
+
+    which was the only way I could find to get it to obey spaces in the SolutionDir
+    -->
     <Exec
-      Command="powershell -NoLogo -NoProfile -NonInteractive -ExecutionPolicy ByPass -Command &quot;$(SolutionDir)\tools\Generate-FeatureStagingHeader.ps1&quot; -Path &quot;%(FeatureFlagFile.FullPath)&quot; -Branding $(_WTBrandingName)"
+      Command="powershell -NoLogo -NoProfile -NonInteractive -ExecutionPolicy ByPass -Command &quot;&amp;&apos;$(SolutionDir)\tools\Generate-FeatureStagingHeader.ps1&apos; -Path &apos;%(FeatureFlagFile.FullPath)&apos; -Branding $(_WTBrandingName)&quot;"
       ConsoleToMsBuild="true"
       StandardOutputImportance="low">
       <Output TaskParameter="ConsoleOutput" ItemName="_FeatureFlagFileLines" />

build/scripts/Create-AppxBundle.ps1

@@ -22,7 +22,7 @@ Param(
     [Parameter(HelpMessage="Path to makeappx.exe")]
     [ValidateScript({Test-Path $_ -Type Leaf})]
     [string]
-    $MakeAppxPath = "C:\Program Files (x86)\Windows Kits\10\bin\10.0.19041.0\x86\MakeAppx.exe"
+    $MakeAppxPath = "C:\Program Files (x86)\Windows Kits\10\bin\10.0.22000.0\x86\MakeAppx.exe"
 )
 
 If ($null -Eq (Get-Item $MakeAppxPath -EA:SilentlyContinue)) {

build/scripts/Test-WindowsTerminalPackage.ps1

@@ -8,7 +8,7 @@ Param(
     [Parameter(HelpMessage="Path to Windows Kit")]
     [ValidateScript({Test-Path $_ -Type Leaf})]
     [string]
-    $WindowsKitPath = "C:\Program Files (x86)\Windows Kits\10\bin\10.0.19041.0"
+    $WindowsKitPath = "C:\Program Files (x86)\Windows Kits\10\bin\10.0.22000.0"
 )
 
 $ErrorActionPreference = "Stop"

custom.props

@@ -5,7 +5,7 @@
     <XesUseOneStoreVersioning>true</XesUseOneStoreVersioning>
     <XesBaseYearForStoreVersion>2021</XesBaseYearForStoreVersion>
     <VersionMajor>1</VersionMajor>
-    <VersionMinor>12</VersionMinor>
+    <VersionMinor>13</VersionMinor>
     <VersionInfoProductName>Windows Terminal</VersionInfoProductName>
   </PropertyGroup>
 </Project>

doc/EXCEPTIONS.md

@@ -4,7 +4,7 @@
 Introducing exceptions to an existing non-exception-based codebase can be perilous. The console was originally written
 in C at a time when C++ was relatively unused in the Windows operating system. As part of our project to modernize the
 Windows console, we converted to use C++, but still had an aversion to using exception-based error handling in
-our code for fear that it introduce unexpected failures. However, the STL and other libraries like it are so useful that
+our code for fear that it might introduce unexpected failures. However, the STL and other libraries like it are so useful that
 sometimes it's significantly simpler to use them. Given that, we have a set of rules that we follow when considering
 exception use.
 

doc/Niksa.md

@@ -189,7 +189,7 @@ I think there might be a bit of a misunderstanding here - there are two differen
 * shell applications, like `cmd.exe`, `powershell`, `zsh`, etc. These are text-only applications that emit streams of characters. They don't care at all about how they're eventually rendered to the user. These are also sometimes referred to as "commandline client" applications.
 * terminal applications, like the Windows Terminal, gnome-terminal, xterm, iterm2, hyper. These are graphical applications that can be used to render the output of commandline clients. 
 
-On Windows, if you just run `cmd.exe` directly, the OS will create an instance of `conhost.exe` as the _terminal_ for `cmd.exe`. The same thing happens for `powershell.exe`, the system will creates a new conhost window for any client that's not already connected to a terminal of some sort. This has lead to an enormous amount of confusion for people thinking that a conhost window is actually a "`cmd` window". `cmd` can't have a window, it's just a commandline application. Its window is always some other terminal.
+On Windows, if you just run `cmd.exe` directly, the OS will create an instance of `conhost.exe` as the _terminal_ for `cmd.exe`. The same thing happens for `powershell.exe`, the system will create a new conhost window for any client that's not already connected to a terminal of some sort. This has lead to an enormous amount of confusion for people thinking that a conhost window is actually a "`cmd` window". `cmd` can't have a window, it's just a commandline application. Its window is always some other terminal.
 
 Any terminal can run any commandline client application. So you can use the Windows Terminal to run whatever shell you want. I use mine for both `cmd` and `powershell`, and also WSL:
 

doc/building.md

@@ -15,7 +15,7 @@ Import-Module .\tools\OpenConsole.psm1
 Set-MsBuildDevEnvironment
 Get-Format
 ```
-After, go to Tools > Options > Text Editor > C++ > Formatting and checking "Use custom clang-format.exe file" in Visual Studio and choose the clang-format.exe in the repository at /packages/clang-format.win-x86.10.0.0/tools/clang-format.exe by clicking "browse" right under the check box.
+After, go to Tools > Options > Text Editor > C++ > Formatting and check "Use custom clang-format.exe file" in Visual Studio and choose the clang-format.exe in the repository at /packages/clang-format.win-x86.10.0.0/tools/clang-format.exe by clicking "browse" right under the check box.
 
 ### Building in PowerShell
 

doc/cascadia/Unittesting-CppWinRT-Xaml.md

@@ -380,7 +380,7 @@ Here's the AppxManifest we're using:
   </Properties>
 
   <Dependencies>
-    <TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.18362.0" MaxVersionTested="10.0.19041.0" />
+    <TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.18362.0" MaxVersionTested="10.0.22000.0" />
     <PackageDependency Name="Microsoft.VCLibs.140.00.Debug" MinVersion="14.0.27023.1" Publisher="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US" />
     <PackageDependency Name="Microsoft.VCLibs.140.00.Debug.UWPDesktop" MinVersion="14.0.27027.1" Publisher="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US" />
   </Dependencies>
@@ -517,7 +517,7 @@ This is because of a few key lines we already put in the appxmanifest:
 
 ```xml
   <Dependencies>
-    <TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.18362.0" MaxVersionTested="10.0.19041.0" />
+    <TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.18362.0" MaxVersionTested="10.0.22000.0" />
     <PackageDependency Name="Microsoft.VCLibs.140.00.Debug" MinVersion="14.0.27023.1" Publisher="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US" />
     <PackageDependency Name="Microsoft.VCLibs.140.00.Debug.UWPDesktop" MinVersion="14.0.27027.1" Publisher="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US" />
   </Dependencies>

doc/specs/#885 - Terminal Settings Model/#885 - Terminal Settings Model.md

@@ -268,7 +268,7 @@ Today, if the deserialization of `CascadiaSettings` encounters any errors, an ex
 To get around this issue, when `CascadiaSettings` encounters a serialization error, it must internally record
  any pertinent information for that error, and return the simple `CascadiaSettings` as if nothing happened.
  The consumer must then call `CascadiaSettings::GetErrors()` and `CascadiaSettings::GetWarnings()` to properly
- understand whether an error ocurred and how to present that to the user.
+ understand whether an error occurred and how to present that to the user.
 
 
 #### TerminalApp: Loading and Reloading Changes

doc/terminal-v2-roadmap.md

@@ -2,7 +2,7 @@
 
 ## Overview
 
-This document outlines the roadmap towards delivering Windows Terminal 2.0 by Winter 2021.
+This document outlines the roadmap towards delivering Windows Terminal 2.0.
 
 ## Milestones
 
@@ -31,9 +31,9 @@ Below is the schedule for when milestones will be included in release builds of
 | 2021-05-31 | [1.9] in Windows Terminal Preview<br>[1.8] in Windows Terminal | [Windows Terminal Preview 1.9 Release](https://devblogs.microsoft.com/commandline/windows-terminal-preview-1-9-release/) |
 | 2021-07-14 | [1.10] in Windows Terminal Preview<br>[1.9] in Windows Terminal | [Windows Terminal Preview 1.10 Release](https://devblogs.microsoft.com/commandline/windows-terminal-preview-1-10-release/) |
 | 2021-08-31 | [1.11] in Windows Terminal Preview<br>[1.10] in Windows Terminal | [Windows Terminal Preview 1.11 Release](https://devblogs.microsoft.com/commandline/windows-terminal-preview-1-11-release/) |
-| 2021-10-31 | 1.12 in Windows Terminal Preview<br>1.11 in Windows Terminal | |
-| 2021-11-30 | 2.0 RC in Windows Terminal Preview<br>2.0 RC in Windows Terminal | |
-| 2021-12-31 | [2.0] in Windows Terminal Preview<br>[2.0] in Windows Terminal | |
+| 2021-10-20 | [1.12] in Windows Terminal Preview<br>[1.11] in Windows Terminal | [Windows Terminal Preview 1.12 Release](https://devblogs.microsoft.com/commandline/windows-terminal-preview-1-12-release/) |
+|  | 2.0 RC in Windows Terminal Preview<br>2.0 RC in Windows Terminal | |
+|  | [2.0] in Windows Terminal Preview<br>[2.0] in Windows Terminal | |
 
 ## Issue Triage & Prioritization
 
@@ -49,28 +49,32 @@ The following are a list of the key scenarios we're aiming to deliver for Termin
 
 > 👉 Note: There are many other features that don't fit within 2.0, but will be re-assessed and prioritized for 3.0, the plan for which will be published in 2021.
 
-| Priority\* | Scenario | Description/Notes |
-| ---------- | -------- | ----------------- |
-| 0 | Settings UI | A user interface that connects to settings.json. This provides a way for people to edit their settings without having to edit a JSON file.<br><br>Issue: [#1564]<br>Specs: [#6720], [#6904]<br>Implementation: [#7283], [#7370], [#8048] |
-| 0 | Command palette | A popup menu to list possible actions and commands.<br><br>Issues: [#5400], [#2046]<br>Spec: [#2193]<br>Implementation: [#6635] |
-| 1 | Tab tear-off | The ability to tear a tab out of the current window and spawn a new window or attach it to a separate window.<br><br>Issue: [#1256], [#5000]<br>Spec: [#2080], [#7240] |
-| 1 | Clickable links | Hyperlinking any links that appear in the text buffer. When clicking on the link, the link will open in your default browser.<br><br>Issue: [#574]<br>Implementation: [#7251] |
-| 1 | Default terminal | If a command-line application is spawned, it should open in Windows Terminal (if installed) or your preferred terminal<br><br>Issue: [#492]<br>Spec: [#2080], [#7414] |
-| 1 | Overall theme support | Tab coloring, title bar coloring, pane border coloring, pane border width, definition of what makes a theme<br><br>Issue: [#3327]<br>Spec: [#5772] |
-| 1 | Open profile elevated | Configure profiles to always open elevated (if Terminal was run unelevated)<br><br>Issue: [#5000], [#632]<br>Spec: [#8455] |
-| 1 | Open tab in existing window | Open new tabs in existing Terminal windows<br><br>Issue: [#5000], [#4472]<br>Spec: [#8135] |
-| 1 | Traditional opacity | Have a transparent background without the acrylic blur.<br><br>Issue: [#603] <br>**Current State**: Blocked on WinUI 3.0 |
-| 2 | SnapOnOutput, scroll lock | Pause output or scrolling on click.<br><br>Issue: [#980]<br>Spec: [#2529]<br>Implementation: [#6062] |
-| 2 | Infinite scrollback | Have an infinite history for the text buffer.<br><br>Issue: [#1410] |
-| 2 | Pane management | All issues listed out in the original issue. Some features include pane resizing with mouse, pane zooming, and opening a pane by prompting which profile to use.<br><br>Issue: [#1000] |
-| 2 | Theme marketplace | Marketplace for creation and distribution of themes.<br>Dependent on overall theming |
-| 2 | Jump list | Show profiles from task bar (on right click)/start menu.<br><br>Issue: [#576]<br>Implementation: [#7515] |
-| 2 | Open with multiple tabs | A setting that allows Windows Terminal to launch with a specific tab configuration (not using only command line arguments).<br><br>Issue: [#756] |
-| 3 | Open in Windows Terminal | Functionality to right click on a file or folder and select Open in Windows Terminal.<br><br>Issue: [#1060]<br>Implementation: [#6100] |
-| 3 | Session restoration | Launch Windows Terminal and the previous session is restored with the proper tab and pane configuration and starting directories.<br><br>Issues: [#961], [#960], [#766] |
-| 3 | Quake mode | Provide a quick launch terminal that appears and disappears when a hotkey is pressed.<br><br>Issue: [#653] |
-| 3 | Settings migration infrastructure | Migrate people's settings without breaking them. Hand-in-hand with settings UI. |
-| 3 | Pointer bindings | Provide settings that can be bound to the mouse.<br><br>Issue: [#1553] |
+| Priority\* | Scenario | Description/Notes | State |
+| ---------- | -------- | ----------------- | ----- |
+| 0 | Settings UI | A user interface that connects to settings.json. This provides a way for people to edit their settings without having to edit a JSON file.<br><br>Issue: [#1564]<br>Specs: [#6720], [#6904]<br>Implementation: [#7283], [#7370], [#8048] | ✔️ |
+| 0 | Command palette | A popup menu to list possible actions and commands.<br><br>Issues: [#5400], [#2046]<br>Spec: [#2193]<br>Implementation: [#6635] | ✔️ |
+| 1 | Tab tear-off | The ability to tear a tab out of the current window and spawn a new window or attach it to a separate window.<br><br>Issue: [#1256], [#5000]<br>Spec: [#2080], [#7240] | 📝 |
+| 1 | Clickable links | Hyperlinking any links that appear in the text buffer. When clicking on the link, the link will open in your default browser.<br><br>Issue: [#574]<br>Implementation: [#7251] | ✔️ |
+| 1 | Default terminal | If a command-line application is spawned, it should open in Windows Terminal (if installed) or your preferred terminal<br><br>Issue: [#492]<br>Spec: [#2080], [#7414] | ✔️ |
+| 1 | Overall theme support | Tab coloring, title bar coloring, pane border coloring, pane border width, definition of what makes a theme<br><br>Issue: [#3327]<br>Spec: [#5772] | 🦶 |
+| 1 | Open profile elevated | Configure profiles to always open elevated (if Terminal was run unelevated)<br><br>Issue: [#5000], [#632]<br>Spec: [#8455] | 📝 |
+| 1 | Open tab in existing window | Open new tabs in existing Terminal windows<br><br>Issue: [#5000], [#4472]<br>Spec: [#8135] | ✔️ |
+| 1 | Traditional opacity | Have a transparent background without the acrylic blur.<br><br>Issue: [#603] | ✔️ |
+| 2 | SnapOnOutput, scroll lock | Pause output or scrolling on click.<br><br>Issue: [#980]<br>Spec: [#2529]<br>Implementation: [#6062] | ✔️ |
+| 2 | Infinite scrollback | Have an infinite history for the text buffer.<br><br>Issue: [#1410] | 🦶 |
+| 2 | Pane management | All issues listed out in the original issue. Some features include pane resizing with mouse, pane zooming, and opening a pane by prompting which profile to use.<br><br>Issue: [#1000] | 📝 |
+| 2 | Theme marketplace | Marketplace for creation and distribution of themes.<br>Dependent on overall theming | 🦶 |
+| 2 | Jump list | Show profiles from task bar (on right click)/start menu.<br><br>Issue: [#576]<br>Implementation: [#7515] | ✔️ |
+| 2 | Open with multiple tabs | A setting that allows Windows Terminal to launch with a specific tab configuration (not using only command line arguments).<br><br>Issue: [#756] | ✔️ |
+| 3 | Open in Windows Terminal | Functionality to right click on a file or folder and select Open in Windows Terminal.<br><br>Issue: [#1060]<br>Implementation: [#6100] | ✔️ |
+| 3 | Session restoration | Launch Windows Terminal and the previous session is restored with the proper tab and pane configuration and starting directories.<br><br>Issues: [#961], [#960], [#766] | ✔️ |
+| 3 | Quake mode | Provide a quick launch terminal that appears and disappears when a hotkey is pressed.<br><br>Issue: [#653] | ✔️ |
+| 3 | Settings migration infrastructure | Migrate people's settings without breaking them. Hand-in-hand with settings UI. | 🦶 |
+| 3 | Pointer bindings | Provide settings that can be bound to the mouse.<br><br>Issue: [#1553] | 🦶 |
+
+* 📝: The feature is currently in progress
+* ✔️: The feature is complete and shipped in a Preview build
+* 🦶: The feature is at risk of being punted to a future release cycle (beyond 2.0)
 
 Feature Notes:
 
@@ -91,6 +95,8 @@ Feature Notes:
 [1.9]: https://github.com/microsoft/terminal/milestone/34
 [1.10]: https://github.com/microsoft/terminal/milestone/35
 [1.11]: https://github.com/microsoft/terminal/milestone/36
+[1.12]: https://github.com/microsoft/terminal/milestone/38
+[1.13]: https://github.com/microsoft/terminal/milestone/39
 [2.0]: https://github.com/microsoft/terminal/milestone/22
 [#1564]: https://github.com/microsoft/terminal/issues/1564
 [#6720]: https://github.com/microsoft/terminal/pull/6720

oss/pcg/LICENSE-APACHE.txt

@@ -0,0 +1,201 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "{}"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright {yyyy} {name of copyright owner}
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

oss/pcg/LICENSE-MIT.txt

@@ -0,0 +1,19 @@
+Copyright (c) 2014-2017 Melissa O'Neill and PCG Project contributors
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

oss/pcg/cgmanifest.json

@@ -0,0 +1,14 @@
+{
+  "Registrations": [
+    {
+      "component": {
+        "type": "git",
+        "git": {
+          "repositoryUrl": "https://github.com/imneme/pcg-cpp",
+          "commitHash": "ffd522e7188bef30a00c74dc7eb9de5faff90092"
+        }
+      }
+    }
+  ],
+  "Version": 1
+}

oss/pcg/include/pcg_random.hpp

@@ -0,0 +1,82 @@
+// PCG Random Number Generation for C++
+//
+// Copyright 2014-2019 Melissa O'Neill <oneill@pcg-random.org>,
+//                     and the PCG Project contributors.
+//
+// SPDX-License-Identifier: (Apache-2.0 OR MIT)
+//
+// Licensed under the Apache License, Version 2.0 (provided in
+// LICENSE-APACHE.txt and at http://www.apache.org/licenses/LICENSE-2.0)
+// or under the MIT license (provided in LICENSE-MIT.txt and at
+// http://opensource.org/licenses/MIT), at your option. This file may not
+// be copied, modified, or distributed except according to those terms.
+//
+// Distributed on an "AS IS" BASIS, WITHOUT WARRANTY OF ANY KIND, either
+// express or implied.  See your chosen license for details.
+//
+// For additional information about the PCG random number generation scheme,
+// visit http://www.pcg-random.org/.
+//
+// -----------------------------------------------------------------------------
+//
+// Leonard Hecker <lhecker@microsoft.com>:
+// The following contents are an extract of pcg_engines::oneseq_dxsm_64_32
+// reduced down to the bare essentials, while retaining base functionality.
+
+namespace pcg_engines {
+    class oneseq_dxsm_64_32 {
+        using xtype = uint32_t;
+        using itype = uint64_t;
+
+        itype state_;
+
+        static constexpr uint64_t multiplier() {
+            return 6364136223846793005ULL;
+        }
+
+        static constexpr uint64_t increment() {
+            return 1442695040888963407ULL;
+        }
+
+        static itype bump(itype state) {
+            return state * multiplier() + increment();
+        }
+
+        itype base_generate0() {
+            itype old_state = state_;
+            state_ = bump(state_);
+            return old_state;
+        }
+
+    public:
+        explicit oneseq_dxsm_64_32(itype state = 0xcafef00dd15ea5e5ULL) : state_(bump(state + increment())) {
+        }
+
+        // Returns a value in the interval [0, UINT32_MAX].
+        xtype operator()() {
+            constexpr auto xtypebits = uint8_t(sizeof(xtype) * 8);
+            constexpr auto itypebits = uint8_t(sizeof(itype) * 8);
+
+            auto internal = base_generate0();
+            auto hi = xtype(internal >> (itypebits - xtypebits));
+            auto lo = xtype(internal);
+
+            lo |= 1;
+            hi ^= hi >> (xtypebits / 2);
+            hi *= xtype(multiplier());
+            hi ^= hi >> (3 * (xtypebits / 4));
+            hi *= lo;
+            return hi;
+        }
+
+        // Returns a value in the interval [0, upper_bound).
+        xtype operator()(xtype upper_bound) {
+            uint32_t threshold = (UINT64_MAX + uint32_t(1) - upper_bound) % upper_bound;
+            for (;;) {
+                auto r = operator()();
+                if (r >= threshold)
+                    return r % upper_bound;
+            }
+        }
+    };
+}

samples/ConPTY/EchoCon/EchoCon/EchoCon.vcxproj

@@ -23,7 +23,7 @@
     <ProjectGuid>{96274800-9574-423E-892A-909FBE2AC8BE}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>EchoCon</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.19041.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.22000.0</WindowsTargetPlatformVersion>
     <WindowsTargetPlatformMinVersion>10.0.17763.0</WindowsTargetPlatformMinVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
@@ -163,4 +163,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>

scratch/ScratchIslandApp/Package/Package.appxmanifest

@@ -27,7 +27,7 @@
   </Properties>
 
   <Dependencies>
-    <TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.18362.0" MaxVersionTested="10.0.19041.0" />
+    <TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.18362.0" MaxVersionTested="10.0.22000.0" />
   </Dependencies>
 
   <Resources>

scratch/ScratchIslandApp/WindowExe/WindowExe.vcxproj

@@ -118,6 +118,23 @@
     <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
   </PropertyGroup>
 
+  <!--
+  BODGY
+
+  The wapproj `GetResolvedWinMD` target tries to get a winmd from every cppwinrt
+  executable we put in the package. But we DON'T produce a winmd. This makes the
+  FastUpToDate check fail every time, and leads to the whole wapproj build
+  running even if you're just f5'ing the package. EVEN AFTER A SUCCESSFUL BUILD.
+
+  Setting GenerateWindowsMetadata=false is enough to tell the build system that
+  we don't produce one, and get it off our backs.
+  -->
+  <ItemDefinitionGroup>
+    <Link>
+        <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
+    </Link>
+  </ItemDefinitionGroup>
+
   <Import Project="$(OpenConsoleDir)src\cppwinrt.build.post.props" />
 
   <Import Project="..\..\..\packages\Microsoft.UI.Xaml.2.7.0-prerelease.210913003\build\native\Microsoft.UI.Xaml.targets" Condition="Exists('..\..\..\packages\Microsoft.UI.Xaml.2.7.0-prerelease.210913003\build\native\Microsoft.UI.Xaml.targets')" />

src/Terminal.wprp

@@ -12,6 +12,16 @@
     <EventProvider Id="EventProvider_TerminalWin32Host" Name="56c06166-2e2e-5f4d-7ff3-74f4b78c87d6" />
     <EventProvider Id="EventProvider_TerminalRemoting" Name="d6f04aad-629f-539a-77c1-73f5c3e4aa7b" />
     <EventProvider Id="EventProvider_TerminalDirectX" Name="c93e739e-ae50-5a14-78e7-f171e947535d" />
+    <EventProvider Id="EventProvider_TerminalUIA" Name="e7ebce59-2161-572d-b263-2f16a6afb9e5"/>
+    <!-- Console providers here -->
+    <EventProvider Id="EventProvider-Microsoft.Windows.Console.Launcher" Name="770aa552-671a-5e97-579b-151709ec0dbd"/>
+    <EventProvider Id="EventProvider-Microsoft.Windows.Console.Host" Name="fe1ff234-1f09-50a8-d38d-c44fab43e818"/>
+    <EventProvider Id="EventProvider-Microsoft.Windows.Console.Server" Name="1A541C01-589A-496E-85A7-A9E02170166D"/>
+    <EventProvider Id="EventProvider-Microsoft.Windows.Console.VirtualTerminal.Parser" Name="c9ba2a84-d3ca-5e19-2bd6-776a0910cb9d"/>
+    <EventProvider Id="EventProvider-Microsoft.Windows.Console.Render.VtEngine" Name="c9ba2a95-d3ca-5e19-2bd6-776a0910cb9d"/>
+    <EventProvider Id="EventProvider-Microsoft.Windows.Console.UIA" Name="e7ebce59-2161-572d-b263-2f16a6afb9e5"/>
+
+    <!-- Profile for General Terminal logging -->
     <Profile Id="Terminal.Verbose.File" Name="Terminal" Description="Terminal" LoggingMode="File" DetailLevel="Verbose">
       <Collectors>
         <EventCollectorId Value="EventCollector_Terminal">
@@ -23,6 +33,7 @@
             <EventProviderId Value="EventProvider_TerminalWin32Host" />
             <EventProviderId Value="EventProvider_TerminalRemoting" />
             <EventProviderId Value="EventProvider_TerminalDirectX" />
+            <EventProviderId Value="EventProvider_TerminalUIA" />
           </EventProviders>
         </EventCollectorId>
       </Collectors>
@@ -30,5 +41,27 @@
     <Profile Id="Terminal.Light.File" Name="Terminal" Description="Terminal" Base="Terminal.Verbose.File" LoggingMode="File" DetailLevel="Light" />
     <Profile Id="Terminal.Verbose.Memory" Name="Terminal" Description="Terminal" Base="Terminal.Verbose.File" LoggingMode="Memory" DetailLevel="Verbose" />
     <Profile Id="Terminal.Light.Memory" Name="Terminal" Description="Terminal" Base="Terminal.Verbose.File" LoggingMode="Memory" DetailLevel="Light" />
+
+    <!-- Profile for DefTerm logging. Includes some conhost logging. -->
+    <Profile Id="DefTerm.Verbose.File" Name="DefTerm" Description="DefTerm" LoggingMode="File" DetailLevel="Verbose">
+      <Collectors>
+        <EventCollectorId Value="EventCollector_Terminal">
+          <EventProviders>
+            <EventProviderId Value="EventProvider_TerminalControl" />
+            <EventProviderId Value="EventProvider_TerminalConnection" />
+            <EventProviderId Value="EventProvider_TerminalSettingsModel" />
+            <EventProviderId Value="EventProvider_TerminalApp" />
+            <EventProviderId Value="EventProvider_TerminalWin32Host" />
+            <EventProviderId Value="EventProvider_TerminalRemoting" />
+            <EventProviderId Value="EventProvider-Microsoft.Windows.Console.Launcher" />
+            <EventProviderId Value="EventProvider-Microsoft.Windows.Console.Host" />
+            <EventProviderId Value="EventProvider-Microsoft.Windows.Console.Server" />
+          </EventProviders>
+        </EventCollectorId>
+      </Collectors>
+    </Profile>
+    <Profile Id="DefTerm.Light.File" Name="DefTerm" Description="DefTerm" Base="DefTerm.Verbose.File" LoggingMode="File" DetailLevel="Light" />
+    <Profile Id="DefTerm.Verbose.Memory" Name="DefTerm" Description="DefTerm" Base="DefTerm.Verbose.File" LoggingMode="Memory" DetailLevel="Verbose" />
+    <Profile Id="DefTerm.Light.Memory" Name="DefTerm" Description="DefTerm" Base="DefTerm.Verbose.File" LoggingMode="Memory" DetailLevel="Light" />
   </Profiles>
-</WindowsPerformanceRecorder>
+</WindowsPerformanceRecorder>

src/buffer/out/TextAttribute.cpp

@@ -12,8 +12,30 @@ static_assert(alignof(TextAttribute) == 2);
 // Ensure that we can memcpy() and memmove() the struct for performance.
 static_assert(std::is_trivially_copyable_v<TextAttribute>);
 
-BYTE TextAttribute::s_legacyDefaultForeground = 7;
-BYTE TextAttribute::s_legacyDefaultBackground = 0;
+namespace
+{
+    constexpr std::array<TextColor, 16> s_initLegacyColorMap(const BYTE defaultIndex)
+    {
+        std::array<TextColor, 16> legacyColorMap;
+        for (auto i = 0u; i < legacyColorMap.size(); i++)
+        {
+            const auto legacyIndex = TextColor::TransposeLegacyIndex(i);
+            gsl::at(legacyColorMap, i) = i == defaultIndex ? TextColor{} : TextColor{ legacyIndex, true };
+        }
+        return legacyColorMap;
+    }
+
+    BYTE s_legacyDefaultForeground = 7;
+    BYTE s_legacyDefaultBackground = 0;
+    BYTE s_ansiDefaultForeground = 7;
+    BYTE s_ansiDefaultBackground = 0;
+}
+
+// These maps allow for an efficient conversion from a legacy attribute index
+// to a TextColor with the corresponding ANSI index, also taking into account
+// the legacy index values that need to be converted to a default TextColor.
+std::array<TextColor, 16> TextAttribute::s_legacyForegroundColorMap = s_initLegacyColorMap(7);
+std::array<TextColor, 16> TextAttribute::s_legacyBackgroundColorMap = s_initLegacyColorMap(0);
 
 // Routine Description:
 // - Sets the legacy attributes which map to and from the default colors.
@@ -23,8 +45,22 @@ BYTE TextAttribute::s_legacyDefaultBackground = 0;
 // - None
 void TextAttribute::SetLegacyDefaultAttributes(const WORD defaultAttributes) noexcept
 {
+    // First we reset the current default color map entries to what they should
+    // be for a regular translation from a legacy index to an ANSI TextColor.
+    gsl::at(s_legacyForegroundColorMap, s_legacyDefaultForeground) = TextColor{ s_ansiDefaultForeground, true };
+    gsl::at(s_legacyBackgroundColorMap, s_legacyDefaultBackground) = TextColor{ s_ansiDefaultBackground, true };
+
+    // Then we save the new default attribute values and their corresponding
+    // ANSI translations. We use the latter values to more efficiently handle
+    // the "VT Quirk" conversion below.
     s_legacyDefaultForeground = defaultAttributes & FG_ATTRS;
     s_legacyDefaultBackground = (defaultAttributes & BG_ATTRS) >> 4;
+    s_ansiDefaultForeground = TextColor::TransposeLegacyIndex(s_legacyDefaultForeground);
+    s_ansiDefaultBackground = TextColor::TransposeLegacyIndex(s_legacyDefaultBackground);
+
+    // Finally we set the new default color map entries.
+    gsl::at(s_legacyForegroundColorMap, s_legacyDefaultForeground) = TextColor{};
+    gsl::at(s_legacyBackgroundColorMap, s_legacyDefaultBackground) = TextColor{};
 }
 
 // Routine Description:
@@ -55,13 +91,13 @@ TextAttribute TextAttribute::StripErroneousVT16VersionsOfLegacyDefaults(const Te
     const auto bg{ attribute.GetBackground() };
     auto copy{ attribute };
     if (fg.IsIndex16() &&
-        attribute.IsBold() == WI_IsFlagSet(s_legacyDefaultForeground, FOREGROUND_INTENSITY) &&
-        fg.GetIndex() == (s_legacyDefaultForeground & ~FOREGROUND_INTENSITY))
+        attribute.IsBold() == WI_IsFlagSet(s_ansiDefaultForeground, FOREGROUND_INTENSITY) &&
+        fg.GetIndex() == (s_ansiDefaultForeground & ~FOREGROUND_INTENSITY))
     {
         // We don't want to turn 1;37m into 39m (or even 1;39m), as this was meant to mimic a legacy color.
         copy.SetDefaultForeground();
     }
-    if (bg.IsIndex16() && bg.GetIndex() == s_legacyDefaultBackground)
+    if (bg.IsIndex16() && bg.GetIndex() == s_ansiDefaultBackground)
     {
         copy.SetDefaultBackground();
     }
@@ -92,22 +128,22 @@ bool TextAttribute::IsLegacy() const noexcept
 // - Calculates rgb colors based off of current color table and active modification attributes.
 // Arguments:
 // - colorTable: the current color table rgb values.
-// - defaultFgColor: the default foreground color rgb value.
-// - defaultBgColor: the default background color rgb value.
+// - defaultFgIndex: the color table index of the default foreground color.
+// - defaultBgIndex: the color table index of the default background color.
 // - reverseScreenMode: true if the screen mode is reversed.
 // - blinkingIsFaint: true if blinking should be interpreted as faint. (defaults to false)
 // - boldIsBright: true if "bold" should be interpreted as bright. (defaults to true)
 // Return Value:
 // - the foreground and background colors that should be displayed.
-std::pair<COLORREF, COLORREF> TextAttribute::CalculateRgbColors(const std::array<COLORREF, 256>& colorTable,
-                                                                const COLORREF defaultFgColor,
-                                                                const COLORREF defaultBgColor,
+std::pair<COLORREF, COLORREF> TextAttribute::CalculateRgbColors(const std::array<COLORREF, TextColor::TABLE_SIZE>& colorTable,
+                                                                const size_t defaultFgIndex,
+                                                                const size_t defaultBgIndex,
                                                                 const bool reverseScreenMode,
                                                                 const bool blinkingIsFaint,
                                                                 const bool boldIsBright) const noexcept
 {
-    auto fg = _foreground.GetColor(colorTable, defaultFgColor, boldIsBright && IsBold());
-    auto bg = _background.GetColor(colorTable, defaultBgColor);
+    auto fg = _foreground.GetColor(colorTable, defaultFgIndex, boldIsBright && IsBold());
+    auto bg = _background.GetColor(colorTable, defaultBgIndex);
     if (IsFaint() || (IsBlinking() && blinkingIsFaint))
     {
         fg = (fg >> 1) & 0x7F7F7F; // Divide foreground color components by two.

src/buffer/out/TextAttribute.hpp

@@ -41,8 +41,8 @@ public:
 
     explicit constexpr TextAttribute(const WORD wLegacyAttr) noexcept :
         _wAttrLegacy{ gsl::narrow_cast<WORD>(wLegacyAttr & META_ATTRS) },
-        _foreground{ s_LegacyIndexOrDefault(wLegacyAttr & FG_ATTRS, s_legacyDefaultForeground) },
-        _background{ s_LegacyIndexOrDefault((wLegacyAttr & BG_ATTRS) >> 4, s_legacyDefaultBackground) },
+        _foreground{ gsl::at(s_legacyForegroundColorMap, wLegacyAttr & FG_ATTRS) },
+        _background{ gsl::at(s_legacyBackgroundColorMap, (wLegacyAttr & BG_ATTRS) >> 4) },
         _extendedAttrs{ ExtendedAttributes::Normal },
         _hyperlinkId{ 0 }
     {
@@ -64,9 +64,9 @@ public:
     static TextAttribute StripErroneousVT16VersionsOfLegacyDefaults(const TextAttribute& attribute) noexcept;
     WORD GetLegacyAttributes() const noexcept;
 
-    std::pair<COLORREF, COLORREF> CalculateRgbColors(const std::array<COLORREF, 256>& colorTable,
-                                                     const COLORREF defaultFgColor,
-                                                     const COLORREF defaultBgColor,
+    std::pair<COLORREF, COLORREF> CalculateRgbColors(const std::array<COLORREF, TextColor::TABLE_SIZE>& colorTable,
+                                                     const size_t defaultFgIndex,
+                                                     const size_t defaultBgIndex,
                                                      const bool reverseScreenMode = false,
                                                      const bool blinkingIsFaint = false,
                                                      const bool boldIsBright = true) const noexcept;
@@ -167,13 +167,8 @@ public:
     }
 
 private:
-    static constexpr TextColor s_LegacyIndexOrDefault(const BYTE requestedIndex, const BYTE defaultIndex)
-    {
-        return requestedIndex == defaultIndex ? TextColor{} : TextColor{ requestedIndex, true };
-    }
-
-    static BYTE s_legacyDefaultForeground;
-    static BYTE s_legacyDefaultBackground;
+    static std::array<TextColor, 16> s_legacyForegroundColorMap;
+    static std::array<TextColor, 16> s_legacyBackgroundColorMap;
 
     uint16_t _wAttrLegacy; // sizeof: 2, alignof: 2
     uint16_t _hyperlinkId; // sizeof: 2, alignof: 2

src/buffer/out/TextColor.cpp

@@ -4,6 +4,8 @@
 #include "precomp.h"
 #include "TextColor.h"
 
+#include <til/bit.h>
+
 // clang-format off
 
 // A table mapping 8-bit RGB colors, in the form RRRGGGBB,
@@ -30,7 +32,7 @@ constexpr std::array<BYTE, 256> CompressedRgbToIndex16 = {
 // A table mapping indexed colors from the 256-color palette,
 // down to one of the 16 colors in the legacy palette.
 constexpr std::array<BYTE, 256> Index256ToIndex16 = {
-     0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15,
+     0,  4,  2,  6,  1,  5,  3,  7,  8, 12, 10, 14,  9, 13, 11, 15,
      0,  1,  1,  1,  9,  9,  2,  1,  1,  1,  1,  1,  2,  2,  3,  3,
      3,  3,  2,  2, 11, 11,  3,  3, 10, 10, 11, 11, 11, 11, 10, 10,
     10, 10, 11, 11,  5,  5,  5,  5,  1,  1,  8,  8,  1,  1,  9,  9,
@@ -137,14 +139,16 @@ void TextColor::SetDefault() noexcept
 // Arguments:
 // - colorTable: The table of colors we should use to look up the value of
 //      an indexed attribute from.
-// - defaultColor: The color value to use if we're a default attribute.
+// - defaultIndex: The color table index to use if we're a default attribute.
 // - brighten: if true, we'll brighten a dark color table index.
 // Return Value:
 // - a COLORREF containing the real value of this TextColor.
-COLORREF TextColor::GetColor(const std::array<COLORREF, 256>& colorTable, const COLORREF defaultColor, bool brighten) const noexcept
+COLORREF TextColor::GetColor(const std::array<COLORREF, TextColor::TABLE_SIZE>& colorTable, const size_t defaultIndex, bool brighten) const noexcept
 {
     if (IsDefault())
     {
+        const auto defaultColor = til::at(colorTable, defaultIndex);
+
         if (brighten)
         {
             // See MSFT:20266024 for context on this fix.
@@ -186,7 +190,7 @@ COLORREF TextColor::GetColor(const std::array<COLORREF, 256>& colorTable, const
             //    the result will be something like 0b00100000.
             // 5. Use BitScanForward (bsf) to find the index of the most significant 1 bit.
             const auto haystack = _mm256_loadu_si256(reinterpret_cast<const __m256i*>(colorTable.data())); // 1.
-            const auto needle = _mm256_set1_epi32(__builtin_bit_cast(int, defaultColor)); // 2.
+            const auto needle = _mm256_set1_epi32(til::bit_cast<int>(defaultColor)); // 2.
             const auto result = _mm256_cmpeq_epi32(haystack, needle); // 3.
             const auto mask = _mm256_movemask_ps(_mm256_castsi256_ps(result)); // 4.
             unsigned long index;
@@ -203,7 +207,7 @@ COLORREF TextColor::GetColor(const std::array<COLORREF, 256>& colorTable, const
             //   --> the index returned by _BitScanForward must be divided by 2.
             const auto haystack1 = _mm_loadu_si128(reinterpret_cast<const __m128i*>(colorTable.data() + 0));
             const auto haystack2 = _mm_loadu_si128(reinterpret_cast<const __m128i*>(colorTable.data() + 4));
-            const auto needle = _mm_set1_epi32(__builtin_bit_cast(int, defaultColor));
+            const auto needle = _mm_set1_epi32(til::bit_cast<int>(defaultColor));
             const auto result1 = _mm_cmpeq_epi32(haystack1, needle);
             const auto result2 = _mm_cmpeq_epi32(haystack2, needle);
             const auto result = _mm_packs_epi32(result1, result2); // 3.5
@@ -250,11 +254,7 @@ BYTE TextColor::GetLegacyIndex(const BYTE defaultIndex) const noexcept
     {
         return defaultIndex;
     }
-    else if (IsIndex16())
-    {
-        return GetIndex();
-    }
-    else if (IsIndex256())
+    else if (IsIndex16() || IsIndex256())
     {
         return til::at(Index256ToIndex16, GetIndex());
     }

src/buffer/out/TextColor.h

@@ -48,6 +48,28 @@ enum class ColorType : BYTE
 struct TextColor
 {
 public:
+    static constexpr BYTE DARK_BLACK = 0;
+    static constexpr BYTE DARK_RED = 1;
+    static constexpr BYTE DARK_GREEN = 2;
+    static constexpr BYTE DARK_YELLOW = 3;
+    static constexpr BYTE DARK_BLUE = 4;
+    static constexpr BYTE DARK_MAGENTA = 5;
+    static constexpr BYTE DARK_CYAN = 6;
+    static constexpr BYTE DARK_WHITE = 7;
+    static constexpr BYTE BRIGHT_BLACK = 8;
+    static constexpr BYTE BRIGHT_RED = 9;
+    static constexpr BYTE BRIGHT_GREEN = 10;
+    static constexpr BYTE BRIGHT_YELLOW = 11;
+    static constexpr BYTE BRIGHT_BLUE = 12;
+    static constexpr BYTE BRIGHT_MAGENTA = 13;
+    static constexpr BYTE BRIGHT_CYAN = 14;
+    static constexpr BYTE BRIGHT_WHITE = 15;
+
+    static constexpr size_t DEFAULT_FOREGROUND = 256;
+    static constexpr size_t DEFAULT_BACKGROUND = 257;
+    static constexpr size_t CURSOR_COLOR = 258;
+    static constexpr size_t TABLE_SIZE = 259;
+
     constexpr TextColor() noexcept :
         _meta{ ColorType::IsDefault },
         _red{ 0 },
@@ -86,7 +108,7 @@ public:
     void SetIndex(const BYTE index, const bool isIndex256) noexcept;
     void SetDefault() noexcept;
 
-    COLORREF GetColor(const std::array<COLORREF, 256>& colorTable, const COLORREF defaultColor, bool brighten = false) const noexcept;
+    COLORREF GetColor(const std::array<COLORREF, TABLE_SIZE>& colorTable, const size_t defaultIndex, bool brighten = false) const noexcept;
     BYTE GetLegacyIndex(const BYTE defaultIndex) const noexcept;
 
     constexpr BYTE GetIndex() const noexcept
@@ -96,6 +118,16 @@ public:
 
     COLORREF GetRGB() const noexcept;
 
+    static constexpr BYTE TransposeLegacyIndex(const size_t index)
+    {
+        // When converting a 16-color index in the legacy Windows order to or
+        // from an ANSI-compatible order, we need to swap the bits in positions
+        // 0 and 2. We do this by XORing the index with 00000101, but only if
+        // one (but not both) of those bit positions is set.
+        const auto oneBitSet = (index ^ (index >> 2)) & 1;
+        return gsl::narrow_cast<BYTE>(index ^ oneBitSet ^ (oneBitSet << 2));
+    }
+
 private:
     union
     {

src/buffer/out/cursor.cpp

@@ -27,9 +27,7 @@ Cursor::Cursor(const ULONG ulSize, TextBuffer& parentBuffer) noexcept :
     _fDeferCursorRedraw(false),
     _fHaveDeferredCursorRedraw(false),
     _ulSize(ulSize),
-    _cursorType(CursorType::Legacy),
-    _fUseColor(false),
-    _color(s_InvertCursorColor)
+    _cursorType(CursorType::Legacy)
 {
 }
 
@@ -143,10 +141,9 @@ void Cursor::SetSize(const ULONG ulSize) noexcept
     _RedrawCursor();
 }
 
-void Cursor::SetStyle(const ULONG ulSize, const COLORREF color, const CursorType type) noexcept
+void Cursor::SetStyle(const ULONG ulSize, const CursorType type) noexcept
 {
     _ulSize = ulSize;
-    _color = color;
     _cursorType = type;
 
     _RedrawCursor();
@@ -285,7 +282,6 @@ void Cursor::CopyProperties(const Cursor& OtherCursor) noexcept
     // Size will be handled separately in the resize operation.
     //_ulSize                       = OtherCursor._ulSize;
     _cursorType = OtherCursor._cursorType;
-    _color = OtherCursor._color;
 }
 
 void Cursor::DelayEOLWrap(const COORD coordDelayedAt) noexcept
@@ -335,21 +331,6 @@ const CursorType Cursor::GetType() const noexcept
     return _cursorType;
 }
 
-const bool Cursor::IsUsingColor() const noexcept
-{
-    return GetColor() != INVALID_COLOR;
-}
-
-const COLORREF Cursor::GetColor() const noexcept
-{
-    return _color;
-}
-
-void Cursor::SetColor(const unsigned int color) noexcept
-{
-    _color = gsl::narrow_cast<COLORREF>(color);
-}
-
 void Cursor::SetType(const CursorType type) noexcept
 {
     _cursorType = type;

src/buffer/out/cursor.h

@@ -24,7 +24,6 @@ class TextBuffer;
 class Cursor final
 {
 public:
-    static const unsigned int s_InvertCursorColor = INVALID_COLOR;
     // the following values are used to create the textmode cursor.
     static constexpr unsigned int CURSOR_SMALL_SIZE = 25; // large enough to be one pixel on a six pixel font
 
@@ -51,8 +50,6 @@ public:
     COORD GetPosition() const noexcept;
 
     const CursorType GetType() const noexcept;
-    const bool IsUsingColor() const noexcept;
-    const COLORREF GetColor() const noexcept;
 
     void StartDeferDrawing() noexcept;
     bool IsDeferDrawing() noexcept;
@@ -67,7 +64,7 @@ public:
     void SetIsPopupShown(const bool fIsPopupShown) noexcept;
     void SetDelay(const bool fDelay) noexcept;
     void SetSize(const ULONG ulSize) noexcept;
-    void SetStyle(const ULONG ulSize, const COLORREF color, const CursorType type) noexcept;
+    void SetStyle(const ULONG ulSize, const CursorType type) noexcept;
 
     void SetPosition(const COORD cPosition) noexcept;
     void SetXPosition(const int NewX) noexcept;
@@ -84,7 +81,6 @@ public:
     COORD GetDelayedAtPosition() const noexcept;
     bool IsDelayedEOLWrap() const noexcept;
 
-    void SetColor(const unsigned int color) noexcept;
     void SetType(const CursorType type) noexcept;
 
 private:
@@ -117,6 +113,4 @@ private:
     void _RedrawCursorAlways() noexcept;
 
     CursorType _cursorType;
-    bool _fUseColor;
-    COLORREF _color;
 };

src/buffer/out/ut_textbuffer/TextAttributeTests.cpp

@@ -24,9 +24,11 @@ class TextAttributeTests
     TEST_METHOD(TestRoundtripDefaultColors);
     TEST_METHOD(TestBoldAsBright);
 
-    std::array<COLORREF, 256> _colorTable;
-    COLORREF _defaultFg = RGB(1, 2, 3);
-    COLORREF _defaultBg = RGB(4, 5, 6);
+    std::array<COLORREF, TextColor::TABLE_SIZE> _colorTable;
+    const COLORREF _defaultFg = RGB(1, 2, 3);
+    const COLORREF _defaultBg = RGB(4, 5, 6);
+    const size_t _defaultFgIndex = TextColor::DEFAULT_FOREGROUND;
+    const size_t _defaultBgIndex = TextColor::DEFAULT_BACKGROUND;
 };
 
 bool TextAttributeTests::ClassSetup()
@@ -47,6 +49,8 @@ bool TextAttributeTests::ClassSetup()
     _colorTable[13] = RGB(180, 0, 158); // Bright Magenta
     _colorTable[14] = RGB(249, 241, 165); // Bright Yellow
     _colorTable[15] = RGB(242, 242, 242); // White
+    _colorTable[_defaultFgIndex] = _defaultFg;
+    _colorTable[_defaultBgIndex] = _defaultBg;
     return true;
 }
 
@@ -132,17 +136,17 @@ void TextAttributeTests::TestTextAttributeColorGetters()
     //      values when reverse video is not set
     VERIFY_IS_FALSE(attr.IsReverseVideo());
 
-    VERIFY_ARE_EQUAL(red, attr.GetForeground().GetColor(_colorTable, _defaultFg));
-    VERIFY_ARE_EQUAL(green, attr.GetBackground().GetColor(_colorTable, _defaultBg));
-    VERIFY_ARE_EQUAL(std::make_pair(red, green), attr.CalculateRgbColors(_colorTable, _defaultFg, _defaultBg));
+    VERIFY_ARE_EQUAL(red, attr.GetForeground().GetColor(_colorTable, _defaultFgIndex));
+    VERIFY_ARE_EQUAL(green, attr.GetBackground().GetColor(_colorTable, _defaultBgIndex));
+    VERIFY_ARE_EQUAL(std::make_pair(red, green), attr.CalculateRgbColors(_colorTable, _defaultFgIndex, _defaultBgIndex));
 
     // with reverse video set, calculated foreground/background values should be
     //      switched while getters stay the same
     attr.SetReverseVideo(true);
 
-    VERIFY_ARE_EQUAL(red, attr.GetForeground().GetColor(_colorTable, _defaultFg));
-    VERIFY_ARE_EQUAL(green, attr.GetBackground().GetColor(_colorTable, _defaultBg));
-    VERIFY_ARE_EQUAL(std::make_pair(green, red), attr.CalculateRgbColors(_colorTable, _defaultFg, _defaultBg));
+    VERIFY_ARE_EQUAL(red, attr.GetForeground().GetColor(_colorTable, _defaultFgIndex));
+    VERIFY_ARE_EQUAL(green, attr.GetBackground().GetColor(_colorTable, _defaultBgIndex));
+    VERIFY_ARE_EQUAL(std::make_pair(green, red), attr.CalculateRgbColors(_colorTable, _defaultFgIndex, _defaultBgIndex));
 
     // reset the reverse video
     attr.SetReverseVideo(false);
@@ -151,17 +155,17 @@ void TextAttributeTests::TestTextAttributeColorGetters()
     //      while the background and getters stay the same
     attr.SetFaint(true);
 
-    VERIFY_ARE_EQUAL(red, attr.GetForeground().GetColor(_colorTable, _defaultFg));
-    VERIFY_ARE_EQUAL(green, attr.GetBackground().GetColor(_colorTable, _defaultBg));
-    VERIFY_ARE_EQUAL(std::make_pair(faintRed, green), attr.CalculateRgbColors(_colorTable, _defaultFg, _defaultBg));
+    VERIFY_ARE_EQUAL(red, attr.GetForeground().GetColor(_colorTable, _defaultFgIndex));
+    VERIFY_ARE_EQUAL(green, attr.GetBackground().GetColor(_colorTable, _defaultBgIndex));
+    VERIFY_ARE_EQUAL(std::make_pair(faintRed, green), attr.CalculateRgbColors(_colorTable, _defaultFgIndex, _defaultBgIndex));
 
     // with reverse video set, calculated foreground/background values should be
     //      switched, and the background fainter, while getters stay the same
     attr.SetReverseVideo(true);
 
-    VERIFY_ARE_EQUAL(red, attr.GetForeground().GetColor(_colorTable, _defaultFg));
-    VERIFY_ARE_EQUAL(green, attr.GetBackground().GetColor(_colorTable, _defaultBg));
-    VERIFY_ARE_EQUAL(std::make_pair(green, faintRed), attr.CalculateRgbColors(_colorTable, _defaultFg, _defaultBg));
+    VERIFY_ARE_EQUAL(red, attr.GetForeground().GetColor(_colorTable, _defaultFgIndex));
+    VERIFY_ARE_EQUAL(green, attr.GetBackground().GetColor(_colorTable, _defaultBgIndex));
+    VERIFY_ARE_EQUAL(std::make_pair(green, faintRed), attr.CalculateRgbColors(_colorTable, _defaultFgIndex, _defaultBgIndex));
 
     // reset the reverse video and faint attributes
     attr.SetReverseVideo(false);
@@ -171,17 +175,17 @@ void TextAttributeTests::TestTextAttributeColorGetters()
     //       background, while getters stay the same
     attr.SetInvisible(true);
 
-    VERIFY_ARE_EQUAL(red, attr.GetForeground().GetColor(_colorTable, _defaultFg));
-    VERIFY_ARE_EQUAL(green, attr.GetBackground().GetColor(_colorTable, _defaultBg));
-    VERIFY_ARE_EQUAL(std::make_pair(green, green), attr.CalculateRgbColors(_colorTable, _defaultFg, _defaultBg));
+    VERIFY_ARE_EQUAL(red, attr.GetForeground().GetColor(_colorTable, _defaultFgIndex));
+    VERIFY_ARE_EQUAL(green, attr.GetBackground().GetColor(_colorTable, _defaultBgIndex));
+    VERIFY_ARE_EQUAL(std::make_pair(green, green), attr.CalculateRgbColors(_colorTable, _defaultFgIndex, _defaultBgIndex));
 
     // with reverse video set, the calculated background value should match
     //      the foreground, while getters stay the same
     attr.SetReverseVideo(true);
 
-    VERIFY_ARE_EQUAL(red, attr.GetForeground().GetColor(_colorTable, _defaultFg));
-    VERIFY_ARE_EQUAL(green, attr.GetBackground().GetColor(_colorTable, _defaultBg));
-    VERIFY_ARE_EQUAL(std::make_pair(red, red), attr.CalculateRgbColors(_colorTable, _defaultFg, _defaultBg));
+    VERIFY_ARE_EQUAL(red, attr.GetForeground().GetColor(_colorTable, _defaultFgIndex));
+    VERIFY_ARE_EQUAL(green, attr.GetBackground().GetColor(_colorTable, _defaultBgIndex));
+    VERIFY_ARE_EQUAL(std::make_pair(red, red), attr.CalculateRgbColors(_colorTable, _defaultFgIndex, _defaultBgIndex));
 }
 
 void TextAttributeTests::TestReverseDefaultColors()
@@ -194,34 +198,34 @@ void TextAttributeTests::TestReverseDefaultColors()
     //      values when reverse video is not set
     VERIFY_IS_FALSE(attr.IsReverseVideo());
 
-    VERIFY_ARE_EQUAL(_defaultFg, attr.GetForeground().GetColor(_colorTable, _defaultFg));
-    VERIFY_ARE_EQUAL(_defaultBg, attr.GetBackground().GetColor(_colorTable, _defaultBg));
-    VERIFY_ARE_EQUAL(std::make_pair(_defaultFg, _defaultBg), attr.CalculateRgbColors(_colorTable, _defaultFg, _defaultBg));
+    VERIFY_ARE_EQUAL(_defaultFg, attr.GetForeground().GetColor(_colorTable, _defaultFgIndex));
+    VERIFY_ARE_EQUAL(_defaultBg, attr.GetBackground().GetColor(_colorTable, _defaultBgIndex));
+    VERIFY_ARE_EQUAL(std::make_pair(_defaultFg, _defaultBg), attr.CalculateRgbColors(_colorTable, _defaultFgIndex, _defaultBgIndex));
 
     // with reverse video set, calculated foreground/background values should be
     //      switched while getters stay the same
     attr.SetReverseVideo(true);
     VERIFY_IS_TRUE(attr.IsReverseVideo());
 
-    VERIFY_ARE_EQUAL(_defaultFg, attr.GetForeground().GetColor(_colorTable, _defaultFg));
-    VERIFY_ARE_EQUAL(_defaultBg, attr.GetBackground().GetColor(_colorTable, _defaultBg));
-    VERIFY_ARE_EQUAL(std::make_pair(_defaultBg, _defaultFg), attr.CalculateRgbColors(_colorTable, _defaultFg, _defaultBg));
+    VERIFY_ARE_EQUAL(_defaultFg, attr.GetForeground().GetColor(_colorTable, _defaultFgIndex));
+    VERIFY_ARE_EQUAL(_defaultBg, attr.GetBackground().GetColor(_colorTable, _defaultBgIndex));
+    VERIFY_ARE_EQUAL(std::make_pair(_defaultBg, _defaultFg), attr.CalculateRgbColors(_colorTable, _defaultFgIndex, _defaultBgIndex));
 
     attr.SetForeground(red);
     VERIFY_IS_TRUE(attr.IsReverseVideo());
 
-    VERIFY_ARE_EQUAL(red, attr.GetForeground().GetColor(_colorTable, _defaultFg));
-    VERIFY_ARE_EQUAL(_defaultBg, attr.GetBackground().GetColor(_colorTable, _defaultBg));
-    VERIFY_ARE_EQUAL(std::make_pair(_defaultBg, red), attr.CalculateRgbColors(_colorTable, _defaultFg, _defaultBg));
+    VERIFY_ARE_EQUAL(red, attr.GetForeground().GetColor(_colorTable, _defaultFgIndex));
+    VERIFY_ARE_EQUAL(_defaultBg, attr.GetBackground().GetColor(_colorTable, _defaultBgIndex));
+    VERIFY_ARE_EQUAL(std::make_pair(_defaultBg, red), attr.CalculateRgbColors(_colorTable, _defaultFgIndex, _defaultBgIndex));
 
     attr.Invert();
     VERIFY_IS_FALSE(attr.IsReverseVideo());
     attr.SetDefaultForeground();
     attr.SetBackground(green);
 
-    VERIFY_ARE_EQUAL(_defaultFg, attr.GetForeground().GetColor(_colorTable, _defaultFg));
-    VERIFY_ARE_EQUAL(green, attr.GetBackground().GetColor(_colorTable, _defaultBg));
-    VERIFY_ARE_EQUAL(std::make_pair(_defaultFg, green), attr.CalculateRgbColors(_colorTable, _defaultFg, _defaultBg));
+    VERIFY_ARE_EQUAL(_defaultFg, attr.GetForeground().GetColor(_colorTable, _defaultFgIndex));
+    VERIFY_ARE_EQUAL(green, attr.GetBackground().GetColor(_colorTable, _defaultBgIndex));
+    VERIFY_ARE_EQUAL(std::make_pair(_defaultFg, green), attr.CalculateRgbColors(_colorTable, _defaultFgIndex, _defaultBgIndex));
 }
 
 void TextAttributeTests::TestRoundtripDefaultColors()
@@ -237,7 +241,7 @@ void TextAttributeTests::TestRoundtripDefaultColors()
     Log::Comment(L"Foreground legacy default index should map to default text color.");
     legacyAttribute = fgLegacyDefault | BACKGROUND_GREEN;
     textAttribute.SetDefaultForeground();
-    textAttribute.SetIndexedBackground256(BACKGROUND_GREEN >> 4);
+    textAttribute.SetIndexedBackground256(TextColor::DARK_GREEN);
     VERIFY_ARE_EQUAL(textAttribute, TextAttribute{ legacyAttribute });
 
     Log::Comment(L"Default foreground text color should map back to legacy default index.");
@@ -245,7 +249,7 @@ void TextAttributeTests::TestRoundtripDefaultColors()
 
     Log::Comment(L"Background legacy default index should map to default text color.");
     legacyAttribute = FOREGROUND_GREEN | bgLegacyDefault;
-    textAttribute.SetIndexedForeground256(FOREGROUND_GREEN);
+    textAttribute.SetIndexedForeground256(TextColor::DARK_GREEN);
     textAttribute.SetDefaultBackground();
     VERIFY_ARE_EQUAL(textAttribute, TextAttribute{ legacyAttribute });
 
@@ -277,43 +281,43 @@ void TextAttributeTests::TestBoldAsBright()
     //      values when not bold
     VERIFY_IS_FALSE(attr.IsBold());
 
-    VERIFY_ARE_EQUAL(_defaultFg, attr.GetForeground().GetColor(_colorTable, _defaultFg));
-    VERIFY_ARE_EQUAL(_defaultBg, attr.GetBackground().GetColor(_colorTable, _defaultBg));
-    VERIFY_ARE_EQUAL(std::make_pair(_defaultFg, _defaultBg), attr.CalculateRgbColors(_colorTable, _defaultFg, _defaultBg, false, false, true));
-    VERIFY_ARE_EQUAL(std::make_pair(_defaultFg, _defaultBg), attr.CalculateRgbColors(_colorTable, _defaultFg, _defaultBg, false, false, false));
+    VERIFY_ARE_EQUAL(_defaultFg, attr.GetForeground().GetColor(_colorTable, _defaultFgIndex));
+    VERIFY_ARE_EQUAL(_defaultBg, attr.GetBackground().GetColor(_colorTable, _defaultBgIndex));
+    VERIFY_ARE_EQUAL(std::make_pair(_defaultFg, _defaultBg), attr.CalculateRgbColors(_colorTable, _defaultFgIndex, _defaultBgIndex, false, false, true));
+    VERIFY_ARE_EQUAL(std::make_pair(_defaultFg, _defaultBg), attr.CalculateRgbColors(_colorTable, _defaultFgIndex, _defaultBgIndex, false, false, false));
 
     // with bold set, calculated foreground/background values shouldn't change for the default colors.
     attr.SetBold(true);
     VERIFY_IS_TRUE(attr.IsBold());
-    VERIFY_ARE_EQUAL(std::make_pair(_defaultFg, _defaultBg), attr.CalculateRgbColors(_colorTable, _defaultFg, _defaultBg, false, false, true));
-    VERIFY_ARE_EQUAL(std::make_pair(_defaultFg, _defaultBg), attr.CalculateRgbColors(_colorTable, _defaultFg, _defaultBg, false, false, false));
+    VERIFY_ARE_EQUAL(std::make_pair(_defaultFg, _defaultBg), attr.CalculateRgbColors(_colorTable, _defaultFgIndex, _defaultBgIndex, false, false, true));
+    VERIFY_ARE_EQUAL(std::make_pair(_defaultFg, _defaultBg), attr.CalculateRgbColors(_colorTable, _defaultFgIndex, _defaultBgIndex, false, false, false));
 
-    attr.SetIndexedForeground(0);
+    attr.SetIndexedForeground(TextColor::DARK_BLACK);
     VERIFY_IS_TRUE(attr.IsBold());
 
     Log::Comment(L"Foreground should be bright black when bold is bright is enabled");
-    VERIFY_ARE_EQUAL(std::make_pair(brightBlack, _defaultBg), attr.CalculateRgbColors(_colorTable, _defaultFg, _defaultBg, false, false, true));
+    VERIFY_ARE_EQUAL(std::make_pair(brightBlack, _defaultBg), attr.CalculateRgbColors(_colorTable, _defaultFgIndex, _defaultBgIndex, false, false, true));
 
     Log::Comment(L"Foreground should be dark black when bold is bright is disabled");
-    VERIFY_ARE_EQUAL(std::make_pair(darkBlack, _defaultBg), attr.CalculateRgbColors(_colorTable, _defaultFg, _defaultBg, false, false, false));
+    VERIFY_ARE_EQUAL(std::make_pair(darkBlack, _defaultBg), attr.CalculateRgbColors(_colorTable, _defaultFgIndex, _defaultBgIndex, false, false, false));
 
-    attr.SetIndexedBackground(2);
+    attr.SetIndexedBackground(TextColor::DARK_GREEN);
     VERIFY_IS_TRUE(attr.IsBold());
 
     Log::Comment(L"background should be unaffected by 'bold is bright'");
-    VERIFY_ARE_EQUAL(std::make_pair(brightBlack, darkGreen), attr.CalculateRgbColors(_colorTable, _defaultFg, _defaultBg, false, false, true));
-    VERIFY_ARE_EQUAL(std::make_pair(darkBlack, darkGreen), attr.CalculateRgbColors(_colorTable, _defaultFg, _defaultBg, false, false, false));
+    VERIFY_ARE_EQUAL(std::make_pair(brightBlack, darkGreen), attr.CalculateRgbColors(_colorTable, _defaultFgIndex, _defaultBgIndex, false, false, true));
+    VERIFY_ARE_EQUAL(std::make_pair(darkBlack, darkGreen), attr.CalculateRgbColors(_colorTable, _defaultFgIndex, _defaultBgIndex, false, false, false));
 
     attr.SetBold(false);
     VERIFY_IS_FALSE(attr.IsBold());
     Log::Comment(L"when not bold, 'bold is bright' changes nothing");
-    VERIFY_ARE_EQUAL(std::make_pair(darkBlack, darkGreen), attr.CalculateRgbColors(_colorTable, _defaultFg, _defaultBg, false, false, true));
-    VERIFY_ARE_EQUAL(std::make_pair(darkBlack, darkGreen), attr.CalculateRgbColors(_colorTable, _defaultFg, _defaultBg, false, false, false));
+    VERIFY_ARE_EQUAL(std::make_pair(darkBlack, darkGreen), attr.CalculateRgbColors(_colorTable, _defaultFgIndex, _defaultBgIndex, false, false, true));
+    VERIFY_ARE_EQUAL(std::make_pair(darkBlack, darkGreen), attr.CalculateRgbColors(_colorTable, _defaultFgIndex, _defaultBgIndex, false, false, false));
 
     Log::Comment(L"When set to a bright color, and bold, 'bold is bright' changes nothing");
     attr.SetBold(true);
-    attr.SetIndexedForeground(8);
+    attr.SetIndexedForeground(TextColor::BRIGHT_BLACK);
     VERIFY_IS_TRUE(attr.IsBold());
-    VERIFY_ARE_EQUAL(std::make_pair(brightBlack, darkGreen), attr.CalculateRgbColors(_colorTable, _defaultFg, _defaultBg, false, false, true));
-    VERIFY_ARE_EQUAL(std::make_pair(brightBlack, darkGreen), attr.CalculateRgbColors(_colorTable, _defaultFg, _defaultBg, false, false, false));
+    VERIFY_ARE_EQUAL(std::make_pair(brightBlack, darkGreen), attr.CalculateRgbColors(_colorTable, _defaultFgIndex, _defaultBgIndex, false, false, true));
+    VERIFY_ARE_EQUAL(std::make_pair(brightBlack, darkGreen), attr.CalculateRgbColors(_colorTable, _defaultFgIndex, _defaultBgIndex, false, false, false));
 }

src/buffer/out/ut_textbuffer/TextColorTests.cpp

@@ -23,9 +23,11 @@ class TextColorTests
     TEST_METHOD(TestRgbColor);
     TEST_METHOD(TestChangeColor);
 
-    std::array<COLORREF, 256> _colorTable;
-    COLORREF _defaultFg = RGB(1, 2, 3);
-    COLORREF _defaultBg = RGB(4, 5, 6);
+    std::array<COLORREF, TextColor::TABLE_SIZE> _colorTable;
+    const COLORREF _defaultFg = RGB(1, 2, 3);
+    const COLORREF _defaultBg = RGB(4, 5, 6);
+    const size_t _defaultFgIndex = TextColor::DEFAULT_FOREGROUND;
+    const size_t _defaultBgIndex = TextColor::DEFAULT_BACKGROUND;
 };
 
 bool TextColorTests::ClassSetup()
@@ -46,6 +48,8 @@ bool TextColorTests::ClassSetup()
     _colorTable[13] = RGB(180, 0, 158); // Bright Magenta
     _colorTable[14] = RGB(249, 241, 165); // Bright Yellow
     _colorTable[15] = RGB(242, 242, 242); // White
+    _colorTable[_defaultFgIndex] = _defaultFg;
+    _colorTable[_defaultBgIndex] = _defaultBg;
     return true;
 }
 
@@ -57,16 +61,16 @@ void TextColorTests::TestDefaultColor()
     VERIFY_IS_FALSE(defaultColor.IsLegacy());
     VERIFY_IS_FALSE(defaultColor.IsRgb());
 
-    auto color = defaultColor.GetColor(_colorTable, _defaultFg, false);
+    auto color = defaultColor.GetColor(_colorTable, _defaultFgIndex, false);
     VERIFY_ARE_EQUAL(_defaultFg, color);
 
-    color = defaultColor.GetColor(_colorTable, _defaultFg, true);
+    color = defaultColor.GetColor(_colorTable, _defaultFgIndex, true);
     VERIFY_ARE_EQUAL(_defaultFg, color);
 
-    color = defaultColor.GetColor(_colorTable, _defaultBg, false);
+    color = defaultColor.GetColor(_colorTable, _defaultBgIndex, false);
     VERIFY_ARE_EQUAL(_defaultBg, color);
 
-    color = defaultColor.GetColor(_colorTable, _defaultBg, true);
+    color = defaultColor.GetColor(_colorTable, _defaultBgIndex, true);
     VERIFY_ARE_EQUAL(_defaultBg, color);
 }
 
@@ -78,16 +82,16 @@ void TextColorTests::TestDarkIndexColor()
     VERIFY_IS_TRUE(indexColor.IsLegacy());
     VERIFY_IS_FALSE(indexColor.IsRgb());
 
-    auto color = indexColor.GetColor(_colorTable, _defaultFg, false);
+    auto color = indexColor.GetColor(_colorTable, _defaultFgIndex, false);
     VERIFY_ARE_EQUAL(_colorTable[7], color);
 
-    color = indexColor.GetColor(_colorTable, _defaultFg, true);
+    color = indexColor.GetColor(_colorTable, _defaultFgIndex, true);
     VERIFY_ARE_EQUAL(_colorTable[15], color);
 
-    color = indexColor.GetColor(_colorTable, _defaultBg, false);
+    color = indexColor.GetColor(_colorTable, _defaultBgIndex, false);
     VERIFY_ARE_EQUAL(_colorTable[7], color);
 
-    color = indexColor.GetColor(_colorTable, _defaultBg, true);
+    color = indexColor.GetColor(_colorTable, _defaultBgIndex, true);
     VERIFY_ARE_EQUAL(_colorTable[15], color);
 }
 
@@ -99,16 +103,16 @@ void TextColorTests::TestBrightIndexColor()
     VERIFY_IS_TRUE(indexColor.IsLegacy());
     VERIFY_IS_FALSE(indexColor.IsRgb());
 
-    auto color = indexColor.GetColor(_colorTable, _defaultFg, false);
+    auto color = indexColor.GetColor(_colorTable, _defaultFgIndex, false);
     VERIFY_ARE_EQUAL(_colorTable[15], color);
 
-    color = indexColor.GetColor(_colorTable, _defaultFg, true);
+    color = indexColor.GetColor(_colorTable, _defaultFgIndex, true);
     VERIFY_ARE_EQUAL(_colorTable[15], color);
 
-    color = indexColor.GetColor(_colorTable, _defaultBg, false);
+    color = indexColor.GetColor(_colorTable, _defaultBgIndex, false);
     VERIFY_ARE_EQUAL(_colorTable[15], color);
 
-    color = indexColor.GetColor(_colorTable, _defaultBg, true);
+    color = indexColor.GetColor(_colorTable, _defaultBgIndex, true);
     VERIFY_ARE_EQUAL(_colorTable[15], color);
 }
 
@@ -121,16 +125,16 @@ void TextColorTests::TestRgbColor()
     VERIFY_IS_FALSE(rgbColor.IsLegacy());
     VERIFY_IS_TRUE(rgbColor.IsRgb());
 
-    auto color = rgbColor.GetColor(_colorTable, _defaultFg, false);
+    auto color = rgbColor.GetColor(_colorTable, _defaultFgIndex, false);
     VERIFY_ARE_EQUAL(myColor, color);
 
-    color = rgbColor.GetColor(_colorTable, _defaultFg, true);
+    color = rgbColor.GetColor(_colorTable, _defaultFgIndex, true);
     VERIFY_ARE_EQUAL(myColor, color);
 
-    color = rgbColor.GetColor(_colorTable, _defaultBg, false);
+    color = rgbColor.GetColor(_colorTable, _defaultBgIndex, false);
     VERIFY_ARE_EQUAL(myColor, color);
 
-    color = rgbColor.GetColor(_colorTable, _defaultBg, true);
+    color = rgbColor.GetColor(_colorTable, _defaultBgIndex, true);
     VERIFY_ARE_EQUAL(myColor, color);
 }
 
@@ -143,55 +147,55 @@ void TextColorTests::TestChangeColor()
     VERIFY_IS_FALSE(rgbColor.IsLegacy());
     VERIFY_IS_TRUE(rgbColor.IsRgb());
 
-    auto color = rgbColor.GetColor(_colorTable, _defaultFg, false);
+    auto color = rgbColor.GetColor(_colorTable, _defaultFgIndex, false);
     VERIFY_ARE_EQUAL(myColor, color);
 
-    color = rgbColor.GetColor(_colorTable, _defaultFg, true);
+    color = rgbColor.GetColor(_colorTable, _defaultFgIndex, true);
     VERIFY_ARE_EQUAL(myColor, color);
 
-    color = rgbColor.GetColor(_colorTable, _defaultBg, false);
+    color = rgbColor.GetColor(_colorTable, _defaultBgIndex, false);
     VERIFY_ARE_EQUAL(myColor, color);
 
-    color = rgbColor.GetColor(_colorTable, _defaultBg, true);
+    color = rgbColor.GetColor(_colorTable, _defaultBgIndex, true);
     VERIFY_ARE_EQUAL(myColor, color);
 
     rgbColor.SetDefault();
 
-    color = rgbColor.GetColor(_colorTable, _defaultFg, false);
+    color = rgbColor.GetColor(_colorTable, _defaultFgIndex, false);
     VERIFY_ARE_EQUAL(_defaultFg, color);
 
-    color = rgbColor.GetColor(_colorTable, _defaultFg, true);
+    color = rgbColor.GetColor(_colorTable, _defaultFgIndex, true);
     VERIFY_ARE_EQUAL(_defaultFg, color);
 
-    color = rgbColor.GetColor(_colorTable, _defaultBg, false);
+    color = rgbColor.GetColor(_colorTable, _defaultBgIndex, false);
     VERIFY_ARE_EQUAL(_defaultBg, color);
 
-    color = rgbColor.GetColor(_colorTable, _defaultBg, true);
+    color = rgbColor.GetColor(_colorTable, _defaultBgIndex, true);
     VERIFY_ARE_EQUAL(_defaultBg, color);
 
     rgbColor.SetIndex(7, false);
-    color = rgbColor.GetColor(_colorTable, _defaultFg, false);
+    color = rgbColor.GetColor(_colorTable, _defaultFgIndex, false);
     VERIFY_ARE_EQUAL(_colorTable[7], color);
 
-    color = rgbColor.GetColor(_colorTable, _defaultFg, true);
+    color = rgbColor.GetColor(_colorTable, _defaultFgIndex, true);
     VERIFY_ARE_EQUAL(_colorTable[15], color);
 
-    color = rgbColor.GetColor(_colorTable, _defaultBg, false);
+    color = rgbColor.GetColor(_colorTable, _defaultBgIndex, false);
     VERIFY_ARE_EQUAL(_colorTable[7], color);
 
-    color = rgbColor.GetColor(_colorTable, _defaultBg, true);
+    color = rgbColor.GetColor(_colorTable, _defaultBgIndex, true);
     VERIFY_ARE_EQUAL(_colorTable[15], color);
 
     rgbColor.SetIndex(15, false);
-    color = rgbColor.GetColor(_colorTable, _defaultFg, false);
+    color = rgbColor.GetColor(_colorTable, _defaultFgIndex, false);
     VERIFY_ARE_EQUAL(_colorTable[15], color);
 
-    color = rgbColor.GetColor(_colorTable, _defaultFg, true);
+    color = rgbColor.GetColor(_colorTable, _defaultFgIndex, true);
     VERIFY_ARE_EQUAL(_colorTable[15], color);
 
-    color = rgbColor.GetColor(_colorTable, _defaultBg, false);
+    color = rgbColor.GetColor(_colorTable, _defaultBgIndex, false);
     VERIFY_ARE_EQUAL(_colorTable[15], color);
 
-    color = rgbColor.GetColor(_colorTable, _defaultBg, true);
+    color = rgbColor.GetColor(_colorTable, _defaultBgIndex, true);
     VERIFY_ARE_EQUAL(_colorTable[15], color);
 }

src/cascadia/CascadiaPackage/CascadiaPackage.wapproj

@@ -61,13 +61,26 @@
 
   <Import Project="$(MSBuildThisFileDirectory)..\CascadiaResources.build.items" />
   <Import Project="$(OpenConsoleDir)src\wap-common.build.post.props" />
+
   <ItemGroup>
-    <ProjectReference Include="..\WindowsTerminal\WindowsTerminal.vcxproj" />
-    <ProjectReference Include="..\..\host\exe\Host.EXE.vcxproj" />
-    <ProjectReference Include="..\..\host\proxy\Host.Proxy.vcxproj" />
-    <ProjectReference Include="..\TerminalAzBridge\TerminalAzBridge.vcxproj" />
-    <ProjectReference Include="..\ShellExtension\WindowsTerminalShellExt.vcxproj" />
-    <ProjectReference Include="..\wt\wt.vcxproj" />
+    <ProjectReference Include="$(OpenConsoleDir)src\cascadia\WindowsTerminal\WindowsTerminal.vcxproj">
+      <Project>{CA5CAD1A-1754-4A9D-93D7-857A9D17CB1B}</Project>
+    </ProjectReference>
+    <ProjectReference Include="$(OpenConsoleDir)src\cascadia\TerminalAzBridge\TerminalAzBridge.vcxproj">
+      <Project>{067F0A06-FCB7-472C-96E9-B03B54E8E18D}</Project>
+    </ProjectReference>
+    <ProjectReference Include="$(OpenConsoleDir)src\cascadia\ShellExtension\WindowsTerminalShellExt.vcxproj">
+      <Project>{f2ed628a-db22-446f-a081-4cc845b51a2b}</Project>
+    </ProjectReference>
+    <ProjectReference Include="$(OpenConsoleDir)src\cascadia\wt\wt.vcxproj">
+      <Project>{506fd703-baa7-4f6e-9361-64f550ec8fca}</Project>
+    </ProjectReference>
+    <ProjectReference Include="$(OpenConsoleDir)src\host\exe\Host.EXE.vcxproj">
+      <Project>{9CBD7DFA-1754-4A9D-93D7-857A9D17CB1B}</Project>
+    </ProjectReference>
+    <ProjectReference Include="$(OpenConsoleDir)src\host\proxy\Host.Proxy.vcxproj">
+      <Project>{71CC9D78-BA29-4D93-946F-BEF5D9A3A6EF}</Project>
+    </ProjectReference>
   </ItemGroup>
 
   <Target Name="OpenConsoleStompSourceProjectForWapProject" BeforeTargets="_ConvertItems">

src/cascadia/CascadiaPackage/Package-Dev.appxmanifest

@@ -26,7 +26,7 @@
   </Properties>
 
   <Dependencies>
-    <TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.18362.0" MaxVersionTested="10.0.19041.0" />
+    <TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.18362.0" MaxVersionTested="10.0.22000.0" />
   </Dependencies>
 
   <Resources>

src/cascadia/CascadiaPackage/Package-Pre.appxmanifest

@@ -27,7 +27,7 @@
   </Properties>
 
   <Dependencies>
-    <TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.18362.0" MaxVersionTested="10.0.19041.0" />
+    <TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.18362.0" MaxVersionTested="10.0.22000.0" />
   </Dependencies>
 
   <Resources>

src/cascadia/CascadiaPackage/Package.appxmanifest

@@ -27,7 +27,7 @@
   </Properties>
 
   <Dependencies>
-    <TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.18362.0" MaxVersionTested="10.0.19041.0" />
+    <TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.18362.0" MaxVersionTested="10.0.22000.0" />
   </Dependencies>
 
   <Resources>
@@ -74,7 +74,7 @@
             Enabled="false"
             DisplayName="ms-resource:AppName" />
         </uap5:Extension>
-        <!-- <uap3:Extension Category="windows.appExtension">
+        <uap3:Extension Category="windows.appExtension">
             <uap3:AppExtension Name="com.microsoft.windows.console.host"
                 Id="OpenConsole"
                 DisplayName="OpenConsole"
@@ -102,15 +102,15 @@
                 <com:Interface Id="E686C757-9A35-4A1C-B3CE-0BCC8B5C69F4" ProxyStubClsid="3171DE52-6EFA-4AEF-8A9F-D02BD67E7A4F"/>
                 <com:Interface Id="59D55CCE-FC8A-48B4-ACE8-0A9286C6557F" ProxyStubClsid="3171DE52-6EFA-4AEF-8A9F-D02BD67E7A4F"/>
             </com:ComInterface>
-        </com:Extension> -->
+        </com:Extension>
         <com:Extension Category="windows.comServer">
             <com:ComServer>
-                <!-- <com:ExeServer DisplayName="OpenConsole" Executable="OpenConsole.exe">
+                <com:ExeServer DisplayName="OpenConsole" Executable="OpenConsole.exe">
                     <com:Class Id="2EACA947-7F5F-4CFA-BA87-8F7FBEEFBE69"/>
                 </com:ExeServer>
                 <com:ExeServer DisplayName="WindowsTerminal" Executable="WindowsTerminal.exe">
                     <com:Class Id="E12CFF52-A866-4C77-9A90-F570A7AA2C6B"/>
-                </com:ExeServer> -->
+                </com:ExeServer>
                 <com:SurrogateServer DisplayName="WindowsTerminalShellExt">
                     <com:Class Id="9f156763-7844-4dc4-b2b1-901f640f5155" Path="WindowsTerminalShellExt.dll" ThreadingModel="STA"/>
                 </com:SurrogateServer>

src/cascadia/LocalTests_SettingsModel/ColorSchemeTests.cpp

@@ -80,7 +80,7 @@ namespace SettingsModelLocalTests
 
         std::array<COLORREF, COLOR_TABLE_SIZE> expectedCampbellTable;
         const auto campbellSpan = gsl::make_span(expectedCampbellTable);
-        Utils::InitializeCampbellColorTable(campbellSpan);
+        Utils::InitializeColorTable(campbellSpan);
         Utils::SetColorTableAlpha(campbellSpan, 0);
 
         for (size_t i = 0; i < expectedCampbellTable.size(); i++)

src/cascadia/LocalTests_SettingsModel/CommandTests.cpp

@@ -465,6 +465,10 @@ namespace SettingsModelLocalTests
                 "name":"action7_startingDirectoryWithTrailingSlash",
                 "command": { "action": "newWindow", "startingDirectory":"C:\\", "commandline": "bar.exe" }
             },
+            {
+                "name":"action8_tabTitleEscaping",
+                "command": { "action": "newWindow", "tabTitle":"\\\";foo\\" }
+            }
         ])" };
 
         const auto commands0Json = VerifyParseSucceeded(commands0String);
@@ -473,7 +477,7 @@ namespace SettingsModelLocalTests
         VERIFY_ARE_EQUAL(0u, commands.Size());
         auto warnings = implementation::Command::LayerJson(commands, commands0Json);
         VERIFY_ARE_EQUAL(0u, warnings.size());
-        VERIFY_ARE_EQUAL(8u, commands.Size());
+        VERIFY_ARE_EQUAL(9u, commands.Size());
 
         {
             auto command = commands.Lookup(L"action0");
@@ -586,5 +590,20 @@ namespace SettingsModelLocalTests
                 L"cmdline: \"%s\"", cmdline.c_str()));
             VERIFY_ARE_EQUAL(L"--startingDirectory \"C:\\\\\" -- \"bar.exe\"", terminalArgs.ToCommandline());
         }
+
+        {
+            auto command = commands.Lookup(L"action8_tabTitleEscaping");
+            VERIFY_IS_NOT_NULL(command);
+            VERIFY_IS_NOT_NULL(command.ActionAndArgs());
+            VERIFY_ARE_EQUAL(ShortcutAction::NewWindow, command.ActionAndArgs().Action());
+            const auto& realArgs = command.ActionAndArgs().Args().try_as<NewWindowArgs>();
+            VERIFY_IS_NOT_NULL(realArgs);
+            const auto& terminalArgs = realArgs.TerminalArgs();
+            VERIFY_IS_NOT_NULL(terminalArgs);
+            auto cmdline = terminalArgs.ToCommandline();
+            Log::Comment(NoThrowString().Format(
+                L"cmdline: \"%s\"", cmdline.c_str()));
+            VERIFY_ARE_EQUAL(LR"-(--title "\\\"\;foo\\")-", terminalArgs.ToCommandline());
+        }
     }
 }

src/cascadia/LocalTests_SettingsModel/DeserializationTests.cpp

@@ -7,7 +7,9 @@
 #include "../TerminalSettingsModel/CascadiaSettings.h"
 #include "JsonTestClass.h"
 #include "TestUtils.h"
+
 #include <defaults.h>
+#include <userDefaults.h>
 
 using namespace Microsoft::Console;
 using namespace WEX::Logging;
@@ -70,6 +72,7 @@ namespace SettingsModelLocalTests
         TEST_METHOD(TestCloneInheritanceTree);
         TEST_METHOD(TestValidDefaults);
         TEST_METHOD(TestInheritedCommand);
+        TEST_METHOD(LoadFragmentsWithMultipleUpdates);
 
     private:
         static winrt::com_ptr<implementation::CascadiaSettings> createSettings(const std::string_view& userJSON)
@@ -1092,7 +1095,7 @@ namespace SettingsModelLocalTests
                 },
                 {
                     "name": "profile1",
-                    "guid": "{6239a42c-1111-49a3-80bd-e8fdd045185c}",
+                    "guid": "{6239a42c-2222-49a3-80bd-e8fdd045185c}",
                     "source": "Terminal.App.UnitTest.1",
                     "historySize": 2222
                 },
@@ -1979,4 +1982,34 @@ namespace SettingsModelLocalTests
             VERIFY_IS_NULL(actualKeyChord);
         }
     }
+
+    // This test ensures GH#11597 doesn't regress.
+    void DeserializationTests::LoadFragmentsWithMultipleUpdates()
+    {
+        static constexpr std::wstring_view fragmentSource{ L"fragment" };
+        static constexpr std::string_view fragmentJson{ R"({
+            "profiles": [
+                {
+                    "updates": "{61c54bbd-c2c6-5271-96e7-009a87ff44bf}",
+                    "cursorShape": "filledBox"
+                },
+                {
+                    "updates": "{0caa0dad-35be-5f56-a8ff-afceeeaa6101}",
+                    "cursorShape": "filledBox"
+                },
+                {
+                    "guid": "{6239a42c-0000-49a3-80bd-e8fdd045185c}",
+                    "commandline": "cmd.exe"
+                }
+            ]
+        })" };
+
+        implementation::SettingsLoader loader{ std::string_view{}, DefaultJson };
+        loader.MergeInboxIntoUserSettings();
+        loader.MergeFragmentIntoUserSettings(winrt::hstring{ fragmentSource }, fragmentJson);
+        loader.FinalizeLayering();
+
+        VERIFY_IS_FALSE(loader.duplicateProfile);
+        VERIFY_ARE_EQUAL(3u, loader.userSettings.profiles.size());
+    }
 }

src/cascadia/LocalTests_SettingsModel/ProfileTests.cpp

@@ -272,20 +272,30 @@ namespace SettingsModelLocalTests
     void ProfileTests::DuplicateProfileTest()
     {
         static constexpr std::string_view userProfiles{ R"({
-            "profiles": [
-                {
-                    "name": "profile0",
-                    "guid": "{6239a42c-0000-49a3-80bd-e8fdd045185c}",
-                    "backgroundImage": "file:///some/path",
-                    "hidden": false,
-                }
-            ]
+            "profiles": {
+                "defaults": {
+                    "font": {
+                        "size": 123
+                    }
+                },
+                "list": [
+                    {
+                        "name": "profile0",
+                        "guid": "{6239a42c-0000-49a3-80bd-e8fdd045185c}",
+                        "backgroundImage": "file:///some/path",
+                        "hidden": false,
+                    }
+                ]
+            }
         })" };
 
         const auto settings = winrt::make_self<implementation::CascadiaSettings>(userProfiles);
         const auto profile = settings->AllProfiles().GetAt(0);
         const auto duplicatedProfile = settings->DuplicateProfile(profile);
 
+        // GH#11392: Ensure duplicated profiles properly inherit the base layer, even for nested objects.
+        VERIFY_ARE_EQUAL(123, duplicatedProfile.FontInfo().FontSize());
+
         duplicatedProfile.Guid(profile.Guid());
         duplicatedProfile.Name(profile.Name());
 
@@ -300,6 +310,17 @@ namespace SettingsModelLocalTests
         // the GUID generated for a dynamic profile (with a source) is different
         // than that of a profile without a source.
 
+        static constexpr std::string_view inboxSettings{ R"({
+            "profiles": [
+                {
+                    "name" : "profile0",
+                    "source": "Terminal.App.UnitTest.0"
+                },
+                {
+                    "name" : "profile1"
+                }
+            ]
+        })" };
         static constexpr std::string_view userSettings{ R"({
             "profiles": [
                 {
@@ -312,9 +333,9 @@ namespace SettingsModelLocalTests
             ]
         })" };
 
-        const auto settings = winrt::make_self<implementation::CascadiaSettings>(userSettings, DefaultJson);
+        const auto settings = winrt::make_self<implementation::CascadiaSettings>(userSettings, inboxSettings);
 
-        VERIFY_ARE_EQUAL(4u, settings->AllProfiles().Size());
+        VERIFY_ARE_EQUAL(3u, settings->AllProfiles().Size());
 
         VERIFY_ARE_EQUAL(L"profile0", settings->AllProfiles().GetAt(0).Name());
         VERIFY_IS_TRUE(settings->AllProfiles().GetAt(0).HasGuid());

src/cascadia/LocalTests_SettingsModel/SerializationTests.cpp

@@ -53,7 +53,7 @@ namespace SettingsModelLocalTests
         // Return Value:
         // - the JsonObject representing this instance
         template<typename T>
-        void RoundtripTest(const std::string& jsonString)
+        void RoundtripTest(const std::string_view& jsonString)
         {
             const auto json{ VerifyParseSucceeded(jsonString) };
             const auto settings{ T::FromJson(json) };
@@ -69,7 +69,7 @@ namespace SettingsModelLocalTests
 
     void SerializationTests::GlobalSettings()
     {
-        const std::string globalsString{ R"(
+        static constexpr std::string_view globalsString{ R"(
             {
                 "defaultProfile": "{61c54bbd-c2c6-5271-96e7-009a87ff44bf}",
 
@@ -97,6 +97,7 @@ namespace SettingsModelLocalTests
                 "confirmCloseAllTabs": true,
                 "largePasteWarning": true,
                 "multiLinePasteWarning": true,
+                "trimPaste": true,
 
                 "experimental.input.forceVT": false,
                 "experimental.rendering.forceFullRepaint": false,
@@ -105,7 +106,7 @@ namespace SettingsModelLocalTests
                 "actions": []
             })" };
 
-        const std::string smallGlobalsString{ R"(
+        static constexpr std::string_view smallGlobalsString{ R"(
             {
                 "defaultProfile": "{61c54bbd-c2c6-5271-96e7-009a87ff44bf}",
                 "actions": []
@@ -117,7 +118,7 @@ namespace SettingsModelLocalTests
 
     void SerializationTests::Profile()
     {
-        const std::string profileString{ R"(
+        static constexpr std::string_view profileString{ R"(
             {
                 "name": "Windows PowerShell",
                 "guid": "{61c54bbd-c2c6-5271-96e7-009a87ff44bf}",
@@ -152,7 +153,7 @@ namespace SettingsModelLocalTests
                 "selectionBackground": "#CCAABB",
 
                 "useAcrylic": false,
-                "acrylicOpacity": 0.5,
+                "opacity": 50,
 
                 "backgroundImage": "made_you_look.jpeg",
                 "backgroundImageStretchMode": "uniformToFill",
@@ -167,7 +168,7 @@ namespace SettingsModelLocalTests
                 "experimental.retroTerminalEffect": false
             })" };
 
-        const std::string smallProfileString{ R"(
+        static constexpr std::string_view smallProfileString{ R"(
             {
                 "name": "Custom Profile"
             })" };
@@ -175,7 +176,7 @@ namespace SettingsModelLocalTests
         // Setting "tabColor" to null tests two things:
         // - null should count as an explicit user-set value, not falling back to the parent's value
         // - null should be acceptable even though we're working with colors
-        const std::string weirdProfileString{ R"(
+        static constexpr std::string_view weirdProfileString{ R"(
             {
                 "guid" : "{8b039d4d-77ca-5a83-88e1-dfc8e895a127}",
                 "name": "Weird Profile",
@@ -192,7 +193,7 @@ namespace SettingsModelLocalTests
 
     void SerializationTests::ColorScheme()
     {
-        const std::string schemeString{ R"({
+        static constexpr std::string_view schemeString{ R"({
                                             "name": "Campbell",
 
                                             "cursorColor": "#FFFFFF",
@@ -225,56 +226,56 @@ namespace SettingsModelLocalTests
     void SerializationTests::Actions()
     {
         // simple command
-        const std::string actionsString1{ R"([
+        static constexpr std::string_view actionsString1{ R"([
                                                 { "command": "paste" }
                                             ])" };
 
         // complex command
-        const std::string actionsString2A{ R"([
+        static constexpr std::string_view actionsString2A{ R"([
                                                 { "command": { "action": "setTabColor" } }
                                             ])" };
-        const std::string actionsString2B{ R"([
+        static constexpr std::string_view actionsString2B{ R"([
                                                 { "command": { "action": "setTabColor", "color": "#112233" } }
                                             ])" };
-        const std::string actionsString2C{ R"([
+        static constexpr std::string_view actionsString2C{ R"([
                                                 { "command": { "action": "copy" } },
                                                 { "command": { "action": "copy", "singleLine": true, "copyFormatting": "html" } }
                                             ])" };
 
         // simple command with key chords
-        const std::string actionsString3{ R"([
+        static constexpr std::string_view actionsString3{ R"([
                                                 { "command": "toggleAlwaysOnTop", "keys": "ctrl+a" },
                                                 { "command": "toggleAlwaysOnTop", "keys": "ctrl+b" }
                                             ])" };
 
         // complex command with key chords
-        const std::string actionsString4A{ R"([
+        static constexpr std::string_view actionsString4A{ R"([
                                                 { "command": { "action": "adjustFontSize", "delta": 1 }, "keys": "ctrl+c" },
                                                 { "command": { "action": "adjustFontSize", "delta": 1 }, "keys": "ctrl+d" }
                                             ])" };
-        const std::string actionsString4B{ R"([
+        static constexpr std::string_view actionsString4B{ R"([
                                                 { "command": { "action": "findMatch", "direction": "next" }, "keys": "ctrl+shift+s" },
                                                 { "command": { "action": "findMatch", "direction": "prev" }, "keys": "ctrl+shift+r" }
                                             ])" };
 
         // command with name and icon and multiple key chords
-        const std::string actionsString5{ R"([
+        static constexpr std::string_view actionsString5{ R"([
                                                 { "icon": "image.png", "name": "Scroll To Top Name", "command": "scrollToTop", "keys": "ctrl+e" },
                                                 { "command": "scrollToTop", "keys": "ctrl+f" }
                                             ])" };
 
         // complex command with new terminal args
-        const std::string actionsString6{ R"([
+        static constexpr std::string_view actionsString6{ R"([
                                                 { "command": { "action": "newTab", "index": 0 }, "keys": "ctrl+g" },
                                             ])" };
 
         // complex command with meaningful null arg
-        const std::string actionsString7{ R"([
+        static constexpr std::string_view actionsString7{ R"([
                                                 { "command": { "action": "renameWindow", "name": null }, "keys": "ctrl+h" }
                                             ])" };
 
         // nested command
-        const std::string actionsString8{ R"([
+        static constexpr std::string_view actionsString8{ R"([
                                                 {
                                                     "name": "Change font size...",
                                                     "commands": [
@@ -286,7 +287,7 @@ namespace SettingsModelLocalTests
                                             ])" };
 
         // iterable command
-        const std::string actionsString9A{ R"([
+        static constexpr std::string_view actionsString9A{ R"([
                                                 {
                                                     "name": "New tab",
                                                     "commands": [
@@ -299,7 +300,7 @@ namespace SettingsModelLocalTests
                                                     ]
                                                 }
                                             ])" };
-        const std::string actionsString9B{ R"([
+        static constexpr std::string_view actionsString9B{ R"([
                                                 {
                                                     "commands":
                                                     [
@@ -315,7 +316,7 @@ namespace SettingsModelLocalTests
                                                     "name": "Send Input ..."
                                                 }
                                         ])" };
-        const std::string actionsString9C{ R""([
+        static constexpr std::string_view actionsString9C{ R""([
                                                 {
                                                     "commands":
                                                     [
@@ -338,7 +339,7 @@ namespace SettingsModelLocalTests
                                                     "name": "Send Input (Evil) ..."
                                                 }
                                             ])"" };
-        const std::string actionsString9D{ R""([
+        static constexpr std::string_view actionsString9D{ R""([
                                                 {
                                                     "command":
                                                     {
@@ -352,7 +353,7 @@ namespace SettingsModelLocalTests
                                             ])"" };
 
         // unbound command
-        const std::string actionsString10{ R"([
+        static constexpr std::string_view actionsString10{ R"([
                                                 { "command": "unbound", "keys": "ctrl+c" }
                                             ])" };
 
@@ -395,7 +396,7 @@ namespace SettingsModelLocalTests
 
     void SerializationTests::CascadiaSettings()
     {
-        const std::string settingsString{ R"({
+        static constexpr std::string_view settingsString{ R"({
             "$help" : "https://aka.ms/terminal-documentation",
             "$schema" : "https://aka.ms/terminal-profiles-schema",
             "defaultProfile": "{61c54bbd-1111-5271-96e7-009a87ff44bf}",
@@ -465,7 +466,7 @@ namespace SettingsModelLocalTests
 
     void SerializationTests::LegacyFontSettings()
     {
-        const std::string profileString{ R"(
+        static constexpr std::string_view profileString{ R"(
             {
                 "name": "Profile with legacy font settings",
 
@@ -474,7 +475,7 @@ namespace SettingsModelLocalTests
                 "fontWeight": "normal"
             })" };
 
-        const std::string expectedOutput{ R"(
+        static constexpr std::string_view expectedOutput{ R"(
             {
                 "name": "Profile with legacy font settings",
 

src/cascadia/LocalTests_SettingsModel/TerminalSettingsTests.cpp

@@ -3,6 +3,8 @@
 
 #include "pch.h"
 
+#include <til/rand.h>
+
 #include "../TerminalSettingsModel/CascadiaSettings.h"
 #include "../TerminalSettingsModel/TerminalSettings.h"
 #include "TestUtils.h"
@@ -34,14 +36,12 @@ namespace SettingsModelLocalTests
         END_TEST_CLASS()
 
         TEST_METHOD(TryCreateWinRTType);
-
         TEST_METHOD(TestTerminalArgsForBinding);
-
+        TEST_METHOD(CommandLineToArgvW);
+        TEST_METHOD(GetProfileForArgsWithCommandline);
         TEST_METHOD(MakeSettingsForProfile);
         TEST_METHOD(MakeSettingsForDefaultProfileThatDoesntExist);
-
         TEST_METHOD(TestLayerProfileOnColorScheme);
-
         TEST_METHOD(TestCommandlineToTitlePromotion);
 
         TEST_CLASS_SETUP(ClassSetup)
@@ -60,6 +60,139 @@ namespace SettingsModelLocalTests
         VERIFY_ARE_NOT_EQUAL(oldFontSize, newFontSize);
     }
 
+    // CascadiaSettings::_normalizeCommandLine abuses some aspects from CommandLineToArgvW
+    // to simplify the implementation. It assumes that all arguments returned by
+    // CommandLineToArgvW are returned back to back in memory as "arg1\0arg2\0arg3\0...".
+    // This test ensures CommandLineToArgvW doesn't change just to be sure.
+    void TerminalSettingsTests::CommandLineToArgvW()
+    {
+        pcg_engines::oneseq_dxsm_64_32 rng{ til::gen_random<uint64_t>() };
+
+        const auto expectedArgc = static_cast<int>(rng(16) + 1);
+        std::wstring expectedArgv;
+        std::wstring input;
+
+        // We generate up to 16 arguments. Each argument is up to 64 chars long, is quoted
+        // (2 chars, only applies to the input) and separated by a whitespace (1 char).
+        expectedArgv.reserve(expectedArgc * 65);
+        input.reserve(expectedArgc * 67);
+
+        for (int i = 0; i < expectedArgc; ++i)
+        {
+            const bool useQuotes = static_cast<bool>(rng(2));
+            const auto count = static_cast<size_t>(rng(64));
+            const auto ch = static_cast<wchar_t>(rng('z' - 'a' + 1) + 'a');
+
+            if (i != 0)
+            {
+                expectedArgv.push_back(L'\0');
+                input.push_back(L' ');
+            }
+
+            if (useQuotes)
+            {
+                input.push_back(L'"');
+            }
+
+            expectedArgv.append(count, ch);
+            input.append(count, ch);
+
+            if (useQuotes)
+            {
+                input.push_back(L'"');
+            }
+        }
+
+        int argc;
+        wil::unique_hlocal_ptr<PWSTR[]> argv{ ::CommandLineToArgvW(input.c_str(), &argc) };
+        VERIFY_ARE_EQUAL(expectedArgc, argc);
+        VERIFY_IS_NOT_NULL(argv);
+
+        const auto lastArg = argv[argc - 1];
+        const auto beg = argv[0];
+        const auto end = lastArg + wcslen(lastArg);
+        VERIFY_IS_GREATER_THAN(end, beg);
+        VERIFY_ARE_EQUAL(expectedArgv.size(), static_cast<size_t>(end - beg));
+        VERIFY_ARE_EQUAL(0, memcmp(beg, expectedArgv.data(), expectedArgv.size()));
+    }
+
+    void TerminalSettingsTests::GetProfileForArgsWithCommandline()
+    {
+        // I'm exclusively using cmd.exe as I know exactly where it resides at.
+        static constexpr std::string_view settingsJson{ R"({
+            "profiles": {
+                "defaults": {
+                    "historySize": 123
+                },
+                "list": [
+                    {
+                        "guid": "{6239a42c-0000-49a3-80bd-e8fdd045185c}",
+                        "commandline": "%SystemRoot%\\System32\\cmd.exe"
+                    },
+                    {
+                        "guid": "{6239a42c-1111-49a3-80bd-e8fdd045185c}",
+                        "commandline": "cmd.exe /A"
+                    },
+                    {
+                        "guid": "{6239a42c-2222-49a3-80bd-e8fdd045185c}",
+                        "commandline": "cmd.exe /A /B"
+                    },
+                    {
+                        "guid": "{6239a42c-3333-49a3-80bd-e8fdd045185c}",
+                        "commandline": "cmd.exe /A /C",
+                        "connectionType": "{9a9977a7-1fe0-49c0-b6c0-13a0cd1c98a1}"
+                    }
+                ]
+            }
+        })" };
+
+        const auto settings = winrt::make_self<implementation::CascadiaSettings>(settingsJson);
+
+        struct TestCase
+        {
+            std::wstring_view input;
+            int expected;
+        };
+
+        static constexpr std::array testCases{
+            // Base test.
+            TestCase{ L"cmd.exe", 0 },
+            // SearchPathW() normalization + case insensitive matching.
+            TestCase{ L"cmd.exe /a", 1 },
+            TestCase{ L"C:\\Windows\\System32\\cmd.exe /A", 1 },
+            // Test that we don't pick the equally long but different "/A /B" variant.
+            TestCase{ L"C:\\Windows\\System32\\cmd.exe /A /C", 1 },
+            // Test that we don't pick the shorter "/A" variant,
+            // but do pick the shorter "/A /B" variant for longer inputs.
+            TestCase{ L"cmd.exe /A /B", 2 },
+            TestCase{ L"cmd.exe /A /B /C", 2 },
+            // Ignore profiles with a connection type, like the Azure cloud shell.
+            // Instead it should pick any other prefix.
+            TestCase{ L"C:\\Windows\\System32\\cmd.exe /A /C", 1 },
+            // Return base layer profile for missing profiles.
+            TestCase{ L"C:\\Windows\\regedit.exe", -1 },
+        };
+
+        for (const auto& testCase : testCases)
+        {
+            NewTerminalArgs args;
+            args.Commandline(testCase.input);
+
+            const auto profile = settings->GetProfileForArgs(args);
+            VERIFY_IS_NOT_NULL(profile);
+
+            if (testCase.expected < 0)
+            {
+                VERIFY_ARE_EQUAL(123, profile.HistorySize());
+            }
+            else
+            {
+                GUID expectedGUID{ 0x6239a42c, static_cast<uint16_t>(0x1111 * testCase.expected), 0x49a3, { 0x80, 0xbd, 0xe8, 0xfd, 0xd0, 0x45, 0x18, 0x5c } };
+                VERIFY_ARE_EQUAL(expectedGUID, static_cast<const GUID&>(profile.Guid()));
+            }
+        }
+    }
+
     void TerminalSettingsTests::TestTerminalArgsForBinding()
     {
         static constexpr std::string_view settingsJson{ R"(

src/cascadia/LocalTests_TerminalApp/CommandlineTest.cpp

@@ -1031,9 +1031,11 @@ namespace TerminalAppLocalTests
             // The first action is going to always be a new-tab action
             VERIFY_ARE_EQUAL(ShortcutAction::NewTab, appArgs._startupActions.at(0).Action());
 
-            auto actionAndArgs = appArgs._startupActions.at(1);
+            const auto actionAndArgs = appArgs._startupActions.at(1);
             VERIFY_ARE_EQUAL(ShortcutAction::NextTab, actionAndArgs.Action());
-            VERIFY_IS_NULL(actionAndArgs.Args());
+            VERIFY_IS_NOT_NULL(actionAndArgs.Args());
+            const auto myArgs = actionAndArgs.Args().as<NextTabArgs>();
+            VERIFY_ARE_EQUAL(TabSwitcherMode::Disabled, myArgs.SwitcherMode().Value());
         }
         {
             AppCommandlineArgs appArgs{};
@@ -1047,7 +1049,9 @@ namespace TerminalAppLocalTests
 
             auto actionAndArgs = appArgs._startupActions.at(1);
             VERIFY_ARE_EQUAL(ShortcutAction::PrevTab, actionAndArgs.Action());
-            VERIFY_IS_NULL(actionAndArgs.Args());
+            VERIFY_IS_NOT_NULL(actionAndArgs.Args());
+            const auto myArgs = actionAndArgs.Args().as<PrevTabArgs>();
+            VERIFY_ARE_EQUAL(TabSwitcherMode::Disabled, myArgs.SwitcherMode().Value());
         }
         {
             AppCommandlineArgs appArgs{};

src/cascadia/LocalTests_TerminalApp/SettingsTests.cpp

@@ -16,6 +16,31 @@ using namespace winrt::Microsoft::Terminal::Control;
 
 namespace TerminalAppLocalTests
 {
+    static constexpr std::wstring_view inboxSettings{ LR"({
+        "schemes": [{
+            "name": "Campbell",
+            "foreground": "#CCCCCC",
+            "background": "#0C0C0C",
+            "cursorColor": "#FFFFFF",
+            "black": "#0C0C0C",
+            "red": "#C50F1F",
+            "green": "#13A10E",
+            "yellow": "#C19C00",
+            "blue": "#0037DA",
+            "purple": "#881798",
+            "cyan": "#3A96DD",
+            "white": "#CCCCCC",
+            "brightBlack": "#767676",
+            "brightRed": "#E74856",
+            "brightGreen": "#16C60C",
+            "brightYellow": "#F9F1A5",
+            "brightBlue": "#3B78FF",
+            "brightPurple": "#B4009E",
+            "brightCyan": "#61D6D6",
+            "brightWhite": "#F2F2F2"
+        }]
+    })" };
+
     // TODO:microsoft/terminal#3838:
     // Unfortunately, these tests _WILL NOT_ work in our CI. We're waiting for
     // an updated TAEF that will let us install framework packages when the test
@@ -107,11 +132,10 @@ namespace TerminalAppLocalTests
                     "iterateOn": "profiles",
                     "command": { "action": "splitPane", "profile": "${profile.name}" }
                 },
-            ],
-            "schemes": [ { "name": "Campbell" } ] // This is included here to prevent settings validation errors.
+            ]
         })" };
 
-        CascadiaSettings settings{ settingsJson, {} };
+        CascadiaSettings settings{ settingsJson, inboxSettings };
 
         VERIFY_ARE_EQUAL(0u, settings.Warnings().Size());
 
@@ -231,11 +255,10 @@ namespace TerminalAppLocalTests
                     "iterateOn": "profiles",
                     "command": { "action": "splitPane", "profile": "${profile.name}" }
                 },
-            ],
-            "schemes": [ { "name": "Campbell" } ] // This is included here to prevent settings validation errors.
+            ]
         })" };
 
-        CascadiaSettings settings{ settingsJson, {} };
+        CascadiaSettings settings{ settingsJson, inboxSettings };
 
         VERIFY_ARE_EQUAL(0u, settings.Warnings().Size());
 
@@ -357,11 +380,10 @@ namespace TerminalAppLocalTests
                     "iterateOn": "profiles",
                     "command": { "action": "splitPane", "profile": "${profile.name}" }
                 },
-            ],
-            "schemes": [ { "name": "Campbell" } ] // This is included here to prevent settings validation errors.
+            ]
         })" };
 
-        CascadiaSettings settings{ settingsJson, {} };
+        CascadiaSettings settings{ settingsJson, inboxSettings };
 
         VERIFY_ARE_EQUAL(0u, settings.Warnings().Size());
 
@@ -495,11 +517,10 @@ namespace TerminalAppLocalTests
                         }
                     ]
                 },
-            ],
-            "schemes": [ { "name": "Campbell" } ] // This is included here to prevent settings validation errors.
+            ]
         })" };
 
-        CascadiaSettings settings{ settingsJson, {} };
+        CascadiaSettings settings{ settingsJson, inboxSettings };
 
         VERIFY_ARE_EQUAL(0u, settings.Warnings().Size());
         VERIFY_ARE_EQUAL(3u, settings.ActiveProfiles().Size());
@@ -590,11 +611,10 @@ namespace TerminalAppLocalTests
                         },
                     ]
                 },
-            ],
-            "schemes": [ { "name": "Campbell" } ] // This is included here to prevent settings validation errors.
+            ]
         })" };
 
-        CascadiaSettings settings{ settingsJson, {} };
+        CascadiaSettings settings{ settingsJson, inboxSettings };
 
         VERIFY_ARE_EQUAL(0u, settings.Warnings().Size());
         VERIFY_ARE_EQUAL(3u, settings.ActiveProfiles().Size());
@@ -714,11 +734,10 @@ namespace TerminalAppLocalTests
                         { "command": { "action": "splitPane", "profile": "${profile.name}", "split": "down" } }
                     ]
                 }
-            ],
-            "schemes": [ { "name": "Campbell" } ] // This is included here to prevent settings validation errors.
+            ]
         })" };
 
-        CascadiaSettings settings{ settingsJson, {} };
+        CascadiaSettings settings{ settingsJson, inboxSettings };
 
         VERIFY_ARE_EQUAL(0u, settings.Warnings().Size());
         VERIFY_ARE_EQUAL(3u, settings.ActiveProfiles().Size());
@@ -851,11 +870,10 @@ namespace TerminalAppLocalTests
                         }
                     ]
                 }
-            ],
-            "schemes": [ { "name": "Campbell" } ] // This is included here to prevent settings validation errors.
+            ]
         })" };
 
-        CascadiaSettings settings{ settingsJson, {} };
+        CascadiaSettings settings{ settingsJson, inboxSettings };
 
         VERIFY_ARE_EQUAL(0u, settings.Warnings().Size());
         VERIFY_ARE_EQUAL(3u, settings.ActiveProfiles().Size());
@@ -954,11 +972,10 @@ namespace TerminalAppLocalTests
                         }
                     ]
                 }
-            ],
-            "schemes": [ { "name": "Campbell" } ] // This is included here to prevent settings validation errors.
+            ]
         })" };
 
-        CascadiaSettings settings{ settingsJson, {} };
+        CascadiaSettings settings{ settingsJson, inboxSettings };
 
         VERIFY_ARE_EQUAL(0u, settings.Warnings().Size());
         VERIFY_ARE_EQUAL(3u, settings.ActiveProfiles().Size());
@@ -1085,9 +1102,72 @@ namespace TerminalAppLocalTests
                 }
             ],
             "schemes": [
-                { "name": "scheme_0" },
-                { "name": "scheme_1" },
-                { "name": "scheme_2" },
+                {
+                    "name": "Campbell",
+                    "foreground": "#CCCCCC",
+                    "background": "#0C0C0C",
+                    "cursorColor": "#FFFFFF",
+                    "black": "#0C0C0C",
+                    "red": "#C50F1F",
+                    "green": "#13A10E",
+                    "yellow": "#C19C00",
+                    "blue": "#0037DA",
+                    "purple": "#881798",
+                    "cyan": "#3A96DD",
+                    "white": "#CCCCCC",
+                    "brightBlack": "#767676",
+                    "brightRed": "#E74856",
+                    "brightGreen": "#16C60C",
+                    "brightYellow": "#F9F1A5",
+                    "brightBlue": "#3B78FF",
+                    "brightPurple": "#B4009E",
+                    "brightCyan": "#61D6D6",
+                    "brightWhite": "#F2F2F2"
+                },
+                {
+                    "name": "Campbell PowerShell",
+                    "foreground": "#CCCCCC",
+                    "background": "#012456",
+                    "cursorColor": "#FFFFFF",
+                    "black": "#0C0C0C",
+                    "red": "#C50F1F",
+                    "green": "#13A10E",
+                    "yellow": "#C19C00",
+                    "blue": "#0037DA",
+                    "purple": "#881798",
+                    "cyan": "#3A96DD",
+                    "white": "#CCCCCC",
+                    "brightBlack": "#767676",
+                    "brightRed": "#E74856",
+                    "brightGreen": "#16C60C",
+                    "brightYellow": "#F9F1A5",
+                    "brightBlue": "#3B78FF",
+                    "brightPurple": "#B4009E",
+                    "brightCyan": "#61D6D6",
+                    "brightWhite": "#F2F2F2"
+                },
+                {
+                    "name": "Vintage",
+                    "foreground": "#C0C0C0",
+                    "background": "#000000",
+                    "cursorColor": "#FFFFFF",
+                    "black": "#000000",
+                    "red": "#800000",
+                    "green": "#008000",
+                    "yellow": "#808000",
+                    "blue": "#000080",
+                    "purple": "#800080",
+                    "cyan": "#008080",
+                    "white": "#C0C0C0",
+                    "brightBlack": "#808080",
+                    "brightRed": "#FF0000",
+                    "brightGreen": "#00FF00",
+                    "brightYellow": "#FFFF00",
+                    "brightBlue": "#0000FF",
+                    "brightPurple": "#FF00FF",
+                    "brightCyan": "#00FFFF",
+                    "brightWhite": "#FFFFFF"
+                }
             ],
             "actions": [
                 {
@@ -1100,10 +1180,6 @@ namespace TerminalAppLocalTests
 
         CascadiaSettings settings{ settingsJson, {} };
 
-        // Since at least one profile does not reference a color scheme,
-        // we add a warning saying "the color scheme is unknown"
-        VERIFY_ARE_EQUAL(1u, settings.Warnings().Size());
-
         VERIFY_ARE_EQUAL(3u, settings.ActiveProfiles().Size());
 
         auto nameMap{ settings.ActionMap().NameMap() };
@@ -1130,8 +1206,6 @@ namespace TerminalAppLocalTests
         auto expandedCommands = winrt::TerminalApp::implementation::TerminalPage::_ExpandCommands(nameMap, settings.ActiveProfiles().GetView(), settings.GlobalSettings().ColorSchemes());
         _logCommandNames(expandedCommands.GetView());
 
-        // This is the same warning as above
-        VERIFY_ARE_EQUAL(1u, settings.Warnings().Size());
         VERIFY_ARE_EQUAL(3u, expandedCommands.Size());
 
         // Yes, this test is testing splitPane with profiles named after each
@@ -1139,7 +1213,7 @@ namespace TerminalAppLocalTests
         // just easy tests to write.
 
         {
-            auto command = expandedCommands.Lookup(L"iterable command scheme_0");
+            auto command = expandedCommands.Lookup(L"iterable command Campbell");
             VERIFY_IS_NOT_NULL(command);
             auto actionAndArgs = command.ActionAndArgs();
             VERIFY_IS_NOT_NULL(actionAndArgs);
@@ -1153,11 +1227,11 @@ namespace TerminalAppLocalTests
             VERIFY_IS_TRUE(realArgs.TerminalArgs().StartingDirectory().empty());
             VERIFY_IS_TRUE(realArgs.TerminalArgs().TabTitle().empty());
             VERIFY_IS_FALSE(realArgs.TerminalArgs().Profile().empty());
-            VERIFY_ARE_EQUAL(L"scheme_0", realArgs.TerminalArgs().Profile());
+            VERIFY_ARE_EQUAL(L"Campbell", realArgs.TerminalArgs().Profile());
         }
 
         {
-            auto command = expandedCommands.Lookup(L"iterable command scheme_1");
+            auto command = expandedCommands.Lookup(L"iterable command Campbell PowerShell");
             VERIFY_IS_NOT_NULL(command);
             auto actionAndArgs = command.ActionAndArgs();
             VERIFY_IS_NOT_NULL(actionAndArgs);
@@ -1171,11 +1245,11 @@ namespace TerminalAppLocalTests
             VERIFY_IS_TRUE(realArgs.TerminalArgs().StartingDirectory().empty());
             VERIFY_IS_TRUE(realArgs.TerminalArgs().TabTitle().empty());
             VERIFY_IS_FALSE(realArgs.TerminalArgs().Profile().empty());
-            VERIFY_ARE_EQUAL(L"scheme_1", realArgs.TerminalArgs().Profile());
+            VERIFY_ARE_EQUAL(L"Campbell PowerShell", realArgs.TerminalArgs().Profile());
         }
 
         {
-            auto command = expandedCommands.Lookup(L"iterable command scheme_2");
+            auto command = expandedCommands.Lookup(L"iterable command Vintage");
             VERIFY_IS_NOT_NULL(command);
             auto actionAndArgs = command.ActionAndArgs();
             VERIFY_IS_NOT_NULL(actionAndArgs);
@@ -1189,7 +1263,7 @@ namespace TerminalAppLocalTests
             VERIFY_IS_TRUE(realArgs.TerminalArgs().StartingDirectory().empty());
             VERIFY_IS_TRUE(realArgs.TerminalArgs().TabTitle().empty());
             VERIFY_IS_FALSE(realArgs.TerminalArgs().Profile().empty());
-            VERIFY_ARE_EQUAL(L"scheme_2", realArgs.TerminalArgs().Profile());
+            VERIFY_ARE_EQUAL(L"Vintage", realArgs.TerminalArgs().Profile());
         }
     }
 

src/cascadia/LocalTests_TerminalApp/TabTests.cpp

@@ -508,7 +508,7 @@ namespace TerminalAppLocalTests
 
         Log::Comment(NoThrowString().Format(L"Duplicate the first pane"));
         result = RunOnUIThread([&page]() {
-            page->_SplitPane(SplitDirection::Automatic, SplitType::Duplicate, 0.5f, nullptr);
+            page->_SplitPane(SplitDirection::Automatic, 0.5f, page->_MakePane(nullptr, true, nullptr));
 
             VERIFY_ARE_EQUAL(1u, page->_tabs.Size());
             auto tab = page->_GetTerminalTabImpl(page->_tabs.GetAt(0));
@@ -526,7 +526,7 @@ namespace TerminalAppLocalTests
 
         Log::Comment(NoThrowString().Format(L"Duplicate the pane, and don't crash"));
         result = RunOnUIThread([&page]() {
-            page->_SplitPane(SplitDirection::Automatic, SplitType::Duplicate, 0.5f, nullptr);
+            page->_SplitPane(SplitDirection::Automatic, 0.5f, page->_MakePane(nullptr, true, nullptr));
 
             VERIFY_ARE_EQUAL(1u, page->_tabs.Size());
             auto tab = page->_GetTerminalTabImpl(page->_tabs.GetAt(0));
@@ -751,7 +751,7 @@ namespace TerminalAppLocalTests
         });
         VERIFY_SUCCEEDED(result);
 
-        Log::Comment(L"Move focus. This will cause us to un-zoom.");
+        Log::Comment(L"Move focus. We should still be zoomed.");
         result = RunOnUIThread([&page]() {
             // Set up action
             MoveFocusArgs args{ FocusDirection::Left };
@@ -761,7 +761,7 @@ namespace TerminalAppLocalTests
 
             auto firstTab = page->_GetTerminalTabImpl(page->_tabs.GetAt(0));
             VERIFY_ARE_EQUAL(2, firstTab->GetLeafPaneCount());
-            VERIFY_IS_FALSE(firstTab->IsZoomed());
+            VERIFY_IS_TRUE(firstTab->IsZoomed());
         });
         VERIFY_SUCCEEDED(result);
     }
@@ -844,7 +844,7 @@ namespace TerminalAppLocalTests
             // |   1    |   2    |
             // |        |        |
             // -------------------
-            page->_SplitPane(SplitDirection::Right, SplitType::Duplicate, 0.5f, nullptr);
+            page->_SplitPane(SplitDirection::Right, 0.5f, page->_MakePane(nullptr, true, nullptr));
             secondId = tab->_activePane->Id().value();
         });
         Sleep(250);
@@ -862,7 +862,7 @@ namespace TerminalAppLocalTests
             // |   3    |        |
             // |        |        |
             // -------------------
-            page->_SplitPane(SplitDirection::Down, SplitType::Duplicate, 0.5f, nullptr);
+            page->_SplitPane(SplitDirection::Down, 0.5f, page->_MakePane(nullptr, true, nullptr));
             auto tab = page->_GetTerminalTabImpl(page->_tabs.GetAt(0));
             // Split again to make the 3rd tab
             thirdId = tab->_activePane->Id().value();
@@ -882,7 +882,7 @@ namespace TerminalAppLocalTests
             // |   3    |   4    |
             // |        |        |
             // -------------------
-            page->_SplitPane(SplitDirection::Down, SplitType::Duplicate, 0.5f, nullptr);
+            page->_SplitPane(SplitDirection::Down, 0.5f, page->_MakePane(nullptr, true, nullptr));
             auto tab = page->_GetTerminalTabImpl(page->_tabs.GetAt(0));
             fourthId = tab->_activePane->Id().value();
         });
@@ -1357,7 +1357,8 @@ namespace TerminalAppLocalTests
 
             Log::Comment(L"Color should be changed to the preview");
             VERIFY_ARE_EQUAL(til::color{ 0xff000000 }, controlSettings.DefaultBackground());
-            VERIFY_ARE_EQUAL(originalSettings, page->_originalSettings);
+            // And we should have stored a function to revert the change.
+            VERIFY_ARE_EQUAL(1u, page->_restorePreviewFuncs.size());
         });
 
         TestOnUIThread([&page]() {
@@ -1383,7 +1384,8 @@ namespace TerminalAppLocalTests
 
             Log::Comment(L"Color should be changed");
             VERIFY_ARE_EQUAL(til::color{ 0xff000000 }, controlSettings.DefaultBackground());
-            VERIFY_ARE_EQUAL(nullptr, page->_originalSettings);
+            // After preview there should be no more restore functions to execute.
+            VERIFY_ARE_EQUAL(0u, page->_restorePreviewFuncs.size());
         });
     }
 
@@ -1428,7 +1430,6 @@ namespace TerminalAppLocalTests
 
             Log::Comment(L"Color should be changed to the preview");
             VERIFY_ARE_EQUAL(til::color{ 0xff000000 }, controlSettings.DefaultBackground());
-            VERIFY_ARE_EQUAL(originalSettings, page->_originalSettings);
         });
 
         TestOnUIThread([&page]() {
@@ -1451,7 +1452,6 @@ namespace TerminalAppLocalTests
 
             Log::Comment(L"Color should be the same as it originally was");
             VERIFY_ARE_EQUAL(til::color{ 0xff0c0c0c }, controlSettings.DefaultBackground());
-            VERIFY_ARE_EQUAL(nullptr, page->_originalSettings);
         });
     }
 
@@ -1498,7 +1498,6 @@ namespace TerminalAppLocalTests
 
             Log::Comment(L"Color should be changed to the preview");
             VERIFY_ARE_EQUAL(til::color{ 0xff000000 }, controlSettings.DefaultBackground());
-            VERIFY_ARE_EQUAL(originalSettings, page->_originalSettings);
         });
 
         TestOnUIThread([&page]() {
@@ -1522,7 +1521,6 @@ namespace TerminalAppLocalTests
 
             Log::Comment(L"Color should be changed to the preview");
             VERIFY_ARE_EQUAL(til::color{ 0xffFAFAFA }, controlSettings.DefaultBackground());
-            VERIFY_ARE_EQUAL(originalSettings, page->_originalSettings);
         });
 
         TestOnUIThread([&page]() {
@@ -1548,7 +1546,6 @@ namespace TerminalAppLocalTests
 
             Log::Comment(L"Color should be changed");
             VERIFY_ARE_EQUAL(til::color{ 0xffFAFAFA }, controlSettings.DefaultBackground());
-            VERIFY_ARE_EQUAL(nullptr, page->_originalSettings);
         });
     }
 

src/cascadia/LocalTests_TerminalApp/TerminalApp.LocalTests.AppxManifest.prototype.xml

@@ -28,7 +28,7 @@
   </Properties>
 
   <Dependencies>
-    <TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.17763.0" MaxVersionTested="10.0.19041.0" />
+    <TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.17763.0" MaxVersionTested="10.0.22000.0" />
     <PackageDependency Name="Microsoft.VCLibs.140.00.Debug" MinVersion="14.0.27023.1" Publisher="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US" />
     <PackageDependency Name="Microsoft.VCLibs.140.00.Debug.UWPDesktop" MinVersion="14.0.27027.1" Publisher="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US" />
   </Dependencies>

src/cascadia/LocalTests_TerminalApp/TestHostApp/Package.appxmanifest

@@ -9,7 +9,7 @@
     <uap:SupportedUsers>multiple</uap:SupportedUsers>
   </Properties>
   <Dependencies>
-    <TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.17763.0" MaxVersionTested="10.0.19041.0" />
+    <TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.17763.0" MaxVersionTested="10.0.22000.0" />
   </Dependencies>
   <Resources>
     <Resource Language="x-generate" />

src/cascadia/PublicTerminalCore/HwndTerminal.cpp

@@ -239,8 +239,8 @@ HRESULT HwndTerminal::Initialize()
     _terminal->SetBackgroundCallback([](auto) {});
 
     _terminal->Create(COORD{ 80, 25 }, 1000, *_renderer);
-    _terminal->SetDefaultBackground(RGB(12, 12, 12));
-    _terminal->SetDefaultForeground(RGB(204, 204, 204));
+    _terminal->SetColorTableEntry(TextColor::DEFAULT_BACKGROUND, RGB(12, 12, 12));
+    _terminal->SetColorTableEntry(TextColor::DEFAULT_FOREGROUND, RGB(204, 204, 204));
     _terminal->SetWriteInputCallback([=](std::wstring& input) noexcept { _WriteTextToConnection(input); });
     localPointerToThread->EnablePainting();
 
@@ -781,8 +781,8 @@ void _stdcall TerminalSetTheme(void* terminal, TerminalTheme theme, LPCWSTR font
     {
         auto lock = publicTerminal->_terminal->LockForWriting();
 
-        publicTerminal->_terminal->SetDefaultForeground(theme.DefaultForeground);
-        publicTerminal->_terminal->SetDefaultBackground(theme.DefaultBackground);
+        publicTerminal->_terminal->SetColorTableEntry(TextColor::DEFAULT_FOREGROUND, theme.DefaultForeground);
+        publicTerminal->_terminal->SetColorTableEntry(TextColor::DEFAULT_BACKGROUND, theme.DefaultBackground);
         publicTerminal->_renderEngine->SetSelectionBackground(theme.DefaultSelectionBackground, theme.SelectionBackgroundAlpha);
 
         // Set the font colors
@@ -977,7 +977,7 @@ void HwndTerminal::_StringPaste(const wchar_t* const pData) noexcept
     CATCH_LOG();
 }
 
-COORD HwndTerminal::GetFontSize() const
+COORD HwndTerminal::GetFontSize() const noexcept
 {
     return _actualFont.GetSize();
 }

src/cascadia/PublicTerminalCore/HwndTerminal.hpp

@@ -128,7 +128,7 @@ private:
     void _SendCharEvent(wchar_t ch, WORD scanCode, WORD flags) noexcept;
 
     // Inherited via IControlAccessibilityInfo
-    COORD GetFontSize() const override;
+    COORD GetFontSize() const noexcept override;
     RECT GetBounds() const noexcept override;
     double GetScaleFactor() const noexcept override;
     void ChangeViewport(const SMALL_RECT NewWindow) override;

src/cascadia/PublicTerminalCore/PublicTerminalCore.vcxproj

@@ -29,6 +29,9 @@
     <ProjectReference Include="$(SolutionDir)src\types\lib\types.vcxproj">
       <Project>{18D09A24-8240-42D6-8CB6-236EEE820263}</Project>
     </ProjectReference>
+    <ProjectReference Include="$(SolutionDir)src\renderer\atlas\atlas.vcxproj">
+      <Project>{8222900C-8B6C-452A-91AC-BE95DB04B95F}</Project>
+    </ProjectReference>
     <ProjectReference Include="$(SolutionDir)src\renderer\base\lib\base.vcxproj">
       <Project>{af0a096a-8b3a-4949-81ef-7df8f0fee91f}</Project>
     </ProjectReference>

src/cascadia/Remoting/GetWindowLayoutArgs.cpp

@@ -0,0 +1,5 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+#include "pch.h"
+#include "GetWindowLayoutArgs.h"
+#include "GetWindowLayoutArgs.g.cpp"

src/cascadia/Remoting/GetWindowLayoutArgs.h

@@ -0,0 +1,32 @@
+/*++
+Copyright (c) Microsoft Corporation
+Licensed under the MIT license.
+
+Class Name:
+- GetWindowLayoutArgs.h
+
+Abstract:
+- This is a helper class for getting the window layout from a peasant.
+  Depending on if we are running on the monarch or on a peasant we might need
+  to switch what thread we are executing on. This gives us the option of
+  either returning the json result synchronously, or as a promise.
+--*/
+
+#pragma once
+
+#include "GetWindowLayoutArgs.g.h"
+#include "../cascadia/inc/cppwinrt_utils.h"
+
+namespace winrt::Microsoft::Terminal::Remoting::implementation
+{
+    struct GetWindowLayoutArgs : public GetWindowLayoutArgsT<GetWindowLayoutArgs>
+    {
+        WINRT_PROPERTY(winrt::hstring, WindowLayoutJson, L"");
+        WINRT_PROPERTY(winrt::Windows::Foundation::IAsyncOperation<winrt::hstring>, WindowLayoutJsonAsync, nullptr)
+    };
+}
+
+namespace winrt::Microsoft::Terminal::Remoting::factory_implementation
+{
+    BASIC_FACTORY(GetWindowLayoutArgs);
+}

src/cascadia/Remoting/Microsoft.Terminal.RemotingLib.vcxproj

@@ -12,7 +12,6 @@
   </PropertyGroup>
   <Import Project="..\..\..\common.openconsole.props" Condition="'$(OpenConsoleDir)'==''" />
   <Import Project="$(OpenConsoleDir)src\cppwinrt.build.pre.props" />
-
   <!-- ========================= Headers ======================== -->
   <ItemGroup>
     <ClInclude Include="Monarch.h">
@@ -36,6 +35,12 @@
     <ClInclude Include="WindowActivatedArgs.h">
       <DependentUpon>Peasant.idl</DependentUpon>
     </ClInclude>
+    <ClInclude Include="GetWindowLayoutArgs.h">
+      <DependentUpon>Peasant.idl</DependentUpon>
+    </ClInclude>
+    <ClInclude Include="QuitAllRequestedArgs.h">
+      <DependentUpon>Monarch.idl</DependentUpon>
+    </ClInclude>
     <ClInclude Include="pch.h" />
     <ClInclude Include="MonarchFactory.h" />
     <ClInclude Include="Peasant.h">
@@ -71,6 +76,12 @@
     <ClCompile Include="WindowActivatedArgs.cpp">
       <DependentUpon>Peasant.idl</DependentUpon>
     </ClCompile>
+    <ClCompile Include="GetWindowLayoutArgs.cpp">
+      <DependentUpon>Peasant.idl</DependentUpon>
+    </ClCompile>
+    <ClCompile Include="QuitAllRequestedArgs.cpp">
+      <DependentUpon>Monarch.idl</DependentUpon>
+    </ClCompile>
     <ClCompile Include="pch.cpp">
       <PrecompiledHeader>Create</PrecompiledHeader>
     </ClCompile>
@@ -128,6 +139,5 @@
   </ItemDefinitionGroup>
   <!-- ========================= Globals ======================== -->
   <Import Project="$(OpenConsoleDir)src\cppwinrt.build.post.props" />
-
   <Import Project="$(SolutionDir)build\rules\CollectWildcardResources.targets" />
-</Project>
+</Project>

src/cascadia/Remoting/Monarch.cpp

@@ -6,6 +6,7 @@
 #include "Monarch.h"
 #include "CommandlineArgs.h"
 #include "FindTargetWindowArgs.h"
+#include "QuitAllRequestedArgs.h"
 #include "ProposeCommandlineResult.h"
 
 #include "Monarch.g.cpp"
@@ -135,12 +136,18 @@ namespace winrt::Microsoft::Terminal::Remoting::implementation
     // - <none> used
     // Return Value:
     // - <none>
-    void Monarch::_handleQuitAll(const winrt::Windows::Foundation::IInspectable& /*sender*/,
-                                 const winrt::Windows::Foundation::IInspectable& /*args*/)
+    winrt::fire_and_forget Monarch::_handleQuitAll(const winrt::Windows::Foundation::IInspectable& /*sender*/,
+                                                   const winrt::Windows::Foundation::IInspectable& /*args*/)
     {
         // Let the process hosting the monarch run any needed logic before
         // closing all windows.
-        _QuitAllRequestedHandlers(*this, nullptr);
+        auto args = winrt::make_self<implementation::QuitAllRequestedArgs>();
+        _QuitAllRequestedHandlers(*this, *args);
+
+        if (const auto action = args->BeforeQuitAllAction())
+        {
+            co_await action;
+        }
 
         _quitting.store(true);
         // Tell all peasants to exit.
@@ -994,4 +1001,28 @@ namespace winrt::Microsoft::Terminal::Remoting::implementation
 
         _forEachPeasant(func, onError);
     }
+
+    // Method Description:
+    // - Ask all peasants to return their window layout as json
+    // Arguments:
+    // - <none>
+    // Return Value:
+    // - The collection of window layouts from each peasant.
+    Windows::Foundation::Collections::IVector<winrt::hstring> Monarch::GetAllWindowLayouts()
+    {
+        std::vector<winrt::hstring> vec;
+        auto callback = [&](const auto& /*id*/, const auto& p) {
+            vec.emplace_back(p.GetWindowLayout());
+        };
+        auto onError = [](auto&& id) {
+            TraceLoggingWrite(g_hRemotingProvider,
+                              "Monarch_GetAllWindowLayouts_Failed",
+                              TraceLoggingInt64(id, "peasantID", "The ID of the peasant which we could not get a window layout from"),
+                              TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE),
+                              TraceLoggingKeyword(TIL_KEYWORD_TRACE));
+        };
+        _forEachPeasant(callback, onError);
+
+        return winrt::single_threaded_vector(std::move(vec));
+    }
 }

src/cascadia/Remoting/Monarch.h

@@ -59,13 +59,14 @@ namespace winrt::Microsoft::Terminal::Remoting::implementation
         void SummonAllWindows();
         bool DoesQuakeWindowExist();
         Windows::Foundation::Collections::IVectorView<winrt::Microsoft::Terminal::Remoting::PeasantInfo> GetPeasantInfos();
+        Windows::Foundation::Collections::IVector<winrt::hstring> GetAllWindowLayouts();
 
         TYPED_EVENT(FindTargetWindowRequested, winrt::Windows::Foundation::IInspectable, winrt::Microsoft::Terminal::Remoting::FindTargetWindowArgs);
         TYPED_EVENT(ShowNotificationIconRequested, winrt::Windows::Foundation::IInspectable, winrt::Windows::Foundation::IInspectable);
         TYPED_EVENT(HideNotificationIconRequested, winrt::Windows::Foundation::IInspectable, winrt::Windows::Foundation::IInspectable);
         TYPED_EVENT(WindowCreated, winrt::Windows::Foundation::IInspectable, winrt::Windows::Foundation::IInspectable);
         TYPED_EVENT(WindowClosed, winrt::Windows::Foundation::IInspectable, winrt::Windows::Foundation::IInspectable);
-        TYPED_EVENT(QuitAllRequested, winrt::Windows::Foundation::IInspectable, winrt::Windows::Foundation::IInspectable);
+        TYPED_EVENT(QuitAllRequested, winrt::Windows::Foundation::IInspectable, winrt::Microsoft::Terminal::Remoting::QuitAllRequestedArgs);
 
     private:
         uint64_t _ourPID;
@@ -103,8 +104,8 @@ namespace winrt::Microsoft::Terminal::Remoting::implementation
         void _renameRequested(const winrt::Windows::Foundation::IInspectable& sender,
                               const winrt::Microsoft::Terminal::Remoting::RenameRequestArgs& args);
 
-        void _handleQuitAll(const winrt::Windows::Foundation::IInspectable& sender,
-                            const winrt::Windows::Foundation::IInspectable& args);
+        winrt::fire_and_forget _handleQuitAll(const winrt::Windows::Foundation::IInspectable& sender,
+                                              const winrt::Windows::Foundation::IInspectable& args);
 
         // Method Description:
         // - Helper for doing something on each and every peasant.
@@ -177,6 +178,10 @@ namespace winrt::Microsoft::Terminal::Remoting::implementation
                     }
                 }
                 _clearOldMruEntries(peasantsToErase);
+
+                // A peasant died, let the app host know that the number of
+                // windows has changed.
+                _WindowClosedHandlers(nullptr, nullptr);
             }
         }
 

src/cascadia/Remoting/Monarch.idl

@@ -31,6 +31,12 @@ namespace Microsoft.Terminal.Remoting
         Windows.Foundation.IReference<UInt64> WindowID;
     }
 
+    [default_interface] runtimeclass QuitAllRequestedArgs 
+    {
+        QuitAllRequestedArgs();
+        Windows.Foundation.IAsyncAction BeforeQuitAllAction;
+    }
+
     struct PeasantInfo
     {
         UInt64 Id;
@@ -52,12 +58,13 @@ namespace Microsoft.Terminal.Remoting
         void SummonAllWindows();
         Boolean DoesQuakeWindowExist();
         Windows.Foundation.Collections.IVectorView<PeasantInfo> GetPeasantInfos { get; };
+        Windows.Foundation.Collections.IVector<String> GetAllWindowLayouts();
 
         event Windows.Foundation.TypedEventHandler<Object, FindTargetWindowArgs> FindTargetWindowRequested;
         event Windows.Foundation.TypedEventHandler<Object, Object> ShowNotificationIconRequested;
         event Windows.Foundation.TypedEventHandler<Object, Object> HideNotificationIconRequested;
         event Windows.Foundation.TypedEventHandler<Object, Object> WindowCreated;
         event Windows.Foundation.TypedEventHandler<Object, Object> WindowClosed;
-        event Windows.Foundation.TypedEventHandler<Object, Object> QuitAllRequested;
+        event Windows.Foundation.TypedEventHandler<Object, QuitAllRequestedArgs> QuitAllRequested;
     };
 }

src/cascadia/Remoting/Peasant.cpp

@@ -5,6 +5,7 @@
 #include "Peasant.h"
 #include "CommandlineArgs.h"
 #include "SummonWindowBehavior.h"
+#include "GetWindowLayoutArgs.h"
 #include "Peasant.g.cpp"
 #include "../../types/inc/utils.hpp"
 
@@ -289,4 +290,24 @@ namespace winrt::Microsoft::Terminal::Remoting::implementation
                           TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE),
                           TraceLoggingKeyword(TIL_KEYWORD_TRACE));
     }
+
+    // Method Description:
+    // - Request and return the window layout from the current TerminalPage
+    // Arguments:
+    // - <none>
+    // Return Value:
+    // - the window layout as a json string
+    hstring Peasant::GetWindowLayout()
+    {
+        auto args = winrt::make_self<implementation::GetWindowLayoutArgs>();
+        _GetWindowLayoutRequestedHandlers(nullptr, *args);
+        if (const auto op = args->WindowLayoutJsonAsync())
+        {
+            // This will fail if called on the UI thread, so the monarch should
+            // never set WindowLayoutJsonAsync.
+            auto str = op.get();
+            return str;
+        }
+        return args->WindowLayoutJson();
+    }
 }

src/cascadia/Remoting/Peasant.h

@@ -36,6 +36,9 @@ namespace winrt::Microsoft::Terminal::Remoting::implementation
         winrt::Microsoft::Terminal::Remoting::WindowActivatedArgs GetLastActivatedArgs();
 
         winrt::Microsoft::Terminal::Remoting::CommandlineArgs InitialArgs();
+
+        winrt::hstring GetWindowLayout();
+
         WINRT_PROPERTY(winrt::hstring, WindowName);
         WINRT_PROPERTY(winrt::hstring, ActiveTabTitle);
 
@@ -49,6 +52,7 @@ namespace winrt::Microsoft::Terminal::Remoting::implementation
         TYPED_EVENT(HideNotificationIconRequested, winrt::Windows::Foundation::IInspectable, winrt::Windows::Foundation::IInspectable);
         TYPED_EVENT(QuitAllRequested, winrt::Windows::Foundation::IInspectable, winrt::Windows::Foundation::IInspectable);
         TYPED_EVENT(QuitRequested, winrt::Windows::Foundation::IInspectable, winrt::Windows::Foundation::IInspectable);
+        TYPED_EVENT(GetWindowLayoutRequested, winrt::Windows::Foundation::IInspectable, winrt::Microsoft::Terminal::Remoting::GetWindowLayoutArgs);
 
     private:
         Peasant(const uint64_t testPID);

src/cascadia/Remoting/Peasant.idl

@@ -30,6 +30,11 @@ namespace Microsoft.Terminal.Remoting
         Windows.Foundation.DateTime ActivatedTime { get; };
     };
 
+    [default_interface] runtimeclass GetWindowLayoutArgs {
+        GetWindowLayoutArgs();
+        String WindowLayoutJson;
+        Windows.Foundation.IAsyncOperation<String> WindowLayoutJsonAsync;
+    }
 
     enum MonitorBehavior
     {
@@ -69,6 +74,7 @@ namespace Microsoft.Terminal.Remoting
         void RequestHideNotificationIcon();
         void RequestQuitAll();
         void Quit();
+        String GetWindowLayout();
 
         event Windows.Foundation.TypedEventHandler<Object, WindowActivatedArgs> WindowActivated;
         event Windows.Foundation.TypedEventHandler<Object, CommandlineArgs> ExecuteCommandlineRequested;
@@ -78,6 +84,7 @@ namespace Microsoft.Terminal.Remoting
         event Windows.Foundation.TypedEventHandler<Object, SummonWindowBehavior> SummonRequested;
         event Windows.Foundation.TypedEventHandler<Object, Object> ShowNotificationIconRequested;
         event Windows.Foundation.TypedEventHandler<Object, Object> HideNotificationIconRequested;
+        event Windows.Foundation.TypedEventHandler<Object, GetWindowLayoutArgs> GetWindowLayoutRequested;
         event Windows.Foundation.TypedEventHandler<Object, Object> QuitAllRequested;
         event Windows.Foundation.TypedEventHandler<Object, Object> QuitRequested;
     };

src/cascadia/Remoting/QuitAllRequestedArgs.cpp

@@ -0,0 +1,5 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+#include "pch.h"
+#include "QuitAllRequestedArgs.h"
+#include "QuitAllRequestedArgs.g.cpp"

src/cascadia/Remoting/QuitAllRequestedArgs.h

@@ -0,0 +1,30 @@
+/*++
+Copyright (c) Microsoft Corporation
+Licensed under the MIT license.
+
+Class Name:
+- QuitAllRequestedArgs.h
+
+Abstract:
+- This is a helper class for allowing the monarch to run code before telling all
+  peasants to quit. This way the monarch can raise an event and get back a future
+  to wait for before continuing.
+--*/
+
+#pragma once
+
+#include "QuitAllRequestedArgs.g.h"
+#include "../cascadia/inc/cppwinrt_utils.h"
+
+namespace winrt::Microsoft::Terminal::Remoting::implementation
+{
+    struct QuitAllRequestedArgs : public QuitAllRequestedArgsT<QuitAllRequestedArgs>
+    {
+        WINRT_PROPERTY(winrt::Windows::Foundation::IAsyncAction, BeforeQuitAllAction, nullptr)
+    };
+}
+
+namespace winrt::Microsoft::Terminal::Remoting::factory_implementation
+{
+    BASIC_FACTORY(QuitAllRequestedArgs);
+}

src/cascadia/Remoting/WindowManager.cpp

@@ -271,7 +271,7 @@ namespace winrt::Microsoft::Terminal::Remoting::implementation
         _monarch.FindTargetWindowRequested({ this, &WindowManager::_raiseFindTargetWindowRequested });
         _monarch.ShowNotificationIconRequested([this](auto&&, auto&&) { _ShowNotificationIconRequestedHandlers(*this, nullptr); });
         _monarch.HideNotificationIconRequested([this](auto&&, auto&&) { _HideNotificationIconRequestedHandlers(*this, nullptr); });
-        _monarch.QuitAllRequested([this](auto&&, auto&&) { _QuitAllRequestedHandlers(*this, nullptr); });
+        _monarch.QuitAllRequested({ get_weak(), &WindowManager::_QuitAllRequestedHandlers });
 
         _BecameMonarchHandlers(*this, nullptr);
     }
@@ -318,6 +318,8 @@ namespace winrt::Microsoft::Terminal::Remoting::implementation
             }
         }
 
+        _peasant.GetWindowLayoutRequested({ get_weak(), &WindowManager::_GetWindowLayoutRequestedHandlers });
+
         TraceLoggingWrite(g_hRemotingProvider,
                           "WindowManager_CreateOurPeasant",
                           TraceLoggingUInt64(_peasant.GetID(), "peasantID", "The ID of our new peasant"),
@@ -610,4 +612,17 @@ namespace winrt::Microsoft::Terminal::Remoting::implementation
     {
         winrt::get_self<implementation::Peasant>(_peasant)->ActiveTabTitle(title);
     }
+
+    Windows::Foundation::Collections::IVector<winrt::hstring> WindowManager::GetAllWindowLayouts()
+    {
+        if (_monarch)
+        {
+            try
+            {
+                return _monarch.GetAllWindowLayouts();
+            }
+            CATCH_LOG()
+        }
+        return nullptr;
+    }
 }

src/cascadia/Remoting/WindowManager.h

@@ -50,6 +50,7 @@ namespace winrt::Microsoft::Terminal::Remoting::implementation
         winrt::fire_and_forget RequestQuitAll();
         bool DoesQuakeWindowExist();
         void UpdateActiveTabTitle(winrt::hstring title);
+        Windows::Foundation::Collections::IVector<winrt::hstring> GetAllWindowLayouts();
 
         TYPED_EVENT(FindTargetWindowRequested, winrt::Windows::Foundation::IInspectable, winrt::Microsoft::Terminal::Remoting::FindTargetWindowArgs);
         TYPED_EVENT(BecameMonarch, winrt::Windows::Foundation::IInspectable, winrt::Windows::Foundation::IInspectable);
@@ -57,7 +58,8 @@ namespace winrt::Microsoft::Terminal::Remoting::implementation
         TYPED_EVENT(WindowClosed, winrt::Windows::Foundation::IInspectable, winrt::Windows::Foundation::IInspectable);
         TYPED_EVENT(ShowNotificationIconRequested, winrt::Windows::Foundation::IInspectable, winrt::Windows::Foundation::IInspectable);
         TYPED_EVENT(HideNotificationIconRequested, winrt::Windows::Foundation::IInspectable, winrt::Windows::Foundation::IInspectable);
-        TYPED_EVENT(QuitAllRequested, winrt::Windows::Foundation::IInspectable, winrt::Windows::Foundation::IInspectable);
+        TYPED_EVENT(QuitAllRequested, winrt::Windows::Foundation::IInspectable, winrt::Microsoft::Terminal::Remoting::QuitAllRequestedArgs);
+        TYPED_EVENT(GetWindowLayoutRequested, winrt::Windows::Foundation::IInspectable, winrt::Microsoft::Terminal::Remoting::GetWindowLayoutArgs);
 
     private:
         bool _shouldCreateWindow{ false };

src/cascadia/Remoting/WindowManager.idl

@@ -16,6 +16,8 @@ namespace Microsoft.Terminal.Remoting
         void SummonAllWindows();
         void RequestShowNotificationIcon();
         void RequestHideNotificationIcon();
+        Windows.Foundation.Collections.IVector<String> GetAllWindowLayouts();
+
         UInt64 GetNumberOfPeasants();
         void RequestQuitAll();
         void UpdateActiveTabTitle(String title);
@@ -25,8 +27,9 @@ namespace Microsoft.Terminal.Remoting
         event Windows.Foundation.TypedEventHandler<Object, Object> BecameMonarch;
         event Windows.Foundation.TypedEventHandler<Object, Object> WindowCreated;
         event Windows.Foundation.TypedEventHandler<Object, Object> WindowClosed;
+        event Windows.Foundation.TypedEventHandler<Object, QuitAllRequestedArgs> QuitAllRequested;
+        event Windows.Foundation.TypedEventHandler<Object, GetWindowLayoutArgs> GetWindowLayoutRequested;
         event Windows.Foundation.TypedEventHandler<Object, Object> ShowNotificationIconRequested;
         event Windows.Foundation.TypedEventHandler<Object, Object> HideNotificationIconRequested;
-        event Windows.Foundation.TypedEventHandler<Object, Object> QuitAllRequested;
     };
 }

src/cascadia/ShellExtension/OpenTerminalHere.cpp

@@ -55,9 +55,7 @@ HRESULT OpenTerminalHere::Invoke(IShellItemArray* psiItemArray,
         STARTUPINFOEX siEx{ 0 };
         siEx.StartupInfo.cb = sizeof(STARTUPINFOEX);
 
-        // Append a "\." to the given path, so that this will work in "C:\"
-        auto path{ wil::str_printf<std::wstring>(LR"-(%s\.)-", pszName.get()) };
-        auto cmdline{ wil::str_printf<std::wstring>(LR"-("%s" -d "%s")-", GetWtExePath().c_str(), path.c_str()) };
+        auto cmdline{ wil::str_printf<std::wstring>(LR"-("%s" -d %s)-", GetWtExePath().c_str(), QuoteAndEscapeCommandlineArg(pszName.get()).c_str()) };
         RETURN_IF_WIN32_BOOL_FALSE(CreateProcessW(
             nullptr, // lpApplicationName
             cmdline.data(),
@@ -66,7 +64,7 @@ HRESULT OpenTerminalHere::Invoke(IShellItemArray* psiItemArray,
             false, // bInheritHandles
             EXTENDED_STARTUPINFO_PRESENT | CREATE_UNICODE_ENVIRONMENT, // dwCreationFlags
             nullptr, // lpEnvironment
-            path.data(),
+            pszName.get(),
             &siEx.StartupInfo, // lpStartupInfo
             &_piClient // lpProcessInformation
             ));

src/cascadia/TerminalApp/ActionPreviewHandlers.cpp

@@ -67,41 +67,17 @@ namespace winrt::TerminalApp::implementation
     // - <none>
     void TerminalPage::_EndPreviewColorScheme()
     {
-        // Get the focused control
-        if (const auto& activeControl{ _GetActiveControl() })
+        for (const auto& f : _restorePreviewFuncs)
         {
-            // Get the runtime settings of the focused control
-            const auto& controlSettings{ activeControl.Settings().as<TerminalSettings>() };
-
-            // Get the control's root settings, the ones that we actually
-            // assigned to it.
-            auto parentSettings{ controlSettings.GetParent() };
-            while (parentSettings.GetParent() != nullptr)
-            {
-                parentSettings = parentSettings.GetParent();
-            }
-
-            // If the root settings are the same as the ones we stashed,
-            // then reset the parent of the runtime settings to the stashed
-            // settings. This condition might be false if the settings
-            // hot-reloaded while the palette was open. In that case, we
-            // don't want to reset the settings to what they were _before_
-            // the hot-reload.
-            if (_originalSettings == parentSettings)
-            {
-                // Set the original settings as the parent of the control's settings
-                activeControl.Settings().as<TerminalSettings>().SetParent(_originalSettings);
-            }
-
-            activeControl.UpdateSettings();
+            f();
         }
-        _originalSettings = nullptr;
+        _restorePreviewFuncs.clear();
     }
 
     // Method Description:
     // - Preview handler for the SetColorScheme action.
-    // - This method will stash the settings of the current control in
-    //   _originalSettings. Then it will create a new TerminalSettings object
+    // - This method will stash functions to reset the settings of the selected controls in
+    //   _restorePreviewFuncs. Then it will create a new TerminalSettings object
     //   with only the properties from the ColorScheme set. It'll _insert_ a
     //   TerminalSettings between the control's root settings (built from
     //   CascadiaSettings) and the control's runtime settings. That'll cause the
@@ -112,33 +88,63 @@ namespace winrt::TerminalApp::implementation
     // - <none>
     void TerminalPage::_PreviewColorScheme(const Settings::Model::SetColorSchemeArgs& args)
     {
-        // Get the focused control
-        if (const auto& activeControl{ _GetActiveControl() })
+        if (const auto& scheme{ _settings.GlobalSettings().ColorSchemes().TryLookup(args.SchemeName()) })
         {
-            if (const auto& scheme{ _settings.GlobalSettings().ColorSchemes().TryLookup(args.SchemeName()) })
-            {
+            // Clear the saved preview funcs because we don't need to add a restore each time
+            // the preview color changes, we only need to be able to restore the last one.
+            _restorePreviewFuncs.clear();
+
+            _ApplyToActiveControls([&](const auto& control) {
                 // Get the settings of the focused control and stash them
-                const auto& controlSettings = activeControl.Settings().as<TerminalSettings>();
+                const auto& controlSettings = control.Settings().as<TerminalSettings>();
                 // Make sure to recurse up to the root - if you're doing
                 // this while you're currently previewing a SetColorScheme
                 // action, then the parent of the control's settings is _the
                 // last preview TerminalSettings we inserted! We don't want
                 // to save that one!
-                _originalSettings = controlSettings.GetParent();
-                while (_originalSettings.GetParent() != nullptr)
+                auto originalSettings = controlSettings.GetParent();
+                while (originalSettings.GetParent() != nullptr)
                 {
-                    _originalSettings = _originalSettings.GetParent();
+                    originalSettings = originalSettings.GetParent();
                 }
                 // Create a new child for those settings
-                TerminalSettingsCreateResult fake{ _originalSettings };
+                TerminalSettingsCreateResult fake{ originalSettings };
                 const auto& childStruct = TerminalSettings::CreateWithParent(fake);
                 // Modify the child to have the applied color scheme
                 childStruct.DefaultSettings().ApplyColorScheme(scheme);
 
                 // Insert that new child as the parent of the control's settings
                 controlSettings.SetParent(childStruct.DefaultSettings());
-                activeControl.UpdateSettings();
-            }
+                control.UpdateSettings();
+
+                // Take a copy of the inputs, since they are pointers anyways.
+                _restorePreviewFuncs.emplace_back([=]() {
+                    // Get the runtime settings of the focused control
+                    const auto& controlSettings{ control.Settings().as<TerminalSettings>() };
+
+                    // Get the control's root settings, the ones that we actually
+                    // assigned to it.
+                    auto parentSettings{ controlSettings.GetParent() };
+                    while (parentSettings.GetParent() != nullptr)
+                    {
+                        parentSettings = parentSettings.GetParent();
+                    }
+
+                    // If the root settings are the same as the ones we stashed,
+                    // then reset the parent of the runtime settings to the stashed
+                    // settings. This condition might be false if the settings
+                    // hot-reloaded while the palette was open. In that case, we
+                    // don't want to reset the settings to what they were _before_
+                    // the hot-reload.
+                    if (originalSettings == parentSettings)
+                    {
+                        // Set the original settings as the parent of the control's settings
+                        control.Settings().as<TerminalSettings>().SetParent(originalSettings);
+                    }
+
+                    control.UpdateSettings();
+                });
+            });
         }
     }
 

src/cascadia/TerminalApp/AppActionHandlers.cpp

@@ -78,7 +78,7 @@ namespace winrt::TerminalApp::implementation
     void TerminalPage::_HandleCloseWindow(const IInspectable& /*sender*/,
                                           const ActionEventArgs& args)
     {
-        CloseWindow(false);
+        _CloseRequestedHandlers(nullptr, nullptr);
         args.Handled(true);
     }
 
@@ -174,10 +174,9 @@ namespace winrt::TerminalApp::implementation
         else if (const auto& realArgs = args.ActionArgs().try_as<SplitPaneArgs>())
         {
             _SplitPane(realArgs.SplitDirection(),
-                       realArgs.SplitMode(),
                        // This is safe, we're already filtering so the value is (0, 1)
                        ::base::saturated_cast<float>(realArgs.SplitSize()),
-                       realArgs.TerminalArgs());
+                       _MakePane(realArgs.TerminalArgs(), realArgs.SplitMode() == SplitType::Duplicate));
             args.Handled(true);
         }
     }
@@ -377,11 +376,10 @@ namespace winrt::TerminalApp::implementation
     {
         if (const auto& realArgs = args.ActionArgs().try_as<AdjustFontSizeArgs>())
         {
-            if (const auto& termControl{ _GetActiveControl() })
-            {
-                termControl.AdjustFontSize(realArgs.Delta());
-                args.Handled(true);
-            }
+            const auto res = _ApplyToActiveControls([&](auto& control) {
+                control.AdjustFontSize(realArgs.Delta());
+            });
+            args.Handled(res);
         }
     }
 
@@ -395,21 +393,19 @@ namespace winrt::TerminalApp::implementation
     void TerminalPage::_HandleResetFontSize(const IInspectable& /*sender*/,
                                             const ActionEventArgs& args)
     {
-        if (const auto& termControl{ _GetActiveControl() })
-        {
-            termControl.ResetFontSize();
-            args.Handled(true);
-        }
+        const auto res = _ApplyToActiveControls([](auto& control) {
+            control.ResetFontSize();
+        });
+        args.Handled(res);
     }
 
     void TerminalPage::_HandleToggleShaderEffects(const IInspectable& /*sender*/,
                                                   const ActionEventArgs& args)
     {
-        if (const auto& termControl{ _GetActiveControl() })
-        {
-            termControl.ToggleShaderEffects();
-            args.Handled(true);
-        }
+        const auto res = _ApplyToActiveControls([](auto& control) {
+            control.ToggleShaderEffects();
+        });
+        args.Handled(res);
     }
 
     void TerminalPage::_HandleToggleFocusMode(const IInspectable& /*sender*/,
@@ -452,37 +448,33 @@ namespace winrt::TerminalApp::implementation
         args.Handled(false);
         if (const auto& realArgs = args.ActionArgs().try_as<SetColorSchemeArgs>())
         {
-            if (const auto activeTab{ _GetFocusedTabImpl() })
+            if (const auto scheme = _settings.GlobalSettings().ColorSchemes().TryLookup(realArgs.SchemeName()))
             {
-                if (auto activeControl = activeTab->GetActiveTerminalControl())
-                {
-                    if (const auto scheme = _settings.GlobalSettings().ColorSchemes().TryLookup(realArgs.SchemeName()))
+                const auto res = _ApplyToActiveControls([&](auto& control) {
+                    // Start by getting the current settings of the control
+                    auto controlSettings = control.Settings().as<TerminalSettings>();
+                    auto parentSettings = controlSettings;
+                    // Those are the _runtime_ settings however. What we
+                    // need to do is:
+                    //
+                    //   1. Blow away any colors set in the runtime settings.
+                    //   2. Apply the color scheme to the parent settings.
+                    //
+                    // 1 is important to make sure that the effects of
+                    // something like `colortool` are cleared when setting
+                    // the scheme.
+                    if (controlSettings.GetParent() != nullptr)
                     {
-                        // Start by getting the current settings of the control
-                        auto controlSettings = activeControl.Settings().as<TerminalSettings>();
-                        auto parentSettings = controlSettings;
-                        // Those are the _runtime_ settings however. What we
-                        // need to do is:
-                        //
-                        //   1. Blow away any colors set in the runtime settings.
-                        //   2. Apply the color scheme to the parent settings.
-                        //
-                        // 1 is important to make sure that the effects of
-                        // something like `colortool` are cleared when setting
-                        // the scheme.
-                        if (controlSettings.GetParent() != nullptr)
-                        {
-                            parentSettings = controlSettings.GetParent();
-                        }
-
-                        // ApplyColorScheme(nullptr) will clear the old color scheme.
-                        controlSettings.ApplyColorScheme(nullptr);
-                        parentSettings.ApplyColorScheme(scheme);
-
-                        activeControl.UpdateSettings();
-                        args.Handled(true);
+                        parentSettings = controlSettings.GetParent();
                     }
-                }
+
+                    // ApplyColorScheme(nullptr) will clear the old color scheme.
+                    controlSettings.ApplyColorScheme(nullptr);
+                    parentSettings.ApplyColorScheme(scheme);
+
+                    control.UpdateSettings();
+                });
+                args.Handled(res);
             }
         }
     }
@@ -563,7 +555,7 @@ namespace winrt::TerminalApp::implementation
             auto actions = winrt::single_threaded_vector<ActionAndArgs>(std::move(
                 TerminalPage::ConvertExecuteCommandlineToActions(realArgs)));
 
-            if (_startupActions.Size() != 0)
+            if (actions.Size() != 0)
             {
                 actionArgs.Handled(true);
                 ProcessStartupActions(actions, false);
@@ -896,11 +888,10 @@ namespace winrt::TerminalApp::implementation
         {
             if (const auto& realArgs = args.ActionArgs().try_as<ClearBufferArgs>())
             {
-                if (const auto termControl{ _GetActiveControl() })
-                {
-                    termControl.ClearBuffer(realArgs.Clear());
-                    args.Handled(true);
-                }
+                const auto res = _ApplyToActiveControls([&](auto& control) {
+                    control.ClearBuffer(realArgs.Clear());
+                });
+                args.Handled(res);
             }
         }
     }

src/cascadia/TerminalApp/AppCommandlineArgs.cpp

@@ -187,6 +187,10 @@ void AppCommandlineArgs::_buildParser()
                     _windowTarget,
                     RS_A(L"CmdWindowTargetArgDesc"));
 
+    _app.add_option("-s,--saved",
+                    _loadPersistedLayoutIdx,
+                    RS_A(L"CmdSavedLayoutArgDesc"));
+
     // Subcommands
     _buildNewTabParser();
     _buildSplitPaneParser();
@@ -700,6 +704,7 @@ void AppCommandlineArgs::_resetStateToDefault()
     _swapPaneDirection = FocusDirection::None;
 
     _focusPaneTarget = -1;
+    _loadPersistedLayoutIdx = -1;
 
     // DON'T clear _launchMode here! This will get called once for every
     // subcommand, so we don't want `wt -F new-tab ; split-pane` clearing out
@@ -915,6 +920,12 @@ void AppCommandlineArgs::ValidateStartupCommands()
         }
     }
 }
+std::optional<uint32_t> AppCommandlineArgs::GetPersistedLayoutIdx() const noexcept
+{
+    return _loadPersistedLayoutIdx >= 0 ?
+               std::optional{ static_cast<uint32_t>(_loadPersistedLayoutIdx) } :
+               std::nullopt;
+}
 
 std::optional<winrt::Microsoft::Terminal::Settings::Model::LaunchMode> AppCommandlineArgs::GetLaunchMode() const noexcept
 {

src/cascadia/TerminalApp/AppCommandlineArgs.h

@@ -39,6 +39,7 @@ public:
     const std::string& GetExitMessage();
     bool ShouldExitEarly() const noexcept;
 
+    std::optional<uint32_t> GetPersistedLayoutIdx() const noexcept;
     std::optional<winrt::Microsoft::Terminal::Settings::Model::LaunchMode> GetLaunchMode() const noexcept;
 
     int ParseArgs(const winrt::Microsoft::Terminal::Settings::Model::ExecuteCommandlineArgs& args);
@@ -123,6 +124,7 @@ private:
     std::string _exitMessage;
     bool _shouldExitEarly{ false };
 
+    int _loadPersistedLayoutIdx{};
     std::string _windowTarget{};
     // Are you adding more args or attributes here? If they are not reset in _resetStateToDefault, make sure to reset them in FullResetState
 

src/cascadia/TerminalApp/AppLogic.cpp

@@ -12,6 +12,8 @@
 #include <WtExeUtils.h>
 #include <wil/token_helpers.h >
 
+#include "../../types/inc/utils.hpp"
+
 using namespace winrt::Windows::ApplicationModel;
 using namespace winrt::Windows::ApplicationModel::DataTransfer;
 using namespace winrt::Windows::UI::Xaml;
@@ -131,38 +133,6 @@ static Documents::Run _BuildErrorRun(const winrt::hstring& text, const ResourceD
     return textRun;
 }
 
-// Method Description:
-// - Returns whether the user is either a member of the Administrators group or
-//   is currently elevated.
-// - This will return **FALSE** if the user has UAC disabled entirely, because
-//   there's no separation of power between the user and an admin in that case.
-// Return Value:
-// - true if the user is an administrator
-static bool _isUserAdmin() noexcept
-try
-{
-    wil::unique_handle processToken{ GetCurrentProcessToken() };
-    const auto elevationType = wil::get_token_information<TOKEN_ELEVATION_TYPE>(processToken.get());
-    const auto elevationState = wil::get_token_information<TOKEN_ELEVATION>(processToken.get());
-    if (elevationType == TokenElevationTypeDefault && elevationState.TokenIsElevated)
-    {
-        // In this case, the user has UAC entirely disabled. This is sort of
-        // weird, we treat this like the user isn't an admin at all. There's no
-        // separation of powers, so the things we normally want to gate on
-        // "having special powers" doesn't apply.
-        //
-        // See GH#7754, GH#11096
-        return false;
-    }
-
-    return wil::test_token_membership(nullptr, SECURITY_NT_AUTHORITY, SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_ALIAS_RID_ADMINS);
-}
-catch (...)
-{
-    LOG_CAUGHT_EXCEPTION();
-    return false;
-}
-
 namespace winrt::TerminalApp::implementation
 {
     // Function Description:
@@ -214,7 +184,7 @@ namespace winrt::TerminalApp::implementation
         // The TerminalPage has to be constructed during our construction, to
         // make sure that there's a terminal page for callers of
         // SetTitleBarContent
-        _isElevated = _isUserAdmin();
+        _isElevated = ::Microsoft::Console::Utils::IsElevated();
         _root = winrt::make_self<TerminalPage>();
 
         _reloadSettings = std::make_shared<ThrottledFuncTrailing<>>(winrt::Windows::System::DispatcherQueue::GetForCurrentThread(), std::chrono::milliseconds(100), [weakSelf = get_weak()]() {
@@ -334,6 +304,9 @@ namespace winrt::TerminalApp::implementation
         _RefreshThemeRoutine();
         _ApplyStartupTaskStateChange();
 
+        auto args = winrt::make_self<SystemMenuChangeArgs>(RS_(L"SettingsMenuItem"), SystemMenuChangeAction::Add, SystemMenuItemHandler(this, &AppLogic::_OpenSettingsUI));
+        _SystemMenuChangeRequestedHandlers(*this, *args);
+
         TraceLoggingWrite(
             g_hTerminalAppProvider,
             "AppCreated",
@@ -375,6 +348,8 @@ namespace winrt::TerminalApp::implementation
             co_return ContentDialogResult::None;
         }
 
+        _dialog = dialog;
+
         // IMPORTANT: This is necessary as documented in the ContentDialog MSDN docs.
         // Since we're hosting the dialog in a Xaml island, we need to connect it to the
         // xaml tree somehow.
@@ -412,6 +387,16 @@ namespace winrt::TerminalApp::implementation
         // be released so another can be shown
     }
 
+    // Method Description:
+    // - Dismiss the (only) visible ContentDialog
+    void AppLogic::DismissDialog()
+    {
+        if (auto localDialog = std::exchange(_dialog, nullptr))
+        {
+            localDialog.Hide();
+        }
+    }
+
     // Method Description:
     // - Displays a dialog for errors found while loading or validating the
     //   settings. Uses the resources under the provided  title and content keys
@@ -600,13 +585,11 @@ namespace winrt::TerminalApp::implementation
         winrt::Windows::Foundation::Size proposedSize{};
 
         const float scale = static_cast<float>(dpi) / static_cast<float>(USER_DEFAULT_SCREEN_DPI);
-        if (_root->ShouldUsePersistedLayout(_settings))
+        if (const auto layout = _root->LoadPersistedLayout(_settings))
         {
-            const auto layouts = ApplicationState::SharedInstance().PersistedWindowLayouts();
-
-            if (layouts && layouts.Size() > 0 && layouts.GetAt(0).InitialSize())
+            if (layout.InitialSize())
             {
-                proposedSize = layouts.GetAt(0).InitialSize().Value();
+                proposedSize = layout.InitialSize().Value();
                 // The size is saved as a non-scaled real pixel size,
                 // so we need to scale it appropriately.
                 proposedSize.Height = proposedSize.Height * scale;
@@ -704,13 +687,11 @@ namespace winrt::TerminalApp::implementation
 
         auto initialPosition{ _settings.GlobalSettings().InitialPosition() };
 
-        if (_root->ShouldUsePersistedLayout(_settings))
+        if (const auto layout = _root->LoadPersistedLayout(_settings))
         {
-            const auto layouts = ApplicationState::SharedInstance().PersistedWindowLayouts();
-
-            if (layouts && layouts.Size() > 0 && layouts.GetAt(0).InitialPosition())
+            if (layout.InitialPosition())
             {
-                initialPosition = layouts.GetAt(0).InitialPosition().Value();
+                initialPosition = layout.InitialPosition().Value();
             }
         }
 
@@ -899,8 +880,6 @@ namespace winrt::TerminalApp::implementation
     void AppLogic::_RegisterSettingsChange()
     {
         const std::filesystem::path settingsPath{ std::wstring_view{ CascadiaSettings::SettingsPath() } };
-        const std::filesystem::path statePath{ std::wstring_view{ ApplicationState::SharedInstance().FilePath() } };
-
         _reader.create(
             settingsPath.parent_path().c_str(),
             false,
@@ -909,14 +888,29 @@ namespace winrt::TerminalApp::implementation
             // editors, who will write a temp file, then rename it to be the
             // actual file you wrote. So listen for that too.
             wil::FolderChangeEvents::FileName | wil::FolderChangeEvents::LastWriteTime,
-            [this, settingsBasename = settingsPath.filename(), stateBasename = statePath.filename()](wil::FolderChangeEvent, PCWSTR fileModified) {
-                const auto modifiedBasename = std::filesystem::path{ fileModified }.filename();
+            [this, settingsBasename = settingsPath.filename()](wil::FolderChangeEvent, PCWSTR fileModified) {
+                // DO NOT create a static reference to ApplicationState::SharedInstance here.
+                //
+                // ApplicationState::SharedInstance already caches its own
+                // static ref. If _we_ keep a static ref to the member in
+                // AppState, then our reference will keep ApplicationState alive
+                // after the `ActionToStringMap` gets cleaned up. Then, when we
+                // try to persist the actions in the window state, we won't be
+                // able to. We'll try to look up the action and the map just
+                // won't exist. We'll explode, even though the Terminal is
+                // tearing down anyways. So we'll just die, but still invoke
+                // WinDBG's post-mortem debugger, who won't be able to attach to
+                // the process that's already exiting.
+                //
+                // So DON'T ~give a mouse a cookie~ take a static ref here.
+
+                const winrt::hstring modifiedBasename{ std::filesystem::path{ fileModified }.filename().c_str() };
 
                 if (modifiedBasename == settingsBasename)
                 {
                     _reloadSettings->Run();
                 }
-                else if (modifiedBasename == stateBasename)
+                else if (ApplicationState::SharedInstance().IsStatePath(modifiedBasename))
                 {
                     _reloadState();
                 }
@@ -1043,6 +1037,11 @@ namespace winrt::TerminalApp::implementation
         _SettingsChangedHandlers(*this, nullptr);
     }
 
+    void AppLogic::_OpenSettingsUI()
+    {
+        _root->OpenSettingsUI();
+    }
+
     // Method Description:
     // - Returns a pointer to the global shared settings.
     [[nodiscard]] CascadiaSettings AppLogic::GetSettings() const noexcept
@@ -1151,10 +1150,22 @@ namespace winrt::TerminalApp::implementation
     // - <none>
     // Return Value:
     // - <none>
-    void AppLogic::WindowCloseButtonClicked()
+    void AppLogic::CloseWindow(LaunchPosition pos)
     {
         if (_root)
         {
+            // If persisted layout is enabled and we are the last window closing
+            // we should save our state.
+            if (_root->ShouldUsePersistedLayout(_settings) && _numOpenWindows == 1)
+            {
+                if (const auto layout = _root->GetWindowLayout())
+                {
+                    layout.InitialPosition(pos);
+                    const auto state = ApplicationState::SharedInstance();
+                    state.PersistedWindowLayouts(winrt::single_threaded_vector<WindowLayout>({ layout }));
+                }
+            }
+
             _root->CloseWindow(false);
         }
     }
@@ -1168,6 +1179,16 @@ namespace winrt::TerminalApp::implementation
         return {};
     }
 
+    bool AppLogic::HasCommandlineArguments() const noexcept
+    {
+        return _hasCommandLineArguments;
+    }
+
+    bool AppLogic::HasSettingsStartupActions() const noexcept
+    {
+        return _hasSettingsStartupActions;
+    }
+
     // Method Description:
     // - Sets the initial commandline to process on startup, and attempts to
     //   parse it. Commands will be parsed into a list of ShortcutActions that
@@ -1191,6 +1212,10 @@ namespace winrt::TerminalApp::implementation
             // then it contains only the executable name and no other arguments.
             _hasCommandLineArguments = args.size() > 1;
             _appArgs.ValidateStartupCommands();
+            if (const auto idx = _appArgs.GetPersistedLayoutIdx())
+            {
+                _root->SetPersistedLayoutIdx(idx.value());
+            }
             _root->SetStartupActions(_appArgs.GetStartupActions());
 
             // Check if we were started as a COM server for inbound connections of console sessions
@@ -1428,6 +1453,40 @@ namespace winrt::TerminalApp::implementation
         return _settings.GlobalSettings().ActionMap().GlobalHotkeys();
     }
 
+    bool AppLogic::ShouldUsePersistedLayout()
+    {
+        return _root != nullptr ? _root->ShouldUsePersistedLayout(_settings) : false;
+    }
+
+    void AppLogic::SaveWindowLayoutJsons(const Windows::Foundation::Collections::IVector<hstring>& layouts)
+    {
+        std::vector<WindowLayout> converted;
+        converted.reserve(layouts.Size());
+
+        for (const auto& json : layouts)
+        {
+            if (json != L"")
+            {
+                converted.emplace_back(WindowLayout::FromJson(json));
+            }
+        }
+
+        ApplicationState::SharedInstance().PersistedWindowLayouts(winrt::single_threaded_vector(std::move(converted)));
+    }
+
+    hstring AppLogic::GetWindowLayoutJson(LaunchPosition position)
+    {
+        if (_root != nullptr)
+        {
+            if (const auto layout = _root->GetWindowLayout())
+            {
+                layout.InitialPosition(position);
+                return WindowLayout::ToJson(layout);
+            }
+        }
+        return L"";
+    }
+
     void AppLogic::IdentifyWindow()
     {
         if (_root)
@@ -1459,8 +1518,17 @@ namespace winrt::TerminalApp::implementation
         }
     }
 
+    void AppLogic::SetPersistedLayoutIdx(const uint32_t idx)
+    {
+        if (_root)
+        {
+            _root->SetPersistedLayoutIdx(idx);
+        }
+    }
+
     void AppLogic::SetNumberOfOpenWindows(const uint64_t num)
     {
+        _numOpenWindows = num;
         if (_root)
         {
             _root->SetNumberOfOpenWindows(num);
@@ -1480,6 +1548,11 @@ namespace winrt::TerminalApp::implementation
         return _root->IsQuakeWindow();
     }
 
+    void AppLogic::RequestExitFullscreen()
+    {
+        _root->SetFullscreen(false);
+    }
+
     bool AppLogic::GetMinimizeToNotificationArea()
     {
         if constexpr (Feature_NotificationIcon::IsEnabled())

src/cascadia/TerminalApp/AppLogic.h

@@ -5,6 +5,7 @@
 
 #include "AppLogic.g.h"
 #include "FindTargetWindowResult.g.h"
+#include "SystemMenuChangeArgs.g.h"
 #include "Jumplist.h"
 #include "LanguageProfileNotifier.h"
 #include "TerminalPage.h"
@@ -35,6 +36,17 @@ namespace winrt::TerminalApp::implementation
             FindTargetWindowResult(id, L""){};
     };
 
+    struct SystemMenuChangeArgs : SystemMenuChangeArgsT<SystemMenuChangeArgs>
+    {
+        WINRT_PROPERTY(winrt::hstring, Name, L"");
+        WINRT_PROPERTY(SystemMenuChangeAction, Action, SystemMenuChangeAction::Add);
+        WINRT_PROPERTY(SystemMenuItemHandler, Handler, nullptr);
+
+    public:
+        SystemMenuChangeArgs(const winrt::hstring& name, SystemMenuChangeAction action, SystemMenuItemHandler handler = nullptr) :
+            _Name{ name }, _Action{ action }, _Handler{ handler } {};
+    };
+
     struct AppLogic : AppLogicT<AppLogic, IInitializeWithWindow>
     {
     public:
@@ -55,6 +67,8 @@ namespace winrt::TerminalApp::implementation
 
         void Quit();
 
+        bool HasCommandlineArguments() const noexcept;
+        bool HasSettingsStartupActions() const noexcept;
         int32_t SetStartupCommandline(array_view<const winrt::hstring> actions);
         int32_t ExecuteCommandline(array_view<const winrt::hstring> actions, const winrt::hstring& cwd);
         TerminalApp::FindTargetWindowResult FindTargetWindow(array_view<const winrt::hstring> actions);
@@ -65,14 +79,19 @@ namespace winrt::TerminalApp::implementation
         bool Fullscreen() const;
         bool AlwaysOnTop() const;
 
+        bool ShouldUsePersistedLayout();
+        hstring GetWindowLayoutJson(Microsoft::Terminal::Settings::Model::LaunchPosition position);
+        void SaveWindowLayoutJsons(const Windows::Foundation::Collections::IVector<hstring>& layouts);
         void IdentifyWindow();
         void RenameFailed();
         winrt::hstring WindowName();
         void WindowName(const winrt::hstring& name);
         uint64_t WindowId();
         void WindowId(const uint64_t& id);
+        void SetPersistedLayoutIdx(const uint32_t idx);
         void SetNumberOfOpenWindows(const uint64_t num);
         bool IsQuakeWindow() const noexcept;
+        void RequestExitFullscreen();
 
         Windows::Foundation::Size GetLaunchDimensions(uint32_t dpi);
         bool CenterOnLaunch();
@@ -91,7 +110,7 @@ namespace winrt::TerminalApp::implementation
         void TitlebarClicked();
         bool OnDirectKeyEvent(const uint32_t vkey, const uint8_t scanCode, const bool down);
 
-        void WindowCloseButtonClicked();
+        void CloseWindow(Microsoft::Terminal::Settings::Model::LaunchPosition position);
 
         winrt::TerminalApp::TaskbarState TaskbarState();
 
@@ -100,12 +119,14 @@ namespace winrt::TerminalApp::implementation
         bool GetShowTitleInTitlebar();
 
         winrt::Windows::Foundation::IAsyncOperation<winrt::Windows::UI::Xaml::Controls::ContentDialogResult> ShowDialog(winrt::Windows::UI::Xaml::Controls::ContentDialog dialog);
+        void DismissDialog();
 
         Windows::Foundation::Collections::IMapView<Microsoft::Terminal::Control::KeyChord, Microsoft::Terminal::Settings::Model::Command> GlobalHotkeys();
 
         // -------------------------------- WinRT Events ---------------------------------
         TYPED_EVENT(RequestedThemeChanged, winrt::Windows::Foundation::IInspectable, winrt::Windows::UI::Xaml::ElementTheme);
         TYPED_EVENT(SettingsChanged, winrt::Windows::Foundation::IInspectable, winrt::Windows::Foundation::IInspectable);
+        TYPED_EVENT(SystemMenuChangeRequested, winrt::Windows::Foundation::IInspectable, winrt::TerminalApp::SystemMenuChangeArgs);
 
     private:
         bool _isUwp{ false };
@@ -123,7 +144,10 @@ namespace winrt::TerminalApp::implementation
         HRESULT _settingsLoadedResult = S_OK;
         bool _loadedInitialSettings = false;
 
+        uint64_t _numOpenWindows{ 0 };
+
         std::shared_mutex _dialogLock;
+        winrt::Windows::UI::Xaml::Controls::ContentDialog _dialog;
 
         ::TerminalApp::AppCommandlineArgs _appArgs;
         ::TerminalApp::AppCommandlineArgs _settingsAppArgs;
@@ -153,6 +177,7 @@ namespace winrt::TerminalApp::implementation
         void _RegisterSettingsChange();
         fire_and_forget _DispatchReloadSettings();
         void _ReloadSettings();
+        void _OpenSettingsUI();
 
         void _ApplyTheme(const Windows::UI::Xaml::ElementTheme& newTheme);
 
@@ -175,6 +200,7 @@ namespace winrt::TerminalApp::implementation
         FORWARDED_TYPED_EVENT(RenameWindowRequested, Windows::Foundation::IInspectable, winrt::TerminalApp::RenameWindowRequestedArgs, _root, RenameWindowRequested);
         FORWARDED_TYPED_EVENT(IsQuakeWindowChanged, Windows::Foundation::IInspectable, Windows::Foundation::IInspectable, _root, IsQuakeWindowChanged);
         FORWARDED_TYPED_EVENT(SummonWindowRequested, Windows::Foundation::IInspectable, Windows::Foundation::IInspectable, _root, SummonWindowRequested);
+        FORWARDED_TYPED_EVENT(CloseRequested, Windows::Foundation::IInspectable, Windows::Foundation::IInspectable, _root, CloseRequested);
         FORWARDED_TYPED_EVENT(OpenSystemMenu, Windows::Foundation::IInspectable, Windows::Foundation::IInspectable, _root, OpenSystemMenu);
         FORWARDED_TYPED_EVENT(QuitRequested, Windows::Foundation::IInspectable, Windows::Foundation::IInspectable, _root, QuitRequested);
 

src/cascadia/TerminalApp/AppLogic.idl

@@ -19,6 +19,20 @@ namespace TerminalApp
         String WindowName { get; };
     };
 
+    delegate void SystemMenuItemHandler();
+
+    enum SystemMenuChangeAction
+    {
+        Add = 0,
+        Remove = 1
+    };
+
+    [default_interface] runtimeclass SystemMenuChangeArgs {
+        String Name { get; };
+        SystemMenuChangeAction Action { get; };
+        SystemMenuItemHandler Handler { get; };
+    };
+
     [default_interface] runtimeclass AppLogic : IDirectKeyListener, IDialogPresenter
     {
         AppLogic();
@@ -34,6 +48,8 @@ namespace TerminalApp
         void RunAsUwp();
         Boolean IsElevated();
 
+        Boolean HasCommandlineArguments();
+        Boolean HasSettingsStartupActions();
         Int32 SetStartupCommandline(String[] commands);
         Int32 ExecuteCommandline(String[] commands, String cwd);
         String ParseCommandlineMessage { get; };
@@ -55,8 +71,10 @@ namespace TerminalApp
         void IdentifyWindow();
         String WindowName;
         UInt64 WindowId;
+        void SetPersistedLayoutIdx(UInt32 idx);
         void SetNumberOfOpenWindows(UInt64 num);
         void RenameFailed();
+        void RequestExitFullscreen();
         Boolean IsQuakeWindow();
 
         Windows.Foundation.Size GetLaunchDimensions(UInt32 dpi);
@@ -69,10 +87,14 @@ namespace TerminalApp
         Boolean GetInitialAlwaysOnTop();
         Single CalcSnappedDimension(Boolean widthOrHeight, Single dimension);
         void TitlebarClicked();
-        void WindowCloseButtonClicked();
+        void CloseWindow(Microsoft.Terminal.Settings.Model.LaunchPosition position);
 
         TaskbarState TaskbarState{ get; };
 
+        Boolean ShouldUsePersistedLayout();
+        String GetWindowLayoutJson(Microsoft.Terminal.Settings.Model.LaunchPosition position);
+        void SaveWindowLayoutJsons(Windows.Foundation.Collections.IVector<String> layouts);
+
         Boolean GetMinimizeToNotificationArea();
         Boolean GetAlwaysShowNotificationIcon();
         Boolean GetShowTitleInTitlebar();
@@ -84,6 +106,7 @@ namespace TerminalApp
         // See IDialogPresenter and TerminalPage's DialogPresenter for more
         // information.
         Windows.Foundation.IAsyncOperation<Windows.UI.Xaml.Controls.ContentDialogResult> ShowDialog(Windows.UI.Xaml.Controls.ContentDialog dialog);
+        void DismissDialog();
 
         event Windows.Foundation.TypedEventHandler<Object, Windows.UI.Xaml.UIElement> SetTitleBarContent;
         event Windows.Foundation.TypedEventHandler<Object, String> TitleChanged;
@@ -99,7 +122,9 @@ namespace TerminalApp
         event Windows.Foundation.TypedEventHandler<Object, Object> SettingsChanged;
         event Windows.Foundation.TypedEventHandler<Object, Object> IsQuakeWindowChanged;
         event Windows.Foundation.TypedEventHandler<Object, Object> SummonWindowRequested;
+        event Windows.Foundation.TypedEventHandler<Object, Object> CloseRequested;
         event Windows.Foundation.TypedEventHandler<Object, Object> OpenSystemMenu;
         event Windows.Foundation.TypedEventHandler<Object, Object> QuitRequested;
+        event Windows.Foundation.TypedEventHandler<Object, TerminalApp.SystemMenuChangeArgs> SystemMenuChangeRequested;
     }
 }

src/cascadia/TerminalApp/DebugTapConnection.cpp

@@ -21,8 +21,22 @@ namespace winrt::Microsoft::TerminalApp::implementation
         }
         void Initialize(const Windows::Foundation::Collections::ValueSet& /*settings*/) {}
         ~DebugInputTapConnection() = default;
-        void Start()
+        winrt::fire_and_forget Start()
         {
+            // GH#11282: It's possible that we're about to be started, _before_
+            // our paired connection is started. Both will get Start()'ed when
+            // their owning TermControl is finally laid out. However, if we're
+            // started first, then we'll immediately start printing to the other
+            // control as well, which might not have initialized yet. If we do
+            // that, we'll explode.
+            //
+            // Instead, wait here until the other connection is started too,
+            // before actually starting the connection to the client app. This
+            // will ensure both controls are initialized before the client app
+            // is.
+            co_await winrt::resume_background();
+            _pairedTap->_start.wait();
+
             _wrappedConnection.Start();
         }
         void WriteInput(hstring const& data)
@@ -59,6 +73,9 @@ namespace winrt::Microsoft::TerminalApp::implementation
     void DebugTapConnection::Start()
     {
         // presume the wrapped connection is started.
+
+        // This is explained in the comment for GH#11282 above.
+        _start.count_down();
     }
 
     void DebugTapConnection::WriteInput(hstring const& data)

src/cascadia/TerminalApp/DebugTapConnection.h

@@ -5,6 +5,7 @@
 
 #include <winrt/Microsoft.Terminal.TerminalConnection.h>
 #include "../../inc/cppwinrt_utils.h"
+#include <til/latch.h>
 
 namespace winrt::Microsoft::TerminalApp::implementation
 {
@@ -36,6 +37,8 @@ namespace winrt::Microsoft::TerminalApp::implementation
         winrt::weak_ref<Microsoft::Terminal::TerminalConnection::ITerminalConnection> _wrappedConnection;
         winrt::weak_ref<Microsoft::Terminal::TerminalConnection::ITerminalConnection> _inputSide;
 
+        til::latch _start{ 1 };
+
         friend class DebugInputTapConnection;
     };
 }

src/cascadia/TerminalApp/Pane.h

@@ -40,7 +40,8 @@ enum class Borders : int
     Top = 0x1,
     Bottom = 0x2,
     Left = 0x4,
-    Right = 0x8
+    Right = 0x8,
+    All = 0xF
 };
 DEFINE_ENUM_FLAG_OPERATORS(Borders);
 
@@ -58,7 +59,14 @@ public:
          const winrt::Microsoft::Terminal::Control::TermControl& control,
          const bool lastFocused = false);
 
+    Pane(std::shared_ptr<Pane> first,
+         std::shared_ptr<Pane> second,
+         const SplitState splitType,
+         const float splitPosition,
+         const bool lastFocused = false);
+
     std::shared_ptr<Pane> GetActivePane();
+    winrt::Microsoft::Terminal::Control::TermControl GetLastFocusedTerminalControl();
     winrt::Microsoft::Terminal::Control::TermControl GetTerminalControl();
     winrt::Microsoft::Terminal::Settings::Model::Profile GetFocusedProfile();
 
@@ -102,8 +110,7 @@ public:
 
     std::pair<std::shared_ptr<Pane>, std::shared_ptr<Pane>> Split(winrt::Microsoft::Terminal::Settings::Model::SplitDirection splitType,
                                                                   const float splitSize,
-                                                                  const winrt::Microsoft::Terminal::Settings::Model::Profile& profile,
-                                                                  const winrt::Microsoft::Terminal::Control::TermControl& control);
+                                                                  std::shared_ptr<Pane> pane);
     bool ToggleSplitOrientation();
     float CalcSnappedDimension(const bool widthOrHeight, const float dimension) const;
     std::optional<winrt::Microsoft::Terminal::Settings::Model::SplitDirection> PreCalculateAutoSplit(const std::shared_ptr<Pane> target,
@@ -142,25 +149,43 @@ public:
     // - true if the predicate returned true on any pane.
     template<typename F>
     //requires std::predicate<F, std::shared_ptr<Pane>>
-    bool WalkTree(F f)
+    auto WalkTree(F f) -> decltype(f(shared_from_this()))
     {
-        if (f(shared_from_this()))
-        {
-            return true;
-        }
+        using R = std::invoke_result_t<F, std::shared_ptr<Pane>>;
+        static constexpr auto IsVoid = std::is_void_v<R>;
 
-        if (!_IsLeaf())
+        if constexpr (IsVoid)
         {
-            return _firstChild->WalkTree(f) || _secondChild->WalkTree(f);
+            f(shared_from_this());
+            if (!_IsLeaf())
+            {
+                _firstChild->WalkTree(f);
+                _secondChild->WalkTree(f);
+            }
         }
+        else
+        {
+            if (f(shared_from_this()))
+            {
+                return true;
+            }
 
-        return false;
+            if (!_IsLeaf())
+            {
+                return _firstChild->WalkTree(f) || _secondChild->WalkTree(f);
+            }
+
+            return false;
+        }
     }
 
     void CollectTaskbarStates(std::vector<winrt::TerminalApp::TaskbarState>& states);
 
     WINRT_CALLBACK(Closed, winrt::Windows::Foundation::EventHandler<winrt::Windows::Foundation::IInspectable>);
-    DECLARE_EVENT(GotFocus, _GotFocusHandlers, winrt::delegate<std::shared_ptr<Pane>>);
+
+    using gotFocusArgs = winrt::delegate<std::shared_ptr<Pane>, winrt::Windows::UI::Xaml::FocusState>;
+
+    DECLARE_EVENT(GotFocus, _GotFocusHandlers, gotFocusArgs);
     DECLARE_EVENT(LostFocus, _LostFocusHandlers, winrt::delegate<std::shared_ptr<Pane>>);
     DECLARE_EVENT(PaneRaiseBell, _PaneRaiseBellHandlers, winrt::Windows::Foundation::EventHandler<bool>);
     DECLARE_EVENT(Detached, _PaneDetachedHandlers, winrt::delegate<std::shared_ptr<Pane>>);
@@ -173,7 +198,8 @@ private:
     struct LayoutSizeNode;
 
     winrt::Windows::UI::Xaml::Controls::Grid _root{};
-    winrt::Windows::UI::Xaml::Controls::Border _border{};
+    winrt::Windows::UI::Xaml::Controls::Border _borderFirst{};
+    winrt::Windows::UI::Xaml::Controls::Border _borderSecond{};
     winrt::Microsoft::Terminal::Control::TermControl _control{ nullptr };
     winrt::Microsoft::Terminal::TerminalConnection::ConnectionState _connectionState{ winrt::Microsoft::Terminal::TerminalConnection::ConnectionState::NotConnected };
     static winrt::Windows::UI::Xaml::Media::SolidColorBrush s_focusedBorderBrush;
@@ -185,6 +211,7 @@ private:
     float _desiredSplitPosition;
 
     std::optional<uint32_t> _id;
+    std::weak_ptr<Pane> _parentChildPath{};
 
     bool _lastActive{ false };
     winrt::Microsoft::Terminal::Settings::Model::Profile _profile{ nullptr };
@@ -205,6 +232,7 @@ private:
     bool _IsLeaf() const noexcept;
     bool _HasFocusedChild() const noexcept;
     void _SetupChildCloseHandlers();
+    bool _HasChild(const std::shared_ptr<Pane> child);
 
     std::pair<std::shared_ptr<Pane>, std::shared_ptr<Pane>> _Split(winrt::Microsoft::Terminal::Settings::Model::SplitDirection splitType,
                                                                    const float splitSize,
@@ -232,6 +260,7 @@ private:
     void _CloseChild(const bool closeFirst, const bool isDetaching);
     winrt::fire_and_forget _CloseChildRoutine(const bool closeFirst);
 
+    void _Focus();
     void _FocusFirstChild();
     void _ControlConnectionStateChangedHandler(const winrt::Windows::Foundation::IInspectable& sender, const winrt::Windows::Foundation::IInspectable& /*args*/);
     void _ControlWarningBellHandler(winrt::Windows::Foundation::IInspectable const& sender,

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

@@ -190,6 +190,9 @@
   <data name="CloseWindowWarningTitle" xml:space="preserve">
     <value>Do you want to close all tabs?</value>
   </data>
+  <data name="MultiplePanes" xml:space="preserve">
+    <value>Multiple panes</value>
+  </data>
   <data name="TabCloseSubMenu" xml:space="preserve">
     <value>Close...</value>
   </data>
@@ -381,6 +384,9 @@
   <data name="CmdFocusDesc" xml:space="preserve">
     <value>Launch the window in focus mode</value>
   </data>
+  <data name="CmdSavedLayoutArgDesc" xml:space="preserve">
+    <value>This parameter is an internal implementation detail and should not be used.</value>
+  </data>
   <data name="CmdWindowTargetArgDesc" xml:space="preserve">
     <value>Specify a terminal window to run the given commandline in. "0" always refers to the current window. </value>
   </data>
@@ -712,10 +718,17 @@
   <data name="CloseOnExitInfoBar.Message" xml:space="preserve">
     <value>Termination behavior can be configured in advanced profile settings.</value>
   </data>
+  <data name="SetAsDefaultInfoBar.Message" xml:space="preserve">
+    <value>Windows Terminal can be set as the default terminal application in your settings.</value>
+  </data>
   <data name="InfoBarDismissButton.Content" xml:space="preserve">
     <value>Don't show again</value>
   </data>
   <data name="ElevationShield.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
     <value>This Terminal window is running as Admin</value>
   </data>
+  <data name="SetAsDefaultTip_OpenSettingsLink.Content" xml:space="preserve">
+    <value>Open Settings</value>
+    <comment>This is a call-to-action hyperlink; it will open the settings.</comment>
+  </data>
 </root>

src/cascadia/TerminalApp/TabManagement.cpp

@@ -19,6 +19,9 @@
 #include "ColorHelper.h"
 #include "DebugTapConnection.h"
 #include "SettingsTab.h"
+#include "..\TerminalSettingsModel\FileUtils.h"
+
+#include <shlobj.h>
 
 using namespace winrt;
 using namespace winrt::Windows::Foundation::Collections;
@@ -65,7 +68,7 @@ namespace winrt::TerminalApp::implementation
         const auto profile{ _settings.GetProfileForArgs(newTerminalArgs) };
         const auto settings{ TerminalSettings::CreateWithNewTerminalArgs(_settings, newTerminalArgs, *_bindings) };
 
-        _CreateNewTabWithProfileAndSettings(profile, settings, existingConnection);
+        _CreateNewTabFromPane(_MakePane(newTerminalArgs, false, existingConnection));
 
         const uint32_t tabCount = _tabs.Size();
         const bool usedManualProfile = (newTerminalArgs != nullptr) &&
@@ -241,58 +244,6 @@ namespace winrt::TerminalApp::implementation
         _InitializeTab(newTabImpl);
     }
 
-    // Method Description:
-    // - Creates a new tab with the given settings. If the tab bar is not being
-    //      currently displayed, it will be shown.
-    // Arguments:
-    // - profile: profile settings for this connection
-    // - settings: the TerminalSettings object to use to create the TerminalControl with.
-    // - existingConnection: optionally receives a connection from the outside world instead of attempting to create one
-    void TerminalPage::_CreateNewTabWithProfileAndSettings(const Profile& profile, const TerminalSettingsCreateResult& settings, TerminalConnection::ITerminalConnection existingConnection)
-    {
-        // Initialize the new tab
-        // Create a connection based on the values in our settings object if we weren't given one.
-        auto connection = existingConnection ? existingConnection : _CreateConnectionFromSettings(profile, settings.DefaultSettings());
-
-        // If we had an `existingConnection`, then this is an inbound handoff from somewhere else.
-        // We need to tell it about our size information so it can match the dimensions of what
-        // we are about to present.
-        if (existingConnection)
-        {
-            connection.Resize(settings.DefaultSettings().InitialRows(), settings.DefaultSettings().InitialCols());
-        }
-
-        TerminalConnection::ITerminalConnection debugConnection{ nullptr };
-        if (_settings.GlobalSettings().DebugFeaturesEnabled())
-        {
-            const CoreWindow window = CoreWindow::GetForCurrentThread();
-            const auto rAltState = window.GetKeyState(VirtualKey::RightMenu);
-            const auto lAltState = window.GetKeyState(VirtualKey::LeftMenu);
-            const bool bothAltsPressed = WI_IsFlagSet(lAltState, CoreVirtualKeyStates::Down) &&
-                                         WI_IsFlagSet(rAltState, CoreVirtualKeyStates::Down);
-            if (bothAltsPressed)
-            {
-                std::tie(connection, debugConnection) = OpenDebugTapConnection(connection);
-            }
-        }
-
-        // Give term control a child of the settings so that any overrides go in the child
-        // This way, when we do a settings reload we just update the parent and the overrides remain
-        auto term = _InitControl(settings, connection);
-
-        auto newTabImpl = winrt::make_self<TerminalTab>(profile, term);
-        _RegisterTerminalEvents(term);
-        _InitializeTab(newTabImpl);
-
-        if (debugConnection) // this will only be set if global debugging is on and tap is active
-        {
-            auto newControl = _InitControl(settings, debugConnection);
-            _RegisterTerminalEvents(newControl);
-            // Split (auto) with the debug tap.
-            newTabImpl->SplitPane(SplitDirection::Automatic, 0.5f, profile, newControl);
-        }
-    }
-
     // Method Description:
     // - Get the icon of the currently focused terminal control, and set its
     //   tab's icon to that icon.
@@ -362,28 +313,14 @@ namespace winrt::TerminalApp::implementation
             // In the future, it may be preferable to just duplicate the
             // current control's live settings (which will include changes
             // made through VT).
+            _CreateNewTabFromPane(_MakePane(nullptr, true, nullptr));
 
-            if (auto profile = tab.GetFocusedProfile())
+            const auto runtimeTabText{ tab.GetTabText() };
+            if (!runtimeTabText.empty())
             {
-                // TODO GH#5047 If we cache the NewTerminalArgs, we no longer need to do this.
-                profile = GetClosestProfileForDuplicationOfProfile(profile);
-                const auto settingsCreateResult{ TerminalSettings::CreateWithProfile(_settings, profile, *_bindings) };
-                const auto workingDirectory = tab.GetActiveTerminalControl().WorkingDirectory();
-                const auto validWorkingDirectory = !workingDirectory.empty();
-                if (validWorkingDirectory)
+                if (auto newTab{ _GetFocusedTabImpl() })
                 {
-                    settingsCreateResult.DefaultSettings().StartingDirectory(workingDirectory);
-                }
-
-                _CreateNewTabWithProfileAndSettings(profile, settingsCreateResult);
-
-                const auto runtimeTabText{ tab.GetTabText() };
-                if (!runtimeTabText.empty())
-                {
-                    if (auto newTab{ _GetFocusedTabImpl() })
-                    {
-                        newTab->SetTabText(runtimeTabText);
-                    }
+                    newTab->SetTabText(runtimeTabText);
                 }
             }
         }
@@ -399,7 +336,7 @@ namespace winrt::TerminalApp::implementation
         try
         {
             _SetFocusedTab(tab);
-            _SplitPane(tab, SplitDirection::Automatic, SplitType::Duplicate);
+            _SplitPane(tab, SplitDirection::Automatic, 0.5f, _MakePane(nullptr, true));
         }
         CATCH_LOG();
     }
@@ -410,33 +347,45 @@ namespace winrt::TerminalApp::implementation
     // - tab: tab to export
     winrt::fire_and_forget TerminalPage::_ExportTab(const TerminalTab& tab)
     {
+        // This will be used to set up the file picker "filter", to select .txt
+        // files by default.
+        static constexpr COMDLG_FILTERSPEC supportedFileTypes[] = {
+            { L"Text Files (*.txt)", L"*.txt" },
+            { L"All Files (*.*)", L"*.*" }
+        };
+        // An arbitrary GUID to associate with all instances of this
+        // dialog, so they all re-open in the same path as they were
+        // open before:
+        static constexpr winrt::guid clientGuidExportFile{ 0xF6AF20BB, 0x0800, 0x48E6, { 0xB0, 0x17, 0xA1, 0x4C, 0xD8, 0x73, 0xDD, 0x58 } };
+
         try
         {
             if (const auto control{ tab.GetActiveTerminalControl() })
             {
-                const FileSavePicker savePicker;
-                savePicker.as<IInitializeWithWindow>()->Initialize(*_hostingHwnd);
-                savePicker.SuggestedStartLocation(PickerLocationId::Downloads);
-                const auto fileChoices = single_threaded_vector<hstring>({ L".txt" });
-                savePicker.FileTypeChoices().Insert(RS_(L"PlainText"), fileChoices);
-                savePicker.SuggestedFileName(control.Title());
+                // GH#11356 - we can't use the UWP apis for writing the file,
+                // because they don't work elevated (shocker) So just use the
+                // shell32 file picker manually.
+                auto path = co_await SaveFilePicker(*_hostingHwnd, [control](auto&& dialog) {
+                    THROW_IF_FAILED(dialog->SetClientGuid(clientGuidExportFile));
+                    try
+                    {
+                        // Default to the Downloads folder
+                        auto folderShellItem{ winrt::capture<IShellItem>(&SHGetKnownFolderItem, FOLDERID_Downloads, KF_FLAG_DEFAULT, nullptr) };
+                        dialog->SetDefaultFolder(folderShellItem.get());
+                    }
+                    CATCH_LOG(); // non-fatal
+                    THROW_IF_FAILED(dialog->SetFileTypes(ARRAYSIZE(supportedFileTypes), supportedFileTypes));
+                    THROW_IF_FAILED(dialog->SetFileTypeIndex(1)); // the array is 1-indexed
+                    THROW_IF_FAILED(dialog->SetDefaultExtension(L"txt"));
 
-                const StorageFile file = co_await savePicker.PickSaveFileAsync();
-                if (file != nullptr)
+                    // Default to using the tab title as the file name
+                    THROW_IF_FAILED(dialog->SetFileName((control.Title() + L".txt").c_str()));
+                });
+
+                if (!path.empty())
                 {
                     const auto buffer = control.ReadEntireBuffer();
-                    CachedFileManager::DeferUpdates(file);
-                    co_await FileIO::WriteTextAsync(file, buffer);
-                    const auto status = co_await CachedFileManager::CompleteUpdatesAsync(file);
-                    switch (status)
-                    {
-                    case FileUpdateStatus::Complete:
-                    case FileUpdateStatus::CompleteAndRenamed:
-                        _ShowControlNoticeDialog(RS_(L"NoticeInfo"), RS_(L"ExportSuccess"));
-                        break;
-                    default:
-                        _ShowControlNoticeDialog(RS_(L"NoticeError"), RS_(L"ExportFailure"));
-                    }
+                    CascadiaSettings::ExportFile(path, buffer);
                 }
             }
         }
@@ -501,7 +450,9 @@ namespace winrt::TerminalApp::implementation
         {
             // If we are supposed to save state, make sure we clear it out
             // if the user manually closed all tabs.
-            if (!_maintainStateOnTabClose && ShouldUsePersistedLayout(_settings))
+            // Do this only if we are the last window; the monarch will notice
+            // we are missing and remove us that way otherwise.
+            if (!_maintainStateOnTabClose && ShouldUsePersistedLayout(_settings) && _numOpenWindows == 1)
             {
                 auto state = ApplicationState::SharedInstance();
                 state.PersistedWindowLayouts(nullptr);
@@ -734,31 +685,32 @@ namespace winrt::TerminalApp::implementation
         {
             _UnZoomIfNeeded();
 
-            auto pane = terminalTab->GetActivePane();
-
             if (const auto pane{ terminalTab->GetActivePane() })
             {
-                if (const auto control{ pane->GetTerminalControl() })
+                if (pane->ContainsReadOnly())
                 {
-                    if (control.ReadOnly())
+                    ContentDialogResult warningResult = co_await _ShowCloseReadOnlyDialog();
+
+                    // If the user didn't explicitly click on close tab - leave
+                    if (warningResult != ContentDialogResult::Primary)
                     {
-                        ContentDialogResult warningResult = co_await _ShowCloseReadOnlyDialog();
-
-                        // If the user didn't explicitly click on close tab - leave
-                        if (warningResult != ContentDialogResult::Primary)
-                        {
-                            co_return;
-                        }
-
-                        // Clean read-only mode to prevent additional prompt if closing the pane triggers closing of a hosting tab
-                        if (control.ReadOnly())
-                        {
-                            control.ToggleReadOnly();
-                        }
+                        co_return;
                     }
 
-                    pane->Close();
+                    // Clean read-only mode to prevent additional prompt if closing the pane triggers closing of a hosting tab
+                    pane->WalkTree([](auto p) {
+                        if (const auto control{ p->GetTerminalControl() })
+                        {
+                            if (control.ReadOnly())
+                            {
+                                control.ToggleReadOnly();
+                            }
+                        }
+                        return false;
+                    });
                 }
+
+                pane->Close();
             }
         }
         else if (auto index{ _GetFocusedTabIndex() })

src/cascadia/TerminalApp/TabRowControl.xaml

@@ -23,7 +23,7 @@
         <mux:TabView.TabStripHeader>
             <!--  EA18 is the "Shield" glyph  -->
             <FontIcon x:Uid="ElevationShield"
-                      Margin="9,4,0,0"
+                      Margin="9,4,0,4"
                       FontFamily="Segoe MDL2 Assets"
                       FontSize="16"
                       Foreground="{ThemeResource SystemControlForegroundBaseMediumBrush}"

src/cascadia/TerminalApp/TerminalAppLib.vcxproj

@@ -318,7 +318,29 @@
     </ProjectReference>
     <!-- For whatever reason, we can't include the TerminalControl and
     TerminalSettings projects' winmds via project references. So we'll have to
-    manually include the winmds as References below -->
+    manually include the winmds as References below
+
+    BODGY: we do need to add a ProjectReference to TerminalControl.vcxproj,
+    with Private=true, ReferenceOutputAssembly=false, so that Visual Studio's
+    "Fast Up-to-date Check" will work with this project. If we don't, the Fast
+    Up-to-date Check will look for the .xaml files from that project in our
+    output, which won't actually be there.
+
+    We do still need to separately reference the winmds manually below, which is annoying.
+    -->
+    <ProjectReference Include="$(OpenConsoleDir)src\cascadia\TerminalControl\dll\TerminalControl.vcxproj">
+      <!-- Private:true and ReferenceOutputAssembly:false, in combination with
+      the manual reference to TerminalControl.winmd below make sure that this
+      project will compile correct, and that we won't roll up the TermControl
+      xbf's into the packaging project twice. -->
+      <Private>true</Private>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="$(OpenConsoleDir)src\cascadia\TerminalSettingsEditor\Microsoft.Terminal.Settings.Editor.vcxproj">
+      <Private>true</Private>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+
   </ItemGroup>
   <PropertyGroup>
     <!-- This is a hack to get the ARM64 CI build working. See

src/cascadia/TerminalApp/TerminalPage.cpp

@@ -3,38 +3,38 @@
 
 #include "pch.h"
 #include "TerminalPage.h"
-#include "Utils.h"
-#include "../../types/inc/utils.hpp"
+#include "TerminalPage.g.cpp"
+#include "RenameWindowRequestedArgs.g.cpp"
 
 #include <filesystem>
+
+#include <inc/WindowingBehavior.h>
 #include <LibraryResources.h>
+#include <TerminalCore/ControlKeyStates.hpp>
+#include <til/latch.h>
 
-#include "TerminalPage.g.cpp"
-#include <winrt/Windows.Storage.h>
-
-#include "TabRowControl.h"
+#include "../../types/inc/utils.hpp"
 #include "ColorHelper.h"
 #include "DebugTapConnection.h"
 #include "SettingsTab.h"
-#include "RenameWindowRequestedArgs.g.cpp"
-#include "../inc/WindowingBehavior.h"
-
-#include <til/latch.h>
+#include "TabRowControl.h"
 
 using namespace winrt;
-using namespace winrt::Windows::Foundation::Collections;
-using namespace winrt::Windows::UI::Xaml;
-using namespace winrt::Windows::UI::Xaml::Controls;
-using namespace winrt::Windows::UI::Core;
-using namespace winrt::Windows::System;
-using namespace winrt::Windows::ApplicationModel::DataTransfer;
-using namespace winrt::Windows::UI::Text;
-using namespace winrt::Microsoft::Terminal;
 using namespace winrt::Microsoft::Terminal::Control;
-using namespace winrt::Microsoft::Terminal::TerminalConnection;
 using namespace winrt::Microsoft::Terminal::Settings::Model;
+using namespace winrt::Microsoft::Terminal::TerminalConnection;
+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::Core;
+using namespace winrt::Windows::UI::Text;
+using namespace winrt::Windows::UI::Xaml::Controls;
+using namespace winrt::Windows::UI::Xaml;
 using namespace ::TerminalApp;
 using namespace ::Microsoft::Console;
+using namespace ::Microsoft::Terminal::Core;
 using namespace std::chrono_literals;
 
 #define HOOKUP_ACTION(action) _actionDispatch->action({ this, &TerminalPage::_Handle##action });
@@ -218,7 +218,7 @@ namespace winrt::TerminalApp::implementation
         _RegisterActionCallbacks();
 
         // Hook up inbound connection event handler
-        TerminalConnection::ConptyConnection::NewConnection({ this, &TerminalPage::_OnNewConnection });
+        ConptyConnection::NewConnection({ this, &TerminalPage::_OnNewConnection });
 
         //Event Bindings (Early)
         _newTabButton.Click([weakThis{ get_weak() }](auto&&, auto&&) {
@@ -287,6 +287,8 @@ namespace winrt::TerminalApp::implementation
             _defaultPointerCursor = CoreWindow::GetForCurrentThread().PointerCursor();
         }
         CATCH_LOG();
+
+        ShowSetAsDefaultInfoBar();
     }
 
     // Method Description;
@@ -298,10 +300,34 @@ namespace winrt::TerminalApp::implementation
     // - true if the ApplicationState should be used.
     bool TerminalPage::ShouldUsePersistedLayout(CascadiaSettings& settings) const
     {
-        // If the setting is enabled, and we are the only window.
         return Feature_PersistedWindowLayout::IsEnabled() &&
-               settings.GlobalSettings().FirstWindowPreference() == FirstWindowPreference::PersistedWindowLayout &&
-               _numOpenWindows == 1;
+               settings.GlobalSettings().FirstWindowPreference() == FirstWindowPreference::PersistedWindowLayout;
+    }
+
+    // Method Description;
+    // - Checks if the current window is configured to load a particular layout
+    // Arguments:
+    // - settings: The settings to use as this may be called before the page is
+    //   fully initialized.
+    // Return Value:
+    // - non-null if there is a particular saved layout to use
+    std::optional<uint32_t> TerminalPage::LoadPersistedLayoutIdx(CascadiaSettings& settings) const
+    {
+        return ShouldUsePersistedLayout(settings) ? _loadFromPersistedLayoutIdx : std::nullopt;
+    }
+
+    WindowLayout TerminalPage::LoadPersistedLayout(CascadiaSettings& settings) const
+    {
+        if (const auto idx = LoadPersistedLayoutIdx(settings))
+        {
+            const auto i = idx.value();
+            const auto layouts = ApplicationState::SharedInstance().PersistedWindowLayouts();
+            if (layouts && layouts.Size() > i)
+            {
+                return layouts.GetAt(i);
+            }
+        }
+        return nullptr;
     }
 
     winrt::fire_and_forget TerminalPage::NewTerminalByDrop(winrt::Windows::UI::Xaml::DragEventArgs& e)
@@ -387,30 +413,13 @@ namespace winrt::TerminalApp::implementation
         {
             _startupState = StartupState::InStartup;
 
-            // If the user selected to save their tab layout, we are the first
-            // window opened, and wt was not run with any other arguments, then
-            // we should use the saved settings.
-            auto firstActionIsDefault = [](ActionAndArgs action) {
-                if (action.Action() != ShortcutAction::NewTab)
-                {
-                    return false;
-                }
-
-                // If no commands were given, we will have default args
-                if (const auto args = action.Args().try_as<NewTabArgs>())
-                {
-                    NewTerminalArgs defaultArgs{};
-                    return args.TerminalArgs() == nullptr || args.TerminalArgs().Equals(defaultArgs);
-                }
-
-                return false;
-            };
-            if (ShouldUsePersistedLayout(_settings) && _startupActions.Size() == 1 && firstActionIsDefault(_startupActions.GetAt(0)))
+            // If we are provided with an index, the cases where we have
+            // commandline args and startup actions are already handled.
+            if (const auto layout = LoadPersistedLayout(_settings))
             {
-                auto layouts = ApplicationState::SharedInstance().PersistedWindowLayouts();
-                if (layouts && layouts.Size() > 0 && layouts.GetAt(0).TabLayout() && layouts.GetAt(0).TabLayout().Size() > 0)
+                if (layout.TabLayout().Size() > 0)
                 {
-                    _startupActions = layouts.GetAt(0).TabLayout();
+                    _startupActions = layout.TabLayout();
                 }
             }
 
@@ -838,14 +847,7 @@ namespace winrt::TerminalApp::implementation
                         WI_IsFlagSet(lAltState, CoreVirtualKeyStates::Down) &&
                         WI_IsFlagSet(rAltState, CoreVirtualKeyStates::Down);
 
-        if (altPressed && !debugTap)
-        {
-            this->_SplitPane(SplitDirection::Automatic,
-                             SplitType::Manual,
-                             0.5f,
-                             newTerminalArgs);
-        }
-        else if (shiftPressed && !debugTap)
+        if (shiftPressed && !debugTap)
         {
             // Manually fill in the evaluated profile.
             if (newTerminalArgs.ProfileIndex() != nullptr)
@@ -861,7 +863,17 @@ namespace winrt::TerminalApp::implementation
         }
         else
         {
-            LOG_IF_FAILED(this->_OpenNewTab(newTerminalArgs));
+            const auto newPane = _MakePane(newTerminalArgs);
+            if (altPressed && !debugTap)
+            {
+                this->_SplitPane(SplitDirection::Automatic,
+                                 0.5f,
+                                 newPane);
+            }
+            else
+            {
+                _CreateNewTabFromPane(newPane);
+            }
         }
     }
 
@@ -1026,29 +1038,153 @@ namespace winrt::TerminalApp::implementation
     }
 
     // Method Description:
-    // Called when the users pressed keyBindings while CommandPalette is open.
+    // - Called when the users pressed keyBindings while CommandPalette is open.
+    // - This method is effectively an extract of TermControl::_KeyHandler and TermControl::_TryHandleKeyBinding.
     // Arguments:
     // - e: the KeyRoutedEventArgs containing info about the keystroke.
     // Return Value:
     // - <none>
     void TerminalPage::_KeyDownHandler(Windows::Foundation::IInspectable const& /*sender*/, Windows::UI::Xaml::Input::KeyRoutedEventArgs const& e)
     {
-        const auto key = e.OriginalKey();
-        const auto scanCode = e.KeyStatus().ScanCode;
-        const auto coreWindow = CoreWindow::GetForCurrentThread();
-        const auto ctrlDown = WI_IsFlagSet(coreWindow.GetKeyState(winrt::Windows::System::VirtualKey::Control), CoreVirtualKeyStates::Down);
-        const auto altDown = WI_IsFlagSet(coreWindow.GetKeyState(winrt::Windows::System::VirtualKey::Menu), CoreVirtualKeyStates::Down);
-        const auto shiftDown = WI_IsFlagSet(coreWindow.GetKeyState(winrt::Windows::System::VirtualKey::Shift), CoreVirtualKeyStates::Down);
+        const auto keyStatus = e.KeyStatus();
+        const auto vkey = gsl::narrow_cast<WORD>(e.OriginalKey());
+        const auto scanCode = gsl::narrow_cast<WORD>(keyStatus.ScanCode);
+        const auto modifiers = _GetPressedModifierKeys();
 
-        winrt::Microsoft::Terminal::Control::KeyChord kc{ ctrlDown, altDown, shiftDown, false, static_cast<int32_t>(key), static_cast<int32_t>(scanCode) };
-        if (const auto cmd{ _settings.ActionMap().GetActionByKeyChord(kc) })
+        // GH#11076:
+        // For some weird reason we sometimes receive a WM_KEYDOWN
+        // message without vkey or scanCode if a user drags a tab.
+        // The KeyChord constructor has a debug assertion ensuring that all KeyChord
+        // either have a valid vkey/scanCode. This is important, because this prevents
+        // accidential insertion of invalid KeyChords into classes like ActionMap.
+        if (!vkey && !scanCode)
         {
-            if (CommandPalette().Visibility() == Visibility::Visible && cmd.ActionAndArgs().Action() != ShortcutAction::ToggleCommandPalette)
+            return;
+        }
+
+        // Alt-Numpad# input will send us a character once the user releases
+        // Alt, so we should be ignoring the individual keydowns. The character
+        // will be sent through the TSFInputControl. See GH#1401 for more
+        // details
+        if (modifiers.IsAltPressed() && (vkey >= VK_NUMPAD0 && vkey <= VK_NUMPAD9))
+        {
+            return;
+        }
+
+        // GH#2235: Terminal::Settings hasn't been modified to differentiate
+        // between AltGr and Ctrl+Alt yet.
+        // -> Don't check for key bindings if this is an AltGr key combination.
+        if (modifiers.IsAltGrPressed())
+        {
+            return;
+        }
+
+        const auto actionMap = _settings.ActionMap();
+        if (!actionMap)
+        {
+            return;
+        }
+
+        const auto cmd = actionMap.GetActionByKeyChord({
+            modifiers.IsCtrlPressed(),
+            modifiers.IsAltPressed(),
+            modifiers.IsShiftPressed(),
+            modifiers.IsWinPressed(),
+            vkey,
+            scanCode,
+        });
+        if (!cmd)
+        {
+            return;
+        }
+
+        if (!_actionDispatch->DoAction(cmd.ActionAndArgs()))
+        {
+            return;
+        }
+
+        if (const auto p = CommandPalette(); p.Visibility() == Visibility::Visible && cmd.ActionAndArgs().Action() != ShortcutAction::ToggleCommandPalette)
+        {
+            p.Visibility(Visibility::Collapsed);
+        }
+
+        // Let's assume the user has bound the dead key "^" to a sendInput command that sends "b".
+        // If the user presses the two keys "^a" it'll produce "bâ", despite us marking the key event as handled.
+        // The following is used to manually "consume" such dead keys and clear them from the keyboard state.
+        _ClearKeyboardState(vkey, scanCode);
+        e.Handled(true);
+    }
+
+    // Method Description:
+    // - Get the modifier keys that are currently pressed. This can be used to
+    //   find out which modifiers (ctrl, alt, shift) are pressed in events that
+    //   don't necessarily include that state.
+    // - This is a copy of TermControl::_GetPressedModifierKeys.
+    // Return Value:
+    // - The Microsoft::Terminal::Core::ControlKeyStates representing the modifier key states.
+    ControlKeyStates TerminalPage::_GetPressedModifierKeys() noexcept
+    {
+        const CoreWindow window = CoreWindow::GetForCurrentThread();
+        // DONT USE
+        //      != CoreVirtualKeyStates::None
+        // OR
+        //      == CoreVirtualKeyStates::Down
+        // Sometimes with the key down, the state is Down | Locked.
+        // Sometimes with the key up, the state is Locked.
+        // IsFlagSet(Down) is the only correct solution.
+
+        struct KeyModifier
+        {
+            VirtualKey vkey;
+            ControlKeyStates flags;
+        };
+
+        constexpr std::array<KeyModifier, 7> modifiers{ {
+            { VirtualKey::RightMenu, ControlKeyStates::RightAltPressed },
+            { VirtualKey::LeftMenu, ControlKeyStates::LeftAltPressed },
+            { VirtualKey::RightControl, ControlKeyStates::RightCtrlPressed },
+            { VirtualKey::LeftControl, ControlKeyStates::LeftCtrlPressed },
+            { VirtualKey::Shift, ControlKeyStates::ShiftPressed },
+            { VirtualKey::RightWindows, ControlKeyStates::RightWinPressed },
+            { VirtualKey::LeftWindows, ControlKeyStates::LeftWinPressed },
+        } };
+
+        ControlKeyStates flags;
+
+        for (const auto& mod : modifiers)
+        {
+            const auto state = window.GetKeyState(mod.vkey);
+            const auto isDown = WI_IsFlagSet(state, CoreVirtualKeyStates::Down);
+
+            if (isDown)
             {
-                CommandPalette().Visibility(Visibility::Collapsed);
+                flags |= mod.flags;
             }
-            _actionDispatch->DoAction(cmd.ActionAndArgs());
-            e.Handled(true);
+        }
+
+        return flags;
+    }
+
+    // Method Description:
+    // - Discards currently pressed dead keys.
+    // - This is a copy of TermControl::_ClearKeyboardState.
+    // Arguments:
+    // - vkey: The vkey of the key pressed.
+    // - scanCode: The scan code of the key pressed.
+    void TerminalPage::_ClearKeyboardState(const WORD vkey, const WORD scanCode) noexcept
+    {
+        std::array<BYTE, 256> keyState;
+        if (!GetKeyboardState(keyState.data()))
+        {
+            return;
+        }
+
+        // As described in "Sometimes you *want* to interfere with the keyboard's state buffer":
+        //   http://archives.miloush.net/michkap/archive/2006/09/10/748775.html
+        // > "The key here is to keep trying to pass stuff to ToUnicode until -1 is not returned."
+        std::array<wchar_t, 16> buffer;
+        while (ToUnicodeEx(vkey, scanCode, keyState.data(), buffer.data(), gsl::narrow_cast<int>(buffer.size()), 0b1, nullptr) < 0)
+        {
         }
     }
 
@@ -1289,12 +1425,19 @@ namespace winrt::TerminalApp::implementation
 
     // Method Description:
     // - Saves the window position and tab layout to the application state
+    // - This does not create the InitialPosition field, that needs to be
+    //   added externally.
     // Arguments:
     // - <none>
     // Return Value:
-    // - <none>
-    void TerminalPage::PersistWindowLayout()
+    // - the window layout
+    WindowLayout TerminalPage::GetWindowLayout()
     {
+        if (_startupState != StartupState::Initialized)
+        {
+            return nullptr;
+        }
+
         std::vector<ActionAndArgs> actions;
 
         for (auto tab : _tabs)
@@ -1302,7 +1445,7 @@ namespace winrt::TerminalApp::implementation
             if (auto terminalTab = _GetTerminalTabImpl(tab))
             {
                 auto tabActions = terminalTab->BuildStartupActions();
-                actions.insert(actions.end(), tabActions.begin(), tabActions.end());
+                actions.insert(actions.end(), std::make_move_iterator(tabActions.begin()), std::make_move_iterator(tabActions.end()));
             }
             else if (tab.try_as<SettingsTab>())
             {
@@ -1311,7 +1454,7 @@ namespace winrt::TerminalApp::implementation
                 OpenSettingsArgs args{ SettingsTarget::SettingsUI };
                 action.Args(args);
 
-                actions.push_back(action);
+                actions.emplace_back(std::move(action));
             }
         }
 
@@ -1324,7 +1467,18 @@ namespace winrt::TerminalApp::implementation
             SwitchToTabArgs switchToTabArgs{ idx.value() };
             action.Args(switchToTabArgs);
 
-            actions.push_back(action);
+            actions.emplace_back(std::move(action));
+        }
+
+        // If the user set a custom name, save it
+        if (_WindowName != L"")
+        {
+            ActionAndArgs action;
+            action.Action(ShortcutAction::RenameWindow);
+            RenameWindowArgs args{ _WindowName };
+            action.Args(args);
+
+            actions.emplace_back(std::move(action));
         }
 
         WindowLayout layout{};
@@ -1337,33 +1491,7 @@ namespace winrt::TerminalApp::implementation
 
         layout.InitialSize(windowSize);
 
-        if (_hostingHwnd)
-        {
-            // Get the position of the current window. This includes the
-            // non-client already.
-            RECT window{};
-            GetWindowRect(_hostingHwnd.value(), &window);
-
-            // We want to remove the non-client area so calculate that.
-            // We don't have access to the (NonClient)IslandWindow directly so
-            // just replicate the logic.
-            const auto windowStyle = static_cast<DWORD>(GetWindowLong(_hostingHwnd.value(), GWL_STYLE));
-
-            auto dpi = GetDpiForWindow(_hostingHwnd.value());
-            RECT nonClientArea{};
-            LOG_IF_WIN32_BOOL_FALSE(AdjustWindowRectExForDpi(&nonClientArea, windowStyle, false, 0, dpi));
-
-            // The nonClientArea adjustment is negative, so subtract that out.
-            // This way we save the user-visible location of the terminal.
-            LaunchPosition pos{};
-            pos.X = window.left - nonClientArea.left;
-            pos.Y = window.top;
-
-            layout.InitialPosition(pos);
-        }
-
-        auto state = ApplicationState::SharedInstance();
-        state.PersistedWindowLayouts(winrt::single_threaded_vector<WindowLayout>({ layout }));
+        return layout;
     }
 
     // Method Description:
@@ -1392,8 +1520,9 @@ namespace winrt::TerminalApp::implementation
 
         if (ShouldUsePersistedLayout(_settings))
         {
-            PersistWindowLayout();
-            // don't delete the ApplicationState when all of the tabs are removed.
+            // Don't delete the ApplicationState when all of the tabs are removed.
+            // If there is still a monarch living they will get the event that
+            // a window closed and trigger a new save without this window.
             _maintainStateOnTabClose = true;
         }
 
@@ -1480,18 +1609,15 @@ namespace winrt::TerminalApp::implementation
 
     // Method Description:
     // - Split the focused pane either horizontally or vertically, and place the
-    //   given TermControl into the newly created pane.
+    //   given pane accordingly in the tree
     // Arguments:
+    // - newPane: the pane to add to our tree of panes
     // - splitDirection: one value from the TerminalApp::SplitDirection enum, indicating how the
     //   new pane should be split from its parent.
-    // - splitMode: value from TerminalApp::SplitType enum, indicating the profile to be used in the newly split pane.
-    // - newTerminalArgs: An object that may contain a blob of parameters to
-    //   control which profile is created and with possible other
-    //   configurations. See CascadiaSettings::BuildSettings for more details.
+    // - splitSize: the size of the split
     void TerminalPage::_SplitPane(const SplitDirection splitDirection,
-                                  const SplitType splitMode,
                                   const float splitSize,
-                                  const NewTerminalArgs& newTerminalArgs)
+                                  std::shared_ptr<Pane> newPane)
     {
         const auto focusedTab{ _GetFocusedTabImpl() };
 
@@ -1501,101 +1627,52 @@ namespace winrt::TerminalApp::implementation
             return;
         }
 
-        _SplitPane(*focusedTab, splitDirection, splitMode, splitSize, newTerminalArgs);
+        _SplitPane(*focusedTab, splitDirection, splitSize, newPane);
     }
 
     // Method Description:
     // - Split the focused pane of the given tab, either horizontally or vertically, and place the
-    //   given TermControl into the newly created pane.
+    //   given pane accordingly
     // Arguments:
     // - tab: The tab that is going to be split.
+    // - newPane: the pane to add to our tree of panes
     // - splitDirection: one value from the TerminalApp::SplitDirection enum, indicating how the
     //   new pane should be split from its parent.
-    // - splitMode: value from TerminalApp::SplitType enum, indicating the profile to be used in the newly split pane.
-    // - newTerminalArgs: An object that may contain a blob of parameters to
-    //   control which profile is created and with possible other
-    //   configurations. See CascadiaSettings::BuildSettings for more details.
+    // - splitSize: the size of the split
     void TerminalPage::_SplitPane(TerminalTab& tab,
                                   const SplitDirection splitDirection,
-                                  const SplitType splitMode,
                                   const float splitSize,
-                                  const NewTerminalArgs& newTerminalArgs)
+                                  std::shared_ptr<Pane> newPane)
     {
-        try
+        const float contentWidth = ::base::saturated_cast<float>(_tabContent.ActualWidth());
+        const float contentHeight = ::base::saturated_cast<float>(_tabContent.ActualHeight());
+        const winrt::Windows::Foundation::Size availableSpace{ contentWidth, contentHeight };
+
+        auto realSplitType = splitDirection;
+        if (realSplitType == SplitDirection::Automatic)
         {
-            TerminalSettingsCreateResult controlSettings{ nullptr };
-            Profile profile{ nullptr };
+            realSplitType = tab.PreCalculateAutoSplit(availableSpace);
+        }
 
-            if (splitMode == SplitType::Duplicate)
+        const auto canSplit = tab.PreCalculateCanSplit(realSplitType, splitSize, availableSpace);
+        if (!canSplit)
+        {
+            return;
+        }
+
+        _UnZoomIfNeeded();
+        tab.SplitPane(realSplitType, splitSize, newPane);
+
+        // After GH#6586, the control will no longer focus itself
+        // automatically when it's finished being laid out. Manually focus
+        // the control here instead.
+        if (_startupState == StartupState::Initialized)
+        {
+            if (const auto control = _GetActiveControl())
             {
-                profile = tab.GetFocusedProfile();
-                if (profile)
-                {
-                    // TODO GH#5047 If we cache the NewTerminalArgs, we no longer need to do this.
-                    profile = GetClosestProfileForDuplicationOfProfile(profile);
-                    controlSettings = TerminalSettings::CreateWithProfile(_settings, profile, *_bindings);
-                    const auto workingDirectory = tab.GetActiveTerminalControl().WorkingDirectory();
-                    const auto validWorkingDirectory = !workingDirectory.empty();
-                    if (validWorkingDirectory)
-                    {
-                        controlSettings.DefaultSettings().StartingDirectory(workingDirectory);
-                    }
-                }
-                // TODO: GH#5047 - In the future, we should get the Profile of
-                // the focused pane, and use that to build a new instance of the
-                // settings so we can duplicate this tab/pane.
-                //
-                // Currently, if the profile doesn't exist anymore in our
-                // settings, we'll silently do nothing.
-                //
-                // In the future, it will be preferable to just duplicate the
-                // current control's settings, but we can't do that currently,
-                // because we won't be able to create a new instance of the
-                // connection without keeping an instance of the original Profile
-                // object around.
-            }
-            if (!profile)
-            {
-                profile = _settings.GetProfileForArgs(newTerminalArgs);
-                controlSettings = TerminalSettings::CreateWithNewTerminalArgs(_settings, newTerminalArgs, *_bindings);
-            }
-
-            const auto controlConnection = _CreateConnectionFromSettings(profile, controlSettings.DefaultSettings());
-
-            const float contentWidth = ::base::saturated_cast<float>(_tabContent.ActualWidth());
-            const float contentHeight = ::base::saturated_cast<float>(_tabContent.ActualHeight());
-            const winrt::Windows::Foundation::Size availableSpace{ contentWidth, contentHeight };
-
-            auto realSplitType = splitDirection;
-            if (realSplitType == SplitDirection::Automatic)
-            {
-                realSplitType = tab.PreCalculateAutoSplit(availableSpace);
-            }
-
-            const auto canSplit = tab.PreCalculateCanSplit(realSplitType, splitSize, availableSpace);
-            if (!canSplit)
-            {
-                return;
-            }
-
-            auto newControl = _InitControl(controlSettings, controlConnection);
-
-            // Hookup our event handlers to the new terminal
-            _RegisterTerminalEvents(newControl);
-
-            _UnZoomIfNeeded();
-
-            tab.SplitPane(realSplitType, splitSize, profile, newControl);
-
-            // After GH#6586, the control will no longer focus itself
-            // automatically when it's finished being laid out. Manually focus
-            // the control here instead.
-            if (_startupState == StartupState::Initialized)
-            {
-                _GetActiveControl().Focus(FocusState::Programmatic);
+                control.Focus(FocusState::Programmatic);
             }
         }
-        CATCH_LOG();
     }
 
     // Method Description:
@@ -1864,6 +1941,22 @@ namespace winrt::TerminalApp::implementation
                 }
             }
 
+            if (_settings.GlobalSettings().TrimPaste())
+            {
+                std::wstring_view textView{ text };
+                const auto pos = textView.find_last_not_of(L"\t\n\v\f\r ");
+                if (pos == textView.npos)
+                {
+                    // Text is all white space, nothing to paste
+                    co_return;
+                }
+                else if (const auto toRemove = textView.size() - 1 - pos; toRemove > 0)
+                {
+                    textView.remove_suffix(toRemove);
+                    text = { textView };
+                }
+            }
+
             bool warnMultiLine = _settings.GlobalSettings().WarnAboutMultiLinePaste();
             if (warnMultiLine)
             {
@@ -2087,7 +2180,7 @@ namespace winrt::TerminalApp::implementation
     {
         if (target == SettingsTarget::SettingsUI)
         {
-            _OpenSettingsUI();
+            OpenSettingsUI();
         }
         else
         {
@@ -2164,6 +2257,96 @@ namespace winrt::TerminalApp::implementation
         return term;
     }
 
+    // Method Description:
+    // - Creates a pane and returns a shared_ptr to it
+    // - The caller should handle where the pane goes after creation,
+    //   either to split an already existing pane or to create a new tab with it
+    // Arguments:
+    // - newTerminalArgs: an object that may contain a blob of parameters to
+    //   control which profile is created and with possible other
+    //   configurations. See CascadiaSettings::BuildSettings for more details.
+    // - duplicate: a boolean to indicate whether the pane we create should be
+    //   a duplicate of the currently focused pane
+    // - existingConnection: optionally receives a connection from the outside
+    //   world instead of attempting to create one
+    std::shared_ptr<Pane> TerminalPage::_MakePane(const NewTerminalArgs& newTerminalArgs, const bool duplicate, TerminalConnection::ITerminalConnection existingConnection)
+    {
+        TerminalSettingsCreateResult controlSettings{ nullptr };
+        Profile profile{ nullptr };
+
+        if (duplicate)
+        {
+            const auto focusedTab{ _GetFocusedTabImpl() };
+            if (focusedTab)
+            {
+                profile = focusedTab->GetFocusedProfile();
+                if (profile)
+                {
+                    // TODO GH#5047 If we cache the NewTerminalArgs, we no longer need to do this.
+                    profile = GetClosestProfileForDuplicationOfProfile(profile);
+                    controlSettings = TerminalSettings::CreateWithProfile(_settings, profile, *_bindings);
+                    const auto workingDirectory = focusedTab->GetActiveTerminalControl().WorkingDirectory();
+                    const auto validWorkingDirectory = !workingDirectory.empty();
+                    if (validWorkingDirectory)
+                    {
+                        controlSettings.DefaultSettings().StartingDirectory(workingDirectory);
+                    }
+                }
+            }
+        }
+        if (!profile)
+        {
+            profile = _settings.GetProfileForArgs(newTerminalArgs);
+            controlSettings = TerminalSettings::CreateWithNewTerminalArgs(_settings, newTerminalArgs, *_bindings);
+        }
+
+        auto connection = existingConnection ? existingConnection : _CreateConnectionFromSettings(profile, controlSettings.DefaultSettings());
+        if (existingConnection)
+        {
+            connection.Resize(controlSettings.DefaultSettings().InitialRows(), controlSettings.DefaultSettings().InitialCols());
+        }
+
+        TerminalConnection::ITerminalConnection debugConnection{ nullptr };
+        if (_settings.GlobalSettings().DebugFeaturesEnabled())
+        {
+            const CoreWindow window = CoreWindow::GetForCurrentThread();
+            const auto rAltState = window.GetKeyState(VirtualKey::RightMenu);
+            const auto lAltState = window.GetKeyState(VirtualKey::LeftMenu);
+            const bool bothAltsPressed = WI_IsFlagSet(lAltState, CoreVirtualKeyStates::Down) &&
+                                         WI_IsFlagSet(rAltState, CoreVirtualKeyStates::Down);
+            if (bothAltsPressed)
+            {
+                std::tie(connection, debugConnection) = OpenDebugTapConnection(connection);
+            }
+        }
+
+        const auto control = _InitControl(controlSettings, connection);
+        _RegisterTerminalEvents(control);
+
+        auto resultPane = std::make_shared<Pane>(profile, control);
+
+        if (debugConnection) // this will only be set if global debugging is on and tap is active
+        {
+            auto newControl = _InitControl(controlSettings, debugConnection);
+            _RegisterTerminalEvents(newControl);
+            // Split (auto) with the debug tap.
+            auto debugPane = std::make_shared<Pane>(profile, newControl);
+
+            // Since we're doing this split directly on the pane (instead of going through TerminalTab,
+            // we need to handle the panes 'active' states
+
+            // Set the pane we're splitting to active (otherwise Split will not do anything)
+            resultPane->SetActive();
+            auto [original, _] = resultPane->Split(SplitDirection::Automatic, 0.5f, debugPane);
+
+            // Set the non-debug pane as active
+            resultPane->ClearActive();
+            original->SetActive();
+        }
+
+        return resultPane;
+    }
+
     // Method Description:
     // - Hook up keybindings, and refresh the UI of the terminal.
     //   This includes update the settings of all the tabs according
@@ -2473,9 +2656,7 @@ namespace winrt::TerminalApp::implementation
     // - <none>
     void TerminalPage::ToggleFullscreen()
     {
-        _isFullscreen = !_isFullscreen;
-        _UpdateTabView();
-        _FullscreenChangedHandlers(*this, nullptr);
+        SetFullscreen(!_isFullscreen);
     }
 
     // Method Description:
@@ -2692,52 +2873,51 @@ namespace winrt::TerminalApp::implementation
         return _isAlwaysOnTop;
     }
 
-    HRESULT TerminalPage::_OnNewConnection(winrt::Microsoft::Terminal::TerminalConnection::ITerminalConnection connection)
+    void TerminalPage::SetFullscreen(bool newFullscreen)
+    {
+        if (_isFullscreen == newFullscreen)
+        {
+            return;
+        }
+        _isFullscreen = newFullscreen;
+        _UpdateTabView();
+        _FullscreenChangedHandlers(*this, nullptr);
+    }
+
+    HRESULT TerminalPage::_OnNewConnection(const ConptyConnection& connection)
     {
         // We need to be on the UI thread in order for _OpenNewTab to run successfully.
         // HasThreadAccess will return true if we're currently on a UI thread and false otherwise.
         // When we're on a COM thread, we'll need to dispatch the calls to the UI thread
         // and wait on it hence the locking mechanism.
-        if (Dispatcher().HasThreadAccess())
-        {
-            try
-            {
-                NewTerminalArgs newTerminalArgs{};
-                // TODO GH#10952: When we pass the actual commandline (or originating application), the
-                // settings model can choose the right settings based on command matching, or synthesize
-                // a profile from the registry/link settings (TODO GH#9458).
-                // TODO GH#9458: Get and pass the LNK/EXE filenames.
-                // Passing in a commandline forces GetProfileForArgs to use Base Layer instead of Default Profile;
-                // in the future, it can make a better decision based on the value we pull out of the process handle.
-                // TODO GH#5047: When we hang on to the N.T.A., try not to spawn "default... .exe" :)
-                newTerminalArgs.Commandline(L"default-terminal-invocation-placeholder");
-                const auto profile{ _settings.GetProfileForArgs(newTerminalArgs) };
-                const auto settings{ TerminalSettings::CreateWithProfile(_settings, profile, *_bindings) };
-
-                _CreateNewTabWithProfileAndSettings(profile, settings, connection);
-
-                // Request a summon of this window to the foreground
-                _SummonWindowRequestedHandlers(*this, nullptr);
-            }
-            CATCH_RETURN();
-
-            return S_OK;
-        }
-        else
+        if (!Dispatcher().HasThreadAccess())
         {
             til::latch latch{ 1 };
             HRESULT finalVal = S_OK;
 
             Dispatcher().RunAsync(CoreDispatcherPriority::Normal, [&]() {
-                // Re-running ourselves under the dispatcher will cause us to take the first branch above.
                 finalVal = _OnNewConnection(connection);
-
                 latch.count_down();
             });
 
             latch.wait();
             return finalVal;
         }
+
+        try
+        {
+            NewTerminalArgs newTerminalArgs;
+            newTerminalArgs.Commandline(connection.Commandline());
+            const auto profile{ _settings.GetProfileForArgs(newTerminalArgs) };
+            const auto settings{ TerminalSettings::CreateWithProfile(_settings, profile, *_bindings) };
+
+            _CreateNewTabFromPane(_MakePane(newTerminalArgs, false, connection));
+
+            // Request a summon of this window to the foreground
+            _SummonWindowRequestedHandlers(*this, nullptr);
+            return S_OK;
+        }
+        CATCH_RETURN()
     }
 
     // Method Description:
@@ -2747,7 +2927,7 @@ namespace winrt::TerminalApp::implementation
     // - <none>
     // Return Value:
     // - <none>
-    void TerminalPage::_OpenSettingsUI()
+    void TerminalPage::OpenSettingsUI()
     {
         // If we're holding the settings tab's switch command, don't create a new one, switch to the existing one.
         if (!_settingsTab)
@@ -2890,6 +3070,30 @@ namespace winrt::TerminalApp::implementation
         }
     }
 
+    // Method Description:
+    // - Displays a info popup guiding the user into setting their default terminal.
+    void TerminalPage::ShowSetAsDefaultInfoBar() const
+    {
+        if (!CascadiaSettings::IsDefaultTerminalAvailable() || _IsMessageDismissed(InfoBarMessage::SetAsDefault))
+        {
+            return;
+        }
+
+        // If the user has already configured any terminal for hand-off we
+        // shouldn't inform them again about the possibility to do so.
+        if (CascadiaSettings::IsDefaultTerminalSet())
+        {
+            _DismissMessage(InfoBarMessage::SetAsDefault);
+            return;
+        }
+
+        if (const auto infoBar = FindName(L"SetAsDefaultInfoBar").try_as<MUX::Controls::InfoBar>())
+        {
+            TraceLoggingWrite(g_hTerminalAppProvider, "SetAsDefaultTipPresented", TraceLoggingKeyword(MICROSOFT_KEYWORD_MEASURES), TelemetryPrivacyDataTag(PDT_ProductAndServicePerformance));
+            infoBar.IsOpen(true);
+        }
+    }
+
     // Function Description:
     // - Helper function to get the OS-localized name for the "Touch Keyboard
     //   and Handwriting Panel Service". If we can't open up the service for any
@@ -3106,6 +3310,11 @@ namespace winrt::TerminalApp::implementation
         }
     }
 
+    void TerminalPage::SetPersistedLayoutIdx(const uint32_t idx)
+    {
+        _loadFromPersistedLayoutIdx = idx;
+    }
+
     void TerminalPage::SetNumberOfOpenWindows(const uint64_t num)
     {
         _numOpenWindows = num;
@@ -3305,6 +3514,40 @@ namespace winrt::TerminalApp::implementation
         }
     }
 
+    // Method Description:
+    // - Persists the user's choice not to show the information bar warning about "Windows Terminal can be set as your default terminal application"
+    // Then hides this information buffer.
+    // Arguments:
+    // - <none>
+    // Return Value:
+    // - <none>
+    void TerminalPage::_SetAsDefaultDismissHandler(const IInspectable& /*sender*/, const IInspectable& /*args*/)
+    {
+        _DismissMessage(InfoBarMessage::SetAsDefault);
+        if (const auto infoBar = FindName(L"SetAsDefaultInfoBar").try_as<MUX::Controls::InfoBar>())
+        {
+            infoBar.IsOpen(false);
+        }
+
+        TraceLoggingWrite(g_hTerminalAppProvider, "SetAsDefaultTipDismissed", TraceLoggingKeyword(MICROSOFT_KEYWORD_MEASURES), TelemetryPrivacyDataTag(PDT_ProductAndServiceUsage));
+
+        _FocusCurrentTab(true);
+    }
+
+    // Method Description:
+    // - Dismisses the Default Terminal tip and opens the settings.
+    void TerminalPage::_SetAsDefaultOpenSettingsHandler(const IInspectable& /*sender*/, const IInspectable& /*args*/)
+    {
+        if (const auto infoBar = FindName(L"SetAsDefaultInfoBar").try_as<MUX::Controls::InfoBar>())
+        {
+            infoBar.IsOpen(false);
+        }
+
+        TraceLoggingWrite(g_hTerminalAppProvider, "SetAsDefaultTipInteracted", TraceLoggingKeyword(MICROSOFT_KEYWORD_MEASURES), TelemetryPrivacyDataTag(PDT_ProductAndServiceUsage));
+
+        OpenSettingsUI();
+    }
+
     // Method Description:
     // - Checks whether information bar message was dismissed earlier (in the application state)
     // Arguments:
@@ -3334,13 +3577,20 @@ namespace winrt::TerminalApp::implementation
     // - <none>
     void TerminalPage::_DismissMessage(const InfoBarMessage& message)
     {
-        auto dismissedMessages = ApplicationState::SharedInstance().DismissedMessages();
-        if (!dismissedMessages)
+        const auto applicationState = ApplicationState::SharedInstance();
+        std::vector<InfoBarMessage> messages;
+
+        if (const auto values = applicationState.DismissedMessages())
         {
-            dismissedMessages = winrt::single_threaded_vector<InfoBarMessage>();
+            messages.resize(values.Size());
+            values.GetMany(0, messages);
         }
 
-        dismissedMessages.Append(message);
-        ApplicationState::SharedInstance().DismissedMessages(dismissedMessages);
+        if (std::none_of(messages.begin(), messages.end(), [&](const auto& m) { return m == message; }))
+        {
+            messages.emplace_back(message);
+        }
+
+        applicationState.DismissedMessages(std::move(messages));
     }
 }

src/cascadia/TerminalApp/TerminalPage.h

@@ -14,12 +14,17 @@
 
 static constexpr uint32_t DefaultRowsToScroll{ 3 };
 static constexpr std::wstring_view TabletInputServiceKey{ L"TabletInputService" };
-// fwdecl unittest classes
+
 namespace TerminalAppLocalTests
 {
     class TabTests;
     class SettingsTests;
-};
+}
+
+namespace Microsoft::Terminal::Core
+{
+    class ControlKeyStates;
+}
 
 namespace winrt::TerminalApp::implementation
 {
@@ -59,6 +64,9 @@ namespace winrt::TerminalApp::implementation
         void Create();
 
         bool ShouldUsePersistedLayout(Microsoft::Terminal::Settings::Model::CascadiaSettings& settings) const;
+        std::optional<uint32_t> LoadPersistedLayoutIdx(Microsoft::Terminal::Settings::Model::CascadiaSettings& settings) const;
+        winrt::Microsoft::Terminal::Settings::Model::WindowLayout LoadPersistedLayout(Microsoft::Terminal::Settings::Model::CascadiaSettings& settings) const;
+        Microsoft::Terminal::Settings::Model::WindowLayout GetWindowLayout();
 
         winrt::fire_and_forget NewTerminalByDrop(winrt::Windows::UI::Xaml::DragEventArgs& e);
 
@@ -80,9 +88,9 @@ namespace winrt::TerminalApp::implementation
         bool FocusMode() const;
         bool Fullscreen() const;
         bool AlwaysOnTop() const;
+        void SetFullscreen(bool);
 
         void SetStartupActions(std::vector<Microsoft::Terminal::Settings::Model::ActionAndArgs>& actions);
-        void PersistWindowLayout();
 
         void SetInboundListener(bool isEmbedding);
         static std::vector<Microsoft::Terminal::Settings::Model::ActionAndArgs> ConvertExecuteCommandlineToActions(const Microsoft::Terminal::Settings::Model::ExecuteCommandlineArgs& args);
@@ -93,6 +101,7 @@ namespace winrt::TerminalApp::implementation
         winrt::TerminalApp::TaskbarState TaskbarState() const;
 
         void ShowKeyboardServiceWarning() const;
+        void ShowSetAsDefaultInfoBar() const;
         winrt::hstring KeyboardServiceDisabledText();
 
         winrt::fire_and_forget IdentifyWindow();
@@ -111,12 +120,15 @@ namespace winrt::TerminalApp::implementation
         void WindowId(const uint64_t& value);
 
         void SetNumberOfOpenWindows(const uint64_t value);
+        void SetPersistedLayoutIdx(const uint32_t value);
 
         winrt::hstring WindowIdForDisplay() const noexcept;
         winrt::hstring WindowNameForDisplay() const noexcept;
         bool IsQuakeWindow() const noexcept;
         bool IsElevated() const noexcept;
 
+        void OpenSettingsUI();
+
         WINRT_CALLBACK(PropertyChanged, Windows::UI::Xaml::Data::PropertyChangedEventHandler);
 
         // -------------------------------- WinRT Events ---------------------------------
@@ -133,6 +145,7 @@ namespace winrt::TerminalApp::implementation
         TYPED_EVENT(RenameWindowRequested, Windows::Foundation::IInspectable, winrt::TerminalApp::RenameWindowRequestedArgs);
         TYPED_EVENT(IsQuakeWindowChanged, IInspectable, IInspectable);
         TYPED_EVENT(SummonWindowRequested, IInspectable, IInspectable);
+        TYPED_EVENT(CloseRequested, IInspectable, IInspectable);
         TYPED_EVENT(OpenSystemMenu, IInspectable, IInspectable);
         TYPED_EVENT(QuitRequested, IInspectable, IInspectable);
 
@@ -166,6 +179,7 @@ namespace winrt::TerminalApp::implementation
         bool _isAlwaysOnTop{ false };
         winrt::hstring _WindowName{};
         uint64_t _WindowId{ 0 };
+        std::optional<uint32_t> _loadFromPersistedLayoutIdx{};
         uint64_t _numOpenWindows{ 0 };
 
         bool _maintainStateOnTabClose{ false };
@@ -203,7 +217,6 @@ namespace winrt::TerminalApp::implementation
         void _OpenNewTabDropdown();
         HRESULT _OpenNewTab(const Microsoft::Terminal::Settings::Model::NewTerminalArgs& newTerminalArgs, winrt::Microsoft::Terminal::TerminalConnection::ITerminalConnection existingConnection = nullptr);
         void _CreateNewTabFromPane(std::shared_ptr<Pane> pane);
-        void _CreateNewTabWithProfileAndSettings(const Microsoft::Terminal::Settings::Model::Profile& profile, const Microsoft::Terminal::Settings::Model::TerminalSettingsCreateResult& settings, winrt::Microsoft::Terminal::TerminalConnection::ITerminalConnection existingConnection = nullptr);
         winrt::Microsoft::Terminal::TerminalConnection::ITerminalConnection _CreateConnectionFromSettings(Microsoft::Terminal::Settings::Model::Profile profile, Microsoft::Terminal::Settings::Model::TerminalSettings settings);
 
         winrt::fire_and_forget _OpenNewWindow(const bool elevate, const Microsoft::Terminal::Settings::Model::NewTerminalArgs newTerminalArgs);
@@ -217,6 +230,8 @@ namespace winrt::TerminalApp::implementation
         void _ThirdPartyNoticesOnClick(const IInspectable& sender, const Windows::UI::Xaml::RoutedEventArgs& eventArgs);
 
         void _KeyDownHandler(Windows::Foundation::IInspectable const& sender, Windows::UI::Xaml::Input::KeyRoutedEventArgs const& e);
+        static ::Microsoft::Terminal::Core::ControlKeyStates _GetPressedModifierKeys() noexcept;
+        static void _ClearKeyboardState(const WORD vkey, const WORD scanCode) noexcept;
         void _HookupKeyBindings(const Microsoft::Terminal::Settings::Model::IActionMapView& actionMap) noexcept;
         void _RegisterActionCallbacks();
 
@@ -257,6 +272,26 @@ namespace winrt::TerminalApp::implementation
         bool _SwapPane(const Microsoft::Terminal::Settings::Model::FocusDirection& direction);
         bool _MovePane(const uint32_t tabIdx);
 
+        template<typename F>
+        bool _ApplyToActiveControls(F f)
+        {
+            if (const auto tab{ _GetFocusedTabImpl() })
+            {
+                if (const auto activePane = tab->GetActivePane())
+                {
+                    activePane->WalkTree([&](auto p) {
+                        if (const auto& control{ p->GetTerminalControl() })
+                        {
+                            f(control);
+                        }
+                    });
+
+                    return true;
+                }
+            }
+            return false;
+        }
+
         winrt::Microsoft::Terminal::Control::TermControl _GetActiveControl();
         std::optional<uint32_t> _GetFocusedTabIndex() const noexcept;
         TerminalApp::TabBase _GetFocusedTab() const noexcept;
@@ -271,14 +306,12 @@ namespace winrt::TerminalApp::implementation
         void _Scroll(ScrollDirection scrollDirection, const Windows::Foundation::IReference<uint32_t>& rowsToScroll);
 
         void _SplitPane(const Microsoft::Terminal::Settings::Model::SplitDirection splitType,
-                        const Microsoft::Terminal::Settings::Model::SplitType splitMode = Microsoft::Terminal::Settings::Model::SplitType::Manual,
-                        const float splitSize = 0.5f,
-                        const Microsoft::Terminal::Settings::Model::NewTerminalArgs& newTerminalArgs = nullptr);
+                        const float splitSize,
+                        std::shared_ptr<Pane> newPane);
         void _SplitPane(TerminalTab& tab,
                         const Microsoft::Terminal::Settings::Model::SplitDirection splitType,
-                        const Microsoft::Terminal::Settings::Model::SplitType splitMode = Microsoft::Terminal::Settings::Model::SplitType::Manual,
-                        const float splitSize = 0.5f,
-                        const Microsoft::Terminal::Settings::Model::NewTerminalArgs& newTerminalArgs = nullptr);
+                        const float splitSize,
+                        std::shared_ptr<Pane> newPane);
         void _ResizePane(const Microsoft::Terminal::Settings::Model::ResizeDirection& direction);
         void _ToggleSplitOrientation();
 
@@ -325,6 +358,10 @@ namespace winrt::TerminalApp::implementation
         winrt::Microsoft::Terminal::Control::TermControl _InitControl(const winrt::Microsoft::Terminal::Settings::Model::TerminalSettingsCreateResult& settings,
                                                                       const winrt::Microsoft::Terminal::TerminalConnection::ITerminalConnection& connection);
 
+        std::shared_ptr<Pane> _MakePane(const Microsoft::Terminal::Settings::Model::NewTerminalArgs& newTerminalArgs = nullptr,
+                                        const bool duplicate = false,
+                                        winrt::Microsoft::Terminal::TerminalConnection::ITerminalConnection existingConnection = nullptr);
+
         void _RefreshUIForSettingsReload();
 
         void _SetNonClientAreaColors(const Windows::UI::Color& selectedTabColor);
@@ -340,8 +377,6 @@ namespace winrt::TerminalApp::implementation
 
         void _UnZoomIfNeeded();
 
-        void _OpenSettingsUI();
-
         static int _ComputeScrollDelta(ScrollDirection scrollDirection, const uint32_t rowsToScroll);
         static uint32_t _ReadSystemRowsToScroll();
 
@@ -360,9 +395,9 @@ namespace winrt::TerminalApp::implementation
         void _EndPreviewColorScheme();
         void _PreviewColorScheme(const Microsoft::Terminal::Settings::Model::SetColorSchemeArgs& args);
         winrt::Microsoft::Terminal::Settings::Model::Command _lastPreviewedCommand{ nullptr };
-        winrt::Microsoft::Terminal::Settings::Model::TerminalSettings _originalSettings{ nullptr };
+        std::vector<std::function<void()>> _restorePreviewFuncs{};
 
-        HRESULT _OnNewConnection(winrt::Microsoft::Terminal::TerminalConnection::ITerminalConnection connection);
+        HRESULT _OnNewConnection(const winrt::Microsoft::Terminal::TerminalConnection::ConptyConnection& connection);
         void _HandleToggleInboundPty(const IInspectable& sender, const Microsoft::Terminal::Settings::Model::ActionEventArgs& args);
 
         void _WindowRenamerActionClick(const IInspectable& sender, const IInspectable& eventArgs);
@@ -378,6 +413,8 @@ namespace winrt::TerminalApp::implementation
         winrt::fire_and_forget _ConnectionStateChangedHandler(const winrt::Windows::Foundation::IInspectable& sender, const winrt::Windows::Foundation::IInspectable& args) const;
         void _CloseOnExitInfoDismissHandler(const winrt::Windows::Foundation::IInspectable& sender, const winrt::Windows::Foundation::IInspectable& args) const;
         void _KeyboardServiceWarningInfoDismissHandler(const winrt::Windows::Foundation::IInspectable& sender, const winrt::Windows::Foundation::IInspectable& args) const;
+        void _SetAsDefaultDismissHandler(const winrt::Windows::Foundation::IInspectable& sender, const winrt::Windows::Foundation::IInspectable& args);
+        void _SetAsDefaultOpenSettingsHandler(const winrt::Windows::Foundation::IInspectable& sender, const winrt::Windows::Foundation::IInspectable& args);
         static bool _IsMessageDismissed(const winrt::Microsoft::Terminal::Settings::Model::InfoBarMessage& message);
         static void _DismissMessage(const winrt::Microsoft::Terminal::Settings::Model::InfoBarMessage& message);
 

src/cascadia/TerminalApp/TerminalPage.idl

@@ -33,7 +33,6 @@ namespace TerminalApp
         UInt64 WindowId;
         String WindowNameForDisplay { get; };
         String WindowIdForDisplay { get; };
-        void SetNumberOfOpenWindows(UInt64 num);
         void RenameFailed();
         Boolean IsQuakeWindow();
 
@@ -58,6 +57,7 @@ namespace TerminalApp
         event Windows.Foundation.TypedEventHandler<Object, RenameWindowRequestedArgs> RenameWindowRequested;
         event Windows.Foundation.TypedEventHandler<Object, Object> IsQuakeWindowChanged;
         event Windows.Foundation.TypedEventHandler<Object, Object> SummonWindowRequested;
+        event Windows.Foundation.TypedEventHandler<Object, Object> CloseRequested;
         event Windows.Foundation.TypedEventHandler<Object, Object> OpenSystemMenu;
     }
 }

src/cascadia/TerminalApp/TerminalPage.xaml

@@ -15,6 +15,7 @@
     <Grid x:Name="Root"
           Background="Transparent">
         <Grid.RowDefinitions>
+            <RowDefinition Height="Auto" />
             <RowDefinition Height="Auto" />
             <RowDefinition Height="*" />
         </Grid.RowDefinitions>
@@ -22,8 +23,50 @@
         <local:TabRowControl x:Name="TabRow"
                              Grid.Row="0" />
 
+        <StackPanel Grid.Row="1">
+            <mux:InfoBar x:Name="KeyboardServiceWarningInfoBar"
+                         x:Load="False"
+                         IsClosable="True"
+                         IsIconVisible="True"
+                         IsOpen="False"
+                         Message="{x:Bind KeyboardServiceDisabledText, Mode=OneWay}"
+                         Severity="Warning">
+                <mux:InfoBar.ActionButton>
+                    <Button x:Uid="InfoBarDismissButton"
+                            Click="_KeyboardServiceWarningInfoDismissHandler" />
+                </mux:InfoBar.ActionButton>
+            </mux:InfoBar>
+
+            <mux:InfoBar x:Name="CloseOnExitInfoBar"
+                         x:Uid="CloseOnExitInfoBar"
+                         x:Load="False"
+                         IsClosable="True"
+                         IsIconVisible="True"
+                         IsOpen="False"
+                         Severity="Informational">
+                <mux:InfoBar.ActionButton>
+                    <Button x:Uid="InfoBarDismissButton"
+                            Click="_CloseOnExitInfoDismissHandler" />
+                </mux:InfoBar.ActionButton>
+            </mux:InfoBar>
+
+            <mux:InfoBar x:Name="SetAsDefaultInfoBar"
+                         x:Uid="SetAsDefaultInfoBar"
+                         x:Load="False"
+                         CloseButtonClick="_SetAsDefaultDismissHandler"
+                         IsClosable="True"
+                         IsIconVisible="True"
+                         IsOpen="False"
+                         Severity="Informational">
+                <mux:InfoBar.ActionButton>
+                    <HyperlinkButton x:Uid="SetAsDefaultTip_OpenSettingsLink"
+                                     Click="_SetAsDefaultOpenSettingsHandler" />
+                </mux:InfoBar.ActionButton>
+            </mux:InfoBar>
+        </StackPanel>
+
         <Grid x:Name="TabContent"
-              Grid.Row="1"
+              Grid.Row="2"
               HorizontalAlignment="Stretch"
               VerticalAlignment="Stretch" />
 
@@ -110,39 +153,11 @@
         </ContentDialog>
 
         <local:CommandPalette x:Name="CommandPalette"
-                              Grid.Row="1"
+                              Grid.Row="2"
                               VerticalAlignment="Stretch"
                               PreviewKeyDown="_KeyDownHandler"
                               Visibility="Collapsed" />
 
-        <StackPanel>
-            <mux:InfoBar x:Name="KeyboardServiceWarningInfoBar"
-                         x:Load="False"
-                         IsClosable="True"
-                         IsIconVisible="True"
-                         IsOpen="False"
-                         Message="{x:Bind KeyboardServiceDisabledText, Mode=OneWay}"
-                         Severity="Warning">
-                <mux:InfoBar.ActionButton>
-                    <Button x:Uid="InfoBarDismissButton"
-                            Click="_KeyboardServiceWarningInfoDismissHandler" />
-                </mux:InfoBar.ActionButton>
-            </mux:InfoBar>
-
-            <mux:InfoBar x:Name="CloseOnExitInfoBar"
-                         x:Uid="CloseOnExitInfoBar"
-                         x:Load="False"
-                         IsClosable="True"
-                         IsIconVisible="True"
-                         IsOpen="False"
-                         Severity="Informational">
-                <mux:InfoBar.ActionButton>
-                    <Button x:Uid="InfoBarDismissButton"
-                            Click="_CloseOnExitInfoDismissHandler" />
-                </mux:InfoBar.ActionButton>
-            </mux:InfoBar>
-        </StackPanel>
-
         <!--
             A TeachingTip with IsLightDismissEnabled="True" will immediately
             dismiss itself if the window is unfocused (In Xaml Islands). This is

src/cascadia/TerminalApp/TerminalTab.cpp

@@ -25,18 +25,6 @@ namespace winrt
 
 namespace winrt::TerminalApp::implementation
 {
-    TerminalTab::TerminalTab(const Profile& profile, const TermControl& control)
-    {
-        _rootPane = std::make_shared<Pane>(profile, control, true);
-
-        _rootPane->Id(_nextPaneId);
-        _activePane = _rootPane;
-        _mruPanes.insert(_mruPanes.begin(), _nextPaneId);
-        ++_nextPaneId;
-
-        _Setup();
-    }
-
     TerminalTab::TerminalTab(std::shared_ptr<Pane> rootPane)
     {
         _rootPane = rootPane;
@@ -64,11 +52,15 @@ namespace winrt::TerminalApp::implementation
         // focus the first one.
         if (_activePane == nullptr)
         {
-            _rootPane->FocusPane(firstId);
-            _activePane = _rootPane->GetActivePane();
+            const auto firstPane = _rootPane->FindPane(firstId);
+            firstPane->SetActive();
+            _activePane = firstPane;
+        }
+        // If the focused pane is a leaf, add it to the MRU panes
+        if (const auto id = _activePane->Id())
+        {
+            _mruPanes.insert(_mruPanes.begin(), id.value());
         }
-        // Set the active control
-        _mruPanes.insert(_mruPanes.begin(), _activePane->Id().value());
 
         _Setup();
     }
@@ -180,8 +172,8 @@ namespace winrt::TerminalApp::implementation
 
     // Method Description:
     // - Returns nullptr if no children of this tab were the last control to be
-    //   focused, or the TermControl that _was_ the last control to be focused (if
-    //   there was one).
+    //   focused, the active control of the current pane, or the last active child control
+    //   of the active pane if it is a parent.
     // - This control might not currently be focused, if the tab itself is not
     //   currently focused.
     // Arguments:
@@ -193,7 +185,7 @@ namespace winrt::TerminalApp::implementation
     {
         if (_activePane)
         {
-            return _activePane->GetTerminalControl();
+            return _activePane->GetLastFocusedTerminalControl();
         }
         return nullptr;
     }
@@ -390,6 +382,10 @@ namespace winrt::TerminalApp::implementation
         {
             return _runtimeTabText;
         }
+        if (!_activePane->_IsLeaf())
+        {
+            return RS_(L"MultiplePanes");
+        }
         const auto lastFocusedControl = GetActiveTerminalControl();
         return lastFocusedControl ? lastFocusedControl.Title() : L"";
     }
@@ -450,12 +446,25 @@ namespace winrt::TerminalApp::implementation
         // 1 for the child after the first split.
         auto state = _rootPane->BuildStartupActions(0, 1);
 
-        ActionAndArgs newTabAction{};
-        newTabAction.Action(ShortcutAction::NewTab);
-        NewTabArgs newTabArgs{ state.firstPane->GetTerminalArgsForPane() };
-        newTabAction.Args(newTabArgs);
+        {
+            ActionAndArgs newTabAction{};
+            newTabAction.Action(ShortcutAction::NewTab);
+            NewTabArgs newTabArgs{ state.firstPane->GetTerminalArgsForPane() };
+            newTabAction.Args(newTabArgs);
 
-        state.args.emplace(state.args.begin(), std::move(newTabAction));
+            state.args.emplace(state.args.begin(), std::move(newTabAction));
+        }
+
+        if (_runtimeTabColor)
+        {
+            ActionAndArgs setColorAction{};
+            setColorAction.Action(ShortcutAction::SetTabColor);
+
+            SetTabColorArgs setColorArgs{ _runtimeTabColor.value() };
+            setColorAction.Args(setColorArgs);
+
+            state.args.emplace_back(std::move(setColorAction));
+        }
 
         // If we only have one arg, we only have 1 pane so we don't need any
         // special focus logic
@@ -483,44 +492,48 @@ namespace winrt::TerminalApp::implementation
 
     // Method Description:
     // - Split the focused pane in our tree of panes, and place the
-    //   given TermControl into the newly created pane.
+    //   given pane into the tree of panes according to the split
     // Arguments:
-    // - splitType: The type of split we want to create.
-    // - profile: The profile GUID to associate with the newly created pane.
-    // - control: A TermControl to use in the new pane.
+    // - splitType: The type of split we want to create
+    // - splitSize: The size of the split we want to create
+    // - pane: The new pane to add to the tree of panes; note that this pane
+    //         could itself be a parent pane/the root node of a tree of panes
     // Return Value:
     // - <none>
     void TerminalTab::SplitPane(SplitDirection splitType,
                                 const float splitSize,
-                                const Profile& profile,
-                                TermControl& control)
+                                std::shared_ptr<Pane> pane)
     {
+        // Add the new event handlers to the new pane(s)
+        // and update their ids.
+        pane->WalkTree([&](auto p) {
+            _AttachEventHandlersToPane(p);
+            if (p->_IsLeaf())
+            {
+                p->Id(_nextPaneId);
+                _AttachEventHandlersToControl(p->Id().value(), p->_control);
+                _nextPaneId++;
+            }
+            return false;
+        });
         // Make sure to take the ID before calling Split() - Split() will clear out the active pane's ID
         const auto activePaneId = _activePane->Id();
         // Depending on which direction will be split, the new pane can be
         // either the first or second child, but this will always return the
         // original pane first.
-        auto [original, newPane] = _activePane->Split(splitType, splitSize, profile, control);
+        auto [original, newPane] = _activePane->Split(splitType, splitSize, pane);
+
+        // The active pane has an id if it is a leaf
         if (activePaneId)
         {
             original->Id(activePaneId.value());
-            newPane->Id(_nextPaneId);
-            ++_nextPaneId;
-        }
-        else
-        {
-            original->Id(_nextPaneId);
-            ++_nextPaneId;
-            newPane->Id(_nextPaneId);
-            ++_nextPaneId;
         }
+
         _activePane = original;
 
         // Add a event handlers to the new panes' GotFocus event. When the pane
         // gains focus, we'll mark it as the new active pane.
-        _AttachEventHandlersToControl(newPane->Id().value(), control);
         _AttachEventHandlersToPane(original);
-        _AttachEventHandlersToPane(newPane);
 
         // Immediately update our tracker of the focused pane now. If we're
         // splitting panes during startup (from a commandline), then it's
@@ -538,8 +551,8 @@ namespace winrt::TerminalApp::implementation
     // - The removed pane, if the remove succeeded.
     std::shared_ptr<Pane> TerminalTab::DetachPane()
     {
-        // if we only have one pane, remove it entirely
-        // and close this tab
+        // if we only have one pane, or the focused pane is the root, remove it
+        // entirely and close this tab
         if (_rootPane == _activePane)
         {
             return DetachRoot();
@@ -614,16 +627,12 @@ namespace winrt::TerminalApp::implementation
         // Add the new pane as an automatic split on the active pane.
         auto first = _activePane->AttachPane(pane, SplitDirection::Automatic);
 
-        // under current assumptions this condition should always be true.
+        // This will be true if the original _activePane is a leaf pane.
+        // If it is a parent pane then we don't want to set an ID on it.
         if (previousId)
         {
             first->Id(previousId.value());
         }
-        else
-        {
-            first->Id(_nextPaneId);
-            ++_nextPaneId;
-        }
 
         // Update with event handlers on the new child.
         _activePane = first;
@@ -699,7 +708,10 @@ namespace winrt::TerminalApp::implementation
         // throughout the entire tree.
         if (const auto newFocus = _rootPane->NavigateDirection(_activePane, direction, _mruPanes))
         {
+            // Mark that we want the active pane to changed
+            _changingActivePane = true;
             const auto res = _rootPane->FocusPane(newFocus);
+            _changingActivePane = false;
 
             if (_zoomedPane)
             {
@@ -722,11 +734,22 @@ namespace winrt::TerminalApp::implementation
     // - true if two panes were swapped.
     bool TerminalTab::SwapPane(const FocusDirection& direction)
     {
+        // You cannot swap panes with the parent/child pane because of the
+        // circular reference.
+        if (direction == FocusDirection::Parent || direction == FocusDirection::Child)
+        {
+            return false;
+        }
         // NOTE: This _must_ be called on the root pane, so that it can propagate
         // throughout the entire tree.
         if (auto neighbor = _rootPane->NavigateDirection(_activePane, direction, _mruPanes))
         {
-            return _rootPane->SwapPanes(_activePane, neighbor);
+            // SwapPanes will refocus the terminal to make sure that it has focus
+            // even after moving.
+            _changingActivePane = true;
+            const auto res = _rootPane->SwapPanes(_activePane, neighbor);
+            _changingActivePane = false;
+            return res;
         }
 
         return false;
@@ -734,7 +757,10 @@ namespace winrt::TerminalApp::implementation
 
     bool TerminalTab::FocusPane(const uint32_t id)
     {
-        return _rootPane->FocusPane(id);
+        _changingActivePane = true;
+        const auto res = _rootPane->FocusPane(id);
+        _changingActivePane = false;
+        return res;
     }
 
     // Method Description:
@@ -1027,7 +1053,7 @@ namespace winrt::TerminalApp::implementation
         auto weakThis{ get_weak() };
         std::weak_ptr<Pane> weakPane{ pane };
 
-        auto gotFocusToken = pane->GotFocus([weakThis](std::shared_ptr<Pane> sender) {
+        auto gotFocusToken = pane->GotFocus([weakThis](std::shared_ptr<Pane> sender, WUX::FocusState focus) {
             // Do nothing if the Tab's lifetime is expired or pane isn't new.
             auto tab{ weakThis.get() };
 
@@ -1035,8 +1061,20 @@ namespace winrt::TerminalApp::implementation
             {
                 if (sender != tab->_activePane)
                 {
-                    tab->_UpdateActivePane(sender);
-                    tab->_RecalculateAndApplyTabColor();
+                    auto senderIsChild = tab->_activePane->_HasChild(sender);
+
+                    // Only move focus if we the program moved focus, or the
+                    // user moved with their mouse. This is a problem because a
+                    // pane isn't a control itself, and if we have the parent
+                    // focused we are fine if the terminal control is focused,
+                    // but we don't want to update the active pane.
+                    if (!senderIsChild ||
+                        (focus == WUX::FocusState::Programmatic && tab->_changingActivePane) ||
+                        focus == WUX::FocusState::Pointer)
+                    {
+                        tab->_UpdateActivePane(sender);
+                        tab->_RecalculateAndApplyTabColor();
+                    }
                 }
                 tab->_focusState = WUX::FocusState::Programmatic;
                 // This tab has gained focus, remove the bell indicator if it is active
@@ -1071,8 +1109,19 @@ namespace winrt::TerminalApp::implementation
                     tab->Content(tab->_rootPane->GetRootElement());
                     tab->ExitZoom();
                 }
+
                 if (auto pane = weakPane.lock())
                 {
+                    // When a parent pane is selected, but one of its children
+                    // close out under it we still need to update title/focus information
+                    // but the GotFocus handler will rightly see that the _activePane
+                    // did not actually change. Triggering
+                    if (pane != tab->_activePane && !tab->_activePane->_IsLeaf())
+                    {
+                        co_await winrt::resume_foreground(tab->Content().Dispatcher());
+                        tab->_UpdateActivePane(tab->_activePane);
+                    }
+
                     for (auto i = tab->_mruPanes.begin(); i != tab->_mruPanes.end(); ++i)
                     {
                         if (*i == pane->Id())
@@ -1290,11 +1339,13 @@ namespace winrt::TerminalApp::implementation
     // - The tab's color, if any
     std::optional<winrt::Windows::UI::Color> TerminalTab::GetTabColor()
     {
-        const auto currControlColor{ GetActiveTerminalControl().TabColor() };
         std::optional<winrt::Windows::UI::Color> controlTabColor;
-        if (currControlColor != nullptr)
+        if (const auto& control = GetActiveTerminalControl())
         {
-            controlTabColor = currControlColor.Value();
+            if (const auto color = control.TabColor())
+            {
+                controlTabColor = color.Value();
+            }
         }
 
         // A Tab's color will be the result of layering a variety of sources,
@@ -1407,6 +1458,10 @@ namespace winrt::TerminalApp::implementation
         // TabViewItem().Background() only sets the color of the tab background
         // when the TabViewItem is unselected. So we still need to set the other
         // properties ourselves.
+        //
+        // In GH#11294 we thought we'd still need to set
+        // TabViewItemHeaderBackground manually, but GH#11382 discovered that
+        // Background() was actually okay after all.
         TabViewItem().Background(deselectedTabBrush);
         TabViewItem().Resources().Insert(winrt::box_value(L"TabViewItemHeaderBackgroundSelected"), selectedTabBrush);
         TabViewItem().Resources().Insert(winrt::box_value(L"TabViewItemHeaderBackgroundPointerOver"), hoverTabBrush);
@@ -1453,6 +1508,7 @@ namespace winrt::TerminalApp::implementation
     void TerminalTab::_ClearTabBackgroundColor()
     {
         winrt::hstring keys[] = {
+            L"TabViewItemHeaderBackground",
             L"TabViewItemHeaderBackgroundSelected",
             L"TabViewItemHeaderBackgroundPointerOver",
             L"TabViewItemHeaderForeground",
@@ -1473,8 +1529,10 @@ namespace winrt::TerminalApp::implementation
             }
         }
 
-        // Clear out the Background.
-        TabViewItem().Background(nullptr);
+        // GH#11382 DON'T set the background to null. If you do that, then the
+        // tab won't be hit testable at all. Transparent, however, is a totally
+        // valid hit test target. That makes sense.
+        TabViewItem().Background(WUX::Media::SolidColorBrush{ Windows::UI::Colors::Transparent() });
 
         _RefreshVisualState();
         _colorCleared();
@@ -1585,6 +1643,11 @@ namespace winrt::TerminalApp::implementation
 
     void TerminalTab::EnterZoom()
     {
+        // Clear the content first, because with parent focusing it is possible
+        // to zoom the root pane, but setting the content will not trigger the
+        // property changed event since it is the same and you would end up with
+        // an empty tab.
+        Content(nullptr);
         _zoomedPane = _activePane;
         _rootPane->Maximize(_zoomedPane);
         // Update the tab header to show the magnifying glass
@@ -1593,6 +1656,7 @@ namespace winrt::TerminalApp::implementation
     }
     void TerminalTab::ExitZoom()
     {
+        Content(nullptr);
         _rootPane->Restore(_zoomedPane);
         _zoomedPane = nullptr;
         // Update the tab header to hide the magnifying glass
@@ -1607,13 +1671,34 @@ namespace winrt::TerminalApp::implementation
 
     // Method Description:
     // - Toggle read-only mode on the active pane
+    // - If a parent pane is selected, this will ensure that all children have
+    //   the same read-only status.
     void TerminalTab::TogglePaneReadOnly()
     {
-        auto control = GetActiveTerminalControl();
-        if (control)
-        {
-            control.ToggleReadOnly();
-        }
+        auto hasReadOnly = false;
+        auto allReadOnly = true;
+        _activePane->WalkTree([&](auto p) {
+            if (const auto& control{ p->GetTerminalControl() })
+            {
+                hasReadOnly |= control.ReadOnly();
+                allReadOnly &= control.ReadOnly();
+            }
+        });
+        _activePane->WalkTree([&](auto p) {
+            if (const auto& control{ p->GetTerminalControl() })
+            {
+                // If all controls have the same read only state then just toggle
+                if (allReadOnly || !hasReadOnly)
+                {
+                    control.ToggleReadOnly();
+                }
+                // otherwise set to all read only.
+                else if (!control.ReadOnly())
+                {
+                    control.ToggleReadOnly();
+                }
+            }
+        });
     }
 
     // Method Description:

src/cascadia/TerminalApp/TerminalTab.h

@@ -21,7 +21,6 @@ namespace winrt::TerminalApp::implementation
     struct TerminalTab : TerminalTabT<TerminalTab, TabBase>
     {
     public:
-        TerminalTab(const winrt::Microsoft::Terminal::Settings::Model::Profile& profile, const winrt::Microsoft::Terminal::Control::TermControl& control);
         TerminalTab(std::shared_ptr<Pane> rootPane);
 
         // Called after construction to perform the necessary setup, which relies on weak_ptr
@@ -40,8 +39,7 @@ namespace winrt::TerminalApp::implementation
 
         void SplitPane(winrt::Microsoft::Terminal::Settings::Model::SplitDirection splitType,
                        const float splitSize,
-                       const winrt::Microsoft::Terminal::Settings::Model::Profile& profile,
-                       winrt::Microsoft::Terminal::Control::TermControl& control);
+                       std::shared_ptr<Pane> newPane);
 
         void ToggleSplitOrientation();
         winrt::fire_and_forget UpdateIcon(const winrt::hstring iconPath);
@@ -139,6 +137,7 @@ namespace winrt::TerminalApp::implementation
 
         bool _receivedKeyDown{ false };
         bool _iconHidden{ false };
+        bool _changingActivePane{ false };
 
         winrt::hstring _runtimeTabText{};
         bool _inRename{ false };

src/cascadia/TerminalAzBridge/TerminalAzBridge.vcxproj

@@ -68,5 +68,22 @@
     </Link>
   </ItemDefinitionGroup>
 
+  <!--
+  BODGY
+
+  The wapproj `GetResolvedWinMD` target tries to get a winmd from every cppwinrt
+  executable we put in the package. But we DON'T produce a winmd. This makes the
+  FastUpToDate check fail every time, and leads to the whole wapproj build
+  running even if you're just f5'ing the package. EVEN AFTER A SUCCESSFUL BUILD.
+
+  Setting GenerateWindowsMetadata=false is enough to tell the build system that
+  we don't produce one, and get it off our backs.
+  -->
+  <ItemDefinitionGroup>
+    <Link>
+        <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
+    </Link>
+  </ItemDefinitionGroup>
+
   <Import Project="$(OpenConsoleDir)\build\rules\GenerateSxsManifestsFromWinmds.targets" />
 </Project>

src/cascadia/TerminalConnection/CTerminalHandoff.cpp

@@ -99,29 +99,57 @@ static HRESULT _duplicateHandle(const HANDLE in, HANDLE& out) noexcept
 //   from the registered handler event function.
 HRESULT CTerminalHandoff::EstablishPtyHandoff(HANDLE in, HANDLE out, HANDLE signal, HANDLE ref, HANDLE server, HANDLE client)
 {
-    // Stash a local copy of _pfnHandoff before we stop listening.
-    auto localPfnHandoff = _pfnHandoff;
+    try
+    {
+        // Stash a local copy of _pfnHandoff before we stop listening.
+        auto localPfnHandoff = _pfnHandoff;
 
-    // Because we are REGCLS_SINGLEUSE... we need to `CoRevokeClassObject` after we handle this ONE call.
-    // COM does not automatically clean that up for us. We must do it.
-    s_StopListening();
+        // Because we are REGCLS_SINGLEUSE... we need to `CoRevokeClassObject` after we handle this ONE call.
+        // COM does not automatically clean that up for us. We must do it.
+        s_StopListening();
 
-    std::unique_lock lock{ _mtx };
+        std::unique_lock lock{ _mtx };
 
-    // Report an error if no one registered a handoff function before calling this.
-    RETURN_HR_IF_NULL(E_NOT_VALID_STATE, localPfnHandoff);
+        // Report an error if no one registered a handoff function before calling this.
+        THROW_HR_IF_NULL(E_NOT_VALID_STATE, localPfnHandoff);
 
-    // Duplicate the handles from what we received.
-    // The contract with COM specifies that any HANDLEs we receive from the caller belong
-    // to the caller and will be freed when we leave the scope of this method.
-    // Making our own duplicate copy ensures they hang around in our lifetime.
-    RETURN_IF_FAILED(_duplicateHandle(in, in));
-    RETURN_IF_FAILED(_duplicateHandle(out, out));
-    RETURN_IF_FAILED(_duplicateHandle(signal, signal));
-    RETURN_IF_FAILED(_duplicateHandle(ref, ref));
-    RETURN_IF_FAILED(_duplicateHandle(server, server));
-    RETURN_IF_FAILED(_duplicateHandle(client, client));
+        // Duplicate the handles from what we received.
+        // The contract with COM specifies that any HANDLEs we receive from the caller belong
+        // to the caller and will be freed when we leave the scope of this method.
+        // Making our own duplicate copy ensures they hang around in our lifetime.
+        THROW_IF_FAILED(_duplicateHandle(in, in));
+        THROW_IF_FAILED(_duplicateHandle(out, out));
+        THROW_IF_FAILED(_duplicateHandle(signal, signal));
+        THROW_IF_FAILED(_duplicateHandle(ref, ref));
+        THROW_IF_FAILED(_duplicateHandle(server, server));
+        THROW_IF_FAILED(_duplicateHandle(client, client));
 
-    // Call registered handler from when we started listening.
-    return localPfnHandoff(in, out, signal, ref, server, client);
+        // Call registered handler from when we started listening.
+        THROW_IF_FAILED(localPfnHandoff(in, out, signal, ref, server, client));
+
+#pragma warning(suppress : 26477)
+        TraceLoggingWrite(
+            g_hTerminalConnectionProvider,
+            "ReceiveTerminalHandoff_Success",
+            TraceLoggingDescription("successfully received a terminal handoff"),
+            TraceLoggingKeyword(MICROSOFT_KEYWORD_MEASURES),
+            TelemetryPrivacyDataTag(PDT_ProductAndServiceUsage));
+
+        return S_OK;
+    }
+    catch (...)
+    {
+        const auto hr = wil::ResultFromCaughtException();
+
+#pragma warning(suppress : 26477)
+        TraceLoggingWrite(
+            g_hTerminalConnectionProvider,
+            "ReceiveTerminalHandoff_Failed",
+            TraceLoggingDescription("failed while receiving a terminal handoff"),
+            TraceLoggingHResult(hr),
+            TraceLoggingKeyword(MICROSOFT_KEYWORD_MEASURES),
+            TelemetryPrivacyDataTag(PDT_ProductAndServiceUsage));
+
+        return hr;
+    }
 }

src/cascadia/TerminalConnection/ConptyConnection.cpp

@@ -1,12 +1,12 @@
-// Copyright (c) Microsoft Corporation.
+// Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 
 #include "pch.h"
 
 #include "ConptyConnection.h"
 
-#include <windows.h>
-#include <userenv.h>
+#include <UserEnv.h>
+#include <winternl.h>
 
 #include "ConptyConnection.g.cpp"
 #include "CTerminalHandoff.h"
@@ -276,24 +276,18 @@ namespace winrt::Microsoft::Terminal::TerminalConnection::implementation
                                        const HANDLE hClientProcess) :
         _initialRows{ 25 },
         _initialCols{ 80 },
-        _commandline{ L"" },
-        _startingDirectory{ L"" },
-        _startingTitle{ L"" },
-        _environment{ nullptr },
-        _guid{},
-        _u8State{},
-        _u16Str{},
-        _buffer{},
+        _guid{ Utils::CreateGuid() },
         _inPipe{ hIn },
         _outPipe{ hOut }
     {
         THROW_IF_FAILED(ConptyPackPseudoConsole(hServerProcess, hRef, hSig, &_hPC));
-        if (_guid == guid{})
-        {
-            _guid = Utils::CreateGuid();
-        }
-
         _piClient.hProcess = hClientProcess;
+
+        try
+        {
+            _commandline = _commandlineFromProcess(hClientProcess);
+        }
+        CATCH_LOG()
     }
 
     // Function Description:
@@ -355,6 +349,11 @@ namespace winrt::Microsoft::Terminal::TerminalConnection::implementation
         return _guid;
     }
 
+    winrt::hstring ConptyConnection::Commandline() const
+    {
+        return _commandline;
+    }
+
     void ConptyConnection::Start()
     try
     {
@@ -373,6 +372,16 @@ namespace winrt::Microsoft::Terminal::TerminalConnection::implementation
         // window is expecting it to be on the first layout.
         else
         {
+#pragma warning(suppress : 26477 26485 26494 26482 26446) // We don't control TraceLoggingWrite
+            TraceLoggingWrite(
+                g_hTerminalConnectionProvider,
+                "ConPtyConnectedToDefterm",
+                TraceLoggingDescription("Event emitted when ConPTY connection is started, for a defterm session"),
+                TraceLoggingGuid(_guid, "SessionGuid", "The WT_SESSION's GUID"),
+                TraceLoggingWideString(_clientName.c_str(), "Client", "The attached client process"),
+                TraceLoggingKeyword(MICROSOFT_KEYWORD_MEASURES),
+                TelemetryPrivacyDataTag(PDT_ProductAndServicePerformance));
+
             THROW_IF_FAILED(ConptyResizePseudoConsole(_hPC.get(), dimensions));
         }
 
@@ -420,8 +429,9 @@ namespace winrt::Microsoft::Terminal::TerminalConnection::implementation
         // EXIT POINT
         const auto hr = wil::ResultFromCaughtException();
 
+        // GH#11556 - make sure to format the error code to this string as an UNSIGNED int
         winrt::hstring failureText{ fmt::format(std::wstring_view{ RS_(L"ProcessFailedToLaunch") },
-                                                fmt::format(_errorFormat, hr),
+                                                fmt::format(_errorFormat, static_cast<unsigned int>(hr)),
                                                 _commandline) };
         _TerminalOutputHandlers(failureText);
 
@@ -448,6 +458,7 @@ namespace winrt::Microsoft::Terminal::TerminalConnection::implementation
     {
         try
         {
+            // GH#11556 - make sure to format the error code to this string as an UNSIGNED int
             winrt::hstring exitText{ fmt::format(std::wstring_view{ RS_(L"ProcessExited") }, fmt::format(_errorFormat, status)) };
             _TerminalOutputHandlers(L"\r\n");
             _TerminalOutputHandlers(exitText);
@@ -560,6 +571,38 @@ namespace winrt::Microsoft::Terminal::TerminalConnection::implementation
     }
     CATCH_LOG()
 
+    // Returns the command line of the given process.
+    // Requires PROCESS_BASIC_INFORMATION | PROCESS_VM_READ privileges.
+    winrt::hstring ConptyConnection::_commandlineFromProcess(HANDLE process)
+    {
+        struct PROCESS_BASIC_INFORMATION
+        {
+            NTSTATUS ExitStatus;
+            PPEB PebBaseAddress;
+            ULONG_PTR AffinityMask;
+            KPRIORITY BasePriority;
+            ULONG_PTR UniqueProcessId;
+            ULONG_PTR InheritedFromUniqueProcessId;
+        } info;
+        THROW_IF_NTSTATUS_FAILED(NtQueryInformationProcess(process, ProcessBasicInformation, &info, sizeof(info), nullptr));
+
+        // PEB: Process Environment Block
+        // This is a funny structure allocated by the kernel which contains all sorts of useful
+        // information, only a tiny fraction of which are documented publicly unfortunately.
+        // Fortunately however it contains a copy of the command line the process launched with.
+        PEB peb;
+        THROW_IF_WIN32_BOOL_FALSE(ReadProcessMemory(process, info.PebBaseAddress, &peb, sizeof(peb), nullptr));
+
+        RTL_USER_PROCESS_PARAMETERS params;
+        THROW_IF_WIN32_BOOL_FALSE(ReadProcessMemory(process, peb.ProcessParameters, &params, sizeof(params), nullptr));
+
+        // Yeah I know... Don't use "impl" stuff... But why do you make something _that_ useful private? :(
+        // The hstring_builder allows us to create a hstring without intermediate copies. Neat!
+        winrt::impl::hstring_builder commandline{ params.CommandLine.Length / 2u };
+        THROW_IF_WIN32_BOOL_FALSE(ReadProcessMemory(process, params.CommandLine.Buffer, commandline.data(), params.CommandLine.Length, nullptr));
+        return commandline.to_hstring();
+    }
+
     DWORD ConptyConnection::_OutputThread()
     {
         // Keep us alive until the output thread terminates; the destructor
@@ -636,8 +679,7 @@ namespace winrt::Microsoft::Terminal::TerminalConnection::implementation
     HRESULT ConptyConnection::NewHandoff(HANDLE in, HANDLE out, HANDLE signal, HANDLE ref, HANDLE server, HANDLE client) noexcept
     try
     {
-        auto conn = winrt::make<implementation::ConptyConnection>(signal, in, out, ref, server, client);
-        _newConnectionHandlers(conn);
+        _newConnectionHandlers(winrt::make<ConptyConnection>(signal, in, out, ref, server, client));
 
         return S_OK;
     }